From 93eaa6a4943ade6513257a740fcde97ca9468559 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 8 Jun 2018 01:29:39 +1000 Subject: as if millions of this pointers suddenly cried out in terror, and were suddenly silenced * streamline templates in addrmap.h * get rid of overloads on read/write member names - this will become even more important in the near future --- src/mame/drivers/1942.cpp | 28 +- src/mame/drivers/1943.cpp | 12 +- src/mame/drivers/1945kiii.cpp | 10 +- src/mame/drivers/20pacgal.cpp | 32 +- src/mame/drivers/24cdjuke.cpp | 4 +- src/mame/drivers/2mindril.cpp | 20 +- src/mame/drivers/30test.cpp | 12 +- src/mame/drivers/39in1.cpp | 14 +- src/mame/drivers/3do.cpp | 10 +- src/mame/drivers/3x3puzzl.cpp | 6 +- src/mame/drivers/4004clk.cpp | 6 +- src/mame/drivers/40love.cpp | 38 +- src/mame/drivers/4dpi.cpp | 6 +- src/mame/drivers/4enlinea.cpp | 10 +- src/mame/drivers/4enraya.cpp | 8 +- src/mame/drivers/4roses.cpp | 12 +- src/mame/drivers/5clown.cpp | 14 +- src/mame/drivers/8080bw.cpp | 148 +++--- src/mame/drivers/88games.cpp | 12 +- src/mame/drivers/a5105.cpp | 16 +- src/mame/drivers/a6809.cpp | 4 +- src/mame/drivers/a7150.cpp | 8 +- src/mame/drivers/a7800.cpp | 4 +- src/mame/drivers/aa310.cpp | 10 +- src/mame/drivers/abc1600.cpp | 92 ++-- src/mame/drivers/abc80.cpp | 4 +- src/mame/drivers/abc80x.cpp | 26 +- src/mame/drivers/accomm.cpp | 12 +- src/mame/drivers/ace.cpp | 30 +- src/mame/drivers/acefruit.cpp | 10 +- src/mame/drivers/aces1.cpp | 6 +- src/mame/drivers/acommand.cpp | 16 +- src/mame/drivers/actfancr.cpp | 6 +- src/mame/drivers/adam.cpp | 34 +- src/mame/drivers/adp.cpp | 4 +- src/mame/drivers/advision.cpp | 4 +- src/mame/drivers/aeroboto.cpp | 14 +- src/mame/drivers/aerofgt.cpp | 188 +++---- src/mame/drivers/agat.cpp | 30 +- src/mame/drivers/airbustr.cpp | 22 +- src/mame/drivers/airraid.cpp | 6 +- src/mame/drivers/ajax.cpp | 8 +- src/mame/drivers/albazc.cpp | 8 +- src/mame/drivers/albazg.cpp | 8 +- src/mame/drivers/aleck64.cpp | 4 +- src/mame/drivers/alesis.cpp | 18 +- src/mame/drivers/alg.cpp | 14 +- src/mame/drivers/alien.cpp | 4 +- src/mame/drivers/aliens.cpp | 6 +- src/mame/drivers/alinvade.cpp | 6 +- src/mame/drivers/alpha68k.cpp | 52 +- src/mame/drivers/alphasma.cpp | 10 +- src/mame/drivers/alphatpx.cpp | 30 +- src/mame/drivers/alphatro.cpp | 20 +- src/mame/drivers/altos2.cpp | 2 +- src/mame/drivers/altos486.cpp | 4 +- src/mame/drivers/altos5.cpp | 4 +- src/mame/drivers/altos8600.cpp | 38 +- src/mame/drivers/amaticmg.cpp | 14 +- src/mame/drivers/ambush.cpp | 4 +- src/mame/drivers/amerihok.cpp | 2 +- src/mame/drivers/amiga.cpp | 196 ++++---- src/mame/drivers/ampex.cpp | 18 +- src/mame/drivers/ampoker2.cpp | 18 +- src/mame/drivers/ampro.cpp | 4 +- src/mame/drivers/amspdwy.cpp | 12 +- src/mame/drivers/amstr_pc.cpp | 10 +- src/mame/drivers/amstrad.cpp | 2 +- src/mame/drivers/amusco.cpp | 6 +- src/mame/drivers/amust.cpp | 2 +- src/mame/drivers/anes.cpp | 4 +- src/mame/drivers/angelkds.cpp | 22 +- src/mame/drivers/apc.cpp | 14 +- src/mame/drivers/apf.cpp | 4 +- src/mame/drivers/apollo.cpp | 188 +++---- src/mame/drivers/apple1.cpp | 2 +- src/mame/drivers/apple2.cpp | 28 +- src/mame/drivers/apple2e.cpp | 124 ++--- src/mame/drivers/apple2gs.cpp | 2 +- src/mame/drivers/apple3.cpp | 2 +- src/mame/drivers/applix.cpp | 32 +- src/mame/drivers/appoooh.cpp | 20 +- src/mame/drivers/apricot.cpp | 18 +- src/mame/drivers/apricotf.cpp | 34 +- src/mame/drivers/apricotp.cpp | 16 +- src/mame/drivers/aquarium.cpp | 12 +- src/mame/drivers/aquarius.cpp | 14 +- src/mame/drivers/arabian.cpp | 4 +- src/mame/drivers/arachnid.cpp | 4 +- src/mame/drivers/arcadecl.cpp | 4 +- src/mame/drivers/arcadia.cpp | 2 +- src/mame/drivers/argo.cpp | 4 +- src/mame/drivers/argus.cpp | 46 +- src/mame/drivers/aristmk4.cpp | 42 +- src/mame/drivers/aristmk5.cpp | 54 +- src/mame/drivers/aristmk6.cpp | 10 +- src/mame/drivers/arkanoid.cpp | 26 +- src/mame/drivers/armedf.cpp | 124 ++--- src/mame/drivers/arsystems.cpp | 12 +- src/mame/drivers/artmagic.cpp | 16 +- src/mame/drivers/ashnojoe.cpp | 24 +- src/mame/drivers/asst128.cpp | 6 +- src/mame/drivers/asterix.cpp | 10 +- src/mame/drivers/asteroid.cpp | 34 +- src/mame/drivers/astinvad.cpp | 10 +- src/mame/drivers/astrafr.cpp | 8 +- src/mame/drivers/astrcorp.cpp | 44 +- src/mame/drivers/astrocde.cpp | 88 ++-- src/mame/drivers/astrof.cpp | 34 +- src/mame/drivers/astrohome.cpp | 6 +- src/mame/drivers/asuka.cpp | 20 +- src/mame/drivers/at.cpp | 12 +- src/mame/drivers/atari400.cpp | 21 +- src/mame/drivers/atari_s1.cpp | 38 +- src/mame/drivers/atari_s2.cpp | 28 +- src/mame/drivers/atarifb.cpp | 62 +-- src/mame/drivers/atarig1.cpp | 6 +- src/mame/drivers/atarig42.cpp | 8 +- src/mame/drivers/atarigt.cpp | 20 +- src/mame/drivers/atarigx2.cpp | 12 +- src/mame/drivers/atarist.cpp | 116 ++--- src/mame/drivers/atarisy1.cpp | 20 +- src/mame/drivers/atarisy2.cpp | 44 +- src/mame/drivers/atarisy4.cpp | 16 +- src/mame/drivers/atetris.cpp | 34 +- src/mame/drivers/atlantis.cpp | 16 +- src/mame/drivers/atm.cpp | 10 +- src/mame/drivers/atom.cpp | 10 +- src/mame/drivers/att4425.cpp | 6 +- src/mame/drivers/attache.cpp | 22 +- src/mame/drivers/attckufo.cpp | 4 +- src/mame/drivers/atvtrack.cpp | 16 +- src/mame/drivers/aussiebyte.cpp | 40 +- src/mame/drivers/avalnche.cpp | 4 +- src/mame/drivers/avigo.cpp | 20 +- src/mame/drivers/avt.cpp | 8 +- src/mame/drivers/ax20.cpp | 6 +- src/mame/drivers/aztarac.cpp | 12 +- src/mame/drivers/b16.cpp | 10 +- src/mame/drivers/b2m.cpp | 8 +- src/mame/drivers/backfire.cpp | 18 +- src/mame/drivers/badlands.cpp | 12 +- src/mame/drivers/badlandsbl.cpp | 12 +- src/mame/drivers/bagman.cpp | 12 +- src/mame/drivers/balsente.cpp | 34 +- src/mame/drivers/banctec.cpp | 2 +- src/mame/drivers/bankp.cpp | 18 +- src/mame/drivers/baraduke.cpp | 22 +- src/mame/drivers/bartop52.cpp | 3 +- src/mame/drivers/batman.cpp | 2 +- src/mame/drivers/battlane.cpp | 16 +- src/mame/drivers/battlera.cpp | 8 +- src/mame/drivers/battlex.cpp | 12 +- src/mame/drivers/battlnts.cpp | 6 +- src/mame/drivers/bbc.cpp | 154 +++--- src/mame/drivers/bbcbc.cpp | 4 +- src/mame/drivers/bbusters.cpp | 32 +- src/mame/drivers/bcs3.cpp | 8 +- src/mame/drivers/beaminv.cpp | 6 +- src/mame/drivers/beathead.cpp | 20 +- src/mame/drivers/bebox.cpp | 26 +- src/mame/drivers/beehive.cpp | 4 +- src/mame/drivers/beezer.cpp | 8 +- src/mame/drivers/berzerk.cpp | 20 +- src/mame/drivers/besta.cpp | 2 +- src/mame/drivers/bestleag.cpp | 8 +- src/mame/drivers/bfcobra.cpp | 16 +- src/mame/drivers/bfm_sc1.cpp | 38 +- src/mame/drivers/bfm_sc2.cpp | 82 +-- src/mame/drivers/bfm_sc4.cpp | 6 +- src/mame/drivers/bfm_sc5.cpp | 8 +- src/mame/drivers/bfm_swp.cpp | 2 +- src/mame/drivers/bfmsys85.cpp | 22 +- src/mame/drivers/big10.cpp | 2 +- src/mame/drivers/bigbord2.cpp | 8 +- src/mame/drivers/bigevglf.cpp | 34 +- src/mame/drivers/bigstrkb.cpp | 6 +- src/mame/drivers/binbug.cpp | 4 +- src/mame/drivers/bingoc.cpp | 6 +- src/mame/drivers/bingor.cpp | 6 +- src/mame/drivers/bionicc.cpp | 14 +- src/mame/drivers/bishi.cpp | 8 +- src/mame/drivers/bitgraph.cpp | 26 +- src/mame/drivers/bk.cpp | 20 +- src/mame/drivers/bking.cpp | 66 +-- src/mame/drivers/blackt96.cpp | 10 +- src/mame/drivers/bladestl.cpp | 8 +- src/mame/drivers/blitz68k.cpp | 238 ++++----- src/mame/drivers/blktiger.cpp | 38 +- src/mame/drivers/blmbycar.cpp | 16 +- src/mame/drivers/blockade.cpp | 10 +- src/mame/drivers/blockhl.cpp | 4 +- src/mame/drivers/blockout.cpp | 20 +- src/mame/drivers/bloodbro.cpp | 18 +- src/mame/drivers/blstroid.cpp | 6 +- src/mame/drivers/blueprnt.cpp | 14 +- src/mame/drivers/bmcbowl.cpp | 6 +- src/mame/drivers/bmcpokr.cpp | 40 +- src/mame/drivers/bmjr.cpp | 16 +- src/mame/drivers/bml3.cpp | 36 +- src/mame/drivers/bnstars.cpp | 24 +- src/mame/drivers/bob85.cpp | 4 +- src/mame/drivers/bogeyman.cpp | 12 +- src/mame/drivers/bombjack.cpp | 12 +- src/mame/drivers/boogwing.cpp | 4 +- src/mame/drivers/bottom9.cpp | 16 +- src/mame/drivers/bowltry.cpp | 2 +- src/mame/drivers/boxer.cpp | 16 +- src/mame/drivers/bpmmicro.cpp | 14 +- src/mame/drivers/brkthru.cpp | 16 +- src/mame/drivers/bsktball.cpp | 8 +- src/mame/drivers/btime.cpp | 68 +-- src/mame/drivers/btoads.cpp | 32 +- src/mame/drivers/bublbobl.cpp | 48 +- src/mame/drivers/buggychl.cpp | 22 +- src/mame/drivers/bullet.cpp | 38 +- src/mame/drivers/busicom.cpp | 10 +- src/mame/drivers/buster.cpp | 2 +- src/mame/drivers/bw12.cpp | 12 +- src/mame/drivers/bw2.cpp | 4 +- src/mame/drivers/bwidow.cpp | 16 +- src/mame/drivers/bwing.cpp | 24 +- src/mame/drivers/by17.cpp | 2 +- src/mame/drivers/by35.cpp | 2 +- src/mame/drivers/by6803.cpp | 4 +- src/mame/drivers/byvid.cpp | 30 +- src/mame/drivers/bzone.cpp | 6 +- src/mame/drivers/c128.cpp | 10 +- src/mame/drivers/c64.cpp | 6 +- src/mame/drivers/c65.cpp | 16 +- src/mame/drivers/c900.cpp | 4 +- src/mame/drivers/cabal.cpp | 32 +- src/mame/drivers/cabaret.cpp | 8 +- src/mame/drivers/calchase.cpp | 22 +- src/mame/drivers/calcune.cpp | 6 +- src/mame/drivers/calomega.cpp | 16 +- src/mame/drivers/calorie.cpp | 10 +- src/mame/drivers/camplynx.cpp | 22 +- src/mame/drivers/candela.cpp | 2 +- src/mame/drivers/canyon.cpp | 12 +- src/mame/drivers/capbowl.cpp | 26 +- src/mame/drivers/cardline.cpp | 10 +- src/mame/drivers/carjmbre.cpp | 8 +- src/mame/drivers/carpolo.cpp | 28 +- src/mame/drivers/casloopy.cpp | 12 +- src/mame/drivers/caswin.cpp | 14 +- src/mame/drivers/cat.cpp | 42 +- src/mame/drivers/cave.cpp | 468 ++++++++--------- src/mame/drivers/cb2001.cpp | 8 +- src/mame/drivers/cball.cpp | 6 +- src/mame/drivers/cbasebal.cpp | 12 +- src/mame/drivers/cbm2.cpp | 10 +- src/mame/drivers/cbuster.cpp | 6 +- src/mame/drivers/cc40.cpp | 14 +- src/mame/drivers/ccastles.cpp | 22 +- src/mame/drivers/cchance.cpp | 4 +- src/mame/drivers/cchasm.cpp | 12 +- src/mame/drivers/cclimber.cpp | 22 +- src/mame/drivers/ccs2810.cpp | 12 +- src/mame/drivers/ccs300.cpp | 2 +- src/mame/drivers/cd2650.cpp | 2 +- src/mame/drivers/cdc721.cpp | 8 +- src/mame/drivers/cdi.cpp | 4 +- src/mame/drivers/cedar_magnet.cpp | 24 +- src/mame/drivers/centiped.cpp | 82 +-- src/mame/drivers/cesclass.cpp | 8 +- src/mame/drivers/cgc7900.cpp | 22 +- src/mame/drivers/cgenie.cpp | 6 +- src/mame/drivers/chaknpop.cpp | 12 +- src/mame/drivers/cham24.cpp | 8 +- src/mame/drivers/champbas.cpp | 10 +- src/mame/drivers/champbwl.cpp | 8 +- src/mame/drivers/chanbara.cpp | 8 +- src/mame/drivers/chance32.cpp | 10 +- src/mame/drivers/changela.cpp | 26 +- src/mame/drivers/channelf.cpp | 8 +- src/mame/drivers/chaos.cpp | 8 +- src/mame/drivers/cheekyms.cpp | 4 +- src/mame/drivers/chessmst.cpp | 2 +- src/mame/drivers/chesstrv.cpp | 16 +- src/mame/drivers/chexx.cpp | 8 +- src/mame/drivers/chihiro.cpp | 2 +- src/mame/drivers/chinagat.cpp | 16 +- src/mame/drivers/chinsan.cpp | 6 +- src/mame/drivers/chqflag.cpp | 16 +- src/mame/drivers/chsuper.cpp | 8 +- src/mame/drivers/cidelsa.cpp | 8 +- src/mame/drivers/cinemat.cpp | 12 +- src/mame/drivers/circus.cpp | 10 +- src/mame/drivers/circusc.cpp | 14 +- src/mame/drivers/cischeat.cpp | 110 ++-- src/mame/drivers/cit101.cpp | 8 +- src/mame/drivers/citycon.cpp | 8 +- src/mame/drivers/ckz80.cpp | 4 +- src/mame/drivers/clayshoo.cpp | 2 +- src/mame/drivers/clcd.cpp | 44 +- src/mame/drivers/cliffhgr.cpp | 26 +- src/mame/drivers/cloak.cpp | 18 +- src/mame/drivers/cloud9.cpp | 16 +- src/mame/drivers/clpoker.cpp | 2 +- src/mame/drivers/clshroad.cpp | 6 +- src/mame/drivers/cm1800.cpp | 2 +- src/mame/drivers/cmi.cpp | 26 +- src/mame/drivers/cmmb.cpp | 8 +- src/mame/drivers/cninja.cpp | 42 +- src/mame/drivers/cntsteer.cpp | 40 +- src/mame/drivers/cobra.cpp | 38 +- src/mame/drivers/coco12.cpp | 2 +- src/mame/drivers/coco3.cpp | 14 +- src/mame/drivers/cocoloco.cpp | 8 +- src/mame/drivers/coinmstr.cpp | 32 +- src/mame/drivers/coleco.cpp | 14 +- src/mame/drivers/combatsc.cpp | 36 +- src/mame/drivers/commando.cpp | 14 +- src/mame/drivers/compc.cpp | 4 +- src/mame/drivers/compgolf.cpp | 6 +- src/mame/drivers/compis.cpp | 18 +- src/mame/drivers/comx35.cpp | 4 +- src/mame/drivers/concept.cpp | 2 +- src/mame/drivers/contra.cpp | 24 +- src/mame/drivers/coolpool.cpp | 28 +- src/mame/drivers/coolridr.cpp | 24 +- src/mame/drivers/cop01.cpp | 24 +- src/mame/drivers/cops.cpp | 22 +- src/mame/drivers/copsnrob.cpp | 4 +- src/mame/drivers/corona.cpp | 80 +-- src/mame/drivers/cortex.cpp | 10 +- src/mame/drivers/cosmic.cpp | 30 +- src/mame/drivers/cosmicos.cpp | 12 +- src/mame/drivers/cp1.cpp | 2 +- src/mame/drivers/cps1.cpp | 80 +-- src/mame/drivers/cps2.cpp | 48 +- src/mame/drivers/cps3.cpp | 74 +-- src/mame/drivers/craft.cpp | 2 +- src/mame/drivers/crbaloon.cpp | 12 +- src/mame/drivers/crgolf.cpp | 14 +- src/mame/drivers/crimfght.cpp | 6 +- src/mame/drivers/crospang.cpp | 32 +- src/mame/drivers/crshrace.cpp | 10 +- src/mame/drivers/crvision.cpp | 26 +- src/mame/drivers/crystal.cpp | 74 +-- src/mame/drivers/csplayh5.cpp | 14 +- src/mame/drivers/cswat.cpp | 10 +- src/mame/drivers/cubeqst.cpp | 16 +- src/mame/drivers/cubo.cpp | 4 +- src/mame/drivers/cultures.cpp | 8 +- src/mame/drivers/cupidon.cpp | 2 +- src/mame/drivers/cv1k.cpp | 10 +- src/mame/drivers/cvicny.cpp | 6 +- src/mame/drivers/cvs.cpp | 32 +- src/mame/drivers/cxgz80.cpp | 4 +- src/mame/drivers/cxhumax.cpp | 66 +-- src/mame/drivers/cyberbal.cpp | 26 +- src/mame/drivers/cybertnk.cpp | 18 +- src/mame/drivers/cybiko.cpp | 34 +- src/mame/drivers/cybstorm.cpp | 4 +- src/mame/drivers/cyclemb.cpp | 14 +- src/mame/drivers/cz101.cpp | 10 +- src/mame/drivers/czk80.cpp | 6 +- src/mame/drivers/d6809.cpp | 2 +- src/mame/drivers/d9final.cpp | 10 +- src/mame/drivers/dacholer.cpp | 22 +- src/mame/drivers/dai.cpp | 8 +- src/mame/drivers/dai3wksi.cpp | 6 +- src/mame/drivers/dambustr.cpp | 22 +- src/mame/drivers/darius.cpp | 32 +- src/mame/drivers/darkmist.cpp | 4 +- src/mame/drivers/darkseal.cpp | 6 +- src/mame/drivers/daruma.cpp | 6 +- src/mame/drivers/dassault.cpp | 12 +- src/mame/drivers/dblcrown.cpp | 16 +- src/mame/drivers/dblewing.cpp | 4 +- src/mame/drivers/dbox.cpp | 8 +- src/mame/drivers/dbz.cpp | 10 +- src/mame/drivers/dccons.cpp | 20 +- src/mame/drivers/dcheese.cpp | 16 +- src/mame/drivers/dcon.cpp | 12 +- src/mame/drivers/dday.cpp | 12 +- src/mame/drivers/ddayjlc.cpp | 26 +- src/mame/drivers/ddealer.cpp | 6 +- src/mame/drivers/ddenlovr.cpp | 942 +++++++++++++++++------------------ src/mame/drivers/ddragon.cpp | 32 +- src/mame/drivers/ddragon3.cpp | 56 +-- src/mame/drivers/ddribble.cpp | 16 +- src/mame/drivers/de_2.cpp | 8 +- src/mame/drivers/deadang.cpp | 10 +- src/mame/drivers/dec0.cpp | 48 +- src/mame/drivers/dec8.cpp | 254 +++++----- src/mame/drivers/deco156.cpp | 16 +- src/mame/drivers/deco32.cpp | 202 ++++---- src/mame/drivers/deco_ld.cpp | 6 +- src/mame/drivers/deco_mlc.cpp | 42 +- src/mame/drivers/decocass.cpp | 74 +-- src/mame/drivers/dectalk.cpp | 16 +- src/mame/drivers/decwritr.cpp | 6 +- src/mame/drivers/deniam.cpp | 24 +- src/mame/drivers/deshoros.cpp | 12 +- src/mame/drivers/destroyr.cpp | 10 +- src/mame/drivers/dfruit.cpp | 18 +- src/mame/drivers/dgn_beta.cpp | 6 +- src/mame/drivers/dgpix.cpp | 10 +- src/mame/drivers/dietgo.cpp | 2 +- src/mame/drivers/digel804.cpp | 66 +-- src/mame/drivers/dim68k.cpp | 18 +- src/mame/drivers/discoboy.cpp | 12 +- src/mame/drivers/divebomb.cpp | 30 +- src/mame/drivers/diverboy.cpp | 4 +- src/mame/drivers/djboy.cpp | 20 +- src/mame/drivers/djmain.cpp | 40 +- src/mame/drivers/dkong.cpp | 86 ++-- src/mame/drivers/dlair.cpp | 20 +- src/mame/drivers/dm7000.cpp | 12 +- src/mame/drivers/dmax8000.cpp | 4 +- src/mame/drivers/dmndrby.cpp | 6 +- src/mame/drivers/dms5000.cpp | 4 +- src/mame/drivers/dms86.cpp | 6 +- src/mame/drivers/dmv.cpp | 30 +- src/mame/drivers/docastle.cpp | 52 +- src/mame/drivers/dogfgt.cpp | 18 +- src/mame/drivers/dolphunk.cpp | 6 +- src/mame/drivers/dominob.cpp | 4 +- src/mame/drivers/dooyong.cpp | 44 +- src/mame/drivers/dorachan.cpp | 8 +- src/mame/drivers/dotrikun.cpp | 4 +- src/mame/drivers/dps1.cpp | 16 +- src/mame/drivers/dragrace.cpp | 6 +- src/mame/drivers/dreambal.cpp | 4 +- src/mame/drivers/dreamwld.cpp | 12 +- src/mame/drivers/drgnmst.cpp | 14 +- src/mame/drivers/dribling.cpp | 4 +- src/mame/drivers/drmicro.cpp | 12 +- src/mame/drivers/drtomy.cpp | 6 +- src/mame/drivers/drw80pkr.cpp | 2 +- src/mame/drivers/dsb46.cpp | 2 +- src/mame/drivers/dual68.cpp | 2 +- src/mame/drivers/duet16.cpp | 18 +- src/mame/drivers/dunhuang.cpp | 38 +- src/mame/drivers/dvk_kcgd.cpp | 12 +- src/mame/drivers/dwarfd.cpp | 12 +- src/mame/drivers/dynadice.cpp | 6 +- src/mame/drivers/dynamoah.cpp | 2 +- src/mame/drivers/dynax.cpp | 494 +++++++++--------- src/mame/drivers/dynduke.cpp | 14 +- src/mame/drivers/e100.cpp | 2 +- src/mame/drivers/ec184x.cpp | 2 +- src/mame/drivers/ecoinf3.cpp | 2 +- src/mame/drivers/ecoinfr.cpp | 48 +- src/mame/drivers/efdt.cpp | 2 +- src/mame/drivers/egghunt.cpp | 12 +- src/mame/drivers/einstein.cpp | 22 +- src/mame/drivers/electron.cpp | 14 +- src/mame/drivers/elekscmp.cpp | 4 +- src/mame/drivers/elf.cpp | 4 +- src/mame/drivers/elwro800.cpp | 8 +- src/mame/drivers/embargo.cpp | 6 +- src/mame/drivers/enigma2.cpp | 12 +- src/mame/drivers/eolith.cpp | 10 +- src/mame/drivers/eolith16.cpp | 4 +- src/mame/drivers/ep64.cpp | 8 +- src/mame/drivers/epos.cpp | 6 +- src/mame/drivers/eprom.cpp | 28 +- src/mame/drivers/equites.cpp | 34 +- src/mame/drivers/ertictac.cpp | 14 +- src/mame/drivers/esd16.cpp | 28 +- src/mame/drivers/esh.cpp | 8 +- src/mame/drivers/espial.cpp | 30 +- src/mame/drivers/esq1.cpp | 8 +- src/mame/drivers/esq5505.cpp | 24 +- src/mame/drivers/esripsys.cpp | 28 +- src/mame/drivers/et3400.cpp | 4 +- src/mame/drivers/eti660.cpp | 4 +- src/mame/drivers/ettrivia.cpp | 12 +- src/mame/drivers/eurocom2.cpp | 6 +- src/mame/drivers/europc.cpp | 6 +- src/mame/drivers/evmbug.cpp | 4 +- src/mame/drivers/excali64.cpp | 16 +- src/mame/drivers/exedexes.cpp | 12 +- src/mame/drivers/exelv.cpp | 6 +- src/mame/drivers/exerion.cpp | 8 +- src/mame/drivers/exidy.cpp | 22 +- src/mame/drivers/exidy440.cpp | 22 +- src/mame/drivers/expro02.cpp | 42 +- src/mame/drivers/exprraid.cpp | 20 +- src/mame/drivers/exterm.cpp | 22 +- src/mame/drivers/exzisus.cpp | 8 +- src/mame/drivers/f-32.cpp | 2 +- src/mame/drivers/f1gp.cpp | 46 +- src/mame/drivers/famibox.cpp | 8 +- src/mame/drivers/fantland.cpp | 24 +- src/mame/drivers/fanucspmg.cpp | 22 +- src/mame/drivers/fastfred.cpp | 22 +- src/mame/drivers/fastinvaders.cpp | 40 +- src/mame/drivers/fastlane.cpp | 12 +- src/mame/drivers/fc100.cpp | 16 +- src/mame/drivers/fccpu30.cpp | 10 +- src/mame/drivers/fcombat.cpp | 20 +- src/mame/drivers/fcrash.cpp | 164 +++--- src/mame/drivers/feversoc.cpp | 8 +- src/mame/drivers/fgoal.cpp | 36 +- src/mame/drivers/fidel6502.cpp | 72 +-- src/mame/drivers/fidel68k.cpp | 50 +- src/mame/drivers/fidelz80.cpp | 14 +- src/mame/drivers/finalizr.cpp | 12 +- src/mame/drivers/fireball.cpp | 8 +- src/mame/drivers/firebeat.cpp | 34 +- src/mame/drivers/firefox.cpp | 26 +- src/mame/drivers/firetrap.cpp | 34 +- src/mame/drivers/firetrk.cpp | 66 +-- src/mame/drivers/fitfight.cpp | 16 +- src/mame/drivers/fk1.cpp | 6 +- src/mame/drivers/flicker.cpp | 8 +- src/mame/drivers/flipjack.cpp | 8 +- src/mame/drivers/flkatck.cpp | 10 +- src/mame/drivers/flower.cpp | 12 +- src/mame/drivers/flstory.cpp | 34 +- src/mame/drivers/flyball.cpp | 20 +- src/mame/drivers/fm7.cpp | 312 ++++++------ src/mame/drivers/fmtowns.cpp | 144 +++--- src/mame/drivers/fontwriter.cpp | 2 +- src/mame/drivers/foodf.cpp | 6 +- src/mame/drivers/force68k.cpp | 8 +- src/mame/drivers/forte2.cpp | 8 +- src/mame/drivers/fp1100.cpp | 18 +- src/mame/drivers/fp200.cpp | 2 +- src/mame/drivers/fp6000.cpp | 14 +- src/mame/drivers/freekick.cpp | 58 +-- src/mame/drivers/fresh.cpp | 18 +- src/mame/drivers/fromanc2.cpp | 80 +-- src/mame/drivers/fromance.cpp | 54 +- src/mame/drivers/fruitpc.cpp | 6 +- src/mame/drivers/ft68m.cpp | 2 +- src/mame/drivers/funkball.cpp | 16 +- src/mame/drivers/funkybee.cpp | 8 +- src/mame/drivers/funkyjet.cpp | 2 +- src/mame/drivers/funtech.cpp | 14 +- src/mame/drivers/funworld.cpp | 46 +- src/mame/drivers/funybubl.cpp | 10 +- src/mame/drivers/fuukifg2.cpp | 16 +- src/mame/drivers/fuukifg3.cpp | 14 +- src/mame/drivers/g627.cpp | 4 +- src/mame/drivers/gaelco.cpp | 18 +- src/mame/drivers/gaelco2.cpp | 50 +- src/mame/drivers/gaelco3d.cpp | 26 +- src/mame/drivers/gaiden.cpp | 72 +-- src/mame/drivers/gal3.cpp | 14 +- src/mame/drivers/galaga.cpp | 40 +- src/mame/drivers/galastrm.cpp | 6 +- src/mame/drivers/galaxi.cpp | 32 +- src/mame/drivers/galaxia.cpp | 10 +- src/mame/drivers/galaxian.cpp | 402 +++++++-------- src/mame/drivers/galaxold.cpp | 338 ++++++------- src/mame/drivers/galaxy.cpp | 8 +- src/mame/drivers/galeb.cpp | 8 +- src/mame/drivers/galgame.cpp | 8 +- src/mame/drivers/galgames.cpp | 20 +- src/mame/drivers/galivan.cpp | 26 +- src/mame/drivers/galpani2.cpp | 16 +- src/mame/drivers/galpani3.cpp | 8 +- src/mame/drivers/galpanic.cpp | 6 +- src/mame/drivers/galspnbl.cpp | 2 +- src/mame/drivers/gamate.cpp | 12 +- src/mame/drivers/gambl186.cpp | 6 +- src/mame/drivers/gamecom.cpp | 4 +- src/mame/drivers/gamecstl.cpp | 10 +- src/mame/drivers/gameking.cpp | 4 +- src/mame/drivers/gamemasters.cpp | 8 +- src/mame/drivers/gamtor.cpp | 2 +- src/mame/drivers/gaplus.cpp | 18 +- src/mame/drivers/gatron.cpp | 6 +- src/mame/drivers/gauntlet.cpp | 10 +- src/mame/drivers/gb.cpp | 50 +- src/mame/drivers/gba.cpp | 6 +- src/mame/drivers/gberet.cpp | 42 +- src/mame/drivers/gcpinbal.cpp | 14 +- src/mame/drivers/gei.cpp | 132 ++--- src/mame/drivers/geneve.cpp | 4 +- src/mame/drivers/geniusiq.cpp | 22 +- src/mame/drivers/ggconnie.cpp | 6 +- src/mame/drivers/ghosteo.cpp | 2 +- src/mame/drivers/giclassic.cpp | 6 +- src/mame/drivers/gijoe.cpp | 4 +- src/mame/drivers/gimix.cpp | 10 +- src/mame/drivers/ginganin.cpp | 6 +- src/mame/drivers/gkigt.cpp | 24 +- src/mame/drivers/gladiatr.cpp | 44 +- src/mame/drivers/glasgow.cpp | 26 +- src/mame/drivers/glass.cpp | 26 +- src/mame/drivers/globalfr.cpp | 2 +- src/mame/drivers/gluck2.cpp | 6 +- src/mame/drivers/gmaster.cpp | 2 +- src/mame/drivers/gng.cpp | 22 +- src/mame/drivers/go2000.cpp | 6 +- src/mame/drivers/goal92.cpp | 16 +- src/mame/drivers/goindol.cpp | 16 +- src/mame/drivers/goldngam.cpp | 2 +- src/mame/drivers/goldnpkr.cpp | 48 +- src/mame/drivers/goldstar.cpp | 294 +++++------ src/mame/drivers/gomoku.cpp | 8 +- src/mame/drivers/good.cpp | 4 +- src/mame/drivers/goodejan.cpp | 14 +- src/mame/drivers/gotcha.cpp | 14 +- src/mame/drivers/gottlieb.cpp | 24 +- src/mame/drivers/gotya.cpp | 8 +- src/mame/drivers/goupil.cpp | 2 +- src/mame/drivers/gp2x.cpp | 14 +- src/mame/drivers/gp32.cpp | 38 +- src/mame/drivers/gpworld.cpp | 10 +- src/mame/drivers/gradius3.cpp | 24 +- src/mame/drivers/grchamp.cpp | 30 +- src/mame/drivers/gridcomp.cpp | 4 +- src/mame/drivers/gridlee.cpp | 8 +- src/mame/drivers/groundfx.cpp | 4 +- src/mame/drivers/gstream.cpp | 34 +- src/mame/drivers/gstriker.cpp | 2 +- src/mame/drivers/gsword.cpp | 24 +- src/mame/drivers/gticlub.cpp | 30 +- src/mame/drivers/gts1.cpp | 2 +- src/mame/drivers/gts3.cpp | 2 +- src/mame/drivers/gts3a.cpp | 6 +- src/mame/drivers/guab.cpp | 2 +- src/mame/drivers/gumbo.cpp | 12 +- src/mame/drivers/gunbustr.cpp | 4 +- src/mame/drivers/gundealr.cpp | 16 +- src/mame/drivers/gunpey.cpp | 16 +- src/mame/drivers/gunsmoke.cpp | 10 +- src/mame/drivers/gyruss.cpp | 10 +- src/mame/drivers/h19.cpp | 8 +- src/mame/drivers/h8.cpp | 4 +- src/mame/drivers/h89.cpp | 2 +- src/mame/drivers/halleys.cpp | 20 +- src/mame/drivers/hanaawas.cpp | 10 +- src/mame/drivers/harddriv.cpp | 102 ++-- src/mame/drivers/harriet.cpp | 4 +- src/mame/drivers/hazeltin.cpp | 12 +- src/mame/drivers/hcastle.cpp | 18 +- src/mame/drivers/headonb.cpp | 2 +- src/mame/drivers/hec2hrp.cpp | 54 +- src/mame/drivers/hexion.cpp | 20 +- src/mame/drivers/hh_cop400.cpp | 4 +- src/mame/drivers/higemaru.cpp | 6 +- src/mame/drivers/highvdeo.cpp | 120 ++--- src/mame/drivers/himesiki.cpp | 8 +- src/mame/drivers/hitme.cpp | 26 +- src/mame/drivers/hitpoker.cpp | 16 +- src/mame/drivers/hk68v10.cpp | 4 +- src/mame/drivers/hnayayoi.cpp | 48 +- src/mame/drivers/hng64.cpp | 38 +- src/mame/drivers/holeland.cpp | 10 +- src/mame/drivers/homedata.cpp | 72 +-- src/mame/drivers/homelab.cpp | 16 +- src/mame/drivers/homerun.cpp | 8 +- src/mame/drivers/homez80.cpp | 2 +- src/mame/drivers/horizon.cpp | 2 +- src/mame/drivers/hornet.cpp | 32 +- src/mame/drivers/hotblock.cpp | 6 +- src/mame/drivers/hp16500.cpp | 64 +-- src/mame/drivers/hp2620.cpp | 10 +- src/mame/drivers/hp2640.cpp | 24 +- src/mame/drivers/hp64k.cpp | 36 +- src/mame/drivers/hp80.cpp | 26 +- src/mame/drivers/hp9845.cpp | 6 +- src/mame/drivers/hp9k.cpp | 18 +- src/mame/drivers/hp9k_3xx.cpp | 30 +- src/mame/drivers/hp_ipc.cpp | 14 +- src/mame/drivers/hpz80unk.cpp | 10 +- src/mame/drivers/ht6000.cpp | 24 +- src/mame/drivers/huebler.cpp | 2 +- src/mame/drivers/hunter2.cpp | 16 +- src/mame/drivers/hvyunit.cpp | 22 +- src/mame/drivers/hx20.cpp | 24 +- src/mame/drivers/hyhoo.cpp | 6 +- src/mame/drivers/hyperscan.cpp | 2 +- src/mame/drivers/hyperspt.cpp | 10 +- src/mame/drivers/hyprduel.cpp | 8 +- src/mame/drivers/ibm6580.cpp | 10 +- src/mame/drivers/ibmpcjr.cpp | 8 +- src/mame/drivers/icatel.cpp | 10 +- src/mame/drivers/icecold.cpp | 2 +- src/mame/drivers/idsa.cpp | 6 +- src/mame/drivers/igs009.cpp | 38 +- src/mame/drivers/igs011.cpp | 374 +++++++------- src/mame/drivers/igs017.cpp | 30 +- src/mame/drivers/igspoker.cpp | 42 +- src/mame/drivers/ikki.cpp | 10 +- src/mame/drivers/imds2.cpp | 42 +- src/mame/drivers/imolagp.cpp | 16 +- src/mame/drivers/imsai.cpp | 10 +- src/mame/drivers/inder.cpp | 42 +- src/mame/drivers/inderp.cpp | 2 +- src/mame/drivers/indigo.cpp | 4 +- src/mame/drivers/indy_indigo2.cpp | 4 +- src/mame/drivers/instantm.cpp | 4 +- src/mame/drivers/instruct.cpp | 18 +- src/mame/drivers/intellec4.cpp | 18 +- src/mame/drivers/interact.cpp | 12 +- src/mame/drivers/interpro.cpp | 20 +- src/mame/drivers/intv.cpp | 62 +-- src/mame/drivers/inufuku.cpp | 10 +- src/mame/drivers/invqix.cpp | 14 +- src/mame/drivers/ipds.cpp | 6 +- src/mame/drivers/iq151.cpp | 6 +- src/mame/drivers/iqblock.cpp | 8 +- src/mame/drivers/iris3130.cpp | 28 +- src/mame/drivers/irisha.cpp | 2 +- src/mame/drivers/irobot.cpp | 24 +- src/mame/drivers/ironhors.cpp | 30 +- src/mame/drivers/isbc.cpp | 12 +- src/mame/drivers/istellar.cpp | 4 +- src/mame/drivers/istrebiteli.cpp | 12 +- src/mame/drivers/itech32.cpp | 82 +-- src/mame/drivers/itech8.cpp | 66 +-- src/mame/drivers/itt3030.cpp | 10 +- src/mame/drivers/jack.cpp | 18 +- src/mame/drivers/jackal.cpp | 12 +- src/mame/drivers/jackie.cpp | 28 +- src/mame/drivers/jackpool.cpp | 2 +- src/mame/drivers/jaguar.cpp | 200 ++++---- src/mame/drivers/jailbrek.cpp | 14 +- src/mame/drivers/jalmah.cpp | 38 +- src/mame/drivers/jangou.cpp | 24 +- src/mame/drivers/jankenmn.cpp | 2 +- src/mame/drivers/jantotsu.cpp | 12 +- src/mame/drivers/jchan.cpp | 10 +- src/mame/drivers/jclub2.cpp | 62 +-- src/mame/drivers/jedi.cpp | 16 +- src/mame/drivers/jeutel.cpp | 2 +- src/mame/drivers/joctronic.cpp | 50 +- src/mame/drivers/jokrwild.cpp | 6 +- src/mame/drivers/jollyjgr.cpp | 16 +- src/mame/drivers/jongkyo.cpp | 10 +- src/mame/drivers/jonos.cpp | 4 +- src/mame/drivers/joystand.cpp | 24 +- src/mame/drivers/jp.cpp | 8 +- src/mame/drivers/jpmimpct.cpp | 52 +- src/mame/drivers/jpmsys5.cpp | 16 +- src/mame/drivers/jr100.cpp | 2 +- src/mame/drivers/jr200.cpp | 8 +- src/mame/drivers/jrpacman.cpp | 6 +- src/mame/drivers/jtc.cpp | 4 +- src/mame/drivers/jubilee.cpp | 8 +- src/mame/drivers/juicebox.cpp | 4 +- src/mame/drivers/junofrst.cpp | 10 +- src/mame/drivers/jupace.cpp | 20 +- src/mame/drivers/jupiter.cpp | 6 +- src/mame/drivers/k1003.cpp | 10 +- src/mame/drivers/k8915.cpp | 2 +- src/mame/drivers/kaneko16.cpp | 76 +-- src/mame/drivers/kangaroo.cpp | 6 +- src/mame/drivers/karnov.cpp | 10 +- src/mame/drivers/kas89.cpp | 14 +- src/mame/drivers/kaypro.cpp | 14 +- src/mame/drivers/kc.cpp | 8 +- src/mame/drivers/kchamp.cpp | 16 +- src/mame/drivers/kdt6.cpp | 80 +-- src/mame/drivers/kickgoal.cpp | 12 +- src/mame/drivers/kingdrby.cpp | 8 +- src/mame/drivers/kingobox.cpp | 36 +- src/mame/drivers/kingpin.cpp | 6 +- src/mame/drivers/kinst.cpp | 6 +- src/mame/drivers/klax.cpp | 8 +- src/mame/drivers/kncljoe.cpp | 18 +- src/mame/drivers/koftball.cpp | 14 +- src/mame/drivers/koikoi.cpp | 4 +- src/mame/drivers/konamigq.cpp | 8 +- src/mame/drivers/konamigv.cpp | 18 +- src/mame/drivers/konamigx.cpp | 30 +- src/mame/drivers/konamim2.cpp | 48 +- src/mame/drivers/konblands.cpp | 22 +- src/mame/drivers/konendev.cpp | 16 +- src/mame/drivers/konin.cpp | 2 +- src/mame/drivers/konmedal.cpp | 28 +- src/mame/drivers/konmedal68k.cpp | 6 +- src/mame/drivers/kontest.cpp | 6 +- src/mame/drivers/kopunch.cpp | 4 +- src/mame/drivers/kron.cpp | 16 +- src/mame/drivers/ksayakyu.cpp | 16 +- src/mame/drivers/ksys573.cpp | 14 +- src/mame/drivers/kungfur.cpp | 4 +- src/mame/drivers/kurukuru.cpp | 20 +- src/mame/drivers/kyocera.cpp | 32 +- src/mame/drivers/kyugo.cpp | 20 +- src/mame/drivers/labyrunr.cpp | 6 +- src/mame/drivers/ladybug.cpp | 20 +- src/mame/drivers/ladyfrog.cpp | 26 +- src/mame/drivers/laser3k.cpp | 8 +- src/mame/drivers/laserbas.cpp | 12 +- src/mame/drivers/laserbat.cpp | 18 +- src/mame/drivers/lasso.cpp | 50 +- src/mame/drivers/lastbank.cpp | 26 +- src/mame/drivers/lastduel.cpp | 30 +- src/mame/drivers/lastfght.cpp | 30 +- src/mame/drivers/lazercmd.cpp | 16 +- src/mame/drivers/lb186.cpp | 4 +- src/mame/drivers/lbeach.cpp | 8 +- src/mame/drivers/lcmate2.cpp | 6 +- src/mame/drivers/leapster.cpp | 4 +- src/mame/drivers/legionna.cpp | 76 +-- src/mame/drivers/leland.cpp | 48 +- src/mame/drivers/lemmings.cpp | 12 +- src/mame/drivers/lethal.cpp | 12 +- src/mame/drivers/lethalj.cpp | 4 +- src/mame/drivers/lft.cpp | 2 +- src/mame/drivers/lgp.cpp | 2 +- src/mame/drivers/liberate.cpp | 40 +- src/mame/drivers/liberatr.cpp | 28 +- src/mame/drivers/limenko.cpp | 18 +- src/mame/drivers/lisa.cpp | 6 +- src/mame/drivers/littlerb.cpp | 4 +- src/mame/drivers/lkage.cpp | 16 +- src/mame/drivers/llc.cpp | 4 +- src/mame/drivers/lockon.cpp | 34 +- src/mame/drivers/lola8a.cpp | 2 +- src/mame/drivers/looping.cpp | 12 +- src/mame/drivers/lordgun.cpp | 42 +- src/mame/drivers/lsasquad.cpp | 24 +- src/mame/drivers/ltcasino.cpp | 4 +- src/mame/drivers/ltd.cpp | 10 +- src/mame/drivers/luckgrln.cpp | 32 +- src/mame/drivers/lucky74.cpp | 32 +- src/mame/drivers/luckybal.cpp | 4 +- src/mame/drivers/lvcards.cpp | 16 +- src/mame/drivers/lviv.cpp | 2 +- src/mame/drivers/lwings.cpp | 64 +-- src/mame/drivers/lwriter.cpp | 6 +- src/mame/drivers/lynx.cpp | 2 +- src/mame/drivers/m10.cpp | 26 +- src/mame/drivers/m107.cpp | 14 +- src/mame/drivers/m14.cpp | 14 +- src/mame/drivers/m20.cpp | 4 +- src/mame/drivers/m24.cpp | 6 +- src/mame/drivers/m5.cpp | 46 +- src/mame/drivers/m52.cpp | 28 +- src/mame/drivers/m57.cpp | 4 +- src/mame/drivers/m58.cpp | 6 +- src/mame/drivers/m62.cpp | 122 ++--- src/mame/drivers/m63.cpp | 22 +- src/mame/drivers/m72.cpp | 140 +++--- src/mame/drivers/m79amb.cpp | 12 +- src/mame/drivers/m90.cpp | 14 +- src/mame/drivers/m92.cpp | 40 +- src/mame/drivers/mac.cpp | 266 +++++----- src/mame/drivers/mac128.cpp | 20 +- src/mame/drivers/macpci.cpp | 6 +- src/mame/drivers/macrossp.cpp | 16 +- src/mame/drivers/macs.cpp | 6 +- src/mame/drivers/madalien.cpp | 10 +- src/mame/drivers/magic10.cpp | 40 +- src/mame/drivers/magicard.cpp | 26 +- src/mame/drivers/magicfly.cpp | 8 +- src/mame/drivers/magictg.cpp | 18 +- src/mame/drivers/magmax.cpp | 6 +- src/mame/drivers/magnum.cpp | 6 +- src/mame/drivers/magtouch.cpp | 2 +- src/mame/drivers/mainevt.cpp | 28 +- src/mame/drivers/mainsnk.cpp | 8 +- src/mame/drivers/majorpkr.cpp | 24 +- src/mame/drivers/malzak.cpp | 20 +- src/mame/drivers/mappy.cpp | 14 +- src/mame/drivers/marineb.cpp | 10 +- src/mame/drivers/marinedt.cpp | 18 +- src/mame/drivers/mario.cpp | 20 +- src/mame/drivers/markham.cpp | 28 +- src/mame/drivers/mastboy.cpp | 10 +- src/mame/drivers/mastboyo.cpp | 6 +- src/mame/drivers/matmania.cpp | 14 +- src/mame/drivers/maxaflex.cpp | 3 +- src/mame/drivers/maygay1b.cpp | 44 +- src/mame/drivers/maygayv1.cpp | 8 +- src/mame/drivers/mazerbla.cpp | 32 +- src/mame/drivers/mbc200.cpp | 2 +- src/mame/drivers/mbc55x.cpp | 14 +- src/mame/drivers/mbee.cpp | 152 +++--- src/mame/drivers/mc10.cpp | 10 +- src/mame/drivers/mc1000.cpp | 10 +- src/mame/drivers/mc1502.cpp | 4 +- src/mame/drivers/mc8030.cpp | 6 +- src/mame/drivers/mcatadv.cpp | 10 +- src/mame/drivers/mcb216.cpp | 2 +- src/mame/drivers/mcr.cpp | 12 +- src/mame/drivers/mcr3.cpp | 14 +- src/mame/drivers/mcr68.cpp | 18 +- src/mame/drivers/meadows.cpp | 26 +- src/mame/drivers/mediagx.cpp | 16 +- src/mame/drivers/megadriv_acbl.cpp | 16 +- src/mame/drivers/megadriv_rad.cpp | 18 +- src/mame/drivers/megaplay.cpp | 10 +- src/mame/drivers/megasys1.cpp | 60 +-- src/mame/drivers/megatech.cpp | 16 +- src/mame/drivers/megazone.cpp | 4 +- src/mame/drivers/meijinsn.cpp | 4 +- src/mame/drivers/mephisto.cpp | 14 +- src/mame/drivers/mephisto_montec.cpp | 52 +- src/mame/drivers/mephistp.cpp | 6 +- src/mame/drivers/merit.cpp | 54 +- src/mame/drivers/meritm.cpp | 14 +- src/mame/drivers/mermaid.cpp | 16 +- src/mame/drivers/mes.cpp | 4 +- src/mame/drivers/metalmx.cpp | 28 +- src/mame/drivers/metlclsh.cpp | 20 +- src/mame/drivers/metlfrzr.cpp | 2 +- src/mame/drivers/metro.cpp | 184 +++---- src/mame/drivers/mexico86.cpp | 8 +- src/mame/drivers/meyc8080.cpp | 14 +- src/mame/drivers/meyc8088.cpp | 6 +- src/mame/drivers/mgames.cpp | 18 +- src/mame/drivers/mgavegas.cpp | 8 +- src/mame/drivers/mgolf.cpp | 14 +- src/mame/drivers/mhavoc.cpp | 40 +- src/mame/drivers/micral.cpp | 8 +- src/mame/drivers/micro20.cpp | 2 +- src/mame/drivers/micro3d.cpp | 36 +- src/mame/drivers/microdec.cpp | 8 +- src/mame/drivers/microkit.cpp | 2 +- src/mame/drivers/micronic.cpp | 22 +- src/mame/drivers/micropin.cpp | 12 +- src/mame/drivers/microtan.cpp | 4 +- src/mame/drivers/microterm.cpp | 2 +- src/mame/drivers/midas.cpp | 36 +- src/mame/drivers/midqslvr.cpp | 18 +- src/mame/drivers/midtunit.cpp | 18 +- src/mame/drivers/midvunit.cpp | 62 +-- src/mame/drivers/midwunit.cpp | 18 +- src/mame/drivers/midxunit.cpp | 22 +- src/mame/drivers/midyunit.cpp | 20 +- src/mame/drivers/midzeus.cpp | 26 +- src/mame/drivers/mikie.cpp | 12 +- src/mame/drivers/mikro80.cpp | 14 +- src/mame/drivers/mikromik.cpp | 2 +- src/mame/drivers/mikrosha.cpp | 4 +- src/mame/drivers/mil4000.cpp | 30 +- src/mame/drivers/miniframe.cpp | 4 +- src/mame/drivers/minitel_2_rpic.cpp | 4 +- src/mame/drivers/mirage.cpp | 8 +- src/mame/drivers/mirax.cpp | 8 +- src/mame/drivers/missb2.cpp | 12 +- src/mame/drivers/missile.cpp | 4 +- src/mame/drivers/mitchell.cpp | 64 +-- src/mame/drivers/mits680b.cpp | 2 +- src/mame/drivers/mjkjidai.cpp | 8 +- src/mame/drivers/mjsenpu.cpp | 12 +- src/mame/drivers/mjsister.cpp | 12 +- src/mame/drivers/mk1.cpp | 2 +- src/mame/drivers/mk14.cpp | 4 +- src/mame/drivers/mlanding.cpp | 38 +- src/mame/drivers/mmagic.cpp | 10 +- src/mame/drivers/mmd1.cpp | 14 +- src/mame/drivers/mmm.cpp | 4 +- src/mame/drivers/mmodular.cpp | 2 +- src/mame/drivers/mod8.cpp | 6 +- src/mame/drivers/model1.cpp | 30 +- src/mame/drivers/model2.cpp | 114 ++--- src/mame/drivers/model3.cpp | 26 +- src/mame/drivers/modellot.cpp | 4 +- src/mame/drivers/mogura.cpp | 6 +- src/mame/drivers/mole.cpp | 10 +- src/mame/drivers/molecular.cpp | 10 +- src/mame/drivers/momoko.cpp | 22 +- src/mame/drivers/monty.cpp | 8 +- src/mame/drivers/monzagp.cpp | 2 +- src/mame/drivers/moo.cpp | 18 +- src/mame/drivers/mosaic.cpp | 12 +- src/mame/drivers/mouser.cpp | 2 +- src/mame/drivers/mpf1.cpp | 2 +- src/mame/drivers/mpu12wbk.cpp | 4 +- src/mame/drivers/mpu3.cpp | 6 +- src/mame/drivers/mpu4plasma.cpp | 4 +- src/mame/drivers/mpu4vid.cpp | 20 +- src/mame/drivers/mpu5.cpp | 2 +- src/mame/drivers/mpz80.cpp | 12 +- src/mame/drivers/mquake.cpp | 16 +- src/mame/drivers/mrdo.cpp | 16 +- src/mame/drivers/mrflea.cpp | 6 +- src/mame/drivers/mrgame.cpp | 28 +- src/mame/drivers/mrjong.cpp | 12 +- src/mame/drivers/ms0515.cpp | 4 +- src/mame/drivers/ms32.cpp | 42 +- src/mame/drivers/ms6102.cpp | 6 +- src/mame/drivers/msisaac.cpp | 36 +- src/mame/drivers/mstation.cpp | 18 +- src/mame/drivers/msx.cpp | 50 +- src/mame/drivers/mt735.cpp | 4 +- src/mame/drivers/mtouchxl.cpp | 6 +- src/mame/drivers/mtx.cpp | 30 +- src/mame/drivers/mugsmash.cpp | 10 +- src/mame/drivers/multfish.cpp | 92 ++-- src/mame/drivers/multi16.cpp | 4 +- src/mame/drivers/multi8.cpp | 14 +- src/mame/drivers/multigam.cpp | 46 +- src/mame/drivers/munchmo.cpp | 8 +- src/mame/drivers/murogem.cpp | 2 +- src/mame/drivers/murogmbl.cpp | 4 +- src/mame/drivers/mustache.cpp | 6 +- src/mame/drivers/mvme147.cpp | 10 +- src/mame/drivers/mw18w.cpp | 10 +- src/mame/drivers/mw8080bw.cpp | 136 ++--- src/mame/drivers/mwarr.cpp | 14 +- src/mame/drivers/mwsub.cpp | 12 +- src/mame/drivers/myb3k.cpp | 10 +- src/mame/drivers/mycom.cpp | 8 +- src/mame/drivers/mystston.cpp | 6 +- src/mame/drivers/mystwarr.cpp | 78 +-- src/mame/drivers/myvision.cpp | 4 +- src/mame/drivers/mz2000.cpp | 16 +- src/mame/drivers/mz2500.cpp | 62 +-- src/mame/drivers/mz3500.cpp | 12 +- src/mame/drivers/mz6500.cpp | 2 +- src/mame/drivers/mz700.cpp | 50 +- src/mame/drivers/mz80.cpp | 2 +- src/mame/drivers/n64.cpp | 2 +- src/mame/drivers/n8080.cpp | 12 +- src/mame/drivers/nakajies.cpp | 28 +- src/mame/drivers/namcofl.cpp | 42 +- src/mame/drivers/namcona1.cpp | 34 +- src/mame/drivers/namconb1.cpp | 62 +-- src/mame/drivers/namcond1.cpp | 10 +- src/mame/drivers/namcos1.cpp | 28 +- src/mame/drivers/namcos10.cpp | 32 +- src/mame/drivers/namcos11.cpp | 12 +- src/mame/drivers/namcos12.cpp | 56 +-- src/mame/drivers/namcos2.cpp | 66 +-- src/mame/drivers/namcos21.cpp | 122 ++--- src/mame/drivers/namcos22.cpp | 120 ++--- src/mame/drivers/namcos23.cpp | 72 +-- src/mame/drivers/namcos86.cpp | 98 ++-- src/mame/drivers/nanos.cpp | 2 +- src/mame/drivers/naomi.cpp | 56 +-- src/mame/drivers/nascom1.cpp | 12 +- src/mame/drivers/naughtyb.cpp | 12 +- src/mame/drivers/nbmj8688.cpp | 150 +++--- src/mame/drivers/nbmj8891.cpp | 184 +++---- src/mame/drivers/nbmj8900.cpp | 20 +- src/mame/drivers/nbmj8991.cpp | 54 +- src/mame/drivers/nbmj9195.cpp | 330 ++++++------ src/mame/drivers/nc.cpp | 48 +- src/mame/drivers/nds.cpp | 26 +- src/mame/drivers/nemesis.cpp | 138 ++--- src/mame/drivers/neogeo.cpp | 36 +- src/mame/drivers/neogeocd.cpp | 16 +- src/mame/drivers/neoprint.cpp | 22 +- src/mame/drivers/neptunp2.cpp | 6 +- src/mame/drivers/nes.cpp | 6 +- src/mame/drivers/nes_vt.cpp | 88 ++-- src/mame/drivers/newbrain.cpp | 4 +- src/mame/drivers/news.cpp | 6 +- src/mame/drivers/next.cpp | 32 +- src/mame/drivers/nexus3d.cpp | 2 +- src/mame/drivers/ngen.cpp | 8 +- src/mame/drivers/ngp.cpp | 12 +- src/mame/drivers/nibble.cpp | 2 +- src/mame/drivers/nightgal.cpp | 42 +- src/mame/drivers/ninjakd2.cpp | 82 +-- src/mame/drivers/ninjaw.cpp | 20 +- src/mame/drivers/nitedrvr.cpp | 12 +- src/mame/drivers/niyanpai.cpp | 124 ++--- src/mame/drivers/nmg5.cpp | 26 +- src/mame/drivers/nmk16.cpp | 280 +++++------ src/mame/drivers/nokia_3310.cpp | 12 +- src/mame/drivers/norautp.cpp | 2 +- src/mame/drivers/notechan.cpp | 8 +- src/mame/drivers/notetaker.cpp | 42 +- src/mame/drivers/nova2001.cpp | 48 +- src/mame/drivers/novag6502.cpp | 24 +- src/mame/drivers/novag68k.cpp | 10 +- src/mame/drivers/novagf8.cpp | 4 +- src/mame/drivers/nsm.cpp | 14 +- src/mame/drivers/nsmpoker.cpp | 6 +- src/mame/drivers/nss.cpp | 22 +- src/mame/drivers/nwk-tr.cpp | 18 +- src/mame/drivers/nycaptor.cpp | 118 ++--- src/mame/drivers/nyny.cpp | 8 +- src/mame/drivers/ob68k1a.cpp | 12 +- src/mame/drivers/octopus.cpp | 16 +- src/mame/drivers/odyssey2.cpp | 4 +- src/mame/drivers/offtwall.cpp | 4 +- src/mame/drivers/ohmygod.cpp | 10 +- src/mame/drivers/ojankohs.cpp | 60 +-- src/mame/drivers/okean240.cpp | 10 +- src/mame/drivers/olibochu.cpp | 8 +- src/mame/drivers/olyboss.cpp | 14 +- src/mame/drivers/omegrace.cpp | 8 +- src/mame/drivers/ondra.cpp | 2 +- src/mame/drivers/oneshot.cpp | 18 +- src/mame/drivers/onetwo.cpp | 10 +- src/mame/drivers/opwolf.cpp | 44 +- src/mame/drivers/orao.cpp | 2 +- src/mame/drivers/orbit.cpp | 10 +- src/mame/drivers/oric.cpp | 41 +- src/mame/drivers/orion.cpp | 22 +- src/mame/drivers/osbexec.cpp | 8 +- src/mame/drivers/osborne1.cpp | 14 +- src/mame/drivers/osi.cpp | 20 +- src/mame/drivers/othello.cpp | 24 +- src/mame/drivers/othunder.cpp | 8 +- src/mame/drivers/overdriv.cpp | 16 +- src/mame/drivers/p2000t.cpp | 18 +- src/mame/drivers/p8k.cpp | 4 +- src/mame/drivers/pachifev.cpp | 12 +- src/mame/drivers/pacland.cpp | 26 +- src/mame/drivers/pacman.cpp | 146 +++--- src/mame/drivers/pandoras.cpp | 20 +- src/mame/drivers/panicr.cpp | 10 +- src/mame/drivers/paradise.cpp | 20 +- src/mame/drivers/paranoia.cpp | 12 +- src/mame/drivers/parodius.cpp | 8 +- src/mame/drivers/partner.cpp | 4 +- src/mame/drivers/pasha2.cpp | 18 +- src/mame/drivers/paso1600.cpp | 12 +- src/mame/drivers/pasogo.cpp | 6 +- src/mame/drivers/pasopia.cpp | 2 +- src/mame/drivers/pasopia7.cpp | 10 +- src/mame/drivers/pass.cpp | 4 +- src/mame/drivers/pastelg.cpp | 20 +- src/mame/drivers/patapata.cpp | 6 +- src/mame/drivers/pb1000.cpp | 2 +- src/mame/drivers/pbaction.cpp | 20 +- src/mame/drivers/pc.cpp | 2 +- src/mame/drivers/pc100.cpp | 18 +- src/mame/drivers/pc1512.cpp | 28 +- src/mame/drivers/pc2000.cpp | 22 +- src/mame/drivers/pc4.cpp | 16 +- src/mame/drivers/pc6001.cpp | 86 ++-- src/mame/drivers/pc8001.cpp | 12 +- src/mame/drivers/pc8401a.cpp | 14 +- src/mame/drivers/pc8801.cpp | 80 +-- src/mame/drivers/pc88va.cpp | 40 +- src/mame/drivers/pc9801.cpp | 152 +++--- src/mame/drivers/pcat_dyn.cpp | 6 +- src/mame/drivers/pcat_nit.cpp | 8 +- src/mame/drivers/pcd.cpp | 24 +- src/mame/drivers/pce.cpp | 8 +- src/mame/drivers/pce220.cpp | 58 +-- src/mame/drivers/pcfx.cpp | 4 +- src/mame/drivers/pcktgal.cpp | 10 +- src/mame/drivers/pcw.cpp | 30 +- src/mame/drivers/pcw16.cpp | 36 +- src/mame/drivers/pcxt.cpp | 14 +- src/mame/drivers/pdp11.cpp | 2 +- src/mame/drivers/pecom.cpp | 6 +- src/mame/drivers/pegasus.cpp | 4 +- src/mame/drivers/pencil2.cpp | 18 +- src/mame/drivers/pengadvb.cpp | 8 +- src/mame/drivers/pengo.cpp | 8 +- src/mame/drivers/pentagon.cpp | 10 +- src/mame/drivers/peoplepc.cpp | 4 +- src/mame/drivers/peplus.cpp | 18 +- src/mame/drivers/pes.cpp | 6 +- src/mame/drivers/pet.cpp | 4 +- src/mame/drivers/peyper.cpp | 6 +- src/mame/drivers/pg685.cpp | 30 +- src/mame/drivers/pgm.cpp | 14 +- src/mame/drivers/pgm2.cpp | 34 +- src/mame/drivers/phc25.cpp | 4 +- src/mame/drivers/phoenix.cpp | 20 +- src/mame/drivers/photon.cpp | 12 +- src/mame/drivers/photon2.cpp | 8 +- src/mame/drivers/photoply.cpp | 12 +- src/mame/drivers/phunsy.cpp | 4 +- src/mame/drivers/pinball2k.cpp | 14 +- src/mame/drivers/pingpong.cpp | 16 +- src/mame/drivers/pinkiri8.cpp | 10 +- src/mame/drivers/pipbug.cpp | 2 +- src/mame/drivers/pipedrm.cpp | 12 +- src/mame/drivers/pipeline.cpp | 4 +- src/mame/drivers/pirates.cpp | 8 +- src/mame/drivers/piratesh.cpp | 8 +- src/mame/drivers/pitnrun.cpp | 20 +- src/mame/drivers/pk8000.cpp | 16 +- src/mame/drivers/pkscram.cpp | 8 +- src/mame/drivers/pktgaldx.cpp | 16 +- src/mame/drivers/plan80.cpp | 4 +- src/mame/drivers/play_1.cpp | 14 +- src/mame/drivers/play_2.cpp | 12 +- src/mame/drivers/play_3.cpp | 22 +- src/mame/drivers/playch10.cpp | 16 +- src/mame/drivers/playmark.cpp | 76 +-- src/mame/drivers/plus4.cpp | 4 +- src/mame/drivers/pluto5.cpp | 2 +- src/mame/drivers/plygonet.cpp | 32 +- src/mame/drivers/pmd85.cpp | 4 +- src/mame/drivers/pmi80.cpp | 4 +- src/mame/drivers/pntnpuzl.cpp | 14 +- src/mame/drivers/pocketc.cpp | 24 +- src/mame/drivers/pockstat.cpp | 20 +- src/mame/drivers/pofo.cpp | 4 +- src/mame/drivers/poisk1.cpp | 6 +- src/mame/drivers/pokechmp.cpp | 10 +- src/mame/drivers/pokemini.cpp | 4 +- src/mame/drivers/poker72.cpp | 6 +- src/mame/drivers/polepos.cpp | 32 +- src/mame/drivers/polgar.cpp | 32 +- src/mame/drivers/policetr.cpp | 32 +- src/mame/drivers/poly.cpp | 20 +- src/mame/drivers/poly88.cpp | 6 +- src/mame/drivers/poly880.cpp | 2 +- src/mame/drivers/polyplay.cpp | 4 +- src/mame/drivers/poolshrk.cpp | 16 +- src/mame/drivers/pooyan.cpp | 4 +- src/mame/drivers/popeye.cpp | 12 +- src/mame/drivers/popobear.cpp | 6 +- src/mame/drivers/popper.cpp | 20 +- src/mame/drivers/portrait.cpp | 10 +- src/mame/drivers/powerbal.cpp | 20 +- src/mame/drivers/powerins.cpp | 14 +- src/mame/drivers/pp01.cpp | 4 +- src/mame/drivers/ppmast93.cpp | 8 +- src/mame/drivers/prehisle.cpp | 14 +- src/mame/drivers/prestige.cpp | 18 +- src/mame/drivers/primo.cpp | 10 +- src/mame/drivers/pro80.cpp | 6 +- src/mame/drivers/proconn.cpp | 60 +-- src/mame/drivers/prof180x.cpp | 8 +- src/mame/drivers/prof80.cpp | 6 +- src/mame/drivers/progolf.cpp | 12 +- src/mame/drivers/prophet600.cpp | 14 +- src/mame/drivers/proteus.cpp | 16 +- src/mame/drivers/psikyo.cpp | 28 +- src/mame/drivers/psikyo4.cpp | 16 +- src/mame/drivers/psikyosh.cpp | 12 +- src/mame/drivers/psion.cpp | 28 +- src/mame/drivers/psx.cpp | 2 +- src/mame/drivers/psychic5.cpp | 36 +- src/mame/drivers/pt68k4.cpp | 12 +- src/mame/drivers/ptcsol.cpp | 10 +- src/mame/drivers/pturn.cpp | 14 +- src/mame/drivers/puckpkmn.cpp | 10 +- src/mame/drivers/pulsar.cpp | 6 +- src/mame/drivers/punchout.cpp | 24 +- src/mame/drivers/pv1000.cpp | 4 +- src/mame/drivers/pv2000.cpp | 20 +- src/mame/drivers/pv9234.cpp | 6 +- src/mame/drivers/pwrview.cpp | 38 +- src/mame/drivers/px4.cpp | 42 +- src/mame/drivers/px8.cpp | 6 +- src/mame/drivers/pyl601.cpp | 24 +- src/mame/drivers/pzletime.cpp | 12 +- src/mame/drivers/qdrmfgp.cpp | 68 +-- src/mame/drivers/qix.cpp | 18 +- src/mame/drivers/ql.cpp | 4 +- src/mame/drivers/qtsbc.cpp | 4 +- src/mame/drivers/quantum.cpp | 6 +- src/mame/drivers/quasar.cpp | 22 +- src/mame/drivers/queen.cpp | 12 +- src/mame/drivers/quickpick5.cpp | 8 +- src/mame/drivers/quizdna.cpp | 36 +- src/mame/drivers/quizo.cpp | 6 +- src/mame/drivers/quizpani.cpp | 6 +- src/mame/drivers/quizpun2.cpp | 14 +- src/mame/drivers/quizshow.cpp | 16 +- src/mame/drivers/qvt201.cpp | 6 +- src/mame/drivers/qx10.cpp | 14 +- src/mame/drivers/r2dtank.cpp | 6 +- src/mame/drivers/r2dx_v33.cpp | 100 ++-- src/mame/drivers/r9751.cpp | 8 +- src/mame/drivers/rabbit.cpp | 16 +- src/mame/drivers/rad_eu3a05.cpp | 42 +- src/mame/drivers/rad_eu3a14.cpp | 10 +- src/mame/drivers/radio86.cpp | 6 +- src/mame/drivers/raiden.cpp | 20 +- src/mame/drivers/raiden2.cpp | 74 +-- src/mame/drivers/rainbow.cpp | 408 +++++++-------- src/mame/drivers/rallyx.cpp | 14 +- src/mame/drivers/rambo.cpp | 2 +- src/mame/drivers/rampart.cpp | 4 +- src/mame/drivers/rastan.cpp | 10 +- src/mame/drivers/rastersp.cpp | 20 +- src/mame/drivers/ravens.cpp | 12 +- src/mame/drivers/rbisland.cpp | 8 +- src/mame/drivers/rbmk.cpp | 22 +- src/mame/drivers/rc702.cpp | 6 +- src/mame/drivers/rc759.cpp | 24 +- src/mame/drivers/rd110.cpp | 12 +- src/mame/drivers/re900.cpp | 8 +- src/mame/drivers/realbrk.cpp | 22 +- src/mame/drivers/redalert.cpp | 28 +- src/mame/drivers/redclash.cpp | 30 +- src/mame/drivers/relief.cpp | 6 +- src/mame/drivers/renegade.cpp | 22 +- src/mame/drivers/replicator.cpp | 2 +- src/mame/drivers/retofinv.cpp | 24 +- src/mame/drivers/rex6000.cpp | 26 +- src/mame/drivers/risc2500.cpp | 8 +- src/mame/drivers/riscpc.cpp | 4 +- src/mame/drivers/rltennis.cpp | 8 +- src/mame/drivers/rm380z.cpp | 12 +- src/mame/drivers/rmhaihai.cpp | 30 +- src/mame/drivers/rmnimbus.cpp | 18 +- src/mame/drivers/rmt32.cpp | 12 +- src/mame/drivers/rockrage.cpp | 10 +- src/mame/drivers/rocnrope.cpp | 6 +- src/mame/drivers/rohga.cpp | 20 +- src/mame/drivers/rollerg.cpp | 10 +- src/mame/drivers/rollext.cpp | 4 +- src/mame/drivers/rollrace.cpp | 16 +- src/mame/drivers/ron.cpp | 10 +- src/mame/drivers/rotaryf.cpp | 2 +- src/mame/drivers/roul.cpp | 8 +- src/mame/drivers/route16.cpp | 38 +- src/mame/drivers/rowamet.cpp | 6 +- src/mame/drivers/royalmah.cpp | 174 +++---- src/mame/drivers/rpunch.cpp | 16 +- src/mame/drivers/rt1715.cpp | 12 +- src/mame/drivers/runaway.cpp | 12 +- src/mame/drivers/rungun.cpp | 14 +- src/mame/drivers/rvoice.cpp | 2 +- src/mame/drivers/rx78.cpp | 18 +- src/mame/drivers/rz1.cpp | 6 +- src/mame/drivers/s11.cpp | 8 +- src/mame/drivers/s11a.cpp | 10 +- src/mame/drivers/s11b.cpp | 14 +- src/mame/drivers/s11c.cpp | 10 +- src/mame/drivers/s3.cpp | 2 +- src/mame/drivers/s4.cpp | 2 +- src/mame/drivers/s6.cpp | 2 +- src/mame/drivers/s6a.cpp | 2 +- src/mame/drivers/s7.cpp | 4 +- src/mame/drivers/s8.cpp | 4 +- src/mame/drivers/s8a.cpp | 4 +- src/mame/drivers/s9.cpp | 4 +- src/mame/drivers/sacstate.cpp | 8 +- src/mame/drivers/safarir.cpp | 6 +- src/mame/drivers/sage2.cpp | 2 +- src/mame/drivers/samcoupe.cpp | 54 +- src/mame/drivers/sandscrp.cpp | 18 +- src/mame/drivers/sangho.cpp | 6 +- src/mame/drivers/sanremo.cpp | 6 +- src/mame/drivers/sapi1.cpp | 26 +- src/mame/drivers/saturn.cpp | 24 +- src/mame/drivers/sauro.cpp | 26 +- src/mame/drivers/savquest.cpp | 22 +- src/mame/drivers/sbasketb.cpp | 12 +- src/mame/drivers/sbc6510.cpp | 2 +- src/mame/drivers/sbowling.cpp | 10 +- src/mame/drivers/sbrain.cpp | 12 +- src/mame/drivers/sbrkout.cpp | 12 +- src/mame/drivers/sbugger.cpp | 8 +- src/mame/drivers/sc1.cpp | 2 +- src/mame/drivers/sc2.cpp | 2 +- src/mame/drivers/scobra.cpp | 124 ++--- src/mame/drivers/scorpion.cpp | 14 +- src/mame/drivers/scotrsht.cpp | 12 +- src/mame/drivers/scramble.cpp | 214 ++++---- src/mame/drivers/scregg.cpp | 18 +- src/mame/drivers/scyclone.cpp | 30 +- src/mame/drivers/sderby.cpp | 72 +-- src/mame/drivers/sderby2.cpp | 12 +- src/mame/drivers/seabattl.cpp | 18 +- src/mame/drivers/seattle.cpp | 50 +- src/mame/drivers/segac2.cpp | 8 +- src/mame/drivers/segae.cpp | 6 +- src/mame/drivers/segag80r.cpp | 36 +- src/mame/drivers/segag80v.cpp | 16 +- src/mame/drivers/segahang.cpp | 14 +- src/mame/drivers/segald.cpp | 12 +- src/mame/drivers/segam1.cpp | 4 +- src/mame/drivers/segapico.cpp | 4 +- src/mame/drivers/segas16a.cpp | 16 +- src/mame/drivers/segas16b.cpp | 54 +- src/mame/drivers/segas18.cpp | 4 +- src/mame/drivers/segas24.cpp | 54 +- src/mame/drivers/segas32.cpp | 64 +-- src/mame/drivers/segasp.cpp | 20 +- src/mame/drivers/segaxbd.cpp | 6 +- src/mame/drivers/segaybd.cpp | 6 +- src/mame/drivers/seibucats.cpp | 18 +- src/mame/drivers/seibuspi.cpp | 70 +-- src/mame/drivers/seicross.cpp | 8 +- src/mame/drivers/seicupbl.cpp | 12 +- src/mame/drivers/sengokmj.cpp | 16 +- src/mame/drivers/senjyo.cpp | 52 +- src/mame/drivers/seta.cpp | 368 +++++++------- src/mame/drivers/seta2.cpp | 114 ++--- src/mame/drivers/sf.cpp | 44 +- src/mame/drivers/sfbonus.cpp | 20 +- src/mame/drivers/sfcbox.cpp | 16 +- src/mame/drivers/sfkick.cpp | 8 +- src/mame/drivers/sg1000.cpp | 42 +- src/mame/drivers/sg1000a.cpp | 12 +- src/mame/drivers/shadfrce.cpp | 28 +- src/mame/drivers/shangha3.cpp | 32 +- src/mame/drivers/shanghai.cpp | 4 +- src/mame/drivers/shangkid.cpp | 26 +- src/mame/drivers/shaolins.cpp | 14 +- src/mame/drivers/shisen.cpp | 8 +- src/mame/drivers/shootout.cpp | 20 +- src/mame/drivers/shougi.cpp | 2 +- src/mame/drivers/shuuz.cpp | 4 +- src/mame/drivers/sidearms.cpp | 44 +- src/mame/drivers/sidepckt.cpp | 10 +- src/mame/drivers/sigmab52.cpp | 24 +- src/mame/drivers/sigmab98.cpp | 166 +++--- src/mame/drivers/silkroad.cpp | 12 +- src/mame/drivers/silvmil.cpp | 20 +- src/mame/drivers/simpl156.cpp | 50 +- src/mame/drivers/simple_st0016.cpp | 16 +- src/mame/drivers/simpsons.cpp | 14 +- src/mame/drivers/skeetsht.cpp | 8 +- src/mame/drivers/skimaxx.cpp | 16 +- src/mame/drivers/skullxbo.cpp | 24 +- src/mame/drivers/skyarmy.cpp | 4 +- src/mame/drivers/skydiver.cpp | 6 +- src/mame/drivers/skyfox.cpp | 2 +- src/mame/drivers/skykid.cpp | 26 +- src/mame/drivers/skylncr.cpp | 106 ++-- src/mame/drivers/skyraid.cpp | 10 +- src/mame/drivers/slapfght.cpp | 62 +-- src/mame/drivers/slapshot.cpp | 10 +- src/mame/drivers/slc1.cpp | 2 +- src/mame/drivers/slicer.cpp | 8 +- src/mame/drivers/sliver.cpp | 16 +- src/mame/drivers/slotcarn.cpp | 2 +- src/mame/drivers/sm7238.cpp | 6 +- src/mame/drivers/smc777.cpp | 32 +- src/mame/drivers/sms.cpp | 96 ++-- src/mame/drivers/sms_bootleg.cpp | 6 +- src/mame/drivers/smsmcorp.cpp | 14 +- src/mame/drivers/snes.cpp | 2 +- src/mame/drivers/snesb.cpp | 6 +- src/mame/drivers/snk.cpp | 622 +++++++++++------------ src/mame/drivers/snk6502.cpp | 66 +-- src/mame/drivers/snk68.cpp | 28 +- src/mame/drivers/snookr10.cpp | 28 +- src/mame/drivers/snowbros.cpp | 62 +-- src/mame/drivers/socrates.cpp | 42 +- src/mame/drivers/softbox.cpp | 10 +- src/mame/drivers/solomon.cpp | 16 +- src/mame/drivers/sonson.cpp | 6 +- src/mame/drivers/sorcerer.cpp | 8 +- src/mame/drivers/sothello.cpp | 22 +- src/mame/drivers/spacefb.cpp | 8 +- src/mame/drivers/spaceg.cpp | 10 +- src/mame/drivers/spartanxtec.cpp | 8 +- src/mame/drivers/spbactn.cpp | 28 +- src/mame/drivers/spc1000.cpp | 10 +- src/mame/drivers/spc1500.cpp | 4 +- src/mame/drivers/spcforce.cpp | 10 +- src/mame/drivers/spdodgeb.cpp | 12 +- src/mame/drivers/spec128.cpp | 8 +- src/mame/drivers/special.cpp | 12 +- src/mame/drivers/specpls3.cpp | 10 +- src/mame/drivers/spectrum.cpp | 6 +- src/mame/drivers/speedatk.cpp | 6 +- src/mame/drivers/speedbal.cpp | 14 +- src/mame/drivers/speedspn.cpp | 16 +- src/mame/drivers/speglsht.cpp | 10 +- src/mame/drivers/spinb.cpp | 34 +- src/mame/drivers/spirit76.cpp | 4 +- src/mame/drivers/splash.cpp | 34 +- src/mame/drivers/splus.cpp | 12 +- src/mame/drivers/spoker.cpp | 18 +- src/mame/drivers/spool99.cpp | 24 +- src/mame/drivers/sprcros2.cpp | 32 +- src/mame/drivers/sprint2.cpp | 32 +- src/mame/drivers/sprint4.cpp | 20 +- src/mame/drivers/sprint8.cpp | 8 +- src/mame/drivers/spy.cpp | 12 +- src/mame/drivers/spyhuntertec.cpp | 18 +- src/mame/drivers/squale.cpp | 10 +- src/mame/drivers/srmp2.cpp | 46 +- src/mame/drivers/srmp5.cpp | 32 +- src/mame/drivers/srmp6.cpp | 10 +- src/mame/drivers/srumbler.cpp | 10 +- src/mame/drivers/ssfindo.cpp | 26 +- src/mame/drivers/sshangha.cpp | 32 +- src/mame/drivers/sshot.cpp | 6 +- src/mame/drivers/ssingles.cpp | 16 +- src/mame/drivers/sslam.cpp | 12 +- src/mame/drivers/ssozumo.cpp | 18 +- src/mame/drivers/sspeedr.cpp | 34 +- src/mame/drivers/ssrj.cpp | 8 +- src/mame/drivers/sstrangr.cpp | 2 +- src/mame/drivers/ssv.cpp | 74 +-- src/mame/drivers/stactics.cpp | 12 +- src/mame/drivers/stadhero.cpp | 4 +- src/mame/drivers/starcrus.cpp | 24 +- src/mame/drivers/starfire.cpp | 6 +- src/mame/drivers/stargame.cpp | 2 +- src/mame/drivers/starshp1.cpp | 14 +- src/mame/drivers/starwars.cpp | 22 +- src/mame/drivers/statriv2.cpp | 4 +- src/mame/drivers/stellafr.cpp | 4 +- src/mame/drivers/stfight.cpp | 14 +- src/mame/drivers/stlforce.cpp | 12 +- src/mame/drivers/stratos.cpp | 10 +- src/mame/drivers/studio2.cpp | 10 +- src/mame/drivers/stuntair.cpp | 12 +- src/mame/drivers/stv.cpp | 20 +- src/mame/drivers/sub.cpp | 8 +- src/mame/drivers/subs.cpp | 10 +- src/mame/drivers/subsino.cpp | 84 ++-- src/mame/drivers/subsino2.cpp | 214 ++++---- src/mame/drivers/summit.cpp | 2 +- src/mame/drivers/sun2.cpp | 10 +- src/mame/drivers/sun3.cpp | 14 +- src/mame/drivers/sun3x.cpp | 48 +- src/mame/drivers/sun4.cpp | 18 +- src/mame/drivers/suna16.cpp | 62 +-- src/mame/drivers/suna8.cpp | 124 ++--- src/mame/drivers/supbtime.cpp | 6 +- src/mame/drivers/supdrapo.cpp | 12 +- src/mame/drivers/supduck.cpp | 14 +- src/mame/drivers/super6.cpp | 20 +- src/mame/drivers/super80.cpp | 56 +-- src/mame/drivers/superchs.cpp | 6 +- src/mame/drivers/supercrd.cpp | 4 +- src/mame/drivers/superdq.cpp | 8 +- src/mame/drivers/superqix.cpp | 22 +- src/mame/drivers/superslave.cpp | 12 +- src/mame/drivers/supertnk.cpp | 12 +- src/mame/drivers/superwng.cpp | 28 +- src/mame/drivers/supracan.cpp | 14 +- src/mame/drivers/suprgolf.cpp | 10 +- src/mame/drivers/suprloco.cpp | 10 +- src/mame/drivers/suprnova.cpp | 18 +- src/mame/drivers/suprridr.cpp | 18 +- src/mame/drivers/suprslam.cpp | 8 +- src/mame/drivers/supstarf.cpp | 4 +- src/mame/drivers/surpratk.cpp | 4 +- src/mame/drivers/svi318.cpp | 22 +- src/mame/drivers/svision.cpp | 4 +- src/mame/drivers/svmu.cpp | 14 +- src/mame/drivers/swtpc09.cpp | 18 +- src/mame/drivers/swyft.cpp | 12 +- src/mame/drivers/system1.cpp | 36 +- src/mame/drivers/system16.cpp | 390 +++++++-------- src/mame/drivers/tagteam.cpp | 18 +- src/mame/drivers/tail2nos.cpp | 8 +- src/mame/drivers/taito.cpp | 6 +- src/mame/drivers/taito_b.cpp | 48 +- src/mame/drivers/taito_f2.cpp | 48 +- src/mame/drivers/taito_f3.cpp | 54 +- src/mame/drivers/taito_h.cpp | 4 +- src/mame/drivers/taito_l.cpp | 48 +- src/mame/drivers/taito_o.cpp | 2 +- src/mame/drivers/taito_x.cpp | 18 +- src/mame/drivers/taito_z.cpp | 74 +-- src/mame/drivers/taitoair.cpp | 54 +- src/mame/drivers/taitogn.cpp | 28 +- src/mame/drivers/taitojc.cpp | 50 +- src/mame/drivers/taitopjc.cpp | 20 +- src/mame/drivers/taitosj.cpp | 34 +- src/mame/drivers/taitotz.cpp | 24 +- src/mame/drivers/taitowlf.cpp | 6 +- src/mame/drivers/tandy1t.cpp | 24 +- src/mame/drivers/tandy2k.cpp | 16 +- src/mame/drivers/tank8.cpp | 20 +- src/mame/drivers/tankbatt.cpp | 10 +- src/mame/drivers/tankbust.cpp | 14 +- src/mame/drivers/taotaido.cpp | 10 +- src/mame/drivers/tapatune.cpp | 30 +- src/mame/drivers/targeth.cpp | 8 +- src/mame/drivers/tasman.cpp | 12 +- src/mame/drivers/tatsumi.cpp | 66 +-- src/mame/drivers/tattack.cpp | 8 +- src/mame/drivers/tavernie.cpp | 2 +- src/mame/drivers/tbowl.cpp | 36 +- src/mame/drivers/tceptor.cpp | 32 +- src/mame/drivers/tdv2324.cpp | 4 +- src/mame/drivers/tec1.cpp | 14 +- src/mame/drivers/techno.cpp | 20 +- src/mame/drivers/tecmo.cpp | 78 +-- src/mame/drivers/tecmo16.cpp | 46 +- src/mame/drivers/tecmosys.cpp | 40 +- src/mame/drivers/tecnbras.cpp | 4 +- src/mame/drivers/tehkanwc.cpp | 40 +- src/mame/drivers/tek405x.cpp | 6 +- src/mame/drivers/tek440x.cpp | 2 +- src/mame/drivers/tempest.cpp | 8 +- src/mame/drivers/terak.cpp | 4 +- src/mame/drivers/terracre.cpp | 36 +- src/mame/drivers/tetrisp2.cpp | 172 +++---- src/mame/drivers/tgtpanic.cpp | 2 +- src/mame/drivers/thayers.cpp | 26 +- src/mame/drivers/thedealr.cpp | 8 +- src/mame/drivers/thedeep.cpp | 10 +- src/mame/drivers/thepit.cpp | 20 +- src/mame/drivers/thief.cpp | 18 +- src/mame/drivers/thomson.cpp | 160 +++--- src/mame/drivers/thoop2.cpp | 6 +- src/mame/drivers/thunderj.cpp | 8 +- src/mame/drivers/thunderx.cpp | 18 +- src/mame/drivers/ti85.cpp | 144 +++--- src/mame/drivers/ti89.cpp | 30 +- src/mame/drivers/ti990_10.cpp | 4 +- src/mame/drivers/ti990_4.cpp | 8 +- src/mame/drivers/ti99_2.cpp | 4 +- src/mame/drivers/ti99_4p.cpp | 6 +- src/mame/drivers/ti99_4x.cpp | 4 +- src/mame/drivers/ti99_8.cpp | 4 +- src/mame/drivers/tiamc1.cpp | 38 +- src/mame/drivers/tickee.cpp | 20 +- src/mame/drivers/tigeroad.cpp | 30 +- src/mame/drivers/tiki100.cpp | 8 +- src/mame/drivers/timelimt.cpp | 10 +- src/mame/drivers/timeplt.cpp | 8 +- src/mame/drivers/timex.cpp | 10 +- src/mame/drivers/tk2000.cpp | 8 +- src/mame/drivers/tk80.cpp | 6 +- src/mame/drivers/tk80bs.cpp | 2 +- src/mame/drivers/tm990189.cpp | 14 +- src/mame/drivers/tmaster.cpp | 2 +- src/mame/drivers/tmc1800.cpp | 14 +- src/mame/drivers/tmc2000e.cpp | 10 +- src/mame/drivers/tmc600.cpp | 4 +- src/mame/drivers/tmmjprd.cpp | 16 +- src/mame/drivers/tmnt.cpp | 134 ++--- src/mame/drivers/tmspoker.cpp | 4 +- src/mame/drivers/tnzs.cpp | 24 +- src/mame/drivers/toaplan1.cpp | 302 +++++------ src/mame/drivers/toaplan2.cpp | 206 ++++---- src/mame/drivers/toki.cpp | 24 +- src/mame/drivers/tomcat.cpp | 14 +- src/mame/drivers/tonton.cpp | 4 +- src/mame/drivers/toobin.cpp | 14 +- src/mame/drivers/topspeed.cpp | 10 +- src/mame/drivers/toratora.cpp | 4 +- src/mame/drivers/tosh1000.cpp | 4 +- src/mame/drivers/tourvis.cpp | 4 +- src/mame/drivers/toypop.cpp | 16 +- src/mame/drivers/tp84.cpp | 20 +- src/mame/drivers/tr175.cpp | 6 +- src/mame/drivers/trackfld.cpp | 40 +- src/mame/drivers/travrusa.cpp | 8 +- src/mame/drivers/tricep.cpp | 4 +- src/mame/drivers/triforce.cpp | 4 +- src/mame/drivers/triplhnt.cpp | 8 +- src/mame/drivers/trs80.cpp | 148 +++--- src/mame/drivers/trs80dt1.cpp | 6 +- src/mame/drivers/trs80m2.cpp | 24 +- src/mame/drivers/trucocl.cpp | 8 +- src/mame/drivers/trvmadns.cpp | 12 +- src/mame/drivers/trvquest.cpp | 2 +- src/mame/drivers/tryout.cpp | 16 +- src/mame/drivers/ts802.cpp | 18 +- src/mame/drivers/ts803.cpp | 8 +- src/mame/drivers/ts816.cpp | 14 +- src/mame/drivers/tsamurai.cpp | 82 +-- src/mame/drivers/tsispch.cpp | 8 +- src/mame/drivers/ttchamp.cpp | 18 +- src/mame/drivers/tubep.cpp | 36 +- src/mame/drivers/tugboat.cpp | 6 +- src/mame/drivers/tumbleb.cpp | 64 +-- src/mame/drivers/tunhunt.cpp | 6 +- src/mame/drivers/turbo.cpp | 24 +- src/mame/drivers/turrett.cpp | 8 +- src/mame/drivers/tutankhm.cpp | 4 +- src/mame/drivers/tutor.cpp | 30 +- src/mame/drivers/tv910.cpp | 12 +- src/mame/drivers/tv912.cpp | 8 +- src/mame/drivers/tv950.cpp | 2 +- src/mame/drivers/tv955.cpp | 2 +- src/mame/drivers/tv965.cpp | 2 +- src/mame/drivers/tv990.cpp | 4 +- src/mame/drivers/tvboy.cpp | 2 +- src/mame/drivers/tvc.cpp | 28 +- src/mame/drivers/twin16.cpp | 40 +- src/mame/drivers/twincobr.cpp | 30 +- src/mame/drivers/twinkle.cpp | 30 +- src/mame/drivers/twins.cpp | 26 +- src/mame/drivers/tx1.cpp | 50 +- src/mame/drivers/uapce.cpp | 8 +- src/mame/drivers/ultraman.cpp | 4 +- src/mame/drivers/ultratnk.cpp | 20 +- src/mame/drivers/ultrsprt.cpp | 8 +- src/mame/drivers/umipoker.cpp | 30 +- src/mame/drivers/undrfire.cpp | 12 +- src/mame/drivers/unichamp.cpp | 4 +- src/mame/drivers/unico.cpp | 50 +- src/mame/drivers/unior.cpp | 4 +- src/mame/drivers/univac.cpp | 12 +- src/mame/drivers/unixpc.cpp | 24 +- src/mame/drivers/unkhorse.cpp | 2 +- src/mame/drivers/upscope.cpp | 10 +- src/mame/drivers/usgames.cpp | 20 +- src/mame/drivers/ut88.cpp | 10 +- src/mame/drivers/uzebox.cpp | 8 +- src/mame/drivers/v100.cpp | 18 +- src/mame/drivers/v1050.cpp | 26 +- src/mame/drivers/v6809.cpp | 6 +- src/mame/drivers/vamphalf.cpp | 86 ++-- src/mame/drivers/vaportra.cpp | 8 +- src/mame/drivers/vastar.cpp | 6 +- src/mame/drivers/vax11.cpp | 8 +- src/mame/drivers/vball.cpp | 12 +- src/mame/drivers/vboy.cpp | 52 +- src/mame/drivers/vc4000.cpp | 10 +- src/mame/drivers/vcombat.cpp | 24 +- src/mame/drivers/vcs80.cpp | 4 +- src/mame/drivers/vd.cpp | 10 +- src/mame/drivers/vector06.cpp | 6 +- src/mame/drivers/vectrex.cpp | 6 +- src/mame/drivers/vega.cpp | 2 +- src/mame/drivers/vegaeo.cpp | 6 +- src/mame/drivers/vegas.cpp | 20 +- src/mame/drivers/vendetta.cpp | 16 +- src/mame/drivers/vertigo.cpp | 12 +- src/mame/drivers/vg5k.cpp | 10 +- src/mame/drivers/vgmplay.cpp | 16 +- src/mame/drivers/vic10.cpp | 6 +- src/mame/drivers/vic20.cpp | 4 +- src/mame/drivers/vicdual.cpp | 86 ++-- src/mame/drivers/victor9k.cpp | 2 +- src/mame/drivers/victory.cpp | 8 +- src/mame/drivers/vidbrain.cpp | 6 +- src/mame/drivers/videopin.cpp | 12 +- src/mame/drivers/videopkr.cpp | 8 +- src/mame/drivers/vigilant.cpp | 18 +- src/mame/drivers/vii.cpp | 6 +- src/mame/drivers/vindictr.cpp | 6 +- src/mame/drivers/vip.cpp | 4 +- src/mame/drivers/viper.cpp | 26 +- src/mame/drivers/vis.cpp | 12 +- src/mame/drivers/vixen.cpp | 10 +- src/mame/drivers/vk100.cpp | 30 +- src/mame/drivers/vlc.cpp | 16 +- src/mame/drivers/volfied.cpp | 8 +- src/mame/drivers/voyager.cpp | 6 +- src/mame/drivers/vp101.cpp | 32 +- src/mame/drivers/vp415.cpp | 6 +- src/mame/drivers/vpoker.cpp | 2 +- src/mame/drivers/vroulet.cpp | 6 +- src/mame/drivers/vsnes.cpp | 38 +- src/mame/drivers/vt100.cpp | 16 +- src/mame/drivers/vt240.cpp | 62 +-- src/mame/drivers/vt520.cpp | 2 +- src/mame/drivers/vtech1.cpp | 10 +- src/mame/drivers/vtech2.cpp | 8 +- src/mame/drivers/vulgus.cpp | 8 +- src/mame/drivers/wacky_gator.cpp | 14 +- src/mame/drivers/wallc.cpp | 12 +- src/mame/drivers/wangpc.cpp | 42 +- src/mame/drivers/wardner.cpp | 28 +- src/mame/drivers/warpsped.cpp | 4 +- src/mame/drivers/warpwarp.cpp | 26 +- src/mame/drivers/warriorb.cpp | 12 +- src/mame/drivers/wc90.cpp | 10 +- src/mame/drivers/wc90b.cpp | 20 +- src/mame/drivers/wecleman.cpp | 46 +- src/mame/drivers/welltris.cpp | 10 +- src/mame/drivers/wgp.cpp | 14 +- src/mame/drivers/wheelfir.cpp | 12 +- src/mame/drivers/whitestar.cpp | 8 +- src/mame/drivers/wicat.cpp | 32 +- src/mame/drivers/wico.cpp | 38 +- src/mame/drivers/wildpkr.cpp | 22 +- src/mame/drivers/williams.cpp | 82 +-- src/mame/drivers/wink.cpp | 12 +- src/mame/drivers/wiping.cpp | 2 +- src/mame/drivers/witch.cpp | 18 +- src/mame/drivers/wiz.cpp | 26 +- src/mame/drivers/wmg.cpp | 4 +- src/mame/drivers/wms.cpp | 2 +- src/mame/drivers/wolfpack.cpp | 56 +-- src/mame/drivers/wpc_95.cpp | 14 +- src/mame/drivers/wpc_an.cpp | 2 +- src/mame/drivers/wpc_dcs.cpp | 18 +- src/mame/drivers/wpc_dot.cpp | 2 +- src/mame/drivers/wpc_flip1.cpp | 2 +- src/mame/drivers/wpc_flip2.cpp | 2 +- src/mame/drivers/wpc_s.cpp | 14 +- src/mame/drivers/wrally.cpp | 6 +- src/mame/drivers/wswan.cpp | 6 +- src/mame/drivers/wwfsstar.cpp | 10 +- src/mame/drivers/wyvernf0.cpp | 27 +- src/mame/drivers/x07.cpp | 2 +- src/mame/drivers/x1.cpp | 86 ++-- src/mame/drivers/x1twin.cpp | 12 +- src/mame/drivers/x68k.cpp | 122 ++--- src/mame/drivers/xain.cpp | 28 +- src/mame/drivers/xavix.cpp | 130 ++--- src/mame/drivers/xerox820.cpp | 20 +- src/mame/drivers/xexex.cpp | 10 +- src/mame/drivers/xmen.cpp | 10 +- src/mame/drivers/xor100.cpp | 20 +- src/mame/drivers/xorworld.cpp | 6 +- src/mame/drivers/xtheball.cpp | 6 +- src/mame/drivers/xtom3d.cpp | 14 +- src/mame/drivers/xxmissio.cpp | 14 +- src/mame/drivers/xybots.cpp | 4 +- src/mame/drivers/xyonix.cpp | 12 +- src/mame/drivers/yiear.cpp | 12 +- src/mame/drivers/ymmu100.cpp | 28 +- src/mame/drivers/yunsun16.cpp | 6 +- src/mame/drivers/yunsung8.cpp | 14 +- src/mame/drivers/z100.cpp | 14 +- src/mame/drivers/z1013.cpp | 2 +- src/mame/drivers/z80dev.cpp | 4 +- src/mame/drivers/z80ne.cpp | 22 +- src/mame/drivers/zac2650.cpp | 6 +- src/mame/drivers/zac_1.cpp | 8 +- src/mame/drivers/zac_2.cpp | 4 +- src/mame/drivers/zac_proto.cpp | 8 +- src/mame/drivers/zaccaria.cpp | 10 +- src/mame/drivers/zapcomputer.cpp | 4 +- src/mame/drivers/zaurus.cpp | 6 +- src/mame/drivers/zaxxon.cpp | 20 +- src/mame/drivers/zerozone.cpp | 6 +- src/mame/drivers/zexall.cpp | 6 +- src/mame/drivers/zms8085.cpp | 4 +- src/mame/drivers/zn.cpp | 64 +-- src/mame/drivers/zodiack.cpp | 16 +- src/mame/drivers/zorba.cpp | 10 +- src/mame/drivers/zr107.cpp | 14 +- src/mame/drivers/zrt80.cpp | 6 +- src/mame/drivers/zwackery.cpp | 6 +- src/mame/drivers/zx.cpp | 12 +- 1805 files changed, 21897 insertions(+), 21936 deletions(-) (limited to 'src/mame/drivers') diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index 2a2bf22ac6a..a511a3b4cd0 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -190,13 +190,13 @@ void _1942_state::_1942_map(address_map &map) map(0xc003, 0xc003).portr("DSWA"); map(0xc004, 0xc004).portr("DSWB"); map(0xc800, 0xc800).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xc802, 0xc803).w(this, FUNC(_1942_state::_1942_scroll_w)); - map(0xc804, 0xc804).w(this, FUNC(_1942_state::_1942_c804_w)); - map(0xc805, 0xc805).w(this, FUNC(_1942_state::_1942_palette_bank_w)); - map(0xc806, 0xc806).w(this, FUNC(_1942_state::_1942_bankswitch_w)); + map(0xc802, 0xc803).w(FUNC(_1942_state::_1942_scroll_w)); + map(0xc804, 0xc804).w(FUNC(_1942_state::_1942_c804_w)); + map(0xc805, 0xc805).w(FUNC(_1942_state::_1942_palette_bank_w)); + map(0xc806, 0xc806).w(FUNC(_1942_state::_1942_bankswitch_w)); map(0xcc00, 0xcc7f).ram().share("spriteram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram"); - map(0xd800, 0xdbff).ram().w(this, FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram"); + map(0xd800, 0xdbff).ram().w(FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram"); map(0xe000, 0xefff).ram(); } @@ -221,22 +221,22 @@ void _1942p_state::_1942p_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram"); - map(0xd800, 0xdbff).ram().w(this, FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram"); + map(0xd800, 0xdbff).ram().w(FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram"); map(0xe000, 0xefff).ram(); map(0xce00, 0xcfff).ram().share("spriteram"); - map(0xdc02, 0xdc03).w(this, FUNC(_1942_state::_1942_scroll_w)); - map(0xc804, 0xc804).w(this, FUNC(_1942_state::_1942_c804_w)); - map(0xc805, 0xc805).w(this, FUNC(_1942_state::_1942_palette_bank_w)); + map(0xdc02, 0xdc03).w(FUNC(_1942_state::_1942_scroll_w)); + map(0xc804, 0xc804).w(FUNC(_1942_state::_1942_c804_w)); + map(0xc805, 0xc805).w(FUNC(_1942_state::_1942_palette_bank_w)); - map(0xf000, 0xf3ff).ram().w(this, FUNC(_1942p_state::_1942p_palette_w)).share("protopal"); + map(0xf000, 0xf3ff).ram().w(FUNC(_1942p_state::_1942p_palette_w)).share("protopal"); - map(0xf400, 0xf400).w(this, FUNC(_1942_state::_1942_bankswitch_w)); + map(0xf400, 0xf400).w(FUNC(_1942_state::_1942_bankswitch_w)); map(0xf500, 0xf500).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xf600, 0xf600).w(this, FUNC(_1942p_state::_1942p_f600_w)); + map(0xf600, 0xf600).w(FUNC(_1942p_state::_1942p_f600_w)); map(0xf700, 0xf700).portr("DSWA"); map(0xf701, 0xf701).portr("SYSTEM"); diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp index ac8b48b1161..eab57f8b6c5 100644 --- a/src/mame/drivers/1943.cpp +++ b/src/mame/drivers/1943.cpp @@ -111,17 +111,17 @@ void _1943_state::c1943_map(address_map &map) map(0xc002, 0xc002).portr("P2"); map(0xc003, 0xc003).portr("DSWA"); map(0xc004, 0xc004).portr("DSWB"); - map(0xc007, 0xc007).r(this, FUNC(_1943_state::c1943_protection_r)); + map(0xc007, 0xc007).r(FUNC(_1943_state::c1943_protection_r)); map(0xc800, 0xc800).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc804, 0xc804).w(this, FUNC(_1943_state::c1943_c804_w)); // ROM bank switch, screen flip + map(0xc804, 0xc804).w(FUNC(_1943_state::c1943_c804_w)); // ROM bank switch, screen flip map(0xc806, 0xc806).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xc807, 0xc807).w(this, FUNC(_1943_state::c1943_protection_w)); - map(0xd000, 0xd3ff).ram().w(this, FUNC(_1943_state::c1943_videoram_w)).share("videoram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(_1943_state::c1943_colorram_w)).share("colorram"); + map(0xc807, 0xc807).w(FUNC(_1943_state::c1943_protection_w)); + map(0xd000, 0xd3ff).ram().w(FUNC(_1943_state::c1943_videoram_w)).share("videoram"); + map(0xd400, 0xd7ff).ram().w(FUNC(_1943_state::c1943_colorram_w)).share("colorram"); map(0xd800, 0xd801).ram().share("scrollx"); map(0xd802, 0xd802).ram().share("scrolly"); map(0xd803, 0xd804).ram().share("bgscrollx"); - map(0xd806, 0xd806).w(this, FUNC(_1943_state::c1943_d806_w)); // sprites, bg1, bg2 enable + map(0xd806, 0xd806).w(FUNC(_1943_state::c1943_d806_w)); // sprites, bg1, bg2 enable map(0xd808, 0xd808).nopw(); // ??? map(0xd868, 0xd868).nopw(); // ??? map(0xd888, 0xd888).nopw(); // ??? diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp index 8c298bbc52d..ac96e285f3c 100644 --- a/src/mame/drivers/1945kiii.cpp +++ b/src/mame/drivers/1945kiii.cpp @@ -205,10 +205,10 @@ void k3_state::k3_base_map(address_map &map) map(0x200000, 0x2003ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x240000, 0x240fff).ram().share("spritera1"); map(0x280000, 0x280fff).ram().share("spritera2"); - map(0x2c0000, 0x2c07ff).ram().w(this, FUNC(k3_state::k3_bgram_w)).share("bgram"); + map(0x2c0000, 0x2c07ff).ram().w(FUNC(k3_state::k3_bgram_w)).share("bgram"); map(0x2c0800, 0x2c0fff).ram(); // or does k3 have a bigger tilemap? (flagrall is definitely 32x32 tiles) - map(0x340000, 0x340001).w(this, FUNC(k3_state::k3_scrollx_w)); - map(0x380000, 0x380001).w(this, FUNC(k3_state::k3_scrolly_w)); + map(0x340000, 0x340001).w(FUNC(k3_state::k3_scrollx_w)); + map(0x380000, 0x380001).w(FUNC(k3_state::k3_scrolly_w)); map(0x400000, 0x400001).portr("INPUTS"); map(0x440000, 0x440001).portr("SYSTEM"); map(0x480000, 0x480001).portr("DSW"); @@ -218,7 +218,7 @@ void k3_state::k3_map(address_map &map) { k3_base_map(map); - map(0x3c0000, 0x3c0001).w(this, FUNC(k3_state::k3_soundbanks_w)); + map(0x3c0000, 0x3c0001).w(FUNC(k3_state::k3_soundbanks_w)); map(0x4c0001, 0x4c0001).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).cswidth(16); map(0x500001, 0x500001).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).cswidth(16); @@ -230,7 +230,7 @@ void k3_state::flagrall_map(address_map &map) { k3_base_map(map); - map(0x3c0000, 0x3c0001).w(this, FUNC(k3_state::flagrall_soundbanks_w)); + map(0x3c0000, 0x3c0001).w(FUNC(k3_state::flagrall_soundbanks_w)); map(0x4c0001, 0x4c0001).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp index 15e2cb4d4f6..86b2bfd2189 100644 --- a/src/mame/drivers/20pacgal.cpp +++ b/src/mame/drivers/20pacgal.cpp @@ -193,10 +193,10 @@ void _25pacman_state::_25pacman_map(address_map &map) map(0x04000, 0x047ff).ram().share("video_ram"); map(0x04800, 0x05fff).ram(); map(0x06000, 0x06fff).writeonly().share("char_gfx_ram"); - map(0x07000, 0x0717f).w(this, FUNC(_25pacman_state::sprite_ram_w)); + map(0x07000, 0x0717f).w(FUNC(_25pacman_state::sprite_ram_w)); // AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE(ram_48000_w) map(0x08000, 0x09fff).nopw(); - map(0x0a000, 0x0bfff).w(this, FUNC(_25pacman_state::sprite_gfx_w)); + map(0x0a000, 0x0bfff).w(FUNC(_25pacman_state::sprite_gfx_w)); map(0x0c000, 0x0dfff).nopw(); // is this the sound waveforms in a different format? map(0x0e000, 0x0ffff).nopw(); map(0x1c000, 0x1ffff).nopw(); @@ -215,11 +215,11 @@ void _20pacgal_state::_20pacgal_map(address_map &map) map(0x45f00, 0x45fff).w("namco", FUNC(namco_cus30_device::namcos1_cus30_w)); map(0x46000, 0x46fff).writeonly().share("char_gfx_ram"); map(0x47100, 0x47100).ram(); /* leftover from original Galaga code */ - map(0x48000, 0x49fff).bankr("bank1").w(this, FUNC(_20pacgal_state::ram_48000_w)); /* this should be a mirror of 08000-09fff */ - map(0x4c000, 0x4dfff).w(this, FUNC(_20pacgal_state::sprite_gfx_w)); - map(0x4e000, 0x4e17f).w(this, FUNC(_20pacgal_state::sprite_ram_w)); + map(0x48000, 0x49fff).bankr("bank1").w(FUNC(_20pacgal_state::ram_48000_w)); /* this should be a mirror of 08000-09fff */ + map(0x4c000, 0x4dfff).w(FUNC(_20pacgal_state::sprite_gfx_w)); + map(0x4e000, 0x4e17f).w(FUNC(_20pacgal_state::sprite_ram_w)); map(0x4e180, 0x4feff).nopw(); - map(0x4ff00, 0x4ffff).w(this, FUNC(_20pacgal_state::sprite_lookup_w)); + map(0x4ff00, 0x4ffff).w(FUNC(_20pacgal_state::sprite_lookup_w)); } @@ -243,18 +243,18 @@ void _25pacman_state::_25pacman_io_map(address_map &map) map(0x81, 0x81).portr("P2"); map(0x82, 0x82).portr("SERVICE"); map(0x80, 0x80).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x81, 0x81).w(this, FUNC(_25pacman_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ - map(0x82, 0x82).w(this, FUNC(_25pacman_state::irqack_w)); + map(0x81, 0x81).w(FUNC(_25pacman_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ + map(0x82, 0x82).w(FUNC(_25pacman_state::irqack_w)); // AM_RANGE(0x84, 0x84) AM_NOP /* ?? */ map(0x85, 0x86).writeonly().share("stars_seed"); /* stars: rng seed (lo/hi) */ - map(0x87, 0x87).r(this, FUNC(_25pacman_state::_25pacman_io_87_r)); // not eeprom on this + map(0x87, 0x87).r(FUNC(_25pacman_state::_25pacman_io_87_r)); // not eeprom on this map(0x87, 0x87).nopw(); // AM_RANGE(0x88, 0x88) AM_WRITE(ram_bank_select_w) - map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::write)); + map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::data_w)); map(0x8a, 0x8a).writeonly().share("stars_ctrl"); /* stars: bits 3-4 = active set; bit 5 = enable */ map(0x8b, 0x8b).writeonly().share("flip"); map(0x8c, 0x8c).nopw(); - map(0x8f, 0x8f).w(this, FUNC(_25pacman_state::_20pacgal_coin_counter_w)); + map(0x8f, 0x8f).w(FUNC(_25pacman_state::_20pacgal_coin_counter_w)); } void _20pacgal_state::_20pacgal_io_map(address_map &map) @@ -266,16 +266,16 @@ void _20pacgal_state::_20pacgal_io_map(address_map &map) map(0x81, 0x81).portr("P2"); map(0x82, 0x82).portr("SERVICE"); map(0x80, 0x80).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x81, 0x81).w(this, FUNC(_20pacgal_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ - map(0x82, 0x82).w(this, FUNC(_20pacgal_state::irqack_w)); + map(0x81, 0x81).w(FUNC(_20pacgal_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ + map(0x82, 0x82).w(FUNC(_20pacgal_state::irqack_w)); map(0x84, 0x84).noprw(); /* ?? */ map(0x85, 0x86).writeonly().share("stars_seed"); /* stars: rng seed (lo/hi) */ map(0x87, 0x87).portr("EEPROMIN").portw("EEPROMOUT"); - map(0x88, 0x88).w(this, FUNC(_20pacgal_state::ram_bank_select_w)); - map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::write)); + map(0x88, 0x88).w(FUNC(_20pacgal_state::ram_bank_select_w)); + map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::data_w)); map(0x8a, 0x8a).writeonly().share("stars_ctrl"); /* stars: bits 3-4 = active set; bit 5 = enable */ map(0x8b, 0x8b).writeonly().share("flip"); - map(0x8f, 0x8f).w(this, FUNC(_20pacgal_state::_20pacgal_coin_counter_w)); + map(0x8f, 0x8f).w(FUNC(_20pacgal_state::_20pacgal_coin_counter_w)); } diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp index 7f8ea365881..212cb5f9ac9 100644 --- a/src/mame/drivers/24cdjuke.cpp +++ b/src/mame/drivers/24cdjuke.cpp @@ -130,7 +130,7 @@ WRITE8_MEMBER(midcoin24cdjuke_state::digit_w) void midcoin24cdjuke_state::midcoin24cdjuke_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x7800, 0x780f).w(this, FUNC(midcoin24cdjuke_state::digit_w)); + map(0x7800, 0x780f).w(FUNC(midcoin24cdjuke_state::digit_w)); map(0x8000, 0xffff).ram(); } @@ -141,7 +141,7 @@ void midcoin24cdjuke_state::midcoin24cdjuke_io(address_map &map) map(0x04, 0x07).rw("ic11", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x08, 0x0b).rw("ic25", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x0c, 0x0c).nopw(); - map(0x10, 0x1f).r(this, FUNC(midcoin24cdjuke_state::unknown_r)); + map(0x10, 0x1f).r(FUNC(midcoin24cdjuke_state::unknown_r)); } static INPUT_PORTS_START( midcoin24cdjuke ) diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 9ba004e5938..c62f4038bf0 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -199,21 +199,21 @@ void _2mindril_state::drill_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x200000, 0x20ffff).ram(); map(0x300000, 0x3000ff).ram(); - map(0x400000, 0x40ffff).rw(this, FUNC(_2mindril_state::f3_spriteram_r), FUNC(_2mindril_state::f3_spriteram_w)); - map(0x410000, 0x41bfff).rw(this, FUNC(_2mindril_state::f3_pf_data_r), FUNC(_2mindril_state::f3_pf_data_w)); - map(0x41c000, 0x41dfff).rw(this, FUNC(_2mindril_state::f3_videoram_r), FUNC(_2mindril_state::f3_videoram_w)); - map(0x41e000, 0x41ffff).rw(this, FUNC(_2mindril_state::f3_vram_r), FUNC(_2mindril_state::f3_vram_w)); - map(0x420000, 0x42ffff).rw(this, FUNC(_2mindril_state::f3_lineram_r), FUNC(_2mindril_state::f3_lineram_w)); - map(0x430000, 0x43ffff).rw(this, FUNC(_2mindril_state::f3_pivot_r), FUNC(_2mindril_state::f3_pivot_w)); - map(0x460000, 0x46000f).w(this, FUNC(_2mindril_state::f3_control_0_w)); - map(0x460010, 0x46001f).w(this, FUNC(_2mindril_state::f3_control_1_w)); + map(0x400000, 0x40ffff).rw(FUNC(_2mindril_state::f3_spriteram_r), FUNC(_2mindril_state::f3_spriteram_w)); + map(0x410000, 0x41bfff).rw(FUNC(_2mindril_state::f3_pf_data_r), FUNC(_2mindril_state::f3_pf_data_w)); + map(0x41c000, 0x41dfff).rw(FUNC(_2mindril_state::f3_videoram_r), FUNC(_2mindril_state::f3_videoram_w)); + map(0x41e000, 0x41ffff).rw(FUNC(_2mindril_state::f3_vram_r), FUNC(_2mindril_state::f3_vram_w)); + map(0x420000, 0x42ffff).rw(FUNC(_2mindril_state::f3_lineram_r), FUNC(_2mindril_state::f3_lineram_w)); + map(0x430000, 0x43ffff).rw(FUNC(_2mindril_state::f3_pivot_r), FUNC(_2mindril_state::f3_pivot_w)); + map(0x460000, 0x46000f).w(FUNC(_2mindril_state::f3_control_0_w)); + map(0x460010, 0x46001f).w(FUNC(_2mindril_state::f3_control_1_w)); map(0x500000, 0x501fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x502022, 0x502023).nopw(); //countinously switches between 0 and 2 map(0x600000, 0x600007).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)).umask16(0x00ff); - map(0x60000c, 0x60000d).rw(this, FUNC(_2mindril_state::drill_irq_r), FUNC(_2mindril_state::drill_irq_w)); + map(0x60000c, 0x60000d).rw(FUNC(_2mindril_state::drill_irq_r), FUNC(_2mindril_state::drill_irq_w)); map(0x60000e, 0x60000f).ram(); // unknown purpose, zeroed at start-up and nothing else map(0x700000, 0x70000f).rw("tc0510nio", FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)).umask16(0xff00); - map(0x800000, 0x800001).w(this, FUNC(_2mindril_state::sensors_w)); + map(0x800000, 0x800001).w(FUNC(_2mindril_state::sensors_w)); } static INPUT_PORTS_START( drill ) diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp index baaf827c39a..9023528e734 100644 --- a/src/mame/drivers/30test.cpp +++ b/src/mame/drivers/30test.cpp @@ -157,26 +157,26 @@ void namco_30test_state::namco_30test_map(address_map &map) { map(0x0000, 0x003f).ram(); // internal I/O map(0x0040, 0x007f).ram(); // more internal I/O, HC11 change pending - map(0x007c, 0x007c).rw(this, FUNC(namco_30test_state::hc11_mux_r), FUNC(namco_30test_state::hc11_mux_w)); - map(0x007e, 0x007e).rw(this, FUNC(namco_30test_state::hc11_okibank_r), FUNC(namco_30test_state::hc11_okibank_w)); + map(0x007c, 0x007c).rw(FUNC(namco_30test_state::hc11_mux_r), FUNC(namco_30test_state::hc11_mux_w)); + map(0x007e, 0x007e).rw(FUNC(namco_30test_state::hc11_okibank_r), FUNC(namco_30test_state::hc11_okibank_w)); map(0x0080, 0x037f).ram(); // internal RAM map(0x0d80, 0x0dbf).ram(); // EEPROM read-back data goes there map(0x2000, 0x2000).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* 0x401e-0x401f: time */ - map(0x4000, 0x401f).w(this, FUNC(namco_30test_state::namco_30test_led_w)); // 7-seg leds + map(0x4000, 0x401f).w(FUNC(namco_30test_state::namco_30test_led_w)); // 7-seg leds /* 0x6000: 1st place 7-seg led */ /* 0x6001: 2nd place 7-seg led */ /* 0x6002: 3rd place 7-seg led */ /* 0x6003: current / last play score */ /* 0x6004: lamps */ - map(0x6000, 0x6003).w(this, FUNC(namco_30test_state::namco_30test_led_rank_w)); - map(0x6004, 0x6004).w(this, FUNC(namco_30test_state::namco_30test_lamps_w)); + map(0x6000, 0x6003).w(FUNC(namco_30test_state::namco_30test_led_rank_w)); + map(0x6004, 0x6004).w(FUNC(namco_30test_state::namco_30test_lamps_w)); map(0x8000, 0xffff).rom(); } void namco_30test_state::namco_30test_io(address_map &map) { - map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).r(this, FUNC(namco_30test_state::namco_30test_mux_r)); + map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).r(FUNC(namco_30test_state::namco_30test_mux_r)); // AM_RANGE(MC68HC11_IO_PORTD,MC68HC11_IO_PORTD) AM_RAM map(MC68HC11_IO_PORTE, MC68HC11_IO_PORTE).portr("SYSTEM"); } diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index 15ba7da8921..2ad3731991f 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -1465,13 +1465,13 @@ void _39in1_state::_39in1_map(address_map &map) { map(0x00000000, 0x0007ffff).rom(); map(0x00400000, 0x005fffff).rom().region("data", 0); - map(0x04000000, 0x047fffff).rw(this, FUNC(_39in1_state::cpld_r), FUNC(_39in1_state::cpld_w)); - map(0x40000000, 0x400002ff).rw(this, FUNC(_39in1_state::pxa255_dma_r), FUNC(_39in1_state::pxa255_dma_w)); - map(0x40400000, 0x40400083).rw(this, FUNC(_39in1_state::pxa255_i2s_r), FUNC(_39in1_state::pxa255_i2s_w)); - map(0x40a00000, 0x40a0001f).rw(this, FUNC(_39in1_state::pxa255_ostimer_r), FUNC(_39in1_state::pxa255_ostimer_w)); - map(0x40d00000, 0x40d00017).rw(this, FUNC(_39in1_state::pxa255_intc_r), FUNC(_39in1_state::pxa255_intc_w)); - map(0x40e00000, 0x40e0006b).rw(this, FUNC(_39in1_state::pxa255_gpio_r), FUNC(_39in1_state::pxa255_gpio_w)); - map(0x44000000, 0x4400021f).rw(this, FUNC(_39in1_state::pxa255_lcd_r), FUNC(_39in1_state::pxa255_lcd_w)); + map(0x04000000, 0x047fffff).rw(FUNC(_39in1_state::cpld_r), FUNC(_39in1_state::cpld_w)); + map(0x40000000, 0x400002ff).rw(FUNC(_39in1_state::pxa255_dma_r), FUNC(_39in1_state::pxa255_dma_w)); + map(0x40400000, 0x40400083).rw(FUNC(_39in1_state::pxa255_i2s_r), FUNC(_39in1_state::pxa255_i2s_w)); + map(0x40a00000, 0x40a0001f).rw(FUNC(_39in1_state::pxa255_ostimer_r), FUNC(_39in1_state::pxa255_ostimer_w)); + map(0x40d00000, 0x40d00017).rw(FUNC(_39in1_state::pxa255_intc_r), FUNC(_39in1_state::pxa255_intc_w)); + map(0x40e00000, 0x40e0006b).rw(FUNC(_39in1_state::pxa255_gpio_r), FUNC(_39in1_state::pxa255_gpio_w)); + map(0x44000000, 0x4400021f).rw(FUNC(_39in1_state::pxa255_lcd_r), FUNC(_39in1_state::pxa255_lcd_w)); map(0xa0000000, 0xa07fffff).ram().share("ram"); } diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp index 79fd8a698f5..88fbe234c6c 100644 --- a/src/mame/drivers/3do.cpp +++ b/src/mame/drivers/3do.cpp @@ -113,11 +113,11 @@ void _3do_state::_3do_mem(address_map &map) map(0x00200000, 0x003FFFFF).ram().share("vram"); /* VRAM */ map(0x03000000, 0x030FFFFF).bankr("bank2"); /* BIOS */ map(0x03100000, 0x0313FFFF).ram(); /* Brooktree? */ - map(0x03140000, 0x0315FFFF).rw(this, FUNC(_3do_state::_3do_nvarea_r), FUNC(_3do_state::_3do_nvarea_w)).umask32(0x000000ff); /* NVRAM */ - map(0x03180000, 0x031BFFFF).rw(this, FUNC(_3do_state::_3do_slow2_r), FUNC(_3do_state::_3do_slow2_w)); /* Slow bus - additional expansion */ - map(0x03200000, 0x0320FFFF).rw(this, FUNC(_3do_state::_3do_svf_r), FUNC(_3do_state::_3do_svf_w)); /* special vram access1 */ - map(0x03300000, 0x033FFFFF).rw(this, FUNC(_3do_state::_3do_madam_r), FUNC(_3do_state::_3do_madam_w)); /* address decoder */ - map(0x03400000, 0x034FFFFF).rw(this, FUNC(_3do_state::_3do_clio_r), FUNC(_3do_state::_3do_clio_w)); /* io controller */ + map(0x03140000, 0x0315FFFF).rw(FUNC(_3do_state::_3do_nvarea_r), FUNC(_3do_state::_3do_nvarea_w)).umask32(0x000000ff); /* NVRAM */ + map(0x03180000, 0x031BFFFF).rw(FUNC(_3do_state::_3do_slow2_r), FUNC(_3do_state::_3do_slow2_w)); /* Slow bus - additional expansion */ + map(0x03200000, 0x0320FFFF).rw(FUNC(_3do_state::_3do_svf_r), FUNC(_3do_state::_3do_svf_w)); /* special vram access1 */ + map(0x03300000, 0x033FFFFF).rw(FUNC(_3do_state::_3do_madam_r), FUNC(_3do_state::_3do_madam_w)); /* address decoder */ + map(0x03400000, 0x034FFFFF).rw(FUNC(_3do_state::_3do_clio_r), FUNC(_3do_state::_3do_clio_w)); /* io controller */ } diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp index 12f5455f6a9..7fd86419adb 100644 --- a/src/mame/drivers/3x3puzzl.cpp +++ b/src/mame/drivers/3x3puzzl.cpp @@ -218,13 +218,13 @@ void _3x3puzzle_state::_3x3puzzle_map(address_map &map) map(0x202000, 0x202fff).ram().share("videoram3"); map(0x280000, 0x280001).portr("VBLANK"); map(0x300000, 0x3005ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x400000, 0x400001).w(this, FUNC(_3x3puzzle_state::tilemap1_scrollx_w)); - map(0x480000, 0x480001).w(this, FUNC(_3x3puzzle_state::tilemap1_scrolly_w)); + map(0x400000, 0x400001).w(FUNC(_3x3puzzle_state::tilemap1_scrollx_w)); + map(0x480000, 0x480001).w(FUNC(_3x3puzzle_state::tilemap1_scrolly_w)); map(0x500000, 0x500001).portr("P1"); map(0x580000, 0x580001).portr("SYS"); map(0x600000, 0x600001).portr("DSW01"); map(0x700001, 0x700001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x800000, 0x800001).w(this, FUNC(_3x3puzzle_state::gfx_ctrl_w)); + map(0x800000, 0x800001).w(FUNC(_3x3puzzle_state::gfx_ctrl_w)); map(0x880000, 0x880001).nopr(); // read, but no tested afterwards } diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp index 2fe4e672e3c..a31d15659f2 100644 --- a/src/mame/drivers/4004clk.cpp +++ b/src/mame/drivers/4004clk.cpp @@ -103,13 +103,13 @@ void nixieclock_state::_4004clk_rp(address_map &map) { map.unmap_value_high(); map(0x0000, 0x000f).mirror(0x0700).portr("INPUT"); - map(0x0000, 0x00ef).mirror(0x0700).w(this, FUNC(nixieclock_state::nixie_w)); - map(0x00f0, 0x00ff).mirror(0x0700).w(this, FUNC(nixieclock_state::neon_w)); + map(0x0000, 0x00ef).mirror(0x0700).w(FUNC(nixieclock_state::nixie_w)); + map(0x00f0, 0x00ff).mirror(0x0700).w(FUNC(nixieclock_state::neon_w)); } void nixieclock_state::_4004clk_mp(address_map &map) { - map(0x00, 0x00).w("dac", FUNC(dac_bit_interface::write)); + map(0x00, 0x00).w("dac", FUNC(dac_bit_interface::data_w)); } /* Input ports */ diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp index c4f347ea1b4..565b2fdaa4c 100644 --- a/src/mame/drivers/40love.cpp +++ b/src/mame/drivers/40love.cpp @@ -331,27 +331,27 @@ void fortyl_state::_40love_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); /* M5517P on main board */ map(0x8800, 0x8800).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0x8801, 0x8801).rw(this, FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_mcu_w)); //pixel layer related - map(0x8802, 0x8802).w(this, FUNC(fortyl_state::bank_select_w)); - map(0x8803, 0x8803).rw(this, FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related + map(0x8801, 0x8801).rw(FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_mcu_w)); //pixel layer related + map(0x8802, 0x8802).w(FUNC(fortyl_state::bank_select_w)); + map(0x8803, 0x8803).rw(FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related map(0x8804, 0x8804).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0x8804, 0x8804).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x8805, 0x8805).r(this, FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //???? + map(0x8805, 0x8805).r(FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //???? map(0x8807, 0x8807).nopr(); /* unknown */ map(0x8808, 0x8808).portr("DSW3"); map(0x8809, 0x8809).portr("P1"); map(0x880a, 0x880a).portr("SYSTEM"); map(0x880b, 0x880b).portr("P2"); - map(0x880c, 0x880c).portr("DSW1").w(this, FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */ + map(0x880c, 0x880c).portr("DSW1").w(FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */ map(0x880d, 0x880d).portr("DSW2").nopw(); /* unknown */ - map(0x9000, 0x97ff).rw(this, FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */ + map(0x9000, 0x97ff).rw(FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */ map(0x9800, 0x983f).ram().share("video_ctrl"); /* video control area */ map(0x9840, 0x987f).ram().share("spriteram"); /* sprites part 1 */ - map(0x9880, 0x98bf).rw(this, FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */ + map(0x9880, 0x98bf).rw(FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */ map(0x98c0, 0x98ff).ram().share("spriteram2");/* sprites part 2 */ map(0xa000, 0xbfff).bankr("bank1"); //AM_RANGE(0xbf00, 0xbfff) writes here when zooms-in/out, left-over or pixel line clearance? - map(0xc000, 0xffff).rw(this, FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w)); /* banked pixel layer */ + map(0xc000, 0xffff).rw(FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w)); /* banked pixel layer */ } void fortyl_state::undoukai_map(address_map &map) @@ -360,25 +360,25 @@ void fortyl_state::undoukai_map(address_map &map) map(0x8000, 0x9fff).bankr("bank1"); map(0xa000, 0xa7ff).ram().share("mcu_ram"); /* M5517P on main board */ map(0xa800, 0xa800).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0xa801, 0xa801).rw(this, FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_w)); //pixel layer related - map(0xa802, 0xa802).w(this, FUNC(fortyl_state::bank_select_w)); - map(0xa803, 0xa803).rw(this, FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related + map(0xa801, 0xa801).rw(FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_w)); //pixel layer related + map(0xa802, 0xa802).w(FUNC(fortyl_state::bank_select_w)); + map(0xa803, 0xa803).rw(FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related map(0xa804, 0xa804).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0xa804, 0xa804).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xa805, 0xa805).r(this, FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //???? + map(0xa805, 0xa805).r(FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //???? map(0xa807, 0xa807).nopr().nopw(); /* unknown */ map(0xa808, 0xa808).portr("DSW3"); map(0xa809, 0xa809).portr("P1"); map(0xa80a, 0xa80a).portr("SYSTEM"); map(0xa80b, 0xa80b).portr("P2"); - map(0xa80c, 0xa80c).portr("DSW1").w(this, FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */ + map(0xa80c, 0xa80c).portr("DSW1").w(FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */ map(0xa80d, 0xa80d).portr("DSW2").nopw(); /* unknown */ - map(0xb000, 0xb7ff).rw(this, FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */ + map(0xb000, 0xb7ff).rw(FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */ map(0xb800, 0xb83f).ram().share("video_ctrl"); /* video control area */ map(0xb840, 0xb87f).ram().share("spriteram"); /* sprites part 1 */ - map(0xb880, 0xb8bf).rw(this, FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */ + map(0xb880, 0xb8bf).rw(FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */ map(0xb8e0, 0xb8ff).ram().share("spriteram2"); /* sprites part 2 */ - map(0xc000, 0xffff).rw(this, FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w)); + map(0xc000, 0xffff).rw(FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w)); } WRITE8_MEMBER(fortyl_state::sound_control_0_w) @@ -429,14 +429,14 @@ void fortyl_state::sound_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xc800, 0xc801).w(m_ay, FUNC(ay8910_device::address_data_w)); map(0xca00, 0xca0d).w(m_msm, FUNC(msm5232_device::write)); - map(0xcc00, 0xcc00).w(this, FUNC(fortyl_state::sound_control_0_w)); - map(0xce00, 0xce00).w(this, FUNC(fortyl_state::sound_control_1_w)); + map(0xcc00, 0xcc00).w(FUNC(fortyl_state::sound_control_0_w)); + map(0xce00, 0xce00).w(FUNC(fortyl_state::sound_control_1_w)); map(0xd800, 0xd800).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xd800, 0xd800).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); map(0xda00, 0xda00).nopr(); // unknown read map(0xda00, 0xda00).w("soundnmi", FUNC(input_merger_device::in_set<1>)); // enable NMI map(0xdc00, 0xdc00).w("soundnmi", FUNC(input_merger_device::in_clear<1>)); // disable NMI - map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::write)); /* signed 8-bit DAC - unknown read */ + map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::data_w)); /* signed 8-bit DAC - unknown read */ map(0xe000, 0xefff).rom(); /* space for diagnostics ROM */ } diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index d69d50d5f29..d3354aa2ca9 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -220,9 +220,9 @@ void sgi_ip6_state::machine_reset() void sgi_ip6_state::sgi_ip6_map(address_map &map) { - map(0x1f880000, 0x1f880003).rw(this, FUNC(sgi_ip6_state::ip6_unk1_r), FUNC(sgi_ip6_state::ip6_unk1_w)); - map(0x1fb00000, 0x1fb00003).rw(this, FUNC(sgi_ip6_state::ip6_unk3_r), FUNC(sgi_ip6_state::ip6_unk3_w)); - map(0x1fbc004c, 0x1fbc004f).rw(this, FUNC(sgi_ip6_state::ip6_unk2_r), FUNC(sgi_ip6_state::ip6_unk2_w)); + map(0x1f880000, 0x1f880003).rw(FUNC(sgi_ip6_state::ip6_unk1_r), FUNC(sgi_ip6_state::ip6_unk1_w)); + map(0x1fb00000, 0x1fb00003).rw(FUNC(sgi_ip6_state::ip6_unk3_r), FUNC(sgi_ip6_state::ip6_unk3_w)); + map(0x1fbc004c, 0x1fbc004f).rw(FUNC(sgi_ip6_state::ip6_unk2_r), FUNC(sgi_ip6_state::ip6_unk2_w)); map(0x1fc00000, 0x1fc3ffff).rom().region("user1", 0); } diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp index 06d2190a9e6..b37fab2bed5 100644 --- a/src/mame/drivers/4enlinea.cpp +++ b/src/mame/drivers/4enlinea.cpp @@ -356,7 +356,7 @@ void _4enlinea_state::main_map(address_map &map) // AM_RANGE(0x8000, 0xbfff) AM_RAM // CGA VRAM map(0xc000, 0xdfff).ram(); - map(0xe000, 0xe001).r(this, FUNC(_4enlinea_state::serial_r)); + map(0xe000, 0xe001).r(FUNC(_4enlinea_state::serial_r)); } void _4enlinea_state::main_portmap(address_map &map) @@ -394,10 +394,10 @@ void _4enlinea_state::audio_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xf800, 0xfbff).ram(); - map(0xfc24, 0xfc24).r(this, FUNC(_4enlinea_state::hack_r)); - map(0xfc28, 0xfc28).r(this, FUNC(_4enlinea_state::hack_r)); - map(0xfc30, 0xfc31).w(this, FUNC(_4enlinea_state::serial_w)); - map(0xfc32, 0xfc32).rw(this, FUNC(_4enlinea_state::serial_status_r), FUNC(_4enlinea_state::serial_status_w)); + map(0xfc24, 0xfc24).r(FUNC(_4enlinea_state::hack_r)); + map(0xfc28, 0xfc28).r(FUNC(_4enlinea_state::hack_r)); + map(0xfc30, 0xfc31).w(FUNC(_4enlinea_state::serial_w)); + map(0xfc32, 0xfc32).rw(FUNC(_4enlinea_state::serial_status_r), FUNC(_4enlinea_state::serial_status_w)); map(0xfc48, 0xfc49).rw(m_ay, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); } diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp index 609e23271b3..64102cf68e1 100644 --- a/src/mame/drivers/4enraya.cpp +++ b/src/mame/drivers/4enraya.cpp @@ -252,7 +252,7 @@ WRITE8_MEMBER(_4enraya_state::fenraya_custom_map_w) void _4enraya_state::main_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(_4enraya_state::fenraya_custom_map_r), FUNC(_4enraya_state::fenraya_custom_map_w)); + map(0x0000, 0xffff).rw(FUNC(_4enraya_state::fenraya_custom_map_r), FUNC(_4enraya_state::fenraya_custom_map_w)); } void _4enraya_state::main_portmap(address_map &map) @@ -261,8 +261,8 @@ void _4enraya_state::main_portmap(address_map &map) map(0x00, 0x00).portr("DSW"); map(0x01, 0x01).portr("INPUTS"); map(0x02, 0x02).portr("SYSTEM"); - map(0x23, 0x23).w(this, FUNC(_4enraya_state::sound_data_w)); - map(0x33, 0x33).w(this, FUNC(_4enraya_state::sound_control_w)); + map(0x23, 0x23).w(FUNC(_4enraya_state::sound_data_w)); + map(0x33, 0x33).w(FUNC(_4enraya_state::sound_control_w)); } @@ -270,7 +270,7 @@ void unk_gambl_state::unkpacg_main_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x6000, 0x67ff).ram().share("nvram"); - map(0x7000, 0x7fff).w(this, FUNC(_4enraya_state::fenraya_videoram_w)); + map(0x7000, 0x7fff).w(FUNC(_4enraya_state::fenraya_videoram_w)); map(0x8000, 0x9fff).rom(); } diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp index 83c5601084c..7661c6117b8 100644 --- a/src/mame/drivers/4roses.cpp +++ b/src/mame/drivers/4roses.cpp @@ -243,8 +243,8 @@ void _4roses_state::_4roses_map(address_map &map) map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w)); map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x4000, 0x4fff).ram().w(this, FUNC(_4roses_state::funworld_videoram_w)).share("videoram"); - map(0x5000, 0x5fff).ram().w(this, FUNC(_4roses_state::funworld_colorram_w)).share("colorram"); + map(0x4000, 0x4fff).ram().w(FUNC(_4roses_state::funworld_videoram_w)).share("videoram"); + map(0x5000, 0x5fff).ram().w(FUNC(_4roses_state::funworld_colorram_w)).share("colorram"); map(0x6000, 0xffff).rom().region("maincpu", 0x6000); } @@ -284,7 +284,7 @@ READ8_MEMBER(_4roses_state::_4roses_opcode_r) void _4roses_state::_4roses_opcodes_map(address_map &map) { - map(0x0000, 0x7fff).r(this, FUNC(_4roses_state::_4roses_opcode_r)); + map(0x0000, 0x7fff).r(FUNC(_4roses_state::_4roses_opcode_r)); map(0x8000, 0xffff).rom().region("maincpu", 0x8000); } @@ -296,8 +296,8 @@ void rugby_state::rugby_map(address_map &map) map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x2000, 0xffff).rom().region("maincpu", 0x2000); - map(0x6000, 0x6fff).ram().w(this, FUNC(_4roses_state::funworld_videoram_w)).share("videoram"); - map(0x7000, 0x7fff).ram().w(this, FUNC(_4roses_state::funworld_colorram_w)).share("colorram"); + map(0x6000, 0x6fff).ram().w(FUNC(_4roses_state::funworld_videoram_w)).share("videoram"); + map(0x7000, 0x7fff).ram().w(FUNC(_4roses_state::funworld_colorram_w)).share("colorram"); } READ8_MEMBER(rugby_state::rugby_opcode_r) @@ -310,7 +310,7 @@ READ8_MEMBER(rugby_state::rugby_opcode_r) void rugby_state::rugby_opcodes_map(address_map &map) { - map(0x0000, 0x7fff).r(this, FUNC(rugby_state::rugby_opcode_r)); + map(0x0000, 0x7fff).r(FUNC(rugby_state::rugby_opcode_r)); map(0x8000, 0xffff).rom().region("maincpu", 0x8000); } diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index e07c6a41c21..61c99ab4ef6 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -763,12 +763,12 @@ void _5clown_state::fclown_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(_5clown_state::fclown_videoram_w)).share("videoram"); /* Init'ed at $2042 */ - map(0x1800, 0x1bff).ram().w(this, FUNC(_5clown_state::fclown_colorram_w)).share("colorram"); /* Init'ed at $2054 */ + map(0x1000, 0x13ff).ram().w(FUNC(_5clown_state::fclown_videoram_w)).share("videoram"); /* Init'ed at $2042 */ + map(0x1800, 0x1bff).ram().w(FUNC(_5clown_state::fclown_colorram_w)).share("colorram"); /* Init'ed at $2054 */ map(0x2000, 0x7fff).rom(); /* ROM space */ - map(0xc048, 0xc048).w(this, FUNC(_5clown_state::cpu_c048_w)); - map(0xd800, 0xd800).w(this, FUNC(_5clown_state::cpu_d800_w)); + map(0xc048, 0xc048).w(FUNC(_5clown_state::cpu_c048_w)); + map(0xd800, 0xd800).w(FUNC(_5clown_state::cpu_d800_w)); map(0xc400, 0xc400).portr("SW1"); /* DIP Switches bank */ map(0xcc00, 0xcc00).portr("SW2"); /* DIP Switches bank */ @@ -835,11 +835,11 @@ void _5clown_state::fclown_map(address_map &map) void _5clown_state::fcaudio_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x0800, 0x0800).w(this, FUNC(_5clown_state::snd_800_w)); - map(0x0a02, 0x0a02).w(this, FUNC(_5clown_state::snd_a02_w)); + map(0x0800, 0x0800).w(FUNC(_5clown_state::snd_800_w)); + map(0x0a02, 0x0a02).w(FUNC(_5clown_state::snd_a02_w)); map(0x0c04, 0x0c04).w("oki6295", FUNC(okim6295_device::write)); map(0x0c06, 0x0c06).r("oki6295", FUNC(okim6295_device::read)); - map(0x0e06, 0x0e06).r(this, FUNC(_5clown_state::snd_e06_r)); + map(0x0e06, 0x0e06).r(FUNC(_5clown_state::snd_e06_r)); map(0xe000, 0xffff).rom(); /* ROM space */ } diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index 72174600ad8..a1e24e05481 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -374,9 +374,9 @@ void _8080bw_state::invadpt2_io_map(address_map &map) map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -445,9 +445,9 @@ void _8080bw_state::spacerng_io_map(address_map &map) map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::spacerng_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::spacerng_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -472,9 +472,9 @@ void _8080bw_state::spcewars_io_map(address_map &map) map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::spcewars_sh_port_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::spcewars_sh_port_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w)); } @@ -531,8 +531,8 @@ void _8080bw_state::spcewarla_io_map(address_map &map) map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2"); - map(0x04, 0x04).w(this, FUNC(_8080bw_state::spcewars_sh_port_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w)); + map(0x04, 0x04).w(FUNC(_8080bw_state::spcewars_sh_port_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w)); map(0x06, 0x06).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x08, 0x08).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x0c, 0x0c).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); @@ -565,8 +565,8 @@ void _8080bw_state::astropal_io_map(address_map &map) map(0x01, 0x01).mirror(0x04).portr("IN1"); map(0x03, 0x03).mirror(0x04).portr("IN3"); - map(0x03, 0x03).w(this, FUNC(_8080bw_state::invaders_audio_1_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invaders_audio_2_w)); + map(0x03, 0x03).w(FUNC(_8080bw_state::invaders_audio_1_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invaders_audio_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -637,8 +637,8 @@ void _8080bw_state::cosmo_io_map(address_map &map) map(0x00, 0x00).portr("IN0").nopw(); map(0x01, 0x01).portr("IN1").nopw(); map(0x02, 0x02).portr("IN2").nopw(); - map(0x03, 0x03).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::cosmo_sh_port_2_w)); + map(0x03, 0x03).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::cosmo_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x07, 0x07).nopw(); } @@ -816,8 +816,8 @@ void _8080bw_state::spacecom_map(address_map &map) void _8080bw_state::spacecom_io_map(address_map &map) { map(0x41, 0x41).portr("IN0"); - map(0x42, 0x42).portr("IN1").w(this, FUNC(_8080bw_state::invaders_audio_1_w)); - map(0x44, 0x44).portr("IN2").w(this, FUNC(_8080bw_state::invaders_audio_2_w)); + map(0x42, 0x42).portr("IN1").w(FUNC(_8080bw_state::invaders_audio_1_w)); + map(0x44, 0x44).portr("IN2").w(FUNC(_8080bw_state::invaders_audio_2_w)); } MACHINE_CONFIG_START(_8080bw_state::spacecom) @@ -872,10 +872,10 @@ void _8080bw_state::invrvnge_io_map(address_map &map) { map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); - map(0x02, 0x02).r(this, FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invrvnge_sh_port_1_w)); + map(0x02, 0x02).r(FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invrvnge_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invrvnge_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invrvnge_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -1068,8 +1068,8 @@ void _8080bw_state::starw1_io_map(address_map &map) map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2"); map(0x03, 0x03).nopw(); /* writes 9B at boot */ - map(0x04, 0x04).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w)); + map(0x04, 0x04).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x07, 0x07).nopw(); /* writes 89 at boot */ } @@ -1098,9 +1098,9 @@ void _8080bw_state::lrescue_io_map(address_map &map) map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::lrescue_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::lrescue_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::lrescue_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::lrescue_sh_port_2_w)); } @@ -1235,13 +1235,13 @@ void _8080bw_state::cosmicmo_io_map(address_map &map) map.global_mask(0x7); map(0x00, 0x00).mirror(0x04).portr("IN0"); map(0x01, 0x01).mirror(0x04).portr("IN1"); - map(0x02, 0x02).mirror(0x04).r(this, FUNC(_8080bw_state::invrvnge_02_r)); + map(0x02, 0x02).mirror(0x04).r(FUNC(_8080bw_state::invrvnge_02_r)); map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).w(this, FUNC(_8080bw_state::invaders_audio_1_w)); + map(0x03, 0x03).w(FUNC(_8080bw_state::invaders_audio_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::cosmicmo_05_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::cosmicmo_05_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -1357,19 +1357,19 @@ void _8080bw_state::rollingc_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x3fff).ram().share("main_ram"); map(0x4000, 0x5fff).rom(); - map(0xa000, 0xbfff).rw(this, FUNC(_8080bw_state::rollingc_scattered_colorram_r), FUNC(_8080bw_state::rollingc_scattered_colorram_w)); - map(0xe000, 0xffff).rw(this, FUNC(_8080bw_state::rollingc_scattered_colorram2_r), FUNC(_8080bw_state::rollingc_scattered_colorram2_w)); + map(0xa000, 0xbfff).rw(FUNC(_8080bw_state::rollingc_scattered_colorram_r), FUNC(_8080bw_state::rollingc_scattered_colorram_w)); + map(0xe000, 0xffff).rw(FUNC(_8080bw_state::rollingc_scattered_colorram2_r), FUNC(_8080bw_state::rollingc_scattered_colorram2_w)); } void _8080bw_state::rollingc_io_map(address_map &map) { - map(0x00, 0x00).portr("IN0").w(this, FUNC(_8080bw_state::rollingc_sh_port_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(_8080bw_state::rollingc_sh_port_w)); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w)); } @@ -1446,7 +1446,7 @@ void _8080bw_state::schaser_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x3fff).ram().share("main_ram"); map(0x4000, 0x5fff).rom(); - map(0xc000, 0xdfff).rw(this, FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w)); + map(0xc000, 0xdfff).rw(FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w)); } @@ -1455,9 +1455,9 @@ void _8080bw_state::schaser_io_map(address_map &map) map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::schaser_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::schaser_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::schaser_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::schaser_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -1609,10 +1609,10 @@ void _8080bw_state::schasercv_io_map(address_map &map) { map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); - map(0x02, 0x02).r(this, FUNC(_8080bw_state::schasercv_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::schasercv_sh_port_1_w)); + map(0x02, 0x02).r(FUNC(_8080bw_state::schasercv_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::schasercv_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::schasercv_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::schasercv_sh_port_2_w)); //map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -1620,9 +1620,9 @@ void _8080bw_state::crashrd_io_map(address_map &map) { map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::crashrd_port03_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::crashrd_port03_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::crashrd_port05_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::crashrd_port05_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -1734,7 +1734,7 @@ void _8080bw_state::sflush_map(address_map &map) map(0x801a, 0x801a).nopw(); map(0x801c, 0x801c).nopw(); map(0x801d, 0x801d).nopw(); - map(0xa000, 0xbfff).rw(this, FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w)); + map(0xa000, 0xbfff).rw(FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w)); map(0xd800, 0xffff).rom(); } @@ -1817,12 +1817,12 @@ MACHINE_CONFIG_END void _8080bw_state::lupin3_io_map(address_map &map) { - map(0x00, 0x00).portr("IN0").w(this, FUNC(_8080bw_state::lupin3_00_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(_8080bw_state::lupin3_00_w)); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::lupin3_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::lupin3_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::lupin3_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::lupin3_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -1983,13 +1983,13 @@ READ8_MEMBER(_8080bw_state::polaris_port00_r) // Probably an unfinished feature. void _8080bw_state::polaris_io_map(address_map &map) { - map(0x00, 0x00).r(this, FUNC(_8080bw_state::polaris_port00_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); + map(0x00, 0x00).r(FUNC(_8080bw_state::polaris_port00_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x01, 0x01).portr("IN1"); - map(0x02, 0x02).portr("IN2").w(this, FUNC(_8080bw_state::polaris_sh_port_1_w)); + map(0x02, 0x02).portr("IN2").w(FUNC(_8080bw_state::polaris_sh_port_1_w)); map(0x03, 0x03).rw(m_mb14241, FUNC(mb14241_device::shift_result_r), FUNC(mb14241_device::shift_data_w)); - map(0x04, 0x04).w(this, FUNC(_8080bw_state::polaris_sh_port_2_w)); + map(0x04, 0x04).w(FUNC(_8080bw_state::polaris_sh_port_2_w)); map(0x05, 0x05).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x06, 0x06).w(this, FUNC(_8080bw_state::polaris_sh_port_3_w)); + map(0x06, 0x06).w(FUNC(_8080bw_state::polaris_sh_port_3_w)); } @@ -2161,11 +2161,11 @@ INPUT_PORTS_END void _8080bw_state::ballbomb_io_map(address_map &map) { map(0x00, 0x00).portr("IN0"); - map(0x01, 0x01).portr("IN1").w(this, FUNC(_8080bw_state::ballbomb_01_w)); + map(0x01, 0x01).portr("IN1").w(FUNC(_8080bw_state::ballbomb_01_w)); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::ballbomb_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::ballbomb_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::ballbomb_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::ballbomb_sh_port_2_w)); } @@ -2223,8 +2223,8 @@ void _8080bw_state::yosakdon_io_map(address_map &map) { map(0x01, 0x01).portr("IN0"); map(0x02, 0x02).portr("IN1"); - map(0x03, 0x03).w(this, FUNC(_8080bw_state::yosakdon_sh_port_1_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::yosakdon_sh_port_2_w)); + map(0x03, 0x03).w(FUNC(_8080bw_state::yosakdon_sh_port_1_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::yosakdon_sh_port_2_w)); map(0x06, 0x06).nopw(); /* character numbers */ } @@ -2405,24 +2405,24 @@ READ8_MEMBER(_8080bw_state::indianbtbr_01_r) void _8080bw_state::indianbt_io_map(address_map &map) { - map(0x00, 0x00).r(this, FUNC(_8080bw_state::indianbt_r)); + map(0x00, 0x00).r(FUNC(_8080bw_state::indianbt_r)); map(0x01, 0x01).portr("IN1"); - map(0x02, 0x02).r(this, FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::indianbt_sh_port_1_w)); + map(0x02, 0x02).r(FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::indianbt_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::indianbt_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::indianbt_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x07, 0x07).w(this, FUNC(_8080bw_state::indianbt_sh_port_3_w)); + map(0x07, 0x07).w(FUNC(_8080bw_state::indianbt_sh_port_3_w)); } void _8080bw_state::indianbtbr_io_map(address_map &map) { map(0x00, 0x00).portr("IN0"); - map(0x01, 0x01).r(this, FUNC(_8080bw_state::indianbtbr_01_r)); + map(0x01, 0x01).r(FUNC(_8080bw_state::indianbtbr_01_r)); map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::indianbtbr_sh_port_1_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::indianbtbr_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::indianbtbr_sh_port_2_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::indianbtbr_sh_port_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x07, 0x07).nopw(); } @@ -2492,11 +2492,11 @@ WRITE8_MEMBER(_8080bw_state::steelwkr_sh_port_3_w) void _8080bw_state::steelwkr_io_map(address_map &map) { map(0x01, 0x01).portr("IN1"); - map(0x02, 0x02).r(this, FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w)); + map(0x02, 0x02).r(FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); + map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w)); - map(0x06, 0x06).w(this, FUNC(_8080bw_state::steelwkr_sh_port_3_w)); + map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w)); + map(0x06, 0x06).w(FUNC(_8080bw_state::steelwkr_sh_port_3_w)); } static INPUT_PORTS_START( steelwkr ) @@ -2744,9 +2744,9 @@ void _8080bw_state::shuttlei_map(address_map &map) void _8080bw_state::shuttlei_io_map(address_map &map) { map(0xfc, 0xfc).nopw(); /* game writes 0xAA every so often (perhaps when base hit?) */ - map(0xfd, 0xfd).w(this, FUNC(_8080bw_state::shuttlei_sh_port_1_w)); - map(0xfe, 0xfe).portr("DSW").w(this, FUNC(_8080bw_state::shuttlei_sh_port_2_w)); - map(0xff, 0xff).rw(this, FUNC(_8080bw_state::shuttlei_ff_r), FUNC(_8080bw_state::shuttlei_ff_w)); + map(0xfd, 0xfd).w(FUNC(_8080bw_state::shuttlei_sh_port_1_w)); + map(0xfe, 0xfe).portr("DSW").w(FUNC(_8080bw_state::shuttlei_sh_port_2_w)); + map(0xff, 0xff).rw(FUNC(_8080bw_state::shuttlei_ff_r), FUNC(_8080bw_state::shuttlei_ff_w)); } @@ -2829,11 +2829,11 @@ void _8080bw_state::darthvdr_map(address_map &map) void _8080bw_state::darthvdr_io_map(address_map &map) { map(0x00, 0x00).portr("P1"); - map(0x01, 0x01).r(this, FUNC(_8080bw_state::darthvdr_01_r)); + map(0x01, 0x01).r(FUNC(_8080bw_state::darthvdr_01_r)); - map(0x00, 0x00).w(this, FUNC(_8080bw_state::darthvdr_00_w)); // flipscreen + map(0x00, 0x00).w(FUNC(_8080bw_state::darthvdr_00_w)); // flipscreen map(0x04, 0x04).nopw(); - map(0x08, 0x08).w(this, FUNC(_8080bw_state::darthvdr_08_w)); // sound + map(0x08, 0x08).w(FUNC(_8080bw_state::darthvdr_08_w)); // sound } @@ -2920,9 +2920,9 @@ void _8080bw_state::vortex_io_map(address_map &map) map(0x01, 0x01).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); map(0x00, 0x00).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x01, 0x01).w(this, FUNC(_8080bw_state::invaders_audio_1_w)); + map(0x01, 0x01).w(FUNC(_8080bw_state::invaders_audio_1_w)); map(0x06, 0x06).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x07, 0x07).w(this, FUNC(_8080bw_state::invaders_audio_2_w)); + map(0x07, 0x07).w(FUNC(_8080bw_state::invaders_audio_2_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -3202,11 +3202,11 @@ void _8080bw_state::claybust_io_map(address_map &map) { //AM_RANGE(0x00, 0x00) AM_WRITENOP // ? map(0x01, 0x01).portr("IN1").w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x02, 0x02).r(this, FUNC(_8080bw_state::claybust_gun_lo_r)).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); + map(0x02, 0x02).r(FUNC(_8080bw_state::claybust_gun_lo_r)).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); //AM_WRITENOP // port3 write looks sound-related map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); //AM_RANGE(0x05, 0x05) AM_WRITENOP // ? - map(0x06, 0x06).r(this, FUNC(_8080bw_state::claybust_gun_hi_r)); + map(0x06, 0x06).r(FUNC(_8080bw_state::claybust_gun_hi_r)); } @@ -3488,8 +3488,8 @@ void _8080bw_state::invmulti_map(address_map &map) map(0x0000, 0x1fff).mirror(0x8000).bankr("bank1"); map(0x2000, 0x3fff).mirror(0x8000).ram().share("main_ram"); map(0x4000, 0x5fff).mirror(0x8000).bankr("bank2"); - map(0x6000, 0x6000).mirror(0x1fff).rw(this, FUNC(_8080bw_state::invmulti_eeprom_r), FUNC(_8080bw_state::invmulti_eeprom_w)); - map(0xe000, 0xe000).mirror(0x1fff).w(this, FUNC(_8080bw_state::invmulti_bank_w)); + map(0x6000, 0x6000).mirror(0x1fff).rw(FUNC(_8080bw_state::invmulti_eeprom_r), FUNC(_8080bw_state::invmulti_eeprom_w)); + map(0xe000, 0xe000).mirror(0x1fff).w(FUNC(_8080bw_state::invmulti_bank_w)); } READ8_MEMBER(_8080bw_state::invmulti_eeprom_r) diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index b6b7997a12c..f9dfde1e34d 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -128,12 +128,12 @@ void _88games_state::main_map(address_map &map) map(0x1000, 0x1fff).w("palette", FUNC(palette_device::write8)).share("palette"); map(0x2000, 0x2fff).ram(); map(0x3000, 0x37ff).ram().share("nvram"); - map(0x3800, 0x3fff).rw(this, FUNC(_88games_state::bankedram_r), FUNC(_88games_state::bankedram_w)).share("ram"); - map(0x4000, 0x7fff).rw(this, FUNC(_88games_state::k052109_051960_r), FUNC(_88games_state::k052109_051960_w)); - map(0x5f84, 0x5f84).w(this, FUNC(_88games_state::k88games_5f84_w)); + map(0x3800, 0x3fff).rw(FUNC(_88games_state::bankedram_r), FUNC(_88games_state::bankedram_w)).share("ram"); + map(0x4000, 0x7fff).rw(FUNC(_88games_state::k052109_051960_r), FUNC(_88games_state::k052109_051960_w)); + map(0x5f84, 0x5f84).w(FUNC(_88games_state::k88games_5f84_w)); map(0x5f88, 0x5f88).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x5f8c, 0x5f8c).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x5f90, 0x5f90).w(this, FUNC(_88games_state::k88games_sh_irqtrigger_w)); + map(0x5f90, 0x5f90).w(FUNC(_88games_state::k88games_sh_irqtrigger_w)); map(0x5f94, 0x5f94).portr("IN0"); map(0x5f95, 0x5f95).portr("IN1"); map(0x5f96, 0x5f96).portr("IN2"); @@ -147,10 +147,10 @@ void _88games_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(_88games_state::speech_msg_w)); + map(0x9000, 0x9000).w(FUNC(_88games_state::speech_msg_w)); map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xe000, 0xe000).w(this, FUNC(_88games_state::speech_control_w)); + map(0xe000, 0xe000).w(FUNC(_88games_state::speech_control_w)); } diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp index d77e02c7a8c..79898e4f8df 100644 --- a/src/mame/drivers/a5105.cpp +++ b/src/mame/drivers/a5105.cpp @@ -56,7 +56,7 @@ public: , m_ram(*this, RAM_TAG) , m_gfxdecode(*this, "gfxdecode") , m_palette(*this, "palette") - { } + { } DECLARE_READ8_MEMBER(a5105_memsel_r); DECLARE_READ8_MEMBER(key_r); @@ -358,21 +358,21 @@ void a5105_state::a5105_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x40, 0x41).m(m_fdc, FUNC(upd765a_device::map)); - map(0x48, 0x4f).w(this, FUNC(a5105_state::a5105_upd765_w)); + map(0x48, 0x4f).w(FUNC(a5105_state::a5105_upd765_w)); map(0x80, 0x83).rw("z80ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x90, 0x93).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x98, 0x99).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); - map(0x9c, 0x9c).w(this, FUNC(a5105_state::pcg_val_w)); + map(0x9c, 0x9c).w(FUNC(a5105_state::pcg_val_w)); // AM_RANGE(0x9d, 0x9d) crtc area (ff-based), palette routes here - map(0x9e, 0x9e).w(this, FUNC(a5105_state::pcg_addr_w)); + map(0x9e, 0x9e).w(FUNC(a5105_state::pcg_addr_w)); // AM_RANGE(0xa0, 0xa1) ay8910? - map(0xa8, 0xa8).rw(this, FUNC(a5105_state::a5105_memsel_r), FUNC(a5105_state::a5105_memsel_w)); - map(0xa9, 0xa9).r(this, FUNC(a5105_state::key_r)); - map(0xaa, 0xaa).rw(this, FUNC(a5105_state::key_mux_r), FUNC(a5105_state::key_mux_w)); - map(0xab, 0xab).w(this, FUNC(a5105_state::a5105_ab_w)); //misc output, see above + map(0xa8, 0xa8).rw(FUNC(a5105_state::a5105_memsel_r), FUNC(a5105_state::a5105_memsel_w)); + map(0xa9, 0xa9).r(FUNC(a5105_state::key_r)); + map(0xaa, 0xaa).rw(FUNC(a5105_state::key_mux_r), FUNC(a5105_state::key_mux_w)); + map(0xab, 0xab).w(FUNC(a5105_state::a5105_ab_w)); //misc output, see above } /* Input ports */ diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp index 253b41cf41b..5d25f1bd37d 100644 --- a/src/mame/drivers/a6809.cpp +++ b/src/mame/drivers/a6809.cpp @@ -108,8 +108,8 @@ void a6809_state::a6809_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x03ff).ram(); map(0x0400, 0x07ff).ram().share("videoram"); - map(0x0800, 0x0800).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(a6809_state::a6809_address_w)); - map(0x0801, 0x0801).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(a6809_state::a6809_register_w)); + map(0x0800, 0x0800).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(a6809_state::a6809_address_w)); + map(0x0801, 0x0801).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(a6809_state::a6809_register_w)); map(0x0900, 0x090f).mirror(0xf0).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0xf000, 0xf7ff); // optional ROM map(0xf800, 0xffff).rom().region("maincpu", 0); diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp index e9687d5f093..b92b8bd587a 100644 --- a/src/mame/drivers/a7150.cpp +++ b/src/mame/drivers/a7150.cpp @@ -324,7 +324,7 @@ void a7150_state::a7150_io(address_map &map) map(0x00d0, 0x00d7).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0x00d8, 0x00d8).rw(m_uart8251, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x00da, 0x00da).rw(m_uart8251, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x0200, 0x0203).rw(this, FUNC(a7150_state::a7150_kgs_r), FUNC(a7150_state::a7150_kgs_w)).umask16(0x00ff); // ABS/KGS board + map(0x0200, 0x0203).rw(FUNC(a7150_state::a7150_kgs_r), FUNC(a7150_state::a7150_kgs_w)).umask16(0x00ff); // ABS/KGS board map(0x0300, 0x031f).unmaprw(); // ASP board #1 map(0x0320, 0x033f).unmaprw(); // ASP board #2 } @@ -362,7 +362,7 @@ void a7150_state::k7070_cpu_io(address_map &map) map.global_mask(0xff); map(0x0000, 0x0003).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0008, 0x000b).rw(Z80SIO_TAG, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); - map(0x0010, 0x0017).rw(this, FUNC(a7150_state::kgs_host_r), FUNC(a7150_state::kgs_host_w)); // p. 11 of KGS-K7070.pdf + map(0x0010, 0x0017).rw(FUNC(a7150_state::kgs_host_r), FUNC(a7150_state::kgs_host_w)); // p. 11 of KGS-K7070.pdf map(0x0020, 0x0021).noprw(); // address register map(0x0022, 0x0022).noprw(); // function register (p. 6 of ABG-K7072.pdf) @@ -481,8 +481,8 @@ MACHINE_CONFIG_START(a7150_state::a7150) // IFSP port on processor card MCFG_DEVICE_ADD("ppi8255", I8255, 0) -// MCFG_I8255_IN_PORTA_CB(READ8("cent_status_in", input_buffer_device, read)) -// MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write)) +// MCFG_I8255_IN_PORTA_CB(READ8("cent_status_in", input_buffer_device, bus_r)) +// MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, a7150_state, ppi_c_w)) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp index d2882a62d78..cbca0bd12c0 100644 --- a/src/mame/drivers/a7800.cpp +++ b/src/mame/drivers/a7800.cpp @@ -303,7 +303,7 @@ READ8_MEMBER(a7800_state::bios_or_cart_r) void a7800_state::a7800_mem(address_map &map) { - map(0x0000, 0x001f).mirror(0x300).rw(this, FUNC(a7800_state::tia_r), FUNC(a7800_state::tia_w)); + map(0x0000, 0x001f).mirror(0x300).rw(FUNC(a7800_state::tia_r), FUNC(a7800_state::tia_w)); map(0x0020, 0x003f).mirror(0x300).rw(m_maria, FUNC(atari_maria_device::read), FUNC(atari_maria_device::write)); map(0x0040, 0x00ff).bankrw("zpmirror"); // mirror of 0x2040-0x20ff, for zero page map(0x0140, 0x01ff).bankrw("spmirror"); // mirror of 0x2140-0x21ff, for stack page @@ -319,7 +319,7 @@ void a7800_state::a7800_mem(address_map &map) // and even then with inconsistent and unreliable results. map(0x4000, 0xffff).w(m_cart, FUNC(a78_cart_slot_device::write_40xx)); map(0x4000, 0xbfff).r(m_cart, FUNC(a78_cart_slot_device::read_40xx)); - map(0xc000, 0xffff).r(this, FUNC(a7800_state::bios_or_cart_r)); // here also the BIOS can be accessed + map(0xc000, 0xffff).r(FUNC(a7800_state::bios_or_cart_r)); // here also the BIOS can be accessed } diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp index 7e8e8ff89bf..1baf9417261 100644 --- a/src/mame/drivers/aa310.cpp +++ b/src/mame/drivers/aa310.cpp @@ -190,12 +190,12 @@ void aa310_state::machine_reset() void aa310_state::aa310_mem(address_map &map) { - map(0x00000000, 0x01ffffff).rw(this, FUNC(aa310_state::archimedes_memc_logical_r), FUNC(aa310_state::archimedes_memc_logical_w)); + map(0x00000000, 0x01ffffff).rw(FUNC(aa310_state::archimedes_memc_logical_r), FUNC(aa310_state::archimedes_memc_logical_w)); map(0x02000000, 0x02ffffff).ram().share("physicalram"); /* physical RAM - 16 MB for now, should be 512k for the A310 */ - map(0x03000000, 0x033fffff).rw(this, FUNC(aa310_state::archimedes_ioc_r), FUNC(aa310_state::archimedes_ioc_w)); - map(0x03400000, 0x035fffff).rom().region("extension", 0x000000).w(this, FUNC(aa310_state::archimedes_vidc_w)); - map(0x03600000, 0x037fffff).rom().region("extension", 0x200000).w(this, FUNC(aa310_state::archimedes_memc_w)); - map(0x03800000, 0x03ffffff).rom().region("maincpu", 0).w(this, FUNC(aa310_state::archimedes_memc_page_w)); + map(0x03000000, 0x033fffff).rw(FUNC(aa310_state::archimedes_ioc_r), FUNC(aa310_state::archimedes_ioc_w)); + map(0x03400000, 0x035fffff).rom().region("extension", 0x000000).w(FUNC(aa310_state::archimedes_vidc_w)); + map(0x03600000, 0x037fffff).rom().region("extension", 0x200000).w(FUNC(aa310_state::archimedes_memc_w)); + map(0x03800000, 0x03ffffff).rom().region("maincpu", 0).w(FUNC(aa310_state::archimedes_memc_page_w)); } diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index d674359a6a3..3e05c8470cd 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -130,10 +130,10 @@ READ8_MEMBER( abc1600_state::bus_r ) // card select pulse uint8_t cs = (m_cs7 << 7) | ((offset >> 5) & 0x3f); - m_bus0i->cs_w(cs); - m_bus0x->cs_w(cs); - m_bus1->cs_w(cs); - m_bus2->cs_w(cs); + m_bus0i->write_cs(cs); + m_bus0x->write_cs(cs); + m_bus1->write_cs(cs); + m_bus2->write_cs(cs); // card select b? m_csb = m_bus2->csb_r(); @@ -210,13 +210,13 @@ READ8_MEMBER( abc1600_state::bus_r ) case INP: if (m_bus0) { - data &= m_bus0i->inp_r(); - data &= m_bus0x->inp_r(); + data &= m_bus0i->read_inp(); + data &= m_bus0x->read_inp(); } else { - data &= m_bus1->inp_r(); - data &= m_bus2->inp_r(); + data &= m_bus1->read_inp(); + data &= m_bus2->read_inp(); } if (LOG) logerror("%s INP %02x: %02x\n", machine().describe_context(), cs, data); @@ -225,13 +225,13 @@ READ8_MEMBER( abc1600_state::bus_r ) case STAT: if (m_bus0) { - data &= m_bus0i->stat_r(); - data &= m_bus0x->stat_r(); + data &= m_bus0i->read_stat(); + data &= m_bus0x->read_stat(); } else { - data &= m_bus1->stat_r(); - data &= m_bus2->stat_r(); + data &= m_bus1->read_stat(); + data &= m_bus2->read_stat(); } if (LOG) logerror("%s STAT %02x: %02x\n", machine().describe_context(), cs, data); @@ -269,10 +269,10 @@ WRITE8_MEMBER( abc1600_state::bus_w ) { uint8_t cs = (m_cs7 << 7) | ((offset >> 5) & 0x3f); - m_bus0i->cs_w(cs); - m_bus0x->cs_w(cs); - m_bus1->cs_w(cs); - m_bus2->cs_w(cs); + m_bus0i->write_cs(cs); + m_bus0x->write_cs(cs); + m_bus1->write_cs(cs); + m_bus2->write_cs(cs); switch ((offset >> 1) & 0x07) { @@ -281,13 +281,13 @@ WRITE8_MEMBER( abc1600_state::bus_w ) if (m_bus0) { - m_bus0i->out_w(data); - m_bus0x->out_w(data); + m_bus0i->write_out(data); + m_bus0x->write_out(data); } else { - m_bus1->out_w(data); - m_bus2->out_w(data); + m_bus1->write_out(data); + m_bus2->write_out(data); } break; @@ -296,13 +296,13 @@ WRITE8_MEMBER( abc1600_state::bus_w ) if (m_bus0) { - m_bus0i->c1_w(data); - m_bus0x->c1_w(data); + m_bus0i->write_c1(data); + m_bus0x->write_c1(data); } else { - m_bus1->c1_w(data); - m_bus2->c1_w(data); + m_bus1->write_c1(data); + m_bus2->write_c1(data); } break; @@ -311,13 +311,13 @@ WRITE8_MEMBER( abc1600_state::bus_w ) if (m_bus0) { - m_bus0i->c2_w(data); - m_bus0x->c2_w(data); + m_bus0i->write_c2(data); + m_bus0x->write_c2(data); } else { - m_bus1->c2_w(data); - m_bus2->c2_w(data); + m_bus1->write_c2(data); + m_bus2->write_c2(data); } break; @@ -326,13 +326,13 @@ WRITE8_MEMBER( abc1600_state::bus_w ) if (m_bus0) { - m_bus0i->c3_w(data); - m_bus0x->c3_w(data); + m_bus0i->write_c3(data); + m_bus0x->write_c3(data); } else { - m_bus1->c3_w(data); - m_bus2->c3_w(data); + m_bus1->write_c3(data); + m_bus2->write_c3(data); } break; @@ -341,13 +341,13 @@ WRITE8_MEMBER( abc1600_state::bus_w ) if (m_bus0) { - m_bus0i->c4_w(data); - m_bus0x->c4_w(data); + m_bus0i->write_c4(data); + m_bus0x->write_c4(data); } else { - m_bus1->c4_w(data); - m_bus2->c4_w(data); + m_bus1->write_c4(data); + m_bus2->write_c4(data); } break; @@ -505,25 +505,25 @@ void abc1600_state::mac_mem(address_map &map) { map(0x000000, 0x0fffff).ram(); map(0x100000, 0x17ffff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::vram_map)); - map(0x1fe000, 0x1fefff).rw(this, FUNC(abc1600_state::bus_r), FUNC(abc1600_state::bus_w)); + map(0x1fe000, 0x1fefff).rw(FUNC(abc1600_state::bus_r), FUNC(abc1600_state::bus_w)); map(0x1ff000, 0x1ff000).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::status_r), FUNC(fd1797_device::cmd_w)); map(0x1ff002, 0x1ff002).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::track_r), FUNC(fd1797_device::track_w)); map(0x1ff004, 0x1ff004).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::sector_r), FUNC(fd1797_device::sector_w)); map(0x1ff006, 0x1ff006).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::data_r), FUNC(fd1797_device::data_w)); map(0x1ff100, 0x1ff101).mirror(0xfe).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::crtc_map)); - map(0x1ff200, 0x1ff207).mirror(0xf8).rw(this, FUNC(abc1600_state::dart_r), FUNC(abc1600_state::dart_w)); - map(0x1ff300, 0x1ff300).mirror(0xff).rw(m_dma0, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0x1ff400, 0x1ff400).mirror(0xff).rw(m_dma1, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0x1ff500, 0x1ff500).mirror(0xff).rw(m_dma2, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0x1ff600, 0x1ff607).mirror(0xf8).rw(this, FUNC(abc1600_state::scc_r), FUNC(abc1600_state::scc_w)); - map(0x1ff700, 0x1ff707).mirror(0xf8).rw(this, FUNC(abc1600_state::cio_r), FUNC(abc1600_state::cio_w)); + map(0x1ff200, 0x1ff207).mirror(0xf8).rw(FUNC(abc1600_state::dart_r), FUNC(abc1600_state::dart_w)); + map(0x1ff300, 0x1ff300).mirror(0xff).rw(m_dma0, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x1ff400, 0x1ff400).mirror(0xff).rw(m_dma1, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x1ff500, 0x1ff500).mirror(0xff).rw(m_dma2, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x1ff600, 0x1ff607).mirror(0xf8).rw(FUNC(abc1600_state::scc_r), FUNC(abc1600_state::scc_w)); + map(0x1ff700, 0x1ff707).mirror(0xf8).rw(FUNC(abc1600_state::cio_r), FUNC(abc1600_state::cio_w)); map(0x1ff800, 0x1ff8ff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::iowr0_map)); map(0x1ff900, 0x1ff9ff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::iowr1_map)); map(0x1ffa00, 0x1ffaff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::iowr2_map)); - map(0x1ffb00, 0x1ffb00).mirror(0x7e).w(this, FUNC(abc1600_state::fw0_w)); - map(0x1ffb01, 0x1ffb01).mirror(0x7e).w(this, FUNC(abc1600_state::fw1_w)); + map(0x1ffb00, 0x1ffb00).mirror(0x7e).w(FUNC(abc1600_state::fw0_w)); + map(0x1ffb01, 0x1ffb01).mirror(0x7e).w(FUNC(abc1600_state::fw1_w)); map(0x1ffd00, 0x1ffd07).mirror(0xf8).w(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dmamap_w)); - map(0x1ffe00, 0x1ffe00).mirror(0xff).w(this, FUNC(abc1600_state::spec_contr_reg_w)); + map(0x1ffe00, 0x1ffe00).mirror(0xff).w(FUNC(abc1600_state::spec_contr_reg_w)); } diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 3b841a84053..07b8368378b 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -180,7 +180,7 @@ WRITE8_MEMBER( abc80_state::csg_w ) void abc80_state::abc80_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(abc80_state::read), FUNC(abc80_state::write)); + map(0x0000, 0xffff).rw(FUNC(abc80_state::read), FUNC(abc80_state::write)); } @@ -198,7 +198,7 @@ void abc80_state::abc80_io(address_map &map) map(0x03, 0x03).w(m_bus, FUNC(abcbus_slot_device::c2_w)); map(0x04, 0x04).w(m_bus, FUNC(abcbus_slot_device::c3_w)); map(0x05, 0x05).w(m_bus, FUNC(abcbus_slot_device::c4_w)); - map(0x06, 0x06).w(this, FUNC(abc80_state::csg_w)); + map(0x06, 0x06).w(FUNC(abc80_state::csg_w)); map(0x07, 0x07).r(m_bus, FUNC(abcbus_slot_device::rst_r)); map(0x10, 0x13).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); } diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index f98d25966c4..cd096321610 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -478,7 +478,7 @@ WRITE8_MEMBER( abc806_state::mao_w ) void abc800_state::abc800_m1(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(abc800_state::m1_r)); + map(0x0000, 0xffff).r(FUNC(abc800_state::m1_r)); } @@ -510,9 +510,9 @@ void abc800_state::abc800c_io(address_map &map) map(0x03, 0x03).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w)); map(0x04, 0x04).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w)); map(0x05, 0x05).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w)); - map(0x05, 0x05).mirror(0x18).r(this, FUNC(abc800_state::pling_r)); - map(0x06, 0x06).mirror(0x18).w(this, FUNC(abc800_state::hrs_w)); - map(0x07, 0x07).mirror(0x18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(this, FUNC(abc800_state::hrc_w)); + map(0x05, 0x05).mirror(0x18).r(FUNC(abc800_state::pling_r)); + map(0x06, 0x06).mirror(0x18).w(FUNC(abc800_state::hrs_w)); + map(0x07, 0x07).mirror(0x18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(FUNC(abc800_state::hrc_w)); map(0x20, 0x23).mirror(0x0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0x40, 0x43).mirror(0x1c).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); map(0x60, 0x63).mirror(0x1c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); @@ -573,7 +573,7 @@ void abc802_state::abc802_io(address_map &map) map(0x03, 0x03).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w)); map(0x04, 0x04).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w)); map(0x05, 0x05).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w)); - map(0x05, 0x05).mirror(0x18).r(this, FUNC(abc800_state::pling_r)); + map(0x05, 0x05).mirror(0x18).r(FUNC(abc800_state::pling_r)); map(0x07, 0x07).mirror(0x18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)); map(0x20, 0x23).mirror(0x0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0x31, 0x31).mirror(0x06).r(m_crtc, FUNC(mc6845_device::register_r)); @@ -590,7 +590,7 @@ void abc802_state::abc802_io(address_map &map) void abc806_state::abc806_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(abc806_state::read), FUNC(abc806_state::write)); + map(0x0000, 0xffff).rw(FUNC(abc806_state::read), FUNC(abc806_state::write)); } @@ -607,15 +607,15 @@ void abc806_state::abc806_io(address_map &map) map(0x03, 0x03).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w)); map(0x04, 0x04).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w)); map(0x05, 0x05).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w)); - map(0x05, 0x05).mirror(0xff18).r(this, FUNC(abc800_state::pling_r)); - map(0x06, 0x06).mirror(0xff18).w(this, FUNC(abc806_state::hrs_w)); - map(0x07, 0x07).mirror(0xff18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(this, FUNC(abc806_state::hrc_w)); + map(0x05, 0x05).mirror(0xff18).r(FUNC(abc800_state::pling_r)); + map(0x06, 0x06).mirror(0xff18).w(FUNC(abc806_state::hrs_w)); + map(0x07, 0x07).mirror(0xff18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(FUNC(abc806_state::hrc_w)); map(0x20, 0x23).mirror(0xff0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0x31, 0x31).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::register_r)); - map(0x34, 0x34).select(0xff00).rw(this, FUNC(abc806_state::mai_r), FUNC(abc806_state::mao_w)); - map(0x35, 0x35).mirror(0xff00).rw(this, FUNC(abc806_state::ami_r), FUNC(abc806_state::amo_w)); - map(0x36, 0x36).mirror(0xff00).rw(this, FUNC(abc806_state::sti_r), FUNC(abc806_state::sto_w)); - map(0x37, 0x37).select(0xff00).rw(this, FUNC(abc806_state::cli_r), FUNC(abc806_state::sso_w)); + map(0x34, 0x34).select(0xff00).rw(FUNC(abc806_state::mai_r), FUNC(abc806_state::mao_w)); + map(0x35, 0x35).mirror(0xff00).rw(FUNC(abc806_state::ami_r), FUNC(abc806_state::amo_w)); + map(0x36, 0x36).mirror(0xff00).rw(FUNC(abc806_state::sti_r), FUNC(abc806_state::sto_w)); + map(0x37, 0x37).select(0xff00).rw(FUNC(abc806_state::cli_r), FUNC(abc806_state::sso_w)); map(0x38, 0x38).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x39, 0x39).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::register_w)); map(0x40, 0x43).mirror(0xff1c).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index 82fbbaebc35..0d51e96275a 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -637,17 +637,17 @@ WRITE_LINE_MEMBER(accomm_state::econet_clk_w) void accomm_state::main_map(address_map &map) { - map(0x000000, 0x1fffff).rw(this, FUNC(accomm_state::ram_r), FUNC(accomm_state::ram_w)); /* System RAM */ + map(0x000000, 0x1fffff).rw(FUNC(accomm_state::ram_r), FUNC(accomm_state::ram_w)); /* System RAM */ map(0x200000, 0x3fffff).noprw(); /* External expansion RAM */ map(0x400000, 0x400000).noprw(); /* MODEM */ map(0x410000, 0x410000).ram(); /* Econet ID */ map(0x420000, 0x42000f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* 6522 VIA (printer etc) */ map(0x430000, 0x430001).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); /* 2641 ACIA (RS423) */ - map(0x440000, 0x440000).w(this, FUNC(accomm_state::ch00switch_w)); /* CH00SWITCH */ + map(0x440000, 0x440000).w(FUNC(accomm_state::ch00switch_w)); /* CH00SWITCH */ map(0x450000, 0x457fff).ram().share("vram"); /* Video RAM */ - map(0x458000, 0x459fff).r(this, FUNC(accomm_state::read_keyboard1)); /* Video ULA */ - map(0x45a000, 0x45bfff).r(this, FUNC(accomm_state::read_keyboard2)); /* Video ULA */ - map(0x45fe00, 0x45feff).rw(this, FUNC(accomm_state::sheila_r), FUNC(accomm_state::sheila_w)); /* Video ULA */ + map(0x458000, 0x459fff).r(FUNC(accomm_state::read_keyboard1)); /* Video ULA */ + map(0x45a000, 0x45bfff).r(FUNC(accomm_state::read_keyboard2)); /* Video ULA */ + map(0x45fe00, 0x45feff).rw(FUNC(accomm_state::sheila_r), FUNC(accomm_state::sheila_w)); /* Video ULA */ map(0x460000, 0x467fff).ram().share("nvram"); /* CMOS RAM */ map(0x470000, 0x47001f).rw(m_adlc, FUNC(mc6854_device::read), FUNC(mc6854_device::write)); /* 68B54 (Econet) */ map(0x480000, 0x7fffff).noprw(); /* Reserved */ @@ -865,7 +865,7 @@ MACHINE_CONFIG_START(accomm_state::accomm) /* via */ MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(16'000'000) / 16) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe)) /* acia */ diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp index d33abfdea4b..3662c46f95b 100644 --- a/src/mame/drivers/ace.cpp +++ b/src/mame/drivers/ace.cpp @@ -152,11 +152,11 @@ void aceal_state::main_map(address_map &map) { map(0x0000, 0x09ff).rom(); - map(0x2000, 0x20ff).ram().w(this, FUNC(aceal_state::ace_scoreram_w)).share("scoreram"); /* 2x2101 */ + map(0x2000, 0x20ff).ram().w(FUNC(aceal_state::ace_scoreram_w)).share("scoreram"); /* 2x2101 */ map(0x8300, 0x83ff).ram().share("ram2"); /* 2x2101 */ - map(0x8000, 0x80ff).ram().w(this, FUNC(aceal_state::ace_characterram_w)).share("characterram"); /* 3x3101 (3bits: 0, 1, 2) */ + map(0x8000, 0x80ff).ram().w(FUNC(aceal_state::ace_characterram_w)).share("characterram"); /* 3x3101 (3bits: 0, 1, 2) */ - map(0xc000, 0xc005).w(this, FUNC(aceal_state::ace_objpos_w)); + map(0xc000, 0xc005).w(FUNC(aceal_state::ace_objpos_w)); /* players inputs */ map(0xc008, 0xc008).portr("c008"); @@ -170,7 +170,7 @@ void aceal_state::main_map(address_map &map) map(0xc010, 0xc010).portr("c010"); map(0xc011, 0xc011).portr("c011"); - map(0xc012, 0xc012).r(this, FUNC(aceal_state::unk_r)); + map(0xc012, 0xc012).r(FUNC(aceal_state::unk_r)); /* vblank */ map(0xc014, 0xc014).portr("c014"); @@ -181,17 +181,17 @@ void aceal_state::main_map(address_map &map) /* start (must read 1 at least once to make the game run) */ map(0xc016, 0xc016).portr("c016"); - map(0xc017, 0xc017).r(this, FUNC(aceal_state::unk_r)); - map(0xc018, 0xc018).r(this, FUNC(aceal_state::unk_r)); - map(0xc019, 0xc019).r(this, FUNC(aceal_state::unk_r)); - - map(0xc020, 0xc020).r(this, FUNC(aceal_state::unk_r)); - map(0xc021, 0xc021).r(this, FUNC(aceal_state::unk_r)); - map(0xc022, 0xc022).r(this, FUNC(aceal_state::unk_r)); - map(0xc023, 0xc023).r(this, FUNC(aceal_state::unk_r)); - map(0xc024, 0xc024).r(this, FUNC(aceal_state::unk_r)); - map(0xc025, 0xc025).r(this, FUNC(aceal_state::unk_r)); - map(0xc026, 0xc026).r(this, FUNC(aceal_state::unk_r)); + map(0xc017, 0xc017).r(FUNC(aceal_state::unk_r)); + map(0xc018, 0xc018).r(FUNC(aceal_state::unk_r)); + map(0xc019, 0xc019).r(FUNC(aceal_state::unk_r)); + + map(0xc020, 0xc020).r(FUNC(aceal_state::unk_r)); + map(0xc021, 0xc021).r(FUNC(aceal_state::unk_r)); + map(0xc022, 0xc022).r(FUNC(aceal_state::unk_r)); + map(0xc023, 0xc023).r(FUNC(aceal_state::unk_r)); + map(0xc024, 0xc024).r(FUNC(aceal_state::unk_r)); + map(0xc025, 0xc025).r(FUNC(aceal_state::unk_r)); + map(0xc026, 0xc026).r(FUNC(aceal_state::unk_r)); } diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp index f7816abf9b0..cd925de66f1 100644 --- a/src/mame/drivers/acefruit.cpp +++ b/src/mame/drivers/acefruit.cpp @@ -337,7 +337,7 @@ void acefruit_state::acefruit_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x20ff).ram().share("nvram"); map(0x4000, 0x43ff).ram().share("videoram"); - map(0x4400, 0x47ff).ram().w(this, FUNC(acefruit_state::acefruit_colorram_w)).share("colorram"); + map(0x4400, 0x47ff).ram().w(FUNC(acefruit_state::acefruit_colorram_w)).share("colorram"); map(0x8000, 0x8000).portr("IN0"); map(0x8001, 0x8001).portr("IN1"); map(0x8002, 0x8002).portr("IN2"); @@ -347,10 +347,10 @@ void acefruit_state::acefruit_map(address_map &map) map(0x8006, 0x8006).portr("IN6"); map(0x8007, 0x8007).portr("IN7"); map(0x6000, 0x6005).ram().share("spriteram"); - map(0xa000, 0xa001).w(this, FUNC(acefruit_state::acefruit_lamp_w)); - map(0xa002, 0xa003).w(this, FUNC(acefruit_state::acefruit_coin_w)); - map(0xa004, 0xa004).w(this, FUNC(acefruit_state::acefruit_solenoid_w)); - map(0xa005, 0xa006).w(this, FUNC(acefruit_state::acefruit_sound_w)); + map(0xa000, 0xa001).w(FUNC(acefruit_state::acefruit_lamp_w)); + map(0xa002, 0xa003).w(FUNC(acefruit_state::acefruit_coin_w)); + map(0xa004, 0xa004).w(FUNC(acefruit_state::acefruit_solenoid_w)); + map(0xa005, 0xa006).w(FUNC(acefruit_state::acefruit_sound_w)); map(0xc000, 0xc000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xe000, 0xffff).rom(); } diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp index 8af29c95354..915c1c38f0e 100644 --- a/src/mame/drivers/aces1.cpp +++ b/src/mame/drivers/aces1.cpp @@ -294,14 +294,14 @@ void aces1_state::aces1_map(address_map &map) map(0xafb0, 0xafb3).rw("ic24", FUNC(i8255_device::read), FUNC(i8255_device::write)); // IC24 - lamps, 7segs map(0xafd0, 0xafd3).rw("ic25", FUNC(i8255_device::read), FUNC(i8255_device::write)); // IC25 - lamps, meters, reel comms (writes) map(0xafe0, 0xafe3).rw("ic37", FUNC(i8255_device::read), FUNC(i8255_device::write));// IC37 - doors, coins, reel optics (reads) - map(0xc000, 0xc000).r(this, FUNC(aces1_state::aces1_unk_r)); // illegal or reset irq? - map(0xe000, 0xe000).rw(this, FUNC(aces1_state::aces1_nmi_counter_reset_r), FUNC(aces1_state::aces1_nmi_counter_reset_w)); + map(0xc000, 0xc000).r(FUNC(aces1_state::aces1_unk_r)); // illegal or reset irq? + map(0xe000, 0xe000).rw(FUNC(aces1_state::aces1_nmi_counter_reset_r), FUNC(aces1_state::aces1_nmi_counter_reset_w)); } void aces1_state::aces1_portmap(address_map &map) { - map(0x00, 0x00).r(this, FUNC(aces1_state::aces1_unk_port00_r)); // read before enabling interrupts? + map(0x00, 0x00).r(FUNC(aces1_state::aces1_unk_port00_r)); // read before enabling interrupts? } diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp index 8987e31531a..5e4bae83d17 100644 --- a/src/mame/drivers/acommand.cpp +++ b/src/mame/drivers/acommand.cpp @@ -331,7 +331,7 @@ void acommand_state::acommand_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x082000, 0x082005).w(m_bgtmap, FUNC(megasys1_tilemap_device::scroll_w)); map(0x082100, 0x082105).w(m_txtmap, FUNC(megasys1_tilemap_device::scroll_w)); - map(0x082208, 0x082209).w(this, FUNC(acommand_state::ac_unk2_w)); + map(0x082208, 0x082209).w(FUNC(acommand_state::ac_unk2_w)); map(0x0a0000, 0x0a3fff).ram().w(m_bgtmap, FUNC(megasys1_tilemap_device::write)).share("bgtmap"); map(0x0b0000, 0x0b3fff).ram().w(m_txtmap, FUNC(megasys1_tilemap_device::write)).share("txtmap"); map(0x0b8000, 0x0bffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -339,17 +339,17 @@ void acommand_state::acommand_map(address_map &map) map(0x0f8000, 0x0f8fff).ram().share("spriteram"); map(0x0f9000, 0x0fffff).ram(); - map(0x100001, 0x100001).w(this, FUNC(acommand_state::oki_bank_w)); - map(0x100008, 0x100009).portr("IN0").w(this, FUNC(acommand_state::output_lamps_w)); + map(0x100001, 0x100001).w(FUNC(acommand_state::oki_bank_w)); + map(0x100008, 0x100009).portr("IN0").w(FUNC(acommand_state::output_lamps_w)); map(0x100014, 0x100017).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); map(0x100018, 0x10001b).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); - map(0x100040, 0x100041).rw(this, FUNC(acommand_state::ext_devices_0_r), FUNC(acommand_state::ext_devices_0_w)); - map(0x100044, 0x100045).rw(this, FUNC(acommand_state::ext_devices_1_r), FUNC(acommand_state::ext_devices_1_w)); - map(0x100048, 0x100049).w(this, FUNC(acommand_state::ext_devices_2_w)); + map(0x100040, 0x100041).rw(FUNC(acommand_state::ext_devices_0_r), FUNC(acommand_state::ext_devices_0_w)); + map(0x100044, 0x100045).rw(FUNC(acommand_state::ext_devices_1_r), FUNC(acommand_state::ext_devices_1_w)); + map(0x100048, 0x100049).w(FUNC(acommand_state::ext_devices_2_w)); - map(0x100050, 0x100051).w(this, FUNC(acommand_state::output_7seg0_w)); - map(0x100054, 0x100055).w(this, FUNC(acommand_state::output_7seg1_w)); + map(0x100050, 0x100051).w(FUNC(acommand_state::output_7seg0_w)); + map(0x100054, 0x100055).w(FUNC(acommand_state::output_7seg1_w)); map(0x10005c, 0x10005d).portr("DSW"); } diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp index 08e9c50d3f5..7ab23c343d5 100644 --- a/src/mame/drivers/actfancr.cpp +++ b/src/mame/drivers/actfancr.cpp @@ -77,7 +77,7 @@ void actfancr_state::actfan_map(address_map &map) map(0x070010, 0x07001f).w(m_tilegen2, FUNC(deco_bac06_device::pf_control1_8bit_swap_w)); map(0x072000, 0x0727ff).rw(m_tilegen2, FUNC(deco_bac06_device::pf_data_8bit_swap_r), FUNC(deco_bac06_device::pf_data_8bit_swap_w)); map(0x100000, 0x1007ff).ram().share("spriteram"); - map(0x110000, 0x110001).w(this, FUNC(actfancr_state::actfancr_buffer_spriteram_w)); + map(0x110000, 0x110001).w(FUNC(actfancr_state::actfancr_buffer_spriteram_w)); map(0x120000, 0x1205ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x130000, 0x130000).portr("P1"); map(0x130001, 0x130001).portr("P2"); @@ -100,12 +100,12 @@ void actfancr_state::triothep_map(address_map &map) map(0x064000, 0x0647ff).rw(m_tilegen1, FUNC(deco_bac06_device::pf_data_8bit_swap_r), FUNC(deco_bac06_device::pf_data_8bit_swap_w)); map(0x066400, 0x0667ff).rw(m_tilegen1, FUNC(deco_bac06_device::pf_rowscroll_8bit_swap_r), FUNC(deco_bac06_device::pf_rowscroll_8bit_swap_w)); map(0x100000, 0x100000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x110000, 0x110001).w(this, FUNC(actfancr_state::actfancr_buffer_spriteram_w)); + map(0x110000, 0x110001).w(FUNC(actfancr_state::actfancr_buffer_spriteram_w)); map(0x120000, 0x1207ff).ram().share("spriteram"); map(0x130000, 0x1305ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x140000, 0x140001).nopr(); /* Value doesn't matter */ map(0x1f0000, 0x1f3fff).ram().share("main_ram"); /* Main ram */ - map(0x1ff000, 0x1ff001).rw(this, FUNC(actfancr_state::triothep_control_r), FUNC(actfancr_state::triothep_control_select_w)); + map(0x1ff000, 0x1ff001).rw(FUNC(actfancr_state::triothep_control_r), FUNC(actfancr_state::triothep_control_select_w)); map(0x1ff400, 0x1ff403).w(m_maincpu, FUNC(h6280_device::irq_status_w)); } diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp index 9a410eeecb7..fccb91c2abe 100644 --- a/src/mame/drivers/adam.cpp +++ b/src/mame/drivers/adam.cpp @@ -544,24 +544,16 @@ READ8_MEMBER( adam_state::iorq_r ) case 5: if (BIT(offset, 0)) - { - data = m_vdc->register_read(space, 0); - } + data = m_vdc->register_read(); else - { - data = m_vdc->vram_read(space, 0); - } + data = m_vdc->vram_read(); break; case 7: if (BIT(offset, 1)) - { data = m_joy2->read(); - } else - { data = m_joy1->read(); - } break; } @@ -600,13 +592,9 @@ WRITE8_MEMBER( adam_state::iorq_w ) case 5: if (BIT(offset, 0)) - { - m_vdc->register_write(space, 0, data); - } + m_vdc->register_write(data); else - { - m_vdc->vram_write(space, 0, data); - } + m_vdc->vram_write(data); break; case 6: @@ -617,7 +605,7 @@ WRITE8_MEMBER( adam_state::iorq_w ) break; case 7: - m_psg->write(space, 0, data); + m_psg->write(data); break; } @@ -876,7 +864,7 @@ WRITE8_MEMBER( adam_state::m6801_p4_w ) void adam_state::adam_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(adam_state::mreq_r), FUNC(adam_state::mreq_w)); + map(0x0000, 0xffff).rw(FUNC(adam_state::mreq_r), FUNC(adam_state::mreq_w)); } @@ -886,7 +874,7 @@ void adam_state::adam_mem(address_map &map) void adam_state::adam_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(adam_state::iorq_r), FUNC(adam_state::iorq_w)); + map(0x0000, 0xffff).rw(FUNC(adam_state::iorq_r), FUNC(adam_state::iorq_w)); } @@ -908,10 +896,10 @@ void adam_state::m6801_mem(address_map &map) void adam_state::m6801_io(address_map &map) { - map(M6801_PORT1, M6801_PORT1).w(this, FUNC(adam_state::m6801_p1_w)); - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(adam_state::m6801_p2_r), FUNC(adam_state::m6801_p2_w)); - map(M6801_PORT3, M6801_PORT3).rw(this, FUNC(adam_state::m6801_p3_r), FUNC(adam_state::m6801_p3_w)); - map(M6801_PORT4, M6801_PORT4).w(this, FUNC(adam_state::m6801_p4_w)); + map(M6801_PORT1, M6801_PORT1).w(FUNC(adam_state::m6801_p1_w)); + map(M6801_PORT2, M6801_PORT2).rw(FUNC(adam_state::m6801_p2_r), FUNC(adam_state::m6801_p2_w)); + map(M6801_PORT3, M6801_PORT3).rw(FUNC(adam_state::m6801_p3_r), FUNC(adam_state::m6801_p3_w)); + map(M6801_PORT4, M6801_PORT4).w(FUNC(adam_state::m6801_p4_w)); } diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index 757e3969d95..f29fb4fd7d4 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -309,7 +309,7 @@ void adp_state::skattv_mem(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x800080, 0x800081).rw("acrtc", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w)); map(0x800082, 0x800083).rw("acrtc", FUNC(hd63484_device::data16_r), FUNC(hd63484_device::data16_w)); - map(0x800100, 0x800101).rw(this, FUNC(adp_state::input_r), FUNC(adp_state::input_w)); + map(0x800100, 0x800101).rw(FUNC(adp_state::input_r), FUNC(adp_state::input_w)); map(0x800140, 0x800143).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)).umask16(0x00ff); //18b too map(0x800180, 0x80019f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0xffc000, 0xffffff).ram().share("nvram"); @@ -359,7 +359,7 @@ void adp_state::fstation_mem(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x800080, 0x800081).rw("acrtc", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w)); map(0x800082, 0x800083).rw("acrtc", FUNC(hd63484_device::data16_r), FUNC(hd63484_device::data16_w)); - map(0x800100, 0x800101).rw(this, FUNC(adp_state::input_r), FUNC(adp_state::input_w)); + map(0x800100, 0x800101).rw(FUNC(adp_state::input_r), FUNC(adp_state::input_w)); map(0x800140, 0x800143).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)).umask16(0x00ff); //18b too map(0x800180, 0x80019f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0xfc0000, 0xffffff).ram().share("nvram"); diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp index 3631d177753..5cd747bce80 100644 --- a/src/mame/drivers/advision.cpp +++ b/src/mame/drivers/advision.cpp @@ -39,12 +39,12 @@ READ8_MEMBER( advision_state::rom_r ) void advision_state::program_map(address_map &map) { map(0x0000, 0x03ff).bankr("bank1"); - map(0x0400, 0x0fff).r(this, FUNC(advision_state::rom_r)); + map(0x0400, 0x0fff).r(FUNC(advision_state::rom_r)); } void advision_state::io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(advision_state::ext_ram_r), FUNC(advision_state::ext_ram_w)); + map(0x00, 0xff).rw(FUNC(advision_state::ext_ram_r), FUNC(advision_state::ext_ram_w)); } /* Input Ports */ diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp index ca6bca9d49c..b51b554cec8 100644 --- a/src/mame/drivers/aeroboto.cpp +++ b/src/mame/drivers/aeroboto.cpp @@ -82,24 +82,24 @@ WRITE8_MEMBER(aeroboto_state::aeroboto_1a2_w) void aeroboto_state::main_map(address_map &map) { map(0x0000, 0x07ff).ram().share("mainram"); // main RAM - map(0x01a2, 0x01a2).w(this, FUNC(aeroboto_state::aeroboto_1a2_w)); // affects IRQ line (more protection?) + map(0x01a2, 0x01a2).w(FUNC(aeroboto_state::aeroboto_1a2_w)); // affects IRQ line (more protection?) map(0x0800, 0x08ff).ram(); // tile color buffer; copied to 0x2000 map(0x0900, 0x09ff).writeonly(); // a backup of default tile colors - map(0x1000, 0x17ff).ram().w(this, FUNC(aeroboto_state::aeroboto_videoram_w)).share("videoram"); // tile RAM + map(0x1000, 0x17ff).ram().w(FUNC(aeroboto_state::aeroboto_videoram_w)).share("videoram"); // tile RAM map(0x1800, 0x183f).ram().share("hscroll"); // horizontal scroll regs map(0x1840, 0x27ff).nopw(); // cleared during custom LSI test - map(0x2000, 0x20ff).ram().w(this, FUNC(aeroboto_state::aeroboto_tilecolor_w)).share("tilecolor"); // tile color RAM + map(0x2000, 0x20ff).ram().w(FUNC(aeroboto_state::aeroboto_tilecolor_w)).share("tilecolor"); // tile color RAM map(0x2800, 0x28ff).ram().share("spriteram"); // sprite RAM map(0x2900, 0x2fff).nopw(); // cleared along with sprite RAM - map(0x2973, 0x2973).r(this, FUNC(aeroboto_state::aeroboto_2973_r)); // protection read - map(0x3000, 0x3000).rw(this, FUNC(aeroboto_state::aeroboto_in0_r), FUNC(aeroboto_state::aeroboto_3000_w)); + map(0x2973, 0x2973).r(FUNC(aeroboto_state::aeroboto_2973_r)); // protection read + map(0x3000, 0x3000).rw(FUNC(aeroboto_state::aeroboto_in0_r), FUNC(aeroboto_state::aeroboto_3000_w)); map(0x3001, 0x3001).portr("DSW1").w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x3002, 0x3002).portr("DSW2").w("soundlatch2", FUNC(generic_latch_8_device::write)); map(0x3003, 0x3003).writeonly().share("vscroll"); - map(0x3004, 0x3004).r(this, FUNC(aeroboto_state::aeroboto_201_r)).writeonly().share("starx"); + map(0x3004, 0x3004).r(FUNC(aeroboto_state::aeroboto_201_r)).writeonly().share("starx"); map(0x3005, 0x3005).writeonly().share("stary"); // usable but probably wrong map(0x3006, 0x3006).writeonly().share("bgcolor"); - map(0x3800, 0x3800).r(this, FUNC(aeroboto_state::aeroboto_irq_ack_r)); // watchdog or IRQ ack + map(0x3800, 0x3800).r(FUNC(aeroboto_state::aeroboto_irq_ack_r)); // watchdog or IRQ ack map(0x4000, 0xffff).rom(); // main ROM } diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 645f16eae0a..bc65f9f4d4d 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -152,16 +152,16 @@ void aerofgt_state::pspikes_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).ram(); /* work RAM */ map(0x200000, 0x203fff).ram().share("sprlookupram1"); - map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); map(0xffc000, 0xffc3ff).writeonly().share("spriteram"); map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */ map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); - map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w)); + map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w)); map(0xfff002, 0xfff003).portr("IN1"); - map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w)); - map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0xfff007, 0xfff007).r(this, FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w)); + map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0xfff007, 0xfff007).r(FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0xfff400, 0xfff403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff); } @@ -171,16 +171,16 @@ void aerofgt_state::pspikesb_map(address_map &map) map(0x100000, 0x10ffff).ram(); /* work RAM */ map(0x200000, 0x203fff).ram().share("sprlookupram1"); map(0xc04000, 0xc04001).nopw(); - map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); map(0xffc000, 0xffcbff).ram().share("spriteram"); map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */ - map(0xffd200, 0xffd201).w(this, FUNC(aerofgt_state::pspikesb_gfxbank_w)); + map(0xffd200, 0xffd201).w(FUNC(aerofgt_state::pspikesb_gfxbank_w)); map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); map(0xfff002, 0xfff003).portr("IN1"); - map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>)); + map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>)); map(0xfff007, 0xfff007).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xfff008, 0xfff009).w(this, FUNC(aerofgt_state::pspikesb_oki_banking_w)); + map(0xfff008, 0xfff009).w(FUNC(aerofgt_state::pspikesb_oki_banking_w)); map(0xfff400, 0xfff403).nopw(); // GGA access } @@ -190,20 +190,20 @@ void aerofgt_state::spikes91_map(address_map &map) map(0x100000, 0x10ffff).ram(); /* work RAM */ map(0x200000, 0x203fff).ram().share("sprlookupram1"); map(0xc04000, 0xc04001).nopw(); - map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); map(0xffa000, 0xffbfff).ram().share("tx_tilemap_ram"); map(0xffc000, 0xffcfff).ram().share("spriteram"); - //map(0xffd200, 0xffd201).w(this, FUNC(aerofgt_state::pspikesb_gfxbank_w)); + //map(0xffd200, 0xffd201).w(FUNC(aerofgt_state::pspikesb_gfxbank_w)); map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */ map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); map(0xfff002, 0xfff003).portr("IN1"); - map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w)); - map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>)); + map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w)); + map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>)); map(0xfff006, 0xfff007).noprw(); - map(0xfff008, 0xfff009).w(this, FUNC(aerofgt_state::spikes91_lookup_w)); + map(0xfff008, 0xfff009).w(FUNC(aerofgt_state::spikes91_lookup_w)); } void aerofgt_state::pspikesc_map(address_map &map) @@ -211,16 +211,16 @@ void aerofgt_state::pspikesc_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).ram(); /* work RAM */ map(0x200000, 0x203fff).ram().share("sprlookupram1"); - map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); map(0xffc000, 0xffcbff).ram().share("spriteram"); map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */ map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); - map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w)); + map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w)); map(0xfff002, 0xfff003).portr("IN1"); - map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w)); + map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w)); map(0xfff004, 0xfff005).portr("DSW"); - map(0xfff004, 0xfff005).w(this, FUNC(aerofgt_state::scrolly_w<0>)); + map(0xfff004, 0xfff005).w(FUNC(aerofgt_state::scrolly_w<0>)); map(0xfff007, 0xfff007).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xfff400, 0xfff403).nopw(); // GGA access } @@ -230,16 +230,16 @@ void aerofgt_state::kickball_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x10ffff).ram(); /* work RAM */ map(0x200000, 0x20ffff).ram().share("sprlookupram1"); - map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); map(0xffc000, 0xffc3ff).writeonly().share("spriteram"); map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */ map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); - map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w)); + map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w)); map(0xfff002, 0xfff003).portr("IN1"); - map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::kickball_gfxbank_w)); - map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0xfff007, 0xfff007).r(this, FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::kickball_gfxbank_w)); + map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0xfff007, 0xfff007).r(FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0xfff400, 0xfff403).nopw(); // GGA access } @@ -247,8 +247,8 @@ void aerofgt_state::karatblz_map(address_map &map) { map.global_mask(0xfffff); map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x081fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x082000, 0x083fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x080000, 0x081fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x082000, 0x083fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0x0a0000, 0x0affff).ram().share("sprlookupram1"); map(0x0b0000, 0x0bffff).ram().share("sprlookupram2"); map(0x0c0000, 0x0cffff).ram(); /* work RAM */ @@ -256,17 +256,17 @@ void aerofgt_state::karatblz_map(address_map &map) map(0x0fc000, 0x0fc7ff).ram().share("spriteram"); map(0x0fe000, 0x0fe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x0ff000, 0x0ff001).portr("IN0"); - map(0x0ff000, 0x0ff000).w(this, FUNC(aerofgt_state::spinlbrk_flip_screen_w)); + map(0x0ff000, 0x0ff000).w(FUNC(aerofgt_state::spinlbrk_flip_screen_w)); map(0x0ff002, 0x0ff003).portr("IN1"); - map(0x0ff002, 0x0ff002).w(this, FUNC(aerofgt_state::karatblz_gfxbank_w)); + map(0x0ff002, 0x0ff002).w(FUNC(aerofgt_state::karatblz_gfxbank_w)); map(0x0ff004, 0x0ff005).portr("IN2"); map(0x0ff006, 0x0ff007).portr("IN3"); map(0x0ff007, 0x0ff007).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x0ff008, 0x0ff009).portr("DSW").w(this, FUNC(aerofgt_state::scrollx_w<0>)); - map(0x0ff00b, 0x0ff00b).r(this, FUNC(aerofgt_state::pending_command_r)); - map(0x0ff00a, 0x0ff00b).w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0x0ff00c, 0x0ff00d).w(this, FUNC(aerofgt_state::scrollx_w<1>)); - map(0x0ff00e, 0x0ff00f).w(this, FUNC(aerofgt_state::scrolly_w<1>)); + map(0x0ff008, 0x0ff009).portr("DSW").w(FUNC(aerofgt_state::scrollx_w<0>)); + map(0x0ff00b, 0x0ff00b).r(FUNC(aerofgt_state::pending_command_r)); + map(0x0ff00a, 0x0ff00b).w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0x0ff00c, 0x0ff00d).w(FUNC(aerofgt_state::scrollx_w<1>)); + map(0x0ff00e, 0x0ff00f).w(FUNC(aerofgt_state::scrolly_w<1>)); map(0x0ff400, 0x0ff403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff); } @@ -274,8 +274,8 @@ void aerofgt_state::karatblzbl_map(address_map &map) { map.global_mask(0xfffff); map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x081fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x082000, 0x083fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x080000, 0x081fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x082000, 0x083fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0x0a0000, 0x0affff).ram().share("sprlookupram1"); map(0x0b0000, 0x0bffff).ram().share("sprlookupram2"); map(0x0c0000, 0x0cffff).ram(); /* work RAM */ @@ -283,33 +283,33 @@ void aerofgt_state::karatblzbl_map(address_map &map) map(0x0fc000, 0x0fc7ff).ram().share("spriteram"); map(0x0fe000, 0x0fe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x0ff000, 0x0ff001).portr("IN0"); - map(0x0ff000, 0x0ff000).w(this, FUNC(aerofgt_state::spinlbrk_flip_screen_w)); + map(0x0ff000, 0x0ff000).w(FUNC(aerofgt_state::spinlbrk_flip_screen_w)); map(0x0ff002, 0x0ff003).portr("IN1"); - map(0x0ff002, 0x0ff002).w(this, FUNC(aerofgt_state::karatblz_gfxbank_w)); + map(0x0ff002, 0x0ff002).w(FUNC(aerofgt_state::karatblz_gfxbank_w)); map(0x0ff004, 0x0ff005).portr("IN2"); map(0x0ff006, 0x0ff007).portr("IN3"); - map(0x0ff007, 0x0ff007).w(this, FUNC(aerofgt_state::karatblzbl_soundlatch_w)); - map(0x0ff008, 0x0ff009).portr("DSW").w(this, FUNC(aerofgt_state::scrollx_w<0>)); - map(0x0ff00b, 0x0ff00b).r(this, FUNC(aerofgt_state::pending_command_r)); - map(0x0ff00a, 0x0ff00b).w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0x0ff00c, 0x0ff00d).w(this, FUNC(aerofgt_state::scrollx_w<1>)); - map(0x0ff00e, 0x0ff00f).w(this, FUNC(aerofgt_state::scrolly_w<1>)); + map(0x0ff007, 0x0ff007).w(FUNC(aerofgt_state::karatblzbl_soundlatch_w)); + map(0x0ff008, 0x0ff009).portr("DSW").w(FUNC(aerofgt_state::scrollx_w<0>)); + map(0x0ff00b, 0x0ff00b).r(FUNC(aerofgt_state::pending_command_r)); + map(0x0ff00a, 0x0ff00b).w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0x0ff00c, 0x0ff00d).w(FUNC(aerofgt_state::scrollx_w<1>)); + map(0x0ff00e, 0x0ff00f).w(FUNC(aerofgt_state::scrolly_w<1>)); map(0x0ff400, 0x0ff403).nopw(); // GGA access } void aerofgt_state::spinlbrk_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x080000, 0x080fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x082000, 0x082fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x080000, 0x080fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x082000, 0x082fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0xff8000, 0xffbfff).ram(); /* work RAM */ map(0xffc000, 0xffc7ff).ram().share("spriteram"); map(0xffd000, 0xffd1ff).ram().share("rasterram"); /* bg1 scroll registers */ map(0xffe000, 0xffe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); - map(0xfff000, 0xfff000).w(this, FUNC(aerofgt_state::spinlbrk_flip_screen_w)); - map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::spinlbrk_gfxbank_w)); - map(0xfff002, 0xfff003).portr("IN1").w(this, FUNC(aerofgt_state::scrollx_w<1>)); + map(0xfff000, 0xfff000).w(FUNC(aerofgt_state::spinlbrk_flip_screen_w)); + map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::spinlbrk_gfxbank_w)); + map(0xfff002, 0xfff003).portr("IN1").w(FUNC(aerofgt_state::scrollx_w<1>)); map(0xfff004, 0xfff005).portr("DSW"); map(0xfff007, 0xfff007).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // map(0xfff008, 0xfff009); - read when analog inputs are enabled @@ -322,8 +322,8 @@ void aerofgt_state::turbofrc_map(address_map &map) map.global_mask(0xfffff); map(0x000000, 0x0bffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* work RAM */ - map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1"); map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2"); map(0x0f8000, 0x0fbfff).ram(); /* work RAM */ @@ -331,13 +331,13 @@ void aerofgt_state::turbofrc_map(address_map &map) map(0x0fd000, 0x0fdfff).ram().share("rasterram"); /* bg1 scroll registers */ map(0x0fe000, 0x0fe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x0ff000, 0x0ff001).portr("IN0"); - map(0x0ff001, 0x0ff001).w(this, FUNC(aerofgt_state::turbofrc_flip_screen_w)); - map(0x0ff002, 0x0ff003).portr("IN1").w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0x0ff004, 0x0ff005).portr("DSW").w(this, FUNC(aerofgt_state::scrollx_w<1>)); - map(0x0ff007, 0x0ff007).r(this, FUNC(aerofgt_state::pending_command_r)); - map(0x0ff006, 0x0ff007).w(this, FUNC(aerofgt_state::scrolly_w<1>)); + map(0x0ff001, 0x0ff001).w(FUNC(aerofgt_state::turbofrc_flip_screen_w)); + map(0x0ff002, 0x0ff003).portr("IN1").w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0x0ff004, 0x0ff005).portr("DSW").w(FUNC(aerofgt_state::scrollx_w<1>)); + map(0x0ff007, 0x0ff007).r(FUNC(aerofgt_state::pending_command_r)); + map(0x0ff006, 0x0ff007).w(FUNC(aerofgt_state::scrolly_w<1>)); map(0x0ff008, 0x0ff009).portr("IN2"); - map(0x0ff008, 0x0ff00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w)); + map(0x0ff008, 0x0ff00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w)); map(0x0ff00c, 0x0ff00d).nopw(); /* related to bg2 (written together with the scroll registers) */ map(0x0ff00e, 0x0ff00e).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x0ff400, 0x0ff403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff); @@ -347,21 +347,21 @@ void aerofgt_state::aerofgtb_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* work RAM */ - map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1"); map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2"); map(0x0f8000, 0x0fbfff).ram(); /* work RAM */ map(0x0fc000, 0x0fc7ff).ram().share("spriteram"); map(0x0fd000, 0x0fd7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x0fe000, 0x0fe001).portr("IN0"); - map(0x0fe001, 0x0fe001).w(this, FUNC(aerofgt_state::turbofrc_flip_screen_w)); - map(0x0fe002, 0x0fe003).portr("IN1").w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0x0fe004, 0x0fe005).portr("DSW1").w(this, FUNC(aerofgt_state::scrollx_w<1>)); - map(0x0fe007, 0x0fe007).r(this, FUNC(aerofgt_state::pending_command_r)); - map(0x0fe006, 0x0fe007).w(this, FUNC(aerofgt_state::scrolly_w<1>)); + map(0x0fe001, 0x0fe001).w(FUNC(aerofgt_state::turbofrc_flip_screen_w)); + map(0x0fe002, 0x0fe003).portr("IN1").w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0x0fe004, 0x0fe005).portr("DSW1").w(FUNC(aerofgt_state::scrollx_w<1>)); + map(0x0fe007, 0x0fe007).r(FUNC(aerofgt_state::pending_command_r)); + map(0x0fe006, 0x0fe007).w(FUNC(aerofgt_state::scrolly_w<1>)); map(0x0fe008, 0x0fe009).portr("DSW2"); - map(0x0fe008, 0x0fe00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w)); + map(0x0fe008, 0x0fe00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w)); map(0x0fe00e, 0x0fe00e).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x0fe400, 0x0fe403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff); map(0x0ff000, 0x0fffff).ram().share("rasterram"); /* used only for the scroll registers */ @@ -374,14 +374,14 @@ void aerofgt_state::aerofgt_map(address_map &map) map(0x1b0000, 0x1b07ff).ram().share("rasterram"); /* used only for the scroll registers */ map(0x1b0800, 0x1b0801).ram(); /* tracks watchdog state */ map(0x1b0ff0, 0x1b0fff).ram(); /* stack area during boot */ - map(0x1b2000, 0x1b3fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x1b4000, 0x1b5fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x1b2000, 0x1b3fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x1b4000, 0x1b5fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0x1c0000, 0x1c7fff).ram().share("sprlookupram1"); map(0x1d0000, 0x1d1fff).ram().share("spriteram"); map(0xfef000, 0xffefff).ram(); /* work RAM */ - map(0xffff80, 0xffff87).w(this, FUNC(aerofgt_state::aerofgt_gfxbank_w)); - map(0xffff88, 0xffff89).w(this, FUNC(aerofgt_state::scrolly_w<0>)); /* + something else in the top byte */ - map(0xffff90, 0xffff91).w(this, FUNC(aerofgt_state::scrolly_w<1>)); /* + something else in the top byte */ + map(0xffff80, 0xffff87).w(FUNC(aerofgt_state::aerofgt_gfxbank_w)); + map(0xffff88, 0xffff89).w(FUNC(aerofgt_state::scrolly_w<0>)); /* + something else in the top byte */ + map(0xffff90, 0xffff91).w(FUNC(aerofgt_state::scrolly_w<1>)); /* + something else in the top byte */ map(0xffffa0, 0xffffbf).rw("io", FUNC(vs9209_device::read), FUNC(vs9209_device::write)).umask16(0x00ff); map(0xffffc1, 0xffffc1).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -390,8 +390,8 @@ void aerofgt_state::aerfboot_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* work RAM */ - map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1"); map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2"); map(0x0f8000, 0x0fbfff).ram(); /* work RAM */ @@ -401,10 +401,10 @@ void aerofgt_state::aerfboot_map(address_map &map) map(0x0fe002, 0x0fe003).portr("IN1"); map(0x0fe004, 0x0fe005).portr("DSW1"); map(0x0fe008, 0x0fe009).portr("DSW2"); - map(0x0fe002, 0x0fe003).w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0x0fe004, 0x0fe005).w(this, FUNC(aerofgt_state::scrollx_w<1>)); - map(0x0fe006, 0x0fe007).w(this, FUNC(aerofgt_state::scrolly_w<1>)); - map(0x0fe008, 0x0fe00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w)); + map(0x0fe002, 0x0fe003).w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0x0fe004, 0x0fe005).w(FUNC(aerofgt_state::scrollx_w<1>)); + map(0x0fe006, 0x0fe007).w(FUNC(aerofgt_state::scrolly_w<1>)); + map(0x0fe008, 0x0fe00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w)); map(0x0fe00e, 0x0fe00e).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x0fe010, 0x0fe011).nopw(); map(0x0fe012, 0x0fe013).nopw(); // MSB = watchdog? @@ -419,8 +419,8 @@ void aerofgt_state::aerfboo2_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* work RAM */ - map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); - map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); + map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1"); map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1"); map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2"); map(0x0f8000, 0x0fbfff).ram(); /* work RAM */ @@ -430,15 +430,15 @@ void aerofgt_state::aerfboo2_map(address_map &map) map(0x0fe002, 0x0fe003).portr("IN1"); map(0x0fe004, 0x0fe005).portr("DSW1"); map(0x0fe008, 0x0fe009).portr("DSW2"); - map(0x0fe002, 0x0fe003).w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0x0fe004, 0x0fe005).w(this, FUNC(aerofgt_state::scrollx_w<1>)); - map(0x0fe006, 0x0fe007).w(this, FUNC(aerofgt_state::scrolly_w<1>)); - map(0x0fe008, 0x0fe00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w)); + map(0x0fe002, 0x0fe003).w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0x0fe004, 0x0fe005).w(FUNC(aerofgt_state::scrollx_w<1>)); + map(0x0fe006, 0x0fe007).w(FUNC(aerofgt_state::scrolly_w<1>)); + map(0x0fe008, 0x0fe00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w)); map(0x0fe006, 0x0fe006).r(m_oki, FUNC(okim6295_device::read)); map(0x0fe00e, 0x0fe00e).w(m_oki, FUNC(okim6295_device::write)); - map(0x0fe01e, 0x0fe01f).w(this, FUNC(aerofgt_state::aerfboo2_okim6295_banking_w)); + map(0x0fe01e, 0x0fe01f).w(FUNC(aerofgt_state::aerfboo2_okim6295_banking_w)); // map(0x0fe010, 0x0fe011).nopw(); -// map(0x0fe012, 0x0fe013).w(this, FUNC(aerofgt_state::aerfboot_soundlatch_w)); +// map(0x0fe012, 0x0fe013).w(FUNC(aerofgt_state::aerfboot_soundlatch_w)); map(0x0fe400, 0x0fe403).nopw(); // GGA access map(0x0ff000, 0x0fffff).ram().share("rasterram"); /* used only for the scroll registers */ } @@ -449,17 +449,17 @@ void aerofgt_state::wbbc97_map(address_map &map) map(0x500000, 0x50ffff).ram(); /* work RAM */ map(0x600000, 0x605fff).ram().share("sprlookupram1"); map(0xa00000, 0xa3ffff).ram().share("bitmapram"); - map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); + map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0"); map(0xffc000, 0xffc3ff).writeonly().share("spriteram"); map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */ map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); - map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w)); + map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w)); map(0xfff002, 0xfff003).portr("IN1"); - map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w)); - map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>)); - map(0xfff007, 0xfff007).r(this, FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); - map(0xfff00e, 0xfff00f).w(this, FUNC(aerofgt_state::wbbc97_bitmap_enable_w)); + map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w)); + map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>)); + map(0xfff007, 0xfff007).r(FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff00e, 0xfff00f).w(FUNC(aerofgt_state::wbbc97_bitmap_enable_w)); map(0xfff400, 0xfff403).nopw(); // GGA access } @@ -473,7 +473,7 @@ void aerofgt_state::sound_map(address_map &map) void aerofgt_state::spinlbrk_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(aerofgt_state::spinlbrk_sh_bankswitch_w)); + map(0x00, 0x00).w(FUNC(aerofgt_state::spinlbrk_sh_bankswitch_w)); map(0x14, 0x14).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0x18, 0x1b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } @@ -481,7 +481,7 @@ void aerofgt_state::spinlbrk_sound_portmap(address_map &map) void aerofgt_state::turbofrc_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(aerofgt_state::aerofgt_sh_bankswitch_w)); + map(0x00, 0x00).w(FUNC(aerofgt_state::aerofgt_sh_bankswitch_w)); map(0x14, 0x14).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0x18, 0x1b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } @@ -490,7 +490,7 @@ void aerofgt_state::aerofgt_sound_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x04, 0x04).w(this, FUNC(aerofgt_state::aerofgt_sh_bankswitch_w)); + map(0x04, 0x04).w(FUNC(aerofgt_state::aerofgt_sh_bankswitch_w)); map(0x08, 0x08).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0x0c, 0x0c).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -499,7 +499,7 @@ void aerofgt_state::aerfboot_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(aerofgt_state::aerfboot_okim6295_banking_w)); + map(0x9000, 0x9000).w(FUNC(aerofgt_state::aerfboot_okim6295_banking_w)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -526,8 +526,8 @@ void aerofgt_state::karatblzbl_sound_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x00).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); map(0x20, 0x20).w("ymsnd", FUNC(ym3812_device::write_port_w)); - map(0x40, 0x40).w(this, FUNC(aerofgt_state::karatblzbl_d7759_write_port_0_w)); - map(0x80, 0x80).w(this, FUNC(aerofgt_state::karatblzbl_d7759_reset_w)); + map(0x40, 0x40).w(FUNC(aerofgt_state::karatblzbl_d7759_write_port_0_w)); + map(0x80, 0x80).w(FUNC(aerofgt_state::karatblzbl_d7759_reset_w)); } void aerofgt_state::kickball_sound_map(address_map &map) diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp index c42bff09c4e..7323102695c 100644 --- a/src/mame/drivers/agat.cpp +++ b/src/mame/drivers/agat.cpp @@ -692,27 +692,27 @@ WRITE8_MEMBER(agat7_state::agat7_ram_w) void agat7_state::agat7_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xbfff).rw(this, FUNC(agat7_state::agat7_ram_r), FUNC(agat7_state::agat7_ram_w)); - map(0xc000, 0xc000).mirror(0xf).r(this, FUNC(agat7_state::keyb_data_r)).nopw(); - map(0xc010, 0xc010).mirror(0xf).rw(this, FUNC(agat7_state::keyb_strobe_r), FUNC(agat7_state::keyb_strobe_w)); - map(0xc020, 0xc020).mirror(0xf).rw(this, FUNC(agat7_state::cassette_toggle_r), FUNC(agat7_state::cassette_toggle_w)); - map(0xc030, 0xc030).mirror(0xf).rw(this, FUNC(agat7_state::speaker_toggle_r), FUNC(agat7_state::speaker_toggle_w)); - map(0xc040, 0xc040).mirror(0xf).rw(this, FUNC(agat7_state::interrupts_on_r), FUNC(agat7_state::interrupts_on_w)); - map(0xc050, 0xc050).mirror(0xf).rw(this, FUNC(agat7_state::interrupts_off_r), FUNC(agat7_state::interrupts_off_w)); - map(0xc060, 0xc067).mirror(0x8).r(this, FUNC(agat7_state::flags_r)).nopw(); - map(0xc070, 0xc070).mirror(0xf).rw(this, FUNC(agat7_state::controller_strobe_r), FUNC(agat7_state::controller_strobe_w)); - map(0xc080, 0xc0ef).rw(this, FUNC(agat7_state::c080_r), FUNC(agat7_state::c080_w)); - map(0xc0f0, 0xc0ff).rw(this, FUNC(agat7_state::agat7_membank_r), FUNC(agat7_state::agat7_membank_w)); - map(0xc100, 0xc6ff).rw(this, FUNC(agat7_state::c100_r), FUNC(agat7_state::c100_w)); + map(0x0000, 0xbfff).rw(FUNC(agat7_state::agat7_ram_r), FUNC(agat7_state::agat7_ram_w)); + map(0xc000, 0xc000).mirror(0xf).r(FUNC(agat7_state::keyb_data_r)).nopw(); + map(0xc010, 0xc010).mirror(0xf).rw(FUNC(agat7_state::keyb_strobe_r), FUNC(agat7_state::keyb_strobe_w)); + map(0xc020, 0xc020).mirror(0xf).rw(FUNC(agat7_state::cassette_toggle_r), FUNC(agat7_state::cassette_toggle_w)); + map(0xc030, 0xc030).mirror(0xf).rw(FUNC(agat7_state::speaker_toggle_r), FUNC(agat7_state::speaker_toggle_w)); + map(0xc040, 0xc040).mirror(0xf).rw(FUNC(agat7_state::interrupts_on_r), FUNC(agat7_state::interrupts_on_w)); + map(0xc050, 0xc050).mirror(0xf).rw(FUNC(agat7_state::interrupts_off_r), FUNC(agat7_state::interrupts_off_w)); + map(0xc060, 0xc067).mirror(0x8).r(FUNC(agat7_state::flags_r)).nopw(); + map(0xc070, 0xc070).mirror(0xf).rw(FUNC(agat7_state::controller_strobe_r), FUNC(agat7_state::controller_strobe_w)); + map(0xc080, 0xc0ef).rw(FUNC(agat7_state::c080_r), FUNC(agat7_state::c080_w)); + map(0xc0f0, 0xc0ff).rw(FUNC(agat7_state::agat7_membank_r), FUNC(agat7_state::agat7_membank_w)); + map(0xc100, 0xc6ff).rw(FUNC(agat7_state::c100_r), FUNC(agat7_state::c100_w)); map(0xc700, 0xc7ff).rw("a7video", FUNC(agat7video_device::read), FUNC(agat7video_device::write)); - map(0xc800, 0xcfff).rw(this, FUNC(agat7_state::c800_r), FUNC(agat7_state::c800_w)); + map(0xc800, 0xcfff).rw(FUNC(agat7_state::c800_r), FUNC(agat7_state::c800_w)); map(0xd000, 0xffff).m(m_upperbank, FUNC(address_map_bank_device::amap8)); } void agat7_state::inhbank_map(address_map &map) { - map(0x0000, 0x2fff).rom().region("maincpu", 0x1000).w(this, FUNC(agat7_state::inh_w)); - map(0x3000, 0x5fff).rw(this, FUNC(agat7_state::inh_r), FUNC(agat7_state::inh_w)); + map(0x0000, 0x2fff).rom().region("maincpu", 0x1000).w(FUNC(agat7_state::inh_w)); + map(0x3000, 0x5fff).rw(FUNC(agat7_state::inh_r), FUNC(agat7_state::inh_w)); } /*************************************************************************** diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp index 4f841869de4..ed5851891fc 100644 --- a/src/mame/drivers/airbustr.cpp +++ b/src/mame/drivers/airbustr.cpp @@ -333,19 +333,19 @@ void airbustr_state::master_map(address_map &map) void airbustr_state::master_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(airbustr_state::master_bankswitch_w)); + map(0x00, 0x00).w(FUNC(airbustr_state::master_bankswitch_w)); map(0x01, 0x01).nopw(); // ??? - map(0x02, 0x02).w(this, FUNC(airbustr_state::master_nmi_trigger_w)); + map(0x02, 0x02).w(FUNC(airbustr_state::master_nmi_trigger_w)); } void airbustr_state::slave_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("slavebank"); - map(0xc000, 0xc3ff).ram().w(this, FUNC(airbustr_state::videoram_w<1>)).share("videoram2"); - map(0xc400, 0xc7ff).ram().w(this, FUNC(airbustr_state::colorram_w<1>)).share("colorram2"); - map(0xc800, 0xcbff).ram().w(this, FUNC(airbustr_state::videoram_w<0>)).share("videoram1"); - map(0xcc00, 0xcfff).ram().w(this, FUNC(airbustr_state::colorram_w<0>)).share("colorram1"); + map(0xc000, 0xc3ff).ram().w(FUNC(airbustr_state::videoram_w<1>)).share("videoram2"); + map(0xc400, 0xc7ff).ram().w(FUNC(airbustr_state::colorram_w<1>)).share("colorram2"); + map(0xc800, 0xcbff).ram().w(FUNC(airbustr_state::videoram_w<0>)).share("videoram1"); + map(0xcc00, 0xcfff).ram().w(FUNC(airbustr_state::colorram_w<0>)).share("colorram1"); map(0xd000, 0xd5ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xd600, 0xdfff).ram(); map(0xe000, 0xefff).ram(); @@ -355,14 +355,14 @@ void airbustr_state::slave_map(address_map &map) void airbustr_state::slave_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(airbustr_state::slave_bankswitch_w)); + map(0x00, 0x00).w(FUNC(airbustr_state::slave_bankswitch_w)); map(0x02, 0x02).r(m_soundlatch[1], FUNC(generic_latch_8_device::read)).w(m_soundlatch[0], FUNC(generic_latch_8_device::write)); - map(0x04, 0x0c).w(this, FUNC(airbustr_state::scrollregs_w)); - map(0x0e, 0x0e).r(this, FUNC(airbustr_state::soundcommand_status_r)); + map(0x04, 0x0c).w(FUNC(airbustr_state::scrollregs_w)); + map(0x0e, 0x0e).r(FUNC(airbustr_state::soundcommand_status_r)); map(0x20, 0x20).portr("P1"); map(0x22, 0x22).portr("P2"); map(0x24, 0x24).portr("SYSTEM"); - map(0x28, 0x28).w(this, FUNC(airbustr_state::coin_counter_w)); + map(0x28, 0x28).w(FUNC(airbustr_state::coin_counter_w)); map(0x38, 0x38).nopw(); // irq ack / irq mask } @@ -376,7 +376,7 @@ void airbustr_state::sound_map(address_map &map) void airbustr_state::sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(airbustr_state::sound_bankswitch_w)); + map(0x00, 0x00).w(FUNC(airbustr_state::sound_bankswitch_w)); map(0x02, 0x03).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0x04, 0x04).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x06, 0x06).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)).w(m_soundlatch[1], FUNC(generic_latch_8_device::write)); diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index a42e8a4fcae..83e62fb306f 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -253,16 +253,16 @@ void airraid_state::airraid_map(address_map &map) map(0xc002, 0xc002).portr("IN2"); map(0xc003, 0xc003).portr("DSW2"); map(0xc004, 0xc004).portr("DSW1"); - map(0xc500, 0xc500).w(this, FUNC(airraid_state::cshooter_c500_w)); + map(0xc500, 0xc500).w(FUNC(airraid_state::cshooter_c500_w)); // AM_RANGE(0xc600, 0xc600) AM_WRITE(cshooter_c600_w) // see notes - map(0xc700, 0xc700).w(this, FUNC(airraid_state::cshooter_c700_w)); + map(0xc700, 0xc700).w(FUNC(airraid_state::cshooter_c700_w)); // AM_RANGE(0xc801, 0xc801) AM_WRITE(cshooter_c801_w) // see notes map(0xd000, 0xd7ff).ram().w(m_airraid_video, FUNC(airraid_video_device::txram_w)).share("txram"); map(0xd800, 0xd8ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xda00, 0xdaff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xdc00, 0xdc0f).ram().w(m_airraid_video, FUNC(airraid_video_device::vregs_w)).share("vregs"); // AM_RANGE(0xdc10, 0xdc10) AM_RAM - map(0xdc11, 0xdc11).w(this, FUNC(airraid_state::bank_w)); + map(0xdc11, 0xdc11).w(FUNC(airraid_state::bank_w)); // AM_RANGE(0xdc19, 0xdc19) AM_RAM // AM_RANGE(0xdc1e, 0xdc1e) AM_RAM // AM_RANGE(0xdc1f, 0xdc1f) AM_RAM diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp index 0361a857c14..2933d1c2b84 100644 --- a/src/mame/drivers/ajax.cpp +++ b/src/mame/drivers/ajax.cpp @@ -25,7 +25,7 @@ void ajax_state::ajax_main_map(address_map &map) { - map(0x0000, 0x01c0).rw(this, FUNC(ajax_state::ls138_f10_r), FUNC(ajax_state::ls138_f10_w)); /* bankswitch + sound command + FIRQ command */ + map(0x0000, 0x01c0).rw(FUNC(ajax_state::ls138_f10_r), FUNC(ajax_state::ls138_f10_w)); /* bankswitch + sound command + FIRQ command */ map(0x0800, 0x0807).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); /* sprite control registers */ map(0x0c00, 0x0fff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); /* sprite RAM 2128SL at J7 */ map(0x1000, 0x1fff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");/* palette */ @@ -40,7 +40,7 @@ void ajax_state::ajax_sub_map(address_map &map) map(0x0000, 0x07ff).rw(m_k051316, FUNC(k051316_device::read), FUNC(k051316_device::write)); /* 051316 zoom/rotation layer */ map(0x0800, 0x080f).w(m_k051316, FUNC(k051316_device::ctrl_w)); /* 051316 control registers */ map(0x1000, 0x17ff).r(m_k051316, FUNC(k051316_device::rom_r)); /* 051316 (ROM test) */ - map(0x1800, 0x1800).w(this, FUNC(ajax_state::bankswitch_2_w)); /* bankswitch control */ + map(0x1800, 0x1800).w(FUNC(ajax_state::bankswitch_2_w)); /* bankswitch control */ map(0x2000, 0x3fff).ram().share("share1"); /* shared RAM with the 052001 */ map(0x4000, 0x7fff).rw(m_k052109, FUNC(k052109_device::read), FUNC(k052109_device::write)); /* video RAM + color RAM + video registers */ map(0x8000, 0x9fff).bankr("subbank"); /* banked ROM */ @@ -51,10 +51,10 @@ void ajax_state::ajax_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); /* ROM F6 */ map(0x8000, 0x87ff).ram(); /* RAM 2128SL at D16 */ - map(0x9000, 0x9000).w(this, FUNC(ajax_state::sound_bank_w)); /* 007232 bankswitch */ + map(0x9000, 0x9000).w(FUNC(ajax_state::sound_bank_w)); /* 007232 bankswitch */ map(0xa000, 0xa00d).rw(m_k007232_1, FUNC(k007232_device::read), FUNC(k007232_device::write)); /* 007232 registers (chip 1) */ map(0xb000, 0xb00d).rw(m_k007232_2, FUNC(k007232_device::read), FUNC(k007232_device::write)); /* 007232 registers (chip 2) */ - map(0xb80c, 0xb80c).w(this, FUNC(ajax_state::k007232_extvol_w)); /* extra volume, goes to the 007232 w/ A11 */ + map(0xb80c, 0xb80c).w(FUNC(ajax_state::k007232_extvol_w)); /* extra volume, goes to the 007232 w/ A11 */ /* selecting a different latch for the external port */ map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); /* YM2151 */ map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp index 27392c688af..1700f6e3d45 100644 --- a/src/mame/drivers/albazc.cpp +++ b/src/mame/drivers/albazc.cpp @@ -188,16 +188,16 @@ void albazc_state::hanaroku_map(address_map &map) map(0x9000, 0x97ff).ram().share("spriteram2"); map(0xa000, 0xa1ff).ram().share("spriteram3"); map(0xa200, 0xa2ff).nopw(); // ??? written once during P.O.S.T. - map(0xa300, 0xa304).w(this, FUNC(albazc_state::albazc_vregs_w)); // ??? + map(0xa300, 0xa304).w(FUNC(albazc_state::albazc_vregs_w)); // ??? map(0xb000, 0xb000).nopw(); // ??? always 0x40 map(0xc000, 0xc3ff).ram(); // main ram map(0xc400, 0xc4ff).ram().share("nvram"); map(0xd000, 0xd000).r("aysnd", FUNC(ay8910_device::data_r)); map(0xd000, 0xd001).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0xe000, 0xe000).portr("IN0").w(this, FUNC(albazc_state::hanaroku_out_0_w)); + map(0xe000, 0xe000).portr("IN0").w(FUNC(albazc_state::hanaroku_out_0_w)); map(0xe001, 0xe001).portr("IN1"); - map(0xe002, 0xe002).portr("IN2").w(this, FUNC(albazc_state::hanaroku_out_1_w)); - map(0xe004, 0xe004).portr("DSW3").w(this, FUNC(albazc_state::hanaroku_out_2_w)); + map(0xe002, 0xe002).portr("IN2").w(FUNC(albazc_state::hanaroku_out_1_w)); + map(0xe004, 0xe004).portr("DSW3").w(FUNC(albazc_state::hanaroku_out_2_w)); } diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp index 817ed154c4e..46df3eceac9 100644 --- a/src/mame/drivers/albazg.cpp +++ b/src/mame/drivers/albazg.cpp @@ -220,13 +220,13 @@ void albazg_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); - map(0xa7fc, 0xa7fc).w(this, FUNC(albazg_state::prot_lock_w)); + map(0xa7fc, 0xa7fc).w(FUNC(albazg_state::prot_lock_w)); map(0xa7ff, 0xa7ff).portw("EEPROMOUT"); - map(0xaf80, 0xafff).rw(this, FUNC(albazg_state::custom_ram_r), FUNC(albazg_state::custom_ram_w)).share("cus_ram"); + map(0xaf80, 0xafff).rw(FUNC(albazg_state::custom_ram_r), FUNC(albazg_state::custom_ram_w)).share("cus_ram"); map(0xb000, 0xb07f).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0xb080, 0xb0ff).ram().w("palette", FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0xc000, 0xc3ff).ram().w(this, FUNC(albazg_state::yumefuda_vram_w)).share("videoram"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(albazg_state::yumefuda_cram_w)).share("colorram"); + map(0xc000, 0xc3ff).ram().w(FUNC(albazg_state::yumefuda_vram_w)).share("videoram"); + map(0xd000, 0xd3ff).ram().w(FUNC(albazg_state::yumefuda_cram_w)).share("colorram"); map(0xe000, 0xffff).ram(); } diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp index 83c404dce29..07a52ecf605 100644 --- a/src/mame/drivers/aleck64.cpp +++ b/src/mame/drivers/aleck64.cpp @@ -336,7 +336,7 @@ void aleck64_state::n64_map(address_map &map) map(0xc0000000, 0xc07fffff).ram(); // SDRAM, Aleck 64 specific - map(0xc0800000, 0xc0800fff).rw(this, FUNC(aleck64_state::aleck_dips_r), FUNC(aleck64_state::aleck_dips_w)); + map(0xc0800000, 0xc0800fff).rw(FUNC(aleck64_state::aleck_dips_r), FUNC(aleck64_state::aleck_dips_w)); } /* @@ -375,7 +375,7 @@ void aleck64_state::e90_map(address_map &map) n64_map(map); map(0xd0000000, 0xd0000fff).ram().share("e90vram");// x/y offsets map(0xd0010000, 0xd0010fff).ram().share("e90pal");// RGB555 palette - map(0xd0030000, 0xd003001f).rw(this, FUNC(aleck64_state::e90_prot_r), FUNC(aleck64_state::e90_prot_w)); + map(0xd0030000, 0xd003001f).rw(FUNC(aleck64_state::e90_prot_r), FUNC(aleck64_state::e90_prot_w)); } void aleck64_state::rsp_map(address_map &map) diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp index 6b86c3ed807..8fe0d4fd534 100644 --- a/src/mame/drivers/alesis.cpp +++ b/src/mame/drivers/alesis.cpp @@ -127,11 +127,11 @@ void alesis_state::hr16_mem(address_map &map) void alesis_state::hr16_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x0000).r(this, FUNC(alesis_state::kb_r)); + map(0x0000, 0x0000).r(FUNC(alesis_state::kb_r)); map(0x0002, 0x0002).w("dm3ag", FUNC(alesis_dm3ag_device::write)); - map(0x0004, 0x0004).w(this, FUNC(alesis_state::led_w)); + map(0x0004, 0x0004).w(FUNC(alesis_state::led_w)); map(0x0006, 0x0007).rw(m_lcdc, FUNC(hd44780_device::read), FUNC(hd44780_device::write)); - map(0x0008, 0x0008).w(this, FUNC(alesis_state::kb_matrix_w)); + map(0x0008, 0x0008).w(FUNC(alesis_state::kb_matrix_w)); map(0x8000, 0xffff).ram().share("nvram"); // 32Kx8 SRAM, (battery-backed) } @@ -145,9 +145,9 @@ void alesis_state::sr16_io(address_map &map) { //ADDRESS_MAP_UNMAP_HIGH map(0x0000, 0x0000).mirror(0xff).w("dm3ag", FUNC(alesis_dm3ag_device::write)); - map(0x0200, 0x0200).mirror(0xff).w(this, FUNC(alesis_state::sr16_lcd_w)); - map(0x0300, 0x0300).mirror(0xff).w(this, FUNC(alesis_state::kb_matrix_w)); - map(0x0400, 0x0400).mirror(0xff).r(this, FUNC(alesis_state::kb_r)); + map(0x0200, 0x0200).mirror(0xff).w(FUNC(alesis_state::sr16_lcd_w)); + map(0x0300, 0x0300).mirror(0xff).w(FUNC(alesis_state::kb_matrix_w)); + map(0x0400, 0x0400).mirror(0xff).r(FUNC(alesis_state::kb_r)); map(0x8000, 0xffff).ram().share("nvram"); // 32Kx8 SRAM, (battery-backed) } @@ -155,9 +155,9 @@ void alesis_state::mmt8_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0xffff).ram().share("nvram"); // 2x32Kx8 SRAM, (battery-backed) - map(0xff02, 0xff02).w(this, FUNC(alesis_state::track_led_w)); - map(0xff04, 0xff04).rw(this, FUNC(alesis_state::mmt8_led_r), FUNC(alesis_state::mmt8_led_w)); - map(0xff06, 0xff06).w(this, FUNC(alesis_state::kb_matrix_w)); + map(0xff02, 0xff02).w(FUNC(alesis_state::track_led_w)); + map(0xff04, 0xff04).rw(FUNC(alesis_state::mmt8_led_r), FUNC(alesis_state::mmt8_led_w)); + map(0xff06, 0xff06).w(FUNC(alesis_state::kb_matrix_w)); map(0xff08, 0xff09).rw(m_lcdc, FUNC(hd44780_device::read), FUNC(hd44780_device::write)); map(0xff0e, 0xff0e).nopr(); } diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index c7040d423ca..6224af4e397 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -35,8 +35,8 @@ class alg_state : public amiga_state { public: - alg_state(const machine_config &mconfig, device_type type, const char *tag) - : amiga_state(mconfig, type, tag), + alg_state(const machine_config &mconfig, device_type type, const char *tag) : + amiga_state(mconfig, type, tag), m_laserdisc(*this, "laserdisc"), m_gun1x(*this, "GUN1X"), m_gun1y(*this, "GUN1Y"), @@ -186,12 +186,12 @@ void alg_state::a500_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(alg_state::cia_r), FUNC(alg_state::cia_w)); - map(0xc00000, 0xd7ffff).rw(this, FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w)); + map(0xa00000, 0xbfffff).rw(FUNC(alg_state::cia_r), FUNC(alg_state::cia_w)); + map(0xc00000, 0xd7ffff).rw(FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w)); map(0xd80000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(alg_state::rom_mirror_r)); + map(0xde0000, 0xdeffff).rw(FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(alg_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf80000, 0xffffff).rom().region("kickstart", 0); } diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp index 5a8c127690a..0c3ca24479d 100644 --- a/src/mame/drivers/alien.cpp +++ b/src/mame/drivers/alien.cpp @@ -89,10 +89,10 @@ READ64_MEMBER( alien_state::test_r ) void alien_state::alien_map(address_map &map) { map(0x00000000, 0x0003ffff).rom(); - map(0x08000000, 0x08000007).r(this, FUNC(alien_state::test_r)); //hangs if zero + map(0x08000000, 0x08000007).r(FUNC(alien_state::test_r)); //hangs if zero map(0x0cfe0000, 0x0cffffff).ram(); map(0x10000000, 0x13ffffff).ram(); - map(0x18000000, 0x1800000f).r(this, FUNC(alien_state::test_r)).nopw(); + map(0x18000000, 0x1800000f).r(FUNC(alien_state::test_r)).nopw(); } diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index a67fe6cfeea..3b5ae56365b 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -90,14 +90,14 @@ void aliens_state::aliens_map(address_map &map) map(0x0000, 0x03ff).m(m_bank0000, FUNC(address_map_bank_device::amap8)); map(0x0400, 0x1fff).ram(); map(0x2000, 0x3fff).bankr("rombank"); /* banked ROM */ - map(0x4000, 0x7fff).rw(this, FUNC(aliens_state::k052109_051960_r), FUNC(aliens_state::k052109_051960_w)); + map(0x4000, 0x7fff).rw(FUNC(aliens_state::k052109_051960_r), FUNC(aliens_state::k052109_051960_w)); map(0x5f80, 0x5f80).portr("DSW3"); map(0x5f81, 0x5f81).portr("P1"); map(0x5f82, 0x5f82).portr("P2"); map(0x5f83, 0x5f83).portr("DSW2"); map(0x5f84, 0x5f84).portr("DSW1"); - map(0x5f88, 0x5f88).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(aliens_state::aliens_coin_counter_w)); /* coin counters */ - map(0x5f8c, 0x5f8c).w(this, FUNC(aliens_state::aliens_sh_irqtrigger_w)); /* cause interrupt on audio CPU */ + map(0x5f88, 0x5f88).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(aliens_state::aliens_coin_counter_w)); /* coin counters */ + map(0x5f8c, 0x5f8c).w(FUNC(aliens_state::aliens_sh_irqtrigger_w)); /* cause interrupt on audio CPU */ map(0x8000, 0xffff).rom().region("maincpu", 0x28000); /* ROM e24_j02.bin */ } diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp index 19dc283b029..27c07353f6d 100644 --- a/src/mame/drivers/alinvade.cpp +++ b/src/mame/drivers/alinvade.cpp @@ -107,7 +107,7 @@ void alinvade_state::alinvade_map(address_map &map) map(0x0000, 0x01ff).ram(); map(0x0400, 0x0bff).ram().share("videoram"); map(0x0c00, 0x0dff).ram(); - map(0x2000, 0x2000).w(this, FUNC(alinvade_state::sound_w)); + map(0x2000, 0x2000).w(FUNC(alinvade_state::sound_w)); map(0x4000, 0x4000).portr("COIN"); map(0x6000, 0x6000).portr("DSW"); map(0x8000, 0x8000).portr("IN0"); @@ -118,8 +118,8 @@ void alinvade_state::alinvade_map(address_map &map) map(0xa000, 0xa000).nopw(); //?? map(0xc000, 0xc00f).mirror(0xff0).rom().region("proms", 0); map(0xe000, 0xe3ff).rom(); - map(0xe400, 0xe400).w(this, FUNC(alinvade_state::sounden_w)); - map(0xe800, 0xe800).rw(this, FUNC(alinvade_state::irqmask_r), FUNC(alinvade_state::irqmask_w)); //?? + map(0xe400, 0xe400).w(FUNC(alinvade_state::sounden_w)); + map(0xe800, 0xe800).rw(FUNC(alinvade_state::irqmask_r), FUNC(alinvade_state::irqmask_w)); //?? map(0xec00, 0xffff).rom(); } diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 69e5987d96e..85286525a2a 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -629,9 +629,9 @@ void alpha68k_state::kyros_map(address_map &map) map(0x020000, 0x020fff).ram().share("shared_ram"); // work RAM map(0x040000, 0x041fff).ram().share("spriteram"); // sprite RAM map(0x060000, 0x060001).ram().share("videoram"); // MSB: watchdog, LSB: BGC - map(0x080000, 0x0801ff).rw(this, FUNC(alpha68k_state::kyros_alpha_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w)); + map(0x080000, 0x0801ff).rw(FUNC(alpha68k_state::kyros_alpha_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w)); map(0x0c0000, 0x0c0001).portr("IN0"); - map(0x0e0000, 0x0e0001).r(this, FUNC(alpha68k_state::kyros_dip_r)); + map(0x0e0000, 0x0e0001).r(FUNC(alpha68k_state::kyros_dip_r)); map(0x0e0000, 0x0e0000).w("soundlatch", FUNC(generic_latch_8_device::write)); } @@ -645,7 +645,7 @@ void alpha68k_state::alpha68k_I_map(address_map &map) map(0x300000, 0x300001).portr("IN0"); // joy1, joy2 map(0x340000, 0x340001).portr("IN1"); // coin, start, service map(0x380000, 0x380001).portr("IN2"); - map(0x380001, 0x380001).w(this, FUNC(alpha68k_state::paddlema_soundlatch_w)); // LSB: sound latch write and RST38 trigger, joy3, joy4 + map(0x380001, 0x380001).w(FUNC(alpha68k_state::paddlema_soundlatch_w)); // LSB: sound latch write and RST38 trigger, joy3, joy4 } void alpha68k_state::alpha68k_II_map(address_map &map) @@ -653,18 +653,18 @@ void alpha68k_state::alpha68k_II_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x008ffe, 0x008fff).nopw(); map(0x040000, 0x040fff).ram().share("shared_ram"); - map(0x080000, 0x080001).r(this, FUNC(alpha68k_state::control_1_r)); /* Joysticks */ + map(0x080000, 0x080001).r(FUNC(alpha68k_state::control_1_r)); /* Joysticks */ map(0x080001, 0x080001).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x0c0000, 0x0c0001).r(this, FUNC(alpha68k_state::control_2_r)); /* CN1 & Dip 1 */ - map(0x0c0001, 0x0c0001).select(0x78).w(this, FUNC(alpha68k_state::outlatch_w)); - map(0x0c8000, 0x0c8001).r(this, FUNC(alpha68k_state::control_3_r)); /* Bottom of CN2 */ - map(0x0d0000, 0x0d0001).r(this, FUNC(alpha68k_state::control_4_r)); /* Top of CN1 & CN2 */ + map(0x0c0000, 0x0c0001).r(FUNC(alpha68k_state::control_2_r)); /* CN1 & Dip 1 */ + map(0x0c0001, 0x0c0001).select(0x78).w(FUNC(alpha68k_state::outlatch_w)); + map(0x0c8000, 0x0c8001).r(FUNC(alpha68k_state::control_3_r)); /* Bottom of CN2 */ + map(0x0d0000, 0x0d0001).r(FUNC(alpha68k_state::control_4_r)); /* Top of CN1 & CN2 */ map(0x0d8000, 0x0d8001).nopr(); /* IRQ ack? */ map(0x0e0000, 0x0e0001).nopr(); /* IRQ ack? */ map(0x0e8000, 0x0e8001).nopr(); /* watchdog? */ - map(0x100000, 0x100fff).ram().w(this, FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram"); + map(0x100000, 0x100fff).ram().w(FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram"); map(0x200000, 0x207fff).ram().share("spriteram"); - map(0x300000, 0x3001ff).rw(this, FUNC(alpha68k_state::alpha_II_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w)); + map(0x300000, 0x3001ff).rw(FUNC(alpha68k_state::alpha_II_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x800000, 0x83ffff).bankr("bank8"); } @@ -673,19 +673,19 @@ void alpha68k_state::alpha68k_V_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x040000, 0x043fff).ram().share("shared_ram"); - map(0x080000, 0x080001).r(this, FUNC(alpha68k_state::control_1_r)); /* Joysticks */ - map(0x080000, 0x080000).w(this, FUNC(alpha68k_state::video_bank_w)); + map(0x080000, 0x080001).r(FUNC(alpha68k_state::control_1_r)); /* Joysticks */ + map(0x080000, 0x080000).w(FUNC(alpha68k_state::video_bank_w)); map(0x080001, 0x080001).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x0c0000, 0x0c0001).r(this, FUNC(alpha68k_state::control_2_V_r)); /* Dip 2 */ - map(0x0c0001, 0x0c0001).select(0x78).w(this, FUNC(alpha68k_state::outlatch_w)); + map(0x0c0000, 0x0c0001).r(FUNC(alpha68k_state::control_2_V_r)); /* Dip 2 */ + map(0x0c0001, 0x0c0001).select(0x78).w(FUNC(alpha68k_state::outlatch_w)); map(0x0d8000, 0x0d8001).nopr(); /* IRQ ack? */ map(0x0e0000, 0x0e0001).nopr(); /* IRQ ack? */ map(0x0e8000, 0x0e8001).nopr(); /* watchdog? */ - map(0x100000, 0x100fff).ram().w(this, FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram"); + map(0x100000, 0x100fff).ram().w(FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram"); map(0x200000, 0x207fff).ram().share("spriteram"); - map(0x300000, 0x303fff).r(this, FUNC(alpha68k_state::alpha_V_trigger_r)); - map(0x300000, 0x3001ff).w(this, FUNC(alpha68k_state::alpha_microcontroller_w)); - map(0x303e00, 0x303fff).w(this, FUNC(alpha68k_state::alpha_microcontroller_w)); /* Gang Wars mirror */ + map(0x300000, 0x303fff).r(FUNC(alpha68k_state::alpha_V_trigger_r)); + map(0x300000, 0x3001ff).w(FUNC(alpha68k_state::alpha_microcontroller_w)); + map(0x303e00, 0x303fff).w(FUNC(alpha68k_state::alpha_microcontroller_w)); /* Gang Wars mirror */ map(0x400000, 0x401fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x800000, 0x83ffff).bankr("bank8"); } @@ -705,10 +705,10 @@ void alpha68k_state::tnextspc_map(address_map &map) map(0x0e0008, 0x0e0009).portr("DSW1"); map(0x0e000a, 0x0e000b).portr("DSW2"); map(0x0e000e, 0x0e000f).nopw(); // unknown write port (0) - map(0x0e0018, 0x0e0019).r(this, FUNC(alpha68k_state::sound_cpu_r)); - map(0x0f0000, 0x0f0001).w(this, FUNC(alpha68k_state::tnextspc_unknown_w)); - map(0x0f0002, 0x0f0005).w(this, FUNC(alpha68k_state::tnextspc_coin_counters_w)); - map(0x0f0009, 0x0f0009).w(this, FUNC(alpha68k_state::tnextspc_soundlatch_w)); + map(0x0e0018, 0x0e0019).r(FUNC(alpha68k_state::sound_cpu_r)); + map(0x0f0000, 0x0f0001).w(FUNC(alpha68k_state::tnextspc_unknown_w)); + map(0x0f0002, 0x0f0005).w(FUNC(alpha68k_state::tnextspc_coin_counters_w)); + map(0x0f0009, 0x0f0009).w(FUNC(alpha68k_state::tnextspc_soundlatch_w)); } /******************************************************************************/ @@ -731,7 +731,7 @@ void alpha68k_state::kyros_sound_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xe002, 0xe002).w(m_soundlatch, FUNC(generic_latch_8_device::clear_w)); - map(0xe004, 0xe004).w("dac", FUNC(dac_byte_interface::write)); + map(0xe004, 0xe004).w("dac", FUNC(dac_byte_interface::data_w)); map(0xe006, 0xe00e).nopw(); // soundboard I/O's, ignored /* reference only AM_RANGE(0xe006, 0xe006) AM_WRITENOP // NMI: diminishing saw-tooth @@ -748,7 +748,7 @@ void alpha68k_state::sstingry_sound_map(address_map &map) map(0x8000, 0x87ff).ram(); map(0xc100, 0xc100).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xc102, 0xc102).w(m_soundlatch, FUNC(generic_latch_8_device::clear_w)); - map(0xc104, 0xc104).w("dac", FUNC(dac_byte_interface::write)); + map(0xc104, 0xc104).w("dac", FUNC(dac_byte_interface::data_w)); map(0xc106, 0xc10e).nopw(); // soundboard I/O's, ignored } @@ -781,10 +781,10 @@ void alpha68k_state::sound_portmap(address_map &map) map.global_mask(0x0f); map(0x00, 0x00).mirror(0x0f).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x00, 0x00).mirror(0x01).w(m_soundlatch, FUNC(generic_latch_8_device::clear_w)); - map(0x08, 0x08).mirror(0x01).w("dac", FUNC(dac_byte_interface::write)); + map(0x08, 0x08).mirror(0x01).w("dac", FUNC(dac_byte_interface::data_w)); map(0x0a, 0x0b).w("ym2", FUNC(ym2413_device::write)); map(0x0c, 0x0d).w("ym1", FUNC(ym2203_device::write)); - map(0x0e, 0x0e).mirror(0x01).w(this, FUNC(alpha68k_state::sound_bank_w)); + map(0x0e, 0x0e).mirror(0x01).w(FUNC(alpha68k_state::sound_bank_w)); } void alpha68k_state::kyros_sound_portmap(address_map &map) diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 755ebc60143..fe4333cf63b 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -175,14 +175,14 @@ void alphasmart_state::alphasmart_mem(address_map &map) map(0x0000, 0x003f).noprw(); // internal registers map(0x0040, 0x00ff).ram(); // internal RAM map(0x8000, 0xffff).rom().region("maincpu", 0); - map(0x8000, 0x8000).rw(this, FUNC(alphasmart_state::kb_r), FUNC(alphasmart_state::kb_matrixh_w)); - map(0xc000, 0xc000).w(this, FUNC(alphasmart_state::kb_matrixl_w)); + map(0x8000, 0x8000).rw(FUNC(alphasmart_state::kb_r), FUNC(alphasmart_state::kb_matrixh_w)); + map(0xc000, 0xc000).w(FUNC(alphasmart_state::kb_matrixl_w)); } void alphasmart_state::alphasmart_io(address_map &map) { - map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(this, FUNC(alphasmart_state::port_a_r), FUNC(alphasmart_state::port_a_w)); - map(MC68HC11_IO_PORTD, MC68HC11_IO_PORTD).rw(this, FUNC(alphasmart_state::port_d_r), FUNC(alphasmart_state::port_d_w)); + map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(FUNC(alphasmart_state::port_a_r), FUNC(alphasmart_state::port_a_w)); + map(MC68HC11_IO_PORTD, MC68HC11_IO_PORTD).rw(FUNC(alphasmart_state::port_d_r), FUNC(alphasmart_state::port_d_w)); } READ8_MEMBER(asma2k_state::io_r) @@ -237,7 +237,7 @@ void asma2k_state::asma2k_mem(address_map &map) map(0x0000, 0x003f).noprw(); // internal registers map(0x0040, 0x00ff).ram().share("internal_ram"); // internal RAM map(0x8000, 0xffff).rom().region("maincpu", 0); - map(0x9000, 0x9000).w(this, FUNC(asma2k_state::kb_matrixl_w)); + map(0x9000, 0x9000).w(FUNC(asma2k_state::kb_matrixl_w)); } /* Input ports */ diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp index 8600780a15e..7979e9fd3e6 100644 --- a/src/mame/drivers/alphatpx.cpp +++ b/src/mame/drivers/alphatpx.cpp @@ -271,10 +271,10 @@ void alphatp_12_state::alphatp2_io(address_map &map) map(0x04, 0x04).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x05, 0x05).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x10, 0x11).rw(m_kbdmcu, FUNC(i8041_device::upi41_master_r), FUNC(i8041_device::upi41_master_w)); - map(0x12, 0x12).w(this, FUNC(alphatp_12_state::beep_w)); - map(0x50, 0x53).rw(this, FUNC(alphatp_12_state::fdc_r), FUNC(alphatp_12_state::fdc_w)); - map(0x54, 0x54).rw(this, FUNC(alphatp_12_state::fdc_stat_r), FUNC(alphatp_12_state::fdc_cmd_w)); - map(0x78, 0x78).w(this, FUNC(alphatp_12_state::bank_w)); + map(0x12, 0x12).w(FUNC(alphatp_12_state::beep_w)); + map(0x50, 0x53).rw(FUNC(alphatp_12_state::fdc_r), FUNC(alphatp_12_state::fdc_w)); + map(0x54, 0x54).rw(FUNC(alphatp_12_state::fdc_stat_r), FUNC(alphatp_12_state::fdc_cmd_w)); + map(0x78, 0x78).w(FUNC(alphatp_12_state::bank_w)); } @@ -310,33 +310,33 @@ void alphatp_34_state::alphatp3_io(address_map &map) //AM_RANGE(0x00, 0x00) AM_READ // unknown map(0x04, 0x04).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x05, 0x05).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x08, 0x09).rw(this, FUNC(alphatp_34_state::comm88_r), FUNC(alphatp_34_state::comm88_w)); + map(0x08, 0x09).rw(FUNC(alphatp_34_state::comm88_r), FUNC(alphatp_34_state::comm88_w)); map(0x10, 0x11).rw(m_kbdmcu, FUNC(i8041_device::upi41_master_r), FUNC(i8041_device::upi41_master_w)); - map(0x12, 0x12).w(this, FUNC(alphatp_34_state::beep_w)); - map(0x40, 0x41).r(this, FUNC(alphatp_34_state::start88_r)); + map(0x12, 0x12).w(FUNC(alphatp_34_state::beep_w)); + map(0x40, 0x41).r(FUNC(alphatp_34_state::start88_r)); //AM_RANGE(0x42, 0x42) AM_WRITE // unknown - map(0x50, 0x53).rw(this, FUNC(alphatp_34_state::fdc_r), FUNC(alphatp_34_state::fdc_w)); - map(0x54, 0x54).rw(this, FUNC(alphatp_34_state::fdc_stat_r), FUNC(alphatp_34_state::fdc_cmd_w)); - map(0x78, 0x78).w(this, FUNC(alphatp_34_state::bank_w)); + map(0x50, 0x53).rw(FUNC(alphatp_34_state::fdc_r), FUNC(alphatp_34_state::fdc_w)); + map(0x54, 0x54).rw(FUNC(alphatp_34_state::fdc_stat_r), FUNC(alphatp_34_state::fdc_cmd_w)); + map(0x78, 0x78).w(FUNC(alphatp_34_state::bank_w)); } void alphatp_34_state::alphatp30_8088_map(address_map &map) { map(0x00000, 0x1ffff).ram(); - map(0xe0000, 0xeffff).rw(this, FUNC(alphatp_34_state::gfxext_r), FUNC(alphatp_34_state::gfxext_w)); + map(0xe0000, 0xeffff).rw(FUNC(alphatp_34_state::gfxext_r), FUNC(alphatp_34_state::gfxext_w)); map(0xfe000, 0xfffff).rom().region("16bit", 0); } void alphatp_34_state::alphatp30_8088_io(address_map &map) { //AM_RANGE(0x008a, 0x008a) AM_READ // unknown - map(0xf800, 0xf800).w(this, FUNC(alphatp_34_state::gfxext1_w)); - map(0xf900, 0xf900).w(this, FUNC(alphatp_34_state::gfxext2_w)); - map(0xfa00, 0xfa01).w(this, FUNC(alphatp_34_state::gfxext3_w)); + map(0xf800, 0xf800).w(FUNC(alphatp_34_state::gfxext1_w)); + map(0xf900, 0xf900).w(FUNC(alphatp_34_state::gfxext2_w)); + map(0xfa00, 0xfa01).w(FUNC(alphatp_34_state::gfxext3_w)); //AM_RANGE(0xfb00, 0xfb0f) AM_WRITE // unknown possibly gfx ext map(0xffe0, 0xffe1).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xffe4, 0xffe7).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0xffe9, 0xffea).rw(this, FUNC(alphatp_34_state::comm85_r), FUNC(alphatp_34_state::comm85_w)); + map(0xffe9, 0xffea).rw(FUNC(alphatp_34_state::comm85_r), FUNC(alphatp_34_state::comm85_w)); } READ8_MEMBER(alphatp_34_state::start88_r) diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp index b834866f8c1..a546a285db5 100644 --- a/src/mame/drivers/alphatro.cpp +++ b/src/mame/drivers/alphatro.cpp @@ -391,23 +391,23 @@ INPUT_CHANGED_MEMBER( alphatro_state::alphatro_break ) void alphatro_state::alphatro_map(address_map &map) { map(0x0000, 0x5fff).m(m_lowbank, FUNC(address_map_bank_device::amap8)); - map(0x6000, 0x9fff).rw(this, FUNC(alphatro_state::ram6000_r), FUNC(alphatro_state::ram6000_w)); + map(0x6000, 0x9fff).rw(FUNC(alphatro_state::ram6000_r), FUNC(alphatro_state::ram6000_w)); map(0xa000, 0xdfff).m("cartbank", FUNC(address_map_bank_device::amap8)); - map(0xe000, 0xefff).rw(this, FUNC(alphatro_state::rame000_r), FUNC(alphatro_state::rame000_w)); + map(0xe000, 0xefff).rw(FUNC(alphatro_state::rame000_r), FUNC(alphatro_state::rame000_w)); map(0xf000, 0xffff).m("monbank", FUNC(address_map_bank_device::amap8)); } void alphatro_state::rombank_map(address_map &map) { - map(0x0000, 0x5fff).rom().region("roms", 0x0000).w(this, FUNC(alphatro_state::ram0000_w)); - map(0x6000, 0xbfff).rw(this, FUNC(alphatro_state::ram0000_r), FUNC(alphatro_state::ram0000_w)); + map(0x0000, 0x5fff).rom().region("roms", 0x0000).w(FUNC(alphatro_state::ram0000_w)); + map(0x6000, 0xbfff).rw(FUNC(alphatro_state::ram0000_r), FUNC(alphatro_state::ram0000_w)); } void alphatro_state::cartbank_map(address_map &map) { - map(0x0000, 0x3fff).r(m_cart, FUNC(generic_slot_device::read_rom)).w(this, FUNC(alphatro_state::rama000_w)); - map(0x4000, 0x7fff).rw(this, FUNC(alphatro_state::rama000_r), FUNC(alphatro_state::rama000_w)); + map(0x0000, 0x3fff).r(m_cart, FUNC(generic_slot_device::read_rom)).w(FUNC(alphatro_state::rama000_w)); + map(0x4000, 0x7fff).rw(FUNC(alphatro_state::rama000_r), FUNC(alphatro_state::rama000_w)); } void alphatro_state::monbank_map(address_map &map) @@ -421,8 +421,8 @@ void alphatro_state::alphatro_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x10, 0x10).rw(this, FUNC(alphatro_state::port10_r), FUNC(alphatro_state::port10_w)); - map(0x20, 0x20).portr("X0").w(this, FUNC(alphatro_state::port20_w)); + map(0x10, 0x10).rw(FUNC(alphatro_state::port10_r), FUNC(alphatro_state::port10_w)); + map(0x20, 0x20).portr("X0").w(FUNC(alphatro_state::port20_w)); map(0x21, 0x21).portr("X1"); map(0x22, 0x22).portr("X2"); map(0x23, 0x23).portr("X3"); @@ -434,7 +434,7 @@ void alphatro_state::alphatro_io(address_map &map) map(0x29, 0x29).portr("X9"); map(0x2a, 0x2a).portr("XA"); map(0x2b, 0x2b).portr("XB"); - map(0x30, 0x30).rw(this, FUNC(alphatro_state::port30_r), FUNC(alphatro_state::port30_w)); + map(0x30, 0x30).rw(FUNC(alphatro_state::port30_r), FUNC(alphatro_state::port30_w)); // USART for cassette reading and writing map(0x40, 0x40).rw(m_usart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x41, 0x41).rw(m_usart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); @@ -445,7 +445,7 @@ void alphatro_state::alphatro_io(address_map &map) map(0x60, 0x68).rw(m_dmac, FUNC(i8257_device::read), FUNC(i8257_device::write)); // 8259 PIT //AM_RANGE(0x70, 0x72) AM_DEVREADWRITE(" - map(0xf0, 0xf0).r(this, FUNC(alphatro_state::portf0_r)).w(this, FUNC(alphatro_state::portf0_w)); + map(0xf0, 0xf0).r(FUNC(alphatro_state::portf0_r)).w(FUNC(alphatro_state::portf0_w)); map(0xf8, 0xf8).rw(m_fdc, FUNC(upd765a_device::fifo_r), FUNC(upd765a_device::fifo_w)); map(0xf9, 0xf9).r(m_fdc, FUNC(upd765a_device::msr_r)); } diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp index bd3063f343f..99c7fb8c693 100644 --- a/src/mame/drivers/altos2.cpp +++ b/src/mame/drivers/altos2.cpp @@ -85,7 +85,7 @@ void altos2_state::io_map(address_map &map) map(0x00, 0x03).rw("dart1", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0x04, 0x07).rw("dart2", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0x08, 0x0b).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x0c, 0x0c).w(this, FUNC(altos2_state::video_mode_w)); + map(0x0c, 0x0c).w(FUNC(altos2_state::video_mode_w)); map(0x40, 0x7f).rw(m_novram, FUNC(x2210_device::read), FUNC(x2210_device::write)); //AM_RANGE(0x80, 0xff) AM_DEVREADWRITE_MOD("vpac", crt9007_device, read, write, rshift<1>) } diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp index 69c5824324a..6a3528b8634 100644 --- a/src/mame/drivers/altos486.cpp +++ b/src/mame/drivers/altos486.cpp @@ -109,12 +109,12 @@ static void altos486_floppies(device_slot_interface &device) void altos486_state::altos486_mem(address_map &map) { map.unmap_value_high(); - map(0x00000, 0xfffff).rw(this, FUNC(altos486_state::mmu_ram_r), FUNC(altos486_state::mmu_ram_w)).share("main_ram"); + map(0x00000, 0xfffff).rw(FUNC(altos486_state::mmu_ram_r), FUNC(altos486_state::mmu_ram_w)).share("main_ram"); } void altos486_state::altos486_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(altos486_state::mmu_io_r), FUNC(altos486_state::mmu_io_w)); + map(0x0000, 0xffff).rw(FUNC(altos486_state::mmu_io_r), FUNC(altos486_state::mmu_io_w)); } void altos486_state::altos486_z80_mem(address_map &map) diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index b1bbfeec99e..e33cc861711 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -102,12 +102,12 @@ void altos5_state::mem_map(address_map &map) void altos5_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); + map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); map(0x04, 0x07).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); map(0x08, 0x0b).rw(m_pio0, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x0c, 0x0f).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x10, 0x13).rw("pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0x14, 0x17).w(this, FUNC(altos5_state::port14_w)); + map(0x14, 0x17).w(FUNC(altos5_state::port14_w)); map(0x1c, 0x1f).rw("dart", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); //AM_RANGE(0x20, 0x23) // Hard drive map(0x2c, 0x2f).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp index 73bed2be0cf..bd714bcc78b 100644 --- a/src/mame/drivers/altos8600.cpp +++ b/src/mame/drivers/altos8600.cpp @@ -667,57 +667,57 @@ IRQ_CALLBACK_MEMBER(altos8600_state::inta) void altos8600_state::cpu_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::cpuram_r), FUNC(altos8600_state::cpuram_w)); + map(0x00000, 0xfffff).rw(FUNC(altos8600_state::cpuram_r), FUNC(altos8600_state::cpuram_w)); } void altos8600_state::stack_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::stkram_r), FUNC(altos8600_state::stkram_w)); + map(0x00000, 0xfffff).rw(FUNC(altos8600_state::stkram_r), FUNC(altos8600_state::stkram_w)); } void altos8600_state::code_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::coderam_r), FUNC(altos8600_state::coderam_w)); + map(0x00000, 0xfffff).rw(FUNC(altos8600_state::coderam_r), FUNC(altos8600_state::coderam_w)); } void altos8600_state::extra_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::xtraram_r), FUNC(altos8600_state::xtraram_w)); + map(0x00000, 0xfffff).rw(FUNC(altos8600_state::xtraram_r), FUNC(altos8600_state::xtraram_w)); } void altos8600_state::cpu_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(altos8600_state::cpuio_r), FUNC(altos8600_state::cpuio_w)); + map(0x0000, 0xffff).rw(FUNC(altos8600_state::cpuio_r), FUNC(altos8600_state::cpuio_w)); } void altos8600_state::dmac_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::dmacram_r), FUNC(altos8600_state::dmacram_w)); + map(0x00000, 0xfffff).rw(FUNC(altos8600_state::dmacram_r), FUNC(altos8600_state::dmacram_w)); } void altos8600_state::dmac_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(altos8600_state::nmi_r), FUNC(altos8600_state::nmi_w)); - map(0x0000, 0x0007).r(this, FUNC(altos8600_state::fault_r)); - map(0x0008, 0x000f).w(this, FUNC(altos8600_state::clear_w)); - map(0x0010, 0x0017).r(this, FUNC(altos8600_state::errlo_r)); - map(0x0018, 0x001f).r(this, FUNC(altos8600_state::errhi_r)); - map(0x0020, 0x0027).rw(this, FUNC(altos8600_state::hd_r), FUNC(altos8600_state::hd_w)).umask16(0x00ff); - map(0x0030, 0x0037).w(this, FUNC(altos8600_state::mode_w)); - map(0x0038, 0x003f).w(this, FUNC(altos8600_state::cattn_w)); + map(0x0000, 0xffff).rw(FUNC(altos8600_state::nmi_r), FUNC(altos8600_state::nmi_w)); + map(0x0000, 0x0007).r(FUNC(altos8600_state::fault_r)); + map(0x0008, 0x000f).w(FUNC(altos8600_state::clear_w)); + map(0x0010, 0x0017).r(FUNC(altos8600_state::errlo_r)); + map(0x0018, 0x001f).r(FUNC(altos8600_state::errhi_r)); + map(0x0020, 0x0027).rw(FUNC(altos8600_state::hd_r), FUNC(altos8600_state::hd_w)).umask16(0x00ff); + map(0x0030, 0x0037).w(FUNC(altos8600_state::mode_w)); + map(0x0038, 0x003f).w(FUNC(altos8600_state::cattn_w)); map(0x0040, 0x0047).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); map(0x0040, 0x0047).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)).umask16(0xff00); map(0x0048, 0x004f).rw(m_uart8274, FUNC(i8274_new_device::cd_ba_r), FUNC(i8274_new_device::cd_ba_w)).umask16(0x00ff); map(0x0048, 0x004f).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0xff00); - map(0x0050, 0x0057).rw(this, FUNC(altos8600_state::romport_r), FUNC(altos8600_state::romport_w)); + map(0x0050, 0x0057).rw(FUNC(altos8600_state::romport_r), FUNC(altos8600_state::romport_w)); map(0x0058, 0x005f).rw(m_pic1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x0058, 0x005f).w(this, FUNC(altos8600_state::clrsys_w)).umask16(0xff00); + map(0x0058, 0x005f).w(FUNC(altos8600_state::clrsys_w)).umask16(0xff00); map(0x0060, 0x0067).rw(m_pic2, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x0068, 0x006f).rw(m_pic3, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x0070, 0x0077).noprw(); - map(0x0078, 0x0079).w(this, FUNC(altos8600_state::ics_attn_w)); - map(0x0200, 0x03ff).rw(this, FUNC(altos8600_state::mmuflags_r), FUNC(altos8600_state::mmuflags_w)); - map(0x0400, 0x05ff).rw(this, FUNC(altos8600_state::mmuaddr_r), FUNC(altos8600_state::mmuaddr_w)); + map(0x0078, 0x0079).w(FUNC(altos8600_state::ics_attn_w)); + map(0x0200, 0x03ff).rw(FUNC(altos8600_state::mmuflags_r), FUNC(altos8600_state::mmuflags_w)); + map(0x0400, 0x05ff).rw(FUNC(altos8600_state::mmuaddr_r), FUNC(altos8600_state::mmuaddr_w)); } static void altos8600_floppies(device_slot_interface &device) diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp index cfbc40e8dd0..d10741eb043 100644 --- a/src/mame/drivers/amaticmg.cpp +++ b/src/mame/drivers/amaticmg.cpp @@ -670,10 +670,10 @@ void amaticmg_state::amaticmg_portmap(address_map &map) map(0x40, 0x41).w("ymsnd", FUNC(ym3812_device::write)); map(0x60, 0x60).w("crtc", FUNC(mc6845_device::address_w)); map(0x61, 0x61).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x80, 0x80).w(this, FUNC(amaticmg_state::unk80_w)); - map(0xc0, 0xc0).w(this, FUNC(amaticmg_state::rombank_w)); -// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_byte_interface, write) -// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac2", dac_byte_interface, write) + map(0x80, 0x80).w(FUNC(amaticmg_state::unk80_w)); + map(0xc0, 0xc0).w(FUNC(amaticmg_state::rombank_w)); +// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_byte_interface, data_w) +// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac2", dac_byte_interface, data_w) } void amaticmg_state::amaticmg2_portmap(address_map &map) @@ -685,8 +685,8 @@ void amaticmg_state::amaticmg2_portmap(address_map &map) map(0x40, 0x41).w("ymsnd", FUNC(ym3812_device::write)); map(0x60, 0x60).w("crtc", FUNC(mc6845_device::address_w)); // 0e for mg_iii_vger_3.64_v_8309 map(0x61, 0x61).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); // 0f for mg_iii_vger_3.64_v_8309 - map(0xc0, 0xc0).w(this, FUNC(amaticmg_state::rombank_w)); - map(0xe6, 0xe6).w(this, FUNC(amaticmg_state::nmi_mask_w)); + map(0xc0, 0xc0).w(FUNC(amaticmg_state::rombank_w)); + map(0xe6, 0xe6).w(FUNC(amaticmg_state::nmi_mask_w)); map(0xe8, 0xeb).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); } @@ -701,7 +701,7 @@ void amaticmg_state::amaticmg4_portmap(address_map &map) map(0x0e, 0x0e).w("crtc", FUNC(mc6845_device::address_w)); map(0x0f, 0x0f).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); // AM_RANGE(0xc0, 0xc0) AM_WRITE(rombank_w) - map(0xe6, 0xe6).w(this, FUNC(amaticmg_state::nmi_mask_w)); + map(0xe6, 0xe6).w(FUNC(amaticmg_state::nmi_mask_w)); } diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp index 051fd5bf2d6..f979de87ecd 100644 --- a/src/mame/drivers/ambush.cpp +++ b/src/mame/drivers/ambush.cpp @@ -126,13 +126,13 @@ void ambush_state::main_map(address_map &map) map(0x8000, 0x87ff).ram(); map(0xa000, 0xa000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xc000, 0xc07f).ram(); - map(0xc080, 0xc09f).ram().w(this, FUNC(ambush_state::scroll_ram_w)).share("scroll_ram"); // 1 byte for each column + map(0xc080, 0xc09f).ram().w(FUNC(ambush_state::scroll_ram_w)).share("scroll_ram"); // 1 byte for each column map(0xc0a0, 0xc0ff).ram(); map(0xc100, 0xc1ff).ram().share("attribute_ram"); // 1 line corresponds to 4 in the video ram map(0xc200, 0xc3ff).ram().share("sprite_ram"); map(0xc400, 0xc7ff).ram().share("video_ram"); map(0xc800, 0xc800).portr("sw1"); - map(0xcc00, 0xcc07).w(this, FUNC(ambush_state::output_latches_w)); + map(0xcc00, 0xcc07).w(FUNC(ambush_state::output_latches_w)); } void ambush_state::main_portmap(address_map &map) diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp index f21b4b74454..d4fd70d4239 100644 --- a/src/mame/drivers/amerihok.cpp +++ b/src/mame/drivers/amerihok.cpp @@ -58,7 +58,7 @@ void amerihok_state::amerihok_map(address_map &map) void amerihok_state::amerihok_data_map(address_map &map) { - map(0x2000, 0x2000).w(this, FUNC(amerihok_state::control_w)); + map(0x2000, 0x2000).w(FUNC(amerihok_state::control_w)); map(0x4000, 0x4000).w(m_oki, FUNC(okim6376_device::write)); } diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index e20d392efe0..8e55a2e4d1e 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -35,9 +35,9 @@ class a1000_state : public amiga_state { public: a1000_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_bootrom(*this, "bootrom"), - m_wom(*this, "wom") + amiga_state(mconfig, type, tag), + m_bootrom(*this, "bootrom"), + m_wom(*this, "wom") { } void init_pal(); @@ -64,11 +64,11 @@ class a2000_state : public amiga_state { public: a2000_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_rtc(*this, "u65"), - m_zorro(*this, ZORROBUS_TAG), - m_zorro2_int2(0), - m_zorro2_int6(0) + amiga_state(mconfig, type, tag), + m_rtc(*this, "u65"), + m_zorro(*this, ZORROBUS_TAG), + m_zorro2_int2(0), + m_zorro2_int6(0) { } void init_pal(); @@ -104,10 +104,10 @@ class a500_state : public amiga_state { public: a500_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_side(*this, EXP_SLOT_TAG), - m_side_int2(0), - m_side_int6(0) + amiga_state(mconfig, type, tag), + m_side(*this, EXP_SLOT_TAG), + m_side_int2(0), + m_side_int6(0) { } void init_pal(); @@ -139,13 +139,13 @@ class cdtv_state : public amiga_state { public: cdtv_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_rtc(*this, "u61"), - m_dmac(*this, "u36"), - m_tpi(*this, "u32"), - m_cdrom(*this, "cdrom"), - m_dmac_irq(0), - m_tpi_irq(0) + amiga_state(mconfig, type, tag), + m_rtc(*this, "u61"), + m_dmac(*this, "u36"), + m_tpi(*this, "u32"), + m_cdrom(*this, "cdrom"), + m_dmac_irq(0), + m_tpi_irq(0) { } void init_pal(); @@ -191,7 +191,7 @@ class a3000_state : public amiga_state { public: a3000_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag) + amiga_state(mconfig, type, tag) { } DECLARE_READ32_MEMBER( scsi_r ); @@ -214,11 +214,11 @@ class a500p_state : public amiga_state { public: a500p_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_rtc(*this, "u9"), - m_side(*this, EXP_SLOT_TAG), - m_side_int2(0), - m_side_int6(0) + amiga_state(mconfig, type, tag), + m_rtc(*this, "u9"), + m_side(*this, EXP_SLOT_TAG), + m_side_int2(0), + m_side_int6(0) { } DECLARE_READ16_MEMBER( clock_r ); @@ -251,8 +251,8 @@ class a600_state : public amiga_state { public: a600_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_gayle_int2(0) + amiga_state(mconfig, type, tag), + m_gayle_int2(0) { } DECLARE_WRITE_LINE_MEMBER( gayle_int2_w ); @@ -276,8 +276,8 @@ class a1200_state : public amiga_state { public: a1200_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_gayle_int2(0) + amiga_state(mconfig, type, tag), + m_gayle_int2(0) { } DECLARE_WRITE_LINE_MEMBER( gayle_int2_w ); @@ -301,13 +301,13 @@ class a4000_state : public amiga_state { public: a4000_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_ata(*this, "ata"), - m_ramsey_config(0), - m_gary_coldboot(1), - m_gary_timeout(0), - m_gary_toenb(0), - m_ide_interrupt(0) + amiga_state(mconfig, type, tag), + m_ata(*this, "ata"), + m_ramsey_config(0), + m_gary_coldboot(1), + m_gary_timeout(0), + m_gary_toenb(0), + m_ide_interrupt(0) { } DECLARE_READ32_MEMBER( scsi_r ); @@ -346,9 +346,9 @@ class cd32_state : public amiga_state { public: cd32_state(const machine_config &mconfig, device_type type, const char *tag) : - amiga_state(mconfig, type, tag), - m_player_ports(*this, {"p1_cd32_buttons", "p2_cd32_buttons"}), - m_cdda(*this, "cdda") + amiga_state(mconfig, type, tag), + m_player_ports(*this, {"p1_cd32_buttons", "p2_cd32_buttons"}), + m_cdda(*this, "cdda") { } DECLARE_WRITE_LINE_MEMBER( akiko_int_w ); @@ -1001,7 +1001,7 @@ void a1000_state::a1000_overlay_map(address_map &map) void a1000_state::a1000_bootrom_map(address_map &map) { - map(0x000000, 0x00ffff).mirror(0x30000).rom().region("bootrom", 0).w(this, FUNC(a1000_state::write_protect_w)); + map(0x000000, 0x00ffff).mirror(0x30000).rom().region("bootrom", 0).w(FUNC(a1000_state::write_protect_w)); map(0x040000, 0x07ffff).bankr("wom"); } @@ -1009,9 +1009,9 @@ void a1000_state::a1000_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(a1000_state::cia_r), FUNC(a1000_state::cia_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(a1000_state::custom_chip_r), FUNC(a1000_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a1000_state::rom_mirror_r)); + map(0xa00000, 0xbfffff).rw(FUNC(a1000_state::cia_r), FUNC(a1000_state::cia_w)); + map(0xc00000, 0xdfffff).rw(FUNC(a1000_state::custom_chip_r), FUNC(a1000_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(a1000_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf80000, 0xfbffff).m(m_bootrom, FUNC(address_map_bank_device::amap16)); map(0xfc0000, 0xffffff).bankrw("wom"); @@ -1062,15 +1062,15 @@ void a2000_state::a2000_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(a2000_state::cia_r), FUNC(a2000_state::cia_w)); + map(0xa00000, 0xbfffff).rw(FUNC(a2000_state::cia_r), FUNC(a2000_state::cia_w)); map(0xc00000, 0xc7ffff).ram(); - map(0xc80000, 0xd7ffff).rw(this, FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w)); + map(0xc80000, 0xd7ffff).rw(FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w)); map(0xd80000, 0xdbffff).noprw(); - map(0xdc0000, 0xdc7fff).rw(this, FUNC(a2000_state::clock_r), FUNC(a2000_state::clock_w)); + map(0xdc0000, 0xdc7fff).rw(FUNC(a2000_state::clock_r), FUNC(a2000_state::clock_w)); map(0xdc8000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a2000_state::rom_mirror_r)); + map(0xde0000, 0xdeffff).rw(FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(a2000_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf00000, 0xf7ffff).noprw(); // cartridge space map(0xf80000, 0xffffff).rom().region("kickstart", 0); @@ -1081,12 +1081,12 @@ void a500_state::a500_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(a500_state::cia_r), FUNC(a500_state::cia_w)); - map(0xc00000, 0xd7ffff).rw(this, FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w)); + map(0xa00000, 0xbfffff).rw(FUNC(a500_state::cia_r), FUNC(a500_state::cia_w)); + map(0xc00000, 0xd7ffff).rw(FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w)); map(0xd80000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a500_state::rom_mirror_r)); + map(0xde0000, 0xdeffff).rw(FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(a500_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf00000, 0xf7ffff).noprw(); // cartridge space map(0xf80000, 0xffffff).rom().region("kickstart", 0); @@ -1097,14 +1097,14 @@ void cdtv_state::cdtv_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(cdtv_state::cia_r), FUNC(cdtv_state::cia_w)); - map(0xc00000, 0xd7ffff).rw(this, FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w)); + map(0xa00000, 0xbfffff).rw(FUNC(cdtv_state::cia_r), FUNC(cdtv_state::cia_w)); + map(0xc00000, 0xd7ffff).rw(FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w)); map(0xd80000, 0xdbffff).noprw(); - map(0xdc0000, 0xdc7fff).rw(this, FUNC(cdtv_state::clock_r), FUNC(cdtv_state::clock_w)); + map(0xdc0000, 0xdc7fff).rw(FUNC(cdtv_state::clock_r), FUNC(cdtv_state::clock_w)); map(0xdc8000, 0xdc87ff).mirror(0x7800).ram().share("sram"); map(0xdd0000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w)); + map(0xde0000, 0xdeffff).rw(FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w)); map(0xe00000, 0xe3ffff).mirror(0x40000).ram().share("memcard"); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf00000, 0xf3ffff).mirror(0x40000).rom().region("cdrom", 0); @@ -1120,13 +1120,13 @@ void a3000_state::a3000_mem(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x001fffff).m(m_overlay, FUNC(address_map_bank_device::amap32)); - map(0x00b80000, 0x00bfffff).rw(this, FUNC(a3000_state::cia_r), FUNC(a3000_state::cia_w)); - map(0x00c00000, 0x00cfffff).rw(this, FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w)); + map(0x00b80000, 0x00bfffff).rw(FUNC(a3000_state::cia_r), FUNC(a3000_state::cia_w)); + map(0x00c00000, 0x00cfffff).rw(FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w)); map(0x00d00000, 0x00dbffff).noprw(); map(0x00dc0000, 0x00dcffff).rw("rtc", FUNC(rp5c01_device::read), FUNC(rp5c01_device::write)).umask32(0x000000ff); - map(0x00dd0000, 0x00ddffff).rw(this, FUNC(a3000_state::scsi_r), FUNC(a3000_state::scsi_w)); - map(0x00de0000, 0x00deffff).rw(this, FUNC(a3000_state::motherboard_r), FUNC(a3000_state::motherboard_w)); - map(0x00df0000, 0x00dfffff).rw(this, FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w)); + map(0x00dd0000, 0x00ddffff).rw(FUNC(a3000_state::scsi_r), FUNC(a3000_state::scsi_w)); + map(0x00de0000, 0x00deffff).rw(FUNC(a3000_state::motherboard_r), FUNC(a3000_state::motherboard_w)); + map(0x00df0000, 0x00dfffff).rw(FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w)); map(0x00e80000, 0x00efffff).noprw(); // autoconfig space (installed by devices) map(0x00f00000, 0x00f7ffff).noprw(); // cartridge space map(0x00f80000, 0x00ffffff).rom().region("kickstart", 0); @@ -1138,15 +1138,15 @@ void a500p_state::a500p_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(a500p_state::cia_r), FUNC(a500p_state::cia_w)); + map(0xa00000, 0xbfffff).rw(FUNC(a500p_state::cia_r), FUNC(a500p_state::cia_w)); map(0xc00000, 0xc7ffff).ram(); - map(0xc80000, 0xd7ffff).rw(this, FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w)); + map(0xc80000, 0xd7ffff).rw(FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w)); map(0xd80000, 0xdbffff).noprw(); - map(0xdc0000, 0xdc7fff).rw(this, FUNC(a500p_state::clock_r), FUNC(a500p_state::clock_w)); + map(0xdc0000, 0xdc7fff).rw(FUNC(a500p_state::clock_r), FUNC(a500p_state::clock_w)); map(0xdc8000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a500p_state::rom_mirror_r)); + map(0xde0000, 0xdeffff).rw(FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(a500p_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf80000, 0xffffff).rom().region("kickstart", 0); } @@ -1157,10 +1157,10 @@ void a600_state::a600_mem(address_map &map) map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); map(0x200000, 0xa7ffff).noprw(); - map(0xa80000, 0xafffff).nopw().r(this, FUNC(a600_state::rom_mirror_r)); - map(0xb00000, 0xb7ffff).nopw().r(this, FUNC(a600_state::rom_mirror_r)); + map(0xa80000, 0xafffff).nopw().r(FUNC(a600_state::rom_mirror_r)); + map(0xb00000, 0xb7ffff).nopw().r(FUNC(a600_state::rom_mirror_r)); map(0xb80000, 0xbeffff).noprw(); // reserved (cdtv) - map(0xbf0000, 0xbfffff).rw(this, FUNC(a600_state::cia_r), FUNC(a600_state::gayle_cia_w)); + map(0xbf0000, 0xbfffff).rw(FUNC(a600_state::cia_r), FUNC(a600_state::gayle_cia_w)); map(0xc00000, 0xd7ffff).noprw(); // slow mem map(0xd80000, 0xd8ffff).noprw(); // spare chip select map(0xd90000, 0xd9ffff).noprw(); // arcnet chip select @@ -1169,8 +1169,8 @@ void a600_state::a600_mem(address_map &map) map(0xdc0000, 0xdcffff).noprw(); // rtc map(0xdd0000, 0xddffff).noprw(); // reserved (dma controller) map(0xde0000, 0xdeffff).rw("gayle", FUNC(gayle_device::gayle_id_r), FUNC(gayle_device::gayle_id_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(a600_state::custom_chip_r), FUNC(a600_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a600_state::rom_mirror_r)); + map(0xdf0000, 0xdfffff).rw(FUNC(a600_state::custom_chip_r), FUNC(a600_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(a600_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf00000, 0xf7ffff).noprw(); // cartridge space map(0xf80000, 0xffffff).rom().region("kickstart", 0); @@ -1182,10 +1182,10 @@ void a1200_state::a1200_mem(address_map &map) map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap32)); map(0x200000, 0xa7ffff).noprw(); - map(0xa80000, 0xafffff).nopw().r(this, FUNC(a1200_state::rom_mirror32_r)); - map(0xb00000, 0xb7ffff).nopw().r(this, FUNC(a1200_state::rom_mirror32_r)); + map(0xa80000, 0xafffff).nopw().r(FUNC(a1200_state::rom_mirror32_r)); + map(0xb00000, 0xb7ffff).nopw().r(FUNC(a1200_state::rom_mirror32_r)); map(0xb80000, 0xbeffff).noprw(); // reserved (cdtv) - map(0xbf0000, 0xbfffff).rw(this, FUNC(a1200_state::cia_r), FUNC(a1200_state::gayle_cia_w)); + map(0xbf0000, 0xbfffff).rw(FUNC(a1200_state::cia_r), FUNC(a1200_state::gayle_cia_w)); map(0xc00000, 0xd7ffff).noprw(); // slow mem map(0xd80000, 0xd8ffff).noprw(); // spare chip select map(0xd90000, 0xd9ffff).noprw(); // arcnet chip select @@ -1194,8 +1194,8 @@ void a1200_state::a1200_mem(address_map &map) map(0xdc0000, 0xdcffff).noprw(); // rtc map(0xdd0000, 0xddffff).noprw(); // reserved (dma controller) map(0xde0000, 0xdeffff).rw("gayle", FUNC(gayle_device::gayle_id_r), FUNC(gayle_device::gayle_id_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(a1200_state::custom_chip_r), FUNC(a1200_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a1200_state::rom_mirror32_r)); + map(0xdf0000, 0xdfffff).rw(FUNC(a1200_state::custom_chip_r), FUNC(a1200_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(a1200_state::rom_mirror32_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf00000, 0xf7ffff).noprw(); // cartridge space map(0xf80000, 0xffffff).rom().region("kickstart", 0); @@ -1209,17 +1209,17 @@ void a4000_state::a4000_mem(address_map &map) map(0x00200000, 0x009fffff).noprw(); // zorro2 expansion map(0x00a00000, 0x00b7ffff).noprw(); map(0x00b80000, 0x00beffff).noprw(); - map(0x00bf0000, 0x00bfffff).rw(this, FUNC(a4000_state::cia_r), FUNC(a4000_state::cia_w)); - map(0x00c00000, 0x00cfffff).rw(this, FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w)); + map(0x00bf0000, 0x00bfffff).rw(FUNC(a4000_state::cia_r), FUNC(a4000_state::cia_w)); + map(0x00c00000, 0x00cfffff).rw(FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w)); map(0x00d00000, 0x00d9ffff).noprw(); map(0x00da0000, 0x00dbffff).noprw(); map(0x00dc0000, 0x00dcffff).rw("rtc", FUNC(rp5c01_device::read), FUNC(rp5c01_device::write)).umask32(0x000000ff); map(0x00dd0000, 0x00dd0fff).noprw(); - map(0x00dd1000, 0x00dd3fff).rw(this, FUNC(a4000_state::ide_r), FUNC(a4000_state::ide_w)); + map(0x00dd1000, 0x00dd3fff).rw(FUNC(a4000_state::ide_r), FUNC(a4000_state::ide_w)); map(0x00dd4000, 0x00ddffff).noprw(); - map(0x00de0000, 0x00deffff).rw(this, FUNC(a4000_state::motherboard_r), FUNC(a4000_state::motherboard_w)); - map(0x00df0000, 0x00dfffff).rw(this, FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w)); - map(0x00e00000, 0x00e7ffff).nopw().r(this, FUNC(a4000_state::rom_mirror32_r)); + map(0x00de0000, 0x00deffff).rw(FUNC(a4000_state::motherboard_r), FUNC(a4000_state::motherboard_w)); + map(0x00df0000, 0x00dfffff).rw(FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w)); + map(0x00e00000, 0x00e7ffff).nopw().r(FUNC(a4000_state::rom_mirror32_r)); map(0x00e80000, 0x00efffff).noprw(); // zorro2 autoconfig space (installed by devices) map(0x00f00000, 0x00f7ffff).noprw(); // cartridge space map(0x00f80000, 0x00ffffff).rom().region("kickstart", 0); @@ -1244,8 +1244,8 @@ void cd32_state::cd32_mem(address_map &map) map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap32)); map(0xb80000, 0xb8003f).rw("akiko", FUNC(akiko_device::read), FUNC(akiko_device::write)); - map(0xbf0000, 0xbfffff).rw(this, FUNC(cd32_state::cia_r), FUNC(cd32_state::gayle_cia_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(cd32_state::custom_chip_r), FUNC(cd32_state::custom_chip_w)); + map(0xbf0000, 0xbfffff).rw(FUNC(cd32_state::cia_r), FUNC(cd32_state::gayle_cia_w)); + map(0xc00000, 0xdfffff).rw(FUNC(cd32_state::custom_chip_r), FUNC(cd32_state::custom_chip_w)); map(0xe00000, 0xe7ffff).rom().region("kickstart", 0x80000); map(0xe80000, 0xf7ffff).noprw(); map(0xf80000, 0xffffff).rom().region("kickstart", 0); @@ -1256,7 +1256,7 @@ void a4000_state::a4000t_mem(address_map &map) { map.unmap_value_high(); a4000_mem(map); - map(0x00dd0000, 0x00dd0fff).rw(this, FUNC(a4000_state::scsi_r), FUNC(a4000_state::scsi_w)); + map(0x00dd0000, 0x00dd0fff).rw(FUNC(a4000_state::scsi_r), FUNC(a4000_state::scsi_w)); } @@ -1385,7 +1385,7 @@ MACHINE_CONFIG_START(amiga_state::amiga_base) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq)) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("cia_0_port_a")) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write)) - MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE("centronics", centronics_device, write_strobe)) MCFG_MOS6526_SP_CALLBACK(WRITELINE("kbd", amiga_keyboard_bus_device, kdat_in_w)) MCFG_DEVCB_INVERT @@ -1737,10 +1737,10 @@ MACHINE_CONFIG_START(a600_state::a600) MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a600_state::GAYLE_ID) MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a600_state, gayle_int2_w)) - MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, read_cs0)) - MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs0)) - MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, read_cs1)) - MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs1)) + MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, cs0_r)) + MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs0_w)) + MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, cs1_r)) + MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs1_w)) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("gayle", gayle_device, ide_interrupt_w)) @@ -1792,10 +1792,10 @@ MACHINE_CONFIG_START(a1200_state::a1200) MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a1200_state::GAYLE_ID) MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a1200_state, gayle_int2_w)) - MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, read_cs0)) - MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs0)) - MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, read_cs1)) - MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs1)) + MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, cs0_r)) + MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs0_w)) + MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, cs1_r)) + MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs1_w)) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("gayle", gayle_device, ide_interrupt_w)) diff --git a/src/mame/drivers/ampex.cpp b/src/mame/drivers/ampex.cpp index 108c5e02bc9..19aabb9c571 100644 --- a/src/mame/drivers/ampex.cpp +++ b/src/mame/drivers/ampex.cpp @@ -162,14 +162,14 @@ void ampex_state::mem_map(address_map &map) map(0x0000, 0x2fff).rom().region("roms", 0); map(0x4000, 0x43ff).ram(); // main RAM map(0x4400, 0x57ff).ram(); // expansion RAM - map(0x5840, 0x5840).rw(this, FUNC(ampex_state::read_5840), FUNC(ampex_state::write_5840)); - map(0x5841, 0x5841).rw(this, FUNC(ampex_state::read_5841), FUNC(ampex_state::write_5841)); - map(0x5842, 0x5842).r(this, FUNC(ampex_state::read_5842)).w(m_uart, FUNC(ay31015_device::transmit)); - map(0x5843, 0x5843).r(m_uart, FUNC(ay31015_device::receive)).w(this, FUNC(ampex_state::write_5843)); - map(0x5846, 0x5846).r(this, FUNC(ampex_state::read_5846)); - map(0x5847, 0x5847).r(this, FUNC(ampex_state::read_5847)); + map(0x5840, 0x5840).rw(FUNC(ampex_state::read_5840), FUNC(ampex_state::write_5840)); + map(0x5841, 0x5841).rw(FUNC(ampex_state::read_5841), FUNC(ampex_state::write_5841)); + map(0x5842, 0x5842).r(FUNC(ampex_state::read_5842)).w(m_uart, FUNC(ay31015_device::transmit)); + map(0x5843, 0x5843).r(m_uart, FUNC(ay31015_device::receive)).w(FUNC(ampex_state::write_5843)); + map(0x5846, 0x5846).r(FUNC(ampex_state::read_5846)); + map(0x5847, 0x5847).r(FUNC(ampex_state::read_5847)); map(0x5c00, 0x5c0f).rw("vtac", FUNC(crt5037_device::read), FUNC(crt5037_device::write)); - map(0x8000, 0x97ff).rw(this, FUNC(ampex_state::page_r), FUNC(ampex_state::page_w)); + map(0x8000, 0x97ff).rw(FUNC(ampex_state::page_r), FUNC(ampex_state::page_w)); map(0xc000, 0xcfff).ram(); // video RAM } @@ -187,8 +187,8 @@ void ampex_state::machine_start() m_uart->write_swe(0); // Are rates hardwired to DIP switches? They don't seem to be software-controlled... - m_dbrg->str_w(0xe); - m_dbrg->stt_w(0xe); + m_dbrg->write_str(0xe); + m_dbrg->write_stt(0xe); // Make up some settings for the UART (probably also actually controlled by DIP switches) m_uart->write_nb1(1); diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp index e9ae00f0d29..a3deba623ca 100644 --- a/src/mame/drivers/ampoker2.cpp +++ b/src/mame/drivers/ampoker2.cpp @@ -600,7 +600,7 @@ void ampoker2_state::ampoker2_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram().share("nvram"); - map(0xe000, 0xefff).ram().w(this, FUNC(ampoker2_state::ampoker2_videoram_w)).share("videoram"); + map(0xe000, 0xefff).ram().w(FUNC(ampoker2_state::ampoker2_videoram_w)).share("videoram"); } void ampoker2_state::ampoker2_io_map(address_map &map) @@ -616,14 +616,14 @@ void ampoker2_state::ampoker2_io_map(address_map &map) map(0x16, 0x16).portr("IN6"); map(0x17, 0x17).portr("IN7"); // AM_RANGE(0x21, 0x21) AM_WRITENOP /* undocumented, write 0x1a after each reset */ - map(0x30, 0x30).w(this, FUNC(ampoker2_state::ampoker2_port30_w)); /* see write handlers */ - map(0x31, 0x31).w(this, FUNC(ampoker2_state::ampoker2_port31_w)); /* see write handlers */ - map(0x32, 0x32).w(this, FUNC(ampoker2_state::ampoker2_port32_w)); /* see write handlers */ - map(0x33, 0x33).w(this, FUNC(ampoker2_state::ampoker2_port33_w)); /* see write handlers */ - map(0x34, 0x34).w(this, FUNC(ampoker2_state::ampoker2_port34_w)); /* see write handlers */ - map(0x35, 0x35).w(this, FUNC(ampoker2_state::ampoker2_port35_w)); /* see write handlers */ - map(0x36, 0x36).w(this, FUNC(ampoker2_state::ampoker2_port36_w)); /* see write handlers */ - map(0x37, 0x37).w(this, FUNC(ampoker2_state::ampoker2_watchdog_reset_w)); + map(0x30, 0x30).w(FUNC(ampoker2_state::ampoker2_port30_w)); /* see write handlers */ + map(0x31, 0x31).w(FUNC(ampoker2_state::ampoker2_port31_w)); /* see write handlers */ + map(0x32, 0x32).w(FUNC(ampoker2_state::ampoker2_port32_w)); /* see write handlers */ + map(0x33, 0x33).w(FUNC(ampoker2_state::ampoker2_port33_w)); /* see write handlers */ + map(0x34, 0x34).w(FUNC(ampoker2_state::ampoker2_port34_w)); /* see write handlers */ + map(0x35, 0x35).w(FUNC(ampoker2_state::ampoker2_port35_w)); /* see write handlers */ + map(0x36, 0x36).w(FUNC(ampoker2_state::ampoker2_port36_w)); /* see write handlers */ + map(0x37, 0x37).w(FUNC(ampoker2_state::ampoker2_watchdog_reset_w)); map(0x38, 0x39).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0x3A, 0x3A).r("aysnd", FUNC(ay8910_device::data_r)); } diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index 043d56f7a13..4bf5e013dca 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -107,13 +107,13 @@ void ampro_state::ampro_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(ampro_state::port00_w)); // system + map(0x00, 0x00).w(FUNC(ampro_state::port00_w)); // system //AM_RANGE(0x01, 0x01) AM_WRITE(port01_w) // printer data //AM_RANGE(0x02, 0x03) AM_WRITE(port02_w) // printer strobe //AM_RANGE(0x20, 0x27) AM_READWRITE() // scsi chip //AM_RANGE(0x28, 0x28) AM_WRITE(port28_w) // scsi control //AM_RANGE(0x29, 0x29) AM_READ(port29_r) // ID port - map(0x40, 0x8f).rw(this, FUNC(ampro_state::io_r), FUNC(ampro_state::io_w)); + map(0x40, 0x8f).rw(FUNC(ampro_state::io_r), FUNC(ampro_state::io_w)); map(0xc0, 0xc3).w(m_fdc, FUNC(wd1772_device::write)); map(0xc4, 0xc7).r(m_fdc, FUNC(wd1772_device::read)); } diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp index f308c26eaf1..2da1b3070f8 100644 --- a/src/mame/drivers/amspdwy.cpp +++ b/src/mame/drivers/amspdwy.cpp @@ -75,16 +75,16 @@ void amspdwy_state::amspdwy_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x801f).w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(amspdwy_state::amspdwy_videoram_w)).share("videoram"); - map(0x9800, 0x9bff).ram().w(this, FUNC(amspdwy_state::amspdwy_colorram_w)).share("colorram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(amspdwy_state::amspdwy_videoram_w)).share("videoram"); + map(0x9800, 0x9bff).ram().w(FUNC(amspdwy_state::amspdwy_colorram_w)).share("colorram"); map(0x9c00, 0x9fff).ram(); // unused? // AM_RANGE(0xa000, 0xa000) AM_WRITENOP // ? map(0xa000, 0xa000).portr("DSW1"); - map(0xa400, 0xa400).portr("DSW2").w(this, FUNC(amspdwy_state::amspdwy_flipscreen_w)); - map(0xa800, 0xa800).r(this, FUNC(amspdwy_state::amspdwy_wheel_0_r)); - map(0xac00, 0xac00).r(this, FUNC(amspdwy_state::amspdwy_wheel_1_r)); + map(0xa400, 0xa400).portr("DSW2").w(FUNC(amspdwy_state::amspdwy_flipscreen_w)); + map(0xa800, 0xa800).r(FUNC(amspdwy_state::amspdwy_wheel_0_r)); + map(0xac00, 0xac00).r(FUNC(amspdwy_state::amspdwy_wheel_1_r)); map(0xb000, 0xb000).nopw(); // irq ack? - map(0xb400, 0xb400).r(this, FUNC(amspdwy_state::amspdwy_sound_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0xb400, 0xb400).r(FUNC(amspdwy_state::amspdwy_sound_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xc000, 0xc0ff).ram().share("spriteram"); map(0xe000, 0xe7ff).ram(); } diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp index 178f64419bd..9f030172dd0 100644 --- a/src/mame/drivers/amstr_pc.cpp +++ b/src/mame/drivers/amstr_pc.cpp @@ -110,13 +110,13 @@ void amstrad_pc_state::pc2086_map(address_map &map) void amstrad_pc_state::pc200_io(address_map &map) { map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); - map(0x0060, 0x0065).rw(this, FUNC(amstrad_pc_state::pc1640_port60_r), FUNC(amstrad_pc_state::pc1640_port60_w)); - map(0x0078, 0x0079).rw(this, FUNC(amstrad_pc_state::pc1640_mouse_x_r), FUNC(amstrad_pc_state::pc1640_mouse_x_w)); - map(0x007a, 0x007b).rw(this, FUNC(amstrad_pc_state::pc1640_mouse_y_r), FUNC(amstrad_pc_state::pc1640_mouse_y_w)); + map(0x0060, 0x0065).rw(FUNC(amstrad_pc_state::pc1640_port60_r), FUNC(amstrad_pc_state::pc1640_port60_w)); + map(0x0078, 0x0079).rw(FUNC(amstrad_pc_state::pc1640_mouse_x_r), FUNC(amstrad_pc_state::pc1640_mouse_x_w)); + map(0x007a, 0x007b).rw(FUNC(amstrad_pc_state::pc1640_mouse_y_r), FUNC(amstrad_pc_state::pc1640_mouse_y_w)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); - map(0x0278, 0x027b).r(this, FUNC(amstrad_pc_state::pc200_port278_r)); + map(0x0278, 0x027b).r(FUNC(amstrad_pc_state::pc200_port278_r)); map(0x0278, 0x027b).w(m_lpt2, FUNC(pc_lpt_device::write)).umask16(0x00ff); - map(0x0378, 0x037b).r(this, FUNC(amstrad_pc_state::pc200_port378_r)); + map(0x0378, 0x037b).r(FUNC(amstrad_pc_state::pc200_port378_r)); map(0x0378, 0x037b).w(m_lpt1, FUNC(pc_lpt_device::write)).umask16(0x00ff); map(0x03bc, 0x03bf).rw("lpt_0", FUNC(pc_lpt_device::read), FUNC(pc_lpt_device::write)).umask16(0x00ff); } diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index 4375804a3dd..9ecc0f47cac 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -140,7 +140,7 @@ are not fully decoded by the CPC h/w. Doing it this way means I can decode it myself and a lot of software should work */ void amstrad_state::amstrad_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(amstrad_state::amstrad_cpc_io_r), FUNC(amstrad_state::amstrad_cpc_io_w)); + map(0x0000, 0xffff).rw(FUNC(amstrad_state::amstrad_cpc_io_r), FUNC(amstrad_state::amstrad_cpc_io_w)); } diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index 51c20c928e3..da77c10685c 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -365,13 +365,13 @@ WRITE8_MEMBER(amusco_state::rtc_control_w) void amusco_state::amusco_io_map(address_map &map) { - map(0x0000, 0x0001).rw(this, FUNC(amusco_state::mc6845_r), FUNC(amusco_state::mc6845_w)); + map(0x0000, 0x0001).rw(FUNC(amusco_state::mc6845_r), FUNC(amusco_state::mc6845_w)); map(0x0010, 0x0011).w(m_pic, FUNC(pic8259_device::write)); map(0x0020, 0x0023).w(m_pit, FUNC(pit8253_device::write)); map(0x0030, 0x0033).rw("ppi_outputs", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x0040, 0x0043).rw("ppi_inputs", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x0060, 0x0060).w("sn", FUNC(sn76489a_device::write)); - map(0x0070, 0x0071).w(this, FUNC(amusco_state::vram_w)); + map(0x0060, 0x0060).w("sn", FUNC(sn76489a_device::command_w)); + map(0x0070, 0x0071).w(FUNC(amusco_state::vram_w)); map(0x0280, 0x0283).rw("lpt_interface", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); map(0x0380, 0x0383).rw("rtc_interface", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); } diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index 0301b5ba7f6..0f3655d3d3f 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -191,7 +191,7 @@ void amust_state::io_map(address_map &map) map(0x03, 0x03).rw("uart2", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x04, 0x07).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x08, 0x0b).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x0d, 0x0d).nopr().w(this, FUNC(amust_state::port0d_w)); + map(0x0d, 0x0d).nopr().w(FUNC(amust_state::port0d_w)); map(0x0e, 0x0e).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x0f, 0x0f).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x10, 0x11).m(m_fdc, FUNC(upd765a_device::map)); diff --git a/src/mame/drivers/anes.cpp b/src/mame/drivers/anes.cpp index 77386592692..35e819258fa 100644 --- a/src/mame/drivers/anes.cpp +++ b/src/mame/drivers/anes.cpp @@ -89,9 +89,9 @@ void anes_state::io_map(address_map &map) map(0x07, 0x07).nopw(); // mux write map(0x08, 0x09).w("ym", FUNC(ym2413_device::write)); - map(0x0a, 0x0a).w(this, FUNC(anes_state::blit_trigger_w)); + map(0x0a, 0x0a).w(FUNC(anes_state::blit_trigger_w)); // AM_RANGE(0x0b, 0x0b) AM_WRITE(blit_mode_w) - map(0x0c, 0x0e).w(this, FUNC(anes_state::vram_offset_w)); + map(0x0c, 0x0e).w(FUNC(anes_state::vram_offset_w)); map(0x11, 0x11).portr("DSW1"); map(0x12, 0x12).portr("DSW2"); map(0x13, 0x13).portr("DSW3"); diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp index e4637d7e635..a40064b2a51 100644 --- a/src/mame/drivers/angelkds.cpp +++ b/src/mame/drivers/angelkds.cpp @@ -170,19 +170,19 @@ void angelkds_state::main_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xdfff).ram(); - map(0xe000, 0xe3ff).ram().w(this, FUNC(angelkds_state::angelkds_bgtopvideoram_w)).share("bgtopvideoram"); /* Top Half of Screen */ - map(0xe400, 0xe7ff).ram().w(this, FUNC(angelkds_state::angelkds_bgbotvideoram_w)).share("bgbotvideoram"); /* Bottom Half of Screen */ - map(0xe800, 0xebff).ram().w(this, FUNC(angelkds_state::angelkds_txvideoram_w)).share("txvideoram"); + map(0xe000, 0xe3ff).ram().w(FUNC(angelkds_state::angelkds_bgtopvideoram_w)).share("bgtopvideoram"); /* Top Half of Screen */ + map(0xe400, 0xe7ff).ram().w(FUNC(angelkds_state::angelkds_bgbotvideoram_w)).share("bgbotvideoram"); /* Bottom Half of Screen */ + map(0xe800, 0xebff).ram().w(FUNC(angelkds_state::angelkds_txvideoram_w)).share("txvideoram"); map(0xec00, 0xecff).ram().share("spriteram"); map(0xed00, 0xedff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0xee00, 0xeeff).ram().w("palette", FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xef00, 0xefff).ram(); - map(0xf000, 0xf000).w(this, FUNC(angelkds_state::angelkds_bgtopbank_write)); - map(0xf001, 0xf001).w(this, FUNC(angelkds_state::angelkds_bgtopscroll_write)); - map(0xf002, 0xf002).w(this, FUNC(angelkds_state::angelkds_bgbotbank_write)); - map(0xf003, 0xf003).w(this, FUNC(angelkds_state::angelkds_bgbotscroll_write)); - map(0xf004, 0xf004).w(this, FUNC(angelkds_state::angelkds_txbank_write)); - map(0xf005, 0xf005).w(this, FUNC(angelkds_state::angelkds_layer_ctrl_write)); + map(0xf000, 0xf000).w(FUNC(angelkds_state::angelkds_bgtopbank_write)); + map(0xf001, 0xf001).w(FUNC(angelkds_state::angelkds_bgtopscroll_write)); + map(0xf002, 0xf002).w(FUNC(angelkds_state::angelkds_bgbotbank_write)); + map(0xf003, 0xf003).w(FUNC(angelkds_state::angelkds_bgbotscroll_write)); + map(0xf004, 0xf004).w(FUNC(angelkds_state::angelkds_txbank_write)); + map(0xf005, 0xf005).w(FUNC(angelkds_state::angelkds_layer_ctrl_write)); } void angelkds_state::decrypted_opcodes_map(address_map &map) @@ -199,7 +199,7 @@ void angelkds_state::main_portmap(address_map &map) map(0x40, 0x43).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x80, 0x83).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xc0, 0xc3).rw(this, FUNC(angelkds_state::angelkds_main_sound_r), FUNC(angelkds_state::angelkds_main_sound_w)); // 02 various points + map(0xc0, 0xc3).rw(FUNC(angelkds_state::angelkds_main_sound_r), FUNC(angelkds_state::angelkds_main_sound_w)); // 02 various points } @@ -222,7 +222,7 @@ void angelkds_state::sub_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x01).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0x40, 0x41).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x80, 0x83).rw(this, FUNC(angelkds_state::angelkds_sub_sound_r), FUNC(angelkds_state::angelkds_sub_sound_w)); // spcpostn + map(0x80, 0x83).rw(FUNC(angelkds_state::angelkds_sub_sound_r), FUNC(angelkds_state::angelkds_sub_sound_w)); // spcpostn } diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp index 3b39cdc5ca5..8a368519237 100644 --- a/src/mame/drivers/apc.cpp +++ b/src/mame/drivers/apc.cpp @@ -484,16 +484,16 @@ void apc_state::apc_map(address_map &map) void apc_state::apc_io(address_map &map) { // ADDRESS_MAP_GLOBAL_MASK(0xff) - map(0x00, 0x1f).rw(this, FUNC(apc_state::apc_dma_r), FUNC(apc_state::apc_dma_w)).umask16(0xff00); + map(0x00, 0x1f).rw(FUNC(apc_state::apc_dma_r), FUNC(apc_state::apc_dma_w)).umask16(0xff00); map(0x20, 0x23).rw(m_i8259_m, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); // i8259 - map(0x28, 0x2f).rw(this, FUNC(apc_state::apc_port_28_r), FUNC(apc_state::apc_port_28_w)); // i8259 (even) / pit8253 (odd) + map(0x28, 0x2f).rw(FUNC(apc_state::apc_port_28_r), FUNC(apc_state::apc_port_28_w)); // i8259 (even) / pit8253 (odd) // 0x30, 0x37 serial port 0/1 (i8251) (even/odd) - map(0x38, 0x3f).w(this, FUNC(apc_state::apc_dma_segments_w)).umask16(0x00ff); - map(0x40, 0x43).rw(this, FUNC(apc_state::apc_gdc_r), FUNC(apc_state::apc_gdc_w)); - map(0x46, 0x46).w(this, FUNC(apc_state::apc_irq_ack_w)); - map(0x48, 0x4f).rw(this, FUNC(apc_state::apc_kbd_r), FUNC(apc_state::apc_kbd_w)).umask16(0x00ff); + map(0x38, 0x3f).w(FUNC(apc_state::apc_dma_segments_w)).umask16(0x00ff); + map(0x40, 0x43).rw(FUNC(apc_state::apc_gdc_r), FUNC(apc_state::apc_gdc_w)); + map(0x46, 0x46).w(FUNC(apc_state::apc_irq_ack_w)); + map(0x48, 0x4f).rw(FUNC(apc_state::apc_kbd_r), FUNC(apc_state::apc_kbd_w)).umask16(0x00ff); map(0x50, 0x53).m(m_fdc, FUNC(upd765a_device::map)).umask16(0x00ff); // upd765 - map(0x58, 0x58).rw(this, FUNC(apc_state::apc_rtc_r), FUNC(apc_state::apc_rtc_w)); + map(0x58, 0x58).rw(FUNC(apc_state::apc_rtc_r), FUNC(apc_state::apc_rtc_w)); // 0x59 CMOS enable // 0x5a APU data (Arithmetic Processing Unit!) // 0x5b, Power Off diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp index 5b1a392bf50..67417342206 100644 --- a/src/mame/drivers/apf.cpp +++ b/src/mame/drivers/apf.cpp @@ -329,9 +329,9 @@ void apf_state::apfimag_map(address_map &map) apfm1000_map(map); map(0x6000, 0x6003).mirror(0x03fc).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // These need to be confirmed, disk does not work - map(0x6400, 0x64ff).rw(this, FUNC(apf_state::serial_r), FUNC(apf_state::serial_w)); + map(0x6400, 0x64ff).rw(FUNC(apf_state::serial_r), FUNC(apf_state::serial_w)); map(0x6500, 0x6503).rw(m_fdc, FUNC(fd1771_device::read), FUNC(fd1771_device::write)); - map(0x6600, 0x6600).w(this, FUNC(apf_state::apf_dischw_w)); + map(0x6600, 0x6600).w(FUNC(apf_state::apf_dischw_w)); map(0xa000, 0xbfff).ram(); // standard map(0xc000, 0xdfff).ram(); // expansion } diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index ef5d17b3ead..a9e61c4e140 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -680,35 +680,35 @@ WRITE32_MEMBER(apollo_state::apollo_f8_w){ void apollo_state::dn3500_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); + map(0x00000000, 0xffffffff).rw(FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); map(0x000000, 0x00ffff).rom(); /* boot ROM */ - map(0x000000, 0x00ffff).w(this, FUNC(apollo_state::apollo_rom_w)); - map(0x010000, 0x0100ff).rw(this, FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); - map(0x010100, 0x0101ff).rw(this, FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); - map(0x010200, 0x0102ff).rw(this, FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); - map(0x010300, 0x0103ff).rw(this, FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); + map(0x000000, 0x00ffff).w(FUNC(apollo_state::apollo_rom_w)); + map(0x010000, 0x0100ff).rw(FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); + map(0x010100, 0x0101ff).rw(FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); + map(0x010200, 0x0102ff).rw(FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); + map(0x010300, 0x0103ff).rw(FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); map(0x010400, 0x0104ff).rw(m_sio, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010500, 0x0105ff).rw(m_sio2, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010800, 0x0108ff).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask32(0x00ff00ff); - map(0x010900, 0x0109ff).rw(this, FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); - map(0x010c00, 0x010cff).rw(this, FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); - map(0x010d00, 0x010dff).rw(this, FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); + map(0x010900, 0x0109ff).rw(FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); + map(0x010c00, 0x010cff).rw(FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); + map(0x010d00, 0x010dff).rw(FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); map(0x011000, 0x0110ff).rw(m_pic8259_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011100, 0x0111ff).rw(m_pic8259_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011200, 0x0112ff).rw(m_node_id, FUNC(apollo_ni::read), FUNC(apollo_ni::write)); - map(0x011300, 0x0113ff).rw(this, FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); - map(0x011600, 0x0116ff).rw(this, FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); + map(0x011300, 0x0113ff).rw(FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); + map(0x011600, 0x0116ff).rw(FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); - map(0x016400, 0x0164ff).rw(this, FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); - map(0x017000, 0x017fff).rw(this, FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); + map(0x016400, 0x0164ff).rw(FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); + map(0x017000, 0x017fff).rw(FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); - map(ATBUS_IO_BASE, ATBUS_IO_END).rw(this, FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); - map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(this, FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); + map(ATBUS_IO_BASE, ATBUS_IO_END).rw(FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); + map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); // FIXME: must match with RAM size in driver/apollo_sio.c // AM_RANGE(DN3500_RAM_BASE, DN3500_RAM_END) AM_RAM /* 8MB RAM */ - map(DN3500_RAM_BASE, DN3500_RAM_END).ram().w(this, FUNC(apollo_state::ram_with_parity_w)).share("messram"); + map(DN3500_RAM_BASE, DN3500_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share("messram"); map(0x05d800, 0x05dc07).rw(APOLLO_SCREEN_TAG, FUNC(apollo_graphics_15i::apollo_mcr_r), FUNC(apollo_graphics_15i::apollo_mcr_w)); map(0xfa0000, 0xfdffff).rw(APOLLO_SCREEN_TAG, FUNC(apollo_graphics_15i::apollo_mgm_r), FUNC(apollo_graphics_15i::apollo_mgm_w)); @@ -725,62 +725,62 @@ void apollo_state::dn3500_map(address_map &map) void apollo_state::dsp3500_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); + map(0x00000000, 0xffffffff).rw(FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); map(0x000000, 0x00ffff).rom(); /* boot ROM */ - map(0x000000, 0x00ffff).w(this, FUNC(apollo_state::apollo_rom_w)); - map(0x010000, 0x0100ff).rw(this, FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); - map(0x010100, 0x0101ff).rw(this, FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); - map(0x010200, 0x0102ff).rw(this, FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); - map(0x010300, 0x0103ff).rw(this, FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); + map(0x000000, 0x00ffff).w(FUNC(apollo_state::apollo_rom_w)); + map(0x010000, 0x0100ff).rw(FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); + map(0x010100, 0x0101ff).rw(FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); + map(0x010200, 0x0102ff).rw(FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); + map(0x010300, 0x0103ff).rw(FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); map(0x010400, 0x0104ff).rw(m_sio, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010500, 0x0105ff).rw(m_sio2, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010800, 0x0108ff).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask32(0x00ff00ff); - map(0x010900, 0x0109ff).rw(this, FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); - map(0x010c00, 0x010cff).rw(this, FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); - map(0x010d00, 0x010dff).rw(this, FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); + map(0x010900, 0x0109ff).rw(FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); + map(0x010c00, 0x010cff).rw(FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); + map(0x010d00, 0x010dff).rw(FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); map(0x011000, 0x0110ff).rw(m_pic8259_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011100, 0x0111ff).rw(m_pic8259_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011200, 0x0112ff).rw(m_node_id, FUNC(apollo_ni::read), FUNC(apollo_ni::write)); - map(0x011300, 0x0113ff).rw(this, FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); - map(0x011600, 0x0116ff).rw(this, FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); + map(0x011300, 0x0113ff).rw(FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); + map(0x011600, 0x0116ff).rw(FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); - map(0x016400, 0x0164ff).rw(this, FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); - map(0x017000, 0x017fff).rw(this, FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); + map(0x016400, 0x0164ff).rw(FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); + map(0x017000, 0x017fff).rw(FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); - map(ATBUS_IO_BASE, ATBUS_IO_END).rw(this, FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); + map(ATBUS_IO_BASE, ATBUS_IO_END).rw(FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); - map(DN3500_RAM_BASE, DN3500_RAM_END).ram().w(this, FUNC(apollo_state::ram_with_parity_w)).share("messram"); + map(DN3500_RAM_BASE, DN3500_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share("messram"); - map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(this, FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); + map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); // AM_RANGE(0xf8000000, 0xffffffff) AM_READWRITE(apollo_f8_r, apollo_f8_w) } void apollo_state::dn3000_map(address_map &map) { - map(0x000000, 0xffffff).rw(this, FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); + map(0x000000, 0xffffff).rw(FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); map(0x000000, 0x007fff).rom(); /* boot ROM */ - map(0x000000, 0x007fff).w(this, FUNC(apollo_state::apollo_rom_w)); - map(0x008000, 0x0080ff).rw(this, FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); - map(0x008100, 0x0081ff).rw(this, FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); + map(0x000000, 0x007fff).w(FUNC(apollo_state::apollo_rom_w)); + map(0x008000, 0x0080ff).rw(FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); + map(0x008100, 0x0081ff).rw(FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); map(0x008400, 0x0087ff).rw(m_sio, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x008800, 0x0088ff).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask32(0x00ff00ff); - map(0x008900, 0x0089ff).rw(this, FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); - map(0x009000, 0x0090ff).rw(this, FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); - map(0x009100, 0x0091ff).rw(this, FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); - map(0x009200, 0x0092ff).rw(this, FUNC(apollo_state::apollo_dma_page_register_r), FUNC(apollo_state::apollo_dma_page_register_w)); - map(0x009300, 0x0093ff).rw(this, FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); + map(0x008900, 0x0089ff).rw(FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); + map(0x009000, 0x0090ff).rw(FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); + map(0x009100, 0x0091ff).rw(FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); + map(0x009200, 0x0092ff).rw(FUNC(apollo_state::apollo_dma_page_register_r), FUNC(apollo_state::apollo_dma_page_register_w)); + map(0x009300, 0x0093ff).rw(FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); map(0x009400, 0x0094ff).rw(m_pic8259_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x009500, 0x0095ff).rw(m_pic8259_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x009600, 0x0096ff).rw(m_node_id, FUNC(apollo_ni::read), FUNC(apollo_ni::write)); - map(ATBUS_IO_BASE, ATBUS_IO_END).rw(this, FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); - map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(this, FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); + map(ATBUS_IO_BASE, ATBUS_IO_END).rw(FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); + map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); // FIXME: must match with RAM size in driver/apollo_sio.c // AM_RANGE(DN3000_RAM_BASE, DN3000_RAM_END) AM_RAM /* 8MB RAM */ - map(DN3000_RAM_BASE, DN3000_RAM_END).ram().w(this, FUNC(apollo_state::ram_with_parity_w)).share("messram"); + map(DN3000_RAM_BASE, DN3000_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share("messram"); map(0x05d800, 0x05dc07).rw(APOLLO_SCREEN_TAG, FUNC(apollo_graphics_15i::apollo_mcr_r), FUNC(apollo_graphics_15i::apollo_mcr_w)); map(0xfa0000, 0xfdffff).rw(APOLLO_SCREEN_TAG, FUNC(apollo_graphics_15i::apollo_mgm_r), FUNC(apollo_graphics_15i::apollo_mgm_w)); @@ -791,66 +791,66 @@ void apollo_state::dn3000_map(address_map &map) void apollo_state::dsp3000_map(address_map &map) { - map(0x000000, 0xffffff).rw(this, FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); + map(0x000000, 0xffffff).rw(FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); map(0x000000, 0x007fff).rom(); /* boot ROM */ - map(0x000000, 0x007fff).w(this, FUNC(apollo_state::apollo_rom_w)); - map(0x008000, 0x0080ff).rw(this, FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); - map(0x008100, 0x0081ff).rw(this, FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); + map(0x000000, 0x007fff).w(FUNC(apollo_state::apollo_rom_w)); + map(0x008000, 0x0080ff).rw(FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); + map(0x008100, 0x0081ff).rw(FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); map(0x008400, 0x0087ff).rw(m_sio, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x008800, 0x0088ff).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask32(0x00ff00ff); - map(0x008900, 0x0089ff).rw(this, FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); + map(0x008900, 0x0089ff).rw(FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); - map(0x009000, 0x0090ff).rw(this, FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); - map(0x009100, 0x0091ff).rw(this, FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); - map(0x009200, 0x0092ff).rw(this, FUNC(apollo_state::apollo_dma_page_register_r), FUNC(apollo_state::apollo_dma_page_register_w)); - map(0x009300, 0x0093ff).rw(this, FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); + map(0x009000, 0x0090ff).rw(FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); + map(0x009100, 0x0091ff).rw(FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); + map(0x009200, 0x0092ff).rw(FUNC(apollo_state::apollo_dma_page_register_r), FUNC(apollo_state::apollo_dma_page_register_w)); + map(0x009300, 0x0093ff).rw(FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); map(0x009400, 0x0094ff).rw(m_pic8259_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x009500, 0x0095ff).rw(m_pic8259_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x009600, 0x0096ff).rw(m_node_id, FUNC(apollo_ni::read), FUNC(apollo_ni::write)); - map(ATBUS_IO_BASE, ATBUS_IO_END).rw(this, FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); - map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(this, FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); + map(ATBUS_IO_BASE, ATBUS_IO_END).rw(FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); + map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); // FIXME: must match with RAM size in driver/apollo_sio.c // AM_RANGE(DN3000_RAM_BASE, DN3000_RAM_END) AM_RAM /* 8MB RAM */ - map(DN3000_RAM_BASE, DN3000_RAM_END).ram().w(this, FUNC(apollo_state::ram_with_parity_w)).share("messram"); + map(DN3000_RAM_BASE, DN3000_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share("messram"); } void apollo_state::dn5500_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); + map(0x00000000, 0xffffffff).rw(FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); map(0x000000, 0x00ffff).rom(); /* boot ROM */ - map(0x000000, 0x00ffff).w(this, FUNC(apollo_state::apollo_rom_w)); - map(0x010000, 0x0100ff).rw(this, FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); - map(0x010100, 0x0101ff).rw(this, FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); - map(0x010200, 0x0102ff).rw(this, FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); - map(0x010300, 0x0103ff).rw(this, FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); + map(0x000000, 0x00ffff).w(FUNC(apollo_state::apollo_rom_w)); + map(0x010000, 0x0100ff).rw(FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); + map(0x010100, 0x0101ff).rw(FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); + map(0x010200, 0x0102ff).rw(FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); + map(0x010300, 0x0103ff).rw(FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); map(0x010400, 0x0104ff).rw(m_sio, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010500, 0x0105ff).rw(m_sio2, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010800, 0x0108ff).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask32(0x00ff00ff); - map(0x010900, 0x0109ff).rw(this, FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); - map(0x010c00, 0x010cff).rw(this, FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); - map(0x010d00, 0x010dff).rw(this, FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); + map(0x010900, 0x0109ff).rw(FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); + map(0x010c00, 0x010cff).rw(FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); + map(0x010d00, 0x010dff).rw(FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); map(0x011000, 0x0110ff).rw(m_pic8259_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011100, 0x0111ff).rw(m_pic8259_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011200, 0x0112ff).rw(m_node_id, FUNC(apollo_ni::read), FUNC(apollo_ni::write)); - map(0x011300, 0x0113ff).rw(this, FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); - map(0x011400, 0x0114ff).rw(this, FUNC(apollo_state::dn5500_memory_present_register_r), FUNC(apollo_state::dn5500_memory_present_register_w)); - map(0x011500, 0x0115ff).rw(this, FUNC(apollo_state::dn5500_11500_r), FUNC(apollo_state::dn5500_11500_w)); - map(0x011600, 0x0116ff).rw(this, FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); + map(0x011300, 0x0113ff).rw(FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); + map(0x011400, 0x0114ff).rw(FUNC(apollo_state::dn5500_memory_present_register_r), FUNC(apollo_state::dn5500_memory_present_register_w)); + map(0x011500, 0x0115ff).rw(FUNC(apollo_state::dn5500_11500_r), FUNC(apollo_state::dn5500_11500_w)); + map(0x011600, 0x0116ff).rw(FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); - map(0x016400, 0x0164ff).rw(this, FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); - map(0x017000, 0x017fff).rw(this, FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); + map(0x016400, 0x0164ff).rw(FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); + map(0x017000, 0x017fff).rw(FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); - map(ATBUS_IO_BASE, ATBUS_IO_END).rw(this, FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); - map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(this, FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); + map(ATBUS_IO_BASE, ATBUS_IO_END).rw(FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); + map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); // FIXME: must match with RAM size in driver/apollo_sio.c // AM_RANGE(DN3500_RAM_BASE, DN3500_RAM_END) AM_RAM /* 8MB RAM */ - map(DN5500_RAM_BASE, DN5500_RAM_END).ram().w(this, FUNC(apollo_state::ram_with_parity_w)).share("messram"); + map(DN5500_RAM_BASE, DN5500_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share("messram"); map(0x05d800, 0x05dc07).rw(APOLLO_SCREEN_TAG, FUNC(apollo_graphics_15i::apollo_mcr_r), FUNC(apollo_graphics_15i::apollo_mcr_w)); map(0xfa0000, 0xfdffff).rw(APOLLO_SCREEN_TAG, FUNC(apollo_graphics_15i::apollo_mgm_r), FUNC(apollo_graphics_15i::apollo_mgm_w)); @@ -860,7 +860,7 @@ void apollo_state::dn5500_map(address_map &map) // AM_RANGE(0x03020000, 0x0303ffff) Cache Tag Store (DN4500 only) // AM_RANGE(0x04000000, 0x0400ffff) Cache Tag Data (DN4500 only) - map(0x07000000, 0x0700FFFF).rw(this, FUNC(apollo_state::dn5500_io_protection_map_r), FUNC(apollo_state::dn5500_io_protection_map_w)); + map(0x07000000, 0x0700FFFF).rw(FUNC(apollo_state::dn5500_io_protection_map_r), FUNC(apollo_state::dn5500_io_protection_map_w)); // AM_RANGE(0x0e000000, 0x0fffffff) FPA address space // AM_RANGE(0xf8000000, 0xffffffff) AM_READWRITE(apollo_f8_r, apollo_f8_w) @@ -868,37 +868,37 @@ void apollo_state::dn5500_map(address_map &map) void apollo_state::dsp5500_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); + map(0x00000000, 0xffffffff).rw(FUNC(apollo_state::apollo_unmapped_r), FUNC(apollo_state::apollo_unmapped_w)); map(0x000000, 0x00ffff).rom(); /* boot ROM */ - map(0x000000, 0x00ffff).w(this, FUNC(apollo_state::apollo_rom_w)); - map(0x010000, 0x0100ff).rw(this, FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); - map(0x010100, 0x0101ff).rw(this, FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); - map(0x010200, 0x0102ff).rw(this, FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); - map(0x010300, 0x0103ff).rw(this, FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); + map(0x000000, 0x00ffff).w(FUNC(apollo_state::apollo_rom_w)); + map(0x010000, 0x0100ff).rw(FUNC(apollo_state::apollo_csr_status_register_r), FUNC(apollo_state::apollo_csr_status_register_w)); + map(0x010100, 0x0101ff).rw(FUNC(apollo_state::apollo_csr_control_register_r), FUNC(apollo_state::apollo_csr_control_register_w)); + map(0x010200, 0x0102ff).rw(FUNC(apollo_state::cache_status_register_r), FUNC(apollo_state::cache_control_register_w)); + map(0x010300, 0x0103ff).rw(FUNC(apollo_state::task_alias_register_r), FUNC(apollo_state::task_alias_register_w)); map(0x010400, 0x0104ff).rw(m_sio, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010500, 0x0105ff).rw(m_sio2, FUNC(apollo_sio::read), FUNC(apollo_sio::write)); map(0x010800, 0x0108ff).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask32(0x00ff00ff); - map(0x010900, 0x0109ff).rw(this, FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); - map(0x010c00, 0x010cff).rw(this, FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); - map(0x010d00, 0x010dff).rw(this, FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); + map(0x010900, 0x0109ff).rw(FUNC(apollo_state::apollo_rtc_r), FUNC(apollo_state::apollo_rtc_w)); + map(0x010c00, 0x010cff).rw(FUNC(apollo_state::/*"dma1",*/apollo_dma_1_r), FUNC(apollo_state::apollo_dma_1_w)); + map(0x010d00, 0x010dff).rw(FUNC(apollo_state::/*"dma2",*/apollo_dma_2_r), FUNC(apollo_state::apollo_dma_2_w)); map(0x011000, 0x0110ff).rw(m_pic8259_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011100, 0x0111ff).rw(m_pic8259_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x011200, 0x0112ff).rw(m_node_id, FUNC(apollo_ni::read), FUNC(apollo_ni::write)); - map(0x011300, 0x0113ff).rw(this, FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); - map(0x011400, 0x0114ff).rw(this, FUNC(apollo_state::dn5500_memory_present_register_r), FUNC(apollo_state::dn5500_memory_present_register_w)); - map(0x011500, 0x0115ff).rw(this, FUNC(apollo_state::dn5500_11500_r), FUNC(apollo_state::dn5500_11500_w)); - map(0x011600, 0x0116ff).rw(this, FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); + map(0x011300, 0x0113ff).rw(FUNC(apollo_state::latch_page_on_parity_error_register_r), FUNC(apollo_state::latch_page_on_parity_error_register_w)); + map(0x011400, 0x0114ff).rw(FUNC(apollo_state::dn5500_memory_present_register_r), FUNC(apollo_state::dn5500_memory_present_register_w)); + map(0x011500, 0x0115ff).rw(FUNC(apollo_state::dn5500_11500_r), FUNC(apollo_state::dn5500_11500_w)); + map(0x011600, 0x0116ff).rw(FUNC(apollo_state::master_req_register_r), FUNC(apollo_state::master_req_register_w)); - map(0x016400, 0x0164ff).rw(this, FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); - map(0x017000, 0x017fff).rw(this, FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); + map(0x016400, 0x0164ff).rw(FUNC(apollo_state::selective_clear_locations_r), FUNC(apollo_state::selective_clear_locations_w)); + map(0x017000, 0x017fff).rw(FUNC(apollo_state::apollo_address_translation_map_r), FUNC(apollo_state::apollo_address_translation_map_w)); - map(ATBUS_IO_BASE, ATBUS_IO_END).rw(this, FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); - map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(this, FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); + map(ATBUS_IO_BASE, ATBUS_IO_END).rw(FUNC(apollo_state::apollo_atbus_io_r), FUNC(apollo_state::apollo_atbus_io_w)); + map(ATBUS_MEMORY_BASE, ATBUS_MEMORY_END).rw(FUNC(apollo_state::apollo_atbus_memory_r), FUNC(apollo_state::apollo_atbus_memory_w)); // FIXME: must match with RAM size in driver/apollo_sio.c - map(DN5500_RAM_BASE, DN5500_RAM_END).ram().w(this, FUNC(apollo_state::ram_with_parity_w)).share("messram"); + map(DN5500_RAM_BASE, DN5500_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share("messram"); - map(0x07000000, 0x0700FFFF).rw(this, FUNC(apollo_state::dn5500_io_protection_map_r), FUNC(apollo_state::dn5500_io_protection_map_w)); + map(0x07000000, 0x0700FFFF).rw(FUNC(apollo_state::dn5500_io_protection_map_r), FUNC(apollo_state::dn5500_io_protection_map_w)); // AM_RANGE(0xf8000000, 0xffffffff) AM_READWRITE(apollo_f8_r, apollo_f8_w) } diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index d2b3d6cec1d..0f3f4e42899 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -434,7 +434,7 @@ WRITE8_MEMBER(apple1_state::ram_w) void apple1_state::apple1_map(address_map &map) { - map(0x0000, 0xbfff).rw(this, FUNC(apple1_state::ram_r), FUNC(apple1_state::ram_w)); + map(0x0000, 0xbfff).rw(FUNC(apple1_state::ram_r), FUNC(apple1_state::ram_w)); map(0xd010, 0xd013).mirror(0x0fec).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xe000, 0xefff).ram().share(A1_BASICRAM_TAG); map(0xff00, 0xffff).rom().region(A1_CPU_TAG, 0); diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index b29ca760a8e..14b94b7b3fc 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -960,25 +960,25 @@ WRITE8_MEMBER(napple2_state::ram_w) void napple2_state::apple2_map(address_map &map) { - map(0x0000, 0xbfff).rw(this, FUNC(napple2_state::ram_r), FUNC(napple2_state::ram_w)); - map(0xc000, 0xc000).mirror(0xf).r(this, FUNC(napple2_state::keyb_data_r)).nopw(); - map(0xc010, 0xc010).mirror(0xf).rw(this, FUNC(napple2_state::keyb_strobe_r), FUNC(napple2_state::keyb_strobe_w)); - map(0xc020, 0xc020).mirror(0xf).rw(this, FUNC(napple2_state::cassette_toggle_r), FUNC(napple2_state::cassette_toggle_w)); - map(0xc030, 0xc030).mirror(0xf).rw(this, FUNC(napple2_state::speaker_toggle_r), FUNC(napple2_state::speaker_toggle_w)); - map(0xc040, 0xc040).mirror(0xf).rw(this, FUNC(napple2_state::utility_strobe_r), FUNC(napple2_state::utility_strobe_w)); - map(0xc050, 0xc05f).r(this, FUNC(napple2_state::switches_r)).w(m_softlatch, FUNC(addressable_latch_device::write_a0)); - map(0xc060, 0xc067).mirror(0x8).r(this, FUNC(napple2_state::flags_r)).nopw(); // includes IIgs STATE register, which ProDOS touches - map(0xc070, 0xc070).mirror(0xf).rw(this, FUNC(napple2_state::controller_strobe_r), FUNC(napple2_state::controller_strobe_w)); - map(0xc080, 0xc0ff).rw(this, FUNC(napple2_state::c080_r), FUNC(napple2_state::c080_w)); - map(0xc100, 0xc7ff).rw(this, FUNC(napple2_state::c100_r), FUNC(napple2_state::c100_w)); - map(0xc800, 0xcfff).rw(this, FUNC(napple2_state::c800_r), FUNC(napple2_state::c800_w)); + map(0x0000, 0xbfff).rw(FUNC(napple2_state::ram_r), FUNC(napple2_state::ram_w)); + map(0xc000, 0xc000).mirror(0xf).r(FUNC(napple2_state::keyb_data_r)).nopw(); + map(0xc010, 0xc010).mirror(0xf).rw(FUNC(napple2_state::keyb_strobe_r), FUNC(napple2_state::keyb_strobe_w)); + map(0xc020, 0xc020).mirror(0xf).rw(FUNC(napple2_state::cassette_toggle_r), FUNC(napple2_state::cassette_toggle_w)); + map(0xc030, 0xc030).mirror(0xf).rw(FUNC(napple2_state::speaker_toggle_r), FUNC(napple2_state::speaker_toggle_w)); + map(0xc040, 0xc040).mirror(0xf).rw(FUNC(napple2_state::utility_strobe_r), FUNC(napple2_state::utility_strobe_w)); + map(0xc050, 0xc05f).r(FUNC(napple2_state::switches_r)).w(m_softlatch, FUNC(addressable_latch_device::write_a0)); + map(0xc060, 0xc067).mirror(0x8).r(FUNC(napple2_state::flags_r)).nopw(); // includes IIgs STATE register, which ProDOS touches + map(0xc070, 0xc070).mirror(0xf).rw(FUNC(napple2_state::controller_strobe_r), FUNC(napple2_state::controller_strobe_w)); + map(0xc080, 0xc0ff).rw(FUNC(napple2_state::c080_r), FUNC(napple2_state::c080_w)); + map(0xc100, 0xc7ff).rw(FUNC(napple2_state::c100_r), FUNC(napple2_state::c100_w)); + map(0xc800, 0xcfff).rw(FUNC(napple2_state::c800_r), FUNC(napple2_state::c800_w)); map(0xd000, 0xffff).m(m_upperbank, FUNC(address_map_bank_device::amap8)); } void napple2_state::inhbank_map(address_map &map) { - map(0x0000, 0x2fff).rom().region("maincpu", 0x1000).w(this, FUNC(napple2_state::inh_w)); - map(0x3000, 0x5fff).rw(this, FUNC(napple2_state::inh_r), FUNC(napple2_state::inh_w)); + map(0x0000, 0x2fff).rom().region("maincpu", 0x1000).w(FUNC(napple2_state::inh_w)); + map(0x3000, 0x5fff).rw(FUNC(napple2_state::inh_r), FUNC(napple2_state::inh_w)); } /*************************************************************************** diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index bcad4465f4c..1ed30c77af6 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -2699,8 +2699,8 @@ void apple2e_state::apple2e_map(address_map &map) map(0x0800, 0x1fff).m(m_0800bank, FUNC(address_map_bank_device::amap8)); map(0x2000, 0x3fff).m(m_2000bank, FUNC(address_map_bank_device::amap8)); map(0x4000, 0xbfff).m(m_4000bank, FUNC(address_map_bank_device::amap8)); - map(0xc000, 0xc07f).rw(this, FUNC(apple2e_state::c000_r), FUNC(apple2e_state::c000_w)); - map(0xc080, 0xc0ff).rw(this, FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); + map(0xc000, 0xc07f).rw(FUNC(apple2e_state::c000_r), FUNC(apple2e_state::c000_w)); + map(0xc080, 0xc0ff).rw(FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); map(0xc100, 0xc2ff).m(m_c100bank, FUNC(address_map_bank_device::amap8)); map(0xc300, 0xc3ff).m(m_c300bank, FUNC(address_map_bank_device::amap8)); map(0xc400, 0xc7ff).m(m_c400bank, FUNC(address_map_bank_device::amap8)); @@ -2716,8 +2716,8 @@ void apple2e_state::apple2c_map(address_map &map) map(0x0800, 0x1fff).m(m_0800bank, FUNC(address_map_bank_device::amap8)); map(0x2000, 0x3fff).m(m_2000bank, FUNC(address_map_bank_device::amap8)); map(0x4000, 0xbfff).m(m_4000bank, FUNC(address_map_bank_device::amap8)); - map(0xc000, 0xc07f).rw(this, FUNC(apple2e_state::c000_iic_r), FUNC(apple2e_state::c000_iic_w)); - map(0xc080, 0xc0ff).rw(this, FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); + map(0xc000, 0xc07f).rw(FUNC(apple2e_state::c000_iic_r), FUNC(apple2e_state::c000_iic_w)); + map(0xc080, 0xc0ff).rw(FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); map(0xc098, 0xc09b).rw(m_acia1, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0xc0a8, 0xc0ab).rw(IIC_ACIA2_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0xc100, 0xc2ff).m(m_c100bank, FUNC(address_map_bank_device::amap8)); @@ -2735,11 +2735,11 @@ void apple2e_state::apple2c_memexp_map(address_map &map) map(0x0800, 0x1fff).m(m_0800bank, FUNC(address_map_bank_device::amap8)); map(0x2000, 0x3fff).m(m_2000bank, FUNC(address_map_bank_device::amap8)); map(0x4000, 0xbfff).m(m_4000bank, FUNC(address_map_bank_device::amap8)); - map(0xc000, 0xc07f).rw(this, FUNC(apple2e_state::c000_iic_r), FUNC(apple2e_state::c000_iic_w)); - map(0xc080, 0xc0ff).rw(this, FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); + map(0xc000, 0xc07f).rw(FUNC(apple2e_state::c000_iic_r), FUNC(apple2e_state::c000_iic_w)); + map(0xc080, 0xc0ff).rw(FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); map(0xc098, 0xc09b).rw(m_acia1, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0xc0a8, 0xc0ab).rw(IIC_ACIA2_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); - map(0xc0c0, 0xc0c3).rw(this, FUNC(apple2e_state::memexp_r), FUNC(apple2e_state::memexp_w)); + map(0xc0c0, 0xc0c3).rw(FUNC(apple2e_state::memexp_r), FUNC(apple2e_state::memexp_w)); map(0xc100, 0xc2ff).m(m_c100bank, FUNC(address_map_bank_device::amap8)); map(0xc300, 0xc3ff).m(m_c300bank, FUNC(address_map_bank_device::amap8)); map(0xc400, 0xc7ff).m(m_c400bank, FUNC(address_map_bank_device::amap8)); @@ -2755,12 +2755,12 @@ void apple2e_state::laser128_map(address_map &map) map(0x0800, 0x1fff).m(m_0800bank, FUNC(address_map_bank_device::amap8)); map(0x2000, 0x3fff).m(m_2000bank, FUNC(address_map_bank_device::amap8)); map(0x4000, 0xbfff).m(m_4000bank, FUNC(address_map_bank_device::amap8)); - map(0xc000, 0xc07f).rw(this, FUNC(apple2e_state::c000_r), FUNC(apple2e_state::c000_w)); - map(0xc080, 0xc0ff).rw(this, FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); + map(0xc000, 0xc07f).rw(FUNC(apple2e_state::c000_r), FUNC(apple2e_state::c000_w)); + map(0xc080, 0xc0ff).rw(FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w)); // AM_RANGE(0xc098, 0xc09b) AM_DEVREADWRITE(IIC_ACIA1_TAG, mos6551_device, read, write) // AM_RANGE(0xc0a8, 0xc0ab) AM_DEVREADWRITE(IIC_ACIA2_TAG, mos6551_device, read, write) - map(0xc0d0, 0xc0d3).rw(this, FUNC(apple2e_state::memexp_r), FUNC(apple2e_state::memexp_w)); - map(0xc0e0, 0xc0ef).rw(m_laserudc, FUNC(applefdc_base_device::read), FUNC(applefdc_base_device::write)); + map(0xc0d0, 0xc0d3).rw(FUNC(apple2e_state::memexp_r), FUNC(apple2e_state::memexp_w)); + map(0xc0e0, 0xc0ef).rw(m_laserudc, FUNC(applefdc_base_device::bus_r), FUNC(applefdc_base_device::bus_w)); map(0xc100, 0xc2ff).m(m_c100bank, FUNC(address_map_bank_device::amap8)); map(0xc300, 0xc3ff).m(m_c300bank, FUNC(address_map_bank_device::amap8)); map(0xc400, 0xc7ff).m(m_c400bank, FUNC(address_map_bank_device::amap8)); @@ -2770,103 +2770,103 @@ void apple2e_state::laser128_map(address_map &map) void apple2e_state::r0000bank_map(address_map &map) { - map(0x0000, 0x01ff).rw(this, FUNC(apple2e_state::ram0000_r), FUNC(apple2e_state::ram0000_w)); - map(0x0200, 0x03ff).rw(this, FUNC(apple2e_state::auxram0000_r), FUNC(apple2e_state::auxram0000_w)); + map(0x0000, 0x01ff).rw(FUNC(apple2e_state::ram0000_r), FUNC(apple2e_state::ram0000_w)); + map(0x0200, 0x03ff).rw(FUNC(apple2e_state::auxram0000_r), FUNC(apple2e_state::auxram0000_w)); } void apple2e_state::r0200bank_map(address_map &map) { - map(0x0000, 0x01ff).rw(this, FUNC(apple2e_state::ram0200_r), FUNC(apple2e_state::ram0200_w)); // wr 0 rd 0 - map(0x0200, 0x03ff).rw(this, FUNC(apple2e_state::auxram0200_r), FUNC(apple2e_state::ram0200_w)); // wr 0 rd 1 - map(0x0400, 0x05ff).rw(this, FUNC(apple2e_state::ram0200_r), FUNC(apple2e_state::auxram0200_w)); // wr 1 rd 0 - map(0x0600, 0x07ff).rw(this, FUNC(apple2e_state::auxram0200_r), FUNC(apple2e_state::auxram0200_w)); // wr 1 rd 1 + map(0x0000, 0x01ff).rw(FUNC(apple2e_state::ram0200_r), FUNC(apple2e_state::ram0200_w)); // wr 0 rd 0 + map(0x0200, 0x03ff).rw(FUNC(apple2e_state::auxram0200_r), FUNC(apple2e_state::ram0200_w)); // wr 0 rd 1 + map(0x0400, 0x05ff).rw(FUNC(apple2e_state::ram0200_r), FUNC(apple2e_state::auxram0200_w)); // wr 1 rd 0 + map(0x0600, 0x07ff).rw(FUNC(apple2e_state::auxram0200_r), FUNC(apple2e_state::auxram0200_w)); // wr 1 rd 1 } void apple2e_state::r0400bank_map(address_map &map) { - map(0x0000, 0x03ff).rw(this, FUNC(apple2e_state::ram0400_r), FUNC(apple2e_state::ram0400_w)); // wr 0 rd 0 - map(0x0400, 0x07ff).rw(this, FUNC(apple2e_state::auxram0400_r), FUNC(apple2e_state::ram0400_w)); // wr 0 rd 1 - map(0x0800, 0x0bff).rw(this, FUNC(apple2e_state::ram0400_r), FUNC(apple2e_state::auxram0400_w)); // wr 1 rd 0 - map(0x0c00, 0x0fff).rw(this, FUNC(apple2e_state::auxram0400_r), FUNC(apple2e_state::auxram0400_w)); // wr 1 rd 1 + map(0x0000, 0x03ff).rw(FUNC(apple2e_state::ram0400_r), FUNC(apple2e_state::ram0400_w)); // wr 0 rd 0 + map(0x0400, 0x07ff).rw(FUNC(apple2e_state::auxram0400_r), FUNC(apple2e_state::ram0400_w)); // wr 0 rd 1 + map(0x0800, 0x0bff).rw(FUNC(apple2e_state::ram0400_r), FUNC(apple2e_state::auxram0400_w)); // wr 1 rd 0 + map(0x0c00, 0x0fff).rw(FUNC(apple2e_state::auxram0400_r), FUNC(apple2e_state::auxram0400_w)); // wr 1 rd 1 } void apple2e_state::r0800bank_map(address_map &map) { - map(0x0000, 0x17ff).rw(this, FUNC(apple2e_state::ram0800_r), FUNC(apple2e_state::ram0800_w)); - map(0x2000, 0x37ff).rw(this, FUNC(apple2e_state::auxram0800_r), FUNC(apple2e_state::ram0800_w)); - map(0x4000, 0x57ff).rw(this, FUNC(apple2e_state::ram0800_r), FUNC(apple2e_state::auxram0800_w)); - map(0x6000, 0x77ff).rw(this, FUNC(apple2e_state::auxram0800_r), FUNC(apple2e_state::auxram0800_w)); + map(0x0000, 0x17ff).rw(FUNC(apple2e_state::ram0800_r), FUNC(apple2e_state::ram0800_w)); + map(0x2000, 0x37ff).rw(FUNC(apple2e_state::auxram0800_r), FUNC(apple2e_state::ram0800_w)); + map(0x4000, 0x57ff).rw(FUNC(apple2e_state::ram0800_r), FUNC(apple2e_state::auxram0800_w)); + map(0x6000, 0x77ff).rw(FUNC(apple2e_state::auxram0800_r), FUNC(apple2e_state::auxram0800_w)); } void apple2e_state::r2000bank_map(address_map &map) { - map(0x0000, 0x1fff).rw(this, FUNC(apple2e_state::ram2000_r), FUNC(apple2e_state::ram2000_w)); - map(0x2000, 0x3fff).rw(this, FUNC(apple2e_state::auxram2000_r), FUNC(apple2e_state::ram2000_w)); - map(0x4000, 0x5fff).rw(this, FUNC(apple2e_state::ram2000_r), FUNC(apple2e_state::auxram2000_w)); - map(0x6000, 0x7fff).rw(this, FUNC(apple2e_state::auxram2000_r), FUNC(apple2e_state::auxram2000_w)); + map(0x0000, 0x1fff).rw(FUNC(apple2e_state::ram2000_r), FUNC(apple2e_state::ram2000_w)); + map(0x2000, 0x3fff).rw(FUNC(apple2e_state::auxram2000_r), FUNC(apple2e_state::ram2000_w)); + map(0x4000, 0x5fff).rw(FUNC(apple2e_state::ram2000_r), FUNC(apple2e_state::auxram2000_w)); + map(0x6000, 0x7fff).rw(FUNC(apple2e_state::auxram2000_r), FUNC(apple2e_state::auxram2000_w)); } void apple2e_state::r4000bank_map(address_map &map) { - map(0x00000, 0x07fff).rw(this, FUNC(apple2e_state::ram4000_r), FUNC(apple2e_state::ram4000_w)); - map(0x08000, 0x0ffff).rw(this, FUNC(apple2e_state::auxram4000_r), FUNC(apple2e_state::ram4000_w)); - map(0x10000, 0x17fff).rw(this, FUNC(apple2e_state::ram4000_r), FUNC(apple2e_state::auxram4000_w)); - map(0x18000, 0x1ffff).rw(this, FUNC(apple2e_state::auxram4000_r), FUNC(apple2e_state::auxram4000_w)); - map(0x20000, 0x23fff).rw(this, FUNC(apple2e_state::cec4000_r), FUNC(apple2e_state::ram4000_w)); - map(0x24000, 0x27fff).rw(this, FUNC(apple2e_state::cec8000_r), FUNC(apple2e_state::ram8000_w)); + map(0x00000, 0x07fff).rw(FUNC(apple2e_state::ram4000_r), FUNC(apple2e_state::ram4000_w)); + map(0x08000, 0x0ffff).rw(FUNC(apple2e_state::auxram4000_r), FUNC(apple2e_state::ram4000_w)); + map(0x10000, 0x17fff).rw(FUNC(apple2e_state::ram4000_r), FUNC(apple2e_state::auxram4000_w)); + map(0x18000, 0x1ffff).rw(FUNC(apple2e_state::auxram4000_r), FUNC(apple2e_state::auxram4000_w)); + map(0x20000, 0x23fff).rw(FUNC(apple2e_state::cec4000_r), FUNC(apple2e_state::ram4000_w)); + map(0x24000, 0x27fff).rw(FUNC(apple2e_state::cec8000_r), FUNC(apple2e_state::ram8000_w)); } void apple2e_state::c100bank_map(address_map &map) { - map(0x0000, 0x01ff).rw(this, FUNC(apple2e_state::c100_r), FUNC(apple2e_state::c100_w)); - map(0x0200, 0x03ff).r(this, FUNC(apple2e_state::c100_int_r)).nopw(); - map(0x0400, 0x05ff).r(this, FUNC(apple2e_state::c100_int_bank_r)).nopw(); - map(0x0600, 0x07ff).r(this, FUNC(apple2e_state::c100_cec_r)).nopw(); - map(0x0800, 0x09ff).r(this, FUNC(apple2e_state::c100_cec_bank_r)).nopw(); + map(0x0000, 0x01ff).rw(FUNC(apple2e_state::c100_r), FUNC(apple2e_state::c100_w)); + map(0x0200, 0x03ff).r(FUNC(apple2e_state::c100_int_r)).nopw(); + map(0x0400, 0x05ff).r(FUNC(apple2e_state::c100_int_bank_r)).nopw(); + map(0x0600, 0x07ff).r(FUNC(apple2e_state::c100_cec_r)).nopw(); + map(0x0800, 0x09ff).r(FUNC(apple2e_state::c100_cec_bank_r)).nopw(); } void apple2e_state::c300bank_map(address_map &map) { - map(0x0000, 0x00ff).rw(this, FUNC(apple2e_state::c300_r), FUNC(apple2e_state::c300_w)); - map(0x0100, 0x01ff).r(this, FUNC(apple2e_state::c300_int_r)).nopw(); - map(0x0200, 0x02ff).r(this, FUNC(apple2e_state::c300_int_bank_r)).nopw(); - map(0x0300, 0x03ff).r(this, FUNC(apple2e_state::c300_cec_r)).nopw(); - map(0x0400, 0x04ff).r(this, FUNC(apple2e_state::c300_cec_bank_r)).nopw(); + map(0x0000, 0x00ff).rw(FUNC(apple2e_state::c300_r), FUNC(apple2e_state::c300_w)); + map(0x0100, 0x01ff).r(FUNC(apple2e_state::c300_int_r)).nopw(); + map(0x0200, 0x02ff).r(FUNC(apple2e_state::c300_int_bank_r)).nopw(); + map(0x0300, 0x03ff).r(FUNC(apple2e_state::c300_cec_r)).nopw(); + map(0x0400, 0x04ff).r(FUNC(apple2e_state::c300_cec_bank_r)).nopw(); } void apple2e_state::c400bank_map(address_map &map) { - map(0x0000, 0x03ff).rw(this, FUNC(apple2e_state::c400_r), FUNC(apple2e_state::c400_w)); - map(0x0400, 0x07ff).rw(this, FUNC(apple2e_state::c400_int_r), FUNC(apple2e_state::c400_w)); - map(0x0800, 0x0bff).rw(this, FUNC(apple2e_state::c400_int_bank_r), FUNC(apple2e_state::c400_w)); - map(0x0c00, 0x0fff).r(this, FUNC(apple2e_state::c400_cec_r)).nopw(); - map(0x1000, 0x13ff).r(this, FUNC(apple2e_state::c400_cec_bank_r)).nopw(); + map(0x0000, 0x03ff).rw(FUNC(apple2e_state::c400_r), FUNC(apple2e_state::c400_w)); + map(0x0400, 0x07ff).rw(FUNC(apple2e_state::c400_int_r), FUNC(apple2e_state::c400_w)); + map(0x0800, 0x0bff).rw(FUNC(apple2e_state::c400_int_bank_r), FUNC(apple2e_state::c400_w)); + map(0x0c00, 0x0fff).r(FUNC(apple2e_state::c400_cec_r)).nopw(); + map(0x1000, 0x13ff).r(FUNC(apple2e_state::c400_cec_bank_r)).nopw(); } void apple2e_state::c800bank_map(address_map &map) { - map(0x0000, 0x07ff).rw(this, FUNC(apple2e_state::c800_r), FUNC(apple2e_state::c800_w)); - map(0x0800, 0x0fff).rw(this, FUNC(apple2e_state::c800_int_r), FUNC(apple2e_state::c800_w)); - map(0x1000, 0x17ff).rw(this, FUNC(apple2e_state::c800_b2_int_r), FUNC(apple2e_state::c800_w)); - map(0x1800, 0x1fff).r(this, FUNC(apple2e_state::c800_cec_r)).nopw(); - map(0x2000, 0x27ff).r(this, FUNC(apple2e_state::c800_cec_bank_r)).nopw(); + map(0x0000, 0x07ff).rw(FUNC(apple2e_state::c800_r), FUNC(apple2e_state::c800_w)); + map(0x0800, 0x0fff).rw(FUNC(apple2e_state::c800_int_r), FUNC(apple2e_state::c800_w)); + map(0x1000, 0x17ff).rw(FUNC(apple2e_state::c800_b2_int_r), FUNC(apple2e_state::c800_w)); + map(0x1800, 0x1fff).r(FUNC(apple2e_state::c800_cec_r)).nopw(); + map(0x2000, 0x27ff).r(FUNC(apple2e_state::c800_cec_bank_r)).nopw(); } void apple2e_state::inhbank_map(address_map &map) { map(0x0000, 0x2fff).m(m_lcbank, FUNC(address_map_bank_device::amap8)); - map(0x3000, 0x5fff).rw(this, FUNC(apple2e_state::inh_r), FUNC(apple2e_state::inh_w)); + map(0x3000, 0x5fff).rw(FUNC(apple2e_state::inh_r), FUNC(apple2e_state::inh_w)); } void apple2e_state::lcbank_map(address_map &map) { - map(0x00000, 0x02fff).rom().region("maincpu", 0x1000).w(this, FUNC(apple2e_state::lc_w)); - map(0x03000, 0x05fff).rw(this, FUNC(apple2e_state::lc_r), FUNC(apple2e_state::lc_w)); - map(0x06000, 0x08fff).rw(this, FUNC(apple2e_state::lc_romswitch_r), FUNC(apple2e_state::lc_romswitch_w)); - map(0x09000, 0x0bfff).rom().region("maincpu", 0x5000).w(this, FUNC(apple2e_state::lc_w)); - map(0x0c000, 0x0efff).rw(this, FUNC(apple2e_state::lc_r), FUNC(apple2e_state::lc_w)); - map(0x0f000, 0x11fff).rom().region("maincpu", 0xd000).w(this, FUNC(apple2e_state::lc_w)); + map(0x00000, 0x02fff).rom().region("maincpu", 0x1000).w(FUNC(apple2e_state::lc_w)); + map(0x03000, 0x05fff).rw(FUNC(apple2e_state::lc_r), FUNC(apple2e_state::lc_w)); + map(0x06000, 0x08fff).rw(FUNC(apple2e_state::lc_romswitch_r), FUNC(apple2e_state::lc_romswitch_w)); + map(0x09000, 0x0bfff).rom().region("maincpu", 0x5000).w(FUNC(apple2e_state::lc_w)); + map(0x0c000, 0x0efff).rw(FUNC(apple2e_state::lc_r), FUNC(apple2e_state::lc_w)); + map(0x0f000, 0x11fff).rom().region("maincpu", 0xd000).w(FUNC(apple2e_state::lc_w)); } void apple2e_state::spectred_keyb_map(address_map &map) diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index f0fa5538ffa..5596e9fd4d3 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -188,7 +188,7 @@ void apple2gs_state::apple2gs_map(address_map &map) void apple2gs_state::vectors_map(address_map &map) { - map(0x00, 0x1f).r(this, FUNC(apple2gs_state::apple2gs_read_vector)); + map(0x00, 0x1f).r(FUNC(apple2gs_state::apple2gs_read_vector)); } // ADB microcontroller emulation diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp index a36170413c6..b5671602f57 100644 --- a/src/mame/drivers/apple3.cpp +++ b/src/mame/drivers/apple3.cpp @@ -33,7 +33,7 @@ void apple3_state::apple3_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(apple3_state::apple3_memory_r), FUNC(apple3_state::apple3_memory_w)); + map(0x0000, 0xffff).rw(FUNC(apple3_state::apple3_memory_r), FUNC(apple3_state::apple3_memory_w)); } static void apple3_cards(device_slot_interface &device) diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp index 4e327134920..ae6c46d3850 100644 --- a/src/mame/drivers/applix.cpp +++ b/src/mame/drivers/applix.cpp @@ -244,7 +244,7 @@ WRITE16_MEMBER( applix_state::palette_w ) offset >>= 4; if (ACCESSING_BITS_0_7) { - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); } else m_palette_latch[offset] = (data >> 8) & 15; @@ -451,19 +451,19 @@ void applix_state::applix_mem(address_map &map) map(0x000000, 0x3fffff).ram().share("expansion"); // Expansion map(0x400000, 0x47ffff).ram().mirror(0x80000).share("base"); // Main ram map(0x500000, 0x51ffff).rom().region("maincpu", 0); - map(0x600000, 0x60007f).w(this, FUNC(applix_state::palette_w)); - map(0x600080, 0x6000ff).w(this, FUNC(applix_state::dac_latch_w)); - map(0x600100, 0x60017f).w(this, FUNC(applix_state::video_latch_w)); //video latch (=border colour, high nybble; video base, low nybble) (odd) - map(0x600180, 0x6001ff).w(this, FUNC(applix_state::analog_latch_w)); + map(0x600000, 0x60007f).w(FUNC(applix_state::palette_w)); + map(0x600080, 0x6000ff).w(FUNC(applix_state::dac_latch_w)); + map(0x600100, 0x60017f).w(FUNC(applix_state::video_latch_w)); //video latch (=border colour, high nybble; video base, low nybble) (odd) + map(0x600180, 0x6001ff).w(FUNC(applix_state::analog_latch_w)); //AM_RANGE(0x700000, 0x700007) z80-scc (ch b control, ch b data, ch a control, ch a data) on even addresses - map(0x700080, 0x7000ff).r(this, FUNC(applix_state::applix_inputs_r)); + map(0x700080, 0x7000ff).r(FUNC(applix_state::applix_inputs_r)); map(0x700100, 0x70011f).mirror(0x60).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0xff00); map(0x700180, 0x700180).mirror(0x7c).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x700182, 0x700182).mirror(0x7c).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0xffffc0, 0xffffc1).rw(this, FUNC(applix_state::fdc_data_r), FUNC(applix_state::fdc_data_w)); + map(0xffffc0, 0xffffc1).rw(FUNC(applix_state::fdc_data_r), FUNC(applix_state::fdc_data_w)); //AM_RANGE(0xffffc2, 0xffffc3) AM_READWRITE(fdc_int_r,fdc_int_w) // optional - map(0xffffc8, 0xffffcd).r(this, FUNC(applix_state::fdc_stat_r)); - map(0xffffd0, 0xffffd1).w(this, FUNC(applix_state::fdc_cmd_w)); + map(0xffffc8, 0xffffcd).r(FUNC(applix_state::fdc_stat_r)); + map(0xffffd0, 0xffffd1).w(FUNC(applix_state::fdc_cmd_w)); //600000, 6FFFFF io ports and latches //700000, 7FFFFF peripheral chips and devices //800000, FFC000 optional roms @@ -480,13 +480,13 @@ void applix_state::subcpu_mem(address_map &map) void applix_state::subcpu_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x07).r(this, FUNC(applix_state::port00_r)); //PORTR - map(0x08, 0x0f).rw(this, FUNC(applix_state::port08_r), FUNC(applix_state::port08_w)); //Disk select - map(0x10, 0x17).rw(this, FUNC(applix_state::port10_r), FUNC(applix_state::port10_w)); //IRQ - map(0x18, 0x1f).rw(this, FUNC(applix_state::port18_r), FUNC(applix_state::port18_w)); //data&command - map(0x20, 0x27).mirror(0x18).rw(this, FUNC(applix_state::port20_r), FUNC(applix_state::port20_w)); //SCSI NCR5380 + map(0x00, 0x07).r(FUNC(applix_state::port00_r)); //PORTR + map(0x08, 0x0f).rw(FUNC(applix_state::port08_r), FUNC(applix_state::port08_w)); //Disk select + map(0x10, 0x17).rw(FUNC(applix_state::port10_r), FUNC(applix_state::port10_w)); //IRQ + map(0x18, 0x1f).rw(FUNC(applix_state::port18_r), FUNC(applix_state::port18_w)); //data&command + map(0x20, 0x27).mirror(0x18).rw(FUNC(applix_state::port20_r), FUNC(applix_state::port20_w)); //SCSI NCR5380 map(0x40, 0x43).mirror(0x1c).rw(m_fdc, FUNC(wd1772_device::read), FUNC(wd1772_device::write)); //FDC - map(0x60, 0x63).mirror(0x1c).rw(this, FUNC(applix_state::port60_r), FUNC(applix_state::port60_w)); //anotherZ80SCC + map(0x60, 0x63).mirror(0x1c).rw(FUNC(applix_state::port60_r), FUNC(applix_state::port60_w)); //anotherZ80SCC } void applix_state::keytronic_pc3270_program(address_map &map) @@ -496,7 +496,7 @@ void applix_state::keytronic_pc3270_program(address_map &map) void applix_state::keytronic_pc3270_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(applix_state::internal_data_read), FUNC(applix_state::internal_data_write)); + map(0x0000, 0xffff).rw(FUNC(applix_state::internal_data_read), FUNC(applix_state::internal_data_write)); } // io priorities: diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp index 87f5f2ce41d..310418a04b1 100644 --- a/src/mame/drivers/appoooh.cpp +++ b/src/mame/drivers/appoooh.cpp @@ -223,11 +223,11 @@ void appoooh_state::main_map(address_map &map) map(0xf000, 0xffff).ram(); map(0xf000, 0xf01f).share("spriteram"); - map(0xf020, 0xf3ff).w(this, FUNC(appoooh_state::fg_videoram_w)).share("fg_videoram"); - map(0xf420, 0xf7ff).w(this, FUNC(appoooh_state::fg_colorram_w)).share("fg_colorram"); + map(0xf020, 0xf3ff).w(FUNC(appoooh_state::fg_videoram_w)).share("fg_videoram"); + map(0xf420, 0xf7ff).w(FUNC(appoooh_state::fg_colorram_w)).share("fg_colorram"); map(0xf800, 0xf81f).share("spriteram_2"); - map(0xf820, 0xfbff).w(this, FUNC(appoooh_state::bg_videoram_w)).share("bg_videoram"); - map(0xfc20, 0xffff).w(this, FUNC(appoooh_state::bg_colorram_w)).share("bg_colorram"); + map(0xf820, 0xfbff).w(FUNC(appoooh_state::bg_videoram_w)).share("bg_videoram"); + map(0xfc20, 0xffff).w(FUNC(appoooh_state::bg_colorram_w)).share("bg_colorram"); } void appoooh_state::decrypted_opcodes_map(address_map &map) @@ -240,12 +240,12 @@ void appoooh_state::decrypted_opcodes_map(address_map &map) void appoooh_state::main_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::write)); - map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::write)); - map(0x02, 0x02).w("sn3", FUNC(sn76489_device::write)); - map(0x03, 0x03).portr("DSW1").w(this, FUNC(appoooh_state::adpcm_w)); - map(0x04, 0x04).portr("BUTTON3").w(this, FUNC(appoooh_state::out_w)); - map(0x05, 0x05).w(this, FUNC(appoooh_state::scroll_w)); /* unknown */ + map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::command_w)); + map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::command_w)); + map(0x02, 0x02).w("sn3", FUNC(sn76489_device::command_w)); + map(0x03, 0x03).portr("DSW1").w(FUNC(appoooh_state::adpcm_w)); + map(0x04, 0x04).portr("BUTTON3").w(FUNC(appoooh_state::out_w)); + map(0x05, 0x05).w(FUNC(appoooh_state::scroll_w)); /* unknown */ } diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 0f964567173..28d5af7ad5c 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -337,16 +337,16 @@ void apricot_state::apricot_io(address_map &map) map(0x00, 0x03).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x40, 0x47).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)).umask16(0x00ff); map(0x48, 0x4f).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x50, 0x50).mirror(0x06).w("ic7", FUNC(sn76489_device::write)); + map(0x50, 0x50).mirror(0x06).w("ic7", FUNC(sn76489_device::command_w)); map(0x58, 0x5f).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); - map(0x60, 0x60).r(this, FUNC(apricot_state::sio_da_r)).w(m_sio, FUNC(z80sio_device::da_w)).umask16(0x00ff); - map(0x62, 0x62).r(this, FUNC(apricot_state::sio_ca_r)).w(m_sio, FUNC(z80sio_device::ca_w)).umask16(0x00ff); - map(0x64, 0x64).r(this, FUNC(apricot_state::sio_db_r)).w(m_sio, FUNC(z80sio_device::db_w)).umask16(0x00ff); - map(0x66, 0x66).r(this, FUNC(apricot_state::sio_cb_r)).w(m_sio, FUNC(z80sio_device::cb_w)).umask16(0x00ff); + map(0x60, 0x60).r(FUNC(apricot_state::sio_da_r)).w(m_sio, FUNC(z80sio_device::da_w)).umask16(0x00ff); + map(0x62, 0x62).r(FUNC(apricot_state::sio_ca_r)).w(m_sio, FUNC(z80sio_device::ca_w)).umask16(0x00ff); + map(0x64, 0x64).r(FUNC(apricot_state::sio_db_r)).w(m_sio, FUNC(z80sio_device::db_w)).umask16(0x00ff); + map(0x66, 0x66).r(FUNC(apricot_state::sio_cb_r)).w(m_sio, FUNC(z80sio_device::cb_w)).umask16(0x00ff); map(0x68, 0x68).mirror(0x04).w(m_crtc, FUNC(hd6845_device::address_w)); map(0x6a, 0x6a).mirror(0x04).rw(m_crtc, FUNC(hd6845_device::register_r), FUNC(hd6845_device::register_w)); - map(0x70, 0x70).mirror(0x04).w(this, FUNC(apricot_state::i8089_ca1_w)); - map(0x72, 0x72).mirror(0x04).w(this, FUNC(apricot_state::i8089_ca2_w)); + map(0x70, 0x70).mirror(0x04).w(FUNC(apricot_state::i8089_ca1_w)); + map(0x72, 0x72).mirror(0x04).w(FUNC(apricot_state::i8089_ca2_w)); map(0x78, 0x7f).noprw(); // unavailable } @@ -397,8 +397,8 @@ MACHINE_CONFIG_START(apricot_state::apricot) // devices MCFG_DEVICE_ADD("ic17", I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8("cent_data_in", input_buffer_device, read)) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_IN_PORTA_CB(READ8("cent_data_in", input_buffer_device, bus_r)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, apricot_state, i8255_portb_w)) MCFG_I8255_IN_PORTC_CB(READ8(*this, apricot_state, i8255_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, apricot_state, i8255_portc_w)) diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp index 884240c58e7..a131d29fea7 100644 --- a/src/mame/drivers/apricotf.cpp +++ b/src/mame/drivers/apricotf.cpp @@ -60,19 +60,19 @@ class f1_state : public driver_device { public: f1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, I8086_TAG), - m_ctc(*this, Z80CTC_TAG), - m_sio(*this, Z80SIO2_TAG), - m_fdc(*this, WD2797_TAG), - m_floppy0(*this, WD2797_TAG ":0"), - m_floppy1(*this, WD2797_TAG ":1"), - m_centronics(*this, CENTRONICS_TAG), - m_cent_data_out(*this, "cent_data_out"), - m_irqs(*this, "irqs"), - m_p_scrollram(*this, "p_scrollram"), - m_p_paletteram(*this, "p_paletteram"), - m_palette(*this, "palette") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, I8086_TAG) + , m_ctc(*this, Z80CTC_TAG) + , m_sio(*this, Z80SIO2_TAG) + , m_fdc(*this, WD2797_TAG) + , m_floppy0(*this, WD2797_TAG ":0") + , m_floppy1(*this, WD2797_TAG ":1") + , m_centronics(*this, CENTRONICS_TAG) + , m_cent_data_out(*this, "cent_data_out") + , m_irqs(*this, "irqs") + , m_p_scrollram(*this, "p_scrollram") + , m_p_paletteram(*this, "p_paletteram") + , m_palette(*this, "palette") { } DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -201,7 +201,7 @@ WRITE8_MEMBER(f1_state::system_w) switch(offset) { case 0: // centronics data port - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); break; case 1: // drive select @@ -257,7 +257,7 @@ void f1_state::act_f1_mem(address_map &map) map(0x00000, 0x01dff).ram(); map(0x01e00, 0x01fff).ram().share("p_scrollram"); map(0x02000, 0x3ffff).ram(); - map(0xe0000, 0xe001f).rw(this, FUNC(f1_state::palette_r), FUNC(f1_state::palette_w)).share("p_paletteram"); + map(0xe0000, 0xe001f).rw(FUNC(f1_state::palette_r), FUNC(f1_state::palette_w)).share("p_paletteram"); map(0xf8000, 0xfffff).rom().region(I8086_TAG, 0); } @@ -269,10 +269,10 @@ void f1_state::act_f1_mem(address_map &map) void f1_state::act_f1_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x000f).w(this, FUNC(f1_state::system_w)); + map(0x0000, 0x000f).w(FUNC(f1_state::system_w)); map(0x0010, 0x0017).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)).umask16(0x00ff); map(0x0020, 0x0027).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).umask16(0x00ff); - map(0x0030, 0x0030).w(this, FUNC(f1_state::m1_w)); + map(0x0030, 0x0030).w(FUNC(f1_state::m1_w)); map(0x0040, 0x0047).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)).umask16(0x00ff); // AM_RANGE(0x01e0, 0x01ff) winchester } diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index 9b9cd95a229..3e31cbb28e8 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -428,7 +428,7 @@ WRITE16_MEMBER( fp_state::mem_w ) void fp_state::fp_mem(address_map &map) { map.unmap_value_high(); - map(0x00000, 0xf7fff).rw(this, FUNC(fp_state::mem_r), FUNC(fp_state::mem_w)); + map(0x00000, 0xf7fff).rw(FUNC(fp_state::mem_r), FUNC(fp_state::mem_w)); map(0xf8000, 0xfffff).rom().region(I8086_TAG, 0); } @@ -443,13 +443,13 @@ void fp_state::fp_io(address_map &map) map(0x000, 0x007).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)).umask16(0x00ff); map(0x008, 0x00f).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0x018, 0x01f).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).umask16(0x00ff); - map(0x020, 0x020).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x022, 0x022).w(this, FUNC(fp_state::pint_clr_w)); - map(0x024, 0x024).r(this, FUNC(fp_state::prtr_snd_r)); - map(0x026, 0x026).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); - map(0x028, 0x028).w(this, FUNC(fp_state::contrast_w)); - map(0x02a, 0x02a).w(this, FUNC(fp_state::palette_w)); - map(0x02e, 0x02f).w(this, FUNC(fp_state::video_w)); + map(0x020, 0x020).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x022, 0x022).w(FUNC(fp_state::pint_clr_w)); + map(0x024, 0x024).r(FUNC(fp_state::prtr_snd_r)); + map(0x026, 0x026).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x028, 0x028).w(FUNC(fp_state::contrast_w)); + map(0x02a, 0x02a).w(FUNC(fp_state::palette_w)); + map(0x02e, 0x02f).w(FUNC(fp_state::video_w)); map(0x040, 0x05f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask16(0x00ff); map(0x068, 0x06b).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x06c, 0x06c).w(m_crtc, FUNC(mc6845_device::address_w)); diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp index 8e70fc0febb..c6dbf21fb7a 100644 --- a/src/mame/drivers/aquarium.cpp +++ b/src/mame/drivers/aquarium.cpp @@ -102,9 +102,9 @@ WRITE8_MEMBER(aquarium_state::aquarium_oki_w) void aquarium_state::main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0xc00000, 0xc00fff).ram().w(this, FUNC(aquarium_state::aquarium_mid_videoram_w)).share("mid_videoram"); - map(0xc01000, 0xc01fff).ram().w(this, FUNC(aquarium_state::aquarium_bak_videoram_w)).share("bak_videoram"); - map(0xc02000, 0xc03fff).ram().w(this, FUNC(aquarium_state::aquarium_txt_videoram_w)).share("txt_videoram"); + map(0xc00000, 0xc00fff).ram().w(FUNC(aquarium_state::aquarium_mid_videoram_w)).share("mid_videoram"); + map(0xc01000, 0xc01fff).ram().w(FUNC(aquarium_state::aquarium_bak_videoram_w)).share("bak_videoram"); + map(0xc02000, 0xc03fff).ram().w(FUNC(aquarium_state::aquarium_txt_videoram_w)).share("txt_videoram"); map(0xc80000, 0xc81fff).rw(m_sprgen, FUNC(excellent_spr_device::read), FUNC(excellent_spr_device::write)).umask16(0x00ff); map(0xd00000, 0xd00fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xd80014, 0xd8001f).writeonly().share("scroll"); @@ -113,7 +113,7 @@ void aquarium_state::main_map(address_map &map) map(0xd80082, 0xd80083).nopr(); /* stored but not read back ? check code at 0x01f440 */ map(0xd80084, 0xd80085).portr("INPUTS"); map(0xd80086, 0xd80087).portr("SYSTEM"); - map(0xd80088, 0xd80088).w(this, FUNC(aquarium_state::aquarium_watchdog_w)); + map(0xd80088, 0xd80088).w(FUNC(aquarium_state::aquarium_watchdog_w)); map(0xd8008b, 0xd8008b).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xff0000, 0xffffff).ram(); } @@ -129,10 +129,10 @@ void aquarium_state::snd_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x02, 0x02).rw(this, FUNC(aquarium_state::aquarium_oki_r), FUNC(aquarium_state::aquarium_oki_w)); + map(0x02, 0x02).rw(FUNC(aquarium_state::aquarium_oki_r), FUNC(aquarium_state::aquarium_oki_w)); map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x06, 0x06).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); // only written with 0 for some reason - map(0x08, 0x08).w(this, FUNC(aquarium_state::aquarium_z80_bank_w)); + map(0x08, 0x08).w(FUNC(aquarium_state::aquarium_z80_bank_w)); } static INPUT_PORTS_START( aquarium ) diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp index ae2daabde4e..bef9c656d6a 100644 --- a/src/mame/drivers/aquarius.cpp +++ b/src/mame/drivers/aquarius.cpp @@ -210,11 +210,11 @@ void aquarius_state::init_aquarius() void aquarius_state::aquarius_mem(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x3000, 0x33ff).ram().w(this, FUNC(aquarius_state::aquarius_videoram_w)).share("videoram"); - map(0x3400, 0x37ff).ram().w(this, FUNC(aquarius_state::aquarius_colorram_w)).share("colorram"); + map(0x3000, 0x33ff).ram().w(FUNC(aquarius_state::aquarius_videoram_w)).share("videoram"); + map(0x3400, 0x37ff).ram().w(FUNC(aquarius_state::aquarius_colorram_w)).share("colorram"); map(0x3800, 0x3fff).ram(); map(0x4000, 0xbfff).noprw(); /* expansion ram */ - map(0xc000, 0xffff).r(this, FUNC(aquarius_state::cartridge_r)); + map(0xc000, 0xffff).r(FUNC(aquarius_state::cartridge_r)); } void aquarius_state::aquarius_io(address_map &map) @@ -222,10 +222,10 @@ void aquarius_state::aquarius_io(address_map &map) // AM_RANGE(0x7e, 0x7f) AM_MIRROR(0xff00) AM_READWRITE(modem_r, modem_w) map(0xf6, 0xf6).mirror(0xff00).rw("ay8910", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xf7, 0xf7).mirror(0xff00).w("ay8910", FUNC(ay8910_device::address_w)); - map(0xfc, 0xfc).mirror(0xff00).rw(this, FUNC(aquarius_state::cassette_r), FUNC(aquarius_state::cassette_w)); - map(0xfd, 0xfd).mirror(0xff00).rw(this, FUNC(aquarius_state::vsync_r), FUNC(aquarius_state::mapper_w)); - map(0xfe, 0xfe).mirror(0xff00).rw(this, FUNC(aquarius_state::printer_r), FUNC(aquarius_state::printer_w)); - map(0xff, 0xff).select(0xff00).rw(this, FUNC(aquarius_state::keyboard_r), FUNC(aquarius_state::scrambler_w)); + map(0xfc, 0xfc).mirror(0xff00).rw(FUNC(aquarius_state::cassette_r), FUNC(aquarius_state::cassette_w)); + map(0xfd, 0xfd).mirror(0xff00).rw(FUNC(aquarius_state::vsync_r), FUNC(aquarius_state::mapper_w)); + map(0xfe, 0xfe).mirror(0xff00).rw(FUNC(aquarius_state::printer_r), FUNC(aquarius_state::printer_w)); + map(0xff, 0xff).select(0xff00).rw(FUNC(aquarius_state::keyboard_r), FUNC(aquarius_state::scrambler_w)); } diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp index dbb7ace4be1..193004549ad 100644 --- a/src/mame/drivers/arabian.cpp +++ b/src/mame/drivers/arabian.cpp @@ -214,11 +214,11 @@ WRITE8_MEMBER(arabian_state::mcu_port_p_w) void arabian_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0xbfff).w(this, FUNC(arabian_state::arabian_videoram_w)); + map(0x8000, 0xbfff).w(FUNC(arabian_state::arabian_videoram_w)); map(0xc000, 0xc000).mirror(0x01ff).portr("IN0"); map(0xc200, 0xc200).mirror(0x01ff).portr("DSW1"); map(0xd000, 0xd7ff).mirror(0x0800).ram().share("custom_cpu_ram"); - map(0xe000, 0xe007).mirror(0x0ff8).w(this, FUNC(arabian_state::arabian_blitter_w)).share("blitter"); + map(0xe000, 0xe007).mirror(0x0ff8).w(FUNC(arabian_state::arabian_blitter_w)).share("blitter"); } diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp index f0a13fb71d6..65b01f47053 100644 --- a/src/mame/drivers/arachnid.cpp +++ b/src/mame/drivers/arachnid.cpp @@ -127,8 +127,8 @@ void arachnid_state::arachnid_map(address_map &map) map(0x2000, 0x2007).rw(PTM6840_TAG, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0x4004, 0x4007).rw(m_pia_u4, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x4008, 0x400b).rw(m_pia_u17, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x6000, 0x6000).w(TMS9118_TAG, FUNC(tms9928a_device::vram_write)); - map(0x6002, 0x6002).w(TMS9118_TAG, FUNC(tms9928a_device::register_write)); + map(0x6000, 0x6000).w(TMS9118_TAG, FUNC(tms9928a_device::vram_w)); + map(0x6002, 0x6002).w(TMS9118_TAG, FUNC(tms9928a_device::register_w)); map(0x8000, 0xffff).rom().region(M6809_TAG, 0); } diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp index 12babfab424..38e49cd625b 100644 --- a/src/mame/drivers/arcadecl.cpp +++ b/src/mame/drivers/arcadecl.cpp @@ -162,11 +162,11 @@ void sparkz_state::main_map(address_map &map) map(0x640022, 0x640023).portr("TRACKY2"); map(0x640024, 0x640025).portr("TRACKX1"); map(0x640026, 0x640027).portr("TRACKY1"); - map(0x640040, 0x64004f).w(this, FUNC(sparkz_state::latch_w)); + map(0x640040, 0x64004f).w(FUNC(sparkz_state::latch_w)); map(0x640060, 0x64006f).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x641000, 0x641fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x642000, 0x642000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x646000, 0x646fff).w(this, FUNC(sparkz_state::scanline_int_ack_w)); + map(0x646000, 0x646fff).w(FUNC(sparkz_state::scanline_int_ack_w)); map(0x647000, 0x647fff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); } diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp index 8011ac8d150..a0244bcb328 100644 --- a/src/mame/drivers/arcadia.cpp +++ b/src/mame/drivers/arcadia.cpp @@ -127,7 +127,7 @@ anything in hardware. No cartridge has been found which uses them. void arcadia_state::arcadia_mem(address_map &map) { map(0x0000, 0x0fff).r(m_cart, FUNC(arcadia_cart_slot_device::read_rom)); - map(0x1800, 0x1aff).rw(this, FUNC(arcadia_state::video_r), FUNC(arcadia_state::video_w)); + map(0x1800, 0x1aff).rw(FUNC(arcadia_state::video_r), FUNC(arcadia_state::video_w)); } /* The Emerson Arcadia 2001 controllers have 2 fire buttons on the side, diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp index 9f0965504ca..1750e5d87bf 100644 --- a/src/mame/drivers/argo.cpp +++ b/src/mame/drivers/argo.cpp @@ -150,12 +150,12 @@ void argo_state::mem_map(address_map &map) map(0x0000, 0x07ff).bankrw("boot"); map(0x0800, 0xf7af).ram(); map(0xf7b0, 0xf7ff).ram().share("videoram"); - map(0xf800, 0xffff).rom().w(this, FUNC(argo_state::argo_videoram_w)); + map(0xf800, 0xffff).rom().w(FUNC(argo_state::argo_videoram_w)); } void argo_state::io_map(address_map &map) { - map(0x0000, 0xFFFF).rw(this, FUNC(argo_state::argo_io_r), FUNC(argo_state::argo_io_w)); + map(0x0000, 0xFFFF).rw(FUNC(argo_state::argo_io_r), FUNC(argo_state::argo_io_w)); } /* Input ports */ diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp index 884c1fe3e25..581830a5e2a 100644 --- a/src/mame/drivers/argus.cpp +++ b/src/mame/drivers/argus.cpp @@ -191,16 +191,16 @@ void argus_state::argus_map(address_map &map) map(0xc003, 0xc003).portr("DSW1"); map(0xc004, 0xc004).portr("DSW2"); map(0xc200, 0xc200).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc201, 0xc201).w(this, FUNC(argus_state::flipscreen_w)); - map(0xc202, 0xc202).w(this, FUNC(argus_state::bankselect_w)); + map(0xc201, 0xc201).w(FUNC(argus_state::flipscreen_w)); + map(0xc202, 0xc202).w(FUNC(argus_state::bankselect_w)); map(0xc300, 0xc301).ram().share("bg0_scrollx"); map(0xc302, 0xc303).ram().share("bg0_scrolly"); map(0xc308, 0xc309).ram().share("bg1_scrollx"); map(0xc30a, 0xc30b).ram().share("bg1_scrolly"); - map(0xc30c, 0xc30c).w(this, FUNC(argus_state::argus_bg_status_w)); - map(0xc400, 0xcfff).ram().w(this, FUNC(argus_state::argus_paletteram_w)).share("paletteram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(argus_state::txram_w)).share("txram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(argus_state::bg1ram_w)).share("bg1ram"); + map(0xc30c, 0xc30c).w(FUNC(argus_state::argus_bg_status_w)); + map(0xc400, 0xcfff).ram().w(FUNC(argus_state::argus_paletteram_w)).share("paletteram"); + map(0xd000, 0xd7ff).ram().w(FUNC(argus_state::txram_w)).share("txram"); + map(0xd800, 0xdfff).ram().w(FUNC(argus_state::bg1ram_w)).share("bg1ram"); map(0xe000, 0xf1ff).ram(); map(0xf200, 0xf7ff).ram().share("spriteram"); map(0xf800, 0xffff).ram(); @@ -216,16 +216,16 @@ void argus_state::valtric_map(address_map &map) map(0xc003, 0xc003).portr("DSW1"); map(0xc004, 0xc004).portr("DSW2"); map(0xc200, 0xc200).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc201, 0xc201).w(this, FUNC(argus_state::flipscreen_w)); - map(0xc202, 0xc202).w(this, FUNC(argus_state::bankselect_w)); - map(0xc300, 0xc300).w(this, FUNC(argus_state::valtric_unknown_w)); + map(0xc201, 0xc201).w(FUNC(argus_state::flipscreen_w)); + map(0xc202, 0xc202).w(FUNC(argus_state::bankselect_w)); + map(0xc300, 0xc300).w(FUNC(argus_state::valtric_unknown_w)); map(0xc308, 0xc309).ram().share("bg1_scrollx"); map(0xc30a, 0xc30b).ram().share("bg1_scrolly"); - map(0xc30c, 0xc30c).w(this, FUNC(argus_state::valtric_bg_status_w)); - map(0xc30d, 0xc30d).w(this, FUNC(argus_state::valtric_mosaic_w)); - map(0xc400, 0xcfff).ram().w(this, FUNC(argus_state::valtric_paletteram_w)).share("paletteram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(argus_state::txram_w)).share("txram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(argus_state::bg1ram_w)).share("bg1ram"); + map(0xc30c, 0xc30c).w(FUNC(argus_state::valtric_bg_status_w)); + map(0xc30d, 0xc30d).w(FUNC(argus_state::valtric_mosaic_w)); + map(0xc400, 0xcfff).ram().w(FUNC(argus_state::valtric_paletteram_w)).share("paletteram"); + map(0xd000, 0xd7ff).ram().w(FUNC(argus_state::txram_w)).share("txram"); + map(0xd800, 0xdfff).ram().w(FUNC(argus_state::bg1ram_w)).share("bg1ram"); map(0xe000, 0xf1ff).ram(); map(0xf200, 0xf7ff).ram().share("spriteram"); map(0xf800, 0xffff).ram(); @@ -240,20 +240,20 @@ void argus_state::butasan_map(address_map &map) map(0xc002, 0xc002).portr("P2"); map(0xc003, 0xc003).portr("DSW1"); map(0xc004, 0xc004).portr("DSW2"); - map(0xc100, 0xc100).w(this, FUNC(argus_state::butasan_unknown_w)); + map(0xc100, 0xc100).w(FUNC(argus_state::butasan_unknown_w)); map(0xc200, 0xc200).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc201, 0xc201).w(this, FUNC(argus_state::flipscreen_w)); - map(0xc202, 0xc202).w(this, FUNC(argus_state::bankselect_w)); - map(0xc203, 0xc203).w(this, FUNC(argus_state::butasan_pageselect_w)); + map(0xc201, 0xc201).w(FUNC(argus_state::flipscreen_w)); + map(0xc202, 0xc202).w(FUNC(argus_state::bankselect_w)); + map(0xc203, 0xc203).w(FUNC(argus_state::butasan_pageselect_w)); map(0xc300, 0xc301).ram().share("bg0_scrollx"); map(0xc302, 0xc303).ram().share("bg0_scrolly"); - map(0xc304, 0xc304).w(this, FUNC(argus_state::butasan_bg0_status_w)); + map(0xc304, 0xc304).w(FUNC(argus_state::butasan_bg0_status_w)); map(0xc308, 0xc309).ram().share("bg1_scrollx"); map(0xc30a, 0xc30b).ram().share("bg1_scrolly"); - map(0xc30c, 0xc30c).w(this, FUNC(argus_state::butasan_bg1_status_w)); - map(0xc400, 0xc7ff).ram().w(this, FUNC(argus_state::butasan_bg1ram_w)).share("butasan_bg1ram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(argus_state::butasan_paletteram_w)).share("paletteram"); - map(0xd000, 0xdfff).rw(this, FUNC(argus_state::butasan_pagedram_r), FUNC(argus_state::butasan_pagedram_w)); + map(0xc30c, 0xc30c).w(FUNC(argus_state::butasan_bg1_status_w)); + map(0xc400, 0xc7ff).ram().w(FUNC(argus_state::butasan_bg1ram_w)).share("butasan_bg1ram"); + map(0xc800, 0xcfff).ram().w(FUNC(argus_state::butasan_paletteram_w)).share("paletteram"); + map(0xd000, 0xdfff).rw(FUNC(argus_state::butasan_pagedram_r), FUNC(argus_state::butasan_pagedram_w)); map(0xe000, 0xefff).ram(); map(0xf000, 0xf67f).ram().share("spriteram"); map(0xf680, 0xffff).ram(); diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp index c8a8bb7c23f..c5691234b1a 100644 --- a/src/mame/drivers/aristmk4.cpp +++ b/src/mame/drivers/aristmk4.cpp @@ -1016,28 +1016,28 @@ void aristmk4_state::aristmk4_map(address_map &map) map(0x0800, 0x17ff).ram(); map(0x1800, 0x1800).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x1801, 0x1801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x1c00, 0x1cff).w(this, FUNC(aristmk4_state::mk4_printer_w)); - map(0x1900, 0x19ff).r(this, FUNC(aristmk4_state::mk4_printer_r)); + map(0x1c00, 0x1cff).w(FUNC(aristmk4_state::mk4_printer_w)); + map(0x1900, 0x19ff).r(FUNC(aristmk4_state::mk4_printer_r)); map(0x2000, 0x3fff).rom(); // graphics rom map map(0x4000, 0x4fff).bankrw("bank1").share("nvram"); - map(0x5000, 0x5000).w(this, FUNC(aristmk4_state::u3_p0)); - map(0x5002, 0x5002).r(this, FUNC(aristmk4_state::u3_p2)); - map(0x5003, 0x5003).r(this, FUNC(aristmk4_state::u3_p3)); - map(0x5005, 0x5005).r(this, FUNC(aristmk4_state::ldsw)); + map(0x5000, 0x5000).w(FUNC(aristmk4_state::u3_p0)); + map(0x5002, 0x5002).r(FUNC(aristmk4_state::u3_p2)); + map(0x5003, 0x5003).r(FUNC(aristmk4_state::u3_p3)); + map(0x5005, 0x5005).r(FUNC(aristmk4_state::ldsw)); map(0x500d, 0x500d).portr("500d"); map(0x500e, 0x500e).portr("500e"); map(0x500f, 0x500f).portr("500f"); map(0x5010, 0x501f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x5200, 0x5200).r(this, FUNC(aristmk4_state::cashcade_r)); + map(0x5200, 0x5200).r(FUNC(aristmk4_state::cashcade_r)); map(0x5201, 0x5201).portr("5201"); - map(0x52c0, 0x52c0).r(this, FUNC(aristmk4_state::bv_p0)); - map(0x52c1, 0x52c1).r(this, FUNC(aristmk4_state::bv_p1)); + map(0x52c0, 0x52c0).r(FUNC(aristmk4_state::bv_p0)); + map(0x52c1, 0x52c1).r(FUNC(aristmk4_state::bv_p1)); map(0x527f, 0x5281).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5300, 0x5300).portr("5300"); map(0x5380, 0x5383).rw("pia6821_0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // RTC data - PORT A , mechanical meters - PORTB ?? - map(0x5440, 0x5440).w(this, FUNC(aristmk4_state::mlamps)); // take win and gamble lamps - map(0x5468, 0x5468).rw(this, FUNC(aristmk4_state::cgdrr), FUNC(aristmk4_state::cgdrw)); // 4020 ripple counter outputs + map(0x5440, 0x5440).w(FUNC(aristmk4_state::mlamps)); // take win and gamble lamps + map(0x5468, 0x5468).rw(FUNC(aristmk4_state::cgdrr), FUNC(aristmk4_state::cgdrw)); // 4020 ripple counter outputs map(0x6000, 0xffff).rom(); // game roms } @@ -1061,27 +1061,27 @@ void aristmk4_state::aristmk4_poker_map(address_map &map) map(0x0800, 0x17ff).ram(); map(0x1800, 0x1800).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x1801, 0x1801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x1c00, 0x1cff).w(this, FUNC(aristmk4_state::mk4_printer_w)); - map(0x1900, 0x19ff).r(this, FUNC(aristmk4_state::mk4_printer_r)); + map(0x1c00, 0x1cff).w(FUNC(aristmk4_state::mk4_printer_w)); + map(0x1900, 0x19ff).r(FUNC(aristmk4_state::mk4_printer_r)); map(0x4000, 0x4fff).bankrw("bank1").share("nvram"); - map(0x5000, 0x5000).w(this, FUNC(aristmk4_state::u3_p0)); - map(0x5002, 0x5002).r(this, FUNC(aristmk4_state::u3_p2)); + map(0x5000, 0x5000).w(FUNC(aristmk4_state::u3_p0)); + map(0x5002, 0x5002).r(FUNC(aristmk4_state::u3_p2)); map(0x5003, 0x5003).portr("5003"); - map(0x5005, 0x5005).r(this, FUNC(aristmk4_state::ldsw)); + map(0x5005, 0x5005).r(FUNC(aristmk4_state::ldsw)); map(0x500d, 0x500d).portr("500d"); map(0x500e, 0x500e).portr("500e"); map(0x500f, 0x500f).portr("500f"); map(0x5010, 0x501f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x5200, 0x5200).r(this, FUNC(aristmk4_state::cashcade_r)); + map(0x5200, 0x5200).r(FUNC(aristmk4_state::cashcade_r)); map(0x5201, 0x5201).portr("5201"); - map(0x52c0, 0x52c0).r(this, FUNC(aristmk4_state::bv_p0)); - map(0x52c1, 0x52c1).r(this, FUNC(aristmk4_state::bv_p1)); + map(0x52c0, 0x52c0).r(FUNC(aristmk4_state::bv_p0)); + map(0x52c1, 0x52c1).r(FUNC(aristmk4_state::bv_p1)); map(0x527f, 0x5281).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5300, 0x5300).portr("5300"); map(0x5380, 0x5383).rw("pia6821_0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // RTC data - PORT A , mechanical meters - PORTB ?? - map(0x5440, 0x5440).w(this, FUNC(aristmk4_state::mlamps)); // take win and gamble lamps - map(0x5468, 0x5468).rw(this, FUNC(aristmk4_state::cgdrr), FUNC(aristmk4_state::cgdrw)); // 4020 ripple counter outputs + map(0x5440, 0x5440).w(FUNC(aristmk4_state::mlamps)); // take win and gamble lamps + map(0x5468, 0x5468).rw(FUNC(aristmk4_state::cgdrr), FUNC(aristmk4_state::cgdrw)); // 4020 ripple counter outputs map(0x6000, 0x7fff).rom(); // graphics rom map map(0x8000, 0xffff).rom(); // game roms } diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp index 0ef7f05248f..3437c774ce1 100644 --- a/src/mame/drivers/aristmk5.cpp +++ b/src/mame/drivers/aristmk5.cpp @@ -921,10 +921,10 @@ void aristmk5_state::aristmk5_map(address_map &map) { map(0x02000000, 0x02ffffff).ram().share("physicalram"); /* physical RAM - 16 MB for now, should be 512k for the A310 */ - map(0x03000000, 0x0331ffff).rw(this, FUNC(aristmk5_state::archimedes_ioc_r), FUNC(aristmk5_state::archimedes_ioc_w)); + map(0x03000000, 0x0331ffff).rw(FUNC(aristmk5_state::archimedes_ioc_r), FUNC(aristmk5_state::archimedes_ioc_w)); /* MK-5 overrides */ - map(0x03010420, 0x03010420).w(this, FUNC(aristmk5_state::sram_banksel_w)); // SRAM bank select write + map(0x03010420, 0x03010420).w(FUNC(aristmk5_state::sram_banksel_w)); // SRAM bank select write map(0x03010480, 0x0301049f).rw("uart_0a", FUNC(ins8250_uart_device::ins8250_r), FUNC(ins8250_uart_device::ins8250_w)).umask32(0x000000ff); map(0x03010500, 0x0301051f).rw("uart_0b", FUNC(ins8250_uart_device::ins8250_r), FUNC(ins8250_uart_device::ins8250_w)).umask32(0x000000ff); @@ -933,20 +933,20 @@ void aristmk5_state::aristmk5_map(address_map &map) map(0x03010680, 0x0301069f).rw("uart_1b", FUNC(ins8250_uart_device::ins8250_r), FUNC(ins8250_uart_device::ins8250_w)).umask32(0x000000ff); map(0x03010700, 0x03010703).portr("P6"); - map(0x03010800, 0x03010800).r(this, FUNC(aristmk5_state::eeprom_r)); + map(0x03010800, 0x03010800).r(FUNC(aristmk5_state::eeprom_r)); map(0x03010810, 0x03010813).rw("watchdog", FUNC(watchdog_timer_device::reset32_r), FUNC(watchdog_timer_device::reset32_w)); //MK-5 specific, watchdog - map(0x03220000, 0x0323ffff).rw(this, FUNC(aristmk5_state::sram_r), FUNC(aristmk5_state::sram_w)).umask32(0x000000ff); + map(0x03220000, 0x0323ffff).rw(FUNC(aristmk5_state::sram_r), FUNC(aristmk5_state::sram_w)).umask32(0x000000ff); // bank5 slow - map(0x03250048, 0x0325004b).w(this, FUNC(aristmk5_state::Ns5w48)); //IOEB control register - map(0x03250050, 0x03250053).r(this, FUNC(aristmk5_state::Ns5r50)); //IOEB ID register - map(0x03250058, 0x0325005b).r(this, FUNC(aristmk5_state::Ns5x58)); //IOEB interrupt Latch + map(0x03250048, 0x0325004b).w(FUNC(aristmk5_state::Ns5w48)); //IOEB control register + map(0x03250050, 0x03250053).r(FUNC(aristmk5_state::Ns5r50)); //IOEB ID register + map(0x03250058, 0x0325005b).r(FUNC(aristmk5_state::Ns5x58)); //IOEB interrupt Latch - map(0x03320000, 0x0333ffff).rw(this, FUNC(aristmk5_state::sram_r), FUNC(aristmk5_state::sram_w)).umask32(0x000000ff); + map(0x03320000, 0x0333ffff).rw(FUNC(aristmk5_state::sram_r), FUNC(aristmk5_state::sram_w)).umask32(0x000000ff); - map(0x03400000, 0x035fffff).w(this, FUNC(aristmk5_state::archimedes_vidc_w)); - map(0x03600000, 0x037fffff).w(this, FUNC(aristmk5_state::archimedes_memc_w)); - map(0x03800000, 0x039fffff).w(this, FUNC(aristmk5_state::archimedes_memc_page_w)); + map(0x03400000, 0x035fffff).w(FUNC(aristmk5_state::archimedes_vidc_w)); + map(0x03600000, 0x037fffff).w(FUNC(aristmk5_state::archimedes_memc_w)); + map(0x03800000, 0x039fffff).w(FUNC(aristmk5_state::archimedes_memc_page_w)); map(0x03400000, 0x03bfffff).rom().region("maincpu", 0); } @@ -956,10 +956,10 @@ void aristmk5_state::aristmk5_usa_map(address_map &map) { aristmk5_map(map); - map(0x00000000, 0x01ffffff).rw(this, FUNC(aristmk5_state::archimedes_memc_logical_r), FUNC(aristmk5_state::archimedes_memc_logical_w)); + map(0x00000000, 0x01ffffff).rw(FUNC(aristmk5_state::archimedes_memc_logical_r), FUNC(aristmk5_state::archimedes_memc_logical_w)); - map(0x03010440, 0x03010440).w(this, FUNC(aristmk5_state::rtc_usa_w)); - map(0x03010450, 0x03010450).w(this, FUNC(aristmk5_state::eeprom_usa_w)); + map(0x03010440, 0x03010440).w(FUNC(aristmk5_state::rtc_usa_w)); + map(0x03010450, 0x03010450).w(FUNC(aristmk5_state::eeprom_usa_w)); map(0x03012000, 0x03012003).portr("P1"); map(0x03012010, 0x03012013).portr("P2"); @@ -967,13 +967,13 @@ void aristmk5_state::aristmk5_usa_map(address_map &map) map(0x03012210, 0x03012213).portr("DSW2"); map(0x03010584, 0x03010587).portr("P4"); - map(0x03012020, 0x03012020).r(this, FUNC(aristmk5_state::ldor_r)); - map(0x03012070, 0x03012070).w(this, FUNC(aristmk5_state::ldor_clk_w)); + map(0x03012020, 0x03012020).r(FUNC(aristmk5_state::ldor_r)); + map(0x03012070, 0x03012070).w(FUNC(aristmk5_state::ldor_clk_w)); map(0x03012184, 0x03012187).portr("P5"); - map(0x03012000, 0x0301201f).w(this, FUNC(aristmk5_state::buttons_lamps_w)).umask32(0x000000ff); - map(0x03012030, 0x0301203f).w(this, FUNC(aristmk5_state::other_lamps_w)).umask32(0x000000ff); - map(0x03012380, 0x0301238f).w(this, FUNC(aristmk5_state::bill_acceptor_lamps_w)).umask32(0x000000ff); + map(0x03012000, 0x0301201f).w(FUNC(aristmk5_state::buttons_lamps_w)).umask32(0x000000ff); + map(0x03012030, 0x0301203f).w(FUNC(aristmk5_state::other_lamps_w)).umask32(0x000000ff); + map(0x03012380, 0x0301238f).w(FUNC(aristmk5_state::bill_acceptor_lamps_w)).umask32(0x000000ff); map(0x03012100, 0x0301211f).rw("uart_2a", FUNC(ins8250_uart_device::ins8250_r), FUNC(ins8250_uart_device::ins8250_w)).umask32(0x000000ff); map(0x03012140, 0x0301215f).rw("uart_2b", FUNC(ins8250_uart_device::ins8250_r), FUNC(ins8250_uart_device::ins8250_w)).umask32(0x000000ff); @@ -986,16 +986,16 @@ void aristmk5_state::aristmk5_drame_map(address_map &map) { aristmk5_map(map); - map(0x00000000, 0x01ffffff).rw(this, FUNC(aristmk5_state::aristmk5_drame_memc_logical_r), FUNC(aristmk5_state::archimedes_memc_logical_w)); + map(0x00000000, 0x01ffffff).rw(FUNC(aristmk5_state::aristmk5_drame_memc_logical_r), FUNC(aristmk5_state::archimedes_memc_logical_w)); - map(0x03010430, 0x03010430).w(this, FUNC(aristmk5_state::hopper_w)); - map(0x03010440, 0x03010440).w(this, FUNC(aristmk5_state::rtc_w)); - map(0x03010450, 0x03010450).w(this, FUNC(aristmk5_state::eeprom_w)); + map(0x03010430, 0x03010430).w(FUNC(aristmk5_state::hopper_w)); + map(0x03010440, 0x03010440).w(FUNC(aristmk5_state::rtc_w)); + map(0x03010450, 0x03010450).w(FUNC(aristmk5_state::eeprom_w)); - map(0x03010400, 0x03010400).w(this, FUNC(aristmk5_state::spi_mux_w)); - map(0x03010470, 0x03010470).w(this, FUNC(aristmk5_state::spi_data_w)); - map(0x03010850, 0x03010850).rw(this, FUNC(aristmk5_state::spi_int_ack_r), FUNC(aristmk5_state::spi_int_ack_w)); - map(0x03010870, 0x03010870).r(this, FUNC(aristmk5_state::spi_data_r)); + map(0x03010400, 0x03010400).w(FUNC(aristmk5_state::spi_mux_w)); + map(0x03010470, 0x03010470).w(FUNC(aristmk5_state::spi_data_w)); + map(0x03010850, 0x03010850).rw(FUNC(aristmk5_state::spi_int_ack_r), FUNC(aristmk5_state::spi_int_ack_w)); + map(0x03010870, 0x03010870).r(FUNC(aristmk5_state::spi_data_r)); map(0x03014000, 0x0301401f).rw("uart_2a", FUNC(ins8250_uart_device::ins8250_r), FUNC(ins8250_uart_device::ins8250_w)).umask32(0x000000ff); map(0x03014020, 0x0301403f).rw("uart_2b", FUNC(ins8250_uart_device::ins8250_r), FUNC(ins8250_uart_device::ins8250_w)).umask32(0x000000ff); diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index 4c13b7cc38f..99e67f47f93 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/src/mame/drivers/aristmk6.cpp @@ -309,15 +309,15 @@ void aristmk6_state::aristmk6_map(address_map &map) map(0x11000000, 0x1107ffff).ram(); // SRAM1 512KB map(0x11800000, 0x1187ffff).ram(); // SRAM2 512KB // 12000xxx main control registers area - map(0x12000010, 0x12000017).w(this, FUNC(aristmk6_state::eeprom_w)); + map(0x12000010, 0x12000017).w(FUNC(aristmk6_state::eeprom_w)); map(0x12000078, 0x1200007f).nopw(); // watchdog ?? map(0x12000080, 0x12000087).nopw(); // 0-1-2 written here repeatedly, diag LED or smth ? - map(0x120000E0, 0x120000E7).r(this, FUNC(aristmk6_state::hwver_r)); - map(0x120000E8, 0x12000107).r(this, FUNC(aristmk6_state::irqpend_r)); - map(0x12000108, 0x12000127).w(this, FUNC(aristmk6_state::irqen_w)); + map(0x120000E0, 0x120000E7).r(FUNC(aristmk6_state::hwver_r)); + map(0x120000E8, 0x12000107).r(FUNC(aristmk6_state::irqpend_r)); + map(0x12000108, 0x12000127).w(FUNC(aristmk6_state::irqen_w)); map(0x12400010, 0x12400017).rw(m_uart1, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); map(0x12400018, 0x1240001f).rw(m_uart0, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); - map(0x13800000, 0x13800007).r(this, FUNC(aristmk6_state::test_r)); + map(0x13800000, 0x13800007).r(FUNC(aristmk6_state::test_r)); } void aristmk6_state::aristmk6_port(address_map &map) diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp index 9662ba1ed99..7a077bb8a7b 100644 --- a/src/mame/drivers/arkanoid.cpp +++ b/src/mame/drivers/arkanoid.cpp @@ -830,12 +830,12 @@ void arkanoid_state::arkanoid_map(address_map &map) map(0xc000, 0xc7ff).ram().mirror(0x0800); map(0xd000, 0xd001).w("aysnd", FUNC(ay8910_device::address_data_w)).mirror(0x0fe6); map(0xd001, 0xd001).r("aysnd", FUNC(ay8910_device::data_r)).mirror(0x0fe6); - map(0xd008, 0xd008).w(this, FUNC(arkanoid_state::arkanoid_d008_w)).mirror(0x0fe7); /* gfx bank, flip screen, 68705 reset, etc. */ + map(0xd008, 0xd008).w(FUNC(arkanoid_state::arkanoid_d008_w)).mirror(0x0fe7); /* gfx bank, flip screen, 68705 reset, etc. */ map(0xd008, 0xd008).portr("SYSTEM2").mirror(0x0fe3); /* unused p1 and p2 joysticks */ map(0xd00c, 0xd00c).portr("SYSTEM").mirror(0x0fe3); /* start, service, coins, and 2 bits from the 68705 */ map(0xd010, 0xd010).portr("BUTTONS").w("watchdog", FUNC(watchdog_timer_device::reset_w)).mirror(0x0fe7); map(0xd018, 0xd018).rw(m_mcuintf, FUNC(arkanoid_mcu_device_base::data_r), FUNC(arkanoid_mcu_device_base::data_w)).mirror(0x0fe7); /* input from the 68705 */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); map(0xe800, 0xe83f).ram().share("spriteram"); map(0xe840, 0xefff).ram(); map(0xf000, 0xffff).nopr(); /* fixes instant death in final level */ @@ -847,11 +847,11 @@ void arkanoid_state::bootleg_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xd000, 0xd000).w("aysnd", FUNC(ay8910_device::address_w)); map(0xd001, 0xd001).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0xd008, 0xd008).w(this, FUNC(arkanoid_state::arkanoid_d008_w)); /* gfx bank, flip screen etc. */ + map(0xd008, 0xd008).w(FUNC(arkanoid_state::arkanoid_d008_w)); /* gfx bank, flip screen etc. */ map(0xd00c, 0xd00c).portr("SYSTEM"); map(0xd010, 0xd010).portr("BUTTONS").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xd018, 0xd018).portr("MUX").nopw(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); map(0xe800, 0xe83f).ram().share("spriteram"); map(0xe840, 0xefff).ram(); map(0xf000, 0xffff).nopr(); /* fixes instant death in final level */ @@ -864,9 +864,9 @@ void arkanoid_state::hexa_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xd001, 0xd001).r("aysnd", FUNC(ay8910_device::data_r)); map(0xd000, 0xd001).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0xd008, 0xd008).w(this, FUNC(arkanoid_state::hexa_d008_w)); + map(0xd008, 0xd008).w(FUNC(arkanoid_state::hexa_d008_w)); map(0xd010, 0xd010).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* or IRQ acknowledge, or both */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); } READ8_MEMBER(arkanoid_state::hexaa_f000_r) @@ -887,11 +887,11 @@ void arkanoid_state::hexaa_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xd001, 0xd001).r("aysnd", FUNC(ay8910_device::data_r)); map(0xd000, 0xd001).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0xd008, 0xd008).w(this, FUNC(arkanoid_state::hexa_d008_w)); + map(0xd008, 0xd008).w(FUNC(arkanoid_state::hexa_d008_w)); map(0xd010, 0xd010).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* or IRQ acknowledge, or both */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); map(0xe800, 0xefff).ram(); - map(0xf000, 0xf000).rw(this, FUNC(arkanoid_state::hexaa_f000_r), FUNC(arkanoid_state::hexaa_f000_w)); + map(0xf000, 0xf000).rw(FUNC(arkanoid_state::hexaa_f000_r), FUNC(arkanoid_state::hexaa_f000_w)); } void arkanoid_state::hexaa_sub_map(address_map &map) @@ -915,8 +915,8 @@ void arkanoid_state::hexaa_sub_iomap(address_map &map) { map.global_mask(0x9f); map(0x00, 0x0f).ram(); // ?? could be communication with the other chip (protection?) - map(0x80, 0x80).w(this, FUNC(arkanoid_state::hexaa_sub_80_w)); - map(0x90, 0x90).r(this, FUNC(arkanoid_state::hexaa_sub_90_r)); + map(0x80, 0x80).w(FUNC(arkanoid_state::hexaa_sub_80_w)); + map(0x90, 0x90).r(FUNC(arkanoid_state::hexaa_sub_90_r)); } @@ -927,8 +927,8 @@ void arkanoid_state::brixian_map(address_map &map) map(0xc000, 0xc7ff).ram().share("protram"); map(0xd000, 0xd000).w("aysnd", FUNC(ay8910_device::address_w)); map(0xd001, 0xd001).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0xd008, 0xd008).w(this, FUNC(arkanoid_state::brixian_d008_w)); /* gfx bank, flip screen etc. */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); + map(0xd008, 0xd008).w(FUNC(arkanoid_state::brixian_d008_w)); /* gfx bank, flip screen etc. */ + map(0xe000, 0xe7ff).ram().w(FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram"); map(0xe800, 0xe83f).ram().share("spriteram"); map(0xe840, 0xefff).ram(); } diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 8dcaaf19346..47249dd4e2e 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -424,21 +424,21 @@ void armedf_state::terraf_map(address_map &map) map(0x060000, 0x0603ff).ram().share("spriteram"); map(0x060400, 0x063fff).ram(); map(0x064000, 0x064fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x068000, 0x069fff).rw(this, FUNC(armedf_state::nb1414m4_text_videoram_r), FUNC(armedf_state::nb1414m4_text_videoram_w)).umask16(0x00ff); + map(0x068000, 0x069fff).rw(FUNC(armedf_state::nb1414m4_text_videoram_r), FUNC(armedf_state::nb1414m4_text_videoram_w)).umask16(0x00ff); map(0x06a000, 0x06a9ff).ram(); map(0x06c000, 0x06cfff).ram().share("spr_pal_clut"); - map(0x070000, 0x070fff).ram().w(this, FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); - map(0x074000, 0x074fff).ram().w(this, FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); + map(0x070000, 0x070fff).ram().w(FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); + map(0x074000, 0x074fff).ram().w(FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); map(0x078000, 0x078001).portr("P1"); map(0x078002, 0x078003).portr("P2"); map(0x078004, 0x078005).portr("DSW1"); map(0x078006, 0x078007).portr("DSW2"); // AM_RANGE(0x07c000, 0x07c001) AM_WRITE(terraf_io_w) handled in DRIVER_INIT - map(0x07c002, 0x07c003).w(this, FUNC(armedf_state::armedf_bg_scrollx_w)); - map(0x07c004, 0x07c005).w(this, FUNC(armedf_state::armedf_bg_scrolly_w)); - map(0x07c00a, 0x07c00b).w(this, FUNC(armedf_state::sound_command_w)); + map(0x07c002, 0x07c003).w(FUNC(armedf_state::armedf_bg_scrollx_w)); + map(0x07c004, 0x07c005).w(FUNC(armedf_state::armedf_bg_scrolly_w)); + map(0x07c00a, 0x07c00b).w(FUNC(armedf_state::sound_command_w)); map(0x07c00c, 0x07c00d).nopw(); /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ - map(0x07c00e, 0x07c00f).w(this, FUNC(armedf_state::irq_lv1_ack_w)); + map(0x07c00e, 0x07c00f).w(FUNC(armedf_state::irq_lv1_ack_w)); } void armedf_state::kozure_map(address_map &map) @@ -457,21 +457,21 @@ void armedf_state::cclimbr2_map(address_map &map) map(0x060000, 0x060fff).ram().share("spriteram"); map(0x061000, 0x063fff).ram(); map(0x064000, 0x064fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x068000, 0x069fff).rw(this, FUNC(armedf_state::nb1414m4_text_videoram_r), FUNC(armedf_state::nb1414m4_text_videoram_w)).umask16(0x00ff); + map(0x068000, 0x069fff).rw(FUNC(armedf_state::nb1414m4_text_videoram_r), FUNC(armedf_state::nb1414m4_text_videoram_w)).umask16(0x00ff); map(0x06a000, 0x06a9ff).ram(); map(0x06c000, 0x06cfff).ram().share("spr_pal_clut"); - map(0x070000, 0x070fff).ram().w(this, FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); - map(0x074000, 0x074fff).ram().w(this, FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); + map(0x070000, 0x070fff).ram().w(FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); + map(0x074000, 0x074fff).ram().w(FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); map(0x078000, 0x078001).portr("P1"); map(0x078002, 0x078003).portr("P2"); map(0x078004, 0x078005).portr("DSW1"); map(0x078006, 0x078007).portr("DSW2"); // AM_RANGE(0x07c000, 0x07c001) AM_WRITE(io_w) - map(0x07c002, 0x07c003).w(this, FUNC(armedf_state::armedf_bg_scrollx_w)); - map(0x07c004, 0x07c005).w(this, FUNC(armedf_state::armedf_bg_scrolly_w)); - map(0x07c00a, 0x07c00b).w(this, FUNC(armedf_state::sound_command_w)); + map(0x07c002, 0x07c003).w(FUNC(armedf_state::armedf_bg_scrollx_w)); + map(0x07c004, 0x07c005).w(FUNC(armedf_state::armedf_bg_scrolly_w)); + map(0x07c00a, 0x07c00b).w(FUNC(armedf_state::sound_command_w)); map(0x07c00c, 0x07c00d).nopw(); /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ - map(0x07c00e, 0x07c00f).w(this, FUNC(armedf_state::irq_lv2_ack_w)); + map(0x07c00e, 0x07c00f).w(FUNC(armedf_state::irq_lv2_ack_w)); } void armedf_state::legion_map(address_map &map) @@ -480,21 +480,21 @@ void armedf_state::legion_map(address_map &map) map(0x060000, 0x060fff).ram().share("spriteram"); map(0x061000, 0x063fff).ram(); map(0x064000, 0x064fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x068000, 0x069fff).rw(this, FUNC(armedf_state::nb1414m4_text_videoram_r), FUNC(armedf_state::nb1414m4_text_videoram_w)).umask16(0x00ff); + map(0x068000, 0x069fff).rw(FUNC(armedf_state::nb1414m4_text_videoram_r), FUNC(armedf_state::nb1414m4_text_videoram_w)).umask16(0x00ff); map(0x06a000, 0x06a9ff).ram(); map(0x06c000, 0x06cfff).ram().share("spr_pal_clut"); - map(0x070000, 0x070fff).ram().w(this, FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); - map(0x074000, 0x074fff).ram().w(this, FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); + map(0x070000, 0x070fff).ram().w(FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); + map(0x074000, 0x074fff).ram().w(FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); map(0x078000, 0x078001).portr("P1"); map(0x078002, 0x078003).portr("P2"); map(0x078004, 0x078005).portr("DSW1"); map(0x078006, 0x078007).portr("DSW2"); // AM_RANGE(0x07c000, 0x07c001) AM_WRITE(legion_io_w) - map(0x07c002, 0x07c003).w(this, FUNC(armedf_state::armedf_bg_scrollx_w)); - map(0x07c004, 0x07c005).w(this, FUNC(armedf_state::armedf_bg_scrolly_w)); - map(0x07c00a, 0x07c00b).w(this, FUNC(armedf_state::sound_command_w)); + map(0x07c002, 0x07c003).w(FUNC(armedf_state::armedf_bg_scrollx_w)); + map(0x07c004, 0x07c005).w(FUNC(armedf_state::armedf_bg_scrolly_w)); + map(0x07c00a, 0x07c00b).w(FUNC(armedf_state::sound_command_w)); map(0x07c00c, 0x07c00d).nopw(); /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ - map(0x07c00e, 0x07c00f).w(this, FUNC(armedf_state::irq_lv2_ack_w)); + map(0x07c00e, 0x07c00f).w(FUNC(armedf_state::irq_lv2_ack_w)); } WRITE8_MEMBER(armedf_state::legionjb_fg_scroll_w) @@ -508,26 +508,26 @@ WRITE8_MEMBER(armedf_state::legionjb_fg_scroll_w) void armedf_state::legionjb_map(address_map &map) { - map(0x040000, 0x04003f).w(this, FUNC(armedf_state::legionjb_fg_scroll_w)).umask16(0x00ff); + map(0x040000, 0x04003f).w(FUNC(armedf_state::legionjb_fg_scroll_w)).umask16(0x00ff); map(0x000000, 0x05ffff).rom(); map(0x060000, 0x060fff).ram().share("spriteram"); map(0x061000, 0x063fff).ram(); map(0x064000, 0x064fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x068000, 0x069fff).rw(this, FUNC(armedf_state::armedf_text_videoram_r), FUNC(armedf_state::armedf_text_videoram_w)).umask16(0x00ff); + map(0x068000, 0x069fff).rw(FUNC(armedf_state::armedf_text_videoram_r), FUNC(armedf_state::armedf_text_videoram_w)).umask16(0x00ff); map(0x06a000, 0x06a9ff).ram(); map(0x06c000, 0x06cfff).ram().share("spr_pal_clut"); - map(0x070000, 0x070fff).ram().w(this, FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); - map(0x074000, 0x074fff).ram().w(this, FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); + map(0x070000, 0x070fff).ram().w(FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); + map(0x074000, 0x074fff).ram().w(FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); map(0x078000, 0x078001).portr("P1"); map(0x078002, 0x078003).portr("P2"); map(0x078004, 0x078005).portr("DSW1"); map(0x078006, 0x078007).portr("DSW2"); // AM_RANGE(0x07c000, 0x07c001) AM_WRITE(bootleg_io_w) - map(0x07c002, 0x07c003).w(this, FUNC(armedf_state::armedf_bg_scrollx_w)); - map(0x07c004, 0x07c005).w(this, FUNC(armedf_state::armedf_bg_scrolly_w)); - map(0x07c00a, 0x07c00b).w(this, FUNC(armedf_state::sound_command_w)); + map(0x07c002, 0x07c003).w(FUNC(armedf_state::armedf_bg_scrollx_w)); + map(0x07c004, 0x07c005).w(FUNC(armedf_state::armedf_bg_scrolly_w)); + map(0x07c00a, 0x07c00b).w(FUNC(armedf_state::sound_command_w)); map(0x07c00c, 0x07c00d).nopw(); /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ - map(0x07c00e, 0x07c00f).w(this, FUNC(armedf_state::irq_lv2_ack_w)); + map(0x07c00e, 0x07c00f).w(FUNC(armedf_state::irq_lv2_ack_w)); } void armedf_state::armedf_map(address_map &map) @@ -535,9 +535,9 @@ void armedf_state::armedf_map(address_map &map) map(0x000000, 0x05ffff).rom(); map(0x060000, 0x060fff).ram().share("spriteram"); map(0x061000, 0x065fff).ram(); - map(0x066000, 0x066fff).ram().w(this, FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); - map(0x067000, 0x067fff).ram().w(this, FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); - map(0x068000, 0x069fff).rw(this, FUNC(armedf_state::armedf_text_videoram_r), FUNC(armedf_state::armedf_text_videoram_w)).umask16(0x00ff); + map(0x066000, 0x066fff).ram().w(FUNC(armedf_state::armedf_bg_videoram_w)).share("bg_videoram"); + map(0x067000, 0x067fff).ram().w(FUNC(armedf_state::armedf_fg_videoram_w)).share("fg_videoram"); + map(0x068000, 0x069fff).rw(FUNC(armedf_state::armedf_text_videoram_r), FUNC(armedf_state::armedf_text_videoram_w)).umask16(0x00ff); map(0x06a000, 0x06afff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x06b000, 0x06bfff).ram().share("spr_pal_clut"); map(0x06c000, 0x06c7ff).ram(); @@ -545,14 +545,14 @@ void armedf_state::armedf_map(address_map &map) map(0x06c002, 0x06c003).portr("P2"); map(0x06c004, 0x06c005).portr("DSW1"); map(0x06c006, 0x06c007).portr("DSW2"); - map(0x06d000, 0x06d001).w(this, FUNC(armedf_state::terraf_io_w)); - map(0x06d002, 0x06d003).w(this, FUNC(armedf_state::armedf_bg_scrollx_w)); - map(0x06d004, 0x06d005).w(this, FUNC(armedf_state::armedf_bg_scrolly_w)); - map(0x06d006, 0x06d007).w(this, FUNC(armedf_state::armedf_fg_scrollx_w)); - map(0x06d008, 0x06d009).w(this, FUNC(armedf_state::armedf_fg_scrolly_w)); - map(0x06d00a, 0x06d00b).w(this, FUNC(armedf_state::sound_command_w)); + map(0x06d000, 0x06d001).w(FUNC(armedf_state::terraf_io_w)); + map(0x06d002, 0x06d003).w(FUNC(armedf_state::armedf_bg_scrollx_w)); + map(0x06d004, 0x06d005).w(FUNC(armedf_state::armedf_bg_scrolly_w)); + map(0x06d006, 0x06d007).w(FUNC(armedf_state::armedf_fg_scrollx_w)); + map(0x06d008, 0x06d009).w(FUNC(armedf_state::armedf_fg_scrolly_w)); + map(0x06d00a, 0x06d00b).w(FUNC(armedf_state::sound_command_w)); map(0x06d00c, 0x06d00d).nopw(); //watchdog - map(0x06d00e, 0x06d00f).w(this, FUNC(armedf_state::irq_lv1_ack_w)); + map(0x06d00e, 0x06d00f).w(FUNC(armedf_state::irq_lv1_ack_w)); } READ16_MEMBER(bigfghtr_state::latch_r) @@ -727,27 +727,27 @@ void bigfghtr_state::bigfghtr_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x080000, 0x0805ff).ram().share("spriteram"); - map(0x080600, 0x083fff).rw(this, FUNC(bigfghtr_state::main_sharedram_r), FUNC(bigfghtr_state::main_sharedram_w)); + map(0x080600, 0x083fff).rw(FUNC(bigfghtr_state::main_sharedram_r), FUNC(bigfghtr_state::main_sharedram_w)); map(0x084000, 0x085fff).ram(); //work ram - map(0x086000, 0x086fff).ram().w(this, FUNC(bigfghtr_state::armedf_bg_videoram_w)).share("bg_videoram"); - map(0x087000, 0x087fff).ram().w(this, FUNC(bigfghtr_state::armedf_fg_videoram_w)).share("fg_videoram"); - map(0x088000, 0x089fff).rw(this, FUNC(bigfghtr_state::armedf_text_videoram_r), FUNC(bigfghtr_state::armedf_text_videoram_w)).umask16(0x00ff); + map(0x086000, 0x086fff).ram().w(FUNC(bigfghtr_state::armedf_bg_videoram_w)).share("bg_videoram"); + map(0x087000, 0x087fff).ram().w(FUNC(bigfghtr_state::armedf_fg_videoram_w)).share("fg_videoram"); + map(0x088000, 0x089fff).rw(FUNC(bigfghtr_state::armedf_text_videoram_r), FUNC(bigfghtr_state::armedf_text_videoram_w)).umask16(0x00ff); map(0x08a000, 0x08afff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08b000, 0x08bfff).ram().share("spr_pal_clut"); map(0x08c000, 0x08c001).portr("P1"); map(0x08c002, 0x08c003).portr("P2"); map(0x08c004, 0x08c005).portr("DSW0"); map(0x08c006, 0x08c007).portr("DSW1"); - map(0x08d000, 0x08d001).w(this, FUNC(bigfghtr_state::terraf_io_w)); //807b0 - map(0x08d002, 0x08d003).w(this, FUNC(bigfghtr_state::armedf_bg_scrollx_w)); - map(0x08d004, 0x08d005).w(this, FUNC(bigfghtr_state::armedf_bg_scrolly_w)); - map(0x08d006, 0x08d007).w(this, FUNC(bigfghtr_state::armedf_fg_scrollx_w)); - map(0x08d008, 0x08d009).w(this, FUNC(bigfghtr_state::armedf_fg_scrolly_w)); - map(0x08d00a, 0x08d00b).w(this, FUNC(bigfghtr_state::sound_command_w)); + map(0x08d000, 0x08d001).w(FUNC(bigfghtr_state::terraf_io_w)); //807b0 + map(0x08d002, 0x08d003).w(FUNC(bigfghtr_state::armedf_bg_scrollx_w)); + map(0x08d004, 0x08d005).w(FUNC(bigfghtr_state::armedf_bg_scrolly_w)); + map(0x08d006, 0x08d007).w(FUNC(bigfghtr_state::armedf_fg_scrollx_w)); + map(0x08d008, 0x08d009).w(FUNC(bigfghtr_state::armedf_fg_scrolly_w)); + map(0x08d00a, 0x08d00b).w(FUNC(bigfghtr_state::sound_command_w)); map(0x08d00c, 0x08d00d).nopw(); //watchdog - map(0x08d00e, 0x08d00f).w(this, FUNC(bigfghtr_state::irq_lv1_ack_w)); + map(0x08d00e, 0x08d00f).w(FUNC(bigfghtr_state::irq_lv1_ack_w)); - map(0x400000, 0x400001).r(this, FUNC(bigfghtr_state::latch_r)); + map(0x400000, 0x400001).r(FUNC(bigfghtr_state::latch_r)); } void bigfghtr_state::bigfghtr_mcu_map(address_map &map) @@ -757,7 +757,7 @@ void bigfghtr_state::bigfghtr_mcu_map(address_map &map) void bigfghtr_state::bigfghtr_mcu_io_map(address_map &map) { - map(0x00000, 0x005ff).w(this, FUNC(bigfghtr_state::mcu_spritelist_w)); //Sprite RAM, guess shared as well + map(0x00000, 0x005ff).w(FUNC(bigfghtr_state::mcu_spritelist_w)); //Sprite RAM, guess shared as well map(0x00600, 0x03fff).ram().share("sharedram"); } @@ -804,25 +804,25 @@ WRITE8_MEMBER(armedf_state::fg_scroll_msb_w) void armedf_state::terrafjb_extraz80_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x5fff).rw(this, FUNC(armedf_state::blitter_txram_r), FUNC(armedf_state::blitter_txram_w)); + map(0x4000, 0x5fff).rw(FUNC(armedf_state::blitter_txram_r), FUNC(armedf_state::blitter_txram_w)); map(0x8000, 0x87ff).ram(); } void armedf_state::terrafjb_extraz80_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(armedf_state::fg_scrollx_w)); - map(0x01, 0x01).w(this, FUNC(armedf_state::fg_scrolly_w)); - map(0x02, 0x02).w(this, FUNC(armedf_state::fg_scroll_msb_w)); + map(0x00, 0x00).w(FUNC(armedf_state::fg_scrollx_w)); + map(0x01, 0x01).w(FUNC(armedf_state::fg_scrolly_w)); + map(0x02, 0x02).w(FUNC(armedf_state::fg_scroll_msb_w)); } void armedf_state::sound_portmap(address_map &map) { map.global_mask(0xff); map(0x0, 0x1).w("ymsnd", FUNC(ym3812_device::write)); - map(0x2, 0x2).w("dac1", FUNC(dac_byte_interface::write)); - map(0x3, 0x3).w("dac2", FUNC(dac_byte_interface::write)); - map(0x4, 0x4).r(this, FUNC(armedf_state::soundlatch_clear_r)); + map(0x2, 0x2).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x3, 0x3).w("dac2", FUNC(dac_byte_interface::data_w)); + map(0x4, 0x4).r(FUNC(armedf_state::soundlatch_clear_r)); map(0x6, 0x6).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -830,9 +830,9 @@ void armedf_state::sound_3526_portmap(address_map &map) { map.global_mask(0xff); map(0x0, 0x1).w("ymsnd", FUNC(ym3526_device::write)); - map(0x2, 0x2).w("dac1", FUNC(dac_byte_interface::write)); - map(0x3, 0x3).w("dac2", FUNC(dac_byte_interface::write)); - map(0x4, 0x4).r(this, FUNC(armedf_state::soundlatch_clear_r)); + map(0x2, 0x2).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x3, 0x3).w("dac2", FUNC(dac_byte_interface::data_w)); + map(0x4, 0x4).r(FUNC(armedf_state::soundlatch_clear_r)); map(0x6, 0x6).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp index 0e7e3a112a3..700f6702ea5 100644 --- a/src/mame/drivers/arsystems.cpp +++ b/src/mame/drivers/arsystems.cpp @@ -207,12 +207,12 @@ void arcadia_amiga_state::a500_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(arcadia_amiga_state::cia_r), FUNC(arcadia_amiga_state::cia_w)); - map(0xc00000, 0xd7ffff).rw(this, FUNC(arcadia_amiga_state::custom_chip_r), FUNC(arcadia_amiga_state::custom_chip_w)); + map(0xa00000, 0xbfffff).rw(FUNC(arcadia_amiga_state::cia_r), FUNC(arcadia_amiga_state::cia_w)); + map(0xc00000, 0xd7ffff).rw(FUNC(arcadia_amiga_state::custom_chip_r), FUNC(arcadia_amiga_state::custom_chip_w)); map(0xd80000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(arcadia_amiga_state::custom_chip_r), FUNC(arcadia_amiga_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(arcadia_amiga_state::custom_chip_r), FUNC(arcadia_amiga_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(arcadia_amiga_state::rom_mirror_r)); + map(0xde0000, 0xdeffff).rw(FUNC(arcadia_amiga_state::custom_chip_r), FUNC(arcadia_amiga_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(arcadia_amiga_state::custom_chip_r), FUNC(arcadia_amiga_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(arcadia_amiga_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf80000, 0xffffff).rom().region("kickstart", 0); } @@ -223,7 +223,7 @@ void arcadia_amiga_state::arcadia_map(address_map &map) map(0x800000, 0x97ffff).bankr("bank2").region("user3", 0); map(0x980000, 0x9fbfff).rom().region("user2", 0); map(0x9fc000, 0x9ffffd).ram().share("nvram"); - map(0x9ffffe, 0x9fffff).w(this, FUNC(arcadia_amiga_state::arcadia_multibios_change_game)); + map(0x9ffffe, 0x9fffff).w(FUNC(arcadia_amiga_state::arcadia_multibios_change_game)); map(0xf00000, 0xf7ffff).rom().region("user2", 0); } diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp index c07196424f2..913a949d020 100644 --- a/src/mame/drivers/artmagic.cpp +++ b/src/mame/drivers/artmagic.cpp @@ -419,8 +419,8 @@ void artmagic_state::main_map(address_map &map) map(0x300006, 0x300007).portr("300006"); map(0x300008, 0x300009).portr("300008"); map(0x30000a, 0x30000b).portr("30000a"); - map(0x300000, 0x300003).w(this, FUNC(artmagic_state::control_w)).share("control"); - map(0x300004, 0x300007).w(this, FUNC(artmagic_state::protection_bit_w)); + map(0x300000, 0x300003).w(FUNC(artmagic_state::control_w)).share("control"); + map(0x300004, 0x300007).w(FUNC(artmagic_state::protection_bit_w)); map(0x360001, 0x360001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380007).rw(m_tms, FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w)); } @@ -439,8 +439,8 @@ void artmagic_state::stonebal_map(address_map &map) map(0x30000a, 0x30000b).portr("30000a"); map(0x30000c, 0x30000d).portr("30000c"); map(0x30000e, 0x30000f).portr("30000e"); - map(0x300000, 0x300003).w(this, FUNC(artmagic_state::control_w)).share("control"); - map(0x300004, 0x300007).w(this, FUNC(artmagic_state::protection_bit_w)); + map(0x300000, 0x300003).w(FUNC(artmagic_state::control_w)).share("control"); + map(0x300004, 0x300007).w(FUNC(artmagic_state::protection_bit_w)); map(0x340001, 0x340001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380007).rw(m_tms, FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w)); } @@ -453,8 +453,8 @@ void artmagic_state::shtstar_map(address_map &map) map(0x280000, 0x280fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x300000, 0x300001).nopr(); //AM_READ_PORT("300000") - map(0x300000, 0x300003).w(this, FUNC(artmagic_state::control_w)).share("control"); - map(0x300004, 0x300007).w(this, FUNC(artmagic_state::protection_bit_w)); + map(0x300000, 0x300003).w(FUNC(artmagic_state::control_w)).share("control"); + map(0x300004, 0x300007).w(FUNC(artmagic_state::protection_bit_w)); map(0x340001, 0x340001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380007).rw(m_tms, FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w)); map(0x3c0000, 0x3c001f).rw("mainduart", FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); @@ -471,7 +471,7 @@ void artmagic_state::tms_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("vram0"); map(0x00400000, 0x005fffff).ram().share("vram1"); - map(0x00800000, 0x0080007f).rw(this, FUNC(artmagic_state::artmagic_blitter_r), FUNC(artmagic_state::artmagic_blitter_w)); + map(0x00800000, 0x0080007f).rw(FUNC(artmagic_state::artmagic_blitter_r), FUNC(artmagic_state::artmagic_blitter_w)); map(0x00c00000, 0x00c000ff).rw(m_tlc34076, FUNC(tlc34076_device::read), FUNC(tlc34076_device::write)).umask16(0x00ff); map(0xc0000000, 0xc00001ff).rw(m_tms, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xffe00000, 0xffffffff).ram(); @@ -482,7 +482,7 @@ void artmagic_state::stonebal_tms_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("vram0"); map(0x00400000, 0x005fffff).ram().share("vram1"); - map(0x00800000, 0x0080007f).rw(this, FUNC(artmagic_state::artmagic_blitter_r), FUNC(artmagic_state::artmagic_blitter_w)); + map(0x00800000, 0x0080007f).rw(FUNC(artmagic_state::artmagic_blitter_r), FUNC(artmagic_state::artmagic_blitter_w)); map(0x00c00000, 0x00c000ff).rw(m_tlc34076, FUNC(tlc34076_device::read), FUNC(tlc34076_device::write)).umask16(0x00ff); map(0xc0000000, 0xc00001ff).rw(m_tms, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xffc00000, 0xffffffff).ram(); diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp index 5e408bb80cb..4677bbce8f5 100644 --- a/src/mame/drivers/ashnojoe.cpp +++ b/src/mame/drivers/ashnojoe.cpp @@ -94,22 +94,22 @@ READ16_MEMBER(ashnojoe_state::fake_4a00a_r) void ashnojoe_state::ashnojoe_map(address_map &map) { map(0x000000, 0x01ffff).rom(); - map(0x040000, 0x041fff).ram().w(this, FUNC(ashnojoe_state::ashnojoe_tileram3_w)).share("tileram_3"); - map(0x042000, 0x043fff).ram().w(this, FUNC(ashnojoe_state::ashnojoe_tileram4_w)).share("tileram_4"); - map(0x044000, 0x044fff).ram().w(this, FUNC(ashnojoe_state::ashnojoe_tileram5_w)).share("tileram_5"); - map(0x045000, 0x045fff).ram().w(this, FUNC(ashnojoe_state::ashnojoe_tileram2_w)).share("tileram_2"); - map(0x046000, 0x046fff).ram().w(this, FUNC(ashnojoe_state::ashnojoe_tileram6_w)).share("tileram_6"); - map(0x047000, 0x047fff).ram().w(this, FUNC(ashnojoe_state::ashnojoe_tileram7_w)).share("tileram_7"); - map(0x048000, 0x048fff).ram().w(this, FUNC(ashnojoe_state::ashnojoe_tileram_w)).share("tileram"); + map(0x040000, 0x041fff).ram().w(FUNC(ashnojoe_state::ashnojoe_tileram3_w)).share("tileram_3"); + map(0x042000, 0x043fff).ram().w(FUNC(ashnojoe_state::ashnojoe_tileram4_w)).share("tileram_4"); + map(0x044000, 0x044fff).ram().w(FUNC(ashnojoe_state::ashnojoe_tileram5_w)).share("tileram_5"); + map(0x045000, 0x045fff).ram().w(FUNC(ashnojoe_state::ashnojoe_tileram2_w)).share("tileram_2"); + map(0x046000, 0x046fff).ram().w(FUNC(ashnojoe_state::ashnojoe_tileram6_w)).share("tileram_6"); + map(0x047000, 0x047fff).ram().w(FUNC(ashnojoe_state::ashnojoe_tileram7_w)).share("tileram_7"); + map(0x048000, 0x048fff).ram().w(FUNC(ashnojoe_state::ashnojoe_tileram_w)).share("tileram"); map(0x049000, 0x049fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x04a000, 0x04a001).portr("P1"); map(0x04a002, 0x04a003).portr("P2"); map(0x04a004, 0x04a005).portr("DSW"); map(0x04a006, 0x04a007).writeonly().share("tilemap_reg"); map(0x04a009, 0x04a009).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x04a00a, 0x04a00b).r(this, FUNC(ashnojoe_state::fake_4a00a_r)); // ?? - map(0x04a010, 0x04a019).w(this, FUNC(ashnojoe_state::joe_tilemaps_xscroll_w)); - map(0x04a020, 0x04a029).w(this, FUNC(ashnojoe_state::joe_tilemaps_yscroll_w)); + map(0x04a00a, 0x04a00b).r(FUNC(ashnojoe_state::fake_4a00a_r)); // ?? + map(0x04a010, 0x04a019).w(FUNC(ashnojoe_state::joe_tilemaps_xscroll_w)); + map(0x04a020, 0x04a029).w(FUNC(ashnojoe_state::joe_tilemaps_yscroll_w)); map(0x04c000, 0x04ffff).ram(); map(0x080000, 0x0bffff).rom(); } @@ -136,9 +136,9 @@ void ashnojoe_state::sound_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x02, 0x02).w(this, FUNC(ashnojoe_state::adpcm_w)); + map(0x02, 0x02).w(FUNC(ashnojoe_state::adpcm_w)); map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x06, 0x06).r(this, FUNC(ashnojoe_state::sound_latch_status_r)); + map(0x06, 0x06).r(FUNC(ashnojoe_state::sound_latch_status_r)); } diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp index f092f5274c4..e4ee88990be 100644 --- a/src/mame/drivers/asst128.cpp +++ b/src/mame/drivers/asst128.cpp @@ -30,8 +30,8 @@ void asst128_mb_device::map(address_map &map) map(0x0020, 0x002f).rw("pic8259", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x0040, 0x004f).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x0060, 0x006f).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x0080, 0x008f).w(this, FUNC(asst128_mb_device::pc_page_w)); - map(0x00a0, 0x00a1).w(this, FUNC(asst128_mb_device::nmi_enable_w)); + map(0x0080, 0x008f).w(FUNC(asst128_mb_device::pc_page_w)); + map(0x00a0, 0x00a1).w(FUNC(asst128_mb_device::nmi_enable_w)); } DEFINE_DEVICE_TYPE(ASST128_MOTHERBOARD, asst128_mb_device, "asst128_mb", "ASST128_MOTHERBOARD") @@ -82,7 +82,7 @@ void asst128_state::asst128_io(address_map &map) map.unmap_value_high(); map(0x0000, 0x00ff).m("mb", FUNC(asst128_mb_device::map)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); - map(0x03f2, 0x03f3).w(this, FUNC(asst128_state::asst128_fdc_dor_w)); + map(0x03f2, 0x03f3).w(FUNC(asst128_state::asst128_fdc_dor_w)); map(0x03f4, 0x03f5).m("fdc:upd765", FUNC(upd765a_device::map)); } diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp index f7f76be939c..cf90da2327a 100644 --- a/src/mame/drivers/asterix.cpp +++ b/src/mame/drivers/asterix.cpp @@ -179,14 +179,14 @@ void asterix_state::main_map(address_map &map) map(0x300000, 0x30001f).rw(m_k053244, FUNC(k05324x_device::k053244_lsb_r), FUNC(k05324x_device::k053244_lsb_w)); map(0x380000, 0x380001).portr("IN0"); map(0x380002, 0x380003).portr("IN1"); - map(0x380100, 0x380101).w(this, FUNC(asterix_state::control2_w)); + map(0x380100, 0x380101).w(FUNC(asterix_state::control2_w)); map(0x380200, 0x380203).rw("k053260", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); - map(0x380300, 0x380301).w(this, FUNC(asterix_state::sound_irq_w)); - map(0x380400, 0x380401).w(this, FUNC(asterix_state::asterix_spritebank_w)); + map(0x380300, 0x380301).w(FUNC(asterix_state::sound_irq_w)); + map(0x380400, 0x380401).w(FUNC(asterix_state::asterix_spritebank_w)); map(0x380500, 0x38051f).w(m_k053251, FUNC(k053251_device::lsb_w)); map(0x380600, 0x380601).noprw(); // Watchdog map(0x380700, 0x380707).w(m_k056832, FUNC(k056832_device::b_word_w)); - map(0x380800, 0x380803).w(this, FUNC(asterix_state::protection_w)); + map(0x380800, 0x380803).w(FUNC(asterix_state::protection_w)); map(0x400000, 0x400fff).rw(m_k056832, FUNC(k056832_device::ram_half_word_r), FUNC(k056832_device::ram_half_word_w)); map(0x420000, 0x421fff).r(m_k056832, FUNC(k056832_device::old_rom_word_r)); // Passthrough to tile roms map(0x440000, 0x44003f).w(m_k056832, FUNC(k056832_device::word_w)); @@ -198,7 +198,7 @@ void asterix_state::sound_map(address_map &map) map(0xf000, 0xf7ff).ram(); map(0xf801, 0xf801).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::data_w)); map(0xfa00, 0xfa2f).rw("k053260", FUNC(k053260_device::read), FUNC(k053260_device::write)); - map(0xfc00, 0xfc00).w(this, FUNC(asterix_state::sound_arm_nmi_w)); + map(0xfc00, 0xfc00).w(FUNC(asterix_state::sound_arm_nmi_w)); map(0xfe00, 0xfe00).w("ymsnd", FUNC(ym2151_device::register_w)); } diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index 164ebdb8690..8b1c287eb04 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -237,16 +237,16 @@ void asteroid_state::asteroid_map(address_map &map) map(0x0000, 0x01ff).ram(); map(0x0200, 0x02ff).bankrw("ram1").share("ram1"); map(0x0300, 0x03ff).bankrw("ram2").share("ram2"); - map(0x2000, 0x2007).r(this, FUNC(asteroid_state::asteroid_IN0_r)).nopw(); /* IN0 */ - map(0x2400, 0x2407).r(this, FUNC(asteroid_state::asteroid_IN1_r)); /* IN1 */ - map(0x2800, 0x2803).r(this, FUNC(asteroid_state::asteroid_DSW1_r)).nopw(); /* DSW1 */ + map(0x2000, 0x2007).r(FUNC(asteroid_state::asteroid_IN0_r)).nopw(); /* IN0 */ + map(0x2400, 0x2407).r(FUNC(asteroid_state::asteroid_IN1_r)); /* IN1 */ + map(0x2800, 0x2803).r(FUNC(asteroid_state::asteroid_DSW1_r)).nopw(); /* DSW1 */ map(0x3000, 0x3000).w(m_dvg, FUNC(dvg_device::go_w)); - map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::write)); + map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::bus_w)); map(0x3400, 0x3400).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x3600, 0x3600).w(this, FUNC(asteroid_state::asteroid_explode_w)); - map(0x3a00, 0x3a00).w(this, FUNC(asteroid_state::asteroid_thump_w)); + map(0x3600, 0x3600).w(FUNC(asteroid_state::asteroid_explode_w)); + map(0x3a00, 0x3a00).w(FUNC(asteroid_state::asteroid_thump_w)); map(0x3c00, 0x3c07).w("audiolatch", FUNC(ls259_device::write_d7)); - map(0x3e00, 0x3e00).w(this, FUNC(asteroid_state::asteroid_noise_reset_w)); + map(0x3e00, 0x3e00).w(FUNC(asteroid_state::asteroid_noise_reset_w)); map(0x4000, 0x47ff).ram().share("vectorram").region("maincpu", 0x4000); map(0x5000, 0x57ff).rom(); /* vector rom */ map(0x6800, 0x7fff).rom(); @@ -259,18 +259,18 @@ void asteroid_state::astdelux_map(address_map &map) map(0x0000, 0x01ff).ram(); map(0x0200, 0x02ff).bankrw("ram1").share("ram1"); map(0x0300, 0x03ff).bankrw("ram2").share("ram2"); - map(0x2000, 0x2007).r(this, FUNC(asteroid_state::asteroid_IN0_r)).nopw(); /* IN0 */ - map(0x2400, 0x2407).r(this, FUNC(asteroid_state::asteroid_IN1_r)).nopw(); /* IN1 */ - map(0x2800, 0x2803).r(this, FUNC(asteroid_state::asteroid_DSW1_r)); /* DSW1 */ + map(0x2000, 0x2007).r(FUNC(asteroid_state::asteroid_IN0_r)).nopw(); /* IN0 */ + map(0x2400, 0x2407).r(FUNC(asteroid_state::asteroid_IN1_r)).nopw(); /* IN1 */ + map(0x2800, 0x2803).r(FUNC(asteroid_state::asteroid_DSW1_r)); /* DSW1 */ map(0x2c00, 0x2c0f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x2c40, 0x2c7f).r("earom", FUNC(atari_vg_earom_device::read)); map(0x3000, 0x3000).w(m_dvg, FUNC(dvg_device::go_w)); map(0x3200, 0x323f).w("earom", FUNC(atari_vg_earom_device::write)).nopr(); map(0x3400, 0x3400).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x3600, 0x3600).w(this, FUNC(asteroid_state::asteroid_explode_w)); + map(0x3600, 0x3600).w(FUNC(asteroid_state::asteroid_explode_w)); map(0x3a00, 0x3a00).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x3c00, 0x3c07).w("audiolatch", FUNC(ls259_device::write_d7)); - map(0x3e00, 0x3e00).w(this, FUNC(asteroid_state::asteroid_noise_reset_w)); + map(0x3e00, 0x3e00).w(FUNC(asteroid_state::asteroid_noise_reset_w)); map(0x4000, 0x47ff).ram().share("vectorram").region("maincpu", 0x4000); map(0x4800, 0x57ff).rom(); /* vector rom */ map(0x6000, 0x7fff).rom(); @@ -282,14 +282,14 @@ void asteroid_state::llander_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x00ff).ram().mirror(0x1f00); map(0x2000, 0x2000).portr("IN0"); - map(0x2400, 0x2407).r(this, FUNC(asteroid_state::asteroid_IN1_r)); /* IN1 */ - map(0x2800, 0x2803).r(this, FUNC(asteroid_state::asteroid_DSW1_r)); /* DSW1 */ + map(0x2400, 0x2407).r(FUNC(asteroid_state::asteroid_IN1_r)); /* IN1 */ + map(0x2800, 0x2803).r(FUNC(asteroid_state::asteroid_DSW1_r)); /* DSW1 */ map(0x2c00, 0x2c00).portr("THRUST"); map(0x3000, 0x3000).w(m_dvg, FUNC(dvg_device::go_w)); - map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::write)); + map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::bus_w)); map(0x3400, 0x3400).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x3c00, 0x3c00).w(this, FUNC(asteroid_state::llander_sounds_w)); - map(0x3e00, 0x3e00).w(this, FUNC(asteroid_state::llander_snd_reset_w)); + map(0x3c00, 0x3c00).w(FUNC(asteroid_state::llander_sounds_w)); + map(0x3e00, 0x3e00).w(FUNC(asteroid_state::llander_snd_reset_w)); map(0x4000, 0x47ff).ram().share("vectorram").region("maincpu", 0x4000); map(0x4800, 0x5fff).rom(); /* vector rom */ map(0x5800, 0x5800).nopw(); // INC access? diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index 332ae0377b0..5850094cc28 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -488,14 +488,14 @@ void astinvad_state::spaceint_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x4000, 0x5fff).ram().w(this, FUNC(astinvad_state::spaceint_videoram_w)).share("videoram"); + map(0x4000, 0x5fff).ram().w(FUNC(astinvad_state::spaceint_videoram_w)).share("videoram"); } void astinvad_state::kamikaze_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(astinvad_state::kamikaze_ppi_r), FUNC(astinvad_state::kamikaze_ppi_w)); + map(0x00, 0xff).rw(FUNC(astinvad_state::kamikaze_ppi_r), FUNC(astinvad_state::kamikaze_ppi_w)); } @@ -504,9 +504,9 @@ void astinvad_state::spaceint_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); - map(0x02, 0x02).w(this, FUNC(astinvad_state::spaceint_sound1_w)); - map(0x03, 0x03).w(this, FUNC(astinvad_state::color_latch_w)); - map(0x04, 0x04).w(this, FUNC(astinvad_state::spaceint_sound2_w)); + map(0x02, 0x02).w(FUNC(astinvad_state::spaceint_sound1_w)); + map(0x03, 0x03).w(FUNC(astinvad_state::color_latch_w)); + map(0x04, 0x04).w(FUNC(astinvad_state::spaceint_sound2_w)); } diff --git a/src/mame/drivers/astrafr.cpp b/src/mame/drivers/astrafr.cpp index e45938f61f6..7070f0a82ec 100644 --- a/src/mame/drivers/astrafr.cpp +++ b/src/mame/drivers/astrafr.cpp @@ -249,24 +249,24 @@ WRITE32_MEMBER(astrafr_state::astrafr_slave_mem_w) void astrafr_state::astrafr_master_map(address_map &map) { - map(0x000000, 0xffffffff).rw(this, FUNC(astrafr_state::astrafr_mem_r), FUNC(astrafr_state::astrafr_mem_w)); + map(0x000000, 0xffffffff).rw(FUNC(astrafr_state::astrafr_mem_r), FUNC(astrafr_state::astrafr_mem_w)); } void astrafr_state::astrafr_master_alt_map(address_map &map) { - map(0x000000, 0xffffffff).rw(this, FUNC(astrafr_state::astrafr_mem_r), FUNC(astrafr_state::astrafr_mem_w)); + map(0x000000, 0xffffffff).rw(FUNC(astrafr_state::astrafr_mem_r), FUNC(astrafr_state::astrafr_mem_w)); } void astrafr_state::astra_map(address_map &map) { - map(0x000000, 0xffffffff).rw(this, FUNC(astrafr_state::astrafr_mem_r), FUNC(astrafr_state::astrafr_mem_w)); + map(0x000000, 0xffffffff).rw(FUNC(astrafr_state::astrafr_mem_r), FUNC(astrafr_state::astrafr_mem_w)); } // probably identical, afaik they're linked units.. void astrafr_state::astrafr_slave_map(address_map &map) { - map(0x000000, 0xffffffff).rw(this, FUNC(astrafr_state::astrafr_slave_mem_r), FUNC(astrafr_state::astrafr_slave_mem_w)); + map(0x000000, 0xffffffff).rw(FUNC(astrafr_state::astrafr_slave_mem_r), FUNC(astrafr_state::astrafr_slave_mem_w)); } diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp index 35954a5afa1..1a59fface44 100644 --- a/src/mame/drivers/astrcorp.cpp +++ b/src/mame/drivers/astrcorp.cpp @@ -321,16 +321,16 @@ void astrocorp_state::showhand_map(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x050000, 0x050fff).ram().share("spriteram"); - map(0x052000, 0x052001).w(this, FUNC(astrocorp_state::astrocorp_draw_sprites_w)); + map(0x052000, 0x052001).w(FUNC(astrocorp_state::astrocorp_draw_sprites_w)); map(0x054000, 0x054001).portr("INPUTS"); - map(0x058000, 0x058001).w(this, FUNC(astrocorp_state::astrocorp_eeprom_w)); - map(0x05a000, 0x05a001).w(this, FUNC(astrocorp_state::showhand_outputs_w)); + map(0x058000, 0x058001).w(FUNC(astrocorp_state::astrocorp_eeprom_w)); + map(0x05a000, 0x05a001).w(FUNC(astrocorp_state::showhand_outputs_w)); map(0x05e000, 0x05e001).portr("EEPROMIN"); map(0x060000, 0x0601ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x070000, 0x073fff).ram().share("nvram"); // battery - map(0x080000, 0x080001).w(this, FUNC(astrocorp_state::astrocorp_sound_bank_w)); - map(0x0a0000, 0x0a0001).w(this, FUNC(astrocorp_state::astrocorp_screen_enable_w)); - map(0x0d0000, 0x0d0001).r(this, FUNC(astrocorp_state::astrocorp_unk_r)); + map(0x080000, 0x080001).w(FUNC(astrocorp_state::astrocorp_sound_bank_w)); + map(0x0a0000, 0x0a0001).w(FUNC(astrocorp_state::astrocorp_screen_enable_w)); + map(0x0d0000, 0x0d0001).r(FUNC(astrocorp_state::astrocorp_unk_r)); map(0x0d0000, 0x0d0000).w(m_oki, FUNC(okim6295_device::write)); } @@ -338,16 +338,16 @@ void astrocorp_state::showhanc_map(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x060000, 0x0601ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x070000, 0x070001).w(this, FUNC(astrocorp_state::astrocorp_sound_bank_w)); + map(0x070000, 0x070001).w(FUNC(astrocorp_state::astrocorp_sound_bank_w)); map(0x080000, 0x080fff).ram().share("spriteram"); - map(0x082000, 0x082001).w(this, FUNC(astrocorp_state::astrocorp_draw_sprites_w)); + map(0x082000, 0x082001).w(FUNC(astrocorp_state::astrocorp_draw_sprites_w)); map(0x084000, 0x084001).portr("INPUTS"); - map(0x088000, 0x088001).w(this, FUNC(astrocorp_state::astrocorp_eeprom_w)); - map(0x08a000, 0x08a001).w(this, FUNC(astrocorp_state::showhand_outputs_w)); + map(0x088000, 0x088001).w(FUNC(astrocorp_state::astrocorp_eeprom_w)); + map(0x08a000, 0x08a001).w(FUNC(astrocorp_state::showhand_outputs_w)); map(0x08e000, 0x08e001).portr("EEPROMIN"); map(0x090000, 0x093fff).ram().share("nvram"); // battery - map(0x0a0000, 0x0a0001).w(this, FUNC(astrocorp_state::astrocorp_screen_enable_w)); - map(0x0e0000, 0x0e0001).r(this, FUNC(astrocorp_state::astrocorp_unk_r)); + map(0x0a0000, 0x0a0001).w(FUNC(astrocorp_state::astrocorp_screen_enable_w)); + map(0x0e0000, 0x0e0001).r(FUNC(astrocorp_state::astrocorp_unk_r)); map(0x0e0000, 0x0e0000).w(m_oki, FUNC(okim6295_device::write)); } @@ -355,15 +355,15 @@ void astrocorp_state::skilldrp_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x202000, 0x202001).w(this, FUNC(astrocorp_state::astrocorp_draw_sprites_w)); + map(0x202000, 0x202001).w(FUNC(astrocorp_state::astrocorp_draw_sprites_w)); map(0x204000, 0x204001).portr("INPUTS"); - map(0x208000, 0x208001).w(this, FUNC(astrocorp_state::astrocorp_eeprom_w)); - map(0x20a000, 0x20a001).w(this, FUNC(astrocorp_state::skilldrp_outputs_w)); + map(0x208000, 0x208001).w(FUNC(astrocorp_state::astrocorp_eeprom_w)); + map(0x20a000, 0x20a001).w(FUNC(astrocorp_state::skilldrp_outputs_w)); map(0x20e000, 0x20e001).portr("EEPROMIN"); map(0x380000, 0x3801ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x400000, 0x400001).w(this, FUNC(astrocorp_state::astrocorp_screen_enable_w)); + map(0x400000, 0x400001).w(FUNC(astrocorp_state::astrocorp_screen_enable_w)); map(0x500000, 0x507fff).ram().share("nvram"); // battery - map(0x580000, 0x580001).w(this, FUNC(astrocorp_state::skilldrp_sound_bank_w)); + map(0x580000, 0x580001).w(FUNC(astrocorp_state::skilldrp_sound_bank_w)); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -372,14 +372,14 @@ void astrocorp_state::speeddrp_map(address_map &map) map(0x000000, 0x01ffff).rom(); map(0x280000, 0x283fff).ram().share("nvram"); // battery map(0x380000, 0x380fff).ram().share("spriteram"); - map(0x382000, 0x382001).w(this, FUNC(astrocorp_state::astrocorp_draw_sprites_w)); + map(0x382000, 0x382001).w(FUNC(astrocorp_state::astrocorp_draw_sprites_w)); map(0x384000, 0x384001).portr("INPUTS"); - map(0x388000, 0x388001).w(this, FUNC(astrocorp_state::astrocorp_eeprom_w)); - map(0x38a000, 0x38a001).w(this, FUNC(astrocorp_state::skilldrp_outputs_w)); + map(0x388000, 0x388001).w(FUNC(astrocorp_state::astrocorp_eeprom_w)); + map(0x38a000, 0x38a001).w(FUNC(astrocorp_state::skilldrp_outputs_w)); map(0x38e000, 0x38e001).portr("EEPROMIN"); map(0x480000, 0x4801ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x500000, 0x500001).w(this, FUNC(astrocorp_state::astrocorp_screen_enable_w)); - map(0x580000, 0x580001).w(this, FUNC(astrocorp_state::skilldrp_sound_bank_w)); + map(0x500000, 0x500001).w(FUNC(astrocorp_state::astrocorp_screen_enable_w)); + map(0x580000, 0x580001).w(FUNC(astrocorp_state::skilldrp_sound_bank_w)); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 9ac5fbb1e40..9924585c5f4 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -417,7 +417,7 @@ CUSTOM_INPUT_MEMBER( astrocde_state::votrax_speech_status_r ) void astrocde_state::seawolf2_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x0000, 0x3fff).w(this, FUNC(astrocde_state::astrocade_funcgen_w)); + map(0x0000, 0x3fff).w(FUNC(astrocde_state::astrocade_funcgen_w)); map(0x4000, 0x7fff).ram().share("videoram"); map(0xc000, 0xc3ff).ram(); } @@ -426,7 +426,7 @@ void astrocde_state::seawolf2_map(address_map &map) void ebases_state::ebases_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x0000, 0x3fff).w(this, FUNC(astrocde_state::astrocade_funcgen_w)); + map(0x0000, 0x3fff).w(FUNC(astrocde_state::astrocade_funcgen_w)); map(0x4000, 0x7fff).ram().share("videoram"); } @@ -434,9 +434,9 @@ void ebases_state::ebases_map(address_map &map) void astrocde_state::spacezap_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x0000, 0x3fff).w(this, FUNC(astrocde_state::astrocade_funcgen_w)); + map(0x0000, 0x3fff).w(FUNC(astrocde_state::astrocade_funcgen_w)); map(0x4000, 0x7fff).ram().share("videoram"); - map(0xd000, 0xd03f).rw(this, FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); + map(0xd000, 0xd03f).rw(FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); map(0xd040, 0xd7ff).ram(); } @@ -444,10 +444,10 @@ void astrocde_state::spacezap_map(address_map &map) void astrocde_state::wow_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x0000, 0x3fff).w(this, FUNC(astrocde_state::astrocade_funcgen_w)); + map(0x0000, 0x3fff).w(FUNC(astrocde_state::astrocade_funcgen_w)); map(0x4000, 0x7fff).ram().share("videoram"); map(0x8000, 0xcfff).rom(); - map(0xd000, 0xd03f).rw(this, FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); + map(0xd000, 0xd03f).rw(FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); map(0xd040, 0xdfff).ram(); } @@ -455,11 +455,11 @@ void astrocde_state::wow_map(address_map &map) void astrocde_state::robby_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x0000, 0x3fff).w(this, FUNC(astrocde_state::astrocade_funcgen_w)); + map(0x0000, 0x3fff).w(FUNC(astrocde_state::astrocade_funcgen_w)); map(0x4000, 0x7fff).ram().share("videoram"); map(0x8000, 0xdfff).rom(); map(0xe000, 0xe7ff).ram().share("nvram"); - map(0xe000, 0xe1ff).rw(this, FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); + map(0xe000, 0xe1ff).rw(FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); map(0xe800, 0xffff).ram(); } @@ -467,8 +467,8 @@ void astrocde_state::robby_map(address_map &map) void astrocde_state::demndrgn_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x0000, 0x3fff).w(this, FUNC(astrocde_state::astrocade_funcgen_w)); - map(0x4000, 0x7fff).r(m_bank4000, FUNC(address_map_bank_device::read8)).w(this, FUNC(astrocde_state::profpac_videoram_w)); + map(0x0000, 0x3fff).w(FUNC(astrocde_state::astrocade_funcgen_w)); + map(0x4000, 0x7fff).r(m_bank4000, FUNC(address_map_bank_device::read8)).w(FUNC(astrocde_state::profpac_videoram_w)); map(0x8000, 0xbfff).bankr("bank8000"); map(0xc000, 0xdfff).rom(); map(0xe000, 0xe7ff).ram().share("nvram"); @@ -479,13 +479,13 @@ void astrocde_state::demndrgn_map(address_map &map) void astrocde_state::profpac_map(address_map &map) { demndrgn_map(map); - map(0xe000, 0xe1ff).rw(this, FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); + map(0xe000, 0xe1ff).rw(FUNC(astrocde_state::protected_ram_r), FUNC(astrocde_state::protected_ram_w)).share("protected_ram"); } void astrocde_state::bank4000_map(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(astrocde_state::profpac_videoram_r)); + map(0x0000, 0x3fff).r(FUNC(astrocde_state::profpac_videoram_r)); map(0x4000, 0x7fff).rom().region("banks", 0x08000); map(0x8000, 0xbfff).rom().region("banks", 0x10000); map(0xc000, 0xffff).rom().region("banks", 0x18000); @@ -517,42 +517,42 @@ void tenpindx_state::sub_map(address_map &map) void astrocde_state::port_map(address_map &map) { - map(0x0000, 0x000f).select(0xff00).rw(this, FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); + map(0x0000, 0x000f).select(0xff00).rw(FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); map(0x0010, 0x001f).select(0xff00).r("astrocade1", FUNC(astrocade_io_device::read)); map(0x0010, 0x0018).select(0xff00).w("astrocade1", FUNC(astrocade_io_device::write)); - map(0x0019, 0x0019).mirror(0xff00).w(this, FUNC(astrocde_state::expand_register_w)); + map(0x0019, 0x0019).mirror(0xff00).w(FUNC(astrocde_state::expand_register_w)); } void seawolf2_state::port_map_discrete(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0f).rw(this, FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); + map(0x00, 0x0f).rw(FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); map(0x10, 0x10).portr("P1HANDLE"); map(0x11, 0x11).portr("P2HANDLE"); map(0x12, 0x12).portr("P3HANDLE"); map(0x13, 0x13).portr("P4HANDLE"); - map(0x19, 0x19).w(this, FUNC(astrocde_state::expand_register_w)); - map(0x40, 0x40).mirror(0x18).w(this, FUNC(seawolf2_state::sound_1_w)); - map(0x41, 0x41).mirror(0x18).w(this, FUNC(seawolf2_state::sound_2_w)); - map(0x42, 0x42).mirror(0x18).w("lamplatch2", FUNC(output_latch_device::write)); - map(0x43, 0x43).mirror(0x18).w("lamplatch1", FUNC(output_latch_device::write)); + map(0x19, 0x19).w(FUNC(astrocde_state::expand_register_w)); + map(0x40, 0x40).mirror(0x18).w(FUNC(seawolf2_state::sound_1_w)); + map(0x41, 0x41).mirror(0x18).w(FUNC(seawolf2_state::sound_2_w)); + map(0x42, 0x42).mirror(0x18).w("lamplatch2", FUNC(output_latch_device::bus_w)); + map(0x43, 0x43).mirror(0x18).w("lamplatch1", FUNC(output_latch_device::bus_w)); } void ebases_state::port_map_ebases(address_map &map) { port_map(map); - map(0x0020, 0x0020).mirror(0xff07).w(this, FUNC(ebases_state::coin_w)); - map(0x0028, 0x0028).mirror(0xff07).w(this, FUNC(ebases_state::trackball_select_w)); + map(0x0020, 0x0020).mirror(0xff07).w(FUNC(ebases_state::coin_w)); + map(0x0028, 0x0028).mirror(0xff07).w(FUNC(ebases_state::trackball_select_w)); } void astrocde_state::port_map_mono_pattern(address_map &map) { port_map(map); - map(0x0078, 0x007e).mirror(0xff00).w(this, FUNC(astrocde_state::astrocade_pattern_board_w)); - map(0xa55b, 0xa55b).w(this, FUNC(astrocde_state::protected_ram_enable_w)); + map(0x0078, 0x007e).mirror(0xff00).w(FUNC(astrocde_state::astrocade_pattern_board_w)); + map(0xa55b, 0xa55b).w(FUNC(astrocde_state::protected_ram_enable_w)); } @@ -566,23 +566,23 @@ void astrocde_state::port_map_stereo_pattern(address_map &map) void astrocde_state::port_map_16col_pattern(address_map &map) { port_map_stereo_pattern(map); - map(0x00bf, 0x00bf).mirror(0xff00).w(this, FUNC(astrocde_state::profpac_page_select_w)); - map(0x00c3, 0x00c3).mirror(0xff00).r(this, FUNC(astrocde_state::profpac_intercept_r)); - map(0x00c0, 0x00c5).mirror(0xff00).w(this, FUNC(astrocde_state::profpac_screenram_ctrl_w)); - map(0x00f3, 0x00f3).mirror(0xff00).w(this, FUNC(astrocde_state::profpac_banksw_w)); + map(0x00bf, 0x00bf).mirror(0xff00).w(FUNC(astrocde_state::profpac_page_select_w)); + map(0x00c3, 0x00c3).mirror(0xff00).r(FUNC(astrocde_state::profpac_intercept_r)); + map(0x00c0, 0x00c5).mirror(0xff00).w(FUNC(astrocde_state::profpac_screenram_ctrl_w)); + map(0x00f3, 0x00f3).mirror(0xff00).w(FUNC(astrocde_state::profpac_banksw_w)); } void astrocde_state::port_map_16col_pattern_nosound(address_map &map) { - map(0x0000, 0x000f).select(0xff00).rw(this, FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); - map(0x0019, 0x0019).mirror(0xff00).w(this, FUNC(astrocde_state::expand_register_w)); - map(0x0078, 0x007e).mirror(0xff00).w(this, FUNC(astrocde_state::astrocade_pattern_board_w)); - map(0x00bf, 0x00bf).mirror(0xff00).w(this, FUNC(astrocde_state::profpac_page_select_w)); - map(0x00c3, 0x00c3).mirror(0xff00).r(this, FUNC(astrocde_state::profpac_intercept_r)); - map(0x00c0, 0x00c5).mirror(0xff00).w(this, FUNC(astrocde_state::profpac_screenram_ctrl_w)); - map(0x00f3, 0x00f3).mirror(0xff00).w(this, FUNC(astrocde_state::demndrgn_banksw_w)); - map(0xa55b, 0xa55b).w(this, FUNC(astrocde_state::protected_ram_enable_w)); + map(0x0000, 0x000f).select(0xff00).rw(FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); + map(0x0019, 0x0019).mirror(0xff00).w(FUNC(astrocde_state::expand_register_w)); + map(0x0078, 0x007e).mirror(0xff00).w(FUNC(astrocde_state::astrocade_pattern_board_w)); + map(0x00bf, 0x00bf).mirror(0xff00).w(FUNC(astrocde_state::profpac_page_select_w)); + map(0x00c3, 0x00c3).mirror(0xff00).r(FUNC(astrocde_state::profpac_intercept_r)); + map(0x00c0, 0x00c5).mirror(0xff00).w(FUNC(astrocde_state::profpac_screenram_ctrl_w)); + map(0x00f3, 0x00f3).mirror(0xff00).w(FUNC(astrocde_state::demndrgn_banksw_w)); + map(0xa55b, 0xa55b).w(FUNC(astrocde_state::protected_ram_enable_w)); } @@ -590,7 +590,7 @@ void demndrgn_state::port_map_16col_pattern_demndrgn(address_map &map) { port_map_16col_pattern_nosound(map); map(0x0010, 0x001f).select(0xff00).r("astrocade1", FUNC(astrocade_io_device::read)); - map(0x0097, 0x0097).mirror(0xff00).w(this, FUNC(demndrgn_state::sound_w)); + map(0x0097, 0x0097).mirror(0xff00).w(FUNC(demndrgn_state::sound_w)); } @@ -602,9 +602,9 @@ void tenpindx_state::port_map_16col_pattern_tenpindx(address_map &map) map(0x0062, 0x0062).mirror(0xff00).portr("P62"); map(0x0063, 0x0063).mirror(0xff00).portr("P63"); map(0x0064, 0x0064).mirror(0xff00).portr("P64"); - map(0x0065, 0x0066).mirror(0xff00).w(this, FUNC(tenpindx_state::lamp_w)); - map(0x0067, 0x0067).mirror(0xff00).w(this, FUNC(tenpindx_state::counter_w)); - map(0x0068, 0x0068).mirror(0xff00).w(this, FUNC(tenpindx_state::lights_w)); + map(0x0065, 0x0066).mirror(0xff00).w(FUNC(tenpindx_state::lamp_w)); + map(0x0067, 0x0067).mirror(0xff00).w(FUNC(tenpindx_state::counter_w)); + map(0x0068, 0x0068).mirror(0xff00).w(FUNC(tenpindx_state::lights_w)); map(0x0097, 0x0097).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -1332,7 +1332,7 @@ MACHINE_CONFIG_START(astrocde_state::spacezap) MCFG_DEVICE_MODIFY("astrocade1") MCFG_ASTROCADE_IO_SO0_STROBE_CB(WRITE8("watchdog", watchdog_timer_device, reset_w)) - MCFG_ASTROCADE_IO_SO3_STROBE_CB(WRITE8("outlatch", output_latch_device, write)) + MCFG_ASTROCADE_IO_SO3_STROBE_CB(WRITE8("outlatch", output_latch_device, bus_w)) MCFG_DEVICE_ADD("outlatch", OUTPUT_LATCH, 0) // MC14174B on game board at U16 MCFG_OUTPUT_LATCH_BIT0_HANDLER(WRITELINE(*this, astrocde_state, coin_counter_w<0>)) @@ -1483,8 +1483,8 @@ MACHINE_CONFIG_START(astrocde_state::profpac) MCFG_OUTPUT_LATCH_BIT6_HANDLER(OUTPUT("lamp5")) // right lamp C MCFG_DEVICE_MODIFY("astrocade1") - MCFG_ASTROCADE_IO_SO4_STROBE_CB(WRITE8("outlatch", output_latch_device, write)) - MCFG_ASTROCADE_IO_SO5_STROBE_CB(WRITE8("lamplatch", output_latch_device, write)) + MCFG_ASTROCADE_IO_SO4_STROBE_CB(WRITE8("outlatch", output_latch_device, bus_w)) + MCFG_ASTROCADE_IO_SO5_STROBE_CB(WRITE8("lamplatch", output_latch_device, bus_w)) MACHINE_CONFIG_END @@ -1505,7 +1505,7 @@ MACHINE_CONFIG_START(demndrgn_state::demndrgn) MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(*this, demndrgn_state, input_select_w)) MCFG_DEVICE_MODIFY("astrocade1") - MCFG_ASTROCADE_IO_SO4_STROBE_CB(WRITE8("outlatch", output_latch_device, write)) + MCFG_ASTROCADE_IO_SO4_STROBE_CB(WRITE8("outlatch", output_latch_device, bus_w)) MCFG_ASTROCADE_IO_POT0("FIREX") MCFG_ASTROCADE_IO_POT1("FIREY") MACHINE_CONFIG_END diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 2b106afcd4c..6d5e0c52024 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -543,17 +543,17 @@ void astrof_state::astrof_map(address_map &map) { map(0x0000, 0x03ff).mirror(0x1c00).ram(); map(0x2000, 0x3fff).noprw(); - map(0x4000, 0x5fff).ram().w(this, FUNC(astrof_state::astrof_videoram_w)).share("videoram"); + map(0x4000, 0x5fff).ram().w(FUNC(astrof_state::astrof_videoram_w)).share("videoram"); map(0x6000, 0x7fff).noprw(); map(0x8000, 0x8002).mirror(0x1ff8).noprw(); map(0x8003, 0x8003).mirror(0x1ff8).nopr().writeonly().share("astrof_color"); - map(0x8004, 0x8004).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::video_control_1_w)); - map(0x8005, 0x8005).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::astrof_video_control_2_w)); - map(0x8006, 0x8006).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::astrof_audio_1_w)); - map(0x8007, 0x8007).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::astrof_audio_2_w)); + map(0x8004, 0x8004).mirror(0x1ff8).nopr().w(FUNC(astrof_state::video_control_1_w)); + map(0x8005, 0x8005).mirror(0x1ff8).nopr().w(FUNC(astrof_state::astrof_video_control_2_w)); + map(0x8006, 0x8006).mirror(0x1ff8).nopr().w(FUNC(astrof_state::astrof_audio_1_w)); + map(0x8007, 0x8007).mirror(0x1ff8).nopr().w(FUNC(astrof_state::astrof_audio_2_w)); map(0xa000, 0xa000).mirror(0x1ff8).portr("IN").nopw(); map(0xa001, 0xa001).mirror(0x1ff8).portr("DSW").nopw(); - map(0xa002, 0xa002).mirror(0x1ff8).r(this, FUNC(astrof_state::irq_clear_r)).nopw(); + map(0xa002, 0xa002).mirror(0x1ff8).r(FUNC(astrof_state::irq_clear_r)).nopw(); map(0xa003, 0xa007).mirror(0x1ff8).noprw(); map(0xc000, 0xffff).rom(); } @@ -563,17 +563,17 @@ void astrof_state::spfghmk2_map(address_map &map) { map(0x0000, 0x03ff).mirror(0x1c00).ram(); map(0x2000, 0x3fff).noprw(); - map(0x4000, 0x5fff).ram().w(this, FUNC(astrof_state::astrof_videoram_w)).share("videoram"); + map(0x4000, 0x5fff).ram().w(FUNC(astrof_state::astrof_videoram_w)).share("videoram"); map(0x6000, 0x7fff).noprw(); map(0x8000, 0x8002).mirror(0x1ff8).noprw(); map(0x8003, 0x8003).mirror(0x1ff8).nopr().writeonly().share("astrof_color"); - map(0x8004, 0x8004).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::video_control_1_w)); - map(0x8005, 0x8005).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::spfghmk2_video_control_2_w)); - map(0x8006, 0x8006).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::spfghmk2_audio_w)); + map(0x8004, 0x8004).mirror(0x1ff8).nopr().w(FUNC(astrof_state::video_control_1_w)); + map(0x8005, 0x8005).mirror(0x1ff8).nopr().w(FUNC(astrof_state::spfghmk2_video_control_2_w)); + map(0x8006, 0x8006).mirror(0x1ff8).nopr().w(FUNC(astrof_state::spfghmk2_audio_w)); map(0x8007, 0x8007).mirror(0x1ff8).noprw(); map(0xa000, 0xa000).mirror(0x1ff8).portr("IN").nopw(); map(0xa001, 0xa001).mirror(0x1ff8).portr("DSW").nopw(); - map(0xa002, 0xa002).mirror(0x1ff8).r(this, FUNC(astrof_state::irq_clear_r)).nopw(); + map(0xa002, 0xa002).mirror(0x1ff8).r(FUNC(astrof_state::irq_clear_r)).nopw(); map(0xa003, 0xa007).mirror(0x1ff8).noprw(); map(0xc000, 0xffff).rom(); } @@ -583,18 +583,18 @@ void astrof_state::tomahawk_map(address_map &map) { map(0x0000, 0x03ff).mirror(0x1c00).ram(); map(0x2000, 0x3fff).noprw(); - map(0x4000, 0x5fff).ram().w(this, FUNC(astrof_state::tomahawk_videoram_w)).share("videoram"); + map(0x4000, 0x5fff).ram().w(FUNC(astrof_state::tomahawk_videoram_w)).share("videoram"); map(0x6000, 0x7fff).noprw(); map(0x8000, 0x8002).mirror(0x1ff8).noprw(); map(0x8003, 0x8003).mirror(0x1ff8).nopr().writeonly().share("astrof_color"); - map(0x8004, 0x8004).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::video_control_1_w)); - map(0x8005, 0x8005).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::tomahawk_video_control_2_w)); - map(0x8006, 0x8006).mirror(0x1ff8).nopr().w(this, FUNC(astrof_state::tomahawk_audio_w)); + map(0x8004, 0x8004).mirror(0x1ff8).nopr().w(FUNC(astrof_state::video_control_1_w)); + map(0x8005, 0x8005).mirror(0x1ff8).nopr().w(FUNC(astrof_state::tomahawk_video_control_2_w)); + map(0x8006, 0x8006).mirror(0x1ff8).nopr().w(FUNC(astrof_state::tomahawk_audio_w)); map(0x8007, 0x8007).mirror(0x1ff8).nopr().writeonly().share("tomahawk_prot"); map(0xa000, 0xa000).mirror(0x1ff8).portr("IN").nopw(); map(0xa001, 0xa001).mirror(0x1ff8).portr("DSW").nopw(); - map(0xa002, 0xa002).mirror(0x1ff8).r(this, FUNC(astrof_state::irq_clear_r)).nopw(); - map(0xa003, 0xa003).mirror(0x1ff8).r(this, FUNC(astrof_state::tomahawk_protection_r)).nopw(); + map(0xa002, 0xa002).mirror(0x1ff8).r(FUNC(astrof_state::irq_clear_r)).nopw(); + map(0xa003, 0xa003).mirror(0x1ff8).r(FUNC(astrof_state::tomahawk_protection_r)).nopw(); map(0xa004, 0xa007).mirror(0x1ff8).noprw(); map(0xc000, 0xffff).rom(); } diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp index 387b376e4f8..5710f8b964b 100644 --- a/src/mame/drivers/astrohome.cpp +++ b/src/mame/drivers/astrohome.cpp @@ -61,7 +61,7 @@ private: void astrocde_mess_state::astrocade_mem(address_map &map) { - map(0x0000, 0x0fff).rom().w(this, FUNC(astrocde_mess_state::astrocade_funcgen_w)); + map(0x0000, 0x0fff).rom().w(FUNC(astrocde_mess_state::astrocade_funcgen_w)); map(0x1000, 0x3fff).rom(); /* Star Fortress writes in here?? */ map(0x4000, 0x4fff).ram().share("videoram"); /* ASG */ //AM_RANGE(0x5000, 0xffff) AM_DEVREADWRITE("exp", astrocade_exp_device, read, write) @@ -70,10 +70,10 @@ void astrocde_mess_state::astrocade_mem(address_map &map) void astrocde_mess_state::astrocade_io(address_map &map) { - map(0x00, 0x0f).select(0xff00).rw(this, FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); + map(0x00, 0x0f).select(0xff00).rw(FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); map(0x10, 0x1f).select(0xff00).r("astrocade1", FUNC(astrocade_io_device::read)); map(0x10, 0x18).select(0xff00).w("astrocade1", FUNC(astrocade_io_device::write)); - map(0x19, 0x19).mirror(0xff00).w(this, FUNC(astrocde_state::expand_register_w)); + map(0x19, 0x19).mirror(0xff00).w(FUNC(astrocde_state::expand_register_w)); } /************************************* diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp index db852195ab3..1da7f2756e5 100644 --- a/src/mame/drivers/asuka.cpp +++ b/src/mame/drivers/asuka.cpp @@ -275,7 +275,7 @@ WRITE_LINE_MEMBER(asuka_state::asuka_msm5205_vck) if (m_adpcm_ff) { - m_adpcm_select->ba_w(m_sound_data[m_adpcm_pos]); + m_adpcm_select->write_ba(m_sound_data[m_adpcm_pos]); m_adpcm_pos = (m_adpcm_pos + 1) & 0xffff; } } @@ -328,7 +328,7 @@ void asuka_state::bonzeadv_map(address_map &map) map(0x10c000, 0x10ffff).ram(); map(0x200000, 0x200007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); map(0x390000, 0x390001).portr("DSWA"); - map(0x3a0000, 0x3a0001).w(this, FUNC(asuka_state::asuka_spritectrl_w)); + map(0x3a0000, 0x3a0001).w(FUNC(asuka_state::asuka_spritectrl_w)); map(0x3b0000, 0x3b0001).portr("DSWB"); map(0x3c0000, 0x3c0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x3d0000, 0x3d0001).nopr(); @@ -347,7 +347,7 @@ void asuka_state::asuka_map(address_map &map) map(0x100000, 0x103fff).ram(); map(0x1076f0, 0x1076f1).nopr(); /* Mofflott init does dummy reads here */ map(0x200000, 0x20000f).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); - map(0x3a0000, 0x3a0003).w(this, FUNC(asuka_state::asuka_spritectrl_w)); + map(0x3a0000, 0x3a0003).w(FUNC(asuka_state::asuka_spritectrl_w)); map(0x3e0000, 0x3e0001).nopr(); map(0x3e0001, 0x3e0001).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0x3e0003, 0x3e0003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); @@ -361,12 +361,12 @@ void asuka_state::asuka_map(address_map &map) void asuka_state::cadash_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x080003).w(this, FUNC(asuka_state::asuka_spritectrl_w)); + map(0x080000, 0x080003).w(FUNC(asuka_state::asuka_spritectrl_w)); map(0x0c0000, 0x0c0001).nopr(); map(0x0c0001, 0x0c0001).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0x0c0003, 0x0c0003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); map(0x100000, 0x107fff).ram(); - map(0x800000, 0x800fff).rw(this, FUNC(asuka_state::cadash_share_r), FUNC(asuka_state::cadash_share_w)); /* network ram */ + map(0x800000, 0x800fff).rw(FUNC(asuka_state::cadash_share_r), FUNC(asuka_state::cadash_share_w)); /* network ram */ map(0x900000, 0x90000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); map(0xa00000, 0xa0000f).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_4bpg_word_w)); map(0xb00000, 0xb03fff).rw(m_pc090oj, FUNC(pc090oj_device::word_r), FUNC(pc090oj_device::word_w)); /* sprite ram */ @@ -381,7 +381,7 @@ void asuka_state::eto_map(address_map &map) map(0x200000, 0x203fff).ram(); map(0x300000, 0x30000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); map(0x400000, 0x40000f).r(m_tc0220ioc, FUNC(tc0220ioc_device::read)).umask16(0x00ff); /* service mode mirror */ - map(0x4a0000, 0x4a0003).w(this, FUNC(asuka_state::asuka_spritectrl_w)); + map(0x4a0000, 0x4a0003).w(FUNC(asuka_state::asuka_spritectrl_w)); map(0x4e0000, 0x4e0001).nopr(); map(0x4e0001, 0x4e0001).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0x4e0003, 0x4e0003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); @@ -406,7 +406,7 @@ void asuka_state::bonzeadv_z80_map(address_map &map) map(0xe600, 0xe600).nopw(); map(0xee00, 0xee00).nopw(); map(0xf000, 0xf000).nopw(); - map(0xf200, 0xf200).w(this, FUNC(asuka_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(asuka_state::sound_bankswitch_w)); } void asuka_state::z80_map(address_map &map) @@ -418,9 +418,9 @@ void asuka_state::z80_map(address_map &map) // map(0x9002, 0x9100).nopr(); map(0xa000, 0xa000).w("ciu", FUNC(pc060ha_device::slave_port_w)); map(0xa001, 0xa001).rw("ciu", FUNC(pc060ha_device::slave_comm_r), FUNC(pc060ha_device::slave_comm_w)); - map(0xb000, 0xb000).w(this, FUNC(asuka_state::asuka_msm5205_address_w)); - map(0xc000, 0xc000).w(this, FUNC(asuka_state::asuka_msm5205_start_w)); - map(0xd000, 0xd000).w(this, FUNC(asuka_state::asuka_msm5205_stop_w)); + map(0xb000, 0xb000).w(FUNC(asuka_state::asuka_msm5205_address_w)); + map(0xc000, 0xc000).w(FUNC(asuka_state::asuka_msm5205_start_w)); + map(0xd000, 0xd000).w(FUNC(asuka_state::asuka_msm5205_stop_w)); } /* no MSM5205 */ diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index e2219682cf8..553bc7ba689 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -276,8 +276,8 @@ void at_state::ps1_16_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(at_mb_device::map)); - map(0x0061, 0x0061).r(this, FUNC(at_state::ps1_portb_r)); - map(0x0102, 0x0105).rw(this, FUNC(at_state::ps1_unk_r), FUNC(at_state::ps1_unk_w)); + map(0x0061, 0x0061).r(FUNC(at_state::ps1_portb_r)); + map(0x0102, 0x0105).rw(FUNC(at_state::ps1_unk_r), FUNC(at_state::ps1_unk_w)); } void at_state::neat_io(address_map &map) @@ -298,10 +298,10 @@ void at_state::ficpio_io(address_map &map) map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(at_mb_device::map)); map(0x00a8, 0x00af).rw("chipset", FUNC(vt82c496_device::read), FUNC(vt82c496_device::write)); - map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); + map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_device::read), FUNC(pci_bus_device::write)); } diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp index f0cf3fedf95..8214947dade 100644 --- a/src/mame/drivers/atari400.cpp +++ b/src/mame/drivers/atari400.cpp @@ -575,7 +575,7 @@ void a400_state::a400_mem(address_map &map) void a400_state::a600xl_mem(address_map &map) { map(0x0000, 0x3fff).ram(); - map(0x5000, 0x57ff).r(this, FUNC(a400_state::a600xl_low_r)); // self test or NOP + map(0x5000, 0x57ff).r(FUNC(a400_state::a600xl_low_r)); // self test or NOP map(0xa000, 0xbfff).rom(); // BASIC map(0xc000, 0xcfff).rom(); // OS map(0xd000, 0xd0ff).rw(m_gtia, FUNC(gtia_device::read), FUNC(gtia_device::write)); @@ -590,53 +590,53 @@ void a400_state::a600xl_mem(address_map &map) void a400_state::a1200xl_mem(address_map &map) { - map(0x0000, 0xcfff).rw(this, FUNC(a400_state::a1200xl_low_r), FUNC(a400_state::xegs_low_w)); + map(0x0000, 0xcfff).rw(FUNC(a400_state::a1200xl_low_r), FUNC(a400_state::xegs_low_w)); map(0xd000, 0xd0ff).rw(m_gtia, FUNC(gtia_device::read), FUNC(gtia_device::write)); map(0xd100, 0xd1ff).noprw(); map(0xd200, 0xd2ff).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0xd300, 0xd3ff).rw(m_pia, FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xd400, 0xd4ff).rw(m_antic, FUNC(antic_device::read), FUNC(antic_device::write)); map(0xd500, 0xd7ff).noprw(); - map(0xd800, 0xffff).rw(this, FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); + map(0xd800, 0xffff).rw(FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); } void a400_state::a800xl_mem(address_map &map) { - map(0x0000, 0xcfff).rw(this, FUNC(a400_state::a800xl_low_r), FUNC(a400_state::a800xl_low_w)); + map(0x0000, 0xcfff).rw(FUNC(a400_state::a800xl_low_r), FUNC(a400_state::a800xl_low_w)); map(0xd000, 0xd0ff).rw(m_gtia, FUNC(gtia_device::read), FUNC(gtia_device::write)); map(0xd100, 0xd1ff).noprw(); map(0xd200, 0xd2ff).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0xd300, 0xd3ff).rw(m_pia, FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xd400, 0xd4ff).rw(m_antic, FUNC(antic_device::read), FUNC(antic_device::write)); map(0xd500, 0xd7ff).noprw(); - map(0xd800, 0xffff).rw(this, FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); + map(0xd800, 0xffff).rw(FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); } void a400_state::a130xe_mem(address_map &map) { - map(0x0000, 0xcfff).rw(this, FUNC(a400_state::a130xe_low_r), FUNC(a400_state::a800xl_low_w)); + map(0x0000, 0xcfff).rw(FUNC(a400_state::a130xe_low_r), FUNC(a400_state::a800xl_low_w)); map(0xd000, 0xd0ff).rw(m_gtia, FUNC(gtia_device::read), FUNC(gtia_device::write)); map(0xd100, 0xd1ff).noprw(); map(0xd200, 0xd2ff).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0xd300, 0xd3ff).rw(m_pia, FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xd400, 0xd4ff).rw(m_antic, FUNC(antic_device::read), FUNC(antic_device::write)); map(0xd500, 0xd7ff).noprw(); - map(0xd800, 0xffff).rw(this, FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); + map(0xd800, 0xffff).rw(FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); } void a400_state::xegs_mem(address_map &map) { - map(0x0000, 0xcfff).rw(this, FUNC(a400_state::xegs_low_r), FUNC(a400_state::xegs_low_w)); + map(0x0000, 0xcfff).rw(FUNC(a400_state::xegs_low_r), FUNC(a400_state::xegs_low_w)); map(0xd000, 0xd0ff).rw(m_gtia, FUNC(gtia_device::read), FUNC(gtia_device::write)); map(0xd100, 0xd1ff).noprw(); map(0xd200, 0xd2ff).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0xd300, 0xd3ff).rw(m_pia, FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xd400, 0xd4ff).rw(m_antic, FUNC(antic_device::read), FUNC(antic_device::write)); map(0xd500, 0xd7ff).noprw(); - map(0xd800, 0xffff).rw(this, FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); + map(0xd800, 0xffff).rw(FUNC(a400_state::a800xl_high_r), FUNC(a400_state::a800xl_high_w)); } @@ -2012,8 +2012,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( a400_state::a5200_interrupt ) MACHINE_RESET_MEMBER( a400_state, a400 ) { - pokey_device *pokey = machine().device("pokey"); - pokey->write(15,0); + subdevice("pokey")->write(machine().dummy_space(), 15, 0); } diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp index 7b4e6849dbc..cf75c68f65a 100644 --- a/src/mame/drivers/atari_s1.cpp +++ b/src/mame/drivers/atari_s1.cpp @@ -122,15 +122,15 @@ void atari_s1_state::atari_s1_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x00ff).ram().share("ram"); - map(0x1080, 0x1083).rw(this, FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w)); - map(0x1084, 0x1087).rw(this, FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w)); - map(0x1088, 0x108b).rw(this, FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w)); - map(0x108c, 0x108f).rw(this, FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w)); - map(0x2000, 0x204f).mirror(0x0F80).r(this, FUNC(atari_s1_state::switch_r)).nopw(); // aavenger ROL 200B causes a spurious write - map(0x3000, 0x3fff).w(this, FUNC(atari_s1_state::audioen_w)); // audio enable + map(0x1080, 0x1083).rw(FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w)); + map(0x1084, 0x1087).rw(FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w)); + map(0x1088, 0x108b).rw(FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w)); + map(0x108c, 0x108f).rw(FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w)); + map(0x2000, 0x204f).mirror(0x0F80).r(FUNC(atari_s1_state::switch_r)).nopw(); // aavenger ROL 200B causes a spurious write + map(0x3000, 0x3fff).w(FUNC(atari_s1_state::audioen_w)); // audio enable map(0x4000, 0x4fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x5080, 0x508f).w(this, FUNC(atari_s1_state::meter_w)); // time2000 only - map(0x6000, 0x6fff).w(this, FUNC(atari_s1_state::audiores_w)); // audio reset + map(0x5080, 0x508f).w(FUNC(atari_s1_state::meter_w)); // time2000 only + map(0x6000, 0x6fff).w(FUNC(atari_s1_state::audiores_w)); // audio reset map(0x7000, 0x7fff).rom(); } @@ -138,14 +138,14 @@ void atari_s1_state::atarians_map(address_map &map) { // more ram map.global_mask(0x7fff); map(0x0000, 0x01ff).ram().share("ram"); - map(0x1080, 0x1083).rw(this, FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w)); - map(0x1084, 0x1087).rw(this, FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w)); - map(0x1088, 0x108b).rw(this, FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w)); - map(0x108c, 0x108f).rw(this, FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w)); - map(0x2000, 0x204f).mirror(0x0F80).r(this, FUNC(atari_s1_state::switch_r)); - map(0x3000, 0x3fff).w(this, FUNC(atari_s1_state::audioen_w)); // audio enable + map(0x1080, 0x1083).rw(FUNC(atari_s1_state::m1080_r), FUNC(atari_s1_state::m1080_w)); + map(0x1084, 0x1087).rw(FUNC(atari_s1_state::m1084_r), FUNC(atari_s1_state::m1084_w)); + map(0x1088, 0x108b).rw(FUNC(atari_s1_state::m1088_r), FUNC(atari_s1_state::m1088_w)); + map(0x108c, 0x108f).rw(FUNC(atari_s1_state::m108c_r), FUNC(atari_s1_state::m108c_w)); + map(0x2000, 0x204f).mirror(0x0F80).r(FUNC(atari_s1_state::switch_r)); + map(0x3000, 0x3fff).w(FUNC(atari_s1_state::audioen_w)); // audio enable map(0x4000, 0x4fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x6000, 0x6fff).w(this, FUNC(atari_s1_state::audiores_w)); // audio reset + map(0x6000, 0x6fff).w(FUNC(atari_s1_state::audiores_w)); // audio reset map(0x7000, 0x7fff).rom(); } @@ -153,11 +153,11 @@ void atari_s1_state::midearth_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x01ff).ram().share("ram"); - map(0x1000, 0x11ff).w(this, FUNC(atari_s1_state::midearth_w)); - map(0x2000, 0x204f).mirror(0x0F80).r(this, FUNC(atari_s1_state::switch_r)); - map(0x3000, 0x3fff).w(this, FUNC(atari_s1_state::audioen_w)); // audio enable + map(0x1000, 0x11ff).w(FUNC(atari_s1_state::midearth_w)); + map(0x2000, 0x204f).mirror(0x0F80).r(FUNC(atari_s1_state::switch_r)); + map(0x3000, 0x3fff).w(FUNC(atari_s1_state::audioen_w)); // audio enable map(0x4000, 0x4fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x6000, 0x6fff).w(this, FUNC(atari_s1_state::audiores_w)); // audio reset + map(0x6000, 0x6fff).w(FUNC(atari_s1_state::audiores_w)); // audio reset map(0x7000, 0x7fff).rom().nopw(); // writes to FFFF due to poor coding at 7FF5 } diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp index 8ea5f31af1f..1226c39504c 100644 --- a/src/mame/drivers/atari_s2.cpp +++ b/src/mame/drivers/atari_s2.cpp @@ -93,14 +93,14 @@ void atari_s2_state::atari_s2_map(address_map &map) map(0x1005, 0x1005).mirror(0x07F8).portr("SWITCH.5"); map(0x1006, 0x1006).mirror(0x07F8).portr("SWITCH.6"); map(0x1007, 0x1007).mirror(0x07F8).portr("SWITCH.7"); - map(0x1800, 0x1800).mirror(0x071F).w(this, FUNC(atari_s2_state::sound0_w)); - map(0x1820, 0x1820).mirror(0x071F).w(this, FUNC(atari_s2_state::sound1_w)); - map(0x1840, 0x1847).mirror(0x0718).w(this, FUNC(atari_s2_state::display_w)); - map(0x1860, 0x1867).mirror(0x0718).w(this, FUNC(atari_s2_state::lamp_w)); - map(0x1880, 0x1880).mirror(0x071F).w(this, FUNC(atari_s2_state::sol0_w)); - map(0x18a0, 0x18a7).mirror(0x0718).w(this, FUNC(atari_s2_state::sol1_w)); + map(0x1800, 0x1800).mirror(0x071F).w(FUNC(atari_s2_state::sound0_w)); + map(0x1820, 0x1820).mirror(0x071F).w(FUNC(atari_s2_state::sound1_w)); + map(0x1840, 0x1847).mirror(0x0718).w(FUNC(atari_s2_state::display_w)); + map(0x1860, 0x1867).mirror(0x0718).w(FUNC(atari_s2_state::lamp_w)); + map(0x1880, 0x1880).mirror(0x071F).w(FUNC(atari_s2_state::sol0_w)); + map(0x18a0, 0x18a7).mirror(0x0718).w(FUNC(atari_s2_state::sol1_w)); map(0x18c0, 0x18c0).mirror(0x071F).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x18e0, 0x18e0).mirror(0x071F).w(this, FUNC(atari_s2_state::intack_w)); + map(0x18e0, 0x18e0).mirror(0x071F).w(FUNC(atari_s2_state::intack_w)); map(0x2000, 0x2000).mirror(0x07FC).portr("DSW0"); map(0x2001, 0x2001).mirror(0x07FC).portr("DSW1"); map(0x2002, 0x2002).mirror(0x07FC).portr("DSW2"); @@ -121,14 +121,14 @@ void atari_s2_state::atari_s3_map(address_map &map) map(0x1005, 0x1005).mirror(0x07F8).portr("SWITCH.5"); map(0x1006, 0x1006).mirror(0x07F8).portr("SWITCH.6"); map(0x1007, 0x1007).mirror(0x07F8).portr("SWITCH.7"); - map(0x1800, 0x1800).mirror(0x071F).w(this, FUNC(atari_s2_state::sound0_w)); - map(0x1820, 0x1820).mirror(0x071F).w(this, FUNC(atari_s2_state::sound1_w)); - map(0x1840, 0x1847).mirror(0x0718).w(this, FUNC(atari_s2_state::display_w)); - map(0x1860, 0x1867).mirror(0x0718).w(this, FUNC(atari_s2_state::lamp_w)); - map(0x1880, 0x1880).mirror(0x071F).w(this, FUNC(atari_s2_state::sol0_w)); - map(0x18a0, 0x18a7).mirror(0x0718).w(this, FUNC(atari_s2_state::sol1_w)); + map(0x1800, 0x1800).mirror(0x071F).w(FUNC(atari_s2_state::sound0_w)); + map(0x1820, 0x1820).mirror(0x071F).w(FUNC(atari_s2_state::sound1_w)); + map(0x1840, 0x1847).mirror(0x0718).w(FUNC(atari_s2_state::display_w)); + map(0x1860, 0x1867).mirror(0x0718).w(FUNC(atari_s2_state::lamp_w)); + map(0x1880, 0x1880).mirror(0x071F).w(FUNC(atari_s2_state::sol0_w)); + map(0x18a0, 0x18a7).mirror(0x0718).w(FUNC(atari_s2_state::sol1_w)); map(0x18c0, 0x18c0).mirror(0x071F).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x18e0, 0x18e0).mirror(0x071F).w(this, FUNC(atari_s2_state::intack_w)); + map(0x18e0, 0x18e0).mirror(0x071F).w(FUNC(atari_s2_state::intack_w)); map(0x2000, 0x2000).mirror(0x07F4).portr("DSW0"); map(0x2001, 0x2001).mirror(0x07F4).portr("DSW1"); map(0x2002, 0x2002).mirror(0x07F4).portr("DSW2"); diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp index 367cdfedc3d..c96eda96ed4 100644 --- a/src/mame/drivers/atarifb.cpp +++ b/src/mame/drivers/atarifb.cpp @@ -154,18 +154,18 @@ void atarifb_state::atarifb_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x01ff).ram(); - map(0x0200, 0x025f).ram().w(this, FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); + map(0x0200, 0x025f).ram().w(FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); map(0x0260, 0x039f).ram(); - map(0x03a0, 0x03ff).ram().w(this, FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); - map(0x1000, 0x13bf).ram().w(this, FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); + map(0x03a0, 0x03ff).ram().w(FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); + map(0x1000, 0x13bf).ram().w(FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); map(0x13c0, 0x13ff).ram().share("spriteram"); map(0x2000, 0x2000).writeonly().share("scroll_register"); /* OUT 0 */ - map(0x2001, 0x2001).w(this, FUNC(atarifb_state::atarifb_out1_w)); /* OUT 1 */ - map(0x2002, 0x2002).w(this, FUNC(atarifb_state::atarifb_out2_w)); /* OUT 2 */ - map(0x2003, 0x2003).w(this, FUNC(atarifb_state::atarifb_out3_w)); /* OUT 3 */ + map(0x2001, 0x2001).w(FUNC(atarifb_state::atarifb_out1_w)); /* OUT 1 */ + map(0x2002, 0x2002).w(FUNC(atarifb_state::atarifb_out2_w)); /* OUT 2 */ + map(0x2003, 0x2003).w(FUNC(atarifb_state::atarifb_out3_w)); /* OUT 3 */ map(0x3000, 0x3000).noprw(); /* Interrupt Acknowledge */ - map(0x4000, 0x4000).r(this, FUNC(atarifb_state::atarifb_in0_r)); - map(0x4002, 0x4002).r(this, FUNC(atarifb_state::atarifb_in2_r)); + map(0x4000, 0x4000).r(FUNC(atarifb_state::atarifb_in0_r)); + map(0x4002, 0x4002).r(FUNC(atarifb_state::atarifb_in2_r)); map(0x5000, 0x5000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x6000, 0x7fff).rom(); } @@ -175,19 +175,19 @@ void atarifb_state::atarifb4_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x01ff).ram(); - map(0x0200, 0x025f).ram().w(this, FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); + map(0x0200, 0x025f).ram().w(FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); map(0x0260, 0x039f).ram(); - map(0x03a0, 0x03ff).ram().w(this, FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); - map(0x1000, 0x13bf).ram().w(this, FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); + map(0x03a0, 0x03ff).ram().w(FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); + map(0x1000, 0x13bf).ram().w(FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); map(0x13c0, 0x13ff).ram().share("spriteram"); map(0x2000, 0x2000).writeonly().share("scroll_register"); /* OUT 0 */ - map(0x2001, 0x2001).w(this, FUNC(atarifb_state::atarifb4_out1_w)); /* OUT 1 */ - map(0x2002, 0x2002).w(this, FUNC(atarifb_state::atarifb_out2_w)); /* OUT 2 */ - map(0x2003, 0x2003).w(this, FUNC(atarifb_state::atarifb_out3_w)); /* OUT 3 */ + map(0x2001, 0x2001).w(FUNC(atarifb_state::atarifb4_out1_w)); /* OUT 1 */ + map(0x2002, 0x2002).w(FUNC(atarifb_state::atarifb_out2_w)); /* OUT 2 */ + map(0x2003, 0x2003).w(FUNC(atarifb_state::atarifb_out3_w)); /* OUT 3 */ map(0x3000, 0x3000).noprw(); /* Interrupt Acknowledge */ - map(0x4000, 0x4000).r(this, FUNC(atarifb_state::atarifb4_in0_r)); + map(0x4000, 0x4000).r(FUNC(atarifb_state::atarifb4_in0_r)); map(0x4001, 0x4001).portr("EXTRA"); - map(0x4002, 0x4002).r(this, FUNC(atarifb_state::atarifb4_in2_r)); + map(0x4002, 0x4002).r(FUNC(atarifb_state::atarifb4_in2_r)); map(0x5000, 0x5000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x6000, 0x7fff).rom(); } @@ -197,18 +197,18 @@ void atarifb_state::abaseb_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x01ff).ram(); - map(0x0200, 0x025f).ram().w(this, FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); + map(0x0200, 0x025f).ram().w(FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); map(0x0260, 0x039f).ram(); - map(0x03a0, 0x03ff).ram().w(this, FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); - map(0x1000, 0x13bf).ram().w(this, FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); + map(0x03a0, 0x03ff).ram().w(FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); + map(0x1000, 0x13bf).ram().w(FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); map(0x13c0, 0x13ff).ram().share("spriteram"); map(0x2000, 0x2000).writeonly().share("scroll_register"); /* OUT 0 */ - map(0x2001, 0x2001).w(this, FUNC(atarifb_state::abaseb_out1_w)); /* OUT 1 */ - map(0x2002, 0x2002).w(this, FUNC(atarifb_state::atarifb_out2_w)); /* OUT 2 */ - map(0x2003, 0x2003).w(this, FUNC(atarifb_state::atarifb_out3_w)); /* OUT 3 */ + map(0x2001, 0x2001).w(FUNC(atarifb_state::abaseb_out1_w)); /* OUT 1 */ + map(0x2002, 0x2002).w(FUNC(atarifb_state::atarifb_out2_w)); /* OUT 2 */ + map(0x2003, 0x2003).w(FUNC(atarifb_state::atarifb_out3_w)); /* OUT 3 */ map(0x3000, 0x3000).noprw(); /* Interrupt Acknowledge */ - map(0x4000, 0x4000).r(this, FUNC(atarifb_state::atarifb_in0_r)); - map(0x4002, 0x4002).r(this, FUNC(atarifb_state::atarifb_in2_r)); + map(0x4000, 0x4000).r(FUNC(atarifb_state::atarifb_in0_r)); + map(0x4002, 0x4002).r(FUNC(atarifb_state::atarifb_in2_r)); map(0x5000, 0x5000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x6000, 0x7fff).rom(); } @@ -218,19 +218,19 @@ void atarifb_state::soccer_map(address_map &map) { map.global_mask(0x3fff); map(0x0000, 0x01ff).ram(); - map(0x0200, 0x025f).ram().w(this, FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); + map(0x0200, 0x025f).ram().w(FUNC(atarifb_state::atarifb_alpha1_videoram_w)).share("p1_videoram"); map(0x0260, 0x039f).ram(); - map(0x03a0, 0x03ff).ram().w(this, FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); - map(0x0800, 0x0bbf).ram().w(this, FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); + map(0x03a0, 0x03ff).ram().w(FUNC(atarifb_state::atarifb_alpha2_videoram_w)).share("p2_videoram"); + map(0x0800, 0x0bbf).ram().w(FUNC(atarifb_state::atarifb_field_videoram_w)).share("field_videoram"); map(0x0bc0, 0x0bff).ram().share("spriteram"); map(0x1000, 0x1000).writeonly().share("scroll_register"); /* OUT 0 */ - map(0x1001, 0x1001).w(this, FUNC(atarifb_state::soccer_out1_w)); /* OUT 1 */ - map(0x1002, 0x1002).w(this, FUNC(atarifb_state::soccer_out2_w)); /* OUT 2 */ + map(0x1001, 0x1001).w(FUNC(atarifb_state::soccer_out1_w)); /* OUT 1 */ + map(0x1002, 0x1002).w(FUNC(atarifb_state::soccer_out2_w)); /* OUT 2 */ map(0x1004, 0x1004).nopw(); /* Interrupt Acknowledge */ map(0x1005, 0x1005).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x1800, 0x1800).r(this, FUNC(atarifb_state::atarifb4_in0_r)); + map(0x1800, 0x1800).r(FUNC(atarifb_state::atarifb4_in0_r)); map(0x1801, 0x1801).portr("EXTRA"); - map(0x1802, 0x1802).r(this, FUNC(atarifb_state::atarifb4_in2_r)); + map(0x1802, 0x1802).r(FUNC(atarifb_state::atarifb4_in2_r)); map(0x1803, 0x1803).portr("DSW1"); map(0x2000, 0x3fff).rom(); } diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp index b0ee6e59eff..621bccb3b04 100644 --- a/src/mame/drivers/atarig1.cpp +++ b/src/mame/drivers/atarig1.cpp @@ -185,16 +185,16 @@ void atarig1_state::main_map(address_map &map) map(0xf90000, 0xf90000).w(m_jsa, FUNC(atari_jsa_ii_device::main_command_w)); map(0xf98000, 0xf98001).w(m_jsa, FUNC(atari_jsa_ii_device::sound_reset_w)); map(0xfa0001, 0xfa0001).w(m_rle, FUNC(atari_rle_objects_device::control_write)); - map(0xfb0000, 0xfb0001).w(this, FUNC(atarig1_state::video_int_ack_w)); + map(0xfb0000, 0xfb0001).w(FUNC(atarig1_state::video_int_ack_w)); map(0xfc0000, 0xfc0001).portr("IN0"); - map(0xfc8000, 0xfc8007).rw(this, FUNC(atarig1_state::a2d_data_r), FUNC(atarig1_state::a2d_select_w)); + map(0xfc8000, 0xfc8007).rw(FUNC(atarig1_state::a2d_data_r), FUNC(atarig1_state::a2d_select_w)); map(0xfd0000, 0xfd0000).r(m_jsa, FUNC(atari_jsa_ii_device::main_response_r)); map(0xfd8000, 0xfdffff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); /* AM_RANGE(0xfe0000, 0xfe7fff) AM_READ(from_r)*/ map(0xfe8000, 0xfe89ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xff0000, 0xffffff).ram(); map(0xff0000, 0xff0fff).ram().share("rle"); - map(0xff2000, 0xff2001).w(this, FUNC(atarig1_state::mo_command_w)).share("mo_command"); + map(0xff2000, 0xff2001).w(FUNC(atarig1_state::mo_command_w)).share("mo_command"); map(0xff4000, 0xff5fff).w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); map(0xff6000, 0xff6fff).w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); } diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp index 2e38b4f05eb..51a5faa8fde 100644 --- a/src/mame/drivers/atarig42.cpp +++ b/src/mame/drivers/atarig42.cpp @@ -322,12 +322,12 @@ void atarig42_state::main_map(address_map &map) map(0xe00002, 0xe00003).portr("IN1"); map(0xe00010, 0xe00011).portr("IN2"); map(0xe00012, 0xe00013).portr("jsa:JSAIII"); - map(0xe00020, 0xe0002f).rw(this, FUNC(atarig42_state::a2d_data_r), FUNC(atarig42_state::a2d_select_w)).umask16(0xff00); + map(0xe00020, 0xe0002f).rw(FUNC(atarig42_state::a2d_data_r), FUNC(atarig42_state::a2d_select_w)).umask16(0xff00); map(0xe00031, 0xe00031).r(m_jsa, FUNC(atari_jsa_iii_device::main_response_r)); map(0xe00041, 0xe00041).w(m_jsa, FUNC(atari_jsa_iii_device::main_command_w)); - map(0xe00050, 0xe00051).w(this, FUNC(atarig42_state::io_latch_w)); + map(0xe00050, 0xe00051).w(FUNC(atarig42_state::io_latch_w)); map(0xe00060, 0xe00061).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); - map(0xe03000, 0xe03001).w(this, FUNC(atarig42_state::video_int_ack_w)); + map(0xe03000, 0xe03001).w(FUNC(atarig42_state::video_int_ack_w)); map(0xe03800, 0xe03801).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0xe80000, 0xe80fff).ram(); map(0xf40000, 0xf40001).r(m_asic65, FUNC(asic65_device::io_r)); @@ -339,7 +339,7 @@ void atarig42_state::main_map(address_map &map) map(0xff0000, 0xff0fff).ram().share("rle"); map(0xff2000, 0xff5fff).w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); map(0xff6000, 0xff6fff).w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); - map(0xff7000, 0xff7001).w(this, FUNC(atarig42_state::mo_command_w)).share("mo_command"); + map(0xff7000, 0xff7001).w(FUNC(atarig42_state::mo_command_w)).share("mo_command"); } diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp index 4347b158579..5a57281b5c7 100644 --- a/src/mame/drivers/atarigt.cpp +++ b/src/mame/drivers/atarigt.cpp @@ -600,24 +600,24 @@ WRITE32_MEMBER(atarigt_state::colorram_protection_w) void atarigt_state::main_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0xc00000, 0xc00003).rw(this, FUNC(atarigt_state::sound_data_r), FUNC(atarigt_state::sound_data_w)); - map(0xd00010, 0xd0001f).r(this, FUNC(atarigt_state::analog_port_r)).umask32(0xff00ff00); + map(0xc00000, 0xc00003).rw(FUNC(atarigt_state::sound_data_r), FUNC(atarigt_state::sound_data_w)); + map(0xd00010, 0xd0001f).r(FUNC(atarigt_state::analog_port_r)).umask32(0xff00ff00); map(0xd20000, 0xd20fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask32(0xff00ff00); map(0xd40000, 0xd4ffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write32)); map(0xd70000, 0xd7ffff).ram(); map(0xd72000, 0xd75fff).w(m_playfield_tilemap, FUNC(tilemap_device::write32)).share("playfield"); map(0xd76000, 0xd76fff).w(m_alpha_tilemap, FUNC(tilemap_device::write32)).share("alpha"); map(0xd78000, 0xd78fff).ram().share("rle"); - map(0xd7a200, 0xd7a203).w(this, FUNC(atarigt_state::mo_command_w)).share("mo_command"); - map(0xd80000, 0xdfffff).rw(this, FUNC(atarigt_state::colorram_protection_r), FUNC(atarigt_state::colorram_protection_w)).share("colorram"); - map(0xe04000, 0xe04003).w(this, FUNC(atarigt_state::led_w)); - map(0xe08000, 0xe08003).w(this, FUNC(atarigt_state::latch_w)); - map(0xe0a000, 0xe0a003).w(this, FUNC(atarigt_state::scanline_int_ack_w)); - map(0xe0c000, 0xe0c003).w(this, FUNC(atarigt_state::video_int_ack_w)); + map(0xd7a200, 0xd7a203).w(FUNC(atarigt_state::mo_command_w)).share("mo_command"); + map(0xd80000, 0xdfffff).rw(FUNC(atarigt_state::colorram_protection_r), FUNC(atarigt_state::colorram_protection_w)).share("colorram"); + map(0xe04000, 0xe04003).w(FUNC(atarigt_state::led_w)); + map(0xe08000, 0xe08003).w(FUNC(atarigt_state::latch_w)); + map(0xe0a000, 0xe0a003).w(FUNC(atarigt_state::scanline_int_ack_w)); + map(0xe0c000, 0xe0c003).w(FUNC(atarigt_state::video_int_ack_w)); map(0xe0e000, 0xe0e003).nopw();//watchdog_reset_w }, map(0xe80000, 0xe80003).portr("P1_P2"); - map(0xe82000, 0xe82003).r(this, FUNC(atarigt_state::special_port2_r)); - map(0xe82004, 0xe82007).r(this, FUNC(atarigt_state::special_port3_r)); + map(0xe82000, 0xe82003).r(FUNC(atarigt_state::special_port2_r)); + map(0xe82004, 0xe82007).r(FUNC(atarigt_state::special_port3_r)); map(0xf80000, 0xffffff).ram(); } diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp index 347af745949..2f80fdb9cf7 100644 --- a/src/mame/drivers/atarigx2.cpp +++ b/src/mame/drivers/atarigx2.cpp @@ -1190,22 +1190,22 @@ void atarigx2_state::main_map(address_map &map) map.unmap_value_high(); map(0x000000, 0x07ffff).rom(); map(0xc80000, 0xc80fff).ram(); - map(0xd00000, 0xd0000f).r(this, FUNC(atarigx2_state::a2d_data_r)).umask32(0xff00ff00); + map(0xd00000, 0xd0000f).r(FUNC(atarigx2_state::a2d_data_r)).umask32(0xff00ff00); map(0xd20000, 0xd20fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask32(0xff00ff00); map(0xd40000, 0xd40fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0xd70000, 0xd7ffff).ram(); map(0xd72000, 0xd75fff).w(m_playfield_tilemap, FUNC(tilemap_device::write32)).share("playfield"); map(0xd76000, 0xd76fff).w(m_alpha_tilemap, FUNC(tilemap_device::write32)).share("alpha"); map(0xd78000, 0xd78fff).ram().share("rle"); - map(0xd7a200, 0xd7a203).w(this, FUNC(atarigx2_state::mo_command_w)).share("mo_command"); + map(0xd7a200, 0xd7a203).w(FUNC(atarigx2_state::mo_command_w)).share("mo_command"); map(0xd80000, 0xd9ffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write32)); map(0xe06000, 0xe06000).w(m_jsa, FUNC(atari_jsa_iiis_device::main_command_w)); - map(0xe08000, 0xe08003).w(this, FUNC(atarigx2_state::latch_w)); - map(0xe0c000, 0xe0c003).w(this, FUNC(atarigx2_state::video_int_ack_w)); + map(0xe08000, 0xe08003).w(FUNC(atarigx2_state::latch_w)); + map(0xe0c000, 0xe0c003).w(FUNC(atarigx2_state::video_int_ack_w)); map(0xe0e000, 0xe0e003).nopw();//watchdog_reset_w }, map(0xe80000, 0xe80003).portr("P1_P2"); - map(0xe82000, 0xe82003).r(this, FUNC(atarigx2_state::special_port2_r)); - map(0xe82004, 0xe82007).r(this, FUNC(atarigx2_state::special_port3_r)); + map(0xe82000, 0xe82003).r(FUNC(atarigx2_state::special_port2_r)); + map(0xe82004, 0xe82007).r(FUNC(atarigx2_state::special_port3_r)); map(0xe86000, 0xe86000).r(m_jsa, FUNC(atari_jsa_iiis_device::main_response_r)); map(0xff8000, 0xffffff).ram(); } diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index 7e3c2423cea..4e19e36dfbf 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -166,7 +166,7 @@ void st_state::fdc_dma_transfer() if (m_fdc_fifo_msb) { // write LSB to disk - m_fdc->data_w(data & 0xff); + m_fdc->write_data(data & 0xff); if (LOG) logerror("DMA Write to FDC %02x\n", data & 0xff); @@ -175,7 +175,7 @@ void st_state::fdc_dma_transfer() else { // write MSB to disk - m_fdc->data_w(data >> 8); + m_fdc->write_data(data >> 8); if (LOG) logerror("DMA Write to FDC %02x\n", data >> 8); } @@ -199,7 +199,7 @@ void st_state::fdc_dma_transfer() else { // read from controller to FIFO - uint8_t data = m_fdc->data_r(); + uint8_t data = m_fdc->read_data(); m_fdc_fifo_empty[m_fdc_fifo_sel] = 0; @@ -1217,10 +1217,10 @@ void st_state::ikbd_map(address_map &map) void st_state::ikbd_io_map(address_map &map) { - map(M6801_PORT1, M6801_PORT1).r(this, FUNC(st_state::ikbd_port1_r)); - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(st_state::ikbd_port2_r), FUNC(st_state::ikbd_port2_w)); - map(M6801_PORT3, M6801_PORT3).w(this, FUNC(st_state::ikbd_port3_w)); - map(M6801_PORT4, M6801_PORT4).rw(this, FUNC(st_state::ikbd_port4_r), FUNC(st_state::ikbd_port4_w)); + map(M6801_PORT1, M6801_PORT1).r(FUNC(st_state::ikbd_port1_r)); + map(M6801_PORT2, M6801_PORT2).rw(FUNC(st_state::ikbd_port2_r), FUNC(st_state::ikbd_port2_w)); + map(M6801_PORT3, M6801_PORT3).w(FUNC(st_state::ikbd_port3_w)); + map(M6801_PORT4, M6801_PORT4).rw(FUNC(st_state::ikbd_port4_r), FUNC(st_state::ikbd_port4_w)); } @@ -1231,36 +1231,36 @@ void st_state::ikbd_io_map(address_map &map) void st_state::st_map(address_map &map) { map.unmap_value_high(); - map(0x000000, 0x000007).rom().region(M68000_TAG, 0).w(this, FUNC(st_state::berr_w)); + map(0x000000, 0x000007).rom().region(M68000_TAG, 0).w(FUNC(st_state::berr_w)); map(0x000008, 0x1fffff).ram(); map(0x200000, 0x3fffff).ram(); - map(0x400000, 0xf9ffff).rw(this, FUNC(st_state::berr_r), FUNC(st_state::berr_w)); + map(0x400000, 0xf9ffff).rw(FUNC(st_state::berr_r), FUNC(st_state::berr_w)); //AM_RANGE(0xfa0000, 0xfbffff) // mapped by the cartslot - map(0xfc0000, 0xfeffff).rom().region(M68000_TAG, 0).w(this, FUNC(st_state::berr_w)); - map(0xff8001, 0xff8001).rw(this, FUNC(st_state::mmu_r), FUNC(st_state::mmu_w)); - map(0xff8200, 0xff8203).rw(this, FUNC(st_state::shifter_base_r), FUNC(st_state::shifter_base_w)).umask16(0x00ff); - map(0xff8204, 0xff8209).r(this, FUNC(st_state::shifter_counter_r)).umask16(0x00ff); - map(0xff820a, 0xff820a).rw(this, FUNC(st_state::shifter_sync_r), FUNC(st_state::shifter_sync_w)); - map(0xff8240, 0xff825f).rw(this, FUNC(st_state::shifter_palette_r), FUNC(st_state::shifter_palette_w)); - map(0xff8260, 0xff8260).rw(this, FUNC(st_state::shifter_mode_r), FUNC(st_state::shifter_mode_w)); - map(0xff8604, 0xff8605).rw(this, FUNC(st_state::fdc_data_r), FUNC(st_state::fdc_data_w)); - map(0xff8606, 0xff8607).rw(this, FUNC(st_state::dma_status_r), FUNC(st_state::dma_mode_w)); - map(0xff8608, 0xff860d).rw(this, FUNC(st_state::dma_counter_r), FUNC(st_state::dma_base_w)).umask16(0x00ff); + map(0xfc0000, 0xfeffff).rom().region(M68000_TAG, 0).w(FUNC(st_state::berr_w)); + map(0xff8001, 0xff8001).rw(FUNC(st_state::mmu_r), FUNC(st_state::mmu_w)); + map(0xff8200, 0xff8203).rw(FUNC(st_state::shifter_base_r), FUNC(st_state::shifter_base_w)).umask16(0x00ff); + map(0xff8204, 0xff8209).r(FUNC(st_state::shifter_counter_r)).umask16(0x00ff); + map(0xff820a, 0xff820a).rw(FUNC(st_state::shifter_sync_r), FUNC(st_state::shifter_sync_w)); + map(0xff8240, 0xff825f).rw(FUNC(st_state::shifter_palette_r), FUNC(st_state::shifter_palette_w)); + map(0xff8260, 0xff8260).rw(FUNC(st_state::shifter_mode_r), FUNC(st_state::shifter_mode_w)); + map(0xff8604, 0xff8605).rw(FUNC(st_state::fdc_data_r), FUNC(st_state::fdc_data_w)); + map(0xff8606, 0xff8607).rw(FUNC(st_state::dma_status_r), FUNC(st_state::dma_mode_w)); + map(0xff8608, 0xff860d).rw(FUNC(st_state::dma_counter_r), FUNC(st_state::dma_base_w)).umask16(0x00ff); map(0xff8800, 0xff8800).rw(YM2149_TAG, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)).mirror(0xfc); map(0xff8802, 0xff8802).rw(YM2149_TAG, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)).mirror(0xfc); #if 0 - map(0xff8a00, 0xff8a1f).rw(this, FUNC(st_state::blitter_halftone_r), FUNC(st_state::blitter_halftone_w)); - map(0xff8a20, 0xff8a21).rw(this, FUNC(st_state::blitter_src_inc_x_r), FUNC(st_state::blitter_src_inc_x_w)); - map(0xff8a22, 0xff8a23).rw(this, FUNC(st_state::blitter_src_inc_y_r), FUNC(st_state::blitter_src_inc_y_w)); - map(0xff8a24, 0xff8a27).rw(this, FUNC(st_state::blitter_src_r), FUNC(st_state::blitter_src_w)); - map(0xff8a28, 0xff8a2d).rw(this, FUNC(st_state::blitter_end_mask_r), FUNC(st_state::blitter_end_mask_w)); - map(0xff8a2e, 0xff8a2f).rw(this, FUNC(st_state::blitter_dst_inc_x_r), FUNC(st_state::blitter_dst_inc_x_w)); - map(0xff8a30, 0xff8a31).rw(this, FUNC(st_state::blitter_dst_inc_y_r), FUNC(st_state::blitter_dst_inc_y_w)); - map(0xff8a32, 0xff8a35).rw(this, FUNC(st_state::blitter_dst_r), FUNC(st_state::blitter_dst_w)); - map(0xff8a36, 0xff8a37).rw(this, FUNC(st_state::blitter_count_x_r), FUNC(st_state::blitter_count_x_w)); - map(0xff8a38, 0xff8a39).rw(this, FUNC(st_state::blitter_count_y_r), FUNC(st_state::blitter_count_y_w)); - map(0xff8a3a, 0xff8a3b).rw(this, FUNC(st_state::blitter_op_r), FUNC(st_state::blitter_op_w)); - map(0xff8a3c, 0xff8a3d).rw(this, FUNC(st_state::blitter_ctrl_r), FUNC(st_state::blitter_ctrl_w)); + map(0xff8a00, 0xff8a1f).rw(FUNC(st_state::blitter_halftone_r), FUNC(st_state::blitter_halftone_w)); + map(0xff8a20, 0xff8a21).rw(FUNC(st_state::blitter_src_inc_x_r), FUNC(st_state::blitter_src_inc_x_w)); + map(0xff8a22, 0xff8a23).rw(FUNC(st_state::blitter_src_inc_y_r), FUNC(st_state::blitter_src_inc_y_w)); + map(0xff8a24, 0xff8a27).rw(FUNC(st_state::blitter_src_r), FUNC(st_state::blitter_src_w)); + map(0xff8a28, 0xff8a2d).rw(FUNC(st_state::blitter_end_mask_r), FUNC(st_state::blitter_end_mask_w)); + map(0xff8a2e, 0xff8a2f).rw(FUNC(st_state::blitter_dst_inc_x_r), FUNC(st_state::blitter_dst_inc_x_w)); + map(0xff8a30, 0xff8a31).rw(FUNC(st_state::blitter_dst_inc_y_r), FUNC(st_state::blitter_dst_inc_y_w)); + map(0xff8a32, 0xff8a35).rw(FUNC(st_state::blitter_dst_r), FUNC(st_state::blitter_dst_w)); + map(0xff8a36, 0xff8a37).rw(FUNC(st_state::blitter_count_x_r), FUNC(st_state::blitter_count_x_w)); + map(0xff8a38, 0xff8a39).rw(FUNC(st_state::blitter_count_y_r), FUNC(st_state::blitter_count_y_w)); + map(0xff8a3a, 0xff8a3b).rw(FUNC(st_state::blitter_op_r), FUNC(st_state::blitter_op_w)); + map(0xff8a3c, 0xff8a3d).rw(FUNC(st_state::blitter_ctrl_r), FUNC(st_state::blitter_ctrl_w)); #endif map(0xfffa00, 0xfffa3f).rw(m_mfp, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff); map(0xfffc00, 0xfffc03).rw(m_acia0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0xff00); @@ -1280,32 +1280,32 @@ void megast_state::megast_map(address_map &map) map(0x200000, 0x3fffff).ram(); //map(0xfa0000, 0xfbffff) // mapped by the cartslot map(0xfc0000, 0xfeffff).rom().region(M68000_TAG, 0); -// map(0xff7f30, 0xff7f31).rw(this, FUNC(megast_state::blitter_dst_inc_y_r), FUNC(megast_state::blitter_dst_inc_y_w) // for TOS 1.02 - map(0xff8001, 0xff8001).rw(this, FUNC(megast_state::mmu_r), FUNC(megast_state::mmu_w)); - map(0xff8200, 0xff8203).rw(this, FUNC(megast_state::shifter_base_r), FUNC(megast_state::shifter_base_w)).umask16(0x00ff); - map(0xff8204, 0xff8209).r(this, FUNC(megast_state::shifter_counter_r)).umask16(0x00ff); - map(0xff820a, 0xff820a).rw(this, FUNC(megast_state::shifter_sync_r), FUNC(megast_state::shifter_sync_w)); - map(0xff8240, 0xff825f).rw(this, FUNC(megast_state::shifter_palette_r), FUNC(megast_state::shifter_palette_w)); - map(0xff8260, 0xff8260).rw(this, FUNC(megast_state::shifter_mode_r), FUNC(megast_state::shifter_mode_w)); - map(0xff8604, 0xff8605).rw(this, FUNC(megast_state::fdc_data_r), FUNC(megast_state::fdc_data_w)); - map(0xff8606, 0xff8607).rw(this, FUNC(megast_state::dma_status_r), FUNC(megast_state::dma_mode_w)); - map(0xff8608, 0xff860d).rw(this, FUNC(megast_state::dma_counter_r), FUNC(megast_state::dma_base_w)).umask16(0x00ff); +// map(0xff7f30, 0xff7f31).rw(FUNC(megast_state::blitter_dst_inc_y_r), FUNC(megast_state::blitter_dst_inc_y_w) // for TOS 1.02 + map(0xff8001, 0xff8001).rw(FUNC(megast_state::mmu_r), FUNC(megast_state::mmu_w)); + map(0xff8200, 0xff8203).rw(FUNC(megast_state::shifter_base_r), FUNC(megast_state::shifter_base_w)).umask16(0x00ff); + map(0xff8204, 0xff8209).r(FUNC(megast_state::shifter_counter_r)).umask16(0x00ff); + map(0xff820a, 0xff820a).rw(FUNC(megast_state::shifter_sync_r), FUNC(megast_state::shifter_sync_w)); + map(0xff8240, 0xff825f).rw(FUNC(megast_state::shifter_palette_r), FUNC(megast_state::shifter_palette_w)); + map(0xff8260, 0xff8260).rw(FUNC(megast_state::shifter_mode_r), FUNC(megast_state::shifter_mode_w)); + map(0xff8604, 0xff8605).rw(FUNC(megast_state::fdc_data_r), FUNC(megast_state::fdc_data_w)); + map(0xff8606, 0xff8607).rw(FUNC(megast_state::dma_status_r), FUNC(megast_state::dma_mode_w)); + map(0xff8608, 0xff860d).rw(FUNC(megast_state::dma_counter_r), FUNC(megast_state::dma_base_w)).umask16(0x00ff); map(0xff8800, 0xff8800).rw(YM2149_TAG, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)); map(0xff8802, 0xff8802).w(YM2149_TAG, FUNC(ay8910_device::data_w)); - map(0xff8a00, 0xff8a1f).rw(this, FUNC(megast_state::blitter_halftone_r), FUNC(megast_state::blitter_halftone_w)); - map(0xff8a20, 0xff8a21).rw(this, FUNC(megast_state::blitter_src_inc_x_r), FUNC(megast_state::blitter_src_inc_x_w)); - map(0xff8a22, 0xff8a23).rw(this, FUNC(megast_state::blitter_src_inc_y_r), FUNC(megast_state::blitter_src_inc_y_w)); - map(0xff8a24, 0xff8a27).rw(this, FUNC(megast_state::blitter_src_r), FUNC(megast_state::blitter_src_w)); - map(0xff8a28, 0xff8a2d).rw(this, FUNC(megast_state::blitter_end_mask_r), FUNC(megast_state::blitter_end_mask_w)); - map(0xff8a2e, 0xff8a2f).rw(this, FUNC(megast_state::blitter_dst_inc_x_r), FUNC(megast_state::blitter_dst_inc_x_w)); - map(0xff8a30, 0xff8a31).rw(this, FUNC(megast_state::blitter_dst_inc_y_r), FUNC(megast_state::blitter_dst_inc_y_w)); - map(0xff8a32, 0xff8a35).rw(this, FUNC(megast_state::blitter_dst_r), FUNC(megast_state::blitter_dst_w)); - map(0xff8a36, 0xff8a37).rw(this, FUNC(megast_state::blitter_count_x_r), FUNC(megast_state::blitter_count_x_w)); - map(0xff8a38, 0xff8a39).rw(this, FUNC(megast_state::blitter_count_y_r), FUNC(megast_state::blitter_count_y_w)); - map(0xff8a3a, 0xff8a3b).rw(this, FUNC(megast_state::blitter_op_r), FUNC(megast_state::blitter_op_w)); - map(0xff8a3c, 0xff8a3d).rw(this, FUNC(megast_state::blitter_ctrl_r), FUNC(megast_state::blitter_ctrl_w)); + map(0xff8a00, 0xff8a1f).rw(FUNC(megast_state::blitter_halftone_r), FUNC(megast_state::blitter_halftone_w)); + map(0xff8a20, 0xff8a21).rw(FUNC(megast_state::blitter_src_inc_x_r), FUNC(megast_state::blitter_src_inc_x_w)); + map(0xff8a22, 0xff8a23).rw(FUNC(megast_state::blitter_src_inc_y_r), FUNC(megast_state::blitter_src_inc_y_w)); + map(0xff8a24, 0xff8a27).rw(FUNC(megast_state::blitter_src_r), FUNC(megast_state::blitter_src_w)); + map(0xff8a28, 0xff8a2d).rw(FUNC(megast_state::blitter_end_mask_r), FUNC(megast_state::blitter_end_mask_w)); + map(0xff8a2e, 0xff8a2f).rw(FUNC(megast_state::blitter_dst_inc_x_r), FUNC(megast_state::blitter_dst_inc_x_w)); + map(0xff8a30, 0xff8a31).rw(FUNC(megast_state::blitter_dst_inc_y_r), FUNC(megast_state::blitter_dst_inc_y_w)); + map(0xff8a32, 0xff8a35).rw(FUNC(megast_state::blitter_dst_r), FUNC(megast_state::blitter_dst_w)); + map(0xff8a36, 0xff8a37).rw(FUNC(megast_state::blitter_count_x_r), FUNC(megast_state::blitter_count_x_w)); + map(0xff8a38, 0xff8a39).rw(FUNC(megast_state::blitter_count_y_r), FUNC(megast_state::blitter_count_y_w)); + map(0xff8a3a, 0xff8a3b).rw(FUNC(megast_state::blitter_op_r), FUNC(megast_state::blitter_op_w)); + map(0xff8a3c, 0xff8a3d).rw(FUNC(megast_state::blitter_ctrl_r), FUNC(megast_state::blitter_ctrl_w)); map(0xfffa00, 0xfffa3f).rw(m_mfp, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff); - map(0xfffa40, 0xfffa57).rw(this, FUNC(megast_state::fpu_r), FUNC(megast_state::fpu_w)); + map(0xfffa40, 0xfffa57).rw(FUNC(megast_state::fpu_r), FUNC(megast_state::fpu_w)); map(0xfffc00, 0xfffc03).rw(m_acia0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0xff00); map(0xfffc04, 0xfffc07).rw(m_acia1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0xff00); map(0xfffc20, 0xfffc3f).rw(RP5C15_TAG, FUNC(rp5c15_device::read), FUNC(rp5c15_device::write)).umask16(0x00ff); @@ -2050,7 +2050,7 @@ MACHINE_CONFIG_START(st_state::st) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, st_state, psg_pa_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) // devices @@ -2140,7 +2140,7 @@ MACHINE_CONFIG_START(megast_state::megast) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, st_state, psg_pa_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) // devices @@ -2233,7 +2233,7 @@ MACHINE_CONFIG_START(ste_state::ste) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, st_state, psg_pa_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(0, "rspeaker", 0.50) /* @@ -2348,7 +2348,7 @@ static MACHINE_CONFIG_START(stbook_state::stbook) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, stbook_state, psg_pa_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_DEVICE_ADD(MC68901_TAG, MC68901, U517/8) diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index df43e689437..c97ce9f8b4c 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -429,23 +429,23 @@ void atarisy1_state::main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x080000, 0x087fff).rom(); /* slapstic maps here */ - map(0x2e0000, 0x2e0001).r(this, FUNC(atarisy1_state::atarisy1_int3state_r)); + map(0x2e0000, 0x2e0001).r(FUNC(atarisy1_state::atarisy1_int3state_r)); map(0x400000, 0x401fff).ram(); - map(0x800000, 0x800001).w(this, FUNC(atarisy1_state::atarisy1_xscroll_w)).share("xscroll"); - map(0x820000, 0x820001).w(this, FUNC(atarisy1_state::atarisy1_yscroll_w)).share("yscroll"); - map(0x840000, 0x840001).w(this, FUNC(atarisy1_state::atarisy1_priority_w)); - map(0x860000, 0x860001).w(this, FUNC(atarisy1_state::atarisy1_bankselect_w)).share("bankselect"); + map(0x800000, 0x800001).w(FUNC(atarisy1_state::atarisy1_xscroll_w)).share("xscroll"); + map(0x820000, 0x820001).w(FUNC(atarisy1_state::atarisy1_yscroll_w)).share("yscroll"); + map(0x840000, 0x840001).w(FUNC(atarisy1_state::atarisy1_priority_w)); + map(0x860000, 0x860001).w(FUNC(atarisy1_state::atarisy1_bankselect_w)).share("bankselect"); map(0x880000, 0x880001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x8a0000, 0x8a0001).w(this, FUNC(atarisy1_state::video_int_ack_w)); + map(0x8a0000, 0x8a0001).w(FUNC(atarisy1_state::video_int_ack_w)); map(0x8c0000, 0x8c0001).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x900000, 0x9fffff).ram(); map(0xa00000, 0xa01fff).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); - map(0xa02000, 0xa02fff).ram().w(this, FUNC(atarisy1_state::atarisy1_spriteram_w)).share("mob"); + map(0xa02000, 0xa02fff).ram().w(FUNC(atarisy1_state::atarisy1_spriteram_w)).share("mob"); map(0xa03000, 0xa03fff).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); map(0xb00000, 0xb007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xf00000, 0xf00fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); - map(0xf20000, 0xf20007).r(this, FUNC(atarisy1_state::trakball_r)); - map(0xf40000, 0xf4001f).rw(this, FUNC(atarisy1_state::adc_r), FUNC(atarisy1_state::adc_w)).umask16(0x00ff); + map(0xf20000, 0xf20007).r(FUNC(atarisy1_state::trakball_r)); + map(0xf40000, 0xf4001f).rw(FUNC(atarisy1_state::adc_r), FUNC(atarisy1_state::adc_w)).umask16(0x00ff); map(0xf60000, 0xf60003).portr("F60000"); map(0xf80001, 0xf80001).w(m_soundcomm, FUNC(atari_sound_comm_device::main_command_w)); /* used by roadbls2 */ map(0xfc0001, 0xfc0001).r(m_soundcomm, FUNC(atari_sound_comm_device::main_response_r)); @@ -466,7 +466,7 @@ void atarisy1_state::sound_map(address_map &map) map(0x1000, 0x100f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0x1800, 0x1801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x1810, 0x1810).rw(m_soundcomm, FUNC(atari_sound_comm_device::sound_command_r), FUNC(atari_sound_comm_device::sound_response_w)); - map(0x1820, 0x1820).r(this, FUNC(atarisy1_state::switch_6502_r)); + map(0x1820, 0x1820).r(FUNC(atarisy1_state::switch_6502_r)); map(0x1820, 0x1827).w(m_outlatch, FUNC(ls259_device::write_d0)); map(0x1870, 0x187f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x4000, 0xffff).rom(); diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp index 02aae9e76b4..38afb8913ff 100644 --- a/src/mame/drivers/atarisy2.cpp +++ b/src/mame/drivers/atarisy2.cpp @@ -738,23 +738,23 @@ void atarisy2_state::main_map(address_map &map) map(0x0000, 0x0fff).ram(); map(0x1000, 0x11ff).mirror(0x0200).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x1400, 0x1400).mirror(0x007e).r("adc", FUNC(adc0808_device::data_r)); - map(0x1400, 0x1403).mirror(0x007c).w(this, FUNC(atarisy2_state::bankselect_w)); + map(0x1400, 0x1403).mirror(0x007c).w(FUNC(atarisy2_state::bankselect_w)); map(0x1480, 0x148f).mirror(0x0070).w("adc", FUNC(adc0808_device::address_offset_start_w)).umask16(0x00ff); - map(0x1580, 0x1581).mirror(0x001e).w(this, FUNC(atarisy2_state::int0_ack_w)); - map(0x15a0, 0x15a1).mirror(0x001e).w(this, FUNC(atarisy2_state::int1_ack_w)); - map(0x15c0, 0x15c1).mirror(0x001e).w(this, FUNC(atarisy2_state::scanline_int_ack_w)); - map(0x15e0, 0x15e1).mirror(0x001e).w(this, FUNC(atarisy2_state::video_int_ack_w)); - map(0x1600, 0x1601).mirror(0x007e).w(this, FUNC(atarisy2_state::int_enable_w)); + map(0x1580, 0x1581).mirror(0x001e).w(FUNC(atarisy2_state::int0_ack_w)); + map(0x15a0, 0x15a1).mirror(0x001e).w(FUNC(atarisy2_state::int1_ack_w)); + map(0x15c0, 0x15c1).mirror(0x001e).w(FUNC(atarisy2_state::scanline_int_ack_w)); + map(0x15e0, 0x15e1).mirror(0x001e).w(FUNC(atarisy2_state::video_int_ack_w)); + map(0x1600, 0x1601).mirror(0x007e).w(FUNC(atarisy2_state::int_enable_w)); map(0x1680, 0x1680).mirror(0x007e).w(m_soundcomm, FUNC(atari_sound_comm_device::main_command_w)); - map(0x1700, 0x1701).mirror(0x007e).w(this, FUNC(atarisy2_state::xscroll_w)).share("xscroll"); - map(0x1780, 0x1781).mirror(0x007e).w(this, FUNC(atarisy2_state::yscroll_w)).share("yscroll"); - map(0x1800, 0x1801).mirror(0x03fe).r(this, FUNC(atarisy2_state::switch_r)).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x1c00, 0x1c01).mirror(0x03fe).r(this, FUNC(atarisy2_state::sound_r)); + map(0x1700, 0x1701).mirror(0x007e).w(FUNC(atarisy2_state::xscroll_w)).share("xscroll"); + map(0x1780, 0x1781).mirror(0x007e).w(FUNC(atarisy2_state::yscroll_w)).share("yscroll"); + map(0x1800, 0x1801).mirror(0x03fe).r(FUNC(atarisy2_state::switch_r)).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); + map(0x1c00, 0x1c01).mirror(0x03fe).r(FUNC(atarisy2_state::sound_r)); map(0x2000, 0x3fff).m(m_vrambank, FUNC(address_map_bank_device::amap16)); map(0x4000, 0x5fff).bankr("rombank1"); map(0x6000, 0x7fff).bankr("rombank2"); map(0x8000, 0xffff).rom(); - map(0x8000, 0x81ff).rw(this, FUNC(atarisy2_state::slapstic_r), FUNC(atarisy2_state::slapstic_w)).share("slapstic_base"); + map(0x8000, 0x81ff).rw(FUNC(atarisy2_state::slapstic_r), FUNC(atarisy2_state::slapstic_w)).share("slapstic_base"); } @@ -769,7 +769,7 @@ void atarisy2_state::vrambank_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x17ff).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); - map(0x1800, 0x1fff).ram().w(this, FUNC(atarisy2_state::spriteram_w)).share("mob"); + map(0x1800, 0x1fff).ram().w(FUNC(atarisy2_state::spriteram_w)).share("mob"); map(0x2000, 0x3fff).ram(); map(0x4000, 0x7fff).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); } @@ -787,19 +787,19 @@ void atarisy2_state::sound_map(address_map &map) map(0x0000, 0x0fff).mirror(0x2000).ram(); map(0x1000, 0x17ff).mirror(0x2000).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); map(0x1800, 0x180f).mirror(0x2780).rw(m_pokey[0], FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1810, 0x1813).mirror(0x278c).r(this, FUNC(atarisy2_state::leta_r)); + map(0x1810, 0x1813).mirror(0x278c).r(FUNC(atarisy2_state::leta_r)); map(0x1830, 0x183f).mirror(0x2780).rw(m_pokey[1], FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1840, 0x1840).mirror(0x278f).r(this, FUNC(atarisy2_state::switch_6502_r)); + map(0x1840, 0x1840).mirror(0x278f).r(FUNC(atarisy2_state::switch_6502_r)); map(0x1850, 0x1851).mirror(0x278e).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x1860, 0x1860).mirror(0x278f).r(this, FUNC(atarisy2_state::sound_6502_r)); - map(0x1870, 0x1870).mirror(0x2781).w(this, FUNC(atarisy2_state::tms5220_w)); - map(0x1872, 0x1873).mirror(0x2780).w(this, FUNC(atarisy2_state::tms5220_strobe_w)); - map(0x1874, 0x1874).mirror(0x2781).w(this, FUNC(atarisy2_state::sound_6502_w)); - map(0x1876, 0x1876).mirror(0x2781).w(this, FUNC(atarisy2_state::coincount_w)); + map(0x1860, 0x1860).mirror(0x278f).r(FUNC(atarisy2_state::sound_6502_r)); + map(0x1870, 0x1870).mirror(0x2781).w(FUNC(atarisy2_state::tms5220_w)); + map(0x1872, 0x1873).mirror(0x2780).w(FUNC(atarisy2_state::tms5220_strobe_w)); + map(0x1874, 0x1874).mirror(0x2781).w(FUNC(atarisy2_state::sound_6502_w)); + map(0x1876, 0x1876).mirror(0x2781).w(FUNC(atarisy2_state::coincount_w)); map(0x1878, 0x1878).mirror(0x2781).w(m_soundcomm, FUNC(atari_sound_comm_device::sound_irq_ack_w)); - map(0x187a, 0x187a).mirror(0x2781).w(this, FUNC(atarisy2_state::mixer_w)); - map(0x187c, 0x187c).mirror(0x2781).w(this, FUNC(atarisy2_state::switch_6502_w)); - map(0x187e, 0x187e).mirror(0x2781).w(this, FUNC(atarisy2_state::sound_reset_w)); + map(0x187a, 0x187a).mirror(0x2781).w(FUNC(atarisy2_state::mixer_w)); + map(0x187c, 0x187c).mirror(0x2781).w(FUNC(atarisy2_state::switch_6502_w)); + map(0x187e, 0x187e).mirror(0x2781).w(FUNC(atarisy2_state::sound_reset_w)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp index 036f023d7f5..0eb092e98ab 100644 --- a/src/mame/drivers/atarisy4.cpp +++ b/src/mame/drivers/atarisy4.cpp @@ -707,20 +707,20 @@ void atarisy4_state::main_map(address_map &map) map(0x000000, 0x00ffff).ram().share("m68k_ram"); map(0x010000, 0x01ffff).ram(); map(0x580000, 0x580001).portr("JOYSTICK"); - map(0x588000, 0x588001).r(this, FUNC(atarisy4_state::analog_r)); + map(0x588000, 0x588001).r(FUNC(atarisy4_state::analog_r)); map(0x598000, 0x598001).noprw(); /* Sound board */ - map(0x7c0000, 0x7c4fff).rw(this, FUNC(atarisy4_state::m68k_shared_1_r), FUNC(atarisy4_state::m68k_shared_1_w)); - map(0x7f0000, 0x7f4fff).rw(this, FUNC(atarisy4_state::m68k_shared_0_r), FUNC(atarisy4_state::m68k_shared_0_w)); - map(0x7f6000, 0x7f6001).rw(this, FUNC(atarisy4_state::dsp0_status_r), FUNC(atarisy4_state::dsp0_control_w)); + map(0x7c0000, 0x7c4fff).rw(FUNC(atarisy4_state::m68k_shared_1_r), FUNC(atarisy4_state::m68k_shared_1_w)); + map(0x7f0000, 0x7f4fff).rw(FUNC(atarisy4_state::m68k_shared_0_r), FUNC(atarisy4_state::m68k_shared_0_w)); + map(0x7f6000, 0x7f6001).rw(FUNC(atarisy4_state::dsp0_status_r), FUNC(atarisy4_state::dsp0_control_w)); map(0xa00400, 0xbfffff).ram().share("screen_ram"); - map(0xff8000, 0xff8fff).rw(this, FUNC(atarisy4_state::gpu_r), FUNC(atarisy4_state::gpu_w)); + map(0xff8000, 0xff8fff).rw(FUNC(atarisy4_state::gpu_r), FUNC(atarisy4_state::gpu_w)); } void airrace_state::airrace_map(address_map &map) { main_map(map); - map(0x7c6000, 0x7c6001).rw(this, FUNC(airrace_state::dsp1_status_r), FUNC(airrace_state::dsp1_control_w)); + map(0x7c6000, 0x7c6001).rw(FUNC(airrace_state::dsp1_status_r), FUNC(airrace_state::dsp1_control_w)); } @@ -739,7 +739,7 @@ void atarisy4_state::dsp0_map(address_map &map) void atarisy4_state::dsp0_io_map(address_map &map) { - map(0x00, 0x01).w(this, FUNC(atarisy4_state::dsp0_bank_w)); + map(0x00, 0x01).w(FUNC(atarisy4_state::dsp0_bank_w)); } @@ -758,7 +758,7 @@ void airrace_state::dsp1_map(address_map &map) void airrace_state::dsp1_io_map(address_map &map) { - map(0x00, 0x01).w(this, FUNC(airrace_state::dsp1_bank_w)); + map(0x00, 0x01).w(FUNC(airrace_state::dsp1_bank_w)); } diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index 1c048dcd6e3..325b7496b55 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -173,17 +173,17 @@ WRITE8_MEMBER(atetris_state::coincount_w) void atetris_state::main_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x1fff).ram().w(this, FUNC(atetris_state::videoram_w)).share("videoram"); + map(0x1000, 0x1fff).ram().w(FUNC(atetris_state::videoram_w)).share("videoram"); map(0x2000, 0x20ff).mirror(0x0300).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x2400, 0x25ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); map(0x2800, 0x280f).mirror(0x03e0).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x2810, 0x281f).mirror(0x03e0).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x3000, 0x3000).mirror(0x03ff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3400, 0x3400).mirror(0x03ff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write8)); - map(0x3800, 0x3800).mirror(0x03ff).w(this, FUNC(atetris_state::irq_ack_w)); - map(0x3c00, 0x3c00).mirror(0x03ff).w(this, FUNC(atetris_state::coincount_w)); + map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(atetris_state::irq_ack_w)); + map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(atetris_state::coincount_w)); map(0x4000, 0x5fff).rom(); - map(0x6000, 0x7fff).r(this, FUNC(atetris_state::slapstic_r)); + map(0x6000, 0x7fff).r(FUNC(atetris_state::slapstic_r)); map(0x8000, 0xffff).rom(); } @@ -191,22 +191,22 @@ void atetris_state::main_map(address_map &map) void atetris_state::atetrisb2_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x1fff).ram().w(this, FUNC(atetris_state::videoram_w)).share("videoram"); + map(0x1000, 0x1fff).ram().w(FUNC(atetris_state::videoram_w)).share("videoram"); map(0x2000, 0x20ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x2400, 0x25ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); - map(0x2802, 0x2802).w("sn1", FUNC(sn76496_device::write)); - map(0x2804, 0x2804).w("sn2", FUNC(sn76496_device::write)); - map(0x2806, 0x2806).w("sn3", FUNC(sn76496_device::write)); + map(0x2802, 0x2802).w("sn1", FUNC(sn76496_device::command_w)); + map(0x2804, 0x2804).w("sn2", FUNC(sn76496_device::command_w)); + map(0x2806, 0x2806).w("sn3", FUNC(sn76496_device::command_w)); map(0x2808, 0x2808).portr("IN0"); map(0x2808, 0x280f).nopw(); map(0x2818, 0x2818).portr("IN1"); map(0x2818, 0x281f).nopw(); map(0x3000, 0x3000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3400, 0x3400).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write8)); - map(0x3800, 0x3800).w(this, FUNC(atetris_state::irq_ack_w)); - map(0x3c00, 0x3c00).w(this, FUNC(atetris_state::coincount_w)); + map(0x3800, 0x3800).w(FUNC(atetris_state::irq_ack_w)); + map(0x3c00, 0x3c00).w(FUNC(atetris_state::coincount_w)); map(0x4000, 0x5fff).rom(); - map(0x6000, 0x7fff).r(this, FUNC(atetris_state::slapstic_r)); + map(0x6000, 0x7fff).r(FUNC(atetris_state::slapstic_r)); map(0x8000, 0xffff).rom(); } @@ -214,18 +214,18 @@ void atetris_state::atetrisb2_map(address_map &map) void atetris_mcu_state::atetrisb3_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x1fff).ram().w(this, FUNC(atetris_mcu_state::videoram_w)).share("videoram"); + map(0x1000, 0x1fff).ram().w(FUNC(atetris_mcu_state::videoram_w)).share("videoram"); map(0x2000, 0x20ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x2400, 0x27ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); - map(0x2800, 0x281f).nopr().w(this, FUNC(atetris_mcu_state::mcu_reg_w)); + map(0x2800, 0x281f).nopr().w(FUNC(atetris_mcu_state::mcu_reg_w)); map(0x2808, 0x2808).portr("IN0"); map(0x2818, 0x2818).portr("IN1"); map(0x3000, 0x3000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3400, 0x3400).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write8)); - map(0x3800, 0x3800).w(this, FUNC(atetris_mcu_state::irq_ack_w)); - map(0x3c00, 0x3c00).w(this, FUNC(atetris_mcu_state::coincount_w)); + map(0x3800, 0x3800).w(FUNC(atetris_mcu_state::irq_ack_w)); + map(0x3c00, 0x3c00).w(FUNC(atetris_mcu_state::coincount_w)); map(0x4000, 0x5fff).rom(); - map(0x6000, 0x7fff).r(this, FUNC(atetris_mcu_state::slapstic_r)); + map(0x6000, 0x7fff).r(FUNC(atetris_mcu_state::slapstic_r)); map(0x8000, 0xffff).rom(); } @@ -254,7 +254,7 @@ READ8_MEMBER(atetris_mcu_state::mcu_bus_r) WRITE8_MEMBER(atetris_mcu_state::mcu_p2_w) { if ((data & 0xc0) == 0x80) - m_sn[(data >> 4) & 3]->write(space, 0, m_mcu->p1_r(space, 0)); + m_sn[(data >> 4) & 3]->write(m_mcu->p1_r(space, 0)); } WRITE8_MEMBER(atetris_mcu_state::mcu_reg_w) diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index c978e2b45df..0ad304b62f9 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -667,13 +667,13 @@ void atlantis_state::device_timer(emu_timer &timer, device_timer_id id, int para *************************************/ void atlantis_state::map0(address_map &map) { - map(0x00000000, 0x0001ffff).rw(this, FUNC(atlantis_state::cmos_r), FUNC(atlantis_state::cmos_w)).umask32(0x000000ff); + map(0x00000000, 0x0001ffff).rw(FUNC(atlantis_state::cmos_r), FUNC(atlantis_state::cmos_w)).umask32(0x000000ff); //AM_RANGE(0x00080000, 0x000?0000) AM_READWRITE8(zeus debug) map(0x00100000, 0x0010001f).rw(m_uart1, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)).umask32(0x000000ff); // Serial UART1 (TL16C552 CS0) map(0x00180000, 0x0018001f).rw(m_uart2, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)).umask32(0x000000ff); // Serial UART2 (TL16C552 CS1) - map(0x00200000, 0x0020001f).rw(this, FUNC(atlantis_state::parallel_r), FUNC(atlantis_state::parallel_w)).umask32(0x000000ff); // Parallel UART (TL16C552 CS2) - map(0x00400000, 0x007fffff).rw(this, FUNC(atlantis_state::exprom_r), FUNC(atlantis_state::exprom_w)).umask32(0x000000ff); // EXPROM - map(0x00800000, 0x00f00003).rw(this, FUNC(atlantis_state::board_ctrl_r), FUNC(atlantis_state::board_ctrl_w)); + map(0x00200000, 0x0020001f).rw(FUNC(atlantis_state::parallel_r), FUNC(atlantis_state::parallel_w)).umask32(0x000000ff); // Parallel UART (TL16C552 CS2) + map(0x00400000, 0x007fffff).rw(FUNC(atlantis_state::exprom_r), FUNC(atlantis_state::exprom_w)).umask32(0x000000ff); // EXPROM + map(0x00800000, 0x00f00003).rw(FUNC(atlantis_state::board_ctrl_r), FUNC(atlantis_state::board_ctrl_w)); //AM_RANGE(0x00d80000, 0x00d80003) AM_READWRITE(status_leds_r, status_leds_w) //AM_RANGE(0x00e00000, 0x00e00003) AM_READWRITE(cmos_protect_r, cmos_protect_w) //AM_RANGE(0x00e80000, 0x00e80003) AM_NOP // Watchdog @@ -683,14 +683,14 @@ void atlantis_state::map0(address_map &map) void atlantis_state::map1(address_map &map) { map(0x00000000, 0x0000003f).rw(m_ioasic, FUNC(midway_ioasic_device::read), FUNC(midway_ioasic_device::write)); - map(0x00200000, 0x00200003).w(this, FUNC(atlantis_state::dcs3_fifo_full_w)); + map(0x00200000, 0x00200003).w(FUNC(atlantis_state::dcs3_fifo_full_w)); map(0x00400000, 0x00400003).w(m_dcs, FUNC(dcs_audio_device::dsio_idma_addr_w)); map(0x00600000, 0x00600003).rw(m_dcs, FUNC(dcs_audio_device::dsio_idma_data_r), FUNC(dcs_audio_device::dsio_idma_data_w)); - map(0x00800000, 0x00900003).rw(this, FUNC(atlantis_state::port_ctrl_r), FUNC(atlantis_state::port_ctrl_w)).umask32(0x0000ffff); + map(0x00800000, 0x00900003).rw(FUNC(atlantis_state::port_ctrl_r), FUNC(atlantis_state::port_ctrl_w)).umask32(0x0000ffff); //AM_RANGE(0x00880000, 0x00880003) // AUX Output Initial write 0000fff0, follow by sequence ffef, ffdf, ffbf, fff7. Row Select? //AM_RANGE(0x00900000, 0x00900003) // AUX Input Read once before each sequence write to 0x00880000. Code checks bits 0,1,2. Keypad? - map(0x00980000, 0x00980001).rw(this, FUNC(atlantis_state::a2d_ctrl_r), FUNC(atlantis_state::a2d_ctrl_w)); // A2D Control Read / Write. Bytes written 0x8f, 0xcf. Code if read 0x1 then read 00a00000. - map(0x00a00000, 0x00a00001).rw(this, FUNC(atlantis_state::a2d_data_r), FUNC(atlantis_state::a2d_data_w)); // A2D Data + map(0x00980000, 0x00980001).rw(FUNC(atlantis_state::a2d_ctrl_r), FUNC(atlantis_state::a2d_ctrl_w)); // A2D Control Read / Write. Bytes written 0x8f, 0xcf. Code if read 0x1 then read 00a00000. + map(0x00a00000, 0x00a00001).rw(FUNC(atlantis_state::a2d_data_r), FUNC(atlantis_state::a2d_data_w)); // A2D Data //AM_RANGE(0x00a80000, 0x00a80003) // Trackball Chan 0 16 bits //AM_RANGE(0x00b00000, 0x00b00003) // Trackball Chan 1 16 bits //AM_RANGE(0x00b80000, 0x00b80003) // Trackball Error 16 bits diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp index eb8c79b0c33..f176b04a860 100644 --- a/src/mame/drivers/atm.cpp +++ b/src/mame/drivers/atm.cpp @@ -126,18 +126,18 @@ void atm_state::atm_io(address_map &map) map(0x003f, 0x003f).rw(m_beta, FUNC(beta_disk_device::track_r), FUNC(beta_disk_device::track_w)).mirror(0xff00); map(0x005f, 0x005f).rw(m_beta, FUNC(beta_disk_device::sector_r), FUNC(beta_disk_device::sector_w)).mirror(0xff00); map(0x007f, 0x007f).rw(m_beta, FUNC(beta_disk_device::data_r), FUNC(beta_disk_device::data_w)).mirror(0xff00); - map(0x00fe, 0x00fe).rw(this, FUNC(atm_state::spectrum_port_fe_r), FUNC(atm_state::spectrum_port_fe_w)).select(0xff00); + map(0x00fe, 0x00fe).rw(FUNC(atm_state::spectrum_port_fe_r), FUNC(atm_state::spectrum_port_fe_w)).select(0xff00); map(0x00ff, 0x00ff).rw(m_beta, FUNC(beta_disk_device::state_r), FUNC(beta_disk_device::param_w)).mirror(0xff00); - map(0x4000, 0x4000).w(this, FUNC(atm_state::atm_port_7ffd_w)).mirror(0x3ffd); + map(0x4000, 0x4000).w(FUNC(atm_state::atm_port_7ffd_w)).mirror(0x3ffd); map(0x8000, 0x8000).w("ay8912", FUNC(ay8910_device::data_w)).mirror(0x3ffd); map(0xc000, 0xc000).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)).mirror(0x3ffd); } void atm_state::atm_switch(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(atm_state::beta_neutral_r)); // Overlap with previous because we want real addresses on the 3e00-3fff range - map(0x3d00, 0x3dff).r(this, FUNC(atm_state::beta_enable_r)); - map(0x4000, 0xffff).r(this, FUNC(atm_state::beta_disable_r)); + map(0x0000, 0x3fff).r(FUNC(atm_state::beta_neutral_r)); // Overlap with previous because we want real addresses on the 3e00-3fff range + map(0x3d00, 0x3dff).r(FUNC(atm_state::beta_enable_r)); + map(0x4000, 0xffff).r(FUNC(atm_state::beta_disable_r)); } MACHINE_RESET_MEMBER(atm_state,atm) diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index 1b452e43cb3..756cbf0d0f9 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -271,9 +271,9 @@ void atom_state::atom_mem(address_map &map) void atomeb_state::atomeb_mem(address_map &map) { atom_mem(map); - map(0xa000, 0xafff).r(this, FUNC(atomeb_state::ext_r)); - map(0xbfff, 0xbfff).rw(this, FUNC(atomeb_state::eprom_r), FUNC(atomeb_state::eprom_w)); - map(0xe000, 0xefff).r(this, FUNC(atomeb_state::dos_r)); + map(0xa000, 0xafff).r(FUNC(atomeb_state::ext_r)); + map(0xbfff, 0xbfff).rw(FUNC(atomeb_state::eprom_r), FUNC(atomeb_state::eprom_w)); + map(0xe000, 0xefff).r(FUNC(atomeb_state::dos_r)); } /*------------------------------------------------- @@ -728,7 +728,7 @@ MACHINE_CONFIG_START(atom_state::atom) MCFG_TIMER_DRIVER_ADD_PERIODIC("hz2400", atom_state, cassette_output_tick, attotime::from_hz(4806)) MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE)) @@ -838,7 +838,7 @@ MACHINE_CONFIG_START(atom_state::atombb) MCFG_TIMER_DRIVER_ADD_PERIODIC("hz2400", atom_state, cassette_output_tick, attotime::from_hz(4806)) MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE)) diff --git a/src/mame/drivers/att4425.cpp b/src/mame/drivers/att4425.cpp index 81d77f12e1b..a0b48557dbc 100644 --- a/src/mame/drivers/att4425.cpp +++ b/src/mame/drivers/att4425.cpp @@ -112,9 +112,9 @@ void att4425_state::att4425_io(address_map &map) map.global_mask(0xff); map(0x00, 0x00).rw(m_i8251, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x01, 0x01).rw(m_i8251, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x10, 0x10).w(this, FUNC(att4425_state::port10_w)); - map(0x14, 0x14).rw(this, FUNC(att4425_state::port14_r), FUNC(att4425_state::port14_w)); - map(0x15, 0x15).r(this, FUNC(att4425_state::port15_r)); + map(0x10, 0x10).w(FUNC(att4425_state::port10_w)); + map(0x14, 0x14).rw(FUNC(att4425_state::port14_r), FUNC(att4425_state::port14_w)); + map(0x15, 0x15).r(FUNC(att4425_state::port15_r)); map(0x18, 0x1b).rw(Z80CTC_TAG, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x1c, 0x1f).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); } diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 9710bd177fb..0e4d8f25136 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -915,29 +915,29 @@ void attache_state::attache_map(address_map &map) void attache_state::attache_io(address_map &map) { map(0xe0, 0xed).rw(m_dma, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).mirror(0xff00); - map(0xee, 0xee).w(this, FUNC(attache_state::display_command_w)).mirror(0xff00); - map(0xef, 0xef).rw(this, FUNC(attache_state::dma_mask_r), FUNC(attache_state::dma_mask_w)).mirror(0xff00); + map(0xee, 0xee).w(FUNC(attache_state::display_command_w)).mirror(0xff00); + map(0xef, 0xef).rw(FUNC(attache_state::dma_mask_r), FUNC(attache_state::dma_mask_w)).mirror(0xff00); map(0xf0, 0xf1).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).mirror(0xff00); map(0xf4, 0xf7).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)).mirror(0xff00); map(0xf8, 0xfb).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)).mirror(0xff00); map(0xfc, 0xfd).m(m_fdc, FUNC(upd765a_device::map)).mirror(0xff00); - map(0xfe, 0xfe).rw(this, FUNC(attache_state::display_data_r), FUNC(attache_state::display_data_w)).select(0xff00); - map(0xff, 0xff).rw(this, FUNC(attache_state::memmap_r), FUNC(attache_state::memmap_w)).mirror(0xff00); + map(0xfe, 0xfe).rw(FUNC(attache_state::display_data_r), FUNC(attache_state::display_data_w)).select(0xff00); + map(0xff, 0xff).rw(FUNC(attache_state::memmap_r), FUNC(attache_state::memmap_w)).mirror(0xff00); } void attache816_state::attache816_io(address_map &map) { - map(0xb8, 0xb8).rw(this, FUNC(attache816_state::z80_comms_status_r), FUNC(attache816_state::z80_comms_ctrl_w)).mirror(0xff00); - map(0xb9, 0xb9).rw(this, FUNC(attache816_state::z80_comms_r), FUNC(attache816_state::z80_comms_w)).mirror(0xff00); + map(0xb8, 0xb8).rw(FUNC(attache816_state::z80_comms_status_r), FUNC(attache816_state::z80_comms_ctrl_w)).mirror(0xff00); + map(0xb9, 0xb9).rw(FUNC(attache816_state::z80_comms_r), FUNC(attache816_state::z80_comms_w)).mirror(0xff00); map(0xe0, 0xed).rw(m_dma, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).mirror(0xff00); - map(0xee, 0xee).w(this, FUNC(attache816_state::display_command_w)).mirror(0xff00); - map(0xef, 0xef).rw(this, FUNC(attache816_state::dma_mask_r), FUNC(attache816_state::dma_mask_w)).mirror(0xff00); + map(0xee, 0xee).w(FUNC(attache816_state::display_command_w)).mirror(0xff00); + map(0xef, 0xef).rw(FUNC(attache816_state::dma_mask_r), FUNC(attache816_state::dma_mask_w)).mirror(0xff00); map(0xf0, 0xf1).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).mirror(0xff00); map(0xf4, 0xf7).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)).mirror(0xff00); map(0xf8, 0xfb).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)).mirror(0xff00); map(0xfc, 0xfd).m(m_fdc, FUNC(upd765a_device::map)).mirror(0xff00); - map(0xfe, 0xfe).rw(this, FUNC(attache816_state::display_data_r), FUNC(attache816_state::display_data_w)).select(0xff00); - map(0xff, 0xff).rw(this, FUNC(attache816_state::memmap_r), FUNC(attache816_state::memmap_w)).mirror(0xff00); + map(0xfe, 0xfe).rw(FUNC(attache816_state::display_data_r), FUNC(attache816_state::display_data_w)).select(0xff00); + map(0xff, 0xff).rw(FUNC(attache816_state::memmap_r), FUNC(attache816_state::memmap_w)).mirror(0xff00); } void attache816_state::attache_x86_map(address_map &map) @@ -950,7 +950,7 @@ void attache816_state::attache_x86_map(address_map &map) void attache816_state::attache_x86_io(address_map &map) { map(0x100, 0x107).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x108, 0x10d).w(this, FUNC(attache816_state::x86_iobf_enable_w)); + map(0x108, 0x10d).w(FUNC(attache816_state::x86_iobf_enable_w)); // 0x140/2/4/6 - Z8530 SCC serial // 0x180/2/4/6/8/a/c/e - GPIB (TMS9914A) } diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp index 4bc05ee309e..f2311b32319 100644 --- a/src/mame/drivers/attckufo.cpp +++ b/src/mame/drivers/attckufo.cpp @@ -57,12 +57,12 @@ void attckufo_state::cpu_map(address_map &map) void attckufo_state::vic_videoram_map(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(attckufo_state::vic_videoram_r)); + map(0x0000, 0x3fff).r(FUNC(attckufo_state::vic_videoram_r)); } void attckufo_state::vic_colorram_map(address_map &map) { - map(0x000, 0x3ff).r(this, FUNC(attckufo_state::vic_colorram_r)); + map(0x000, 0x3ff).r(FUNC(attckufo_state::vic_colorram_r)); } diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index 85c47962e8f..e634ebe245f 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/src/mame/drivers/atvtrack.cpp @@ -510,17 +510,17 @@ void smashdrv_state::machine_reset() void atvtrack_state::atvtrack_main_map(address_map &map) { map(0x00000000, 0x000003ff).ram().share("sharedmem"); - map(0x00020000, 0x00020007).rw(this, FUNC(atvtrack_state::control_r), FUNC(atvtrack_state::control_w)); // control registers + map(0x00020000, 0x00020007).rw(FUNC(atvtrack_state::control_r), FUNC(atvtrack_state::control_w)); // control registers // AM_RANGE(0x00020040, 0x0002007f) // audio DAC buffer - map(0x14000000, 0x14000007).rw(this, FUNC(atvtrack_state::nand_data_r), FUNC(atvtrack_state::nand_data_w)); - map(0x14100000, 0x14100007).w(this, FUNC(atvtrack_state::nand_cmd_w)); - map(0x14200000, 0x14200007).w(this, FUNC(atvtrack_state::nand_addr_w)); + map(0x14000000, 0x14000007).rw(FUNC(atvtrack_state::nand_data_r), FUNC(atvtrack_state::nand_data_w)); + map(0x14100000, 0x14100007).w(FUNC(atvtrack_state::nand_cmd_w)); + map(0x14200000, 0x14200007).w(FUNC(atvtrack_state::nand_addr_w)); map(0x0c000000, 0x0c7fffff).ram(); } void atvtrack_state::atvtrack_main_port(address_map &map) { - map(0x00, 0x1f).rw(this, FUNC(atvtrack_state::ioport_r), FUNC(atvtrack_state::ioport_w)); + map(0x00, 0x1f).rw(FUNC(atvtrack_state::ioport_r), FUNC(atvtrack_state::ioport_w)); } // Smashing Drive @@ -530,7 +530,7 @@ void smashdrv_state::smashdrv_main_map(address_map &map) map(0x00000000, 0x03ffffff).rom(); map(0x0c000000, 0x0c7fffff).ram(); map(0x10000000, 0x100003ff).ram().share("sharedmem"); - map(0x10000400, 0x10000407).rw(this, FUNC(smashdrv_state::control_r), FUNC(smashdrv_state::control_w)); // control registers + map(0x10000400, 0x10000407).rw(FUNC(smashdrv_state::control_r), FUNC(smashdrv_state::control_w)); // control registers // 0x10000400 - 0x1000043F control registers // 0x10000440 - 0x1000047F Audio DAC buffer @@ -539,7 +539,7 @@ void smashdrv_state::smashdrv_main_map(address_map &map) void smashdrv_state::smashdrv_main_port(address_map &map) { - map(0x00, 0x1f).rw(this, FUNC(smashdrv_state::ioport_r), FUNC(smashdrv_state::ioport_w)); + map(0x00, 0x1f).rw(FUNC(smashdrv_state::ioport_r), FUNC(smashdrv_state::ioport_w)); } // Sub CPU (same for both games) @@ -548,7 +548,7 @@ void atvtrack_state::atvtrack_sub_map(address_map &map) { map(0x00000000, 0x000003ff).ram().share("sharedmem"); map(0x0c000000, 0x0cffffff).ram(); - map(0x14000000, 0x14003fff).rw(this, FUNC(atvtrack_state::gpu_r), FUNC(atvtrack_state::gpu_w)); + map(0x14000000, 0x14003fff).rw(FUNC(atvtrack_state::gpu_r), FUNC(atvtrack_state::gpu_w)); // 0x14004xxx GPU PCI CONFIG registers map(0x18000000, 0x19ffffff).ram(); // 0x18000000 - 0x19FFFFFF GPU RAM (32MB) diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index 27d180e9193..eed5fdfdf3e 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -60,28 +60,28 @@ void aussiebyte_state::aussiebyte_io(address_map &map) map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0c, 0x0f).noprw(); // winchester interface map(0x10, 0x13).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)); - map(0x14, 0x14).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0x15, 0x15).w(this, FUNC(aussiebyte_state::port15_w)); // boot rom disable - map(0x16, 0x16).w(this, FUNC(aussiebyte_state::port16_w)); // fdd select - map(0x17, 0x17).w(this, FUNC(aussiebyte_state::port17_w)); // DMA mux - map(0x18, 0x18).w(this, FUNC(aussiebyte_state::port18_w)); // fdc select - map(0x19, 0x19).r(this, FUNC(aussiebyte_state::port19_r)); // info port - map(0x1a, 0x1a).w(this, FUNC(aussiebyte_state::port1a_w)); // membank - map(0x1b, 0x1b).w(this, FUNC(aussiebyte_state::port1b_w)); // winchester control - map(0x1c, 0x1f).w(this, FUNC(aussiebyte_state::port1c_w)); // gpebh select + map(0x14, 0x14).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x15, 0x15).w(FUNC(aussiebyte_state::port15_w)); // boot rom disable + map(0x16, 0x16).w(FUNC(aussiebyte_state::port16_w)); // fdd select + map(0x17, 0x17).w(FUNC(aussiebyte_state::port17_w)); // DMA mux + map(0x18, 0x18).w(FUNC(aussiebyte_state::port18_w)); // fdc select + map(0x19, 0x19).r(FUNC(aussiebyte_state::port19_r)); // info port + map(0x1a, 0x1a).w(FUNC(aussiebyte_state::port1a_w)); // membank + map(0x1b, 0x1b).w(FUNC(aussiebyte_state::port1b_w)); // winchester control + map(0x1c, 0x1f).w(FUNC(aussiebyte_state::port1c_w)); // gpebh select map(0x20, 0x23).rw(m_pio2, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x24, 0x27).rw("sio2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); - map(0x28, 0x28).r(this, FUNC(aussiebyte_state::port28_r)).w(m_votrax, FUNC(votrax_sc01_device::write)); + map(0x28, 0x28).r(FUNC(aussiebyte_state::port28_r)).w(m_votrax, FUNC(votrax_sc01_device::write)); map(0x2c, 0x2c).w(m_votrax, FUNC(votrax_sc01_device::inflection_w)); - map(0x30, 0x30).w(this, FUNC(aussiebyte_state::address_w)); + map(0x30, 0x30).w(FUNC(aussiebyte_state::address_w)); map(0x31, 0x31).r(m_crtc, FUNC(mc6845_device::status_r)); - map(0x32, 0x32).w(this, FUNC(aussiebyte_state::register_w)); - map(0x33, 0x33).r(this, FUNC(aussiebyte_state::port33_r)); - map(0x34, 0x34).w(this, FUNC(aussiebyte_state::port34_w)); // video control - map(0x35, 0x35).w(this, FUNC(aussiebyte_state::port35_w)); // data to vram and aram - map(0x36, 0x36).r(this, FUNC(aussiebyte_state::port36_r)); // data from vram and aram - map(0x37, 0x37).r(this, FUNC(aussiebyte_state::port37_r)); // read dispen flag - map(0x40, 0x4f).rw(this, FUNC(aussiebyte_state::rtc_r), FUNC(aussiebyte_state::rtc_w)); + map(0x32, 0x32).w(FUNC(aussiebyte_state::register_w)); + map(0x33, 0x33).r(FUNC(aussiebyte_state::port33_r)); + map(0x34, 0x34).w(FUNC(aussiebyte_state::port34_w)); // video control + map(0x35, 0x35).w(FUNC(aussiebyte_state::port35_w)); // data to vram and aram + map(0x36, 0x36).r(FUNC(aussiebyte_state::port36_r)); // data from vram and aram + map(0x37, 0x37).r(FUNC(aussiebyte_state::port37_r)); // read dispen flag + map(0x40, 0x4f).rw(FUNC(aussiebyte_state::rtc_r), FUNC(aussiebyte_state::rtc_w)); } /*********************************************************** @@ -552,8 +552,8 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_DEVICE_ADD("pio1", Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) - MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, read)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) + MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, bus_r)) MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_INVERT MCFG_DEVICE_ADD("pio2", Z80PIO, 16_MHz_XTAL / 4) diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp index 5172ed256ba..6b935977d5d 100644 --- a/src/mame/drivers/avalnche.cpp +++ b/src/mame/drivers/avalnche.cpp @@ -107,7 +107,7 @@ void avalnche_state::main_map(address_map &map) map(0x2003, 0x2003).mirror(0x0ffc).nopr(); map(0x3000, 0x3000).mirror(0x0fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x4000, 0x4007).mirror(0x0ff8).w("latch", FUNC(f9334_device::write_d0)); - map(0x5000, 0x5000).mirror(0x0fff).w(this, FUNC(avalnche_state::avalnche_noise_amplitude_w)); + map(0x5000, 0x5000).mirror(0x0fff).w(FUNC(avalnche_state::avalnche_noise_amplitude_w)); map(0x6000, 0x7fff).rom(); } @@ -121,7 +121,7 @@ void avalnche_state::catch_map(address_map &map) map(0x2003, 0x2003).mirror(0x0ffc).nopr(); map(0x3000, 0x3000).mirror(0x0fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x4000, 0x4007).mirror(0x0ff8).w("latch", FUNC(f9334_device::write_d0)); - map(0x6000, 0x6000).mirror(0x0fff).w(this, FUNC(avalnche_state::catch_coin_counter_w)); + map(0x6000, 0x6000).mirror(0x0fff).w(FUNC(avalnche_state::catch_coin_counter_w)); map(0x7000, 0x7fff).rom(); } diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp index b703f1c8ad7..538d4172a54 100644 --- a/src/mame/drivers/avigo.cpp +++ b/src/mame/drivers/avigo.cpp @@ -174,7 +174,7 @@ void avigo_state::avigo_banked_map(address_map &map) map(0x1400000, 0x14fffff).mirror(0x0300000).rw("flash2", FUNC(intelfsh8_device::read), FUNC(intelfsh8_device::write)); map(0x1c00000, 0x1cfffff).mirror(0x0300000).rw("flash0", FUNC(intelfsh8_device::read), FUNC(intelfsh8_device::write)); - map(0x1800000, 0x1803fff).mirror(0x03fc000).rw(this, FUNC(avigo_state::vid_memory_r), FUNC(avigo_state::vid_memory_w)); + map(0x1800000, 0x1803fff).mirror(0x03fc000).rw(FUNC(avigo_state::vid_memory_r), FUNC(avigo_state::vid_memory_w)); } void avigo_state::avigo_mem(address_map &map) @@ -502,16 +502,16 @@ void avigo_state::avigo_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x001, 0x001).rw(this, FUNC(avigo_state::key_data_read_r), FUNC(avigo_state::set_key_line_w)); - map(0x002, 0x002).w(this, FUNC(avigo_state::port2_w)); - map(0x003, 0x003).rw(this, FUNC(avigo_state::irq_r), FUNC(avigo_state::irq_w)); - map(0x004, 0x004).r(this, FUNC(avigo_state::port_04_r)); - map(0x005, 0x006).rw(this, FUNC(avigo_state::bank1_r), FUNC(avigo_state::bank1_w)); - map(0x007, 0x008).rw(this, FUNC(avigo_state::bank2_r), FUNC(avigo_state::bank2_w)); - map(0x009, 0x009).rw(this, FUNC(avigo_state::ad_control_status_r), FUNC(avigo_state::ad_control_status_w)); + map(0x001, 0x001).rw(FUNC(avigo_state::key_data_read_r), FUNC(avigo_state::set_key_line_w)); + map(0x002, 0x002).w(FUNC(avigo_state::port2_w)); + map(0x003, 0x003).rw(FUNC(avigo_state::irq_r), FUNC(avigo_state::irq_w)); + map(0x004, 0x004).r(FUNC(avigo_state::port_04_r)); + map(0x005, 0x006).rw(FUNC(avigo_state::bank1_r), FUNC(avigo_state::bank1_w)); + map(0x007, 0x008).rw(FUNC(avigo_state::bank2_r), FUNC(avigo_state::bank2_w)); + map(0x009, 0x009).rw(FUNC(avigo_state::ad_control_status_r), FUNC(avigo_state::ad_control_status_w)); map(0x010, 0x01f).rw("rtc", FUNC(tc8521_device::read), FUNC(tc8521_device::write)); - map(0x028, 0x028).w(this, FUNC(avigo_state::speaker_w)); - map(0x02d, 0x02d).r(this, FUNC(avigo_state::ad_data_r)); + map(0x028, 0x028).w(FUNC(avigo_state::speaker_w)); + map(0x02d, 0x02d).r(FUNC(avigo_state::ad_data_r)); map(0x030, 0x037).rw(m_uart, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); } diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp index 2705902e91d..901cd20c5fd 100644 --- a/src/mame/drivers/avt.cpp +++ b/src/mame/drivers/avt.cpp @@ -651,8 +651,8 @@ void avt_state::avt_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x7fff).ram(); map(0x8000, 0x9fff).ram(); // AM_SHARE("nvram") - map(0xa000, 0xa7ff).ram().w(this, FUNC(avt_state::avt_videoram_w)).share("videoram"); - map(0xc000, 0xc7ff).ram().w(this, FUNC(avt_state::avt_colorram_w)).share("colorram"); + map(0xa000, 0xa7ff).ram().w(FUNC(avt_state::avt_videoram_w)).share("videoram"); + map(0xc000, 0xc7ff).ram().w(FUNC(avt_state::avt_colorram_w)).share("colorram"); } void avt_state::avt_portmap(address_map &map) @@ -663,8 +663,8 @@ void avt_state::avt_portmap(address_map &map) map(0x0c, 0x0f).rw("ctc0", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x21, 0x21).w("aysnd", FUNC(ay8910_device::data_w)); /* AY8910 data */ map(0x23, 0x23).w("aysnd", FUNC(ay8910_device::address_w)); /* AY8910 control */ - map(0x28, 0x28).w(this, FUNC(avt_state::avt_6845_address_w)); - map(0x29, 0x29).rw(this, FUNC(avt_state::avt_6845_data_r), FUNC(avt_state::avt_6845_data_w)); + map(0x28, 0x28).w(FUNC(avt_state::avt_6845_address_w)); + map(0x29, 0x29).rw(FUNC(avt_state::avt_6845_data_r), FUNC(avt_state::avt_6845_data_w)); } /* I/O byte R/W diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp index 320346496d7..03f903c79e2 100644 --- a/src/mame/drivers/ax20.cpp +++ b/src/mame/drivers/ax20.cpp @@ -92,9 +92,9 @@ void ax20_state::ax20_map(address_map &map) void ax20_state::ax20_io(address_map &map) { map.unmap_value_high(); - map(0xffc0, 0xffc0).w(this, FUNC(ax20_state::tc_w)); - map(0xffd0, 0xffd0).w(this, FUNC(ax20_state::ctl_w)); - map(0xffe0, 0xffe0).r(this, FUNC(ax20_state::unk_r)); + map(0xffc0, 0xffc0).w(FUNC(ax20_state::tc_w)); + map(0xffd0, 0xffd0).w(FUNC(ax20_state::ctl_w)); + map(0xffe0, 0xffe0).r(FUNC(ax20_state::unk_r)); map(0xff80, 0xff81).m(m_fdc, FUNC(i8272a_device::map)); } diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp index 196fd0fd19a..9c7e5d093ca 100644 --- a/src/mame/drivers/aztarac.cpp +++ b/src/mame/drivers/aztarac.cpp @@ -81,14 +81,14 @@ READ16_MEMBER(aztarac_state::joystick_r) void aztarac_state::main_map(address_map &map) { map(0x000000, 0x00bfff).rom(); - map(0x022000, 0x0220ff).r(this, FUNC(aztarac_state::nvram_r)).writeonly().share("nvram"); - map(0x027000, 0x027001).r(this, FUNC(aztarac_state::joystick_r)); + map(0x022000, 0x0220ff).r(FUNC(aztarac_state::nvram_r)).writeonly().share("nvram"); + map(0x027000, 0x027001).r(FUNC(aztarac_state::joystick_r)); map(0x027004, 0x027005).portr("INPUTS"); - map(0x027008, 0x027009).rw(this, FUNC(aztarac_state::sound_r), FUNC(aztarac_state::sound_w)); + map(0x027008, 0x027009).rw(FUNC(aztarac_state::sound_r), FUNC(aztarac_state::sound_w)); map(0x02700c, 0x02700d).portr("DIAL"); map(0x02700e, 0x02700f).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); map(0xff8000, 0xffafff).ram().share("vectorram"); - map(0xffb000, 0xffb001).w(this, FUNC(aztarac_state::ubr_w)); + map(0xffb000, 0xffb001).w(FUNC(aztarac_state::ubr_w)); map(0xffe000, 0xffffff).ram(); } @@ -104,12 +104,12 @@ void aztarac_state::sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8800).r(this, FUNC(aztarac_state::snd_command_r)); + map(0x8800, 0x8800).r(FUNC(aztarac_state::snd_command_r)); map(0x8c00, 0x8c01).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_address_w)); map(0x8c02, 0x8c03).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_address_w)); map(0x8c04, 0x8c05).rw("ay3", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_address_w)); map(0x8c06, 0x8c07).rw("ay4", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_address_w)); - map(0x9000, 0x9000).rw(this, FUNC(aztarac_state::snd_status_r), FUNC(aztarac_state::snd_status_w)); + map(0x9000, 0x9000).rw(FUNC(aztarac_state::snd_status_r), FUNC(aztarac_state::snd_status_w)); } diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp index e3589046f03..e208a0579e7 100644 --- a/src/mame/drivers/b16.cpp +++ b/src/mame/drivers/b16.cpp @@ -129,7 +129,7 @@ void b16_state::b16_map(address_map &map) map(0x00000, 0x9ffff).ram(); // probably not all of it. map(0xa0000, 0xaffff).ram(); // bitmap? map(0xb0000, 0xb7fff).ram().share("vram"); // tvram - map(0xb8000, 0xbbfff).w(this, FUNC(b16_state::b16_pcg_w)).umask16(0x00ff); // pcg + map(0xb8000, 0xbbfff).w(FUNC(b16_state::b16_pcg_w)).umask16(0x00ff); // pcg map(0xfc000, 0xfffff).rom().region("ipl", 0); } @@ -220,11 +220,11 @@ WRITE8_MEMBER( b16_state::unk_dev_w ) void b16_state::b16_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x0f).rw(this, FUNC(b16_state::unk_dev_r), FUNC(b16_state::unk_dev_w)).umask16(0x00ff); // DMA device? - map(0x20, 0x20).w(this, FUNC(b16_state::b16_6845_address_w)); - map(0x22, 0x22).w(this, FUNC(b16_state::b16_6845_data_w)); + map(0x00, 0x0f).rw(FUNC(b16_state::unk_dev_r), FUNC(b16_state::unk_dev_w)).umask16(0x00ff); // DMA device? + map(0x20, 0x20).w(FUNC(b16_state::b16_6845_address_w)); + map(0x22, 0x22).w(FUNC(b16_state::b16_6845_data_w)); //0x79 bit 0 DSW? - map(0x80, 0x81).r(this, FUNC(b16_state::vblank_r)); // TODO + map(0x80, 0x81).r(FUNC(b16_state::vblank_r)); // TODO } diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp index 6f2153e29f7..86a71c04e87 100644 --- a/src/mame/drivers/b2m.cpp +++ b/src/mame/drivers/b2m.cpp @@ -39,8 +39,8 @@ void b2m_state::b2m_io(address_map &map) map(0x00, 0x03).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x04, 0x07).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x0c, 0x0c).rw(this, FUNC(b2m_state::b2m_localmachine_r), FUNC(b2m_state::b2m_localmachine_w)); - map(0x10, 0x13).rw(this, FUNC(b2m_state::b2m_palette_r), FUNC(b2m_state::b2m_palette_w)); + map(0x0c, 0x0c).rw(FUNC(b2m_state::b2m_localmachine_r), FUNC(b2m_state::b2m_localmachine_w)); + map(0x10, 0x13).rw(FUNC(b2m_state::b2m_palette_r), FUNC(b2m_state::b2m_palette_w)); map(0x14, 0x15).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x18, 0x18).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x19, 0x19).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); @@ -53,8 +53,8 @@ void b2m_state::b2m_rom_io(address_map &map) map(0x00, 0x03).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x04, 0x07).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x0c, 0x0c).rw(this, FUNC(b2m_state::b2m_localmachine_r), FUNC(b2m_state::b2m_localmachine_w)); - map(0x10, 0x13).rw(this, FUNC(b2m_state::b2m_palette_r), FUNC(b2m_state::b2m_palette_w)); + map(0x0c, 0x0c).rw(FUNC(b2m_state::b2m_localmachine_r), FUNC(b2m_state::b2m_localmachine_w)); + map(0x10, 0x13).rw(FUNC(b2m_state::b2m_palette_r), FUNC(b2m_state::b2m_palette_w)); map(0x14, 0x15).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x18, 0x18).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x19, 0x19).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index 385ca14ff5b..4636208ddb7 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -262,28 +262,28 @@ void backfire_state::backfire_map(address_map &map) map(0x100000, 0x10001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x110000, 0x111fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x114000, 0x115fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x120000, 0x120fff).rw(this, FUNC(backfire_state::pf1_rowscroll_r), FUNC(backfire_state::pf1_rowscroll_w)); - map(0x124000, 0x124fff).rw(this, FUNC(backfire_state::pf2_rowscroll_r), FUNC(backfire_state::pf2_rowscroll_w)); + map(0x120000, 0x120fff).rw(FUNC(backfire_state::pf1_rowscroll_r), FUNC(backfire_state::pf1_rowscroll_w)); + map(0x124000, 0x124fff).rw(FUNC(backfire_state::pf2_rowscroll_r), FUNC(backfire_state::pf2_rowscroll_w)); map(0x130000, 0x13001f).rw(m_deco_tilegen2, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x140000, 0x141fff).rw(m_deco_tilegen2, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x144000, 0x145fff).rw(m_deco_tilegen2, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x150000, 0x150fff).rw(this, FUNC(backfire_state::pf3_rowscroll_r), FUNC(backfire_state::pf3_rowscroll_w)); - map(0x154000, 0x154fff).rw(this, FUNC(backfire_state::pf4_rowscroll_r), FUNC(backfire_state::pf4_rowscroll_w)); + map(0x150000, 0x150fff).rw(FUNC(backfire_state::pf3_rowscroll_r), FUNC(backfire_state::pf3_rowscroll_w)); + map(0x154000, 0x154fff).rw(FUNC(backfire_state::pf4_rowscroll_r), FUNC(backfire_state::pf4_rowscroll_w)); map(0x160000, 0x161fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); map(0x170000, 0x177fff).ram().share("mainram");// main ram map(0x180010, 0x180013).nopw(); // always 180010 ? - map(0x184000, 0x185fff).rw(this, FUNC(backfire_state::spriteram1_r), FUNC(backfire_state::spriteram1_w)); + map(0x184000, 0x185fff).rw(FUNC(backfire_state::spriteram1_r), FUNC(backfire_state::spriteram1_w)); map(0x188010, 0x188013).nopw(); // always 188010 ? - map(0x18c000, 0x18dfff).rw(this, FUNC(backfire_state::spriteram2_r), FUNC(backfire_state::spriteram2_w)); + map(0x18c000, 0x18dfff).rw(FUNC(backfire_state::spriteram2_r), FUNC(backfire_state::spriteram2_w)); map(0x190000, 0x190003).portr("IN0"); map(0x194000, 0x194003).portr("IN1"); - map(0x1a4000, 0x1a4000).w(this, FUNC(backfire_state::eeprom_w)); + map(0x1a4000, 0x1a4000).w(FUNC(backfire_state::eeprom_w)); map(0x1a8000, 0x1a8003).ram().share("left_priority"); map(0x1ac000, 0x1ac003).ram().share("right_priority"); - map(0x1b0000, 0x1b0003).w(this, FUNC(backfire_state::irq_ack_w)); + map(0x1b0000, 0x1b0003).w(FUNC(backfire_state::irq_ack_w)); map(0x1c0000, 0x1c0007).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask32(0x000000ff); map(0x1e4000, 0x1e4000).r("adc", FUNC(adc0808_device::data_r)); - map(0x1e8000, 0x1e8007).r(this, FUNC(backfire_state::pot_select_r)); + map(0x1e8000, 0x1e8007).r(FUNC(backfire_state::pot_select_r)); } diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp index 0671f81c1ba..d50894949f1 100644 --- a/src/mame/drivers/badlands.cpp +++ b/src/mame/drivers/badlands.cpp @@ -362,18 +362,18 @@ WRITE8_MEMBER(badlands_state::audio_io_w) void badlands_state::main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0xfc0000, 0xfc1fff).r(this, FUNC(badlands_state::sound_busy_r)).w(m_soundcomm, FUNC(atari_sound_comm_device::sound_reset_w)); + map(0xfc0000, 0xfc1fff).r(FUNC(badlands_state::sound_busy_r)).w(m_soundcomm, FUNC(atari_sound_comm_device::sound_reset_w)); map(0xfd0000, 0xfd1fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0xfe0000, 0xfe1fff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0xfe2000, 0xfe3fff).w(this, FUNC(badlands_state::video_int_ack_w)); + map(0xfe2000, 0xfe3fff).w(FUNC(badlands_state::video_int_ack_w)); map(0xfe4000, 0xfe5fff).portr("FE4000"); map(0xfe6000, 0xfe6001).portr("FE6000"); map(0xfe6002, 0xfe6003).portr("FE6002"); - map(0xfe6004, 0xfe6005).r(this, FUNC(badlands_state::pedal_0_r)); - map(0xfe6006, 0xfe6007).r(this, FUNC(badlands_state::pedal_1_r)); + map(0xfe6004, 0xfe6005).r(FUNC(badlands_state::pedal_0_r)); + map(0xfe6006, 0xfe6007).r(FUNC(badlands_state::pedal_1_r)); map(0xfe8000, 0xfe9fff).w(m_soundcomm, FUNC(atari_sound_comm_device::main_command_w)).umask16(0xff00); map(0xfea000, 0xfebfff).r(m_soundcomm, FUNC(atari_sound_comm_device::main_response_r)).umask16(0xff00); - map(0xfec000, 0xfedfff).w(this, FUNC(badlands_state::badlands_pf_bank_w)); + map(0xfec000, 0xfedfff).w(FUNC(badlands_state::badlands_pf_bank_w)); map(0xfee000, 0xfeffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0xffc000, 0xffc3ff).rw("palette", FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0xff00).share("palette"); map(0xffe000, 0xffefff).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); @@ -393,7 +393,7 @@ void badlands_state::audio_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x2001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x2800, 0x2bff).rw(this, FUNC(badlands_state::audio_io_r), FUNC(badlands_state::audio_io_w)); + map(0x2800, 0x2bff).rw(FUNC(badlands_state::audio_io_r), FUNC(badlands_state::audio_io_w)); map(0x3000, 0x3fff).bankr("soundbank"); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/badlandsbl.cpp b/src/mame/drivers/badlandsbl.cpp index 785dee352a2..477da52a411 100644 --- a/src/mame/drivers/badlandsbl.cpp +++ b/src/mame/drivers/badlandsbl.cpp @@ -101,23 +101,23 @@ void badlandsbl_state::bootleg_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x400000, 0x400005).rw(this, FUNC(badlandsbl_state::bootleg_shared_r), FUNC(badlandsbl_state::bootleg_shared_w)); - map(0x400006, 0x400006).r(this, FUNC(badlandsbl_state::sound_response_r)); + map(0x400000, 0x400005).rw(FUNC(badlandsbl_state::bootleg_shared_r), FUNC(badlandsbl_state::bootleg_shared_w)); + map(0x400006, 0x400006).r(FUNC(badlandsbl_state::sound_response_r)); map(0x400008, 0x40000f).ram(); // breaks tilemap gfxs otherwise? map(0x400010, 0x4000ff).ram().share("spriteram"); // sound comms? - map(0xfc0000, 0xfc0001).r(this, FUNC(badlandsbl_state::badlandsb_unk_r)).nopw(); + map(0xfc0000, 0xfc0001).r(FUNC(badlandsbl_state::badlandsb_unk_r)).nopw(); map(0xfd0000, 0xfd1fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); //AM_RANGE(0xfe0000, 0xfe1fff) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w) - map(0xfe2000, 0xfe3fff).w(this, FUNC(badlandsbl_state::video_int_ack_w)); + map(0xfe2000, 0xfe3fff).w(FUNC(badlandsbl_state::video_int_ack_w)); map(0xfe0000, 0xfe0001).nopw(); map(0xfe4000, 0xfe4001).portr("FE4000"); map(0xfe4004, 0xfe4005).portr("P1"); map(0xfe4006, 0xfe4007).portr("P2"); - map(0xfe4008, 0xfe4009).w(this, FUNC(badlandsbl_state::badlands_pf_bank_w)); + map(0xfe4008, 0xfe4009).w(FUNC(badlandsbl_state::badlands_pf_bank_w)); map(0xfe400c, 0xfe400d).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0xffc000, 0xffc3ff).rw("palette", FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0xff00).share("palette"); @@ -138,7 +138,7 @@ void badlandsbl_state::bootleg_audio_map(address_map &map) map(0x2000, 0x2005).ram().share("b_sharedram"); map(0x2006, 0x3fff).ram(); map(0x4000, 0xcfff).rom().region("audiorom", 0x4000); - map(0xd400, 0xd400).w(this, FUNC(badlandsbl_state::bootleg_main_irq_w)); + map(0xd400, 0xd400).w(FUNC(badlandsbl_state::bootleg_main_irq_w)); map(0xd800, 0xd801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xe000, 0xffff).noprw(); // either RAM mirror or left-over } diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp index 453961e3f29..03830cbeac7 100644 --- a/src/mame/drivers/bagman.cpp +++ b/src/mame/drivers/bagman.cpp @@ -132,16 +132,16 @@ void bagman_state::main_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x67ff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(bagman_state::videoram_w)).share("videoram"); - map(0x9800, 0x9bff).ram().w(this, FUNC(bagman_state::colorram_w)).share("colorram"); + map(0x9000, 0x93ff).ram().w(FUNC(bagman_state::videoram_w)).share("videoram"); + map(0x9800, 0x9bff).ram().w(FUNC(bagman_state::colorram_w)).share("colorram"); map(0x9c00, 0x9fff).nopw(); /* written to, but unused */ - map(0xa000, 0xa000).r(this, FUNC(bagman_state::pal16r6_r)); + map(0xa000, 0xa000).r(FUNC(bagman_state::pal16r6_r)); map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xc000, 0xffff).rom(); /* Super Bagman only */ map(0x9800, 0x981f).writeonly().share("spriteram"); /* hidden portion of color RAM */ /* here only to initialize the pointer, */ /* writes are handled by colorram_w */ - map(0xa800, 0xa807).w(this, FUNC(bagman_state::ls259_w)); /* TMS5110 driving state machine */ + map(0xa800, 0xa807).w(FUNC(bagman_state::ls259_w)); /* TMS5110 driving state machine */ map(0xb000, 0xb000).portr("DSW"); map(0xb800, 0xb800).nopr(); /* looks like watchdog from schematics */ @@ -157,8 +157,8 @@ void bagman_state::pickin_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x7000, 0x77ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(bagman_state::videoram_w)).share("videoram"); - map(0x9800, 0x9bff).ram().w(this, FUNC(bagman_state::colorram_w)).share("colorram"); + map(0x8800, 0x8bff).ram().w(FUNC(bagman_state::videoram_w)).share("videoram"); + map(0x9800, 0x9bff).ram().w(FUNC(bagman_state::colorram_w)).share("colorram"); map(0x9800, 0x981f).writeonly().share("spriteram"); /* hidden portion of color RAM */ /* here only to initialize the pointer, */ /* writes are handled by colorram_w */ diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp index bc714b2d667..38ca7f58448 100644 --- a/src/mame/drivers/balsente.cpp +++ b/src/mame/drivers/balsente.cpp @@ -249,24 +249,24 @@ DIP locations verified for: void balsente_state::cpu1_map(address_map &map) { map(0x0000, 0x07ff).ram().share("spriteram"); - map(0x0800, 0x7fff).ram().w(this, FUNC(balsente_state::balsente_videoram_w)).share("videoram"); - map(0x8000, 0x8fff).ram().w(this, FUNC(balsente_state::balsente_paletteram_w)).share("paletteram"); - map(0x9000, 0x9007).w(this, FUNC(balsente_state::balsente_adc_select_w)); - map(0x9400, 0x9401).r(this, FUNC(balsente_state::balsente_adc_data_r)); + map(0x0800, 0x7fff).ram().w(FUNC(balsente_state::balsente_videoram_w)).share("videoram"); + map(0x8000, 0x8fff).ram().w(FUNC(balsente_state::balsente_paletteram_w)).share("paletteram"); + map(0x9000, 0x9007).w(FUNC(balsente_state::balsente_adc_select_w)); + map(0x9400, 0x9401).r(FUNC(balsente_state::balsente_adc_data_r)); map(0x9800, 0x981f).mirror(0x0060).lw8("outlatch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_outlatch->write_d7(space, offset >> 2, data, mem_mask); }); - map(0x9880, 0x989f).w(this, FUNC(balsente_state::balsente_random_reset_w)); - map(0x98a0, 0x98bf).w(this, FUNC(balsente_state::balsente_rombank_select_w)); - map(0x98c0, 0x98df).w(this, FUNC(balsente_state::balsente_palette_select_w)); + map(0x9880, 0x989f).w(FUNC(balsente_state::balsente_random_reset_w)); + map(0x98a0, 0x98bf).w(FUNC(balsente_state::balsente_rombank_select_w)); + map(0x98c0, 0x98df).w(FUNC(balsente_state::balsente_palette_select_w)); map(0x98e0, 0x98ff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x9900, 0x9900).portr("SWH"); map(0x9901, 0x9901).portr("SWG"); map(0x9902, 0x9902).portr("IN0"); map(0x9903, 0x9903).portr("IN1").nopw(); - map(0x9a00, 0x9a03).r(this, FUNC(balsente_state::balsente_random_num_r)); - map(0x9a04, 0x9a05).rw(this, FUNC(balsente_state::balsente_m6850_r), FUNC(balsente_state::balsente_m6850_w)); + map(0x9a00, 0x9a03).r(FUNC(balsente_state::balsente_random_num_r)); + map(0x9a04, 0x9a05).rw(FUNC(balsente_state::balsente_m6850_r), FUNC(balsente_state::balsente_m6850_w)); map(0x9b00, 0x9cff).ram().share("nvram"); /* system+cart NOVRAM */ map(0xa000, 0xbfff).bankr("bank1"); map(0xc000, 0xffff).bankr("bank2"); @@ -284,20 +284,20 @@ void balsente_state::cpu2_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x5fff).ram(); - map(0x6000, 0x7fff).w(this, FUNC(balsente_state::balsente_m6850_sound_w)); - map(0xe000, 0xffff).r(this, FUNC(balsente_state::balsente_m6850_sound_r)); + map(0x6000, 0x7fff).w(FUNC(balsente_state::balsente_m6850_sound_w)); + map(0xe000, 0xffff).r(FUNC(balsente_state::balsente_m6850_sound_r)); } void balsente_state::cpu2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x03).rw(this, FUNC(balsente_state::balsente_counter_8253_r), FUNC(balsente_state::balsente_counter_8253_w)); - map(0x08, 0x0f).r(this, FUNC(balsente_state::balsente_counter_state_r)); - map(0x08, 0x09).w(this, FUNC(balsente_state::balsente_counter_control_w)); - map(0x0a, 0x0b).w(this, FUNC(balsente_state::balsente_dac_data_w)); - map(0x0c, 0x0d).w(this, FUNC(balsente_state::balsente_register_addr_w)); - map(0x0e, 0x0f).w(this, FUNC(balsente_state::balsente_chip_select_w)); + map(0x00, 0x03).rw(FUNC(balsente_state::balsente_counter_8253_r), FUNC(balsente_state::balsente_counter_8253_w)); + map(0x08, 0x0f).r(FUNC(balsente_state::balsente_counter_state_r)); + map(0x08, 0x09).w(FUNC(balsente_state::balsente_counter_control_w)); + map(0x0a, 0x0b).w(FUNC(balsente_state::balsente_dac_data_w)); + map(0x0c, 0x0d).w(FUNC(balsente_state::balsente_register_addr_w)); + map(0x0e, 0x0f).w(FUNC(balsente_state::balsente_chip_select_w)); } diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp index d22886378dc..becd7e8476b 100644 --- a/src/mame/drivers/banctec.cpp +++ b/src/mame/drivers/banctec.cpp @@ -63,7 +63,7 @@ void banctec_state::banctec_mcu_mem(address_map &map) map(0x0000, 0x00ff).ram(); /* Probably wrong. Must be verified on pcb! */ map(0x2000, 0x2000).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x2001, 0x2001).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x2003, 0x2003).w(this, FUNC(banctec_state::videoram_w)); + map(0x2003, 0x2003).w(FUNC(banctec_state::videoram_w)); map(0x8000, 0x80ff).ram().share("videoram"); /* Probably wrong. Must be verified on pcb! */ map(0xe000, 0xffff).rom().region("mcu", 0x0000); } diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp index c28e2021951..1a7188ff771 100644 --- a/src/mame/drivers/bankp.cpp +++ b/src/mame/drivers/bankp.cpp @@ -128,21 +128,21 @@ void bankp_state::bankp_map(address_map &map) { map(0x0000, 0xdfff).rom(); map(0xe000, 0xefff).ram(); - map(0xf000, 0xf3ff).ram().w(this, FUNC(bankp_state::videoram_w)).share("videoram"); - map(0xf400, 0xf7ff).ram().w(this, FUNC(bankp_state::colorram_w)).share("colorram"); - map(0xf800, 0xfbff).ram().w(this, FUNC(bankp_state::videoram2_w)).share("videoram2"); - map(0xfc00, 0xffff).ram().w(this, FUNC(bankp_state::colorram2_w)).share("colorram2"); + map(0xf000, 0xf3ff).ram().w(FUNC(bankp_state::videoram_w)).share("videoram"); + map(0xf400, 0xf7ff).ram().w(FUNC(bankp_state::colorram_w)).share("colorram"); + map(0xf800, 0xfbff).ram().w(FUNC(bankp_state::videoram2_w)).share("videoram2"); + map(0xfc00, 0xffff).ram().w(FUNC(bankp_state::colorram2_w)).share("colorram2"); } void bankp_state::bankp_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w("sn1", FUNC(sn76489_device::write)); - map(0x01, 0x01).portr("IN1").w("sn2", FUNC(sn76489_device::write)); - map(0x02, 0x02).portr("IN2").w("sn3", FUNC(sn76489_device::write)); + map(0x00, 0x00).portr("IN0").w("sn1", FUNC(sn76489_device::command_w)); + map(0x01, 0x01).portr("IN1").w("sn2", FUNC(sn76489_device::command_w)); + map(0x02, 0x02).portr("IN2").w("sn3", FUNC(sn76489_device::command_w)); map(0x04, 0x04).portr("DSW1"); - map(0x05, 0x05).w(this, FUNC(bankp_state::scroll_w)); - map(0x07, 0x07).w(this, FUNC(bankp_state::out_w)); + map(0x05, 0x05).w(FUNC(bankp_state::scroll_w)); + map(0x07, 0x07).w(FUNC(bankp_state::out_w)); } diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp index ceff0282f98..b066a7d95ff 100644 --- a/src/mame/drivers/baraduke.cpp +++ b/src/mame/drivers/baraduke.cpp @@ -167,14 +167,14 @@ WRITE8_MEMBER(baraduke_state::baraduke_irq_ack_w) void baraduke_state::baraduke_map(address_map &map) { - map(0x0000, 0x1fff).rw(this, FUNC(baraduke_state::baraduke_spriteram_r), FUNC(baraduke_state::baraduke_spriteram_w)).share("spriteram"); /* Sprite RAM */ - map(0x2000, 0x3fff).rw(this, FUNC(baraduke_state::baraduke_videoram_r), FUNC(baraduke_state::baraduke_videoram_w)).share("videoram"); /* Video RAM */ + map(0x0000, 0x1fff).rw(FUNC(baraduke_state::baraduke_spriteram_r), FUNC(baraduke_state::baraduke_spriteram_w)).share("spriteram"); /* Sprite RAM */ + map(0x2000, 0x3fff).rw(FUNC(baraduke_state::baraduke_videoram_r), FUNC(baraduke_state::baraduke_videoram_w)).share("videoram"); /* Video RAM */ map(0x4000, 0x43ff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); /* PSG device, shared RAM */ - map(0x4800, 0x4fff).rw(this, FUNC(baraduke_state::baraduke_textram_r), FUNC(baraduke_state::baraduke_textram_w)).share("textram");/* video RAM (text layer) */ + map(0x4800, 0x4fff).rw(FUNC(baraduke_state::baraduke_textram_r), FUNC(baraduke_state::baraduke_textram_w)).share("textram");/* video RAM (text layer) */ map(0x8000, 0x8000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog reset */ - map(0x8800, 0x8800).w(this, FUNC(baraduke_state::baraduke_irq_ack_w)); /* irq acknowledge */ - map(0xb000, 0xb002).w(this, FUNC(baraduke_state::baraduke_scroll0_w)); /* scroll (layer 0) */ - map(0xb004, 0xb006).w(this, FUNC(baraduke_state::baraduke_scroll1_w)); /* scroll (layer 1) */ + map(0x8800, 0x8800).w(FUNC(baraduke_state::baraduke_irq_ack_w)); /* irq acknowledge */ + map(0xb000, 0xb002).w(FUNC(baraduke_state::baraduke_scroll0_w)); /* scroll (layer 0) */ + map(0xb004, 0xb006).w(FUNC(baraduke_state::baraduke_scroll1_w)); /* scroll (layer 1) */ map(0x6000, 0xffff).rom(); /* ROM */ } @@ -188,7 +188,7 @@ void baraduke_state::mcu_map(address_map &map) map(0x0000, 0x001f).rw("mcu", FUNC(hd63701_cpu_device::m6801_io_r), FUNC(hd63701_cpu_device::m6801_io_w));/* internal registers */ map(0x0080, 0x00ff).ram(); /* built in RAM */ map(0x1000, 0x13ff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); /* PSG device, shared RAM */ - map(0x1105, 0x1105).r(this, FUNC(baraduke_state::soundkludge_r)); /* cures speech */ + map(0x1105, 0x1105).r(FUNC(baraduke_state::soundkludge_r)); /* cures speech */ map(0x8000, 0xbfff).rom(); /* MCU external ROM */ map(0x8000, 0x8000).nopw(); /* watchdog reset? */ map(0x8800, 0x8800).nopw(); /* irq acknoledge? */ @@ -204,10 +204,10 @@ READ8_MEMBER(baraduke_state::readFF) void baraduke_state::mcu_port_map(address_map &map) { - map(M6801_PORT1, M6801_PORT1).r(this, FUNC(baraduke_state::inputport_r)); /* input ports read */ - map(M6801_PORT1, M6801_PORT1).w(this, FUNC(baraduke_state::inputport_select_w)); /* input port select */ - map(M6801_PORT2, M6801_PORT2).r(this, FUNC(baraduke_state::readFF)); /* leds won't work otherwise */ - map(M6801_PORT2, M6801_PORT2).w(this, FUNC(baraduke_state::baraduke_lamps_w)); /* lamps */ + map(M6801_PORT1, M6801_PORT1).r(FUNC(baraduke_state::inputport_r)); /* input ports read */ + map(M6801_PORT1, M6801_PORT1).w(FUNC(baraduke_state::inputport_select_w)); /* input port select */ + map(M6801_PORT2, M6801_PORT2).r(FUNC(baraduke_state::readFF)); /* leds won't work otherwise */ + map(M6801_PORT2, M6801_PORT2).w(FUNC(baraduke_state::baraduke_lamps_w)); /* lamps */ } diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp index 89f090b8ae4..3de126bf203 100644 --- a/src/mame/drivers/bartop52.cpp +++ b/src/mame/drivers/bartop52.cpp @@ -118,8 +118,7 @@ void bartop52_state::machine_reset() { atari_common_state::machine_reset(); - pokey_device *pokey = machine().device("pokey"); - pokey->write(15,0); + subdevice("pokey")->write(machine().dummy_space(), 15, 0); } TIMER_DEVICE_CALLBACK_MEMBER( bartop52_state::bartop_interrupt ) diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp index 42368855c51..41196856dc9 100644 --- a/src/mame/drivers/batman.cpp +++ b/src/mame/drivers/batman.cpp @@ -92,7 +92,7 @@ void batman_state::main_map(address_map &map) map(0x260010, 0x260011).mirror(0x11ff8e).portr("260010"); map(0x260031, 0x260031).mirror(0x11ff8e).r(m_jsa, FUNC(atari_jsa_iii_device::main_response_r)); map(0x260041, 0x260041).mirror(0x11ff8e).w(m_jsa, FUNC(atari_jsa_iii_device::main_command_w)); - map(0x260050, 0x260051).mirror(0x11ff8e).w(this, FUNC(batman_state::latch_w)); + map(0x260050, 0x260051).mirror(0x11ff8e).w(FUNC(batman_state::latch_w)); map(0x260060, 0x260061).mirror(0x11ff8e).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x2a0000, 0x2a0001).mirror(0x11fffe).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x2e0000, 0x2e0fff).mirror(0x100000).ram().w("palette", FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp index 70e7f17508f..ccdc4c15d0e 100644 --- a/src/mame/drivers/battlane.cpp +++ b/src/mame/drivers/battlane.cpp @@ -103,15 +103,15 @@ INTERRUPT_GEN_MEMBER(battlane_state::battlane_cpu1_interrupt) void battlane_state::battlane_map(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); - map(0x1000, 0x17ff).ram().w(this, FUNC(battlane_state::battlane_tileram_w)).share("tileram"); - map(0x1800, 0x18ff).ram().w(this, FUNC(battlane_state::battlane_spriteram_w)).share("spriteram"); - map(0x1c00, 0x1c00).portr("P1").w(this, FUNC(battlane_state::battlane_video_ctrl_w)); - map(0x1c01, 0x1c01).portr("P2").w(this, FUNC(battlane_state::battlane_scrollx_w)); - map(0x1c02, 0x1c02).portr("DSW1").w(this, FUNC(battlane_state::battlane_scrolly_w)); - map(0x1c03, 0x1c03).portr("DSW2").w(this, FUNC(battlane_state::battlane_cpu_command_w)); + map(0x1000, 0x17ff).ram().w(FUNC(battlane_state::battlane_tileram_w)).share("tileram"); + map(0x1800, 0x18ff).ram().w(FUNC(battlane_state::battlane_spriteram_w)).share("spriteram"); + map(0x1c00, 0x1c00).portr("P1").w(FUNC(battlane_state::battlane_video_ctrl_w)); + map(0x1c01, 0x1c01).portr("P2").w(FUNC(battlane_state::battlane_scrollx_w)); + map(0x1c02, 0x1c02).portr("DSW1").w(FUNC(battlane_state::battlane_scrolly_w)); + map(0x1c03, 0x1c03).portr("DSW2").w(FUNC(battlane_state::battlane_cpu_command_w)); map(0x1c04, 0x1c05).rw("ymsnd", FUNC(ym3526_device::read), FUNC(ym3526_device::write)); - map(0x1e00, 0x1e3f).w(this, FUNC(battlane_state::battlane_palette_w)); - map(0x2000, 0x3fff).ram().w(this, FUNC(battlane_state::battlane_bitmap_w)).share("share4"); + map(0x1e00, 0x1e3f).w(FUNC(battlane_state::battlane_palette_w)); + map(0x2000, 0x3fff).ram().w(FUNC(battlane_state::battlane_bitmap_w)).share("share4"); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp index 650c6bbda91..2c952b6eee5 100644 --- a/src/mame/drivers/battlera.cpp +++ b/src/mame/drivers/battlera.cpp @@ -143,10 +143,10 @@ READ8_MEMBER(battlera_state::control_data_r) void battlera_state::battlera_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x1e0800, 0x1e0801).w(this, FUNC(battlera_state::sound_w)); + map(0x1e0800, 0x1e0801).w(FUNC(battlera_state::sound_w)); map(0x1e1000, 0x1e13ff).rw(m_huc6260, FUNC(huc6260_device::palette_direct_read), FUNC(huc6260_device::palette_direct_write)).share("paletteram"); map(0x1f0000, 0x1f1fff).bankrw("bank8"); /* Main ram */ - map(0x1ff000, 0x1ff001).rw(this, FUNC(battlera_state::control_data_r), FUNC(battlera_state::control_data_w)); + map(0x1ff000, 0x1ff001).rw(FUNC(battlera_state::control_data_r), FUNC(battlera_state::control_data_w)); map(0x1FE000, 0x1FE3FF).rw("huc6270", FUNC(huc6270_device::read), FUNC(huc6270_device::write)); map(0x1FE400, 0x1FE7FF).rw(m_huc6260, FUNC(huc6260_device::read), FUNC(huc6260_device::write)); @@ -187,10 +187,10 @@ void battlera_state::sound_map(address_map &map) { map(0x000000, 0x00ffff).rom(); map(0x040000, 0x040001).w("ymsnd", FUNC(ym2203_device::write)); - map(0x080000, 0x080001).w(this, FUNC(battlera_state::adpcm_data_w)); + map(0x080000, 0x080001).w(FUNC(battlera_state::adpcm_data_w)); map(0x1fe800, 0x1fe80f).w("c6280", FUNC(c6280_device::c6280_w)); map(0x1f0000, 0x1f1fff).bankrw("bank7"); /* Main ram */ - map(0x1ff000, 0x1ff001).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(battlera_state::adpcm_reset_w)); + map(0x1ff000, 0x1ff001).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(battlera_state::adpcm_reset_w)); map(0x1ff400, 0x1ff403).w(m_audiocpu, FUNC(h6280_device::irq_status_w)); } diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp index 51e3b0e6fbe..1822e26e0a3 100644 --- a/src/mame/drivers/battlex.cpp +++ b/src/mame/drivers/battlex.cpp @@ -118,10 +118,10 @@ CUSTOM_INPUT_MEMBER(battlex_state::battlex_in0_b4_r) void battlex_state::battlex_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0x8000, 0x8fff).ram().w(this, FUNC(battlex_state::battlex_videoram_w)).share("videoram"); + map(0x8000, 0x8fff).ram().w(FUNC(battlex_state::battlex_videoram_w)).share("videoram"); map(0x9000, 0x91ff).ram().share("spriteram"); map(0xa000, 0xa3ff).ram(); - map(0xe000, 0xe03f).ram().w(this, FUNC(battlex_state::battlex_palette_w)); + map(0xe000, 0xe03f).ram().w(FUNC(battlex_state::battlex_palette_w)); } @@ -132,13 +132,13 @@ void battlex_state::io_map(address_map &map) map(0x01, 0x01).portr("SYSTEM"); map(0x02, 0x02).portr("INPUTS"); map(0x03, 0x03).portr("DSW2"); - map(0x10, 0x10).w(this, FUNC(battlex_state::battlex_flipscreen_w)); + map(0x10, 0x10).w(FUNC(battlex_state::battlex_flipscreen_w)); /* verify all of these */ map(0x22, 0x23).w("ay1", FUNC(ay8910_device::data_address_w)); - map(0x30, 0x30).w(this, FUNC(battlex_state::battlex_scroll_starfield_w)); - map(0x32, 0x32).w(this, FUNC(battlex_state::battlex_scroll_x_lsb_w)); - map(0x33, 0x33).w(this, FUNC(battlex_state::battlex_scroll_x_msb_w)); + map(0x30, 0x30).w(FUNC(battlex_state::battlex_scroll_starfield_w)); + map(0x32, 0x32).w(FUNC(battlex_state::battlex_scroll_x_lsb_w)); + map(0x33, 0x33).w(FUNC(battlex_state::battlex_scroll_x_msb_w)); } void battlex_state::dodgeman_io_map(address_map &map) diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp index 97a043f87a0..2feac7bec2d 100644 --- a/src/mame/drivers/battlnts.cpp +++ b/src/mame/drivers/battlnts.cpp @@ -73,11 +73,11 @@ void battlnts_state::battlnts_map(address_map &map) map(0x2e02, 0x2e02).portr("P1"); map(0x2e03, 0x2e03).portr("DSW3"); /* coinsw, testsw, startsw */ map(0x2e04, 0x2e04).portr("DSW2"); - map(0x2e08, 0x2e08).w(this, FUNC(battlnts_state::battlnts_bankswitch_w)); /* bankswitch control */ - map(0x2e0c, 0x2e0c).w(this, FUNC(battlnts_state::battlnts_spritebank_w)); /* sprite bank select */ + map(0x2e08, 0x2e08).w(FUNC(battlnts_state::battlnts_bankswitch_w)); /* bankswitch control */ + map(0x2e0c, 0x2e0c).w(FUNC(battlnts_state::battlnts_spritebank_w)); /* sprite bank select */ map(0x2e10, 0x2e10).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x2e14, 0x2e14).w("soundlatch", FUNC(generic_latch_8_device::write)); /* sound code # */ - map(0x2e18, 0x2e18).w(this, FUNC(battlnts_state::battlnts_sh_irqtrigger_w)); /* cause interrupt on audio CPU */ + map(0x2e18, 0x2e18).w(FUNC(battlnts_state::battlnts_sh_irqtrigger_w)); /* cause interrupt on audio CPU */ map(0x4000, 0x7fff).bankr("rombank"); /* banked ROM */ map(0x8000, 0xffff).rom(); /* ROM 777e02.bin */ } diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 9a3d540e9dc..3fbd654bf94 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -144,119 +144,119 @@ READ8_MEMBER(bbc_state::bbc_fe_r) void bbc_state::bbca_mem(address_map &map) { - map.unmap_value_high(); /* Hardware marked with a # is not present in a Model A */ - map(0x0000, 0x3fff).bankrw("bank1"); /* 0000-3fff Regular RAM */ - map(0x4000, 0x7fff).bankrw("bank3"); /* 4000-7fff Regular RAM mirrored */ - map(0x8000, 0xbfff).bankr("bank4").w(this, FUNC(bbc_state::bbc_memoryb4_w)); /* 8000-bfff Paged ROM */ - map(0xc000, 0xfbff).bankr("bank7"); /* c000-fbff OS ROM */ - map(0xfc00, 0xfdff).noprw(); /* fc00-fdff FRED & JIM Pages */ - /* fe00-feff SHEILA Address Page */ - map(0xfe00, 0xfe00).mirror(0x06).rw(m_hd6845, FUNC(hd6845_device::status_r), FUNC(hd6845_device::address_w)); /* fe00-fe07 6845 CRTC Video controller */ + map.unmap_value_high(); // Hardware marked with a # is not present in a Model A + map(0x0000, 0x3fff).bankrw("bank1"); // 0000-3fff Regular RAM + map(0x4000, 0x7fff).bankrw("bank3"); // 4000-7fff Regular RAM mirrored + map(0x8000, 0xbfff).bankr("bank4").w(FUNC(bbc_state::bbc_memoryb4_w)); // 8000-bfff Paged ROM + map(0xc000, 0xfbff).bankr("bank7"); // c000-fbff OS ROM + map(0xfc00, 0xfdff).noprw(); // fc00-fdff FRED & JIM Pages + // fe00-feff SHEILA Address Page + map(0xfe00, 0xfe00).mirror(0x06).rw(m_hd6845, FUNC(hd6845_device::status_r), FUNC(hd6845_device::address_w)); // fe00-fe07 6845 CRTC Video controller map(0xfe01, 0xfe01).mirror(0x06).rw(m_hd6845, FUNC(hd6845_device::register_r), FUNC(hd6845_device::register_w)); - map(0xfe08, 0xfe09).mirror(0x06).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); /* fe08-fe0f 6850 ACIA Serial controller */ - map(0xfe10, 0xfe17).rw(this, FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_SerialULA_w)); /* fe10-fe17 Serial ULA Serial system chip */ - map(0xfe18, 0xfe1f).noprw(); /* fe18-fe1f INTOFF/STATID # ECONET Interrupt Off / ID No. */ - map(0xfe20, 0xfe2f).rw(this, FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_videoULA_w)); /* R: fe20-fe2f INTON # ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ - map(0xfe30, 0xfe3f).rw(this, FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::page_selecta_w)); /* W: fe30-fe3f 74LS161 Paged ROM selector */ - map(0xfe40, 0xfe5f).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* fe40-fe5f 6522 VIA SYSTEM VIA */ - map(0xfe60, 0xfe7f).noprw(); /* fe60-fe7f 6522 VIA # USER VIA */ - map(0xfe80, 0xfe9f).noprw(); /* fe80-fe9f 8271/1770 FDC # Floppy disc controller */ - map(0xfea0, 0xfebf).r(this, FUNC(bbc_state::bbc_fe_r)); /* fea0-febf 68B54 ADLC # ECONET controller */ - map(0xfec0, 0xfedf).noprw(); /* fec0-fedf uPD7002 # Analogue to digital converter */ - map(0xfee0, 0xfeff).r(this, FUNC(bbc_state::bbc_fe_r)); /* fee0-feff Tube ULA # Tube system interface */ - map(0xff00, 0xffff).rom().region("os", 0x3f00); /* ff00-ffff OS Rom (continued) */ + map(0xfe08, 0xfe09).mirror(0x06).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // fe08-fe0f 6850 ACIA Serial controller + map(0xfe10, 0xfe17).rw(FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_SerialULA_w)); // fe10-fe17 Serial ULA Serial system chip + map(0xfe18, 0xfe1f).noprw(); // fe18-fe1f INTOFF/STATID # ECONET Interrupt Off / ID No. + map(0xfe20, 0xfe2f).rw(FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_videoULA_w)); // R: fe20-fe2f INTON # ECONET Interrupt On + // W: fe20-fe2f Video ULA Video system chip + map(0xfe30, 0xfe3f).rw(FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::page_selecta_w)); // W: fe30-fe3f 74LS161 Paged ROM selector + map(0xfe40, 0xfe5f).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe40-fe5f 6522 VIA SYSTEM VIA + map(0xfe60, 0xfe7f).noprw(); // fe60-fe7f 6522 VIA # USER VIA + map(0xfe80, 0xfe9f).noprw(); // fe80-fe9f 8271/1770 FDC # Floppy disc controller + map(0xfea0, 0xfebf).r(FUNC(bbc_state::bbc_fe_r)); // fea0-febf 68B54 ADLC # ECONET controller + map(0xfec0, 0xfedf).noprw(); // fec0-fedf uPD7002 # Analogue to digital converter + map(0xfee0, 0xfeff).r(FUNC(bbc_state::bbc_fe_r)); // fee0-feff Tube ULA # Tube system interface + map(0xff00, 0xffff).rom().region("os", 0x3f00); // ff00-ffff OS ROM (continued) } void bbc_state::bbc_base(address_map &map) { map.unmap_value_high(); - map(0xc000, 0xfbff).bankr("bank7"); /* c000-fbff OS ROM */ - map(0xfc00, 0xfdff).noprw(); /* fc00-fdff FRED & JIM Pages */ - map(0xfe00, 0xfeff).r(this, FUNC(bbc_state::bbc_fe_r)); /* fe00-feff SHEILA Address Page */ - map(0xfe00, 0xfe00).mirror(0x06).rw(m_hd6845, FUNC(hd6845_device::status_r), FUNC(hd6845_device::address_w)); /* fe00-fe07 6845 CRTC Video controller */ + map(0xc000, 0xfbff).bankr("bank7"); // c000-fbff OS ROM + map(0xfc00, 0xfdff).noprw(); // fc00-fdff FRED & JIM Pages + map(0xfe00, 0xfeff).r(FUNC(bbc_state::bbc_fe_r)); // fe00-feff SHEILA Address Page + map(0xfe00, 0xfe00).mirror(0x06).rw(m_hd6845, FUNC(hd6845_device::status_r), FUNC(hd6845_device::address_w)); // fe00-fe07 6845 CRTC Video controller map(0xfe01, 0xfe01).mirror(0x06).rw(m_hd6845, FUNC(hd6845_device::register_r), FUNC(hd6845_device::register_w)); - map(0xfe08, 0xfe09).mirror(0x06).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); /* fe08-fe0f 6850 ACIA Serial controller */ - map(0xfe10, 0xfe17).rw(this, FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_SerialULA_w)); /* fe10-fe17 Serial ULA Serial system chip */ - map(0xfe18, 0xfe1f).portr("STATID"); /* fe18-fe1f INTOFF/STATID ECONET Interrupt Off / ID No. */ - map(0xfe20, 0xfe2f).rw(this, FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_videoULA_w)); /* R: fe20-fe2f INTON ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ - map(0xfe40, 0xfe5f).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* fe40-fe5f 6522 VIA SYSTEM VIA */ - map(0xfe60, 0xfe7f).rw(m_via6522_1, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* fe60-fe7f 6522 VIA USER VIA */ - /* fe80-fe9f FDC Floppy disc controller */ - map(0xfea0, 0xfebf).r(this, FUNC(bbc_state::bbc_fe_r)); /* fea0-febf 68B54 ADLC ECONET controller */ - map(0xfec0, 0xfedf).rw(m_upd7002, FUNC(upd7002_device::read), FUNC(upd7002_device::write)); /* fec0-fedf uPD7002 Analogue to digital converter */ - map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); /* fee0-feff Tube ULA Tube system interface */ - map(0xff00, 0xffff).rom().region("os", 0x3f00); /* ff00-ffff OS ROM (continued) */ + map(0xfe08, 0xfe09).mirror(0x06).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // fe08-fe0f 6850 ACIA Serial controller + map(0xfe10, 0xfe17).rw(FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_SerialULA_w)); // fe10-fe17 Serial ULA Serial system chip + map(0xfe18, 0xfe1f).portr("STATID"); // fe18-fe1f INTOFF/STATID ECONET Interrupt Off / ID No. + map(0xfe20, 0xfe2f).rw(FUNC(bbc_state::bbc_fe_r), FUNC(bbc_state::bbc_videoULA_w)); // R: fe20-fe2f INTON ECONET Interrupt On + // W: fe20-fe2f Video ULA Video system chip + map(0xfe40, 0xfe5f).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe40-fe5f 6522 VIA SYSTEM VIA + map(0xfe60, 0xfe7f).rw(m_via6522_1, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe60-fe7f 6522 VIA USER VIA + // fe80-fe9f FDC Floppy disc controller + map(0xfea0, 0xfebf).r(FUNC(bbc_state::bbc_fe_r)); // fea0-febf 68B54 ADLC ECONET controller + map(0xfec0, 0xfedf).rw(m_upd7002, FUNC(upd7002_device::read), FUNC(upd7002_device::write)); // fec0-fedf uPD7002 Analogue to digital converter + map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); // fee0-feff Tube ULA Tube system interface + map(0xff00, 0xffff).rom().region("os", 0x3f00); // ff00-ffff OS ROM (continued) } void bbc_state::bbcb_mem(address_map &map) { bbc_base(map); - map(0x0000, 0x3fff).bankrw("bank1"); /* 0000-3fff Regular RAM */ - map(0x4000, 0x7fff).bankrw("bank3"); /* 4000-7fff Regular RAM */ - map(0x8000, 0xbfff).bankr("bank4").w(this, FUNC(bbc_state::bbc_memoryb4_w)); /* 8000-bfff Paged ROM/RAM */ - map(0xfe30, 0xfe3f).w(this, FUNC(bbc_state::page_selectb_w)); /* W: fe30-fe3f 84LS161 Paged ROM selector */ - map(0xfe80, 0xfe83).m(m_i8271, FUNC(i8271_device::map)); /* fe80-fe83 8271 FDC Floppy disc controller */ - map(0xfe84, 0xfe9f).rw(m_i8271, FUNC(i8271_device::data_r), FUNC(i8271_device::data_w)); /* fe84-fe9f 8271 FDC Floppy disc controller */ + map(0x0000, 0x3fff).bankrw("bank1"); // 0000-3fff Regular RAM + map(0x4000, 0x7fff).bankrw("bank3"); // 4000-7fff Regular RAM + map(0x8000, 0xbfff).bankr("bank4").w(FUNC(bbc_state::bbc_memoryb4_w)); // 8000-bfff Paged ROM/RAM + map(0xfe30, 0xfe3f).w(FUNC(bbc_state::page_selectb_w)); // W: fe30-fe3f 84LS161 Paged ROM selector + map(0xfe80, 0xfe83).m(m_i8271, FUNC(i8271_device::map)); // fe80-fe83 8271 FDC Floppy disc controller + map(0xfe84, 0xfe9f).rw(m_i8271, FUNC(i8271_device::data_r), FUNC(i8271_device::data_w)); // fe84-fe9f 8271 FDC Floppy disc controller } void bbc_state::bbcb_nofdc_mem(address_map &map) { bbc_base(map); - map(0x0000, 0x3fff).bankrw("bank1"); /* 0000-3fff Regular RAM */ - map(0x4000, 0x7fff).bankrw("bank3"); /* 4000-7fff Regular RAM */ - map(0x8000, 0xbfff).bankr("bank4").w(this, FUNC(bbc_state::bbc_memoryb4_w)); /* 8000-bfff Paged ROM/RAM */ - map(0xfe30, 0xfe3f).w(this, FUNC(bbc_state::page_selectb_w)); /* W: fe30-fe3f 84LS161 Paged ROM selector */ + map(0x0000, 0x3fff).bankrw("bank1"); // 0000-3fff Regular RAM + map(0x4000, 0x7fff).bankrw("bank3"); // 4000-7fff Regular RAM + map(0x8000, 0xbfff).bankr("bank4").w(FUNC(bbc_state::bbc_memoryb4_w)); // 8000-bfff Paged ROM/RAM + map(0xfe30, 0xfe3f).w(FUNC(bbc_state::page_selectb_w)); // W: fe30-fe3f 84LS161 Paged ROM selector } void bbc_state::bbcbp_mem(address_map &map) { bbc_base(map); - map(0x0000, 0x2fff).bankrw("bank1"); /* 0000-2fff Regular RAM */ - map(0x3000, 0x7fff).bankrw("bank2"); /* 3000-7fff Video/Shadow RAM */ - map(0x8000, 0xafff).bankr("bank4").w(this, FUNC(bbc_state::bbc_memorybp4_w)); /* 8000-afff Paged ROM or 12K of SWRAM */ - map(0xb000, 0xbfff).bankr("bank6").w(this, FUNC(bbc_state::bbc_memorybp6_w)); /* b000-bfff Rest of paged ROM area */ - map(0xfe30, 0xfe3f).w(this, FUNC(bbc_state::page_selectbp_w)); /* W: fe30-fe3f 84LS161 Paged ROM selector */ - map(0xfe80, 0xfe83).w(this, FUNC(bbc_state::bbc_wd1770_status_w)); /* fe80-fe83 1770 FDC Drive control register */ - map(0xfe84, 0xfe9f).rw(m_wd1770, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); /* fe84-fe9f 1770 FDC Floppy disc controller */ - map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); /* fee0-feff Tube ULA Tube system interface */ + map(0x0000, 0x2fff).bankrw("bank1"); // 0000-2fff Regular RAM + map(0x3000, 0x7fff).bankrw("bank2"); // 3000-7fff Video/Shadow RAM + map(0x8000, 0xafff).bankr("bank4").w(FUNC(bbc_state::bbc_memorybp4_w)); // 8000-afff Paged ROM or 12K of SWRAM + map(0xb000, 0xbfff).bankr("bank6").w(FUNC(bbc_state::bbc_memorybp6_w)); // b000-bfff Rest of paged ROM area + map(0xfe30, 0xfe3f).w(FUNC(bbc_state::page_selectbp_w)); // W: fe30-fe3f 84LS161 Paged ROM selector + map(0xfe80, 0xfe83).w(FUNC(bbc_state::bbc_wd1770_status_w)); // fe80-fe83 1770 FDC Drive control register + map(0xfe84, 0xfe9f).rw(m_wd1770, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); // fe84-fe9f 1770 FDC Floppy disc controller + map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); // fee0-feff Tube ULA Tube system interface } void bbc_state::bbcbp128_mem(address_map &map) { bbc_base(map); - map(0x0000, 0x2fff).bankrw("bank1"); /* 0000-2fff Regular RAM */ - map(0x3000, 0x7fff).bankrw("bank2"); /* 3000-7fff Video/Shadow RAM */ - map(0x8000, 0xafff).bankr("bank4").w(this, FUNC(bbc_state::bbc_memorybp4_w)); /* 8000-afff Paged ROM or 12K of SWRAM */ - map(0xb000, 0xbfff).bankr("bank6").w(this, FUNC(bbc_state::bbc_memorybp6_w)); /* b000-bfff Rest of paged ROM area */ - map(0xfe30, 0xfe3f).w(this, FUNC(bbc_state::page_selectbp128_w)); /* W: fe30-fe3f 84LS161 Paged ROM selector */ - map(0xfe80, 0xfe83).w(this, FUNC(bbc_state::bbc_wd1770_status_w)); /* fe80-fe83 1770 FDC Drive control register */ - map(0xfe84, 0xfe9f).rw(m_wd1770, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); /* fe84-fe9f 1770 FDC Floppy disc controller */ - map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); /* fee0-feff Tube ULA Tube system interface */ + map(0x0000, 0x2fff).bankrw("bank1"); // 0000-2fff Regular RAM + map(0x3000, 0x7fff).bankrw("bank2"); // 3000-7fff Video/Shadow RAM + map(0x8000, 0xafff).bankr("bank4").w(FUNC(bbc_state::bbc_memorybp4_w)); // 8000-afff Paged ROM or 12K of SWRAM + map(0xb000, 0xbfff).bankr("bank6").w(FUNC(bbc_state::bbc_memorybp6_w)); // b000-bfff Rest of paged ROM area + map(0xfe30, 0xfe3f).w(FUNC(bbc_state::page_selectbp128_w)); // W: fe30-fe3f 84LS161 Paged ROM selector + map(0xfe80, 0xfe83).w(FUNC(bbc_state::bbc_wd1770_status_w)); // fe80-fe83 1770 FDC Drive control register + map(0xfe84, 0xfe9f).rw(m_wd1770, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); // fe84-fe9f 1770 FDC Floppy disc controller + map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); // fee0-feff Tube ULA Tube system interface } void bbc_state::reutapm_mem(address_map &map) { bbc_base(map); - map(0x0000, 0x2fff).bankrw("bank1"); /* 0000-2fff Regular RAM */ - map(0x3000, 0x7fff).bankrw("bank2"); /* 3000-7fff Video/Shadow RAM */ - map(0x8000, 0xafff).bankr("bank4").w(this, FUNC(bbc_state::bbc_memorybp4_w)); /* 8000-afff Paged ROM or 12K of SWRAM */ - map(0xb000, 0xbfff).bankr("bank6").w(this, FUNC(bbc_state::bbc_memorybp6_w)); /* b000-bfff Rest of paged ROM area */ - map(0xfe30, 0xfe3f).w(this, FUNC(bbc_state::page_selectbp_w)); /* W: fe30-fe3f 84LS161 Paged ROM selector */ - map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); /* fee0-feff Tube ULA Tube system interface */ + map(0x0000, 0x2fff).bankrw("bank1"); // 0000-2fff Regular RAM + map(0x3000, 0x7fff).bankrw("bank2"); // 3000-7fff Video/Shadow RAM + map(0x8000, 0xafff).bankr("bank4").w(FUNC(bbc_state::bbc_memorybp4_w)); // 8000-afff Paged ROM or 12K of SWRAM + map(0xb000, 0xbfff).bankr("bank6").w(FUNC(bbc_state::bbc_memorybp6_w)); // b000-bfff Rest of paged ROM area + map(0xfe30, 0xfe3f).w(FUNC(bbc_state::page_selectbp_w)); // W: fe30-fe3f 84LS161 Paged ROM selector + map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); // fee0-feff Tube ULA Tube system interface } void bbc_state::bbcbp_fetch(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(bbc_state::bbcbp_fetch_r)); + map(0x0000, 0xffff).r(FUNC(bbc_state::bbcbp_fetch_r)); } @@ -288,16 +288,16 @@ void bbc_state::bbcm_mem(address_map &map) { map(0x0000, 0x2fff).bankrw("bank1"); /* 0000-2fff Regular RAM */ map(0x3000, 0x7fff).bankrw("bank2"); /* 3000-7fff Video/Shadow RAM */ - map(0x8000, 0x8fff).bankr("bank4").w(this, FUNC(bbc_state::bbc_memorybm4_w)); /* 8000-8fff Paged ROM/RAM or 4K of RAM ANDY */ - map(0x9000, 0xbfff).bankr("bank5").w(this, FUNC(bbc_state::bbc_memorybm5_w)); /* 9000-bfff Rest of paged ROM/RAM area */ - map(0xc000, 0xdfff).bankr("bank7").w(this, FUNC(bbc_state::bbc_memorybm7_w)); /* c000-dfff OS ROM or 8K of RAM HAZEL */ + map(0x8000, 0x8fff).bankr("bank4").w(FUNC(bbc_state::bbc_memorybm4_w)); /* 8000-8fff Paged ROM/RAM or 4K of RAM ANDY */ + map(0x9000, 0xbfff).bankr("bank5").w(FUNC(bbc_state::bbc_memorybm5_w)); /* 9000-bfff Rest of paged ROM/RAM area */ + map(0xc000, 0xdfff).bankr("bank7").w(FUNC(bbc_state::bbc_memorybm7_w)); /* c000-dfff OS ROM or 8K of RAM HAZEL */ map(0xe000, 0xffff).rom().region("os", 0x2000); /* e000-ffff OS ROM */ - map(0xfc00, 0xfeff).bankr("bank8").w(this, FUNC(bbc_state::bbcm_w)); /* processed directly because it can be ROM or hardware */ + map(0xfc00, 0xfeff).bankr("bank8").w(FUNC(bbc_state::bbcm_w)); /* processed directly because it can be ROM or hardware */ } void bbc_state::bbcm_fetch(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(bbc_state::bbcm_fetch_r)); + map(0x0000, 0xffff).r(FUNC(bbc_state::bbcm_fetch_r)); } @@ -941,7 +941,7 @@ MACHINE_CONFIG_START(bbc_state::bbcb) /* user via */ MCFG_DEVICE_ADD("via6522_1", VIA6522, 16_MHz_XTAL / 16) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_VIA6522_READPB_HANDLER(READ8("userport", bbc_userport_slot_device, pb_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8("userport", bbc_userport_slot_device, pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe)) @@ -1407,7 +1407,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm) /* user via */ MCFG_DEVICE_ADD("via6522_1", VIA6522, 16_MHz_XTAL / 16) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_VIA6522_READPB_HANDLER(READ8("userport", bbc_userport_slot_device, pb_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8("userport", bbc_userport_slot_device, pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe)) diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp index f1f09355898..d9ce2eb8de9 100644 --- a/src/mame/drivers/bbcbc.cpp +++ b/src/mame/drivers/bbcbc.cpp @@ -82,8 +82,8 @@ void bbcbc_state::io_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_z80pio->write(space, offset >> 5, data, mem_mask); }); - map(0x80, 0x80).rw("tms9129", FUNC(tms9129_device::vram_read), FUNC(tms9129_device::vram_write)); - map(0x81, 0x81).rw("tms9129", FUNC(tms9129_device::register_read), FUNC(tms9129_device::register_write)); + map(0x80, 0x80).rw("tms9129", FUNC(tms9129_device::vram_r), FUNC(tms9129_device::vram_w)); + map(0x81, 0x81).rw("tms9129", FUNC(tms9129_device::register_r), FUNC(tms9129_device::register_w)); } // Input bits are read through the PIO four at a time, then stored individually in RAM at E030-E03B diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp index 299e590e5f6..55785a80d0e 100644 --- a/src/mame/drivers/bbusters.cpp +++ b/src/mame/drivers/bbusters.cpp @@ -328,13 +328,13 @@ void bbusters_state::bbusters_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x080000, 0x08ffff).ram().share("ram"); - map(0x090000, 0x090fff).ram().w(this, FUNC(bbusters_state::video_w)).share("videoram"); + map(0x090000, 0x090fff).ram().w(FUNC(bbusters_state::video_w)).share("videoram"); map(0x0a0000, 0x0a0fff).ram().share("spriteram"); map(0x0a1000, 0x0a7fff).ram(); /* service mode */ map(0x0a8000, 0x0a8fff).ram().share("spriteram2"); map(0x0a9000, 0x0affff).ram(); /* service mode */ - map(0x0b0000, 0x0b1fff).ram().w(this, FUNC(bbusters_state::pf1_w)).share("pf1_data"); - map(0x0b2000, 0x0b3fff).ram().w(this, FUNC(bbusters_state::pf2_w)).share("pf2_data"); + map(0x0b0000, 0x0b1fff).ram().w(FUNC(bbusters_state::pf1_w)).share("pf1_data"); + map(0x0b2000, 0x0b3fff).ram().w(FUNC(bbusters_state::pf2_w)).share("pf2_data"); map(0x0b4000, 0x0b5fff).ram(); /* service mode */ map(0x0b8000, 0x0b8003).writeonly().share("pf1_scroll_data"); map(0x0b8008, 0x0b800b).writeonly().share("pf2_scroll_data"); @@ -344,13 +344,13 @@ void bbusters_state::bbusters_map(address_map &map) map(0x0e0004, 0x0e0005).portr("IN1"); /* Player 3 */ map(0x0e0008, 0x0e0009).portr("DSW1"); /* Dip 1 */ map(0x0e000a, 0x0e000b).portr("DSW2"); /* Dip 2 */ - map(0x0e0018, 0x0e0019).r(this, FUNC(bbusters_state::sound_status_r)); - map(0x0e8000, 0x0e8001).rw(this, FUNC(bbusters_state::kludge_r), FUNC(bbusters_state::gun_select_w)); - map(0x0e8002, 0x0e8003).r(this, FUNC(bbusters_state::control_3_r)); + map(0x0e0018, 0x0e0019).r(FUNC(bbusters_state::sound_status_r)); + map(0x0e8000, 0x0e8001).rw(FUNC(bbusters_state::kludge_r), FUNC(bbusters_state::gun_select_w)); + map(0x0e8002, 0x0e8003).r(FUNC(bbusters_state::control_3_r)); /* AM_RANGE(0x0f0008, 0x0f0009) AM_WRITENOP */ - map(0x0f0008, 0x0f0009).w(this, FUNC(bbusters_state::three_gun_output_w)); - map(0x0f0018, 0x0f0019).w(this, FUNC(bbusters_state::sound_cpu_w)); - map(0x0f8000, 0x0f80ff).r(this, FUNC(bbusters_state::eprom_r)).writeonly().share("eeprom"); /* Eeprom */ + map(0x0f0008, 0x0f0009).w(FUNC(bbusters_state::three_gun_output_w)); + map(0x0f0018, 0x0f0019).w(FUNC(bbusters_state::sound_cpu_w)); + map(0x0f8000, 0x0f80ff).r(FUNC(bbusters_state::eprom_r)).writeonly().share("eeprom"); /* Eeprom */ } /*******************************************************************************/ @@ -359,20 +359,20 @@ void bbusters_state::mechatt_map(address_map &map) { map(0x000000, 0x06ffff).rom(); map(0x070000, 0x07ffff).ram().share("ram"); - map(0x090000, 0x090fff).ram().w(this, FUNC(bbusters_state::video_w)).share("videoram"); + map(0x090000, 0x090fff).ram().w(FUNC(bbusters_state::video_w)).share("videoram"); map(0x0a0000, 0x0a0fff).ram().share("spriteram"); map(0x0a1000, 0x0a7fff).nopw(); - map(0x0b0000, 0x0b3fff).ram().w(this, FUNC(bbusters_state::pf1_w)).share("pf1_data"); + map(0x0b0000, 0x0b3fff).ram().w(FUNC(bbusters_state::pf1_w)).share("pf1_data"); map(0x0b8000, 0x0b8003).writeonly().share("pf1_scroll_data"); - map(0x0c0000, 0x0c3fff).ram().w(this, FUNC(bbusters_state::pf2_w)).share("pf2_data"); + map(0x0c0000, 0x0c3fff).ram().w(FUNC(bbusters_state::pf2_w)).share("pf2_data"); map(0x0c8000, 0x0c8003).writeonly().share("pf2_scroll_data"); map(0x0d0000, 0x0d07ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x0e0000, 0x0e0001).portr("IN0"); map(0x0e0002, 0x0e0003).portr("DSW1"); - map(0x0e0004, 0x0e0007).r(this, FUNC(bbusters_state::mechatt_gun_r)); + map(0x0e0004, 0x0e0007).r(FUNC(bbusters_state::mechatt_gun_r)); /* AM_RANGE(0x0e4002, 0x0e4003) AM_WRITENOP Gun force feedback? */ - map(0x0e4002, 0x0e4003).w(this, FUNC(bbusters_state::two_gun_output_w)); - map(0x0e8000, 0x0e8001).rw(this, FUNC(bbusters_state::sound_status_r), FUNC(bbusters_state::sound_cpu_w)); + map(0x0e4002, 0x0e4003).w(FUNC(bbusters_state::two_gun_output_w)); + map(0x0e8000, 0x0e8001).rw(FUNC(bbusters_state::sound_status_r), FUNC(bbusters_state::sound_cpu_w)); } /******************************************************************************/ @@ -381,7 +381,7 @@ void bbusters_state::sound_map(address_map &map) { map(0x0000, 0xefff).rom(); map(0xf000, 0xf7ff).ram(); - map(0xf800, 0xf800).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(bbusters_state::sound_status_w)); + map(0xf800, 0xf800).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(bbusters_state::sound_status_w)); } void bbusters_state::sound_portmap(address_map &map) diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp index 49048b0c316..8d3aa63ee46 100644 --- a/src/mame/drivers/bcs3.cpp +++ b/src/mame/drivers/bcs3.cpp @@ -137,9 +137,9 @@ void bcs3_state::bcs3_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0fff).mirror(0x2000).rom().region("roms", 0); - map(0x1000, 0x13ff).mirror(0x2000).r(this, FUNC(bcs3_state::keyboard_r)); + map(0x1000, 0x13ff).mirror(0x2000).r(FUNC(bcs3_state::keyboard_r)); map(0x1400, 0x17ff).mirror(0x2000).noprw(); // /WAIT circuit - map(0x1800, 0x1bff).mirror(0x2000).r(this, FUNC(bcs3_state::video_r)); + map(0x1800, 0x1bff).mirror(0x2000).r(FUNC(bcs3_state::video_r)); map(0x1c00, 0x1fff).mirror(0x2000).ram().share("videoram"); } @@ -147,9 +147,9 @@ void bcs3_state::bcs3a_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0fff).mirror(0x2000).rom().region("roms", 0); - map(0x1000, 0x13ff).mirror(0x2000).r(this, FUNC(bcs3_state::keyboard_r)); + map(0x1000, 0x13ff).mirror(0x2000).r(FUNC(bcs3_state::keyboard_r)); map(0x1400, 0x17ff).mirror(0x2000).noprw(); // /WAIT circuit - map(0x1800, 0x1bff).mirror(0x2000).r(this, FUNC(bcs3_state::zx_r)); + map(0x1800, 0x1bff).mirror(0x2000).r(FUNC(bcs3_state::zx_r)); map(0x3c00, 0x7fff).ram().share("videoram"); map(0xf000, 0xf3ff).rom().region("roms", 0x1000); } diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp index 5ae71c9ca41..4648b557265 100644 --- a/src/mame/drivers/beaminv.cpp +++ b/src/mame/drivers/beaminv.cpp @@ -247,8 +247,8 @@ void beaminv_state::main_map(address_map &map) map(0x1800, 0x1fff).ram(); map(0x2400, 0x2400).mirror(0x03ff).portr("DSW"); map(0x2800, 0x2800).mirror(0x03ff).portr("INPUTS"); - map(0x3400, 0x3400).mirror(0x03ff).r(this, FUNC(beaminv_state::controller_r)); - map(0x3800, 0x3800).mirror(0x03ff).r(this, FUNC(beaminv_state::v128_r)); + map(0x3400, 0x3400).mirror(0x03ff).r(FUNC(beaminv_state::controller_r)); + map(0x3800, 0x3800).mirror(0x03ff).r(FUNC(beaminv_state::v128_r)); map(0x4000, 0x5fff).ram().share("videoram"); } @@ -263,7 +263,7 @@ void beaminv_state::main_map(address_map &map) void beaminv_state::main_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(beaminv_state::controller_select_w)); /* to be confirmed */ + map(0x00, 0x00).w(FUNC(beaminv_state::controller_select_w)); /* to be confirmed */ } diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp index 531d4d27c31..9a09601ed56 100644 --- a/src/mame/drivers/beathead.cpp +++ b/src/mame/drivers/beathead.cpp @@ -256,27 +256,27 @@ void beathead_state::main_map(address_map &map) map(0x01800000, 0x01bfffff).rom().region("user1", 0).share("rom_base"); map(0x40000000, 0x400007ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask32(0x000000ff); map(0x41000000, 0x41000000).rw(m_jsa, FUNC(atari_jsa_iii_device::main_response_r), FUNC(atari_jsa_iii_device::main_command_w)); - map(0x41000100, 0x41000103).r(this, FUNC(beathead_state::interrupt_control_r)); - map(0x41000100, 0x4100011f).w(this, FUNC(beathead_state::interrupt_control_w)); + map(0x41000100, 0x41000103).r(FUNC(beathead_state::interrupt_control_r)); + map(0x41000100, 0x4100011f).w(FUNC(beathead_state::interrupt_control_w)); map(0x41000200, 0x41000203).portr("IN1"); map(0x41000204, 0x41000207).portr("IN0"); - map(0x41000208, 0x4100020f).w(this, FUNC(beathead_state::sound_reset_w)); - map(0x41000220, 0x41000227).w(this, FUNC(beathead_state::coin_count_w)); + map(0x41000208, 0x4100020f).w(FUNC(beathead_state::sound_reset_w)); + map(0x41000220, 0x41000227).w(FUNC(beathead_state::coin_count_w)); map(0x41000300, 0x41000303).portr("IN2"); map(0x41000304, 0x41000307).portr("IN3"); map(0x41000400, 0x41000403).writeonly().share("palette_select"); map(0x41000500, 0x41000500).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write8)); - map(0x41000600, 0x41000603).w(this, FUNC(beathead_state::finescroll_w)); + map(0x41000600, 0x41000603).w(FUNC(beathead_state::finescroll_w)); map(0x41000700, 0x41000703).w("watchdog", FUNC(watchdog_timer_device::reset32_w)); map(0x42000000, 0x4201ffff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); - map(0x43000000, 0x43000007).rw(this, FUNC(beathead_state::hsync_ram_r), FUNC(beathead_state::hsync_ram_w)); + map(0x43000000, 0x43000007).rw(FUNC(beathead_state::hsync_ram_r), FUNC(beathead_state::hsync_ram_w)); map(0x8df80000, 0x8df80003).nopr(); /* noisy x4 during scanline int */ - map(0x8f380000, 0x8f3fffff).w(this, FUNC(beathead_state::vram_latch_w)); - map(0x8f900000, 0x8f97ffff).w(this, FUNC(beathead_state::vram_transparent_w)); + map(0x8f380000, 0x8f3fffff).w(FUNC(beathead_state::vram_latch_w)); + map(0x8f900000, 0x8f97ffff).w(FUNC(beathead_state::vram_transparent_w)); map(0x8f980000, 0x8f9fffff).ram().share("videoram"); - map(0x8fb80000, 0x8fbfffff).w(this, FUNC(beathead_state::vram_bulk_w)); + map(0x8fb80000, 0x8fbfffff).w(FUNC(beathead_state::vram_bulk_w)); map(0x8fff8000, 0x8fff8003).writeonly().share("vram_bulk_latch"); - map(0x9e280000, 0x9e2fffff).w(this, FUNC(beathead_state::vram_copy_w)); + map(0x9e280000, 0x9e2fffff).w(FUNC(beathead_state::vram_copy_w)); } diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index 95c49e5c7eb..08008374502 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -34,39 +34,39 @@ WRITE8_MEMBER(bebox_state::at_dma8237_1_w) { m_dma8237_2->write(space, offset / void bebox_state::bebox_mem(address_map &map) { - map(0x7FFFF0F0, 0x7FFFF0F7).rw(this, FUNC(bebox_state::bebox_cpu0_imask_r), FUNC(bebox_state::bebox_cpu0_imask_w)); - map(0x7FFFF1F0, 0x7FFFF1F7).rw(this, FUNC(bebox_state::bebox_cpu1_imask_r), FUNC(bebox_state::bebox_cpu1_imask_w)); - map(0x7FFFF2F0, 0x7FFFF2F7).r(this, FUNC(bebox_state::bebox_interrupt_sources_r)); - map(0x7FFFF3F0, 0x7FFFF3F7).rw(this, FUNC(bebox_state::bebox_crossproc_interrupts_r), FUNC(bebox_state::bebox_crossproc_interrupts_w)); - map(0x7FFFF4F0, 0x7FFFF4F7).w(this, FUNC(bebox_state::bebox_processor_resets_w)); + map(0x7FFFF0F0, 0x7FFFF0F7).rw(FUNC(bebox_state::bebox_cpu0_imask_r), FUNC(bebox_state::bebox_cpu0_imask_w)); + map(0x7FFFF1F0, 0x7FFFF1F7).rw(FUNC(bebox_state::bebox_cpu1_imask_r), FUNC(bebox_state::bebox_cpu1_imask_w)); + map(0x7FFFF2F0, 0x7FFFF2F7).r(FUNC(bebox_state::bebox_interrupt_sources_r)); + map(0x7FFFF3F0, 0x7FFFF3F7).rw(FUNC(bebox_state::bebox_crossproc_interrupts_r), FUNC(bebox_state::bebox_crossproc_interrupts_w)); + map(0x7FFFF4F0, 0x7FFFF4F7).w(FUNC(bebox_state::bebox_processor_resets_w)); map(0x80000000, 0x8000001F).rw(m_dma8237_1, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x80000020, 0x8000003F).rw(m_pic8259_1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x80000040, 0x8000005f).rw(m_pit8254, FUNC(pit8254_device::read), FUNC(pit8254_device::write)); map(0x80000060, 0x8000006F).rw("kbdc", FUNC(kbdc8042_device::data_r), FUNC(kbdc8042_device::data_w)); map(0x80000070, 0x8000007F).rw("rtc", FUNC(mc146818_device::read), FUNC(mc146818_device::write)); - map(0x80000080, 0x8000009F).rw(this, FUNC(bebox_state::bebox_page_r), FUNC(bebox_state::bebox_page_w)); + map(0x80000080, 0x8000009F).rw(FUNC(bebox_state::bebox_page_r), FUNC(bebox_state::bebox_page_w)); map(0x800000A0, 0x800000BF).rw(m_pic8259_2, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x800000C0, 0x800000DF).rw(this, FUNC(bebox_state::at_dma8237_1_r), FUNC(bebox_state::at_dma8237_1_w)); - map(0x800001F0, 0x800001F7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); + map(0x800000C0, 0x800000DF).rw(FUNC(bebox_state::at_dma8237_1_r), FUNC(bebox_state::at_dma8237_1_w)); + map(0x800001F0, 0x800001F7).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); map(0x800002F8, 0x800002FF).rw("ns16550_1", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); map(0x80000380, 0x80000387).rw("ns16550_2", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); map(0x80000388, 0x8000038F).rw("ns16550_3", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); map(0x800003b0, 0x800003bf).rw("vga", FUNC(cirrus_gd5428_device::port_03b0_r), FUNC(cirrus_gd5428_device::port_03b0_w)); map(0x800003c0, 0x800003cf).rw("vga", FUNC(cirrus_gd5428_device::port_03c0_r), FUNC(cirrus_gd5428_device::port_03c0_w)); map(0x800003d0, 0x800003df).rw("vga", FUNC(cirrus_gd5428_device::port_03d0_r), FUNC(cirrus_gd5428_device::port_03d0_w)); - map(0x800003F0, 0x800003F7).rw("ide", FUNC(ide_controller_device::read_cs1), FUNC(ide_controller_device::write_cs1)); + map(0x800003F0, 0x800003F7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); map(0x800003F0, 0x800003F7).m(m_smc37c78, FUNC(smc37c78_device::map)); map(0x800003F8, 0x800003FF).rw("ns16550_0", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); - map(0x80000480, 0x8000048F).rw(this, FUNC(bebox_state::bebox_80000480_r), FUNC(bebox_state::bebox_80000480_w)); + map(0x80000480, 0x8000048F).rw(FUNC(bebox_state::bebox_80000480_r), FUNC(bebox_state::bebox_80000480_w)); map(0x80000CF8, 0x80000CFF).rw(m_pcibus, FUNC(pci_bus_device::read_64be), FUNC(pci_bus_device::write_64be)); //AM_RANGE(0x800042E8, 0x800042EF) AM_DEVWRITE8("cirrus", cirrus_device, cirrus_42E8_w, 0xffffffffffffffffU ) - map(0xBFFFFFF0, 0xBFFFFFFF).r(this, FUNC(bebox_state::bebox_interrupt_ack_r)); + map(0xBFFFFFF0, 0xBFFFFFFF).r(FUNC(bebox_state::bebox_interrupt_ack_r)); map(0xC00A0000, 0xC00BFFFF).rw("vga", FUNC(cirrus_gd5428_device::mem_r), FUNC(cirrus_gd5428_device::mem_w)); map(0xC1000000, 0xC11FFFFF).rw("vga", FUNC(cirrus_gd5428_device::mem_linear_r), FUNC(cirrus_gd5428_device::mem_linear_w)); map(0xFFF00000, 0xFFF03FFF).bankr("bank2"); - map(0xFFF04000, 0xFFFFFFFF).rw(this, FUNC(bebox_state::bebox_flash_r), FUNC(bebox_state::bebox_flash_w)); + map(0xFFF04000, 0xFFFFFFFF).rw(FUNC(bebox_state::bebox_flash_r), FUNC(bebox_state::bebox_flash_w)); } // The following is a gross hack to let the BeBox boot ROM identify the processors correctly. @@ -86,7 +86,7 @@ READ64_MEMBER(bebox_state::bb_slave_64be_r) void bebox_state::bebox_slave_mem(address_map &map) { bebox_mem(map); - map(0x80000cf8, 0x80000cff).r(this, FUNC(bebox_state::bb_slave_64be_r)); + map(0x80000cf8, 0x80000cff).r(FUNC(bebox_state::bb_slave_64be_r)); map(0x80000cf8, 0x80000cff).w(m_pcibus, FUNC(pci_bus_device::write_64be)); } diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp index 28c320b0edf..e31ac4538c3 100644 --- a/src/mame/drivers/beehive.cpp +++ b/src/mame/drivers/beehive.cpp @@ -79,9 +79,9 @@ void beehive_state::beehive_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0x11, 0x11).portr("DIPS"); - map(0x60, 0x60).r(this, FUNC(beehive_state::beehive_60_r)); + map(0x60, 0x60).r(FUNC(beehive_state::beehive_60_r)); map(0x61, 0x61).portr("MODIFIERS"); - map(0x62, 0x62).w(this, FUNC(beehive_state::beehive_62_w)); + map(0x62, 0x62).w(FUNC(beehive_state::beehive_62_w)); } /* Input ports */ diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp index 24d52ce1165..bde05859c1e 100644 --- a/src/mame/drivers/beezer.cpp +++ b/src/mame/drivers/beezer.cpp @@ -137,7 +137,7 @@ void beezer_state::main_map(address_map &map) { map(0x0000, 0xbfff).ram().share("videoram"); map(0xc000, 0xcfff).m(m_sysbank, FUNC(address_map_bank_device::amap8)); - map(0xd000, 0xdfff).rom().region("maincpu", 0x0000).w(this, FUNC(beezer_state::bankswitch_w)); // g1 + map(0xd000, 0xdfff).rom().region("maincpu", 0x0000).w(FUNC(beezer_state::bankswitch_w)); // g1 map(0xe000, 0xefff).rom().region("maincpu", 0x1000); // g3 map(0xf000, 0xffff).rom().region("maincpu", 0x2000); // g5 } @@ -145,8 +145,8 @@ void beezer_state::main_map(address_map &map) void beezer_state::banked_map(address_map &map) { map(0x0600, 0x0600).mirror(0x1ff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0800, 0x080f).mirror(0x1f0).w(this, FUNC(beezer_state::palette_w)); - map(0x0a00, 0x0a00).mirror(0x1ff).r(this, FUNC(beezer_state::line_r)); + map(0x0800, 0x080f).mirror(0x1f0).w(FUNC(beezer_state::palette_w)); + map(0x0a00, 0x0a00).mirror(0x1ff).r(FUNC(beezer_state::line_r)); map(0x0e00, 0x0e0f).mirror(0x1f0).rw("via_u6", FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0x1000, 0x1fff).bankr("rombank_f1"); map(0x2000, 0x2fff).bankr("rombank_f3"); @@ -163,7 +163,7 @@ void beezer_state::sound_map(address_map &map) map(0x0800, 0x0fff).ram(); // 2d, optional (can be rom) map(0x1000, 0x1007).mirror(0x07f8).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0x1800, 0x180f).mirror(0x07f0).rw(m_via_audio, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x8000, 0x8003).mirror(0x1ffc).w(this, FUNC(beezer_state::dac_w)); + map(0x8000, 0x8003).mirror(0x1ffc).w(FUNC(beezer_state::dac_w)); // AM_RANGE(0xa000, 0xbfff) AM_ROM // 2d (can be ram, unpopulated) // AM_RANGE(0xc000, 0xdfff) AM_ROM // 4d (unpopulated) map(0xe000, 0xffff).rom().region("audiocpu", 0); // 6d diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp index 0bb7fda4b02..02329e21664 100644 --- a/src/mame/drivers/berzerk.cpp +++ b/src/mame/drivers/berzerk.cpp @@ -619,7 +619,7 @@ void berzerk_state::berzerk_map(address_map &map) map(0x0800, 0x0bff).mirror(0x0400).ram().share("nvram"); map(0x1000, 0x3fff).rom(); map(0x4000, 0x5fff).ram().share("videoram"); - map(0x6000, 0x7fff).ram().w(this, FUNC(berzerk_state::magicram_w)).share("videoram"); + map(0x6000, 0x7fff).ram().w(FUNC(berzerk_state::magicram_w)).share("videoram"); map(0x8000, 0x87ff).mirror(0x3800).ram().share("colorram"); map(0xc000, 0xffff).noprw(); } @@ -629,7 +629,7 @@ void berzerk_state::frenzy_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x5fff).ram().share("videoram"); - map(0x6000, 0x7fff).ram().w(this, FUNC(berzerk_state::magicram_w)).share("videoram"); + map(0x6000, 0x7fff).ram().w(FUNC(berzerk_state::magicram_w)).share("videoram"); map(0x8000, 0x87ff).mirror(0x3800).ram().share("colorram"); map(0xc000, 0xcfff).rom(); map(0xf800, 0xfbff).mirror(0x0400).ram().share("nvram"); @@ -647,15 +647,15 @@ void berzerk_state::berzerk_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x3f).noprw(); - map(0x40, 0x47).rw(this, FUNC(berzerk_state::audio_r), FUNC(berzerk_state::audio_w)); + map(0x40, 0x47).rw(FUNC(berzerk_state::audio_r), FUNC(berzerk_state::audio_w)); map(0x48, 0x48).portr("P1").nopw(); map(0x49, 0x49).portr("SYSTEM").nopw(); map(0x4a, 0x4a).portr("P2").nopw(); - map(0x4b, 0x4b).nopr().w(this, FUNC(berzerk_state::magicram_control_w)); - map(0x4c, 0x4c).rw(this, FUNC(berzerk_state::nmi_enable_r), FUNC(berzerk_state::nmi_enable_w)); - map(0x4d, 0x4d).rw(this, FUNC(berzerk_state::nmi_disable_r), FUNC(berzerk_state::nmi_disable_w)); - map(0x4e, 0x4e).r(this, FUNC(berzerk_state::intercept_v256_r)).nopw(); // note reading from here should clear pending frame interrupts, see zfb-1.tiff 74ls74 at 3D pin 13 /CLR - map(0x4f, 0x4f).nopr().w(this, FUNC(berzerk_state::irq_enable_w)); + map(0x4b, 0x4b).nopr().w(FUNC(berzerk_state::magicram_control_w)); + map(0x4c, 0x4c).rw(FUNC(berzerk_state::nmi_enable_r), FUNC(berzerk_state::nmi_enable_w)); + map(0x4d, 0x4d).rw(FUNC(berzerk_state::nmi_disable_r), FUNC(berzerk_state::nmi_disable_w)); + map(0x4e, 0x4e).r(FUNC(berzerk_state::intercept_v256_r)).nopw(); // note reading from here should clear pending frame interrupts, see zfb-1.tiff 74ls74 at 3D pin 13 /CLR + map(0x4f, 0x4f).nopr().w(FUNC(berzerk_state::irq_enable_w)); map(0x50, 0x57).noprw(); /* second sound board, initialized but not used */ map(0x58, 0x5f).noprw(); map(0x60, 0x60).mirror(0x18).portr("F3").nopw(); @@ -664,8 +664,8 @@ void berzerk_state::berzerk_io_map(address_map &map) map(0x63, 0x63).mirror(0x18).portr("F5").nopw(); map(0x64, 0x64).mirror(0x18).portr("F4").nopw(); map(0x65, 0x65).mirror(0x18).portr("SW2").nopw(); - map(0x66, 0x66).mirror(0x18).rw(this, FUNC(berzerk_state::led_off_r), FUNC(berzerk_state::led_off_w)); - map(0x67, 0x67).mirror(0x18).rw(this, FUNC(berzerk_state::led_on_r), FUNC(berzerk_state::led_on_w)); + map(0x66, 0x66).mirror(0x18).rw(FUNC(berzerk_state::led_off_r), FUNC(berzerk_state::led_off_w)); + map(0x67, 0x67).mirror(0x18).rw(FUNC(berzerk_state::led_on_r), FUNC(berzerk_state::led_on_w)); map(0x80, 0xff).noprw(); } diff --git a/src/mame/drivers/besta.cpp b/src/mame/drivers/besta.cpp index e4e550f8ac2..cf8c9213551 100644 --- a/src/mame/drivers/besta.cpp +++ b/src/mame/drivers/besta.cpp @@ -110,7 +110,7 @@ void besta_state::besta_mem(address_map &map) map(0xff000000, 0xff00ffff).rom().region("user1", 0); // actual mapping is up to 0xff03ffff map(0xff040000, 0xff07ffff).ram(); // onboard SRAM // AM_RANGE(0xff800000, 0xff80001f) AM_DEVREADWRITE8("mpcc", mpcc68561_t, reg_r, reg_w, 0xffffffff) - map(0xff800000, 0xff80001f).rw(this, FUNC(besta_state::mpcc_reg_r), FUNC(besta_state::mpcc_reg_w)); // console + map(0xff800000, 0xff80001f).rw(FUNC(besta_state::mpcc_reg_r), FUNC(besta_state::mpcc_reg_w)); // console map(0xff800200, 0xff800237).rw(m_pit2, FUNC(pit68230_device::read), FUNC(pit68230_device::write)); // AM_RANGE(0xff800400, 0xff800xxx) // ??? -- shows up in cp31dssp log // AM_RANGE(0xff800800, 0xff800xxx) // 68153 BIM diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp index 6c92dd88bde..34ec681c166 100644 --- a/src/mame/drivers/bestleag.cpp +++ b/src/mame/drivers/bestleag.cpp @@ -254,9 +254,9 @@ void bestleag_state::bestleag_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x0d2000, 0x0d3fff).noprw(); // left over from the original game (only read / written in memory test) - map(0x0e0000, 0x0e3fff).ram().w(this, FUNC(bestleag_state::bgram_w)).share("bgram"); - map(0x0e8000, 0x0ebfff).ram().w(this, FUNC(bestleag_state::fgram_w)).share("fgram"); - map(0x0f0000, 0x0f3fff).ram().w(this, FUNC(bestleag_state::txram_w)).share("txram"); + map(0x0e0000, 0x0e3fff).ram().w(FUNC(bestleag_state::bgram_w)).share("bgram"); + map(0x0e8000, 0x0ebfff).ram().w(FUNC(bestleag_state::fgram_w)).share("fgram"); + map(0x0f0000, 0x0f3fff).ram().w(FUNC(bestleag_state::txram_w)).share("txram"); map(0x0f8000, 0x0f800b).ram().share("vregs"); map(0x100000, 0x100fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x200000, 0x200fff).ram().share("spriteram"); @@ -265,7 +265,7 @@ void bestleag_state::bestleag_map(address_map &map) map(0x300014, 0x300015).portr("P2"); map(0x300016, 0x300017).portr("DSWA"); map(0x300018, 0x300019).portr("DSWB"); - map(0x30001c, 0x30001d).w(this, FUNC(bestleag_state::oki_bank_w)); + map(0x30001c, 0x30001d).w(FUNC(bestleag_state::oki_bank_w)); map(0x30001f, 0x30001f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x304000, 0x304001).nopw(); map(0xfe0000, 0xffffff).ram(); diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 94438850439..b1d2e115043 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -1273,12 +1273,12 @@ void bfcobra_state::z80_prog_map(address_map &map) void bfcobra_state::z80_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x23).rw(this, FUNC(bfcobra_state::chipset_r), FUNC(bfcobra_state::chipset_w)); + map(0x00, 0x23).rw(FUNC(bfcobra_state::chipset_r), FUNC(bfcobra_state::chipset_w)); map(0x24, 0x25).w(m_acia6850_0, FUNC(acia6850_device::write)); map(0x26, 0x27).r(m_acia6850_0, FUNC(acia6850_device::read)); - map(0x30, 0x30).r(this, FUNC(bfcobra_state::fdctrl_r)); - map(0x31, 0x31).rw(this, FUNC(bfcobra_state::fddata_r), FUNC(bfcobra_state::fdctrl_w)); - map(0x40, 0x40).w(this, FUNC(bfcobra_state::rombank_w)); + map(0x30, 0x30).r(FUNC(bfcobra_state::fdctrl_r)); + map(0x31, 0x31).rw(FUNC(bfcobra_state::fddata_r), FUNC(bfcobra_state::fdctrl_w)); + map(0x40, 0x40).w(FUNC(bfcobra_state::rombank_w)); map(0x50, 0x50).w("ramdac", FUNC(ramdac_device::index_w)); map(0x51, 0x51).rw("ramdac", FUNC(ramdac_device::pal_r), FUNC(ramdac_device::pal_w)); map(0x52, 0x52).w("ramdac", FUNC(ramdac_device::mask_w)); @@ -1406,10 +1406,10 @@ void bfcobra_state::m6809_prog_map(address_map &map) map(0x0000, 0x1fff).ram().share("nvram"); map(0x2000, 0x2000).ram(); // W 'B', 6F map(0x2200, 0x2200).ram(); // W 'F' - map(0x2600, 0x2600).rw(this, FUNC(bfcobra_state::meter_r), FUNC(bfcobra_state::meter_w)); + map(0x2600, 0x2600).rw(FUNC(bfcobra_state::meter_r), FUNC(bfcobra_state::meter_w)); map(0x2800, 0x2800).ram(); // W - map(0x2A00, 0x2A02).rw(this, FUNC(bfcobra_state::latch_r), FUNC(bfcobra_state::latch_w)); - map(0x2E00, 0x2E00).r(this, FUNC(bfcobra_state::int_latch_r)); + map(0x2A00, 0x2A02).rw(FUNC(bfcobra_state::latch_r), FUNC(bfcobra_state::latch_w)); + map(0x2E00, 0x2E00).r(FUNC(bfcobra_state::int_latch_r)); map(0x3001, 0x3001).w("aysnd", FUNC(ay8910_device::data_w)); map(0x3201, 0x3201).w("aysnd", FUNC(ay8910_device::address_w)); map(0x3404, 0x3405).rw(m_acia6850_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); @@ -1417,7 +1417,7 @@ void bfcobra_state::m6809_prog_map(address_map &map) // AM_RANGE(0x3408, 0x3408) AM_NOP // AM_RANGE(0x340A, 0x340A) AM_NOP // AM_RANGE(0x3600, 0x3600) AM_NOP - map(0x3801, 0x3801).rw(this, FUNC(bfcobra_state::upd_r), FUNC(bfcobra_state::upd_w)); + map(0x3801, 0x3801).rw(FUNC(bfcobra_state::upd_r), FUNC(bfcobra_state::upd_w)); map(0x8000, 0xffff).rom(); map(0xf000, 0xf000).nopw(); /* Watchdog */ } diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp index b87e778df10..32a9ddb07d4 100644 --- a/src/mame/drivers/bfm_sc1.cpp +++ b/src/mame/drivers/bfm_sc1.cpp @@ -669,32 +669,32 @@ void bfm_sc1_state::sc1_base(address_map &map) { map(0x0000, 0x1FFF).ram().share("nvram"); //8k RAM - map(0x2000, 0x21FF).w(this, FUNC(bfm_sc1_state::reel34_w)); // reel 2+3 latch - map(0x2200, 0x23FF).w(this, FUNC(bfm_sc1_state::reel12_w)); // reel 1+2 latch - map(0x2400, 0x25FF).w(this, FUNC(bfm_sc1_state::vfd_w)); // vfd latch + map(0x2000, 0x21FF).w(FUNC(bfm_sc1_state::reel34_w)); // reel 2+3 latch + map(0x2200, 0x23FF).w(FUNC(bfm_sc1_state::reel12_w)); // reel 1+2 latch + map(0x2400, 0x25FF).w(FUNC(bfm_sc1_state::vfd_w)); // vfd latch - map(0x2600, 0x27FF).rw(this, FUNC(bfm_sc1_state::mmtr_r), FUNC(bfm_sc1_state::mmtr_w)); // mechanical meters - map(0x2800, 0x2800).rw(this, FUNC(bfm_sc1_state::triac_r), FUNC(bfm_sc1_state::triac_w)); // payslide triacs + map(0x2600, 0x27FF).rw(FUNC(bfm_sc1_state::mmtr_r), FUNC(bfm_sc1_state::mmtr_w)); // mechanical meters + map(0x2800, 0x2800).rw(FUNC(bfm_sc1_state::triac_r), FUNC(bfm_sc1_state::triac_w)); // payslide triacs - map(0x2A00, 0x2A00).rw(this, FUNC(bfm_sc1_state::mux1latch_r), FUNC(bfm_sc1_state::mux1latch_w)); // mux1 - map(0x2A01, 0x2A01).rw(this, FUNC(bfm_sc1_state::mux1datlo_r), FUNC(bfm_sc1_state::mux1datlo_w)); - map(0x2A02, 0x2A02).rw(this, FUNC(bfm_sc1_state::mux1dathi_r), FUNC(bfm_sc1_state::mux1dathi_w)); + map(0x2A00, 0x2A00).rw(FUNC(bfm_sc1_state::mux1latch_r), FUNC(bfm_sc1_state::mux1latch_w)); // mux1 + map(0x2A01, 0x2A01).rw(FUNC(bfm_sc1_state::mux1datlo_r), FUNC(bfm_sc1_state::mux1datlo_w)); + map(0x2A02, 0x2A02).rw(FUNC(bfm_sc1_state::mux1dathi_r), FUNC(bfm_sc1_state::mux1dathi_w)); - map(0x2E00, 0x2E00).r(this, FUNC(bfm_sc1_state::irqlatch_r)); // irq latch + map(0x2E00, 0x2E00).r(FUNC(bfm_sc1_state::irqlatch_r)); // irq latch map(0x3001, 0x3001).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x3001, 0x3001).w("aysnd", FUNC(ay8910_device::data_w)); map(0x3101, 0x3201).w("aysnd", FUNC(ay8910_device::address_w)); - map(0x3406, 0x3406).rw(this, FUNC(bfm_sc1_state::aciastat_r), FUNC(bfm_sc1_state::aciactrl_w)); // MC6850 status register - map(0x3407, 0x3407).rw(this, FUNC(bfm_sc1_state::aciadata_r), FUNC(bfm_sc1_state::aciadata_w)); // MC6850 data register + map(0x3406, 0x3406).rw(FUNC(bfm_sc1_state::aciastat_r), FUNC(bfm_sc1_state::aciactrl_w)); // MC6850 status register + map(0x3407, 0x3407).rw(FUNC(bfm_sc1_state::aciadata_r), FUNC(bfm_sc1_state::aciadata_w)); // MC6850 data register - map(0x3408, 0x3408).rw(this, FUNC(bfm_sc1_state::mux2latch_r), FUNC(bfm_sc1_state::mux2latch_w)); // mux2 - map(0x3409, 0x3409).rw(this, FUNC(bfm_sc1_state::mux2datlo_r), FUNC(bfm_sc1_state::mux2datlo_w)); - map(0x340A, 0x340A).rw(this, FUNC(bfm_sc1_state::mux2dathi_r), FUNC(bfm_sc1_state::mux2dathi_w)); + map(0x3408, 0x3408).rw(FUNC(bfm_sc1_state::mux2latch_r), FUNC(bfm_sc1_state::mux2latch_w)); // mux2 + map(0x3409, 0x3409).rw(FUNC(bfm_sc1_state::mux2datlo_r), FUNC(bfm_sc1_state::mux2datlo_w)); + map(0x340A, 0x340A).rw(FUNC(bfm_sc1_state::mux2dathi_r), FUNC(bfm_sc1_state::mux2dathi_w)); - map(0x3600, 0x3600).w(this, FUNC(bfm_sc1_state::bankswitch_w)); // write bank - map(0x3800, 0x39FF).w(this, FUNC(bfm_sc1_state::reel56_w)); // reel 5+6 latch + map(0x3600, 0x3600).w(FUNC(bfm_sc1_state::bankswitch_w)); // write bank + map(0x3800, 0x39FF).w(FUNC(bfm_sc1_state::reel56_w)); // reel 5+6 latch map(0x4000, 0x5FFF).rom(); // 8k ROM map(0x6000, 0x7FFF).bankr("bank1"); // 8k paged ROM (4 pages) @@ -723,9 +723,9 @@ void bfm_sc1_state::sc1_viper(address_map &map) { sc1_base(map); - map(0x3404, 0x3404).r(this, FUNC(bfm_sc1_state::dipcoin_r)); // coin input on gamecard - map(0x3801, 0x3801).r(this, FUNC(bfm_sc1_state::nec_r)); - map(0x3800, 0x39FF).w(this, FUNC(bfm_sc1_state::nec_latch_w)); + map(0x3404, 0x3404).r(FUNC(bfm_sc1_state::dipcoin_r)); // coin input on gamecard + map(0x3801, 0x3801).r(FUNC(bfm_sc1_state::nec_r)); + map(0x3800, 0x39FF).w(FUNC(bfm_sc1_state::nec_latch_w)); } // input ports for scorpion1 board ////////////////////////////////////////////////// diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index fcd078f4eef..e8e31324122 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -1535,44 +1535,44 @@ void bfm_sc2_state::sc2_basemap(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); //8k - map(0x2300, 0x230B).r(this, FUNC(bfm_sc2_state::mux_input_r)); - map(0x2300, 0x231F).w(this, FUNC(bfm_sc2_state::mux_output_w)); - map(0x2320, 0x2323).w(this, FUNC(bfm_sc2_state::dimas_w)); /* ?unknown dim related */ - - map(0x2324, 0x2324).rw(this, FUNC(bfm_sc2_state::expansion_latch_r), FUNC(bfm_sc2_state::expansion_latch_w)); - map(0x2325, 0x2327).w(this, FUNC(bfm_sc2_state::unknown_w)); - map(0x2328, 0x2328).w(this, FUNC(bfm_sc2_state::muxena_w)); - map(0x2329, 0x2329).rw(this, FUNC(bfm_sc2_state::timerirqclr_r), FUNC(bfm_sc2_state::timerirq_w)); - map(0x232A, 0x232D).w(this, FUNC(bfm_sc2_state::unknown_w)); - map(0x232E, 0x232E).r(this, FUNC(bfm_sc2_state::irqstatus_r)); - - map(0x232F, 0x232F).w(this, FUNC(bfm_sc2_state::coininhib_w)); - map(0x2330, 0x2330).w(this, FUNC(bfm_sc2_state::payout_latch_w)); - map(0x2331, 0x2331).w(this, FUNC(bfm_sc2_state::payout_triac_w)); + map(0x2300, 0x230B).r(FUNC(bfm_sc2_state::mux_input_r)); + map(0x2300, 0x231F).w(FUNC(bfm_sc2_state::mux_output_w)); + map(0x2320, 0x2323).w(FUNC(bfm_sc2_state::dimas_w)); /* ?unknown dim related */ + + map(0x2324, 0x2324).rw(FUNC(bfm_sc2_state::expansion_latch_r), FUNC(bfm_sc2_state::expansion_latch_w)); + map(0x2325, 0x2327).w(FUNC(bfm_sc2_state::unknown_w)); + map(0x2328, 0x2328).w(FUNC(bfm_sc2_state::muxena_w)); + map(0x2329, 0x2329).rw(FUNC(bfm_sc2_state::timerirqclr_r), FUNC(bfm_sc2_state::timerirq_w)); + map(0x232A, 0x232D).w(FUNC(bfm_sc2_state::unknown_w)); + map(0x232E, 0x232E).r(FUNC(bfm_sc2_state::irqstatus_r)); + + map(0x232F, 0x232F).w(FUNC(bfm_sc2_state::coininhib_w)); + map(0x2330, 0x2330).w(FUNC(bfm_sc2_state::payout_latch_w)); + map(0x2331, 0x2331).w(FUNC(bfm_sc2_state::payout_triac_w)); map(0x2332, 0x2332).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x2333, 0x2333).w(this, FUNC(bfm_sc2_state::mmtr_w)); - map(0x2334, 0x2335).w(this, FUNC(bfm_sc2_state::unknown_w)); - map(0x2336, 0x2336).w(this, FUNC(bfm_sc2_state::dimcnt_w)); - map(0x2337, 0x2337).w(this, FUNC(bfm_sc2_state::volume_override_w)); - map(0x2338, 0x2338).w(this, FUNC(bfm_sc2_state::payout_select_w)); - map(0x2339, 0x2339).w(this, FUNC(bfm_sc2_state::unknown_w)); - map(0x2400, 0x2400).rw(this, FUNC(bfm_sc2_state::uart1stat_r), FUNC(bfm_sc2_state::uart1ctrl_w)); /* mc6850 compatible uart */ - map(0x2500, 0x2500).rw(this, FUNC(bfm_sc2_state::uart1data_r), FUNC(bfm_sc2_state::uart1data_w)); - map(0x2600, 0x2600).rw(this, FUNC(bfm_sc2_state::uart2stat_r), FUNC(bfm_sc2_state::uart2ctrl_w)); /* mc6850 compatible uart */ - map(0x2700, 0x2700).rw(this, FUNC(bfm_sc2_state::uart2data_r), FUNC(bfm_sc2_state::uart2data_w)); - map(0x2800, 0x2800).w(this, FUNC(bfm_sc2_state::vfd1_bd1_w)); /* vfd1 data */ - map(0x2900, 0x2900).w(this, FUNC(bfm_sc2_state::vfd_reset_w)); /* vfd1+vfd2 reset line */ - map(0x2A00, 0x2AFF).w(this, FUNC(bfm_sc2_state::nec_latch_w)); - map(0x2B00, 0x2BFF).w(this, FUNC(bfm_sc2_state::nec_reset_w)); - map(0x2C00, 0x2C00).w(this, FUNC(bfm_sc2_state::unlock_w)); /* custom chip unlock */ + map(0x2333, 0x2333).w(FUNC(bfm_sc2_state::mmtr_w)); + map(0x2334, 0x2335).w(FUNC(bfm_sc2_state::unknown_w)); + map(0x2336, 0x2336).w(FUNC(bfm_sc2_state::dimcnt_w)); + map(0x2337, 0x2337).w(FUNC(bfm_sc2_state::volume_override_w)); + map(0x2338, 0x2338).w(FUNC(bfm_sc2_state::payout_select_w)); + map(0x2339, 0x2339).w(FUNC(bfm_sc2_state::unknown_w)); + map(0x2400, 0x2400).rw(FUNC(bfm_sc2_state::uart1stat_r), FUNC(bfm_sc2_state::uart1ctrl_w)); /* mc6850 compatible uart */ + map(0x2500, 0x2500).rw(FUNC(bfm_sc2_state::uart1data_r), FUNC(bfm_sc2_state::uart1data_w)); + map(0x2600, 0x2600).rw(FUNC(bfm_sc2_state::uart2stat_r), FUNC(bfm_sc2_state::uart2ctrl_w)); /* mc6850 compatible uart */ + map(0x2700, 0x2700).rw(FUNC(bfm_sc2_state::uart2data_r), FUNC(bfm_sc2_state::uart2data_w)); + map(0x2800, 0x2800).w(FUNC(bfm_sc2_state::vfd1_bd1_w)); /* vfd1 data */ + map(0x2900, 0x2900).w(FUNC(bfm_sc2_state::vfd_reset_w)); /* vfd1+vfd2 reset line */ + map(0x2A00, 0x2AFF).w(FUNC(bfm_sc2_state::nec_latch_w)); + map(0x2B00, 0x2BFF).w(FUNC(bfm_sc2_state::nec_reset_w)); + map(0x2C00, 0x2C00).w(FUNC(bfm_sc2_state::unlock_w)); /* custom chip unlock */ map(0x2D00, 0x2D01).w(m_ym2413, FUNC(ym2413_device::write)); - map(0x2E00, 0x2E00).w(this, FUNC(bfm_sc2_state::bankswitch_w)); /* write bank (rom page select for 0x6000 - 0x7fff ) */ + map(0x2E00, 0x2E00).w(FUNC(bfm_sc2_state::bankswitch_w)); /* write bank (rom page select for 0x6000 - 0x7fff ) */ //AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) /* vfd2 data (not usually connected!)*/ - map(0x3FFE, 0x3FFE).r(this, FUNC(bfm_sc2_state::direct_input_r)); - map(0x3FFF, 0x3FFF).r(this, FUNC(bfm_sc2_state::coin_input_r)); + map(0x3FFE, 0x3FFE).r(FUNC(bfm_sc2_state::direct_input_r)); + map(0x3FFF, 0x3FFF).r(FUNC(bfm_sc2_state::coin_input_r)); map(0x4000, 0x5FFF).rom(); - map(0x4000, 0xFFFF).w(this, FUNC(bfm_sc2_state::unknown_w)); // contains unknown I/O registers + map(0x4000, 0xFFFF).w(FUNC(bfm_sc2_state::unknown_w)); // contains unknown I/O registers map(0x6000, 0x7FFF).bankr("bank1"); map(0x8000, 0xFFFF).rom(); } @@ -1580,10 +1580,10 @@ void bfm_sc2_state::sc2_basemap(address_map &map) void bfm_sc2_novid_state::memmap_no_vid(address_map &map) { sc2_basemap(map); - map(0x2000, 0x2000).r(this, FUNC(bfm_sc2_novid_state::vfd_status_r)); - map(0x2000, 0x20FF).w(this, FUNC(bfm_sc2_novid_state::reel12_w)); - map(0x2100, 0x21FF).w(this, FUNC(bfm_sc2_novid_state::reel34_w)); - map(0x2200, 0x22FF).w(this, FUNC(bfm_sc2_novid_state::reel56_w)); + map(0x2000, 0x2000).r(FUNC(bfm_sc2_novid_state::vfd_status_r)); + map(0x2000, 0x20FF).w(FUNC(bfm_sc2_novid_state::reel12_w)); + map(0x2100, 0x21FF).w(FUNC(bfm_sc2_novid_state::reel34_w)); + map(0x2200, 0x22FF).w(FUNC(bfm_sc2_novid_state::reel56_w)); } // memory map for scorpion2 board video addon ///////////////////////////// @@ -1592,13 +1592,13 @@ void bfm_sc2_vid_state::memmap_vid(address_map &map) { sc2_basemap(map); - map(0x2000, 0x2000).r(this, FUNC(bfm_sc2_vid_state::vfd_status_hop_r)); // vfd status register - map(0x2000, 0x20FF).w(this, FUNC(bfm_sc2_vid_state::reel12_vid_w)); + map(0x2000, 0x2000).r(FUNC(bfm_sc2_vid_state::vfd_status_hop_r)); // vfd status register + map(0x2000, 0x20FF).w(FUNC(bfm_sc2_vid_state::reel12_vid_w)); map(0x2100, 0x21FF).nopw(); map(0x2200, 0x22FF).nopw(); - map(0x3C00, 0x3C07).r(this, FUNC(bfm_sc2_vid_state::key_r)); - map(0x3C80, 0x3C80).w(this, FUNC(bfm_sc2_vid_state::e2ram_w)); + map(0x3C00, 0x3C07).r(FUNC(bfm_sc2_vid_state::key_r)); + map(0x3C80, 0x3C80).w(FUNC(bfm_sc2_vid_state::e2ram_w)); map(0x3E00, 0x3E00).rw("adder2", FUNC(bfm_adder2_device::vid_uart_ctrl_r), FUNC(bfm_adder2_device::vid_uart_ctrl_w)); // video uart control reg map(0x3E01, 0x3E01).rw("adder2", FUNC(bfm_adder2_device::vid_uart_rx_r), FUNC(bfm_adder2_device::vid_uart_tx_w)); // video uart data reg diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index b2ff238c4aa..e7200f5222c 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -614,8 +614,8 @@ WRITE16_MEMBER(sc4_state::sc4_mem_w) void sc4_state::sc4_map(address_map &map) { - map(0x0000000, 0xffffff).rw(this, FUNC(sc4_state::sc4_mem_r), FUNC(sc4_state::sc4_mem_w)); - map(0x0000000, 0x0fffff).r(this, FUNC(sc4_state::sc4_cs1_r)); // technically we should be going through the cs handler, but this is always set to ROM, and assuming that is a lot faster + map(0x0000000, 0xffffff).rw(FUNC(sc4_state::sc4_mem_r), FUNC(sc4_state::sc4_mem_w)); + map(0x0000000, 0x0fffff).r(FUNC(sc4_state::sc4_cs1_r)); // technically we should be going through the cs handler, but this is always set to ROM, and assuming that is a lot faster } @@ -665,7 +665,7 @@ WRITE32_MEMBER(sc4_adder4_state::adder4_mem_w) void sc4_adder4_state::sc4_adder4_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(sc4_adder4_state::adder4_mem_r), FUNC(sc4_adder4_state::adder4_mem_w)); + map(0x00000000, 0xffffffff).rw(FUNC(sc4_adder4_state::adder4_mem_r), FUNC(sc4_adder4_state::adder4_mem_w)); } diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp index 4aa48b0bb49..cd02180cfb3 100644 --- a/src/mame/drivers/bfm_sc5.cpp +++ b/src/mame/drivers/bfm_sc5.cpp @@ -89,7 +89,7 @@ void bfm_sc5_state::sc5_map(address_map &map) #if 1 // dev1 - map(0x01010000, 0x010101ff).rw(this, FUNC(bfm_sc5_state::sc5_mux1_r), FUNC(bfm_sc5_state::sc5_mux1_w)); // guess + map(0x01010000, 0x010101ff).rw(FUNC(bfm_sc5_state::sc5_mux1_r), FUNC(bfm_sc5_state::sc5_mux1_w)); // guess #endif #if 0 @@ -119,7 +119,7 @@ void bfm_sc5_state::sc5_map(address_map &map) #if 1 // dev2 - map(0x01020000, 0x010201ff).w(this, FUNC(bfm_sc5_state::sc5_mux2_w)); // guess + map(0x01020000, 0x010201ff).w(FUNC(bfm_sc5_state::sc5_mux2_w)); // guess #endif #if 0 @@ -135,7 +135,7 @@ void bfm_sc5_state::sc5_map(address_map &map) map(0x010202b0, 0x010202b3).nopw(); map(0x010202c0, 0x010202c3).nopw(); #endif - map(0x010202F0, 0x010202F3).rw(this, FUNC(bfm_sc5_state::sc5_10202F0_r), FUNC(bfm_sc5_state::sc5_10202F0_w)); + map(0x010202F0, 0x010202F3).rw(FUNC(bfm_sc5_state::sc5_10202F0_r), FUNC(bfm_sc5_state::sc5_10202F0_w)); #if 1 map(0x01020330, 0x01020333).nopw(); @@ -145,7 +145,7 @@ void bfm_sc5_state::sc5_map(address_map &map) map(0x01020390, 0x01020393).nopw(); #endif - map(0x02000000, 0x0200001f).w(this, FUNC(bfm_sc5_state::sc5_duart_w)); + map(0x02000000, 0x0200001f).w(FUNC(bfm_sc5_state::sc5_duart_w)); // ram map(0x40000000, 0x4000ffff).ram(); diff --git a/src/mame/drivers/bfm_swp.cpp b/src/mame/drivers/bfm_swp.cpp index c0b18371b84..e5eaf96eb4d 100644 --- a/src/mame/drivers/bfm_swp.cpp +++ b/src/mame/drivers/bfm_swp.cpp @@ -184,7 +184,7 @@ WRITE32_MEMBER(bfm_swp_state::bfm_swp_mem_w) void bfm_swp_state::bfm_swp_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(bfm_swp_state::bfm_swp_mem_r), FUNC(bfm_swp_state::bfm_swp_mem_w)); + map(0x00000000, 0xffffffff).rw(FUNC(bfm_swp_state::bfm_swp_mem_r), FUNC(bfm_swp_state::bfm_swp_mem_w)); map(0x00000000, 0x000fffff).rom(); } diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp index a484b780887..0df1e9832ba 100644 --- a/src/mame/drivers/bfmsys85.cpp +++ b/src/mame/drivers/bfmsys85.cpp @@ -364,17 +364,17 @@ void bfmsys85_state::memmap(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); //8k RAM - map(0x2000, 0x21FF).w(this, FUNC(bfmsys85_state::reel34_w)); // reel 3+4 latch - map(0x2200, 0x23FF).w(this, FUNC(bfmsys85_state::reel12_w)); // reel 1+2 latch - map(0x2400, 0x25FF).w(this, FUNC(bfmsys85_state::vfd_w)); // vfd latch + map(0x2000, 0x21FF).w(FUNC(bfmsys85_state::reel34_w)); // reel 3+4 latch + map(0x2200, 0x23FF).w(FUNC(bfmsys85_state::reel12_w)); // reel 1+2 latch + map(0x2400, 0x25FF).w(FUNC(bfmsys85_state::vfd_w)); // vfd latch - map(0x2600, 0x27FF).rw(this, FUNC(bfmsys85_state::mmtr_r), FUNC(bfmsys85_state::mmtr_w));// mechanical meter latch - map(0x2800, 0x2800).r(this, FUNC(bfmsys85_state::triac_r)); // payslide triacs - map(0x2800, 0x29FF).w(this, FUNC(bfmsys85_state::triac_w)); // triacs + map(0x2600, 0x27FF).rw(FUNC(bfmsys85_state::mmtr_r), FUNC(bfmsys85_state::mmtr_w));// mechanical meter latch + map(0x2800, 0x2800).r(FUNC(bfmsys85_state::triac_r)); // payslide triacs + map(0x2800, 0x29FF).w(FUNC(bfmsys85_state::triac_w)); // triacs - map(0x2A00, 0x2A00).rw(this, FUNC(bfmsys85_state::mux_data_r), FUNC(bfmsys85_state::mux_data_w));// mux - map(0x2A01, 0x2A01).rw(this, FUNC(bfmsys85_state::mux_ctrl_r), FUNC(bfmsys85_state::mux_ctrl_w));// mux status register - map(0x2E00, 0x2E00).r(this, FUNC(bfmsys85_state::irqlatch_r)); // irq latch ( MC6850 / timer ) + map(0x2A00, 0x2A00).rw(FUNC(bfmsys85_state::mux_data_r), FUNC(bfmsys85_state::mux_data_w));// mux + map(0x2A01, 0x2A01).rw(FUNC(bfmsys85_state::mux_ctrl_r), FUNC(bfmsys85_state::mux_ctrl_w));// mux status register + map(0x2E00, 0x2E00).r(FUNC(bfmsys85_state::irqlatch_r)); // irq latch ( MC6850 / timer ) map(0x3000, 0x3000).w("aysnd", FUNC(ay8910_device::data_w)); map(0x3001, 0x3001).nopr(); //sound latch @@ -383,10 +383,10 @@ void bfmsys85_state::memmap(address_map &map) map(0x3402, 0x3403).w(m_acia6850_0, FUNC(acia6850_device::write)); map(0x3406, 0x3407).r(m_acia6850_0, FUNC(acia6850_device::read)); - map(0x3600, 0x3600).w(this, FUNC(bfmsys85_state::mux_enable_w)); // mux enable + map(0x3600, 0x3600).w(FUNC(bfmsys85_state::mux_enable_w)); // mux enable map(0x4000, 0xffff).rom(); // 48K ROM - map(0x8000, 0xFFFF).w(this, FUNC(bfmsys85_state::watchdog_w)); // kick watchdog + map(0x8000, 0xFFFF).w(FUNC(bfmsys85_state::watchdog_w)); // kick watchdog } diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp index 3f5bccf8add..c1ae3224c45 100644 --- a/src/mame/drivers/big10.cpp +++ b/src/mame/drivers/big10.cpp @@ -137,7 +137,7 @@ void big10_state::main_map(address_map &map) void big10_state::main_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(big10_state::mux_r)); /* present in test mode */ + map(0x00, 0x00).r(FUNC(big10_state::mux_r)); /* present in test mode */ map(0x02, 0x02).portr("SYSTEM"); /* coins and service */ map(0x98, 0x9b).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); map(0xa0, 0xa1).w("aysnd", FUNC(ay8910_device::address_data_w)); diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 8cb40961da9..fe63b18d39e 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -339,12 +339,12 @@ void bigbord2_state::bigbord2_io(address_map &map) map(0x80, 0x83).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // u16 map(0x84, 0x87).rw(m_ctc1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // u37 has issues map(0x88, 0x8b).rw(m_ctc2, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // u21 - map(0x8c, 0x8f).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // u62 + map(0x8c, 0x8f).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); // u62 map(0xc0, 0xc3).w("proglatch", FUNC(ls259_device::write_nibble_d3)); // u41 - eprom programming port - map(0xc4, 0xc7).r(this, FUNC(bigbord2_state::status_port_r)); // u11 + map(0xc4, 0xc7).r(FUNC(bigbord2_state::status_port_r)); // u11 map(0xc8, 0xcb).w(m_syslatch1, FUNC(ls259_device::write_nibble_d3)); // u14 - map(0xcc, 0xcf).w(this, FUNC(bigbord2_state::syslatch2_w)); - map(0xd0, 0xd3).r(this, FUNC(bigbord2_state::kbd_r)); // u1 + map(0xcc, 0xcf).w(FUNC(bigbord2_state::syslatch2_w)); + map(0xd0, 0xd3).r(FUNC(bigbord2_state::kbd_r)); // u1 map(0xd4, 0xd7).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write)); // u10 //AM_RANGE(0xd8, 0xdb) AM_READWRITE(portd8_r, portd8_w) // various external data ports; DB = centronics printer map(0xd9, 0xd9).w("outlatch1", FUNC(ls259_device::write_nibble_d3)); // u96 diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp index c58b30e8961..113c2b4ea92 100644 --- a/src/mame/drivers/bigevglf.cpp +++ b/src/mame/drivers/bigevglf.cpp @@ -239,9 +239,9 @@ void bigevglf_state::main_map(address_map &map) map(0xc000, 0xcfff).ram(); map(0xd000, 0xd7ff).bankr("bank1"); map(0xd800, 0xdbff).ram().share("share1"); /* only half of the RAM is accessible, line a10 of IC73 (6116) is GNDed */ - map(0xe000, 0xe7ff).w(this, FUNC(bigevglf_state::bigevglf_palette_w)).share("paletteram"); + map(0xe000, 0xe7ff).w(FUNC(bigevglf_state::bigevglf_palette_w)).share("paletteram"); map(0xe800, 0xefff).writeonly().share("spriteram1"); /* sprite 'templates' */ - map(0xf000, 0xf0ff).rw(this, FUNC(bigevglf_state::bigevglf_vidram_r), FUNC(bigevglf_state::bigevglf_vidram_w)); /* 41464 (64kB * 8 chips), addressed using ports 1 and 5 */ + map(0xf000, 0xf0ff).rw(FUNC(bigevglf_state::bigevglf_vidram_r), FUNC(bigevglf_state::bigevglf_vidram_w)); /* 41464 (64kB * 8 chips), addressed using ports 1 and 5 */ map(0xf840, 0xf8ff).ram().share("spriteram2"); /* spriteram (x,y,offset in spriteram1,palette) */ } @@ -249,12 +249,12 @@ void bigevglf_state::bigevglf_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).nopw(); /* video ram enable ???*/ - map(0x01, 0x01).w(this, FUNC(bigevglf_state::bigevglf_gfxcontrol_w)); /* plane select */ - map(0x02, 0x02).w(this, FUNC(bigevglf_state::beg_banking_w)); - map(0x03, 0x03).w(this, FUNC(bigevglf_state::beg13_a_set_w)); - map(0x04, 0x04).w(this, FUNC(bigevglf_state::beg13_b_clr_w)); - map(0x05, 0x05).w(this, FUNC(bigevglf_state::bigevglf_vidram_addr_w)); /* video banking (256 banks) for f000-f0ff area */ - map(0x06, 0x06).r(this, FUNC(bigevglf_state::beg_status_r)); + map(0x01, 0x01).w(FUNC(bigevglf_state::bigevglf_gfxcontrol_w)); /* plane select */ + map(0x02, 0x02).w(FUNC(bigevglf_state::beg_banking_w)); + map(0x03, 0x03).w(FUNC(bigevglf_state::beg13_a_set_w)); + map(0x04, 0x04).w(FUNC(bigevglf_state::beg13_b_clr_w)); + map(0x05, 0x05).w(FUNC(bigevglf_state::bigevglf_vidram_addr_w)); /* video banking (256 banks) for f000-f0ff area */ + map(0x06, 0x06).r(FUNC(bigevglf_state::beg_status_r)); } @@ -290,21 +290,21 @@ void bigevglf_state::bigevglf_sub_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x00).portr("PORT00"); map(0x01, 0x01).nopr(); - map(0x02, 0x02).r(this, FUNC(bigevglf_state::beg_trackball_x_r)); - map(0x03, 0x03).r(this, FUNC(bigevglf_state::beg_trackball_y_r)); - map(0x04, 0x04).r(this, FUNC(bigevglf_state::sub_cpu_mcu_coin_port_r)); + map(0x02, 0x02).r(FUNC(bigevglf_state::beg_trackball_x_r)); + map(0x03, 0x03).r(FUNC(bigevglf_state::beg_trackball_y_r)); + map(0x04, 0x04).r(FUNC(bigevglf_state::sub_cpu_mcu_coin_port_r)); map(0x05, 0x05).portr("DSW1"); map(0x06, 0x06).portr("DSW2"); map(0x07, 0x07).nopr(); - map(0x08, 0x08).w(this, FUNC(bigevglf_state::beg_port08_w)); /* muxed port select + other unknown stuff */ + map(0x08, 0x08).w(FUNC(bigevglf_state::beg_port08_w)); /* muxed port select + other unknown stuff */ map(0x0b, 0x0b).r(m_bmcu, FUNC(taito68705_mcu_device::data_r)); map(0x0c, 0x0c).w(m_bmcu, FUNC(taito68705_mcu_device::data_w)); map(0x0e, 0x0e).nopw(); /* 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 */ - map(0x10, 0x17).w(this, FUNC(bigevglf_state::beg13_a_clr_w)); - map(0x18, 0x1f).w(this, FUNC(bigevglf_state::beg13_b_set_w)); + map(0x10, 0x17).w(FUNC(bigevglf_state::beg13_a_clr_w)); + map(0x18, 0x1f).w(FUNC(bigevglf_state::beg13_b_set_w)); map(0x20, 0x20).r("soundlatch2", FUNC(generic_latch_8_device::read)); map(0x20, 0x20).w("soundlatch1", FUNC(generic_latch_8_device::write)); - map(0x21, 0x21).r(this, FUNC(bigevglf_state::soundstate_r)); + map(0x21, 0x21).r(FUNC(bigevglf_state::soundstate_r)); } @@ -323,10 +323,10 @@ void bigevglf_state::sound_map(address_map &map) map(0xce00, 0xce00).nopw(); map(0xd800, 0xd800).r("soundlatch1", FUNC(generic_latch_8_device::read)); map(0xd800, 0xd800).w("soundlatch2", FUNC(generic_latch_8_device::write)); /* write to D800 sets bit 1 in status */ - map(0xda00, 0xda00).r(this, FUNC(bigevglf_state::soundstate_r)); + map(0xda00, 0xda00).r(FUNC(bigevglf_state::soundstate_r)); map(0xda00, 0xda00).w("soundnmi", FUNC(input_merger_device::in_set<1>)); // enable NMI map(0xdc00, 0xdc00).w("soundnmi", FUNC(input_merger_device::in_clear<1>)); // disable NMI - map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::write)); /* signed 8-bit DAC & unknown read */ + map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::data_w)); /* signed 8-bit DAC & unknown read */ map(0xe000, 0xefff).nopr(); /* space for diagnostics ROM */ } diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp index 37adafdd92a..1196c121e81 100644 --- a/src/mame/drivers/bigstrkb.cpp +++ b/src/mame/drivers/bigstrkb.cpp @@ -54,9 +54,9 @@ void bigstrkb_state::bigstrkb_map(address_map &map) map(0x0D0000, 0x0dffff).ram(); // 0xd2000 - 0xd3fff? 0xd8000? - map(0x0e0000, 0x0e3fff).ram().w(this, FUNC(bigstrkb_state::videoram2_w)).share("videoram2"); - map(0x0e8000, 0x0ebfff).ram().w(this, FUNC(bigstrkb_state::videoram3_w)).share("videoram3"); - map(0x0ec000, 0x0effff).ram().w(this, FUNC(bigstrkb_state::videoram_w)).share("videoram"); + map(0x0e0000, 0x0e3fff).ram().w(FUNC(bigstrkb_state::videoram2_w)).share("videoram2"); + map(0x0e8000, 0x0ebfff).ram().w(FUNC(bigstrkb_state::videoram3_w)).share("videoram3"); + map(0x0ec000, 0x0effff).ram().w(FUNC(bigstrkb_state::videoram_w)).share("videoram"); map(0x0f0000, 0x0f7fff).ram(); map(0x0f8000, 0x0f87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 0901fbe52b6..2851830d315 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -125,7 +125,7 @@ void binbug_state::binbug_mem(address_map &map) void binbug_state::binbug_data(address_map &map) { map.unmap_value_high(); - map(S2650_CTRL_PORT, S2650_CTRL_PORT).w(this, FUNC(binbug_state::binbug_ctrl_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).w(FUNC(binbug_state::binbug_ctrl_w)); } /* Input ports */ @@ -454,7 +454,7 @@ void dg680_state::dg680_io(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x04, 0x07).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x08, 0x08).rw(this, FUNC(dg680_state::port08_r), FUNC(dg680_state::port08_w)); //SWP Control and Status + map(0x08, 0x08).rw(FUNC(dg680_state::port08_r), FUNC(dg680_state::port08_w)); //SWP Control and Status //AM_RANGE(0x09,0x09) parallel input port // Optional AM9519 Programmable Interrupt Controller (port c = data, port d = control) //AM_RANGE(0x0c,0x0d) AM_DEVREADWRITE("am9519", am9519_device, read, write) diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp index c4cf571d919..c490e2fc8ba 100644 --- a/src/mame/drivers/bingoc.cpp +++ b/src/mame/drivers/bingoc.cpp @@ -146,7 +146,7 @@ void bingoc_state::main_map(address_map &map) map(0x10003b, 0x10003b).rw("uart8", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x180000, 0x18001f).rw("io", FUNC(sega_315_5338a_device::read), FUNC(sega_315_5338a_device::write)).umask16(0x00ff); //lamps? #if 0 // !SOUND_TEST - map(0x180010, 0x180011).w(this, FUNC(bingoc_state::main_sound_latch_w)); //WRONG there... + map(0x180010, 0x180011).w(FUNC(bingoc_state::main_sound_latch_w)); //WRONG there... #endif map(0xff8000, 0xffffff).ram(); } @@ -161,12 +161,12 @@ void bingoc_state::sound_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x40, 0x40).w(this, FUNC(bingoc_state::sound_play_w)); + map(0x40, 0x40).w(FUNC(bingoc_state::sound_play_w)); map(0x80, 0x80).w(m_upd7759, FUNC(upd7759_device::port_w)); #if !SOUND_TEST map(0xc0, 0xc0).r(m_soundlatch, FUNC(generic_latch_8_device::read)); #else - map(0xc0, 0xc0).r(this, FUNC(bingoc_state::sound_test_r)); + map(0xc0, 0xc0).r(FUNC(bingoc_state::sound_test_r)); #endif } diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp index 4517e97ccdd..98461927992 100644 --- a/src/mame/drivers/bingor.cpp +++ b/src/mame/drivers/bingor.cpp @@ -739,8 +739,8 @@ void bingor_state::vip2000_io(address_map &map) { map(0x0000, 0x0001).nopr(); // watchdog map(0x0080, 0x009f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)).umask16(0x00ff); - map(0x0100, 0x0100).rw(this, FUNC(bingor_state::fromslave_r), FUNC(bingor_state::toslave_w)); - map(0x0280, 0x0281).w(this, FUNC(bingor_state::vip2000_outputs_w)); + map(0x0100, 0x0100).rw(FUNC(bingor_state::fromslave_r), FUNC(bingor_state::toslave_w)); + map(0x0280, 0x0281).w(FUNC(bingor_state::vip2000_outputs_w)); } WRITE8_MEMBER(bingor_state::toslave_w) @@ -775,7 +775,7 @@ void bingor_state::slave_map(address_map &map) void bingor_state::slave_io(address_map &map) { - map(0x0000, 0x0000).rw(this, FUNC(bingor_state::toslave_r), FUNC(bingor_state::fromslave_w)); + map(0x0000, 0x0000).rw(FUNC(bingor_state::toslave_r), FUNC(bingor_state::fromslave_w)); map(0xc000, 0xcfff).ram(); } diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index 53f48460c16..e5a9cee29ae 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -190,14 +190,14 @@ void bionicc_state::main_map(address_map &map) map(0xfe0800, 0xfe0cff).ram().share("spriteram"); map(0xfe0d00, 0xfe3fff).ram(); /* RAM? */ map(0xfe4000, 0xfe4001).portr("SYSTEM"); - map(0xfe4000, 0xfe4001).w(this, FUNC(bionicc_state::gfxctrl_w)); /* + coin counters */ + map(0xfe4000, 0xfe4001).w(FUNC(bionicc_state::gfxctrl_w)); /* + coin counters */ map(0xfe4002, 0xfe4003).portr("DSW").nopw(); - map(0xfe8010, 0xfe8017).w(this, FUNC(bionicc_state::scroll_w)); + map(0xfe8010, 0xfe8017).w(FUNC(bionicc_state::scroll_w)); map(0xfe8018, 0xfe8019).nopw(); // vblank irq ack? - map(0xfe801a, 0xfe801b).w(this, FUNC(bionicc_state::mpu_trigger_w)); // based on the code this looks like the MCU trigger if compared to F1 Dream, but 0xfe4002 would match up closer in terms of addresses. Maybe this is IRQ4 related instead? - map(0xfec000, 0xfecfff).ram().w(this, FUNC(bionicc_state::txvideoram_w)).share("txvideoram"); - map(0xff0000, 0xff3fff).ram().w(this, FUNC(bionicc_state::fgvideoram_w)).share("fgvideoram"); - map(0xff4000, 0xff7fff).ram().w(this, FUNC(bionicc_state::bgvideoram_w)).share("bgvideoram"); + map(0xfe801a, 0xfe801b).w(FUNC(bionicc_state::mpu_trigger_w)); // based on the code this looks like the MCU trigger if compared to F1 Dream, but 0xfe4002 would match up closer in terms of addresses. Maybe this is IRQ4 related instead? + map(0xfec000, 0xfecfff).ram().w(FUNC(bionicc_state::txvideoram_w)).share("txvideoram"); + map(0xff0000, 0xff3fff).ram().w(FUNC(bionicc_state::fgvideoram_w)).share("fgvideoram"); + map(0xff4000, 0xff7fff).ram().w(FUNC(bionicc_state::bgvideoram_w)).share("bgvideoram"); map(0xff8000, 0xff87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xffc000, 0xffffff).ram().share("ram16"); } @@ -213,7 +213,7 @@ void bionicc_state::sound_map(address_map &map) void bionicc_state::mcu_io(address_map &map) { - map(0x000, 0x7ff).rw(this, FUNC(bionicc_state::mcu_shared_r), FUNC(bionicc_state::mcu_shared_w)); + map(0x000, 0x7ff).rw(FUNC(bionicc_state::mcu_shared_r), FUNC(bionicc_state::mcu_shared_w)); } /************************************* diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp index b3ea65f8c71..ea7d1dca822 100644 --- a/src/mame/drivers/bishi.cpp +++ b/src/mame/drivers/bishi.cpp @@ -148,11 +148,11 @@ void bishi_state::main_map(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x400000, 0x407fff).ram(); // Work RAM - map(0x800000, 0x800001).rw(this, FUNC(bishi_state::control_r), FUNC(bishi_state::control_w)); + map(0x800000, 0x800001).rw(FUNC(bishi_state::control_r), FUNC(bishi_state::control_w)); map(0x800004, 0x800005).portr("DSW"); map(0x800006, 0x800007).portr("SYSTEM"); map(0x800008, 0x800009).portr("INPUTS"); - map(0x810000, 0x810003).w(this, FUNC(bishi_state::control2_w)); // bank switch for K056832 character ROM test + map(0x810000, 0x810003).w(FUNC(bishi_state::control2_w)); // bank switch for K056832 character ROM test map(0x820000, 0x820001).nopw(); // lamps (see lamp test in service menu) map(0x830000, 0x83003f).w(m_k056832, FUNC(k056832_device::word_w)); map(0x840000, 0x840007).w(m_k056832, FUNC(k056832_device::b_word_w)); // VSCCS @@ -161,8 +161,8 @@ void bishi_state::main_map(address_map &map) map(0x880000, 0x880003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0xff00); map(0xa00000, 0xa01fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // Graphic planes map(0xb00000, 0xb03fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xb04000, 0xb047ff).r(this, FUNC(bishi_state::bishi_mirror_r)); // bug in the ram/rom test? - map(0xc00000, 0xc01fff).r(this, FUNC(bishi_state::bishi_K056832_rom_r)); + map(0xb04000, 0xb047ff).r(FUNC(bishi_state::bishi_mirror_r)); // bug in the ram/rom test? + map(0xc00000, 0xc01fff).r(FUNC(bishi_state::bishi_K056832_rom_r)); } static INPUT_PORTS_START( bishi ) diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index 4c8c7435054..b63a6fafac5 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -182,9 +182,9 @@ void bitgraph_state::bitgrapha_mem(address_map &map) map(0x010013, 0x010013).rw(m_acia2, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); map(0x010019, 0x010019).rw(m_acia3, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // POINTER map(0x01001b, 0x01001b).rw(m_acia3, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); - map(0x010020, 0x010027).rw(this, FUNC(bitgraph_state::adlc_r), FUNC(bitgraph_state::adlc_w)).umask16(0xff00); - map(0x010028, 0x01002f).rw(this, FUNC(bitgraph_state::pia_r), FUNC(bitgraph_state::pia_w)).umask16(0xff00); // EAROM, PSG - map(0x010030, 0x010031).w(this, FUNC(bitgraph_state::baud_write)); + map(0x010020, 0x010027).rw(FUNC(bitgraph_state::adlc_r), FUNC(bitgraph_state::adlc_w)).umask16(0xff00); + map(0x010028, 0x01002f).rw(FUNC(bitgraph_state::pia_r), FUNC(bitgraph_state::pia_w)).umask16(0xff00); // EAROM, PSG + map(0x010030, 0x010031).w(FUNC(bitgraph_state::baud_write)); map(0x3e0000, 0x3fffff).ram(); } @@ -198,12 +198,12 @@ void bitgraph_state::bitgraphb_mem(address_map &map) map(0x01000b, 0x01000b).rw(m_acia1, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); map(0x010011, 0x010011).rw(m_acia2, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // DEBUGGER map(0x010013, 0x010013).rw(m_acia2, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); - map(0x01001b, 0x01001b).w(this, FUNC(bitgraph_state::misccr_write)); - map(0x010020, 0x010027).rw(this, FUNC(bitgraph_state::adlc_r), FUNC(bitgraph_state::adlc_w)).umask16(0xff00); - map(0x010028, 0x01002f).rw(this, FUNC(bitgraph_state::pia_r), FUNC(bitgraph_state::pia_w)).umask16(0xff00); // EAROM, PSG - map(0x010030, 0x010031).w(this, FUNC(bitgraph_state::baud_write)); + map(0x01001b, 0x01001b).w(FUNC(bitgraph_state::misccr_write)); + map(0x010020, 0x010027).rw(FUNC(bitgraph_state::adlc_r), FUNC(bitgraph_state::adlc_w)).umask16(0xff00); + map(0x010028, 0x01002f).rw(FUNC(bitgraph_state::pia_r), FUNC(bitgraph_state::pia_w)).umask16(0xff00); // EAROM, PSG + map(0x010030, 0x010031).w(FUNC(bitgraph_state::baud_write)); // AM_RANGE(0x010030, 0x010037) AM_READ8(ppu_read, 0x00ff) - map(0x010038, 0x01003f).w(this, FUNC(bitgraph_state::ppu_write)).umask16(0x00ff); + map(0x010038, 0x01003f).w(FUNC(bitgraph_state::ppu_write)).umask16(0x00ff); map(0x380000, 0x3fffff).ram(); } @@ -337,10 +337,10 @@ WRITE_LINE_MEMBER(bitgraph_state::system_clock_write) WRITE16_MEMBER(bitgraph_state::baud_write) { DBG_LOG(1,"Baud", ("%04X\n", data)); - m_dbrgb->str_w(data & 15); // 2 DBG - m_dbrga->stt_w((data >> 4) & 15); // 1 KBD - m_dbrgb->stt_w((data >> 8) & 15); // 3 PNT - m_dbrga->str_w((data >> 12) & 15); // 0 HOST + m_dbrgb->write_str(data & 15); // 2 DBG + m_dbrga->write_stt((data >> 4) & 15); // 1 KBD + m_dbrgb->write_stt((data >> 8) & 15); // 3 PNT + m_dbrga->write_str((data >> 12) & 15); // 0 HOST } WRITE_LINE_MEMBER(bitgraph_state::com8116_a_fr_w) @@ -435,7 +435,7 @@ WRITE8_MEMBER(bitgraph_state::ppu_write) #ifdef UNUSED_FUNCTION void bitgraph_state::ppu_io(address_map &map) { -// map(0x00, 0x00).r(this, FUNC(bitgraph_state::ppu_irq)); +// map(0x00, 0x00).r(FUNC(bitgraph_state::ppu_irq)); } #endif diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp index 9fb6e5a4e38..e3850529218 100644 --- a/src/mame/drivers/bk.cpp +++ b/src/mame/drivers/bk.cpp @@ -31,10 +31,10 @@ void bk_state::bk0010_mem(address_map &map) map(0xa000, 0xbfff).rom(); // ROM map(0xc000, 0xdfff).rom(); // ROM map(0xe000, 0xfeff).rom(); // ROM - map(0xffb0, 0xffb1).rw(this, FUNC(bk_state::bk_key_state_r), FUNC(bk_state::bk_key_state_w)); - map(0xffb2, 0xffb3).r(this, FUNC(bk_state::bk_key_code_r)); - map(0xffb4, 0xffb5).rw(this, FUNC(bk_state::bk_vid_scrool_r), FUNC(bk_state::bk_vid_scrool_w)); - map(0xffce, 0xffcf).rw(this, FUNC(bk_state::bk_key_press_r), FUNC(bk_state::bk_key_press_w)); + map(0xffb0, 0xffb1).rw(FUNC(bk_state::bk_key_state_r), FUNC(bk_state::bk_key_state_w)); + map(0xffb2, 0xffb3).r(FUNC(bk_state::bk_key_code_r)); + map(0xffb4, 0xffb5).rw(FUNC(bk_state::bk_vid_scrool_r), FUNC(bk_state::bk_vid_scrool_w)); + map(0xffce, 0xffcf).rw(FUNC(bk_state::bk_key_press_r), FUNC(bk_state::bk_key_press_w)); } void bk_state::bk0010fd_mem(address_map &map) @@ -45,12 +45,12 @@ void bk_state::bk0010fd_mem(address_map &map) map(0x8000, 0x9fff).rom(); // ROM map(0xa000, 0xdfff).ram(); // RAM map(0xe000, 0xfdff).rom(); // ROM - map(0xfe58, 0xfe59).rw(this, FUNC(bk_state::bk_floppy_cmd_r), FUNC(bk_state::bk_floppy_cmd_w)); - map(0xfe5a, 0xfe5b).rw(this, FUNC(bk_state::bk_floppy_data_r), FUNC(bk_state::bk_floppy_data_w)); - map(0xffb0, 0xffb1).rw(this, FUNC(bk_state::bk_key_state_r), FUNC(bk_state::bk_key_state_w)); - map(0xffb2, 0xffb3).r(this, FUNC(bk_state::bk_key_code_r)); - map(0xffb4, 0xffb5).rw(this, FUNC(bk_state::bk_vid_scrool_r), FUNC(bk_state::bk_vid_scrool_w)); - map(0xffce, 0xffcf).rw(this, FUNC(bk_state::bk_key_press_r), FUNC(bk_state::bk_key_press_w)); + map(0xfe58, 0xfe59).rw(FUNC(bk_state::bk_floppy_cmd_r), FUNC(bk_state::bk_floppy_cmd_w)); + map(0xfe5a, 0xfe5b).rw(FUNC(bk_state::bk_floppy_data_r), FUNC(bk_state::bk_floppy_data_w)); + map(0xffb0, 0xffb1).rw(FUNC(bk_state::bk_key_state_r), FUNC(bk_state::bk_key_state_w)); + map(0xffb2, 0xffb3).r(FUNC(bk_state::bk_key_code_r)); + map(0xffb4, 0xffb5).rw(FUNC(bk_state::bk_vid_scrool_r), FUNC(bk_state::bk_vid_scrool_w)); + map(0xffce, 0xffcf).rw(FUNC(bk_state::bk_key_press_r), FUNC(bk_state::bk_key_press_w)); } /* Input ports */ diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp index 4116cb337a8..6210b15ef50 100644 --- a/src/mame/drivers/bking.cpp +++ b/src/mame/drivers/bking.cpp @@ -85,52 +85,52 @@ void bking_state::bking_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x83ff).ram(); - map(0x9000, 0x97ff).ram().w(this, FUNC(bking_state::bking_playfield_w)).share("playfield_ram"); + map(0x9000, 0x97ff).ram().w(FUNC(bking_state::bking_playfield_w)).share("playfield_ram"); } void bking_state::bking_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w(this, FUNC(bking_state::bking_xld1_w)); - map(0x01, 0x01).portr("IN1").w(this, FUNC(bking_state::bking_yld1_w)); - map(0x02, 0x02).portr("DSWA").w(this, FUNC(bking_state::bking_xld2_w)); - map(0x03, 0x03).portr("DSWB").w(this, FUNC(bking_state::bking_yld2_w)); - map(0x04, 0x04).portr("DSWC").w(this, FUNC(bking_state::bking_xld3_w)); - map(0x05, 0x05).rw(this, FUNC(bking_state::bking_input_port_5_r), FUNC(bking_state::bking_yld3_w)); - map(0x06, 0x06).rw(this, FUNC(bking_state::bking_input_port_6_r), FUNC(bking_state::bking_msk_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(bking_state::bking_xld1_w)); + map(0x01, 0x01).portr("IN1").w(FUNC(bking_state::bking_yld1_w)); + map(0x02, 0x02).portr("DSWA").w(FUNC(bking_state::bking_xld2_w)); + map(0x03, 0x03).portr("DSWB").w(FUNC(bking_state::bking_yld2_w)); + map(0x04, 0x04).portr("DSWC").w(FUNC(bking_state::bking_xld3_w)); + map(0x05, 0x05).rw(FUNC(bking_state::bking_input_port_5_r), FUNC(bking_state::bking_yld3_w)); + map(0x06, 0x06).rw(FUNC(bking_state::bking_input_port_6_r), FUNC(bking_state::bking_msk_w)); map(0x07, 0x07).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x08, 0x08).w(this, FUNC(bking_state::bking_cont1_w)); - map(0x09, 0x09).w(this, FUNC(bking_state::bking_cont2_w)); - map(0x0a, 0x0a).w(this, FUNC(bking_state::bking_cont3_w)); - map(0x0b, 0x0b).w(this, FUNC(bking_state::bking_soundlatch_w)); + map(0x08, 0x08).w(FUNC(bking_state::bking_cont1_w)); + map(0x09, 0x09).w(FUNC(bking_state::bking_cont2_w)); + map(0x0a, 0x0a).w(FUNC(bking_state::bking_cont3_w)); + map(0x0b, 0x0b).w(FUNC(bking_state::bking_soundlatch_w)); // AM_RANGE(0x0c, 0x0c) AM_WRITE(bking_eport2_w) this is not shown to be connected anywhere - map(0x0d, 0x0d).w(this, FUNC(bking_state::bking_hitclr_w)); - map(0x07, 0x1f).r(this, FUNC(bking_state::bking_pos_r)); + map(0x0d, 0x0d).w(FUNC(bking_state::bking_hitclr_w)); + map(0x07, 0x1f).r(FUNC(bking_state::bking_pos_r)); } void bking_state::bking3_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w(this, FUNC(bking_state::bking_xld1_w)); - map(0x01, 0x01).portr("IN1").w(this, FUNC(bking_state::bking_yld1_w)); - map(0x02, 0x02).portr("DSWA").w(this, FUNC(bking_state::bking_xld2_w)); - map(0x03, 0x03).portr("DSWB").w(this, FUNC(bking_state::bking_yld2_w)); - map(0x04, 0x04).portr("DSWC").w(this, FUNC(bking_state::bking_xld3_w)); - map(0x05, 0x05).rw(this, FUNC(bking_state::bking_input_port_5_r), FUNC(bking_state::bking_yld3_w)); - map(0x06, 0x06).rw(this, FUNC(bking_state::bking_input_port_6_r), FUNC(bking_state::bking_msk_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(bking_state::bking_xld1_w)); + map(0x01, 0x01).portr("IN1").w(FUNC(bking_state::bking_yld1_w)); + map(0x02, 0x02).portr("DSWA").w(FUNC(bking_state::bking_xld2_w)); + map(0x03, 0x03).portr("DSWB").w(FUNC(bking_state::bking_yld2_w)); + map(0x04, 0x04).portr("DSWC").w(FUNC(bking_state::bking_xld3_w)); + map(0x05, 0x05).rw(FUNC(bking_state::bking_input_port_5_r), FUNC(bking_state::bking_yld3_w)); + map(0x06, 0x06).rw(FUNC(bking_state::bking_input_port_6_r), FUNC(bking_state::bking_msk_w)); map(0x07, 0x07).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x08, 0x08).w(this, FUNC(bking_state::bking_cont1_w)); - map(0x09, 0x09).w(this, FUNC(bking_state::bking_cont2_w)); - map(0x0a, 0x0a).w(this, FUNC(bking_state::bking_cont3_w)); - map(0x0b, 0x0b).w(this, FUNC(bking_state::bking_soundlatch_w)); + map(0x08, 0x08).w(FUNC(bking_state::bking_cont1_w)); + map(0x09, 0x09).w(FUNC(bking_state::bking_cont2_w)); + map(0x0a, 0x0a).w(FUNC(bking_state::bking_cont3_w)); + map(0x0b, 0x0b).w(FUNC(bking_state::bking_soundlatch_w)); // AM_RANGE(0x0c, 0x0c) AM_WRITE(bking_eport2_w) this is not shown to be connected anywhere - map(0x0d, 0x0d).w(this, FUNC(bking_state::bking_hitclr_w)); - map(0x07, 0x1f).r(this, FUNC(bking_state::bking_pos_r)); + map(0x0d, 0x0d).w(FUNC(bking_state::bking_hitclr_w)); + map(0x07, 0x1f).r(FUNC(bking_state::bking_pos_r)); map(0x2f, 0x2f).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0x4f, 0x4f).rw(this, FUNC(bking_state::bking3_mcu_status_r), FUNC(bking_state::unk_w)); - map(0x60, 0x60).r(this, FUNC(bking_state::bking3_extrarom_r)); - map(0x6f, 0x6f).rw(this, FUNC(bking_state::bking3_ext_check_r), FUNC(bking_state::bking3_addr_h_w)); - map(0x8f, 0x8f).w(this, FUNC(bking_state::bking3_addr_l_w)); + map(0x4f, 0x4f).rw(FUNC(bking_state::bking3_mcu_status_r), FUNC(bking_state::unk_w)); + map(0x60, 0x60).r(FUNC(bking_state::bking3_extrarom_r)); + map(0x6f, 0x6f).rw(FUNC(bking_state::bking3_ext_check_r), FUNC(bking_state::bking3_addr_h_w)); + map(0x8f, 0x8f).w(FUNC(bking_state::bking3_addr_l_w)); } void bking_state::bking_audio_map(address_map &map) @@ -143,7 +143,7 @@ void bking_state::bking_audio_map(address_map &map) map(0x4402, 0x4403).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x4403, 0x4403).r("ay2", FUNC(ay8910_device::data_r)); map(0x4800, 0x4800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x4802, 0x4802).rw(this, FUNC(bking_state::bking_sndnmi_disable_r), FUNC(bking_state::bking_sndnmi_enable_w)); + map(0x4802, 0x4802).rw(FUNC(bking_state::bking_sndnmi_disable_r), FUNC(bking_state::bking_sndnmi_enable_w)); map(0xe000, 0xefff).rom(); /* Space for diagnostic ROM */ } @@ -434,7 +434,7 @@ MACHINE_CONFIG_START(bking_state::bking) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/4) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, bking_state, port_b_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp index 4a30d477eaf..597015ad286 100644 --- a/src/mame/drivers/blackt96.cpp +++ b/src/mame/drivers/blackt96.cpp @@ -244,15 +244,15 @@ void blackt96_state::blackt96_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x080000, 0x080001).portr("P1_P2"); - map(0x080000, 0x080000).w(this, FUNC(blackt96_state::sound_cmd_w)); // soundlatch + map(0x080000, 0x080000).w(FUNC(blackt96_state::sound_cmd_w)); // soundlatch map(0x0c0000, 0x0c0001).portr("IN1"); // COIN INPUT - map(0x0c0001, 0x0c0001).w(this, FUNC(blackt96_state::output_w)); - map(0x0e0000, 0x0e0001).r(this, FUNC(blackt96_state::random_r)); // unk, from sound? - called in tandem with result discarded, watchdog? - map(0x0e8000, 0x0e8001).r(this, FUNC(blackt96_state::random_r)); // unk, from sound? / + map(0x0c0001, 0x0c0001).w(FUNC(blackt96_state::output_w)); + map(0x0e0000, 0x0e0001).r(FUNC(blackt96_state::random_r)); // unk, from sound? - called in tandem with result discarded, watchdog? + map(0x0e8000, 0x0e8001).r(FUNC(blackt96_state::random_r)); // unk, from sound? / map(0x0f0000, 0x0f0001).portr("DSW1"); map(0x0f0008, 0x0f0009).portr("DSW2").nopw(); // service mode, left-over? - map(0x100000, 0x100fff).ram().w(this, FUNC(blackt96_state::tx_vram_w)).share("tilemapram"); // text tilemap + map(0x100000, 0x100fff).ram().w(FUNC(blackt96_state::tx_vram_w)).share("tilemapram"); // text tilemap map(0x200000, 0x207fff).rw(m_sprites, FUNC(snk68_spr_device::spriteram_r), FUNC(snk68_spr_device::spriteram_w)).share("spriteram"); // only partially populated map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp index a4e60975f19..945e59a2659 100644 --- a/src/mame/drivers/bladestl.cpp +++ b/src/mame/drivers/bladestl.cpp @@ -132,8 +132,8 @@ void bladestl_state::main_map(address_map &map) map(0x2e40, 0x2e40).portr("DSW1"); /* DIPSW #1 */ map(0x2e80, 0x2e80).w("soundlatch", FUNC(generic_latch_8_device::write)); /* cause interrupt on audio CPU */ map(0x2ec0, 0x2ec0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x2f00, 0x2f03).r(this, FUNC(bladestl_state::trackball_r)); /* Trackballs */ - map(0x2f40, 0x2f40).w(this, FUNC(bladestl_state::bladestl_bankswitch_w)); /* bankswitch control */ + map(0x2f00, 0x2f03).r(FUNC(bladestl_state::trackball_r)); /* Trackballs */ + map(0x2f40, 0x2f40).w(FUNC(bladestl_state::bladestl_bankswitch_w)); /* bankswitch control */ map(0x2f80, 0x2f9f).rw("k051733", FUNC(k051733_device::read), FUNC(k051733_device::write)); /* Protection: 051733 */ map(0x2fc0, 0x2fc0).nopw(); /* ??? */ map(0x4000, 0x5fff).ram(); /* Work RAM */ @@ -145,8 +145,8 @@ void bladestl_state::sound_map(address_map &map) { map(0x0000, 0x07ff).ram(); map(0x1000, 0x1001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); /* YM2203 */ - map(0x3000, 0x3000).w(this, FUNC(bladestl_state::bladestl_speech_ctrl_w)); /* UPD7759 */ - map(0x4000, 0x4000).r(this, FUNC(bladestl_state::bladestl_speech_busy_r)); /* UPD7759 */ + map(0x3000, 0x3000).w(FUNC(bladestl_state::bladestl_speech_ctrl_w)); /* UPD7759 */ + map(0x4000, 0x4000).r(FUNC(bladestl_state::bladestl_speech_busy_r)); /* UPD7759 */ map(0x5000, 0x5000).w("soundlatch", FUNC(generic_latch_8_device::acknowledge_w)); map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index 6f6e3f7ded7..6fe24bde4d7 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -647,10 +647,10 @@ void blitz68k_state::ilpag_map(address_map &map) map(0x9a0000, 0x9a0001).ram().share("blit_attr1_ram"); map(0x9a8000, 0x9a8001).ram().share("blitram_loword"); map(0x9b0000, 0x9b0001).ram().share("blit_attr2_ram"); - map(0x9b8000, 0x9b8001).ram().w(this, FUNC(blitz68k_state::blit_copy_w)).share("blitram_hiword"); - map(0x9e0000, 0x9e0001).r(this, FUNC(blitz68k_state::blitter_status_r)); + map(0x9b8000, 0x9b8001).ram().w(FUNC(blitz68k_state::blit_copy_w)).share("blitram_hiword"); + map(0x9e0000, 0x9e0001).r(FUNC(blitz68k_state::blitter_status_r)); - map(0xc00000, 0xc00001).w(this, FUNC(blitz68k_state::lamps_w)); + map(0xc00000, 0xc00001).w(FUNC(blitz68k_state::lamps_w)); map(0xc00180, 0xc00181).portr("IN2"); // AM_RANGE(0xc00200, 0xc00201) AM_WRITE(sound_write_w) map(0xc00380, 0xc00381).portr("IN3"); @@ -663,9 +663,9 @@ void blitz68k_state::steaser_map(address_map &map) map(0x100000, 0x1fffff).rom().region("blitter", 0); map(0x200000, 0x20ffff).ram().share("nvram"); - map(0x800000, 0x800001).r(this, FUNC(blitz68k_state::test_r)); + map(0x800000, 0x800001).r(FUNC(blitz68k_state::test_r)); // AM_RANGE(0x840000, 0x840001) AM_WRITE(sound_write_w) - map(0x880000, 0x880001).r(this, FUNC(blitz68k_state::test_r)); + map(0x880000, 0x880001).r(FUNC(blitz68k_state::test_r)); // AM_RANGE(0x8c0000, 0x8c0001) AM_WRITE(sound_write_w) map(0x900000, 0x900000).w("ramdac", FUNC(ramdac_device::index_w)); @@ -678,14 +678,14 @@ void blitz68k_state::steaser_map(address_map &map) map(0x9a0000, 0x9a0001).ram().share("blit_attr1_ram"); map(0x9a8000, 0x9a8001).ram().share("blitram_loword"); map(0x9b0000, 0x9b0001).ram().share("blit_attr2_ram"); - map(0x9b8000, 0x9b8001).ram().w(this, FUNC(blitz68k_state::blit_copy_w)).share("blitram_hiword"); + map(0x9b8000, 0x9b8001).ram().w(FUNC(blitz68k_state::blit_copy_w)).share("blitram_hiword"); map(0x9c0002, 0x9c0003).nopr(); //pen control? map(0x9d0000, 0x9d0001).nopr(); //? - map(0x9e0000, 0x9e0001).r(this, FUNC(blitz68k_state::blitter_status_r)); + map(0x9e0000, 0x9e0001).r(FUNC(blitz68k_state::blitter_status_r)); map(0x9f0000, 0x9f0001).nopw(); //??? // AM_RANGE(0xc00000, 0xc00001) AM_WRITE(lamps_w) - map(0xbd0000, 0xbd0001).r(this, FUNC(blitz68k_state::test_r)); + map(0xbd0000, 0xbd0001).r(FUNC(blitz68k_state::test_r)); // AM_RANGE(0xc00200, 0xc00201) AM_WRITE(sound_write_w) // AM_RANGE(0xc00380, 0xc00381) AM_READ_PORT("IN3") // AM_RANGE(0xc00300, 0xc00301) AM_WRITE(irq_callback_w) @@ -736,45 +736,45 @@ void blitz68k_state::bankrob_map(address_map &map) map(0x220000, 0x220000).r("ramdac", FUNC(ramdac_device::index_r)); map(0x220002, 0x220002).r("ramdac", FUNC(ramdac_device::pal_r)); - map(0x240000, 0x240000).w(this, FUNC(blitz68k_state::blit_addr0_w)); - map(0x240002, 0x240002).w(this, FUNC(blitz68k_state::blit_addr1_w)); - map(0x240004, 0x240004).w(this, FUNC(blitz68k_state::blit_addr2_w)); + map(0x240000, 0x240000).w(FUNC(blitz68k_state::blit_addr0_w)); + map(0x240002, 0x240002).w(FUNC(blitz68k_state::blit_addr1_w)); + map(0x240004, 0x240004).w(FUNC(blitz68k_state::blit_addr2_w)); - map(0x240006, 0x240006).w(this, FUNC(blitz68k_state::blit_x_w)); - map(0x240008, 0x240008).w(this, FUNC(blitz68k_state::blit_y_w)); + map(0x240006, 0x240006).w(FUNC(blitz68k_state::blit_x_w)); + map(0x240008, 0x240008).w(FUNC(blitz68k_state::blit_y_w)); - map(0x24000a, 0x24000a).w(this, FUNC(blitz68k_state::blit_w_w)); - map(0x24000c, 0x24000c).w(this, FUNC(blitz68k_state::blit_h_w)); + map(0x24000a, 0x24000a).w(FUNC(blitz68k_state::blit_w_w)); + map(0x24000c, 0x24000c).w(FUNC(blitz68k_state::blit_h_w)); - map(0x24000e, 0x24000e).w(this, FUNC(blitz68k_state::blit_draw_w)); + map(0x24000e, 0x24000e).w(FUNC(blitz68k_state::blit_draw_w)); - map(0x260000, 0x260000).w(this, FUNC(blitz68k_state::blit_pen0_w)); - map(0x260002, 0x260002).w(this, FUNC(blitz68k_state::blit_pen1_w)); - map(0x260004, 0x260004).w(this, FUNC(blitz68k_state::blit_pen2_w)); - map(0x260006, 0x260006).w(this, FUNC(blitz68k_state::blit_pen3_w)); + map(0x260000, 0x260000).w(FUNC(blitz68k_state::blit_pen0_w)); + map(0x260002, 0x260002).w(FUNC(blitz68k_state::blit_pen1_w)); + map(0x260004, 0x260004).w(FUNC(blitz68k_state::blit_pen2_w)); + map(0x260006, 0x260006).w(FUNC(blitz68k_state::blit_pen3_w)); - map(0x280000, 0x280001).r(this, FUNC(blitz68k_state::blitter_status_r)); + map(0x280000, 0x280001).r(FUNC(blitz68k_state::blitter_status_r)); map(0x2c0000, 0x2c0001).nopw(); // 1->0 - map(0x2e0000, 0x2e0000).w(this, FUNC(blitz68k_state::blit_flag0_w)); - map(0x2e0002, 0x2e0002).w(this, FUNC(blitz68k_state::blit_flag1_w)); - map(0x2e0004, 0x2e0004).w(this, FUNC(blitz68k_state::blit_flipx_w)); - map(0x2e0006, 0x2e0006).w(this, FUNC(blitz68k_state::blit_flipy_w)); - map(0x2e0008, 0x2e0008).w(this, FUNC(blitz68k_state::blit_solid_w)); - map(0x2e000a, 0x2e000a).w(this, FUNC(blitz68k_state::blit_trans_w)); - map(0x2e000c, 0x2e000c).w(this, FUNC(blitz68k_state::blit_flag6_w)); - map(0x2e000e, 0x2e000e).w(this, FUNC(blitz68k_state::blit_flag7_w)); + map(0x2e0000, 0x2e0000).w(FUNC(blitz68k_state::blit_flag0_w)); + map(0x2e0002, 0x2e0002).w(FUNC(blitz68k_state::blit_flag1_w)); + map(0x2e0004, 0x2e0004).w(FUNC(blitz68k_state::blit_flipx_w)); + map(0x2e0006, 0x2e0006).w(FUNC(blitz68k_state::blit_flipy_w)); + map(0x2e0008, 0x2e0008).w(FUNC(blitz68k_state::blit_solid_w)); + map(0x2e000a, 0x2e000a).w(FUNC(blitz68k_state::blit_trans_w)); + map(0x2e000c, 0x2e000c).w(FUNC(blitz68k_state::blit_flag6_w)); + map(0x2e000e, 0x2e000e).w(FUNC(blitz68k_state::blit_flag7_w)); map(0x300000, 0x300000).w("ramdac", FUNC(ramdac_device::index_w)); map(0x300002, 0x300002).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x300004, 0x300004).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x400001, 0x400001).r(this, FUNC(blitz68k_state::bankrob_mcu_status_write_r)); - map(0x400003, 0x400003).r(this, FUNC(blitz68k_state::bankrob_mcu_status_read_r)); + map(0x400001, 0x400001).r(FUNC(blitz68k_state::bankrob_mcu_status_write_r)); + map(0x400003, 0x400003).r(FUNC(blitz68k_state::bankrob_mcu_status_read_r)); - map(0x400005, 0x400005).rw(this, FUNC(blitz68k_state::bankrob_mcu1_r), FUNC(blitz68k_state::bankrob_mcu1_w)); - map(0x400006, 0x400006).rw(this, FUNC(blitz68k_state::bankrob_mcu2_r), FUNC(blitz68k_state::bankrob_mcu2_w)); + map(0x400005, 0x400005).rw(FUNC(blitz68k_state::bankrob_mcu1_r), FUNC(blitz68k_state::bankrob_mcu1_w)); + map(0x400006, 0x400006).rw(FUNC(blitz68k_state::bankrob_mcu2_r), FUNC(blitz68k_state::bankrob_mcu2_w)); map(0x800000, 0x800000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); // triggered by MCU? map(0x800002, 0x800002).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); @@ -819,11 +819,11 @@ void blitz68k_state::bankroba_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x200000, 0x20ffff).ram(); - map(0x800001, 0x800001).r(this, FUNC(blitz68k_state::bankroba_mcu1_r)); // lev 4 - map(0x840001, 0x840001).w(this, FUNC(blitz68k_state::bankroba_mcu1_w)); + map(0x800001, 0x800001).r(FUNC(blitz68k_state::bankroba_mcu1_r)); // lev 4 + map(0x840001, 0x840001).w(FUNC(blitz68k_state::bankroba_mcu1_w)); - map(0x880001, 0x880001).r(this, FUNC(blitz68k_state::bankroba_mcu2_r)); // lev 3 - map(0x8c0001, 0x8c0001).w(this, FUNC(blitz68k_state::bankroba_mcu2_w)); + map(0x880001, 0x880001).r(FUNC(blitz68k_state::bankroba_mcu2_r)); // lev 3 + map(0x8c0001, 0x8c0001).w(FUNC(blitz68k_state::bankroba_mcu2_w)); map(0x900000, 0x900000).w("ramdac", FUNC(ramdac_device::index_w)); map(0x900002, 0x900002).w("ramdac", FUNC(ramdac_device::pal_w)); @@ -831,39 +831,39 @@ void blitz68k_state::bankroba_map(address_map &map) // AM_RANGE(0x940000, 0x940001) AM_WRITE // lev 6 - map(0x980000, 0x980000).w(this, FUNC(blitz68k_state::blit_flag0_w)); - map(0x980002, 0x980002).w(this, FUNC(blitz68k_state::blit_flag1_w)); - map(0x980004, 0x980004).w(this, FUNC(blitz68k_state::blit_flipx_w)); - map(0x980006, 0x980006).w(this, FUNC(blitz68k_state::blit_flipy_w)); - map(0x980008, 0x980008).w(this, FUNC(blitz68k_state::blit_solid_w)); - map(0x98000a, 0x98000a).w(this, FUNC(blitz68k_state::blit_trans_w)); - map(0x98000c, 0x98000c).w(this, FUNC(blitz68k_state::blit_flag6_w)); - map(0x98000e, 0x98000e).w(this, FUNC(blitz68k_state::blit_flag7_w)); + map(0x980000, 0x980000).w(FUNC(blitz68k_state::blit_flag0_w)); + map(0x980002, 0x980002).w(FUNC(blitz68k_state::blit_flag1_w)); + map(0x980004, 0x980004).w(FUNC(blitz68k_state::blit_flipx_w)); + map(0x980006, 0x980006).w(FUNC(blitz68k_state::blit_flipy_w)); + map(0x980008, 0x980008).w(FUNC(blitz68k_state::blit_solid_w)); + map(0x98000a, 0x98000a).w(FUNC(blitz68k_state::blit_trans_w)); + map(0x98000c, 0x98000c).w(FUNC(blitz68k_state::blit_flag6_w)); + map(0x98000e, 0x98000e).w(FUNC(blitz68k_state::blit_flag7_w)); - map(0x990000, 0x990000).w(this, FUNC(blitz68k_state::blit_pen0_w)); - map(0x990002, 0x990002).w(this, FUNC(blitz68k_state::blit_pen1_w)); - map(0x990004, 0x990004).w(this, FUNC(blitz68k_state::blit_pen2_w)); - map(0x990006, 0x990006).w(this, FUNC(blitz68k_state::blit_pen3_w)); + map(0x990000, 0x990000).w(FUNC(blitz68k_state::blit_pen0_w)); + map(0x990002, 0x990002).w(FUNC(blitz68k_state::blit_pen1_w)); + map(0x990004, 0x990004).w(FUNC(blitz68k_state::blit_pen2_w)); + map(0x990006, 0x990006).w(FUNC(blitz68k_state::blit_pen3_w)); - map(0x998000, 0x998001).w(this, FUNC(blitz68k_state::blit_addr01_w)); - map(0x9a0000, 0x9a0000).w(this, FUNC(blitz68k_state::blit_addr2_w)); + map(0x998000, 0x998001).w(FUNC(blitz68k_state::blit_addr01_w)); + map(0x9a0000, 0x9a0000).w(FUNC(blitz68k_state::blit_addr2_w)); - map(0x9a8000, 0x9a8001).w(this, FUNC(blitz68k_state::blit_xy_w)); + map(0x9a8000, 0x9a8001).w(FUNC(blitz68k_state::blit_xy_w)); - map(0x9b0000, 0x9b0001).w(this, FUNC(blitz68k_state::blit_wh_w)); + map(0x9b0000, 0x9b0001).w(FUNC(blitz68k_state::blit_wh_w)); - map(0x9b8001, 0x9b8001).w(this, FUNC(blitz68k_state::blit_draw_w)); + map(0x9b8001, 0x9b8001).w(FUNC(blitz68k_state::blit_draw_w)); map(0x9c0000, 0x9c0000).r("ramdac", FUNC(ramdac_device::index_r)); map(0x9c0002, 0x9c0002).r("ramdac", FUNC(ramdac_device::pal_r)); - map(0x9d0000, 0x9d0000).r(this, FUNC(blitz68k_state::bankroba_mcu1_status_write_r)); + map(0x9d0000, 0x9d0000).r(FUNC(blitz68k_state::bankroba_mcu1_status_write_r)); - map(0x9e0000, 0x9e0001).r(this, FUNC(blitz68k_state::blitter_status_r)); + map(0x9e0000, 0x9e0001).r(FUNC(blitz68k_state::blitter_status_r)); map(0x9f0000, 0x9f0001).nopw(); // 1 - map(0xbd0000, 0xbd0000).r(this, FUNC(blitz68k_state::bankroba_mcu2_status_write_r)); + map(0xbd0000, 0xbd0000).r(FUNC(blitz68k_state::bankroba_mcu2_status_write_r)); // CRTC connected to MCU? } @@ -961,9 +961,9 @@ void blitz68k_state::cjffruit_map(address_map &map) map(0x400000, 0x41ffff).ram().share("nvram"); map(0x480000, 0x4807ff).ram(); - map(0x820000, 0x820007).w(this, FUNC(blitz68k_state::blit_hwyxa_draw_w)); + map(0x820000, 0x820007).w(FUNC(blitz68k_state::blit_hwyxa_draw_w)); - map(0x850000, 0x850001).r(this, FUNC(blitz68k_state::cjffruit_mcu_r)); + map(0x850000, 0x850001).r(FUNC(blitz68k_state::cjffruit_mcu_r)); map(0x870000, 0x870001).portr("IN0"); map(0x872000, 0x872001).portr("IN1"); @@ -976,21 +976,21 @@ void blitz68k_state::cjffruit_map(address_map &map) map(0x880000, 0x880000).r("ramdac", FUNC(ramdac_device::index_r)); map(0x880001, 0x880001).r("ramdac", FUNC(ramdac_device::pal_r)); - map(0x8a0000, 0x8a0007).w(this, FUNC(blitz68k_state::blit_hwyxa_draw_w)); + map(0x8a0000, 0x8a0007).w(FUNC(blitz68k_state::blit_hwyxa_draw_w)); - map(0x8b0000, 0x8b0003).w(this, FUNC(blitz68k_state::blit_pens_w)); + map(0x8b0000, 0x8b0003).w(FUNC(blitz68k_state::blit_pens_w)); - map(0x8e0000, 0x8e0001).w(this, FUNC(blitz68k_state::cjffruit_mcu_w)); + map(0x8e0000, 0x8e0001).w(FUNC(blitz68k_state::cjffruit_mcu_w)); - map(0x8f8000, 0x8f8001).w(this, FUNC(blitz68k_state::cjffruit_leds1_w)).share("leds0"); - map(0x8fa000, 0x8fa001).w(this, FUNC(blitz68k_state::cjffruit_leds2_w)).share("leds1"); - map(0x8fc000, 0x8fc001).w(this, FUNC(blitz68k_state::cjffruit_leds3_w)).share("leds2"); + map(0x8f8000, 0x8f8001).w(FUNC(blitz68k_state::cjffruit_leds1_w)).share("leds0"); + map(0x8fa000, 0x8fa001).w(FUNC(blitz68k_state::cjffruit_leds2_w)).share("leds1"); + map(0x8fc000, 0x8fc001).w(FUNC(blitz68k_state::cjffruit_leds3_w)).share("leds2"); - map(0x8fe000, 0x8fe003).w(this, FUNC(blitz68k_state::blit_flags_w)); // flipx,y,solid,trans + map(0x8fe000, 0x8fe003).w(FUNC(blitz68k_state::blit_flags_w)); // flipx,y,solid,trans map(0x8fe004, 0x8fe005).writeonly(); - map(0x8fe006, 0x8fe007).w(this, FUNC(blitz68k_state::crtc_lpen_w)); // 0x8fe006: 0->1, 0x8fe007: 1->0 + map(0x8fe006, 0x8fe007).w(FUNC(blitz68k_state::crtc_lpen_w)); // 0x8fe006: 0->1, 0x8fe007: 1->0 - map(0xc40000, 0xc40001).rw(this, FUNC(blitz68k_state::crtc_r), FUNC(blitz68k_state::crtc_w)); + map(0xc40000, 0xc40001).rw(FUNC(blitz68k_state::crtc_r), FUNC(blitz68k_state::crtc_w)); } /************************************************************************************************************* @@ -1060,37 +1060,37 @@ void blitz68k_state::deucesw2_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x400000, 0x41ffff).ram(); - map(0x800000, 0x800007).w(this, FUNC(blitz68k_state::blit_hwyxa_draw_w)); + map(0x800000, 0x800007).w(FUNC(blitz68k_state::blit_hwyxa_draw_w)); map(0x812000, 0x812000).r("ramdac", FUNC(ramdac_device::index_r)); map(0x812001, 0x812001).r("ramdac", FUNC(ramdac_device::pal_r)); - map(0x830000, 0x830001).r(this, FUNC(blitz68k_state::deucesw2_mcu_r)); + map(0x830000, 0x830001).r(FUNC(blitz68k_state::deucesw2_mcu_r)); map(0x840000, 0x840001).portr("IN0"); map(0x850000, 0x850001).portr("IN1"); map(0x860000, 0x860001).portr("IN2"); map(0x870000, 0x870001).portr("DSW"); - map(0x880000, 0x880007).w(this, FUNC(blitz68k_state::blit_hwyxa_draw_w)); + map(0x880000, 0x880007).w(FUNC(blitz68k_state::blit_hwyxa_draw_w)); map(0x890000, 0x890000).w("ramdac", FUNC(ramdac_device::index_w)); map(0x890001, 0x890001).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x890002, 0x890002).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x894000, 0x894003).w(this, FUNC(blitz68k_state::blit_pens_w)); + map(0x894000, 0x894003).w(FUNC(blitz68k_state::blit_pens_w)); - map(0x896000, 0x896001).w(this, FUNC(blitz68k_state::deucesw2_mcu_w)); + map(0x896000, 0x896001).w(FUNC(blitz68k_state::deucesw2_mcu_w)); - map(0x898000, 0x898001).w(this, FUNC(blitz68k_state::deucesw2_leds1_w)).share("leds0"); - map(0x89a000, 0x89a001).w(this, FUNC(blitz68k_state::deucesw2_leds2_w)).share("leds1"); - map(0x89c000, 0x89c001).w(this, FUNC(blitz68k_state::deucesw2_leds3_w)).share("leds2"); + map(0x898000, 0x898001).w(FUNC(blitz68k_state::deucesw2_leds1_w)).share("leds0"); + map(0x89a000, 0x89a001).w(FUNC(blitz68k_state::deucesw2_leds2_w)).share("leds1"); + map(0x89c000, 0x89c001).w(FUNC(blitz68k_state::deucesw2_leds3_w)).share("leds2"); - map(0x89e000, 0x89e003).w(this, FUNC(blitz68k_state::blit_flags_w)); // flipx,y,solid,trans + map(0x89e000, 0x89e003).w(FUNC(blitz68k_state::blit_flags_w)); // flipx,y,solid,trans map(0x89e004, 0x89e005).writeonly(); - map(0x89e006, 0x89e007).w(this, FUNC(blitz68k_state::crtc_lpen_w)); // 0x89e006: 0->1, 0x89e007: 1->0 + map(0x89e006, 0x89e007).w(FUNC(blitz68k_state::crtc_lpen_w)); // 0x89e006: 0->1, 0x89e007: 1->0 - map(0xc00000, 0xc00001).rw(this, FUNC(blitz68k_state::crtc_r), FUNC(blitz68k_state::crtc_w)); + map(0xc00000, 0xc00001).rw(FUNC(blitz68k_state::crtc_r), FUNC(blitz68k_state::crtc_w)); } /************************************************************************************************************* @@ -1138,48 +1138,48 @@ void blitz68k_state::dualgame_map(address_map &map) map(0x220002, 0x220002).r("ramdac", FUNC(ramdac_device::index_r)); map(0x220003, 0x220003).r("ramdac", FUNC(ramdac_device::pal_r)); - map(0x240000, 0x240000).w(this, FUNC(blitz68k_state::blit_addr0_w)); - map(0x240002, 0x240002).w(this, FUNC(blitz68k_state::blit_addr1_w)); - map(0x240004, 0x240004).w(this, FUNC(blitz68k_state::blit_addr2_w)); + map(0x240000, 0x240000).w(FUNC(blitz68k_state::blit_addr0_w)); + map(0x240002, 0x240002).w(FUNC(blitz68k_state::blit_addr1_w)); + map(0x240004, 0x240004).w(FUNC(blitz68k_state::blit_addr2_w)); - map(0x240006, 0x240006).w(this, FUNC(blitz68k_state::blit_x_w)); - map(0x240008, 0x240008).w(this, FUNC(blitz68k_state::blit_y_w)); + map(0x240006, 0x240006).w(FUNC(blitz68k_state::blit_x_w)); + map(0x240008, 0x240008).w(FUNC(blitz68k_state::blit_y_w)); - map(0x24000a, 0x24000a).w(this, FUNC(blitz68k_state::blit_w_w)); - map(0x24000c, 0x24000c).w(this, FUNC(blitz68k_state::blit_h_w)); + map(0x24000a, 0x24000a).w(FUNC(blitz68k_state::blit_w_w)); + map(0x24000c, 0x24000c).w(FUNC(blitz68k_state::blit_h_w)); - map(0x24000e, 0x24000e).w(this, FUNC(blitz68k_state::blit_draw_w)); + map(0x24000e, 0x24000e).w(FUNC(blitz68k_state::blit_draw_w)); - map(0x260000, 0x260000).w(this, FUNC(blitz68k_state::blit_pen0_w)); - map(0x260002, 0x260002).w(this, FUNC(blitz68k_state::blit_pen1_w)); - map(0x260004, 0x260004).w(this, FUNC(blitz68k_state::blit_pen2_w)); - map(0x260006, 0x260006).w(this, FUNC(blitz68k_state::blit_pen3_w)); + map(0x260000, 0x260000).w(FUNC(blitz68k_state::blit_pen0_w)); + map(0x260002, 0x260002).w(FUNC(blitz68k_state::blit_pen1_w)); + map(0x260004, 0x260004).w(FUNC(blitz68k_state::blit_pen2_w)); + map(0x260006, 0x260006).w(FUNC(blitz68k_state::blit_pen3_w)); - map(0x280000, 0x280000).r(this, FUNC(blitz68k_state::blit_status_r)); + map(0x280000, 0x280000).r(FUNC(blitz68k_state::blit_status_r)); - map(0x2a0000, 0x2a0001).w(this, FUNC(blitz68k_state::crtc_lpen_w)); + map(0x2a0000, 0x2a0001).w(FUNC(blitz68k_state::crtc_lpen_w)); map(0x2a0000, 0x2a0001).nopr(); map(0x2c0000, 0x2c0001).nopw(); // 1->0 (MCU related?) - map(0x2e0000, 0x2e0000).w(this, FUNC(blitz68k_state::blit_flag0_w)); - map(0x2e0002, 0x2e0002).w(this, FUNC(blitz68k_state::blit_flag1_w)); - map(0x2e0004, 0x2e0004).w(this, FUNC(blitz68k_state::blit_flipx_w)); // flipx - map(0x2e0006, 0x2e0006).w(this, FUNC(blitz68k_state::blit_flipy_w)); // flipy - map(0x2e0008, 0x2e0008).w(this, FUNC(blitz68k_state::blit_solid_w)); // solid - map(0x2e000a, 0x2e000a).w(this, FUNC(blitz68k_state::blit_trans_w)); // transparency - map(0x2e000c, 0x2e000c).w(this, FUNC(blitz68k_state::blit_flag6_w)); - map(0x2e000e, 0x2e000e).w(this, FUNC(blitz68k_state::blit_flag7_w)); + map(0x2e0000, 0x2e0000).w(FUNC(blitz68k_state::blit_flag0_w)); + map(0x2e0002, 0x2e0002).w(FUNC(blitz68k_state::blit_flag1_w)); + map(0x2e0004, 0x2e0004).w(FUNC(blitz68k_state::blit_flipx_w)); // flipx + map(0x2e0006, 0x2e0006).w(FUNC(blitz68k_state::blit_flipy_w)); // flipy + map(0x2e0008, 0x2e0008).w(FUNC(blitz68k_state::blit_solid_w)); // solid + map(0x2e000a, 0x2e000a).w(FUNC(blitz68k_state::blit_trans_w)); // transparency + map(0x2e000c, 0x2e000c).w(FUNC(blitz68k_state::blit_flag6_w)); + map(0x2e000e, 0x2e000e).w(FUNC(blitz68k_state::blit_flag7_w)); map(0x300000, 0x300000).w("ramdac", FUNC(ramdac_device::index_w)); map(0x300002, 0x300002).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x300004, 0x300004).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x400001, 0x400001).r(this, FUNC(blitz68k_state::dualgame_mcu_status_write_r)); - map(0x400003, 0x400003).r(this, FUNC(blitz68k_state::dualgame_mcu_status_read_r)); + map(0x400001, 0x400001).r(FUNC(blitz68k_state::dualgame_mcu_status_write_r)); + map(0x400003, 0x400003).r(FUNC(blitz68k_state::dualgame_mcu_status_read_r)); - map(0x400005, 0x400005).rw(this, FUNC(blitz68k_state::dualgame_mcu1_r), FUNC(blitz68k_state::dualgame_mcu1_w)); - map(0x400006, 0x400006).rw(this, FUNC(blitz68k_state::dualgame_mcu2_r), FUNC(blitz68k_state::dualgame_mcu2_w)); + map(0x400005, 0x400005).rw(FUNC(blitz68k_state::dualgame_mcu1_r), FUNC(blitz68k_state::dualgame_mcu1_w)); + map(0x400006, 0x400006).rw(FUNC(blitz68k_state::dualgame_mcu2_r), FUNC(blitz68k_state::dualgame_mcu2_w)); map(0x800000, 0x800000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x800002, 0x800002).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); @@ -1249,26 +1249,26 @@ void blitz68k_state::hermit_map(address_map &map) map(0x840001, 0x840001).r("ramdac", FUNC(ramdac_device::pal_r)); - map(0x8c0000, 0x8c0003).w(this, FUNC(blitz68k_state::blit_pens_w)); + map(0x8c0000, 0x8c0003).w(FUNC(blitz68k_state::blit_pens_w)); - map(0x940000, 0x940001).r(this, FUNC(blitz68k_state::hermit_mcu_r)); - map(0x980000, 0x980001).w(this, FUNC(blitz68k_state::hermit_mcu_w)); + map(0x940000, 0x940001).r(FUNC(blitz68k_state::hermit_mcu_r)); + map(0x980000, 0x980001).w(FUNC(blitz68k_state::hermit_mcu_w)); map(0x9c0000, 0x9c0001).portr("IN0"); - map(0x9c8000, 0x9c8001).r(this, FUNC(blitz68k_state::hermit_track_r)); + map(0x9c8000, 0x9c8001).r(FUNC(blitz68k_state::hermit_track_r)); map(0x9d0000, 0x9d0001).portr("IN2"); map(0x9d8000, 0x9d8001).portr("DSW"); - map(0x9e0000, 0x9e0001).w(this, FUNC(blitz68k_state::hermit_leds1_w)).share("leds0"); - map(0x9e8000, 0x9e8001).w(this, FUNC(blitz68k_state::hermit_leds2_w)).share("leds1"); + map(0x9e0000, 0x9e0001).w(FUNC(blitz68k_state::hermit_leds1_w)).share("leds0"); + map(0x9e8000, 0x9e8001).w(FUNC(blitz68k_state::hermit_leds2_w)).share("leds1"); - map(0x9f0000, 0x9f0003).w(this, FUNC(blitz68k_state::blit_flags_w)); // flipx,y,solid,trans + map(0x9f0000, 0x9f0003).w(FUNC(blitz68k_state::blit_flags_w)); // flipx,y,solid,trans map(0x9f0004, 0x9f0005).writeonly(); - map(0x9f0006, 0x9f0007).w(this, FUNC(blitz68k_state::crtc_lpen_w)); // 0x9f0006: 0->1, 0x9f0007: 1->0 + map(0x9f0006, 0x9f0007).w(FUNC(blitz68k_state::crtc_lpen_w)); // 0x9f0006: 0->1, 0x9f0007: 1->0 - map(0xb00000, 0xb00001).rw(this, FUNC(blitz68k_state::crtc_r), FUNC(blitz68k_state::crtc_w)); // triggered by MCU? + map(0xb00000, 0xb00001).rw(FUNC(blitz68k_state::crtc_r), FUNC(blitz68k_state::crtc_w)); // triggered by MCU? - map(0xc80000, 0xc80007).w(this, FUNC(blitz68k_state::blit_hwyxa_draw_w)); + map(0xc80000, 0xc80007).w(FUNC(blitz68k_state::blit_hwyxa_draw_w)); } /************************************************************************************************************* @@ -1318,11 +1318,11 @@ void blitz68k_state::maxidbl_map(address_map &map) map(0x30000c, 0x30000d).nopw(); // 0->1 (IRQ3 ack.?) map(0x30000e, 0x30000f).nopw(); // 1->0 (MCU related?) - map(0x500001, 0x500001).r(this, FUNC(blitz68k_state::maxidbl_mcu_status_write_r)); - map(0x500003, 0x500003).r(this, FUNC(blitz68k_state::maxidbl_mcu_status_read_r)); + map(0x500001, 0x500001).r(FUNC(blitz68k_state::maxidbl_mcu_status_write_r)); + map(0x500003, 0x500003).r(FUNC(blitz68k_state::maxidbl_mcu_status_read_r)); - map(0x500005, 0x500005).rw(this, FUNC(blitz68k_state::maxidbl_mcu1_r), FUNC(blitz68k_state::maxidbl_mcu1_w)); - map(0x500006, 0x500006).rw(this, FUNC(blitz68k_state::maxidbl_mcu2_r), FUNC(blitz68k_state::maxidbl_mcu2_w)); + map(0x500005, 0x500005).rw(FUNC(blitz68k_state::maxidbl_mcu1_r), FUNC(blitz68k_state::maxidbl_mcu1_w)); + map(0x500006, 0x500006).rw(FUNC(blitz68k_state::maxidbl_mcu2_r), FUNC(blitz68k_state::maxidbl_mcu2_w)); map(0x600000, 0x600000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); // triggered by MCU? map(0x600002, 0x600002).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index d98845de5ba..a59cf5edd13 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -78,8 +78,8 @@ void blktiger_state::blktiger_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xcfff).rw(this, FUNC(blktiger_state::blktiger_bgvideoram_r), FUNC(blktiger_state::blktiger_bgvideoram_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(blktiger_state::blktiger_txvideoram_w)).share("txvideoram"); + map(0xc000, 0xcfff).rw(FUNC(blktiger_state::blktiger_bgvideoram_r), FUNC(blktiger_state::blktiger_bgvideoram_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(blktiger_state::blktiger_txvideoram_w)).share("txvideoram"); map(0xd800, 0xdbff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xdc00, 0xdfff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xe000, 0xfdff).ram(); @@ -90,36 +90,36 @@ void blktiger_state::blktiger_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("IN0").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x01, 0x01).portr("IN1").w(this, FUNC(blktiger_state::blktiger_bankswitch_w)); + map(0x01, 0x01).portr("IN1").w(FUNC(blktiger_state::blktiger_bankswitch_w)); map(0x02, 0x02).portr("IN2"); - map(0x03, 0x03).portr("DSW0").w(this, FUNC(blktiger_state::blktiger_coinlockout_w)); - map(0x04, 0x04).portr("DSW1").w(this, FUNC(blktiger_state::blktiger_video_control_w)); + map(0x03, 0x03).portr("DSW0").w(FUNC(blktiger_state::blktiger_coinlockout_w)); + map(0x04, 0x04).portr("DSW1").w(FUNC(blktiger_state::blktiger_video_control_w)); map(0x05, 0x05).portr("FREEZE"); map(0x06, 0x06).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x07, 0x07).rw(this, FUNC(blktiger_state::blktiger_from_mcu_r), FUNC(blktiger_state::blktiger_to_mcu_w)); /* Software protection (7) */ - map(0x08, 0x09).w(this, FUNC(blktiger_state::blktiger_scrollx_w)); - map(0x0a, 0x0b).w(this, FUNC(blktiger_state::blktiger_scrolly_w)); - map(0x0c, 0x0c).w(this, FUNC(blktiger_state::blktiger_video_enable_w)); - map(0x0d, 0x0d).w(this, FUNC(blktiger_state::blktiger_bgvideoram_bank_w)); - map(0x0e, 0x0e).w(this, FUNC(blktiger_state::blktiger_screen_layout_w)); + map(0x07, 0x07).rw(FUNC(blktiger_state::blktiger_from_mcu_r), FUNC(blktiger_state::blktiger_to_mcu_w)); /* Software protection (7) */ + map(0x08, 0x09).w(FUNC(blktiger_state::blktiger_scrollx_w)); + map(0x0a, 0x0b).w(FUNC(blktiger_state::blktiger_scrolly_w)); + map(0x0c, 0x0c).w(FUNC(blktiger_state::blktiger_video_enable_w)); + map(0x0d, 0x0d).w(FUNC(blktiger_state::blktiger_bgvideoram_bank_w)); + map(0x0e, 0x0e).w(FUNC(blktiger_state::blktiger_screen_layout_w)); } void blktiger_state::blktigerbl_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("IN0").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x01, 0x01).portr("IN1").w(this, FUNC(blktiger_state::blktiger_bankswitch_w)); + map(0x01, 0x01).portr("IN1").w(FUNC(blktiger_state::blktiger_bankswitch_w)); map(0x02, 0x02).portr("IN2"); - map(0x03, 0x03).portr("DSW0").w(this, FUNC(blktiger_state::blktiger_coinlockout_w)); - map(0x04, 0x04).portr("DSW1").w(this, FUNC(blktiger_state::blktiger_video_control_w)); + map(0x03, 0x03).portr("DSW0").w(FUNC(blktiger_state::blktiger_coinlockout_w)); + map(0x04, 0x04).portr("DSW1").w(FUNC(blktiger_state::blktiger_video_control_w)); map(0x05, 0x05).portr("FREEZE"); map(0x06, 0x06).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x07, 0x07).noprw(); /* Software protection (7) */ - map(0x08, 0x09).w(this, FUNC(blktiger_state::blktiger_scrollx_w)); - map(0x0a, 0x0b).w(this, FUNC(blktiger_state::blktiger_scrolly_w)); - map(0x0c, 0x0c).w(this, FUNC(blktiger_state::blktiger_video_enable_w)); - map(0x0d, 0x0d).w(this, FUNC(blktiger_state::blktiger_bgvideoram_bank_w)); - map(0x0e, 0x0e).w(this, FUNC(blktiger_state::blktiger_screen_layout_w)); + map(0x08, 0x09).w(FUNC(blktiger_state::blktiger_scrollx_w)); + map(0x0a, 0x0b).w(FUNC(blktiger_state::blktiger_scrolly_w)); + map(0x0c, 0x0c).w(FUNC(blktiger_state::blktiger_video_enable_w)); + map(0x0d, 0x0d).w(FUNC(blktiger_state::blktiger_bgvideoram_bank_w)); + map(0x0e, 0x0e).w(FUNC(blktiger_state::blktiger_screen_layout_w)); } void blktiger_state::blktiger_sound_map(address_map &map) diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp index a1a092b2f87..68b0c205901 100644 --- a/src/mame/drivers/blmbycar.cpp +++ b/src/mame/drivers/blmbycar.cpp @@ -107,8 +107,8 @@ void blmbycar_state::common_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0xfec000, 0xfeffff).ram(); map(0x100000, 0x103fff).writeonly(); // ??? - map(0x104000, 0x105fff).ram().w(this, FUNC(blmbycar_state::vram_1_w)).share("vram_1"); // Layer 1 - map(0x106000, 0x107fff).ram().w(this, FUNC(blmbycar_state::vram_0_w)).share("vram_0"); // Layer 0 + map(0x104000, 0x105fff).ram().w(FUNC(blmbycar_state::vram_1_w)).share("vram_1"); // Layer 1 + map(0x106000, 0x107fff).ram().w(FUNC(blmbycar_state::vram_0_w)).share("vram_0"); // Layer 0 map(0x108000, 0x10bfff).writeonly(); // ??? map(0x10c000, 0x10c003).writeonly().share("scroll_1"); // Scroll 1 map(0x10c004, 0x10c007).writeonly().share("scroll_0"); // Scroll 0 @@ -118,7 +118,7 @@ void blmbycar_state::common_map(address_map &map) map(0x444000, 0x445fff).writeonly().share("spriteram");// Sprites (size?) map(0x700000, 0x700001).portr("DSW"); map(0x700002, 0x700003).portr("P1_P2"); - map(0x70000c, 0x70000d).w(this, FUNC(blmbycar_state::okibank_w)); // Sound + map(0x70000c, 0x70000d).w(FUNC(blmbycar_state::okibank_w)); // Sound map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound } @@ -126,12 +126,12 @@ void blmbycar_state::blmbycar_map(address_map &map) { common_map(map); - map(0x700004, 0x700005).r(this, FUNC(blmbycar_state::blmbycar_opt_wheel_r)); // Wheel (optical) + map(0x700004, 0x700005).r(FUNC(blmbycar_state::blmbycar_opt_wheel_r)); // Wheel (optical) map(0x700006, 0x700007).portr("UNK"); - map(0x700008, 0x700009).r(this, FUNC(blmbycar_state::blmbycar_pot_wheel_r)); // Wheel (potentiometer) + map(0x700008, 0x700009).r(FUNC(blmbycar_state::blmbycar_pot_wheel_r)); // Wheel (potentiometer) map(0x70000a, 0x70000b).nopw(); // ? Wheel - map(0x70006a, 0x70006b).nopr().w(this, FUNC(blmbycar_state::blmbycar_pot_wheel_reset_w)); // Wheel (potentiometer) - map(0x70007a, 0x70007b).nopr().w(this, FUNC(blmbycar_state::blmbycar_pot_wheel_shift_w)); // + map(0x70006a, 0x70006b).nopr().w(FUNC(blmbycar_state::blmbycar_pot_wheel_reset_w)); // Wheel (potentiometer) + map(0x70007a, 0x70007b).nopr().w(FUNC(blmbycar_state::blmbycar_pot_wheel_shift_w)); // } READ16_MEMBER(blmbycar_state::waterball_unk_r) @@ -145,7 +145,7 @@ void blmbycar_state::watrball_map(address_map &map) common_map(map); map(0x700006, 0x700007).nopr(); // read - map(0x700008, 0x700009).r(this, FUNC(blmbycar_state::waterball_unk_r)); // 0x0008 must toggle + map(0x700008, 0x700009).r(FUNC(blmbycar_state::waterball_unk_r)); // 0x0008 must toggle map(0x70000a, 0x70000b).writeonly(); // ?? busy } diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp index c63d1321f9b..a4d85844e73 100644 --- a/src/mame/drivers/blockade.cpp +++ b/src/mame/drivers/blockade.cpp @@ -85,16 +85,16 @@ void blockade_state::main_map(address_map &map) { map(0x0000, 0x03ff).mirror(0x6000).rom(); map(0x0400, 0x07ff).mirror(0x6000).rom(); // comotion, blasto, hustle - map(0x8000, 0x83ff).mirror(0x6c00).ram().w(this, FUNC(blockade_state::videoram_w)).share("videoram"); + map(0x8000, 0x83ff).mirror(0x6c00).ram().w(FUNC(blockade_state::videoram_w)).share("videoram"); map(0x9000, 0x90ff).mirror(0x6f00).ram(); } void blockade_state::main_io_map(address_map &map) { - map(0x01, 0x01).portr("IN0").w(this, FUNC(blockade_state::coin_latch_w)); - map(0x02, 0x02).portr("IN1").w(this, FUNC(blockade_state::sound_freq_w)); - map(0x04, 0x04).portr("IN2").w(this, FUNC(blockade_state::env_on_w)); - map(0x08, 0x08).w(this, FUNC(blockade_state::env_off_w)); + map(0x01, 0x01).portr("IN0").w(FUNC(blockade_state::coin_latch_w)); + map(0x02, 0x02).portr("IN1").w(FUNC(blockade_state::sound_freq_w)); + map(0x04, 0x04).portr("IN2").w(FUNC(blockade_state::env_on_w)); + map(0x08, 0x08).w(FUNC(blockade_state::env_off_w)); } diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp index 82e7e30dc3f..3c85c1e2be0 100644 --- a/src/mame/drivers/blockhl.cpp +++ b/src/mame/drivers/blockhl.cpp @@ -81,9 +81,9 @@ private: void blockhl_state::main_map(address_map &map) { - map(0x0000, 0x3fff).rw(this, FUNC(blockhl_state::k052109_051960_r), FUNC(blockhl_state::k052109_051960_w)); + map(0x0000, 0x3fff).rw(FUNC(blockhl_state::k052109_051960_r), FUNC(blockhl_state::k052109_051960_w)); map(0x1f84, 0x1f84).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x1f88, 0x1f88).w(this, FUNC(blockhl_state::sound_irq_w)); + map(0x1f88, 0x1f88).w(FUNC(blockhl_state::sound_irq_w)); map(0x1f8c, 0x1f8c).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x1f94, 0x1f94).portr("DSW3"); map(0x1f95, 0x1f95).portr("P1"); diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp index 82c70b3a80b..6c2fe9c4fa1 100644 --- a/src/mame/drivers/blockout.cpp +++ b/src/mame/drivers/blockout.cpp @@ -103,17 +103,17 @@ void blockout_state::main_map(address_map &map) map(0x100004, 0x100005).portr("SYSTEM"); map(0x100006, 0x100007).portr("DSW1"); map(0x100008, 0x100009).portr("DSW2"); - map(0x100010, 0x100011).w(this, FUNC(blockout_state::blockout_irq6_ack_w)); - map(0x100012, 0x100013).w(this, FUNC(blockout_state::blockout_irq5_ack_w)); + map(0x100010, 0x100011).w(FUNC(blockout_state::blockout_irq6_ack_w)); + map(0x100012, 0x100013).w(FUNC(blockout_state::blockout_irq5_ack_w)); map(0x100015, 0x100015).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x100016, 0x100017).nopw(); /* don't know, maybe reset sound CPU */ - map(0x180000, 0x1bffff).ram().w(this, FUNC(blockout_state::blockout_videoram_w)).share("videoram"); + map(0x180000, 0x1bffff).ram().w(FUNC(blockout_state::blockout_videoram_w)).share("videoram"); map(0x1d4000, 0x1dffff).ram(); /* work RAM */ map(0x1f4000, 0x1fffff).ram(); /* work RAM */ map(0x200000, 0x207fff).ram().share("frontvideoram"); map(0x208000, 0x21ffff).ram(); /* ??? */ - map(0x280002, 0x280003).w(this, FUNC(blockout_state::blockout_frontcolor_w)); - map(0x280200, 0x2805ff).ram().w(this, FUNC(blockout_state::blockout_paletteram_w)).share("paletteram"); + map(0x280002, 0x280003).w(FUNC(blockout_state::blockout_frontcolor_w)); + map(0x280200, 0x2805ff).ram().w(FUNC(blockout_state::blockout_paletteram_w)).share("paletteram"); } void blockout_state::agress_map(address_map &map) @@ -124,17 +124,17 @@ void blockout_state::agress_map(address_map &map) map(0x100004, 0x100005).portr("SYSTEM"); map(0x100006, 0x100007).portr("DSW1"); map(0x100008, 0x100009).portr("DSW2"); - map(0x100010, 0x100011).w(this, FUNC(blockout_state::blockout_irq6_ack_w)); - map(0x100012, 0x100013).w(this, FUNC(blockout_state::blockout_irq5_ack_w)); + map(0x100010, 0x100011).w(FUNC(blockout_state::blockout_irq6_ack_w)); + map(0x100012, 0x100013).w(FUNC(blockout_state::blockout_irq5_ack_w)); map(0x100015, 0x100015).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x100016, 0x100017).nopw(); /* don't know, maybe reset sound CPU */ - map(0x180000, 0x1bffff).ram().w(this, FUNC(blockout_state::blockout_videoram_w)).share("videoram"); + map(0x180000, 0x1bffff).ram().w(FUNC(blockout_state::blockout_videoram_w)).share("videoram"); map(0x1d4000, 0x1dffff).ram(); /* work RAM */ map(0x1f4000, 0x1fffff).ram(); /* work RAM */ map(0x200000, 0x207fff).ram().share("frontvideoram"); map(0x208000, 0x21ffff).ram(); /* ??? */ - map(0x280002, 0x280003).w(this, FUNC(blockout_state::blockout_frontcolor_w)); - map(0x280200, 0x2805ff).ram().w(this, FUNC(blockout_state::blockout_paletteram_w)).share("paletteram"); + map(0x280002, 0x280003).w(FUNC(blockout_state::blockout_frontcolor_w)); + map(0x280200, 0x2805ff).ram().w(FUNC(blockout_state::blockout_paletteram_w)).share("paletteram"); } void blockout_state::audio_map(address_map &map) diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp index feecec8dbd0..1397a9bca5f 100644 --- a/src/mame/drivers/bloodbro.cpp +++ b/src/mame/drivers/bloodbro.cpp @@ -154,11 +154,11 @@ void bloodbro_state::common_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x080000, 0x08afff).ram(); map(0x08b000, 0x08bfff).ram().share("spriteram"); - map(0x08c000, 0x08c3ff).ram().w(this, FUNC(bloodbro_state::bgvideoram_w)).share("bgvideoram"); + map(0x08c000, 0x08c3ff).ram().w(FUNC(bloodbro_state::bgvideoram_w)).share("bgvideoram"); map(0x08c400, 0x08cfff).ram(); - map(0x08d000, 0x08d3ff).ram().w(this, FUNC(bloodbro_state::fgvideoram_w)).share("fgvideoram"); + map(0x08d000, 0x08d3ff).ram().w(FUNC(bloodbro_state::fgvideoram_w)).share("fgvideoram"); map(0x08d400, 0x08d7ff).ram(); - map(0x08d800, 0x08dfff).ram().w(this, FUNC(bloodbro_state::txvideoram_w)).share("txvideoram"); + map(0x08d800, 0x08dfff).ram().w(FUNC(bloodbro_state::txvideoram_w)).share("txvideoram"); map(0x08e000, 0x08e7ff).ram(); map(0x08e800, 0x08f7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08f800, 0x08ffff).ram(); @@ -199,14 +199,14 @@ void bloodbro_state::weststry_map(address_map &map) map(0x0c1000, 0x0c1001).portr("DSW"); map(0x0c1002, 0x0c1003).portr("IN0"); map(0x0c1004, 0x0c1005).portr("IN1"); - map(0x0c1000, 0x0c1003).w(this, FUNC(bloodbro_state::weststry_soundlatch_w)).umask16(0xff00); - map(0x0c1004, 0x0c100b).w(this, FUNC(bloodbro_state::weststry_layer_scroll_w)); + map(0x0c1000, 0x0c1003).w(FUNC(bloodbro_state::weststry_soundlatch_w)).umask16(0xff00); + map(0x0c1004, 0x0c100b).w(FUNC(bloodbro_state::weststry_layer_scroll_w)); map(0x0e0002, 0x0e0003).nopr(); // remnant of old code map(0x122800, 0x122bff).ram(); // cleared at startup - map(0x122c00, 0x122fff).ram().w(this, FUNC(bloodbro_state::fgvideoram_w)).share("fgvideoram"); - map(0x123000, 0x1233ff).ram().w(this, FUNC(bloodbro_state::bgvideoram_w)).share("bgvideoram"); + map(0x122c00, 0x122fff).ram().w(FUNC(bloodbro_state::fgvideoram_w)).share("fgvideoram"); + map(0x123000, 0x1233ff).ram().w(FUNC(bloodbro_state::bgvideoram_w)).share("bgvideoram"); map(0x123400, 0x1237ff).ram(); // cleared at startup - map(0x123800, 0x123fff).ram().w(this, FUNC(bloodbro_state::txvideoram_w)).share("txvideoram"); + map(0x123800, 0x123fff).ram().w(FUNC(bloodbro_state::txvideoram_w)).share("txvideoram"); map(0x124000, 0x124005).ram(); map(0x124006, 0x1247fd).ram().share("spriteram"); map(0x128000, 0x1287ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -241,7 +241,7 @@ void bloodbro_state::weststry_soundnmi_update() void bloodbro_state::weststry_sound_map(address_map &map) { seibu_sound_map(map); - map(0x4002, 0x4002).w(this, FUNC(bloodbro_state::weststry_soundnmi_ack_w)); + map(0x4002, 0x4002).w(FUNC(bloodbro_state::weststry_soundnmi_ack_w)); } /* Input Ports */ diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp index 14e87bdefa2..805258be642 100644 --- a/src/mame/drivers/blstroid.cpp +++ b/src/mame/drivers/blstroid.cpp @@ -69,13 +69,13 @@ void blstroid_state::main_map(address_map &map) map.global_mask(0x83ffff); map(0x000000, 0x03ffff).mirror(0x000000).rom(); map(0x800000, 0x800001).mirror(0x0381fe).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x800200, 0x800201).mirror(0x0381fe).w(this, FUNC(blstroid_state::scanline_int_ack_w)); - map(0x800400, 0x800401).mirror(0x0381fe).w(this, FUNC(blstroid_state::video_int_ack_w)); + map(0x800200, 0x800201).mirror(0x0381fe).w(FUNC(blstroid_state::scanline_int_ack_w)); + map(0x800400, 0x800401).mirror(0x0381fe).w(FUNC(blstroid_state::video_int_ack_w)); map(0x800600, 0x800601).mirror(0x0381fe).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x800800, 0x8009ff).mirror(0x038000).writeonly().share("priorityram"); map(0x800a01, 0x800a01).mirror(0x0381fe).w(m_jsa, FUNC(atari_jsa_i_device::main_command_w)); map(0x800c00, 0x800c01).mirror(0x0381fe).w(m_jsa, FUNC(atari_jsa_i_device::sound_reset_w)); - map(0x800e00, 0x800e01).mirror(0x0381fe).w(this, FUNC(blstroid_state::blstroid_halt_until_hblank_0_w)); + map(0x800e00, 0x800e01).mirror(0x0381fe).w(FUNC(blstroid_state::blstroid_halt_until_hblank_0_w)); map(0x801401, 0x801401).mirror(0x0383fe).r(m_jsa, FUNC(atari_jsa_i_device::main_response_r)); map(0x801800, 0x801801).mirror(0x0383f8).portr("DIAL0"); map(0x801804, 0x801805).mirror(0x0383f8).portr("DIAL1"); diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp index 00a0da13646..8a478fa7f37 100644 --- a/src/mame/drivers/blueprnt.cpp +++ b/src/mame/drivers/blueprnt.cpp @@ -105,21 +105,21 @@ void blueprnt_state::blueprnt_map(address_map &map) { map(0x0000, 0x7fff).rom(); // service mode checks for 8 chips = 64K map(0x8000, 0x87ff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(blueprnt_state::blueprnt_videoram_w)).mirror(0x400).share("videoram"); + map(0x9000, 0x93ff).ram().w(FUNC(blueprnt_state::blueprnt_videoram_w)).mirror(0x400).share("videoram"); map(0xa000, 0xa0ff).ram().share("scrollram"); map(0xb000, 0xb0ff).ram().share("spriteram"); - map(0xc000, 0xc000).portr("P1").w(this, FUNC(blueprnt_state::blueprnt_coin_counter_w)); + map(0xc000, 0xc000).portr("P1").w(FUNC(blueprnt_state::blueprnt_coin_counter_w)); map(0xc001, 0xc001).portr("P2"); - map(0xc003, 0xc003).r(this, FUNC(blueprnt_state::blueprnt_sh_dipsw_r)); - map(0xd000, 0xd000).w(this, FUNC(blueprnt_state::blueprnt_sound_command_w)); - map(0xe000, 0xe000).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(blueprnt_state::blueprnt_flipscreen_w)); - map(0xf000, 0xf3ff).ram().w(this, FUNC(blueprnt_state::blueprnt_colorram_w)).mirror(0x400).share("colorram"); + map(0xc003, 0xc003).r(FUNC(blueprnt_state::blueprnt_sh_dipsw_r)); + map(0xd000, 0xd000).w(FUNC(blueprnt_state::blueprnt_sound_command_w)); + map(0xe000, 0xe000).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(blueprnt_state::blueprnt_flipscreen_w)); + map(0xf000, 0xf3ff).ram().w(FUNC(blueprnt_state::blueprnt_colorram_w)).mirror(0x400).share("colorram"); } void blueprnt_state::grasspin_map(address_map &map) { blueprnt_map(map); - map(0xc003, 0xc003).r(this, FUNC(blueprnt_state::grasspin_sh_dipsw_r)); + map(0xc003, 0xc003).r(FUNC(blueprnt_state::grasspin_sh_dipsw_r)); } diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp index 27210c009a2..c70e04aaf34 100644 --- a/src/mame/drivers/bmcbowl.cpp +++ b/src/mame/drivers/bmcbowl.cpp @@ -322,7 +322,7 @@ void bmcbowl_state::bmcbowl_mem(address_map &map) map(0x090800, 0x090803).nopw(); map(0x091000, 0x091001).nopw(); - map(0x091800, 0x091801).w(this, FUNC(bmcbowl_state::scroll_w)); + map(0x091800, 0x091801).w(FUNC(bmcbowl_state::scroll_w)); map(0x092000, 0x09201f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0x00ff); @@ -344,9 +344,9 @@ void bmcbowl_state::bmcbowl_mem(address_map &map) map(0x30c040, 0x30c041).nopw(); map(0x30c080, 0x30c081).nopw(); map(0x30c0c0, 0x30c0c1).nopw(); - map(0x30c100, 0x30c101).r(this, FUNC(bmcbowl_state::bmc_protection_r)); + map(0x30c100, 0x30c101).r(FUNC(bmcbowl_state::bmc_protection_r)); map(0x30c140, 0x30c141).nopw(); - map(0x30ca00, 0x30ca01).r(this, FUNC(bmcbowl_state::bmc_random_read)).nopw(); + map(0x30ca00, 0x30ca01).r(FUNC(bmcbowl_state::bmc_random_read)).nopw(); } diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp index 441d03b18a6..ac8e94206d5 100644 --- a/src/mame/drivers/bmcpokr.cpp +++ b/src/mame/drivers/bmcpokr.cpp @@ -385,11 +385,11 @@ void bmcpokr_state::bmcpokr_mem(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x210000, 0x21ffff).ram().share("nvram"); - map(0x280000, 0x287fff).ram().w(this, FUNC(bmcpokr_state::videoram_1_w)).share("videoram_1"); - map(0x288000, 0x28ffff).ram().w(this, FUNC(bmcpokr_state::videoram_2_w)).share("videoram_2"); + map(0x280000, 0x287fff).ram().w(FUNC(bmcpokr_state::videoram_1_w)).share("videoram_1"); + map(0x288000, 0x28ffff).ram().w(FUNC(bmcpokr_state::videoram_2_w)).share("videoram_2"); map(0x290000, 0x297fff).ram(); - map(0x2a0000, 0x2dffff).ram().w(this, FUNC(bmcpokr_state::pixram_w)).share("pixram"); + map(0x2a0000, 0x2dffff).ram().w(FUNC(bmcpokr_state::pixram_w)).share("pixram"); map(0x2ff800, 0x2ff9ff).ram().share("scrollram_1"); map(0x2ffa00, 0x2ffbff).ram().share("scrollram_2"); @@ -398,27 +398,27 @@ void bmcpokr_state::bmcpokr_mem(address_map &map) map(0x320000, 0x320003).ram().share("layerctrl"); - map(0x330000, 0x330001).rw(this, FUNC(bmcpokr_state::prot_r), FUNC(bmcpokr_state::prot_w)); + map(0x330000, 0x330001).rw(FUNC(bmcpokr_state::prot_r), FUNC(bmcpokr_state::prot_w)); map(0x340000, 0x340001).ram(); // 340001.b, rw map(0x340002, 0x340003).ram(); // 340003.b, w(9d) - map(0x340006, 0x340007).w(this, FUNC(bmcpokr_state::irq_ack_w)); - map(0x340008, 0x340009).w(this, FUNC(bmcpokr_state::irq_enable_w)); + map(0x340006, 0x340007).w(FUNC(bmcpokr_state::irq_ack_w)); + map(0x340008, 0x340009).w(FUNC(bmcpokr_state::irq_enable_w)); map(0x34000e, 0x34000f).ram().share("priority"); // 34000f.b, w (priority?) - map(0x340016, 0x340017).w(this, FUNC(bmcpokr_state::pixpal_w)); + map(0x340016, 0x340017).w(FUNC(bmcpokr_state::pixpal_w)); map(0x340018, 0x340019).ram(); // 340019.b, w - map(0x34001a, 0x34001b).r(this, FUNC(bmcpokr_state::unk_r)).nopw(); + map(0x34001a, 0x34001b).r(FUNC(bmcpokr_state::unk_r)).nopw(); map(0x34001c, 0x34001d).ram(); // 34001d.b, w(0) map(0x350001, 0x350001).w("ramdac", FUNC(ramdac_device::index_w)); map(0x350003, 0x350003).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x350005, 0x350005).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x360000, 0x360001).r(this, FUNC(bmcpokr_state::dsw_r)); + map(0x360000, 0x360001).r(FUNC(bmcpokr_state::dsw_r)); map(0x370000, 0x370001).portr("INPUTS"); - map(0x380000, 0x380001).w(this, FUNC(bmcpokr_state::mux_w)); + map(0x380000, 0x380001).w(FUNC(bmcpokr_state::mux_w)); map(0x390000, 0x390003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x398001, 0x398001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -458,11 +458,11 @@ void bmcpokr_state::mjmaglmp_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x210000, 0x21ffff).ram().share("nvram"); - map(0x280000, 0x287fff).ram().w(this, FUNC(bmcpokr_state::videoram_1_w)).share("videoram_1"); - map(0x288000, 0x28ffff).ram().w(this, FUNC(bmcpokr_state::videoram_2_w)).share("videoram_2"); + map(0x280000, 0x287fff).ram().w(FUNC(bmcpokr_state::videoram_1_w)).share("videoram_1"); + map(0x288000, 0x28ffff).ram().w(FUNC(bmcpokr_state::videoram_2_w)).share("videoram_2"); map(0x290000, 0x297fff).ram(); - map(0x2a0000, 0x2dffff).ram().w(this, FUNC(bmcpokr_state::pixram_w)).share("pixram"); + map(0x2a0000, 0x2dffff).ram().w(FUNC(bmcpokr_state::pixram_w)).share("pixram"); map(0x2ff800, 0x2ff9ff).ram().share("scrollram_1"); map(0x2ffa00, 0x2ffbff).ram().share("scrollram_2"); @@ -471,11 +471,11 @@ void bmcpokr_state::mjmaglmp_map(address_map &map) map(0x320000, 0x320003).ram().share("layerctrl"); - map(0x388000, 0x388001).w(this, FUNC(bmcpokr_state::mux_w)); + map(0x388000, 0x388001).w(FUNC(bmcpokr_state::mux_w)); - map(0x390000, 0x390001).r(this, FUNC(bmcpokr_state::mjmaglmp_dsw_r)); + map(0x390000, 0x390001).r(FUNC(bmcpokr_state::mjmaglmp_dsw_r)); - map(0x398000, 0x398001).r(this, FUNC(bmcpokr_state::mjmaglmp_key_r)); + map(0x398000, 0x398001).r(FUNC(bmcpokr_state::mjmaglmp_key_r)); map(0x3c8800, 0x3c8803).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x3c9001, 0x3c9001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -486,12 +486,12 @@ void bmcpokr_state::mjmaglmp_map(address_map &map) map(0x3ca000, 0x3ca001).ram(); // 3ca001.b, rw map(0x3ca002, 0x3ca003).ram(); // 3ca003.b, w(9d) - map(0x3ca006, 0x3ca007).w(this, FUNC(bmcpokr_state::irq_ack_w)); - map(0x3ca008, 0x3ca009).w(this, FUNC(bmcpokr_state::irq_enable_w)); + map(0x3ca006, 0x3ca007).w(FUNC(bmcpokr_state::irq_ack_w)); + map(0x3ca008, 0x3ca009).w(FUNC(bmcpokr_state::irq_enable_w)); map(0x3ca00e, 0x3ca00f).ram().share("priority"); // 3ca00f.b, w (priority?) - map(0x3ca016, 0x3ca017).w(this, FUNC(bmcpokr_state::pixpal_w)); + map(0x3ca016, 0x3ca017).w(FUNC(bmcpokr_state::pixpal_w)); map(0x3ca018, 0x3ca019).ram(); // 3ca019.b, w - map(0x3ca01a, 0x3ca01b).r(this, FUNC(bmcpokr_state::unk_r)).nopw(); + map(0x3ca01a, 0x3ca01b).r(FUNC(bmcpokr_state::unk_r)).nopw(); map(0x3ca01c, 0x3ca01d).ram(); // 3ca01d.b, w(0) } diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp index ad3b8cf5517..f6ba4bfa55d 100644 --- a/src/mame/drivers/bmjr.cpp +++ b/src/mame/drivers/bmjr.cpp @@ -176,14 +176,14 @@ void bmjr_state::bmjr_mem(address_map &map) // AM_RANGE(0xe890, 0xe890) W MP-1710 tile color // AM_RANGE(0xe891, 0xe891) W MP-1710 background color // AM_RANGE(0xe892, 0xe892) W MP-1710 monochrome / color setting - map(0xee00, 0xee00).r(this, FUNC(bmjr_state::tape_stop_r)); //R stop tape - map(0xee20, 0xee20).r(this, FUNC(bmjr_state::tape_start_r)); //R start tape - map(0xee40, 0xee40).w(this, FUNC(bmjr_state::xor_display_w)); //W Picture reverse - map(0xee80, 0xee80).rw(this, FUNC(bmjr_state::tape_r), FUNC(bmjr_state::tape_w));//RW tape input / output - map(0xeec0, 0xeec0).rw(this, FUNC(bmjr_state::key_r), FUNC(bmjr_state::key_w));//RW keyboard - map(0xef00, 0xef00).r(this, FUNC(bmjr_state::ff_r)); //R timer - map(0xef40, 0xef40).r(this, FUNC(bmjr_state::ff_r)); //R unknown - map(0xef80, 0xef80).r(this, FUNC(bmjr_state::unk_r)); //R unknown + map(0xee00, 0xee00).r(FUNC(bmjr_state::tape_stop_r)); //R stop tape + map(0xee20, 0xee20).r(FUNC(bmjr_state::tape_start_r)); //R start tape + map(0xee40, 0xee40).w(FUNC(bmjr_state::xor_display_w)); //W Picture reverse + map(0xee80, 0xee80).rw(FUNC(bmjr_state::tape_r), FUNC(bmjr_state::tape_w));//RW tape input / output + map(0xeec0, 0xeec0).rw(FUNC(bmjr_state::key_r), FUNC(bmjr_state::key_w));//RW keyboard + map(0xef00, 0xef00).r(FUNC(bmjr_state::ff_r)); //R timer + map(0xef40, 0xef40).r(FUNC(bmjr_state::ff_r)); //R unknown + map(0xef80, 0xef80).r(FUNC(bmjr_state::unk_r)); //R unknown // AM_RANGE(0xefe0, 0xefe0) W screen mode map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp index fa9708e5b6c..86104e38e26 100644 --- a/src/mame/drivers/bml3.cpp +++ b/src/mame/drivers/bml3.cpp @@ -405,53 +405,53 @@ void bml3_state::bml3_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x03ff).ram(); - map(0x0400, 0x43ff).rw(this, FUNC(bml3_state::bml3_vram_r), FUNC(bml3_state::bml3_vram_w)); + map(0x0400, 0x43ff).rw(FUNC(bml3_state::bml3_vram_r), FUNC(bml3_state::bml3_vram_w)); map(0x4400, 0x9fff).ram(); map(0xff40, 0xff46).noprw(); // lots of unknown reads and writes map(0xffc0, 0xffc3).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xffc4, 0xffc5).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); - map(0xffc6, 0xffc7).rw(this, FUNC(bml3_state::bml3_6845_r), FUNC(bml3_state::bml3_6845_w)); + map(0xffc6, 0xffc7).rw(FUNC(bml3_state::bml3_6845_r), FUNC(bml3_state::bml3_6845_w)); // KBNMI - Keyboard "Break" key non-maskable interrupt - map(0xffc8, 0xffc8).r(this, FUNC(bml3_state::bml3_keyb_nmi_r)); // keyboard nmi + map(0xffc8, 0xffc8).r(FUNC(bml3_state::bml3_keyb_nmi_r)); // keyboard nmi // DIPSW - DIP switches on system mainboard map(0xffc9, 0xffc9).portr("DSW"); // TIMER - System timer enable - map(0xffca, 0xffca).r(this, FUNC(bml3_state::bml3_firq_status_r)); // timer irq + map(0xffca, 0xffca).r(FUNC(bml3_state::bml3_firq_status_r)); // timer irq // LPFLG - Light pen interrupt // AM_RANGE(0xffcb, 0xffcb) // MODE_SEL - Graphics mode select - map(0xffd0, 0xffd0).w(this, FUNC(bml3_state::bml3_hres_reg_w)); + map(0xffd0, 0xffd0).w(FUNC(bml3_state::bml3_hres_reg_w)); // TRACE - Trace counter // AM_RANGE(0xffd1, 0xffd1) // REMOTE - Remote relay control for cassette - bit 7 - map(0xffd2, 0xffd2).w(this, FUNC(bml3_state::relay_w)); + map(0xffd2, 0xffd2).w(FUNC(bml3_state::relay_w)); // MUSIC_SEL - Music select: toggle audio output level when rising - map(0xffd3, 0xffd3).rw(this, FUNC(bml3_state::bml3_beep_r), FUNC(bml3_state::bml3_beep_w)); + map(0xffd3, 0xffd3).rw(FUNC(bml3_state::bml3_beep_r), FUNC(bml3_state::bml3_beep_w)); // TIME_MASK - Prohibit timer IRQ - map(0xffd4, 0xffd4).w(this, FUNC(bml3_state::bml3_firq_mask_w)); + map(0xffd4, 0xffd4).w(FUNC(bml3_state::bml3_firq_mask_w)); // LPENBL - Light pen operation enable map(0xffd5, 0xffd5).noprw(); // INTERLACE_SEL - Interlaced video mode (manual has "INTERACE SEL"!) - map(0xffd6, 0xffd6).w(this, FUNC(bml3_state::bml3_vres_reg_w)); + map(0xffd6, 0xffd6).w(FUNC(bml3_state::bml3_vres_reg_w)); // AM_RANGE(0xffd7, 0xffd7) baud select // C_REG_SEL - Attribute register (character/video mode and colours) - map(0xffd8, 0xffd8).rw(this, FUNC(bml3_state::bml3_vram_attr_r), FUNC(bml3_state::bml3_vram_attr_w)); + map(0xffd8, 0xffd8).rw(FUNC(bml3_state::bml3_vram_attr_r), FUNC(bml3_state::bml3_vram_attr_w)); // KB - Keyboard mode register, interrupt control, keyboard LEDs - map(0xffe0, 0xffe0).rw(this, FUNC(bml3_state::bml3_keyboard_r), FUNC(bml3_state::bml3_keyboard_w)); + map(0xffe0, 0xffe0).rw(FUNC(bml3_state::bml3_keyboard_r), FUNC(bml3_state::bml3_keyboard_w)); // AM_RANGE(0xffe8, 0xffe8) bank register // AM_RANGE(0xffe9, 0xffe9) IG mode register // AM_RANGE(0xffea, 0xffea) IG enable register map(0xa000, 0xfeff).rom().region("maincpu", 0xa000); map(0xfff0, 0xffff).rom().region("maincpu", 0xfff0); - map(0xa000, 0xbfff).w(this, FUNC(bml3_state::bml3_a000_w)); - map(0xc000, 0xdfff).w(this, FUNC(bml3_state::bml3_c000_w)); - map(0xe000, 0xefff).w(this, FUNC(bml3_state::bml3_e000_w)); - map(0xf000, 0xfeff).w(this, FUNC(bml3_state::bml3_f000_w)); - map(0xfff0, 0xffff).w(this, FUNC(bml3_state::bml3_fff0_w)); + map(0xa000, 0xbfff).w(FUNC(bml3_state::bml3_a000_w)); + map(0xc000, 0xdfff).w(FUNC(bml3_state::bml3_c000_w)); + map(0xe000, 0xefff).w(FUNC(bml3_state::bml3_e000_w)); + map(0xf000, 0xfeff).w(FUNC(bml3_state::bml3_f000_w)); + map(0xfff0, 0xffff).w(FUNC(bml3_state::bml3_fff0_w)); #if 0 - map(0xff00, 0xff00).rw(this, FUNC(bml3_state::bml3_ym2203_r), FUNC(bml3_state::bml3_ym2203_w)); - map(0xff02, 0xff02).rw(this, FUNC(bml3_state::bml3_psg_latch_r), FUNC(bml3_state::bml3_psg_latch_w)); // PSG address/data select + map(0xff00, 0xff00).rw(FUNC(bml3_state::bml3_ym2203_r), FUNC(bml3_state::bml3_ym2203_w)); + map(0xff02, 0xff02).rw(FUNC(bml3_state::bml3_psg_latch_r), FUNC(bml3_state::bml3_psg_latch_w)); // PSG address/data select #endif } diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp index 79701d83dd3..173d41a8173 100644 --- a/src/mame/drivers/bnstars.cpp +++ b/src/mame/drivers/bnstars.cpp @@ -746,14 +746,14 @@ void bnstars_state::bnstars_map(address_map &map) { map(0x00000000, 0x001fffff).rom(); - map(0xfc800000, 0xfc800003).w(this, FUNC(bnstars_state::ms32_sound_w)); + map(0xfc800000, 0xfc800003).w(FUNC(bnstars_state::ms32_sound_w)); map(0xfcc00004, 0xfcc00007).portr("P1"); map(0xfcc00008, 0xfcc0000b).portr("P2"); map(0xfcc00010, 0xfcc00013).portr("DSW"); map(0xfce00034, 0xfce00037).nopw(); - map(0xfce00038, 0xfce0003b).w(this, FUNC(bnstars_state::reset_sub_w)); + map(0xfce00038, 0xfce0003b).w(FUNC(bnstars_state::reset_sub_w)); map(0xfce00050, 0xfce00053).nopw(); map(0xfce00058, 0xfce0005b).nopw(); @@ -767,22 +767,22 @@ void bnstars_state::bnstars_map(address_map &map) map(0xfce00c00, 0xfce00c17).writeonly().share("tx1_scroll"); map(0xfce00c20, 0xfce00c37).writeonly().share("bg1_scroll"); - map(0xfce00e00, 0xfce00e03).w(this, FUNC(bnstars_state::bnstars1_mahjong_select_w)); // ? + map(0xfce00e00, 0xfce00e03).w(FUNC(bnstars_state::bnstars1_mahjong_select_w)); // ? - map(0xfd000000, 0xfd000003).r(this, FUNC(bnstars_state::ms32_sound_r)); + map(0xfd000000, 0xfd000003).r(FUNC(bnstars_state::ms32_sound_r)); /* wrote together */ map(0xfd040000, 0xfd047fff).ram(); // priority ram map(0xfd080000, 0xfd087fff).ram(); map(0xfd200000, 0xfd237fff).rw("palette2", FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette2"); map(0xfd400000, 0xfd437fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); - map(0xfe000000, 0xfe01ffff).ram().w(this, FUNC(bnstars_state::ms32_roz1_ram_w)).share("roz1_ram"); - map(0xfe400000, 0xfe41ffff).ram().w(this, FUNC(bnstars_state::ms32_roz0_ram_w)).share("roz0_ram"); + map(0xfe000000, 0xfe01ffff).ram().w(FUNC(bnstars_state::ms32_roz1_ram_w)).share("roz1_ram"); + map(0xfe400000, 0xfe41ffff).ram().w(FUNC(bnstars_state::ms32_roz0_ram_w)).share("roz0_ram"); map(0xfe800000, 0xfe83ffff).ram().share("spram"); - map(0xfea00000, 0xfea07fff).ram().w(this, FUNC(bnstars_state::ms32_tx1_ram_w)).share("tx1_ram"); - map(0xfea08000, 0xfea0ffff).ram().w(this, FUNC(bnstars_state::ms32_bg1_ram_w)).share("bg1_ram"); - map(0xfec00000, 0xfec07fff).ram().w(this, FUNC(bnstars_state::ms32_tx0_ram_w)).share("tx0_ram"); - map(0xfec08000, 0xfec0ffff).ram().w(this, FUNC(bnstars_state::ms32_bg0_ram_w)).share("bg0_ram"); + map(0xfea00000, 0xfea07fff).ram().w(FUNC(bnstars_state::ms32_tx1_ram_w)).share("tx1_ram"); + map(0xfea08000, 0xfea0ffff).ram().w(FUNC(bnstars_state::ms32_bg1_ram_w)).share("bg1_ram"); + map(0xfec00000, 0xfec07fff).ram().w(FUNC(bnstars_state::ms32_tx0_ram_w)).share("tx0_ram"); + map(0xfec08000, 0xfec0ffff).ram().w(FUNC(bnstars_state::ms32_bg0_ram_w)).share("bg0_ram"); map(0xfee00000, 0xfee1ffff).ram(); map(0xffe00000, 0xffffffff).rom().region("maincpu", 0); @@ -792,11 +792,11 @@ void bnstars_state::bnstars_sound_map(address_map &map) { map(0x0000, 0x3eff).rom(); map(0x3f00, 0x3f0f).rw("ymf2", FUNC(ymf271_device::read), FUNC(ymf271_device::write)); - map(0x3f10, 0x3f10).rw(this, FUNC(bnstars_state::latch_r), FUNC(bnstars_state::to_main_w)); + map(0x3f10, 0x3f10).rw(FUNC(bnstars_state::latch_r), FUNC(bnstars_state::to_main_w)); map(0x3f20, 0x3f2f).rw("ymf1", FUNC(ymf271_device::read), FUNC(ymf271_device::write)); map(0x3f40, 0x3f40).nopw(); /* YMF271 pin 4 (bit 1) , YMF271 pin 39 (bit 4) */ map(0x3f70, 0x3f70).nopw(); // watchdog? banking? very noisy - map(0x3f80, 0x3f80).w(this, FUNC(bnstars_state::ms32_snd_bank_w)); + map(0x3f80, 0x3f80).w(FUNC(bnstars_state::ms32_snd_bank_w)); map(0x4000, 0x7fff).ram(); map(0x8000, 0xbfff).bankr("z80bank1"); map(0xc000, 0xffff).bankr("z80bank2"); diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp index e9a255c8dbc..f30ef82ba03 100644 --- a/src/mame/drivers/bob85.cpp +++ b/src/mame/drivers/bob85.cpp @@ -157,8 +157,8 @@ void bob85_state::bob85_mem(address_map &map) void bob85_state::bob85_io(address_map &map) { map.unmap_value_high(); - map(0x0a, 0x0a).r(this, FUNC(bob85_state::bob85_keyboard_r)); - map(0x0a, 0x0f).w(this, FUNC(bob85_state::bob85_7seg_w)); + map(0x0a, 0x0a).r(FUNC(bob85_state::bob85_keyboard_r)); + map(0x0a, 0x0f).w(FUNC(bob85_state::bob85_7seg_w)); } /* Input ports */ diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp index f8db9b88e48..01061d0bdec 100644 --- a/src/mame/drivers/bogeyman.cpp +++ b/src/mame/drivers/bogeyman.cpp @@ -51,14 +51,14 @@ WRITE8_MEMBER(bogeyman_state::ay8910_control_w) void bogeyman_state::bogeyman_map(address_map &map) { map(0x0000, 0x17ff).ram(); - map(0x1800, 0x1bff).ram().w(this, FUNC(bogeyman_state::videoram2_w)).share("videoram2"); - map(0x1c00, 0x1fff).ram().w(this, FUNC(bogeyman_state::colorram2_w)).share("colorram2"); - map(0x2000, 0x20ff).ram().w(this, FUNC(bogeyman_state::videoram_w)).share("videoram"); - map(0x2100, 0x21ff).ram().w(this, FUNC(bogeyman_state::colorram_w)).share("colorram"); + map(0x1800, 0x1bff).ram().w(FUNC(bogeyman_state::videoram2_w)).share("videoram2"); + map(0x1c00, 0x1fff).ram().w(FUNC(bogeyman_state::colorram2_w)).share("colorram2"); + map(0x2000, 0x20ff).ram().w(FUNC(bogeyman_state::videoram_w)).share("videoram"); + map(0x2100, 0x21ff).ram().w(FUNC(bogeyman_state::colorram_w)).share("colorram"); map(0x2800, 0x2bff).ram().share("spriteram"); map(0x3000, 0x300f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x3800, 0x3800).portr("P1").w(this, FUNC(bogeyman_state::ay8910_control_w)); - map(0x3801, 0x3801).portr("P2").w(this, FUNC(bogeyman_state::ay8910_latch_w)); + map(0x3800, 0x3800).portr("P1").w(FUNC(bogeyman_state::ay8910_control_w)); + map(0x3801, 0x3801).portr("P2").w(FUNC(bogeyman_state::ay8910_latch_w)); map(0x3802, 0x3802).portr("DSW1"); map(0x3803, 0x3803).portr("DSW2").nopw(); // ??? sound map(0x4000, 0xffff).rom(); diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp index 6f67c9ab9a3..510627272c9 100644 --- a/src/mame/drivers/bombjack.cpp +++ b/src/mame/drivers/bombjack.cpp @@ -134,19 +134,19 @@ void bombjack_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(bombjack_state::bombjack_videoram_w)).share("videoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(bombjack_state::bombjack_colorram_w)).share("colorram"); + map(0x9000, 0x93ff).ram().w(FUNC(bombjack_state::bombjack_videoram_w)).share("videoram"); + map(0x9400, 0x97ff).ram().w(FUNC(bombjack_state::bombjack_colorram_w)).share("colorram"); map(0x9820, 0x987f).writeonly().share("spriteram"); map(0x9a00, 0x9a00).nopw(); map(0x9c00, 0x9cff).w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x9e00, 0x9e00).w(this, FUNC(bombjack_state::bombjack_background_w)); + map(0x9e00, 0x9e00).w(FUNC(bombjack_state::bombjack_background_w)); map(0xb000, 0xb000).portr("P1"); - map(0xb000, 0xb000).w(this, FUNC(bombjack_state::irq_mask_w)); + map(0xb000, 0xb000).w(FUNC(bombjack_state::irq_mask_w)); map(0xb001, 0xb001).portr("P2"); map(0xb002, 0xb002).portr("SYSTEM"); map(0xb003, 0xb003).nopr(); /* watchdog reset? */ map(0xb004, 0xb004).portr("DSW1"); - map(0xb004, 0xb004).w(this, FUNC(bombjack_state::bombjack_flipscreen_w)); + map(0xb004, 0xb004).w(FUNC(bombjack_state::bombjack_flipscreen_w)); map(0xb005, 0xb005).portr("DSW2"); map(0xb800, 0xb800).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xc000, 0xdfff).rom(); @@ -156,7 +156,7 @@ void bombjack_state::audio_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x6000, 0x6000).r(this, FUNC(bombjack_state::soundlatch_read_and_clear)); + map(0x6000, 0x6000).r(FUNC(bombjack_state::soundlatch_read_and_clear)); } void bombjack_state::audio_io_map(address_map &map) diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp index 8bf4f2c8d30..ef70a6f3f7a 100644 --- a/src/mame/drivers/boogwing.cpp +++ b/src/mame/drivers/boogwing.cpp @@ -127,7 +127,7 @@ void boogwing_state::boogwing_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x20ffff).ram(); - map(0x220000, 0x220001).w(this, FUNC(boogwing_state::priority_w)); + map(0x220000, 0x220001).w(FUNC(boogwing_state::priority_w)); map(0x220002, 0x22000f).noprw(); map(0x240000, 0x240001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); @@ -138,7 +138,7 @@ void boogwing_state::boogwing_map(address_map &map) // map(0x24e6c0, 0x24e6c1).portr("DSW"); // map(0x24e138, 0x24e139).portr("SYSTEM"); // map(0x24e344, 0x24e345).portr("INPUTS"); - map(0x24e000, 0x24efff).rw(this, FUNC(boogwing_state::boogwing_protection_region_0_104_r), FUNC(boogwing_state::boogwing_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ + map(0x24e000, 0x24efff).rw(FUNC(boogwing_state::boogwing_protection_region_0_104_r), FUNC(boogwing_state::boogwing_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ map(0x260000, 0x26000f).w(m_deco_tilegen[0], FUNC(deco16ic_device::pf_control_w)); map(0x264000, 0x265fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index b2396317327..c7207e743b7 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -161,20 +161,20 @@ WRITE8_MEMBER(bottom9_state::sound_bank_w) void bottom9_state::main_map(address_map &map) { - map(0x0000, 0x3fff).rw(this, FUNC(bottom9_state::k052109_051960_r), FUNC(bottom9_state::k052109_051960_w)); - map(0x0000, 0x07ff).rw(this, FUNC(bottom9_state::bottom9_bankedram1_r), FUNC(bottom9_state::bottom9_bankedram1_w)); - map(0x1f80, 0x1f80).w(this, FUNC(bottom9_state::bankswitch_w)); - map(0x1f90, 0x1f90).w(this, FUNC(bottom9_state::bottom9_1f90_w)); + map(0x0000, 0x3fff).rw(FUNC(bottom9_state::k052109_051960_r), FUNC(bottom9_state::k052109_051960_w)); + map(0x0000, 0x07ff).rw(FUNC(bottom9_state::bottom9_bankedram1_r), FUNC(bottom9_state::bottom9_bankedram1_w)); + map(0x1f80, 0x1f80).w(FUNC(bottom9_state::bankswitch_w)); + map(0x1f90, 0x1f90).w(FUNC(bottom9_state::bottom9_1f90_w)); map(0x1fa0, 0x1fa0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x1fb0, 0x1fb0).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x1fc0, 0x1fc0).w(this, FUNC(bottom9_state::bottom9_sh_irqtrigger_w)); + map(0x1fc0, 0x1fc0).w(FUNC(bottom9_state::bottom9_sh_irqtrigger_w)); map(0x1fd0, 0x1fd0).portr("SYSTEM"); map(0x1fd1, 0x1fd1).portr("P1"); map(0x1fd2, 0x1fd2).portr("P2"); map(0x1fd3, 0x1fd3).portr("DSW1"); map(0x1fe0, 0x1fe0).portr("DSW2"); map(0x1ff0, 0x1fff).w(m_k051316, FUNC(k051316_device::ctrl_w)); - map(0x2000, 0x27ff).rw(this, FUNC(bottom9_state::bottom9_bankedram2_r), FUNC(bottom9_state::bottom9_bankedram2_w)).share("palette"); + map(0x2000, 0x27ff).rw(FUNC(bottom9_state::bottom9_bankedram2_r), FUNC(bottom9_state::bottom9_bankedram2_w)).share("palette"); map(0x4000, 0x5fff).ram(); map(0x6000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom(); @@ -184,11 +184,11 @@ void bottom9_state::audio_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(bottom9_state::sound_bank_w)); + map(0x9000, 0x9000).w(FUNC(bottom9_state::sound_bank_w)); map(0xa000, 0xa00d).rw(m_k007232_1, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xb000, 0xb00d).rw(m_k007232_2, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xd000, 0xd000).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0xf000, 0xf000).w(this, FUNC(bottom9_state::nmi_enable_w)); + map(0xf000, 0xf000).w(FUNC(bottom9_state::nmi_enable_w)); } diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp index ddcfbddfca4..d22bf158a38 100644 --- a/src/mame/drivers/bowltry.cpp +++ b/src/mame/drivers/bowltry.cpp @@ -84,7 +84,7 @@ void bowltry_state::bowltry_map(address_map &map) map(0x080000, 0x083fff).ram(); map(0x600000, 0x60ffff).ram(); #if HACK_ENABLED - map(0x60e090, 0x60e093).rw(this, FUNC(bowltry_state::hack_r), FUNC(bowltry_state::hack_w)); + map(0x60e090, 0x60e093).rw(FUNC(bowltry_state::hack_r), FUNC(bowltry_state::hack_w)); #endif } diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp index f10b28d48e5..1e3783449db 100644 --- a/src/mame/drivers/boxer.cpp +++ b/src/mame/drivers/boxer.cpp @@ -349,14 +349,14 @@ void boxer_state::boxer_map(address_map &map) map.global_mask(0x3fff); map(0x0000, 0x01ff).ram(); map(0x0200, 0x03ff).ram().share("tile_ram"); - map(0x0800, 0x08ff).r(this, FUNC(boxer_state::input_r)); - map(0x1000, 0x17ff).r(this, FUNC(boxer_state::misc_r)); - map(0x1800, 0x1800).w(this, FUNC(boxer_state::pot_w)); - map(0x1900, 0x19ff).w(this, FUNC(boxer_state::led_w)); - map(0x1a00, 0x1aff).w(this, FUNC(boxer_state::sound_w)); - map(0x1b00, 0x1bff).w(this, FUNC(boxer_state::crowd_w)); - map(0x1c00, 0x1cff).w(this, FUNC(boxer_state::irq_reset_w)); - map(0x1d00, 0x1dff).w(this, FUNC(boxer_state::bell_w)); + map(0x0800, 0x08ff).r(FUNC(boxer_state::input_r)); + map(0x1000, 0x17ff).r(FUNC(boxer_state::misc_r)); + map(0x1800, 0x1800).w(FUNC(boxer_state::pot_w)); + map(0x1900, 0x19ff).w(FUNC(boxer_state::led_w)); + map(0x1a00, 0x1aff).w(FUNC(boxer_state::sound_w)); + map(0x1b00, 0x1bff).w(FUNC(boxer_state::crowd_w)); + map(0x1c00, 0x1cff).w(FUNC(boxer_state::irq_reset_w)); + map(0x1d00, 0x1dff).w(FUNC(boxer_state::bell_w)); map(0x1e00, 0x1eff).writeonly().share("sprite_ram"); map(0x1f00, 0x1fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3000, 0x3fff).rom(); diff --git a/src/mame/drivers/bpmmicro.cpp b/src/mame/drivers/bpmmicro.cpp index c4d1bc877b9..fc68ade40e8 100644 --- a/src/mame/drivers/bpmmicro.cpp +++ b/src/mame/drivers/bpmmicro.cpp @@ -334,13 +334,13 @@ void bpmmicro_state::i286_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x07ffff).ram(); // 512k ram - map(0x082200, 0x82201).w(this, FUNC(bpmmicro_state::unknown_82200_w)); - map(0x084000, 0x84001).r(this, FUNC(bpmmicro_state::latch_84000_r)); // GUESS: this is reading the octal latch - map(0x084002, 0x84003).w(this, FUNC(bpmmicro_state::latch_84002_w)); // GUESS: this is clocking the CK pin on the octal latch from bit 0, dumping the contents of a serial in parallel out shifter into said latch - map(0x08400e, 0x8400f).w(this, FUNC(bpmmicro_state::unknown_8400e_w)); - map(0x084018, 0x84019).w(this, FUNC(bpmmicro_state::unknown_84018_w)); - map(0x08401a, 0x8401b).w(this, FUNC(bpmmicro_state::unknown_8401a_w)); - map(0x08401c, 0x8401d).w(this, FUNC(bpmmicro_state::eeprom_8401c_w)); + map(0x082200, 0x82201).w(FUNC(bpmmicro_state::unknown_82200_w)); + map(0x084000, 0x84001).r(FUNC(bpmmicro_state::latch_84000_r)); // GUESS: this is reading the octal latch + map(0x084002, 0x84003).w(FUNC(bpmmicro_state::latch_84002_w)); // GUESS: this is clocking the CK pin on the octal latch from bit 0, dumping the contents of a serial in parallel out shifter into said latch + map(0x08400e, 0x8400f).w(FUNC(bpmmicro_state::unknown_8400e_w)); + map(0x084018, 0x84019).w(FUNC(bpmmicro_state::unknown_84018_w)); + map(0x08401a, 0x8401b).w(FUNC(bpmmicro_state::unknown_8401a_w)); + map(0x08401c, 0x8401d).w(FUNC(bpmmicro_state::eeprom_8401c_w)); map(0x0f0000, 0x0fffff).rom().region("bios", 0x10000); //AM_RANGE(0xfe0000, 0xffffff) AM_ROM AM_REGION("bios", 0) //? map(0xfffff0, 0xffffff).rom().region("bios", 0x1fff0); //? diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp index 3bf37c22fe1..745650e872e 100644 --- a/src/mame/drivers/brkthru.cpp +++ b/src/mame/drivers/brkthru.cpp @@ -110,18 +110,18 @@ INPUT_CHANGED_MEMBER(brkthru_state::coin_inserted) void brkthru_state::brkthru_map(address_map &map) { - map(0x0000, 0x03ff).ram().w(this, FUNC(brkthru_state::brkthru_fgram_w)).share("fg_videoram"); + map(0x0000, 0x03ff).ram().w(FUNC(brkthru_state::brkthru_fgram_w)).share("fg_videoram"); map(0x0400, 0x0bff).ram(); - map(0x0c00, 0x0fff).ram().w(this, FUNC(brkthru_state::brkthru_bgram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(brkthru_state::brkthru_bgram_w)).share("videoram"); map(0x1000, 0x10ff).ram().share("spriteram"); map(0x1100, 0x17ff).ram(); map(0x1800, 0x1800).portr("P1"); map(0x1801, 0x1801).portr("P2"); map(0x1802, 0x1802).portr("DSW1"); map(0x1803, 0x1803).portr("DSW2/COIN"); - map(0x1800, 0x1801).w(this, FUNC(brkthru_state::brkthru_1800_w)); /* bg scroll and color, ROM bank selection, flip screen */ + map(0x1800, 0x1801).w(FUNC(brkthru_state::brkthru_1800_w)); /* bg scroll and color, ROM bank selection, flip screen */ map(0x1802, 0x1802).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x1803, 0x1803).w(this, FUNC(brkthru_state::brkthru_1803_w)); /* NMI enable, + ? */ + map(0x1803, 0x1803).w(FUNC(brkthru_state::brkthru_1803_w)); /* NMI enable, + ? */ map(0x2000, 0x3fff).bankr("bank1"); map(0x4000, 0xffff).rom(); } @@ -129,18 +129,18 @@ void brkthru_state::brkthru_map(address_map &map) /* same as brktrhu, but xor 0x1000 below 8k */ void brkthru_state::darwin_map(address_map &map) { - map(0x1000, 0x13ff).ram().w(this, FUNC(brkthru_state::brkthru_fgram_w)).share("fg_videoram"); + map(0x1000, 0x13ff).ram().w(FUNC(brkthru_state::brkthru_fgram_w)).share("fg_videoram"); map(0x1400, 0x1bff).ram(); - map(0x1c00, 0x1fff).ram().w(this, FUNC(brkthru_state::brkthru_bgram_w)).share("videoram"); + map(0x1c00, 0x1fff).ram().w(FUNC(brkthru_state::brkthru_bgram_w)).share("videoram"); map(0x0000, 0x00ff).ram().share("spriteram"); map(0x0100, 0x01ff).nopw(); /*tidyup, nothing really here?*/ map(0x0800, 0x0800).portr("P1"); map(0x0801, 0x0801).portr("P2"); map(0x0802, 0x0802).portr("DSW1"); map(0x0803, 0x0803).portr("DSW2/COIN"); - map(0x0800, 0x0801).w(this, FUNC(brkthru_state::brkthru_1800_w)); /* bg scroll and color, ROM bank selection, flip screen */ + map(0x0800, 0x0801).w(FUNC(brkthru_state::brkthru_1800_w)); /* bg scroll and color, ROM bank selection, flip screen */ map(0x0802, 0x0802).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x0803, 0x0803).w(this, FUNC(brkthru_state::darwin_0803_w)); /* NMI enable, + ? */ + map(0x0803, 0x0803).w(FUNC(brkthru_state::darwin_0803_w)); /* NMI enable, + ? */ map(0x2000, 0x3fff).bankr("bank1"); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/bsktball.cpp b/src/mame/drivers/bsktball.cpp index 7e55c07c8ac..c9b01a12e8a 100644 --- a/src/mame/drivers/bsktball.cpp +++ b/src/mame/drivers/bsktball.cpp @@ -80,14 +80,14 @@ void bsktball_state::main_map(address_map &map) { map.global_mask(0x3fff); map(0x0000, 0x01ff).ram(); /* Zero Page RAM */ - map(0x0800, 0x0800).r(this, FUNC(bsktball_state::bsktball_in0_r)); + map(0x0800, 0x0800).r(FUNC(bsktball_state::bsktball_in0_r)); map(0x0802, 0x0802).portr("IN1"); map(0x0803, 0x0803).portr("DSW"); map(0x1000, 0x1000).nopw(); /* Timer Reset */ - map(0x1010, 0x1010).w(this, FUNC(bsktball_state::bsktball_bounce_w)); /* Crowd Amp / Bounce */ + map(0x1010, 0x1010).w(FUNC(bsktball_state::bsktball_bounce_w)); /* Crowd Amp / Bounce */ map(0x1020, 0x102f).w("outlatch", FUNC(f9334_device::write_a0)); - map(0x1030, 0x1030).w(this, FUNC(bsktball_state::bsktball_note_w)); /* Music Ckt Note Dvsr */ - map(0x1800, 0x1bbf).ram().w(this, FUNC(bsktball_state::bsktball_videoram_w)).share("videoram"); /* DISPLAY */ + map(0x1030, 0x1030).w(FUNC(bsktball_state::bsktball_note_w)); /* Music Ckt Note Dvsr */ + map(0x1800, 0x1bbf).ram().w(FUNC(bsktball_state::bsktball_videoram_w)).share("videoram"); /* DISPLAY */ map(0x1bc0, 0x1bff).ram().share("motion"); map(0x1c00, 0x1cff).ram(); map(0x2000, 0x3fff).rom(); /* PROGRAM */ diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp index c6986a67c8f..43a25c9f72e 100644 --- a/src/mame/drivers/btime.cpp +++ b/src/mame/drivers/btime.cpp @@ -190,13 +190,13 @@ void btime_state::btime_map(address_map &map) map(0x0c00, 0x0c0f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x1000, 0x13ff).ram().share("videoram"); map(0x1400, 0x17ff).ram().share("colorram"); - map(0x1800, 0x1bff).rw(this, FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); - map(0x1c00, 0x1fff).rw(this, FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); + map(0x1800, 0x1bff).rw(FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); + map(0x1c00, 0x1fff).rw(FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); map(0x4000, 0x4000).portr("P1").nopw(); map(0x4001, 0x4001).portr("P2"); - map(0x4002, 0x4002).portr("SYSTEM").w(this, FUNC(btime_state::btime_video_control_w)); + map(0x4002, 0x4002).portr("SYSTEM").w(FUNC(btime_state::btime_video_control_w)); map(0x4003, 0x4003).portr("DSW1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x4004, 0x4004).portr("DSW2").w(this, FUNC(btime_state::bnj_scroll1_w)); + map(0x4004, 0x4004).portr("DSW2").w(FUNC(btime_state::bnj_scroll1_w)); map(0xb000, 0xffff).rom(); } @@ -206,12 +206,12 @@ void btime_state::cookrace_map(address_map &map) map(0x0500, 0x3fff).rom(); map(0xc000, 0xc3ff).ram().share("videoram"); map(0xc400, 0xc7ff).ram().share("colorram"); - map(0xc800, 0xcbff).rw(this, FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); - map(0xcc00, 0xcfff).rw(this, FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); + map(0xc800, 0xcbff).rw(FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); + map(0xcc00, 0xcfff).rw(FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); map(0xd000, 0xd0ff).ram(); /* background? */ map(0xd100, 0xd3ff).ram(); /* ? */ map(0xd400, 0xd7ff).ram().share("bnj_bgram"); - map(0xe000, 0xe000).portr("DSW1").w(this, FUNC(btime_state::bnj_video_control_w)); + map(0xe000, 0xe000).portr("DSW1").w(FUNC(btime_state::bnj_video_control_w)); map(0xe300, 0xe300).portr("DSW1"); /* mirror address used on high score name entry */ /* screen */ map(0xe001, 0xe001).portr("DSW2").w(m_soundlatch, FUNC(generic_latch_8_device::write)); @@ -227,14 +227,14 @@ void btime_state::tisland_map(address_map &map) map(0x0c00, 0x0c0f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x1000, 0x13ff).ram().share("videoram"); map(0x1400, 0x17ff).ram().share("colorram"); - map(0x1800, 0x1bff).rw(this, FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); - map(0x1c00, 0x1fff).rw(this, FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); + map(0x1800, 0x1bff).rw(FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); + map(0x1c00, 0x1fff).rw(FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); map(0x4000, 0x4000).portr("P1").nopw(); map(0x4001, 0x4001).portr("P2"); - map(0x4002, 0x4002).portr("SYSTEM").w(this, FUNC(btime_state::btime_video_control_w)); + map(0x4002, 0x4002).portr("SYSTEM").w(FUNC(btime_state::btime_video_control_w)); map(0x4003, 0x4003).portr("DSW1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x4004, 0x4004).portr("DSW2").w(this, FUNC(btime_state::bnj_scroll1_w)); - map(0x4005, 0x4005).w(this, FUNC(btime_state::bnj_scroll2_w)); + map(0x4004, 0x4004).portr("DSW2").w(FUNC(btime_state::bnj_scroll1_w)); + map(0x4005, 0x4005).w(FUNC(btime_state::bnj_scroll2_w)); map(0x9000, 0xffff).rom(); } @@ -243,16 +243,16 @@ void btime_state::zoar_map(address_map &map) map(0x0000, 0x07ff).ram().share("rambase"); map(0x8000, 0x83ff).writeonly().share("videoram"); map(0x8400, 0x87ff).writeonly().share("colorram"); - map(0x8800, 0x8bff).w(this, FUNC(btime_state::btime_mirrorvideoram_w)); - map(0x8c00, 0x8fff).w(this, FUNC(btime_state::btime_mirrorcolorram_w)); - map(0x9000, 0x9000).w(this, FUNC(btime_state::zoar_video_control_w)); - map(0x9800, 0x9800).r(this, FUNC(btime_state::zoar_dsw1_read)); + map(0x8800, 0x8bff).w(FUNC(btime_state::btime_mirrorvideoram_w)); + map(0x8c00, 0x8fff).w(FUNC(btime_state::btime_mirrorcolorram_w)); + map(0x9000, 0x9000).w(FUNC(btime_state::zoar_video_control_w)); + map(0x9800, 0x9800).r(FUNC(btime_state::zoar_dsw1_read)); map(0x9801, 0x9801).portr("DSW2"); map(0x9802, 0x9802).portr("P1"); map(0x9803, 0x9803).portr("P2"); map(0x9800, 0x9803).writeonly().share("zoar_scrollram"); - map(0x9804, 0x9804).portr("SYSTEM").w(this, FUNC(btime_state::bnj_scroll2_w)); - map(0x9805, 0x9805).w(this, FUNC(btime_state::bnj_scroll1_w)); + map(0x9804, 0x9804).portr("SYSTEM").w(FUNC(btime_state::bnj_scroll2_w)); + map(0x9805, 0x9805).w(FUNC(btime_state::bnj_scroll1_w)); map(0x9806, 0x9806).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xd000, 0xffff).rom(); } @@ -260,11 +260,11 @@ void btime_state::zoar_map(address_map &map) void btime_state::lnc_map(address_map &map) { map(0x0000, 0x3bff).ram().share("rambase"); - map(0x3c00, 0x3fff).ram().w(this, FUNC(btime_state::lnc_videoram_w)).share("videoram"); + map(0x3c00, 0x3fff).ram().w(FUNC(btime_state::lnc_videoram_w)).share("videoram"); map(0x7800, 0x7bff).writeonly().share("colorram"); /* this is just here to initialize the pointer */ - map(0x7c00, 0x7fff).rw(this, FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::lnc_mirrorvideoram_w)); + map(0x7c00, 0x7fff).rw(FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::lnc_mirrorvideoram_w)); map(0x8000, 0x8000).portr("DSW1").nopw(); /* ??? */ - map(0x8001, 0x8001).portr("DSW2").w(this, FUNC(btime_state::bnj_video_control_w)); + map(0x8001, 0x8001).portr("DSW2").w(FUNC(btime_state::bnj_video_control_w)); map(0x8003, 0x8003).writeonly().share("lnc_charbank"); map(0x9000, 0x9000).portr("P1").nopw(); /* IRQ ack??? */ map(0x9001, 0x9001).portr("P2"); @@ -276,16 +276,16 @@ void btime_state::lnc_map(address_map &map) void btime_state::mmonkey_map(address_map &map) { map(0x0000, 0x3bff).ram().share("rambase"); - map(0x3c00, 0x3fff).ram().w(this, FUNC(btime_state::lnc_videoram_w)).share("videoram"); + map(0x3c00, 0x3fff).ram().w(FUNC(btime_state::lnc_videoram_w)).share("videoram"); map(0x7800, 0x7bff).writeonly().share("colorram"); /* this is just here to initialize the pointer */ - map(0x7c00, 0x7fff).rw(this, FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::lnc_mirrorvideoram_w)); + map(0x7c00, 0x7fff).rw(FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::lnc_mirrorvideoram_w)); map(0x8000, 0x8000).portr("DSW1"); - map(0x8001, 0x8001).portr("DSW2").w(this, FUNC(btime_state::bnj_video_control_w)); + map(0x8001, 0x8001).portr("DSW2").w(FUNC(btime_state::bnj_video_control_w)); map(0x8003, 0x8003).writeonly().share("lnc_charbank"); map(0x9000, 0x9000).portr("P1").nopw(); /* IRQ ack??? */ map(0x9001, 0x9001).portr("P2"); map(0x9002, 0x9002).portr("SYSTEM").w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xb000, 0xbfff).rw(this, FUNC(btime_state::mmonkey_protection_r), FUNC(btime_state::mmonkey_protection_w)); + map(0xb000, 0xbfff).rw(FUNC(btime_state::mmonkey_protection_r), FUNC(btime_state::mmonkey_protection_w)); map(0xc000, 0xffff).rom(); } @@ -293,18 +293,18 @@ void btime_state::bnj_map(address_map &map) { map(0x0000, 0x07ff).ram().share("rambase"); map(0x1000, 0x1000).portr("DSW1"); - map(0x1001, 0x1001).portr("DSW2").w(this, FUNC(btime_state::bnj_video_control_w)); + map(0x1001, 0x1001).portr("DSW2").w(FUNC(btime_state::bnj_video_control_w)); map(0x1002, 0x1002).portr("P1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x1003, 0x1003).portr("P2"); map(0x1004, 0x1004).portr("SYSTEM"); map(0x4000, 0x43ff).ram().share("videoram"); map(0x4400, 0x47ff).ram().share("colorram"); - map(0x4800, 0x4bff).rw(this, FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); - map(0x4c00, 0x4fff).rw(this, FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); - map(0x5000, 0x51ff).ram().w(this, FUNC(btime_state::bnj_background_w)).share("bnj_bgram"); + map(0x4800, 0x4bff).rw(FUNC(btime_state::btime_mirrorvideoram_r), FUNC(btime_state::btime_mirrorvideoram_w)); + map(0x4c00, 0x4fff).rw(FUNC(btime_state::btime_mirrorcolorram_r), FUNC(btime_state::btime_mirrorcolorram_w)); + map(0x5000, 0x51ff).ram().w(FUNC(btime_state::bnj_background_w)).share("bnj_bgram"); map(0x5200, 0x53ff).ram(); - map(0x5400, 0x5400).w(this, FUNC(btime_state::bnj_scroll1_w)); - map(0x5800, 0x5800).w(this, FUNC(btime_state::bnj_scroll2_w)); + map(0x5400, 0x5400).w(FUNC(btime_state::bnj_scroll1_w)); + map(0x5800, 0x5800).w(FUNC(btime_state::bnj_scroll2_w)); map(0x5c00, 0x5c0f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xa000, 0xffff).rom(); } @@ -312,7 +312,7 @@ void btime_state::bnj_map(address_map &map) void btime_state::disco_map(address_map &map) { map(0x0000, 0x04ff).ram().share("rambase"); - map(0x2000, 0x7fff).ram().w(this, FUNC(btime_state::deco_charram_w)).share("deco_charram"); + map(0x2000, 0x7fff).ram().w(FUNC(btime_state::deco_charram_w)).share("deco_charram"); map(0x8000, 0x83ff).ram().share("videoram"); map(0x8400, 0x87ff).ram().share("colorram"); map(0x8800, 0x881f).ram().share("spriteram"); @@ -321,7 +321,7 @@ void btime_state::disco_map(address_map &map) map(0x9400, 0x9400).portr("P2"); map(0x9800, 0x9800).portr("DSW1"); map(0x9a00, 0x9a00).portr("DSW2").w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x9c00, 0x9c00).portr("VBLANK").w(this, FUNC(btime_state::disco_video_control_w)); + map(0x9c00, 0x9c00).portr("VBLANK").w(FUNC(btime_state::disco_video_control_w)); map(0xa000, 0xffff).rom(); } @@ -335,7 +335,7 @@ void btime_state::audio_map(address_map &map) map(0x6000, 0x7fff).w("ay2", FUNC(ay8910_device::data_w)); map(0x8000, 0x9fff).w("ay2", FUNC(ay8910_device::address_w)); map(0xa000, 0xbfff).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xc000, 0xdfff).w(this, FUNC(btime_state::audio_nmi_enable_w)); + map(0xc000, 0xdfff).w(FUNC(btime_state::audio_nmi_enable_w)); map(0xe000, 0xefff).mirror(0x1000).rom(); } diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp index 32a1e0133cb..3262a855bb4 100644 --- a/src/mame/drivers/btoads.cpp +++ b/src/mame/drivers/btoads.cpp @@ -177,20 +177,20 @@ void btoads_state::main_map(address_map &map) map(0x20000280, 0x200002ff).portr("SW1"); map(0x20000000, 0x200000ff).writeonly().share("sprite_scale"); map(0x20000100, 0x2000017f).writeonly().share("sprite_control"); - map(0x20000180, 0x200001ff).w(this, FUNC(btoads_state::display_control_w)); - map(0x20000200, 0x2000027f).w(this, FUNC(btoads_state::scroll0_w)); - map(0x20000280, 0x200002ff).w(this, FUNC(btoads_state::scroll1_w)); - map(0x20000300, 0x2000037f).rw(this, FUNC(btoads_state::paletteram_r), FUNC(btoads_state::paletteram_w)); - map(0x20000380, 0x200003ff).rw(this, FUNC(btoads_state::main_sound_r), FUNC(btoads_state::main_sound_w)); - map(0x20000400, 0x2000047f).w(this, FUNC(btoads_state::misc_control_w)); + map(0x20000180, 0x200001ff).w(FUNC(btoads_state::display_control_w)); + map(0x20000200, 0x2000027f).w(FUNC(btoads_state::scroll0_w)); + map(0x20000280, 0x200002ff).w(FUNC(btoads_state::scroll1_w)); + map(0x20000300, 0x2000037f).rw(FUNC(btoads_state::paletteram_r), FUNC(btoads_state::paletteram_w)); + map(0x20000380, 0x200003ff).rw(FUNC(btoads_state::main_sound_r), FUNC(btoads_state::main_sound_w)); + map(0x20000400, 0x2000047f).w(FUNC(btoads_state::misc_control_w)); map(0x40000000, 0x4000000f).nopw(); /* watchdog? */ map(0x60000000, 0x6003ffff).ram().share("nvram"); - map(0xa0000000, 0xa03fffff).rw(this, FUNC(btoads_state::vram_fg_display_r), FUNC(btoads_state::vram_fg_display_w)).share("vram_fg0"); - map(0xa4000000, 0xa43fffff).rw(this, FUNC(btoads_state::vram_fg_draw_r), FUNC(btoads_state::vram_fg_draw_w)).share("vram_fg1"); + map(0xa0000000, 0xa03fffff).rw(FUNC(btoads_state::vram_fg_display_r), FUNC(btoads_state::vram_fg_display_w)).share("vram_fg0"); + map(0xa4000000, 0xa43fffff).rw(FUNC(btoads_state::vram_fg_draw_r), FUNC(btoads_state::vram_fg_draw_w)).share("vram_fg1"); map(0xa8000000, 0xa87fffff).ram().share("vram_fg_data"); map(0xa8800000, 0xa8ffffff).nopw(); - map(0xb0000000, 0xb03fffff).rw(this, FUNC(btoads_state::vram_bg0_r), FUNC(btoads_state::vram_bg0_w)).share("vram_bg0"); - map(0xb4000000, 0xb43fffff).rw(this, FUNC(btoads_state::vram_bg1_r), FUNC(btoads_state::vram_bg1_w)).share("vram_bg1"); + map(0xb0000000, 0xb03fffff).rw(FUNC(btoads_state::vram_bg0_r), FUNC(btoads_state::vram_bg0_w)).share("vram_bg0"); + map(0xb4000000, 0xb43fffff).rw(FUNC(btoads_state::vram_bg1_r), FUNC(btoads_state::vram_bg1_w)).share("vram_bg1"); map(0xc0000000, 0xc00003ff).rw(m_maincpu, FUNC(tms34020_device::io_register_r), FUNC(tms34020_device::io_register_w)); map(0xfc000000, 0xffffffff).rom().region("user1", 0); } @@ -211,12 +211,12 @@ void btoads_state::sound_map(address_map &map) void btoads_state::sound_io_map(address_map &map) { - map(0x0000, 0x7fff).w(this, FUNC(btoads_state::bsmt2000_port_w)); - map(0x8000, 0x8000).rw(this, FUNC(btoads_state::sound_data_r), FUNC(btoads_state::sound_data_w)); - map(0x8002, 0x8002).w(this, FUNC(btoads_state::sound_int_state_w)); - map(0x8004, 0x8004).r(this, FUNC(btoads_state::sound_data_ready_r)); - map(0x8005, 0x8005).r(this, FUNC(btoads_state::sound_ready_to_send_r)); - map(0x8006, 0x8006).r(this, FUNC(btoads_state::bsmt_ready_r)); + map(0x0000, 0x7fff).w(FUNC(btoads_state::bsmt2000_port_w)); + map(0x8000, 0x8000).rw(FUNC(btoads_state::sound_data_r), FUNC(btoads_state::sound_data_w)); + map(0x8002, 0x8002).w(FUNC(btoads_state::sound_int_state_w)); + map(0x8004, 0x8004).r(FUNC(btoads_state::sound_data_ready_r)); + map(0x8005, 0x8005).r(FUNC(btoads_state::sound_ready_to_send_r)); + map(0x8006, 0x8006).r(FUNC(btoads_state::bsmt_ready_r)); } diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp index e0ef4a62a20..912182aa9c9 100644 --- a/src/mame/drivers/bublbobl.cpp +++ b/src/mame/drivers/bublbobl.cpp @@ -306,11 +306,11 @@ void bublbobl_state::bublbobl_maincpu_map(address_map &map) { common_maincpu_map(map); map(0xfa00, 0xfa00).mirror(0x007c).r(m_sound_to_main, FUNC(generic_latch_8_device::read)).w(m_main_to_sound, FUNC(generic_latch_8_device::write)); - map(0xfa01, 0xfa01).mirror(0x007c).r(this, FUNC(bublbobl_state::common_sound_semaphores_r)); - map(0xfa03, 0xfa03).mirror(0x007c).w(this, FUNC(bublbobl_state::bublbobl_soundcpu_reset_w)); + map(0xfa01, 0xfa01).mirror(0x007c).r(FUNC(bublbobl_state::common_sound_semaphores_r)); + map(0xfa03, 0xfa03).mirror(0x007c).w(FUNC(bublbobl_state::bublbobl_soundcpu_reset_w)); map(0xfa80, 0xfa80).mirror(0x007f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xfb00, 0xfb00).mirror(0x003f).w(this, FUNC(bublbobl_state::bublbobl_nmitrigger_w)); - map(0xfb40, 0xfb40).mirror(0x003f).w(this, FUNC(bublbobl_state::bublbobl_bankswitch_w)); + map(0xfb00, 0xfb00).mirror(0x003f).w(FUNC(bublbobl_state::bublbobl_nmitrigger_w)); + map(0xfb40, 0xfb40).mirror(0x003f).w(FUNC(bublbobl_state::bublbobl_bankswitch_w)); map(0xfc00, 0xffff).ram().share("mcu_sharedram"); } @@ -353,21 +353,21 @@ void bublbobl_state::sound_map(address_map &map) map(0x9000, 0x9001).mirror(0x0ffe).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xa000, 0xa001).mirror(0x0ffe).rw("ym2", FUNC(ym3526_device::read), FUNC(ym3526_device::write)); map(0xb000, 0xb000).mirror(0x0ffc).r(m_main_to_sound, FUNC(generic_latch_8_device::read)).w(m_sound_to_main, FUNC(generic_latch_8_device::write)); - map(0xb001, 0xb001).mirror(0x0ffc).r(this, FUNC(bublbobl_state::common_sound_semaphores_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); + map(0xb001, 0xb001).mirror(0x0ffc).r(FUNC(bublbobl_state::common_sound_semaphores_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); map(0xb002, 0xb002).mirror(0x0ffc).w(m_soundnmi, FUNC(input_merger_device::in_clear<0>)); map(0xe000, 0xffff).rom(); // space for diagnostic ROM? } void bublbobl_state::mcu_map(address_map &map) { - map(0x0000, 0x0000).rw(this, FUNC(bublbobl_state::bublbobl_mcu_ddr1_r), FUNC(bublbobl_state::bublbobl_mcu_ddr1_w)); - map(0x0001, 0x0001).rw(this, FUNC(bublbobl_state::bublbobl_mcu_ddr2_r), FUNC(bublbobl_state::bublbobl_mcu_ddr2_w)); - map(0x0002, 0x0002).rw(this, FUNC(bublbobl_state::bublbobl_mcu_port1_r), FUNC(bublbobl_state::bublbobl_mcu_port1_w)); - map(0x0003, 0x0003).rw(this, FUNC(bublbobl_state::bublbobl_mcu_port2_r), FUNC(bublbobl_state::bublbobl_mcu_port2_w)); - map(0x0004, 0x0004).rw(this, FUNC(bublbobl_state::bublbobl_mcu_ddr3_r), FUNC(bublbobl_state::bublbobl_mcu_ddr3_w)); - map(0x0005, 0x0005).rw(this, FUNC(bublbobl_state::bublbobl_mcu_ddr4_r), FUNC(bublbobl_state::bublbobl_mcu_ddr4_w)); - map(0x0006, 0x0006).rw(this, FUNC(bublbobl_state::bublbobl_mcu_port3_r), FUNC(bublbobl_state::bublbobl_mcu_port3_w)); - map(0x0007, 0x0007).rw(this, FUNC(bublbobl_state::bublbobl_mcu_port4_r), FUNC(bublbobl_state::bublbobl_mcu_port4_w)); + map(0x0000, 0x0000).rw(FUNC(bublbobl_state::bublbobl_mcu_ddr1_r), FUNC(bublbobl_state::bublbobl_mcu_ddr1_w)); + map(0x0001, 0x0001).rw(FUNC(bublbobl_state::bublbobl_mcu_ddr2_r), FUNC(bublbobl_state::bublbobl_mcu_ddr2_w)); + map(0x0002, 0x0002).rw(FUNC(bublbobl_state::bublbobl_mcu_port1_r), FUNC(bublbobl_state::bublbobl_mcu_port1_w)); + map(0x0003, 0x0003).rw(FUNC(bublbobl_state::bublbobl_mcu_port2_r), FUNC(bublbobl_state::bublbobl_mcu_port2_w)); + map(0x0004, 0x0004).rw(FUNC(bublbobl_state::bublbobl_mcu_ddr3_r), FUNC(bublbobl_state::bublbobl_mcu_ddr3_w)); + map(0x0005, 0x0005).rw(FUNC(bublbobl_state::bublbobl_mcu_ddr4_r), FUNC(bublbobl_state::bublbobl_mcu_ddr4_w)); + map(0x0006, 0x0006).rw(FUNC(bublbobl_state::bublbobl_mcu_port3_r), FUNC(bublbobl_state::bublbobl_mcu_port3_w)); + map(0x0007, 0x0007).rw(FUNC(bublbobl_state::bublbobl_mcu_port4_r), FUNC(bublbobl_state::bublbobl_mcu_port4_w)); map(0x0040, 0x00ff).ram(); map(0xf000, 0xffff).rom(); } @@ -376,16 +376,16 @@ void bublbobl_state::bootleg_map(address_map &map) { common_maincpu_map(map); map(0xfa00, 0xfa00).mirror(0x007c).r(m_sound_to_main, FUNC(generic_latch_8_device::read)).w(m_main_to_sound, FUNC(generic_latch_8_device::write)); - map(0xfa01, 0xfa01).mirror(0x007c).r(this, FUNC(bublbobl_state::common_sound_semaphores_r)); - map(0xfa03, 0xfa03).mirror(0x007c).w(this, FUNC(bublbobl_state::bublbobl_soundcpu_reset_w)); + map(0xfa01, 0xfa01).mirror(0x007c).r(FUNC(bublbobl_state::common_sound_semaphores_r)); + map(0xfa03, 0xfa03).mirror(0x007c).w(FUNC(bublbobl_state::bublbobl_soundcpu_reset_w)); map(0xfa80, 0xfa80).mirror(0x007f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xfb00, 0xfb00).mirror(0x003f).w(this, FUNC(bublbobl_state::bublbobl_nmitrigger_w)); - map(0xfb40, 0xfb40).mirror(0x003f).w(this, FUNC(bublbobl_state::bublbobl_bankswitch_w)); + map(0xfb00, 0xfb00).mirror(0x003f).w(FUNC(bublbobl_state::bublbobl_nmitrigger_w)); + map(0xfb40, 0xfb40).mirror(0x003f).w(FUNC(bublbobl_state::bublbobl_bankswitch_w)); // above here is identical to non-bootleg map(0xfc00, 0xfcff).ram(); map(0xfd00, 0xfdff).ram(); - map(0xfe00, 0xfe03).rw(this, FUNC(bublbobl_state::boblbobl_ic43_a_r), FUNC(bublbobl_state::boblbobl_ic43_a_w)); - map(0xfe80, 0xfe83).rw(this, FUNC(bublbobl_state::boblbobl_ic43_b_r), FUNC(bublbobl_state::boblbobl_ic43_b_w)); + map(0xfe00, 0xfe03).rw(FUNC(bublbobl_state::boblbobl_ic43_a_r), FUNC(bublbobl_state::boblbobl_ic43_a_w)); + map(0xfe80, 0xfe83).rw(FUNC(bublbobl_state::boblbobl_ic43_b_r), FUNC(bublbobl_state::boblbobl_ic43_b_w)); map(0xff00, 0xff00).portr("DSW0"); map(0xff01, 0xff01).portr("DSW1"); map(0xff02, 0xff02).portr("IN0"); @@ -404,9 +404,9 @@ void bublbobl_state::tokio_map(address_map &map) map(0xfa05, 0xfa05).portr("IN0"); map(0xfa06, 0xfa06).portr("IN1"); map(0xfa07, 0xfa07).portr("IN2"); - map(0xfa80, 0xfa80).w(this, FUNC(bublbobl_state::tokio_bankswitch_w)); - map(0xfb00, 0xfb00).w(this, FUNC(bublbobl_state::tokio_videoctrl_w)); - map(0xfb80, 0xfb80).w(this, FUNC(bublbobl_state::bublbobl_nmitrigger_w)); + map(0xfa80, 0xfa80).w(FUNC(bublbobl_state::tokio_bankswitch_w)); + map(0xfb00, 0xfb00).w(FUNC(bublbobl_state::tokio_videoctrl_w)); + map(0xfb80, 0xfb80).w(FUNC(bublbobl_state::bublbobl_nmitrigger_w)); map(0xfc00, 0xfc00).r(m_sound_to_main, FUNC(generic_latch_8_device::read)).w(m_main_to_sound, FUNC(generic_latch_8_device::write)); } @@ -419,7 +419,7 @@ void bublbobl_state::tokio_map_mcu(address_map &map) void bublbobl_state::tokio_map_bootleg(address_map &map) { tokio_map(map); - map(0xfe00, 0xfe00).r(this, FUNC(bublbobl_state::tokiob_mcu_r)); + map(0xfe00, 0xfe00).r(FUNC(bublbobl_state::tokiob_mcu_r)); } @@ -434,7 +434,7 @@ void bublbobl_state::tokio_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); map(0x9000, 0x9000).r(m_main_to_sound, FUNC(generic_latch_8_device::read)).w(m_sound_to_main, FUNC(generic_latch_8_device::write)); - map(0x9800, 0x9800).r(this, FUNC(bublbobl_state::common_sound_semaphores_r)); + map(0x9800, 0x9800).r(FUNC(bublbobl_state::common_sound_semaphores_r)); map(0xa000, 0xa000).w(m_soundnmi, FUNC(input_merger_device::in_clear<0>)); map(0xa800, 0xa800).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); map(0xb000, 0xb001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp index 0e46f023ac8..86b5ebb9d16 100644 --- a/src/mame/drivers/buggychl.cpp +++ b/src/mame/drivers/buggychl.cpp @@ -203,19 +203,19 @@ void buggychl_state::buggychl_map(address_map &map) map(0x4000, 0x7fff).rom(); /* A22-05 (22) */ map(0x8000, 0x87ff).ram(); /* 6116 SRAM (36) */ map(0x8800, 0x8fff).ram(); /* 6116 SRAM (35) */ - map(0x9000, 0x9fff).w(this, FUNC(buggychl_state::buggychl_sprite_lookup_w)); - map(0xa000, 0xbfff).bankr("bank1").w(this, FUNC(buggychl_state::buggychl_chargen_w)).share("charram"); + map(0x9000, 0x9fff).w(FUNC(buggychl_state::buggychl_sprite_lookup_w)); + map(0xa000, 0xbfff).bankr("bank1").w(FUNC(buggychl_state::buggychl_chargen_w)).share("charram"); map(0xc800, 0xcfff).ram().share("videoram"); map(0xd000, 0xd000).nopw(); // ??? - map(0xd100, 0xd100).mirror(0x00ff).w(this, FUNC(buggychl_state::buggychl_ctrl_w)); - map(0xd200, 0xd200).mirror(0x00ff).w(this, FUNC(buggychl_state::bankswitch_w)); + map(0xd100, 0xd100).mirror(0x00ff).w(FUNC(buggychl_state::buggychl_ctrl_w)); + map(0xd200, 0xd200).mirror(0x00ff).w(FUNC(buggychl_state::bankswitch_w)); map(0xd300, 0xd300).mirror(0x00f8).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // d301 = flp stuff, unused? // d302 = mcu reset latched d0 - map(0xd303, 0xd303).mirror(0x00f8).w(this, FUNC(buggychl_state::buggychl_sprite_lookup_bank_w)); + map(0xd303, 0xd303).mirror(0x00f8).w(FUNC(buggychl_state::buggychl_sprite_lookup_bank_w)); map(0xd304, 0xd307).nopw(); // d304-d307 is SCCON, which seems to be for a bezel mounted 7seg score/time display like Grand Champion has map(0xd400, 0xd400).mirror(0x00fc).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0xd401, 0xd401).mirror(0x00fc).r(this, FUNC(buggychl_state::mcu_status_r)); + map(0xd401, 0xd401).mirror(0x00fc).r(FUNC(buggychl_state::mcu_status_r)); map(0xd500, 0xd57f).writeonly().share("spriteram"); map(0xd600, 0xd600).mirror(0x00e4).portr("DSW1"); map(0xd601, 0xd601).mirror(0x00e4).portr("DSW2"); @@ -226,7 +226,7 @@ void buggychl_state::buggychl_map(address_map &map) // AM_RANGE(0xd60a, 0xd60a) AM_MIRROR(0x00e4) // other inputs, not used? // AM_RANGE(0xd60b, 0xd60b) AM_MIRROR(0x00e4) // other inputs, not used? map(0xd610, 0xd610).mirror(0x00e4).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xd611, 0xd611).mirror(0x00e4).r(this, FUNC(buggychl_state::sound_status_main_r)); + map(0xd611, 0xd611).mirror(0x00e4).r(FUNC(buggychl_state::sound_status_main_r)); // AM_RANGE(0xd613, 0xd613) AM_MIRROR(0x00e4) AM_WRITE(sound_reset_w) map(0xd618, 0xd618).mirror(0x00e7).nopw(); /* accelerator clear; TODO: should we emulate the proper quadrature counter here? */ map(0xd700, 0xd7ff).w(m_palette, FUNC(palette_device::write8)).share("palette"); @@ -234,7 +234,7 @@ void buggychl_state::buggychl_map(address_map &map) map(0xd840, 0xd85f).writeonly().share("scrollv"); map(0xdb00, 0xdbff).writeonly().share("scrollh"); map(0xdc04, 0xdc04).writeonly(); /* should be fg scroll */ - map(0xdc06, 0xdc06).w(this, FUNC(buggychl_state::buggychl_bg_scrollx_w)); + map(0xdc06, 0xdc06).w(FUNC(buggychl_state::buggychl_bg_scrollx_w)); } /* The schematics for buggy challenge has the wrong sound board schematic attached to it. @@ -248,12 +248,12 @@ void buggychl_state::sound_map(address_map &map) map(0x4800, 0x4801).w(m_ay1, FUNC(ay8910_device::address_data_w)); map(0x4802, 0x4803).w(m_ay2, FUNC(ay8910_device::address_data_w)); map(0x4810, 0x481d).w(m_msm, FUNC(msm5232_device::write)); - map(0x4820, 0x4820).w(this, FUNC(buggychl_state::ta7630_volbal_msm_w)); /* VOL/BAL for the 7630 on the MSM5232 output */ + map(0x4820, 0x4820).w(FUNC(buggychl_state::ta7630_volbal_msm_w)); /* VOL/BAL for the 7630 on the MSM5232 output */ map(0x4830, 0x4830).ram(); /* TRBL/BASS for the 7630 on the MSM5232 output */ map(0x5000, 0x5000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); - map(0x5001, 0x5001).r(this, FUNC(buggychl_state::sound_status_sound_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<1>)); + map(0x5001, 0x5001).r(FUNC(buggychl_state::sound_status_sound_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<1>)); map(0x5002, 0x5002).w(m_soundnmi, FUNC(input_merger_device::in_clear<1>)); - map(0x5003, 0x5003).w(this, FUNC(buggychl_state::sound_enable_w)); // unclear what this actually controls + map(0x5003, 0x5003).w(FUNC(buggychl_state::sound_enable_w)); // unclear what this actually controls map(0xe000, 0xefff).rom(); /* space for diagnostics ROM */ } diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp index 186f4b9d8cd..ff4be802d9b 100644 --- a/src/mame/drivers/bullet.cpp +++ b/src/mame/drivers/bullet.cpp @@ -609,7 +609,7 @@ READ8_MEMBER( bulletf_state::hwsts_r ) void bullet_state::bullet_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(bullet_state::mreq_r), FUNC(bullet_state::mreq_w)); + map(0x0000, 0xffff).rw(FUNC(bullet_state::mreq_r), FUNC(bullet_state::mreq_w)); } @@ -623,15 +623,15 @@ void bullet_state::bullet_io(address_map &map) map(0x00, 0x03).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0x04, 0x07).rw(Z80PIO_TAG, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x0c, 0x0c).mirror(0x03).rw(this, FUNC(bullet_state::win_r), FUNC(bullet_state::wstrobe_w)); + map(0x0c, 0x0c).mirror(0x03).rw(FUNC(bullet_state::win_r), FUNC(bullet_state::wstrobe_w)); map(0x10, 0x13).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write)); - map(0x14, 0x14).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0x15, 0x15).rw(this, FUNC(bullet_state::brom_r), FUNC(bullet_state::brom_w)); - map(0x16, 0x16).w(this, FUNC(bullet_state::exdsk_w)); - map(0x17, 0x17).w(this, FUNC(bullet_state::exdma_w)); - map(0x18, 0x18).w(this, FUNC(bullet_state::hdcon_w)); - map(0x19, 0x19).r(this, FUNC(bullet_state::info_r)); - map(0x1a, 0x1a).w(this, FUNC(bullet_state::segst_w)); + map(0x14, 0x14).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x15, 0x15).rw(FUNC(bullet_state::brom_r), FUNC(bullet_state::brom_w)); + map(0x16, 0x16).w(FUNC(bullet_state::exdsk_w)); + map(0x17, 0x17).w(FUNC(bullet_state::exdma_w)); + map(0x18, 0x18).w(FUNC(bullet_state::hdcon_w)); + map(0x19, 0x19).r(FUNC(bullet_state::info_r)); + map(0x1a, 0x1a).w(FUNC(bullet_state::segst_w)); } @@ -641,7 +641,7 @@ void bullet_state::bullet_io(address_map &map) void bulletf_state::bulletf_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(bulletf_state::mreq_r), FUNC(bulletf_state::mreq_w)); + map(0x0000, 0xffff).rw(FUNC(bulletf_state::mreq_r), FUNC(bulletf_state::mreq_w)); } @@ -656,12 +656,12 @@ void bulletf_state::bulletf_io(address_map &map) map(0x04, 0x07).rw(Z80PIO_TAG, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x10, 0x13).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write)); - map(0x14, 0x14).w(this, FUNC(bulletf_state::xdma0_w)); - map(0x16, 0x16).w(this, FUNC(bulletf_state::xfdc_w)); - map(0x17, 0x17).w(this, FUNC(bulletf_state::mbank_w)); - map(0x19, 0x19).rw(this, FUNC(bulletf_state::scsi_r), FUNC(bulletf_state::scsi_w)); - map(0x1a, 0x1a).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0x1b, 0x1b).r(this, FUNC(bulletf_state::hwsts_r)); + map(0x14, 0x14).w(FUNC(bulletf_state::xdma0_w)); + map(0x16, 0x16).w(FUNC(bulletf_state::xfdc_w)); + map(0x17, 0x17).w(FUNC(bulletf_state::mbank_w)); + map(0x19, 0x19).rw(FUNC(bulletf_state::scsi_r), FUNC(bulletf_state::scsi_w)); + map(0x1a, 0x1a).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x1b, 0x1b).r(FUNC(bulletf_state::hwsts_r)); } @@ -1143,7 +1143,7 @@ MACHINE_CONFIG_START(bullet_state::bullet) MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, bullet_state, pio_pb_r)) MCFG_DEVICE_ADD(MB8877_TAG, MB8877, 16_MHz_XTAL / 16) @@ -1223,9 +1223,9 @@ MACHINE_CONFIG_START(bulletf_state::bulletf) MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_Z80PIO_IN_PA_CB(READ8("scsi_ctrl_in", input_buffer_device, read)) + MCFG_Z80PIO_IN_PA_CB(READ8("scsi_ctrl_in", input_buffer_device, bus_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, bulletf_state, pio_pa_w)) - MCFG_Z80PIO_OUT_ARDY_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_ARDY_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, bulletf_state, cstrb_w)) MCFG_DEVICE_ADD(MB8877_TAG, MB8877, 16_MHz_XTAL / 16) diff --git a/src/mame/drivers/busicom.cpp b/src/mame/drivers/busicom.cpp index 689fc193deb..b0c3261dd85 100644 --- a/src/mame/drivers/busicom.cpp +++ b/src/mame/drivers/busicom.cpp @@ -120,15 +120,15 @@ void busicom_state::busicom_stat(address_map &map) void busicom_state::busicom_rp(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x000f).mirror(0x0700).w(this, FUNC(busicom_state::shifter_w)); // ROM0 I/O - map(0x0010, 0x001f).mirror(0x0700).rw(this, FUNC(busicom_state::keyboard_r), FUNC(busicom_state::printer_ctrl_w)); // ROM1 I/O - map(0x0020, 0x002f).mirror(0x0700).r(this, FUNC(busicom_state::printer_r)); // ROM2 I/O + map(0x0000, 0x000f).mirror(0x0700).w(FUNC(busicom_state::shifter_w)); // ROM0 I/O + map(0x0010, 0x001f).mirror(0x0700).rw(FUNC(busicom_state::keyboard_r), FUNC(busicom_state::printer_ctrl_w)); // ROM1 I/O + map(0x0020, 0x002f).mirror(0x0700).r(FUNC(busicom_state::printer_r)); // ROM2 I/O } void busicom_state::busicom_mp(address_map &map) { - map(0x00, 0x00).w(this, FUNC(busicom_state::printer_w)); // RAM0 output - map(0x01, 0x01).w(this, FUNC(busicom_state::status_w)); // RAM1 output + map(0x00, 0x00).w(FUNC(busicom_state::printer_w)); // RAM0 output + map(0x01, 0x01).w(FUNC(busicom_state::status_w)); // RAM1 output } /* Input ports */ diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp index dda17312e78..5626513dfa9 100644 --- a/src/mame/drivers/buster.cpp +++ b/src/mame/drivers/buster.cpp @@ -95,7 +95,7 @@ void buster_state::mainmap(address_map &map) map(0x7c8a, 0x7c8a).portr("IN5"); map(0x7c8c, 0x7c8c).portr("IN6"); map(0x7c8e, 0x7c8e).portr("IN7"); - map(0x7cb0, 0x7cb7).w(this, FUNC(buster_state::coin_output_w)); + map(0x7cb0, 0x7cb7).w(FUNC(buster_state::coin_output_w)); map(0x8800, 0x8fff).ram().share("wram"); // ??? map(0xa000, 0xa0ff).ram(); // nvram? } diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp index 480a23ba66b..486cf080dbf 100644 --- a/src/mame/drivers/bw12.cpp +++ b/src/mame/drivers/bw12.cpp @@ -108,7 +108,7 @@ void bw12_state::set_floppy_motor_off_timer() } } -void bw12_state::ls259_w(int address, int data) +void bw12_state::write_ls259(int address, int data) { switch (address) { @@ -156,7 +156,7 @@ WRITE8_MEMBER( bw12_state::ls259_w ) int d = BIT(offset, 0); int a = (offset >> 1) & 0x07; - ls259_w(a, d); + write_ls259(a, d); } READ8_MEMBER( bw12_state::ls259_r ) @@ -178,13 +178,13 @@ void bw12_state::bw12_mem(address_map &map) void bw12_state::bw12_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0f).rw(this, FUNC(bw12_state::ls259_r), FUNC(bw12_state::ls259_w)); + map(0x00, 0x0f).rw(FUNC(bw12_state::ls259_r), FUNC(bw12_state::ls259_w)); map(0x10, 0x10).mirror(0x0e).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x11, 0x11).mirror(0x0e).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x20, 0x21).mirror(0x0e).m(m_fdc, FUNC(upd765a_device::map)); map(0x30, 0x33).mirror(0x0c).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x40, 0x43).mirror(0x0c).rw(m_sio, FUNC(z80sio0_device::ba_cd_r), FUNC(z80sio0_device::ba_cd_w)); - map(0x50, 0x50).mirror(0x0f).w("dac", FUNC(dac_byte_interface::write)); + map(0x50, 0x50).mirror(0x0f).w("dac", FUNC(dac_byte_interface::data_w)); map(0x60, 0x63).mirror(0x0c).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); } @@ -506,7 +506,7 @@ void bw12_state::machine_reset() { for (int i = 0; i < 8; i++) { - ls259_w(i, 0); + write_ls259(i, 0); } } @@ -583,7 +583,7 @@ MACHINE_CONFIG_START(bw12_state::common) MCFG_DEVICE_ADD(PIA6821_TAG, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(*this, bw12_state, pia_pa_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, bw12_state, pia_cb2_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index f25fbf9126a..d4f71f9dca2 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -205,7 +205,7 @@ WRITE8_MEMBER( bw2_state::write ) void bw2_state::bw2_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(bw2_state::read), FUNC(bw2_state::write)); + map(0x0000, 0xffff).rw(FUNC(bw2_state::read), FUNC(bw2_state::write)); } @@ -223,7 +223,7 @@ void bw2_state::bw2_io(address_map &map) map(0x30, 0x3f).rw(m_exp, FUNC(bw2_expansion_slot_device::slot_r), FUNC(bw2_expansion_slot_device::slot_w)); map(0x40, 0x40).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x41, 0x41).rw(m_uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x50, 0x50).w("cent_data_out", FUNC(output_latch_device::write)); + map(0x50, 0x50).w("cent_data_out", FUNC(output_latch_device::bus_w)); map(0x60, 0x63).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)); map(0x70, 0x7f).rw(m_exp, FUNC(bw2_expansion_slot_device::modsel_r), FUNC(bw2_expansion_slot_device::modsel_w)); } diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp index 2208f84228f..eb41b77ea1d 100644 --- a/src/mame/drivers/bwidow.cpp +++ b/src/mame/drivers/bwidow.cpp @@ -386,10 +386,10 @@ void bwidow_state::bwidow_map(address_map &map) map(0x7800, 0x7800).portr("IN0"); map(0x8000, 0x8000).portr("IN3"); map(0x8800, 0x8800).portr("IN4"); - map(0x8800, 0x8800).w(this, FUNC(bwidow_state::bwidow_misc_w)); /* coin counters, leds */ + map(0x8800, 0x8800).w(FUNC(bwidow_state::bwidow_misc_w)); /* coin counters, leds */ map(0x8840, 0x8840).w("avg", FUNC(avg_device::go_w)); map(0x8880, 0x8880).w("avg", FUNC(avg_device::reset_w)); - map(0x88c0, 0x88c0).w(this, FUNC(bwidow_state::irq_ack_w)); /* interrupt acknowledge */ + map(0x88c0, 0x88c0).w(FUNC(bwidow_state::irq_ack_w)); /* interrupt acknowledge */ map(0x8900, 0x8900).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x8940, 0x897f).w("earom", FUNC(atari_vg_earom_device::write)); map(0x8980, 0x89ed).nopw(); /* watchdog clear */ @@ -401,15 +401,15 @@ void bwidow_state::bwidowp_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x0800, 0x080f).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x0810, 0x081f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1000, 0x1000).r(this, FUNC(bwidow_state::bwidowp_in_r)); + map(0x1000, 0x1000).r(FUNC(bwidow_state::bwidowp_in_r)); map(0x1800, 0x1800).portr("IN0"); map(0x2000, 0x2000).w("avg", FUNC(avg_device::go_w)); map(0x2800, 0x2800).w("avg", FUNC(avg_device::reset_w)); map(0x3000, 0x3000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x3800, 0x3800).w(this, FUNC(bwidow_state::bwidow_misc_w)); /* coin counters, leds */ + map(0x3800, 0x3800).w(FUNC(bwidow_state::bwidow_misc_w)); /* coin counters, leds */ map(0x4000, 0x47ff).ram().share("vectorram").region("maincpu", 0x4000); map(0x4800, 0x6fff).rom(); - map(0x6000, 0x6000).w(this, FUNC(bwidow_state::irq_ack_w)); /* interrupt acknowledge */ + map(0x6000, 0x6000).w(FUNC(bwidow_state::irq_ack_w)); /* interrupt acknowledge */ map(0x8000, 0x803f).w("earom", FUNC(atari_vg_earom_device::write)); map(0x8800, 0x8800).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x9000, 0x9000).r("earom", FUNC(atari_vg_earom_device::read)); @@ -421,14 +421,14 @@ void bwidow_state::spacduel_map(address_map &map) { map(0x0000, 0x03ff).ram(); map(0x0800, 0x0800).portr("IN0"); - map(0x0900, 0x0907).r(this, FUNC(bwidow_state::spacduel_IN3_r)); /* IN1 */ + map(0x0900, 0x0907).r(FUNC(bwidow_state::spacduel_IN3_r)); /* IN1 */ map(0x0905, 0x0906).nopw(); /* ignore? */ map(0x0a00, 0x0a00).r("earom", FUNC(atari_vg_earom_device::read)); - map(0x0c00, 0x0c00).w(this, FUNC(bwidow_state::spacduel_coin_counter_w)); /* coin out */ + map(0x0c00, 0x0c00).w(FUNC(bwidow_state::spacduel_coin_counter_w)); /* coin out */ map(0x0c80, 0x0c80).w("avg", FUNC(avg_device::go_w)); map(0x0d00, 0x0d00).nopw(); /* watchdog clear */ map(0x0d80, 0x0d80).w("avg", FUNC(avg_device::reset_w)); - map(0x0e00, 0x0e00).w(this, FUNC(bwidow_state::irq_ack_w)); /* interrupt acknowledge */ + map(0x0e00, 0x0e00).w(FUNC(bwidow_state::irq_ack_w)); /* interrupt acknowledge */ map(0x0e80, 0x0e80).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x0f00, 0x0f3f).w("earom", FUNC(atari_vg_earom_device::write)); map(0x1000, 0x10ff).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp index a248b6a32d1..670794eeb92 100644 --- a/src/mame/drivers/bwing.cpp +++ b/src/mame/drivers/bwing.cpp @@ -125,17 +125,17 @@ void bwing_state::bwp1_map(address_map &map) { map(0x0000, 0x07ff).ram().share("sharedram"); map(0x0800, 0x0fff).ram(); - map(0x1000, 0x13ff).ram().w(this, FUNC(bwing_state::videoram_w)).share("videoram"); + map(0x1000, 0x13ff).ram().w(FUNC(bwing_state::videoram_w)).share("videoram"); map(0x1400, 0x17ff).ram(); map(0x1800, 0x19ff).ram().share("spriteram"); - map(0x1a00, 0x1aff).ram().w(this, FUNC(bwing_state::paletteram_w)).share("paletteram"); + map(0x1a00, 0x1aff).ram().w(FUNC(bwing_state::paletteram_w)).share("paletteram"); map(0x1b00, 0x1b00).portr("DSW0"); map(0x1b01, 0x1b01).portr("DSW1"); map(0x1b02, 0x1b02).portr("IN0"); map(0x1b03, 0x1b03).portr("IN1"); map(0x1b04, 0x1b04).portr("IN2"); - map(0x1b00, 0x1b07).w(this, FUNC(bwing_state::scrollreg_w)); - map(0x1c00, 0x1c07).ram().w(this, FUNC(bwing_state::bwp1_ctrl_w)); + map(0x1b00, 0x1b07).w(FUNC(bwing_state::scrollreg_w)); + map(0x1c00, 0x1c07).ram().w(FUNC(bwing_state::bwp1_ctrl_w)); map(0x2000, 0x3fff).m(m_vrambank, FUNC(address_map_bank_device::amap8)); map(0x4000, 0xffff).rom(); // "B-Wings US" writes to 9631-9632(debug?) } @@ -143,9 +143,9 @@ void bwing_state::bwp1_map(address_map &map) // Banked video RAM void bwing_state::bank_map(address_map &map) { - map(0x0000, 0x0fff).ram().w(this, FUNC(bwing_state::fgscrollram_w)).share("fgscrollram"); - map(0x1000, 0x1fff).ram().w(this, FUNC(bwing_state::bgscrollram_w)).share("bgscrollram"); - map(0x2000, 0x7fff).ram().w(this, FUNC(bwing_state::gfxram_w)).share("gfxram"); + map(0x0000, 0x0fff).ram().w(FUNC(bwing_state::fgscrollram_w)).share("fgscrollram"); + map(0x1000, 0x1fff).ram().w(FUNC(bwing_state::bgscrollram_w)).share("bgscrollram"); + map(0x2000, 0x7fff).ram().w(FUNC(bwing_state::gfxram_w)).share("gfxram"); } // Sub CPU @@ -153,7 +153,7 @@ void bwing_state::bwp2_map(address_map &map) { map(0x0000, 0x07ff).ram().share("sharedram"); map(0x0800, 0x0fff).ram(); - map(0x1800, 0x1803).w(this, FUNC(bwing_state::bwp2_ctrl_w)); + map(0x1800, 0x1803).w(FUNC(bwing_state::bwp2_ctrl_w)); map(0xa000, 0xffff).rom(); } @@ -162,21 +162,21 @@ void bwing_state::bwp2_map(address_map &map) void bwing_state::bwp3_map(address_map &map) { map(0x0000, 0x01ff).ram(); - map(0x0200, 0x0200).w("dac", FUNC(dac_byte_interface::write)); - map(0x1000, 0x1000).w(this, FUNC(bwing_state::bwp3_nmiack_w)); + map(0x0200, 0x0200).w("dac", FUNC(dac_byte_interface::data_w)); + map(0x1000, 0x1000).w(FUNC(bwing_state::bwp3_nmiack_w)); map(0x2000, 0x2000).w("ay1", FUNC(ay8912_device::data_w)); map(0x4000, 0x4000).w("ay1", FUNC(ay8912_device::address_w)); map(0x6000, 0x6000).w("ay2", FUNC(ay8912_device::data_w)); map(0x8000, 0x8000).w("ay2", FUNC(ay8912_device::address_w)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xd000, 0xd000).w(this, FUNC(bwing_state::bwp3_nmimask_w)); + map(0xd000, 0xd000).w(FUNC(bwing_state::bwp3_nmimask_w)); map(0xe000, 0xffff).rom().region("audiocpu", 0); } void bwing_state::bwp3_io_map(address_map &map) { - map(0x00, 0x00).portr("VBLANK").w(this, FUNC(bwing_state::bwp3_u8F_w)); + map(0x00, 0x00).portr("VBLANK").w(FUNC(bwing_state::bwp3_u8F_w)); } //**************************************************************************** diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp index ac1461338d9..a819e54c3c0 100644 --- a/src/mame/drivers/by17.cpp +++ b/src/mame/drivers/by17.cpp @@ -133,7 +133,7 @@ void by17_state::by17_map(address_map &map) map(0x0000, 0x007f).ram(); map(0x0088, 0x008b).rw(m_pia_u10, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0090, 0x0093).rw(m_pia_u11, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x0200, 0x02ff).ram().rw(this, FUNC(by17_state::nibble_nvram_r), FUNC(by17_state::nibble_nvram_w)).share("nvram"); + map(0x0200, 0x02ff).ram().rw(FUNC(by17_state::nibble_nvram_r), FUNC(by17_state::nibble_nvram_w)).share("nvram"); map(0x1000, 0x1fff).rom().region("roms", 0); } diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp index b5bd9c84363..e8496720cbc 100644 --- a/src/mame/drivers/by35.cpp +++ b/src/mame/drivers/by35.cpp @@ -247,7 +247,7 @@ void by35_state::by35_map(address_map &map) map(0x0000, 0x007f).ram(); map(0x0088, 0x008b).rw(m_pia_u10, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0090, 0x0093).rw(m_pia_u11, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x0200, 0x02ff).ram().rw(this, FUNC(by35_state::nibble_nvram_r), FUNC(by35_state::nibble_nvram_w)).share("nvram"); + map(0x0200, 0x02ff).ram().rw(FUNC(by35_state::nibble_nvram_r), FUNC(by35_state::nibble_nvram_w)).share("nvram"); map(0x1000, 0x7fff).rom(); // AM_REGION("roms", 0 ) } diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp index 54cb7a4fcb1..e1d4445edf5 100644 --- a/src/mame/drivers/by6803.cpp +++ b/src/mame/drivers/by6803.cpp @@ -103,8 +103,8 @@ void by6803_state::by6803_map(address_map &map) void by6803_state::by6803_io(address_map &map) { - map(M6801_PORT1, M6801_PORT1).rw(this, FUNC(by6803_state::port1_r), FUNC(by6803_state::port1_w)); // P10-P17 - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(by6803_state::port2_r), FUNC(by6803_state::port2_w)); // P20-P24 + map(M6801_PORT1, M6801_PORT1).rw(FUNC(by6803_state::port1_r), FUNC(by6803_state::port1_w)); // P10-P17 + map(M6801_PORT2, M6801_PORT2).rw(FUNC(by6803_state::port2_r), FUNC(by6803_state::port2_w)); // P20-P24 } static INPUT_PORTS_START( by6803 ) diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp index b668fbce13a..0043cfa403b 100644 --- a/src/mame/drivers/byvid.cpp +++ b/src/mame/drivers/byvid.cpp @@ -165,22 +165,22 @@ void by133_state::main_map(address_map &map) void by133_state::video_map(address_map &map) { // U8 Vidiot - map(0x0000, 0x1fff).rw(this, FUNC(by133_state::sound_data_r), FUNC(by133_state::sound_data_w)); + map(0x0000, 0x1fff).rw(FUNC(by133_state::sound_data_r), FUNC(by133_state::sound_data_w)); map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pia_u7, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // PIA U7 Vidiot - map(0x4000, 0x4000).mirror(0x0ffe).rw(m_crtc, FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x4001, 0x4001).mirror(0x0ffe).rw(m_crtc, FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); + map(0x4000, 0x4000).mirror(0x0ffe).rw(m_crtc, FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x4001, 0x4001).mirror(0x0ffe).rw(m_crtc, FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); map(0x6000, 0x63ff).mirror(0x1c00).ram(); map(0x8000, 0xffff).rom(); } void by133_state::granny_map(address_map &map) { - map(0x0000, 0x0001).rw(this, FUNC(by133_state::sound_data_r), FUNC(by133_state::sound_data_w)); - map(0x0002, 0x0002).rw(m_crtc, FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x0003, 0x0003).rw(m_crtc, FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0x0004, 0x0004).rw(m_crtc2, FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x0005, 0x0005).rw(m_crtc2, FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0x0006, 0x0007).w(this, FUNC(by133_state::granny_crtc_w)); // can write to both at once + map(0x0000, 0x0001).rw(FUNC(by133_state::sound_data_r), FUNC(by133_state::sound_data_w)); + map(0x0002, 0x0002).rw(m_crtc, FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x0003, 0x0003).rw(m_crtc, FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0x0004, 0x0004).rw(m_crtc2, FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x0005, 0x0005).rw(m_crtc2, FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0x0006, 0x0007).w(FUNC(by133_state::granny_crtc_w)); // can write to both at once map(0x0008, 0x000b).rw(m_pia_u7, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x2000, 0x27ff).ram(); map(0x2801, 0x2801).nopr(); // The '9' test reads this location constantly and throws away the result @@ -194,8 +194,8 @@ void by133_state::sound_map(address_map &map) void by133_state::sound_portmap(address_map &map) { - map(M6801_PORT1, M6801_PORT1).w("dac", FUNC(dac_byte_interface::write)); // P10-P17 - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(by133_state::m6803_port2_r), FUNC(by133_state::m6803_port2_w)); // P20-P24 sound command in + map(M6801_PORT1, M6801_PORT1).w("dac", FUNC(dac_byte_interface::data_w)); // P10-P17 + map(M6801_PORT2, M6801_PORT2).rw(FUNC(by133_state::m6803_port2_r), FUNC(by133_state::m6803_port2_w)); // P20-P24 sound command in } @@ -545,13 +545,13 @@ WRITE8_MEMBER( by133_state::granny_crtc_w ) { if (offset) { - m_crtc->register_write(space, 0, data); - m_crtc2->register_write(space, 0, data); + m_crtc->register_write(data); + m_crtc2->register_write(data); } else { - m_crtc->vram_write(space, 0, data); - m_crtc2->vram_write(space, 0, data); + m_crtc->vram_write(data); + m_crtc2->vram_write(data); } } diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp index 57109982e1f..dba73af808c 100644 --- a/src/mame/drivers/bzone.cpp +++ b/src/mame/drivers/bzone.cpp @@ -308,7 +308,7 @@ void bzone_state::bzone_map(address_map &map) map(0x0800, 0x0800).portr("IN0"); map(0x0a00, 0x0a00).portr("DSW0"); map(0x0c00, 0x0c00).portr("DSW1"); - map(0x1000, 0x1000).w(this, FUNC(bzone_state::bzone_coin_counter_w)); + map(0x1000, 0x1000).w(FUNC(bzone_state::bzone_coin_counter_w)); map(0x1200, 0x1200).w("avg", FUNC(avg_bzone_device::go_w)); map(0x1400, 0x1400).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x1600, 0x1600).w("avg", FUNC(avg_bzone_device::reset_w)); @@ -316,7 +316,7 @@ void bzone_state::bzone_map(address_map &map) map(0x1810, 0x1810).r(m_mathbox, FUNC(mathbox_device::lo_r)); map(0x1818, 0x1818).r(m_mathbox, FUNC(mathbox_device::hi_r)); map(0x1820, 0x182f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1840, 0x1840).w(this, FUNC(bzone_state::bzone_sounds_w)); + map(0x1840, 0x1840).w(FUNC(bzone_state::bzone_sounds_w)); map(0x1860, 0x187f).w(m_mathbox, FUNC(mathbox_device::go_w)); map(0x2000, 0x2fff).ram().share("vectorram").region("maincpu", 0x2000); map(0x3000, 0x7fff).rom(); @@ -337,7 +337,7 @@ void redbaron_state::redbaron_map(address_map &map) map(0x1802, 0x1802).portr("IN4"); map(0x1804, 0x1804).r("mathbox", FUNC(mathbox_device::lo_r)); map(0x1806, 0x1806).r("mathbox", FUNC(mathbox_device::hi_r)); - map(0x1808, 0x1808).w(this, FUNC(redbaron_state::redbaron_joysound_w)); /* and select joystick pot also */ + map(0x1808, 0x1808).w(FUNC(redbaron_state::redbaron_joysound_w)); /* and select joystick pot also */ map(0x180a, 0x180a).nopw(); /* sound reset, yet todo */ map(0x180c, 0x180c).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x1810, 0x181f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp index 7d8b5007f7d..77bc5684258 100644 --- a/src/mame/drivers/c128.cpp +++ b/src/mame/drivers/c128.cpp @@ -672,7 +672,7 @@ READ8_MEMBER( c128_state::vic_colorram_r ) void c128_state::z80_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(c128_state::z80_r), FUNC(c128_state::z80_w)); + map(0x0000, 0xffff).rw(FUNC(c128_state::z80_r), FUNC(c128_state::z80_w)); } @@ -682,7 +682,7 @@ void c128_state::z80_mem(address_map &map) void c128_state::z80_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(c128_state::z80_io_r), FUNC(c128_state::z80_io_w)); + map(0x0000, 0xffff).rw(FUNC(c128_state::z80_io_r), FUNC(c128_state::z80_io_w)); } @@ -692,7 +692,7 @@ void c128_state::z80_io(address_map &map) void c128_state::m8502_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(c128_state::read), FUNC(c128_state::write)); + map(0x0000, 0xffff).rw(FUNC(c128_state::read), FUNC(c128_state::write)); } @@ -702,7 +702,7 @@ void c128_state::m8502_mem(address_map &map) void c128_state::vic_videoram_map(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(c128_state::vic_videoram_r)); + map(0x0000, 0x3fff).r(FUNC(c128_state::vic_videoram_r)); } @@ -712,7 +712,7 @@ void c128_state::vic_videoram_map(address_map &map) void c128_state::vic_colorram_map(address_map &map) { - map(0x000, 0x3ff).r(this, FUNC(c128_state::vic_colorram_r)); + map(0x000, 0x3ff).r(FUNC(c128_state::vic_colorram_r)); } diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp index a66c31f3b63..d9a7ae916d7 100644 --- a/src/mame/drivers/c64.cpp +++ b/src/mame/drivers/c64.cpp @@ -538,7 +538,7 @@ READ8_MEMBER( c64_state::vic_colorram_r ) void c64_state::c64_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(c64_state::read), FUNC(c64_state::write)); + map(0x0000, 0xffff).rw(FUNC(c64_state::read), FUNC(c64_state::write)); } @@ -548,7 +548,7 @@ void c64_state::c64_mem(address_map &map) void c64_state::vic_videoram_map(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(c64_state::vic_videoram_r)); + map(0x0000, 0x3fff).r(FUNC(c64_state::vic_videoram_r)); } @@ -558,7 +558,7 @@ void c64_state::vic_videoram_map(address_map &map) void c64_state::vic_colorram_map(address_map &map) { - map(0x000, 0x3ff).r(this, FUNC(c64_state::vic_colorram_r)); + map(0x000, 0x3ff).r(FUNC(c64_state::vic_colorram_r)); } diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp index 2dd36e5600f..f7024b19ccb 100644 --- a/src/mame/drivers/c65.cpp +++ b/src/mame/drivers/c65.cpp @@ -488,19 +488,19 @@ void c65_state::c65_map(address_map &map) { map(0x00000, 0x07fff).ram().share("wram"); // TODO: bank map(0x0c800, 0x0cfff).rom().region("maincpu", 0xc800); - map(0x0d000, 0x0d07f).rw(this, FUNC(c65_state::vic4567_dummy_r), FUNC(c65_state::vic4567_dummy_w)); // 0x0d000, 0x0d07f VIC-4567 - map(0x0d080, 0x0d081).r(this, FUNC(c65_state::dummy_r)); // 0x0d080, 0x0d09f FDC + map(0x0d000, 0x0d07f).rw(FUNC(c65_state::vic4567_dummy_r), FUNC(c65_state::vic4567_dummy_w)); // 0x0d000, 0x0d07f VIC-4567 + map(0x0d080, 0x0d081).r(FUNC(c65_state::dummy_r)); // 0x0d080, 0x0d09f FDC // 0x0d0a0, 0x0d0ff Ram Expansion Control (REC) - map(0x0d100, 0x0d1ff).ram().w(this, FUNC(c65_state::PalRed_w)).share("redpal");// 0x0d100, 0x0d1ff Red Palette - map(0x0d200, 0x0d2ff).ram().w(this, FUNC(c65_state::PalGreen_w)).share("greenpal"); // 0x0d200, 0x0d2ff Green Palette - map(0x0d300, 0x0d3ff).ram().w(this, FUNC(c65_state::PalBlue_w)).share("bluepal"); // 0x0d300, 0x0d3ff Blue Palette + map(0x0d100, 0x0d1ff).ram().w(FUNC(c65_state::PalRed_w)).share("redpal");// 0x0d100, 0x0d1ff Red Palette + map(0x0d200, 0x0d2ff).ram().w(FUNC(c65_state::PalGreen_w)).share("greenpal"); // 0x0d200, 0x0d2ff Green Palette + map(0x0d300, 0x0d3ff).ram().w(FUNC(c65_state::PalBlue_w)).share("bluepal"); // 0x0d300, 0x0d3ff Blue Palette // 0x0d400, 0x0d4*f Right SID // 0x0d440, 0x0d4*f Left SID - map(0x0d600, 0x0d6ff).rw(this, FUNC(c65_state::uart_r), FUNC(c65_state::uart_w)); - map(0x0d700, 0x0d702).w(this, FUNC(c65_state::DMAgic_w)).share("dmalist"); // 0x0d700, 0x0d7** DMAgic + map(0x0d600, 0x0d6ff).rw(FUNC(c65_state::uart_r), FUNC(c65_state::uart_w)); + map(0x0d700, 0x0d702).w(FUNC(c65_state::DMAgic_w)).share("dmalist"); // 0x0d700, 0x0d7** DMAgic //AM_RANGE(0x0d703, 0x0d703) AM_READ(DMAgic_r) // 0x0d800, 0x0d8** Color matrix - map(0x0d800, 0x0dfff).rw(this, FUNC(c65_state::CIASelect_r), FUNC(c65_state::CIASelect_w)).share("cram"); + map(0x0d800, 0x0dfff).rw(FUNC(c65_state::CIASelect_r), FUNC(c65_state::CIASelect_w)).share("cram"); // 0x0dc00, 0x0dc** CIA-1 // 0x0dd00, 0x0dd** CIA-2 // 0x0de00, 0x0de** Ext I/O Select 1 diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp index d877940503e..3fdc267ae98 100644 --- a/src/mame/drivers/c900.cpp +++ b/src/mame/drivers/c900.cpp @@ -71,8 +71,8 @@ void c900_state::io_map(address_map &map) { map(0x0000, 0x007f).rw("cio", FUNC(z8036_device::read), FUNC(z8036_device::write)).umask16(0x00ff); //AM_RANGE(0x0100, 0x011f) AM_DEVREADWRITE8("scc", scc8030_device, zbus_r, zbus_w, 0x00ff) // range for one channel - map(0x0100, 0x0101).r(this, FUNC(c900_state::stat_r)); - map(0x0110, 0x0111).r(this, FUNC(c900_state::key_r)); + map(0x0100, 0x0101).r(FUNC(c900_state::stat_r)); + map(0x0110, 0x0111).r(FUNC(c900_state::key_r)); map(0x0111, 0x0111).w(m_terminal, FUNC(generic_terminal_device::write)); } diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 2f7397ea6da..063d249a76a 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -108,17 +108,17 @@ void cabal_state::main_map(address_map &map) map(0x40000, 0x437ff).ram(); map(0x43800, 0x43fff).ram().share("spriteram"); map(0x44000, 0x4ffff).ram(); - map(0x60000, 0x607ff).ram().w(this, FUNC(cabal_state::text_videoram_w)).share("colorram"); - map(0x80000, 0x801ff).ram().w(this, FUNC(cabal_state::background_videoram_w)).share("videoram"); + map(0x60000, 0x607ff).ram().w(FUNC(cabal_state::text_videoram_w)).share("colorram"); + map(0x80000, 0x801ff).ram().w(FUNC(cabal_state::background_videoram_w)).share("videoram"); map(0x80200, 0x803ff).ram(); map(0xa0000, 0xa0001).portr("DSW"); map(0xa0008, 0xa0009).portr("IN2"); map(0xa0010, 0xa0011).portr("INPUTS"); map(0xc0040, 0xc0041).nopw(); /* ??? */ - map(0xc0080, 0xc0081).w(this, FUNC(cabal_state::flipscreen_w)); + map(0xc0080, 0xc0081).w(FUNC(cabal_state::flipscreen_w)); map(0xe0000, 0xe07ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xe8000, 0xe800d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); - map(0xe8008, 0xe8009).w(this, FUNC(cabal_state::sound_irq_trigger_word_w)); // fix coin insertion + map(0xe8008, 0xe8009).w(FUNC(cabal_state::sound_irq_trigger_word_w)); // fix coin insertion } @@ -128,8 +128,8 @@ void cabal_state::trackball_main_map(address_map &map) main_map(map); map(0xa0008, 0xa000f).r("upd4701l", FUNC(upd4701_device::read_xy)).umask16(0x00ff); map(0xa0008, 0xa000f).r("upd4701h", FUNC(upd4701_device::read_xy)).umask16(0xff00); - map(0xc0001, 0xc0001).w("upd4701l", FUNC(upd4701_device::reset_xy)); - map(0xc0000, 0xc0000).w("upd4701h", FUNC(upd4701_device::reset_xy)); + map(0xc0001, 0xc0001).w("upd4701l", FUNC(upd4701_device::reset_xy_w)); + map(0xc0000, 0xc0000).w("upd4701h", FUNC(upd4701_device::reset_xy_w)); } @@ -140,18 +140,18 @@ void cabal_state::cabalbl_main_map(address_map &map) map(0x40000, 0x437ff).ram(); map(0x43800, 0x43fff).ram().share("spriteram"); map(0x44000, 0x4ffff).ram(); - map(0x60000, 0x607ff).ram().w(this, FUNC(cabal_state::text_videoram_w)).share("colorram"); - map(0x80000, 0x801ff).ram().w(this, FUNC(cabal_state::background_videoram_w)).share("videoram"); + map(0x60000, 0x607ff).ram().w(FUNC(cabal_state::text_videoram_w)).share("colorram"); + map(0x80000, 0x801ff).ram().w(FUNC(cabal_state::background_videoram_w)).share("videoram"); map(0x80200, 0x803ff).ram(); map(0xa0000, 0xa0001).portr("DSW"); map(0xa0008, 0xa0009).portr("JOY"); map(0xa0010, 0xa0011).portr("INPUTS"); map(0xc0040, 0xc0041).nopw(); /* ??? */ - map(0xc0080, 0xc0081).w(this, FUNC(cabal_state::flipscreen_w)); + map(0xc0080, 0xc0081).w(FUNC(cabal_state::flipscreen_w)); map(0xe0000, 0xe07ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xe8000, 0xe8003).w(this, FUNC(cabal_state::cabalbl_sndcmd_w)); + map(0xe8000, 0xe8003).w(FUNC(cabal_state::cabalbl_sndcmd_w)); map(0xe8005, 0xe8005).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0xe8008, 0xe8009).w(this, FUNC(cabal_state::cabalbl_sound_irq_trigger_word_w)); + map(0xe8008, 0xe8009).w(FUNC(cabal_state::cabalbl_sound_irq_trigger_word_w)); } /*********************************************************************/ @@ -207,10 +207,10 @@ void cabal_state::cabalbl_sound_map(address_map &map) map(0x2000, 0x2fff).ram(); map(0x4000, 0x4000).w("soundlatch2", FUNC(generic_latch_8_device::write)); map(0x4002, 0x4002).w("soundlatch3", FUNC(generic_latch_8_device::write)); - map(0x4004, 0x4004).w(this, FUNC(cabal_state::cabalbl_coin_w)); + map(0x4004, 0x4004).w(FUNC(cabal_state::cabalbl_coin_w)); map(0x4006, 0x4006).portr("COIN"); - map(0x4008, 0x4008).r(this, FUNC(cabal_state::cabalbl_snd2_r)); - map(0x400a, 0x400a).r(this, FUNC(cabal_state::cabalbl_snd1_r)); + map(0x4008, 0x4008).r(FUNC(cabal_state::cabalbl_snd2_r)); + map(0x400a, 0x400a).r(FUNC(cabal_state::cabalbl_snd1_r)); map(0x400c, 0x400c).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x400e, 0x400f).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x6000, 0x6000).nopw(); /* ??? */ @@ -270,7 +270,7 @@ void cabal_state::cabalbl_talk1_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch2", FUNC(generic_latch_8_device::read)); - map(0x01, 0x01).w(this, FUNC(cabal_state::cabalbl_1_adpcm_w)); + map(0x01, 0x01).w(FUNC(cabal_state::cabalbl_1_adpcm_w)); } void cabal_state::cabalbl_talk2_map(address_map &map) @@ -282,7 +282,7 @@ void cabal_state::cabalbl_talk2_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch3", FUNC(generic_latch_8_device::read)); - map(0x01, 0x01).w(this, FUNC(cabal_state::cabalbl_2_adpcm_w)); + map(0x01, 0x01).w(FUNC(cabal_state::cabalbl_2_adpcm_w)); } /***************************************************************************/ diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp index ab45d2e3abe..b50792c15f4 100644 --- a/src/mame/drivers/cabaret.cpp +++ b/src/mame/drivers/cabaret.cpp @@ -214,15 +214,15 @@ void cabaret_state::cabaret_portmap(address_map &map) map(0x00e0, 0x00e1).w("ymsnd", FUNC(ym2413_device::write)); - map(0x2000, 0x27ff).ram().w(this, FUNC(cabaret_state::fg_tile_w)).share("fg_tile_ram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(cabaret_state::fg_color_w)).share("fg_color_ram"); + map(0x2000, 0x27ff).ram().w(FUNC(cabaret_state::fg_tile_w)).share("fg_tile_ram"); + map(0x2800, 0x2fff).ram().w(FUNC(cabaret_state::fg_color_w)).share("fg_color_ram"); map(0x3000, 0x37ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x3800, 0x3fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0x1000, 0x103f).ram().w(this, FUNC(cabaret_state::bg_scroll_w)).share("bg_scroll"); + map(0x1000, 0x103f).ram().w(FUNC(cabaret_state::bg_scroll_w)).share("bg_scroll"); - map(0x1800, 0x19ff).ram().w(this, FUNC(cabaret_state::bg_tile_w)).share("bg_tile_ram"); + map(0x1800, 0x19ff).ram().w(FUNC(cabaret_state::bg_tile_w)).share("bg_tile_ram"); map(0x8000, 0xffff).rom().region("gfx3", 0); } diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp index 89a4b64fdbb..7ebf8c49ff9 100644 --- a/src/mame/drivers/calchase.cpp +++ b/src/mame/drivers/calchase.cpp @@ -394,19 +394,19 @@ void calchase_state::calchase_map(address_map &map) map(0x000c0000, 0x000c7fff).ram().region("video_bios", 0); map(0x000c8000, 0x000cffff).noprw(); //map(0x000d0000, 0x000d0003).ram(); // XYLINX - Sincronus serial communication - map(0x000d0004, 0x000d0005).r(this, FUNC(calchase_state::calchase_iocard1_r)); - map(0x000d000c, 0x000d000d).r(this, FUNC(calchase_state::calchase_iocard2_r)); - map(0x000d0032, 0x000d0033).r(this, FUNC(calchase_state::calchase_iocard3_r)); - map(0x000d0030, 0x000d0031).r(this, FUNC(calchase_state::calchase_iocard4_r)); - map(0x000d0034, 0x000d0035).r(this, FUNC(calchase_state::calchase_iocard5_r)); + map(0x000d0004, 0x000d0005).r(FUNC(calchase_state::calchase_iocard1_r)); + map(0x000d000c, 0x000d000d).r(FUNC(calchase_state::calchase_iocard2_r)); + map(0x000d0032, 0x000d0033).r(FUNC(calchase_state::calchase_iocard3_r)); + map(0x000d0030, 0x000d0031).r(FUNC(calchase_state::calchase_iocard4_r)); + map(0x000d0034, 0x000d0035).r(FUNC(calchase_state::calchase_iocard5_r)); map(0x000d0008, 0x000d000b).nopw(); // ??? - map(0x000d0024, 0x000d0025).w("ldac", FUNC(dac_word_interface::write)); - map(0x000d0028, 0x000d0029).w("rdac", FUNC(dac_word_interface::write)); + map(0x000d0024, 0x000d0025).w("ldac", FUNC(dac_word_interface::data_w)); + map(0x000d0028, 0x000d0029).w("rdac", FUNC(dac_word_interface::data_w)); map(0x000d0800, 0x000d0fff).rom().region("nvram", 0); // // map(0x000d0800, 0x000d0fff).ram(); // GAME_CMOS - map(0x000e0000, 0x000effff).bankr("bios_ext").w(this, FUNC(calchase_state::bios_ext_ram_w)); - map(0x000f0000, 0x000fffff).bankr("bios_bank").w(this, FUNC(calchase_state::bios_ram_w)); + map(0x000e0000, 0x000effff).bankr("bios_ext").w(FUNC(calchase_state::bios_ext_ram_w)); + map(0x000f0000, 0x000fffff).bankr("bios_bank").w(FUNC(calchase_state::bios_ram_w)); map(0x00100000, 0x03ffffff).ram(); // 64MB map(0x04000000, 0x28ffffff).noprw(); //map(0x04000000, 0x040001ff).ram(); @@ -426,7 +426,7 @@ void calchase_state::calchase_io(address_map &map) //map(0x00e8, 0x00eb).noprw(); map(0x00e8, 0x00ef).noprw(); //AMI BIOS write to this ports as delays between I/O ports operations sending al value -> NEWIODELAY map(0x0170, 0x0177).noprw(); //To debug - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); map(0x0200, 0x021f).noprw(); //To debug map(0x0260, 0x026f).noprw(); //To debug map(0x0278, 0x027b).nopw();//AM_WRITE(pnp_config_w) @@ -444,7 +444,7 @@ void calchase_state::calchase_io(address_map &map) map(0x0378, 0x037f).noprw(); //To debug // map(0x0300, 0x03af).noprw(); // map(0x03b0, 0x03df).noprw(); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); map(0x03f8, 0x03ff).noprw(); // To debug Serial Port COM1: map(0x0a78, 0x0a7b).nopw();//AM_WRITE(pnp_data_w) map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); diff --git a/src/mame/drivers/calcune.cpp b/src/mame/drivers/calcune.cpp index c579a757c9d..9cc3d7aeff4 100644 --- a/src/mame/drivers/calcune.cpp +++ b/src/mame/drivers/calcune.cpp @@ -127,18 +127,18 @@ void calcune_state::calcune_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0x700000, 0x700001).r(this, FUNC(calcune_state::cal_700000_r)); + map(0x700000, 0x700001).r(FUNC(calcune_state::cal_700000_r)); map(0x710000, 0x710001).portr("710000"); map(0x720000, 0x720001).portr("720000"); // AM_RANGE(0x730000, 0x730001) possible Z80 control? map(0x760000, 0x760003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0xff00); - map(0x770000, 0x770001).w(this, FUNC(calcune_state::cal_770000_w)); + map(0x770000, 0x770001).w(FUNC(calcune_state::cal_770000_w)); map(0xA14100, 0xA14101).noprw(); // on startup, possible z80 control - map(0xc00000, 0xc0001f).rw(this, FUNC(calcune_state::cal_vdp_r), FUNC(calcune_state::cal_vdp_w)); + map(0xc00000, 0xc0001f).rw(FUNC(calcune_state::cal_vdp_r), FUNC(calcune_state::cal_vdp_w)); map(0xff0000, 0xffffff).ram().share("nvram"); // battery on PCB } diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp index 25bd5aa7a7c..b6f2181ac7a 100644 --- a/src/mame/drivers/calomega.cpp +++ b/src/mame/drivers/calomega.cpp @@ -832,8 +832,8 @@ void calomega_state::sys903_map(address_map &map) map(0x08c4, 0x08c7).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x08c8, 0x08cb).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x08d0, 0x08d1).rw(m_acia6850_0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(calomega_state::calomega_videoram_w)).share("videoram"); - map(0x1400, 0x17ff).ram().w(this, FUNC(calomega_state::calomega_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(calomega_state::calomega_videoram_w)).share("videoram"); + map(0x1400, 0x17ff).ram().w(FUNC(calomega_state::calomega_colorram_w)).share("colorram"); map(0x1800, 0x3fff).rom(); } @@ -846,8 +846,8 @@ void calomega_state::s903mod_map(address_map &map) map(0x0881, 0x0881).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x08c4, 0x08c7).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x08c8, 0x08cb).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(calomega_state::calomega_videoram_w)).share("videoram"); - map(0x1400, 0x17ff).ram().w(this, FUNC(calomega_state::calomega_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(calomega_state::calomega_videoram_w)).share("videoram"); + map(0x1400, 0x17ff).ram().w(FUNC(calomega_state::calomega_colorram_w)).share("colorram"); map(0x1800, 0x3fff).rom(); } @@ -860,8 +860,8 @@ void calomega_state::sys905_map(address_map &map) map(0x1081, 0x1081).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x10c4, 0x10c7).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x10c8, 0x10cb).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x2000, 0x23ff).ram().w(this, FUNC(calomega_state::calomega_videoram_w)).share("videoram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(calomega_state::calomega_colorram_w)).share("colorram"); + map(0x2000, 0x23ff).ram().w(FUNC(calomega_state::calomega_videoram_w)).share("videoram"); + map(0x2400, 0x27ff).ram().w(FUNC(calomega_state::calomega_colorram_w)).share("colorram"); map(0x2800, 0x7fff).rom(); } @@ -873,8 +873,8 @@ void calomega_state::sys906_map(address_map &map) map(0x2c04, 0x2c04).w("crtc", FUNC(mc6845_device::address_w)); map(0x2c05, 0x2c05).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x2c08, 0x2c09).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); - map(0x2000, 0x23ff).ram().w(this, FUNC(calomega_state::calomega_videoram_w)).share("videoram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(calomega_state::calomega_colorram_w)).share("colorram"); + map(0x2000, 0x23ff).ram().w(FUNC(calomega_state::calomega_videoram_w)).share("videoram"); + map(0x2400, 0x27ff).ram().w(FUNC(calomega_state::calomega_colorram_w)).share("colorram"); map(0x6000, 0xffff).rom(); } diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp index 685f4e4f8e5..019d4cec9ab 100644 --- a/src/mame/drivers/calorie.cpp +++ b/src/mame/drivers/calorie.cpp @@ -269,14 +269,14 @@ void calorie_state::calorie_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).rom(); map(0xc000, 0xcfff).ram().share("ram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(calorie_state::fg_ram_w)).share("fg_ram"); + map(0xd000, 0xd7ff).ram().w(FUNC(calorie_state::fg_ram_w)).share("fg_ram"); map(0xd800, 0xdbff).ram().share("sprites"); map(0xdc00, 0xdcff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xde00, 0xde00).w(this, FUNC(calorie_state::bg_bank_w)); + map(0xde00, 0xde00).w(FUNC(calorie_state::bg_bank_w)); map(0xf000, 0xf000).portr("P1"); map(0xf001, 0xf001).portr("P2"); map(0xf002, 0xf002).portr("SYSTEM"); - map(0xf004, 0xf004).portr("DSW1").w(this, FUNC(calorie_state::calorie_flipscreen_w)); + map(0xf004, 0xf004).portr("DSW1").w(FUNC(calorie_state::calorie_flipscreen_w)); map(0xf005, 0xf005).portr("DSW2"); map(0xf800, 0xf800).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -292,14 +292,14 @@ void calorie_state::calorie_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xc000, 0xc000).r(this, FUNC(calorie_state::calorie_soundlatch_r)); + map(0xc000, 0xc000).r(FUNC(calorie_state::calorie_soundlatch_r)); } void calorie_state::calorie_sound_io_map(address_map &map) { map.global_mask(0xff); // 3rd ? - map(0x00, 0xff).w(this, FUNC(calorie_state::bogus_w)); + map(0x00, 0xff).w(FUNC(calorie_state::bogus_w)); map(0x00, 0x01).w("ay1", FUNC(ym2149_device::address_data_w)); map(0x01, 0x01).r("ay1", FUNC(ym2149_device::data_r)); diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index 51220fa2d8a..eb4133c01aa 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -469,7 +469,7 @@ void camplynx_state::lynx48k_mem(address_map &map) map(0xa000, 0xbfff).bankr("bankr6"); map(0xc000, 0xdfff).bankr("bankr7"); map(0xe000, 0xffff).bankr("bankr8"); - map(0x0000, 0xffff).w(this, FUNC(camplynx_state::bank6_w)); + map(0x0000, 0xffff).w(FUNC(camplynx_state::bank6_w)); } void camplynx_state::lynx128k_mem(address_map &map) @@ -483,15 +483,15 @@ void camplynx_state::lynx128k_mem(address_map &map) map(0xa000, 0xbfff).bankr("bankr6"); map(0xc000, 0xdfff).bankr("bankr7"); map(0xe000, 0xffff).bankr("bankr8"); - map(0x0000, 0xffff).w(this, FUNC(camplynx_state::bank1_w)); + map(0x0000, 0xffff).w(FUNC(camplynx_state::bank1_w)); } void camplynx_state::lynx48k_io(address_map &map) { map.unmap_value_high(); - map(0x007f, 0x007f).mirror(0xff80).w(this, FUNC(camplynx_state::port7f_w)); - map(0x0080, 0x0080).mirror(0xff00).w(this, FUNC(camplynx_state::port80_w)); - map(0x0080, 0x0080).mirror(0xf000).r(this, FUNC(camplynx_state::port80_r)); + map(0x007f, 0x007f).mirror(0xff80).w(FUNC(camplynx_state::port7f_w)); + map(0x0080, 0x0080).mirror(0xff00).w(FUNC(camplynx_state::port80_w)); + map(0x0080, 0x0080).mirror(0xf000).r(FUNC(camplynx_state::port80_r)); map(0x0180, 0x0180).mirror(0xf000).portr("LINE1"); map(0x0280, 0x0280).mirror(0xf000).portr("LINE2"); map(0x0380, 0x0380).mirror(0xf000).portr("LINE3"); @@ -501,7 +501,7 @@ void camplynx_state::lynx48k_io(address_map &map) map(0x0780, 0x0780).mirror(0xf000).portr("LINE7"); map(0x0880, 0x0880).mirror(0xf000).portr("LINE8"); map(0x0980, 0x0980).mirror(0xf000).portr("LINE9"); - map(0x0084, 0x0084).mirror(0xff00).w(this, FUNC(camplynx_state::port84_w)); + map(0x0084, 0x0084).mirror(0xff00).w(FUNC(camplynx_state::port84_w)); map(0x0086, 0x0086).mirror(0xff00).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x0087, 0x0087).mirror(0xff00).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } @@ -511,7 +511,7 @@ void camplynx_state::lynx96k_io(address_map &map) lynx48k_io(map); map(0x0050, 0x0053).mirror(0xff80).r("fdc", FUNC(fd1793_device::read)); map(0x0054, 0x0057).mirror(0xff80).w("fdc", FUNC(fd1793_device::write)); - map(0x0058, 0x0058).mirror(0xff80).w(this, FUNC(camplynx_state::port58_w)); + map(0x0058, 0x0058).mirror(0xff80).w(FUNC(camplynx_state::port58_w)); } void camplynx_state::lynx128k_io(address_map &map) @@ -519,12 +519,12 @@ void camplynx_state::lynx128k_io(address_map &map) map.unmap_value_high(); map(0x0050, 0x0053).mirror(0xff80).r("fdc", FUNC(fd1793_device::read)); map(0x0054, 0x0057).mirror(0xff80).w("fdc", FUNC(fd1793_device::write)); - map(0x0058, 0x0058).mirror(0xff80).w(this, FUNC(camplynx_state::port58_w)); + map(0x0058, 0x0058).mirror(0xff80).w(FUNC(camplynx_state::port58_w)); // AM_RANGE(0x007a,0x007b) AM_MIRROR(0xff80) AM_READ(lynx128k_joysticks_r) // AM_RANGE(0x007c,0x007c) AM_MIRROR(0xff80) AM_READ(lynx128k_printer_r) // AM_RANGE(0x007d,0x007d) AM_MIRROR(0xff80) AM_WRITE(lynx128k_printer_init_w) // this is rw // AM_RANGE(0x007e,0x007e) AM_MIRROR(0xff80) AM_WRITE(lynx128k_printer_w) - map(0x0080, 0x0080).mirror(0xff00).w(this, FUNC(camplynx_state::port80_w)); + map(0x0080, 0x0080).mirror(0xff00).w(FUNC(camplynx_state::port80_w)); map(0x0080, 0x0080).mirror(0xf000).portr("LINE0"); map(0x0180, 0x0180).mirror(0xf000).portr("LINE1"); map(0x0280, 0x0280).mirror(0xf000).portr("LINE2"); @@ -535,8 +535,8 @@ void camplynx_state::lynx128k_io(address_map &map) map(0x0780, 0x0780).mirror(0xf000).portr("LINE7"); map(0x0880, 0x0880).mirror(0xf000).portr("LINE8"); map(0x0980, 0x0980).mirror(0xf000).portr("LINE9"); - map(0x0082, 0x0082).mirror(0xff00).rw(this, FUNC(camplynx_state::port82_r), FUNC(camplynx_state::port82_w)); // read=serial buffer - map(0x0084, 0x0084).mirror(0xff00).w(this, FUNC(camplynx_state::port84_w)); + map(0x0082, 0x0082).mirror(0xff00).rw(FUNC(camplynx_state::port82_r), FUNC(camplynx_state::port82_w)); // read=serial buffer + map(0x0084, 0x0084).mirror(0xff00).w(FUNC(camplynx_state::port84_w)); map(0x0086, 0x0086).mirror(0xff00).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x0087, 0x0087).mirror(0xff00).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp index ca368f3eead..d659b7027df 100644 --- a/src/mame/drivers/candela.cpp +++ b/src/mame/drivers/candela.cpp @@ -474,7 +474,7 @@ WRITE_LINE_MEMBER (can09t_state::write_acia_clock){ void can09t_state::can09t_map(address_map &map) { // Everything is dynamically and asymetrically mapped through the PAL decoded by read/write - map(0x0000, 0xffff).rw(this, FUNC(can09t_state::read), FUNC(can09t_state::write)); + map(0x0000, 0xffff).rw(FUNC(can09t_state::read), FUNC(can09t_state::write)); } static INPUT_PORTS_START( can09t ) diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp index f47da9a86a5..8ff0684a889 100644 --- a/src/mame/drivers/canyon.cpp +++ b/src/mame/drivers/canyon.cpp @@ -114,13 +114,13 @@ void canyon_state::main_map(address_map &map) { map.global_mask(0x3fff); map(0x0000, 0x00ff).mirror(0x100).ram(); - map(0x0400, 0x0401).w(this, FUNC(canyon_state::canyon_motor_w)); - map(0x0500, 0x0500).w(this, FUNC(canyon_state::canyon_explode_w)); + map(0x0400, 0x0401).w(FUNC(canyon_state::canyon_motor_w)); + map(0x0500, 0x0500).w(FUNC(canyon_state::canyon_explode_w)); map(0x0501, 0x0501).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); /* watchdog, disabled in service mode */ - map(0x0600, 0x0603).select(0x0180).w(this, FUNC(canyon_state::output_latch_w)); - map(0x0800, 0x0bff).ram().w(this, FUNC(canyon_state::canyon_videoram_w)).share("videoram"); - map(0x1000, 0x17ff).r(this, FUNC(canyon_state::canyon_switches_r)).nopw(); /* sloppy code writes here */ - map(0x1800, 0x1fff).r(this, FUNC(canyon_state::canyon_options_r)); + map(0x0600, 0x0603).select(0x0180).w(FUNC(canyon_state::output_latch_w)); + map(0x0800, 0x0bff).ram().w(FUNC(canyon_state::canyon_videoram_w)).share("videoram"); + map(0x1000, 0x17ff).r(FUNC(canyon_state::canyon_switches_r)).nopw(); /* sloppy code writes here */ + map(0x1800, 0x1fff).r(FUNC(canyon_state::canyon_options_r)); map(0x2000, 0x3fff).rom(); } diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp index c062a90e76c..ff5ae422f27 100644 --- a/src/mame/drivers/capbowl.cpp +++ b/src/mame/drivers/capbowl.cpp @@ -212,27 +212,27 @@ void capbowl_state::capbowl_map(address_map &map) { map(0x0000, 0x3fff).bankr("bank1"); map(0x4000, 0x4000).writeonly().share("rowaddress"); - map(0x4800, 0x4800).w(this, FUNC(capbowl_state::capbowl_rom_select_w)); + map(0x4800, 0x4800).w(FUNC(capbowl_state::capbowl_rom_select_w)); map(0x5000, 0x57ff).ram().share("nvram"); - map(0x5800, 0x5fff).rw(this, FUNC(capbowl_state::tms34061_r), FUNC(capbowl_state::tms34061_w)); - map(0x6000, 0x6000).w(this, FUNC(capbowl_state::sndcmd_w)); - map(0x6800, 0x6800).w(this, FUNC(capbowl_state::track_reset_w)).nopr(); /* + watchdog */ - map(0x7000, 0x7000).r(this, FUNC(capbowl_state::track_0_r)); /* + other inputs */ - map(0x7800, 0x7800).r(this, FUNC(capbowl_state::track_1_r)); /* + other inputs */ + map(0x5800, 0x5fff).rw(FUNC(capbowl_state::tms34061_r), FUNC(capbowl_state::tms34061_w)); + map(0x6000, 0x6000).w(FUNC(capbowl_state::sndcmd_w)); + map(0x6800, 0x6800).w(FUNC(capbowl_state::track_reset_w)).nopr(); /* + watchdog */ + map(0x7000, 0x7000).r(FUNC(capbowl_state::track_0_r)); /* + other inputs */ + map(0x7800, 0x7800).r(FUNC(capbowl_state::track_1_r)); /* + other inputs */ map(0x8000, 0xffff).rom(); } void capbowl_state::bowlrama_map(address_map &map) { - map(0x0000, 0x001f).rw(this, FUNC(capbowl_state::bowlrama_blitter_r), FUNC(capbowl_state::bowlrama_blitter_w)); + map(0x0000, 0x001f).rw(FUNC(capbowl_state::bowlrama_blitter_r), FUNC(capbowl_state::bowlrama_blitter_w)); map(0x4000, 0x4000).writeonly().share("rowaddress"); map(0x5000, 0x57ff).ram().share("nvram"); - map(0x5800, 0x5fff).rw(this, FUNC(capbowl_state::tms34061_r), FUNC(capbowl_state::tms34061_w)); - map(0x6000, 0x6000).w(this, FUNC(capbowl_state::sndcmd_w)); - map(0x6800, 0x6800).w(this, FUNC(capbowl_state::track_reset_w)).nopr(); /* + watchdog */ - map(0x7000, 0x7000).r(this, FUNC(capbowl_state::track_0_r)); /* + other inputs */ - map(0x7800, 0x7800).r(this, FUNC(capbowl_state::track_1_r)); /* + other inputs */ + map(0x5800, 0x5fff).rw(FUNC(capbowl_state::tms34061_r), FUNC(capbowl_state::tms34061_w)); + map(0x6000, 0x6000).w(FUNC(capbowl_state::sndcmd_w)); + map(0x6800, 0x6800).w(FUNC(capbowl_state::track_reset_w)).nopr(); /* + watchdog */ + map(0x7000, 0x7000).r(FUNC(capbowl_state::track_0_r)); /* + other inputs */ + map(0x7800, 0x7800).r(FUNC(capbowl_state::track_1_r)); /* + other inputs */ map(0x8000, 0xffff).rom(); } @@ -249,7 +249,7 @@ void capbowl_state::sound_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x1000, 0x1001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0x2000, 0x2000).nopw(); /* watchdog */ - map(0x6000, 0x6000).w("dac", FUNC(dac_byte_interface::write)); + map(0x6000, 0x6000).w("dac", FUNC(dac_byte_interface::data_w)); map(0x7000, 0x7000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp index 470d688fa88..35fb45c34ef 100644 --- a/src/mame/drivers/cardline.cpp +++ b/src/mame/drivers/cardline.cpp @@ -228,18 +228,18 @@ void cardline_state::mem_io(address_map &map) map(0x2003, 0x2003).portr("IN0"); map(0x2005, 0x2005).portr("IN1"); map(0x2006, 0x2006).portr("DSW"); - map(0x2007, 0x2007).w(this, FUNC(cardline_state::lamps_w)); + map(0x2007, 0x2007).w(FUNC(cardline_state::lamps_w)); map(0x2008, 0x2008).noprw(); // set to 1 during coin input //AM_RANGE(0x2080, 0x213f) AM_NOP // ???? - map(0x2100, 0x213f).rw(this, FUNC(cardline_state::asic_r), FUNC(cardline_state::asic_w)); + map(0x2100, 0x213f).rw(FUNC(cardline_state::asic_r), FUNC(cardline_state::asic_w)); map(0x2400, 0x2400).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x2800, 0x2800).w("crtc", FUNC(mc6845_device::address_w)); map(0x2801, 0x2801).w("crtc", FUNC(mc6845_device::register_w)); //AM_RANGE(0x2840, 0x2840) AM_NOP // ??? //AM_RANGE(0x2880, 0x2880) AM_NOP // ??? - map(0x3003, 0x3003).w(this, FUNC(cardline_state::a3003_w)); - map(0xc000, 0xdfff).w(this, FUNC(cardline_state::vram_w)).share("videoram"); - map(0xe000, 0xffff).w(this, FUNC(cardline_state::attr_w)).share("colorram"); + map(0x3003, 0x3003).w(FUNC(cardline_state::a3003_w)); + map(0xc000, 0xdfff).w(FUNC(cardline_state::vram_w)).share("videoram"); + map(0xe000, 0xffff).w(FUNC(cardline_state::attr_w)).share("colorram"); } diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp index 244541ffe54..d10255c32a4 100644 --- a/src/mame/drivers/carjmbre.cpp +++ b/src/mame/drivers/carjmbre.cpp @@ -244,11 +244,11 @@ WRITE8_MEMBER(carjmbre_state::flipscreen_w) void carjmbre_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8803, 0x8803).w(this, FUNC(carjmbre_state::nmi_enable_w)); - map(0x8805, 0x8805).w(this, FUNC(carjmbre_state::bgcolor_w)); - map(0x8807, 0x8807).w(this, FUNC(carjmbre_state::flipscreen_w)); + map(0x8803, 0x8803).w(FUNC(carjmbre_state::nmi_enable_w)); + map(0x8805, 0x8805).w(FUNC(carjmbre_state::bgcolor_w)); + map(0x8807, 0x8807).w(FUNC(carjmbre_state::flipscreen_w)); map(0x8000, 0x87ff).ram(); // 6116 - map(0x9000, 0x97ff).ram().w(this, FUNC(carjmbre_state::videoram_w)).share("videoram"); // 2114*4 + map(0x9000, 0x97ff).ram().w(FUNC(carjmbre_state::videoram_w)).share("videoram"); // 2114*4 map(0x9800, 0x98ff).ram().share("spriteram"); // 5101*2 map(0xa000, 0xa000).portr("IN1"); map(0xa800, 0xa800).portr("IN2"); diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp index 203dad48769..c2a3073c3d1 100644 --- a/src/mame/drivers/carpolo.cpp +++ b/src/mame/drivers/carpolo.cpp @@ -41,21 +41,21 @@ void carpolo_state::main_map(address_map &map) map(0x4000, 0x400f).writeonly().share("spriteram"); map(0x5400, 0x5403).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x5800, 0x5803).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0xa000, 0xa000).r(this, FUNC(carpolo_state::carpolo_ball_screen_collision_cause_r)); - map(0xa001, 0xa001).r(this, FUNC(carpolo_state::carpolo_car_ball_collision_x_r)); - map(0xa002, 0xa002).r(this, FUNC(carpolo_state::carpolo_car_ball_collision_y_r)); - map(0xa003, 0xa003).r(this, FUNC(carpolo_state::carpolo_car_car_collision_cause_r)); - map(0xa004, 0xa004).r(this, FUNC(carpolo_state::carpolo_car_border_collision_cause_r)); - map(0xa005, 0xa005).r(this, FUNC(carpolo_state::carpolo_car_ball_collision_cause_r)); - map(0xa006, 0xa006).r(this, FUNC(carpolo_state::carpolo_car_goal_collision_cause_r)); + map(0xa000, 0xa000).r(FUNC(carpolo_state::carpolo_ball_screen_collision_cause_r)); + map(0xa001, 0xa001).r(FUNC(carpolo_state::carpolo_car_ball_collision_x_r)); + map(0xa002, 0xa002).r(FUNC(carpolo_state::carpolo_car_ball_collision_y_r)); + map(0xa003, 0xa003).r(FUNC(carpolo_state::carpolo_car_car_collision_cause_r)); + map(0xa004, 0xa004).r(FUNC(carpolo_state::carpolo_car_border_collision_cause_r)); + map(0xa005, 0xa005).r(FUNC(carpolo_state::carpolo_car_ball_collision_cause_r)); + map(0xa006, 0xa006).r(FUNC(carpolo_state::carpolo_car_goal_collision_cause_r)); map(0xa007, 0xa007).portr("IN1"); - map(0xb000, 0xb000).w(this, FUNC(carpolo_state::carpolo_ball_screen_interrupt_clear_w)); - map(0xb001, 0xb001).w(this, FUNC(carpolo_state::carpolo_timer_interrupt_clear_w)); - map(0xb003, 0xb003).w(this, FUNC(carpolo_state::carpolo_car_car_interrupt_clear_w)); - map(0xb004, 0xb004).w(this, FUNC(carpolo_state::carpolo_car_border_interrupt_clear_w)); - map(0xb005, 0xb005).w(this, FUNC(carpolo_state::carpolo_car_ball_interrupt_clear_w)); - map(0xb006, 0xb006).w(this, FUNC(carpolo_state::carpolo_car_goal_interrupt_clear_w)); - map(0xc000, 0xc000).r(this, FUNC(carpolo_state::carpolo_interrupt_cause_r)); + map(0xb000, 0xb000).w(FUNC(carpolo_state::carpolo_ball_screen_interrupt_clear_w)); + map(0xb001, 0xb001).w(FUNC(carpolo_state::carpolo_timer_interrupt_clear_w)); + map(0xb003, 0xb003).w(FUNC(carpolo_state::carpolo_car_car_interrupt_clear_w)); + map(0xb004, 0xb004).w(FUNC(carpolo_state::carpolo_car_border_interrupt_clear_w)); + map(0xb005, 0xb005).w(FUNC(carpolo_state::carpolo_car_ball_interrupt_clear_w)); + map(0xb006, 0xb006).w(FUNC(carpolo_state::carpolo_car_goal_interrupt_clear_w)); + map(0xc000, 0xc000).r(FUNC(carpolo_state::carpolo_interrupt_cause_r)); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index 93da8efaa41..bcfc55c3a2f 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -428,18 +428,18 @@ void casloopy_state::casloopy_map(address_map &map) { map(0x00000000, 0x00007fff).ram().share("bios_rom"); map(0x01000000, 0x0107ffff).ram().share("wram");// stack pointer points here - map(0x04000000, 0x0401ffff).rw(this, FUNC(casloopy_state::bitmap_r), FUNC(casloopy_state::bitmap_w)); - map(0x04040000, 0x0404ffff).rw(this, FUNC(casloopy_state::vram_r), FUNC(casloopy_state::vram_w)); // tilemap + PCG + map(0x04000000, 0x0401ffff).rw(FUNC(casloopy_state::bitmap_r), FUNC(casloopy_state::bitmap_w)); + map(0x04040000, 0x0404ffff).rw(FUNC(casloopy_state::vram_r), FUNC(casloopy_state::vram_w)); // tilemap + PCG map(0x04050000, 0x040503ff).ram(); // ??? - map(0x04051000, 0x040511ff).rw(this, FUNC(casloopy_state::pal_r), FUNC(casloopy_state::pal_w)); - map(0x04058000, 0x04058007).rw(this, FUNC(casloopy_state::vregs_r), FUNC(casloopy_state::vregs_w)); + map(0x04051000, 0x040511ff).rw(FUNC(casloopy_state::pal_r), FUNC(casloopy_state::pal_w)); + map(0x04058000, 0x04058007).rw(FUNC(casloopy_state::vregs_r), FUNC(casloopy_state::vregs_w)); map(0x0405b000, 0x0405b00f).ram().share("vregs"); // RGB555 brightness control plus scrolling // AM_RANGE(0x05ffff00, 0x05ffffff) AM_READWRITE16(sh7021_r, sh7021_w, 0xffffffff) // AM_RANGE(0x05ffff00, 0x05ffffff) - SH7021 internal i/o - map(0x06000000, 0x062fffff).r(this, FUNC(casloopy_state::cart_r)); + map(0x06000000, 0x062fffff).r(FUNC(casloopy_state::cart_r)); map(0x07000000, 0x070003ff).ram().share("oram");// on-chip RAM, actually at 0xf000000 (1 kb) map(0x09000000, 0x0907ffff).ram().share("wram"); - map(0x0e000000, 0x0e2fffff).r(this, FUNC(casloopy_state::cart_r)); + map(0x0e000000, 0x0e2fffff).r(FUNC(casloopy_state::cart_r)); map(0x0f000000, 0x0f0003ff).ram().share("oram"); } diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp index 9c23eb18f22..b0ee41ac3fa 100644 --- a/src/mame/drivers/caswin.cpp +++ b/src/mame/drivers/caswin.cpp @@ -201,10 +201,10 @@ WRITE8_MEMBER(caswin_state::vvillage_lamps_w) void caswin_state::vvillage_mem(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xa000, 0xa000).r(this, FUNC(caswin_state::vvillage_rng_r)); //accessed by caswin only + map(0xa000, 0xa000).r(FUNC(caswin_state::vvillage_rng_r)); //accessed by caswin only map(0xe000, 0xe7ff).ram().share("nvram"); - map(0xf000, 0xf3ff).ram().w(this, FUNC(caswin_state::sc0_vram_w)).share("sc0_vram"); - map(0xf800, 0xfbff).ram().w(this, FUNC(caswin_state::sc0_attr_w)).share("sc0_attr"); + map(0xf000, 0xf3ff).ram().w(FUNC(caswin_state::sc0_vram_w)).share("sc0_vram"); + map(0xf800, 0xfbff).ram().w(FUNC(caswin_state::sc0_attr_w)).share("sc0_attr"); } void caswin_state::vvillage_io(address_map &map) @@ -214,10 +214,10 @@ void caswin_state::vvillage_io(address_map &map) map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x10, 0x10).portr("IN0"); map(0x11, 0x11).portr("IN1"); - map(0x10, 0x10).w(this, FUNC(caswin_state::vvillage_scroll_w)); - map(0x11, 0x11).w(this, FUNC(caswin_state::vvillage_vregs_w)); - map(0x12, 0x12).w(this, FUNC(caswin_state::vvillage_lamps_w)); - map(0x13, 0x13).w(this, FUNC(caswin_state::vvillage_output_w)); + map(0x10, 0x10).w(FUNC(caswin_state::vvillage_scroll_w)); + map(0x11, 0x11).w(FUNC(caswin_state::vvillage_vregs_w)); + map(0x12, 0x12).w(FUNC(caswin_state::vvillage_lamps_w)); + map(0x13, 0x13).w(FUNC(caswin_state::vvillage_output_w)); } diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index 091706291f5..0f26aab7418 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -246,8 +246,8 @@ public: TIMER_COUNTER_6MS }; - cat_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + cat_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), //m_nvram(*this, "nvram"), // merge with svram? m_duart(*this, "duartn68681"), @@ -265,7 +265,7 @@ public: m_y6(*this, "Y6"), m_y7(*this, "Y7"), m_dipsw(*this, "DIPSW1") - { } + { } required_device m_maincpu; //optional_device m_nvram; @@ -763,25 +763,25 @@ void cat_state::cat_mem(address_map &map) map(0x040000, 0x043fff).ram().share("svram").mirror(0x18C000);// SRAM powered by battery map(0x200000, 0x27ffff).rom().region("svrom", 0x0000).mirror(0x180000); // SV ROM map(0x400000, 0x47ffff).ram().share("p_cat_vram").mirror(0x180000); // 512 KB RAM - map(0x600000, 0x67ffff).rw(this, FUNC(cat_state::cat_2e80_r), FUNC(cat_state::cat_video_control_w)).mirror(0x180000); // Gate Array #1: Video Addressing and Timing, dram refresh timing, dram /cs and /wr (ga2 does the actual video invert/display and access to the dram data bus) - map(0x800000, 0x800001).rw(this, FUNC(cat_state::cat_floppy_control_r), FUNC(cat_state::cat_floppy_control_w)).mirror(0x18FFE0); // floppy control lines and readback - map(0x800002, 0x800003).rw(this, FUNC(cat_state::cat_0080_r), FUNC(cat_state::cat_keyboard_w)).mirror(0x18FFE0); // keyboard col write - map(0x800004, 0x800005).rw(this, FUNC(cat_state::cat_0080_r), FUNC(cat_state::cat_printer_data_w)).mirror(0x18FFE0); // Centronics Printer Data - map(0x800006, 0x800007).rw(this, FUNC(cat_state::cat_floppy_data_r), FUNC(cat_state::cat_floppy_data_w)).mirror(0x18FFE0); // floppy data read/write - map(0x800008, 0x800009).r(this, FUNC(cat_state::cat_floppy_status_r)).mirror(0x18FFE0); // floppy status lines - map(0x80000a, 0x80000b).r(this, FUNC(cat_state::cat_keyboard_r)).mirror(0x18FFE0); // keyboard row read - map(0x80000c, 0x80000d).r(this, FUNC(cat_state::cat_0080_r)).mirror(0x18FFE0); // Open bus? - map(0x80000e, 0x80000f).rw(this, FUNC(cat_state::cat_battery_r), FUNC(cat_state::cat_printer_control_w)).mirror(0x18FFE0); // Centronics Printer Control, keyboard led and country code enable - map(0x800010, 0x80001f).r(this, FUNC(cat_state::cat_0080_r)).mirror(0x18FFE0); // Open bus? + map(0x600000, 0x67ffff).rw(FUNC(cat_state::cat_2e80_r), FUNC(cat_state::cat_video_control_w)).mirror(0x180000); // Gate Array #1: Video Addressing and Timing, dram refresh timing, dram /cs and /wr (ga2 does the actual video invert/display and access to the dram data bus) + map(0x800000, 0x800001).rw(FUNC(cat_state::cat_floppy_control_r), FUNC(cat_state::cat_floppy_control_w)).mirror(0x18FFE0); // floppy control lines and readback + map(0x800002, 0x800003).rw(FUNC(cat_state::cat_0080_r), FUNC(cat_state::cat_keyboard_w)).mirror(0x18FFE0); // keyboard col write + map(0x800004, 0x800005).rw(FUNC(cat_state::cat_0080_r), FUNC(cat_state::cat_printer_data_w)).mirror(0x18FFE0); // Centronics Printer Data + map(0x800006, 0x800007).rw(FUNC(cat_state::cat_floppy_data_r), FUNC(cat_state::cat_floppy_data_w)).mirror(0x18FFE0); // floppy data read/write + map(0x800008, 0x800009).r(FUNC(cat_state::cat_floppy_status_r)).mirror(0x18FFE0); // floppy status lines + map(0x80000a, 0x80000b).r(FUNC(cat_state::cat_keyboard_r)).mirror(0x18FFE0); // keyboard row read + map(0x80000c, 0x80000d).r(FUNC(cat_state::cat_0080_r)).mirror(0x18FFE0); // Open bus? + map(0x80000e, 0x80000f).rw(FUNC(cat_state::cat_battery_r), FUNC(cat_state::cat_printer_control_w)).mirror(0x18FFE0); // Centronics Printer Control, keyboard led and country code enable + map(0x800010, 0x80001f).r(FUNC(cat_state::cat_0080_r)).mirror(0x18FFE0); // Open bus? map(0x810000, 0x81001f).rw("duartn68681", FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff).mirror(0x18FFE0); - map(0x820000, 0x82003f).rw(this, FUNC(cat_state::cat_modem_r), FUNC(cat_state::cat_modem_w)).mirror(0x18FFC0); // AMI S35213 Modem Chip, all access is on bit 7 - map(0x830000, 0x830001).r(this, FUNC(cat_state::cat_6ms_counter_r)).mirror(0x18FFFE); // 16bit 6ms counter clocked by output of another 16bit counter clocked at 10mhz - map(0x840000, 0x840001).rw(this, FUNC(cat_state::cat_2e80_r), FUNC(cat_state::cat_opr_w)).mirror(0x18FFFE); // GA2 Output port register (video enable, invert, watchdog reset, phone relays) - map(0x850000, 0x850001).r(this, FUNC(cat_state::cat_wdt_r)).mirror(0x18FFFE); // watchdog and power fail state read - map(0x860000, 0x860001).rw(this, FUNC(cat_state::cat_0000_r), FUNC(cat_state::cat_tcb_w)).mirror(0x18FFFE); // Test mode - map(0x870000, 0x870001).r(this, FUNC(cat_state::cat_2e80_r)).mirror(0x18FFFE); // Open bus? - map(0xA00000, 0xA00001).r(this, FUNC(cat_state::cat_2e80_r)).mirror(0x1FFFFE); // Open bus/dtack? The 0xA00000-0xA3ffff area is ram used for shadow rom storage on cat developer machines, which is either banked over top of, or jumped to instead of the normal rom - map(0xC00000, 0xC00001).r(this, FUNC(cat_state::cat_2e80_r)).mirror(0x3FFFFE); // Open bus/vme? + map(0x820000, 0x82003f).rw(FUNC(cat_state::cat_modem_r), FUNC(cat_state::cat_modem_w)).mirror(0x18FFC0); // AMI S35213 Modem Chip, all access is on bit 7 + map(0x830000, 0x830001).r(FUNC(cat_state::cat_6ms_counter_r)).mirror(0x18FFFE); // 16bit 6ms counter clocked by output of another 16bit counter clocked at 10mhz + map(0x840000, 0x840001).rw(FUNC(cat_state::cat_2e80_r), FUNC(cat_state::cat_opr_w)).mirror(0x18FFFE); // GA2 Output port register (video enable, invert, watchdog reset, phone relays) + map(0x850000, 0x850001).r(FUNC(cat_state::cat_wdt_r)).mirror(0x18FFFE); // watchdog and power fail state read + map(0x860000, 0x860001).rw(FUNC(cat_state::cat_0000_r), FUNC(cat_state::cat_tcb_w)).mirror(0x18FFFE); // Test mode + map(0x870000, 0x870001).r(FUNC(cat_state::cat_2e80_r)).mirror(0x18FFFE); // Open bus? + map(0xA00000, 0xA00001).r(FUNC(cat_state::cat_2e80_r)).mirror(0x1FFFFE); // Open bus/dtack? The 0xA00000-0xA3ffff area is ram used for shadow rom storage on cat developer machines, which is either banked over top of, or jumped to instead of the normal rom + map(0xC00000, 0xC00001).r(FUNC(cat_state::cat_2e80_r)).mirror(0x3FFFFE); // Open bus/vme? } /* Input ports */ diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 88b80af1736..df6acb70784 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -496,19 +496,19 @@ void cave_state::dfeveron_map(address_map &map) map(0x000000, 0x0fffff).rom(); // ROM map(0x100000, 0x10ffff).ram(); // RAM map(0x300000, 0x300003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 - map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x600000, 0x607fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x708000, 0x708fff).ram().share("paletteram.0"); // Palette + map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x600000, 0x607fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x708000, 0x708fff).ram().share("paletteram.0"); // Palette map(0x710000, 0x710bff).readonly(); // ? map(0x710c00, 0x710fff).ram(); // ? - map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs - map(0x800000, 0x800007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control - map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control - map(0xb00000, 0xb00001).portr("IN0"); // Inputs - map(0xb00002, 0xb00003).portr("IN1"); // Inputs + EEPROM - map(0xc00000, 0xc00001).w(this, FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM + map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs + map(0x800000, 0x800007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control + map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control + map(0xb00000, 0xb00001).portr("IN0"); // Inputs + map(0xb00002, 0xb00003).portr("IN1"); // Inputs + EEPROM + map(0xc00000, 0xc00001).w(FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM } @@ -521,19 +521,19 @@ void cave_state::ddonpach_map(address_map &map) map(0x000000, 0x0fffff).rom(); // ROM map(0x100000, 0x10ffff).ram(); // RAM map(0x300000, 0x300003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 - map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x600000, 0x607fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x700000, 0x70ffff).ram().w(this, FUNC(cave_state::vram_8x8_w<2>)).share("vram.2"); // Layer 2 - map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs - map(0x800000, 0x800007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control - map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control - map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control - map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette - map(0xd00000, 0xd00001).portr("IN0"); // Inputs - map(0xd00002, 0xd00003).portr("IN1"); // Inputs + EEPROM - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM + map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x600000, 0x607fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x700000, 0x70ffff).ram().w(FUNC(cave_state::vram_8x8_w<2>)).share("vram.2"); // Layer 2 + map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs + map(0x800000, 0x800007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control + map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control + map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control + map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette + map(0xd00000, 0xd00001).portr("IN0"); // Inputs + map(0xd00002, 0xd00003).portr("IN1"); // Inputs + EEPROM + map(0xe00000, 0xe00001).w(FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM } @@ -556,23 +556,23 @@ READ16_MEMBER(cave_state::donpachi_videoregs_r) void cave_state::donpachi_map(address_map &map) { - map(0x000000, 0x07ffff).rom(); // ROM - map(0x100000, 0x10ffff).ram(); // RAM - map(0x200000, 0x207fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x300000, 0x307fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x400000, 0x407fff).ram().w(this, FUNC(cave_state::vram_8x8_w<2>)).share("vram.2"); // Layer 2 - map(0x500000, 0x50ffff).ram().share("spriteram.0"); // Sprites - map(0x600000, 0x600005).ram().share("vctrl.1"); // Layer 1 Control - map(0x700000, 0x700005).ram().share("vctrl.0"); // Layer 0 Control - map(0x800000, 0x800005).ram().share("vctrl.2"); // Layer 2 Control - map(0x900000, 0x90007f).ram().r(this, FUNC(cave_state::donpachi_videoregs_r)).share("videoregs.0"); // Video Regs - map(0xa08000, 0xa08fff).ram().share("paletteram.0"); // Palette + map(0x000000, 0x07ffff).rom(); // ROM + map(0x100000, 0x10ffff).ram(); // RAM + map(0x200000, 0x207fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x300000, 0x307fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x400000, 0x407fff).ram().w(FUNC(cave_state::vram_8x8_w<2>)).share("vram.2"); // Layer 2 + map(0x500000, 0x50ffff).ram().share("spriteram.0"); // Sprites + map(0x600000, 0x600005).ram().share("vctrl.1"); // Layer 1 Control + map(0x700000, 0x700005).ram().share("vctrl.0"); // Layer 0 Control + map(0x800000, 0x800005).ram().share("vctrl.2"); // Layer 2 Control + map(0x900000, 0x90007f).ram().r(FUNC(cave_state::donpachi_videoregs_r)).share("videoregs.0"); // Video Regs + map(0xa08000, 0xa08fff).ram().share("paletteram.0"); // Palette map(0xb00000, 0xb00003).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); // M6295 map(0xb00010, 0xb00013).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); // - map(0xb00020, 0xb0002f).w("nmk112", FUNC(nmk112_device::okibank_w)).umask16(0x00ff); // - map(0xc00000, 0xc00001).portr("IN0"); // Inputs - map(0xc00002, 0xc00003).portr("IN1"); // Inputs + EEPROM - map(0xd00000, 0xd00001).w(this, FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM + map(0xb00020, 0xb0002f).w("nmk112", FUNC(nmk112_device::okibank_w)).umask16(0x00ff); // + map(0xc00000, 0xc00001).portr("IN0"); // Inputs + map(0xc00002, 0xc00003).portr("IN1"); // Inputs + EEPROM + map(0xd00000, 0xd00001).w(FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM } @@ -585,19 +585,19 @@ void cave_state::esprade_map(address_map &map) map(0x000000, 0x0fffff).rom(); // ROM map(0x100000, 0x10ffff).ram(); // RAM map(0x300000, 0x300003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 - map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x600000, 0x607fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x700000, 0x707fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 - map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs - map(0x800000, 0x800007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control - map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control - map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control - map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette - map(0xd00000, 0xd00001).portr("IN0"); // Inputs - map(0xd00002, 0xd00003).portr("IN1"); // Inputs + EEPROM - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM + map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x600000, 0x607fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x700000, 0x707fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 + map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs + map(0x800000, 0x800007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control + map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control + map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control + map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette + map(0xd00000, 0xd00001).portr("IN0"); // Inputs + map(0xd00002, 0xd00003).portr("IN1"); // Inputs + EEPROM + map(0xe00000, 0xe00001).w(FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM } @@ -610,24 +610,24 @@ void cave_state::gaia_map(address_map &map) map(0x000000, 0x0fffff).rom(); // ROM map(0x100000, 0x10ffff).ram(); // RAM map(0x300000, 0x300003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 - map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprite - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprite + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 map(0x508000, 0x50ffff).ram(); // More Layer 0, Tested but not used? - map(0x600000, 0x607fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x600000, 0x607fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 map(0x608000, 0x60ffff).ram(); // More Layer 1, Tested but not used? - map(0x700000, 0x707fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 + map(0x700000, 0x707fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 map(0x708000, 0x70ffff).ram(); // More Layer 2, Tested but not used? - map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs - map(0x800000, 0x800007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control - map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control - map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control - map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette - map(0xd00010, 0xd00011).portr("IN0"); // Inputs - map(0xd00010, 0xd00011).w(this, FUNC(cave_state::gaia_coin_lsb_w)); // Coin counter only - map(0xd00012, 0xd00013).portr("IN1"); // Inputs - map(0xd00014, 0xd00015).portr("DSW"); // Dips - map(0xd00014, 0xd00015).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog? + map(0x800000, 0x80007f).writeonly().share("videoregs.0"); // Video Regs + map(0x800000, 0x800007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control + map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control + map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control + map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette + map(0xd00010, 0xd00011).portr("IN0"); // Inputs + map(0xd00010, 0xd00011).w(FUNC(cave_state::gaia_coin_lsb_w)); // Coin counter only + map(0xd00012, 0xd00013).portr("IN1"); // Inputs + map(0xd00014, 0xd00015).portr("DSW"); // Dips + map(0xd00014, 0xd00015).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog? } @@ -639,22 +639,22 @@ void cave_state::guwange_map(address_map &map) { map(0x000000, 0x0fffff).rom(); // ROM map(0x200000, 0x20ffff).ram(); // RAM - map(0x300000, 0x30007f).writeonly().share("videoregs.0"); // Video Regs - map(0x300000, 0x300007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x600000, 0x607fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x700000, 0x707fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 + map(0x300000, 0x30007f).writeonly().share("videoregs.0"); // Video Regs + map(0x300000, 0x300007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x600000, 0x607fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x700000, 0x707fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 map(0x800000, 0x800003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 - map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control - map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control - map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control -/**/map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette - map(0xd00010, 0xd00011).portr("IN0"); // Inputs - map(0xd00010, 0xd00011).w(this, FUNC(cave_state::cave_eeprom_lsb_w)); // EEPROM - map(0xd00012, 0xd00013).portr("IN1"); // Inputs + EEPROM -// AM_RANGE(0xd00012, 0xd00013) AM_WRITENOP // ? -// AM_RANGE(0xd00014, 0xd00015) AM_WRITENOP // ? $800068 in dfeveron ? probably Watchdog + map(0x900000, 0x900005).ram().share("vctrl.0"); // Layer 0 Control + map(0xa00000, 0xa00005).ram().share("vctrl.1"); // Layer 1 Control + map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control +/**/map(0xc00000, 0xc0ffff).ram().share("paletteram.0"); // Palette + map(0xd00010, 0xd00011).portr("IN0"); // Inputs + map(0xd00010, 0xd00011).w(FUNC(cave_state::cave_eeprom_lsb_w)); // EEPROM + map(0xd00012, 0xd00013).portr("IN1"); // Inputs + EEPROM +// AM_RANGE(0xd00012, 0xd00013) AM_WRITENOP // ? +// AM_RANGE(0xd00014, 0xd00015) AM_WRITENOP // ? $800068 in dfeveron ? probably Watchdog } @@ -666,22 +666,22 @@ void cave_state::hotdogst_map(address_map &map) { map(0x000000, 0x0fffff).rom(); // ROM map(0x300000, 0x30ffff).ram(); // RAM - map(0x408000, 0x408fff).ram().share("paletteram.0"); // Palette - map(0x880000, 0x887fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x900000, 0x907fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x980000, 0x987fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 - map(0xa80000, 0xa8007f).writeonly().share("videoregs.0"); // Video Regs - map(0xa80000, 0xa80007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause -// AM_RANGE(0xa8006e, 0xa8006f) AM_READ(soundlatch_ack_r) // From Sound CPU - map(0xa8006e, 0xa8006f).w(this, FUNC(cave_state::sound_cmd_w)); // To Sound CPU - map(0xb00000, 0xb00005).ram().share("vctrl.0"); // Layer 0 Control - map(0xb80000, 0xb80005).ram().share("vctrl.1"); // Layer 1 Control - map(0xc00000, 0xc00005).ram().share("vctrl.2"); // Layer 2 Control - map(0xc80000, 0xc80001).portr("IN0"); // Inputs - map(0xc80002, 0xc80003).portr("IN1"); // Inputs + EEPROM - map(0xd00000, 0xd00001).w(this, FUNC(cave_state::hotdogst_eeprom_msb_w)); // EEPROM - map(0xd00002, 0xd00003).nopw(); // ??? - map(0xf00000, 0xf0ffff).ram().share("spriteram.0"); // Sprites + map(0x408000, 0x408fff).ram().share("paletteram.0"); // Palette + map(0x880000, 0x887fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x900000, 0x907fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x980000, 0x987fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 + map(0xa80000, 0xa8007f).writeonly().share("videoregs.0"); // Video Regs + map(0xa80000, 0xa80007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause +// AM_RANGE(0xa8006e, 0xa8006f) AM_READ(soundlatch_ack_r) // From Sound CPU + map(0xa8006e, 0xa8006f).w(FUNC(cave_state::sound_cmd_w)); // To Sound CPU + map(0xb00000, 0xb00005).ram().share("vctrl.0"); // Layer 0 Control + map(0xb80000, 0xb80005).ram().share("vctrl.1"); // Layer 1 Control + map(0xc00000, 0xc00005).ram().share("vctrl.2"); // Layer 2 Control + map(0xc80000, 0xc80001).portr("IN0"); // Inputs + map(0xc80002, 0xc80003).portr("IN1"); // Inputs + EEPROM + map(0xd00000, 0xd00001).w(FUNC(cave_state::hotdogst_eeprom_msb_w)); // EEPROM + map(0xd00002, 0xd00003).nopw(); // ??? + map(0xf00000, 0xf0ffff).ram().share("spriteram.0"); // Sprites } @@ -752,39 +752,39 @@ CUSTOM_INPUT_MEMBER(cave_state::korokoro_hopper_r) void cave_state::korokoro_map(address_map &map) { - map(0x000000, 0x07ffff).rom(); // ROM - map(0x100000, 0x107fff).w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x140000, 0x140005).writeonly().share("vctrl.0"); // Layer 0 Control - map(0x180000, 0x187fff).writeonly().share("spriteram.0"); // Sprites - map(0x1c0000, 0x1c007f).writeonly().share("videoregs.0"); // Video Regs - map(0x1c0000, 0x1c0007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x200000, 0x207fff).writeonly().share("paletteram.0"); // Palette -// AM_RANGE(0x240000, 0x240003) AM_DEVREAD8("ymz", ymz280b_device, read, 0x00ff) // YMZ280 - map(0x240000, 0x240003).w("ymz", FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 - map(0x280000, 0x280001).portr("IN0"); // Inputs + ??? - map(0x280002, 0x280003).portr("IN1"); // Inputs + EEPROM - map(0x280008, 0x280009).w(this, FUNC(cave_state::korokoro_leds_w)); // Leds - map(0x28000a, 0x28000b).w(this, FUNC(cave_state::korokoro_eeprom_msb_w)); // EEPROM + map(0x000000, 0x07ffff).rom(); // ROM + map(0x100000, 0x107fff).w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x140000, 0x140005).writeonly().share("vctrl.0"); // Layer 0 Control + map(0x180000, 0x187fff).writeonly().share("spriteram.0"); // Sprites + map(0x1c0000, 0x1c007f).writeonly().share("videoregs.0"); // Video Regs + map(0x1c0000, 0x1c0007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x200000, 0x207fff).writeonly().share("paletteram.0"); // Palette +// AM_RANGE(0x240000, 0x240003) AM_DEVREAD8("ymz", ymz280b_device, read, 0x00ff) // YMZ280 + map(0x240000, 0x240003).w("ymz", FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 + map(0x280000, 0x280001).portr("IN0"); // Inputs + ??? + map(0x280002, 0x280003).portr("IN1"); // Inputs + EEPROM + map(0x280008, 0x280009).w(FUNC(cave_state::korokoro_leds_w)); // Leds + map(0x28000a, 0x28000b).w(FUNC(cave_state::korokoro_eeprom_msb_w)); // EEPROM map(0x28000c, 0x28000d).nopw(); // 0 (watchdog?) - map(0x300000, 0x30ffff).ram(); // RAM + map(0x300000, 0x30ffff).ram(); // RAM } void cave_state::crusherm_map(address_map &map) { - map(0x000000, 0x07ffff).rom(); // ROM - map(0x100000, 0x107fff).w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x140000, 0x140005).writeonly().share("vctrl.0"); // Layer 0 Control - map(0x180000, 0x187fff).writeonly().share("spriteram.0"); // Sprites - map(0x200000, 0x207fff).writeonly().share("paletteram.0"); // Palette - map(0x240000, 0x240003).w("ymz", FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 - map(0x280000, 0x280001).portr("IN0"); // Inputs + ??? - map(0x280002, 0x280003).portr("IN1"); // Inputs + EEPROM - map(0x280008, 0x280009).w(this, FUNC(cave_state::korokoro_leds_w)); // Leds - map(0x28000a, 0x28000b).w(this, FUNC(cave_state::korokoro_eeprom_msb_w)); // EEPROM + map(0x000000, 0x07ffff).rom(); // ROM + map(0x100000, 0x107fff).w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x140000, 0x140005).writeonly().share("vctrl.0"); // Layer 0 Control + map(0x180000, 0x187fff).writeonly().share("spriteram.0"); // Sprites + map(0x200000, 0x207fff).writeonly().share("paletteram.0"); // Palette + map(0x240000, 0x240003).w("ymz", FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 + map(0x280000, 0x280001).portr("IN0"); // Inputs + ??? + map(0x280002, 0x280003).portr("IN1"); // Inputs + EEPROM + map(0x280008, 0x280009).w(FUNC(cave_state::korokoro_leds_w)); // Leds + map(0x28000a, 0x28000b).w(FUNC(cave_state::korokoro_eeprom_msb_w)); // EEPROM map(0x28000c, 0x28000d).nopw(); // 0 (watchdog?) - map(0x300000, 0x30007f).writeonly().share("videoregs.0"); // Video Regs - map(0x300000, 0x300007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x340000, 0x34ffff).ram(); // RAM + map(0x300000, 0x30007f).writeonly().share("videoregs.0"); // Video Regs + map(0x300000, 0x300007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x340000, 0x34ffff).ram(); // RAM } /*************************************************************************** @@ -795,20 +795,20 @@ void cave_state::mazinger_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x10ffff).ram(); // RAM - map(0x200000, 0x20ffff).ram().share("spriteram.0"); // Sprites - map(0x300000, 0x30007f).writeonly().share("videoregs.0"); // Video Regs - map(0x300000, 0x300007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0x300068, 0x300069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog - map(0x30006e, 0x30006f).rw(this, FUNC(cave_state::soundlatch_ack_r), FUNC(cave_state::sound_cmd_w)); // From Sound CPU - map(0x400000, 0x407fff).ram().w(this, FUNC(cave_state::vram_8x8_w<1>)).share("vram.1"); // Layer 1 - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_8x8_w<0>)).share("vram.0"); // Layer 0 - map(0x600000, 0x600005).ram().share("vctrl.1"); // Layer 1 Control - map(0x700000, 0x700005).ram().share("vctrl.0"); // Layer 0 Control - map(0x800000, 0x800001).portr("IN0"); // Inputs - map(0x800002, 0x800003).portr("IN1"); // Inputs + EEPROM - map(0x900000, 0x900001).w(this, FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM - map(0xc08000, 0xc0ffff).ram().share("paletteram.0"); // Palette - map(0xd00000, 0xd7ffff).rom().region("user1", 0); // extra data ROM + map(0x200000, 0x20ffff).ram().share("spriteram.0"); // Sprites + map(0x300000, 0x30007f).writeonly().share("videoregs.0"); // Video Regs + map(0x300000, 0x300007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x300068, 0x300069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog + map(0x30006e, 0x30006f).rw(FUNC(cave_state::soundlatch_ack_r), FUNC(cave_state::sound_cmd_w)); // From Sound CPU + map(0x400000, 0x407fff).ram().w(FUNC(cave_state::vram_8x8_w<1>)).share("vram.1"); // Layer 1 + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_8x8_w<0>)).share("vram.0"); // Layer 0 + map(0x600000, 0x600005).ram().share("vctrl.1"); // Layer 1 Control + map(0x700000, 0x700005).ram().share("vctrl.0"); // Layer 0 Control + map(0x800000, 0x800001).portr("IN0"); // Inputs + map(0x800002, 0x800003).portr("IN1"); // Inputs + EEPROM + map(0x900000, 0x900001).w(FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM + map(0xc08000, 0xc0ffff).ram().share("paletteram.0"); // Palette + map(0xd00000, 0xd7ffff).rom().region("user1", 0); // extra data ROM } @@ -821,26 +821,26 @@ void cave_state::metmqstr_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x17ffff).rom(); // ROM map(0x200000, 0x27ffff).rom(); // ROM - map(0x408000, 0x408fff).ram().share("paletteram.0"); // Palette - map(0x600000, 0x600001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // Watchdog? - map(0x880000, 0x887fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 + map(0x408000, 0x408fff).ram().share("paletteram.0"); // Palette + map(0x600000, 0x600001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // Watchdog? + map(0x880000, 0x887fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 map(0x888000, 0x88ffff).ram(); // - map(0x900000, 0x907fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x900000, 0x907fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 map(0x908000, 0x90ffff).ram(); // - map(0x980000, 0x987fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x980000, 0x987fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 map(0x988000, 0x98ffff).ram(); // - map(0xa80000, 0xa8007f).writeonly().share("videoregs.0"); // Video Regs - map(0xa80000, 0xa80007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause - map(0xa80068, 0xa80069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog? - map(0xa8006c, 0xa8006d).r(this, FUNC(cave_state::soundflags_ack_r)).nopw(); // Communication - map(0xa8006e, 0xa8006f).rw(this, FUNC(cave_state::soundlatch_ack_r), FUNC(cave_state::sound_cmd_w)); // From Sound CPU - map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control - map(0xb80000, 0xb80005).ram().share("vctrl.1"); // Layer 1 Control - map(0xc00000, 0xc00005).ram().share("vctrl.0"); // Layer 0 Control - map(0xc80000, 0xc80001).portr("IN0"); // Inputs - map(0xc80002, 0xc80003).portr("IN1"); // Inputs + EEPROM - map(0xd00000, 0xd00001).w(this, FUNC(cave_state::metmqstr_eeprom_msb_w)); // EEPROM - map(0xf00000, 0xf0ffff).ram().share("spriteram.0"); // Sprites + map(0xa80000, 0xa8007f).writeonly().share("videoregs.0"); // Video Regs + map(0xa80000, 0xa80007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0xa80068, 0xa80069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog? + map(0xa8006c, 0xa8006d).r(FUNC(cave_state::soundflags_ack_r)).nopw(); // Communication + map(0xa8006e, 0xa8006f).rw(FUNC(cave_state::soundlatch_ack_r), FUNC(cave_state::sound_cmd_w)); // From Sound CPU + map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control + map(0xb80000, 0xb80005).ram().share("vctrl.1"); // Layer 1 Control + map(0xc00000, 0xc00005).ram().share("vctrl.0"); // Layer 0 Control + map(0xc80000, 0xc80001).portr("IN0"); // Inputs + map(0xc80002, 0xc80003).portr("IN1"); // Inputs + EEPROM + map(0xd00000, 0xd00001).w(FUNC(cave_state::metmqstr_eeprom_msb_w)); // EEPROM + map(0xf00000, 0xf0ffff).ram().share("spriteram.0"); // Sprites } @@ -932,25 +932,25 @@ void cave_state::ppsatan_map(address_map &map) // Left Screen (Player 2) map(0x080000, 0x080005).ram().share("vctrl.1"); // Layer Control - map(0x100000, 0x107fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer + map(0x100000, 0x107fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer // AM_RANGE(0x180000, 0x1803ff) AM_RAM // Palette (Tilemaps) // AM_RANGE(0x187800, 0x188fff) AM_RAM AM_SHARE("paletteram.1") // Palette (Sprites) map(0x180000, 0x188fff).ram().share("paletteram.1"); // Palette map(0x1c0000, 0x1c7fff).ram().share("spriteram.1"); // Sprites map(0x200000, 0x200001).portr("SYSTEM"); // DSW + (unused) EEPROM - map(0x200000, 0x200001).w(this, FUNC(cave_state::ppsatan_out_w)); // Outputs + OKI banking - map(0x200002, 0x200003).rw(this, FUNC(cave_state::ppsatan_touch2_r), FUNC(cave_state::ppsatan_eeprom_msb_w)); // Touch Screen + (unused) EEPROM - map(0x200004, 0x200005).rw(this, FUNC(cave_state::ppsatan_touch1_r), FUNC(cave_state::ppsatan_io_mux_w)); // Touch Screen + map(0x200000, 0x200001).w(FUNC(cave_state::ppsatan_out_w)); // Outputs + OKI banking + map(0x200002, 0x200003).rw(FUNC(cave_state::ppsatan_touch2_r), FUNC(cave_state::ppsatan_eeprom_msb_w)); // Touch Screen + (unused) EEPROM + map(0x200004, 0x200005).rw(FUNC(cave_state::ppsatan_touch1_r), FUNC(cave_state::ppsatan_io_mux_w)); // Touch Screen map(0x200006, 0x200007).nopw(); // Lev. 2 IRQ Ack? map(0x2c0000, 0x2c007f).writeonly().share("videoregs.1"); // Video Regs - map(0x2c0000, 0x2c0007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x2c0000, 0x2c0007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause map(0x2c0068, 0x2c0069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog map(0x300001, 0x300001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 // Right Screen (Player 1) map(0x480000, 0x480005).ram().share("vctrl.2"); // Layer Control - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer // AM_RANGE(0x580000, 0x5803ff) AM_RAM // Palette (Tilemaps) // AM_RANGE(0x587800, 0x588fff) AM_RAM //AM_SHARE("paletteram.2") // Palette (Sprites) map(0x580000, 0x588fff).ram().share("paletteram.2"); // Palette @@ -959,7 +959,7 @@ void cave_state::ppsatan_map(address_map &map) // Top Screen map(0x880000, 0x880005).ram().share("vctrl.0"); // Layer Control - map(0x900000, 0x907fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer + map(0x900000, 0x907fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer // AM_RANGE(0x980000, 0x9803ff) AM_RAM // Palette (Tilemaps) // AM_RANGE(0x987800, 0x988fff) AM_RAM AM_SHARE("paletteram.0") // Palette (Sprites) map(0x980000, 0x988fff).ram().share("paletteram.0"); // Palette @@ -1002,21 +1002,21 @@ void cave_state::pwrinst2_map(address_map &map) map(0x500000, 0x500001).portr("IN0"); // Inputs map(0x500002, 0x500003).portr("IN1"); // map(0x600000, 0x6fffff).rom().region("user1", 0); // extra data ROM space - map(0x700000, 0x700001).w(this, FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM - map(0x800000, 0x807fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 - map(0x880000, 0x887fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x900000, 0x907fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x980000, 0x987fff).ram().w(this, FUNC(cave_state::vram_8x8_w<3>)).share("vram.3"); // Layer 3 + map(0x700000, 0x700001).w(FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM + map(0x800000, 0x807fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 + map(0x880000, 0x887fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x900000, 0x907fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x980000, 0x987fff).ram().w(FUNC(cave_state::vram_8x8_w<3>)).share("vram.3"); // Layer 3 map(0xa00000, 0xa0ffff).ram().share("spriteram.0"); // Sprites map(0xa10000, 0xa1ffff).ram(); // Sprites? - map(0xa80000, 0xa8007f).ram().r(this, FUNC(cave_state::donpachi_videoregs_r)).share("videoregs.0"); // Video Regs - map(0xb00000, 0xb00005).ram().w(this, FUNC(cave_state::pwrinst2_vctrl_w<2>)).share("vctrl.2"); // Layer 2 Control - map(0xb80000, 0xb80005).ram().w(this, FUNC(cave_state::pwrinst2_vctrl_w<0>)).share("vctrl.0"); // Layer 0 Control - map(0xc00000, 0xc00005).ram().w(this, FUNC(cave_state::pwrinst2_vctrl_w<1>)).share("vctrl.1"); // Layer 1 Control - map(0xc80000, 0xc80005).ram().w(this, FUNC(cave_state::pwrinst2_vctrl_w<3>)).share("vctrl.3"); // Layer 3 Control - map(0xd80000, 0xd80001).r(this, FUNC(cave_state::soundlatch_ack_r)); // ? From Sound CPU - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::sound_cmd_w)); // To Sound CPU - map(0xe80000, 0xe80001).r(this, FUNC(cave_state::pwrinst2_eeprom_r)); // EEPROM + map(0xa80000, 0xa8007f).ram().r(FUNC(cave_state::donpachi_videoregs_r)).share("videoregs.0"); // Video Regs + map(0xb00000, 0xb00005).ram().w(FUNC(cave_state::pwrinst2_vctrl_w<2>)).share("vctrl.2"); // Layer 2 Control + map(0xb80000, 0xb80005).ram().w(FUNC(cave_state::pwrinst2_vctrl_w<0>)).share("vctrl.0"); // Layer 0 Control + map(0xc00000, 0xc00005).ram().w(FUNC(cave_state::pwrinst2_vctrl_w<1>)).share("vctrl.1"); // Layer 1 Control + map(0xc80000, 0xc80005).ram().w(FUNC(cave_state::pwrinst2_vctrl_w<3>)).share("vctrl.3"); // Layer 3 Control + map(0xd80000, 0xd80001).r(FUNC(cave_state::soundlatch_ack_r)); // ? From Sound CPU + map(0xe00000, 0xe00001).w(FUNC(cave_state::sound_cmd_w)); // To Sound CPU + map(0xe80000, 0xe80001).r(FUNC(cave_state::pwrinst2_eeprom_r)); // EEPROM map(0xf00000, 0xf04fff).ram().share("paletteram.0"); // Palette } @@ -1043,21 +1043,21 @@ void cave_state::sailormn_map(address_map &map) map(0x410000, 0x410001).ram(); // (agallet) map(0x500000, 0x50ffff).ram().share("spriteram.0"); // Sprites map(0x510000, 0x510001).ram(); // (agallet) - map(0x600000, 0x600001).r(this, FUNC(cave_state::sailormn_input0_r)); // Inputs + Watchdog! + map(0x600000, 0x600001).r(FUNC(cave_state::sailormn_input0_r)); // Inputs + Watchdog! map(0x600002, 0x600003).portr("IN1"); // Inputs + EEPROM - map(0x700000, 0x700001).w(this, FUNC(cave_state::sailormn_eeprom_msb_w)); // EEPROM - map(0x800000, 0x807fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x880000, 0x887fff).ram().w(this, FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 - map(0x900000, 0x907fff).ram().w(this, FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 + map(0x700000, 0x700001).w(FUNC(cave_state::sailormn_eeprom_msb_w)); // EEPROM + map(0x800000, 0x807fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x880000, 0x887fff).ram().w(FUNC(cave_state::vram_w<1>)).share("vram.1"); // Layer 1 + map(0x900000, 0x907fff).ram().w(FUNC(cave_state::vram_w<2>)).share("vram.2"); // Layer 2 map(0x908000, 0x908001).ram(); // (agallet) map(0xa00000, 0xa00005).ram().share("vctrl.0"); // Layer 0 Control map(0xa80000, 0xa80005).ram().share("vctrl.1"); // Layer 1 Control map(0xb00000, 0xb00005).ram().share("vctrl.2"); // Layer 2 Control map(0xb80000, 0xb8007f).writeonly().share("videoregs.0"); // Video Regs - map(0xb80000, 0xb80007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause (bit 2 tested!) - map(0xb8006c, 0xb8006d).r(this, FUNC(cave_state::soundflags_ack_r)); // Communication - map(0xb8006e, 0xb8006f).r(this, FUNC(cave_state::soundlatch_ack_r)); // From Sound CPU - map(0xb8006e, 0xb8006f).w(this, FUNC(cave_state::sound_cmd_w)); // To Sound CPU + map(0xb80000, 0xb80007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause (bit 2 tested!) + map(0xb8006c, 0xb8006d).r(FUNC(cave_state::soundflags_ack_r)); // Communication + map(0xb8006e, 0xb8006f).r(FUNC(cave_state::soundlatch_ack_r)); // From Sound CPU + map(0xb8006e, 0xb8006f).w(FUNC(cave_state::sound_cmd_w)); // To Sound CPU } @@ -1070,17 +1070,17 @@ void cave_state::tekkencw_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x10ffff).ram().share("nvram"); // RAM (battery) map(0x200000, 0x20ffff).ram().share("spriteram.0"); // Sprites - map(0x300000, 0x307fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x300000, 0x307fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 map(0x400000, 0x400001).portr("IN0"); // Inputs + EEPROM + Hopper map(0x400002, 0x400003).portr("IN1"); // Inputs map(0x500000, 0x500005).writeonly().share("vctrl.0"); // Layer 0 Control map(0x600000, 0x60ffff).ram().share("paletteram.0"); // Palette map(0x700000, 0x70007f).writeonly().share("videoregs.0"); // Video Regs - map(0x700000, 0x700007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x700000, 0x700007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause map(0x700068, 0x700069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog map(0x800001, 0x800001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 - map(0xc00000, 0xc00001).w(this, FUNC(cave_state::tjumpman_leds_w)); // Leds + Hopper - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM + map(0xc00000, 0xc00001).w(FUNC(cave_state::tjumpman_leds_w)); // Leds + Hopper + map(0xe00000, 0xe00001).w(FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM } @@ -1093,17 +1093,17 @@ void cave_state::tekkenbs_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x10ffff).ram().share("nvram"); // RAM (battery) map(0x200000, 0x20ffff).ram().share("spriteram.0"); // Sprites - map(0x300000, 0x307fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x300000, 0x307fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 map(0x400000, 0x40ffff).ram().share("paletteram.0"); // Palette map(0x500000, 0x500005).writeonly().share("vctrl.0"); // Layer 0 Control map(0x600000, 0x600001).portr("IN0"); // Inputs + EEPROM + Hopper map(0x600002, 0x600003).portr("IN1"); // Inputs map(0x700000, 0x70007f).writeonly().share("videoregs.0"); // Video Regs - map(0x700000, 0x700007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x700000, 0x700007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause map(0x700068, 0x700069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog map(0x800001, 0x800001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 - map(0xc00000, 0xc00001).w(this, FUNC(cave_state::tjumpman_leds_w)); // Leds + Hopper - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM + map(0xc00000, 0xc00001).w(FUNC(cave_state::tjumpman_leds_w)); // Leds + Hopper + map(0xe00000, 0xe00001).w(FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM } @@ -1156,18 +1156,18 @@ void cave_state::tjumpman_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x10ffff).ram().share("nvram"); // RAM (battery) map(0x200000, 0x20ffff).ram().share("spriteram.0"); // Sprites - map(0x300000, 0x307fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 - map(0x304000, 0x307fff).w(this, FUNC(cave_state::vram_w<0>)); // Layer 0 - 16x16 tiles mapped here + map(0x300000, 0x307fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x304000, 0x307fff).w(FUNC(cave_state::vram_w<0>)); // Layer 0 - 16x16 tiles mapped here map(0x400000, 0x400005).writeonly().share("vctrl.0"); // Layer 0 Control map(0x500000, 0x50ffff).ram().share("paletteram.0"); // Palette map(0x600000, 0x600001).portr("IN0"); // Inputs + EEPROM + Hopper map(0x600002, 0x600003).portr("IN1"); // Inputs map(0x700000, 0x70007f).writeonly().share("videoregs.0"); // Video Regs - map(0x700000, 0x700007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x700000, 0x700007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause map(0x700068, 0x700069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog map(0x800001, 0x800001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 - map(0xc00000, 0xc00001).w(this, FUNC(cave_state::tjumpman_leds_w)); // Leds + Hopper - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM + map(0xc00000, 0xc00001).w(FUNC(cave_state::tjumpman_leds_w)); // Leds + Hopper + map(0xe00000, 0xe00001).w(FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM } @@ -1196,17 +1196,17 @@ void cave_state::pacslot_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x10ffff).ram().share("nvram"); // RAM (battery) map(0x200000, 0x20ffff).ram().share("spriteram.0"); // Sprites - map(0x300000, 0x307fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x300000, 0x307fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 map(0x400000, 0x40007f).writeonly().share("videoregs.0"); // Video Regs - map(0x400000, 0x400007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x400000, 0x400007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause map(0x400068, 0x400069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog map(0x500000, 0x500005).writeonly().share("vctrl.0"); // Layer 0 Control map(0x600000, 0x60ffff).ram().share("paletteram.0"); // Palette map(0x700000, 0x700001).portr("IN0"); // Inputs + EEPROM + Hopper map(0x700002, 0x700003).portr("IN1"); // Inputs map(0x800001, 0x800001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 - map(0xc00000, 0xc00001).w(this, FUNC(cave_state::pacslot_leds_w)); // Leds + Hopper - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM + map(0xc00000, 0xc00001).w(FUNC(cave_state::pacslot_leds_w)); // Leds + Hopper + map(0xe00000, 0xe00001).w(FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM } @@ -1221,17 +1221,17 @@ void cave_state::paceight_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x10ffff).ram().share("nvram"); // RAM (battery) map(0x200000, 0x20ffff).ram().share("spriteram.0"); // Sprites - map(0x300000, 0x307fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x300000, 0x307fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 map(0x400000, 0x40ffff).ram().share("paletteram.0"); // Palette map(0x500000, 0x500001).portr("IN0"); // Inputs + EEPROM + Hopper map(0x500002, 0x500003).portr("IN1"); // Inputs map(0x600000, 0x600005).writeonly().share("vctrl.0"); // Layer 0 Control map(0x700000, 0x70007f).writeonly().share("videoregs.0"); // Video Regs - map(0x700000, 0x700007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x700000, 0x700007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause map(0x700068, 0x700069).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Watchdog map(0x800001, 0x800001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 - map(0xc00000, 0xc00001).w(this, FUNC(cave_state::pacslot_leds_w)); // Leds + Hopper - map(0xe00000, 0xe00001).w(this, FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM + map(0xc00000, 0xc00001).w(FUNC(cave_state::pacslot_leds_w)); // Leds + Hopper + map(0xe00000, 0xe00001).w(FUNC(cave_state::tjumpman_eeprom_lsb_w)); // EEPROM } /*************************************************************************** @@ -1244,14 +1244,14 @@ void cave_state::uopoko_map(address_map &map) map(0x100000, 0x10ffff).ram(); // RAM map(0x300000, 0x300003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // YMZ280 map(0x400000, 0x40ffff).ram().share("spriteram.0"); // Sprites - map(0x500000, 0x507fff).ram().w(this, FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 + map(0x500000, 0x507fff).ram().w(FUNC(cave_state::vram_w<0>)).share("vram.0"); // Layer 0 map(0x600000, 0x60007f).writeonly().share("videoregs.0"); // Video Regs - map(0x600000, 0x600007).r(this, FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause + map(0x600000, 0x600007).r(FUNC(cave_state::cave_irq_cause_r)); // IRQ Cause map(0x700000, 0x700005).ram().share("vctrl.0"); // Layer 0 Control map(0x800000, 0x80ffff).ram().share("paletteram.0"); // Palette map(0x900000, 0x900001).portr("IN0"); // Inputs map(0x900002, 0x900003).portr("IN1"); // Inputs + EEPROM - map(0xa00000, 0xa00001).w(this, FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM + map(0xa00000, 0xa00001).w(FUNC(cave_state::cave_eeprom_msb_w)); // EEPROM } @@ -1319,12 +1319,12 @@ void cave_state::hotdogst_sound_map(address_map &map) void cave_state::hotdogst_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(cave_state::z80_rombank_w<0x0f>)); // ROM bank - map(0x30, 0x30).r(this, FUNC(cave_state::soundlatch_lo_r)); // From Main CPU - map(0x40, 0x40).r(this, FUNC(cave_state::soundlatch_hi_r)); // + map(0x00, 0x00).w(FUNC(cave_state::z80_rombank_w<0x0f>)); // ROM bank + map(0x30, 0x30).r(FUNC(cave_state::soundlatch_lo_r)); // From Main CPU + map(0x40, 0x40).r(FUNC(cave_state::soundlatch_hi_r)); // map(0x50, 0x51).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // map(0x60, 0x60).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 - map(0x70, 0x70).w(this, FUNC(cave_state::oki1_bank_w<0x3>)); // Samples bank + map(0x70, 0x70).w(FUNC(cave_state::oki1_bank_w<0x3>)); // Samples bank } @@ -1343,13 +1343,13 @@ void cave_state::mazinger_sound_map(address_map &map) void cave_state::mazinger_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(cave_state::z80_rombank_w<0x07>)); // ROM bank - map(0x10, 0x10).w(this, FUNC(cave_state::soundlatch_ack_w)); // To Main CPU - map(0x30, 0x30).r(this, FUNC(cave_state::soundlatch_lo_r)); // From Main CPU + map(0x00, 0x00).w(FUNC(cave_state::z80_rombank_w<0x07>)); // ROM bank + map(0x10, 0x10).w(FUNC(cave_state::soundlatch_ack_w)); // To Main CPU + map(0x30, 0x30).r(FUNC(cave_state::soundlatch_lo_r)); // From Main CPU map(0x50, 0x51).w("ymsnd", FUNC(ym2203_device::write)); // YM2203 map(0x52, 0x53).r("ymsnd", FUNC(ym2203_device::read)); // YM2203 map(0x70, 0x70).w("oki1", FUNC(okim6295_device::write)); // M6295 - map(0x74, 0x74).w(this, FUNC(cave_state::oki1_bank_w<0x3>)); // Samples bank + map(0x74, 0x74).w(FUNC(cave_state::oki1_bank_w<0x3>)); // Samples bank } @@ -1367,15 +1367,15 @@ void cave_state::metmqstr_sound_map(address_map &map) void cave_state::metmqstr_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(cave_state::z80_rombank_w<0x0f>)); // Rom Bank - map(0x20, 0x20).r(this, FUNC(cave_state::soundflags_r)); // Communication - map(0x30, 0x30).r(this, FUNC(cave_state::soundlatch_lo_r)); // From Main CPU - map(0x40, 0x40).r(this, FUNC(cave_state::soundlatch_hi_r)); // + map(0x00, 0x00).w(FUNC(cave_state::z80_rombank_w<0x0f>)); // Rom Bank + map(0x20, 0x20).r(FUNC(cave_state::soundflags_r)); // Communication + map(0x30, 0x30).r(FUNC(cave_state::soundlatch_lo_r)); // From Main CPU + map(0x40, 0x40).r(FUNC(cave_state::soundlatch_hi_r)); // map(0x50, 0x51).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); // YM2151 map(0x60, 0x60).w("oki1", FUNC(okim6295_device::write)); // M6295 #0 - map(0x70, 0x70).w(this, FUNC(cave_state::oki1_bank_w<0x7>)); // Samples Bank #0 + map(0x70, 0x70).w(FUNC(cave_state::oki1_bank_w<0x7>)); // Samples Bank #0 map(0x80, 0x80).w("oki2", FUNC(okim6295_device::write)); // M6295 #1 - map(0x90, 0x90).w(this, FUNC(cave_state::oki2_bank_w<0x7>)); // Samples Bank #1 + map(0x90, 0x90).w(FUNC(cave_state::oki2_bank_w<0x7>)); // Samples Bank #1 } @@ -1397,11 +1397,11 @@ void cave_state::pwrinst2_sound_portmap(address_map &map) map(0x08, 0x08).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // map(0x10, 0x17).w("nmk112", FUNC(nmk112_device::okibank_w)); // Samples bank map(0x40, 0x41).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // - map(0x50, 0x50).w(this, FUNC(cave_state::soundlatch_ack_w)); // To Main CPU + map(0x50, 0x50).w(FUNC(cave_state::soundlatch_ack_w)); // To Main CPU // AM_RANGE(0x51, 0x51) AM_WRITENOP // ?? volume - map(0x80, 0x80).w(this, FUNC(cave_state::z80_rombank_w<0x07>)); // ROM bank - map(0x60, 0x60).r(this, FUNC(cave_state::soundlatch_hi_r)); // From Main CPU - map(0x70, 0x70).r(this, FUNC(cave_state::soundlatch_lo_r)); // + map(0x80, 0x80).w(FUNC(cave_state::z80_rombank_w<0x07>)); // ROM bank + map(0x60, 0x60).r(FUNC(cave_state::soundlatch_hi_r)); // From Main CPU + map(0x70, 0x70).r(FUNC(cave_state::soundlatch_lo_r)); // } @@ -1419,16 +1419,16 @@ void cave_state::sailormn_sound_map(address_map &map) void cave_state::sailormn_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(cave_state::z80_rombank_w<0x1f>)); // Rom Bank - map(0x10, 0x10).w(this, FUNC(cave_state::soundlatch_ack_w)); // To Main CPU - map(0x20, 0x20).r(this, FUNC(cave_state::soundflags_r)); // Communication - map(0x30, 0x30).r(this, FUNC(cave_state::soundlatch_lo_r)); // From Main CPU - map(0x40, 0x40).r(this, FUNC(cave_state::soundlatch_hi_r)); // + map(0x00, 0x00).w(FUNC(cave_state::z80_rombank_w<0x1f>)); // Rom Bank + map(0x10, 0x10).w(FUNC(cave_state::soundlatch_ack_w)); // To Main CPU + map(0x20, 0x20).r(FUNC(cave_state::soundflags_r)); // Communication + map(0x30, 0x30).r(FUNC(cave_state::soundlatch_lo_r)); // From Main CPU + map(0x40, 0x40).r(FUNC(cave_state::soundlatch_hi_r)); // map(0x50, 0x51).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); // YM2151 map(0x60, 0x60).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 #0 - map(0x70, 0x70).w(this, FUNC(cave_state::oki1_bank_w<0xf>)); // Samples Bank #0 + map(0x70, 0x70).w(FUNC(cave_state::oki1_bank_w<0xf>)); // Samples Bank #0 map(0x80, 0x80).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 #1 - map(0xc0, 0xc0).w(this, FUNC(cave_state::oki2_bank_w<0xf>)); // Samples Bank #1 + map(0xc0, 0xc0).w(FUNC(cave_state::oki2_bank_w<0xf>)); // Samples Bank #1 } diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp index a460372ce0e..2544f3abf59 100644 --- a/src/mame/drivers/cb2001.cpp +++ b/src/mame/drivers/cb2001.cpp @@ -573,7 +573,7 @@ void cb2001_state::cb2001_map(address_map &map) { map(0x00000, 0x1ffff).ram(); map(0x20000, 0x20fff).ram().share("vrafg"); - map(0x21000, 0x21fff).ram().w(this, FUNC(cb2001_state::cb2001_bg_w)).share("vrabg"); + map(0x21000, 0x21fff).ram().w(FUNC(cb2001_state::cb2001_bg_w)).share("vrabg"); map(0xc0000, 0xfffff).rom().region("boot_prg", 0); } @@ -584,9 +584,9 @@ void cb2001_state::cb2001_io(address_map &map) map(0x21, 0x21).r("aysnd", FUNC(ay8910_device::data_r)); map(0x22, 0x23).w("aysnd", FUNC(ay8910_device::data_address_w)); - map(0x30, 0x30).r(this, FUNC(cb2001_state::irq_ack_r)); - map(0x30, 0x31).w(this, FUNC(cb2001_state::cb2001_vidctrl_w)); - map(0x32, 0x33).w(this, FUNC(cb2001_state::cb2001_vidctrl2_w)); + map(0x30, 0x30).r(FUNC(cb2001_state::irq_ack_r)); + map(0x30, 0x31).w(FUNC(cb2001_state::cb2001_vidctrl_w)); + map(0x32, 0x33).w(FUNC(cb2001_state::cb2001_vidctrl2_w)); } static INPUT_PORTS_START( cb2001 ) diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp index 761633c8062..103ca5bde75 100644 --- a/src/mame/drivers/cball.cpp +++ b/src/mame/drivers/cball.cpp @@ -166,7 +166,7 @@ void cball_state::cpu_map(address_map &map) { map.global_mask(0x7fff); - map(0x0000, 0x03ff).r(this, FUNC(cball_state::wram_r)).mask(0x7f); + map(0x0000, 0x03ff).r(FUNC(cball_state::wram_r)).mask(0x7f); map(0x0400, 0x07ff).readonly(); map(0x1001, 0x1001).portr("1001"); map(0x1003, 0x1003).portr("1003"); @@ -176,8 +176,8 @@ void cball_state::cpu_map(address_map &map) map(0x2000, 0x2001).noprw(); map(0x2800, 0x2800).portr("2800"); - map(0x0000, 0x03ff).w(this, FUNC(cball_state::wram_w)).mask(0x7f); - map(0x0400, 0x07ff).w(this, FUNC(cball_state::vram_w)).share("video_ram"); + map(0x0000, 0x03ff).w(FUNC(cball_state::wram_w)).mask(0x7f); + map(0x0400, 0x07ff).w(FUNC(cball_state::vram_w)).share("video_ram"); map(0x1800, 0x1800).noprw(); /* watchdog? */ map(0x1810, 0x1811).noprw(); map(0x1820, 0x1821).noprw(); diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp index 4cf9f1824a1..ff2d767551a 100644 --- a/src/mame/drivers/cbasebal.cpp +++ b/src/mame/drivers/cbasebal.cpp @@ -98,7 +98,7 @@ void cbasebal_state::cbasebal_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xcfff).rw(this, FUNC(cbasebal_state::bankedram_r), FUNC(cbasebal_state::bankedram_w)).share("palette"); /* palette + vram + scrollram */ + map(0xc000, 0xcfff).rw(FUNC(cbasebal_state::bankedram_r), FUNC(cbasebal_state::bankedram_w)).share("palette"); /* palette + vram + scrollram */ map(0xe000, 0xfdff).ram(); /* work RAM */ map(0xfe00, 0xffff).ram().share("spriteram"); } @@ -112,19 +112,19 @@ void cbasebal_state::decrypted_opcodes_map(address_map &map) void cbasebal_state::cbasebal_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(cbasebal_state::cbasebal_bankswitch_w)); + map(0x00, 0x00).w(FUNC(cbasebal_state::cbasebal_bankswitch_w)); map(0x01, 0x01).portw("IO_01"); map(0x02, 0x02).portw("IO_02"); map(0x03, 0x03).portw("IO_03"); map(0x05, 0x05).w("oki", FUNC(okim6295_device::write)); map(0x06, 0x07).w("ymsnd", FUNC(ym2413_device::write)); - map(0x08, 0x09).w(this, FUNC(cbasebal_state::cbasebal_scrollx_w)); - map(0x0a, 0x0b).w(this, FUNC(cbasebal_state::cbasebal_scrolly_w)); + map(0x08, 0x09).w(FUNC(cbasebal_state::cbasebal_scrollx_w)); + map(0x0a, 0x0b).w(FUNC(cbasebal_state::cbasebal_scrolly_w)); map(0x10, 0x10).portr("P1"); map(0x11, 0x11).portr("P2"); map(0x12, 0x12).portr("SYSTEM"); - map(0x13, 0x13).w(this, FUNC(cbasebal_state::cbasebal_gfxctrl_w)); - map(0x14, 0x14).w(this, FUNC(cbasebal_state::cbasebal_coinctrl_w)); + map(0x13, 0x13).w(FUNC(cbasebal_state::cbasebal_gfxctrl_w)); + map(0x14, 0x14).w(FUNC(cbasebal_state::cbasebal_coinctrl_w)); } diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index c4591c70ba0..eda8c8d6bdc 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -1159,7 +1159,7 @@ READ8_MEMBER( p500_state::vic_colorram_r ) void cbm2_state::cbm2_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(cbm2_state::read), FUNC(cbm2_state::write)); + map(0x00000, 0xfffff).rw(FUNC(cbm2_state::read), FUNC(cbm2_state::write)); } @@ -1169,7 +1169,7 @@ void cbm2_state::cbm2_mem(address_map &map) void cbm2_state::ext_mem(address_map &map) { - map(0x00000, 0xeffff).r(this, FUNC(cbm2_state::ext_read)).w(this, FUNC(cbm2_state::ext_write)); + map(0x00000, 0xeffff).r(FUNC(cbm2_state::ext_read)).w(FUNC(cbm2_state::ext_write)); map(0xf0000, 0xf0fff).mirror(0xf000).rom().region(EXT_I8088_TAG, 0); } @@ -1192,7 +1192,7 @@ void cbm2_state::ext_io(address_map &map) void p500_state::p500_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(p500_state::read), FUNC(p500_state::write)); + map(0x00000, 0xfffff).rw(FUNC(p500_state::read), FUNC(p500_state::write)); } @@ -1202,7 +1202,7 @@ void p500_state::p500_mem(address_map &map) void p500_state::vic_videoram_map(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(p500_state::vic_videoram_r)); + map(0x0000, 0x3fff).r(FUNC(p500_state::vic_videoram_r)); } @@ -1212,7 +1212,7 @@ void p500_state::vic_videoram_map(address_map &map) void p500_state::vic_colorram_map(address_map &map) { - map(0x000, 0x3ff).r(this, FUNC(p500_state::vic_colorram_r)); + map(0x000, 0x3ff).r(FUNC(p500_state::vic_colorram_r)); } diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp index 2eb71068b90..65619763907 100644 --- a/src/mame/drivers/cbuster.cpp +++ b/src/mame/drivers/cbuster.cpp @@ -144,9 +144,9 @@ void cbuster_state::twocrude_map(address_map &map) map(0x0b4000, 0x0b4001).nopw(); map(0x0b5000, 0x0b500f).w("tilegen1", FUNC(deco16ic_device::pf_control_w)); map(0x0b6000, 0x0b600f).w("tilegen2", FUNC(deco16ic_device::pf_control_w)); - map(0x0b8000, 0x0b8fff).ram().w(this, FUNC(cbuster_state::palette_w)).share("palette"); - map(0x0b9000, 0x0b9fff).ram().w(this, FUNC(cbuster_state::palette_ext_w)).share("palette_ext"); - map(0x0bc000, 0x0bc00f).rw(this, FUNC(cbuster_state::twocrude_control_r), FUNC(cbuster_state::twocrude_control_w)); + map(0x0b8000, 0x0b8fff).ram().w(FUNC(cbuster_state::palette_w)).share("palette"); + map(0x0b9000, 0x0b9fff).ram().w(FUNC(cbuster_state::palette_ext_w)).share("palette_ext"); + map(0x0bc000, 0x0bc00f).rw(FUNC(cbuster_state::twocrude_control_r), FUNC(cbuster_state::twocrude_control_w)); } diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index 7aec9302296..50cb24f9f8e 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -372,19 +372,19 @@ void cc40_state::main_map(address_map &map) { map.unmap_value_high(); - map(0x0110, 0x0110).rw(this, FUNC(cc40_state::bus_control_r), FUNC(cc40_state::bus_control_w)); - map(0x0111, 0x0111).w(this, FUNC(cc40_state::power_w)); + map(0x0110, 0x0110).rw(FUNC(cc40_state::bus_control_r), FUNC(cc40_state::bus_control_w)); + map(0x0111, 0x0111).w(FUNC(cc40_state::power_w)); map(0x0112, 0x0112).noprw(); // d0-d3: Hexbus data map(0x0113, 0x0113).noprw(); // d0: Hexbus available map(0x0114, 0x0114).noprw(); // d0,d1: Hexbus handshake - map(0x0115, 0x0115).w("dac", FUNC(dac_bit_interface::write)); // d0: piezo control - map(0x0116, 0x0116).r(this, FUNC(cc40_state::battery_r)); - map(0x0119, 0x0119).rw(this, FUNC(cc40_state::bankswitch_r), FUNC(cc40_state::bankswitch_w)); - map(0x011a, 0x011a).rw(this, FUNC(cc40_state::clock_control_r), FUNC(cc40_state::clock_control_w)); + map(0x0115, 0x0115).w("dac", FUNC(dac_bit_interface::data_w)); // d0: piezo control + map(0x0116, 0x0116).r(FUNC(cc40_state::battery_r)); + map(0x0119, 0x0119).rw(FUNC(cc40_state::bankswitch_r), FUNC(cc40_state::bankswitch_w)); + map(0x011a, 0x011a).rw(FUNC(cc40_state::clock_control_r), FUNC(cc40_state::clock_control_w)); map(0x011e, 0x011f).rw("hd44780", FUNC(hd44780_device::read), FUNC(hd44780_device::write)); map(0x0800, 0x0fff).ram().share("sysram.0"); - map(0x1000, 0x4fff).rw(this, FUNC(cc40_state::sysram_r), FUNC(cc40_state::sysram_w)); + map(0x1000, 0x4fff).rw(FUNC(cc40_state::sysram_r), FUNC(cc40_state::sysram_w)); map(0x5000, 0xcfff).bankr("cartbank"); map(0xd000, 0xefff).bankr("sysbank"); } diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp index 122602fec45..8f8824da2ad 100644 --- a/src/mame/drivers/ccastles.cpp +++ b/src/mame/drivers/ccastles.cpp @@ -309,24 +309,24 @@ WRITE8_MEMBER(ccastles_state::nvram_w) /* complete memory map derived from schematics */ void ccastles_state::main_map(address_map &map) { - map(0x0000, 0x7fff).ram().w(this, FUNC(ccastles_state::ccastles_videoram_w)).share("videoram"); - map(0x0000, 0x0001).w(this, FUNC(ccastles_state::ccastles_bitmode_addr_w)); - map(0x0002, 0x0002).rw(this, FUNC(ccastles_state::ccastles_bitmode_r), FUNC(ccastles_state::ccastles_bitmode_w)); + map(0x0000, 0x7fff).ram().w(FUNC(ccastles_state::ccastles_videoram_w)).share("videoram"); + map(0x0000, 0x0001).w(FUNC(ccastles_state::ccastles_bitmode_addr_w)); + map(0x0002, 0x0002).rw(FUNC(ccastles_state::ccastles_bitmode_r), FUNC(ccastles_state::ccastles_bitmode_w)); map(0x8000, 0x8fff).ram(); map(0x8e00, 0x8fff).share("spriteram"); - map(0x9000, 0x90ff).mirror(0x0300).rw(this, FUNC(ccastles_state::nvram_r), FUNC(ccastles_state::nvram_w)); - map(0x9400, 0x9403).mirror(0x01fc).r(this, FUNC(ccastles_state::leta_r)); + map(0x9000, 0x90ff).mirror(0x0300).rw(FUNC(ccastles_state::nvram_r), FUNC(ccastles_state::nvram_w)); + map(0x9400, 0x9403).mirror(0x01fc).r(FUNC(ccastles_state::leta_r)); map(0x9600, 0x97ff).portr("IN0"); map(0x9800, 0x980f).mirror(0x01f0).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x9a00, 0x9a0f).mirror(0x01f0).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x9c00, 0x9c7f).w(this, FUNC(ccastles_state::nvram_recall_w)); - map(0x9c80, 0x9cff).w(this, FUNC(ccastles_state::ccastles_hscroll_w)); - map(0x9d00, 0x9d7f).w(this, FUNC(ccastles_state::ccastles_vscroll_w)); - map(0x9d80, 0x9dff).w(this, FUNC(ccastles_state::irq_ack_w)); + map(0x9c00, 0x9c7f).w(FUNC(ccastles_state::nvram_recall_w)); + map(0x9c80, 0x9cff).w(FUNC(ccastles_state::ccastles_hscroll_w)); + map(0x9d00, 0x9d7f).w(FUNC(ccastles_state::ccastles_vscroll_w)); + map(0x9d80, 0x9dff).w(FUNC(ccastles_state::irq_ack_w)); map(0x9e00, 0x9e7f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x9e80, 0x9e87).mirror(0x0078).w("outlatch0", FUNC(ls259_device::write_d0)); - map(0x9f00, 0x9f07).mirror(0x0078).w(this, FUNC(ccastles_state::ccastles_video_control_w)); - map(0x9f80, 0x9fbf).mirror(0x0040).w(this, FUNC(ccastles_state::ccastles_paletteram_w)); + map(0x9f00, 0x9f07).mirror(0x0078).w(FUNC(ccastles_state::ccastles_video_control_w)); + map(0x9f80, 0x9fbf).mirror(0x0040).w(FUNC(ccastles_state::ccastles_paletteram_w)); map(0xa000, 0xdfff).bankr("bank1"); map(0xe000, 0xffff).rom(); } diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp index ff8a45294dc..b7cc8140575 100644 --- a/src/mame/drivers/cchance.cpp +++ b/src/mame/drivers/cchance.cpp @@ -96,8 +96,8 @@ void cchance_state::main_map(address_map &map) map(0xe800, 0xe800).w(m_seta001, FUNC(seta001_device::spritebgflag_w8)); /* enable / disable background transparency */ map(0xf000, 0xf000).nopr().nopw(); //??? - map(0xf001, 0xf001).r(this, FUNC(cchance_state::input_1_r)).w(this, FUNC(cchance_state::output_0_w)); - map(0xf002, 0xf002).portr("IN0").w(this, FUNC(cchance_state::output_1_w)); + map(0xf001, 0xf001).r(FUNC(cchance_state::input_1_r)).w(FUNC(cchance_state::output_0_w)); + map(0xf002, 0xf002).portr("IN0").w(FUNC(cchance_state::output_1_w)); map(0xf800, 0xf801).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xf801, 0xf801).r("aysnd", FUNC(ay8910_device::data_r)); } diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp index b87c198dcb9..2d1617e9c4f 100644 --- a/src/mame/drivers/cchasm.cpp +++ b/src/mame/drivers/cchasm.cpp @@ -39,10 +39,10 @@ void cchasm_state::memmap(address_map &map) { map(0x000000, 0x00ffff).rom(); map(0x040000, 0x04000f).rw("6840ptm", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); - map(0x050000, 0x050001).w(this, FUNC(cchasm_state::refresh_control_w)); - map(0x060000, 0x060001).portr("DSW").w(this, FUNC(cchasm_state::led_w)); + map(0x050000, 0x050001).w(FUNC(cchasm_state::refresh_control_w)); + map(0x060000, 0x060001).portr("DSW").w(FUNC(cchasm_state::led_w)); map(0x070000, 0x070001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0xf80000, 0xf800ff).rw(this, FUNC(cchasm_state::io_r), FUNC(cchasm_state::io_w)); + map(0xf80000, 0xf800ff).rw(FUNC(cchasm_state::io_r), FUNC(cchasm_state::io_w)); map(0xffb000, 0xffffff).ram().share("ram"); } @@ -58,13 +58,13 @@ void cchasm_state::sound_memmap(address_map &map) map(0x4000, 0x43ff).ram(); map(0x5000, 0x53ff).ram(); map(0x6000, 0x6001).mirror(0xf9e).w("ay1", FUNC(ay8910_device::address_data_w)); - map(0x6000, 0x6000).mirror(0xf9e).r(this, FUNC(cchasm_state::coin_sound_r)); + map(0x6000, 0x6000).mirror(0xf9e).r(FUNC(cchasm_state::coin_sound_r)); map(0x6001, 0x6001).mirror(0xf9e).r("ay1", FUNC(ay8910_device::data_r)); map(0x6020, 0x6021).mirror(0xf9e).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x6021, 0x6021).mirror(0xf9e).r("ay2", FUNC(ay8910_device::data_r)); map(0x6040, 0x6040).mirror(0xf9e).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(m_soundlatch3, FUNC(generic_latch_8_device::write)); - map(0x6041, 0x6041).mirror(0xf9e).rw(this, FUNC(cchasm_state::soundlatch2_r), FUNC(cchasm_state::soundlatch4_w)); - map(0x6061, 0x6061).mirror(0xf9e).w(this, FUNC(cchasm_state::reset_coin_flag_w)); + map(0x6041, 0x6041).mirror(0xf9e).rw(FUNC(cchasm_state::soundlatch2_r), FUNC(cchasm_state::soundlatch4_w)); + map(0x6061, 0x6061).mirror(0xf9e).w(FUNC(cchasm_state::reset_coin_flag_w)); map(0x7041, 0x7041).noprw(); // TODO } diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 67b1d98c97d..088c6d3acac 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -334,7 +334,7 @@ void cclimber_state::cclimber_map(address_map &map) map(0x9800, 0x981f).ram().share("column_scroll"); map(0x9880, 0x989f).ram().share("spriteram"); map(0x98dc, 0x98df).ram().share("bigspritectrl"); - map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); + map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0xa000, 0xa000).portr("P1"); map(0xa800, 0xa800).portr("P2").w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w)); @@ -362,7 +362,7 @@ void cclimber_state::cannonb_map(address_map &map) map(0x9800, 0x981f).ram().share("column_scroll"); map(0x9880, 0x989f).ram().share("spriteram"); map(0x98dc, 0x98df).ram().share("bigspritectrl"); - map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); + map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0xa000, 0xa000).portr("P1"); map(0xa800, 0xa800).portr("P2").w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w)); @@ -379,10 +379,10 @@ void cclimber_state::swimmer_map(address_map &map) map(0x9800, 0x981f).writeonly().share("column_scroll"); map(0x9880, 0x989f).writeonly().share("spriteram"); map(0x98fc, 0x98ff).writeonly().share("bigspritectrl"); - map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); + map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0xa000, 0xa000).portr("P2"); - map(0xa800, 0xa800).portr("P1").w(this, FUNC(cclimber_state::swimmer_sh_soundlatch_w)); + map(0xa800, 0xa800).portr("P1").w(FUNC(cclimber_state::swimmer_sh_soundlatch_w)); map(0xb000, 0xb000).portr("DSW1"); map(0xb800, 0xb800).portr("DSW2").writeonly().share("bgcolor"); map(0xb880, 0xb880).portr("SYSTEM"); @@ -409,7 +409,7 @@ void cclimber_state::yamato_map(address_map &map) map(0x9800, 0x981f).ram().share("column_scroll"); map(0x9880, 0x989f).ram().share("spriteram"); map(0x98dc, 0x98df).ram().share("bigspritectrl"); - map(0x9c00, 0x9fff).ram().w(this, FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); + map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram"); map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0xa000, 0xa000).portr("P1"); map(0xa800, 0xa800).portr("P2"); @@ -458,7 +458,7 @@ void cclimber_state::bagmanf_map(address_map &map) map(0x9800, 0x9800).portr("SYSTEM"); map(0x98dc, 0x98df).ram().share("bigspritectrl"); // wrong map(0x9c00, 0x9fff).ram(); /* not used, but initialized */ - map(0xa000, 0xa000).r(this, FUNC(cclimber_state::bagmanf_a000_r)); + map(0xa000, 0xa000).r(FUNC(cclimber_state::bagmanf_a000_r)); map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0xa800, 0xa800).nopr().w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w)); map(0xb000, 0xb000).portr("DSW").w("cclimber_audio", FUNC(cclimber_audio_device::sample_volume_w)); @@ -481,8 +481,8 @@ void cclimber_state::cclimber_portmap(address_map &map) void cclimber_state::yamato_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(cclimber_state::yamato_p0_w)); /* ??? */ - map(0x01, 0x01).w(this, FUNC(cclimber_state::yamato_p1_w)); /* ??? */ + map(0x00, 0x00).w(FUNC(cclimber_state::yamato_p0_w)); /* ??? */ + map(0x01, 0x01).w(FUNC(cclimber_state::yamato_p1_w)); /* ??? */ } @@ -513,8 +513,8 @@ void cclimber_state::yamato_audio_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x01).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x02, 0x03).w("ay2", FUNC(ay8910_device::address_data_w)); - map(0x04, 0x04).r(this, FUNC(cclimber_state::yamato_p0_r)); /* ??? */ - map(0x08, 0x08).r(this, FUNC(cclimber_state::yamato_p1_r)); /* ??? */ + map(0x04, 0x04).r(FUNC(cclimber_state::yamato_p0_r)); /* ??? */ + map(0x08, 0x08).r(FUNC(cclimber_state::yamato_p1_r)); /* ??? */ } @@ -1141,7 +1141,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cclimber_state::cclimber) root(config); MCFG_DEVICE_MODIFY("mainlatch") // 7J on CCG-1 - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger_w)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger)) /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp index 1a53b57a487..cb26477eea4 100644 --- a/src/mame/drivers/ccs2810.cpp +++ b/src/mame/drivers/ccs2810.cpp @@ -180,21 +180,21 @@ WRITE8_MEMBER(ccs_state::io_write) void ccs_state::ccs2810_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(ccs_state::memory_read), FUNC(ccs_state::memory_write)); + map(0x0000, 0xffff).rw(FUNC(ccs_state::memory_read), FUNC(ccs_state::memory_write)); } void ccs_state::ccs2810_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(ccs_state::io_read), FUNC(ccs_state::io_write)); + map(0x0000, 0xffff).rw(FUNC(ccs_state::io_read), FUNC(ccs_state::io_write)); } void ccs_state::ccs2422_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(ccs_state::io_read), FUNC(ccs_state::io_write)); - map(0x04, 0x04).mirror(0xff00).rw(this, FUNC(ccs_state::port04_r), FUNC(ccs_state::port04_w)); + map(0x0000, 0xffff).rw(FUNC(ccs_state::io_read), FUNC(ccs_state::io_write)); + map(0x04, 0x04).mirror(0xff00).rw(FUNC(ccs_state::port04_r), FUNC(ccs_state::port04_w)); map(0x30, 0x33).mirror(0xff00).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write)); - map(0x34, 0x34).mirror(0xff00).rw(this, FUNC(ccs_state::port34_r), FUNC(ccs_state::port34_w)); - map(0x40, 0x40).mirror(0xff00).w(this, FUNC(ccs_state::port40_w)); + map(0x34, 0x34).mirror(0xff00).rw(FUNC(ccs_state::port34_r), FUNC(ccs_state::port34_w)); + map(0x40, 0x40).mirror(0xff00).w(FUNC(ccs_state::port40_w)); } /* Input ports */ diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp index 753e9e26f0d..a852ac599f8 100644 --- a/src/mame/drivers/ccs300.cpp +++ b/src/mame/drivers/ccs300.cpp @@ -63,7 +63,7 @@ void ccs300_state::ccs300_io(address_map &map) map(0x18, 0x1b).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // init bytes seem to be for a CTC map(0x30, 0x33); // fdc? map(0x34, 0x34); // motor control? - map(0x40, 0x40).w(this, FUNC(ccs300_state::port40_w)); + map(0x40, 0x40).w(FUNC(ccs300_state::port40_w)); map(0xf0, 0xf0); // unknown, long sequence of init bytes map(0xf2, 0xf2); // dip or jumper? } diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index 277f48b31e9..e37dda0fcdd 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -132,7 +132,7 @@ void cd2650_state::cd2650_io(address_map &map) void cd2650_state::cd2650_data(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(this, FUNC(cd2650_state::keyin_r)).w("outlatch", FUNC(f9334_device::write_nibble_d3)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(cd2650_state::keyin_r)).w("outlatch", FUNC(f9334_device::write_nibble_d3)); } /* Input ports */ diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp index 6b44e98d1a8..6b8506e55da 100644 --- a/src/mame/drivers/cdc721.cpp +++ b/src/mame/drivers/cdc721.cpp @@ -171,7 +171,7 @@ void cdc721_state::block0_map(address_map &map) void cdc721_state::block4_map(address_map &map) { - map(0x0000, 0x00ff).mirror(0x2700).ram().share("nvram").w(this, FUNC(cdc721_state::nvram_w)); + map(0x0000, 0x00ff).mirror(0x2700).ram().share("nvram").w(FUNC(cdc721_state::nvram_w)); map(0x0800, 0x0bff).mirror(0x2400).ram().share("chargen"); // 2x P2114AL-2 map(0x8000, 0xbfff).rom().region("16krom", 0); map(0xc000, 0xffff).ram(); @@ -187,7 +187,7 @@ void cdc721_state::blockc_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x3fff).ram().share("videoram"); - map(0x4000, 0x40ff).mirror(0x2700).ram().share("nvram").w(this, FUNC(cdc721_state::nvram_w)); + map(0x4000, 0x40ff).mirror(0x2700).ram().share("nvram").w(FUNC(cdc721_state::nvram_w)); map(0x4800, 0x4bff).mirror(0x2400).ram().share("chargen"); } @@ -199,8 +199,8 @@ void cdc721_state::io_map(address_map &map) map(0x20, 0x27).rw("kbduart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); map(0x30, 0x33).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x40, 0x47).rw("comuart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); - map(0x50, 0x50).w("ledlatch", FUNC(output_latch_device::write)); - map(0x70, 0x70).w(this, FUNC(cdc721_state::block_select_w)); + map(0x50, 0x50).w("ledlatch", FUNC(output_latch_device::bus_w)); + map(0x70, 0x70).w(FUNC(cdc721_state::block_select_w)); map(0x80, 0x87).rw("pauart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); map(0x90, 0x97).rw("pbuart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); } diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp index ce9c10f1553..eda94167e4a 100644 --- a/src/mame/drivers/cdi.cpp +++ b/src/mame/drivers/cdi.cpp @@ -131,14 +131,14 @@ void cdi_state::cdi910_mem(address_map &map) void cdi_state::cdimono2_servo_mem(address_map &map) { - map(0x0000, 0x001f).rw(this, FUNC(cdi_state::servo_io_r), FUNC(cdi_state::servo_io_w)); + map(0x0000, 0x001f).rw(FUNC(cdi_state::servo_io_r), FUNC(cdi_state::servo_io_w)); map(0x0050, 0x00ff).ram(); map(0x0100, 0x1fff).rom().region("servo", 0x100); } void cdi_state::cdimono2_slave_mem(address_map &map) { - map(0x0000, 0x001f).rw(this, FUNC(cdi_state::slave_io_r), FUNC(cdi_state::slave_io_w)); + map(0x0000, 0x001f).rw(FUNC(cdi_state::slave_io_r), FUNC(cdi_state::slave_io_w)); map(0x0050, 0x00ff).ram(); map(0x0100, 0x1fff).rom().region("slave", 0x100); } diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp index c6493417748..242bf24ca8e 100644 --- a/src/mame/drivers/cedar_magnet.cpp +++ b/src/mame/drivers/cedar_magnet.cpp @@ -246,9 +246,9 @@ void cedar_magnet_state::cedar_magnet_mainboard_sub_pal_map(address_map &map) { // these are 3x MOTOROLA MM2114N SRAM 4096 bit RAM (twice the size because we map bytes, but only 4 bits are used) // these are on the master board memory sub-board - map(0x2400, 0x27ff).ram().w(this, FUNC(cedar_magnet_state::palette_r_w)).share("pal_r"); - map(0x2800, 0x2bff).ram().w(this, FUNC(cedar_magnet_state::palette_g_w)).share("pal_g"); - map(0x3000, 0x33ff).ram().w(this, FUNC(cedar_magnet_state::palette_b_w)).share("pal_b"); + map(0x2400, 0x27ff).ram().w(FUNC(cedar_magnet_state::palette_r_w)).share("pal_r"); + map(0x2800, 0x2bff).ram().w(FUNC(cedar_magnet_state::palette_g_w)).share("pal_g"); + map(0x3000, 0x33ff).ram().w(FUNC(cedar_magnet_state::palette_b_w)).share("pal_b"); } void cedar_magnet_state::cedar_magnet_mainboard_sub_ram_map(address_map &map) @@ -267,10 +267,10 @@ void cedar_magnet_state::cedar_magnet_io(address_map &map) { map.global_mask(0xff); - map(0x18, 0x18).rw(this, FUNC(cedar_magnet_state::port18_r), FUNC(cedar_magnet_state::port18_w)); - map(0x19, 0x19).rw(this, FUNC(cedar_magnet_state::port19_r), FUNC(cedar_magnet_state::port19_w)); - map(0x1a, 0x1a).r(this, FUNC(cedar_magnet_state::port1a_r)); - map(0x1b, 0x1b).w(this, FUNC(cedar_magnet_state::port1b_w)); + map(0x18, 0x18).rw(FUNC(cedar_magnet_state::port18_r), FUNC(cedar_magnet_state::port18_w)); + map(0x19, 0x19).rw(FUNC(cedar_magnet_state::port19_r), FUNC(cedar_magnet_state::port19_w)); + map(0x1a, 0x1a).r(FUNC(cedar_magnet_state::port1a_r)); + map(0x1b, 0x1b).w(FUNC(cedar_magnet_state::port1b_w)); map(0x20, 0x23).rw(m_ic48_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x40, 0x43).rw(m_ic49_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); @@ -282,10 +282,10 @@ void cedar_magnet_state::cedar_magnet_io(address_map &map) map(0x6c, 0x6c).portr("TEST"); // banking / access controls to the sub-board memory - map(0x70, 0x70).w(this, FUNC(cedar_magnet_state::rambank_palbank_w)); - map(0x74, 0x74).w(this, FUNC(cedar_magnet_state::palupload_w)); - map(0x78, 0x78).rw(this, FUNC(cedar_magnet_state::watchdog_r), FUNC(cedar_magnet_state::paladdr_w)); - map(0x7c, 0x7c).r(this, FUNC(cedar_magnet_state::port7c_r)); // protection?? + map(0x70, 0x70).w(FUNC(cedar_magnet_state::rambank_palbank_w)); + map(0x74, 0x74).w(FUNC(cedar_magnet_state::palupload_w)); + map(0x78, 0x78).rw(FUNC(cedar_magnet_state::watchdog_r), FUNC(cedar_magnet_state::paladdr_w)); + map(0x7c, 0x7c).r(FUNC(cedar_magnet_state::port7c_r)); // protection?? map(0xff, 0xff).w(m_cedsound, FUNC(cedar_magnet_sound_device::sound_command_w)); } @@ -301,7 +301,7 @@ void cedar_magnet_state::cedar_bank0(address_map &map) /* memory configuration 2*/ map(0x20000, 0x2bfff).m(m_sub_ram_bankdev, FUNC(address_map_bank_device::amap8)); - map(0x2c000, 0x2ffff).rw(this, FUNC(cedar_magnet_state::other_cpu_r), FUNC(cedar_magnet_state::other_cpu_w)); + map(0x2c000, 0x2ffff).rw(FUNC(cedar_magnet_state::other_cpu_r), FUNC(cedar_magnet_state::other_cpu_w)); /* memory configuration 3*/ map(0x30000, 0x31fff).rom().region("maincpu", 0x0000).mirror(0x0e000); diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp index 4320ccc5e10..e0d4913c401 100644 --- a/src/mame/drivers/centiped.cpp +++ b/src/mame/drivers/centiped.cpp @@ -655,19 +655,19 @@ void centiped_state::centiped_base_map(address_map &map) { map.global_mask(0x3fff); map(0x0000, 0x03ff).ram().share("rambase"); - map(0x0400, 0x07bf).ram().w(this, FUNC(centiped_state::centiped_videoram_w)).share("videoram"); + map(0x0400, 0x07bf).ram().w(FUNC(centiped_state::centiped_videoram_w)).share("videoram"); map(0x07c0, 0x07ff).ram().share("spriteram"); map(0x0800, 0x0800).portr("DSW1"); map(0x0801, 0x0801).portr("DSW2"); - map(0x0c00, 0x0c00).r(this, FUNC(centiped_state::centiped_IN0_r)); + map(0x0c00, 0x0c00).r(FUNC(centiped_state::centiped_IN0_r)); map(0x0c01, 0x0c01).portr("IN1"); - map(0x0c02, 0x0c02).r(this, FUNC(centiped_state::centiped_IN2_r)); + map(0x0c02, 0x0c02).r(FUNC(centiped_state::centiped_IN2_r)); map(0x0c03, 0x0c03).portr("IN3"); - map(0x1400, 0x140f).w(this, FUNC(centiped_state::centiped_paletteram_w)).share("paletteram"); + map(0x1400, 0x140f).w(FUNC(centiped_state::centiped_paletteram_w)).share("paletteram"); map(0x1600, 0x163f).nopr().w("earom", FUNC(atari_vg_earom_device::write)); map(0x1680, 0x1680).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x1700, 0x173f).r("earom", FUNC(atari_vg_earom_device::read)); - map(0x1800, 0x1800).w(this, FUNC(centiped_state::irq_ack_w)); + map(0x1800, 0x1800).w(FUNC(centiped_state::irq_ack_w)); map(0x1c00, 0x1c07).nopr().w("outlatch", FUNC(ls259_device::write_d7)); map(0x2000, 0x2000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x2000, 0x3fff).rom(); @@ -695,21 +695,21 @@ void centiped_state::centipdb_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x03ff).mirror(0x4000).ram(); - map(0x0400, 0x07bf).mirror(0x4000).ram().w(this, FUNC(centiped_state::centiped_videoram_w)).share("videoram"); + map(0x0400, 0x07bf).mirror(0x4000).ram().w(FUNC(centiped_state::centiped_videoram_w)).share("videoram"); map(0x07c0, 0x07ff).mirror(0x4000).ram().share("spriteram"); map(0x0800, 0x0800).mirror(0x4000).portr("DSW1"); map(0x0801, 0x0801).mirror(0x4000).portr("DSW2"); - map(0x0c00, 0x0c00).mirror(0x4000).r(this, FUNC(centiped_state::centiped_IN0_r)); + map(0x0c00, 0x0c00).mirror(0x4000).r(FUNC(centiped_state::centiped_IN0_r)); map(0x0c01, 0x0c01).mirror(0x4000).portr("IN1"); - map(0x0c02, 0x0c02).mirror(0x4000).r(this, FUNC(centiped_state::centiped_IN2_r)); + map(0x0c02, 0x0c02).mirror(0x4000).r(FUNC(centiped_state::centiped_IN2_r)); map(0x0c03, 0x0c03).mirror(0x4000).portr("IN3"); map(0x1000, 0x1001).mirror(0x4000).w(m_aysnd, FUNC(ay8910_device::data_address_w)); map(0x1001, 0x1001).mirror(0x4000).r(m_aysnd, FUNC(ay8910_device::data_r)); - map(0x1400, 0x140f).mirror(0x4000).w(this, FUNC(centiped_state::centiped_paletteram_w)).share("paletteram"); + map(0x1400, 0x140f).mirror(0x4000).w(FUNC(centiped_state::centiped_paletteram_w)).share("paletteram"); map(0x1600, 0x163f).mirror(0x4000).w("earom", FUNC(atari_vg_earom_device::write)); map(0x1680, 0x1680).mirror(0x4000).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x1700, 0x173f).mirror(0x4000).r("earom", FUNC(atari_vg_earom_device::read)); - map(0x1800, 0x1800).mirror(0x4000).w(this, FUNC(centiped_state::irq_ack_w)); + map(0x1800, 0x1800).mirror(0x4000).w(FUNC(centiped_state::irq_ack_w)); map(0x1c00, 0x1c07).mirror(0x4000).w("outlatch", FUNC(ls259_device::write_d7)); map(0x2000, 0x27ff).rom(); map(0x2800, 0x3fff).mirror(0x4000).rom(); @@ -728,8 +728,8 @@ void centiped_state::magworm_map(address_map &map) void centiped_state::caterplr_map(address_map &map) { centiped_base_map(map); - map(0x1780, 0x1780).r(this, FUNC(centiped_state::caterplr_unknown_r)); - map(0x1000, 0x100f).rw(this, FUNC(centiped_state::caterplr_AY8910_r), FUNC(centiped_state::caterplr_AY8910_w)); + map(0x1780, 0x1780).r(FUNC(centiped_state::caterplr_unknown_r)); + map(0x1000, 0x100f).rw(FUNC(centiped_state::caterplr_AY8910_r), FUNC(centiped_state::caterplr_AY8910_w)); } WRITE8_MEMBER(centiped_state::caterplr_AY8910_w) @@ -758,16 +758,16 @@ void centiped_state::milliped_map(address_map &map) map(0x0000, 0x03ff).ram(); map(0x0400, 0x040f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x0800, 0x080f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1000, 0x13bf).ram().w(this, FUNC(centiped_state::centiped_videoram_w)).share("videoram"); + map(0x1000, 0x13bf).ram().w(FUNC(centiped_state::centiped_videoram_w)).share("videoram"); map(0x13c0, 0x13ff).ram().share("spriteram"); - map(0x2000, 0x2000).r(this, FUNC(centiped_state::centiped_IN0_r)); - map(0x2001, 0x2001).r(this, FUNC(centiped_state::milliped_IN1_r)); - map(0x2010, 0x2010).r(this, FUNC(centiped_state::milliped_IN2_r)); + map(0x2000, 0x2000).r(FUNC(centiped_state::centiped_IN0_r)); + map(0x2001, 0x2001).r(FUNC(centiped_state::milliped_IN1_r)); + map(0x2010, 0x2010).r(FUNC(centiped_state::milliped_IN2_r)); map(0x2011, 0x2011).portr("IN3"); map(0x2030, 0x2030).r("earom", FUNC(atari_vg_earom_device::read)); - map(0x2480, 0x249f).w(this, FUNC(centiped_state::milliped_paletteram_w)).share("paletteram"); + map(0x2480, 0x249f).w(FUNC(centiped_state::milliped_paletteram_w)).share("paletteram"); map(0x2500, 0x2507).w("outlatch", FUNC(ls259_device::write_d7)); - map(0x2600, 0x2600).w(this, FUNC(centiped_state::irq_ack_w)); + map(0x2600, 0x2600).w(FUNC(centiped_state::irq_ack_w)); map(0x2680, 0x2680).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x2700, 0x2700).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x2780, 0x27bf).w("earom", FUNC(atari_vg_earom_device::write)); @@ -803,25 +803,25 @@ void centiped_state::multiped_map(address_map &map) map(0x0000, 0x03ff).ram(); map(0x0400, 0x040f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x0800, 0x080f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1000, 0x13bf).ram().w(this, FUNC(centiped_state::centiped_videoram_w)).share("videoram"); + map(0x1000, 0x13bf).ram().w(FUNC(centiped_state::centiped_videoram_w)).share("videoram"); map(0x13c0, 0x13ff).ram().share("spriteram"); - map(0x2000, 0x2000).r(this, FUNC(centiped_state::centiped_IN0_r)); - map(0x2001, 0x2001).r(this, FUNC(centiped_state::milliped_IN1_r)); - map(0x2010, 0x2010).r(this, FUNC(centiped_state::milliped_IN2_r)); + map(0x2000, 0x2000).r(FUNC(centiped_state::centiped_IN0_r)); + map(0x2001, 0x2001).r(FUNC(centiped_state::milliped_IN1_r)); + map(0x2010, 0x2010).r(FUNC(centiped_state::milliped_IN2_r)); map(0x2011, 0x2011).portr("IN3"); map(0x2030, 0x2030).nopr(); - map(0x2480, 0x249f).w(this, FUNC(centiped_state::milliped_paletteram_w)).share("paletteram"); + map(0x2480, 0x249f).w(FUNC(centiped_state::milliped_paletteram_w)).share("paletteram"); map(0x2500, 0x2507).w("outlatch", FUNC(ls259_device::write_d7)); - map(0x2600, 0x2600).w(this, FUNC(centiped_state::irq_ack_w)); + map(0x2600, 0x2600).w(FUNC(centiped_state::irq_ack_w)); map(0x2680, 0x2680).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x2700, 0x2700).nopw(); map(0x2780, 0x27bf).nopw(); map(0x4000, 0x5fff).rom(); map(0x6000, 0x7fff).mirror(0x8000).rom(); map(0x8000, 0xbfff).rom(); - map(0xd000, 0xd7ff).w(this, FUNC(centiped_state::multiped_eeprom_w)); - map(0xd800, 0xd800).mirror(0x03ff).rw(this, FUNC(centiped_state::multiped_eeprom_r), FUNC(centiped_state::multiped_prgbank_w)); - map(0xdc00, 0xdc00).mirror(0x03ff).w(this, FUNC(centiped_state::multiped_gfxbank_w)); + map(0xd000, 0xd7ff).w(FUNC(centiped_state::multiped_eeprom_w)); + map(0xd800, 0xd800).mirror(0x03ff).rw(FUNC(centiped_state::multiped_eeprom_r), FUNC(centiped_state::multiped_prgbank_w)); + map(0xdc00, 0xdc00).mirror(0x03ff).w(FUNC(centiped_state::multiped_gfxbank_w)); } READ8_MEMBER(centiped_state::multiped_eeprom_r) @@ -875,14 +875,14 @@ void centiped_state::warlords_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07bf).ram().w(this, FUNC(centiped_state::centiped_videoram_w)).share("videoram"); + map(0x0400, 0x07bf).ram().w(FUNC(centiped_state::centiped_videoram_w)).share("videoram"); map(0x07c0, 0x07ff).ram().share("spriteram"); map(0x0800, 0x0800).portr("DSW1"); map(0x0801, 0x0801).portr("DSW2"); map(0x0c00, 0x0c00).portr("IN0"); map(0x0c01, 0x0c01).portr("IN1"); map(0x1000, 0x100f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1800, 0x1800).w(this, FUNC(centiped_state::irq_ack_w)); + map(0x1800, 0x1800).w(FUNC(centiped_state::irq_ack_w)); map(0x1c00, 0x1c07).w("outlatch", FUNC(ls259_device::write_d7)); map(0x4000, 0x4000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x5000, 0x7fff).rom(); @@ -902,18 +902,18 @@ void centiped_state::mazeinv_map(address_map &map) map(0x0000, 0x03ff).ram(); map(0x0400, 0x040f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x0800, 0x080f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x1000, 0x13bf).ram().w(this, FUNC(centiped_state::centiped_videoram_w)).share("videoram"); + map(0x1000, 0x13bf).ram().w(FUNC(centiped_state::centiped_videoram_w)).share("videoram"); map(0x13c0, 0x13ff).ram().share("spriteram"); map(0x2000, 0x2000).portr("IN0"); map(0x2001, 0x2001).portr("IN1"); map(0x2010, 0x2010).portr("IN2"); map(0x2011, 0x2011).portr("IN3"); - map(0x2020, 0x2020).r(this, FUNC(centiped_state::mazeinv_input_r)); + map(0x2020, 0x2020).r(FUNC(centiped_state::mazeinv_input_r)); map(0x2030, 0x2030).r("earom", FUNC(atari_vg_earom_device::read)); - map(0x2480, 0x249f).w(this, FUNC(centiped_state::mazeinv_paletteram_w)).share("paletteram"); + map(0x2480, 0x249f).w(FUNC(centiped_state::mazeinv_paletteram_w)).share("paletteram"); map(0x2500, 0x2507).w("outlatch", FUNC(ls259_device::write_d7)); - map(0x2580, 0x2583).w(this, FUNC(centiped_state::mazeinv_input_select_w)); - map(0x2600, 0x2600).w(this, FUNC(centiped_state::irq_ack_w)); + map(0x2580, 0x2583).w(FUNC(centiped_state::mazeinv_input_select_w)); + map(0x2600, 0x2600).w(FUNC(centiped_state::irq_ack_w)); map(0x2680, 0x2680).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x2700, 0x2700).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x2780, 0x27bf).w("earom", FUNC(atari_vg_earom_device::write)); @@ -932,17 +932,17 @@ void centiped_state::bullsdrt_map(address_map &map) { map(0x0000, 0x0fff).rom(); map(0x1000, 0x1000).mirror(0x6000).portr("DSW1"); - map(0x1080, 0x1080).mirror(0x6000).r(this, FUNC(centiped_state::centiped_IN0_r)); + map(0x1080, 0x1080).mirror(0x6000).r(FUNC(centiped_state::centiped_IN0_r)); map(0x1081, 0x1081).mirror(0x6000).portr("IN1"); - map(0x1082, 0x1082).mirror(0x6000).r(this, FUNC(centiped_state::centiped_IN2_r)); + map(0x1082, 0x1082).mirror(0x6000).r(FUNC(centiped_state::centiped_IN2_r)); map(0x1200, 0x123f).mirror(0x6000).rw("earom", FUNC(atari_vg_earom_device::read), FUNC(atari_vg_earom_device::write)); map(0x1280, 0x1280).mirror(0x6000).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); map(0x1300, 0x1300).mirror(0x6000).portr("DSW2"); - map(0x1400, 0x140f).mirror(0x6000).w(this, FUNC(centiped_state::centiped_paletteram_w)).share("paletteram"); + map(0x1400, 0x140f).mirror(0x6000).w(FUNC(centiped_state::centiped_paletteram_w)).share("paletteram"); map(0x1480, 0x1487).mirror(0x6000).w("outlatch", FUNC(ls259_device::write_d7)); map(0x1500, 0x1500).mirror(0x6000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x1580, 0x1580).mirror(0x6000).noprw(); - map(0x1800, 0x1bbf).mirror(0x6000).w(this, FUNC(centiped_state::centiped_videoram_w)).share("videoram"); + map(0x1800, 0x1bbf).mirror(0x6000).w(FUNC(centiped_state::centiped_videoram_w)).share("videoram"); map(0x1bc0, 0x1bff).mirror(0x6000).ram().share("spriteram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x2fff).rom(); @@ -952,13 +952,13 @@ void centiped_state::bullsdrt_map(address_map &map) void centiped_state::bullsdrt_port_map(address_map &map) { - map(0x00, 0x00).w(this, FUNC(centiped_state::bullsdrt_sprites_bank_w)); - map(0x20, 0x3f).w(this, FUNC(centiped_state::bullsdrt_tilesbank_w)).share("bullsdrt_bank"); + map(0x00, 0x00).w(FUNC(centiped_state::bullsdrt_sprites_bank_w)); + map(0x20, 0x3f).w(FUNC(centiped_state::bullsdrt_tilesbank_w)).share("bullsdrt_bank"); } void centiped_state::bullsdrt_data_map(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(this, FUNC(centiped_state::bullsdrt_data_port_r)).w("snsnd", FUNC(sn76496_device::write)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(centiped_state::bullsdrt_data_port_r)).w("snsnd", FUNC(sn76496_device::command_w)); } diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp index a84fc2a9147..893d94232c6 100644 --- a/src/mame/drivers/cesclass.cpp +++ b/src/mame/drivers/cesclass.cpp @@ -131,13 +131,13 @@ void cesclassic_state::cesclassic_map(address_map &map) map(0x400000, 0x40cfff).ram(); map(0x40d000, 0x40ffff).ram().share("vram"); map(0x410000, 0x410001).portr("VBLANK"); //probably m68681 lies there instead - map(0x410004, 0x410005).w(this, FUNC(cesclassic_state::irq3_ack_w)); - map(0x410006, 0x410007).w(this, FUNC(cesclassic_state::irq2_ack_w)); + map(0x410004, 0x410005).w(FUNC(cesclassic_state::irq3_ack_w)); + map(0x410006, 0x410007).w(FUNC(cesclassic_state::irq2_ack_w)); map(0x480000, 0x481fff).ram().share("nvram"); //8k according to schematics (games doesn't use that much tho) map(0x600000, 0x600001).portr("SYSTEM"); - map(0x610000, 0x610001).w(this, FUNC(cesclassic_state::outputs_w)); + map(0x610000, 0x610001).w(FUNC(cesclassic_state::outputs_w)); // AM_RANGE(0x640000, 0x640001) AM_WRITENOP - map(0x640040, 0x640041).w(this, FUNC(cesclassic_state::lamps_w)); + map(0x640040, 0x640041).w(FUNC(cesclassic_state::lamps_w)); map(0x670000, 0x670001).portr("DSW"); map(0x70ff00, 0x70ff01).nopw(); // writes 0xffff at irq 3 end of service, watchdog? map(0x900001, 0x900001).r(m_oki, FUNC(okim6295_device::read)); // unsure about this ... diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp index 1761ef52ef8..7cb4efc34a7 100644 --- a/src/mame/drivers/cgc7900.cpp +++ b/src/mame/drivers/cgc7900.cpp @@ -310,8 +310,8 @@ READ16_MEMBER(cgc7900_state::unmapped_r) WRITE8_MEMBER(cgc7900_state::baud_write) { - m_dbrg->str_w(data >> 0); - m_dbrg->stt_w(data >> 4); + m_dbrg->write_str(data >> 0); + m_dbrg->write_stt(data >> 4); } WRITE_LINE_MEMBER(cgc7900_state::write_rs232_clock) @@ -339,10 +339,10 @@ void cgc7900_state::cgc7900_mem(address_map &map) map.unmap_value_high(); map(0x000000, 0x1fffff).ram().share("chrom_ram"); map(0x800000, 0x80ffff).rom().region(M68000_TAG, 0); - map(0x810000, 0x9fffff).r(this, FUNC(cgc7900_state::unmapped_r)); - map(0xa00000, 0xbfffff).rw(this, FUNC(cgc7900_state::z_mode_r), FUNC(cgc7900_state::z_mode_w)); + map(0x810000, 0x9fffff).r(FUNC(cgc7900_state::unmapped_r)); + map(0xa00000, 0xbfffff).rw(FUNC(cgc7900_state::z_mode_r), FUNC(cgc7900_state::z_mode_w)); map(0xc00000, 0xdfffff).ram().share("plane_ram"); - map(0xe00000, 0xe1ffff).w(this, FUNC(cgc7900_state::color_status_w)); + map(0xe00000, 0xe1ffff).w(FUNC(cgc7900_state::color_status_w)); // AM_RANGE(0xe20000, 0xe23fff) Raster Processor map(0xe30000, 0xe303ff).ram().share("clut_ram"); map(0xe38000, 0xe3bfff).ram().share("overlay_ram"); @@ -369,22 +369,22 @@ void cgc7900_state::cgc7900_mem(address_map &map) map(0xff8003, 0xff8003).rw(m_i8251_0, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xff8041, 0xff8041).rw(m_i8251_1, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xff8043, 0xff8043).rw(m_i8251_1, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0xff8080, 0xff8081).rw(this, FUNC(cgc7900_state::keyboard_r), FUNC(cgc7900_state::keyboard_w)); + map(0xff8080, 0xff8081).rw(FUNC(cgc7900_state::keyboard_r), FUNC(cgc7900_state::keyboard_w)); // AM_RANGE(0xff80c6, 0xff80c7) Joystick X axis // AM_RANGE(0xff80ca, 0xff80cb) Joystick Y axis // AM_RANGE(0xff80cc, 0xff80cd) Joystick Z axis - map(0xff8100, 0xff8101).rw(this, FUNC(cgc7900_state::disk_data_r), FUNC(cgc7900_state::disk_data_w)); - map(0xff8120, 0xff8121).rw(this, FUNC(cgc7900_state::disk_status_r), FUNC(cgc7900_state::disk_command_w)); + map(0xff8100, 0xff8101).rw(FUNC(cgc7900_state::disk_data_r), FUNC(cgc7900_state::disk_data_w)); + map(0xff8120, 0xff8121).rw(FUNC(cgc7900_state::disk_status_r), FUNC(cgc7900_state::disk_command_w)); map(0xff8140, 0xff8141).portr("BEZEL"); - map(0xff8180, 0xff8180).w(this, FUNC(cgc7900_state::baud_write)); + map(0xff8180, 0xff8180).w(FUNC(cgc7900_state::baud_write)); map(0xff81c0, 0xff81ff).rw(MM58167_TAG, FUNC(mm58167_device::read), FUNC(mm58167_device::write)).umask16(0x00ff); - map(0xff8200, 0xff8201).w(this, FUNC(cgc7900_state::interrupt_mask_w)); + map(0xff8200, 0xff8201).w(FUNC(cgc7900_state::interrupt_mask_w)); // AM_RANGE(0xff8240, 0xff8241) Light Pen enable // AM_RANGE(0xff8242, 0xff8243) Light Pen X value // AM_RANGE(0xff8244, 0xff8245) Light Pen Y value // AM_RANGE(0xff8246, 0xff8247) Buffer memory parity check // AM_RANGE(0xff8248, 0xff8249) Buffer memory parity set/reset - map(0xff824a, 0xff824b).r(this, FUNC(cgc7900_state::sync_r)); + map(0xff824a, 0xff824b).r(FUNC(cgc7900_state::sync_r)); map(0xff83c0, 0xff83c0).w(AY8910_TAG, FUNC(ay8910_device::address_w)); map(0xff83c2, 0xff83c2).r(AY8910_TAG, FUNC(ay8910_device::data_r)); map(0xff83c4, 0xff83c4).w(AY8910_TAG, FUNC(ay8910_device::data_w)); diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp index 1c73863fdaf..8600dc70ac9 100644 --- a/src/mame/drivers/cgenie.cpp +++ b/src/mame/drivers/cgenie.cpp @@ -114,9 +114,9 @@ void cgenie_state::cgenie_mem(address_map &map) map(0x0000, 0x3fff).rom(); // AM_RANGE(0x4000, 0xbfff) AM_RAM // set up in machine_start map(0xc000, 0xefff).noprw(); // cartridge space - map(0xf000, 0xf3ff).rw(this, FUNC(cgenie_state::colorram_r), FUNC(cgenie_state::colorram_w)).share("colorram"); + map(0xf000, 0xf3ff).rw(FUNC(cgenie_state::colorram_r), FUNC(cgenie_state::colorram_w)).share("colorram"); map(0xf400, 0xf7ff).ram().share("fontram"); - map(0xf800, 0xf8ff).mirror(0x300).r(this, FUNC(cgenie_state::keyboard_r)); + map(0xf800, 0xf8ff).mirror(0x300).r(FUNC(cgenie_state::keyboard_r)); map(0xfc00, 0xffff).noprw(); // cartridge space } @@ -127,7 +127,7 @@ void cgenie_state::cgenie_io(address_map &map) map(0xf9, 0xf9).rw("ay8910", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xfa, 0xfa).w(m_crtc, FUNC(hd6845_device::address_w)); map(0xfb, 0xfb).rw(m_crtc, FUNC(hd6845_device::register_r), FUNC(hd6845_device::register_w)); - map(0xff, 0xff).rw(this, FUNC(cgenie_state::control_r), FUNC(cgenie_state::control_w)); + map(0xff, 0xff).rw(FUNC(cgenie_state::control_r), FUNC(cgenie_state::control_w)); } diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp index 8ea9c559342..35cb88e6240 100644 --- a/src/mame/drivers/chaknpop.cpp +++ b/src/mame/drivers/chaknpop.cpp @@ -166,18 +166,18 @@ void chaknpop_state::chaknpop_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0x8800, 0x8800).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0x8801, 0x8801).r(this, FUNC(chaknpop_state::mcu_status_r)); - map(0x8802, 0x8802).w(this, FUNC(chaknpop_state::unknown_port_3_w)); + map(0x8801, 0x8801).r(FUNC(chaknpop_state::mcu_status_r)); + map(0x8802, 0x8802).w(FUNC(chaknpop_state::unknown_port_3_w)); map(0x8804, 0x8805).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0x8806, 0x8807).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0x8808, 0x8808).portr("DSWC"); map(0x8809, 0x8809).portr("P1"); map(0x880a, 0x880a).portr("SYSTEM"); map(0x880b, 0x880b).portr("P2"); - map(0x880c, 0x880c).rw(this, FUNC(chaknpop_state::gfxmode_r), FUNC(chaknpop_state::gfxmode_w)); - map(0x880d, 0x880d).w(this, FUNC(chaknpop_state::coinlock_w)); // coin lock out - map(0x9000, 0x93ff).ram().w(this, FUNC(chaknpop_state::txram_w)).share("tx_ram"); // TX tilemap - map(0x9800, 0x983f).ram().w(this, FUNC(chaknpop_state::attrram_w)).share("attr_ram"); // Color attribute + map(0x880c, 0x880c).rw(FUNC(chaknpop_state::gfxmode_r), FUNC(chaknpop_state::gfxmode_w)); + map(0x880d, 0x880d).w(FUNC(chaknpop_state::coinlock_w)); // coin lock out + map(0x9000, 0x93ff).ram().w(FUNC(chaknpop_state::txram_w)).share("tx_ram"); // TX tilemap + map(0x9800, 0x983f).ram().w(FUNC(chaknpop_state::attrram_w)).share("attr_ram"); // Color attribute map(0x9840, 0x98ff).ram().share("spr_ram"); // sprite map(0xa000, 0xbfff).rom(); map(0xc000, 0xffff).bankrw("bank1"); // bitmap plane 1-4 diff --git a/src/mame/drivers/cham24.cpp b/src/mame/drivers/cham24.cpp index 9ff10888d50..1d109114f3c 100644 --- a/src/mame/drivers/cham24.cpp +++ b/src/mame/drivers/cham24.cpp @@ -223,10 +223,10 @@ void cham24_state::cham24_map(address_map &map) { map(0x0000, 0x07ff).ram(); /* NES RAM */ map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(cham24_state::sprite_dma_w)); - map(0x4016, 0x4016).rw(this, FUNC(cham24_state::cham24_IN0_r), FUNC(cham24_state::cham24_IN0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(this, FUNC(cham24_state::cham24_IN1_r)); /* IN1 - input port 2 / PSG second control register */ - map(0x8000, 0xffff).rom().w(this, FUNC(cham24_state::cham24_mapper_w)); + map(0x4014, 0x4014).w(FUNC(cham24_state::sprite_dma_w)); + map(0x4016, 0x4016).rw(FUNC(cham24_state::cham24_IN0_r), FUNC(cham24_state::cham24_IN0_w)); /* IN0 - input port 1 */ + map(0x4017, 0x4017).r(FUNC(cham24_state::cham24_IN1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x8000, 0xffff).rom().w(FUNC(cham24_state::cham24_mapper_w)); } static INPUT_PORTS_START( cham24 ) diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp index 162d1a71c5d..f4eea5c2f34 100644 --- a/src/mame/drivers/champbas.cpp +++ b/src/mame/drivers/champbas.cpp @@ -185,7 +185,7 @@ void champbas_state::champbas_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x7000, 0x7001).mirror(0x0ffe).w("ay1", FUNC(ay8910_device::data_address_w)); - map(0x8000, 0x87ff).ram().w(this, FUNC(champbas_state::tilemap_w)).share("vram"); + map(0x8000, 0x87ff).ram().w(FUNC(champbas_state::tilemap_w)).share("vram"); map(0x8800, 0x8fff).ram().share("mainram"); map(0xa000, 0xa000).portr("P1"); @@ -212,7 +212,7 @@ void champbas_state::champbasja_map(address_map &map) { champbas_map(map); map(0x6000, 0x63ff).ram(); - map(0x6800, 0x68ff).r(this, FUNC(champbas_state::champbja_protection_r)); + map(0x6800, 0x68ff).r(FUNC(champbas_state::champbja_protection_r)); } // champbasjb appears to have no protection @@ -268,7 +268,7 @@ void champbas_state::champbas_sound_map(address_map &map) map(0x6000, 0x6000).mirror(0x1fff).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x8000, 0x8000).mirror(0x1fff).nopw(); // 4-bit return code to main CPU (not used) map(0xa000, 0xa000).mirror(0x1fff).w("soundlatch", FUNC(generic_latch_8_device::clear_w)); - map(0xc000, 0xc000).mirror(0x1fff).w("dac", FUNC(dac_byte_interface::write)); + map(0xc000, 0xc000).mirror(0x1fff).w("dac", FUNC(dac_byte_interface::data_w)); map(0xe000, 0xe3ff).mirror(0x1c00).ram(); } @@ -277,8 +277,8 @@ void exctsccr_state::exctsccr_sound_map(address_map &map) { map(0x0000, 0x8fff).rom(); map(0xa000, 0xa7ff).ram(); - map(0xc008, 0xc008).w("dac1", FUNC(dac_byte_interface::write)); - map(0xc009, 0xc009).w("dac2", FUNC(dac_byte_interface::write)); + map(0xc008, 0xc008).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0xc009, 0xc009).w("dac2", FUNC(dac_byte_interface::data_w)); map(0xc00c, 0xc00c).w("soundlatch", FUNC(generic_latch_8_device::clear_w)); map(0xc00d, 0xc00d).r("soundlatch", FUNC(generic_latch_8_device::read)); // AM_RANGE(0xc00f, 0xc00f) AM_WRITENOP // ? diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp index 369d0fdb1b6..c6d740f1e26 100644 --- a/src/mame/drivers/champbwl.cpp +++ b/src/mame/drivers/champbwl.cpp @@ -261,13 +261,13 @@ void champbwl_state::champbwl_map(address_map &map) map(0xe300, 0xe303).mirror(0xfc).w(m_seta001, FUNC(seta001_device::spritectrl_w8)); /* control registers (0x80 mirror used by Arkanoid 2) */ map(0xe800, 0xe800).w(m_seta001, FUNC(seta001_device::spritebgflag_w8)); /* enable / disable background transparency */ - map(0xf000, 0xf000).r(this, FUNC(champbwl_state::trackball_r)); + map(0xf000, 0xf000).r(FUNC(champbwl_state::trackball_r)); map(0xf002, 0xf002).portr("IN0"); - map(0xf004, 0xf004).r(this, FUNC(champbwl_state::trackball_reset_r)); + map(0xf004, 0xf004).r(FUNC(champbwl_state::trackball_reset_r)); map(0xf006, 0xf006).portr("IN2"); map(0xf007, 0xf007).portr("IN3"); - map(0xf000, 0xf000).w(this, FUNC(champbwl_state::champbwl_misc_w)); + map(0xf000, 0xf000).w(FUNC(champbwl_state::champbwl_misc_w)); map(0xf002, 0xf002).nopw(); //buttons light? map(0xf004, 0xf004).nopw(); //buttons light? map(0xf006, 0xf006).nopw(); //buttons light? @@ -300,7 +300,7 @@ void champbwl_state::doraemon(address_map &map) map(0xe000, 0xe2ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r8), FUNC(seta001_device::spriteylow_w8)); map(0xe300, 0xe303).w(m_seta001, FUNC(seta001_device::spritectrl_w8)); map(0xe800, 0xe800).w(m_seta001, FUNC(seta001_device::spritebgflag_w8)); /* enable / disable background transparency */ - map(0xf000, 0xf000).portr("IN0").w(this, FUNC(champbwl_state::doraemon_outputs_w)); + map(0xf000, 0xf000).portr("IN0").w(FUNC(champbwl_state::doraemon_outputs_w)); map(0xf002, 0xf002).portr("IN1").nopw(); // Ack? map(0xf004, 0xf004).nopw(); // Ack? map(0xf006, 0xf006).portr("DSW").nopw(); // Ack? diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp index ee4fd7c7c64..2e463f6083f 100644 --- a/src/mame/drivers/chanbara.cpp +++ b/src/mame/drivers/chanbara.cpp @@ -231,11 +231,11 @@ uint32_t chanbara_state::screen_update_chanbara(screen_device &screen, bitmap_in void chanbara_state::chanbara_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x0800, 0x0bff).ram().w(this, FUNC(chanbara_state::chanbara_videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(chanbara_state::chanbara_colorram_w)).share("colorram"); + map(0x0800, 0x0bff).ram().w(FUNC(chanbara_state::chanbara_videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(chanbara_state::chanbara_colorram_w)).share("colorram"); map(0x1000, 0x10ff).ram().share("spriteram"); - map(0x1800, 0x19ff).ram().w(this, FUNC(chanbara_state::chanbara_videoram2_w)).share("videoram2"); - map(0x1a00, 0x1bff).ram().w(this, FUNC(chanbara_state::chanbara_colorram2_w)).share("colorram2"); + map(0x1800, 0x19ff).ram().w(FUNC(chanbara_state::chanbara_videoram2_w)).share("videoram2"); + map(0x1a00, 0x1bff).ram().w(FUNC(chanbara_state::chanbara_colorram2_w)).share("colorram2"); map(0x2000, 0x2000).portr("DSW1"); map(0x2001, 0x2001).portr("SYSTEM"); map(0x2002, 0x2002).portr("P2"); diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp index 24c998e0b6a..915ba6ef0c0 100644 --- a/src/mame/drivers/chance32.cpp +++ b/src/mame/drivers/chance32.cpp @@ -210,26 +210,26 @@ void chance32_state::chance32_map(address_map &map) map(0x0000, 0xcfff).rom(); map(0xd800, 0xdfff).ram(); map(0xe000, 0xefff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(chance32_state::chance32_fgram_w)).share("fgram"); - map(0xf800, 0xffff).ram().w(this, FUNC(chance32_state::chance32_bgram_w)).share("bgram"); + map(0xf000, 0xf7ff).ram().w(FUNC(chance32_state::chance32_fgram_w)).share("fgram"); + map(0xf800, 0xffff).ram().w(FUNC(chance32_state::chance32_bgram_w)).share("bgram"); } void chance32_state::chance32_portmap(address_map &map) { map.global_mask(0xff); map(0x10, 0x10).nopw(); // writing bit3 constantly... watchdog? - map(0x13, 0x13).w(this, FUNC(chance32_state::mux_w)); + map(0x13, 0x13).w(FUNC(chance32_state::mux_w)); map(0x20, 0x20).portr("DSW0"); map(0x21, 0x21).portr("DSW1"); map(0x22, 0x22).portr("DSW2"); map(0x23, 0x23).portr("DSW3"); map(0x24, 0x24).portr("DSW4"); - map(0x25, 0x25).r(this, FUNC(chance32_state::mux_r)); + map(0x25, 0x25).r(FUNC(chance32_state::mux_r)); map(0x26, 0x26).portr("UNK"); // vblank (other bits are checked for different reasons) map(0x30, 0x30).w("crtc", FUNC(mc6845_device::address_w)); map(0x31, 0x31).w("crtc", FUNC(mc6845_device::register_w)); map(0x50, 0x50).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x60, 0x60).w(this, FUNC(chance32_state::muxout_w)); + map(0x60, 0x60).w(FUNC(chance32_state::muxout_w)); } diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp index 1eafde739d4..75d9691887f 100644 --- a/src/mame/drivers/changela.cpp +++ b/src/mame/drivers/changela.cpp @@ -164,16 +164,16 @@ void changela_state::changela_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x83ff).ram().share("spriteram"); /* OBJ0 RAM */ map(0x9000, 0x97ff).ram().share("videoram"); /* OBJ1 RAM */ - map(0xa000, 0xa07f).w(this, FUNC(changela_state::changela_colors_w)).share("colorram"); /* Color 93419 RAM 64x9(nine!!!) bits A0-used as the 8-th bit data input (d0-d7->normal, a0->d8) */ + map(0xa000, 0xa07f).w(FUNC(changela_state::changela_colors_w)).share("colorram"); /* Color 93419 RAM 64x9(nine!!!) bits A0-used as the 8-th bit data input (d0-d7->normal, a0->d8) */ map(0xb000, 0xbfff).rom(); - map(0xc000, 0xc7ff).rw(this, FUNC(changela_state::changela_mem_device_r), FUNC(changela_state::changela_mem_device_w)); /* RAM4 (River Bed RAM); RAM5 (Tree RAM) */ + map(0xc000, 0xc7ff).rw(FUNC(changela_state::changela_mem_device_r), FUNC(changela_state::changela_mem_device_w)); /* RAM4 (River Bed RAM); RAM5 (Tree RAM) */ /* LS138 - U16 */ map(0xc800, 0xc800).nopw(); /* not connected */ - map(0xc900, 0xc900).w(this, FUNC(changela_state::changela_mem_device_select_w)); /* selects the memory device to be accessible at 0xc000-0xc7ff */ - map(0xca00, 0xca00).w(this, FUNC(changela_state::changela_slope_rom_addr_hi_w)); - map(0xcb00, 0xcb00).w(this, FUNC(changela_state::changela_slope_rom_addr_lo_w)); + map(0xc900, 0xc900).w(FUNC(changela_state::changela_mem_device_select_w)); /* selects the memory device to be accessible at 0xc000-0xc7ff */ + map(0xca00, 0xca00).w(FUNC(changela_state::changela_slope_rom_addr_hi_w)); + map(0xcb00, 0xcb00).w(FUNC(changela_state::changela_slope_rom_addr_lo_w)); map(0xd000, 0xd001).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0xd010, 0xd011).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); @@ -182,14 +182,14 @@ void changela_state::changela_map(address_map &map) map(0xd020, 0xd027).w("outlatch", FUNC(ls259_device::write_d0)); /* LS139 - U24 */ - map(0xd024, 0xd024).r(this, FUNC(changela_state::changela_24_r)); - map(0xd025, 0xd025).r(this, FUNC(changela_state::changela_25_r)); - map(0xd028, 0xd028).r(this, FUNC(changela_state::mcu_r)); - map(0xd02c, 0xd02c).r(this, FUNC(changela_state::changela_2c_r)); - map(0xd02d, 0xd02d).r(this, FUNC(changela_state::changela_2d_r)); - - map(0xd030, 0xd030).rw(this, FUNC(changela_state::changela_30_r), FUNC(changela_state::mcu_w)); - map(0xd031, 0xd031).r(this, FUNC(changela_state::changela_31_r)); + map(0xd024, 0xd024).r(FUNC(changela_state::changela_24_r)); + map(0xd025, 0xd025).r(FUNC(changela_state::changela_25_r)); + map(0xd028, 0xd028).r(FUNC(changela_state::mcu_r)); + map(0xd02c, 0xd02c).r(FUNC(changela_state::changela_2c_r)); + map(0xd02d, 0xd02d).r(FUNC(changela_state::changela_2d_r)); + + map(0xd030, 0xd030).rw(FUNC(changela_state::changela_30_r), FUNC(changela_state::mcu_w)); + map(0xd031, 0xd031).r(FUNC(changela_state::changela_31_r)); map(0xe000, 0xe000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* Watchdog */ diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp index 651af71472f..aa5ab511afd 100644 --- a/src/mame/drivers/channelf.cpp +++ b/src/mame/drivers/channelf.cpp @@ -127,10 +127,10 @@ void channelf_state::channelf_map(address_map &map) void channelf_state::channelf_io(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(channelf_state::port_0_r), FUNC(channelf_state::port_0_w)); /* Front panel switches */ - map(0x01, 0x01).rw(this, FUNC(channelf_state::port_1_r), FUNC(channelf_state::port_1_w)); /* Right controller */ - map(0x04, 0x04).rw(this, FUNC(channelf_state::port_4_r), FUNC(channelf_state::port_4_w)); /* Left controller */ - map(0x05, 0x05).rw(this, FUNC(channelf_state::port_5_r), FUNC(channelf_state::port_5_w)); + map(0x00, 0x00).rw(FUNC(channelf_state::port_0_r), FUNC(channelf_state::port_0_w)); /* Front panel switches */ + map(0x01, 0x01).rw(FUNC(channelf_state::port_1_r), FUNC(channelf_state::port_1_w)); /* Right controller */ + map(0x04, 0x04).rw(FUNC(channelf_state::port_4_r), FUNC(channelf_state::port_4_w)); /* Left controller */ + map(0x05, 0x05).rw(FUNC(channelf_state::port_5_r), FUNC(channelf_state::port_5_w)); } diff --git a/src/mame/drivers/chaos.cpp b/src/mame/drivers/chaos.cpp index 50b4c608d13..13d3e84cb96 100644 --- a/src/mame/drivers/chaos.cpp +++ b/src/mame/drivers/chaos.cpp @@ -73,10 +73,10 @@ void chaos_state::mem_map(address_map &map) void chaos_state::io_map(address_map &map) { map.unmap_value_high(); - map(0x1e, 0x1e).r(this, FUNC(chaos_state::port1e_r)); - map(0x1f, 0x1f).rw(this, FUNC(chaos_state::port90_r), FUNC(chaos_state::port1f_w)); - map(0x90, 0x90).r(this, FUNC(chaos_state::port90_r)); - map(0x91, 0x91).r(this, FUNC(chaos_state::port91_r)); + map(0x1e, 0x1e).r(FUNC(chaos_state::port1e_r)); + map(0x1f, 0x1f).rw(FUNC(chaos_state::port90_r), FUNC(chaos_state::port1f_w)); + map(0x90, 0x90).r(FUNC(chaos_state::port90_r)); + map(0x91, 0x91).r(FUNC(chaos_state::port91_r)); map(0x92, 0x92).w(m_terminal, FUNC(generic_terminal_device::write)); } diff --git a/src/mame/drivers/cheekyms.cpp b/src/mame/drivers/cheekyms.cpp index b3a5c2af1bd..a712de57db1 100644 --- a/src/mame/drivers/cheekyms.cpp +++ b/src/mame/drivers/cheekyms.cpp @@ -33,8 +33,8 @@ void cheekyms_state::io_map(address_map &map) map(0x00, 0x00).portr("DSW"); map(0x01, 0x01).portr("INPUTS"); map(0x20, 0x3f).writeonly().share("spriteram"); - map(0x40, 0x40).w(this, FUNC(cheekyms_state::port_40_w)); - map(0x80, 0x80).w(this, FUNC(cheekyms_state::port_80_w)).share("port_80"); + map(0x40, 0x40).w(FUNC(cheekyms_state::port_40_w)); + map(0x80, 0x80).w(FUNC(cheekyms_state::port_80_w)).share("port_80"); } diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp index e63e47e64e8..b451969152b 100644 --- a/src/mame/drivers/chessmst.cpp +++ b/src/mame/drivers/chessmst.cpp @@ -116,7 +116,7 @@ void chessmst_state::chessmst_io(address_map &map) void chessmst_state::chessmstdm_io(address_map &map) { chessmst_io(map); - map(0x4c, 0x4c).w(this, FUNC(chessmst_state::digits_w)); + map(0x4c, 0x4c).w(FUNC(chessmst_state::digits_w)); } WRITE_LINE_MEMBER( chessmst_state::timer_555_w ) diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp index 28a9e016c6a..db4a478c640 100644 --- a/src/mame/drivers/chesstrv.cpp +++ b/src/mame/drivers/chesstrv.cpp @@ -169,18 +169,18 @@ void chesstrv_base_state::chesstrv_mem(address_map &map) void chesstrv_state::chesstrv_io(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(chesstrv_state::ram_addr_r), FUNC(chesstrv_state::ram_addr_w)); - map(0x01, 0x01).w(this, FUNC(chesstrv_state::display_w)); - map(0x04, 0x04).rw(this, FUNC(chesstrv_state::ram_r), FUNC(chesstrv_state::ram_w)); - map(0x05, 0x05).rw(this, FUNC(chesstrv_state::keypad_r), FUNC(chesstrv_state::matrix_w)); + map(0x00, 0x00).rw(FUNC(chesstrv_state::ram_addr_r), FUNC(chesstrv_state::ram_addr_w)); + map(0x01, 0x01).w(FUNC(chesstrv_state::display_w)); + map(0x04, 0x04).rw(FUNC(chesstrv_state::ram_r), FUNC(chesstrv_state::ram_w)); + map(0x05, 0x05).rw(FUNC(chesstrv_state::keypad_r), FUNC(chesstrv_state::matrix_w)); } void borisdpl_state::borisdpl_io(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(borisdpl_state::keypad_r), FUNC(borisdpl_state::matrix_w)); - map(0x01, 0x01).w(this, FUNC(borisdpl_state::display_w)); - map(0x04, 0x04).rw(this, FUNC(borisdpl_state::ram_r), FUNC(borisdpl_state::ram_w)); - map(0x05, 0x05).rw(this, FUNC(borisdpl_state::ram_addr_r), FUNC(borisdpl_state::ram_addr_w)); + map(0x00, 0x00).rw(FUNC(borisdpl_state::keypad_r), FUNC(borisdpl_state::matrix_w)); + map(0x01, 0x01).w(FUNC(borisdpl_state::display_w)); + map(0x04, 0x04).rw(FUNC(borisdpl_state::ram_r), FUNC(borisdpl_state::ram_w)); + map(0x05, 0x05).rw(FUNC(borisdpl_state::ram_addr_r), FUNC(borisdpl_state::ram_addr_w)); } static INPUT_PORTS_START( chesstrv ) diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index 31dc1d710d9..e9813cbf5a9 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -185,7 +185,7 @@ void chexx_state::chexx83_map(address_map &map) { map(0x0000, 0x007f).ram().mirror(0x100); // 6810 - 128 x 8 static RAM map(0x4000, 0x400f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x8000, 0x8000).r(this, FUNC(chexx_state::input_r)); + map(0x8000, 0x8000).r(FUNC(chexx_state::input_r)); map(0xf800, 0xffff).rom().region("maincpu", 0); } @@ -223,9 +223,9 @@ void chexx_state::faceoffh_map(address_map &map) { map(0x0000, 0x007f).ram().mirror(0x100); // M58725P - 2KB map(0x4000, 0x400f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x8000, 0x8000).r(this, FUNC(chexx_state::input_r)); - map(0xa000, 0xa001).w(this, FUNC(chexx_state::ay_w)); - map(0xc000, 0xc000).w(this, FUNC(chexx_state::lamp_w)); + map(0x8000, 0x8000).r(FUNC(chexx_state::input_r)); + map(0xa000, 0xa001).w(FUNC(chexx_state::ay_w)); + map(0xc000, 0xc000).w(FUNC(chexx_state::lamp_w)); map(0xf000, 0xffff).rom().region("maincpu", 0); } diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index d2763836e3c..05f57950bc6 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -1709,7 +1709,7 @@ void chihiro_state::chihiro_map(address_map &map) void chihiro_state::chihiro_map_io(address_map &map) { xbox_base_map_io(map); - map(0x4000, 0x40ff).rw(this, FUNC(chihiro_state::mediaboard_r), FUNC(chihiro_state::mediaboard_w)); + map(0x4000, 0x40ff).rw(FUNC(chihiro_state::mediaboard_r), FUNC(chihiro_state::mediaboard_w)); } static INPUT_PORTS_START(chihiro) diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index 4e2fbd52297..10bdfc58523 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -337,16 +337,16 @@ WRITE_LINE_MEMBER(chinagat_state::saiyugoub1_m5205_irq_w) void chinagat_state::main_map(address_map &map) { map(0x0000, 0x1fff).ram().share("share1"); - map(0x2000, 0x27ff).ram().w(this, FUNC(chinagat_state::ddragon_fgvideoram_w)).share("fgvideoram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(chinagat_state::ddragon_bgvideoram_w)).share("bgvideoram"); + map(0x2000, 0x27ff).ram().w(FUNC(chinagat_state::ddragon_fgvideoram_w)).share("fgvideoram"); + map(0x2800, 0x2fff).ram().w(FUNC(chinagat_state::ddragon_bgvideoram_w)).share("bgvideoram"); map(0x3000, 0x317f).w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x3400, 0x357f).w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x3800, 0x397f).bankw("bank3").share("spriteram"); - map(0x3e00, 0x3e04).w(this, FUNC(chinagat_state::interrupt_w)); + map(0x3e00, 0x3e04).w(FUNC(chinagat_state::interrupt_w)); map(0x3e06, 0x3e06).writeonly().share("scrolly_lo"); map(0x3e07, 0x3e07).writeonly().share("scrollx_lo"); - map(0x3f00, 0x3f00).w(this, FUNC(chinagat_state::video_ctrl_w)); - map(0x3f01, 0x3f01).w(this, FUNC(chinagat_state::bankswitch_w)); + map(0x3f00, 0x3f00).w(FUNC(chinagat_state::video_ctrl_w)); + map(0x3f01, 0x3f01).w(FUNC(chinagat_state::bankswitch_w)); map(0x3f00, 0x3f00).portr("SYSTEM"); map(0x3f01, 0x3f01).portr("DSW1"); map(0x3f02, 0x3f02).portr("DSW2"); @@ -359,8 +359,8 @@ void chinagat_state::main_map(address_map &map) void chinagat_state::sub_map(address_map &map) { map(0x0000, 0x1fff).ram().share("share1"); - map(0x2000, 0x2000).w(this, FUNC(chinagat_state::sub_bankswitch_w)); - map(0x2800, 0x2800).w(this, FUNC(chinagat_state::sub_irq_ack_w)); /* Called on CPU start and after return from jump table */ + map(0x2000, 0x2000).w(FUNC(chinagat_state::sub_bankswitch_w)); + map(0x2800, 0x2800).w(FUNC(chinagat_state::sub_irq_ack_w)); /* Called on CPU start and after return from jump table */ // AM_RANGE(0x2a2b, 0x2a2b) AM_READNOP /* What lives here? */ // AM_RANGE(0x2a30, 0x2a30) AM_READNOP /* What lives here? */ map(0x4000, 0x7fff).bankr("bank4"); @@ -400,7 +400,7 @@ void chinagat_state::saiyugoub1_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0x8800, 0x8801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x9800, 0x9800).w(this, FUNC(chinagat_state::saiyugoub1_mcu_command_w)); + map(0x9800, 0x9800).w(FUNC(chinagat_state::saiyugoub1_mcu_command_w)); map(0xA000, 0xA000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp index 8cbc7dea6b2..d92835933cd 100644 --- a/src/mame/drivers/chinsan.cpp +++ b/src/mame/drivers/chinsan.cpp @@ -125,14 +125,14 @@ void chinsan_state::chinsan_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x10, 0x11).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x20, 0x20).w(this, FUNC(chinsan_state::adpcm_w)); - map(0x30, 0x30).w(this, FUNC(chinsan_state::ctrl_w)); + map(0x20, 0x20).w(FUNC(chinsan_state::adpcm_w)); + map(0x30, 0x30).w(FUNC(chinsan_state::ctrl_w)); } void chinsan_state::mayumi_io_map(address_map &map) { map.global_mask(0xff); - map(0x30, 0x30).portr("extra").w(this, FUNC(chinsan_state::ctrl_w)); + map(0x30, 0x30).portr("extra").w(FUNC(chinsan_state::ctrl_w)); map(0xc0, 0xc3).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xd0, 0xd1).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); } diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp index ceb4e4ee964..b062181aca4 100644 --- a/src/mame/drivers/chqflag.cpp +++ b/src/mame/drivers/chqflag.cpp @@ -132,11 +132,11 @@ void chqflag_state::chqflag_map(address_map &map) map(0x1000, 0x1fff).m(m_bank1000, FUNC(address_map_bank_device::amap8)); map(0x2000, 0x2007).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); /* Sprite control registers */ map(0x2400, 0x27ff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); /* Sprite RAM */ - map(0x2800, 0x2fff).r(this, FUNC(chqflag_state::k051316_ramrom_r<1>)).w(m_k051316[1], FUNC(k051316_device::write)); /* 051316 zoom/rotation (chip 2) */ + map(0x2800, 0x2fff).r(FUNC(chqflag_state::k051316_ramrom_r<1>)).w(m_k051316[1], FUNC(k051316_device::write)); /* 051316 zoom/rotation (chip 2) */ map(0x3000, 0x3000).w("soundlatch", FUNC(generic_latch_8_device::write)); /* sound code # */ map(0x3001, 0x3001).w("soundlatch2", FUNC(generic_latch_8_device::write)); /* cause interrupt on audio CPU */ - map(0x3002, 0x3002).w(this, FUNC(chqflag_state::chqflag_bankswitch_w)); /* bankswitch control */ - map(0x3003, 0x3003).w(this, FUNC(chqflag_state::chqflag_vreg_w)); /* enable K051316 ROM reading */ + map(0x3002, 0x3002).w(FUNC(chqflag_state::chqflag_bankswitch_w)); /* bankswitch control */ + map(0x3003, 0x3003).w(FUNC(chqflag_state::chqflag_vreg_w)); /* enable K051316 ROM reading */ map(0x3100, 0x3100).portr("DSW1"); /* DIPSW #1 */ map(0x3200, 0x3200).portr("IN1"); /* COINSW, STARTSW, test mode */ map(0x3201, 0x3201).portr("IN0"); /* DIPSW #3, SW 4 */ @@ -145,9 +145,9 @@ void chqflag_state::chqflag_map(address_map &map) map(0x3400, 0x341f).rw("k051733", FUNC(k051733_device::read), FUNC(k051733_device::write)); /* 051733 (protection) */ map(0x3500, 0x350f).w(m_k051316[0], FUNC(k051316_device::ctrl_w)); /* 051316 control registers (chip 1) */ map(0x3600, 0x360f).w(m_k051316[1], FUNC(k051316_device::ctrl_w)); /* 051316 control registers (chip 2) */ - map(0x3700, 0x3700).w(this, FUNC(chqflag_state::select_analog_ctrl_w)); /* select accelerator/wheel */ + map(0x3700, 0x3700).w(FUNC(chqflag_state::select_analog_ctrl_w)); /* select accelerator/wheel */ map(0x3701, 0x3701).portr("IN2"); /* Brake + Shift + ? */ - map(0x3702, 0x3702).rw(this, FUNC(chqflag_state::analog_read_r), FUNC(chqflag_state::select_analog_ctrl_w)); /* accelerator/wheel */ + map(0x3702, 0x3702).rw(FUNC(chqflag_state::analog_read_r), FUNC(chqflag_state::select_analog_ctrl_w)); /* accelerator/wheel */ map(0x4000, 0x7fff).bankr("rombank"); /* banked ROM */ map(0x8000, 0xffff).rom().region("maincpu", 0x48000); /* ROM */ } @@ -155,7 +155,7 @@ void chqflag_state::chqflag_map(address_map &map) void chqflag_state::bank1000_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x17ff).r(this, FUNC(chqflag_state::k051316_ramrom_r<0>)).w(m_k051316[0], FUNC(k051316_device::write)); + map(0x1000, 0x17ff).r(FUNC(chqflag_state::k051316_ramrom_r<0>)).w(m_k051316[0], FUNC(k051316_device::write)); map(0x1800, 0x1fff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); } @@ -179,9 +179,9 @@ void chqflag_state::chqflag_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); /* ROM */ map(0x8000, 0x87ff).ram(); /* RAM */ - map(0x9000, 0x9000).w(this, FUNC(chqflag_state::k007232_bankswitch_w)); /* 007232 bankswitch */ + map(0x9000, 0x9000).w(FUNC(chqflag_state::k007232_bankswitch_w)); /* 007232 bankswitch */ map(0xa000, 0xa00d).rw(m_k007232[0], FUNC(k007232_device::read), FUNC(k007232_device::write)); /* 007232 (chip 1) */ - map(0xa01c, 0xa01c).w(this, FUNC(chqflag_state::k007232_extvolume_w)); /* extra volume, goes to the 007232 w/ A4 */ + map(0xa01c, 0xa01c).w(FUNC(chqflag_state::k007232_extvolume_w)); /* extra volume, goes to the 007232 w/ A4 */ /* selecting a different latch for the external port */ map(0xb000, 0xb00d).rw(m_k007232[1], FUNC(k007232_device::read), FUNC(k007232_device::write)); /* 007232 (chip 2) */ map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); /* YM2151 */ diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp index 14597635115..63dae8dc6a6 100644 --- a/src/mame/drivers/chsuper.cpp +++ b/src/mame/drivers/chsuper.cpp @@ -214,7 +214,7 @@ WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh void chsuper_state::chsuper_prg_map(address_map &map) { map(0x00000, 0x0efff).rom(); - map(0x00000, 0x01fff).w(this, FUNC(chsuper_state::chsuper_vram_w)); + map(0x00000, 0x01fff).w(FUNC(chsuper_state::chsuper_vram_w)); map(0x0f000, 0x0ffff).ram().region("maincpu", 0xf000); map(0xfb000, 0xfbfff).ram().share("nvram"); } @@ -228,13 +228,13 @@ void chsuper_state::chsuper_portmap(address_map &map) map(0x00e9, 0x00e9).portr("IN1"); map(0x00ea, 0x00ea).portr("DSW"); map(0x00ed, 0x00ed).nopw(); // mirror of EFh, but with bit0 active... - map(0x00ee, 0x00ee).w(this, FUNC(chsuper_state::chsuper_outporta_w)); - map(0x00ef, 0x00ef).w(this, FUNC(chsuper_state::chsuper_outportb_w)); + map(0x00ee, 0x00ee).w(FUNC(chsuper_state::chsuper_outporta_w)); + map(0x00ef, 0x00ef).w(FUNC(chsuper_state::chsuper_outportb_w)); map(0x00fc, 0x00fc).w("ramdac", FUNC(ramdac_device::index_w)); map(0x00fd, 0x00fd).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x00fe, 0x00fe).w("ramdac", FUNC(ramdac_device::mask_w)); map(0x8300, 0x8300).portr("IN2"); // valid input port present in test mode. - map(0xff20, 0xff3f).w("dac", FUNC(dac_byte_interface::write)); // unk writes + map(0xff20, 0xff3f).w("dac", FUNC(dac_byte_interface::data_w)); // unk writes } /* About Sound... diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp index 02b99a34c92..09337876144 100644 --- a/src/mame/drivers/cidelsa.cpp +++ b/src/mame/drivers/cidelsa.cpp @@ -159,9 +159,9 @@ void cidelsa_state::destryera_map(address_map &map) void cidelsa_state::destryer_io_map(address_map &map) { - map(0x01, 0x01).portr("IN0").w(this, FUNC(cidelsa_state::destryer_out1_w)); + map(0x01, 0x01).portr("IN0").w(FUNC(cidelsa_state::destryer_out1_w)); map(0x02, 0x02).portr("IN1"); - map(0x03, 0x07).w(this, FUNC(cidelsa_state::cdp1869_w)); + map(0x03, 0x07).w(FUNC(cidelsa_state::cdp1869_w)); } // Altair @@ -179,7 +179,7 @@ void cidelsa_state::altair_io_map(address_map &map) map(0x01, 0x01).r("ic23", FUNC(cdp1852_device::read)).w("ic26", FUNC(cdp1852_device::write)); map(0x02, 0x02).r("ic24", FUNC(cdp1852_device::read)); map(0x04, 0x04).r("ic25", FUNC(cdp1852_device::read)); - map(0x03, 0x07).w(this, FUNC(cidelsa_state::cdp1869_w)); + map(0x03, 0x07).w(FUNC(cidelsa_state::cdp1869_w)); } // Draco @@ -197,7 +197,7 @@ void draco_state::draco_io_map(address_map &map) map(0x01, 0x01).r("ic29", FUNC(cdp1852_device::read)).w("ic32", FUNC(cdp1852_device::write)); map(0x02, 0x02).r("ic30", FUNC(cdp1852_device::read)); map(0x04, 0x04).r("ic31", FUNC(cdp1852_device::read)); - map(0x03, 0x07).w(this, FUNC(draco_state::cdp1869_w)); + map(0x03, 0x07).w(FUNC(draco_state::cdp1869_w)); } void draco_state::draco_sound_map(address_map &map) diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp index 0b51f6c828f..a64dc230e31 100644 --- a/src/mame/drivers/cinemat.cpp +++ b/src/mame/drivers/cinemat.cpp @@ -324,9 +324,9 @@ void qb3_state::data_map_qb3(address_map &map) void cinemat_state::io_map(address_map &map) { - map(0x00, 0x0f).r(this, FUNC(cinemat_state::inputs_r)); - map(0x10, 0x16).r(this, FUNC(cinemat_state::switches_r)); - map(0x17, 0x17).r(this, FUNC(cinemat_state::coin_input_r)); + map(0x00, 0x0f).r(FUNC(cinemat_state::inputs_r)); + map(0x10, 0x16).r(FUNC(cinemat_state::switches_r)); + map(0x17, 0x17).r(FUNC(cinemat_state::coin_input_r)); map(0x00, 0x07).w(m_outlatch, FUNC(ls259_device::write_d0)); } @@ -335,9 +335,9 @@ void qb3_state::io_map_qb3(address_map &map) { io_map(map); // Some of the outputs here are definitely not mapped through the LS259, since they use multiple bits of data - map(0x00, 0x00).w(this, FUNC(qb3_state::qb3_ram_bank_w)); - map(0x04, 0x04).w(this, FUNC(qb3_state::qb3_sound_fifo_w)); - map(0x0f, 0x0f).r(this, FUNC(qb3_state::qb3_frame_r)); + map(0x00, 0x00).w(FUNC(qb3_state::qb3_ram_bank_w)); + map(0x04, 0x04).w(FUNC(qb3_state::qb3_sound_fifo_w)); + map(0x0f, 0x0f).r(FUNC(qb3_state::qb3_frame_r)); } diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp index 55a9b48ca03..d28aaaeab5b 100644 --- a/src/mame/drivers/circus.cpp +++ b/src/mame/drivers/circus.cpp @@ -67,13 +67,13 @@ void circus_state::circus_map(address_map &map) { map(0x0000, 0x01ff).ram(); map(0x1000, 0x1fff).rom(); - map(0x2000, 0x2000).w(this, FUNC(circus_state::circus_clown_x_w)); - map(0x3000, 0x3000).w(this, FUNC(circus_state::circus_clown_y_w)); - map(0x4000, 0x43ff).ram().w(this, FUNC(circus_state::circus_videoram_w)).share("videoram"); - map(0x8000, 0x8000).ram().w(this, FUNC(circus_state::circus_clown_z_w)); + map(0x2000, 0x2000).w(FUNC(circus_state::circus_clown_x_w)); + map(0x3000, 0x3000).w(FUNC(circus_state::circus_clown_y_w)); + map(0x4000, 0x43ff).ram().w(FUNC(circus_state::circus_videoram_w)).share("videoram"); + map(0x8000, 0x8000).ram().w(FUNC(circus_state::circus_clown_z_w)); map(0xa000, 0xa000).portr("INPUTS"); map(0xc000, 0xc000).portr("DSW"); - map(0xd000, 0xd000).r(this, FUNC(circus_state::circus_paddle_r)); + map(0xd000, 0xd000).r(FUNC(circus_state::circus_paddle_r)); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp index f457d7447f7..12540299ee3 100644 --- a/src/mame/drivers/circusc.cpp +++ b/src/mame/drivers/circusc.cpp @@ -124,12 +124,12 @@ WRITE8_MEMBER(circusc_state::circusc_sound_w) /* CS3 */ case 1: - m_sn_1->write(space, 0, m_sn_latch); + m_sn_1->write(m_sn_latch); break; /* CS4 */ case 2: - m_sn_2->write(space, 0, m_sn_latch); + m_sn_2->write(m_sn_latch); break; /* CS5 */ @@ -158,7 +158,7 @@ void circusc_state::circusc_map(address_map &map) map(0x0000, 0x0007).mirror(0x03f8).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x0400, 0x0400).mirror(0x03ff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* WDOG */ map(0x0800, 0x0800).mirror(0x03ff).w("soundlatch", FUNC(generic_latch_8_device::write)); /* SOUND DATA */ - map(0x0c00, 0x0c00).mirror(0x03ff).w(this, FUNC(circusc_state::circusc_sh_irqtrigger_w)); /* SOUND-ON causes interrupt on audio CPU */ + map(0x0c00, 0x0c00).mirror(0x03ff).w(FUNC(circusc_state::circusc_sh_irqtrigger_w)); /* SOUND-ON causes interrupt on audio CPU */ map(0x1000, 0x1000).mirror(0x03fc).portr("SYSTEM"); map(0x1001, 0x1001).mirror(0x03fc).portr("P1"); map(0x1002, 0x1002).mirror(0x03fc).portr("P2"); @@ -167,8 +167,8 @@ void circusc_state::circusc_map(address_map &map) map(0x1800, 0x1800).mirror(0x03ff).portr("DSW2"); map(0x1c00, 0x1c00).mirror(0x03ff).writeonly().share("scroll"); /* VGAP */ map(0x2000, 0x2fff).ram(); - map(0x3000, 0x33ff).ram().w(this, FUNC(circusc_state::circusc_colorram_w)).share("colorram"); /* colorram */ - map(0x3400, 0x37ff).ram().w(this, FUNC(circusc_state::circusc_videoram_w)).share("videoram"); /* videoram */ + map(0x3000, 0x33ff).ram().w(FUNC(circusc_state::circusc_colorram_w)).share("colorram"); /* colorram */ + map(0x3400, 0x37ff).ram().w(FUNC(circusc_state::circusc_videoram_w)).share("videoram"); /* videoram */ map(0x3800, 0x38ff).ram().share("spriteram_2"); /* spriteram2 */ map(0x3900, 0x39ff).ram().share("spriteram"); /* spriteram */ map(0x3a00, 0x3fff).ram(); @@ -180,8 +180,8 @@ void circusc_state::sound_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).mirror(0x1c00).ram(); map(0x6000, 0x6000).mirror(0x1fff).r("soundlatch", FUNC(generic_latch_8_device::read)); /* CS0 */ - map(0x8000, 0x8000).mirror(0x1fff).r(this, FUNC(circusc_state::circusc_sh_timer_r)); /* CS1 */ - map(0xa000, 0xa07f).mirror(0x1f80).w(this, FUNC(circusc_state::circusc_sound_w)); /* CS2 - CS6 */ + map(0x8000, 0x8000).mirror(0x1fff).r(FUNC(circusc_state::circusc_sh_timer_r)); /* CS1 */ + map(0xa000, 0xa07f).mirror(0x1f80).w(FUNC(circusc_state::circusc_sound_w)); /* CS2 - CS6 */ } diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp index c85489ca884..9ac20947178 100644 --- a/src/mame/drivers/cischeat.cpp +++ b/src/mame/drivers/cischeat.cpp @@ -199,23 +199,23 @@ Cisco Heat. void cischeat_state::bigrun_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x080000, 0x080001).portr("IN1").w(this, FUNC(cischeat_state::leds_out_w)); // Coins - map(0x080002, 0x080003).portr("IN2").w(this, FUNC(cischeat_state::unknown_out_w)); // Buttons - map(0x080004, 0x080005).portr("IN3").w(this, FUNC(cischeat_state::motor_out_w)); // Motor Limit Switches - map(0x080006, 0x080007).portr("IN4").w(this, FUNC(cischeat_state::wheel_out_w)); // DSW 1 & 2 + map(0x080000, 0x080001).portr("IN1").w(FUNC(cischeat_state::leds_out_w)); // Coins + map(0x080002, 0x080003).portr("IN2").w(FUNC(cischeat_state::unknown_out_w)); // Buttons + map(0x080004, 0x080005).portr("IN3").w(FUNC(cischeat_state::motor_out_w)); // Motor Limit Switches + map(0x080006, 0x080007).portr("IN4").w(FUNC(cischeat_state::wheel_out_w)); // DSW 1 & 2 map(0x080008, 0x080009).r(m_soundlatch2, FUNC(generic_latch_16_device::read)); // From sound cpu map(0x08000a, 0x08000b).w(m_soundlatch, FUNC(generic_latch_16_device::write)); // To sound cpu map(0x08000c, 0x08000d).nopw(); // ?? - map(0x080010, 0x080011).rw(this, FUNC(cischeat_state::bigrun_ip_select_r), FUNC(cischeat_state::ip_select_w)); - map(0x080012, 0x080013).w(this, FUNC(cischeat_state::ip_select_plus1_w)); + map(0x080010, 0x080011).rw(FUNC(cischeat_state::bigrun_ip_select_r), FUNC(cischeat_state::ip_select_w)); + map(0x080012, 0x080013).w(FUNC(cischeat_state::ip_select_plus1_w)); map(0x082000, 0x082005).rw("scroll0", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082008, 0x08200d).rw("scroll1", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082100, 0x082105).rw("scroll2", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082108, 0x082109).noprw(); // ? written with 0 only map(0x082200, 0x082201).portr("IN5"); // DSW 3 (4 bits) map(0x082208, 0x082209).noprw(); // watchdog reset - map(0x082308, 0x082309).w(this, FUNC(cischeat_state::cischeat_comms_w)); - map(0x082400, 0x082401).w(this, FUNC(cischeat_state::active_layers_w)); + map(0x082308, 0x082309).w(FUNC(cischeat_state::cischeat_comms_w)); + map(0x082400, 0x082401).w(FUNC(cischeat_state::active_layers_w)); /* It's actually 0x840000-0x847ff, divided in four banks and shared with other boards. Each board expects reads from the other boards and writes to own bank. @@ -254,13 +254,13 @@ void cischeat_state::bigrun_map(address_map &map) void cischeat_state::cischeat_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x080000, 0x080001).portr("IN1").w(this, FUNC(cischeat_state::leds_out_w)); // Coins - map(0x080002, 0x080003).portr("IN2").w(this, FUNC(cischeat_state::unknown_out_w)); // Buttons - map(0x080004, 0x080005).portr("IN3").w(this, FUNC(cischeat_state::motor_out_w)); // Motor Limit Switches - map(0x080006, 0x080007).portr("IN4").w(this, FUNC(cischeat_state::wheel_out_w)); // DSW 1 & 2 + map(0x080000, 0x080001).portr("IN1").w(FUNC(cischeat_state::leds_out_w)); // Coins + map(0x080002, 0x080003).portr("IN2").w(FUNC(cischeat_state::unknown_out_w)); // Buttons + map(0x080004, 0x080005).portr("IN3").w(FUNC(cischeat_state::motor_out_w)); // Motor Limit Switches + map(0x080006, 0x080007).portr("IN4").w(FUNC(cischeat_state::wheel_out_w)); // DSW 1 & 2 map(0x08000a, 0x08000b).w(m_soundlatch, FUNC(generic_latch_16_device::write)); // To sound cpu map(0x08000c, 0x08000d).nopw(); // ?? - map(0x080010, 0x080011).rw(this, FUNC(cischeat_state::cischeat_ip_select_r), FUNC(cischeat_state::ip_select_w)); + map(0x080010, 0x080011).rw(FUNC(cischeat_state::cischeat_ip_select_r), FUNC(cischeat_state::ip_select_w)); map(0x080012, 0x080013).nopw(); // value above + 1 map(0x082000, 0x082005).rw("scroll0", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082008, 0x08200d).rw("scroll1", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); @@ -268,9 +268,9 @@ void cischeat_state::cischeat_map(address_map &map) map(0x082108, 0x082109).noprw(); // ? written with 0 only map(0x082200, 0x082201).portr("IN5"); // DSW 3 (4 bits) map(0x082208, 0x082209).noprw(); // watchdog reset - map(0x082300, 0x082301).r(m_soundlatch2, FUNC(generic_latch_16_device::read)).w(this, FUNC(cischeat_state::cischeat_soundlatch_w)); // From sound cpu - map(0x082308, 0x082309).w(this, FUNC(cischeat_state::cischeat_comms_w)); - map(0x082400, 0x082401).w(this, FUNC(cischeat_state::active_layers_w)); + map(0x082300, 0x082301).r(m_soundlatch2, FUNC(generic_latch_16_device::read)).w(FUNC(cischeat_state::cischeat_soundlatch_w)); // From sound cpu + map(0x082308, 0x082309).w(FUNC(cischeat_state::cischeat_comms_w)); + map(0x082400, 0x082401).w(FUNC(cischeat_state::active_layers_w)); map(0x088000, 0x0887ff).ram(); // Linking with other units @@ -318,22 +318,22 @@ void cischeat_state::f1gpstar_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0x080000, 0x080001).portr("IN1"); // DSW 1 & 2 - map(0x080004, 0x080005).portr("IN2").w(this, FUNC(cischeat_state::f1gpstar_motor_w)); // Buttons + map(0x080004, 0x080005).portr("IN2").w(FUNC(cischeat_state::f1gpstar_motor_w)); // Buttons map(0x080006, 0x080007).portr("IN3"); // ? Read at boot only map(0x080008, 0x080009).r(m_soundlatch2, FUNC(generic_latch_16_device::read)); // From sound cpu map(0x080008, 0x080009).w(m_soundlatch, FUNC(generic_latch_16_device::write)); // To sound cpu map(0x08000c, 0x08000d).portr("IN4"); // DSW 3 - map(0x080010, 0x080011).r(this, FUNC(cischeat_state::f1gpstar_wheel_r)).nopw(); // Accel + Driving Wheel + map(0x080010, 0x080011).r(FUNC(cischeat_state::f1gpstar_wheel_r)).nopw(); // Accel + Driving Wheel map(0x080014, 0x080015).nopw(); - map(0x080018, 0x080019).w(this, FUNC(cischeat_state::f1gpstar_soundint_w)); + map(0x080018, 0x080019).w(FUNC(cischeat_state::f1gpstar_soundint_w)); map(0x082000, 0x082005).rw("scroll0", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082008, 0x08200d).rw("scroll1", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082100, 0x082105).rw("scroll2", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082108, 0x082109).noprw(); // ? written with 0 only map(0x082208, 0x082209).noprw(); // watchdog reset - map(0x082308, 0x082309).nopr().w(this, FUNC(cischeat_state::f1gpstar_comms_w)); - map(0x082400, 0x082401).w(this, FUNC(cischeat_state::active_layers_w)); + map(0x082308, 0x082309).nopr().w(FUNC(cischeat_state::f1gpstar_comms_w)); + map(0x082400, 0x082401).w(FUNC(cischeat_state::active_layers_w)); map(0x088000, 0x0883ff).ram(); // Linking with other units @@ -392,14 +392,14 @@ WRITE16_MEMBER(cischeat_state::wildplt_mux_w) void cischeat_state::wildplt_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x080000, 0x080001).portr("IN0").w(this, FUNC(cischeat_state::f1gpstr2_io_w)); // DSW 1 & 2 - map(0x080004, 0x080005).r(this, FUNC(cischeat_state::wildplt_mux_r)).w(this, FUNC(cischeat_state::wildplt_mux_w)); // Buttons + map(0x080000, 0x080001).portr("IN0").w(FUNC(cischeat_state::f1gpstr2_io_w)); // DSW 1 & 2 + map(0x080004, 0x080005).r(FUNC(cischeat_state::wildplt_mux_r)).w(FUNC(cischeat_state::wildplt_mux_w)); // Buttons map(0x080008, 0x080009).r(m_soundlatch2, FUNC(generic_latch_16_device::read)); // From sound cpu map(0x080008, 0x080009).w(m_soundlatch, FUNC(generic_latch_16_device::write)); // To sound cpu map(0x08000c, 0x08000d).nopw(); // 1000, 3000 - map(0x080010, 0x080011).r(this, FUNC(cischeat_state::wildplt_xy_r)).w(this, FUNC(cischeat_state::ip_select_w)); // X, Y + map(0x080010, 0x080011).r(FUNC(cischeat_state::wildplt_xy_r)).w(FUNC(cischeat_state::ip_select_w)); // X, Y map(0x080014, 0x080015).nopw(); - map(0x080018, 0x080019).rw(this, FUNC(cischeat_state::f1gpstr2_ioready_r), FUNC(cischeat_state::f1gpstar_soundint_w)); + map(0x080018, 0x080019).rw(FUNC(cischeat_state::f1gpstr2_ioready_r), FUNC(cischeat_state::f1gpstar_soundint_w)); map(0x081000, 0x081fff).ram().share("shareio"); @@ -408,8 +408,8 @@ void cischeat_state::wildplt_map(address_map &map) map(0x082100, 0x082105).rw("scroll2", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082108, 0x082109).noprw(); // ? written with 0 only map(0x082208, 0x082209).noprw(); // watchdog reset - map(0x082308, 0x082309).nopr().w(this, FUNC(cischeat_state::f1gpstar_comms_w)); - map(0x082400, 0x082401).w(this, FUNC(cischeat_state::active_layers_w)); + map(0x082308, 0x082309).nopr().w(FUNC(cischeat_state::f1gpstar_comms_w)); + map(0x082400, 0x082401).w(FUNC(cischeat_state::active_layers_w)); // AM_RANGE(0x088000, 0x088fff) AM_RAM // Linking with other units @@ -436,15 +436,15 @@ void cischeat_state::wildplt_map(address_map &map) void cischeat_state::f1gpstr2_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x080000, 0x080001).portr("IN1").w(this, FUNC(cischeat_state::f1gpstr2_io_w)); // DSW 1 & 2 - map(0x080004, 0x080005).portr("IN2").w(this, FUNC(cischeat_state::f1gpstar_motor_w)); // Buttons + map(0x080000, 0x080001).portr("IN1").w(FUNC(cischeat_state::f1gpstr2_io_w)); // DSW 1 & 2 + map(0x080004, 0x080005).portr("IN2").w(FUNC(cischeat_state::f1gpstar_motor_w)); // Buttons map(0x080006, 0x080007).portr("IN3"); // ? Read at boot only map(0x080008, 0x080009).r(m_soundlatch2, FUNC(generic_latch_16_device::read)); // From sound cpu map(0x080008, 0x080009).w(m_soundlatch, FUNC(generic_latch_16_device::write)); // To sound cpu map(0x08000c, 0x08000d).portr("IN4"); // DSW 3 - map(0x080010, 0x080011).r(this, FUNC(cischeat_state::f1gpstar_wheel_r)).nopw(); + map(0x080010, 0x080011).r(FUNC(cischeat_state::f1gpstar_wheel_r)).nopw(); map(0x080014, 0x080015).nopw(); - map(0x080018, 0x080019).rw(this, FUNC(cischeat_state::f1gpstr2_ioready_r), FUNC(cischeat_state::f1gpstar_soundint_w)); + map(0x080018, 0x080019).rw(FUNC(cischeat_state::f1gpstr2_ioready_r), FUNC(cischeat_state::f1gpstar_soundint_w)); map(0x081000, 0x081fff).ram().share("shareio"); @@ -453,8 +453,8 @@ void cischeat_state::f1gpstr2_map(address_map &map) map(0x082100, 0x082105).rw("scroll2", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w)); map(0x082108, 0x082109).noprw(); // ? written with 0 only map(0x082208, 0x082209).noprw(); // watchdog reset - map(0x082308, 0x082309).nopr().w(this, FUNC(cischeat_state::f1gpstar_comms_w)); - map(0x082400, 0x082401).w(this, FUNC(cischeat_state::active_layers_w)); + map(0x082308, 0x082309).nopr().w(FUNC(cischeat_state::f1gpstar_comms_w)); + map(0x082400, 0x082401).w(FUNC(cischeat_state::active_layers_w)); // 0x100 RAM banks instead of 0x200 map(0x088000, 0x0887ff).ram(); // Linking with other units @@ -586,14 +586,14 @@ void cischeat_state::scudhamm_map(address_map &map) map(0x0b0000, 0x0b3fff).ram().w("scroll2", FUNC(megasys1_tilemap_device::write)).share("scroll2"); // Scroll RAM 2 map(0x0b8000, 0x0bffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x0f0000, 0x0fffff).ram().share("ram"); // Work RAM + Spriteram - map(0x100000, 0x100001).w(this, FUNC(cischeat_state::scudhamm_oki_bank_w)); // Sound - map(0x100008, 0x100009).portr("IN0").w(this, FUNC(cischeat_state::scudhamm_leds_w)); // Buttons + map(0x100000, 0x100001).w(FUNC(cischeat_state::scudhamm_oki_bank_w)); // Sound + map(0x100008, 0x100009).portr("IN0").w(FUNC(cischeat_state::scudhamm_leds_w)); // Buttons map(0x100015, 0x100015).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x100019, 0x100019).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // - map(0x10001c, 0x10001d).w(this, FUNC(cischeat_state::scudhamm_enable_w)); // ? - map(0x100040, 0x100041).r(this, FUNC(cischeat_state::scudhamm_analog_r)).nopw(); // A / D - map(0x100044, 0x100045).r(this, FUNC(cischeat_state::scudhamm_motor_pos_r)); // Motor Position - map(0x100050, 0x100051).r(this, FUNC(cischeat_state::scudhamm_motor_status_r)).w(this, FUNC(cischeat_state::scudhamm_motor_command_w)); // Motor Limit Switches + map(0x10001c, 0x10001d).w(FUNC(cischeat_state::scudhamm_enable_w)); // ? + map(0x100040, 0x100041).r(FUNC(cischeat_state::scudhamm_analog_r)).nopw(); // A / D + map(0x100044, 0x100045).r(FUNC(cischeat_state::scudhamm_motor_pos_r)); // Motor Position + map(0x100050, 0x100051).r(FUNC(cischeat_state::scudhamm_motor_status_r)).w(FUNC(cischeat_state::scudhamm_motor_command_w)); // Motor Limit Switches map(0x10005c, 0x10005d).portr("IN2"); // 2 x DSW } @@ -671,11 +671,11 @@ void cischeat_state::armchmp2_map(address_map &map) map(0x0b0000, 0x0b7fff).ram().w("scroll2", FUNC(megasys1_tilemap_device::write)).share("scroll2"); // Scroll ram 2 map(0x0b8000, 0x0bffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x0f0000, 0x0fffff).ram().share("ram"); // Work RAM + Spriteram - map(0x100000, 0x100001).portr("IN2").w(this, FUNC(cischeat_state::scudhamm_oki_bank_w)); // DSW + Sound + map(0x100000, 0x100001).portr("IN2").w(FUNC(cischeat_state::scudhamm_oki_bank_w)); // DSW + Sound map(0x100004, 0x100005).portr("IN3"); // DSW - map(0x100008, 0x100009).rw(this, FUNC(cischeat_state::armchmp2_buttons_r), FUNC(cischeat_state::armchmp2_leds_w)); // Leds + Coin Counters + Buttons + Sensors - map(0x10000c, 0x10000d).r(this, FUNC(cischeat_state::armchmp2_analog_r)).nopw(); // A / D - map(0x100010, 0x100011).rw(this, FUNC(cischeat_state::armchmp2_motor_status_r), FUNC(cischeat_state::armchmp2_motor_command_w)); // Motor Limit Switches? + map(0x100008, 0x100009).rw(FUNC(cischeat_state::armchmp2_buttons_r), FUNC(cischeat_state::armchmp2_leds_w)); // Leds + Coin Counters + Buttons + Sensors + map(0x10000c, 0x10000d).r(FUNC(cischeat_state::armchmp2_analog_r)).nopw(); // A / D + map(0x100010, 0x100011).rw(FUNC(cischeat_state::armchmp2_motor_status_r), FUNC(cischeat_state::armchmp2_motor_command_w)); // Motor Limit Switches? map(0x100015, 0x100015).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x100019, 0x100019).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // } @@ -817,14 +817,14 @@ void cischeat_state::captflag_map(address_map &map) map(0x0b0000, 0x0b7fff).ram().w("scroll2", FUNC(megasys1_tilemap_device::write)).share("scroll2"); // Scroll RAM 2 map(0x0b8000, 0x0bffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x0f0000, 0x0fffff).ram().share("ram"); // Work RAM + Spriteram - map(0x100000, 0x100001).portr("SW1_2").w(this, FUNC(cischeat_state::captflag_oki_bank_w)); // 2 x DSW + Sound - map(0x100008, 0x100009).portr("Buttons").w(this, FUNC(cischeat_state::captflag_leds_w)); // Buttons + Leds + map(0x100000, 0x100001).portr("SW1_2").w(FUNC(cischeat_state::captflag_oki_bank_w)); // 2 x DSW + Sound + map(0x100008, 0x100009).portr("Buttons").w(FUNC(cischeat_state::captflag_leds_w)); // Buttons + Leds map(0x100015, 0x100015).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x100019, 0x100019).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // - map(0x10001c, 0x10001d).w(this, FUNC(cischeat_state::scudhamm_enable_w)); // ? + map(0x10001c, 0x10001d).w(FUNC(cischeat_state::scudhamm_enable_w)); // ? map(0x100040, 0x100041).portr("SW01"); // DSW + Motor - map(0x100044, 0x100045).w(this, FUNC(cischeat_state::captflag_motor_command_left_w)); // Motor Command (Left) - map(0x100048, 0x100049).w(this, FUNC(cischeat_state::captflag_motor_command_right_w)); // Motor Command (Right) + map(0x100044, 0x100045).w(FUNC(cischeat_state::captflag_motor_command_left_w)); // Motor Command (Left) + map(0x100048, 0x100049).w(FUNC(cischeat_state::captflag_motor_command_right_w)); // Motor Command (Right) map(0x100060, 0x10007d).ram(); // 7-seg? NVRAM? } @@ -946,7 +946,7 @@ WRITE16_MEMBER(cischeat_state::bigrun_soundbank_w) void cischeat_state::bigrun_sound_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM - map(0x040000, 0x040001).r(m_soundlatch, FUNC(generic_latch_16_device::read)).w(this, FUNC(cischeat_state::bigrun_soundbank_w)); // From Main CPU + map(0x040000, 0x040001).r(m_soundlatch, FUNC(generic_latch_16_device::read)).w(FUNC(cischeat_state::bigrun_soundbank_w)); // From Main CPU map(0x060000, 0x060001).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); // To Main CPU map(0x080000, 0x080003).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); map(0x0a0000, 0x0a0003).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); @@ -972,8 +972,8 @@ WRITE16_MEMBER(cischeat_state::cischeat_soundbank_2_w) void cischeat_state::cischeat_sound_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM - map(0x040002, 0x040003).w(this, FUNC(cischeat_state::cischeat_soundbank_1_w)); // Sample Banking - map(0x040004, 0x040005).w(this, FUNC(cischeat_state::cischeat_soundbank_2_w)); // Sample Banking + map(0x040002, 0x040003).w(FUNC(cischeat_state::cischeat_soundbank_1_w)); // Sample Banking + map(0x040004, 0x040005).w(FUNC(cischeat_state::cischeat_soundbank_2_w)); // Sample Banking map(0x060002, 0x060003).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); // To Main CPU map(0x060004, 0x060005).r(m_soundlatch, FUNC(generic_latch_16_device::read)); // From Main CPU map(0x080000, 0x080003).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); @@ -990,8 +990,8 @@ void cischeat_state::cischeat_sound_map(address_map &map) void cischeat_state::f1gpstar_sound_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM - map(0x040004, 0x040005).w(this, FUNC(cischeat_state::cischeat_soundbank_1_w)); // Sample Banking (cischeat: 40002) - map(0x040008, 0x040009).w(this, FUNC(cischeat_state::cischeat_soundbank_2_w)); // Sample Banking (cischeat: 40004) + map(0x040004, 0x040005).w(FUNC(cischeat_state::cischeat_soundbank_1_w)); // Sample Banking (cischeat: 40002) + map(0x040008, 0x040009).w(FUNC(cischeat_state::cischeat_soundbank_2_w)); // Sample Banking (cischeat: 40004) map(0x060000, 0x060001).r(m_soundlatch, FUNC(generic_latch_16_device::read)).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); // From Main CPU (cischeat: 60004) map(0x080000, 0x080003).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); map(0x0a0000, 0x0a0003).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); @@ -1007,8 +1007,8 @@ void cischeat_state::f1gpstar_sound_map(address_map &map) void cischeat_state::f1gpstr2_sound_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM - map(0x040004, 0x040005).w(this, FUNC(cischeat_state::cischeat_soundbank_1_w)); // Sample Banking - map(0x040008, 0x040009).w(this, FUNC(cischeat_state::cischeat_soundbank_2_w)); // Sample Banking + map(0x040004, 0x040005).w(FUNC(cischeat_state::cischeat_soundbank_1_w)); // Sample Banking + map(0x040008, 0x040009).w(FUNC(cischeat_state::cischeat_soundbank_2_w)); // Sample Banking map(0x04000e, 0x04000f).nopw(); // ? 0 (f1gpstar: no) map(0x060002, 0x060003).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); // To Main CPU map(0x060004, 0x060005).r(m_soundlatch, FUNC(generic_latch_16_device::read)); // From Main CPU diff --git a/src/mame/drivers/cit101.cpp b/src/mame/drivers/cit101.cpp index 7eab898268e..26612a5d5d0 100644 --- a/src/mame/drivers/cit101.cpp +++ b/src/mame/drivers/cit101.cpp @@ -300,8 +300,8 @@ void cit101_state::mem_map(address_map &map) map(0x0000, 0x3fff).rom().region("maincpu", 0); map(0x4000, 0x7fff).ram().share("mainram"); map(0x8000, 0xbfff).ram().share("extraram"); // only 4 bits wide? - map(0x8000, 0x8000).w(this, FUNC(cit101_state::screen_control_w)); - map(0xc000, 0xdfff).rw(this, FUNC(cit101_state::c000_ram_r), FUNC(cit101_state::c000_ram_w)); + map(0x8000, 0x8000).w(FUNC(cit101_state::screen_control_w)); + map(0xc000, 0xdfff).rw(FUNC(cit101_state::c000_ram_r), FUNC(cit101_state::c000_ram_w)); map(0xfc00, 0xfc00).rw("auxuart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xfc01, 0xfc01).rw("auxuart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xfc20, 0xfc20).rw("comuart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); @@ -322,8 +322,8 @@ void cit101_state::io_map(address_map &map) map(0x40, 0x40).rw("kbduart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x41, 0x41).rw("kbduart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x60, 0x63).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa0, 0xa0).w(this, FUNC(cit101_state::brightness_w)); - map(0xe0, 0xe0).rw(this, FUNC(cit101_state::e0_latch_r), FUNC(cit101_state::e0_latch_w)); + map(0xa0, 0xa0).w(FUNC(cit101_state::brightness_w)); + map(0xe0, 0xe0).rw(FUNC(cit101_state::e0_latch_r), FUNC(cit101_state::e0_latch_w)); } diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp index f8704bd48bd..15a4f73746b 100644 --- a/src/mame/drivers/citycon.cpp +++ b/src/mame/drivers/citycon.cpp @@ -46,14 +46,14 @@ READ8_MEMBER(citycon_state::citycon_irq_ack_r) void citycon_state::citycon_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x1fff).ram().w(this, FUNC(citycon_state::citycon_videoram_w)).share("videoram"); - map(0x2000, 0x20ff).ram().w(this, FUNC(citycon_state::citycon_linecolor_w)).share("linecolor").mirror(0x0700); + map(0x1000, 0x1fff).ram().w(FUNC(citycon_state::citycon_videoram_w)).share("videoram"); + map(0x2000, 0x20ff).ram().w(FUNC(citycon_state::citycon_linecolor_w)).share("linecolor").mirror(0x0700); map(0x2800, 0x28ff).ram().share("spriteram").mirror(0x0700); //0x2900-0x2fff cleared at post but unused - map(0x3000, 0x3000).r(this, FUNC(citycon_state::citycon_in_r)).w(this, FUNC(citycon_state::citycon_background_w)); /* player 1 & 2 inputs multiplexed */ + map(0x3000, 0x3000).r(FUNC(citycon_state::citycon_in_r)).w(FUNC(citycon_state::citycon_background_w)); /* player 1 & 2 inputs multiplexed */ map(0x3001, 0x3001).portr("DSW1").w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x3002, 0x3002).portr("DSW2").w("soundlatch2", FUNC(generic_latch_8_device::write)); map(0x3004, 0x3005).nopr().writeonly().share("scroll"); - map(0x3007, 0x3007).r(this, FUNC(citycon_state::citycon_irq_ack_r)); + map(0x3007, 0x3007).r(FUNC(citycon_state::citycon_irq_ack_r)); map(0x3800, 0x3cff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp index 5673f441fb5..c294e4c7b86 100644 --- a/src/mame/drivers/ckz80.cpp +++ b/src/mame/drivers/ckz80.cpp @@ -281,7 +281,7 @@ void ckz80_state::init_master() void ckz80_state::master_map(address_map &map) { map(0x0000, 0x1fff).mirror(0x6000).rom().region("maincpu", 0); // _A15 - map(0xa000, 0xa000).mirror(0x1fff).rw(this, FUNC(ckz80_state::master_input_r), FUNC(ckz80_state::master_control_w)); // A13 + map(0xa000, 0xa000).mirror(0x1fff).rw(FUNC(ckz80_state::master_input_r), FUNC(ckz80_state::master_control_w)); // A13 map(0xc000, 0xc7ff).mirror(0x3800).ram(); // A14 } @@ -309,7 +309,7 @@ READ8_MEMBER(ckz80_state::master_trampoline_r) void ckz80_state::master_trampoline(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(ckz80_state::master_trampoline_r), FUNC(ckz80_state::master_trampoline_w)); + map(0x0000, 0xffff).rw(FUNC(ckz80_state::master_trampoline_r), FUNC(ckz80_state::master_trampoline_w)); } diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp index 270b84603df..f7acdc51792 100644 --- a/src/mame/drivers/clayshoo.cpp +++ b/src/mame/drivers/clayshoo.cpp @@ -221,7 +221,7 @@ void clayshoo_state::main_map(address_map &map) map(0x4000, 0x47ff).rom(); map(0x8000, 0x97ff).ram().share("videoram"); /* 6k of video ram according to readme */ map(0x9800, 0xa800).nopw(); /* not really mapped, but cleared */ - map(0xc800, 0xc800).rw(this, FUNC(clayshoo_state::analog_r), FUNC(clayshoo_state::analog_reset_w)); + map(0xc800, 0xc800).rw(FUNC(clayshoo_state::analog_r), FUNC(clayshoo_state::analog_reset_w)); } diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp index cb78ea03f54..9225f325554 100644 --- a/src/mame/drivers/clcd.cpp +++ b/src/mame/drivers/clcd.cpp @@ -607,20 +607,20 @@ void clcd_state::nvram_init(nvram_device &nvram, void *data, size_t size) void clcd_state::clcd_banked_mem(address_map &map) { /* KERN/APPL/RAM */ - map(0x00000, 0x1ffff).mirror(0x40000).rw(this, FUNC(clcd_state::ram_r), FUNC(clcd_state::ram_w)); + map(0x00000, 0x1ffff).mirror(0x40000).rw(FUNC(clcd_state::ram_r), FUNC(clcd_state::ram_w)); map(0x20000, 0x3ffff).mirror(0x40000).rom().region("maincpu", 0); /* TEST */ - map(0x81000, 0x83fff).r(this, FUNC(clcd_state::mmu_offset1_r)); - map(0x84000, 0x87fff).r(this, FUNC(clcd_state::mmu_offset2_r)); - map(0x88000, 0x8bfff).r(this, FUNC(clcd_state::mmu_offset3_r)); - map(0x8c000, 0x8dfff).r(this, FUNC(clcd_state::mmu_offset4_r)); - map(0x8e000, 0x8f7ff).r(this, FUNC(clcd_state::mmu_offset5_r)); + map(0x81000, 0x83fff).r(FUNC(clcd_state::mmu_offset1_r)); + map(0x84000, 0x87fff).r(FUNC(clcd_state::mmu_offset2_r)); + map(0x88000, 0x8bfff).r(FUNC(clcd_state::mmu_offset3_r)); + map(0x8c000, 0x8dfff).r(FUNC(clcd_state::mmu_offset4_r)); + map(0x8e000, 0x8f7ff).r(FUNC(clcd_state::mmu_offset5_r)); } void clcd_state::clcd_mem(address_map &map) { - map(0x0000, 0x0fff).rw(this, FUNC(clcd_state::ram_r), FUNC(clcd_state::ram_w)); + map(0x0000, 0x0fff).rw(FUNC(clcd_state::ram_r), FUNC(clcd_state::ram_w)); map(0x1000, 0x3fff).rw(m_bank1, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0x4000, 0x7fff).rw(m_bank2, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0x8000, 0xbfff).rw(m_bank3, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); @@ -629,21 +629,21 @@ void clcd_state::clcd_mem(address_map &map) map(0xf880, 0xf88f).mirror(0x70).rw("via1", FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0xf980, 0xf983).mirror(0x7c).rw(m_acia, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0xfa00, 0xffff).rom().region("maincpu", 0x1fa00); - map(0xfa00, 0xfa00).mirror(0x7f).w(this, FUNC(clcd_state::mmu_mode_kern_w)); - map(0xfa80, 0xfa80).mirror(0x7f).w(this, FUNC(clcd_state::mmu_mode_appl_w)); - map(0xfb00, 0xfb00).mirror(0x7f).w(this, FUNC(clcd_state::mmu_mode_ram_w)); - map(0xfb80, 0xfb80).mirror(0x7f).w(this, FUNC(clcd_state::mmu_mode_recall_w)); - map(0xfc00, 0xfc00).mirror(0x7f).w(this, FUNC(clcd_state::mmu_mode_save_w)); - map(0xfc80, 0xfc80).mirror(0x7f).w(this, FUNC(clcd_state::mmu_mode_test_w)); - map(0xfd00, 0xfd00).mirror(0x7f).w(this, FUNC(clcd_state::mmu_offset1_w)); - map(0xfd80, 0xfd80).mirror(0x7f).w(this, FUNC(clcd_state::mmu_offset2_w)); - map(0xfe00, 0xfe00).mirror(0x7f).w(this, FUNC(clcd_state::mmu_offset3_w)); - map(0xfe80, 0xfe80).mirror(0x7f).w(this, FUNC(clcd_state::mmu_offset4_w)); - map(0xff00, 0xff00).mirror(0x7f).w(this, FUNC(clcd_state::mmu_offset5_w)); - map(0xff80, 0xff80).mirror(0x7c).w(this, FUNC(clcd_state::lcd_scrollx_w)); - map(0xff81, 0xff81).mirror(0x7c).w(this, FUNC(clcd_state::lcd_scrolly_w)); - map(0xff82, 0xff82).mirror(0x7c).w(this, FUNC(clcd_state::lcd_mode_w)); - map(0xff83, 0xff83).mirror(0x7c).w(this, FUNC(clcd_state::lcd_size_w)); + map(0xfa00, 0xfa00).mirror(0x7f).w(FUNC(clcd_state::mmu_mode_kern_w)); + map(0xfa80, 0xfa80).mirror(0x7f).w(FUNC(clcd_state::mmu_mode_appl_w)); + map(0xfb00, 0xfb00).mirror(0x7f).w(FUNC(clcd_state::mmu_mode_ram_w)); + map(0xfb80, 0xfb80).mirror(0x7f).w(FUNC(clcd_state::mmu_mode_recall_w)); + map(0xfc00, 0xfc00).mirror(0x7f).w(FUNC(clcd_state::mmu_mode_save_w)); + map(0xfc80, 0xfc80).mirror(0x7f).w(FUNC(clcd_state::mmu_mode_test_w)); + map(0xfd00, 0xfd00).mirror(0x7f).w(FUNC(clcd_state::mmu_offset1_w)); + map(0xfd80, 0xfd80).mirror(0x7f).w(FUNC(clcd_state::mmu_offset2_w)); + map(0xfe00, 0xfe00).mirror(0x7f).w(FUNC(clcd_state::mmu_offset3_w)); + map(0xfe80, 0xfe80).mirror(0x7f).w(FUNC(clcd_state::mmu_offset4_w)); + map(0xff00, 0xff00).mirror(0x7f).w(FUNC(clcd_state::mmu_offset5_w)); + map(0xff80, 0xff80).mirror(0x7c).w(FUNC(clcd_state::lcd_scrollx_w)); + map(0xff81, 0xff81).mirror(0x7c).w(FUNC(clcd_state::lcd_scrolly_w)); + map(0xff82, 0xff82).mirror(0x7c).w(FUNC(clcd_state::lcd_mode_w)); + map(0xff83, 0xff83).mirror(0x7c).w(FUNC(clcd_state::lcd_size_w)); } /* Input ports */ diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp index 82ee95de627..e5e37abdf2e 100644 --- a/src/mame/drivers/cliffhgr.cpp +++ b/src/mame/drivers/cliffhgr.cpp @@ -259,21 +259,21 @@ void cliffhgr_state::mainmem(address_map &map) void cliffhgr_state::mainport(address_map &map) { map.global_mask(0xff); - map(0x44, 0x44).w("tms9928a", FUNC(tms9928a_device::vram_write)); - map(0x45, 0x45).r("tms9928a", FUNC(tms9928a_device::vram_read)); - map(0x46, 0x46).w(this, FUNC(cliffhgr_state::cliff_sound_overlay_w)); - map(0x50, 0x52).r(this, FUNC(cliffhgr_state::cliff_phillips_code_r)); - map(0x53, 0x53).r(this, FUNC(cliffhgr_state::cliff_irq_ack_r)); - map(0x54, 0x54).w("tms9928a", FUNC(tms9928a_device::register_write)); - map(0x55, 0x55).r("tms9928a", FUNC(tms9928a_device::register_read)); - map(0x57, 0x57).w(this, FUNC(cliffhgr_state::cliff_phillips_clear_w)); - map(0x60, 0x60).w(this, FUNC(cliffhgr_state::cliff_port_bank_w)); - map(0x62, 0x62).r(this, FUNC(cliffhgr_state::cliff_port_r)); + map(0x44, 0x44).w("tms9928a", FUNC(tms9928a_device::vram_w)); + map(0x45, 0x45).r("tms9928a", FUNC(tms9928a_device::vram_r)); + map(0x46, 0x46).w(FUNC(cliffhgr_state::cliff_sound_overlay_w)); + map(0x50, 0x52).r(FUNC(cliffhgr_state::cliff_phillips_code_r)); + map(0x53, 0x53).r(FUNC(cliffhgr_state::cliff_irq_ack_r)); + map(0x54, 0x54).w("tms9928a", FUNC(tms9928a_device::register_w)); + map(0x55, 0x55).r("tms9928a", FUNC(tms9928a_device::register_r)); + map(0x57, 0x57).w(FUNC(cliffhgr_state::cliff_phillips_clear_w)); + map(0x60, 0x60).w(FUNC(cliffhgr_state::cliff_port_bank_w)); + map(0x62, 0x62).r(FUNC(cliffhgr_state::cliff_port_r)); map(0x64, 0x64).nopw(); /* unused in schematics, may be used as timing delay for IR interface */ - map(0x66, 0x66).w(this, FUNC(cliffhgr_state::cliff_ldwire_w)); - map(0x68, 0x68).w(this, FUNC(cliffhgr_state::cliff_coin_counter_w)); + map(0x66, 0x66).w(FUNC(cliffhgr_state::cliff_ldwire_w)); + map(0x68, 0x68).w(FUNC(cliffhgr_state::cliff_coin_counter_w)); map(0x6a, 0x6a).nopw(); /* /LAMP0 (Infrared?) */ - map(0x6e, 0x6f).w(this, FUNC(cliffhgr_state::cliff_test_led_w)); + map(0x6e, 0x6f).w(FUNC(cliffhgr_state::cliff_test_led_w)); } diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp index 3b6bb6a1d3b..97cdc984c3a 100644 --- a/src/mame/drivers/cloak.cpp +++ b/src/mame/drivers/cloak.cpp @@ -173,22 +173,22 @@ WRITE8_MEMBER(cloak_state::cloak_nvram_enable_w) void cloak_state::master_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(cloak_state::cloak_videoram_w)).share("videoram"); + map(0x0400, 0x07ff).ram().w(FUNC(cloak_state::cloak_videoram_w)).share("videoram"); map(0x0800, 0x0fff).ram().share("share1"); map(0x1000, 0x100f).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); /* DSW0 also */ map(0x1800, 0x180f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); /* DSW1 also */ map(0x2000, 0x2000).portr("P1"); map(0x2200, 0x2200).portr("P2"); map(0x2400, 0x2400).portr("SYSTEM"); - map(0x2600, 0x2600).w(this, FUNC(cloak_state::cloak_custom_w)); + map(0x2600, 0x2600).w(FUNC(cloak_state::cloak_custom_w)); map(0x2800, 0x29ff).ram().share("nvram"); map(0x2f00, 0x2fff).noprw(); map(0x3000, 0x30ff).ram().share("spriteram"); - map(0x3200, 0x327f).w(this, FUNC(cloak_state::cloak_paletteram_w)); + map(0x3200, 0x327f).w(FUNC(cloak_state::cloak_paletteram_w)); map(0x3800, 0x3807).w("outlatch", FUNC(ls259_device::write_d7)); map(0x3a00, 0x3a00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x3c00, 0x3c00).w(this, FUNC(cloak_state::cloak_irq_reset_0_w)); - map(0x3e00, 0x3e00).w(this, FUNC(cloak_state::cloak_nvram_enable_w)); + map(0x3c00, 0x3c00).w(FUNC(cloak_state::cloak_irq_reset_0_w)); + map(0x3e00, 0x3e00).w(FUNC(cloak_state::cloak_nvram_enable_w)); map(0x4000, 0xffff).rom(); } @@ -202,12 +202,12 @@ void cloak_state::master_map(address_map &map) void cloak_state::slave_map(address_map &map) { map(0x0000, 0x0007).ram(); - map(0x0008, 0x000f).rw(this, FUNC(cloak_state::graph_processor_r), FUNC(cloak_state::graph_processor_w)); + map(0x0008, 0x000f).rw(FUNC(cloak_state::graph_processor_r), FUNC(cloak_state::graph_processor_w)); map(0x0010, 0x07ff).ram(); map(0x0800, 0x0fff).ram().share("share1"); - map(0x1000, 0x1000).w(this, FUNC(cloak_state::cloak_irq_reset_1_w)); - map(0x1200, 0x1200).w(this, FUNC(cloak_state::cloak_clearbmp_w)); - map(0x1400, 0x1400).w(this, FUNC(cloak_state::cloak_custom_w)); + map(0x1000, 0x1000).w(FUNC(cloak_state::cloak_irq_reset_1_w)); + map(0x1200, 0x1200).w(FUNC(cloak_state::cloak_clearbmp_w)); + map(0x1400, 0x1400).w(FUNC(cloak_state::cloak_custom_w)); map(0x2000, 0xffff).rom(); } diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp index 0cc979e0227..a69700dafe4 100644 --- a/src/mame/drivers/cloud9.cpp +++ b/src/mame/drivers/cloud9.cpp @@ -266,20 +266,20 @@ WRITE8_MEMBER(cloud9_state::nvram_store_w) void cloud9_state::cloud9_map(address_map &map) { - map(0x0000, 0x4fff).bankr("bank1").w(this, FUNC(cloud9_state::cloud9_videoram_w)); - map(0x0000, 0x0001).w(this, FUNC(cloud9_state::cloud9_bitmode_addr_w)); - map(0x0002, 0x0002).rw(this, FUNC(cloud9_state::cloud9_bitmode_r), FUNC(cloud9_state::cloud9_bitmode_w)); + map(0x0000, 0x4fff).bankr("bank1").w(FUNC(cloud9_state::cloud9_videoram_w)); + map(0x0000, 0x0001).w(FUNC(cloud9_state::cloud9_bitmode_addr_w)); + map(0x0002, 0x0002).rw(FUNC(cloud9_state::cloud9_bitmode_r), FUNC(cloud9_state::cloud9_bitmode_w)); map(0x5000, 0x53ff).ram().share("spriteram"); map(0x5400, 0x547f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x5480, 0x54ff).w(this, FUNC(cloud9_state::irq_ack_w)); - map(0x5500, 0x557f).ram().w(this, FUNC(cloud9_state::cloud9_paletteram_w)).share("paletteram"); + map(0x5480, 0x54ff).w(FUNC(cloud9_state::irq_ack_w)); + map(0x5500, 0x557f).ram().w(FUNC(cloud9_state::cloud9_paletteram_w)).share("paletteram"); map(0x5580, 0x5587).mirror(0x0078).w(m_videolatch, FUNC(ls259_device::write_d7)); // video control registers map(0x5600, 0x5607).mirror(0x0078).w("outlatch", FUNC(ls259_device::write_d7)); - map(0x5680, 0x56ff).w(this, FUNC(cloud9_state::nvram_store_w)); - map(0x5700, 0x577f).w(this, FUNC(cloud9_state::nvram_recall_w)); + map(0x5680, 0x56ff).w(FUNC(cloud9_state::nvram_store_w)); + map(0x5700, 0x577f).w(FUNC(cloud9_state::nvram_recall_w)); map(0x5800, 0x5800).mirror(0x007e).portr("IN0"); map(0x5801, 0x5801).mirror(0x007e).portr("IN1"); - map(0x5900, 0x5903).mirror(0x007c).r(this, FUNC(cloud9_state::leta_r)); + map(0x5900, 0x5903).mirror(0x007c).r(FUNC(cloud9_state::leta_r)); map(0x5a00, 0x5a0f).mirror(0x00f0).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x5b00, 0x5b0f).mirror(0x00f0).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x5c00, 0x5cff).mirror(0x0300).rw(m_nvram, FUNC(x2212_device::read), FUNC(x2212_device::write)); diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp index 5b88faf8990..3ca09e57082 100644 --- a/src/mame/drivers/clpoker.cpp +++ b/src/mame/drivers/clpoker.cpp @@ -82,7 +82,7 @@ private: void clpoker_state::prg_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xdfff).ram().w(this, FUNC(clpoker_state::videoram_w)).share("videoram"); + map(0xc000, 0xdfff).ram().w(FUNC(clpoker_state::videoram_w)).share("videoram"); map(0xe000, 0xe7ff).ram().share("nvram"); map(0xf000, 0xf000).w("ramdac", FUNC(ramdac_device::index_w)); map(0xf001, 0xf001).w("ramdac", FUNC(ramdac_device::pal_w)); diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp index e34d040de8d..f53d7385874 100644 --- a/src/mame/drivers/clshroad.cpp +++ b/src/mame/drivers/clshroad.cpp @@ -78,10 +78,10 @@ void clshroad_state::clshroad_map(address_map &map) map(0x9800, 0x9dff).ram(); map(0x9e00, 0x9fff).ram().share("spriteram"); map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xa100, 0xa107).r(this, FUNC(clshroad_state::input_r)); - map(0xa800, 0xafff).ram().w(this, FUNC(clshroad_state::vram_1_w)).share("vram_1"); // Layer 1 + map(0xa100, 0xa107).r(FUNC(clshroad_state::input_r)); + map(0xa800, 0xafff).ram().w(FUNC(clshroad_state::vram_1_w)).share("vram_1"); // Layer 1 map(0xb000, 0xb003).writeonly().share("vregs"); // Scroll - map(0xc000, 0xc7ff).ram().w(this, FUNC(clshroad_state::vram_0_w)).share("vram_0"); // Layer 0 + map(0xc000, 0xc7ff).ram().w(FUNC(clshroad_state::vram_0_w)).share("vram_0"); // Layer 0 } void clshroad_state::clshroad_sound_map(address_map &map) diff --git a/src/mame/drivers/cm1800.cpp b/src/mame/drivers/cm1800.cpp index 18153794f01..7dacac348b9 100644 --- a/src/mame/drivers/cm1800.cpp +++ b/src/mame/drivers/cm1800.cpp @@ -75,7 +75,7 @@ void cm1800_state::io_map(address_map &map) { map.unmap_value_high(); map(0x00, 0x00).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0x01, 0x01).r(this, FUNC(cm1800_state::uart_status_r)); + map(0x01, 0x01).r(FUNC(cm1800_state::uart_status_r)); } /* Input ports */ diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index c0348a743a6..1b422a32cf4 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -875,12 +875,12 @@ READ16_MEMBER( cmi_state::midi_dma_r ) /* The maps are dynamically populated */ void cmi_state::maincpu1_map(address_map &map) { - map(0xfffe, 0xffff).r(this, FUNC(cmi_state::vector_r<0>)); + map(0xfffe, 0xffff).r(FUNC(cmi_state::vector_r<0>)); } void cmi_state::maincpu2_map(address_map &map) { - map(0xfffe, 0xffff).r(this, FUNC(cmi_state::vector_r<1>)); + map(0xfffe, 0xffff).r(FUNC(cmi_state::vector_r<1>)); } void cmi_state::muskeys_map(address_map &map) @@ -908,7 +908,7 @@ void cmi_state::alphakeys_map(address_map &map) void cmi_state::midicpu_map(address_map &map) { map(0x000000, 0x003fff).rom(); - map(0x040000, 0x05ffff).rw(this, FUNC(cmi_state::midi_dma_r), FUNC(cmi_state::midi_dma_w)); + map(0x040000, 0x05ffff).rw(FUNC(cmi_state::midi_dma_r), FUNC(cmi_state::midi_dma_w)); // AM_RANGE(0x060000, 0x06001f) TIMERS // AM_RANGE(0x060050, 0x06005f) ACIA // AM_RANGE(0x060070, 0x06007f) SMPTE @@ -1358,10 +1358,10 @@ WRITE8_MEMBER( cmi_state::fdc_w ) case 0x6: m_fdc_dma_cnt.b.l = data; break; case 0x8: m_fdc_dma_cnt.b.h = data; break; case 0xa: dma_fdc_rom(); break; - case 0xc: m_wd1791->cmd_w(data ^ 0xff); break; - case 0xd: m_wd1791->track_w(data ^ 0xff); break; - case 0xe: m_wd1791->sector_w(data ^ 0xff); break; - case 0xf: m_wd1791->data_w(data ^ 0xff); break; + case 0xc: m_wd1791->write_cmd(data ^ 0xff); break; + case 0xd: m_wd1791->write_track(data ^ 0xff); break; + case 0xe: m_wd1791->write_sector(data ^ 0xff); break; + case 0xf: m_wd1791->write_data(data ^ 0xff); break; default: printf("fdc_w: Invalid access (%x with %x)", m_fdc_addr, data); } } @@ -1378,10 +1378,10 @@ READ8_MEMBER( cmi_state::fdc_r ) { switch (m_fdc_addr) { - case 0xc: { return m_wd1791->status_r() ^ 0xff; } - case 0xd: { return m_wd1791->track_r() ^ 0xff; } - case 0xe: { return m_wd1791->sector_r() ^ 0xff; } - case 0xf: { return m_wd1791->data_r() ^ 0xff; } + case 0xc: { return m_wd1791->read_status() ^ 0xff; } + case 0xd: { return m_wd1791->read_track() ^ 0xff; } + case 0xe: { return m_wd1791->read_sector() ^ 0xff; } + case 0xf: { return m_wd1791->read_data() ^ 0xff; } default: return 0; } } @@ -1413,7 +1413,7 @@ void cmi_state::fdc_dma_transfer() if (!BIT(m_fdc_ctrl, 4)) { /* Read a byte at a time */ - uint8_t data = m_wd1791->data_r() ^ 0xff; + uint8_t data = m_wd1791->read_data() ^ 0xff; if (m_fdc_dma_cnt.w.l == 0xffff) return; @@ -1445,7 +1445,7 @@ void cmi_state::fdc_dma_transfer() if (phys_page & 0x80) data = m_q256_ram[i][((phys_page & 0x7f) * PAGE_SIZE) + (m_fdc_dma_addr.w.l & PAGE_MASK)]; - m_wd1791->data_w(data ^ 0xff); + m_wd1791->write_data(data ^ 0xff); if (!BIT(m_fdc_ctrl, 3)) m_fdc_dma_addr.w.l++; diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp index be9bfd75da9..532af268fbf 100644 --- a/src/mame/drivers/cmmb.cpp +++ b/src/mame/drivers/cmmb.cpp @@ -214,15 +214,15 @@ void cmmb_state::cmmb_map(address_map &map) map(0x2001, 0x2001).portr("IN4"); map(0x2011, 0x2011).portr("IN5"); map(0x2480, 0x249f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x2505, 0x2505).w(this, FUNC(cmmb_state::irq_enable_w)); - map(0x2600, 0x2600).w(this, FUNC(cmmb_state::irq_ack_w)); + map(0x2505, 0x2505).w(FUNC(cmmb_state::irq_enable_w)); + map(0x2600, 0x2600).w(FUNC(cmmb_state::irq_ack_w)); //AM_RANGE(0x4000, 0x400f) AM_READWRITE(cmmb_input_r,cmmb_output_w) //AM_RANGE(0x4900, 0x4900) AM_READ(kludge_r) map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0x9fff).rom().region("maincpu", 0x18000); map(0xa000, 0xafff).ram(); - map(0xb000, 0xbfff).rw(this, FUNC(cmmb_state::cmmb_charram_r), FUNC(cmmb_state::cmmb_charram_w)); - map(0xc000, 0xc00f).rw(this, FUNC(cmmb_state::cmmb_input_r), FUNC(cmmb_state::cmmb_output_w)); + map(0xb000, 0xbfff).rw(FUNC(cmmb_state::cmmb_charram_r), FUNC(cmmb_state::cmmb_charram_w)); + map(0xc000, 0xc00f).rw(FUNC(cmmb_state::cmmb_input_r), FUNC(cmmb_state::cmmb_output_w)); // debugging, to be removed // AM_RANGE(0x2aaa, 0x2aaa) AM_WRITE(flash_dbg_0_w) // AM_RANGE(0x5555, 0x5555) AM_WRITE(flash_dbg_1_w) diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index 9705aa3d1ee..cd8101cac17 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -91,13 +91,13 @@ void cninja_state::cninja_map(address_map &map) { map(0x000000, 0x0bffff).rom(); - map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>)); + map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>)); map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x14c000, 0x14c7ff).writeonly().share("pf1_rowscroll"); map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll"); - map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>)); + map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>)); map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll"); @@ -109,7 +109,7 @@ void cninja_state::cninja_map(address_map &map) map(0x1a4000, 0x1a47ff).ram().share("spriteram1"); /* Sprites */ map(0x1b4000, 0x1b4001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* DMA flag */ - map(0x1bc000, 0x1bffff).rw(this, FUNC(cninja_state::cninja_protection_region_0_104_r), FUNC(cninja_state::cninja_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ + map(0x1bc000, 0x1bffff).rw(FUNC(cninja_state::cninja_protection_region_0_104_r), FUNC(cninja_state::cninja_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ map(0x308000, 0x308fff).nopw(); /* Bootleg only */ } @@ -120,13 +120,13 @@ void cninja_state::cninjabl_map(address_map &map) map(0x138000, 0x1387ff).ram().share("spriteram1"); /* bootleg sprite-ram (sprites rewritten here in new format) */ - map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>)); + map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>)); map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x14c000, 0x14c7ff).writeonly().share("pf1_rowscroll"); map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll"); - map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>)); // not used / incorrect on this + map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>)); // not used / incorrect on this map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll"); @@ -193,13 +193,13 @@ void cninja_state::edrandy_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>)); + map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>)); map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x14c000, 0x14c7ff).ram().share("pf1_rowscroll"); map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll"); - map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>)); + map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>)); map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll"); @@ -207,10 +207,10 @@ void cninja_state::edrandy_map(address_map &map) map(0x188000, 0x189fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x194000, 0x197fff).ram(); /* Main ram */ - map(0x198000, 0x19bfff).rw(this, FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */ -// map(0x198000, 0x1987ff).rw(this, FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */ + map(0x198000, 0x19bfff).rw(FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */ +// map(0x198000, 0x1987ff).rw(FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */ - map(0x1a0000, 0x1a3fff).rw(this, FUNC(cninja_state::edrandy_protection_region_8_146_r), FUNC(cninja_state::edrandy_protection_region_8_146_w)); + map(0x1a0000, 0x1a3fff).rw(FUNC(cninja_state::edrandy_protection_region_8_146_r), FUNC(cninja_state::edrandy_protection_region_8_146_w)); map(0x1a4000, 0x1a4007).m("irq", FUNC(deco_irq_device::map)).umask16(0x00ff); map(0x1ac000, 0x1ac001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* DMA flag */ @@ -227,29 +227,29 @@ void cninja_state::robocop2_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>)); + map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>)); map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x14c000, 0x14c7ff).ram().share("pf1_rowscroll"); map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll"); - map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>)); + map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>)); map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll"); map(0x15e000, 0x15e7ff).ram().share("pf4_rowscroll"); map(0x180000, 0x1807ff).ram().share("spriteram1"); -// map(0x18c000, 0x18c0ff).w(this, FUNC(cninja_state::cninja_loopback_w)) /* Protection writes */ +// map(0x18c000, 0x18c0ff).w(FUNC(cninja_state::cninja_loopback_w)) /* Protection writes */ // map(0x18c000, 0x18c7ff).r(m_ioprot, FUNC(deco146_device,robocop2_prot_r)) /* Protection device */ // map(0x18c064, 0x18c065).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x18c000, 0x18ffff).rw(this, FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ + map(0x18c000, 0x18ffff).rw(FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ map(0x198000, 0x198001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* DMA flag */ map(0x1a8000, 0x1a9fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x1b0000, 0x1b0007).m("irq", FUNC(deco_irq_device::map)).umask16(0x00ff); map(0x1b8000, 0x1bbfff).ram(); /* Main ram */ - map(0x1f0000, 0x1f0001).w(this, FUNC(cninja_state::robocop2_priority_w)); + map(0x1f0000, 0x1f0001).w(FUNC(cninja_state::robocop2_priority_w)); map(0x1f8000, 0x1f8001).portr("DSW3"); /* Dipswitch #3 */ } @@ -283,19 +283,19 @@ void cninja_state::mutantf_map(address_map &map) map(0x120000, 0x1207ff).ram().share("spriteram1"); map(0x140000, 0x1407ff).ram().share("spriteram2"); map(0x160000, 0x161fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x180000, 0x180001).w(this, FUNC(cninja_state::robocop2_priority_w)); + map(0x180000, 0x180001).w(FUNC(cninja_state::robocop2_priority_w)); map(0x180002, 0x180003).nopw(); /* VBL irq ack */ - map(0x1a0000, 0x1a3fff).rw(this, FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ - map(0x1c0000, 0x1c0001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)).r(this, FUNC(cninja_state::mutantf_71_r)); + map(0x1a0000, 0x1a3fff).rw(FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ + map(0x1c0000, 0x1c0001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)).r(FUNC(cninja_state::mutantf_71_r)); map(0x1e0000, 0x1e0001).w(m_spriteram[1], FUNC(buffered_spriteram16_device::write)); - map(0x300000, 0x30000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>)); + map(0x300000, 0x30000f).w(FUNC(cninja_state::cninja_pf_control_w<0>)); map(0x304000, 0x305fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x306000, 0x307fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x308000, 0x3087ff).ram().share("pf1_rowscroll"); map(0x30a000, 0x30a7ff).ram().share("pf2_rowscroll"); - map(0x310000, 0x31000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>)); + map(0x310000, 0x31000f).w(FUNC(cninja_state::cninja_pf_control_w<1>)); map(0x314000, 0x315fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x316000, 0x317fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x318000, 0x3187ff).ram().share("pf3_rowscroll"); @@ -354,7 +354,7 @@ void cninja_state::cninjabl2_s_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(cninja_state::cninjabl2_oki_bank_w)); + map(0x9000, 0x9000).w(FUNC(cninja_state::cninjabl2_oki_bank_w)); map(0x9800, 0x9800).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_ioprot, FUNC(deco_146_base_device::soundlatch_r)); } diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp index 5e3b8a3cbe7..c4060615e8e 100644 --- a/src/mame/drivers/cntsteer.cpp +++ b/src/mame/drivers/cntsteer.cpp @@ -584,23 +584,23 @@ void cntsteer_state::gekitsui_cpu1_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x11ff).ram().share("spriteram"); map(0x1200, 0x1fff).ram(); - map(0x2000, 0x23ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); - map(0x3000, 0x3003).w(this, FUNC(cntsteer_state::zerotrgt_ctrl_w)); + map(0x2000, 0x23ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); + map(0x2400, 0x27ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); + map(0x3000, 0x3003).w(FUNC(cntsteer_state::zerotrgt_ctrl_w)); map(0x8000, 0xffff).rom(); } void cntsteer_state::gekitsui_cpu2_map(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); - map(0x1000, 0x1fff).ram().w(this, FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); + map(0x1000, 0x1fff).ram().w(FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); map(0x3000, 0x3000).portr("DSW0"); map(0x3001, 0x3001).portr("P2"); map(0x3002, 0x3002).portr("P1"); map(0x3003, 0x3003).portr("COINS"); - map(0x3000, 0x3004).w(this, FUNC(cntsteer_state::zerotrgt_vregs_w)); - map(0x3005, 0x3005).w(this, FUNC(cntsteer_state::gekitsui_sub_irq_ack)); - map(0x3007, 0x3007).w(this, FUNC(cntsteer_state::cntsteer_sound_w)); + map(0x3000, 0x3004).w(FUNC(cntsteer_state::zerotrgt_vregs_w)); + map(0x3005, 0x3005).w(FUNC(cntsteer_state::gekitsui_sub_irq_ack)); + map(0x3007, 0x3007).w(FUNC(cntsteer_state::cntsteer_sound_w)); map(0x4000, 0xffff).rom(); } @@ -608,26 +608,26 @@ void cntsteer_state::cntsteer_cpu1_map(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x11ff).ram().share("spriteram"); - map(0x2000, 0x23ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); - map(0x3000, 0x3000).w(this, FUNC(cntsteer_state::cntsteer_sub_nmi_w)); - map(0x3001, 0x3001).w(this, FUNC(cntsteer_state::cntsteer_sub_irq_w)); + map(0x2000, 0x23ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_vram_w)).share("videoram"); + map(0x2400, 0x27ff).ram().w(FUNC(cntsteer_state::cntsteer_foreground_attr_w)).share("colorram"); + map(0x3000, 0x3000).w(FUNC(cntsteer_state::cntsteer_sub_nmi_w)); + map(0x3001, 0x3001).w(FUNC(cntsteer_state::cntsteer_sub_irq_w)); map(0x8000, 0xffff).rom(); } void cntsteer_state::cntsteer_cpu2_map(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); - map(0x1000, 0x1fff).ram().w(this, FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); - map(0x2000, 0x2fff).rw(this, FUNC(cntsteer_state::cntsteer_background_mirror_r), FUNC(cntsteer_state::cntsteer_background_w)); + map(0x1000, 0x1fff).ram().w(FUNC(cntsteer_state::cntsteer_background_w)).share("videoram2"); + map(0x2000, 0x2fff).rw(FUNC(cntsteer_state::cntsteer_background_mirror_r), FUNC(cntsteer_state::cntsteer_background_w)); map(0x3000, 0x3000).portr("DSW0"); - map(0x3001, 0x3001).r(this, FUNC(cntsteer_state::cntsteer_adx_r)); + map(0x3001, 0x3001).r(FUNC(cntsteer_state::cntsteer_adx_r)); map(0x3002, 0x3002).portr("P1"); map(0x3003, 0x3003).portr("COINS"); - map(0x3000, 0x3004).w(this, FUNC(cntsteer_state::cntsteer_vregs_w)); - map(0x3005, 0x3005).w(this, FUNC(cntsteer_state::gekitsui_sub_irq_ack)); - map(0x3006, 0x3006).w(this, FUNC(cntsteer_state::cntsteer_main_irq_w)); - map(0x3007, 0x3007).w(this, FUNC(cntsteer_state::cntsteer_sound_w)); + map(0x3000, 0x3004).w(FUNC(cntsteer_state::cntsteer_vregs_w)); + map(0x3005, 0x3005).w(FUNC(cntsteer_state::gekitsui_sub_irq_ack)); + map(0x3006, 0x3006).w(FUNC(cntsteer_state::cntsteer_main_irq_w)); + map(0x3007, 0x3007).w(FUNC(cntsteer_state::cntsteer_sound_w)); map(0x3007, 0x3007).nopr(); //m6809 bug. map(0x4000, 0xffff).rom(); } @@ -667,7 +667,7 @@ void cntsteer_state::sound_map(address_map &map) map(0x6000, 0x6000).w("ay2", FUNC(ay8910_device::data_w)); map(0x8000, 0x8000).w("ay2", FUNC(ay8910_device::address_w)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xd000, 0xd000).w(this, FUNC(cntsteer_state::nmimask_w)); + map(0xd000, 0xd000).w(FUNC(cntsteer_state::nmimask_w)); map(0xe000, 0xffff).rom(); } @@ -961,7 +961,7 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_DEVICE_ADD("ay1", AY8910, 1500000) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) MCFG_DEVICE_ADD("ay2", AY8910, 1500000) diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index 3c70653d47a..335e72f8de4 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -1700,12 +1700,12 @@ void cobra_state::cobra_main_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("main_ram"); map(0x07c00000, 0x07ffffff).ram(); - map(0x80000cf8, 0x80000cff).rw(this, FUNC(cobra_state::main_mpc106_r), FUNC(cobra_state::main_mpc106_w)); + map(0x80000cf8, 0x80000cff).rw(FUNC(cobra_state::main_mpc106_r), FUNC(cobra_state::main_mpc106_w)); map(0xc0000000, 0xc03fffff).ram().share("gfx_main_ram_0"); // GFX board main ram, bank 0 map(0xc7c00000, 0xc7ffffff).ram().share("gfx_main_ram_1"); // GFX board main ram, bank 1 map(0xfff00000, 0xfff7ffff).rom().region("user1", 0); /* Boot ROM */ - map(0xfff80000, 0xfffbffff).rw(this, FUNC(cobra_state::main_comram_r), FUNC(cobra_state::main_comram_w)); - map(0xffff0000, 0xffff0007).rw(this, FUNC(cobra_state::main_fifo_r), FUNC(cobra_state::main_fifo_w)); + map(0xfff80000, 0xfffbffff).rw(FUNC(cobra_state::main_comram_r), FUNC(cobra_state::main_comram_w)); + map(0xffff0000, 0xffff0007).rw(FUNC(cobra_state::main_fifo_r), FUNC(cobra_state::main_fifo_w)); } @@ -2040,24 +2040,24 @@ WRITE8_MEMBER(cobra_state::sub_jvs_w) void cobra_state::cobra_sub_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("sub_ram"); // Main RAM - map(0x70000000, 0x7003ffff).rw(this, FUNC(cobra_state::sub_comram_r), FUNC(cobra_state::sub_comram_w)); // Double buffered shared RAM between Main and Sub + map(0x70000000, 0x7003ffff).rw(FUNC(cobra_state::sub_comram_r), FUNC(cobra_state::sub_comram_w)); // Double buffered shared RAM between Main and Sub // AM_RANGE(0x78000000, 0x780000ff) AM_NOP // SCSI controller (unused) map(0x78040000, 0x7804ffff).rw("rfsnd", FUNC(rf5c400_device::rf5c400_r), FUNC(rf5c400_device::rf5c400_w)); - map(0x78080000, 0x7808000f).rw(this, FUNC(cobra_state::sub_ata0_r), FUNC(cobra_state::sub_ata0_w)); - map(0x780c0010, 0x780c001f).rw(this, FUNC(cobra_state::sub_ata1_r), FUNC(cobra_state::sub_ata1_w)); + map(0x78080000, 0x7808000f).rw(FUNC(cobra_state::sub_ata0_r), FUNC(cobra_state::sub_ata0_w)); + map(0x780c0010, 0x780c001f).rw(FUNC(cobra_state::sub_ata1_r), FUNC(cobra_state::sub_ata1_w)); map(0x78200000, 0x782000ff).rw(m_k001604, FUNC(k001604_device::reg_r), FUNC(k001604_device::reg_w)); // PSAC registers - map(0x78210000, 0x78217fff).ram().w(this, FUNC(cobra_state::sub_psac_palette_w)).share("paletteram"); // PSAC palette RAM + map(0x78210000, 0x78217fff).ram().w(FUNC(cobra_state::sub_psac_palette_w)).share("paletteram"); // PSAC palette RAM map(0x78220000, 0x7823ffff).rw(m_k001604, FUNC(k001604_device::tile_r), FUNC(k001604_device::tile_w)); // PSAC tile RAM map(0x78240000, 0x7827ffff).rw(m_k001604, FUNC(k001604_device::char_r), FUNC(k001604_device::char_w)); // PSAC character RAM map(0x78280000, 0x7828000f).noprw(); // ??? - map(0x78300000, 0x7830000f).rw(this, FUNC(cobra_state::sub_psac2_r), FUNC(cobra_state::sub_psac2_w)); // PSAC - map(0x7e000000, 0x7e000003).rw(this, FUNC(cobra_state::sub_unk7e_r), FUNC(cobra_state::sub_debug_w)); + map(0x78300000, 0x7830000f).rw(FUNC(cobra_state::sub_psac2_r), FUNC(cobra_state::sub_psac2_w)); // PSAC + map(0x7e000000, 0x7e000003).rw(FUNC(cobra_state::sub_unk7e_r), FUNC(cobra_state::sub_debug_w)); map(0x7e040000, 0x7e041fff).rw("m48t58", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); /* M48T58Y RTC/NVRAM */ - map(0x7e180000, 0x7e180003).rw(this, FUNC(cobra_state::sub_unk1_r), FUNC(cobra_state::sub_unk1_w)); // TMS57002? - map(0x7e200000, 0x7e200003).rw(this, FUNC(cobra_state::sub_config_r), FUNC(cobra_state::sub_config_w)); + map(0x7e180000, 0x7e180003).rw(FUNC(cobra_state::sub_unk1_r), FUNC(cobra_state::sub_unk1_w)); // TMS57002? + map(0x7e200000, 0x7e200003).rw(FUNC(cobra_state::sub_config_r), FUNC(cobra_state::sub_config_w)); map(0x7e280000, 0x7e28ffff).noprw(); // LANC map(0x7e300000, 0x7e30ffff).noprw(); // LANC - map(0x7e380000, 0x7e380003).rw(this, FUNC(cobra_state::sub_mainbd_r), FUNC(cobra_state::sub_mainbd_w)); + map(0x7e380000, 0x7e380003).rw(FUNC(cobra_state::sub_mainbd_r), FUNC(cobra_state::sub_mainbd_w)); map(0x7ff80000, 0x7fffffff).rom().region("user2", 0); /* Boot ROM */ } @@ -3148,15 +3148,15 @@ void cobra_state::cobra_gfx_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("gfx_main_ram_0"); map(0x07c00000, 0x07ffffff).ram().share("gfx_main_ram_1"); - map(0x10000000, 0x100007ff).w(this, FUNC(cobra_state::gfx_fifo0_w)); - map(0x18000000, 0x180007ff).w(this, FUNC(cobra_state::gfx_fifo1_w)); - map(0x1e000000, 0x1e0007ff).w(this, FUNC(cobra_state::gfx_fifo2_w)); - map(0x20000000, 0x20000007).w(this, FUNC(cobra_state::gfx_buf_w)); // this might really map to 0x1e000000, depending on the pagetable + map(0x10000000, 0x100007ff).w(FUNC(cobra_state::gfx_fifo0_w)); + map(0x18000000, 0x180007ff).w(FUNC(cobra_state::gfx_fifo1_w)); + map(0x1e000000, 0x1e0007ff).w(FUNC(cobra_state::gfx_fifo2_w)); + map(0x20000000, 0x20000007).w(FUNC(cobra_state::gfx_buf_w)); // this might really map to 0x1e000000, depending on the pagetable map(0x7f000000, 0x7f00ffff).ram().share("pagetable"); map(0xfff00000, 0xfff7ffff).rom().region("user3", 0); /* Boot ROM */ - map(0xfff80000, 0xfff80007).w(this, FUNC(cobra_state::gfx_debug_state_w)); - map(0xffff0000, 0xffff0007).rw(this, FUNC(cobra_state::gfx_unk1_r), FUNC(cobra_state::gfx_unk1_w)); - map(0xffff0010, 0xffff001f).r(this, FUNC(cobra_state::gfx_fifo_r)); + map(0xfff80000, 0xfff80007).w(FUNC(cobra_state::gfx_debug_state_w)); + map(0xffff0000, 0xffff0007).rw(FUNC(cobra_state::gfx_unk1_r), FUNC(cobra_state::gfx_unk1_w)); + map(0xffff0010, 0xffff001f).r(FUNC(cobra_state::gfx_fifo_r)); } diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index 3fb12d89c6e..22e3d9e27a2 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -403,7 +403,7 @@ MACHINE_CONFIG_END void coco_state::coco_floating_map(address_map &map) { - map(0x0000, 0xFFFF).r(this, FUNC(coco_state::floating_bus_read)); + map(0x0000, 0xFFFF).r(FUNC(coco_state::floating_bus_r)); } diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp index 0e0d91faca3..2419e5b9358 100644 --- a/src/mame/drivers/coco3.cpp +++ b/src/mame/drivers/coco3.cpp @@ -41,11 +41,11 @@ void coco3_state::coco3_mem(address_map &map) map(0xC000, 0xDFFF).bankr("rbank6").bankw("wbank6"); map(0xE000, 0xFDFF).bankr("rbank7").bankw("wbank7"); map(0xFE00, 0xFEFF).bankr("rbank8").bankw("wbank8"); - map(0xFF00, 0xFF1F).rw(this, FUNC(coco3_state::ff00_read), FUNC(coco3_state::ff00_write)); - map(0xFF20, 0xFF3F).rw(this, FUNC(coco3_state::ff20_read), FUNC(coco3_state::ff20_write)); - map(0xFF40, 0xFF5F).rw(this, FUNC(coco3_state::ff40_read), FUNC(coco3_state::ff40_write)); - map(0xFF60, 0xFF8F).rw(this, FUNC(coco3_state::ff60_read), FUNC(coco3_state::ff60_write)); - map(0xFF90, 0xFFDF).rw(m_gime, FUNC(gime_device::read), FUNC(gime_device::write)); + map(0xFF00, 0xFF1F).rw(FUNC(coco3_state::ff00_read), FUNC(coco3_state::ff00_write)); + map(0xFF20, 0xFF3F).rw(FUNC(coco3_state::ff20_read), FUNC(coco3_state::ff20_write)); + map(0xFF40, 0xFF5F).rw(FUNC(coco3_state::ff40_read), FUNC(coco3_state::ff40_write)); + map(0xFF60, 0xFF8F).rw(FUNC(coco3_state::ff60_read), FUNC(coco3_state::ff60_write)); + map(0xFF90, 0xFFDF).rw(m_gime, FUNC(gime_device::bus_r), FUNC(gime_device::bus_w)); // While Tepolt and other sources say that the interrupt vectors are mapped to // the same memory accessed at $BFFx, William Astle offered evidence that this @@ -297,7 +297,7 @@ MACHINE_CONFIG_START(coco3_state::coco3) MCFG_GIME_FSYNC_CALLBACK(WRITELINE(PIA0_TAG, pia6821_device, cb1_w)) MCFG_GIME_IRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_irq_w)) MCFG_GIME_FIRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_firq_w)) - MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(*this, coco_state, floating_bus_read)) + MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(*this, coco_state, floating_bus_r)) // composite monitor MCFG_SCREEN_ADD(COMPOSITE_SCREEN_TAG, RASTER) @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(coco3_state::coco3p) MCFG_GIME_FSYNC_CALLBACK(WRITELINE(PIA0_TAG, pia6821_device, cb1_w)) MCFG_GIME_IRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_irq_w)) MCFG_GIME_FIRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_firq_w)) - MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(*this, coco_state, floating_bus_read)) + MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(*this, coco_state, floating_bus_r)) MACHINE_CONFIG_END MACHINE_CONFIG_START(coco3_state::coco3h) diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp index 72a7360a0cb..76e64f652f7 100644 --- a/src/mame/drivers/cocoloco.cpp +++ b/src/mame/drivers/cocoloco.cpp @@ -389,14 +389,14 @@ WRITE8_MEMBER( cocoloco_state::coincounter_w ) void cocoloco_state::cocoloco_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x3fff).rw(this, FUNC(cocoloco_state::vram_r), FUNC(cocoloco_state::vram_w)); // 256 x 256 x 1 + map(0x2000, 0x3fff).rw(FUNC(cocoloco_state::vram_r), FUNC(cocoloco_state::vram_w)); // 256 x 256 x 1 map(0x6001, 0x6001).r("ay8910", FUNC(ay8910_device::data_r)); map(0x6002, 0x6002).w("ay8910", FUNC(ay8910_device::data_w)); map(0x6003, 0x6003).w("ay8910", FUNC(ay8910_device::address_w)); - map(0x8003, 0x8003).w(this, FUNC(cocoloco_state::vbank_w)); - map(0x8005, 0x8005).w(this, FUNC(cocoloco_state::coincounter_w)); + map(0x8003, 0x8003).w(FUNC(cocoloco_state::vbank_w)); + map(0x8005, 0x8005).w(FUNC(cocoloco_state::coincounter_w)); map(0xa000, 0xa000).portr("IN0"); - map(0xa005, 0xa005).w(this, FUNC(cocoloco_state::vram_clear_w)); + map(0xa005, 0xa005).w(FUNC(cocoloco_state::vram_clear_w)); map(0xd000, 0xffff).rom(); } diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp index db439c11704..63718f814fa 100644 --- a/src/mame/drivers/coinmstr.cpp +++ b/src/mame/drivers/coinmstr.cpp @@ -343,10 +343,10 @@ void coinmstr_state::coinmstr_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(coinmstr_state::quizmstr_bg_w)).share("videoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(coinmstr_state::quizmstr_attr1_w)).share("attr_ram1"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(coinmstr_state::quizmstr_attr2_w)).share("attr_ram2"); - map(0xf800, 0xffff).ram().w(this, FUNC(coinmstr_state::quizmstr_attr3_w)).share("attr_ram3"); + map(0xe000, 0xe7ff).ram().w(FUNC(coinmstr_state::quizmstr_bg_w)).share("videoram"); + map(0xe800, 0xefff).ram().w(FUNC(coinmstr_state::quizmstr_attr1_w)).share("attr_ram1"); + map(0xf000, 0xf7ff).ram().w(FUNC(coinmstr_state::quizmstr_attr2_w)).share("attr_ram2"); + map(0xf800, 0xffff).ram().w(FUNC(coinmstr_state::quizmstr_attr3_w)).share("attr_ram3"); } /* 2x 6462 hardware C000-DFFF & E000-FFFF */ @@ -354,10 +354,10 @@ void coinmstr_state::jpcoin_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).ram(); /* 2x 6462 hardware */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(coinmstr_state::quizmstr_bg_w)).share("videoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(coinmstr_state::quizmstr_attr1_w)).share("attr_ram1"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(coinmstr_state::quizmstr_attr2_w)).share("attr_ram2"); - map(0xf800, 0xffff).ram().w(this, FUNC(coinmstr_state::quizmstr_attr3_w)).share("attr_ram3"); + map(0xe000, 0xe7ff).ram().w(FUNC(coinmstr_state::quizmstr_bg_w)).share("videoram"); + map(0xe800, 0xefff).ram().w(FUNC(coinmstr_state::quizmstr_attr1_w)).share("attr_ram1"); + map(0xf000, 0xf7ff).ram().w(FUNC(coinmstr_state::quizmstr_attr2_w)).share("attr_ram2"); + map(0xf800, 0xffff).ram().w(FUNC(coinmstr_state::quizmstr_attr3_w)).share("attr_ram3"); } // Different I/O mappping for every game @@ -366,8 +366,8 @@ void coinmstr_state::quizmstr_io_map(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(coinmstr_state::question_r)); - map(0x00, 0x03).w(this, FUNC(coinmstr_state::question_w)); + map(0x00, 0x00).r(FUNC(coinmstr_state::question_r)); + map(0x00, 0x03).w(FUNC(coinmstr_state::question_w)); map(0x40, 0x41).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0x41, 0x41).r("aysnd", FUNC(ay8910_device::data_r)); map(0x48, 0x4b).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); @@ -383,8 +383,8 @@ void coinmstr_state::quizmstr_io_map(address_map &map) void coinmstr_state::trailblz_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(coinmstr_state::question_r)); - map(0x00, 0x03).w(this, FUNC(coinmstr_state::question_w)); + map(0x00, 0x00).r(FUNC(coinmstr_state::question_r)); + map(0x00, 0x03).w(FUNC(coinmstr_state::question_w)); map(0x40, 0x40).w("crtc", FUNC(mc6845_device::address_w)); map(0x41, 0x41).w("crtc", FUNC(mc6845_device::register_w)); map(0x48, 0x49).w("aysnd", FUNC(ay8910_device::address_data_w)); @@ -427,8 +427,8 @@ E0-E1 CRTC */ map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(coinmstr_state::question_r)); - map(0x00, 0x03).w(this, FUNC(coinmstr_state::question_w)); + map(0x00, 0x00).r(FUNC(coinmstr_state::question_r)); + map(0x00, 0x03).w(FUNC(coinmstr_state::question_w)); map(0x48, 0x48).w("crtc", FUNC(mc6845_device::address_w)); map(0x49, 0x49).w("crtc", FUNC(mc6845_device::register_w)); map(0x40, 0x43).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); @@ -470,7 +470,7 @@ E0-E1 CRTC map(0x58, 0x5b).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* confirmed */ map(0x68, 0x6b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* confirmed */ map(0x78, 0x7b).rw("pia2", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* confirmed */ - map(0xc0, 0xc1).r(this, FUNC(coinmstr_state::ff_r)); /* needed to boot */ + map(0xc0, 0xc1).r(FUNC(coinmstr_state::ff_r)); /* needed to boot */ } void coinmstr_state::jpcoin_io_map(address_map &map) @@ -500,7 +500,7 @@ E0-E1 CRTC map(0xd0, 0xd3).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xd8, 0xdb).rw("pia2", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* confirmed */ // AM_RANGE(0xc0, 0xc1) AM_READ(ff_r) /* needed to boot */ - map(0xc4, 0xc4).r(this, FUNC(coinmstr_state::ff_r)); /* needed to boot */ + map(0xc4, 0xc4).r(FUNC(coinmstr_state::ff_r)); /* needed to boot */ } diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp index f86836789d6..b6f2a60c259 100644 --- a/src/mame/drivers/coleco.cpp +++ b/src/mame/drivers/coleco.cpp @@ -104,13 +104,13 @@ void coleco_state::coleco_map(address_map &map) void coleco_state::coleco_io_map(address_map &map) { map.global_mask(0xff); - map(0x80, 0x80).mirror(0x1f).w(this, FUNC(coleco_state::paddle_off_w)); - map(0xa0, 0xa0).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0xa1, 0xa1).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0xc0, 0xc0).mirror(0x1f).w(this, FUNC(coleco_state::paddle_on_w)); - map(0xe0, 0xe0).mirror(0x1f).w("sn76489a", FUNC(sn76489a_device::write)); - map(0xe0, 0xe0).mirror(0x1d).r(this, FUNC(coleco_state::paddle_1_r)); - map(0xe2, 0xe2).mirror(0x1d).r(this, FUNC(coleco_state::paddle_2_r)); + map(0x80, 0x80).mirror(0x1f).w(FUNC(coleco_state::paddle_off_w)); + map(0xa0, 0xa0).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0xa1, 0xa1).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0xc0, 0xc0).mirror(0x1f).w(FUNC(coleco_state::paddle_on_w)); + map(0xe0, 0xe0).mirror(0x1f).w("sn76489a", FUNC(sn76489a_device::command_w)); + map(0xe0, 0xe0).mirror(0x1d).r(FUNC(coleco_state::paddle_1_r)); + map(0xe2, 0xe2).mirror(0x1d).r(FUNC(coleco_state::paddle_2_r)); } void coleco_state::czz50_map(address_map &map) diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index 542fc5599f0..c249fb8b622 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -348,29 +348,29 @@ READ8_MEMBER(combatsc_state::unk_r) void combatsc_state::combatsc_map(address_map &map) { - map(0x0000, 0x0007).w(this, FUNC(combatsc_state::combatsc_pf_control_w)); - map(0x001f, 0x001f).r(this, FUNC(combatsc_state::unk_r)); - map(0x0020, 0x005f).rw(this, FUNC(combatsc_state::combatsc_scrollram_r), FUNC(combatsc_state::combatsc_scrollram_w)); + map(0x0000, 0x0007).w(FUNC(combatsc_state::combatsc_pf_control_w)); + map(0x001f, 0x001f).r(FUNC(combatsc_state::unk_r)); + map(0x0020, 0x005f).rw(FUNC(combatsc_state::combatsc_scrollram_r), FUNC(combatsc_state::combatsc_scrollram_w)); // AM_RANGE(0x0060, 0x00ff) AM_WRITEONLY /* RAM */ - map(0x0200, 0x0201).rw(this, FUNC(combatsc_state::protection_r), FUNC(combatsc_state::protection_w)); - map(0x0206, 0x0206).w(this, FUNC(combatsc_state::protection_clock_w)); + map(0x0200, 0x0201).rw(FUNC(combatsc_state::protection_r), FUNC(combatsc_state::protection_w)); + map(0x0206, 0x0206).w(FUNC(combatsc_state::protection_clock_w)); map(0x0400, 0x0400).portr("IN0"); map(0x0401, 0x0401).portr("DSW3"); /* DSW #3 */ map(0x0402, 0x0402).portr("DSW1"); /* DSW #1 */ map(0x0403, 0x0403).portr("DSW2"); /* DSW #2 */ - map(0x0404, 0x0407).r(this, FUNC(combatsc_state::trackball_r)); /* 1P & 2P controls / trackball */ - map(0x0408, 0x0408).w(this, FUNC(combatsc_state::combatsc_coin_counter_w)); /* coin counters */ - map(0x040c, 0x040c).w(this, FUNC(combatsc_state::combatsc_vreg_w)); - map(0x0410, 0x0410).nopr().w(this, FUNC(combatsc_state::combatsc_bankselect_w)); // read is clr a (discarded) + map(0x0404, 0x0407).r(FUNC(combatsc_state::trackball_r)); /* 1P & 2P controls / trackball */ + map(0x0408, 0x0408).w(FUNC(combatsc_state::combatsc_coin_counter_w)); /* coin counters */ + map(0x040c, 0x040c).w(FUNC(combatsc_state::combatsc_vreg_w)); + map(0x0410, 0x0410).nopr().w(FUNC(combatsc_state::combatsc_bankselect_w)); // read is clr a (discarded) map(0x0414, 0x0414).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x0418, 0x0418).w(this, FUNC(combatsc_state::combatsc_sh_irqtrigger_w)); + map(0x0418, 0x0418).w(FUNC(combatsc_state::combatsc_sh_irqtrigger_w)); map(0x041c, 0x041c).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog reset? */ map(0x0600, 0x06ff).ram().w(m_palette, FUNC(palette_device::write_indirect)).share("palette"); map(0x0800, 0x1fff).ram(); /* RAM */ - map(0x2000, 0x3fff).rw(this, FUNC(combatsc_state::combatsc_video_r), FUNC(combatsc_state::combatsc_video_w)); + map(0x2000, 0x3fff).rw(FUNC(combatsc_state::combatsc_video_r), FUNC(combatsc_state::combatsc_video_w)); map(0x4000, 0x7fff).bankr("bank1"); /* banked ROM area */ map(0x8000, 0xffff).rom(); /* ROM */ } @@ -378,10 +378,10 @@ void combatsc_state::combatsc_map(address_map &map) void combatsc_state::combatscb_map(address_map &map) { map(0x0000, 0x04ff).ram(); - map(0x0500, 0x0500).w(this, FUNC(combatsc_state::combatscb_bankselect_w)); + map(0x0500, 0x0500).w(FUNC(combatsc_state::combatscb_bankselect_w)); map(0x0600, 0x06ff).ram().w(m_palette, FUNC(palette_device::write_indirect)).share("palette"); map(0x0800, 0x1fff).ram(); - map(0x2000, 0x3fff).rw(this, FUNC(combatsc_state::combatsc_video_r), FUNC(combatsc_state::combatsc_video_w)); + map(0x2000, 0x3fff).rw(FUNC(combatsc_state::combatsc_video_r), FUNC(combatsc_state::combatsc_video_w)); map(0x4000, 0x7fff).bankr("bank1"); /* banked ROM/RAM area */ map(0x8000, 0xffff).rom(); /* ROM */ } @@ -391,10 +391,10 @@ void combatsc_state::combatsc_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); /* ROM */ map(0x8000, 0x87ff).ram(); /* RAM */ - map(0x9000, 0x9000).w(this, FUNC(combatsc_state::combatsc_play_w)); /* upd7759 play voice */ + map(0x9000, 0x9000).w(FUNC(combatsc_state::combatsc_play_w)); /* upd7759 play voice */ map(0xa000, 0xa000).w(m_upd7759, FUNC(upd7759_device::port_w)); /* upd7759 voice select */ - map(0xb000, 0xb000).r(this, FUNC(combatsc_state::combatsc_busy_r)); /* upd7759 busy? */ - map(0xc000, 0xc000).w(this, FUNC(combatsc_state::combatsc_voice_reset_w)); /* upd7759 reset? */ + map(0xb000, 0xb000).r(FUNC(combatsc_state::combatsc_busy_r)); /* upd7759 busy? */ + map(0xc000, 0xc000).w(FUNC(combatsc_state::combatsc_voice_reset_w)); /* upd7759 reset? */ map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* soundlatch read? */ map(0xe000, 0xe001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); /* YM 2203 intercepted */ @@ -419,9 +419,9 @@ void combatsc_state::combatscb_sound_map(address_map &map) map(0x8000, 0x87ff).ram(); /* RAM */ map(0x9000, 0x9001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); /* YM 2203 */ map(0x9008, 0x9009).r("ymsnd", FUNC(ym2203_device::read)); /* ??? */ - map(0x9800, 0x9800).w(this, FUNC(combatsc_state::combatscb_msm_w)); + map(0x9800, 0x9800).w(FUNC(combatsc_state::combatscb_msm_w)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* soundlatch read? */ - map(0xa800, 0xa800).w(this, FUNC(combatsc_state::combatscb_sound_irq_ack)); + map(0xa800, 0xa800).w(FUNC(combatsc_state::combatscb_sound_irq_ack)); map(0xc000, 0xffff).bankr("bl_abank"); } diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp index 53b8d36df4e..e628310992d 100644 --- a/src/mame/drivers/commando.cpp +++ b/src/mame/drivers/commando.cpp @@ -65,13 +65,13 @@ void commando_state::commando_map(address_map &map) map(0xc003, 0xc003).portr("DSW1"); map(0xc004, 0xc004).portr("DSW2"); map(0xc800, 0xc800).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc804, 0xc804).w(this, FUNC(commando_state::commando_c804_w)); - map(0xc808, 0xc809).w(this, FUNC(commando_state::commando_scrollx_w)); - map(0xc80a, 0xc80b).w(this, FUNC(commando_state::commando_scrolly_w)); - map(0xd000, 0xd3ff).ram().w(this, FUNC(commando_state::commando_videoram2_w)).share("videoram2"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(commando_state::commando_colorram2_w)).share("colorram2"); - map(0xd800, 0xdbff).ram().w(this, FUNC(commando_state::commando_videoram_w)).share("videoram"); - map(0xdc00, 0xdfff).ram().w(this, FUNC(commando_state::commando_colorram_w)).share("colorram"); + map(0xc804, 0xc804).w(FUNC(commando_state::commando_c804_w)); + map(0xc808, 0xc809).w(FUNC(commando_state::commando_scrollx_w)); + map(0xc80a, 0xc80b).w(FUNC(commando_state::commando_scrolly_w)); + map(0xd000, 0xd3ff).ram().w(FUNC(commando_state::commando_videoram2_w)).share("videoram2"); + map(0xd400, 0xd7ff).ram().w(FUNC(commando_state::commando_colorram2_w)).share("colorram2"); + map(0xd800, 0xdbff).ram().w(FUNC(commando_state::commando_videoram_w)).share("videoram"); + map(0xdc00, 0xdfff).ram().w(FUNC(commando_state::commando_colorram_w)).share("colorram"); map(0xe000, 0xfdff).ram(); map(0xfe00, 0xff7f).ram().share("spriteram"); map(0xff80, 0xffff).ram(); diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp index bce4106f67f..be19566ae86 100644 --- a/src/mame/drivers/compc.cpp +++ b/src/mame/drivers/compc.cpp @@ -182,14 +182,14 @@ void compc_state::compc_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); - map(0x0060, 0x0063).rw(this, FUNC(compc_state::pio_r), FUNC(compc_state::pio_w)); + map(0x0060, 0x0063).rw(FUNC(compc_state::pio_r), FUNC(compc_state::pio_w)); } void compc_state::compciii_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); - map(0x0060, 0x0063).rw(this, FUNC(compc_state::pioiii_r), FUNC(compc_state::pioiii_w)); + map(0x0060, 0x0063).rw(FUNC(compc_state::pioiii_r), FUNC(compc_state::pioiii_w)); } MACHINE_CONFIG_START(compc_state::compc) diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp index 5a4f3a4e876..bc5fa770891 100644 --- a/src/mame/drivers/compgolf.cpp +++ b/src/mame/drivers/compgolf.cpp @@ -63,12 +63,12 @@ WRITE8_MEMBER(compgolf_state::compgolf_ctrl_w) void compgolf_state::compgolf_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x1000, 0x17ff).ram().w(this, FUNC(compgolf_state::compgolf_video_w)).share("videoram"); - map(0x1800, 0x1fff).ram().w(this, FUNC(compgolf_state::compgolf_back_w)).share("bg_ram"); + map(0x1000, 0x17ff).ram().w(FUNC(compgolf_state::compgolf_video_w)).share("videoram"); + map(0x1800, 0x1fff).ram().w(FUNC(compgolf_state::compgolf_back_w)).share("bg_ram"); map(0x2000, 0x2060).ram().share("spriteram"); map(0x2061, 0x2061).nopw(); map(0x3000, 0x3000).portr("P1"); - map(0x3001, 0x3001).portr("P2").w(this, FUNC(compgolf_state::compgolf_ctrl_w)); + map(0x3001, 0x3001).portr("P2").w(FUNC(compgolf_state::compgolf_ctrl_w)); map(0x3002, 0x3002).portr("DSW1"); map(0x3003, 0x3003).portr("DSW2"); map(0x3800, 0x3801).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp index 6fa8fc946ed..8d1b853bc2f 100644 --- a/src/mame/drivers/compis.cpp +++ b/src/mame/drivers/compis.cpp @@ -427,14 +427,14 @@ void compis_state::compis_io(address_map &map) map(0x0180, 0x01ff) /* PCS3 */ .rw(GRAPHICS_TAG, FUNC(compis_graphics_slot_device::pcs3_r), FUNC(compis_graphics_slot_device::pcs3_w)); //map(0x0200, 0x0201) /* PCS4 */ .mirror(0x7e); map(0x0280, 0x028f) /* PCS5 */ .mirror(0x70).m(I80130_TAG, FUNC(i80130_device::io_map)); - map(0x0300, 0x030f).rw(this, FUNC(compis_state::pcs6_0_1_r), FUNC(compis_state::pcs6_0_1_w)); - map(0x0310, 0x031f).rw(this, FUNC(compis_state::pcs6_2_3_r), FUNC(compis_state::pcs6_2_3_w)); - map(0x0320, 0x032f).rw(this, FUNC(compis_state::pcs6_4_5_r), FUNC(compis_state::pcs6_4_5_w)); - map(0x0330, 0x033f).rw(this, FUNC(compis_state::pcs6_6_7_r), FUNC(compis_state::pcs6_6_7_w)); - map(0x0340, 0x034f).rw(this, FUNC(compis_state::pcs6_8_9_r), FUNC(compis_state::pcs6_8_9_w)); - map(0x0350, 0x035f).rw(this, FUNC(compis_state::pcs6_10_11_r), FUNC(compis_state::pcs6_10_11_w)); - map(0x0360, 0x036f).rw(this, FUNC(compis_state::pcs6_12_13_r), FUNC(compis_state::pcs6_12_13_w)); - map(0x0370, 0x037f).rw(this, FUNC(compis_state::pcs6_14_15_r), FUNC(compis_state::pcs6_14_15_w)); + map(0x0300, 0x030f).rw(FUNC(compis_state::pcs6_0_1_r), FUNC(compis_state::pcs6_0_1_w)); + map(0x0310, 0x031f).rw(FUNC(compis_state::pcs6_2_3_r), FUNC(compis_state::pcs6_2_3_w)); + map(0x0320, 0x032f).rw(FUNC(compis_state::pcs6_4_5_r), FUNC(compis_state::pcs6_4_5_w)); + map(0x0330, 0x033f).rw(FUNC(compis_state::pcs6_6_7_r), FUNC(compis_state::pcs6_6_7_w)); + map(0x0340, 0x034f).rw(FUNC(compis_state::pcs6_8_9_r), FUNC(compis_state::pcs6_8_9_w)); + map(0x0350, 0x035f).rw(FUNC(compis_state::pcs6_10_11_r), FUNC(compis_state::pcs6_10_11_w)); + map(0x0360, 0x036f).rw(FUNC(compis_state::pcs6_12_13_r), FUNC(compis_state::pcs6_12_13_w)); + map(0x0370, 0x037f).rw(FUNC(compis_state::pcs6_14_15_r), FUNC(compis_state::pcs6_14_15_w)); } @@ -775,7 +775,7 @@ MACHINE_CONFIG_START(compis_state::compis) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, compis_state, tmr5_w)) MCFG_DEVICE_ADD(I8255_TAG, I8255, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTB_CB(READ8(*this, compis_state, ppi_pb_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, compis_state, ppi_pc_w)) diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index 5b3b3364877..dd1fa84c61f 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -295,7 +295,7 @@ WRITE8_MEMBER( comx35_state::io_w ) void comx35_state::comx35_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(comx35_state::mem_r), FUNC(comx35_state::mem_w)); + map(0x0000, 0xffff).rw(FUNC(comx35_state::mem_r), FUNC(comx35_state::mem_w)); } @@ -306,7 +306,7 @@ void comx35_state::comx35_mem(address_map &map) void comx35_state::comx35_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x07).rw(this, FUNC(comx35_state::io_r), FUNC(comx35_state::io_w)); + map(0x00, 0x07).rw(FUNC(comx35_state::io_r), FUNC(comx35_state::io_w)); } diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp index 50f4cf653f4..22999d25ddf 100644 --- a/src/mame/drivers/concept.cpp +++ b/src/mame/drivers/concept.cpp @@ -48,7 +48,7 @@ void concept_state::concept_memmap(address_map &map) map(0x000008, 0x000fff).ram(); /* static RAM */ map(0x010000, 0x011fff).rom().region("maincpu", 0x010000); /* boot ROM */ map(0x020000, 0x021fff).rom().region("macsbug", 0x0); /* macsbugs ROM (optional) */ - map(0x030000, 0x03ffff).rw(this, FUNC(concept_state::concept_io_r), FUNC(concept_state::concept_io_w)); /* I/O space */ + map(0x030000, 0x03ffff).rw(FUNC(concept_state::concept_io_r), FUNC(concept_state::concept_io_w)); /* I/O space */ map(0x080000, 0x0fffff).ram().share("videoram");/* AM_RAMBANK(2) */ /* DRAM */ } diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp index 7b8c56ebcaa..3af801f7f68 100644 --- a/src/mame/drivers/contra.cpp +++ b/src/mame/drivers/contra.cpp @@ -62,7 +62,7 @@ WRITE8_MEMBER(contra_state::contra_coin_counter_w) void contra_state::contra_map(address_map &map) { - map(0x0000, 0x0007).w(this, FUNC(contra_state::contra_K007121_ctrl_0_w)); + map(0x0000, 0x0007).w(FUNC(contra_state::contra_K007121_ctrl_0_w)); map(0x0010, 0x0010).portr("SYSTEM"); map(0x0011, 0x0011).portr("P1"); map(0x0012, 0x0012).portr("P2"); @@ -71,29 +71,29 @@ void contra_state::contra_map(address_map &map) map(0x0015, 0x0015).portr("DSW2"); map(0x0016, 0x0016).portr("DSW3"); - map(0x0018, 0x0018).w(this, FUNC(contra_state::contra_coin_counter_w)); - map(0x001a, 0x001a).w(this, FUNC(contra_state::contra_sh_irqtrigger_w)); + map(0x0018, 0x0018).w(FUNC(contra_state::contra_coin_counter_w)); + map(0x001a, 0x001a).w(FUNC(contra_state::contra_sh_irqtrigger_w)); map(0x001c, 0x001c).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x001e, 0x001e).nopw(); /* ? */ - map(0x0060, 0x0067).w(this, FUNC(contra_state::contra_K007121_ctrl_1_w)); + map(0x0060, 0x0067).w(FUNC(contra_state::contra_K007121_ctrl_1_w)); map(0x0c00, 0x0cff).ram().w(m_palette, FUNC(palette_device::write_indirect)).share("palette"); map(0x1000, 0x1fff).ram(); map(0x2000, 0x5fff).readonly(); - map(0x2000, 0x23ff).w(this, FUNC(contra_state::contra_fg_cram_w)).share("fg_cram"); - map(0x2400, 0x27ff).w(this, FUNC(contra_state::contra_fg_vram_w)).share("fg_vram"); - map(0x2800, 0x2bff).w(this, FUNC(contra_state::contra_text_cram_w)).share("tx_cram"); - map(0x2c00, 0x2fff).w(this, FUNC(contra_state::contra_text_vram_w)).share("tx_vram"); + map(0x2000, 0x23ff).w(FUNC(contra_state::contra_fg_cram_w)).share("fg_cram"); + map(0x2400, 0x27ff).w(FUNC(contra_state::contra_fg_vram_w)).share("fg_vram"); + map(0x2800, 0x2bff).w(FUNC(contra_state::contra_text_cram_w)).share("tx_cram"); + map(0x2c00, 0x2fff).w(FUNC(contra_state::contra_text_vram_w)).share("tx_vram"); map(0x3000, 0x37ff).writeonly().share("spriteram");/* 2nd bank is at 0x5000 */ map(0x3800, 0x3fff).writeonly(); // second sprite buffer - map(0x4000, 0x43ff).w(this, FUNC(contra_state::contra_bg_cram_w)).share("bg_cram"); - map(0x4400, 0x47ff).w(this, FUNC(contra_state::contra_bg_vram_w)).share("bg_vram"); + map(0x4000, 0x43ff).w(FUNC(contra_state::contra_bg_cram_w)).share("bg_cram"); + map(0x4400, 0x47ff).w(FUNC(contra_state::contra_bg_vram_w)).share("bg_vram"); map(0x4800, 0x5fff).writeonly(); map(0x6000, 0x7fff).bankr("bank1"); - map(0x7000, 0x7000).w(this, FUNC(contra_state::contra_bankswitch_w)); + map(0x7000, 0x7000).w(FUNC(contra_state::contra_bankswitch_w)); map(0x8000, 0xffff).rom(); } @@ -102,7 +102,7 @@ void contra_state::sound_map(address_map &map) { map(0x0000, 0x0000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x2000, 0x2001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x4000, 0x4000).w(this, FUNC(contra_state::sirq_clear_w)); /* read triggers irq reset and latch read (in the hardware only). */ + map(0x4000, 0x4000).w(FUNC(contra_state::sirq_clear_w)); /* read triggers irq reset and latch read (in the hardware only). */ map(0x6000, 0x67ff).ram(); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp index e9c41c99753..2677ec9321a 100644 --- a/src/mame/drivers/coolpool.cpp +++ b/src/mame/drivers/coolpool.cpp @@ -524,9 +524,9 @@ READ16_MEMBER(coolpool_state::coolpool_input_r) void coolpool_state::amerdart_map(address_map &map) { map(0x00000000, 0x000fffff).ram().share("vram_base"); - map(0x04000000, 0x0400000f).w(this, FUNC(coolpool_state::amerdart_misc_w)); + map(0x04000000, 0x0400000f).w(FUNC(coolpool_state::amerdart_misc_w)); map(0x05000000, 0x0500000f).r(m_dsp2main, FUNC(generic_latch_16_device::read)).w(m_main2dsp, FUNC(generic_latch_16_device::write)); - map(0x06000000, 0x06007fff).ram().w(this, FUNC(coolpool_state::nvram_thrash_data_w)).share("nvram"); + map(0x06000000, 0x06007fff).ram().w(FUNC(coolpool_state::nvram_thrash_data_w)).share("nvram"); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xffb00000, 0xffffffff).rom().region("maincpu", 0); } @@ -537,9 +537,9 @@ void coolpool_state::coolpool_map(address_map &map) map(0x00000000, 0x001fffff).ram().share("vram_base"); map(0x01000000, 0x010000ff).rw(m_tlc34076, FUNC(tlc34076_device::read), FUNC(tlc34076_device::write)).umask16(0x00ff); // IMSG176P-40 map(0x02000000, 0x020000ff).r(m_dsp2main, FUNC(generic_latch_16_device::read)).w(m_main2dsp, FUNC(generic_latch_16_device::write)); - map(0x03000000, 0x0300000f).w(this, FUNC(coolpool_state::coolpool_misc_w)); + map(0x03000000, 0x0300000f).w(FUNC(coolpool_state::coolpool_misc_w)); map(0x03000000, 0x03ffffff).rom().region("gfx1", 0); - map(0x06000000, 0x06007fff).ram().w(this, FUNC(coolpool_state::nvram_thrash_data_w)).share("nvram"); + map(0x06000000, 0x06007fff).ram().w(FUNC(coolpool_state::nvram_thrash_data_w)).share("nvram"); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xffe00000, 0xffffffff).rom().region("maincpu", 0); } @@ -549,9 +549,9 @@ void coolpool_state::nballsht_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("vram_base"); map(0x02000000, 0x020000ff).r(m_dsp2main, FUNC(generic_latch_16_device::read)).w(m_main2dsp, FUNC(generic_latch_16_device::write)); - map(0x03000000, 0x0300000f).w(this, FUNC(coolpool_state::coolpool_misc_w)); + map(0x03000000, 0x0300000f).w(FUNC(coolpool_state::coolpool_misc_w)); map(0x04000000, 0x040000ff).rw(m_tlc34076, FUNC(tlc34076_device::read), FUNC(tlc34076_device::write)).umask16(0x00ff); // IMSG176P-40 - map(0x06000000, 0x0601ffff).mirror(0x00020000).ram().w(this, FUNC(coolpool_state::nvram_thrash_data_w)).share("nvram"); + map(0x06000000, 0x0601ffff).mirror(0x00020000).ram().w(FUNC(coolpool_state::nvram_thrash_data_w)).share("nvram"); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xff000000, 0xff7fffff).rom().region("gfx1", 0); map(0xffc00000, 0xffffffff).rom().region("maincpu", 0); @@ -574,12 +574,12 @@ void coolpool_state::amerdart_dsp_pgm_map(address_map &map) void coolpool_state::amerdart_dsp_io_map(address_map &map) { - map(0x00, 0x01).w(this, FUNC(coolpool_state::dsp_romaddr_w)); + map(0x00, 0x01).w(FUNC(coolpool_state::dsp_romaddr_w)); map(0x02, 0x02).w(m_dsp2main, FUNC(generic_latch_16_device::write)); - map(0x03, 0x03).w("dac", FUNC(dac_word_interface::write)); - map(0x04, 0x04).r(this, FUNC(coolpool_state::dsp_rom_r)); + map(0x03, 0x03).w("dac", FUNC(dac_word_interface::data_w)); + map(0x04, 0x04).r(FUNC(coolpool_state::dsp_rom_r)); map(0x05, 0x05).portr("IN0"); - map(0x06, 0x06).r(this, FUNC(coolpool_state::amerdart_trackball_r)); + map(0x06, 0x06).r(FUNC(coolpool_state::amerdart_trackball_r)); map(0x07, 0x07).r(m_main2dsp, FUNC(generic_latch_16_device::read)); } @@ -592,10 +592,10 @@ void coolpool_state::coolpool_dsp_pgm_map(address_map &map) void coolpool_state::coolpool_dsp_io_base_map(address_map &map) { - map(0x00, 0x01).w(this, FUNC(coolpool_state::dsp_romaddr_w)); + map(0x00, 0x01).w(FUNC(coolpool_state::dsp_romaddr_w)); map(0x02, 0x02).r(m_main2dsp, FUNC(generic_latch_16_device::read)).w(m_dsp2main, FUNC(generic_latch_16_device::write)); - map(0x03, 0x03).w("dac", FUNC(dac_word_interface::write)); - map(0x04, 0x04).r(this, FUNC(coolpool_state::dsp_rom_r)); + map(0x03, 0x03).w("dac", FUNC(dac_word_interface::data_w)); + map(0x04, 0x04).r(FUNC(coolpool_state::dsp_rom_r)); map(0x05, 0x05).portr("IN0"); } @@ -603,7 +603,7 @@ void coolpool_state::coolpool_dsp_io_base_map(address_map &map) void coolpool_state::coolpool_dsp_io_map(address_map &map) { coolpool_dsp_io_base_map(map); - map(0x07, 0x07).r(this, FUNC(coolpool_state::coolpool_input_r)); + map(0x07, 0x07).r(FUNC(coolpool_state::coolpool_input_r)); } diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index e7960932e13..ab1647537dd 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/src/mame/drivers/coolridr.cpp @@ -2812,15 +2812,15 @@ void coolridr_state::system_h1_map(address_map &map) map(0x00000000, 0x001fffff).rom().share("share1").nopw(); map(0x01000000, 0x01ffffff).rom().region("gfx_data", 0x0000000); - map(0x03c00000, 0x03c1ffff).mirror(0x00200000).ram().w(this, FUNC(coolridr_state::sysh1_dma_w)).share("fb_vram"); /* mostly mapped at 0x03e00000 */ + map(0x03c00000, 0x03c1ffff).mirror(0x00200000).ram().w(FUNC(coolridr_state::sysh1_dma_w)).share("fb_vram"); /* mostly mapped at 0x03e00000 */ map(0x03f00000, 0x03f0ffff).ram().share("share3"); /*Communication area RAM*/ map(0x03f40000, 0x03f4ffff).ram().share("txt_vram");//text tilemap + "lineram" - map(0x04000000, 0x0400000f).rw(this, FUNC(coolridr_state::sysh1_unk_blit_r), FUNC(coolridr_state::sysh1_unk_blit_w)).share("sysh1_txt_blit"); - map(0x04000010, 0x04000013).w(this, FUNC(coolridr_state::sysh1_blit_mode_w)); - map(0x04000014, 0x04000017).w(this, FUNC(coolridr_state::sysh1_blit_data_w)); - map(0x04000018, 0x0400001b).w(this, FUNC(coolridr_state::sysh1_fb_mode_w)); - map(0x0400001c, 0x0400001f).w(this, FUNC(coolridr_state::sysh1_fb_data_w)); + map(0x04000000, 0x0400000f).rw(FUNC(coolridr_state::sysh1_unk_blit_r), FUNC(coolridr_state::sysh1_unk_blit_w)).share("sysh1_txt_blit"); + map(0x04000010, 0x04000013).w(FUNC(coolridr_state::sysh1_blit_mode_w)); + map(0x04000014, 0x04000017).w(FUNC(coolridr_state::sysh1_blit_data_w)); + map(0x04000018, 0x0400001b).w(FUNC(coolridr_state::sysh1_fb_mode_w)); + map(0x0400001c, 0x0400001f).w(FUNC(coolridr_state::sysh1_fb_data_w)); map(0x06000000, 0x060fffff).ram().share("sysh1_workrah"); map(0x20000000, 0x201fffff).rom().share("share1"); @@ -2831,7 +2831,7 @@ void coolridr_state::system_h1_map(address_map &map) void coolridr_state::aquastge_h1_map(address_map &map) { system_h1_map(map); - map(0x03c00000, 0x03c0ffff).mirror(0x00200000).ram().w(this, FUNC(coolridr_state::sysh1_dma_w)).share("fb_vram"); /* mostly mapped at 0x03e00000 */ + map(0x03c00000, 0x03c0ffff).mirror(0x00200000).ram().w(FUNC(coolridr_state::sysh1_dma_w)).share("fb_vram"); /* mostly mapped at 0x03e00000 */ map(0x03f50000, 0x03f5ffff).ram(); // video registers map(0x03e10000, 0x03e1ffff).ram().share("share3"); /*Communication area RAM*/ map(0x03f00000, 0x03f0ffff).ram(); /*Communication area RAM*/ @@ -2956,18 +2956,18 @@ void coolridr_state::coolridr_submap(address_map &map) map(0x01000000, 0x0100ffff).ram(); //communication RAM - map(0x03000000, 0x0307ffff).rw(this, FUNC(coolridr_state::h1_soundram_r), FUNC(coolridr_state::h1_soundram_w)); //.share("soundram"); + map(0x03000000, 0x0307ffff).rw(FUNC(coolridr_state::h1_soundram_r), FUNC(coolridr_state::h1_soundram_w)); //.share("soundram"); map(0x03100000, 0x03100fff).rw("scsp1", FUNC(scsp_device::read), FUNC(scsp_device::write)); - map(0x03200000, 0x0327ffff).rw(this, FUNC(coolridr_state::h1_soundram2_r), FUNC(coolridr_state::h1_soundram2_w)); //.share("soundram2"); + map(0x03200000, 0x0327ffff).rw(FUNC(coolridr_state::h1_soundram2_r), FUNC(coolridr_state::h1_soundram2_w)); //.share("soundram2"); map(0x03300000, 0x03300fff).rw("scsp2", FUNC(scsp_device::read), FUNC(scsp_device::write)); - map(0x04000000, 0x0400003f).rw(this, FUNC(coolridr_state::sysh1_sound_dma_r), FUNC(coolridr_state::sysh1_sound_dma_w)).share("sound_dma"); + map(0x04000000, 0x0400003f).rw(FUNC(coolridr_state::sysh1_sound_dma_r), FUNC(coolridr_state::sysh1_sound_dma_w)).share("sound_dma"); // map(0x04200000, 0x0420003f).ram(); /* unknown */ map(0x05000000, 0x05000fff).ram(); map(0x05200000, 0x052001ff).ram(); map(0x05300000, 0x0530ffff).ram().share("share3"); /*Communication area RAM*/ -// map(0x05fffe00, 0x05ffffff).rw(this, FUNC(coolridr_state::sh7032_r), FUNC(coolridr_state::sh7032_w)); // SH-7032H internal i/o +// map(0x05fffe00, 0x05ffffff).rw(FUNC(coolridr_state::sh7032_r), FUNC(coolridr_state::sh7032_w)); // SH-7032H internal i/o map(0x06000000, 0x060001ff).ram().share("nvram"); // backup RAM map(0x06100000, 0x0610001f).rw("io", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write)).umask32(0x00ff00ff); map(0x06200000, 0x06200fff).ram(); //network related? @@ -2995,7 +2995,7 @@ void coolridr_state::system_h1_sound_map(address_map &map) map(0x200000, 0x27ffff).ram().region("scsp2", 0).share("soundram2"); map(0x300000, 0x300fff).rw("scsp2", FUNC(scsp_device::read), FUNC(scsp_device::write)); map(0x800000, 0x80ffff).mirror(0x200000).ram(); - map(0x900001, 0x900001).w(this, FUNC(coolridr_state::sound_to_sh1_w)); + map(0x900001, 0x900001).w(FUNC(coolridr_state::sound_to_sh1_w)); } diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp index 301fe62848a..d5cb83d9784 100644 --- a/src/mame/drivers/cop01.cpp +++ b/src/mame/drivers/cop01.cpp @@ -129,9 +129,9 @@ void cop01_state::cop01_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); /* c000-c7ff in cop01 */ - map(0xd000, 0xdfff).ram().w(this, FUNC(cop01_state::cop01_background_w)).share("bgvideoram"); + map(0xd000, 0xdfff).ram().w(FUNC(cop01_state::cop01_background_w)).share("bgvideoram"); map(0xe000, 0xe0ff).writeonly().share("spriteram"); - map(0xf000, 0xf3ff).w(this, FUNC(cop01_state::cop01_foreground_w)).share("fgvideoram"); + map(0xf000, 0xf3ff).w(FUNC(cop01_state::cop01_foreground_w)).share("fgvideoram"); } void cop01_state::io_map(address_map &map) @@ -142,9 +142,9 @@ void cop01_state::io_map(address_map &map) map(0x02, 0x02).portr("SYSTEM"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x40, 0x43).w(this, FUNC(cop01_state::cop01_vreg_w)); - map(0x44, 0x44).w(this, FUNC(cop01_state::cop01_sound_command_w)); - map(0x45, 0x45).w(this, FUNC(cop01_state::cop01_irq_ack_w)); /* ? */ + map(0x40, 0x43).w(FUNC(cop01_state::cop01_vreg_w)); + map(0x44, 0x44).w(FUNC(cop01_state::cop01_sound_command_w)); + map(0x45, 0x45).w(FUNC(cop01_state::cop01_irq_ack_w)); /* ? */ } void mightguy_state::mightguy_io_map(address_map &map) @@ -155,15 +155,15 @@ void mightguy_state::mightguy_io_map(address_map &map) map(0x02, 0x02).portr("SYSTEM"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x40, 0x43).w(this, FUNC(cop01_state::cop01_vreg_w)); - map(0x44, 0x44).w(this, FUNC(cop01_state::cop01_sound_command_w)); - map(0x45, 0x45).w(this, FUNC(cop01_state::cop01_irq_ack_w)); /* ? */ + map(0x40, 0x43).w(FUNC(cop01_state::cop01_vreg_w)); + map(0x44, 0x44).w(FUNC(cop01_state::cop01_sound_command_w)); + map(0x45, 0x45).w(FUNC(cop01_state::cop01_irq_ack_w)); /* ? */ } void cop01_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8000).r(this, FUNC(cop01_state::cop01_sound_irq_ack_w)); + map(0x8000, 0x8000).r(FUNC(cop01_state::cop01_sound_irq_ack_w)); map(0xc000, 0xc7ff).ram(); } @@ -173,7 +173,7 @@ void cop01_state::audio_io_map(address_map &map) map(0x00, 0x01).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x02, 0x03).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x04, 0x05).w("ay3", FUNC(ay8910_device::address_data_w)); - map(0x06, 0x06).r(this, FUNC(cop01_state::cop01_sound_command_r)); + map(0x06, 0x06).r(FUNC(cop01_state::cop01_sound_command_r)); } void mightguy_state::mightguy_audio_io_map(address_map &map) @@ -182,7 +182,7 @@ void mightguy_state::mightguy_audio_io_map(address_map &map) map(0x00, 0x01).w("ymsnd", FUNC(ym3526_device::write)); map(0x02, 0x02).w("prot_chip", FUNC(nb1412m2_device::command_w)); map(0x03, 0x03).rw("prot_chip", FUNC(nb1412m2_device::data_r), FUNC(nb1412m2_device::data_w)); - map(0x06, 0x06).r(this, FUNC(cop01_state::cop01_sound_command_r)); + map(0x06, 0x06).r(FUNC(cop01_state::cop01_sound_command_r)); } @@ -501,7 +501,7 @@ MACHINE_CONFIG_START(mightguy_state::mightguy) MCFG_DEVICE_IO_MAP(mightguy_audio_io_map) MCFG_DEVICE_ADD("prot_chip", NB1412M2, XTAL(8'000'000)/2) // divided by 2 maybe - MCFG_NB1412M2_DAC_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_NB1412M2_DAC_CB(WRITE8("dac", dac_byte_interface, data_w)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp index e4530ae4f76..ad3a6439eb1 100644 --- a/src/mame/drivers/cops.cpp +++ b/src/mame/drivers/cops.cpp @@ -53,11 +53,11 @@ class cops_state : public driver_device { public: cops_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_sn(*this, "snsnd"), - m_ld(*this, "laserdisc"), - m_irq(0) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_sn(*this, "snsnd") + , m_ld(*this, "laserdisc") + , m_irq(0) { } // devices @@ -764,7 +764,7 @@ WRITE8_MEMBER(cops_state::via1_b_w) m_sn_data = bitswap<8>(data,0,1,2,3,4,5,6,7); if (m_sn_cb1) { - m_sn->write(space,0,m_sn_data); + m_sn->write(m_sn_data); } } @@ -806,11 +806,11 @@ void cops_state::cops_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x9fff).rom().region("program", 0); - map(0xa000, 0xafff).rw(this, FUNC(cops_state::io1_r), FUNC(cops_state::io1_w)); + map(0xa000, 0xafff).rw(FUNC(cops_state::io1_r), FUNC(cops_state::io1_w)); map(0xb000, 0xb00f).rw("via6522_1", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 1 */ map(0xb800, 0xb80f).rw("via6522_2", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 2 */ - map(0xc000, 0xcfff).rw(this, FUNC(cops_state::io2_r), FUNC(cops_state::io2_w)); - map(0xd000, 0xd007).rw(this, FUNC(cops_state::dacia_r), FUNC(cops_state::dacia_w)); + map(0xc000, 0xcfff).rw(FUNC(cops_state::io2_r), FUNC(cops_state::io2_w)); + map(0xd000, 0xd007).rw(FUNC(cops_state::dacia_r), FUNC(cops_state::dacia_w)); map(0xd800, 0xd80f).rw("via6522_3", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 3 */ map(0xe000, 0xffff).bankr("sysbank1"); } @@ -819,10 +819,10 @@ void cops_state::revlatns_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x9fff).rom().region("program", 0); - map(0xa000, 0xafff).rw(this, FUNC(cops_state::io1_lm_r), FUNC(cops_state::io1_w)); + map(0xa000, 0xafff).rw(FUNC(cops_state::io1_lm_r), FUNC(cops_state::io1_w)); map(0xb000, 0xb00f).rw("via6522_1", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 1 */ map(0xc000, 0xc00f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0xd000, 0xd007).rw(this, FUNC(cops_state::dacia_r), FUNC(cops_state::dacia_w)); + map(0xd000, 0xd007).rw(FUNC(cops_state::dacia_r), FUNC(cops_state::dacia_w)); map(0xe000, 0xffff).bankr("sysbank1"); } diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp index 9178b9458b9..b78ce672c06 100644 --- a/src/mame/drivers/copsnrob.cpp +++ b/src/mame/drivers/copsnrob.cpp @@ -102,8 +102,8 @@ void copsnrob_state::main_map(address_map &map) map(0x0a00, 0x0a03).writeonly().share("cary"); map(0x0b00, 0x0bff).ram(); map(0x0c00, 0x0fff).ram().share("videoram"); - map(0x1000, 0x1000).r(this, FUNC(copsnrob_state::copsnrob_misc_r)); - map(0x1000, 0x1000).w(this, FUNC(copsnrob_state::copsnrob_misc2_w)); + map(0x1000, 0x1000).r(FUNC(copsnrob_state::copsnrob_misc_r)); + map(0x1000, 0x1000).w(FUNC(copsnrob_state::copsnrob_misc2_w)); map(0x1002, 0x1002).portr("CTRL1"); map(0x1006, 0x1006).portr("CTRL2"); map(0x100a, 0x100a).portr("CTRL3"); diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp index 6bfb5cd2077..60f2473e6d8 100644 --- a/src/mame/drivers/corona.cpp +++ b/src/mame/drivers/corona.cpp @@ -644,15 +644,15 @@ void corona_state::winner81_map(address_map &map) void corona_state::winner81_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0x70, 0x70).w(this, FUNC(corona_state::blitter_x_w)); - map(0x71, 0x71).w(this, FUNC(corona_state::blitter_unk_w)); - map(0x72, 0x72).w(this, FUNC(corona_state::blitter_trig_wdht_w)); - map(0x74, 0x74).w(this, FUNC(corona_state::blitter_y_w)); - map(0x75, 0x75).r(this, FUNC(corona_state::blitter_status_r)); - map(0x76, 0x76).w(this, FUNC(corona_state::blitter_aux_w)); + map(0x70, 0x70).w(FUNC(corona_state::blitter_x_w)); + map(0x71, 0x71).w(FUNC(corona_state::blitter_unk_w)); + map(0x72, 0x72).w(FUNC(corona_state::blitter_trig_wdht_w)); + map(0x74, 0x74).w(FUNC(corona_state::blitter_y_w)); + map(0x75, 0x75).r(FUNC(corona_state::blitter_status_r)); + map(0x76, 0x76).w(FUNC(corona_state::blitter_aux_w)); map(0xd8, 0xd8).nopw(); /* dunno, but is writing 0's very often */ - map(0xdf, 0xdf).w(this, FUNC(corona_state::sound_latch_w)); + map(0xdf, 0xdf).w(FUNC(corona_state::sound_latch_w)); map(0xe8, 0xe8).portr("IN0"); /* credits for players A, B, C, D */ map(0xe9, 0xe9).portr("IN3"); @@ -661,7 +661,7 @@ void corona_state::winner81_cpu_io_map(address_map &map) map(0xec, 0xec).portr("IN4"); map(0xed, 0xed).portr("DSW1"); /* DIP switches bank 1 */ map(0xee, 0xee).portr("DSW2"); - map(0xef, 0xef).w(this, FUNC(corona_state::wc_meters_w)); /* meters: coin1 = bit0, coin2 = bit1, coinout = bit2 */ + map(0xef, 0xef).w(FUNC(corona_state::wc_meters_w)); /* meters: coin1 = bit0, coin2 = bit1, coinout = bit2 */ } void corona_state::winner81_sound_map(address_map &map) @@ -673,7 +673,7 @@ void corona_state::winner81_sound_map(address_map &map) void corona_state::winner81_sound_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(corona_state::sound_latch_r)); + map(0x00, 0x00).r(FUNC(corona_state::sound_latch_r)); map(0x00, 0x01).w("aysnd", FUNC(ay8910_device::address_data_w)); } @@ -705,20 +705,20 @@ void corona_state::winner82_map(address_map &map) void corona_state::winner82_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).w(this, FUNC(corona_state::blitter_x_w)); - map(0xf1, 0xf1).w(this, FUNC(corona_state::blitter_y_w)); - map(0xf2, 0xf2).w(this, FUNC(corona_state::blitter_trig_wdht_w)); - map(0xf3, 0xf3).w(this, FUNC(corona_state::blitter_aux_w)); - map(0xf4, 0xf4).w(this, FUNC(corona_state::blitter_unk_w)); - map(0xf5, 0xf5).r(this, FUNC(corona_state::blitter_status_r)); + map(0xf0, 0xf0).w(FUNC(corona_state::blitter_x_w)); + map(0xf1, 0xf1).w(FUNC(corona_state::blitter_y_w)); + map(0xf2, 0xf2).w(FUNC(corona_state::blitter_trig_wdht_w)); + map(0xf3, 0xf3).w(FUNC(corona_state::blitter_aux_w)); + map(0xf4, 0xf4).w(FUNC(corona_state::blitter_unk_w)); + map(0xf5, 0xf5).r(FUNC(corona_state::blitter_status_r)); map(0xf8, 0xf8).portr("DSW1"); /* coinage DIP SW */ map(0xf9, 0xf9).portr("IN0"); /* controls for players A & B */ map(0xfa, 0xfa).portr("IN1"); /* credits for players A, B, C, D */ map(0xfb, 0xfb).portr("IN3"); /* single credits for players A, B, C, D, + fix bits 3, 4, 5, 6 in meters */ - map(0xfc, 0xfc).w(this, FUNC(corona_state::wc_meters_w)); + map(0xfc, 0xfc).w(FUNC(corona_state::wc_meters_w)); map(0xfd, 0xfd).portr("IN2"); /* controls for players C & D */ - map(0xfe, 0xfe).w(this, FUNC(corona_state::sound_latch_w)); + map(0xfe, 0xfe).w(FUNC(corona_state::sound_latch_w)); map(0xff, 0xff).portr("DSW2"); /* no idea */ } @@ -731,7 +731,7 @@ void corona_state::winner82_sound_map(address_map &map) void corona_state::winner82_sound_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(corona_state::sound_latch_r)); + map(0x00, 0x00).r(FUNC(corona_state::sound_latch_r)); map(0x00, 0x01).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0x02, 0x03).nopw(); /* socket for another ay, inited but never played */ } @@ -773,18 +773,18 @@ void corona_state::re800_map(address_map &map) void corona_state::re800_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).w(this, FUNC(corona_state::blitter_x_w)); - map(0xf1, 0xf1).w(this, FUNC(corona_state::blitter_y_w)); - map(0xf2, 0xf2).w(this, FUNC(corona_state::blitter_trig_wdht_w)); - map(0xf3, 0xf3).w(this, FUNC(corona_state::blitter_aux_w)); - map(0xf4, 0xf4).w(this, FUNC(corona_state::blitter_unk_w)); - map(0xf5, 0xf5).r(this, FUNC(corona_state::blitter_status_r)); + map(0xf0, 0xf0).w(FUNC(corona_state::blitter_x_w)); + map(0xf1, 0xf1).w(FUNC(corona_state::blitter_y_w)); + map(0xf2, 0xf2).w(FUNC(corona_state::blitter_trig_wdht_w)); + map(0xf3, 0xf3).w(FUNC(corona_state::blitter_aux_w)); + map(0xf4, 0xf4).w(FUNC(corona_state::blitter_unk_w)); + map(0xf5, 0xf5).r(FUNC(corona_state::blitter_status_r)); map(0xf8, 0xf8).portr("IN1"); map(0xf9, 0xf9).portr("DSW1"); - map(0xfc, 0xfc).w(this, FUNC(corona_state::mux_port_w)); - map(0xfd, 0xfd).r(this, FUNC(corona_state::mux_port_r)); - map(0xfe, 0xfe).w(this, FUNC(corona_state::sound_latch_w)); - map(0xff, 0xff).w(this, FUNC(corona_state::ball_w)); + map(0xfc, 0xfc).w(FUNC(corona_state::mux_port_w)); + map(0xfd, 0xfd).r(FUNC(corona_state::mux_port_r)); + map(0xfe, 0xfe).w(FUNC(corona_state::sound_latch_w)); + map(0xff, 0xff).w(FUNC(corona_state::ball_w)); } void corona_state::re800_sound_map(address_map &map) @@ -796,7 +796,7 @@ void corona_state::re800_sound_map(address_map &map) void corona_state::re800_sound_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(corona_state::sound_latch_r)); + map(0x00, 0x00).r(FUNC(corona_state::sound_latch_r)); map(0x00, 0x01).w("aysnd", FUNC(ay8910_device::address_data_w)); } @@ -836,19 +836,19 @@ void corona_state::luckyrlt_map(address_map &map) void corona_state::luckyrlt_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).w(this, FUNC(corona_state::blitter_x_w)); - map(0xf1, 0xf1).w(this, FUNC(corona_state::blitter_y_w)); - map(0xf2, 0xf2).w(this, FUNC(corona_state::blitter_trig_wdht_w)); - map(0xf3, 0xf3).w(this, FUNC(corona_state::blitter_aux_w)); - map(0xf4, 0xf4).w(this, FUNC(corona_state::blitter_unk_w)); - map(0xf5, 0xf5).r(this, FUNC(corona_state::blitter_status_r)); + map(0xf0, 0xf0).w(FUNC(corona_state::blitter_x_w)); + map(0xf1, 0xf1).w(FUNC(corona_state::blitter_y_w)); + map(0xf2, 0xf2).w(FUNC(corona_state::blitter_trig_wdht_w)); + map(0xf3, 0xf3).w(FUNC(corona_state::blitter_aux_w)); + map(0xf4, 0xf4).w(FUNC(corona_state::blitter_unk_w)); + map(0xf5, 0xf5).r(FUNC(corona_state::blitter_status_r)); map(0xf8, 0xf8).portr("DSW2"); - map(0xf9, 0xf9).w(this, FUNC(corona_state::ball_w)); + map(0xf9, 0xf9).w(FUNC(corona_state::ball_w)); map(0xfa, 0xfa).portr("DSW1"); - map(0xfc, 0xfc).w(this, FUNC(corona_state::mux_port_w)); - map(0xfd, 0xfd).r(this, FUNC(corona_state::mux_port_r)); - map(0xfe, 0xfe).w(this, FUNC(corona_state::sound_latch_w)); + map(0xfc, 0xfc).w(FUNC(corona_state::mux_port_w)); + map(0xfd, 0xfd).r(FUNC(corona_state::mux_port_r)); + map(0xfe, 0xfe).w(FUNC(corona_state::sound_latch_w)); } void corona_state::luckyrlt_sound_map(address_map &map) @@ -860,7 +860,7 @@ void corona_state::luckyrlt_sound_map(address_map &map) void corona_state::luckyrlt_sound_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(corona_state::sound_latch_r)); + map(0x00, 0x00).r(FUNC(corona_state::sound_latch_r)); map(0x00, 0x01).w("aysnd", FUNC(ay8910_device::address_data_w)); } diff --git a/src/mame/drivers/cortex.cpp b/src/mame/drivers/cortex.cpp index b30fd510d21..f685fbbc61c 100644 --- a/src/mame/drivers/cortex.cpp +++ b/src/mame/drivers/cortex.cpp @@ -62,7 +62,7 @@ public: , m_maincpu(*this, "maincpu") , m_beep(*this, "beeper") , m_io_dsw(*this, "DSW") - { } + { } void kbd_put(u8 data); DECLARE_WRITE_LINE_MEMBER(keyboard_ack_w); @@ -90,8 +90,8 @@ void cortex_state::mem_map(address_map &map) map(0x0000, 0x7fff).bankr("bankr0").bankw("bankw0"); map(0x8000, 0xefff).ram(); map(0xf100, 0xf11f).ram(); // memory mapping unit - map(0xf120, 0xf120).rw("crtc", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0xf121, 0xf121).rw("crtc", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); + map(0xf120, 0xf120).rw("crtc", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0xf121, 0xf121).rw("crtc", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); //AM_RANGE(0xf140, 0xf147) // fdc tms9909 } @@ -99,8 +99,8 @@ void cortex_state::io_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0007).mirror(0x18).w("control", FUNC(ls259_device::write_d0)); - map(0x0000, 0x0000).r(this, FUNC(cortex_state::pio_r)); - map(0x0001, 0x0001).r(this, FUNC(cortex_state::keyboard_r)); + map(0x0000, 0x0000).r(FUNC(cortex_state::pio_r)); + map(0x0001, 0x0001).r(FUNC(cortex_state::keyboard_r)); //AM_RANGE(0x0040, 0x005f) AM_DEVWRITE("uart1", tms9902_device, cruwrite) // RS232 (r12 = 80-bf) //AM_RANGE(0x0008, 0x000b) AM_DEVREAD("uart1", tms9902_device, cruread) // RS232 //AM_RANGE(0x00c0, 0x00df) AM_DEVWRITE("uart2", tms9902_device, cruwrite) // Cassette (r12 = 180-1bf) diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp index 1c098288a54..f423b1fac74 100644 --- a/src/mame/drivers/cosmic.cpp +++ b/src/mame/drivers/cosmic.cpp @@ -385,10 +385,10 @@ void cosmic_state::panic_map(address_map &map) map(0x6801, 0x6801).portr("P2"); map(0x6802, 0x6802).portr("DSW"); map(0x6803, 0x6803).portr("SYSTEM"); - map(0x7000, 0x700b).w(this, FUNC(cosmic_state::panic_sound_output_w)); - map(0x700c, 0x700e).w(this, FUNC(cosmic_state::cosmic_color_register_w)); - map(0x700f, 0x700f).w(this, FUNC(cosmic_state::flip_screen_w)); - map(0x7800, 0x7801).w(this, FUNC(cosmic_state::panic_sound_output2_w)); + map(0x7000, 0x700b).w(FUNC(cosmic_state::panic_sound_output_w)); + map(0x700c, 0x700e).w(FUNC(cosmic_state::cosmic_color_register_w)); + map(0x700f, 0x700f).w(FUNC(cosmic_state::flip_screen_w)); + map(0x7800, 0x7801).w(FUNC(cosmic_state::panic_sound_output2_w)); } @@ -400,10 +400,10 @@ void cosmic_state::cosmica_map(address_map &map) map(0x6800, 0x6800).portr("P1"); map(0x6801, 0x6801).portr("P2"); map(0x6802, 0x6802).portr("DSW"); - map(0x6803, 0x6803).r(this, FUNC(cosmic_state::cosmica_pixel_clock_r)); - map(0x7000, 0x700b).w(this, FUNC(cosmic_state::cosmica_sound_output_w)); - map(0x700c, 0x700d).w(this, FUNC(cosmic_state::cosmic_color_register_w)); - map(0x700f, 0x700f).w(this, FUNC(cosmic_state::flip_screen_w)); + map(0x6803, 0x6803).r(FUNC(cosmic_state::cosmica_pixel_clock_r)); + map(0x7000, 0x700b).w(FUNC(cosmic_state::cosmica_sound_output_w)); + map(0x700c, 0x700d).w(FUNC(cosmic_state::cosmic_color_register_w)); + map(0x700f, 0x700f).w(FUNC(cosmic_state::flip_screen_w)); } @@ -415,21 +415,21 @@ void cosmic_state::cosmicg_map(address_map &map) void cosmic_state::cosmicg_io_map(address_map &map) { - map(0x00, 0x00).r(this, FUNC(cosmic_state::cosmicg_port_0_r)); + map(0x00, 0x00).r(FUNC(cosmic_state::cosmicg_port_0_r)); map(0x01, 0x01).portr("IN1"); - map(0x00, 0x15).w(this, FUNC(cosmic_state::cosmicg_output_w)); - map(0x16, 0x17).w(this, FUNC(cosmic_state::cosmic_color_register_w)); + map(0x00, 0x15).w(FUNC(cosmic_state::cosmicg_output_w)); + map(0x16, 0x17).w(FUNC(cosmic_state::cosmic_color_register_w)); } void cosmic_state::magspot_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x3800, 0x3807).r(this, FUNC(cosmic_state::magspot_coinage_dip_r)); + map(0x3800, 0x3807).r(FUNC(cosmic_state::magspot_coinage_dip_r)); map(0x4000, 0x401f).writeonly().share("spriteram"); - map(0x4800, 0x4800).w(this, FUNC(cosmic_state::dac_w)); - map(0x480c, 0x480d).w(this, FUNC(cosmic_state::cosmic_color_register_w)); - map(0x480f, 0x480f).w(this, FUNC(cosmic_state::flip_screen_w)); + map(0x4800, 0x4800).w(FUNC(cosmic_state::dac_w)); + map(0x480c, 0x480d).w(FUNC(cosmic_state::cosmic_color_register_w)); + map(0x480f, 0x480f).w(FUNC(cosmic_state::flip_screen_w)); map(0x5000, 0x5000).portr("IN0"); map(0x5001, 0x5001).portr("IN1"); map(0x5002, 0x5002).portr("IN2"); diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp index 87daeaae882..160883b0e1e 100644 --- a/src/mame/drivers/cosmicos.cpp +++ b/src/mame/drivers/cosmicos.cpp @@ -181,19 +181,19 @@ WRITE8_MEMBER( cosmicos_state::display_w ) void cosmicos_state::cosmicos_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(cosmicos_state::read), FUNC(cosmicos_state::write)); + map(0x0000, 0xffff).rw(FUNC(cosmicos_state::read), FUNC(cosmicos_state::write)); } void cosmicos_state::cosmicos_io(address_map &map) { // AM_RANGE(0x00, 0x00) - map(0x01, 0x01).r(this, FUNC(cosmicos_state::video_on_r)); - map(0x02, 0x02).rw(this, FUNC(cosmicos_state::video_off_r), FUNC(cosmicos_state::audio_latch_w)); + map(0x01, 0x01).r(FUNC(cosmicos_state::video_on_r)); + map(0x02, 0x02).rw(FUNC(cosmicos_state::video_off_r), FUNC(cosmicos_state::audio_latch_w)); // AM_RANGE(0x03, 0x03) // AM_RANGE(0x04, 0x04) - map(0x05, 0x05).rw(this, FUNC(cosmicos_state::hex_keyboard_r), FUNC(cosmicos_state::hex_keylatch_w)); - map(0x06, 0x06).rw(this, FUNC(cosmicos_state::reset_counter_r), FUNC(cosmicos_state::segment_w)); - map(0x07, 0x07).rw(this, FUNC(cosmicos_state::data_r), FUNC(cosmicos_state::display_w)); + map(0x05, 0x05).rw(FUNC(cosmicos_state::hex_keyboard_r), FUNC(cosmicos_state::hex_keylatch_w)); + map(0x06, 0x06).rw(FUNC(cosmicos_state::reset_counter_r), FUNC(cosmicos_state::segment_w)); + map(0x07, 0x07).rw(FUNC(cosmicos_state::data_r), FUNC(cosmicos_state::display_w)); } /* Input Ports */ diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index ebfc1dba66d..233cea9e3ab 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -189,7 +189,7 @@ WRITE8_MEMBER(cp1_state::i8155_portc_w) void cp1_state::cp1_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0xff).rw(this, FUNC(cp1_state::i8155_read), FUNC(cp1_state::i8155_write)); + map(0x00, 0xff).rw(FUNC(cp1_state::i8155_read), FUNC(cp1_state::i8155_write)); } /* Input ports */ diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 8a963e74a55..f0976322ca4 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -540,17 +540,17 @@ void cps_state::main_map(address_map &map) map(0x000000, 0x3fffff).rom(); map(0x800000, 0x800007).portr("IN1"); /* Player input ports */ /* forgottn, willow, cawing, nemo, varth read from 800010. Probably debug input leftover from development */ - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ map(0x800020, 0x800021).nopr(); /* ? Used by Rockman ? not mapped according to PAL */ - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); /* Forgotten Worlds has dial controls on B-board mapped at 800040-80005f. See below */ - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("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 at a different address, see DRIVER_INIT */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); - map(0x800180, 0x800187).w(this, FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ - map(0x800188, 0x80018f).w(this, FUNC(cps_state::cps1_soundlatch2_w)); /* Sound timer fade */ - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); /* SF2CE executes code from here */ + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); + map(0x800180, 0x800187).w(FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ + map(0x800188, 0x80018f).w(FUNC(cps_state::cps1_soundlatch2_w)); /* Sound timer fade */ + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); /* SF2CE executes code from here */ map(0xff0000, 0xffffff).ram().share("mainram"); } @@ -560,8 +560,8 @@ void cps_state::main_map(address_map &map) void cps_state::forgottn_map(address_map &map) { main_map(map); - map(0x800041, 0x800041).w("upd4701", FUNC(upd4701_device::reset_x)); - map(0x800049, 0x800049).w("upd4701", FUNC(upd4701_device::reset_y)); + map(0x800041, 0x800041).w("upd4701", FUNC(upd4701_device::reset_x_w)); + map(0x800049, 0x800049).w("upd4701", FUNC(upd4701_device::reset_y_w)); map(0x800052, 0x800055).r("upd4701", FUNC(upd4701_device::read_x)).umask16(0x00ff); map(0x80005a, 0x80005d).r("upd4701", FUNC(upd4701_device::read_y)).umask16(0x00ff); } @@ -596,8 +596,8 @@ void cps_state::sub_map(address_map &map) map(0xd000, 0xd7ff).ram(); map(0xf000, 0xf001).rw("2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xf002, 0xf002).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xf004, 0xf004).w(this, FUNC(cps_state::cps1_snd_bankswitch_w)); - map(0xf006, 0xf006).w(this, FUNC(cps_state::cps1_oki_pin7_w)); /* controls pin 7 of OKI chip */ + map(0xf004, 0xf004).w(FUNC(cps_state::cps1_snd_bankswitch_w)); + map(0xf006, 0xf006).w(FUNC(cps_state::cps1_oki_pin7_w)); /* controls pin 7 of OKI chip */ map(0xf008, 0xf008).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* Sound command */ map(0xf00a, 0xf00a).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); /* Sound timer fade */ } @@ -606,18 +606,18 @@ void cps_state::qsound_main_map(address_map &map) { map(0x000000, 0x1fffff).rom(); map(0x800000, 0x800007).portr("IN1"); /* Player input ports */ - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); /* CPS-B custom (mapped by LWIO/IOB1 PAL on B-board) */ - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); /* SF2CE executes code from here */ - map(0xf00000, 0xf0ffff).r(this, FUNC(cps_state::qsound_rom_r)); /* Slammasters protection */ - map(0xf18000, 0xf19fff).rw(this, FUNC(cps_state::qsound_sharedram1_r), FUNC(cps_state::qsound_sharedram1_w)); /* Q RAM */ + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); /* CPS-B custom (mapped by LWIO/IOB1 PAL on B-board) */ + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); /* SF2CE executes code from here */ + map(0xf00000, 0xf0ffff).r(FUNC(cps_state::qsound_rom_r)); /* Slammasters protection */ + map(0xf18000, 0xf19fff).rw(FUNC(cps_state::qsound_sharedram1_r), FUNC(cps_state::qsound_sharedram1_w)); /* Q RAM */ map(0xf1c000, 0xf1c001).portr("IN2"); /* Player 3 controls (later games) */ map(0xf1c002, 0xf1c003).portr("IN3"); /* Player 4 controls ("Muscle Bombers") */ - map(0xf1c004, 0xf1c005).w(this, FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ + map(0xf1c004, 0xf1c005).w(FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ map(0xf1c006, 0xf1c007).portr("EEPROMIN").portw("EEPROMOUT"); - map(0xf1e000, 0xf1ffff).rw(this, FUNC(cps_state::qsound_sharedram2_r), FUNC(cps_state::qsound_sharedram2_w)); /* Q RAM */ + map(0xf1e000, 0xf1ffff).rw(FUNC(cps_state::qsound_sharedram2_r), FUNC(cps_state::qsound_sharedram2_w)); /* Q RAM */ map(0xff0000, 0xffffff).ram().share("mainram"); } @@ -627,7 +627,7 @@ void cps_state::qsound_sub_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); /* banked (contains music data) */ map(0xc000, 0xcfff).ram().share("qsound_ram1"); map(0xd000, 0xd002).w("qsound", FUNC(qsound_device::qsound_w)); - map(0xd003, 0xd003).w(this, FUNC(cps_state::qsound_banksw_w)); + map(0xd003, 0xd003).w(FUNC(cps_state::qsound_banksw_w)); map(0xd007, 0xd007).r("qsound", FUNC(qsound_device::qsound_r)); map(0xf000, 0xffff).ram().share("qsound_ram2"); } @@ -641,16 +641,16 @@ void cps_state::sf2m3_map(address_map &map) { map(0x000000, 0x3fffff).rom(); map(0x800010, 0x800011).portr("IN1"); /* Player input ports */ - map(0x800028, 0x80002f).r(this, FUNC(cps_state::cps1_hack_dsw_r)); /* System input ports / Dip Switches */ - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); /* CPS-B custom */ - map(0x800186, 0x800187).r(this, FUNC(cps_state::cps1_in2_r)); /* Buttons 4,5,6 for both players */ - map(0x800190, 0x800197).w(this, FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ - map(0x800198, 0x80019f).w(this, FUNC(cps_state::cps1_soundlatch2_w)); /* Sound timer fade */ - map(0x8001a0, 0x8001c3).w(this, FUNC(cps_state::cps1_cps_a_w)); - map(0x8001c4, 0x8001c5).w(this, FUNC(cps_state::sf2m3_layer_w)); - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x800028, 0x80002f).r(FUNC(cps_state::cps1_hack_dsw_r)); /* System input ports / Dip Switches */ + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); /* CPS-B custom */ + map(0x800186, 0x800187).r(FUNC(cps_state::cps1_in2_r)); /* Buttons 4,5,6 for both players */ + map(0x800190, 0x800197).w(FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ + map(0x800198, 0x80019f).w(FUNC(cps_state::cps1_soundlatch2_w)); /* Sound timer fade */ + map(0x8001a0, 0x8001c3).w(FUNC(cps_state::cps1_cps_a_w)); + map(0x8001c4, 0x8001c5).w(FUNC(cps_state::sf2m3_layer_w)); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); map(0xff0000, 0xffffff).ram(); } @@ -658,18 +658,18 @@ void cps_state::sf2m10_map(address_map &map) { map(0x000000, 0x3fffff).rom(); map(0x800000, 0x800007).portr("IN1"); - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_hack_dsw_r)); + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_hack_dsw_r)); map(0x800020, 0x800021).nopr(); - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); - map(0x800180, 0x800187).w(this, FUNC(cps_state::cps1_soundlatch_w)); - map(0x800188, 0x80018f).w(this, FUNC(cps_state::cps1_soundlatch2_w)); - map(0x8001a2, 0x8001b3).w(this, FUNC(cps_state::cps1_cps_a_w)); // make 8001b2 point at 800110 + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); + map(0x800180, 0x800187).w(FUNC(cps_state::cps1_soundlatch_w)); + map(0x800188, 0x80018f).w(FUNC(cps_state::cps1_soundlatch2_w)); + map(0x8001a2, 0x8001b3).w(FUNC(cps_state::cps1_cps_a_w)); // make 8001b2 point at 800110 map(0x8001fe, 0x8001ff).nopw(); // writes FFFF here a lot - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); map(0xe00000, 0xefffff).ram(); // it writes to the whole range at start - map(0xf1c000, 0xf1c001).r(this, FUNC(cps_state::cps1_in2_r)); + map(0xf1c000, 0xf1c001).r(FUNC(cps_state::cps1_in2_r)); map(0xfeff00, 0xfeffff).ram(); // fix stack crash at start map(0xff0000, 0xffffff).ram().share("mainram"); } diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index e66cada4221..311a5d27fd3 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -928,27 +928,27 @@ void cps2_state::cps2_map(address_map &map) { map(0x000000, 0x3fffff).rom(); /* 68000 ROM */ map(0x400000, 0x40000b).ram().share("output"); /* CPS2 object output */ - map(0x618000, 0x619fff).rw(this, FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w)); /* Q RAM */ + map(0x618000, 0x619fff).rw(FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w)); /* Q RAM */ map(0x660000, 0x663fff).ram(); /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ map(0x662000, 0x662001).ram(); /* Network adapter related, accessed in SSF2TB */ map(0x662008, 0x662009).ram(); /* Network adapter related, accessed in SSF2TB */ map(0x662020, 0x662021).ram(); /* Network adapter related, accessed in SSF2TB */ map(0x664000, 0x664001).ram(); /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ - map(0x700000, 0x701fff).w(this, FUNC(cps2_state::cps2_objram1_w)).share("objram1"); /* Object RAM, no game seems to use it directly */ - map(0x708000, 0x709fff).mirror(0x006000).rw(this, FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2"); /* Object RAM */ - map(0x800100, 0x80013f).w(this, FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* mirror (sfa) */ - map(0x800140, 0x80017f).rw(this, FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs"); /* mirror (sfa) */ + map(0x700000, 0x701fff).w(FUNC(cps2_state::cps2_objram1_w)).share("objram1"); /* Object RAM, no game seems to use it directly */ + map(0x708000, 0x709fff).mirror(0x006000).rw(FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2"); /* Object RAM */ + map(0x800100, 0x80013f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* mirror (sfa) */ + map(0x800140, 0x80017f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs"); /* mirror (sfa) */ map(0x804000, 0x804001).portr("IN0"); /* IN0 */ map(0x804010, 0x804011).portr("IN1"); /* IN1 */ map(0x804020, 0x804021).portr("IN2"); /* IN2 + EEPROM */ - map(0x804030, 0x804031).r(this, FUNC(cps2_state::cps2_qsound_volume_r)); /* Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present. */ - map(0x804040, 0x804041).w(this, FUNC(cps2_state::cps2_eeprom_port_w)); /* EEPROM */ + map(0x804030, 0x804031).r(FUNC(cps2_state::cps2_qsound_volume_r)); /* Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present. */ + map(0x804040, 0x804041).w(FUNC(cps2_state::cps2_eeprom_port_w)); /* EEPROM */ map(0x8040a0, 0x8040a1).nopw(); /* Unknown (reset once on startup) */ - map(0x8040b0, 0x8040b3).r(this, FUNC(cps2_state::kludge_r)); /* unknown (xmcotaj hangs if this is 0) */ - map(0x8040e0, 0x8040e1).w(this, FUNC(cps2_state::cps2_objram_bank_w)); /* bit 0 = Object ram bank swap */ - map(0x804100, 0x80413f).w(this, FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x804140, 0x80417f).rw(this, FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)); /* CPS-B custom */ - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps2_state::cps1_gfxram_w)).share("gfxram"); /* Video RAM */ + map(0x8040b0, 0x8040b3).r(FUNC(cps2_state::kludge_r)); /* unknown (xmcotaj hangs if this is 0) */ + map(0x8040e0, 0x8040e1).w(FUNC(cps2_state::cps2_objram_bank_w)); /* bit 0 = Object ram bank swap */ + map(0x804100, 0x80413f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x804140, 0x80417f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)); /* CPS-B custom */ + map(0x900000, 0x92ffff).ram().w(FUNC(cps2_state::cps1_gfxram_w)).share("gfxram"); /* Video RAM */ map(0xff0000, 0xffffff).ram(); /* RAM */ } @@ -961,27 +961,27 @@ void cps2_state::dead_cps2_map(address_map &map) { map(0x000000, 0x3fffff).rom(); /* 68000 ROM */ map(0x400000, 0x40000b).ram().share("output"); /* CPS2 object output */ - map(0x618000, 0x619fff).rw(this, FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w)); /* Q RAM */ + map(0x618000, 0x619fff).rw(FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w)); /* Q RAM */ map(0x660000, 0x663fff).ram(); /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ map(0x662000, 0x662001).ram(); /* Network adapter related, accessed in SSF2TB */ map(0x662008, 0x662009).ram(); /* Network adapter related, accessed in SSF2TB */ map(0x662020, 0x662021).ram(); /* Network adapter related, accessed in SSF2TB */ map(0x664000, 0x664001).ram(); /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ - map(0x700000, 0x701fff).w(this, FUNC(cps2_state::cps2_objram1_w)).share("objram1"); /* Object RAM, no game seems to use it directly */ - map(0x708000, 0x709fff).mirror(0x006000).rw(this, FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2"); /* Object RAM */ - map(0x800100, 0x80013f).w(this, FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* mirror (sfa) */ - map(0x800140, 0x80017f).rw(this, FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs"); /* mirror (sfa) */ + map(0x700000, 0x701fff).w(FUNC(cps2_state::cps2_objram1_w)).share("objram1"); /* Object RAM, no game seems to use it directly */ + map(0x708000, 0x709fff).mirror(0x006000).rw(FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2"); /* Object RAM */ + map(0x800100, 0x80013f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* mirror (sfa) */ + map(0x800140, 0x80017f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs"); /* mirror (sfa) */ map(0x804000, 0x804001).portr("IN0"); /* IN0 */ map(0x804010, 0x804011).portr("IN1"); /* IN1 */ map(0x804020, 0x804021).portr("IN2"); /* IN2 + EEPROM */ - map(0x804030, 0x804031).r(this, FUNC(cps2_state::cps2_qsound_volume_r)); /* Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present. */ - map(0x804040, 0x804041).w(this, FUNC(cps2_state::cps2_eeprom_port_w)); /* EEPROM */ + map(0x804030, 0x804031).r(FUNC(cps2_state::cps2_qsound_volume_r)); /* Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present. */ + map(0x804040, 0x804041).w(FUNC(cps2_state::cps2_eeprom_port_w)); /* EEPROM */ map(0x8040a0, 0x8040a1).nopw(); /* Unknown (reset once on startup) */ - map(0x8040b0, 0x8040b3).r(this, FUNC(cps2_state::kludge_r)); /* unknown (xmcotaj hangs if this is 0) */ - map(0x8040e0, 0x8040e1).w(this, FUNC(cps2_state::cps2_objram_bank_w)); /* bit 0 = Object ram bank swap */ - map(0x804100, 0x80413f).w(this, FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x804140, 0x80417f).rw(this, FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)); /* CPS-B custom */ - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps2_state::cps1_gfxram_w)).share("gfxram"); /* Video RAM */ + map(0x8040b0, 0x8040b3).r(FUNC(cps2_state::kludge_r)); /* unknown (xmcotaj hangs if this is 0) */ + map(0x8040e0, 0x8040e1).w(FUNC(cps2_state::cps2_objram_bank_w)); /* bit 0 = Object ram bank swap */ + map(0x804100, 0x80413f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x804140, 0x80417f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)); /* CPS-B custom */ + map(0x900000, 0x92ffff).ram().w(FUNC(cps2_state::cps1_gfxram_w)).share("gfxram"); /* Video RAM */ map(0xff0000, 0xffffef).ram(); /* RAM */ map(0xfffff0, 0xfffffb).ram().share("output"); /* CPS2 output */ map(0xfffffc, 0xffffff).ram(); diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index 78b4fa0481b..d088e45a3c3 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -1415,22 +1415,22 @@ READ32_MEMBER(cps3_state::cps3_gfxflash_r) if (ACCESSING_BITS_24_31) // GFX Flash 1 { //logerror("read GFX flash chip %s addr %02x\n", chip0->tag(), (offset<<1)); - result |= chip0->read( (offset<<1) ) << 24; + result |= chip0->read(space, (offset<<1)) << 24; } if (ACCESSING_BITS_16_23) // GFX Flash 2 { //logerror("read GFX flash chip %s addr %02x\n", chip1->tag(), (offset<<1)); - result |= chip1->read( (offset<<1) ) << 16; + result |= chip1->read(space, (offset<<1)) << 16; } if (ACCESSING_BITS_8_15) // GFX Flash 1 { //logerror("read GFX flash chip %s addr %02x\n", chip0->tag(), (offset<<1)+1); - result |= chip0->read( (offset<<1)+0x1 ) << 8; + result |= chip0->read(space, (offset<<1)+0x1) << 8; } if (ACCESSING_BITS_0_7) // GFX Flash 2 { //logerror("read GFX flash chip %s addr %02x\n", chip1->tag(), (offset<<1)+1); - result |= chip1->read( (offset<<1)+0x1 ) << 0; + result |= chip1->read(space, (offset<<1)+0x1) << 0; } //printf("read GFX flash chips addr %02x returning %08x mem_mask %08x crambank %08x gfxbank %08x\n", offset*2, result,mem_mask, m_cram_bank, m_cram_gfxflash_bank ); @@ -1455,25 +1455,25 @@ WRITE32_MEMBER(cps3_state::cps3_gfxflash_w) { command = (data >> 24) & 0xff; //logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag(), (offset<<1), command); - chip0->write( (offset<<1), command); + chip0->write(space, (offset<<1), command); } if (ACCESSING_BITS_16_23) // GFX Flash 2 { command = (data >> 16) & 0xff; //logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip1->tag(), (offset<<1), command); - chip1->write( (offset<<1), command); + chip1->write(space, (offset<<1), command); } if (ACCESSING_BITS_8_15) // GFX Flash 1 { command = (data >> 8) & 0xff; //logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag(), (offset<<1)+1, command); - chip0->write( (offset<<1)+0x1, command); + chip0->write(space, (offset<<1)+0x1, command); } if (ACCESSING_BITS_0_7) // GFX Flash 2 { command = (data >> 0) & 0xff; //if ( ((offset<<1)+1) != 0x555) printf("write to GFX flash chip %s addr %02x cmd %02x\n", chip1->tag(), (offset<<1)+1, command); - chip1->write( (offset<<1)+0x1, command); + chip1->write(space, (offset<<1)+0x1, command); } /* make a copy in the linear memory region we actually use for drawing etc. having it stored in interleaved flash roms isnt' very useful */ @@ -1506,22 +1506,22 @@ uint32_t cps3_state::cps3_flashmain_r(int which, uint32_t offset, uint32_t mem_m if (ACCESSING_BITS_24_31) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+0, offset*4 ); - result |= (m_simm[which][0]->read(offset)<<24); + result |= (m_simm[which][0]->read(machine().dummy_space(), offset)<<24); } if (ACCESSING_BITS_16_23) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+1, offset*4 ); - result |= (m_simm[which][1]->read(offset)<<16); + result |= (m_simm[which][1]->read(machine().dummy_space(), offset)<<16); } if (ACCESSING_BITS_8_15) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+2, offset*4 ); - result |= (m_simm[which][2]->read(offset)<<8); + result |= (m_simm[which][2]->read(machine().dummy_space(), offset)<<8); } if (ACCESSING_BITS_0_7) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+3, offset*4 ); - result |= (m_simm[which][3]->read(offset)<<0); + result |= (m_simm[which][3]->read(machine().dummy_space(), offset)<<0); } // if (base==4) logerror("read flash chips addr %02x returning %08x\n", offset*4, result ); @@ -1562,25 +1562,25 @@ void cps3_state::cps3_flashmain_w(int which, uint32_t offset, uint32_t data, uin { command = (data >> 24) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][0]->tag(), offset, command); - m_simm[which][0]->write(offset, command); + m_simm[which][0]->write(machine().dummy_space(), offset, command); } if (ACCESSING_BITS_16_23) // Flash 2 { command = (data >> 16) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][1]->tag(), offset, command); - m_simm[which][1]->write(offset, command); + m_simm[which][1]->write(machine().dummy_space(), offset, command); } if (ACCESSING_BITS_8_15) // Flash 2 { command = (data >> 8) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][2]->tag(), offset, command); - m_simm[which][2]->write(offset, command); + m_simm[which][2]->write(machine().dummy_space(), offset, command); } if (ACCESSING_BITS_0_7) // Flash 2 { command = (data >> 0) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][3]->tag(), offset, command); - m_simm[which][3]->write(offset, command); + m_simm[which][3]->write(machine().dummy_space(), offset, command); } /* copy data into regions to execute from */ @@ -2152,15 +2152,15 @@ void cps3_state::cps3_map(address_map &map) // AM_RANGE(0x04000000, 0x0407dfff) AM_RAM AM_SHARE("spriteram")//AM_WRITEONLY // Sprite RAM (jojoba tests this size) map(0x04000000, 0x0407ffff).ram().share("spriteram");//AM_WRITEONLY // Sprite RAM - map(0x04080000, 0x040bffff).rw(this, FUNC(cps3_state::cps3_colourram_r), FUNC(cps3_state::cps3_colourram_w)).share("colourram"); // Colour RAM (jojoba tests this size) 0x20000 colours?! + map(0x04080000, 0x040bffff).rw(FUNC(cps3_state::cps3_colourram_r), FUNC(cps3_state::cps3_colourram_w)).share("colourram"); // Colour RAM (jojoba tests this size) 0x20000 colours?! // video registers of some kind probably - map(0x040C0000, 0x040C0003).r(this, FUNC(cps3_state::cps3_40C0000_r));//?? every frame - map(0x040C0004, 0x040C0007).r(this, FUNC(cps3_state::cps3_40C0004_r));//AM_READ(cps3_40C0004_r) // warzard reads this! + map(0x040C0000, 0x040C0003).r(FUNC(cps3_state::cps3_40C0000_r));//?? every frame + map(0x040C0004, 0x040C0007).r(FUNC(cps3_state::cps3_40C0004_r));//AM_READ(cps3_40C0004_r) // warzard reads this! // AM_RANGE(0x040C0008, 0x040C000b) AM_WRITENOP//?? - map(0x040C000c, 0x040C000f).r(this, FUNC(cps3_state::cps3_vbl_r));// AM_WRITENOP/ + map(0x040C000c, 0x040C000f).r(FUNC(cps3_state::cps3_vbl_r));// AM_WRITENOP/ - map(0x040C0000, 0x040C001f).w(this, FUNC(cps3_state::cps3_unk_vidregs_w)); + map(0x040C0000, 0x040C001f).w(FUNC(cps3_state::cps3_unk_vidregs_w)); map(0x040C0020, 0x040C002b).writeonly().share("tmap20_regs"); map(0x040C0030, 0x040C003b).writeonly().share("tmap30_regs"); map(0x040C0040, 0x040C004b).writeonly().share("tmap40_regs"); @@ -2169,44 +2169,44 @@ void cps3_state::cps3_map(address_map &map) map(0x040C0060, 0x040C007f).ram().share("fullscreenzoom"); - map(0x040C0094, 0x040C009b).w(this, FUNC(cps3_state::cps3_characterdma_w)); + map(0x040C0094, 0x040C009b).w(FUNC(cps3_state::cps3_characterdma_w)); - map(0x040C00a0, 0x040C00af).w(this, FUNC(cps3_state::cps3_palettedma_w)); + map(0x040C00a0, 0x040C00af).w(FUNC(cps3_state::cps3_palettedma_w)); - map(0x040C0084, 0x040C0087).w(this, FUNC(cps3_state::cram_bank_w)); - map(0x040C0088, 0x040C008b).w(this, FUNC(cps3_state::cram_gfxflash_bank_w)); + map(0x040C0084, 0x040C0087).w(FUNC(cps3_state::cram_bank_w)); + map(0x040C0088, 0x040C008b).w(FUNC(cps3_state::cram_gfxflash_bank_w)); map(0x040e0000, 0x040e02ff).rw(m_cps3sound, FUNC(cps3_sound_device::cps3_sound_r), FUNC(cps3_sound_device::cps3_sound_w)); - map(0x04100000, 0x041fffff).rw(this, FUNC(cps3_state::cram_data_r), FUNC(cps3_state::cram_data_w)); - map(0x04200000, 0x043fffff).rw(this, FUNC(cps3_state::cps3_gfxflash_r), FUNC(cps3_state::cps3_gfxflash_w)); // GFX Flash ROMS + map(0x04100000, 0x041fffff).rw(FUNC(cps3_state::cram_data_r), FUNC(cps3_state::cram_data_w)); + map(0x04200000, 0x043fffff).rw(FUNC(cps3_state::cps3_gfxflash_r), FUNC(cps3_state::cps3_gfxflash_w)); // GFX Flash ROMS map(0x05000000, 0x05000003).portr("INPUTS"); map(0x05000004, 0x05000007).portr("EXTRA"); map(0x05000008, 0x0500000b).nopw(); // ?? every frame - map(0x05000a00, 0x05000a1f).r(this, FUNC(cps3_state::cps3_unk_io_r)); // ?? every frame + map(0x05000a00, 0x05000a1f).r(FUNC(cps3_state::cps3_unk_io_r)); // ?? every frame - map(0x05001000, 0x05001203).rw(this, FUNC(cps3_state::cps3_eeprom_r), FUNC(cps3_state::cps3_eeprom_w)); + map(0x05001000, 0x05001203).rw(FUNC(cps3_state::cps3_eeprom_r), FUNC(cps3_state::cps3_eeprom_w)); - map(0x05040000, 0x0504ffff).rw(this, FUNC(cps3_state::cps3_ssram_r), FUNC(cps3_state::cps3_ssram_w)); // 'SS' RAM (Score Screen) (text tilemap + toles) + map(0x05040000, 0x0504ffff).rw(FUNC(cps3_state::cps3_ssram_r), FUNC(cps3_state::cps3_ssram_w)); // 'SS' RAM (Score Screen) (text tilemap + toles) //0x25050020 - map(0x05050020, 0x05050023).w(this, FUNC(cps3_state::cps3_ss_bank_base_w)); - map(0x05050024, 0x05050027).w(this, FUNC(cps3_state::cps3_ss_pal_base_w)); + map(0x05050020, 0x05050023).w(FUNC(cps3_state::cps3_ss_bank_base_w)); + map(0x05050024, 0x05050027).w(FUNC(cps3_state::cps3_ss_pal_base_w)); - map(0x05100000, 0x05100003).w(this, FUNC(cps3_state::cps3_irq12_ack_w)); - map(0x05110000, 0x05110003).w(this, FUNC(cps3_state::cps3_irq10_ack_w)); + map(0x05100000, 0x05100003).w(FUNC(cps3_state::cps3_irq12_ack_w)); + map(0x05110000, 0x05110003).w(FUNC(cps3_state::cps3_irq10_ack_w)); map(0x05140000, 0x05140003).rw("wd33c93", FUNC(wd33c93_device::read), FUNC(wd33c93_device::write)).umask32(0x00ff00ff); - map(0x06000000, 0x067fffff).rw(this, FUNC(cps3_state::cps3_flash1_r), FUNC(cps3_state::cps3_flash1_w)); /* Flash ROMs simm 1 */ - map(0x06800000, 0x06ffffff).rw(this, FUNC(cps3_state::cps3_flash2_r), FUNC(cps3_state::cps3_flash2_w)); /* Flash ROMs simm 2 */ + map(0x06000000, 0x067fffff).rw(FUNC(cps3_state::cps3_flash1_r), FUNC(cps3_state::cps3_flash1_w)); /* Flash ROMs simm 1 */ + map(0x06800000, 0x06ffffff).rw(FUNC(cps3_state::cps3_flash2_r), FUNC(cps3_state::cps3_flash2_w)); /* Flash ROMs simm 2 */ map(0x07ff0048, 0x07ff004b).nopw(); // bit 0 toggles during programming - map(0xc0000000, 0xc00003ff).ram().w(this, FUNC(cps3_state::cps3_0xc0000000_ram_w)).share("0xc0000000_ram"); /* Executes code from here */ + map(0xc0000000, 0xc00003ff).ram().w(FUNC(cps3_state::cps3_0xc0000000_ram_w)).share("0xc0000000_ram"); /* Executes code from here */ } void cps3_state::decrypted_opcodes_map(address_map &map) diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp index 9248569c30f..4569132d9ed 100644 --- a/src/mame/drivers/craft.cpp +++ b/src/mame/drivers/craft.cpp @@ -197,7 +197,7 @@ void craft_state::craft_data_map(address_map &map) void craft_state::craft_io_map(address_map &map) { - map(AVR8_IO_PORTA, AVR8_IO_PORTD).rw(this, FUNC(craft_state::port_r), FUNC(craft_state::port_w)); + map(AVR8_IO_PORTA, AVR8_IO_PORTD).rw(FUNC(craft_state::port_r), FUNC(craft_state::port_w)); } /****************************************************\ diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp index 59594bc58f6..d79823c375a 100644 --- a/src/mame/drivers/crbaloon.cpp +++ b/src/mame/drivers/crbaloon.cpp @@ -197,8 +197,8 @@ void crbaloon_state::main_map(address_map &map) map.global_mask(0x7fff); /* A15 is not decoded */ map(0x0000, 0x3fff).rom(); /* not fully populated */ map(0x4000, 0x43ff).mirror(0x0400).ram(); - map(0x4800, 0x4bff).mirror(0x0400).ram().w(this, FUNC(crbaloon_state::crbaloon_videoram_w)).share("videoram"); - map(0x5000, 0x53ff).mirror(0x0400).ram().w(this, FUNC(crbaloon_state::crbaloon_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0x0400).ram().w(FUNC(crbaloon_state::crbaloon_videoram_w)).share("videoram"); + map(0x5000, 0x53ff).mirror(0x0400).ram().w(FUNC(crbaloon_state::crbaloon_colorram_w)).share("colorram"); map(0x5800, 0x7fff).noprw(); } @@ -215,15 +215,15 @@ void crbaloon_state::main_io_map(address_map &map) map.global_mask(0xf); map(0x00, 0x00).mirror(0x0c).portr("DSW0"); map(0x01, 0x01).mirror(0x0c).portr("IN0"); - map(0x02, 0x02).select(0x0c).r(this, FUNC(crbaloon_state::pc3259_r)); + map(0x02, 0x02).select(0x0c).r(FUNC(crbaloon_state::pc3259_r)); map(0x03, 0x03).mirror(0x0c).portr("IN1"); map(0x00, 0x00).nopw(); /* not connected */ map(0x01, 0x01).nopw(); /* watchdog */ map(0x02, 0x04).writeonly().share("spriteram"); - map(0x05, 0x05).w(this, FUNC(crbaloon_state::crbaloon_audio_set_music_freq)); - map(0x06, 0x06).w(this, FUNC(crbaloon_state::port_sound_w)); - map(0x07, 0x0b).w(this, FUNC(crbaloon_state::pc3092_w)).share("pc3092_data"); + map(0x05, 0x05).w(FUNC(crbaloon_state::crbaloon_audio_set_music_freq)); + map(0x06, 0x06).w(FUNC(crbaloon_state::port_sound_w)); + map(0x07, 0x0b).w(FUNC(crbaloon_state::pc3092_w)).share("pc3092_data"); map(0x0c, 0x0c).nopw(); /* MSK - to PC3259 */ map(0x0d, 0x0d).nopw(); /* schematics has it in a box marked "NOT USE" */ map(0x0e, 0x0f).nopw(); diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp index 30472851218..13fbb63b7ca 100644 --- a/src/mame/drivers/crgolf.cpp +++ b/src/mame/drivers/crgolf.cpp @@ -284,7 +284,7 @@ void crgolf_state::main_map(address_map &map) map(0x8000, 0x8007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x8800, 0x8800).r("soundlatch2", FUNC(generic_latch_8_device::read)); map(0x8800, 0x8800).w("soundlatch1", FUNC(generic_latch_8_device::write)); - map(0x9000, 0x9000).w(this, FUNC(crgolf_state::rom_bank_select_w)); + map(0x9000, 0x9000).w(FUNC(crgolf_state::rom_bank_select_w)); map(0xa000, 0xffff).m(m_vrambank, FUNC(address_map_bank_device::amap8)); } @@ -307,8 +307,8 @@ void crgolf_state::sound_map(address_map &map) map(0x8000, 0x87ff).ram(); map(0xc000, 0xc001).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xc002, 0xc002).nopw(); - map(0xe000, 0xe000).rw(this, FUNC(crgolf_state::switch_input_r), FUNC(crgolf_state::switch_input_select_w)); - map(0xe001, 0xe001).rw(this, FUNC(crgolf_state::analog_input_r), FUNC(crgolf_state::unknown_w)); + map(0xe000, 0xe000).rw(FUNC(crgolf_state::switch_input_r), FUNC(crgolf_state::switch_input_select_w)); + map(0xe001, 0xe001).rw(FUNC(crgolf_state::analog_input_r), FUNC(crgolf_state::unknown_w)); map(0xe003, 0xe003).r("soundlatch1", FUNC(generic_latch_8_device::read)); map(0xe003, 0xe003).w("soundlatch2", FUNC(generic_latch_8_device::write)); } @@ -372,12 +372,12 @@ void crgolf_state::mastrglf_subio(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch1", FUNC(generic_latch_8_device::read)).nopw(); - map(0x02, 0x02).r(this, FUNC(crgolf_state::unk_sub_02_r)); - map(0x05, 0x05).r(this, FUNC(crgolf_state::unk_sub_05_r)); + map(0x02, 0x02).r(FUNC(crgolf_state::unk_sub_02_r)); + map(0x05, 0x05).r(FUNC(crgolf_state::unk_sub_05_r)); map(0x06, 0x06).nopr(); - map(0x07, 0x07).r(this, FUNC(crgolf_state::unk_sub_07_r)); + map(0x07, 0x07).r(FUNC(crgolf_state::unk_sub_07_r)); map(0x08, 0x08).w("soundlatch2", FUNC(generic_latch_8_device::write)); - map(0x0c, 0x0c).w(this, FUNC(crgolf_state::unk_sub_0c_w)); + map(0x0c, 0x0c).w(FUNC(crgolf_state::unk_sub_0c_w)); map(0x10, 0x11).w("aysnd", FUNC(ay8910_device::address_data_w)); } diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index eb528258df6..d230dbab198 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -85,7 +85,7 @@ void crimfght_state::crimfght_map(address_map &map) { map(0x0000, 0x03ff).m(m_bank0000, FUNC(address_map_bank_device::amap8)); map(0x0400, 0x1fff).ram(); - map(0x2000, 0x5fff).rw(this, FUNC(crimfght_state::k052109_051960_r), FUNC(crimfght_state::k052109_051960_w)); /* video RAM + sprite RAM */ + map(0x2000, 0x5fff).rw(FUNC(crimfght_state::k052109_051960_r), FUNC(crimfght_state::k052109_051960_w)); /* video RAM + sprite RAM */ map(0x3f80, 0x3f80).portr("SYSTEM"); map(0x3f81, 0x3f81).portr("P1"); map(0x3f82, 0x3f82).portr("P2"); @@ -94,8 +94,8 @@ void crimfght_state::crimfght_map(address_map &map) map(0x3f85, 0x3f85).portr("P3"); map(0x3f86, 0x3f86).portr("P4"); map(0x3f87, 0x3f87).portr("DSW1"); - map(0x3f88, 0x3f88).mirror(0x03).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(crimfght_state::crimfght_coin_w)); // 051550 - map(0x3f8c, 0x3f8c).mirror(0x03).w(this, FUNC(crimfght_state::sound_w)); + map(0x3f88, 0x3f88).mirror(0x03).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(crimfght_state::crimfght_coin_w)); // 051550 + map(0x3f8c, 0x3f8c).mirror(0x03).w(FUNC(crimfght_state::sound_w)); map(0x6000, 0x7fff).bankr("rombank"); /* banked ROM */ map(0x8000, 0xffff).rom().region("maincpu", 0x18000); } diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp index 23cd77b9557..099bcaacd0a 100644 --- a/src/mame/drivers/crospang.cpp +++ b/src/mame/drivers/crospang.cpp @@ -49,8 +49,8 @@ void crospang_state::crospang_base_map(address_map &map) { map(0x000000, 0x0fffff).rom().nopw(); // writes to rom quite often - map(0x120000, 0x1207ff).ram().w(this, FUNC(crospang_state::crospang_fg_videoram_w)).share("fg_videoram"); - map(0x122000, 0x1227ff).ram().w(this, FUNC(crospang_state::crospang_bg_videoram_w)).share("bg_videoram"); + map(0x120000, 0x1207ff).ram().w(FUNC(crospang_state::crospang_fg_videoram_w)).share("fg_videoram"); + map(0x122000, 0x1227ff).ram().w(FUNC(crospang_state::crospang_bg_videoram_w)).share("bg_videoram"); map(0x200000, 0x2005ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x210000, 0x2107ff).ram().share("spriteram"); map(0x270001, 0x270001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); @@ -65,10 +65,10 @@ void crospang_state::crospang_map(address_map &map) crospang_base_map(map); map(0x100000, 0x100001).nopw(); - map(0x100002, 0x100003).w(this, FUNC(crospang_state::crospang_fg_scrolly_w)); - map(0x100004, 0x100005).w(this, FUNC(crospang_state::crospang_bg_scrollx_w)); - map(0x100006, 0x100007).w(this, FUNC(crospang_state::crospang_bg_scrolly_w)); - map(0x100008, 0x100009).w(this, FUNC(crospang_state::crospang_fg_scrollx_w)); + map(0x100002, 0x100003).w(FUNC(crospang_state::crospang_fg_scrolly_w)); + map(0x100004, 0x100005).w(FUNC(crospang_state::crospang_bg_scrollx_w)); + map(0x100006, 0x100007).w(FUNC(crospang_state::crospang_bg_scrolly_w)); + map(0x100008, 0x100009).w(FUNC(crospang_state::crospang_fg_scrollx_w)); map(0x10000e, 0x10000f).nopw(); map(0x320000, 0x32ffff).ram(); @@ -78,11 +78,11 @@ void crospang_state::bestri_map(address_map &map) { crospang_base_map(map); - map(0x100004, 0x100005).w(this, FUNC(crospang_state::bestri_fg_scrollx_w)); - map(0x100006, 0x100007).w(this, FUNC(crospang_state::bestri_fg_scrolly_w)); - map(0x10000a, 0x10000b).w(this, FUNC(crospang_state::bestri_bg_scrolly_w)); - map(0x10000c, 0x10000d).w(this, FUNC(crospang_state::bestri_bg_scrollx_w)); - map(0x10000e, 0x10000f).w(this, FUNC(crospang_state::bestri_tilebank_w)); + map(0x100004, 0x100005).w(FUNC(crospang_state::bestri_fg_scrollx_w)); + map(0x100006, 0x100007).w(FUNC(crospang_state::bestri_fg_scrolly_w)); + map(0x10000a, 0x10000b).w(FUNC(crospang_state::bestri_bg_scrolly_w)); + map(0x10000c, 0x10000d).w(FUNC(crospang_state::bestri_bg_scrollx_w)); + map(0x10000e, 0x10000f).w(FUNC(crospang_state::bestri_tilebank_w)); map(0x3a0000, 0x3affff).ram(); } @@ -92,11 +92,11 @@ void crospang_state::bestria_map(address_map &map) crospang_base_map(map); map(0x100000, 0x100001).nopw(); // ?? - map(0x100006, 0x100007).w(this, FUNC(crospang_state::bestri_fg_scrollx_w)); - map(0x100008, 0x100009).w(this, FUNC(crospang_state::bestri_fg_scrolly_w)); - map(0x10000a, 0x10000b).w(this, FUNC(crospang_state::bestri_bg_scrollx_w)); - map(0x10000c, 0x10000d).w(this, FUNC(crospang_state::bestri_bg_scrolly_w)); - map(0x10000e, 0x10000f).w(this, FUNC(crospang_state::bestri_tilebank_w)); + map(0x100006, 0x100007).w(FUNC(crospang_state::bestri_fg_scrollx_w)); + map(0x100008, 0x100009).w(FUNC(crospang_state::bestri_fg_scrolly_w)); + map(0x10000a, 0x10000b).w(FUNC(crospang_state::bestri_bg_scrollx_w)); + map(0x10000c, 0x10000d).w(FUNC(crospang_state::bestri_bg_scrolly_w)); + map(0x10000e, 0x10000f).w(FUNC(crospang_state::bestri_tilebank_w)); map(0x340000, 0x34ffff).ram(); } diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp index e6a99dc32db..7a0aee56d55 100644 --- a/src/mame/drivers/crshrace.cpp +++ b/src/mame/drivers/crshrace.cpp @@ -152,13 +152,13 @@ void crshrace_state::crshrace_map(address_map &map) map(0x300000, 0x3fffff).rom().region("user1", 0); map(0x400000, 0x4fffff).rom().region("user2", 0).mirror(0x100000); map(0xa00000, 0xa0ffff).ram().share("spriteram2"); - map(0xd00000, 0xd01fff).ram().w(this, FUNC(crshrace_state::crshrace_videoram1_w)).share("videoram1"); + map(0xd00000, 0xd01fff).ram().w(FUNC(crshrace_state::crshrace_videoram1_w)).share("videoram1"); map(0xe00000, 0xe01fff).ram().share("spriteram"); map(0xfe0000, 0xfeffff).ram(); - map(0xffc000, 0xffc001).w(this, FUNC(crshrace_state::crshrace_roz_bank_w)); - map(0xffd000, 0xffdfff).ram().w(this, FUNC(crshrace_state::crshrace_videoram2_w)).share("videoram2"); + map(0xffc000, 0xffc001).w(FUNC(crshrace_state::crshrace_roz_bank_w)); + map(0xffd000, 0xffdfff).ram().w(FUNC(crshrace_state::crshrace_videoram2_w)).share("videoram2"); map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xfff000, 0xfff001).portr("P1").w(this, FUNC(crshrace_state::crshrace_gfxctrl_w)); + map(0xfff000, 0xfff001).portr("P1").w(FUNC(crshrace_state::crshrace_gfxctrl_w)); map(0xfff002, 0xfff003).portr("P2"); map(0xfff004, 0xfff005).portr("DSW0"); map(0xfff006, 0xfff007).portr("DSW2"); @@ -179,7 +179,7 @@ void crshrace_state::sound_map(address_map &map) void crshrace_state::sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(crshrace_state::crshrace_sh_bankswitch_w)); + map(0x00, 0x00).w(FUNC(crshrace_state::crshrace_sh_bankswitch_w)); map(0x04, 0x04).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0x08, 0x0b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp index 1253b4dee79..e00bfbaa870 100644 --- a/src/mame/drivers/crvision.cpp +++ b/src/mame/drivers/crvision.cpp @@ -146,16 +146,16 @@ void crvision_state::crvision_map(address_map &map) { map(0x0000, 0x03ff).mirror(0x0c00).ram(); map(0x1000, 0x1003).mirror(0x0ffc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x2000, 0x2000).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::vram_read)); - map(0x2001, 0x2001).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::register_read)); - map(0x3000, 0x3000).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::vram_write)); - map(0x3001, 0x3001).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::register_write)); + map(0x2000, 0x2000).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::vram_r)); + map(0x2001, 0x2001).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::register_r)); + map(0x3000, 0x3000).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::vram_w)); + map(0x3001, 0x3001).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::register_w)); map(0x4000, 0x7fff).bankr(BANK_ROM2); map(0x8000, 0xbfff).bankr(BANK_ROM1); // AM_RANGE(0xc000, 0xe7ff) AM_RAMBANK(3) - map(0xe800, 0xe800).w(m_cent_data_out, FUNC(output_latch_device::write)); - map(0xe801, 0xe801).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0xe801, 0xe801).w("cent_ctrl_out", FUNC(output_latch_device::write)); + map(0xe800, 0xe800).w(m_cent_data_out, FUNC(output_latch_device::bus_w)); + map(0xe801, 0xe801).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0xe801, 0xe801).w("cent_ctrl_out", FUNC(output_latch_device::bus_w)); // AM_RANGE(0xe802, 0xf7ff) AM_RAMBANK(4) map(0xf800, 0xffff).rom().region(M6502_TAG, 0); } @@ -168,10 +168,10 @@ void laser2001_state::lasr2001_map(address_map &map) { map(0x0000, 0x03ff).mirror(0x0c00).ram(); map(0x1000, 0x1003).mirror(0x0ffc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x2000, 0x2000).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::vram_read)); - map(0x2001, 0x2001).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::register_read)); - map(0x3000, 0x3000).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::vram_write)); - map(0x3001, 0x3001).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::register_write)); + map(0x2000, 0x2000).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::vram_r)); + map(0x2001, 0x2001).mirror(0x0ffe).r(TMS9929_TAG, FUNC(tms9928a_device::register_r)); + map(0x3000, 0x3000).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::vram_w)); + map(0x3001, 0x3001).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::register_w)); map(0x4000, 0x7fff).bankrw(BANK_ROM2); map(0x8000, 0xbfff).bankrw(BANK_ROM1); map(0xc000, 0xffff).rom().region(M6502_TAG, 0); @@ -642,7 +642,7 @@ WRITE8_MEMBER( laser2001_state::pia_pb_w ) m_keylatch = data; /* centronics data */ - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); } READ_LINE_MEMBER( laser2001_state::pia_ca1_r ) @@ -747,7 +747,7 @@ MACHINE_CONFIG_START(crvision_state::creativision) MCFG_PIA_READPA_HANDLER(READ8(*this, crvision_state, pia_pa_r)) MCFG_PIA_READPB_HANDLER(READ8(*this, crvision_state, pia_pb_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, crvision_state, pia_pa_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(SN76489_TAG, sn76496_base_device, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(SN76489_TAG, sn76496_base_device, command_w)) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 560ca9defe6..73861cd45c4 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -656,33 +656,33 @@ void crystal_state::crystal_mem(address_map &map) { map(0x00000000, 0x0001ffff).rom().nopw(); - map(0x01200000, 0x0120000f).r(this, FUNC(crystal_state::Input_r)); - map(0x01280000, 0x01280003).w(this, FUNC(crystal_state::Banksw_w)); + map(0x01200000, 0x0120000f).r(FUNC(crystal_state::Input_r)); + map(0x01280000, 0x01280003).w(FUNC(crystal_state::Banksw_w)); map(0x01400000, 0x0140ffff).ram().share("nvram"); map(0x01800000, 0x0180ffff).ram().share("sysregs"); - map(0x01800800, 0x01800803).rw(this, FUNC(crystal_state::DMA0_r), FUNC(crystal_state::DMA0_w)); - map(0x01800810, 0x01800813).rw(this, FUNC(crystal_state::DMA1_r), FUNC(crystal_state::DMA1_w)); + map(0x01800800, 0x01800803).rw(FUNC(crystal_state::DMA0_r), FUNC(crystal_state::DMA0_w)); + map(0x01800810, 0x01800813).rw(FUNC(crystal_state::DMA1_r), FUNC(crystal_state::DMA1_w)); - map(0x01800c04, 0x01800c07).w(this, FUNC(crystal_state::IntAck_w)); + map(0x01800c04, 0x01800c07).w(FUNC(crystal_state::IntAck_w)); - map(0x01801400, 0x01801403).rw(this, FUNC(crystal_state::Timer0_r), FUNC(crystal_state::Timer0_w)); - map(0x01801408, 0x0180140b).rw(this, FUNC(crystal_state::Timer1_r), FUNC(crystal_state::Timer1_w)); - map(0x01801410, 0x01801413).rw(this, FUNC(crystal_state::Timer2_r), FUNC(crystal_state::Timer2_w)); - map(0x01801418, 0x0180141b).rw(this, FUNC(crystal_state::Timer3_r), FUNC(crystal_state::Timer3_w)); - map(0x01802004, 0x01802007).rw(this, FUNC(crystal_state::PIO_r), FUNC(crystal_state::PIO_w)); + map(0x01801400, 0x01801403).rw(FUNC(crystal_state::Timer0_r), FUNC(crystal_state::Timer0_w)); + map(0x01801408, 0x0180140b).rw(FUNC(crystal_state::Timer1_r), FUNC(crystal_state::Timer1_w)); + map(0x01801410, 0x01801413).rw(FUNC(crystal_state::Timer2_r), FUNC(crystal_state::Timer2_w)); + map(0x01801418, 0x0180141b).rw(FUNC(crystal_state::Timer3_r), FUNC(crystal_state::Timer3_w)); + map(0x01802004, 0x01802007).rw(FUNC(crystal_state::PIO_r), FUNC(crystal_state::PIO_w)); map(0x02000000, 0x027fffff).ram().share("workram"); map(0x03000000, 0x0300ffff).ram().share("vidregs"); - map(0x030000a4, 0x030000a7).rw(this, FUNC(crystal_state::FlipCount_r), FUNC(crystal_state::FlipCount_w)); + map(0x030000a4, 0x030000a7).rw(FUNC(crystal_state::FlipCount_r), FUNC(crystal_state::FlipCount_w)); map(0x03800000, 0x03ffffff).ram().share("textureram"); map(0x04000000, 0x047fffff).ram().share("frameram"); map(0x04800000, 0x04800fff).rw("vrender", FUNC(vrender0_device::vr0_snd_read), FUNC(vrender0_device::vr0_snd_write)); map(0x05000000, 0x05ffffff).bankr("bank1"); - map(0x05000000, 0x05000003).rw(this, FUNC(crystal_state::FlashCmd_r), FUNC(crystal_state::FlashCmd_w)); + map(0x05000000, 0x05000003).rw(FUNC(crystal_state::FlashCmd_r), FUNC(crystal_state::FlashCmd_w)); map(0x44414F4C, 0x44414F7F).ram().share("reset_patch"); } @@ -716,7 +716,7 @@ void crystal_state::trivrus_mem(address_map &map) map(0x00000000, 0x0007ffff).rom().nopw(); // 0x01280000 & 0x0000ffff (written at boot) - map(0x01500000, 0x01500003).rw(this, FUNC(crystal_state::trivrus_input_r), FUNC(crystal_state::trivrus_input_w)); + map(0x01500000, 0x01500003).rw(FUNC(crystal_state::trivrus_input_r), FUNC(crystal_state::trivrus_input_w)); // 0x01500010 & 0x000000ff = sec // 0x01500010 & 0x00ff0000 = min // 0x01500014 & 0x000000ff = hour @@ -727,28 +727,28 @@ void crystal_state::trivrus_mem(address_map &map) map(0x01800000, 0x0180ffff).ram().share("sysregs"); - map(0x01800800, 0x01800803).rw(this, FUNC(crystal_state::DMA0_r), FUNC(crystal_state::DMA0_w)); - map(0x01800810, 0x01800813).rw(this, FUNC(crystal_state::DMA1_r), FUNC(crystal_state::DMA1_w)); + map(0x01800800, 0x01800803).rw(FUNC(crystal_state::DMA0_r), FUNC(crystal_state::DMA0_w)); + map(0x01800810, 0x01800813).rw(FUNC(crystal_state::DMA1_r), FUNC(crystal_state::DMA1_w)); - map(0x01800c04, 0x01800c07).w(this, FUNC(crystal_state::IntAck_w)); + map(0x01800c04, 0x01800c07).w(FUNC(crystal_state::IntAck_w)); - map(0x01801400, 0x01801403).rw(this, FUNC(crystal_state::Timer0_r), FUNC(crystal_state::Timer0_w)); - map(0x01801408, 0x0180140b).rw(this, FUNC(crystal_state::Timer1_r), FUNC(crystal_state::Timer1_w)); - map(0x01801410, 0x01801413).rw(this, FUNC(crystal_state::Timer2_r), FUNC(crystal_state::Timer2_w)); - map(0x01801418, 0x0180141b).rw(this, FUNC(crystal_state::Timer3_r), FUNC(crystal_state::Timer3_w)); - map(0x01802004, 0x01802007).rw(this, FUNC(crystal_state::PIO_r), FUNC(crystal_state::PIO_w)); + map(0x01801400, 0x01801403).rw(FUNC(crystal_state::Timer0_r), FUNC(crystal_state::Timer0_w)); + map(0x01801408, 0x0180140b).rw(FUNC(crystal_state::Timer1_r), FUNC(crystal_state::Timer1_w)); + map(0x01801410, 0x01801413).rw(FUNC(crystal_state::Timer2_r), FUNC(crystal_state::Timer2_w)); + map(0x01801418, 0x0180141b).rw(FUNC(crystal_state::Timer3_r), FUNC(crystal_state::Timer3_w)); + map(0x01802004, 0x01802007).rw(FUNC(crystal_state::PIO_r), FUNC(crystal_state::PIO_w)); map(0x02000000, 0x027fffff).ram().share("workram"); map(0x03000000, 0x0300ffff).ram().share("vidregs"); - map(0x030000a4, 0x030000a7).rw(this, FUNC(crystal_state::FlipCount_r), FUNC(crystal_state::FlipCount_w)); + map(0x030000a4, 0x030000a7).rw(FUNC(crystal_state::FlipCount_r), FUNC(crystal_state::FlipCount_w)); map(0x03800000, 0x03ffffff).ram().share("textureram"); map(0x04000000, 0x047fffff).ram().share("frameram"); map(0x04800000, 0x04800fff).rw("vrender", FUNC(vrender0_device::vr0_snd_read), FUNC(vrender0_device::vr0_snd_write)); map(0x05000000, 0x05ffffff).bankr("bank1"); - map(0x05000000, 0x05000003).rw(this, FUNC(crystal_state::FlashCmd_r), FUNC(crystal_state::FlashCmd_w)); + map(0x05000000, 0x05000003).rw(FUNC(crystal_state::FlashCmd_r), FUNC(crystal_state::FlashCmd_w)); // AM_RANGE(0x44414F4C, 0x44414F7F) AM_RAM AM_SHARE("reset_patch") } @@ -757,8 +757,8 @@ void crystal_state::crospuzl_mem(address_map &map) { trivrus_mem(map); - map(0x01500000, 0x01500003).r(this, FUNC(crystal_state::FlashCmd_r)); - map(0x01500100, 0x01500103).w(this, FUNC(crystal_state::FlashCmd_w)); + map(0x01500000, 0x01500003).r(FUNC(crystal_state::FlashCmd_r)); + map(0x01500100, 0x01500103).w(FUNC(crystal_state::FlashCmd_w)); map(0x01510000, 0x01510003).portr("IN0"); map(0x01511000, 0x01511003).portr("IN1"); map(0x01512000, 0x01512003).portr("IN2"); @@ -810,35 +810,35 @@ void crystal_state::crzyddz2_mem(address_map &map) { map(0x00000000, 0x00ffffff).rom().nopw(); - map(0x01280000, 0x01280003).w(this, FUNC(crystal_state::Banksw_w)); + map(0x01280000, 0x01280003).w(FUNC(crystal_state::Banksw_w)); map(0x01400000, 0x0140ffff).ram().share("nvram"); map(0x01500000, 0x01500003).portr("P1_P2"); - map(0x01500004, 0x01500007).r(this, FUNC(crystal_state::crzyddz2_key_r)); + map(0x01500004, 0x01500007).r(FUNC(crystal_state::crzyddz2_key_r)); map(0x01800000, 0x0180ffff).ram().share("sysregs"); - map(0x01800800, 0x01800803).rw(this, FUNC(crystal_state::DMA0_r), FUNC(crystal_state::DMA0_w)); - map(0x01800810, 0x01800813).rw(this, FUNC(crystal_state::DMA1_r), FUNC(crystal_state::DMA1_w)); + map(0x01800800, 0x01800803).rw(FUNC(crystal_state::DMA0_r), FUNC(crystal_state::DMA0_w)); + map(0x01800810, 0x01800813).rw(FUNC(crystal_state::DMA1_r), FUNC(crystal_state::DMA1_w)); - map(0x01800c04, 0x01800c07).w(this, FUNC(crystal_state::IntAck_w)); + map(0x01800c04, 0x01800c07).w(FUNC(crystal_state::IntAck_w)); - map(0x01801400, 0x01801403).rw(this, FUNC(crystal_state::Timer0_r), FUNC(crystal_state::Timer0_w)); - map(0x01801408, 0x0180140b).rw(this, FUNC(crystal_state::Timer1_r), FUNC(crystal_state::Timer1_w)); - map(0x01801410, 0x01801413).rw(this, FUNC(crystal_state::Timer2_r), FUNC(crystal_state::Timer2_w)); - map(0x01801418, 0x0180141b).rw(this, FUNC(crystal_state::Timer3_r), FUNC(crystal_state::Timer3_w)); - map(0x01802004, 0x01802007).rw(this, FUNC(crystal_state::PIO_r), FUNC(crystal_state::crzyddz2_PIO_w)); + map(0x01801400, 0x01801403).rw(FUNC(crystal_state::Timer0_r), FUNC(crystal_state::Timer0_w)); + map(0x01801408, 0x0180140b).rw(FUNC(crystal_state::Timer1_r), FUNC(crystal_state::Timer1_w)); + map(0x01801410, 0x01801413).rw(FUNC(crystal_state::Timer2_r), FUNC(crystal_state::Timer2_w)); + map(0x01801418, 0x0180141b).rw(FUNC(crystal_state::Timer3_r), FUNC(crystal_state::Timer3_w)); + map(0x01802004, 0x01802007).rw(FUNC(crystal_state::PIO_r), FUNC(crystal_state::crzyddz2_PIO_w)); map(0x02000000, 0x027fffff).ram().share("workram"); map(0x03000000, 0x0300ffff).ram().share("vidregs"); - map(0x030000a4, 0x030000a7).rw(this, FUNC(crystal_state::FlipCount_r), FUNC(crystal_state::FlipCount_w)); + map(0x030000a4, 0x030000a7).rw(FUNC(crystal_state::FlipCount_r), FUNC(crystal_state::FlipCount_w)); map(0x03800000, 0x03ffffff).ram().share("textureram"); map(0x04000000, 0x047fffff).ram().share("frameram"); map(0x04800000, 0x04800fff).rw("vrender", FUNC(vrender0_device::vr0_snd_read), FUNC(vrender0_device::vr0_snd_write)); map(0x05000000, 0x05ffffff).bankr("bank1"); - map(0x05000000, 0x05000003).rw(this, FUNC(crystal_state::FlashCmd_r), FUNC(crystal_state::FlashCmd_w)); + map(0x05000000, 0x05000003).rw(FUNC(crystal_state::FlashCmd_r), FUNC(crystal_state::FlashCmd_w)); // AM_RANGE(0x44414F4C, 0x44414F7F) AM_RAM AM_SHARE("reset_patch") } diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index 86daa41c42a..70aa07bf9e4 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -136,7 +136,7 @@ void csplayh5_state::csplayh5_map(address_map &map) map(0x200000, 0x200001).portr("DSW"); map(0x200000, 0x200000).w(m_nichisnd, FUNC(nichisnd_device::sound_host_command_w)); - map(0x200200, 0x200201).rw(this, FUNC(csplayh5_state::csplayh5_mux_r), FUNC(csplayh5_state::csplayh5_mux_w)); + map(0x200200, 0x200201).rw(FUNC(csplayh5_state::csplayh5_mux_r), FUNC(csplayh5_state::csplayh5_mux_w)); map(0x200400, 0x200401).portr("SYSTEM"); map(0x200600, 0x200607).rw(m_v9958, FUNC(v9958_device::read), FUNC(v9958_device::write)).umask16(0x00ff); @@ -158,12 +158,12 @@ void csplayh5_state::csplayh5_sub_map(address_map &map) { map(0x000000, 0x01ffff).rom(); - map(0x02000a, 0x02000b).r(this, FUNC(csplayh5_state::test_r)); -// map(0x020008, 0x02000f).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); + map(0x02000a, 0x02000b).r(FUNC(csplayh5_state::test_r)); +// map(0x020008, 0x02000f).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); - map(0x040018, 0x040019).r(this, FUNC(csplayh5_state::test_r)); - map(0x040028, 0x04002f).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); // correct? - map(0x040036, 0x040037).r(this, FUNC(csplayh5_state::test_r)); + map(0x040018, 0x040019).r(FUNC(csplayh5_state::test_r)); + map(0x040028, 0x04002f).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); // correct? + map(0x040036, 0x040037).r(FUNC(csplayh5_state::test_r)); map(0x078000, 0x07ffff).mirror(0xf80000).ram(); //.share("nvram"); } @@ -171,7 +171,7 @@ void csplayh5_state::csplayh5_sub_map(address_map &map) void csplayh5_state::csplayh5_sub_io_map(address_map &map) { - map(0x0a, 0x0b).r(this, FUNC(csplayh5_state::test_r)); + map(0x0a, 0x0b).r(FUNC(csplayh5_state::test_r)); } #endif diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp index dfe60925d24..797c67186b2 100644 --- a/src/mame/drivers/cswat.cpp +++ b/src/mame/drivers/cswat.cpp @@ -139,13 +139,13 @@ READ8_MEMBER(cswat_state::sensors_r) void cswat_state::cswat_map(address_map &map) { - map(0x0000, 0x0bff).ram().w(this, FUNC(cswat_state::videoram_w)).share("videoram"); + map(0x0000, 0x0bff).ram().w(FUNC(cswat_state::videoram_w)).share("videoram"); map(0x0c00, 0x0fff).ram(); // AM_RANGE(0x1800, 0x1800) AM_READNOP // ? reads here after writing to $4000 - map(0x2000, 0x2000).w(this, FUNC(cswat_state::irq_ack_w)); // writes 1 at end of vblank irq, 0 at gamestart - map(0x2000, 0x2001).r(this, FUNC(cswat_state::dipswitch_r)); - map(0x2002, 0x2002).w(this, FUNC(cswat_state::irq_ack_w)); // writes 0 at start of vblank irq - map(0x2002, 0x2002).r(this, FUNC(cswat_state::sensors_r)); + map(0x2000, 0x2000).w(FUNC(cswat_state::irq_ack_w)); // writes 1 at end of vblank irq, 0 at gamestart + map(0x2000, 0x2001).r(FUNC(cswat_state::dipswitch_r)); + map(0x2002, 0x2002).w(FUNC(cswat_state::irq_ack_w)); // writes 0 at start of vblank irq + map(0x2002, 0x2002).r(FUNC(cswat_state::sensors_r)); map(0x2003, 0x2003).portr("IN0"); // AM_RANGE(0x4000, 0x4009) AM_NOP // ? map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp index 07e1cef589c..cfa8bfef50f 100644 --- a/src/mame/drivers/cubeqst.cpp +++ b/src/mame/drivers/cubeqst.cpp @@ -434,14 +434,14 @@ void cubeqst_state::m68k_program_map(address_map &map) { map.global_mask(0x03ffff); map(0x000000, 0x01ffff).rom(); - map(0x020000, 0x027fff).rw(this, FUNC(cubeqst_state::read_rotram), FUNC(cubeqst_state::write_rotram)); - map(0x028000, 0x028fff).rw(this, FUNC(cubeqst_state::read_sndram), FUNC(cubeqst_state::write_sndram)); - map(0x038000, 0x038001).rw(this, FUNC(cubeqst_state::io_r), FUNC(cubeqst_state::io_w)); - map(0x038002, 0x038003).rw(this, FUNC(cubeqst_state::chop_r), FUNC(cubeqst_state::ldaud_w)); - map(0x038008, 0x038009).rw(this, FUNC(cubeqst_state::line_r), FUNC(cubeqst_state::reset_w)); - map(0x03800e, 0x03800f).rw(this, FUNC(cubeqst_state::laserdisc_r), FUNC(cubeqst_state::laserdisc_w)); - map(0x03c800, 0x03c9ff).ram().w(this, FUNC(cubeqst_state::palette_w)).share("paletteram"); - map(0x03cc00, 0x03cc01).w(this, FUNC(cubeqst_state::control_w)); + map(0x020000, 0x027fff).rw(FUNC(cubeqst_state::read_rotram), FUNC(cubeqst_state::write_rotram)); + map(0x028000, 0x028fff).rw(FUNC(cubeqst_state::read_sndram), FUNC(cubeqst_state::write_sndram)); + map(0x038000, 0x038001).rw(FUNC(cubeqst_state::io_r), FUNC(cubeqst_state::io_w)); + map(0x038002, 0x038003).rw(FUNC(cubeqst_state::chop_r), FUNC(cubeqst_state::ldaud_w)); + map(0x038008, 0x038009).rw(FUNC(cubeqst_state::line_r), FUNC(cubeqst_state::reset_w)); + map(0x03800e, 0x03800f).rw(FUNC(cubeqst_state::laserdisc_r), FUNC(cubeqst_state::laserdisc_w)); + map(0x03c800, 0x03c9ff).ram().w(FUNC(cubeqst_state::palette_w)).share("paletteram"); + map(0x03cc00, 0x03cc01).w(FUNC(cubeqst_state::control_w)); map(0x03e000, 0x03efff).ram().share("nvram"); map(0x03f000, 0x03ffff).ram(); } diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp index eb8bd112520..7b1310572c1 100644 --- a/src/mame/drivers/cubo.cpp +++ b/src/mame/drivers/cubo.cpp @@ -431,8 +431,8 @@ void cubo_state::cubo_mem(address_map &map) map(0x800010, 0x800013).portr("DIPSW2"); map(0xa80000, 0xb7ffff).noprw(); map(0xb80000, 0xb8003f).rw("akiko", FUNC(akiko_device::read), FUNC(akiko_device::write)); - map(0xbf0000, 0xbfffff).rw(this, FUNC(cubo_state::cia_r), FUNC(cubo_state::gayle_cia_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(cubo_state::custom_chip_r), FUNC(cubo_state::custom_chip_w)); + map(0xbf0000, 0xbfffff).rw(FUNC(cubo_state::cia_r), FUNC(cubo_state::gayle_cia_w)); + map(0xc00000, 0xdfffff).rw(FUNC(cubo_state::custom_chip_r), FUNC(cubo_state::custom_chip_w)); map(0xe00000, 0xe7ffff).rom().region("kickstart", 0x80000); map(0xe80000, 0xf7ffff).noprw(); map(0xf80000, 0xffffff).rom().region("kickstart", 0); diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp index a01da67d1a6..324dc08599c 100644 --- a/src/mame/drivers/cultures.cpp +++ b/src/mame/drivers/cultures.cpp @@ -196,7 +196,7 @@ void cultures_state::oki_map(address_map &map) void cultures_state::vrambank_map(address_map &map) { - map(0x0000, 0x3fff).ram().w(this, FUNC(cultures_state::bg0_videoram_w)).share("bg0_videoram"); + map(0x0000, 0x3fff).ram().w(FUNC(cultures_state::bg0_videoram_w)).share("bg0_videoram"); map(0x4000, 0x6fff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); } @@ -220,9 +220,9 @@ void cultures_state::cultures_io_map(address_map &map) map(0x50, 0x53).ram().share("bg1_regs_y"); map(0x60, 0x63).ram().share("bg2_regs_x"); map(0x70, 0x73).ram().share("bg2_regs_y"); - map(0x80, 0x80).w(this, FUNC(cultures_state::cpu_bankswitch_w)); - map(0x90, 0x90).w(this, FUNC(cultures_state::misc_w)); - map(0xa0, 0xa0).w(this, FUNC(cultures_state::bg_bank_w)); + map(0x80, 0x80).w(FUNC(cultures_state::cpu_bankswitch_w)); + map(0x90, 0x90).w(FUNC(cultures_state::misc_w)); + map(0xa0, 0xa0).w(FUNC(cultures_state::bg_bank_w)); map(0xc0, 0xc0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xd0, 0xd0).portr("SW1_A"); map(0xd1, 0xd1).portr("SW1_B"); diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp index a8d95701fad..85ea4ef11ff 100644 --- a/src/mame/drivers/cupidon.cpp +++ b/src/mame/drivers/cupidon.cpp @@ -84,7 +84,7 @@ void cupidon_state::cupidon_map(address_map &map) map(0x0000000, 0x07fffff).rom().mirror(0x1000000); map(0x1000000, 0x100ffff).ram(); - map(0x1800000, 0x1800003).r(this, FUNC(cupidon_state::cupidon_return_ffffffff)); + map(0x1800000, 0x1800003).r(FUNC(cupidon_state::cupidon_return_ffffffff)); map(0x2000074, 0x2000077).ram(); // port // AM_RANGE(0x2000040, 0x200004f) AM_RAM diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index b668a9090cb..c823b9784cf 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -345,9 +345,9 @@ void cv1k_state::cv1k_map(address_map &map) { map(0x00000000, 0x003fffff).rom().region("maincpu", 0).nopw().share("rombase"); // mmmbanc writes here on startup for some reason.. map(0x0c000000, 0x0c7fffff).ram().share("mainram");// work RAM - map(0x10000000, 0x10000007).rw(this, FUNC(cv1k_state::flash_io_r), FUNC(cv1k_state::flash_io_w)); + map(0x10000000, 0x10000007).rw(FUNC(cv1k_state::flash_io_r), FUNC(cv1k_state::flash_io_w)); map(0x10400000, 0x10400007).w("ymz770", FUNC(ymz770_device::write)); - map(0x10C00000, 0x10C00007).rw(this, FUNC(cv1k_state::serial_rtc_eeprom_r), FUNC(cv1k_state::serial_rtc_eeprom_w)); + map(0x10C00000, 0x10C00007).rw(FUNC(cv1k_state::serial_rtc_eeprom_r), FUNC(cv1k_state::serial_rtc_eeprom_w)); // AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset map(0xf0000000, 0xf0ffffff).ram(); // mem mapped cache (sh3 internal?) } @@ -356,9 +356,9 @@ void cv1k_state::cv1k_d_map(address_map &map) { map(0x00000000, 0x003fffff).rom().region("maincpu", 0).nopw().share("rombase"); // mmmbanc writes here on startup for some reason.. map(0x0c000000, 0x0cffffff).ram().share("mainram"); // work RAM - map(0x10000000, 0x10000007).rw(this, FUNC(cv1k_state::flash_io_r), FUNC(cv1k_state::flash_io_w)); + map(0x10000000, 0x10000007).rw(FUNC(cv1k_state::flash_io_r), FUNC(cv1k_state::flash_io_w)); map(0x10400000, 0x10400007).w("ymz770", FUNC(ymz770_device::write)); - map(0x10C00000, 0x10C00007).rw(this, FUNC(cv1k_state::serial_rtc_eeprom_r), FUNC(cv1k_state::serial_rtc_eeprom_w)); + map(0x10C00000, 0x10C00007).rw(FUNC(cv1k_state::serial_rtc_eeprom_r), FUNC(cv1k_state::serial_rtc_eeprom_w)); // AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset map(0xf0000000, 0xf0ffffff).ram(); // mem mapped cache (sh3 internal?) } @@ -367,7 +367,7 @@ void cv1k_state::cv1k_port(address_map &map) { map(SH3_PORT_C, SH3_PORT_C+7).portr("PORT_C"); map(SH3_PORT_D, SH3_PORT_D+7).portr("PORT_D"); - map(SH3_PORT_E, SH3_PORT_E+7).r(this, FUNC(cv1k_state::flash_port_e_r)); + map(SH3_PORT_E, SH3_PORT_E+7).r(FUNC(cv1k_state::flash_port_e_r)); map(SH3_PORT_F, SH3_PORT_F+7).portr("PORT_F"); map(SH3_PORT_L, SH3_PORT_L+7).portr("PORT_L"); map(SH3_PORT_J, SH3_PORT_J+7).rw(m_blitter, FUNC(epic12_device::fpga_r), FUNC(epic12_device::fpga_w)); diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp index 82c6a8a8548..d73da9d7db2 100644 --- a/src/mame/drivers/cvicny.cpp +++ b/src/mame/drivers/cvicny.cpp @@ -86,9 +86,9 @@ void cvicny_state::cvicny_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x07ff).rom(); // 1 x 2716 map(0x0800, 0x0bff).ram().mirror(0x400); // 2x 2114 static ram - map(0x1000, 0x17ff).r(this, FUNC(cvicny_state::key_r)); - map(0x1800, 0x1fff).w(this, FUNC(cvicny_state::digit_w)); - map(0x2000, 0x27ff).w(this, FUNC(cvicny_state::segment_w)); + map(0x1000, 0x17ff).r(FUNC(cvicny_state::key_r)); + map(0x1800, 0x1fff).w(FUNC(cvicny_state::digit_w)); + map(0x2000, 0x27ff).w(FUNC(cvicny_state::segment_w)); } diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp index 4c855821e19..8c376d0ffaf 100644 --- a/src/mame/drivers/cvs.cpp +++ b/src/mame/drivers/cvs.cpp @@ -449,11 +449,11 @@ void cvs_state::cvs_main_cpu_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x13ff).rom(); - map(0x1400, 0x14ff).mirror(0x6000).rw(this, FUNC(cvs_state::cvs_bullet_ram_or_palette_r), FUNC(cvs_state::cvs_bullet_ram_or_palette_w)).share("bullet_ram"); - map(0x1500, 0x15ff).mirror(0x6000).rw(this, FUNC(cvs_state::cvs_s2636_2_or_character_ram_r), FUNC(cvs_state::cvs_s2636_2_or_character_ram_w)); - map(0x1600, 0x16ff).mirror(0x6000).rw(this, FUNC(cvs_state::cvs_s2636_1_or_character_ram_r), FUNC(cvs_state::cvs_s2636_1_or_character_ram_w)); - map(0x1700, 0x17ff).mirror(0x6000).rw(this, FUNC(cvs_state::cvs_s2636_0_or_character_ram_r), FUNC(cvs_state::cvs_s2636_0_or_character_ram_w)); - map(0x1800, 0x1bff).mirror(0x6000).rw(this, FUNC(cvs_state::cvs_video_or_color_ram_r), FUNC(cvs_state::cvs_video_or_color_ram_w)).share("video_ram"); + map(0x1400, 0x14ff).mirror(0x6000).rw(FUNC(cvs_state::cvs_bullet_ram_or_palette_r), FUNC(cvs_state::cvs_bullet_ram_or_palette_w)).share("bullet_ram"); + map(0x1500, 0x15ff).mirror(0x6000).rw(FUNC(cvs_state::cvs_s2636_2_or_character_ram_r), FUNC(cvs_state::cvs_s2636_2_or_character_ram_w)); + map(0x1600, 0x16ff).mirror(0x6000).rw(FUNC(cvs_state::cvs_s2636_1_or_character_ram_r), FUNC(cvs_state::cvs_s2636_1_or_character_ram_w)); + map(0x1700, 0x17ff).mirror(0x6000).rw(FUNC(cvs_state::cvs_s2636_0_or_character_ram_r), FUNC(cvs_state::cvs_s2636_0_or_character_ram_w)); + map(0x1800, 0x1bff).mirror(0x6000).rw(FUNC(cvs_state::cvs_video_or_color_ram_r), FUNC(cvs_state::cvs_video_or_color_ram_w)).share("video_ram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x33ff).rom(); map(0x4000, 0x53ff).rom(); @@ -462,13 +462,13 @@ void cvs_state::cvs_main_cpu_map(address_map &map) void cvs_state::cvs_main_cpu_io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(cvs_state::cvs_input_r), FUNC(cvs_state::cvs_scroll_w)); + map(0x00, 0xff).rw(FUNC(cvs_state::cvs_input_r), FUNC(cvs_state::cvs_scroll_w)); } void cvs_state::cvs_main_cpu_data_map(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(cvs_state::cvs_collision_r), FUNC(cvs_state::audio_command_w)); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(cvs_state::cvs_collision_clear), FUNC(cvs_state::cvs_video_fx_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(cvs_state::cvs_collision_r), FUNC(cvs_state::audio_command_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(cvs_state::cvs_collision_clear), FUNC(cvs_state::cvs_video_fx_w)); } /************************************* @@ -483,9 +483,9 @@ void cvs_state::cvs_dac_cpu_map(address_map &map) map(0x0000, 0x0fff).rom(); map(0x1000, 0x107f).ram(); map(0x1800, 0x1800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x1840, 0x1840).w("dac1", FUNC(dac_byte_interface::write)); - map(0x1880, 0x1883).w(this, FUNC(cvs_state::cvs_4_bit_dac_data_w)).share("4bit_dac"); - map(0x1884, 0x1887).w(this, FUNC(cvs_state::cvs_unknown_w)).share("dac3_state"); /* ???? not connected to anything */ + map(0x1840, 0x1840).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x1880, 0x1883).w(FUNC(cvs_state::cvs_4_bit_dac_data_w)).share("4bit_dac"); + map(0x1884, 0x1887).w(FUNC(cvs_state::cvs_unknown_w)).share("dac3_state"); /* ???? not connected to anything */ } @@ -500,11 +500,11 @@ void cvs_state::cvs_speech_cpu_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x07ff).rom(); - map(0x1d00, 0x1d00).w(this, FUNC(cvs_state::cvs_speech_rom_address_lo_w)); - map(0x1d40, 0x1d40).w(this, FUNC(cvs_state::cvs_speech_rom_address_hi_w)); - map(0x1d80, 0x1d80).r(this, FUNC(cvs_state::cvs_speech_command_r)); - map(0x1ddc, 0x1dde).w(this, FUNC(cvs_state::cvs_tms5110_ctl_w)).share("tms5110_ctl"); - map(0x1ddf, 0x1ddf).w(this, FUNC(cvs_state::cvs_tms5110_pdc_w)); + map(0x1d00, 0x1d00).w(FUNC(cvs_state::cvs_speech_rom_address_lo_w)); + map(0x1d40, 0x1d40).w(FUNC(cvs_state::cvs_speech_rom_address_hi_w)); + map(0x1d80, 0x1d80).r(FUNC(cvs_state::cvs_speech_command_r)); + map(0x1ddc, 0x1dde).w(FUNC(cvs_state::cvs_tms5110_ctl_w)).share("tms5110_ctl"); + map(0x1ddf, 0x1ddf).w(FUNC(cvs_state::cvs_tms5110_pdc_w)); } diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp index 9c05383c880..2c28dae3463 100644 --- a/src/mame/drivers/cxgz80.cpp +++ b/src/mame/drivers/cxgz80.cpp @@ -272,8 +272,8 @@ void cxgz80_state::ch2001_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).mirror(0x3800).ram(); - map(0x8000, 0x8000).mirror(0x3fff).rw(this, FUNC(cxgz80_state::ch2001_input_r), FUNC(cxgz80_state::ch2001_leds_w)); - map(0xc000, 0xc000).mirror(0x3fff).w(this, FUNC(cxgz80_state::ch2001_speaker_on_w)); + map(0x8000, 0x8000).mirror(0x3fff).rw(FUNC(cxgz80_state::ch2001_input_r), FUNC(cxgz80_state::ch2001_leds_w)); + map(0xc000, 0xc000).mirror(0x3fff).w(FUNC(cxgz80_state::ch2001_speaker_on_w)); } diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp index 9f78660c72c..50badb8eaca 100644 --- a/src/mame/drivers/cxhumax.cpp +++ b/src/mame/drivers/cxhumax.cpp @@ -119,9 +119,9 @@ WRITE32_MEMBER ( cxhumax_state::flash_w ) { offset *= 2; if(ACCESSING_BITS_0_15) - m_flash->write(offset, data); + m_flash->write(space, offset, data); if(ACCESSING_BITS_16_31) - m_flash->write(offset+1, data >> 16); + m_flash->write(space, offset+1, data >> 16); verboselog(*this, 9, "(FLASH) %08X <- %08X\n", 0xF0000000 + (offset << 2), data); } @@ -130,9 +130,9 @@ READ32_MEMBER ( cxhumax_state::flash_r ) uint32_t res = 0; offset *= 2; if(ACCESSING_BITS_0_15) - res |= m_flash->read(offset); + res |= m_flash->read(space, offset); if(ACCESSING_BITS_16_31) - res |= m_flash->read(offset+1) << 16; + res |= m_flash->read(space, offset+1) << 16; //if(m_flash->m_flash_mode!=FM_NORMAL) verboselog(*this, 9, "(FLASH) %08X -> %08X\n", 0xF0000000 + (offset << 2), res); return res; } @@ -946,37 +946,37 @@ uint32_t cxhumax_state::screen_update_cxhumax(screen_device &screen, bitmap_rgb3 void cxhumax_state::cxhumax_map(address_map &map) { map(0x00000000, 0x03ffffff).ram().share("ram").mirror(0x40000000); // 64?MB RAM - map(0xe0000000, 0xe000ffff).rw(this, FUNC(cxhumax_state::cx_hsx_r), FUNC(cxhumax_state::cx_hsx_w)); // HSX - map(0xe0010000, 0xe0010003).rw(this, FUNC(cxhumax_state::cx_romdescr_r), FUNC(cxhumax_state::cx_romdescr_w)); // ROM Descriptor - map(0xe0010004, 0xe001000f).rw(this, FUNC(cxhumax_state::cx_isaromdescr_r), FUNC(cxhumax_state::cx_isaromdescr_w)); // ISA/ROM Descriptors - map(0xe0010010, 0xe001001f).rw(this, FUNC(cxhumax_state::cx_isadescr_r), FUNC(cxhumax_state::cx_isadescr_w)); // ISA Descriptors - map(0xe0010020, 0xe001002f).rw(this, FUNC(cxhumax_state::cx_rommap_r), FUNC(cxhumax_state::cx_rommap_w)); // ROM Mapping - map(0xe0010030, 0xe0010033).rw(this, FUNC(cxhumax_state::cx_rommode_r), FUNC(cxhumax_state::cx_rommode_w)); // ISA Mode - map(0xe0010034, 0xe0010037).rw(this, FUNC(cxhumax_state::cx_xoemask_r), FUNC(cxhumax_state::cx_xoemask_w)); // XOE Mask - map(0xe0010040, 0xe0010047).rw(this, FUNC(cxhumax_state::cx_pci_r), FUNC(cxhumax_state::cx_pci_w)); // PCI - map(0xe0010080, 0xe00100ff).rw(this, FUNC(cxhumax_state::cx_extdesc_r), FUNC(cxhumax_state::cx_extdesc_w)); // Extended Control - map(0xe0400014, 0xe0400017).w(this, FUNC(cxhumax_state::cx_remap_w)); // RST_REMAP_REG - map(0xe0400024, 0xe0400027).rw(this, FUNC(cxhumax_state::cx_scratch_r), FUNC(cxhumax_state::cx_scratch_w)); // RST_SCRATCH_REG - System Scratch Register - map(0xe0430000, 0xe0430103).rw(this, FUNC(cxhumax_state::cx_timers_r), FUNC(cxhumax_state::cx_timers_w)); // Timers - map(0xe0411000, 0xe0411033).rw(this, FUNC(cxhumax_state::cx_uart2_r), FUNC(cxhumax_state::cx_uart2_w)); // UART2 - map(0xe0440000, 0xe0440013).rw(this, FUNC(cxhumax_state::cx_pll_r), FUNC(cxhumax_state::cx_pll_w)); // PLL Registers - map(0xe0440020, 0xe0440037).rw(this, FUNC(cxhumax_state::cx_clkdiv_r), FUNC(cxhumax_state::cx_clkdiv_w)); // Clock Divider Registers - map(0xe0440094, 0xe0440097).rw(this, FUNC(cxhumax_state::cx_pllprescale_r), FUNC(cxhumax_state::cx_pllprescale_w)); // PLL Prescale - map(0xe0440100, 0xe0440173).rw(this, FUNC(cxhumax_state::cx_chipcontrol_r), FUNC(cxhumax_state::cx_chipcontrol_w)); // Chip Control Registers - map(0xe0450000, 0xe0450037).rw(this, FUNC(cxhumax_state::cx_intctrl_r), FUNC(cxhumax_state::cx_intctrl_w)); // Interrupt Controller Registers - map(0xe0490000, 0xe0490017).rw(this, FUNC(cxhumax_state::cx_ss_r), FUNC(cxhumax_state::cx_ss_w)); // Synchronous Serial Port - map(0xe04e0000, 0xe04e001f).rw(this, FUNC(cxhumax_state::cx_i2c0_r), FUNC(cxhumax_state::cx_i2c0_w)); // I2C0 - map(0xe04e1000, 0xe04e101f).rw(this, FUNC(cxhumax_state::cx_i2c1_r), FUNC(cxhumax_state::cx_i2c1_w)); // I2C1 - map(0xe04e2000, 0xe04e201f).rw(this, FUNC(cxhumax_state::cx_i2c2_r), FUNC(cxhumax_state::cx_i2c2_w)); // I2C2 - map(0xe0500300, 0xe050030b).rw(this, FUNC(cxhumax_state::cx_mc_cfg_r), FUNC(cxhumax_state::cx_mc_cfg_w)); // Memory Controller configuration - map(0xe0560000, 0xe05600fb).rw(this, FUNC(cxhumax_state::cx_drm0_r), FUNC(cxhumax_state::cx_drm0_w)); // DRM0 - map(0xe0570000, 0xe05700fb).rw(this, FUNC(cxhumax_state::cx_drm1_r), FUNC(cxhumax_state::cx_drm1_w)); // DRM1 - map(0xe05d0800, 0xe05d0bff).rw(this, FUNC(cxhumax_state::cx_hdmi_r), FUNC(cxhumax_state::cx_hdmi_w)); // HDMI - map(0xe0600000, 0xe063ffff).rw(this, FUNC(cxhumax_state::cx_gxa_r), FUNC(cxhumax_state::cx_gxa_w)); // GXA + map(0xe0000000, 0xe000ffff).rw(FUNC(cxhumax_state::cx_hsx_r), FUNC(cxhumax_state::cx_hsx_w)); // HSX + map(0xe0010000, 0xe0010003).rw(FUNC(cxhumax_state::cx_romdescr_r), FUNC(cxhumax_state::cx_romdescr_w)); // ROM Descriptor + map(0xe0010004, 0xe001000f).rw(FUNC(cxhumax_state::cx_isaromdescr_r), FUNC(cxhumax_state::cx_isaromdescr_w)); // ISA/ROM Descriptors + map(0xe0010010, 0xe001001f).rw(FUNC(cxhumax_state::cx_isadescr_r), FUNC(cxhumax_state::cx_isadescr_w)); // ISA Descriptors + map(0xe0010020, 0xe001002f).rw(FUNC(cxhumax_state::cx_rommap_r), FUNC(cxhumax_state::cx_rommap_w)); // ROM Mapping + map(0xe0010030, 0xe0010033).rw(FUNC(cxhumax_state::cx_rommode_r), FUNC(cxhumax_state::cx_rommode_w)); // ISA Mode + map(0xe0010034, 0xe0010037).rw(FUNC(cxhumax_state::cx_xoemask_r), FUNC(cxhumax_state::cx_xoemask_w)); // XOE Mask + map(0xe0010040, 0xe0010047).rw(FUNC(cxhumax_state::cx_pci_r), FUNC(cxhumax_state::cx_pci_w)); // PCI + map(0xe0010080, 0xe00100ff).rw(FUNC(cxhumax_state::cx_extdesc_r), FUNC(cxhumax_state::cx_extdesc_w)); // Extended Control + map(0xe0400014, 0xe0400017).w(FUNC(cxhumax_state::cx_remap_w)); // RST_REMAP_REG + map(0xe0400024, 0xe0400027).rw(FUNC(cxhumax_state::cx_scratch_r), FUNC(cxhumax_state::cx_scratch_w)); // RST_SCRATCH_REG - System Scratch Register + map(0xe0430000, 0xe0430103).rw(FUNC(cxhumax_state::cx_timers_r), FUNC(cxhumax_state::cx_timers_w)); // Timers + map(0xe0411000, 0xe0411033).rw(FUNC(cxhumax_state::cx_uart2_r), FUNC(cxhumax_state::cx_uart2_w)); // UART2 + map(0xe0440000, 0xe0440013).rw(FUNC(cxhumax_state::cx_pll_r), FUNC(cxhumax_state::cx_pll_w)); // PLL Registers + map(0xe0440020, 0xe0440037).rw(FUNC(cxhumax_state::cx_clkdiv_r), FUNC(cxhumax_state::cx_clkdiv_w)); // Clock Divider Registers + map(0xe0440094, 0xe0440097).rw(FUNC(cxhumax_state::cx_pllprescale_r), FUNC(cxhumax_state::cx_pllprescale_w)); // PLL Prescale + map(0xe0440100, 0xe0440173).rw(FUNC(cxhumax_state::cx_chipcontrol_r), FUNC(cxhumax_state::cx_chipcontrol_w)); // Chip Control Registers + map(0xe0450000, 0xe0450037).rw(FUNC(cxhumax_state::cx_intctrl_r), FUNC(cxhumax_state::cx_intctrl_w)); // Interrupt Controller Registers + map(0xe0490000, 0xe0490017).rw(FUNC(cxhumax_state::cx_ss_r), FUNC(cxhumax_state::cx_ss_w)); // Synchronous Serial Port + map(0xe04e0000, 0xe04e001f).rw(FUNC(cxhumax_state::cx_i2c0_r), FUNC(cxhumax_state::cx_i2c0_w)); // I2C0 + map(0xe04e1000, 0xe04e101f).rw(FUNC(cxhumax_state::cx_i2c1_r), FUNC(cxhumax_state::cx_i2c1_w)); // I2C1 + map(0xe04e2000, 0xe04e201f).rw(FUNC(cxhumax_state::cx_i2c2_r), FUNC(cxhumax_state::cx_i2c2_w)); // I2C2 + map(0xe0500300, 0xe050030b).rw(FUNC(cxhumax_state::cx_mc_cfg_r), FUNC(cxhumax_state::cx_mc_cfg_w)); // Memory Controller configuration + map(0xe0560000, 0xe05600fb).rw(FUNC(cxhumax_state::cx_drm0_r), FUNC(cxhumax_state::cx_drm0_w)); // DRM0 + map(0xe0570000, 0xe05700fb).rw(FUNC(cxhumax_state::cx_drm1_r), FUNC(cxhumax_state::cx_drm1_w)); // DRM1 + map(0xe05d0800, 0xe05d0bff).rw(FUNC(cxhumax_state::cx_hdmi_r), FUNC(cxhumax_state::cx_hdmi_w)); // HDMI + map(0xe0600000, 0xe063ffff).rw(FUNC(cxhumax_state::cx_gxa_r), FUNC(cxhumax_state::cx_gxa_w)); // GXA map(0xe4017000, 0xe40173ff).ram(); // HSX - BSP - 1K Video Shared Dual Port RAM (shared with MVP) map(0xe4080000, 0xe4083fff).ram(); // HSX - TSP 0 - 16K Private Instructions/Data and Host-Shared Data - map(0xf0000000, 0xf03fffff).rw(this, FUNC(cxhumax_state::flash_r), FUNC(cxhumax_state::flash_w)).mirror(0x08000000); // 4MB FLASH (INTEL 28F320J3D) - map(0xf4000000, 0xf43fffff).r(this, FUNC(cxhumax_state::dummy_flash_r)); // do we need it? + map(0xf0000000, 0xf03fffff).rw(FUNC(cxhumax_state::flash_r), FUNC(cxhumax_state::flash_w)).mirror(0x08000000); // 4MB FLASH (INTEL 28F320J3D) + map(0xf4000000, 0xf43fffff).r(FUNC(cxhumax_state::dummy_flash_r)); // do we need it? } static INPUT_PORTS_START( cxhumax ) diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp index b69fe1a0579..597ba2999f3 100644 --- a/src/mame/drivers/cyberbal.cpp +++ b/src/mame/drivers/cyberbal.cpp @@ -127,7 +127,7 @@ void cyberbal_state::main_map(address_map &map) map(0xfd0000, 0xfd1fff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0xfd2000, 0xfd3fff).w(m_soundcomm, FUNC(atari_sound_comm_device::sound_reset_w)); map(0xfd4000, 0xfd5fff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0xfd6000, 0xfd7fff).w(this, FUNC(cyberbal_state::p2_reset_w)); + map(0xfd6000, 0xfd7fff).w(FUNC(cyberbal_state::p2_reset_w)); map(0xfd8000, 0xfd9fff).w(m_soundcomm, FUNC(atari_sound_comm_device::main_command_w)).umask16(0xff00); map(0xfe0000, 0xfe0fff).portr("IN0"); map(0xfe1000, 0xfe1fff).portr("IN1"); @@ -156,7 +156,7 @@ void cyberbal_state::main_map(address_map &map) void cyberbal_state::extra_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0xfc0000, 0xfdffff).w(this, FUNC(cyberbal_state::video_int_ack_w)); + map(0xfc0000, 0xfdffff).w(FUNC(cyberbal_state::video_int_ack_w)); map(0xfe0000, 0xfe0fff).portr("IN0"); map(0xfe1000, 0xfe1fff).portr("IN1"); map(0xfe8000, 0xfe8fff).ram().w("rpalette", FUNC(palette_device::write16)).share("rpalette"); @@ -185,14 +185,14 @@ void cyberbal_state::sound_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x2001).rw(m_ymsnd, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x2800, 0x2801).w(this, FUNC(cyberbal_state::sound_68k_6502_w)); + map(0x2800, 0x2801).w(FUNC(cyberbal_state::sound_68k_6502_w)); map(0x2802, 0x2803).rw(m_soundcomm, FUNC(atari_sound_comm_device::sound_irq_ack_r), FUNC(atari_sound_comm_device::sound_irq_ack_w)); map(0x2804, 0x2805).w(m_soundcomm, FUNC(atari_sound_comm_device::sound_response_w)); - map(0x2806, 0x2807).w(this, FUNC(cyberbal_state::sound_bank_select_w)); + map(0x2806, 0x2807).w(FUNC(cyberbal_state::sound_bank_select_w)); map(0x2c00, 0x2c01).r(m_soundcomm, FUNC(atari_sound_comm_device::sound_command_r)); - map(0x2c02, 0x2c03).r(this, FUNC(cyberbal_state::special_port3_r)); - map(0x2c04, 0x2c05).r(this, FUNC(cyberbal_state::sound_68k_6502_r)); - map(0x2c06, 0x2c07).r(this, FUNC(cyberbal_state::sound_6502_stat_r)); + map(0x2c02, 0x2c03).r(FUNC(cyberbal_state::special_port3_r)); + map(0x2c04, 0x2c05).r(FUNC(cyberbal_state::sound_68k_6502_r)); + map(0x2c06, 0x2c07).r(FUNC(cyberbal_state::sound_6502_stat_r)); map(0x3000, 0x3fff).bankr("soundbank"); map(0x4000, 0xffff).rom(); } @@ -208,10 +208,10 @@ void cyberbal_state::sound_map(address_map &map) void cyberbal_state::sound_68k_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0xff8000, 0xff87ff).r(this, FUNC(cyberbal_state::sound_68k_r)); - map(0xff8800, 0xff8fff).w(this, FUNC(cyberbal_state::sound_68k_w)); - map(0xff9000, 0xff97ff).w(this, FUNC(cyberbal_state::io_68k_irq_ack_w)); - map(0xff9800, 0xff9fff).w(this, FUNC(cyberbal_state::sound_68k_dac_w)); + map(0xff8000, 0xff87ff).r(FUNC(cyberbal_state::sound_68k_r)); + map(0xff8800, 0xff8fff).w(FUNC(cyberbal_state::sound_68k_w)); + map(0xff9000, 0xff97ff).w(FUNC(cyberbal_state::io_68k_irq_ack_w)); + map(0xff9800, 0xff9fff).w(FUNC(cyberbal_state::sound_68k_dac_w)); map(0xfff000, 0xffffff).ram(); } @@ -235,9 +235,9 @@ void cyberbal2p_state::cyberbal2p_map(address_map &map) map(0xfd0000, 0xfd0003).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0xfd2000, 0xfd2003).w("jsa", FUNC(atari_jsa_ii_device::sound_reset_w)); map(0xfd4000, 0xfd4003).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0xfd6000, 0xfd6003).w(this, FUNC(cyberbal2p_state::video_int_ack_w)); + map(0xfd6000, 0xfd6003).w(FUNC(cyberbal2p_state::video_int_ack_w)); map(0xfd8000, 0xfd8003).w("jsa", FUNC(atari_jsa_ii_device::main_command_w)).umask16(0xff00); - map(0xfe0000, 0xfe0003).r(this, FUNC(cyberbal2p_state::sound_state_r)); + map(0xfe0000, 0xfe0003).r(FUNC(cyberbal2p_state::sound_state_r)); map(0xff0000, 0xff1fff).ram().w("playfield", FUNC(tilemap_device::write16)).share("playfield"); map(0xff2000, 0xff2fff).ram().w("alpha", FUNC(tilemap_device::write16)).share("alpha"); map(0xff3000, 0xff37ff).ram().share("mob"); diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp index 31a54caa26a..abeb93dc0c9 100644 --- a/src/mame/drivers/cybertnk.cpp +++ b/src/mame/drivers/cybertnk.cpp @@ -586,26 +586,26 @@ void cybertnk_state::master_mem(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x080000, 0x087fff).ram(); /*Work RAM*/ map(0x0a0000, 0x0a0fff).ram().share("spr_ram"); // non-tile based sprite ram - map(0x0c0000, 0x0c1fff).ram().w(this, FUNC(cybertnk_state::vram_w<0>)).share("tilemap0_vram"); - map(0x0c4000, 0x0c5fff).ram().w(this, FUNC(cybertnk_state::vram_w<1>)).share("tilemap1_vram"); - map(0x0c8000, 0x0c9fff).ram().w(this, FUNC(cybertnk_state::vram_w<2>)).share("tilemap2_vram"); + map(0x0c0000, 0x0c1fff).ram().w(FUNC(cybertnk_state::vram_w<0>)).share("tilemap0_vram"); + map(0x0c4000, 0x0c5fff).ram().w(FUNC(cybertnk_state::vram_w<1>)).share("tilemap1_vram"); + map(0x0c8000, 0x0c9fff).ram().w(FUNC(cybertnk_state::vram_w<2>)).share("tilemap2_vram"); map(0x0e0000, 0x0e0fff).ram().share("sharedram"); map(0x100000, 0x107fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* 2x palettes, one for each screen */ - map(0x110000, 0x110001).w(this, FUNC(cybertnk_state::sound_cmd_w)); + map(0x110000, 0x110001).w(FUNC(cybertnk_state::sound_cmd_w)); map(0x110002, 0x110003).portr("DSW1").nopw();// watchdog? - map(0x110004, 0x110004).r(this, FUNC(cybertnk_state::io_rdy_r)); + map(0x110004, 0x110004).r(FUNC(cybertnk_state::io_rdy_r)); map(0x110006, 0x110007).portr("IN0"); - map(0x110006, 0x110007).w(this, FUNC(cybertnk_state::mux_w)); - map(0x110008, 0x110009).portr("IN1").w(this, FUNC(cybertnk_state::cnt_w)); + map(0x110006, 0x110007).w(FUNC(cybertnk_state::mux_w)); + map(0x110008, 0x110009).portr("IN1").w(FUNC(cybertnk_state::cnt_w)); map(0x11000a, 0x11000b).portr("DSW2"); - map(0x11000c, 0x11000d).w(this, FUNC(cybertnk_state::irq_ack_w)); + map(0x11000c, 0x11000d).w(FUNC(cybertnk_state::irq_ack_w)); map(0x110040, 0x110045).ram().share("tilemap0_scroll"); map(0x110048, 0x11004d).ram().share("tilemap1_scroll"); map(0x110080, 0x110085).ram().share("tilemap2_scroll"); - map(0x1100d5, 0x1100d5).r(this, FUNC(cybertnk_state::mux_r)); + map(0x1100d5, 0x1100d5).r(FUNC(cybertnk_state::mux_r)); } void cybertnk_state::slave_mem(address_map &map) diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index cec1030e999..0259c65c7cc 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -64,7 +64,7 @@ ToDo: void cybiko_state::cybikov1_mem(address_map &map) { map(0x000000, 0x007fff).rom(); - map(0x600000, 0x600001).rw(this, FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); + map(0x600000, 0x600001).rw(FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); // AM_RANGE( 0xe00000, 0xe07fff ) AM_READ( cybikov1_key_r ) } @@ -106,18 +106,18 @@ void cybiko_state::cybikov2_mem(address_map &map) { map(0x000000, 0x007fff).rom(); map(0x100000, 0x13ffff).r("flash2", FUNC(sst_39vf020_device::read)).mirror(0x0c0000); - map(0x600000, 0x600001).rw(this, FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)).mirror(0x1ffffe); - map(0xe00000, 0xffdbff).r(this, FUNC(cybiko_state::cybikov2_key_r)); + map(0x600000, 0x600001).rw(FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)).mirror(0x1ffffe); + map(0xe00000, 0xffdbff).r(FUNC(cybiko_state::cybikov2_key_r)); } // 2048 kbyte ram + 512 kbyte memory mapped flash void cybiko_state::cybikoxt_mem(address_map &map) { map(0x000000, 0x007fff).rom().mirror(0x038000); - map(0x100000, 0x100001).rw(this, FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); - map(0x200000, 0x200003).w(this, FUNC(cybiko_state::cybiko_usb_w)); + map(0x100000, 0x100001).rw(FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); + map(0x200000, 0x200003).w(FUNC(cybiko_state::cybiko_usb_w)); map(0x600000, 0x67ffff).r("flashxt", FUNC(sst_39vf400a_device::read)).mirror(0x180000); - map(0xe00000, 0xefffff).r(this, FUNC(cybiko_state::cybikoxt_key_r)); + map(0xe00000, 0xefffff).r(FUNC(cybiko_state::cybikoxt_key_r)); } WRITE16_MEMBER(cybiko_state::serflash_w) @@ -187,25 +187,25 @@ READ16_MEMBER(cybiko_state::port0_r) void cybiko_state::cybikov1_io(address_map &map) { - map(h8_device::PORT_3, h8_device::PORT_3).w(this, FUNC(cybiko_state::serflash_w)); - map(h8_device::PORT_F, h8_device::PORT_F).rw(this, FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); - map(h8_device::ADC_1, h8_device::ADC_1).r(this, FUNC(cybiko_state::adc1_r)); - map(h8_device::ADC_2, h8_device::ADC_2).r(this, FUNC(cybiko_state::adc2_r)); + map(h8_device::PORT_3, h8_device::PORT_3).w(FUNC(cybiko_state::serflash_w)); + map(h8_device::PORT_F, h8_device::PORT_F).rw(FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); + map(h8_device::ADC_1, h8_device::ADC_1).r(FUNC(cybiko_state::adc1_r)); + map(h8_device::ADC_2, h8_device::ADC_2).r(FUNC(cybiko_state::adc2_r)); } void cybiko_state::cybikov2_io(address_map &map) { - map(h8_device::PORT_1, h8_device::PORT_1).r(this, FUNC(cybiko_state::port0_r)); - map(h8_device::PORT_3, h8_device::PORT_3).w(this, FUNC(cybiko_state::serflash_w)); - map(h8_device::PORT_F, h8_device::PORT_F).rw(this, FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); - map(h8_device::ADC_1, h8_device::ADC_1).r(this, FUNC(cybiko_state::adc1_r)); - map(h8_device::ADC_2, h8_device::ADC_2).r(this, FUNC(cybiko_state::adc2_r)); + map(h8_device::PORT_1, h8_device::PORT_1).r(FUNC(cybiko_state::port0_r)); + map(h8_device::PORT_3, h8_device::PORT_3).w(FUNC(cybiko_state::serflash_w)); + map(h8_device::PORT_F, h8_device::PORT_F).rw(FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); + map(h8_device::ADC_1, h8_device::ADC_1).r(FUNC(cybiko_state::adc1_r)); + map(h8_device::ADC_2, h8_device::ADC_2).r(FUNC(cybiko_state::adc2_r)); } void cybiko_state::cybikoxt_io(address_map &map) { - map(h8_device::PORT_A, h8_device::PORT_A).r(this, FUNC(cybiko_state::xtpower_r)); - map(h8_device::PORT_F, h8_device::PORT_F).rw(this, FUNC(cybiko_state::xtclock_r), FUNC(cybiko_state::xtclock_w)); + map(h8_device::PORT_A, h8_device::PORT_A).r(FUNC(cybiko_state::xtpower_r)); + map(h8_device::PORT_F, h8_device::PORT_F).rw(FUNC(cybiko_state::xtclock_r), FUNC(cybiko_state::xtclock_w)); } ///////////////// diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp index 3eea0a05b29..a3a2c28832b 100644 --- a/src/mame/drivers/cybstorm.cpp +++ b/src/mame/drivers/cybstorm.cpp @@ -87,10 +87,10 @@ void cybstorm_state::main_map(address_map &map) map(0x3effc0, 0x3effff).rw(m_vad, FUNC(atari_vad_device::control_read), FUNC(atari_vad_device::control_write)); map(0x3f0000, 0x3fffff).m(m_vadbank, FUNC(address_map_bank_device::amap16)); map(0x9f0000, 0x9f0003).portr("9F0000"); - map(0x9f0010, 0x9f0013).r(this, FUNC(cybstorm_state::special_port1_r)); + map(0x9f0010, 0x9f0013).r(FUNC(cybstorm_state::special_port1_r)); map(0x9f0031, 0x9f0031).r(m_jsa, FUNC(atari_jsa_iii_device::main_response_r)); map(0x9f0041, 0x9f0041).w(m_jsa, FUNC(atari_jsa_iii_device::main_command_w)); - map(0x9f0050, 0x9f0053).w(this, FUNC(cybstorm_state::latch_w)); + map(0x9f0050, 0x9f0053).w(FUNC(cybstorm_state::latch_w)); map(0xfb0000, 0xfb0003).w("watchdog", FUNC(watchdog_timer_device::reset32_w)); map(0xfc0000, 0xfc0003).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write32)); map(0xfd0000, 0xfd0fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask32(0xff00ff00); diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp index 6e7274f201c..07c0f605dff 100644 --- a/src/mame/drivers/cyclemb.cpp +++ b/src/mame/drivers/cyclemb.cpp @@ -587,21 +587,21 @@ void cyclemb_state::cyclemb_map(address_map &map) void cyclemb_state::cyclemb_io(address_map &map) { // ADDRESS_MAP_GLOBAL_MASK(0xff) - map(0xc000, 0xc000).w(this, FUNC(cyclemb_state::cyclemb_bankswitch_w)); + map(0xc000, 0xc000).w(FUNC(cyclemb_state::cyclemb_bankswitch_w)); //AM_RANGE(0xc020, 0xc020) AM_WRITENOP // ? - map(0xc09e, 0xc09f).rw(this, FUNC(cyclemb_state::skydest_i8741_0_r), FUNC(cyclemb_state::skydest_i8741_0_w)); - map(0xc0bf, 0xc0bf).w(this, FUNC(cyclemb_state::cyclemb_flip_w)); //flip screen + map(0xc09e, 0xc09f).rw(FUNC(cyclemb_state::skydest_i8741_0_r), FUNC(cyclemb_state::skydest_i8741_0_w)); + map(0xc0bf, 0xc0bf).w(FUNC(cyclemb_state::cyclemb_flip_w)); //flip screen } void cyclemb_state::skydest_io(address_map &map) { // ADDRESS_MAP_GLOBAL_MASK(0xff) - map(0xc000, 0xc000).w(this, FUNC(cyclemb_state::cyclemb_bankswitch_w)); + map(0xc000, 0xc000).w(FUNC(cyclemb_state::cyclemb_bankswitch_w)); //AM_RANGE(0xc020, 0xc020) AM_WRITENOP // ? - map(0xc080, 0xc081).rw(this, FUNC(cyclemb_state::skydest_i8741_0_r), FUNC(cyclemb_state::skydest_i8741_0_w)); + map(0xc080, 0xc081).rw(FUNC(cyclemb_state::skydest_i8741_0_r), FUNC(cyclemb_state::skydest_i8741_0_w)); //AM_RANGE(0xc0a0, 0xc0a0) AM_WRITENOP // ? - map(0xc0bf, 0xc0bf).w(this, FUNC(cyclemb_state::cyclemb_flip_w)); //flip screen + map(0xc0bf, 0xc0bf).w(FUNC(cyclemb_state::cyclemb_flip_w)); //flip screen } @@ -641,7 +641,7 @@ void cyclemb_state::cyclemb_sound_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x40, 0x41).rw(this, FUNC(cyclemb_state::skydest_i8741_1_r), FUNC(cyclemb_state::skydest_i8741_1_w)); + map(0x40, 0x41).rw(FUNC(cyclemb_state::skydest_i8741_1_r), FUNC(cyclemb_state::skydest_i8741_1_w)); } diff --git a/src/mame/drivers/cz101.cpp b/src/mame/drivers/cz101.cpp index 3c0374d23ac..7a067fb4659 100644 --- a/src/mame/drivers/cz101.cpp +++ b/src/mame/drivers/cz101.cpp @@ -80,11 +80,11 @@ void cz101_state::maincpu_map(address_map &map) map(0x0000, 0x7fff).rom().region("program", 0); map(0x8000, 0x8fff).ram(); map(0x9000, 0x97ff).noprw(); // rampack - map(0x9800, 0x9fff).w(this, FUNC(cz101_state::led_4_w)); - map(0xa000, 0xa7ff).w(this, FUNC(cz101_state::led_3_w)); - map(0xa800, 0xafff).w(this, FUNC(cz101_state::led_2_w)); - map(0xb000, 0xb7ff).w(this, FUNC(cz101_state::led_1_w)); - map(0xb800, 0xbfff).r(this, FUNC(cz101_state::keys_r)); + map(0x9800, 0x9fff).w(FUNC(cz101_state::led_4_w)); + map(0xa000, 0xa7ff).w(FUNC(cz101_state::led_3_w)); + map(0xa800, 0xafff).w(FUNC(cz101_state::led_2_w)); + map(0xb000, 0xb7ff).w(FUNC(cz101_state::led_1_w)); + map(0xb800, 0xbfff).r(FUNC(cz101_state::keys_r)); } diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp index 0227b4aa6a7..f884ea71b8e 100644 --- a/src/mame/drivers/czk80.cpp +++ b/src/mame/drivers/czk80.cpp @@ -115,12 +115,12 @@ void czk80_state::czk80_mem(address_map &map) void czk80_state::czk80_io(address_map &map) { map.global_mask(0xff); - map(0x40, 0x40).w(this, FUNC(czk80_state::port40_w)); + map(0x40, 0x40).w(FUNC(czk80_state::port40_w)); map(0x4c, 0x4f).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x50, 0x53).rw("dart", FUNC(z80dart_device::cd_ba_r), FUNC(z80dart_device::cd_ba_w)); map(0x54, 0x57).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x80, 0x80).r(this, FUNC(czk80_state::port80_r)).w(m_terminal, FUNC(generic_terminal_device::write)); - map(0x81, 0x81).r(this, FUNC(czk80_state::port81_r)); + map(0x80, 0x80).r(FUNC(czk80_state::port80_r)).w(m_terminal, FUNC(generic_terminal_device::write)); + map(0x81, 0x81).r(FUNC(czk80_state::port81_r)); /* Select one of the below */ //AM_RANGE(0xc0, 0xc0) AM_READ(portc0_r) map(0xc0, 0xc1).m(m_fdc, FUNC(upd765a_device::map)); diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp index 48a9e6ff47e..fa7a84d6019 100644 --- a/src/mame/drivers/d6809.cpp +++ b/src/mame/drivers/d6809.cpp @@ -129,7 +129,7 @@ void d6809_state::mem_map(address_map &map) // 00-FF is for various devices. map(0x0000, 0x0003).rw("acia1", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x0004, 0x0007).rw("acia2", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); - map(0x00ff, 0x00ff).rw(this, FUNC(d6809_state::term_r), FUNC(d6809_state::term_w)); + map(0x00ff, 0x00ff).rw(FUNC(d6809_state::term_r), FUNC(d6809_state::term_w)); map(0x1000, 0xdfff).ram(); map(0xe000, 0xffff).rom().region("roms", 0); } diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp index d7fb98b9f37..3449d3cf6db 100644 --- a/src/mame/drivers/d9final.cpp +++ b/src/mame/drivers/d9final.cpp @@ -133,10 +133,10 @@ void d9final_state::d9final_map(address_map &map) map(0xc000, 0xc7ff).ram().share("nvram"); map(0xc800, 0xcbff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0xcc00, 0xcfff).ram().w("palette", FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(d9final_state::sc0_lovram)).share("lo_vram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(d9final_state::sc0_hivram)).share("hi_vram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(d9final_state::sc0_cram)).share("cram"); - map(0xf000, 0xf007).r(this, FUNC(d9final_state::prot_latch_r)); //AM_DEVREADWRITE("essnd", es8712_device, read, write) + map(0xd000, 0xd7ff).ram().w(FUNC(d9final_state::sc0_lovram)).share("lo_vram"); + map(0xd800, 0xdfff).ram().w(FUNC(d9final_state::sc0_hivram)).share("hi_vram"); + map(0xe000, 0xe7ff).ram().w(FUNC(d9final_state::sc0_cram)).share("cram"); + map(0xf000, 0xf007).r(FUNC(d9final_state::prot_latch_r)); //AM_DEVREADWRITE("essnd", es8712_device, read, write) map(0xf800, 0xf80f).rw("rtc", FUNC(rtc62421_device::read), FUNC(rtc62421_device::write)); } @@ -150,7 +150,7 @@ void d9final_state::d9final_io(address_map &map) map(0x40, 0x41).w("ymsnd", FUNC(ym2413_device::write)); map(0x60, 0x60).portr("DSWD"); map(0x80, 0x80).portr("IN0"); - map(0xa0, 0xa0).portr("IN1").w(this, FUNC(d9final_state::bank_w)); + map(0xa0, 0xa0).portr("IN1").w(FUNC(d9final_state::bank_w)); map(0xe0, 0xe0).portr("IN2"); } diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index 36d09ee8c68..8b81942cf4e 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -245,8 +245,8 @@ void dacholer_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8800, 0x97ff).ram(); - map(0xc000, 0xc3ff).mirror(0x400).ram().w(this, FUNC(dacholer_state::background_w)).share("bgvideoram"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(dacholer_state::foreground_w)).share("fgvideoram"); + map(0xc000, 0xc3ff).mirror(0x400).ram().w(FUNC(dacholer_state::background_w)).share("bgvideoram"); + map(0xd000, 0xd3ff).ram().w(FUNC(dacholer_state::foreground_w)).share("fgvideoram"); map(0xe000, 0xe0ff).ram().share("spriteram"); } @@ -266,11 +266,11 @@ void dacholer_state::main_io_map(address_map &map) map(0x03, 0x03).portr("DSWA"); map(0x04, 0x04).portr("DSWB"); map(0x05, 0x05).nopr(); // watchdog in itaten - map(0x20, 0x20).w(this, FUNC(dacholer_state::coins_w)); - map(0x21, 0x21).w(this, FUNC(dacholer_state::bg_bank_w)); - map(0x22, 0x22).w(this, FUNC(dacholer_state::bg_scroll_x_w)); - map(0x23, 0x23).w(this, FUNC(dacholer_state::bg_scroll_y_w)); - map(0x24, 0x24).w(this, FUNC(dacholer_state::main_irq_ack_w)); + map(0x20, 0x20).w(FUNC(dacholer_state::coins_w)); + map(0x21, 0x21).w(FUNC(dacholer_state::bg_bank_w)); + map(0x22, 0x22).w(FUNC(dacholer_state::bg_scroll_x_w)); + map(0x23, 0x23).w(FUNC(dacholer_state::bg_scroll_y_w)); + map(0x24, 0x24).w(FUNC(dacholer_state::main_irq_ack_w)); map(0x27, 0x27).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -319,10 +319,10 @@ void dacholer_state::snd_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); - map(0x04, 0x04).w(this, FUNC(dacholer_state::music_irq_w)); - map(0x08, 0x08).w(this, FUNC(dacholer_state::snd_irq_w)); - map(0x0c, 0x0c).w(this, FUNC(dacholer_state::snd_ack_w)); - map(0x80, 0x80).w(this, FUNC(dacholer_state::adpcm_w)); + map(0x04, 0x04).w(FUNC(dacholer_state::music_irq_w)); + map(0x08, 0x08).w(FUNC(dacholer_state::snd_irq_w)); + map(0x0c, 0x0c).w(FUNC(dacholer_state::snd_ack_w)); + map(0x80, 0x80).w(FUNC(dacholer_state::adpcm_w)); map(0x86, 0x87).w("ay1", FUNC(ay8910_device::data_address_w)); map(0x8a, 0x8b).w("ay2", FUNC(ay8910_device::data_address_w)); map(0x8e, 0x8f).w("ay3", FUNC(ay8910_device::data_address_w)); diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp index 0f1088a6b36..f46b2090c5b 100644 --- a/src/mame/drivers/dai.cpp +++ b/src/mame/drivers/dai.cpp @@ -77,11 +77,11 @@ void dai_state::dai_mem(address_map &map) map(0x0000, 0xbfff).bankrw("bank1"); map(0xc000, 0xdfff).rom(); map(0xe000, 0xefff).bankr("bank2"); - map(0xf000, 0xf7ff).w(this, FUNC(dai_state::dai_stack_interrupt_circuit_w)); + map(0xf000, 0xf7ff).w(FUNC(dai_state::dai_stack_interrupt_circuit_w)); map(0xf800, 0xf8ff).ram(); - map(0xfb00, 0xfbff).rw(this, FUNC(dai_state::dai_amd9511_r), FUNC(dai_state::dai_amd9511_w)); - map(0xfc00, 0xfcff).rw(this, FUNC(dai_state::dai_pit_r), FUNC(dai_state::dai_pit_w)); // AM_DEVREADWRITE("pit8253", pit8253_device, read, write) - map(0xfd00, 0xfdff).rw(this, FUNC(dai_state::dai_io_discrete_devices_r), FUNC(dai_state::dai_io_discrete_devices_w)); + map(0xfb00, 0xfbff).rw(FUNC(dai_state::dai_amd9511_r), FUNC(dai_state::dai_amd9511_w)); + map(0xfc00, 0xfcff).rw(FUNC(dai_state::dai_pit_r), FUNC(dai_state::dai_pit_w)); // AM_DEVREADWRITE("pit8253", pit8253_device, read, write) + map(0xfd00, 0xfdff).rw(FUNC(dai_state::dai_io_discrete_devices_r), FUNC(dai_state::dai_io_discrete_devices_w)); map(0xfe00, 0xfeff).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xff00, 0xff0f).mirror(0xf0).m(m_tms5501, FUNC(tms5501_device::io_map)); } diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp index e051971aedd..407159aa920 100644 --- a/src/mame/drivers/dai3wksi.cpp +++ b/src/mame/drivers/dai3wksi.cpp @@ -327,9 +327,9 @@ void dai3wksi_state::main_map(address_map &map) map(0x2000, 0x23ff).ram(); map(0x2400, 0x24ff).mirror(0x100).portr("IN0"); map(0x2800, 0x28ff).mirror(0x100).portr("IN1"); - map(0x3000, 0x3000).w(this, FUNC(dai3wksi_state::dai3wksi_audio_1_w)); - map(0x3400, 0x3400).w(this, FUNC(dai3wksi_state::dai3wksi_audio_2_w)); - map(0x3800, 0x3800).w(this, FUNC(dai3wksi_state::dai3wksi_audio_3_w)); + map(0x3000, 0x3000).w(FUNC(dai3wksi_state::dai3wksi_audio_1_w)); + map(0x3400, 0x3400).w(FUNC(dai3wksi_state::dai3wksi_audio_2_w)); + map(0x3800, 0x3800).w(FUNC(dai3wksi_state::dai3wksi_audio_3_w)); map(0x8000, 0xbfff).ram().share("videoram"); } diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp index e22f17b6d99..2b370a7abe9 100644 --- a/src/mame/drivers/dambustr.cpp +++ b/src/mame/drivers/dambustr.cpp @@ -91,35 +91,35 @@ void dambustr_state::dambustr_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8000).w(this, FUNC(dambustr_state::dambustr_bg_color_w)); - map(0x8001, 0x8001).w(this, FUNC(dambustr_state::dambustr_bg_split_line_w)); + map(0x8000, 0x8000).w(FUNC(dambustr_state::dambustr_bg_color_w)); + map(0x8001, 0x8001).w(FUNC(dambustr_state::dambustr_bg_split_line_w)); map(0xc000, 0xc7ff).ram(); - map(0xd000, 0xd3ff).ram().w(this, FUNC(dambustr_state::galaxold_videoram_w)).share("videoram"); - map(0xd400, 0xd7ff).r(this, FUNC(dambustr_state::galaxold_videoram_r)); - map(0xd800, 0xd83f).ram().w(this, FUNC(dambustr_state::galaxold_attributesram_w)).share("attributesram"); + map(0xd000, 0xd3ff).ram().w(FUNC(dambustr_state::galaxold_videoram_w)).share("videoram"); + map(0xd400, 0xd7ff).r(FUNC(dambustr_state::galaxold_videoram_r)); + map(0xd800, 0xd83f).ram().w(FUNC(dambustr_state::galaxold_attributesram_w)).share("attributesram"); map(0xd840, 0xd85f).ram().share("spriteram"); map(0xd860, 0xd87f).ram().share("bulletsram"); map(0xd880, 0xd8ff).ram(); map(0xe000, 0xe000).portr("IN0"); - map(0xe002, 0xe003).w(this, FUNC(dambustr_state::galaxold_coin_counter_w)); + map(0xe002, 0xe003).w(FUNC(dambustr_state::galaxold_coin_counter_w)); map(0xe004, 0xe007).w(m_custom, FUNC(galaxian_sound_device::lfo_freq_w)); map(0xe800, 0xefff).portr("IN1"); map(0xe800, 0xe802).w(m_custom, FUNC(galaxian_sound_device::background_enable_w)); - map(0xe803, 0xe803).w(this, FUNC(dambustr_state::dambustr_noise_enable_w)); + map(0xe803, 0xe803).w(FUNC(dambustr_state::dambustr_noise_enable_w)); map(0xe804, 0xe804).w(m_custom, FUNC(galaxian_sound_device::fire_enable_w)); // probably louder than normal shot map(0xe805, 0xe805).w(m_custom, FUNC(galaxian_sound_device::fire_enable_w)); // normal shot (like Galaxian) map(0xe806, 0xe807).w(m_custom, FUNC(galaxian_sound_device::vol_w)); map(0xf000, 0xf7ff).portr("DSW"); - map(0xf001, 0xf001).w(this, FUNC(dambustr_state::galaxold_nmi_enable_w)); - map(0xf004, 0xf004).w(this, FUNC(dambustr_state::galaxold_stars_enable_w)); - map(0xf006, 0xf006).w(this, FUNC(dambustr_state::galaxold_flip_screen_x_w)); - map(0xf007, 0xf007).w(this, FUNC(dambustr_state::galaxold_flip_screen_y_w)); + map(0xf001, 0xf001).w(FUNC(dambustr_state::galaxold_nmi_enable_w)); + map(0xf004, 0xf004).w(FUNC(dambustr_state::galaxold_stars_enable_w)); + map(0xf006, 0xf006).w(FUNC(dambustr_state::galaxold_flip_screen_x_w)); + map(0xf007, 0xf007).w(FUNC(dambustr_state::galaxold_flip_screen_y_w)); map(0xf800, 0xf800).w(m_custom, FUNC(galaxian_sound_device::pitch_w)); map(0xf800, 0xffff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 59c22b8b937..0d2107bab8e 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -196,7 +196,7 @@ void darius_state::darius_map(address_map &map) { map(0x000000, 0x05ffff).rom(); map(0x080000, 0x08ffff).ram(); /* main RAM */ - map(0x0a0000, 0x0a0001).w(this, FUNC(darius_state::cpua_ctrl_w)); + map(0x0a0000, 0x0a0001).w(FUNC(darius_state::cpua_ctrl_w)); map(0x0b0000, 0x0b0001).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); map(0xc00000, 0xc00001).nopr(); map(0xc00001, 0xc00001).w("ciu", FUNC(pc060ha_device::master_port_w)); @@ -204,10 +204,10 @@ void darius_state::darius_map(address_map &map) map(0xc00008, 0xc00009).portr("P1"); map(0xc0000a, 0xc0000b).portr("P2"); map(0xc0000c, 0xc0000d).portr("SYSTEM"); - map(0xc0000e, 0xc0000f).r(this, FUNC(darius_state::coin_r)); + map(0xc0000e, 0xc0000f).r(FUNC(darius_state::coin_r)); map(0xc00010, 0xc00011).portr("DSW"); map(0xc00050, 0xc00051).noprw(); // unknown, written by both cpus - always 0? - map(0xc00060, 0xc00061).w(this, FUNC(darius_state::coin_w)); + map(0xc00060, 0xc00061).w(FUNC(darius_state::coin_w)); map(0xd00000, 0xd0ffff).rw(m_pc080sn, FUNC(pc080sn_device::word_r), FUNC(pc080sn_device::word_w)); /* tilemaps */ map(0xd20000, 0xd20003).w(m_pc080sn, FUNC(pc080sn_device::yscroll_word_w)); map(0xd40000, 0xd40003).w(m_pc080sn, FUNC(pc080sn_device::xscroll_word_w)); @@ -215,7 +215,7 @@ void darius_state::darius_map(address_map &map) map(0xd80000, 0xd80fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");/* palette */ map(0xe00100, 0xe00fff).ram().share("spriteram"); map(0xe01000, 0xe02fff).ram().share("share2"); - map(0xe08000, 0xe0ffff).ram().w(this, FUNC(darius_state::darius_fg_layer_w)).share("fg_ram"); + map(0xe08000, 0xe0ffff).ram().w(FUNC(darius_state::darius_fg_layer_w)).share("fg_ram"); map(0xe10000, 0xe10fff).ram(); /* ??? */ } @@ -227,7 +227,7 @@ void darius_state::darius_cpub_map(address_map &map) map(0xd80000, 0xd80fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xe00100, 0xe00fff).ram().share("spriteram"); map(0xe01000, 0xe02fff).ram().share("share2"); - map(0xe08000, 0xe0ffff).ram().w(this, FUNC(darius_state::darius_fg_layer_w)).share("fg_ram"); + map(0xe08000, 0xe0ffff).ram().w(FUNC(darius_state::darius_fg_layer_w)).share("fg_ram"); } @@ -430,14 +430,14 @@ void darius_state::darius_sound_map(address_map &map) map(0xa000, 0xa001).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xb000, 0xb000).nopr().w("ciu", FUNC(pc060ha_device::slave_port_w)); map(0xb001, 0xb001).rw("ciu", FUNC(pc060ha_device::slave_comm_r), FUNC(pc060ha_device::slave_comm_w)); - map(0xc000, 0xc000).w(this, FUNC(darius_state::darius_fm0_pan)); - map(0xc400, 0xc400).w(this, FUNC(darius_state::darius_fm1_pan)); - map(0xc800, 0xc800).w(this, FUNC(darius_state::darius_psg0_pan)); - map(0xcc00, 0xcc00).w(this, FUNC(darius_state::darius_psg1_pan)); - map(0xd000, 0xd000).w(this, FUNC(darius_state::darius_da_pan)); - map(0xd400, 0xd400).w(this, FUNC(darius_state::adpcm_command_w)); /* ADPCM command for second Z80 to read from port 0x00 */ + map(0xc000, 0xc000).w(FUNC(darius_state::darius_fm0_pan)); + map(0xc400, 0xc400).w(FUNC(darius_state::darius_fm1_pan)); + map(0xc800, 0xc800).w(FUNC(darius_state::darius_psg0_pan)); + map(0xcc00, 0xcc00).w(FUNC(darius_state::darius_psg1_pan)); + map(0xd000, 0xd000).w(FUNC(darius_state::darius_da_pan)); + map(0xd400, 0xd400).w(FUNC(darius_state::adpcm_command_w)); /* ADPCM command for second Z80 to read from port 0x00 */ // AM_RANGE(0xd800, 0xd800) AM_WRITE(display_value) /* ??? */ - map(0xdc00, 0xdc00).w(this, FUNC(darius_state::sound_bankswitch_w)); + map(0xdc00, 0xdc00).w(FUNC(darius_state::sound_bankswitch_w)); } void darius_state::darius_sound2_map(address_map &map) @@ -490,10 +490,10 @@ WRITE8_MEMBER(darius_state::adpcm_data_w) void darius_state::darius_sound2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(darius_state::adpcm_command_read), FUNC(darius_state::adpcm_nmi_disable)); - map(0x01, 0x01).w(this, FUNC(darius_state::adpcm_nmi_enable)); - map(0x02, 0x02).r(this, FUNC(darius_state::readport2)).w(this, FUNC(darius_state::adpcm_data_w)); /* readport2 ??? */ - map(0x03, 0x03).r(this, FUNC(darius_state::readport3)); /* ??? */ + map(0x00, 0x00).rw(FUNC(darius_state::adpcm_command_read), FUNC(darius_state::adpcm_nmi_disable)); + map(0x01, 0x01).w(FUNC(darius_state::adpcm_nmi_enable)); + map(0x02, 0x02).r(FUNC(darius_state::readport2)).w(FUNC(darius_state::adpcm_data_w)); /* readport2 ??? */ + map(0x03, 0x03).r(FUNC(darius_state::readport3)); /* ??? */ } diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp index 7a6240a64aa..63c1dd2ea62 100644 --- a/src/mame/drivers/darkmist.cpp +++ b/src/mame/drivers/darkmist.cpp @@ -51,7 +51,7 @@ void darkmist_state::memmap(address_map &map) map(0xc801, 0xc801).portr("P1"); map(0xc802, 0xc802).portr("P2"); map(0xc803, 0xc803).portr("START"); - map(0xc804, 0xc804).w(this, FUNC(darkmist_state::hw_w)); + map(0xc804, 0xc804).w(FUNC(darkmist_state::hw_w)); map(0xc805, 0xc805).writeonly().share("spritebank"); map(0xc806, 0xc806).portr("DSW1"); map(0xc807, 0xc807).portr("DSW2"); @@ -64,7 +64,7 @@ void darkmist_state::memmap(address_map &map) map(0xd681, 0xd681).r(m_t5182, FUNC(t5182_device::sharedram_semaphore_snd_r)); map(0xd682, 0xd682).w(m_t5182, FUNC(t5182_device::sharedram_semaphore_main_acquire_w)); map(0xd683, 0xd683).w(m_t5182, FUNC(t5182_device::sharedram_semaphore_main_release_w)); - map(0xd800, 0xdfff).ram().w(this, FUNC(darkmist_state::tx_vram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(darkmist_state::tx_vram_w)).share("videoram"); map(0xe000, 0xefff).ram().share("workram"); map(0xf000, 0xffff).ram().share("spriteram"); } diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp index ac4245060f5..5a13e860963 100644 --- a/src/mame/drivers/darkseal.cpp +++ b/src/mame/drivers/darkseal.cpp @@ -43,14 +43,14 @@ void darkseal_state::darkseal_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); map(0x120000, 0x1207ff).ram().share("spriteram"); - map(0x140000, 0x140fff).ram().w(this, FUNC(darkseal_state::palette_w)).share("palette"); - map(0x141000, 0x141fff).ram().w(this, FUNC(darkseal_state::palette_ext_w)).share("palette_ext"); + map(0x140000, 0x140fff).ram().w(FUNC(darkseal_state::palette_w)).share("palette"); + map(0x141000, 0x141fff).ram().w(FUNC(darkseal_state::palette_ext_w)).share("palette_ext"); map(0x180000, 0x180001).portr("DSW"); map(0x180002, 0x180003).portr("P1_P2"); map(0x180004, 0x180005).portr("SYSTEM"); map(0x180006, 0x180007).nopr().w(m_spriteram, FUNC(buffered_spriteram16_device::write)); map(0x180008, 0x180009).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff).cswidth(16); - map(0x18000a, 0x18000b).nopr().w(this, FUNC(darkseal_state::irq_ack_w)); + map(0x18000a, 0x18000b).nopr().w(FUNC(darkseal_state::irq_ack_w)); map(0x200000, 0x201fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x202000, 0x203fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp index cb63e0712fe..68a7798770b 100644 --- a/src/mame/drivers/daruma.cpp +++ b/src/mame/drivers/daruma.cpp @@ -90,11 +90,11 @@ void daruma_state::mem_prg(address_map &map) void daruma_state::mem_io(address_map &map) { - map(0x0000, 0x0000).r(this, FUNC(daruma_state::dev0_r)); - map(0x1000, 0x1000).w(this, FUNC(daruma_state::dev1_w)); + map(0x0000, 0x0000).r(FUNC(daruma_state::dev0_r)); + map(0x1000, 0x1000).w(FUNC(daruma_state::dev1_w)); // AM_RANGE(0x2000, 0x2000) AM_WRITE(dev2_w) // AM_RANGE(0x3000, 0x3000) AM_WRITE(dev3_w) - map(0x4000, 0x4000).r(this, FUNC(daruma_state::dev4_r)); + map(0x4000, 0x4000).r(FUNC(daruma_state::dev4_r)); map(0x8000, 0xffff).ram(); /* 32K CMOS SRAM (HYUNDAY hy62256a) */ } diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp index 3d79d5285c0..9d4cbf112e2 100644 --- a/src/mame/drivers/dassault.cpp +++ b/src/mame/drivers/dassault.cpp @@ -280,15 +280,15 @@ void dassault_state::dassault_map(address_map &map) map(0x100000, 0x103fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x140004, 0x140005).w(this, FUNC(dassault_state::main_irq_ack_w)); + map(0x140004, 0x140005).w(FUNC(dassault_state::main_irq_ack_w)); map(0x140006, 0x140007).nopw(); /* ? */ map(0x180001, 0x180001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x1c0000, 0x1c000f).r(this, FUNC(dassault_state::dassault_control_r)); - map(0x1c000a, 0x1c000b).w(this, FUNC(dassault_state::priority_w)); + map(0x1c0000, 0x1c000f).r(FUNC(dassault_state::dassault_control_r)); + map(0x1c000a, 0x1c000b).w(FUNC(dassault_state::priority_w)); map(0x1c000c, 0x1c000d).w(m_spriteram[1], FUNC(buffered_spriteram16_device::write)); - map(0x1c000e, 0x1c000f).w(this, FUNC(dassault_state::dassault_control_w)); + map(0x1c000e, 0x1c000f).w(FUNC(dassault_state::dassault_control_w)); map(0x200000, 0x201fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x202000, 0x203fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); @@ -310,9 +310,9 @@ void dassault_state::dassault_sub_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x100001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); - map(0x100002, 0x100003).w(this, FUNC(dassault_state::sub_irq_ack_w)); + map(0x100002, 0x100003).w(FUNC(dassault_state::sub_irq_ack_w)); map(0x100004, 0x100007).nopw(); /* ? */ - map(0x100004, 0x100005).r(this, FUNC(dassault_state::dassault_sub_control_r)); + map(0x100004, 0x100005).r(FUNC(dassault_state::dassault_sub_control_r)); map(0x3f8000, 0x3fbfff).ram(); /* Sub cpu ram */ map(0x3fc000, 0x3fcfff).ram().share("spriteram1"); /* Sprite ram */ diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp index d14916d6099..a80e9244a72 100644 --- a/src/mame/drivers/dblcrown.cpp +++ b/src/mame/drivers/dblcrown.cpp @@ -346,12 +346,12 @@ void dblcrown_state::dblcrown_map(address_map &map) map(0x8000, 0x9fff).bankr("rom_bank"); map(0xa000, 0xb7ff).ram(); // work ram map(0xb800, 0xbfff).ram().share("nvram"); - map(0xc000, 0xdfff).rw(this, FUNC(dblcrown_state::vram_r), FUNC(dblcrown_state::vram_w)); - map(0xf000, 0xf1ff).rw(this, FUNC(dblcrown_state::palette_r), FUNC(dblcrown_state::palette_w)); + map(0xc000, 0xdfff).rw(FUNC(dblcrown_state::vram_r), FUNC(dblcrown_state::vram_w)); + map(0xf000, 0xf1ff).rw(FUNC(dblcrown_state::palette_r), FUNC(dblcrown_state::palette_w)); map(0xfe00, 0xfeff).ram(); // ??? map(0xff00, 0xffff).ram(); // ???, intentional fall-through - map(0xff00, 0xff01).rw(this, FUNC(dblcrown_state::vram_bank_r), FUNC(dblcrown_state::vram_bank_w)); - map(0xff04, 0xff04).rw(this, FUNC(dblcrown_state::irq_source_r), FUNC(dblcrown_state::irq_source_w)); + map(0xff00, 0xff01).rw(FUNC(dblcrown_state::vram_bank_r), FUNC(dblcrown_state::vram_bank_w)); + map(0xff04, 0xff04).rw(FUNC(dblcrown_state::irq_source_r), FUNC(dblcrown_state::irq_source_w)); } @@ -363,12 +363,12 @@ void dblcrown_state::dblcrown_io(address_map &map) map(0x01, 0x01).portr("DSWB"); map(0x02, 0x02).portr("DSWC"); map(0x03, 0x03).portr("DSWD"); - map(0x04, 0x04).r(this, FUNC(dblcrown_state::in_mux_r)); - map(0x05, 0x05).r(this, FUNC(dblcrown_state::in_mux_type_r)); + map(0x04, 0x04).r(FUNC(dblcrown_state::in_mux_r)); + map(0x05, 0x05).r(FUNC(dblcrown_state::in_mux_type_r)); map(0x10, 0x13).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x20, 0x21).w("ymz", FUNC(ymz284_device::address_data_w)); - map(0x30, 0x30).w(this, FUNC(dblcrown_state::watchdog_w)); - map(0x40, 0x40).w(this, FUNC(dblcrown_state::output_w)); + map(0x30, 0x30).w(FUNC(dblcrown_state::watchdog_w)); + map(0x40, 0x40).w(FUNC(dblcrown_state::output_w)); } static INPUT_PORTS_START( dblcrown ) diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp index 5c537f8d4aa..40583b4bb55 100644 --- a/src/mame/drivers/dblewing.cpp +++ b/src/mame/drivers/dblewing.cpp @@ -183,7 +183,7 @@ void dblewing_state::dblewing_map(address_map &map) map(0x106000, 0x106fff).ram().share("pf2_rowscroll"); // AM_RANGE(0x280000, 0x2807ff) AM_DEVREADWRITE("ioprot104", deco104_device, dblewing_prot_r, dblewing_prot_w) AM_SHARE("prot16ram") - map(0x280000, 0x283fff).rw(this, FUNC(dblewing_state::wf_protection_region_0_104_r), FUNC(dblewing_state::wf_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ + map(0x280000, 0x283fff).rw(FUNC(dblewing_state::wf_protection_region_0_104_r), FUNC(dblewing_state::wf_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ map(0x284000, 0x284001).ram(); @@ -212,7 +212,7 @@ void dblewing_state::sound_map(address_map &map) map(0xa000, 0xa001).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::write)); map(0xb000, 0xb000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xc000, 0xc000).r(m_deco104, FUNC(deco104_device::soundlatch_r)); - map(0xd000, 0xd000).r(this, FUNC(dblewing_state::irq_latch_r)); //timing? sound latch? + map(0xd000, 0xd000).r(FUNC(dblewing_state::irq_latch_r)); //timing? sound latch? map(0xf000, 0xf000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp index 4ea3360d228..07255123c96 100644 --- a/src/mame/drivers/dbox.cpp +++ b/src/mame/drivers/dbox.cpp @@ -574,8 +574,8 @@ void dbox_state::dbox_map(address_map &map) // 008004ee Address mask CS0 00000040, 003ffff5 (ffffffff) - Mask: 003fff00 FCM:0f DD:1 PS: 16-Bit // 008004f8 Base address CS0 00000044, 0000005b (ffffffff) - Base: 00000000 BFC:05 WP:1 FTE:0 NCS:1 Valid: Yes #if LOCALFLASH - map(0x000000, 0x3fffff).rom().r(this, FUNC(dbox_state::sysflash_r)).region("flash", 0); - map(0x000000, 0x3fffff).w(this, FUNC(dbox_state::sysflash_w)); + map(0x000000, 0x3fffff).rom().r(FUNC(dbox_state::sysflash_r)).region("flash", 0); + map(0x000000, 0x3fffff).w(FUNC(dbox_state::sysflash_w)); #else map(0x000000, 0x3fffff).rw("flash", FUNC(intelfsh16_device::read), FUNC(intelfsh16_device::write)); #endif @@ -587,8 +587,8 @@ void dbox_state::dbox_map(address_map &map) // 000000aa Address mask CS3 00000058, 000007f2 (ffffffff) - Mask: 00000700 FCM:0f DD:0 PS: 8-bit // 000000b2 Base address CS3 0000005c, 00780003 (ffffffff) - Base: 00780000 BFC:00 WP:0 FTE:0 NCS:1 Valid: Yes // AM_RANGE(0x780000, 0x7807ff) - map(0x780100, 0x7801ff).w(this, FUNC(dbox_state::sda5708_reset)); - map(0x780600, 0x7806ff).w(this, FUNC(dbox_state::sda5708_clk)); + map(0x780100, 0x7801ff).w(FUNC(dbox_state::sda5708_reset)); + map(0x780600, 0x7806ff).w(FUNC(dbox_state::sda5708_clk)); // CS1 - RAM area // 0000008a Address mask CS1 00000048, 003ffff5 (ffffffff) - Mask: 003fff00 FCM:0f DD:1 PS: 16-Bit // 00000092 Base address CS1 0000004c, 00800003 (ffffffff) - Base: 00800000 BFC:00 WP:0 FTE:0 NCS:1 Valid: Yes diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp index f39270004d9..c8508b62dcd 100644 --- a/src/mame/drivers/dbz.cpp +++ b/src/mame/drivers/dbz.cpp @@ -127,14 +127,14 @@ void dbz_state::dbz_map(address_map &map) map(0x4e0002, 0x4e0003).portr("SYSTEM_DSW1"); map(0x4e4000, 0x4e4001).portr("DSW2"); map(0x4e8000, 0x4e8001).nopw(); - map(0x4ec000, 0x4ec001).w(this, FUNC(dbz_state::dbzcontrol_w)); - map(0x4f0000, 0x4f0001).w(this, FUNC(dbz_state::dbz_sound_command_w)); - map(0x4f4000, 0x4f4001).w(this, FUNC(dbz_state::dbz_sound_cause_nmi)); + map(0x4ec000, 0x4ec001).w(FUNC(dbz_state::dbzcontrol_w)); + map(0x4f0000, 0x4f0001).w(FUNC(dbz_state::dbz_sound_command_w)); + map(0x4f4000, 0x4f4001).w(FUNC(dbz_state::dbz_sound_cause_nmi)); map(0x4f8000, 0x4f801f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0xff00); // 251 #1 map(0x4fc000, 0x4fc01f).w(m_k053251, FUNC(k053251_device::lsb_w)); // 251 #2 - map(0x500000, 0x501fff).ram().w(this, FUNC(dbz_state::dbz_bg2_videoram_w)).share("bg2_videoram"); - map(0x508000, 0x509fff).ram().w(this, FUNC(dbz_state::dbz_bg1_videoram_w)).share("bg1_videoram"); + map(0x500000, 0x501fff).ram().w(FUNC(dbz_state::dbz_bg2_videoram_w)).share("bg2_videoram"); + map(0x508000, 0x509fff).ram().w(FUNC(dbz_state::dbz_bg1_videoram_w)).share("bg1_videoram"); map(0x510000, 0x513fff).rw(m_k053936_1, FUNC(k053936_device::linectrl_r), FUNC(k053936_device::linectrl_w)); // ?? guess, it might not be map(0x518000, 0x51bfff).rw(m_k053936_2, FUNC(k053936_device::linectrl_r), FUNC(k053936_device::linectrl_w)); // ?? guess, it might not be map(0x600000, 0x6fffff).nopr(); // PSAC 1 ROM readback window diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index 180df870083..1ff2eca884c 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -368,18 +368,18 @@ void dc_cons_state::dc_map(address_map &map) { map(0x00000000, 0x001fffff).rom().nopw(); // BIOS map(0x00200000, 0x0021ffff).rom().region("dcflash", 0);//AM_READWRITE8(dc_flash_r,dc_flash_w, 0xffffffffffffffffU) - map(0x005f6800, 0x005f69ff).rw(this, FUNC(dc_cons_state::dc_sysctrl_r), FUNC(dc_cons_state::dc_sysctrl_w)); + map(0x005f6800, 0x005f69ff).rw(FUNC(dc_cons_state::dc_sysctrl_r), FUNC(dc_cons_state::dc_sysctrl_w)); map(0x005f6c00, 0x005f6cff).m(m_maple, FUNC(maple_dc_device::amap)); - map(0x005f7000, 0x005f701f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)).umask64(0x0000ffff0000ffff); - map(0x005f7080, 0x005f709f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)).umask64(0x0000ffff0000ffff); - map(0x005f7400, 0x005f74ff).rw(this, FUNC(dc_cons_state::dc_mess_g1_ctrl_r), FUNC(dc_cons_state::dc_mess_g1_ctrl_w)); - map(0x005f7800, 0x005f78ff).rw(this, FUNC(dc_cons_state::dc_g2_ctrl_r), FUNC(dc_cons_state::dc_g2_ctrl_w)); + map(0x005f7000, 0x005f701f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)).umask64(0x0000ffff0000ffff); + map(0x005f7080, 0x005f709f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)).umask64(0x0000ffff0000ffff); + map(0x005f7400, 0x005f74ff).rw(FUNC(dc_cons_state::dc_mess_g1_ctrl_r), FUNC(dc_cons_state::dc_mess_g1_ctrl_w)); + map(0x005f7800, 0x005f78ff).rw(FUNC(dc_cons_state::dc_g2_ctrl_r), FUNC(dc_cons_state::dc_g2_ctrl_w)); map(0x005f7c00, 0x005f7cff).m(m_powervr2, FUNC(powervr2_device::pd_dma_map)); map(0x005f8000, 0x005f9fff).m(m_powervr2, FUNC(powervr2_device::ta_map)); - map(0x00600000, 0x006007ff).rw(this, FUNC(dc_cons_state::dc_modem_r), FUNC(dc_cons_state::dc_modem_w)); - map(0x00700000, 0x00707fff).rw(this, FUNC(dc_cons_state::dc_aica_reg_r), FUNC(dc_cons_state::dc_aica_reg_w)); + map(0x00600000, 0x006007ff).rw(FUNC(dc_cons_state::dc_modem_r), FUNC(dc_cons_state::dc_modem_w)); + map(0x00700000, 0x00707fff).rw(FUNC(dc_cons_state::dc_aica_reg_r), FUNC(dc_cons_state::dc_aica_reg_w)); map(0x00710000, 0x0071000f).mirror(0x02000000).rw("aicartc", FUNC(aicartc_device::read), FUNC(aicartc_device::write)).umask64(0x0000ffff0000ffff); - map(0x00800000, 0x009fffff).rw(this, FUNC(dc_cons_state::sh4_soundram_r), FUNC(dc_cons_state::sh4_soundram_w)); + map(0x00800000, 0x009fffff).rw(FUNC(dc_cons_state::sh4_soundram_r), FUNC(dc_cons_state::sh4_soundram_w)); // AM_RANGE(0x01000000, 0x01ffffff) G2 Ext Device #1 // AM_RANGE(0x02700000, 0x02707fff) AICA reg mirror // AM_RANGE(0x02800000, 0x02ffffff) AICA wave mem mirror @@ -414,14 +414,14 @@ void dc_cons_state::dc_map(address_map &map) void dc_cons_state::dc_port(address_map &map) { - map(0x00000000, 0x00000007).rw(this, FUNC(dc_cons_state::dc_pdtra_r), FUNC(dc_cons_state::dc_pdtra_w)); + map(0x00000000, 0x00000007).rw(FUNC(dc_cons_state::dc_pdtra_r), FUNC(dc_cons_state::dc_pdtra_w)); } void dc_cons_state::dc_audio_map(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x001fffff).ram().share("dc_sound_ram"); /* shared with SH-4 */ - map(0x00800000, 0x00807fff).rw(this, FUNC(dc_cons_state::dc_arm_aica_r), FUNC(dc_cons_state::dc_arm_aica_w)); + map(0x00800000, 0x00807fff).rw(FUNC(dc_cons_state::dc_arm_aica_r), FUNC(dc_cons_state::dc_arm_aica_w)); } static INPUT_PORTS_START( dc ) diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp index 1cd67793c88..73563eef05a 100644 --- a/src/mame/drivers/dcheese.cpp +++ b/src/mame/drivers/dcheese.cpp @@ -177,13 +177,13 @@ void dcheese_state::main_cpu_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).ram(); map(0x200000, 0x200001).portr("200000").w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x220000, 0x220001).portr("220000").w(this, FUNC(dcheese_state::madmax_blitter_color_w)); - map(0x240000, 0x240001).portr("240000").w(this, FUNC(dcheese_state::eeprom_control_w)); - map(0x260000, 0x26001f).w(this, FUNC(dcheese_state::madmax_blitter_xparam_w)); - map(0x280000, 0x28001f).w(this, FUNC(dcheese_state::madmax_blitter_yparam_w)); - map(0x2a0000, 0x2a003f).rw(this, FUNC(dcheese_state::madmax_blitter_vidparam_r), FUNC(dcheese_state::madmax_blitter_vidparam_w)); + map(0x220000, 0x220001).portr("220000").w(FUNC(dcheese_state::madmax_blitter_color_w)); + map(0x240000, 0x240001).portr("240000").w(FUNC(dcheese_state::eeprom_control_w)); + map(0x260000, 0x26001f).w(FUNC(dcheese_state::madmax_blitter_xparam_w)); + map(0x280000, 0x28001f).w(FUNC(dcheese_state::madmax_blitter_yparam_w)); + map(0x2a0000, 0x2a003f).rw(FUNC(dcheese_state::madmax_blitter_vidparam_r), FUNC(dcheese_state::madmax_blitter_vidparam_w)); map(0x2e0001, 0x2e0001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x300000, 0x300001).w(this, FUNC(dcheese_state::madmax_blitter_unknown_w)); + map(0x300000, 0x300001).w(FUNC(dcheese_state::madmax_blitter_unknown_w)); } @@ -197,9 +197,9 @@ void dcheese_state::main_cpu_map(address_map &map) void dcheese_state::sound_cpu_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x07ff).rw(this, FUNC(dcheese_state::sound_status_r), FUNC(dcheese_state::sound_control_w)); + map(0x0000, 0x07ff).rw(FUNC(dcheese_state::sound_status_r), FUNC(dcheese_state::sound_control_w)); map(0x0800, 0x0fff).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x1000, 0x10ff).mirror(0x0700).w(this, FUNC(dcheese_state::bsmt_data_w)); + map(0x1000, 0x10ff).mirror(0x0700).w(FUNC(dcheese_state::bsmt_data_w)); map(0x1800, 0x1fff).ram(); map(0x2000, 0xffff).rom(); } diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp index 39745954c8b..a86b3cccf3f 100644 --- a/src/mame/drivers/dcon.cpp +++ b/src/mame/drivers/dcon.cpp @@ -43,13 +43,13 @@ void dcon_state::dcon_map(address_map &map) map(0x00000, 0x7ffff).rom(); map(0x80000, 0x8bfff).ram(); - map(0x8c000, 0x8c7ff).ram().w(this, FUNC(dcon_state::background_w)).share("back_data"); - map(0x8c800, 0x8cfff).ram().w(this, FUNC(dcon_state::foreground_w)).share("fore_data"); - map(0x8d000, 0x8d7ff).ram().w(this, FUNC(dcon_state::midground_w)).share("mid_data"); - map(0x8d800, 0x8e7ff).ram().w(this, FUNC(dcon_state::text_w)).share("textram"); + map(0x8c000, 0x8c7ff).ram().w(FUNC(dcon_state::background_w)).share("back_data"); + map(0x8c800, 0x8cfff).ram().w(FUNC(dcon_state::foreground_w)).share("fore_data"); + map(0x8d000, 0x8d7ff).ram().w(FUNC(dcon_state::midground_w)).share("mid_data"); + map(0x8d800, 0x8e7ff).ram().w(FUNC(dcon_state::text_w)).share("textram"); map(0x8e800, 0x8f7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x8f800, 0x8ffff).ram().share("spriteram"); - map(0x9d000, 0x9d7ff).w(this, FUNC(dcon_state::gfxbank_w)); + map(0x9d000, 0x9d7ff).w(FUNC(dcon_state::gfxbank_w)); map(0xa0000, 0xa000d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); map(0xc0000, 0xc004f).rw("crtc", FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); @@ -63,7 +63,7 @@ void dcon_state::dcon_map(address_map &map) void dcon_state::sdgndmps_map(address_map &map) { dcon_map(map); - map(0xa0000, 0xa000d).r(this, FUNC(dcon_state::sdgndmps_sound_comms_r)).umask16(0x00ff); + map(0xa0000, 0xa000d).r(FUNC(dcon_state::sdgndmps_sound_comms_r)).umask16(0x00ff); } /******************************************************************************/ diff --git a/src/mame/drivers/dday.cpp b/src/mame/drivers/dday.cpp index 2fd83e41126..1385c36f450 100644 --- a/src/mame/drivers/dday.cpp +++ b/src/mame/drivers/dday.cpp @@ -61,18 +61,18 @@ write: void dday_state::dday_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x4000).w(this, FUNC(dday_state::dday_sl_control_w)); - map(0x5000, 0x53ff).ram().w(this, FUNC(dday_state::dday_textvideoram_w)).share("textvideoram"); - map(0x5400, 0x57ff).ram().w(this, FUNC(dday_state::dday_fgvideoram_w)).share("fgvideoram"); - map(0x5800, 0x5bff).ram().w(this, FUNC(dday_state::dday_bgvideoram_w)).share("bgvideoram"); - map(0x5c00, 0x5fff).rw(this, FUNC(dday_state::dday_colorram_r), FUNC(dday_state::dday_colorram_w)).share("colorram"); + map(0x4000, 0x4000).w(FUNC(dday_state::dday_sl_control_w)); + map(0x5000, 0x53ff).ram().w(FUNC(dday_state::dday_textvideoram_w)).share("textvideoram"); + map(0x5400, 0x57ff).ram().w(FUNC(dday_state::dday_fgvideoram_w)).share("fgvideoram"); + map(0x5800, 0x5bff).ram().w(FUNC(dday_state::dday_bgvideoram_w)).share("bgvideoram"); + map(0x5c00, 0x5fff).rw(FUNC(dday_state::dday_colorram_r), FUNC(dday_state::dday_colorram_w)).share("colorram"); map(0x6000, 0x63ff).ram(); map(0x6400, 0x6401).mirror(0x000e).w(m_ay1, FUNC(ay8910_device::address_data_w)); map(0x6800, 0x6801).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x6c00, 0x6c00).portr("BUTTONS"); map(0x7000, 0x7000).portr("DSW0"); map(0x7400, 0x7400).portr("DSW1"); - map(0x7800, 0x7800).rw(this, FUNC(dday_state::dday_countdown_timer_r), FUNC(dday_state::dday_control_w)); + map(0x7800, 0x7800).rw(FUNC(dday_state::dday_countdown_timer_r), FUNC(dday_state::dday_control_w)); map(0x7c00, 0x7c00).portr("PADDLE"); } diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp index 6ffa3e15921..0b2a55409cc 100644 --- a/src/mame/drivers/ddayjlc.cpp +++ b/src/mame/drivers/ddayjlc.cpp @@ -388,21 +388,21 @@ void ddayjlc_state::main_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram().share("mainram"); map(0x9000, 0x93ff).ram().share("spriteram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(ddayjlc_state::vram_w)).share("videoram"); - map(0x9800, 0x9fff).ram().w(this, FUNC(ddayjlc_state::bgvram_w)).share("bgram"); /* 9800-981f - videoregs */ + map(0x9400, 0x97ff).ram().w(FUNC(ddayjlc_state::vram_w)).share("videoram"); + map(0x9800, 0x9fff).ram().w(FUNC(ddayjlc_state::bgvram_w)).share("bgram"); /* 9800-981f - videoregs */ map(0xa000, 0xdfff).bankr("bank1").nopw(); - map(0xe000, 0xe003).w(this, FUNC(ddayjlc_state::i8257_CH0_w)); + map(0xe000, 0xe003).w(FUNC(ddayjlc_state::i8257_CH0_w)); map(0xe008, 0xe008).nopw(); // i8257 control byte - map(0xf000, 0xf000).w(this, FUNC(ddayjlc_state::sound_w)); + map(0xf000, 0xf000).w(FUNC(ddayjlc_state::sound_w)); map(0xf100, 0xf100).nopw(); // sound related (f/f irq trigger?) - map(0xf080, 0xf080).portr("P2").w(this, FUNC(ddayjlc_state::char_bank_w)); - map(0xf081, 0xf081).w(this, FUNC(ddayjlc_state::flip_screen_w)); - map(0xf083, 0xf083).w(this, FUNC(ddayjlc_state::i8257_LMSR_w)); - map(0xf084, 0xf084).w(this, FUNC(ddayjlc_state::bg0_w)); - map(0xf085, 0xf085).w(this, FUNC(ddayjlc_state::bg1_w)); - map(0xf086, 0xf086).w(this, FUNC(ddayjlc_state::bg2_w)); - map(0xf101, 0xf101).w(this, FUNC(ddayjlc_state::main_nmi_w)); - map(0xf102, 0xf105).w(this, FUNC(ddayjlc_state::prot_w)); + map(0xf080, 0xf080).portr("P2").w(FUNC(ddayjlc_state::char_bank_w)); + map(0xf081, 0xf081).w(FUNC(ddayjlc_state::flip_screen_w)); + map(0xf083, 0xf083).w(FUNC(ddayjlc_state::i8257_LMSR_w)); + map(0xf084, 0xf084).w(FUNC(ddayjlc_state::bg0_w)); + map(0xf085, 0xf085).w(FUNC(ddayjlc_state::bg1_w)); + map(0xf086, 0xf086).w(FUNC(ddayjlc_state::bg2_w)); + map(0xf101, 0xf101).w(FUNC(ddayjlc_state::main_nmi_w)); + map(0xf102, 0xf105).w(FUNC(ddayjlc_state::prot_w)); map(0xf000, 0xf000).portr("P1"); map(0xf100, 0xf100).portr("SYSTEM"); map(0xf180, 0xf180).portr("DSW1"); @@ -418,7 +418,7 @@ void ddayjlc_state::sound_map(address_map &map) map(0x4000, 0x4000).w("ay1", FUNC(ay8910_device::address_w)); map(0x5000, 0x5000).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0x6000, 0x6000).w("ay2", FUNC(ay8910_device::address_w)); - map(0x7000, 0x7000).w(this, FUNC(ddayjlc_state::sound_nmi_w)); + map(0x7000, 0x7000).w(FUNC(ddayjlc_state::sound_nmi_w)); } static INPUT_PORTS_START( ddayjlc ) diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp index b0287d68866..4ee5ac72383 100644 --- a/src/mame/drivers/ddealer.cpp +++ b/src/mame/drivers/ddealer.cpp @@ -489,10 +489,10 @@ void ddealer_state::ddealer(address_map &map) map(0x092000, 0x092fff).ram().share("left_fg_vrabot"); map(0x093000, 0x093fff).ram().share("right_fg_vrabot"); //AM_RANGE(0x094000, 0x094001) AM_NOP // always 0? - map(0x098000, 0x098001).w(this, FUNC(ddealer_state::flipscreen_w)); - map(0x09c000, 0x09cfff).ram().w(this, FUNC(ddealer_state::back_vram_w)).share("back_vram"); // bg tilemap + map(0x098000, 0x098001).w(FUNC(ddealer_state::flipscreen_w)); + map(0x09c000, 0x09cfff).ram().w(FUNC(ddealer_state::back_vram_w)).share("back_vram"); // bg tilemap map(0x0f0000, 0x0fdfff).ram().share("work_ram"); - map(0x0fe000, 0x0fefff).ram().w(this, FUNC(ddealer_state::mcu_shared_w)).share("mcu_shared_ram"); + map(0x0fe000, 0x0fefff).ram().w(FUNC(ddealer_state::mcu_shared_w)).share("mcu_shared_ram"); map(0x0ff000, 0x0fffff).ram(); } diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 4246ae6a661..acfdc3f8dd3 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -1944,26 +1944,26 @@ void ddenlovr_state::quiz365_map(address_map &map) { map(0x000000, 0x17ffff).rom(); // ROM - map(0x200000, 0x2003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); + map(0x200000, 0x2003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); - map(0x200c02, 0x200c03).r(this, FUNC(ddenlovr_state::quiz365_protection_r)); // Protection - map(0x200e0a, 0x200e0d).w(this, FUNC(ddenlovr_state::quiz365_protection_w)); // Protection + map(0x200c02, 0x200c03).r(FUNC(ddenlovr_state::quiz365_protection_r)); // Protection + map(0x200e0a, 0x200e0d).w(FUNC(ddenlovr_state::quiz365_protection_w)); // Protection // map(0x201000, 0x2017ff) AM_WRITEONLY // ? - map(0x300201, 0x300201).w(this, FUNC(ddenlovr_state::ddenlovr_select2_w)); - map(0x300203, 0x300203).w(this, FUNC(ddenlovr_state::quiz365_coincounter_w)); // Coin Counters + more stuff written on startup - map(0x300204, 0x300207).r(this, FUNC(ddenlovr_state::quiz365_input2_r)); // - - map(0x300240, 0x300247).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); - map(0x300248, 0x30024f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); - map(0x300250, 0x300257).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); - map(0x300258, 0x30025f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); - map(0x300269, 0x300269).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x30026b, 0x30026b).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x30026d, 0x30026d).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x300270, 0x300271).r(this, FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) - map(0x300280, 0x300283).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); - map(0x300286, 0x300287).r(this, FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip + map(0x300201, 0x300201).w(FUNC(ddenlovr_state::ddenlovr_select2_w)); + map(0x300203, 0x300203).w(FUNC(ddenlovr_state::quiz365_coincounter_w)); // Coin Counters + more stuff written on startup + map(0x300204, 0x300207).r(FUNC(ddenlovr_state::quiz365_input2_r)); // + + map(0x300240, 0x300247).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); + map(0x300248, 0x30024f).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); + map(0x300250, 0x300257).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); + map(0x300258, 0x30025f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); + map(0x300269, 0x300269).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x30026b, 0x30026b).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x30026d, 0x30026d).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x300270, 0x300271).r(FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) + map(0x300280, 0x300283).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); + map(0x300286, 0x300287).r(FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip map(0x3002c1, 0x3002c1).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));// Sound map(0x300300, 0x300303).w("ym2413", FUNC(ym2413_device::write)).umask16(0x00ff); @@ -2001,29 +2001,29 @@ void ddenlovr_state::ddenlovj_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x200000, 0x2003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); + map(0x200000, 0x2003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); // map(0x201000, 0x2017ff) AM_WRITEONLY // ? B0 on startup, then 00 - map(0x300040, 0x300047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); - map(0x300048, 0x30004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); - map(0x300050, 0x300057).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); - map(0x300058, 0x30005f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); - map(0x300069, 0x300069).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x30006b, 0x30006b).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x30006d, 0x30006d).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x300070, 0x300071).r(this, FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) - map(0x300080, 0x300083).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); - map(0x300086, 0x300087).r(this, FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip + map(0x300040, 0x300047).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); + map(0x300048, 0x30004f).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); + map(0x300050, 0x300057).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); + map(0x300058, 0x30005f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); + map(0x300069, 0x300069).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x30006b, 0x30006b).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x30006d, 0x30006d).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x300070, 0x300071).r(FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) + map(0x300080, 0x300083).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); + map(0x300086, 0x300087).r(FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip map(0x3000c0, 0x3000c3).w("ym2413", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x300100, 0x30011f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)).umask16(0x00ff); map(0x300140, 0x300143).w("aysnd", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x300180, 0x300181).portr("P1"); map(0x300182, 0x300183).portr("P2"); map(0x300184, 0x300185).portr("SYSTEM"); - map(0x300186, 0x300187).r(this, FUNC(ddenlovr_state::ddenlovj_dsw_r)); // DSW - map(0x300189, 0x300189).w(this, FUNC(ddenlovr_state::ddenlovj_coincounter_w)); - map(0x30018b, 0x30018b).w(this, FUNC(ddenlovr_state::ddenlovr_select_w)); // DSW select - map(0x30018d, 0x30018d).w(this, FUNC(ddenlovr_state::ddenlovr_oki_bank_w)); + map(0x300186, 0x300187).r(FUNC(ddenlovr_state::ddenlovj_dsw_r)); // DSW + map(0x300189, 0x300189).w(FUNC(ddenlovr_state::ddenlovj_coincounter_w)); + map(0x30018b, 0x30018b).w(FUNC(ddenlovr_state::ddenlovr_select_w)); // DSW select + map(0x30018d, 0x30018d).w(FUNC(ddenlovr_state::ddenlovr_oki_bank_w)); map(0x3001c0, 0x3001cf).w(m_mainlatch, FUNC(ls259_device::write_d0)).umask16(0x00ff); map(0x300241, 0x300241).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));// Sound map(0xff0000, 0xffffff).ram(); // RAM @@ -2057,22 +2057,22 @@ void ddenlovr_state::ddenlovrk_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x100000, 0x100001).ram().r(this, FUNC(ddenlovr_state::ddenlovrk_protection1_r)).share("protection1"); - map(0x200000, 0x200001).rw(this, FUNC(ddenlovr_state::ddenlovrk_protection2_r), FUNC(ddenlovr_state::ddenlovrk_protection2_w)).share("protection2"); + map(0x100000, 0x100001).ram().r(FUNC(ddenlovr_state::ddenlovrk_protection1_r)).share("protection1"); + map(0x200000, 0x200001).rw(FUNC(ddenlovr_state::ddenlovrk_protection2_r), FUNC(ddenlovr_state::ddenlovrk_protection2_w)).share("protection2"); - map(0xd00000, 0xd003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); + map(0xd00000, 0xd003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); // map(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00 - map(0xe00040, 0xe00047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); - map(0xe00048, 0xe0004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); - map(0xe00050, 0xe00057).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); - map(0xe00058, 0xe0005f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); - map(0xe00069, 0xe00069).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xe0006b, 0xe0006b).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0xe0006d, 0xe0006d).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0xe00040, 0xe00047).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); + map(0xe00048, 0xe0004f).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); + map(0xe00050, 0xe00057).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); + map(0xe00058, 0xe0005f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); + map(0xe00069, 0xe00069).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xe0006b, 0xe0006b).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0xe0006d, 0xe0006d).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); map(0xe00070, 0xe00071).nopr(); - map(0xe00080, 0xe00083).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); - map(0xe00086, 0xe00087).r(this, FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip + map(0xe00080, 0xe00083).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); + map(0xe00086, 0xe00087).r(FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip map(0xe00100, 0xe00101).portr("P1"); map(0xe00102, 0xe00103).portr("P2"); @@ -2094,21 +2094,21 @@ void ddenlovr_state::ddenlovr_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x300001, 0x300001).w(this, FUNC(ddenlovr_state::ddenlovr_oki_bank_w)); + map(0x300001, 0x300001).w(FUNC(ddenlovr_state::ddenlovr_oki_bank_w)); - map(0xd00000, 0xd003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); + map(0xd00000, 0xd003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); // map(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00 - map(0xe00040, 0xe00047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); - map(0xe00048, 0xe0004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); - map(0xe00050, 0xe00057).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); - map(0xe00058, 0xe0005f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); - map(0xe00069, 0xe00069).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xe0006b, 0xe0006b).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0xe0006d, 0xe0006d).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0xe00070, 0xe00071).r(this, FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) - map(0xe00080, 0xe00083).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); - map(0xe00086, 0xe00087).r(this, FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip + map(0xe00040, 0xe00047).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); + map(0xe00048, 0xe0004f).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); + map(0xe00050, 0xe00057).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); + map(0xe00058, 0xe0005f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); + map(0xe00069, 0xe00069).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xe0006b, 0xe0006b).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0xe0006d, 0xe0006d).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0xe00070, 0xe00071).r(FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) + map(0xe00080, 0xe00083).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); + map(0xe00086, 0xe00087).r(FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip map(0xe00100, 0xe00101).portr("P1"); map(0xe00102, 0xe00103).portr("P2"); @@ -2169,31 +2169,31 @@ void ddenlovr_state::nettoqc_map(address_map &map) { map(0x000000, 0x17ffff).rom(); // ROM - map(0x200000, 0x2003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); - map(0x200c02, 0x200c03).r(this, FUNC(ddenlovr_state::nettoqc_protection1_r)); // Protection 1 + map(0x200000, 0x2003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); + map(0x200c02, 0x200c03).r(FUNC(ddenlovr_state::nettoqc_protection1_r)); // Protection 1 map(0x200e0a, 0x200e0d).writeonly().share("protection1"); // "" map(0x201000, 0x2017ff).writeonly(); // ? - map(0x300040, 0x300047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); - map(0x300048, 0x30004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); - map(0x300050, 0x300057).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); - map(0x300058, 0x30005f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); - map(0x300069, 0x300069).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x30006b, 0x30006b).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x30006d, 0x30006d).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x300070, 0x300071).r(this, FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) - map(0x300080, 0x300083).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); - map(0x300086, 0x300087).r(this, FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip + map(0x300040, 0x300047).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); + map(0x300048, 0x30004f).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); + map(0x300050, 0x300057).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); + map(0x300058, 0x30005f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); + map(0x300069, 0x300069).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x30006b, 0x30006b).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x30006d, 0x30006d).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x300070, 0x300071).r(FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) + map(0x300080, 0x300083).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); + map(0x300086, 0x300087).r(FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip map(0x3000c0, 0x3000c3).w("ym2413", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x300100, 0x30011f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)).umask16(0x00ff); map(0x300140, 0x300143).w("aysnd", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x300180, 0x300181).portr("P1"); map(0x300182, 0x300183).portr("P2"); map(0x300184, 0x300185).portr("SYSTEM"); - map(0x300186, 0x300187).r(this, FUNC(ddenlovr_state::nettoqc_input_r)); // DSW's - map(0x300189, 0x300189).w(this, FUNC(ddenlovr_state::nettoqc_coincounter_w)); - map(0x30018b, 0x30018b).w(this, FUNC(ddenlovr_state::ddenlovr_select_w)); - map(0x30018d, 0x30018d).w(this, FUNC(ddenlovr_state::nettoqc_oki_bank_w)); + map(0x300186, 0x300187).r(FUNC(ddenlovr_state::nettoqc_input_r)); // DSW's + map(0x300189, 0x300189).w(FUNC(ddenlovr_state::nettoqc_coincounter_w)); + map(0x30018b, 0x30018b).w(FUNC(ddenlovr_state::ddenlovr_select_w)); + map(0x30018d, 0x30018d).w(FUNC(ddenlovr_state::nettoqc_oki_bank_w)); map(0x3001c0, 0x3001cf).w(m_mainlatch, FUNC(ls259_device::write_d0)).umask16(0x00ff); map(0x300241, 0x300241).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0xff0000, 0xffffff).ram(); // RAM @@ -2219,26 +2219,26 @@ void ddenlovr_state::ultrchmp_map(address_map &map) { map(0x000000, 0x17ffff).rom(); // ROM - map(0x224680, 0x224681).ram().r(this, FUNC(ddenlovr_state::ultrchmp_protection2_r)).share("protection2"); // Protection 2 - map(0x313570, 0x313571).w(this, FUNC(ddenlovr_state::ultrchmp_protection2_w)); // "" + OKI bank + map(0x224680, 0x224681).ram().r(FUNC(ddenlovr_state::ultrchmp_protection2_r)).share("protection2"); // Protection 2 + map(0x313570, 0x313571).w(FUNC(ddenlovr_state::ultrchmp_protection2_w)); // "" + OKI bank - map(0xd00000, 0xd003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); + map(0xd00000, 0xd003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); - map(0xd00c02, 0xd00c03).r(this, FUNC(ddenlovr_state::nettoqc_protection1_r)); // Protection 1 + map(0xd00c02, 0xd00c03).r(FUNC(ddenlovr_state::nettoqc_protection1_r)); // Protection 1 map(0xd00e0a, 0xd00e0d).writeonly().share("protection1"); // "" map(0xd01000, 0xd017ff).writeonly(); // ? - map(0xe00040, 0xe00047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); - map(0xe00048, 0xe0004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); - map(0xe00050, 0xe00057).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); - map(0xe00058, 0xe0005f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); - map(0xe00069, 0xe00069).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xe0006b, 0xe0006b).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0xe0006d, 0xe0006d).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0xe00040, 0xe00047).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); + map(0xe00048, 0xe0004f).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); + map(0xe00050, 0xe00057).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); + map(0xe00058, 0xe0005f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); + map(0xe00069, 0xe00069).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xe0006b, 0xe0006b).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0xe0006d, 0xe0006d).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); map(0xe00070, 0xe00071).nopr(); - map(0xe00080, 0xe00083).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); - map(0xe00086, 0xe00087).r(this, FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip + map(0xe00080, 0xe00083).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); + map(0xe00086, 0xe00087).r(FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip map(0xe00100, 0xe00101).portr("P1"); map(0xe00102, 0xe00103).portr("P2"); @@ -2287,33 +2287,33 @@ void ddenlovr_state::quizchq_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0x8000, 0x81ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); + map(0x8000, 0x81ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); } void ddenlovr_state::quizchq_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); - map(0x20, 0x20).w(this, FUNC(ddenlovr_state::ddenlovr_select2_w)); - map(0x22, 0x23).r(this, FUNC(ddenlovr_state::rongrong_input2_r)); + map(0x20, 0x20).w(FUNC(ddenlovr_state::ddenlovr_select2_w)); + map(0x22, 0x23).r(FUNC(ddenlovr_state::rongrong_input2_r)); map(0x40, 0x40).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x60, 0x61).w("ym2413", FUNC(ym2413_device::write)); - map(0x80, 0x83).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x84, 0x87).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x88, 0x8b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x8c, 0x8f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x94, 0x94).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x95, 0x95).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x96, 0x96).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x98, 0x98).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0x80, 0x83).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x84, 0x87).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x88, 0x8b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x8c, 0x8f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x94, 0x94).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x95, 0x95).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x96, 0x96).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x98, 0x98).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup map(0xa0, 0xaf).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0xc0, 0xc0).w(this, FUNC(ddenlovr_state::quizchq_oki_bank_w)); + map(0xc0, 0xc0).w(FUNC(ddenlovr_state::quizchq_oki_bank_w)); map(0xc2, 0xc2).nopw(); // enables palette RAM at 8000 } @@ -2325,31 +2325,31 @@ void ddenlovr_state::rongrong_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0xf000, 0xf1ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); + map(0xf000, 0xf1ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); } void ddenlovr_state::rongrong_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); map(0x20, 0x2f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); map(0x40, 0x40).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x60, 0x61).w("ym2413", FUNC(ym2413_device::write)); - map(0x80, 0x83).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x84, 0x87).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x88, 0x8b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x8c, 0x8f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x94, 0x94).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x95, 0x95).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x96, 0x96).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x98, 0x98).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - - map(0xa0, 0xa0).w(this, FUNC(ddenlovr_state::ddenlovr_select2_w)); - map(0xa2, 0xa3).r(this, FUNC(ddenlovr_state::rongrong_input2_r)); + map(0x80, 0x83).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x84, 0x87).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x88, 0x8b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x8c, 0x8f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x94, 0x94).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x95, 0x95).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x96, 0x96).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x98, 0x98).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + + map(0xa0, 0xa0).w(FUNC(ddenlovr_state::ddenlovr_select2_w)); + map(0xa2, 0xa3).r(FUNC(ddenlovr_state::rongrong_input2_r)); map(0xc2, 0xc2).nopw(); // enables palette RAM at f000, and protection device at f705/f706/f601 } /* @@ -2423,11 +2423,11 @@ READ8_MEMBER(ddenlovr_state::mmpanic_link_r){ return 0xff; } void ddenlovr_state::mmpanic_map(address_map &map) { map(0x0000, 0x5fff).rom(); // ROM - map(0x0051, 0x0051).r(this, FUNC(ddenlovr_state::magic_r)); // ? + map(0x0051, 0x0051).r(FUNC(ddenlovr_state::magic_r)); // ? map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0x8000, 0x81ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); + map(0x8000, 0x81ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); } void ddenlovr_state::mmpanic_portmap(address_map &map) @@ -2436,43 +2436,43 @@ void ddenlovr_state::mmpanic_portmap(address_map &map) map(0x00, 0x0f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); // Layers 0-3: - map(0x20, 0x23).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x24, 0x27).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x28, 0x2b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x2c, 0x2f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x34, 0x34).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x35, 0x35).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x36, 0x36).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x38, 0x38).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0x20, 0x23).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x24, 0x27).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x28, 0x2b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x2c, 0x2f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x34, 0x34).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x35, 0x35).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x36, 0x36).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x38, 0x38).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup // Layers 4-7: - map(0x40, 0x43).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base2_w)); - map(0x44, 0x47).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask2_w)); - map(0x48, 0x4b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen2_w)); - map(0x4c, 0x4f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask2_w)); - map(0x54, 0x54).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor2_w)); - map(0x55, 0x55).w(this, FUNC(ddenlovr_state::ddenlovr_priority2_w)); - map(0x56, 0x56).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable2_w)); - map(0x58, 0x58).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - - map(0x60, 0x61).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x63, 0x63).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); // Video Chip - map(0x64, 0x65).w(this, FUNC(ddenlovr_state::mmpanic_blitter2_w)); - map(0x68, 0x68).w(this, FUNC(ddenlovr_state::ddenlovr_select_w)); - map(0x69, 0x69).w(this, FUNC(ddenlovr_state::mmpanic_lockout_w)); + map(0x40, 0x43).w(FUNC(ddenlovr_state::ddenlovr_palette_base2_w)); + map(0x44, 0x47).w(FUNC(ddenlovr_state::ddenlovr_palette_mask2_w)); + map(0x48, 0x4b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen2_w)); + map(0x4c, 0x4f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask2_w)); + map(0x54, 0x54).w(FUNC(ddenlovr_state::ddenlovr_bgcolor2_w)); + map(0x55, 0x55).w(FUNC(ddenlovr_state::ddenlovr_priority2_w)); + map(0x56, 0x56).w(FUNC(ddenlovr_state::ddenlovr_layer_enable2_w)); + map(0x58, 0x58).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + + map(0x60, 0x61).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x63, 0x63).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); // Video Chip + map(0x64, 0x65).w(FUNC(ddenlovr_state::mmpanic_blitter2_w)); + map(0x68, 0x68).w(FUNC(ddenlovr_state::ddenlovr_select_w)); + map(0x69, 0x69).w(FUNC(ddenlovr_state::mmpanic_lockout_w)); map(0x6a, 0x6a).portr("IN0"); map(0x6b, 0x6b).portr("IN1"); - map(0x6c, 0x6d).r(this, FUNC(ddenlovr_state::mmpanic_link_r)); // Other cabinets? - map(0x74, 0x74).w(this, FUNC(ddenlovr_state::mmpanic_rombank_w)); + map(0x6c, 0x6d).r(FUNC(ddenlovr_state::mmpanic_link_r)); // Other cabinets? + map(0x74, 0x74).w(FUNC(ddenlovr_state::mmpanic_rombank_w)); map(0x78, 0x78).nopw(); // 0, during RST 08 (irq acknowledge?) map(0x7c, 0x7c).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x8c, 0x8c).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x88, 0x88).w(this, FUNC(ddenlovr_state::mmpanic_leds_w)); // Leds + map(0x88, 0x88).w(FUNC(ddenlovr_state::mmpanic_leds_w)); // Leds map(0x90, 0x90).nopw(); // written just before port 8c map(0x94, 0x94).portr("DSW1"); map(0x98, 0x98).portr("DSW2"); map(0x9c, 0x9c).portr("DSW3"); // DSW 1&2 high bits - map(0xa6, 0xa6).w(this, FUNC(ddenlovr_state::mmpanic_leds2_w)); // + map(0xa6, 0xa6).w(FUNC(ddenlovr_state::mmpanic_leds2_w)); // } /* Sound CPU */ @@ -2511,7 +2511,7 @@ void ddenlovr_state::funkyfig_map(address_map &map) map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); - map(0x8000, 0x81ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); + map(0x8000, 0x81ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); map(0x8400, 0x87ff).nopw(); } @@ -2596,29 +2596,29 @@ void ddenlovr_state::funkyfig_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound - map(0x01, 0x01).w(this, FUNC(ddenlovr_state::mmpanic_leds_w)); // Leds + map(0x01, 0x01).w(FUNC(ddenlovr_state::mmpanic_leds_w)); // Leds map(0x02, 0x02).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x04, 0x04).r(this, FUNC(ddenlovr_state::funkyfig_busy_r)); - map(0x20, 0x21).w(this, FUNC(ddenlovr_state::funkyfig_blitter_w)); - map(0x23, 0x23).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); // Video Chip + map(0x04, 0x04).r(FUNC(ddenlovr_state::funkyfig_busy_r)); + map(0x20, 0x21).w(FUNC(ddenlovr_state::funkyfig_blitter_w)); + map(0x23, 0x23).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); // Video Chip map(0x40, 0x4f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); // Layers 0-3: - map(0x60, 0x63).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x64, 0x67).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x68, 0x6b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x6c, 0x6f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x74, 0x74).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x75, 0x75).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x76, 0x76).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x78, 0x78).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0x60, 0x63).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x64, 0x67).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x68, 0x6b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x6c, 0x6f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x74, 0x74).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x75, 0x75).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x76, 0x76).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x78, 0x78).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - map(0x80, 0x80).w(this, FUNC(ddenlovr_state::ddenlovr_select2_w)); - map(0x81, 0x81).w(this, FUNC(ddenlovr_state::funkyfig_lockout_w)); - map(0x82, 0x82).r(this, FUNC(ddenlovr_state::funkyfig_coin_r)); - map(0x83, 0x83).r(this, FUNC(ddenlovr_state::funkyfig_key_r)); + map(0x80, 0x80).w(FUNC(ddenlovr_state::ddenlovr_select2_w)); + map(0x81, 0x81).w(FUNC(ddenlovr_state::funkyfig_lockout_w)); + map(0x82, 0x82).r(FUNC(ddenlovr_state::funkyfig_coin_r)); + map(0x83, 0x83).r(FUNC(ddenlovr_state::funkyfig_key_r)); - map(0xa2, 0xa2).w(this, FUNC(ddenlovr_state::mmpanic_leds2_w)); + map(0xa2, 0xa2).w(FUNC(ddenlovr_state::mmpanic_leds2_w)); } @@ -2772,19 +2772,19 @@ READ8_MEMBER(ddenlovr_state::hanakanz_rand_r) void ddenlovr_state::hanakanz_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_rombank_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::hanakanz_dsw_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); - map(0x80, 0x80).w(this, FUNC(ddenlovr_state::hanakanz_blitter_data_w)); - map(0x81, 0x81).w(this, FUNC(ddenlovr_state::hanakanz_palette_w)); - map(0x83, 0x84).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_rombank_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::hanakanz_dsw_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x80, 0x80).w(FUNC(ddenlovr_state::hanakanz_blitter_data_w)); + map(0x81, 0x81).w(FUNC(ddenlovr_state::hanakanz_palette_w)); + map(0x83, 0x84).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0x90, 0x90).portr("SYSTEM"); - map(0x91, 0x92).r(this, FUNC(ddenlovr_state::hanakanz_keyb_r)); - map(0x93, 0x93).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); - map(0x94, 0x94).w(this, FUNC(ddenlovr_state::hanakanz_keyb_w)); - map(0x96, 0x96).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x91, 0x92).r(FUNC(ddenlovr_state::hanakanz_keyb_r)); + map(0x93, 0x93).w(FUNC(ddenlovr_state::hanakanz_coincounter_w)); + map(0x94, 0x94).w(FUNC(ddenlovr_state::hanakanz_keyb_w)); + map(0x96, 0x96).r(FUNC(ddenlovr_state::hanakanz_rand_r)); map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0xc0, 0xc0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xe0, 0xef).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); @@ -2794,20 +2794,20 @@ void ddenlovr_state::hanakanz_portmap(address_map &map) void ddenlovr_state::hkagerou_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_rombank_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::hanakanz_dsw_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); - map(0x80, 0x80).w(this, FUNC(ddenlovr_state::hanakanz_blitter_data_w)); - map(0x81, 0x81).w(this, FUNC(ddenlovr_state::hanakanz_palette_w)); - map(0x83, 0x84).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_rombank_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::hanakanz_dsw_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x80, 0x80).w(FUNC(ddenlovr_state::hanakanz_blitter_data_w)); + map(0x81, 0x81).w(FUNC(ddenlovr_state::hanakanz_palette_w)); + map(0x83, 0x84).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0xb0, 0xb0).portr("SYSTEM"); - map(0xb1, 0xb2).r(this, FUNC(ddenlovr_state::hanakanz_keyb_r)); - map(0xb3, 0xb3).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); - map(0xb4, 0xb4).w(this, FUNC(ddenlovr_state::hanakanz_keyb_w)); - map(0xb6, 0xb6).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0xb1, 0xb2).r(FUNC(ddenlovr_state::hanakanz_keyb_r)); + map(0xb3, 0xb3).w(FUNC(ddenlovr_state::hanakanz_coincounter_w)); + map(0xb4, 0xb4).w(FUNC(ddenlovr_state::hanakanz_keyb_w)); + map(0xb6, 0xb6).r(FUNC(ddenlovr_state::hanakanz_rand_r)); map(0xc0, 0xc0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xe0, 0xef).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); } @@ -2817,22 +2817,22 @@ void ddenlovr_state::hkagerou_portmap(address_map &map) void ddenlovr_state::kotbinyo_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_rombank_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::hanakanz_dsw_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); - map(0x80, 0x80).w(this, FUNC(ddenlovr_state::hanakanz_blitter_data_w)); - map(0x81, 0x81).w(this, FUNC(ddenlovr_state::hanakanz_palette_w)); - map(0x83, 0x84).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_rombank_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::hanakanz_dsw_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x80, 0x80).w(FUNC(ddenlovr_state::hanakanz_blitter_data_w)); + map(0x81, 0x81).w(FUNC(ddenlovr_state::hanakanz_palette_w)); + map(0x83, 0x84).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0xb0, 0xb0).portr("SYSTEM"); // map(0xb1, 0xb2) AM_READ(hanakanz_keyb_r) map(0xb1, 0xb1).portr("KEYB0"); map(0xb2, 0xb2).portr("KEYB1"); - map(0xb3, 0xb3).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); + map(0xb3, 0xb3).w(FUNC(ddenlovr_state::hanakanz_coincounter_w)); // map(0xb4, 0xb4) AM_WRITE(hanakanz_keyb_w) - map(0xb6, 0xb6).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0xb6, 0xb6).r(FUNC(ddenlovr_state::hanakanz_rand_r)); map(0xc0, 0xc0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // map(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_device, read, write) } @@ -2842,22 +2842,22 @@ void ddenlovr_state::kotbinyo_portmap(address_map &map) void ddenlovr_state::kotbinsp_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_rombank_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::hanakanz_dsw_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); - map(0x80, 0x80).w(this, FUNC(ddenlovr_state::hanakanz_blitter_data_w)); - map(0x81, 0x81).w(this, FUNC(ddenlovr_state::hanakanz_palette_w)); - map(0x83, 0x84).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_rombank_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::hanakanz_dsw_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x80, 0x80).w(FUNC(ddenlovr_state::hanakanz_blitter_data_w)); + map(0x81, 0x81).w(FUNC(ddenlovr_state::hanakanz_palette_w)); + map(0x83, 0x84).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0x90, 0x90).portr("SYSTEM"); // map(0x91, 0x91) AM_READ(hanakanz_keyb_r) map(0x91, 0x91).portr("KEYB0"); map(0x92, 0x92).portr("KEYB1"); - map(0x93, 0x93).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); + map(0x93, 0x93).w(FUNC(ddenlovr_state::hanakanz_coincounter_w)); // map(0x94, 0x94) AM_WRITE(hanakanz_keyb_w) - map(0x96, 0x96).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x96, 0x96).r(FUNC(ddenlovr_state::hanakanz_rand_r)); map(0xc0, 0xc0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // map(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_device, read, write) } @@ -2876,20 +2876,20 @@ READ8_MEMBER(ddenlovr_state::mjreach1_protection_r) void ddenlovr_state::mjreach1_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_rombank_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::hanakanz_dsw_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); - map(0x80, 0x80).w(this, FUNC(ddenlovr_state::hanakanz_blitter_data_w)); - map(0x81, 0x81).w(this, FUNC(ddenlovr_state::hanakanz_palette_w)); - map(0x83, 0x84).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); - map(0x90, 0x90).w(this, FUNC(ddenlovr_state::hanakanz_keyb_w)); - map(0x92, 0x92).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0x93, 0x93).rw(this, FUNC(ddenlovr_state::mjreach1_protection_r), FUNC(ddenlovr_state::mjreach1_protection_w)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::hanakanz_busy_r), FUNC(ddenlovr_state::hanakanz_oki_bank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_rombank_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::hanakanz_dsw_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x80, 0x80).w(FUNC(ddenlovr_state::hanakanz_blitter_data_w)); + map(0x81, 0x81).w(FUNC(ddenlovr_state::hanakanz_palette_w)); + map(0x83, 0x84).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x90, 0x90).w(FUNC(ddenlovr_state::hanakanz_keyb_w)); + map(0x92, 0x92).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x93, 0x93).rw(FUNC(ddenlovr_state::mjreach1_protection_r), FUNC(ddenlovr_state::mjreach1_protection_w)); map(0x94, 0x94).portr("SYSTEM"); - map(0x95, 0x96).r(this, FUNC(ddenlovr_state::hanakanz_keyb_r)); - map(0x97, 0x97).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); + map(0x95, 0x96).r(FUNC(ddenlovr_state::hanakanz_keyb_r)); + map(0x97, 0x97).w(FUNC(ddenlovr_state::hanakanz_coincounter_w)); map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0xc0, 0xc0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xe0, 0xef).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); @@ -3002,14 +3002,14 @@ WRITE8_MEMBER(ddenlovr_state::mjchuuka_oki_bank_w ) void ddenlovr_state::mjchuuka_portmap(address_map &map) { // 16 bit I/O - map(0x20, 0x20).select(0xff00).w(this, FUNC(ddenlovr_state::mjchuuka_blitter_w)); - map(0x21, 0x21).select(0xff00).w(this, FUNC(ddenlovr_state::mjchuuka_palette_w)); - map(0x23, 0x23).mirror(0xff00).r(this, FUNC(ddenlovr_state::mjchuuka_gfxrom_0_r)); - map(0x40, 0x40).mirror(0xff00).w(this, FUNC(ddenlovr_state::mjchuuka_coincounter_w)); - map(0x41, 0x41).mirror(0xff00).w(this, FUNC(ddenlovr_state::hanakanz_keyb_w)); + map(0x20, 0x20).select(0xff00).w(FUNC(ddenlovr_state::mjchuuka_blitter_w)); + map(0x21, 0x21).select(0xff00).w(FUNC(ddenlovr_state::mjchuuka_palette_w)); + map(0x23, 0x23).mirror(0xff00).r(FUNC(ddenlovr_state::mjchuuka_gfxrom_0_r)); + map(0x40, 0x40).mirror(0xff00).w(FUNC(ddenlovr_state::mjchuuka_coincounter_w)); + map(0x41, 0x41).mirror(0xff00).w(FUNC(ddenlovr_state::hanakanz_keyb_w)); map(0x42, 0x42).mirror(0xff00).portr("SYSTEM"); - map(0x43, 0x44).mirror(0xff00).r(this, FUNC(ddenlovr_state::mjchuuka_keyb_r)); - map(0x45, 0x45).mirror(0xff00).r(this, FUNC(ddenlovr_state::mjchuuka_gfxrom_1_r)); + map(0x43, 0x44).mirror(0xff00).r(FUNC(ddenlovr_state::mjchuuka_keyb_r)); + map(0x45, 0x45).mirror(0xff00).r(FUNC(ddenlovr_state::mjchuuka_gfxrom_1_r)); map(0x60, 0x60).mirror(0xff00).portr("DSW1"); map(0x61, 0x61).mirror(0xff00).portr("DSW2"); map(0x62, 0x62).mirror(0xff00).portr("DSW3"); @@ -3049,27 +3049,27 @@ void ddenlovr_state::mjschuka_portmap(address_map &map) map(0x00, 0x0f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x20, 0x23).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x24, 0x27).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x28, 0x2b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x2c, 0x2f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x34, 0x34).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x35, 0x35).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x36, 0x36).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x20, 0x23).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x24, 0x27).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x28, 0x2b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x2c, 0x2f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x34, 0x34).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x35, 0x35).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x36, 0x36).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); map(0x38, 0x38).nopr(); // ? ack or watchdog - map(0x40, 0x41).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x43, 0x43).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); - map(0x50, 0x50).w(this, FUNC(ddenlovr_state::mjflove_okibank_w)); + map(0x40, 0x41).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x43, 0x43).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x50, 0x50).w(FUNC(ddenlovr_state::mjflove_okibank_w)); - map(0x54, 0x54).rw(this, FUNC(ddenlovr_state::mjschuka_protection_r), FUNC(ddenlovr_state::mjschuka_protection_w)); + map(0x54, 0x54).rw(FUNC(ddenlovr_state::mjschuka_protection_r), FUNC(ddenlovr_state::mjschuka_protection_w)); // 58 writes ? (0/1) - map(0x5c, 0x5c).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x5c, 0x5c).r(FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0x60, 0x60).w(this, FUNC(ddenlovr_state::sryudens_coincounter_w)); - map(0x61, 0x61).w(this, FUNC(ddenlovr_state::hanakanz_keyb_w)); + map(0x60, 0x60).w(FUNC(ddenlovr_state::sryudens_coincounter_w)); + map(0x61, 0x61).w(FUNC(ddenlovr_state::hanakanz_keyb_w)); map(0x62, 0x62).portr("SYSTEM"); - map(0x63, 0x64).r(this, FUNC(ddenlovr_state::sryudens_keyb_r)); + map(0x63, 0x64).r(FUNC(ddenlovr_state::sryudens_keyb_r)); map(0x68, 0x68).portr("DSW1"); map(0x69, 0x69).portr("DSW2"); @@ -3092,7 +3092,7 @@ void ddenlovr_state::mjmyster_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM/RAM (Banked) - map(0xf000, 0xf1ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); // RAM enabled by bit 4 of rombank + map(0xf000, 0xf1ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); // RAM enabled by bit 4 of rombank map(0xf200, 0xffff).nopw(); // "" } @@ -3180,28 +3180,28 @@ WRITE_LINE_MEMBER(ddenlovr_state::mjmyster_blitter_irq) void ddenlovr_state::mjmyster_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); - map(0x20, 0x20).w(this, FUNC(ddenlovr_state::mjmyster_select2_w)); - map(0x21, 0x21).w(this, FUNC(ddenlovr_state::mjmyster_coincounter_w)); - map(0x22, 0x22).r(this, FUNC(ddenlovr_state::mjmyster_coins_r)); - map(0x23, 0x23).r(this, FUNC(ddenlovr_state::mjmyster_keyb_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x20, 0x20).w(FUNC(ddenlovr_state::mjmyster_select2_w)); + map(0x21, 0x21).w(FUNC(ddenlovr_state::mjmyster_coincounter_w)); + map(0x22, 0x22).r(FUNC(ddenlovr_state::mjmyster_coins_r)); + map(0x23, 0x23).r(FUNC(ddenlovr_state::mjmyster_keyb_r)); map(0x40, 0x40).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x42, 0x43).w("ym2413", FUNC(ym2413_device::write)); map(0x44, 0x44).r("aysnd", FUNC(ay8910_device::data_r)); map(0x46, 0x46).w("aysnd", FUNC(ay8910_device::data_w)); map(0x48, 0x48).w("aysnd", FUNC(ay8910_device::address_w)); map(0x60, 0x6f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x80, 0x83).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x84, 0x87).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x88, 0x8b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x8c, 0x8f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x94, 0x94).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x95, 0x95).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x96, 0x96).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x98, 0x98).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - map(0xc2, 0xc2).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0xc3, 0xc3).r(this, FUNC(ddenlovr_state::mjmyster_dsw_r)); + map(0x80, 0x83).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x84, 0x87).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x88, 0x8b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x8c, 0x8f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x94, 0x94).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x95, 0x95).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x96, 0x96).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x98, 0x98).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0xc2, 0xc2).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0xc3, 0xc3).r(FUNC(ddenlovr_state::mjmyster_dsw_r)); } /*************************************************************************** @@ -3230,8 +3230,8 @@ void ddenlovr_state::hginga_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM/RAM (Banked) - map(0xf601, 0xf601).r(this, FUNC(ddenlovr_state::hginga_protection_r)); - map(0xf000, 0xf1ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); // RAM enabled by bit 4 of rombank + map(0xf601, 0xf601).r(FUNC(ddenlovr_state::hginga_protection_r)); + map(0xf000, 0xf1ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); // RAM enabled by bit 4 of rombank map(0xf700, 0xf706).nopw(); } @@ -3350,26 +3350,26 @@ WRITE8_MEMBER(ddenlovr_state::hginga_blitter_w) void ddenlovr_state::hginga_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::hginga_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::hginga_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); map(0x22, 0x23).w("ym2413", FUNC(ym2413_device::write)); map(0x24, 0x24).r("aysnd", FUNC(ay8910_device::data_r)); map(0x26, 0x26).w("aysnd", FUNC(ay8910_device::data_w)); map(0x28, 0x28).w("aysnd", FUNC(ay8910_device::address_w)); - map(0x40, 0x40).w(this, FUNC(ddenlovr_state::hginga_input_w)); - map(0x41, 0x41).w(this, FUNC(ddenlovr_state::hginga_coins_w)); - map(0x42, 0x42).r(this, FUNC(ddenlovr_state::hginga_coins_r)); - map(0x43, 0x43).r(this, FUNC(ddenlovr_state::hginga_input_r)); + map(0x40, 0x40).w(FUNC(ddenlovr_state::hginga_input_w)); + map(0x41, 0x41).w(FUNC(ddenlovr_state::hginga_coins_w)); + map(0x42, 0x42).r(FUNC(ddenlovr_state::hginga_coins_r)); + map(0x43, 0x43).r(FUNC(ddenlovr_state::hginga_input_r)); map(0x60, 0x6f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x80, 0x80).w(this, FUNC(ddenlovr_state::hginga_80_w)); - map(0xa0, 0xa3).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0xa4, 0xa7).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0xa8, 0xab).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0xac, 0xaf).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0xb4, 0xb4).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xb5, 0xb5).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0xb6, 0xb6).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0xb8, 0xb8).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0x80, 0x80).w(FUNC(ddenlovr_state::hginga_80_w)); + map(0xa0, 0xa3).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0xa4, 0xa7).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0xa8, 0xab).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0xac, 0xaf).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0xb4, 0xb4).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xb5, 0xb5).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0xb6, 0xb6).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0xb8, 0xb8).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup } @@ -3451,8 +3451,8 @@ void ddenlovr_state::hgokou_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0xe000, 0xe1ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); - map(0xe601, 0xe601).r(this, FUNC(ddenlovr_state::hgokou_protection_r)); + map(0xe000, 0xe1ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); + map(0xe601, 0xe601).r(FUNC(ddenlovr_state::hgokou_protection_r)); map(0xe700, 0xe706).nopw(); } @@ -3460,26 +3460,26 @@ void ddenlovr_state::hgokou_map(address_map &map) void ddenlovr_state::hgokou_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::hginga_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::hginga_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); map(0x20, 0x2f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x40, 0x43).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x44, 0x47).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x48, 0x4b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x4c, 0x4f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x54, 0x54).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x55, 0x55).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x56, 0x56).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x58, 0x58).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - map(0x60, 0x60).w(this, FUNC(ddenlovr_state::hgokou_dsw_sel_w)); - map(0x61, 0x61).w(this, FUNC(ddenlovr_state::hgokou_input_w)); - map(0x62, 0x62).r(this, FUNC(ddenlovr_state::hgokou_input_r)); + map(0x40, 0x43).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x44, 0x47).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x48, 0x4b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x4c, 0x4f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x54, 0x54).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x55, 0x55).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x56, 0x56).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x58, 0x58).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0x60, 0x60).w(FUNC(ddenlovr_state::hgokou_dsw_sel_w)); + map(0x61, 0x61).w(FUNC(ddenlovr_state::hgokou_input_w)); + map(0x62, 0x62).r(FUNC(ddenlovr_state::hgokou_input_r)); map(0x80, 0x80).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x82, 0x83).w("ym2413", FUNC(ym2413_device::write)); map(0x84, 0x84).r("aysnd", FUNC(ay8910_device::data_r)); map(0x86, 0x86).w("aysnd", FUNC(ay8910_device::data_w)); map(0x88, 0x88).w("aysnd", FUNC(ay8910_device::address_w)); - map(0xb0, 0xb0).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0xb0, 0xb0).r(FUNC(ddenlovr_state::hanakanz_rand_r)); } @@ -3514,27 +3514,27 @@ READ8_MEMBER(ddenlovr_state::hgokbang_input_r) void ddenlovr_state::hgokbang_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::hginga_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::hginga_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); map(0x20, 0x20).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x22, 0x23).w("ym2413", FUNC(ym2413_device::write)); map(0x24, 0x24).r("aysnd", FUNC(ay8910_device::data_r)); map(0x26, 0x26).w("aysnd", FUNC(ay8910_device::data_w)); map(0x28, 0x28).w("aysnd", FUNC(ay8910_device::address_w)); - map(0x40, 0x40).w(this, FUNC(ddenlovr_state::hgokou_dsw_sel_w)); - map(0x41, 0x41).w(this, FUNC(ddenlovr_state::hgokou_input_w)); - map(0x42, 0x42).r(this, FUNC(ddenlovr_state::hgokou_input_r)); - map(0x43, 0x43).r(this, FUNC(ddenlovr_state::hgokbang_input_r)); + map(0x40, 0x40).w(FUNC(ddenlovr_state::hgokou_dsw_sel_w)); + map(0x41, 0x41).w(FUNC(ddenlovr_state::hgokou_input_w)); + map(0x42, 0x42).r(FUNC(ddenlovr_state::hgokou_input_r)); + map(0x43, 0x43).r(FUNC(ddenlovr_state::hgokbang_input_r)); map(0x60, 0x6f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0xa0, 0xa3).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0xa4, 0xa7).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0xa8, 0xab).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0xac, 0xaf).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0xb4, 0xb4).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xb5, 0xb5).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0xb6, 0xb6).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0xb8, 0xb8).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - map(0xe0, 0xe0).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0xa0, 0xa3).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0xa4, 0xa7).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0xa8, 0xab).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0xac, 0xaf).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0xb4, 0xb4).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xb5, 0xb5).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0xb6, 0xb6).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0xb8, 0xb8).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0xe0, 0xe0).r(FUNC(ddenlovr_state::hanakanz_rand_r)); } @@ -3597,27 +3597,27 @@ void ddenlovr_state::hparadis_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0xc000, 0xc1ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); + map(0xc000, 0xc1ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); } void ddenlovr_state::hparadis_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); map(0x40, 0x40).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x60, 0x61).w("ym2413", FUNC(ym2413_device::write)); - map(0x80, 0x83).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x84, 0x87).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x88, 0x8b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x8c, 0x8f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x94, 0x94).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x95, 0x95).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x96, 0x96).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x98, 0x98).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - map(0xa0, 0xa0).w(this, FUNC(ddenlovr_state::hginga_input_w)); - map(0xa1, 0xa1).w(this, FUNC(ddenlovr_state::hparadis_coin_w)); - map(0xa2, 0xa3).r(this, FUNC(ddenlovr_state::hparadis_input_r)); + map(0x80, 0x83).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x84, 0x87).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x88, 0x8b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x8c, 0x8f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x94, 0x94).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x95, 0x95).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x96, 0x96).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x98, 0x98).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0xa0, 0xa0).w(FUNC(ddenlovr_state::hginga_input_w)); + map(0xa1, 0xa1).w(FUNC(ddenlovr_state::hparadis_coin_w)); + map(0xa2, 0xa3).r(FUNC(ddenlovr_state::hparadis_input_r)); map(0xc2, 0xc2).nopw(); // enables palette RAM at c000 } @@ -3644,28 +3644,28 @@ READ8_MEMBER(ddenlovr_state::mjmywrld_coins_r) void ddenlovr_state::mjmywrld_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x03, 0x03).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); - map(0x20, 0x20).w(this, FUNC(ddenlovr_state::mjmyster_select2_w)); - map(0x21, 0x21).w(this, FUNC(ddenlovr_state::mjmyster_coincounter_w)); - map(0x22, 0x22).r(this, FUNC(ddenlovr_state::mjmywrld_coins_r)); - map(0x23, 0x23).r(this, FUNC(ddenlovr_state::mjmyster_keyb_r)); + map(0x00, 0x01).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x03, 0x03).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x20, 0x20).w(FUNC(ddenlovr_state::mjmyster_select2_w)); + map(0x21, 0x21).w(FUNC(ddenlovr_state::mjmyster_coincounter_w)); + map(0x22, 0x22).r(FUNC(ddenlovr_state::mjmywrld_coins_r)); + map(0x23, 0x23).r(FUNC(ddenlovr_state::mjmyster_keyb_r)); map(0x40, 0x40).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x42, 0x43).w("ym2413", FUNC(ym2413_device::write)); map(0x44, 0x44).r("aysnd", FUNC(ay8910_device::data_r)); map(0x46, 0x46).w("aysnd", FUNC(ay8910_device::data_w)); map(0x48, 0x48).w("aysnd", FUNC(ay8910_device::address_w)); map(0x60, 0x6f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x80, 0x83).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x84, 0x87).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x88, 0x8b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x8c, 0x8f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x94, 0x94).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x95, 0x95).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x96, 0x96).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0x98, 0x98).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - map(0xc0, 0xc0).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0xe0, 0xe0).r(this, FUNC(ddenlovr_state::mjmyster_dsw_r)); + map(0x80, 0x83).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x84, 0x87).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x88, 0x8b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x8c, 0x8f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x94, 0x94).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x95, 0x95).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x96, 0x96).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x98, 0x98).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0xc0, 0xc0).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0xe0, 0xe0).r(FUNC(ddenlovr_state::mjmyster_dsw_r)); } @@ -3728,35 +3728,35 @@ void ddenlovr_state::akamaru_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // ROM - map(0x213570, 0x213571).w(this, FUNC(ddenlovr_state::akamaru_protection1_w)); // OKI bank - map(0x624680, 0x624681).r(this, FUNC(ddenlovr_state::akamaru_protection1_r)); + map(0x213570, 0x213571).w(FUNC(ddenlovr_state::akamaru_protection1_w)); // OKI bank + map(0x624680, 0x624681).r(FUNC(ddenlovr_state::akamaru_protection1_r)); - map(0xd00000, 0xd003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); + map(0xd00000, 0xd003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); map(0xd00e00, 0xd00e09).nopw(); map(0xd01000, 0xd017ff).nopw(); // 0 - map(0xe00040, 0xe00047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); - map(0xe00048, 0xe0004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); - map(0xe00050, 0xe00057).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); - map(0xe00058, 0xe0005f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); - map(0xe00069, 0xe00069).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xe0006b, 0xe0006b).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0xe0006d, 0xe0006d).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xe00070, 0xe00071).r(this, FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) - map(0xe00080, 0xe00083).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); - map(0xe00086, 0xe00087).r(this, FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip + map(0xe00040, 0xe00047).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); + map(0xe00048, 0xe0004f).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); + map(0xe00050, 0xe00057).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)).umask16(0x00ff); + map(0xe00058, 0xe0005f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)).umask16(0x00ff); + map(0xe00069, 0xe00069).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xe0006b, 0xe0006b).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0xe0006d, 0xe0006d).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xe00070, 0xe00071).r(FUNC(ddenlovr_state::unk16_r)); // ? must be 78 on startup (not necessary in ddlover) + map(0xe00080, 0xe00083).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).umask16(0x00ff); + map(0xe00086, 0xe00087).r(FUNC(ddenlovr_state::ddenlovr_gfxrom_r)); // Video Chip map(0xe00100, 0xe00101).portr("P1"); map(0xe00102, 0xe00103).portr("P2"); map(0xe00104, 0xe00105).portr("SYSTEM"); - map(0xe00106, 0xe00107).r(this, FUNC(ddenlovr_state::akamaru_protection2_r)); + map(0xe00106, 0xe00107).r(FUNC(ddenlovr_state::akamaru_protection2_r)); map(0xe00108, 0xe0010b).writeonly().share("protection2"); - map(0xe0010c, 0xe0010d).r(this, FUNC(ddenlovr_state::akamaru_e0010d_r)); - map(0xe00200, 0xe00201).r(this, FUNC(ddenlovr_state::akamaru_dsw_r)); // DSW + map(0xe0010c, 0xe0010d).r(FUNC(ddenlovr_state::akamaru_e0010d_r)); + map(0xe00200, 0xe00201).r(FUNC(ddenlovr_state::akamaru_dsw_r)); // DSW - map(0xe00204, 0xe00205).r(this, FUNC(ddenlovr_state::akamaru_blitter_r)); // Blitter Busy & IRQ + map(0xe00204, 0xe00205).r(FUNC(ddenlovr_state::akamaru_blitter_r)); // Blitter Busy & IRQ map(0xe00300, 0xe0030f).w(m_mainlatch, FUNC(ls259_device::write_d0)).umask16(0x00ff).nopr(); map(0xe00400, 0xe00403).w("ym2413", FUNC(ym2413_device::write)).umask16(0x00ff); @@ -3824,25 +3824,25 @@ WRITE8_MEMBER(ddenlovr_state::mjflove_coincounter_w) void ddenlovr_state::mjflove_portmap(address_map &map) { // 16 bit I/O - map(0x0020, 0x0023).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x0024, 0x0027).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x0028, 0x002b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x002c, 0x002f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x0034, 0x0034).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x0035, 0x0035).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x0036, 0x0036).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x0020, 0x0023).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x0024, 0x0027).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x0028, 0x002b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x002c, 0x002f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x0034, 0x0034).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x0035, 0x0035).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x0036, 0x0036).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); map(0x0038, 0x0038).nopr(); // ? ack or watchdog - map(0x0040, 0x0041).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)).mirror(0xff00); - map(0x0043, 0x0043).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); - map(0x0080, 0x0081).r(this, FUNC(ddenlovr_state::mjflove_keyb_r)); + map(0x0040, 0x0041).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)).mirror(0xff00); + map(0x0043, 0x0043).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x0080, 0x0081).r(FUNC(ddenlovr_state::mjflove_keyb_r)); map(0x0082, 0x0082).portr("SYSTEM"); - map(0x00da, 0x00da).r(this, FUNC(ddenlovr_state::mjflove_protection_r)).mirror(0xff00); - map(0x00f2, 0x00f2).w(this, FUNC(ddenlovr_state::mjmyster_rambank_w)).mirror(0xff00); - map(0x00f8, 0x00f8).w(this, FUNC(ddenlovr_state::mjflove_rombank_w)).mirror(0xff00); - map(0x00fa, 0x00fa).w(this, FUNC(ddenlovr_state::mjflove_okibank_w)); + map(0x00da, 0x00da).r(FUNC(ddenlovr_state::mjflove_protection_r)).mirror(0xff00); + map(0x00f2, 0x00f2).w(FUNC(ddenlovr_state::mjmyster_rambank_w)).mirror(0xff00); + map(0x00f8, 0x00f8).w(FUNC(ddenlovr_state::mjflove_rombank_w)).mirror(0xff00); + map(0x00fa, 0x00fa).w(FUNC(ddenlovr_state::mjflove_okibank_w)); map(0x0100, 0x0100).portr("DSW1"); map(0x0181, 0x0181).nopw(); // ? int. enable - map(0x0184, 0x0184).w(this, FUNC(ddenlovr_state::mjflove_coincounter_w)); + map(0x0184, 0x0184).w(FUNC(ddenlovr_state::mjflove_coincounter_w)); map(0x0200, 0x0201).w("ym2413", FUNC(ym2413_device::write)); map(0x0280, 0x028f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); map(0x0300, 0x0301).w("aysnd", FUNC(ay8910_device::address_data_w)); @@ -3873,18 +3873,18 @@ READ8_MEMBER(ddenlovr_state::jongtei_busy_r) void ddenlovr_state::jongtei_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::jongtei_busy_r), FUNC(ddenlovr_state::jongtei_okibank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_rombank_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::jongtei_dsw_keyb_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::jongtei_busy_r), FUNC(ddenlovr_state::jongtei_okibank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_rombank_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::jongtei_dsw_keyb_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); map(0x40, 0x40).portr("SYSTEM"); - map(0x41, 0x42).r(this, FUNC(ddenlovr_state::hanakanz_keyb_r)); - map(0x43, 0x43).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); - map(0x46, 0x46).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0x60, 0x60).w(this, FUNC(ddenlovr_state::hanakanz_blitter_data_w)); - map(0x61, 0x61).w(this, FUNC(ddenlovr_state::hanakanz_palette_w)); - map(0x63, 0x64).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x41, 0x42).r(FUNC(ddenlovr_state::hanakanz_keyb_r)); + map(0x43, 0x43).w(FUNC(ddenlovr_state::hanakanz_coincounter_w)); + map(0x46, 0x46).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x60, 0x60).w(FUNC(ddenlovr_state::hanakanz_blitter_data_w)); + map(0x61, 0x61).w(FUNC(ddenlovr_state::hanakanz_palette_w)); + map(0x63, 0x64).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0x80, 0x81).w("ym2413", FUNC(ym2413_device::write)); map(0xa0, 0xa0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xc0, 0xcf).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); @@ -3930,19 +3930,19 @@ READ8_MEMBER(ddenlovr_state::mjgnight_protection_r) void ddenlovr_state::mjgnight_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::jongtei_busy_r), FUNC(ddenlovr_state::jongtei_okibank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_rombank_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::jongtei_dsw_keyb_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::jongtei_busy_r), FUNC(ddenlovr_state::jongtei_okibank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_rombank_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::jongtei_dsw_keyb_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); map(0x40, 0x40).portr("SYSTEM"); - map(0x41, 0x42).r(this, FUNC(ddenlovr_state::hanakanz_keyb_r)); - map(0x46, 0x46).w(this, FUNC(ddenlovr_state::mjgnight_coincounter_w)); - map(0x46, 0x46).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0x47, 0x47).rw(this, FUNC(ddenlovr_state::mjgnight_protection_r), FUNC(ddenlovr_state::mjgnight_protection_w)); - map(0x60, 0x60).w(this, FUNC(ddenlovr_state::hanakanz_blitter_data_w)); - map(0x61, 0x61).w(this, FUNC(ddenlovr_state::hanakanz_palette_w)); - map(0x63, 0x64).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x41, 0x42).r(FUNC(ddenlovr_state::hanakanz_keyb_r)); + map(0x46, 0x46).w(FUNC(ddenlovr_state::mjgnight_coincounter_w)); + map(0x46, 0x46).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x47, 0x47).rw(FUNC(ddenlovr_state::mjgnight_protection_r), FUNC(ddenlovr_state::mjgnight_protection_w)); + map(0x60, 0x60).w(FUNC(ddenlovr_state::hanakanz_blitter_data_w)); + map(0x61, 0x61).w(FUNC(ddenlovr_state::hanakanz_palette_w)); + map(0x63, 0x64).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0x80, 0x81).w("ym2413", FUNC(ym2413_device::write)); map(0xa0, 0xa0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xc0, 0xcf).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); @@ -3959,7 +3959,7 @@ void ddenlovr_state::sryudens_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0xe000, 0xe1ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); + map(0xe000, 0xe1ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); } READ8_MEMBER(ddenlovr_state::sryudens_keyb_r) @@ -4010,28 +4010,28 @@ void ddenlovr_state::sryudens_portmap(address_map &map) map(0x00, 0x00).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x02, 0x03).w("ym2413", FUNC(ym2413_device::write)); map(0x04, 0x05).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0x20, 0x23).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x24, 0x27).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x28, 0x2b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x2c, 0x2f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x34, 0x34).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x35, 0x35).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x36, 0x36).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x20, 0x23).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x24, 0x27).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x28, 0x2b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x2c, 0x2f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x34, 0x34).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x35, 0x35).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x36, 0x36).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); map(0x38, 0x38).nopr(); // ? ack or watchdog - map(0x40, 0x41).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x43, 0x43).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); - map(0x50, 0x50).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0x70, 0x70).w(this, FUNC(ddenlovr_state::quizchq_oki_bank_w)); + map(0x40, 0x41).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x43, 0x43).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x50, 0x50).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x70, 0x70).w(FUNC(ddenlovr_state::quizchq_oki_bank_w)); map(0x80, 0x8f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); map(0x90, 0x90).portr("DSW1"); map(0x91, 0x91).portr("DSW2"); map(0x92, 0x92).portr("DSW4"); map(0x93, 0x93).portr("DSW3"); map(0x94, 0x94).portr("DSWTOP"); - map(0x98, 0x98).w(this, FUNC(ddenlovr_state::sryudens_coincounter_w)); - map(0x99, 0x99).w(this, FUNC(ddenlovr_state::hanakanz_keyb_w)); + map(0x98, 0x98).w(FUNC(ddenlovr_state::sryudens_coincounter_w)); + map(0x99, 0x99).w(FUNC(ddenlovr_state::hanakanz_keyb_w)); map(0x9a, 0x9a).portr("SYSTEM"); - map(0x9b, 0x9c).r(this, FUNC(ddenlovr_state::sryudens_keyb_r)); + map(0x9b, 0x9c).r(FUNC(ddenlovr_state::sryudens_keyb_r)); } @@ -4063,7 +4063,7 @@ void ddenlovr_state::janshinp_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0xe000, 0xe1ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)); + map(0xe000, 0xe1ff).w(FUNC(ddenlovr_state::rongrong_palette_w)); } void ddenlovr_state::janshinp_portmap(address_map &map) @@ -4074,23 +4074,23 @@ void ddenlovr_state::janshinp_portmap(address_map &map) map(0x02, 0x02).portr("DSW4"); map(0x03, 0x03).portr("DSW3"); map(0x04, 0x04).portr("DSWTOP"); - map(0x08, 0x08).w(this, FUNC(ddenlovr_state::janshinp_coincounter_w)); - map(0x09, 0x09).w(this, FUNC(ddenlovr_state::hanakanz_keyb_w)); + map(0x08, 0x08).w(FUNC(ddenlovr_state::janshinp_coincounter_w)); + map(0x09, 0x09).w(FUNC(ddenlovr_state::hanakanz_keyb_w)); map(0x0a, 0x0a).portr("SYSTEM"); - map(0x0b, 0x0c).r(this, FUNC(ddenlovr_state::sryudens_keyb_r)); - map(0x20, 0x23).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x24, 0x27).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x28, 0x2b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x2c, 0x2f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x34, 0x34).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x35, 0x35).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x36, 0x36).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x0b, 0x0c).r(FUNC(ddenlovr_state::sryudens_keyb_r)); + map(0x20, 0x23).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x24, 0x27).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x28, 0x2b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x2c, 0x2f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x34, 0x34).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x35, 0x35).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x36, 0x36).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); map(0x38, 0x38).nopr(); // ? ack or watchdog - map(0x40, 0x41).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x43, 0x43).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x40, 0x41).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x43, 0x43).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); map(0x50, 0x5f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x60, 0x60).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0x70, 0x70).w(this, FUNC(ddenlovr_state::quizchq_oki_bank_w)); + map(0x60, 0x60).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x70, 0x70).w(FUNC(ddenlovr_state::quizchq_oki_bank_w)); map(0x80, 0x80).ram(); map(0x90, 0x90).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x92, 0x93).w("ym2413", FUNC(ym2413_device::write)); @@ -4149,34 +4149,34 @@ void ddenlovr_state::seljan2_map(address_map &map) map(0x6000, 0x6fff).ram(); // RAM map(0x7000, 0x7fff).bankrw("bank2"); // RAM (Banked) map(0x8000, 0xffff).bankr("bank1"); // ROM (Banked) - map(0x8000, 0xffff).w(this, FUNC(ddenlovr_state::seljan2_palette_w)); + map(0x8000, 0xffff).w(FUNC(ddenlovr_state::seljan2_palette_w)); } void ddenlovr_state::seljan2_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x0f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x20, 0x23).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); - map(0x24, 0x27).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0x28, 0x2b).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0x2c, 0x2f).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); - map(0x34, 0x34).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0x35, 0x35).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0x36, 0x36).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0x20, 0x23).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); + map(0x24, 0x27).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0x28, 0x2b).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0x2c, 0x2f).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0x34, 0x34).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0x35, 0x35).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0x36, 0x36).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); map(0x38, 0x38).nopr(); // ? ack or watchdog - map(0x40, 0x41).w(this, FUNC(ddenlovr_state::ddenlovr_blitter_w)); - map(0x43, 0x43).r(this, FUNC(ddenlovr_state::rongrong_gfxrom_r)); + map(0x40, 0x41).w(FUNC(ddenlovr_state::ddenlovr_blitter_w)); + map(0x43, 0x43).r(FUNC(ddenlovr_state::rongrong_gfxrom_r)); map(0x50, 0x51).w("ym2413", FUNC(ym2413_device::write)); map(0x54, 0x54).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x58, 0x58).w("aysnd", FUNC(ay8910_device::address_w)); map(0x5c, 0x5c).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); // dsw - map(0x60, 0x60).nopr().w(this, FUNC(ddenlovr_state::sryudens_rambank_w)); // ? ack on RTC int - map(0x70, 0x70).w(this, FUNC(ddenlovr_state::seljan2_rombank_w)); - map(0x80, 0x80).portr("SYSTEM").w(this, FUNC(ddenlovr_state::seljan2_palette_enab_w)); // writes: 1 = palette RAM at b000, 0 = ROM - map(0x84, 0x84).r(this, FUNC(ddenlovr_state::daimyojn_keyb1_r)); - map(0x88, 0x88).r(this, FUNC(ddenlovr_state::daimyojn_keyb2_r)); - map(0x90, 0x90).w(this, FUNC(ddenlovr_state::quizchq_oki_bank_w)); - map(0xa0, 0xa0).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0x60, 0x60).nopr().w(FUNC(ddenlovr_state::sryudens_rambank_w)); // ? ack on RTC int + map(0x70, 0x70).w(FUNC(ddenlovr_state::seljan2_rombank_w)); + map(0x80, 0x80).portr("SYSTEM").w(FUNC(ddenlovr_state::seljan2_palette_enab_w)); // writes: 1 = palette RAM at b000, 0 = ROM + map(0x84, 0x84).r(FUNC(ddenlovr_state::daimyojn_keyb1_r)); + map(0x88, 0x88).r(FUNC(ddenlovr_state::daimyojn_keyb2_r)); + map(0x90, 0x90).w(FUNC(ddenlovr_state::quizchq_oki_bank_w)); + map(0xa0, 0xa0).r(FUNC(ddenlovr_state::hanakanz_rand_r)); } @@ -4303,32 +4303,32 @@ WRITE8_MEMBER(ddenlovr_state::htengoku_blit_romregion_w) void ddenlovr_state::htengoku_io_map(address_map &map) { map.global_mask(0xff); - map(0x01, 0x07).w(this, FUNC(ddenlovr_state::dynax_blitter_rev2_w)); // Blitter - map(0x20, 0x20).w(this, FUNC(ddenlovr_state::htengoku_select_w)); // Controls - map(0x21, 0x21).w(this, FUNC(ddenlovr_state::htengoku_coin_w)); // - map(0x22, 0x22).r(this, FUNC(ddenlovr_state::htengoku_coin_r)); // - map(0x23, 0x23).r(this, FUNC(ddenlovr_state::htengoku_input_r)); // + map(0x01, 0x07).w(FUNC(ddenlovr_state::dynax_blitter_rev2_w)); // Blitter + map(0x20, 0x20).w(FUNC(ddenlovr_state::htengoku_select_w)); // Controls + map(0x21, 0x21).w(FUNC(ddenlovr_state::htengoku_coin_w)); // + map(0x22, 0x22).r(FUNC(ddenlovr_state::htengoku_coin_r)); // + map(0x23, 0x23).r(FUNC(ddenlovr_state::htengoku_input_r)); // map(0x40, 0x40).w("aysnd", FUNC(ay8910_device::address_w)); // AY8910 map(0x42, 0x42).r("aysnd", FUNC(ay8910_device::data_r)); // map(0x44, 0x44).w("aysnd", FUNC(ay8910_device::data_w)); // map(0x46, 0x47).w("ym2413", FUNC(ym2413_device::write)); // map(0x80, 0x8f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0xa0, 0xa3).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)); // ddenlovr mixer chip - map(0xa4, 0xa7).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); - map(0xa8, 0xab).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); - map(0xac, 0xaf).w(this, FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); + map(0xa0, 0xa3).w(FUNC(ddenlovr_state::ddenlovr_palette_base_w)); // ddenlovr mixer chip + map(0xa4, 0xa7).w(FUNC(ddenlovr_state::ddenlovr_palette_mask_w)); + map(0xa8, 0xab).w(FUNC(ddenlovr_state::ddenlovr_transparency_pen_w)); + map(0xac, 0xaf).w(FUNC(ddenlovr_state::ddenlovr_transparency_mask_w)); // b0-b3 ? - map(0xb4, 0xb4).w(this, FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); - map(0xb5, 0xb5).w(this, FUNC(ddenlovr_state::ddenlovr_priority_w)); - map(0xb6, 0xb6).w(this, FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); - map(0xb8, 0xb8).r(this, FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup - map(0xc2, 0xc2).w(this, FUNC(ddenlovr_state::htengoku_rombank_w)); // BANK ROM Select - map(0xc0, 0xc0).w(this, FUNC(ddenlovr_state::dynax_extra_scrollx_w)); // screen scroll X - map(0xc1, 0xc1).w(this, FUNC(ddenlovr_state::dynax_extra_scrolly_w)); // screen scroll Y - map(0xc3, 0xc3).w(this, FUNC(ddenlovr_state::dynax_vblank_ack_w)); // VBlank IRQ Ack - map(0xc4, 0xc4).w(this, FUNC(ddenlovr_state::dynax_blit_pen_w)); // Destination Pen - map(0xc5, 0xc5).w(this, FUNC(ddenlovr_state::dynax_blit_dest_w)); // Destination Layer - map(0xc6, 0xc6).w(this, FUNC(ddenlovr_state::htengoku_blit_romregion_w)); // Blitter ROM bank + map(0xb4, 0xb4).w(FUNC(ddenlovr_state::ddenlovr_bgcolor_w)); + map(0xb5, 0xb5).w(FUNC(ddenlovr_state::ddenlovr_priority_w)); + map(0xb6, 0xb6).w(FUNC(ddenlovr_state::ddenlovr_layer_enable_w)); + map(0xb8, 0xb8).r(FUNC(ddenlovr_state::unk_r)); // ? must be 78 on startup + map(0xc2, 0xc2).w(FUNC(ddenlovr_state::htengoku_rombank_w)); // BANK ROM Select + map(0xc0, 0xc0).w(FUNC(ddenlovr_state::dynax_extra_scrollx_w)); // screen scroll X + map(0xc1, 0xc1).w(FUNC(ddenlovr_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0xc3, 0xc3).w(FUNC(ddenlovr_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0xc4, 0xc4).w(FUNC(ddenlovr_state::dynax_blit_pen_w)); // Destination Pen + map(0xc5, 0xc5).w(FUNC(ddenlovr_state::dynax_blit_dest_w)); // Destination Layer + map(0xc6, 0xc6).w(FUNC(ddenlovr_state::htengoku_blit_romregion_w)); // Blitter ROM bank map(0xe0, 0xe7).w(m_mainlatch, FUNC(ls259_device::write_d1)); } @@ -4347,7 +4347,7 @@ void ddenlovr_state::htengoku_mem_map(address_map &map) void dynax_state::htengoku_banked_map(address_map &map) { map(0x00000, 0x3ffff).rom().region("maincpu", 0x10000); - map(0x80000, 0x801ff).w(this, FUNC(dynax_state::tenkai_palette_w)); + map(0x80000, 0x801ff).w(FUNC(dynax_state::tenkai_palette_w)); } MACHINE_CONFIG_START(ddenlovr_state::htengoku) @@ -4509,25 +4509,25 @@ READ8_MEMBER(ddenlovr_state::daimyojn_year_hack_r) void ddenlovr_state::daimyojn_portmap(address_map &map) { map.global_mask(0xff); - map(0x2c, 0x2c).rw(this, FUNC(ddenlovr_state::jongtei_busy_r), FUNC(ddenlovr_state::daimyojn_okibank_w)); - map(0x2e, 0x2e).w(this, FUNC(ddenlovr_state::daimyojn_palette_sel_w)); - map(0x30, 0x30).w(this, FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); - map(0x31, 0x31).w(this, FUNC(ddenlovr_state::jongtei_dsw_keyb_w)); - map(0x32, 0x32).r(this, FUNC(ddenlovr_state::hanakanz_dsw_r)); - map(0x40, 0x40).w(this, FUNC(ddenlovr_state::daimyojn_blitter_data_palette_w)); - map(0x42, 0x44).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); + map(0x2c, 0x2c).rw(FUNC(ddenlovr_state::jongtei_busy_r), FUNC(ddenlovr_state::daimyojn_okibank_w)); + map(0x2e, 0x2e).w(FUNC(ddenlovr_state::daimyojn_palette_sel_w)); + map(0x30, 0x30).w(FUNC(ddenlovr_state::hanakanz_blitter_reg_w)); + map(0x31, 0x31).w(FUNC(ddenlovr_state::jongtei_dsw_keyb_w)); + map(0x32, 0x32).r(FUNC(ddenlovr_state::hanakanz_dsw_r)); + map(0x40, 0x40).w(FUNC(ddenlovr_state::daimyojn_blitter_data_palette_w)); + map(0x42, 0x44).r(FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0x80, 0x8f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x8a, 0x8b).r(this, FUNC(ddenlovr_state::daimyojn_year_hack_r)); // ? + map(0x8a, 0x8b).r(FUNC(ddenlovr_state::daimyojn_year_hack_r)); // ? map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0xa2, 0xa2).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa8, 0xa8).portr("SYSTEM"); - map(0xaa, 0xaa).r(this, FUNC(ddenlovr_state::daimyojn_keyb1_r)); - map(0xac, 0xac).r(this, FUNC(ddenlovr_state::daimyojn_keyb2_r)); - map(0xae, 0xae).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); - map(0xb0, 0xb0).w(this, FUNC(ddenlovr_state::mjmyster_rambank_w)); - map(0xc0, 0xc0).w(this, FUNC(ddenlovr_state::mjflove_rombank_w)); - map(0xd0, 0xd0).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); - map(0xe0, 0xe0).rw(this, FUNC(ddenlovr_state::daimyojn_protection_r), FUNC(ddenlovr_state::daimyojn_protection_w)); + map(0xaa, 0xaa).r(FUNC(ddenlovr_state::daimyojn_keyb1_r)); + map(0xac, 0xac).r(FUNC(ddenlovr_state::daimyojn_keyb2_r)); + map(0xae, 0xae).w(FUNC(ddenlovr_state::hanakanz_coincounter_w)); + map(0xb0, 0xb0).w(FUNC(ddenlovr_state::mjmyster_rambank_w)); + map(0xc0, 0xc0).w(FUNC(ddenlovr_state::mjflove_rombank_w)); + map(0xd0, 0xd0).r(FUNC(ddenlovr_state::hanakanz_rand_r)); + map(0xe0, 0xe0).rw(FUNC(ddenlovr_state::daimyojn_protection_r), FUNC(ddenlovr_state::daimyojn_protection_w)); } diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index b65d279e222..fd7027a454a 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -494,19 +494,19 @@ void ddragon_state::ddragon_map(address_map &map) map(0x0000, 0x0fff).ram().share("rambase"); map(0x1000, 0x11ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x1200, 0x13ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0x1800, 0x1fff).ram().w(this, FUNC(ddragon_state::ddragon_fgvideoram_w)).share("fgvideoram"); - map(0x2000, 0x21ff).rw(this, FUNC(ddragon_state::ddragon_comram_r), FUNC(ddragon_state::ddragon_comram_w)).share("comram").mirror(0x0600); + map(0x1800, 0x1fff).ram().w(FUNC(ddragon_state::ddragon_fgvideoram_w)).share("fgvideoram"); + map(0x2000, 0x21ff).rw(FUNC(ddragon_state::ddragon_comram_r), FUNC(ddragon_state::ddragon_comram_w)).share("comram").mirror(0x0600); map(0x2800, 0x2fff).ram().share("spriteram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(ddragon_state::ddragon_bgvideoram_w)).share("bgvideoram"); + map(0x3000, 0x37ff).ram().w(FUNC(ddragon_state::ddragon_bgvideoram_w)).share("bgvideoram"); map(0x3800, 0x3800).portr("P1"); map(0x3801, 0x3801).portr("P2"); map(0x3802, 0x3802).portr("EXTRA"); map(0x3803, 0x3803).portr("DSW0"); map(0x3804, 0x3804).portr("DSW1"); - map(0x3808, 0x3808).w(this, FUNC(ddragon_state::ddragon_bankswitch_w)); + map(0x3808, 0x3808).w(FUNC(ddragon_state::ddragon_bankswitch_w)); map(0x3809, 0x3809).writeonly().share("scrollx_lo"); map(0x380a, 0x380a).writeonly().share("scrolly_lo"); - map(0x380b, 0x380f).rw(this, FUNC(ddragon_state::ddragon_interrupt_r), FUNC(ddragon_state::ddragon_interrupt_w)); + map(0x380b, 0x380f).rw(FUNC(ddragon_state::ddragon_interrupt_r), FUNC(ddragon_state::ddragon_interrupt_w)); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom(); } @@ -515,19 +515,19 @@ void ddragon_state::ddragon_map(address_map &map) void ddragon_state::dd2_map(address_map &map) { map(0x0000, 0x17ff).ram(); - map(0x1800, 0x1fff).ram().w(this, FUNC(ddragon_state::ddragon_fgvideoram_w)).share("fgvideoram"); - map(0x2000, 0x21ff).rw(this, FUNC(ddragon_state::ddragon_comram_r), FUNC(ddragon_state::ddragon_comram_w)).share("comram").mirror(0x0600); + map(0x1800, 0x1fff).ram().w(FUNC(ddragon_state::ddragon_fgvideoram_w)).share("fgvideoram"); + map(0x2000, 0x21ff).rw(FUNC(ddragon_state::ddragon_comram_r), FUNC(ddragon_state::ddragon_comram_w)).share("comram").mirror(0x0600); map(0x2800, 0x2fff).ram().share("spriteram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(ddragon_state::ddragon_bgvideoram_w)).share("bgvideoram"); + map(0x3000, 0x37ff).ram().w(FUNC(ddragon_state::ddragon_bgvideoram_w)).share("bgvideoram"); map(0x3800, 0x3800).portr("P1"); map(0x3801, 0x3801).portr("P2"); map(0x3802, 0x3802).portr("EXTRA"); map(0x3803, 0x3803).portr("DSW0"); map(0x3804, 0x3804).portr("DSW1"); - map(0x3808, 0x3808).w(this, FUNC(ddragon_state::ddragon_bankswitch_w)); + map(0x3808, 0x3808).w(FUNC(ddragon_state::ddragon_bankswitch_w)); map(0x3809, 0x3809).writeonly().share("scrollx_lo"); map(0x380a, 0x380a).writeonly().share("scrolly_lo"); - map(0x380b, 0x380f).rw(this, FUNC(ddragon_state::ddragon_interrupt_r), FUNC(ddragon_state::ddragon_interrupt_w)); + map(0x380b, 0x380f).rw(FUNC(ddragon_state::ddragon_interrupt_r), FUNC(ddragon_state::ddragon_interrupt_w)); map(0x3c00, 0x3dff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x3e00, 0x3fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x4000, 0x7fff).bankr("bank1"); @@ -544,7 +544,7 @@ void ddragon_state::dd2_map(address_map &map) void ddragon_state::sub_map(address_map &map) { - map(0x0000, 0x001f).rw(this, FUNC(ddragon_state::ddragon_hd63701_internal_registers_r), FUNC(ddragon_state::ddragon_hd63701_internal_registers_w)); + map(0x0000, 0x001f).rw(FUNC(ddragon_state::ddragon_hd63701_internal_registers_r), FUNC(ddragon_state::ddragon_hd63701_internal_registers_w)); map(0x0020, 0x0fff).ram(); map(0x8000, 0x81ff).ram().share("comram"); map(0xc000, 0xffff).rom(); @@ -563,14 +563,14 @@ void ddragon_state::dd2_sub_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc3ff).ram().share("comram"); - map(0xd000, 0xd000).w(this, FUNC(ddragon_state::ddragon2_sub_irq_ack_w)); - map(0xe000, 0xe000).w(this, FUNC(ddragon_state::ddragon2_sub_irq_w)); + map(0xd000, 0xd000).w(FUNC(ddragon_state::ddragon2_sub_irq_ack_w)); + map(0xe000, 0xe000).w(FUNC(ddragon_state::ddragon2_sub_irq_w)); } void ddragon_state::ddragonba_sub_portmap(address_map &map) { - map(0x0000, 0x01ff).w(this, FUNC(ddragon_state::ddragonba_port_w)); + map(0x0000, 0x01ff).w(FUNC(ddragon_state::ddragonba_port_w)); } @@ -585,9 +585,9 @@ void ddragon_state::sound_map(address_map &map) { map(0x0000, 0x0fff).ram(); map(0x1000, 0x1000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x1800, 0x1800).r(this, FUNC(ddragon_state::dd_adpcm_status_r)); + map(0x1800, 0x1800).r(FUNC(ddragon_state::dd_adpcm_status_r)); map(0x2800, 0x2801).rw("fmsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x3800, 0x3807).w(this, FUNC(ddragon_state::dd_adpcm_w)); + map(0x3800, 0x3807).w(FUNC(ddragon_state::dd_adpcm_w)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 37c44b4fbf8..ddd459e6bf3 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -294,17 +294,17 @@ void ddragon3_state::ddragon3_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x000004, 0x000007).nopw(); - map(0x080000, 0x080fff).ram().w(this, FUNC(ddragon3_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* Foreground (32x32 Tiles - 4 by per tile) */ - map(0x082000, 0x0827ff).ram().w(this, FUNC(ddragon3_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* Background (32x32 Tiles - 2 by per tile) */ - map(0x0c0000, 0x0c000f).w(this, FUNC(ddragon3_state::ddragon3_scroll_w)); + map(0x080000, 0x080fff).ram().w(FUNC(ddragon3_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* Foreground (32x32 Tiles - 4 by per tile) */ + map(0x082000, 0x0827ff).ram().w(FUNC(ddragon3_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* Background (32x32 Tiles - 2 by per tile) */ + map(0x0c0000, 0x0c000f).w(FUNC(ddragon3_state::ddragon3_scroll_w)); map(0x100000, 0x100001).portr("P1_P2"); map(0x100002, 0x100003).portr("SYSTEM"); map(0x100004, 0x100005).portr("DSW"); map(0x100006, 0x100007).portr("P3"); - map(0x100000, 0x100001).w(this, FUNC(ddragon3_state::ddragon3_vreg_w)); + map(0x100000, 0x100001).w(FUNC(ddragon3_state::ddragon3_vreg_w)); map(0x100003, 0x100003).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x100004, 0x100005).w(this, FUNC(ddragon3_state::irq6_ack_w)); - map(0x100006, 0x100007).w(this, FUNC(ddragon3_state::irq5_ack_w)); + map(0x100004, 0x100005).w(FUNC(ddragon3_state::irq6_ack_w)); + map(0x100006, 0x100007).w(FUNC(ddragon3_state::irq5_ack_w)); map(0x140000, 0x1405ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette RAM */ map(0x180000, 0x180fff).ram().share("spriteram"); map(0x1c0000, 0x1c3fff).ram(); /* work RAM */ @@ -313,15 +313,15 @@ void ddragon3_state::ddragon3_map(address_map &map) void ddragon3_state::dd3b_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x080fff).ram().w(this, FUNC(ddragon3_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* Foreground (32x32 Tiles - 4 by per tile) */ + map(0x080000, 0x080fff).ram().w(FUNC(ddragon3_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* Foreground (32x32 Tiles - 4 by per tile) */ map(0x081000, 0x081fff).ram().share("spriteram"); - map(0x082000, 0x0827ff).ram().w(this, FUNC(ddragon3_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* Background (32x32 Tiles - 2 by per tile) */ - map(0x0c0000, 0x0c000f).w(this, FUNC(ddragon3_state::ddragon3_scroll_w)); + map(0x082000, 0x0827ff).ram().w(FUNC(ddragon3_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* Background (32x32 Tiles - 2 by per tile) */ + map(0x0c0000, 0x0c000f).w(FUNC(ddragon3_state::ddragon3_scroll_w)); map(0x100000, 0x1005ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette RAM */ - map(0x140000, 0x140001).w(this, FUNC(ddragon3_state::ddragon3_vreg_w)); + map(0x140000, 0x140001).w(FUNC(ddragon3_state::ddragon3_vreg_w)); map(0x140003, 0x140003).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x140004, 0x140005).w(this, FUNC(ddragon3_state::irq6_ack_w)); - map(0x140006, 0x140007).w(this, FUNC(ddragon3_state::irq5_ack_w)); + map(0x140004, 0x140005).w(FUNC(ddragon3_state::irq6_ack_w)); + map(0x140006, 0x140007).w(FUNC(ddragon3_state::irq5_ack_w)); map(0x140008, 0x140009).w(m_spriteram, FUNC(buffered_spriteram16_device::write)); map(0x180000, 0x180001).portr("IN0"); map(0x180002, 0x180003).portr("IN1"); @@ -333,16 +333,16 @@ void ddragon3_state::dd3b_map(address_map &map) void ddragon3_state::ctribe_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x080fff).ram().w(this, FUNC(ddragon3_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* Foreground (32x32 Tiles - 4 by per tile) */ + map(0x080000, 0x080fff).ram().w(FUNC(ddragon3_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* Foreground (32x32 Tiles - 4 by per tile) */ map(0x081000, 0x081fff).ram().share("spriteram"); - map(0x082000, 0x0827ff).ram().w(this, FUNC(ddragon3_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* Background (32x32 Tiles - 2 by per tile) */ + map(0x082000, 0x0827ff).ram().w(FUNC(ddragon3_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* Background (32x32 Tiles - 2 by per tile) */ map(0x082800, 0x082fff).ram(); - map(0x0c0000, 0x0c000f).rw(this, FUNC(ddragon3_state::ddragon3_scroll_r), FUNC(ddragon3_state::ddragon3_scroll_w)); + map(0x0c0000, 0x0c000f).rw(FUNC(ddragon3_state::ddragon3_scroll_r), FUNC(ddragon3_state::ddragon3_scroll_w)); map(0x100000, 0x1005ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette RAM */ - map(0x140000, 0x140001).w(this, FUNC(ddragon3_state::ddragon3_vreg_w)); + map(0x140000, 0x140001).w(FUNC(ddragon3_state::ddragon3_vreg_w)); map(0x140003, 0x140003).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x140004, 0x140005).w(this, FUNC(ddragon3_state::irq6_ack_w)); - map(0x140006, 0x140007).w(this, FUNC(ddragon3_state::irq5_ack_w)); + map(0x140004, 0x140005).w(FUNC(ddragon3_state::irq6_ack_w)); + map(0x140006, 0x140007).w(FUNC(ddragon3_state::irq5_ack_w)); map(0x140008, 0x140009).w(m_spriteram, FUNC(buffered_spriteram16_device::write)); map(0x180000, 0x180001).portr("IN0"); map(0x180002, 0x180003).portr("IN1"); @@ -354,20 +354,20 @@ void ddragon3_state::ctribe_map(address_map &map) void wwfwfest_state::main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x0c0000, 0x0c1fff).ram().w(this, FUNC(wwfwfest_state::wwfwfest_fg0_videoram_w)).share("fg0_videoram"); /* FG0 Ram - 4 bytes per tile */ + map(0x0c0000, 0x0c1fff).ram().w(FUNC(wwfwfest_state::wwfwfest_fg0_videoram_w)).share("fg0_videoram"); /* FG0 Ram - 4 bytes per tile */ map(0x0c2000, 0x0c3fff).ram().share("spriteram"); /* SPR Ram */ - map(0x080000, 0x080fff).ram().w(this, FUNC(wwfwfest_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* BG0 Ram - 4 bytes per tile */ - map(0x082000, 0x082fff).ram().w(this, FUNC(wwfwfest_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* BG1 Ram - 2 bytes per tile */ - map(0x100000, 0x100007).rw(this, FUNC(wwfwfest_state::ddragon3_scroll_r), FUNC(wwfwfest_state::ddragon3_scroll_w)); - map(0x10000a, 0x10000b).w(this, FUNC(wwfwfest_state::wwfwfest_flipscreen_w)); - map(0x140000, 0x140003).w(this, FUNC(wwfwfest_state::wwfwfest_irq_ack_w)); - map(0x14000c, 0x14000d).w(this, FUNC(wwfwfest_state::wwfwfest_soundwrite)); - map(0x140011, 0x140011).w(this, FUNC(wwfwfest_state::wwfwfest_priority_w)); + map(0x080000, 0x080fff).ram().w(FUNC(wwfwfest_state::ddragon3_fg_videoram_w)).share("fg_videoram"); /* BG0 Ram - 4 bytes per tile */ + map(0x082000, 0x082fff).ram().w(FUNC(wwfwfest_state::ddragon3_bg_videoram_w)).share("bg_videoram"); /* BG1 Ram - 2 bytes per tile */ + map(0x100000, 0x100007).rw(FUNC(wwfwfest_state::ddragon3_scroll_r), FUNC(wwfwfest_state::ddragon3_scroll_w)); + map(0x10000a, 0x10000b).w(FUNC(wwfwfest_state::wwfwfest_flipscreen_w)); + map(0x140000, 0x140003).w(FUNC(wwfwfest_state::wwfwfest_irq_ack_w)); + map(0x14000c, 0x14000d).w(FUNC(wwfwfest_state::wwfwfest_soundwrite)); + map(0x140011, 0x140011).w(FUNC(wwfwfest_state::wwfwfest_priority_w)); map(0x140020, 0x140021).portr("P1"); map(0x140022, 0x140023).portr("P2"); map(0x140024, 0x140025).portr("P3"); map(0x140026, 0x140027).portr("P4"); - map(0x180000, 0x18ffff).rw(this, FUNC(wwfwfest_state::wwfwfest_paletteram_r), FUNC(wwfwfest_state::wwfwfest_paletteram_w)).share("palette"); + map(0x180000, 0x18ffff).rw(FUNC(wwfwfest_state::wwfwfest_paletteram_r), FUNC(wwfwfest_state::wwfwfest_paletteram_w)).share("palette"); map(0x1c0000, 0x1c3fff).ram(); /* Work Ram */ } @@ -379,7 +379,7 @@ void ddragon3_state::sound_map(address_map &map) map(0xc800, 0xc801).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xd800, 0xd800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe800, 0xe800).w(this, FUNC(ddragon3_state::oki_bankswitch_w)); + map(0xe800, 0xe800).w(FUNC(ddragon3_state::oki_bankswitch_w)); } diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp index 04f3aa1d94a..40c70327afa 100644 --- a/src/mame/drivers/ddribble.cpp +++ b/src/mame/drivers/ddribble.cpp @@ -107,30 +107,30 @@ WRITE8_MEMBER(ddribble_state::ddribble_vlm5030_ctrl_w) void ddribble_state::cpu0_map(address_map &map) { - map(0x0000, 0x0004).w(this, FUNC(ddribble_state::K005885_0_w)); /* video registers (005885 #1) */ - map(0x0800, 0x0804).w(this, FUNC(ddribble_state::K005885_1_w)); /* video registers (005885 #2) */ + map(0x0000, 0x0004).w(FUNC(ddribble_state::K005885_0_w)); /* video registers (005885 #1) */ + map(0x0800, 0x0804).w(FUNC(ddribble_state::K005885_1_w)); /* video registers (005885 #2) */ map(0x1800, 0x187f).ram().w("palette", FUNC(palette_device::write_indirect)).share("palette"); /* palette */ - map(0x2000, 0x2fff).ram().w(this, FUNC(ddribble_state::ddribble_fg_videoram_w)).share("fg_videoram"); /* Video RAM 1 */ + map(0x2000, 0x2fff).ram().w(FUNC(ddribble_state::ddribble_fg_videoram_w)).share("fg_videoram"); /* Video RAM 1 */ map(0x3000, 0x3fff).ram().share("spriteram_1"); /* Object RAM 1 */ map(0x4000, 0x5fff).ram().share("sharedram"); /* shared RAM with CPU #1 */ - map(0x6000, 0x6fff).ram().w(this, FUNC(ddribble_state::ddribble_bg_videoram_w)).share("bg_videoram"); /* Video RAM 2 */ + map(0x6000, 0x6fff).ram().w(FUNC(ddribble_state::ddribble_bg_videoram_w)).share("bg_videoram"); /* Video RAM 2 */ map(0x7000, 0x7fff).ram().share("spriteram_2"); /* Object RAM 2 */ - map(0x8000, 0x8000).w(this, FUNC(ddribble_state::ddribble_bankswitch_w)); /* bankswitch control */ + map(0x8000, 0x8000).w(FUNC(ddribble_state::ddribble_bankswitch_w)); /* bankswitch control */ map(0x8000, 0x9fff).bankr("bank1"); /* banked ROM */ map(0xa000, 0xffff).rom(); /* ROM */ } void ddribble_state::cpu1_map(address_map &map) { - map(0x0000, 0x1fff).rw(this, FUNC(ddribble_state::ddribble_sharedram_r), FUNC(ddribble_state::ddribble_sharedram_w)); /* shared RAM with CPU #0 */ - map(0x2000, 0x27ff).rw(this, FUNC(ddribble_state::ddribble_snd_sharedram_r), FUNC(ddribble_state::ddribble_snd_sharedram_w)); /* shared RAM with CPU #2 */ + map(0x0000, 0x1fff).rw(FUNC(ddribble_state::ddribble_sharedram_r), FUNC(ddribble_state::ddribble_sharedram_w)); /* shared RAM with CPU #0 */ + map(0x2000, 0x27ff).rw(FUNC(ddribble_state::ddribble_snd_sharedram_r), FUNC(ddribble_state::ddribble_snd_sharedram_w)); /* shared RAM with CPU #2 */ map(0x2800, 0x2800).portr("DSW1"); map(0x2801, 0x2801).portr("P1"); map(0x2802, 0x2802).portr("P2"); map(0x2803, 0x2803).portr("SYSTEM"); /* coinsw & start */ map(0x2c00, 0x2c00).portr("DSW2"); map(0x3000, 0x3000).portr("DSW3"); - map(0x3400, 0x3400).w(this, FUNC(ddribble_state::ddribble_coin_counter_w)); /* coin counters */ + map(0x3400, 0x3400).w(FUNC(ddribble_state::ddribble_coin_counter_w)); /* coin counters */ map(0x3c00, 0x3c00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog reset */ map(0x8000, 0xffff).rom(); /* ROM */ } diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index 5b46b8b0858..aed7e0104c4 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -122,7 +122,7 @@ void de_2_state::de_2_map(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); map(0x2100, 0x2103).rw("pia21", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).w(this, FUNC(de_2_state::sol3_w)); // solenoids + map(0x2200, 0x2200).w(FUNC(de_2_state::sol3_w)); // solenoids map(0x2400, 0x2403).rw("pia24", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).rw("pia28", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x2c00, 0x2c03).rw("pia2c", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display @@ -135,10 +135,10 @@ void de_2_state::de_2_audio_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x2001).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x2400, 0x2400).r(this, FUNC(de_2_state::sound_latch_r)); - map(0x2800, 0x2800).w(this, FUNC(de_2_state::sample_bank_w)); + map(0x2400, 0x2400).r(FUNC(de_2_state::sound_latch_r)); + map(0x2800, 0x2800).w(FUNC(de_2_state::sample_bank_w)); // 0x2c00 - 4052(?) - map(0x3000, 0x3000).w(this, FUNC(de_2_state::sample_w)); + map(0x3000, 0x3000).w(FUNC(de_2_state::sample_w)); // 0x3800 - Watchdog reset map(0x4000, 0x7fff).bankr("sample_bank"); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp index 42084ffa976..0f3d6ff2090 100644 --- a/src/mame/drivers/deadang.cpp +++ b/src/mame/drivers/deadang.cpp @@ -75,7 +75,7 @@ void deadang_state::main_map(address_map &map) map(0x05000, 0x05fff).writeonly(); map(0x06000, 0x0600f).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); map(0x06010, 0x07fff).writeonly(); - map(0x08000, 0x087ff).w(this, FUNC(deadang_state::text_w)).share("videoram"); + map(0x08000, 0x087ff).w(FUNC(deadang_state::text_w)).share("videoram"); map(0x08800, 0x0bfff).writeonly(); map(0x0a000, 0x0a001).portr("P1_P2"); map(0x0a002, 0x0a003).portr("DSW"); @@ -92,23 +92,23 @@ void popnrun_state::popnrun_main_map(address_map &map) map(0x00000, 0x03bff).ram(); map(0x03c00, 0x03dff).ram().share("spriteram"); map(0x03e00, 0x03fff).ram(); - map(0x08000, 0x08fff).ram().w(this, FUNC(popnrun_state::popnrun_text_w)).share("videoram"); + map(0x08000, 0x08fff).ram().w(FUNC(popnrun_state::popnrun_text_w)).share("videoram"); map(0x0e000, 0x0e0ff).ram().share("scroll_ram"); } void deadang_state::sub_map(address_map &map) { map(0x00000, 0x037ff).ram(); - map(0x03800, 0x03fff).ram().w(this, FUNC(deadang_state::foreground_w)).share("video_data"); + map(0x03800, 0x03fff).ram().w(FUNC(deadang_state::foreground_w)).share("video_data"); map(0x04000, 0x04fff).ram().share("share1"); - map(0x08000, 0x08001).w(this, FUNC(deadang_state::bank_w)); + map(0x08000, 0x08001).w(FUNC(deadang_state::bank_w)); map(0x0c000, 0x0c001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0xe0000, 0xfffff).rom(); } void popnrun_state::popnrun_sub_map(address_map &map) { - map(0x00000, 0x003ff).ram().w(this, FUNC(deadang_state::foreground_w)).share("video_data"); + map(0x00000, 0x003ff).ram().w(FUNC(deadang_state::foreground_w)).share("video_data"); map(0x00400, 0x03fff).ram(); map(0x04000, 0x04fff).ram().share("share1"); map(0xe0000, 0xfffff).rom(); diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index 1b78d1df538..aa7d433fe06 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -451,8 +451,8 @@ void dec0_state::dec0_map(address_map &map) map(0x300000, 0x300001).portr("AN0"); map(0x300008, 0x300009).portr("AN1"); - map(0x30c000, 0x30c00b).r(this, FUNC(dec0_state::dec0_controls_r)); - map(0x30c010, 0x30c01f).w(this, FUNC(dec0_state::dec0_control_w)); /* Priority, sound, etc. */ + map(0x30c000, 0x30c00b).r(FUNC(dec0_state::dec0_controls_r)); + map(0x30c010, 0x30c01f).w(FUNC(dec0_state::dec0_control_w)); /* Priority, sound, etc. */ map(0x30c012, 0x30c013).nopr(); // clr.w for sprite DMA map(0x30c018, 0x30c019).nopr(); // clr.w for irq ack map(0x310000, 0x3107ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -476,7 +476,7 @@ void dec0_state::hippodrm_sub_map(address_map &map) map(0x1a0000, 0x1a0007).w(m_tilegen3, FUNC(deco_bac06_device::pf_control0_8bit_packed_w)); map(0x1a0010, 0x1a001f).w(m_tilegen3, FUNC(deco_bac06_device::pf_control1_8bit_swap_w)); map(0x1a1000, 0x1a17ff).rw(m_tilegen3, FUNC(deco_bac06_device::pf_data_8bit_swap_r), FUNC(deco_bac06_device::pf_data_8bit_swap_w)); - map(0x1d0000, 0x1d00ff).rw(this, FUNC(dec0_state::hippodrm_prot_r), FUNC(dec0_state::hippodrm_prot_w)); + map(0x1d0000, 0x1d00ff).rw(FUNC(dec0_state::hippodrm_prot_r), FUNC(dec0_state::hippodrm_prot_w)); map(0x1f0000, 0x1f1fff).bankrw("bank8"); /* Main ram */ map(0x1ff400, 0x1ff403).w(m_subcpu, FUNC(h6280_device::irq_status_w)); map(0x1ff402, 0x1ff403).portr("VBLANK"); @@ -573,8 +573,8 @@ READ16_MEMBER(dec0_state::slyspy_state_r) void dec0_state::slyspy_protection_map(address_map &map) { - map(0x04000, 0x04001).mirror(0x30000).r(this, FUNC(dec0_state::slyspy_state_r)).nopw(); - map(0x0a000, 0x0a001).mirror(0x30000).w(this, FUNC(dec0_state::slyspy_state_w)); + map(0x04000, 0x04001).mirror(0x30000).r(FUNC(dec0_state::slyspy_state_r)).nopw(); + map(0x0a000, 0x0a001).mirror(0x30000).w(FUNC(dec0_state::slyspy_state_w)); // Default state (called by Traps 1, 3, 4, 7, C) map(0x00000, 0x00007).w(m_tilegen2, FUNC(deco_bac06_device::pf_control_0_w)); map(0x00010, 0x00017).w(m_tilegen2, FUNC(deco_bac06_device::pf_control_1_w)); @@ -616,9 +616,9 @@ void dec0_state::slyspy_map(address_map &map) map(0x308000, 0x3087ff).ram().share("spriteram"); /* Sprites */ map(0x310000, 0x3107ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x314001, 0x314001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x314002, 0x314003).w(this, FUNC(dec0_state::dec0_priority_w)); - map(0x314008, 0x31400f).r(this, FUNC(dec0_state::slyspy_controls_r)); - map(0x31c000, 0x31c00f).r(this, FUNC(dec0_state::slyspy_protection_r)).nopw(); + map(0x314002, 0x314003).w(FUNC(dec0_state::dec0_priority_w)); + map(0x314008, 0x31400f).r(FUNC(dec0_state::slyspy_controls_r)); + map(0x31c000, 0x31c00f).r(FUNC(dec0_state::slyspy_protection_r)).nopw(); } @@ -628,8 +628,8 @@ void dec0_state::midres_map(address_map &map) map(0x100000, 0x103fff).ram().share("ram"); map(0x120000, 0x1207ff).ram().share("spriteram"); map(0x140000, 0x1407ff).w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x160000, 0x160001).w(this, FUNC(dec0_state::dec0_priority_w)); - map(0x180000, 0x18000f).r(this, FUNC(dec0_state::midres_controls_r)); + map(0x160000, 0x160001).w(FUNC(dec0_state::dec0_priority_w)); + map(0x180000, 0x18000f).r(FUNC(dec0_state::midres_controls_r)); map(0x180008, 0x18000f).nopw(); /* ?? watchdog ?? */ map(0x1a0001, 0x1a0001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); @@ -656,10 +656,10 @@ void dec0_state::midres_map(address_map &map) void dec0_state::midresb_map(address_map &map) { midres_map(map); - map(0x160010, 0x160011).w(this, FUNC(dec0_state::dec0_priority_w)); - map(0x180000, 0x18000f).r(this, FUNC(dec0_state::dec0_controls_r)); + map(0x160010, 0x160011).w(FUNC(dec0_state::dec0_priority_w)); + map(0x180000, 0x18000f).r(FUNC(dec0_state::dec0_controls_r)); map(0x180012, 0x180013).noprw(); - map(0x180014, 0x180015).w(this, FUNC(dec0_state::midres_sound_w)); + map(0x180014, 0x180015).w(FUNC(dec0_state::midres_sound_w)); map(0x180018, 0x180019).noprw(); map(0x1a0000, 0x1a0001).portr("AN0"); map(0x1a0008, 0x1a0009).portr("AN1"); @@ -710,8 +710,8 @@ READ8_MEMBER(dec0_state::slyspy_sound_state_reset_r) void dec0_state::slyspy_sound_protection_map(address_map &map) { - map(0x020000, 0x020001).mirror(0x180000).r(this, FUNC(dec0_state::slyspy_sound_state_r)); /* Protection counter */ - map(0x050000, 0x050001).mirror(0x180000).r(this, FUNC(dec0_state::slyspy_sound_state_reset_r)); + map(0x020000, 0x020001).mirror(0x180000).r(FUNC(dec0_state::slyspy_sound_state_r)); /* Protection counter */ + map(0x050000, 0x050001).mirror(0x180000).r(FUNC(dec0_state::slyspy_sound_state_reset_r)); // state 0 map(0x010000, 0x010001).w("ym2", FUNC(ym3812_device::write)); map(0x030000, 0x030001).w("ym1", FUNC(ym2203_device::write)); @@ -801,14 +801,14 @@ void dec0_automat_state::automat_map(address_map &map) map(0x300000, 0x300001).portr("AN0"); map(0x300008, 0x300009).portr("AN1"); - map(0x30c000, 0x30c00b).r(this, FUNC(dec0_automat_state::dec0_controls_r)); - map(0x30c000, 0x30c01f).w(this, FUNC(dec0_automat_state::automat_control_w)); /* Priority, sound, etc. */ - map(0x310000, 0x3107ff).rw(this, FUNC(dec0_automat_state::automat_palette_r), FUNC(dec0_automat_state::automat_palette_w)).share("palette"); + map(0x30c000, 0x30c00b).r(FUNC(dec0_automat_state::dec0_controls_r)); + map(0x30c000, 0x30c01f).w(FUNC(dec0_automat_state::automat_control_w)); /* Priority, sound, etc. */ + map(0x310000, 0x3107ff).rw(FUNC(dec0_automat_state::automat_palette_r), FUNC(dec0_automat_state::automat_palette_w)).share("palette"); map(0x314000, 0x3147ff).ram(); // video regs are moved to here.. - map(0x400000, 0x400007).w(this, FUNC(dec0_automat_state::automat_scroll_w)); - map(0x400008, 0x400009).w(this, FUNC(dec0_automat_state::dec0_priority_w)); + map(0x400000, 0x400007).w(FUNC(dec0_automat_state::automat_scroll_w)); + map(0x400008, 0x400009).w(FUNC(dec0_automat_state::dec0_priority_w)); map(0x500000, 0x500001).nopw(); // ??? @@ -831,7 +831,7 @@ void dec0_automat_state::secretab_map(address_map &map) // AM_RANGE(0x340000, 0x34007f) AM_DEVREADWRITE("tilegen1", deco_bac06_device, pf_colscroll_r, pf_colscroll_w) // AM_RANGE(0x340400, 0x3407ff) AM_DEVREADWRITE("tilegen1", deco_bac06_device, pf_rowscroll_r, pf_rowscroll_w) - map(0x314008, 0x31400f).r(this, FUNC(dec0_automat_state::slyspy_controls_r)); + map(0x314008, 0x31400f).r(FUNC(dec0_automat_state::slyspy_controls_r)); map(0x314001, 0x314001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x300000, 0x300007).ram(); @@ -840,7 +840,7 @@ void dec0_automat_state::secretab_map(address_map &map) map(0x300c00, 0x300fff).ram(); map(0x301000, 0x3017ff).rw(m_tilegen3, FUNC(deco_bac06_device::pf_data_r), FUNC(deco_bac06_device::pf_data_w)); map(0x301800, 0x307fff).ram().share("ram"); /* Sly spy main ram */ - map(0x310000, 0x3107ff).rw(this, FUNC(dec0_automat_state::automat_palette_r), FUNC(dec0_automat_state::automat_palette_w)).share("palette"); + map(0x310000, 0x3107ff).rw(FUNC(dec0_automat_state::automat_palette_r), FUNC(dec0_automat_state::automat_palette_w)).share("palette"); map(0xb08000, 0xb08fff).ram().share("spriteram"); /* Sprites */ } @@ -854,7 +854,7 @@ void dec0_automat_state::automat_s_map(address_map &map) map(0xd000, 0xd001).rw("2203b", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xd800, 0xd800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xe000, 0xe000).w(m_adpcm_select2, FUNC(ls157_device::ba_w)); - map(0xe800, 0xe800).w(this, FUNC(dec0_automat_state::sound_bankswitch_w)); + map(0xe800, 0xe800).w(FUNC(dec0_automat_state::sound_bankswitch_w)); map(0xf000, 0xf000).w(m_adpcm_select1, FUNC(ls157_device::ba_w)); } @@ -867,7 +867,7 @@ void dec0_automat_state::secretab_s_map(address_map &map) map(0xd000, 0xd001).rw("ym3812", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0xd800, 0xd800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xe000, 0xe000).w(m_adpcm_select2, FUNC(ls157_device::ba_w)); - map(0xe800, 0xe800).w(this, FUNC(dec0_automat_state::sound_bankswitch_w)); + map(0xe800, 0xe800).w(FUNC(dec0_automat_state::sound_bankswitch_w)); map(0xf000, 0xf000).w(m_adpcm_select1, FUNC(ls157_device::ba_w)); } diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index f1ad0dc02f1..f2c0776583f 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -443,23 +443,23 @@ void dec8_state::lastmisn_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x13ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x1400, 0x17ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); - map(0x1800, 0x1800).portr("IN0").w(this, FUNC(dec8_state::sub_irq_off_w)); - map(0x1801, 0x1801).portr("IN1").w(this, FUNC(dec8_state::main_irq_off_w)); - map(0x1802, 0x1802).portr("IN2").w(this, FUNC(dec8_state::main_firq_off_w)); - map(0x1803, 0x1803).portr("DSW0").w(this, FUNC(dec8_state::main_irq_on_w)); - map(0x1804, 0x1804).portr("DSW1").w(this, FUNC(dec8_state::sub_irq_on_w)); - map(0x1805, 0x1805).w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ - map(0x1806, 0x1806).r(this, FUNC(dec8_state::i8751_h_r)); - map(0x1807, 0x1807).rw(this, FUNC(dec8_state::i8751_l_r), FUNC(dec8_state::flip_screen_w)); - map(0x1809, 0x1809).w(this, FUNC(dec8_state::lastmisn_scrollx_w)); /* Scroll LSB */ - map(0x180b, 0x180b).w(this, FUNC(dec8_state::lastmisn_scrolly_w)); /* Scroll LSB */ - map(0x180c, 0x180c).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x180d, 0x180d).w(this, FUNC(dec8_state::lastmisn_control_w)); /* Bank switch + Scroll MSB */ - map(0x180e, 0x180f).w(this, FUNC(dec8_state::lastmisn_i8751_w)); - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x1800, 0x1800).portr("IN0").w(FUNC(dec8_state::sub_irq_off_w)); + map(0x1801, 0x1801).portr("IN1").w(FUNC(dec8_state::main_irq_off_w)); + map(0x1802, 0x1802).portr("IN2").w(FUNC(dec8_state::main_firq_off_w)); + map(0x1803, 0x1803).portr("DSW0").w(FUNC(dec8_state::main_irq_on_w)); + map(0x1804, 0x1804).portr("DSW1").w(FUNC(dec8_state::sub_irq_on_w)); + map(0x1805, 0x1805).w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ + map(0x1806, 0x1806).r(FUNC(dec8_state::i8751_h_r)); + map(0x1807, 0x1807).rw(FUNC(dec8_state::i8751_l_r), FUNC(dec8_state::flip_screen_w)); + map(0x1809, 0x1809).w(FUNC(dec8_state::lastmisn_scrollx_w)); /* Scroll LSB */ + map(0x180b, 0x180b).w(FUNC(dec8_state::lastmisn_scrolly_w)); /* Scroll LSB */ + map(0x180c, 0x180c).w(FUNC(dec8_state::dec8_sound_w)); + map(0x180d, 0x180d).w(FUNC(dec8_state::lastmisn_control_w)); /* Bank switch + Scroll MSB */ + map(0x180e, 0x180f).w(FUNC(dec8_state::lastmisn_i8751_w)); + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); map(0x2800, 0x2fff).ram().share("spriteram"); map(0x3000, 0x37ff).ram().share("share2"); - map(0x3800, 0x3fff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); + map(0x3800, 0x3fff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -469,18 +469,18 @@ void dec8_state::lastmisn_sub_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x13ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x1400, 0x17ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); - map(0x1800, 0x1800).portr("IN0").w(this, FUNC(dec8_state::sub_irq_off_w)); - map(0x1801, 0x1801).portr("IN1").w(this, FUNC(dec8_state::main_irq_off_w)); - map(0x1802, 0x1802).portr("IN2").w(this, FUNC(dec8_state::main_firq_off_w)); - map(0x1803, 0x1803).portr("DSW0").w(this, FUNC(dec8_state::main_irq_on_w)); - map(0x1804, 0x1804).portr("DSW1").w(this, FUNC(dec8_state::sub_irq_on_w)); - map(0x1805, 0x1805).w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ - map(0x1807, 0x1807).w(this, FUNC(dec8_state::flip_screen_w)); - map(0x180c, 0x180c).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)); + map(0x1800, 0x1800).portr("IN0").w(FUNC(dec8_state::sub_irq_off_w)); + map(0x1801, 0x1801).portr("IN1").w(FUNC(dec8_state::main_irq_off_w)); + map(0x1802, 0x1802).portr("IN2").w(FUNC(dec8_state::main_firq_off_w)); + map(0x1803, 0x1803).portr("DSW0").w(FUNC(dec8_state::main_irq_on_w)); + map(0x1804, 0x1804).portr("DSW1").w(FUNC(dec8_state::sub_irq_on_w)); + map(0x1805, 0x1805).w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ + map(0x1807, 0x1807).w(FUNC(dec8_state::flip_screen_w)); + map(0x180c, 0x180c).w(FUNC(dec8_state::dec8_sound_w)); + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)); map(0x2800, 0x2fff).writeonly().share("spriteram"); map(0x3000, 0x37ff).ram().share("share2"); - map(0x3800, 0x3fff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)); + map(0x3800, 0x3fff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)); map(0x4000, 0xffff).rom(); } @@ -489,21 +489,21 @@ void dec8_state::shackled_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x13ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x1400, 0x17ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); - map(0x1800, 0x1800).portr("IN0").w(this, FUNC(dec8_state::sub_irq_off_w)); - map(0x1801, 0x1801).portr("IN1").w(this, FUNC(dec8_state::main_irq_off_w)); - map(0x1802, 0x1802).portr("IN2").w(this, FUNC(dec8_state::sub_firq_off_w)); - map(0x1803, 0x1803).portr("DSW0").w(this, FUNC(dec8_state::main_irq_on_w)); - map(0x1804, 0x1804).portr("DSW1").w(this, FUNC(dec8_state::sub_irq_on_w)); - map(0x1805, 0x1805).w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ - map(0x1807, 0x1807).w(this, FUNC(dec8_state::flip_screen_w)); - map(0x1809, 0x1809).w(this, FUNC(dec8_state::lastmisn_scrollx_w)); /* Scroll LSB */ - map(0x180b, 0x180b).w(this, FUNC(dec8_state::lastmisn_scrolly_w)); /* Scroll LSB */ - map(0x180c, 0x180c).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x180d, 0x180d).w(this, FUNC(dec8_state::shackled_control_w)); /* Bank switch + Scroll MSB */ - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)); + map(0x1800, 0x1800).portr("IN0").w(FUNC(dec8_state::sub_irq_off_w)); + map(0x1801, 0x1801).portr("IN1").w(FUNC(dec8_state::main_irq_off_w)); + map(0x1802, 0x1802).portr("IN2").w(FUNC(dec8_state::sub_firq_off_w)); + map(0x1803, 0x1803).portr("DSW0").w(FUNC(dec8_state::main_irq_on_w)); + map(0x1804, 0x1804).portr("DSW1").w(FUNC(dec8_state::sub_irq_on_w)); + map(0x1805, 0x1805).w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ + map(0x1807, 0x1807).w(FUNC(dec8_state::flip_screen_w)); + map(0x1809, 0x1809).w(FUNC(dec8_state::lastmisn_scrollx_w)); /* Scroll LSB */ + map(0x180b, 0x180b).w(FUNC(dec8_state::lastmisn_scrolly_w)); /* Scroll LSB */ + map(0x180c, 0x180c).w(FUNC(dec8_state::dec8_sound_w)); + map(0x180d, 0x180d).w(FUNC(dec8_state::shackled_control_w)); /* Bank switch + Scroll MSB */ + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)); map(0x2800, 0x2fff).ram().share("spriteram"); map(0x3000, 0x37ff).ram().share("share2"); - map(0x3800, 0x3fff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); + map(0x3800, 0x3fff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -513,46 +513,46 @@ void dec8_state::shackled_sub_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x13ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x1400, 0x17ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); - map(0x1800, 0x1800).portr("IN0").w(this, FUNC(dec8_state::sub_irq_off_w)); - map(0x1801, 0x1801).portr("IN1").w(this, FUNC(dec8_state::main_irq_off_w)); - map(0x1802, 0x1802).portr("IN2").w(this, FUNC(dec8_state::sub_firq_off_w)); - map(0x1803, 0x1803).portr("DSW0").w(this, FUNC(dec8_state::main_irq_on_w)); - map(0x1804, 0x1804).portr("DSW1").w(this, FUNC(dec8_state::sub_irq_on_w)); - map(0x1805, 0x1805).w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ - map(0x1806, 0x1806).r(this, FUNC(dec8_state::i8751_h_r)); - map(0x1807, 0x1807).rw(this, FUNC(dec8_state::i8751_l_r), FUNC(dec8_state::flip_screen_w)); - map(0x1809, 0x1809).w(this, FUNC(dec8_state::lastmisn_scrollx_w)); /* Scroll LSB */ - map(0x180b, 0x180b).w(this, FUNC(dec8_state::lastmisn_scrolly_w)); /* Scroll LSB */ - map(0x180c, 0x180c).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x180d, 0x180d).w(this, FUNC(dec8_state::shackled_control_w)); /* Bank switch + Scroll MSB */ - map(0x180e, 0x180f).w(this, FUNC(dec8_state::dec8_i8751_w)); - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x1800, 0x1800).portr("IN0").w(FUNC(dec8_state::sub_irq_off_w)); + map(0x1801, 0x1801).portr("IN1").w(FUNC(dec8_state::main_irq_off_w)); + map(0x1802, 0x1802).portr("IN2").w(FUNC(dec8_state::sub_firq_off_w)); + map(0x1803, 0x1803).portr("DSW0").w(FUNC(dec8_state::main_irq_on_w)); + map(0x1804, 0x1804).portr("DSW1").w(FUNC(dec8_state::sub_irq_on_w)); + map(0x1805, 0x1805).w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ + map(0x1806, 0x1806).r(FUNC(dec8_state::i8751_h_r)); + map(0x1807, 0x1807).rw(FUNC(dec8_state::i8751_l_r), FUNC(dec8_state::flip_screen_w)); + map(0x1809, 0x1809).w(FUNC(dec8_state::lastmisn_scrollx_w)); /* Scroll LSB */ + map(0x180b, 0x180b).w(FUNC(dec8_state::lastmisn_scrolly_w)); /* Scroll LSB */ + map(0x180c, 0x180c).w(FUNC(dec8_state::dec8_sound_w)); + map(0x180d, 0x180d).w(FUNC(dec8_state::shackled_control_w)); /* Bank switch + Scroll MSB */ + map(0x180e, 0x180f).w(FUNC(dec8_state::dec8_i8751_w)); + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); map(0x2800, 0x2fff).ram().share("spriteram"); map(0x3000, 0x37ff).ram().share("share2"); - map(0x3800, 0x3fff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)); + map(0x3800, 0x3fff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)); map(0x4000, 0xffff).rom(); } void dec8_state::gondo_map(address_map &map) { map(0x0000, 0x17ff).ram(); - map(0x1800, 0x1fff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); - map(0x2000, 0x27ff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); + map(0x1800, 0x1fff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x2000, 0x27ff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); map(0x2800, 0x2bff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x2c00, 0x2fff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); map(0x3000, 0x37ff).ram().share("spriteram"); /* Sprites */ map(0x3800, 0x3800).portr("DSW0"); /* Dip 1 */ map(0x3801, 0x3801).portr("DSW1"); /* Dip 2 */ - map(0x380a, 0x380b).r(this, FUNC(dec8_state::gondo_player_1_r)); /* Player 1 rotary */ - map(0x380c, 0x380d).r(this, FUNC(dec8_state::gondo_player_2_r)); /* Player 2 rotary */ + map(0x380a, 0x380b).r(FUNC(dec8_state::gondo_player_1_r)); /* Player 1 rotary */ + map(0x380c, 0x380d).r(FUNC(dec8_state::gondo_player_2_r)); /* Player 2 rotary */ map(0x380e, 0x380e).portr("IN3"); /* VBL */ map(0x380f, 0x380f).portr("IN2"); /* Fire buttons */ - map(0x3810, 0x3810).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x3818, 0x382f).w(this, FUNC(dec8_state::gondo_scroll_w)); - map(0x3830, 0x3830).w(this, FUNC(dec8_state::ghostb_bank_w)); /* Bank + NMI enable */ - map(0x3838, 0x3838).r(this, FUNC(dec8_state::i8751_h_r)); - map(0x3839, 0x3839).r(this, FUNC(dec8_state::i8751_l_r)); - map(0x383a, 0x383b).w(this, FUNC(dec8_state::dec8_i8751_w)); + map(0x3810, 0x3810).w(FUNC(dec8_state::dec8_sound_w)); + map(0x3818, 0x382f).w(FUNC(dec8_state::gondo_scroll_w)); + map(0x3830, 0x3830).w(FUNC(dec8_state::ghostb_bank_w)); /* Bank + NMI enable */ + map(0x3838, 0x3838).r(FUNC(dec8_state::i8751_h_r)); + map(0x3839, 0x3839).r(FUNC(dec8_state::i8751_l_r)); + map(0x383a, 0x383b).w(FUNC(dec8_state::dec8_i8751_w)); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -560,8 +560,8 @@ void dec8_state::gondo_map(address_map &map) void dec8_state::garyoret_map(address_map &map) { map(0x0000, 0x17ff).ram(); - map(0x1800, 0x1fff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); - map(0x2000, 0x27ff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); + map(0x1800, 0x1fff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x2000, 0x27ff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); map(0x2800, 0x2bff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x2c00, 0x2fff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); map(0x3000, 0x37ff).ram().share("spriteram"); /* Sprites */ @@ -570,12 +570,12 @@ void dec8_state::garyoret_map(address_map &map) map(0x3808, 0x3808).nopr(); /* ? */ map(0x380a, 0x380a).portr("IN1"); /* Player 2 + VBL */ map(0x380b, 0x380b).portr("IN0"); /* Player 1 */ - map(0x3810, 0x3810).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x3818, 0x382f).w(this, FUNC(dec8_state::gondo_scroll_w)); - map(0x3830, 0x3830).w(this, FUNC(dec8_state::ghostb_bank_w)); /* Bank + NMI enable */ - map(0x3838, 0x3839).w(this, FUNC(dec8_state::dec8_i8751_w)); - map(0x383a, 0x383a).r(this, FUNC(dec8_state::i8751_h_r)); - map(0x383b, 0x383b).r(this, FUNC(dec8_state::i8751_l_r)); + map(0x3810, 0x3810).w(FUNC(dec8_state::dec8_sound_w)); + map(0x3818, 0x382f).w(FUNC(dec8_state::gondo_scroll_w)); + map(0x3830, 0x3830).w(FUNC(dec8_state::ghostb_bank_w)); /* Bank + NMI enable */ + map(0x3838, 0x3839).w(FUNC(dec8_state::dec8_i8751_w)); + map(0x383a, 0x383a).r(FUNC(dec8_state::i8751_h_r)); + map(0x383b, 0x383b).r(FUNC(dec8_state::i8751_l_r)); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -584,23 +584,23 @@ void dec8_state::meikyuh_map(address_map &map) { map(0x0000, 0x0fff).ram(); map(0x1000, 0x17ff).ram(); - map(0x1800, 0x1fff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x1800, 0x1fff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); map(0x2000, 0x27ff).rw("tilegen1", FUNC(deco_bac06_device::pf_data_8bit_r), FUNC(deco_bac06_device::pf_data_8bit_w)); map(0x2800, 0x2bff).ram(); // colscroll? mirror? map(0x2c00, 0x2fff).rw("tilegen1", FUNC(deco_bac06_device::pf_rowscroll_8bit_r), FUNC(deco_bac06_device::pf_rowscroll_8bit_w)); map(0x3000, 0x37ff).ram().share("spriteram"); map(0x3800, 0x3800).portr("IN0"); /* Player 1 */ - map(0x3800, 0x3800).w(this, FUNC(dec8_state::dec8_sound_w)); + map(0x3800, 0x3800).w(FUNC(dec8_state::dec8_sound_w)); map(0x3801, 0x3801).portr("IN1"); /* Player 2 */ map(0x3802, 0x3802).portr("IN2"); /* Player 3 */ map(0x3803, 0x3803).portr("DSW0"); /* Start buttons + VBL */ map(0x3820, 0x3820).portr("DSW1"); /* Dip */ map(0x3820, 0x3827).w("tilegen1", FUNC(deco_bac06_device::pf_control0_8bit_w)); map(0x3830, 0x383f).rw("tilegen1", FUNC(deco_bac06_device::pf_control1_8bit_r), FUNC(deco_bac06_device::pf_control1_8bit_w)); - map(0x3840, 0x3840).r(this, FUNC(dec8_state::i8751_h_r)); - map(0x3840, 0x3840).w(this, FUNC(dec8_state::ghostb_bank_w)); - map(0x3860, 0x3860).r(this, FUNC(dec8_state::i8751_l_r)); - map(0x3860, 0x3861).w(this, FUNC(dec8_state::dec8_i8751_w)); + map(0x3840, 0x3840).r(FUNC(dec8_state::i8751_h_r)); + map(0x3840, 0x3840).w(FUNC(dec8_state::ghostb_bank_w)); + map(0x3860, 0x3860).r(FUNC(dec8_state::i8751_l_r)); + map(0x3860, 0x3861).w(FUNC(dec8_state::dec8_i8751_w)); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -610,23 +610,23 @@ void dec8_state::csilver_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x13ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x1400, 0x17ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); - map(0x1800, 0x1800).portr("IN1").w(this, FUNC(dec8_state::sub_irq_off_w)); - map(0x1801, 0x1801).portr("IN0").w(this, FUNC(dec8_state::main_irq_off_w)); - map(0x1802, 0x1802).w(this, FUNC(dec8_state::main_firq_off_w)); - map(0x1803, 0x1803).portr("IN2").w(this, FUNC(dec8_state::main_irq_on_w)); - map(0x1804, 0x1804).portr("DSW1").w(this, FUNC(dec8_state::sub_irq_on_w)); - map(0x1805, 0x1805).portr("DSW0").w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* Dip 1, DMA */ - map(0x1807, 0x1807).w(this, FUNC(dec8_state::flip_screen_w)); - map(0x1808, 0x180b).w(this, FUNC(dec8_state::dec8_scroll2_w)); - map(0x180c, 0x180c).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x180d, 0x180d).w(this, FUNC(dec8_state::csilver_control_w)); - map(0x180e, 0x180f).w(this, FUNC(dec8_state::csilver_i8751_w)); - map(0x1c00, 0x1c00).r(this, FUNC(dec8_state::i8751_h_r)); - map(0x1e00, 0x1e00).r(this, FUNC(dec8_state::i8751_l_r)); - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)); + map(0x1800, 0x1800).portr("IN1").w(FUNC(dec8_state::sub_irq_off_w)); + map(0x1801, 0x1801).portr("IN0").w(FUNC(dec8_state::main_irq_off_w)); + map(0x1802, 0x1802).w(FUNC(dec8_state::main_firq_off_w)); + map(0x1803, 0x1803).portr("IN2").w(FUNC(dec8_state::main_irq_on_w)); + map(0x1804, 0x1804).portr("DSW1").w(FUNC(dec8_state::sub_irq_on_w)); + map(0x1805, 0x1805).portr("DSW0").w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* Dip 1, DMA */ + map(0x1807, 0x1807).w(FUNC(dec8_state::flip_screen_w)); + map(0x1808, 0x180b).w(FUNC(dec8_state::dec8_scroll2_w)); + map(0x180c, 0x180c).w(FUNC(dec8_state::dec8_sound_w)); + map(0x180d, 0x180d).w(FUNC(dec8_state::csilver_control_w)); + map(0x180e, 0x180f).w(FUNC(dec8_state::csilver_i8751_w)); + map(0x1c00, 0x1c00).r(FUNC(dec8_state::i8751_h_r)); + map(0x1e00, 0x1e00).r(FUNC(dec8_state::i8751_l_r)); + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)); map(0x2800, 0x2fff).ram().share("spriteram"); map(0x3000, 0x37ff).ram().share("share2"); - map(0x3800, 0x3fff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); + map(0x3800, 0x3fff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -636,17 +636,17 @@ void dec8_state::csilver_sub_map(address_map &map) map(0x0000, 0x0fff).ram().share("share1"); map(0x1000, 0x13ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x1400, 0x17ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); - map(0x1800, 0x1800).w(this, FUNC(dec8_state::sub_irq_off_w)); - map(0x1801, 0x1801).w(this, FUNC(dec8_state::main_irq_off_w)); - map(0x1802, 0x1802).w(this, FUNC(dec8_state::main_firq_off_w)); - map(0x1803, 0x1803).portr("IN2").w(this, FUNC(dec8_state::main_irq_on_w)); - map(0x1804, 0x1804).portr("DSW1").w(this, FUNC(dec8_state::sub_irq_on_w)); - map(0x1805, 0x1805).portr("DSW0").w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ - map(0x180c, 0x180c).w(this, FUNC(dec8_state::dec8_sound_w)); - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x1800, 0x1800).w(FUNC(dec8_state::sub_irq_off_w)); + map(0x1801, 0x1801).w(FUNC(dec8_state::main_irq_off_w)); + map(0x1802, 0x1802).w(FUNC(dec8_state::main_firq_off_w)); + map(0x1803, 0x1803).portr("IN2").w(FUNC(dec8_state::main_irq_on_w)); + map(0x1804, 0x1804).portr("DSW1").w(FUNC(dec8_state::sub_irq_on_w)); + map(0x1805, 0x1805).portr("DSW0").w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ + map(0x180c, 0x180c).w(FUNC(dec8_state::dec8_sound_w)); + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); map(0x2800, 0x2fff).ram().share("spriteram"); map(0x3000, 0x37ff).ram().share("share2"); - map(0x3800, 0x3fff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)); + map(0x3800, 0x3fff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)); map(0x4000, 0xffff).rom(); } @@ -655,7 +655,7 @@ void dec8_state::oscar_map(address_map &map) map(0x0000, 0x0eff).ram().share("share1"); map(0x0f00, 0x0fff).ram(); map(0x1000, 0x1fff).ram().share("share2"); - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); map(0x2800, 0x2fff).rw("tilegen1", FUNC(deco_bac06_device::pf_data_8bit_r), FUNC(deco_bac06_device::pf_data_8bit_w)); map(0x3000, 0x37ff).ram().share("spriteram"); /* Sprites */ map(0x3800, 0x3bff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); @@ -666,14 +666,14 @@ void dec8_state::oscar_map(address_map &map) map(0x3c04, 0x3c04).portr("DSW1"); map(0x3c00, 0x3c07).w("tilegen1", FUNC(deco_bac06_device::pf_control0_8bit_w)); map(0x3c10, 0x3c1f).w("tilegen1", FUNC(deco_bac06_device::pf_control1_8bit_w)); - map(0x3c80, 0x3c80).w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ - map(0x3d00, 0x3d00).w(this, FUNC(dec8_state::dec8_bank_w)); /* BNKS */ + map(0x3c80, 0x3c80).w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ + map(0x3d00, 0x3d00).w(FUNC(dec8_state::dec8_bank_w)); /* BNKS */ map(0x3d80, 0x3d80).w(m_soundlatch, FUNC(generic_latch_8_device::write)); /* SOUN */ - map(0x3e00, 0x3e00).w(this, FUNC(dec8_state::oscar_coin_clear_w)); /* COINCL */ - map(0x3e80, 0x3e80).w(this, FUNC(dec8_state::sub_irq_on_w)); /* IRQ 2 */ - map(0x3e81, 0x3e81).w(this, FUNC(dec8_state::main_irq_off_w)); /* IRC 1 */ - map(0x3e82, 0x3e82).w(this, FUNC(dec8_state::main_irq_on_w)); /* IRQ 1 */ - map(0x3e83, 0x3e83).w(this, FUNC(dec8_state::sub_irq_off_w)); /* IRC 2 */ + map(0x3e00, 0x3e00).w(FUNC(dec8_state::oscar_coin_clear_w)); /* COINCL */ + map(0x3e80, 0x3e80).w(FUNC(dec8_state::sub_irq_on_w)); /* IRQ 2 */ + map(0x3e81, 0x3e81).w(FUNC(dec8_state::main_irq_off_w)); /* IRC 1 */ + map(0x3e82, 0x3e82).w(FUNC(dec8_state::main_irq_on_w)); /* IRQ 1 */ + map(0x3e83, 0x3e83).w(FUNC(dec8_state::sub_irq_off_w)); /* IRC 2 */ map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -683,10 +683,10 @@ void dec8_state::oscar_sub_map(address_map &map) map(0x0000, 0x0eff).ram().share("share1"); map(0x0f00, 0x0fff).ram(); map(0x1000, 0x1fff).ram().share("share2"); - map(0x3e80, 0x3e80).w(this, FUNC(dec8_state::sub_irq_on_w)); /* IRQ 2 */ - map(0x3e81, 0x3e81).w(this, FUNC(dec8_state::main_irq_off_w)); /* IRC 1 */ - map(0x3e82, 0x3e82).w(this, FUNC(dec8_state::main_irq_on_w)); /* IRQ 1 */ - map(0x3e83, 0x3e83).w(this, FUNC(dec8_state::sub_irq_off_w)); /* IRC 2 */ + map(0x3e80, 0x3e80).w(FUNC(dec8_state::sub_irq_on_w)); /* IRQ 2 */ + map(0x3e81, 0x3e81).w(FUNC(dec8_state::main_irq_off_w)); /* IRC 1 */ + map(0x3e82, 0x3e82).w(FUNC(dec8_state::main_irq_on_w)); /* IRQ 1 */ + map(0x3e83, 0x3e83).w(FUNC(dec8_state::sub_irq_off_w)); /* IRC 2 */ map(0x4000, 0xffff).rom(); } @@ -694,16 +694,16 @@ void dec8_state::srdarwin_map(address_map &map) { map(0x0000, 0x05ff).ram(); map(0x0600, 0x07ff).ram().share("spriteram"); - map(0x0800, 0x0fff).ram().w(this, FUNC(dec8_state::srdarwin_videoram_w)).share("videoram"); + map(0x0800, 0x0fff).ram().w(FUNC(dec8_state::srdarwin_videoram_w)).share("videoram"); map(0x1000, 0x13ff).ram(); - map(0x1400, 0x17ff).rw(this, FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); - map(0x1800, 0x1801).w(this, FUNC(dec8_state::dec8_i8751_w)); - map(0x1802, 0x1802).w(this, FUNC(dec8_state::i8751_reset_w)); /* Maybe.. */ + map(0x1400, 0x17ff).rw(FUNC(dec8_state::dec8_bg_data_r), FUNC(dec8_state::dec8_bg_data_w)).share("bg_data"); + map(0x1800, 0x1801).w(FUNC(dec8_state::dec8_i8751_w)); + map(0x1802, 0x1802).w(FUNC(dec8_state::i8751_reset_w)); /* Maybe.. */ map(0x1803, 0x1803).nopw(); /* NMI ack */ map(0x1804, 0x1804).w(m_spriteram, FUNC(buffered_spriteram8_device::write)); /* DMA */ - map(0x1805, 0x1806).w(this, FUNC(dec8_state::srdarwin_control_w)); /* Scroll & Bank */ - map(0x2000, 0x2000).rw(this, FUNC(dec8_state::i8751_h_r), FUNC(dec8_state::dec8_sound_w)); /* Sound */ - map(0x2001, 0x2001).rw(this, FUNC(dec8_state::i8751_l_r), FUNC(dec8_state::flip_screen_w)); /* Flipscreen */ + map(0x1805, 0x1806).w(FUNC(dec8_state::srdarwin_control_w)); /* Scroll & Bank */ + map(0x2000, 0x2000).rw(FUNC(dec8_state::i8751_h_r), FUNC(dec8_state::dec8_sound_w)); /* Sound */ + map(0x2001, 0x2001).rw(FUNC(dec8_state::i8751_l_r), FUNC(dec8_state::flip_screen_w)); /* Flipscreen */ map(0x2800, 0x288f).w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x3000, 0x308f).w(m_palette, FUNC(deco_rmc3_device::write8_ext)).share("palette_ext"); map(0x3800, 0x3800).portr("DSW0"); /* Dip 1 */ @@ -720,7 +720,7 @@ void dec8_state::cobra_map(address_map &map) map(0x0800, 0x0fff).rw("tilegen1", FUNC(deco_bac06_device::pf_data_8bit_r), FUNC(deco_bac06_device::pf_data_8bit_w)); map(0x1000, 0x17ff).rw("tilegen2", FUNC(deco_bac06_device::pf_data_8bit_r), FUNC(deco_bac06_device::pf_data_8bit_w)); map(0x1800, 0x1fff).ram(); - map(0x2000, 0x27ff).ram().w(this, FUNC(dec8_state::dec8_videoram_w)).share("videoram"); + map(0x2000, 0x27ff).ram().w(FUNC(dec8_state::dec8_videoram_w)).share("videoram"); map(0x2800, 0x2fff).ram().share("spriteram"); map(0x3000, 0x31ff).ram().w(m_palette, FUNC(deco_rmc3_device::write8)).share("palette"); map(0x3200, 0x37ff).writeonly(); /* Unused */ @@ -733,9 +733,9 @@ void dec8_state::cobra_map(address_map &map) map(0x3a00, 0x3a00).portr("IN2"); /* VBL & coins */ map(0x3a00, 0x3a07).w("tilegen2", FUNC(deco_bac06_device::pf_control0_8bit_w)); map(0x3a10, 0x3a1f).w("tilegen2", FUNC(deco_bac06_device::pf_control1_8bit_w)); - map(0x3c00, 0x3c00).w(this, FUNC(dec8_state::dec8_bank_w)); - map(0x3c02, 0x3c02).w(this, FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ - map(0x3e00, 0x3e00).w(this, FUNC(dec8_state::dec8_sound_w)); + map(0x3c00, 0x3c00).w(FUNC(dec8_state::dec8_bank_w)); + map(0x3c02, 0x3c02).w(FUNC(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)); /* DMA */ + map(0x3e00, 0x3e00).w(FUNC(dec8_state::dec8_sound_w)); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -778,10 +778,10 @@ void dec8_state::csilver_s_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x0800, 0x0801).w("ym1", FUNC(ym2203_device::write)); map(0x1000, 0x1001).w("ym2", FUNC(ym3526_device::write)); - map(0x1800, 0x1800).w(this, FUNC(dec8_state::csilver_adpcm_data_w)); /* ADPCM data for the MSM5205 chip */ - map(0x2000, 0x2000).w(this, FUNC(dec8_state::csilver_sound_bank_w)); + map(0x1800, 0x1800).w(FUNC(dec8_state::csilver_adpcm_data_w)); /* ADPCM data for the MSM5205 chip */ + map(0x2000, 0x2000).w(FUNC(dec8_state::csilver_sound_bank_w)); map(0x3000, 0x3000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x3400, 0x3400).r(this, FUNC(dec8_state::csilver_adpcm_reset_r)); /* ? not sure */ + map(0x3400, 0x3400).r(FUNC(dec8_state::csilver_adpcm_reset_r)); /* ? not sure */ map(0x4000, 0x7fff).bankr("soundbank"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp index 98f55b96954..67680a1f151 100644 --- a/src/mame/drivers/deco156.cpp +++ b/src/mame/drivers/deco156.cpp @@ -136,19 +136,19 @@ void deco156_state::hvysmsh_map(address_map &map) map(0x100000, 0x107fff).ram(); map(0x120000, 0x120003).portr("INPUTS"); map(0x120000, 0x120003).nopw(); // Volume control in low byte - map(0x120004, 0x120007).w(this, FUNC(deco156_state::hvysmsh_eeprom_w)); + map(0x120004, 0x120007).w(FUNC(deco156_state::hvysmsh_eeprom_w)); map(0x120008, 0x12000b).nopw(); // IRQ ack? - map(0x12000c, 0x12000f).w(this, FUNC(deco156_state::hvysmsh_oki_0_bank_w)); + map(0x12000c, 0x12000f).w(FUNC(deco156_state::hvysmsh_oki_0_bank_w)); map(0x140000, 0x140000).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x160000, 0x160000).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x180000, 0x18001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x190000, 0x191fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x194000, 0x195fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1a0000, 0x1a0fff).rw(this, FUNC(deco156_state::pf1_rowscroll_r), FUNC(deco156_state::pf1_rowscroll_w)); - map(0x1a4000, 0x1a4fff).rw(this, FUNC(deco156_state::pf2_rowscroll_r), FUNC(deco156_state::pf2_rowscroll_w)); + map(0x1a0000, 0x1a0fff).rw(FUNC(deco156_state::pf1_rowscroll_r), FUNC(deco156_state::pf1_rowscroll_w)); + map(0x1a4000, 0x1a4fff).rw(FUNC(deco156_state::pf2_rowscroll_r), FUNC(deco156_state::pf2_rowscroll_w)); map(0x1c0000, 0x1c0fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x1d0010, 0x1d002f).nopr(); // Check for DMA complete? - map(0x1e0000, 0x1e1fff).rw(this, FUNC(deco156_state::spriteram_r), FUNC(deco156_state::spriteram_w)); + map(0x1e0000, 0x1e1fff).rw(FUNC(deco156_state::spriteram_r), FUNC(deco156_state::spriteram_w)); } void deco156_state::wcvol95_map(address_map &map) @@ -157,12 +157,12 @@ void deco156_state::wcvol95_map(address_map &map) map(0x100000, 0x10001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x110000, 0x111fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x114000, 0x115fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x120000, 0x120fff).rw(this, FUNC(deco156_state::pf1_rowscroll_r), FUNC(deco156_state::pf1_rowscroll_w)); - map(0x124000, 0x124fff).rw(this, FUNC(deco156_state::pf2_rowscroll_r), FUNC(deco156_state::pf2_rowscroll_w)); + map(0x120000, 0x120fff).rw(FUNC(deco156_state::pf1_rowscroll_r), FUNC(deco156_state::pf1_rowscroll_w)); + map(0x124000, 0x124fff).rw(FUNC(deco156_state::pf2_rowscroll_r), FUNC(deco156_state::pf2_rowscroll_w)); map(0x130000, 0x137fff).ram(); map(0x140000, 0x140003).portr("INPUTS"); map(0x150000, 0x150003).portw("EEPROMOUT"); - map(0x160000, 0x161fff).rw(this, FUNC(deco156_state::spriteram_r), FUNC(deco156_state::spriteram_w)); + map(0x160000, 0x161fff).rw(FUNC(deco156_state::spriteram_r), FUNC(deco156_state::spriteram_w)); map(0x170000, 0x170003).noprw(); // Irq ack? map(0x180000, 0x180fff).readonly().w(m_palette, FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); map(0x1a0000, 0x1a0007).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask32(0x000000ff); diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 0c431730688..2f6f88fd629 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -385,63 +385,63 @@ NOTE: There are several unpopulated locations (denoted by *) for additional rom void captaven_state::captaven_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x100007).r(this, FUNC(captaven_state::_71_r)); - map(0x100000, 0x100003).w(this, FUNC(captaven_state::buffer_spriteram_w<0>)); + map(0x100000, 0x100007).r(FUNC(captaven_state::_71_r)); + map(0x100000, 0x100003).w(FUNC(captaven_state::buffer_spriteram_w<0>)); map(0x108000, 0x108003).nopw(); /* ? */ - map(0x110000, 0x111fff).rw(this, FUNC(captaven_state::spriteram_r<0>), FUNC(captaven_state::spriteram_w<0>)); + map(0x110000, 0x111fff).rw(FUNC(captaven_state::spriteram_r<0>), FUNC(captaven_state::spriteram_w<0>)); map(0x120000, 0x127fff).ram(); /* Main RAM */ - map(0x128000, 0x12ffff).rw(this, FUNC(captaven_state::ioprot_r), FUNC(captaven_state::ioprot_w)).umask32(0x0000ffff); + map(0x128000, 0x12ffff).rw(FUNC(captaven_state::ioprot_r), FUNC(captaven_state::ioprot_w)).umask32(0x0000ffff); map(0x130000, 0x131fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x148000, 0x14800f).m(m_deco_irq, FUNC(deco_irq_device::map)).umask32(0x000000ff); map(0x160000, 0x167fff).ram(); /* Extra work RAM */ - map(0x168000, 0x168000).r(this, FUNC(captaven_state::captaven_dsw1_r)); - map(0x168001, 0x168001).r(this, FUNC(captaven_state::captaven_dsw2_r)); - map(0x168002, 0x168002).r(this, FUNC(captaven_state::captaven_dsw3_r)); - map(0x168003, 0x168003).r(this, FUNC(captaven_state::captaven_soundcpu_status_r)); - map(0x178000, 0x178003).w(this, FUNC(captaven_state::pri_w)); + map(0x168000, 0x168000).r(FUNC(captaven_state::captaven_dsw1_r)); + map(0x168001, 0x168001).r(FUNC(captaven_state::captaven_dsw2_r)); + map(0x168002, 0x168002).r(FUNC(captaven_state::captaven_dsw3_r)); + map(0x168003, 0x168003).r(FUNC(captaven_state::captaven_soundcpu_status_r)); + map(0x178000, 0x178003).w(FUNC(captaven_state::pri_w)); map(0x180000, 0x18001f).rw("tilegen1", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x190000, 0x191fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x192000, 0x193fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); /* Mirror address - bug in program code */ map(0x194000, 0x195fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1a0000, 0x1a3fff).ram().w(this, FUNC(captaven_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); - map(0x1a4000, 0x1a5fff).ram().w(this, FUNC(captaven_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); + map(0x1a0000, 0x1a3fff).ram().w(FUNC(captaven_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); + map(0x1a4000, 0x1a5fff).ram().w(FUNC(captaven_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); map(0x1c0000, 0x1c001f).rw("tilegen2", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x1d0000, 0x1d1fff).rw("tilegen2", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1d4000, 0x1d5fff).rw("tilegen2", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); // unused - map(0x1e0000, 0x1e3fff).ram().w(this, FUNC(captaven_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); - map(0x1e4000, 0x1e5fff).ram().w(this, FUNC(captaven_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); // unused + map(0x1e0000, 0x1e3fff).ram().w(FUNC(captaven_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); + map(0x1e4000, 0x1e5fff).ram().w(FUNC(captaven_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); // unused } void fghthist_state::fghthist_map(address_map &map) { map.unmap_value_high(); -// map(0x000000, 0x001fff).rom().w(this, FUNC(fghthist_state::pf1_data_w)); // wtf?? +// map(0x000000, 0x001fff).rom().w(FUNC(fghthist_state::pf1_data_w)); // wtf?? map(0x000000, 0x0fffff).rom(); map(0x100000, 0x11ffff).ram(); - map(0x120020, 0x120021).r(this, FUNC(fghthist_state::fghthist_in0_r)); - map(0x120024, 0x120025).r(this, FUNC(fghthist_state::fghthist_in1_r)); - map(0x120028, 0x120028).r(this, FUNC(fghthist_state::eeprom_r)); - map(0x12002c, 0x12002c).w(this, FUNC(fghthist_state::eeprom_w)); - map(0x12002d, 0x12002d).w(this, FUNC(fghthist_state::volume_w)); + map(0x120020, 0x120021).r(FUNC(fghthist_state::fghthist_in0_r)); + map(0x120024, 0x120025).r(FUNC(fghthist_state::fghthist_in1_r)); + map(0x120028, 0x120028).r(FUNC(fghthist_state::eeprom_r)); + map(0x12002c, 0x12002c).w(FUNC(fghthist_state::eeprom_w)); + map(0x12002d, 0x12002d).w(FUNC(fghthist_state::volume_w)); map(0x1201fc, 0x1201fc).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x140000, 0x140003).w(this, FUNC(fghthist_state::vblank_ack_w)); - map(0x168000, 0x169fff).ram().w(this, FUNC(fghthist_state::buffered_palette_w)).share("paletteram"); - map(0x16c008, 0x16c00b).w(this, FUNC(fghthist_state::palette_dma_w)); - map(0x16c010, 0x16c013).r(this, FUNC(fghthist_state::unk_status_r)); - map(0x178000, 0x179fff).rw(this, FUNC(fghthist_state::spriteram_r<0>), FUNC(fghthist_state::spriteram_w<0>)); - map(0x17c010, 0x17c013).w(this, FUNC(fghthist_state::buffer_spriteram_w<0>)); - map(0x17c020, 0x17c023).r(this, FUNC(fghthist_state::unk_status_r)); + map(0x140000, 0x140003).w(FUNC(fghthist_state::vblank_ack_w)); + map(0x168000, 0x169fff).ram().w(FUNC(fghthist_state::buffered_palette_w)).share("paletteram"); + map(0x16c008, 0x16c00b).w(FUNC(fghthist_state::palette_dma_w)); + map(0x16c010, 0x16c013).r(FUNC(fghthist_state::unk_status_r)); + map(0x178000, 0x179fff).rw(FUNC(fghthist_state::spriteram_r<0>), FUNC(fghthist_state::spriteram_w<0>)); + map(0x17c010, 0x17c013).w(FUNC(fghthist_state::buffer_spriteram_w<0>)); + map(0x17c020, 0x17c023).r(FUNC(fghthist_state::unk_status_r)); map(0x182000, 0x183fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x184000, 0x185fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x192000, 0x193fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); - map(0x194000, 0x195fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); + map(0x192000, 0x193fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); + map(0x194000, 0x195fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); map(0x1a0000, 0x1a001f).rw("tilegen1", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x1c2000, 0x1c3fff).rw("tilegen2", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1c4000, 0x1c5fff).rw("tilegen2", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1d2000, 0x1d3fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); - map(0x1d4000, 0x1d5fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); + map(0x1d2000, 0x1d3fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); + map(0x1d4000, 0x1d5fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); map(0x1e0000, 0x1e001f).rw("tilegen2", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); - map(0x200000, 0x207fff).rw(this, FUNC(fghthist_state::ioprot_r), FUNC(fghthist_state::ioprot_w)).umask32(0xffff0000).share("prot32ram"); // only maps on 16-bits + map(0x200000, 0x207fff).rw(FUNC(fghthist_state::ioprot_r), FUNC(fghthist_state::ioprot_w)).umask32(0xffff0000).share("prot32ram"); // only maps on 16-bits map(0x208800, 0x208803).nopw(); /* ? */ } @@ -449,26 +449,26 @@ void fghthist_state::fghthsta_memmap(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x100000, 0x11ffff).ram(); - map(0x140000, 0x140003).w(this, FUNC(fghthist_state::vblank_ack_w)); - map(0x150000, 0x150000).w(this, FUNC(fghthist_state::eeprom_w)); - map(0x150001, 0x150001).w(this, FUNC(fghthist_state::volume_w)); - map(0x168000, 0x169fff).ram().w(this, FUNC(fghthist_state::buffered_palette_w)).share("paletteram"); - map(0x16c008, 0x16c00b).w(this, FUNC(fghthist_state::palette_dma_w)); - map(0x16c010, 0x16c013).r(this, FUNC(fghthist_state::unk_status_r)); - map(0x178000, 0x179fff).rw(this, FUNC(fghthist_state::spriteram_r<0>), FUNC(fghthist_state::spriteram_w<0>)); - map(0x17c010, 0x17c013).w(this, FUNC(fghthist_state::buffer_spriteram_w<0>)); - map(0x17c020, 0x17c023).r(this, FUNC(fghthist_state::unk_status_r)); + map(0x140000, 0x140003).w(FUNC(fghthist_state::vblank_ack_w)); + map(0x150000, 0x150000).w(FUNC(fghthist_state::eeprom_w)); + map(0x150001, 0x150001).w(FUNC(fghthist_state::volume_w)); + map(0x168000, 0x169fff).ram().w(FUNC(fghthist_state::buffered_palette_w)).share("paletteram"); + map(0x16c008, 0x16c00b).w(FUNC(fghthist_state::palette_dma_w)); + map(0x16c010, 0x16c013).r(FUNC(fghthist_state::unk_status_r)); + map(0x178000, 0x179fff).rw(FUNC(fghthist_state::spriteram_r<0>), FUNC(fghthist_state::spriteram_w<0>)); + map(0x17c010, 0x17c013).w(FUNC(fghthist_state::buffer_spriteram_w<0>)); + map(0x17c020, 0x17c023).r(FUNC(fghthist_state::unk_status_r)); map(0x182000, 0x183fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x184000, 0x185fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x192000, 0x193fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); - map(0x194000, 0x195fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); + map(0x192000, 0x193fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); + map(0x194000, 0x195fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); map(0x1a0000, 0x1a001f).rw("tilegen1", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x1c2000, 0x1c3fff).rw("tilegen2", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1c4000, 0x1c5fff).rw("tilegen2", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1d2000, 0x1d3fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); - map(0x1d4000, 0x1d5fff).ram().w(this, FUNC(fghthist_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); + map(0x1d2000, 0x1d3fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); + map(0x1d4000, 0x1d5fff).ram().w(FUNC(fghthist_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); map(0x1e0000, 0x1e001f).rw("tilegen2", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); - map(0x200000, 0x207fff).rw(this, FUNC(fghthist_state::ioprot_r), FUNC(fghthist_state::ioprot_w)).umask32(0xffff0000).share("prot32ram"); // only maps on 16-bits + map(0x200000, 0x207fff).rw(FUNC(fghthist_state::ioprot_r), FUNC(fghthist_state::ioprot_w)).umask32(0xffff0000).share("prot32ram"); // only maps on 16-bits } // the video drawing (especially sprite) code on this is too slow to cope with proper partial updates @@ -477,12 +477,12 @@ void dragngun_state::dragngun_map(address_map &map) { map(0x0000000, 0x00fffff).rom(); map(0x0100000, 0x011ffff).ram(); - map(0x0120000, 0x0127fff).rw(this, FUNC(dragngun_state::ioprot_r), FUNC(dragngun_state::ioprot_w)).umask32(0x0000ffff); + map(0x0120000, 0x0127fff).rw(FUNC(dragngun_state::ioprot_r), FUNC(dragngun_state::ioprot_w)).umask32(0x0000ffff); // map(0x01204c0, 0x01204c3) AM_WRITE(sound_w) map(0x0128000, 0x012800f).m(m_deco_irq, FUNC(deco_irq_device::map)).umask32(0x000000ff); - map(0x0130000, 0x0131fff).ram().w(this, FUNC(dragngun_state::buffered_palette_w)).share("paletteram"); + map(0x0130000, 0x0131fff).ram().w(FUNC(dragngun_state::buffered_palette_w)).share("paletteram"); map(0x0138000, 0x0138003).noprw(); /* Palette dma complete in bit 0x8? ack? return 0 else tight loop */ - map(0x0138008, 0x013800b).w(this, FUNC(dragngun_state::palette_dma_w)); + map(0x0138008, 0x013800b).w(FUNC(dragngun_state::palette_dma_w)); map(0x0170100, 0x0170103).nopw(); map(0x0170038, 0x017003b).nopw(); map(0x017002C, 0x017002f).nopw(); @@ -490,13 +490,13 @@ void dragngun_state::dragngun_map(address_map &map) map(0x0180000, 0x018001f).rw("tilegen1", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x0190000, 0x0191fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x0194000, 0x0195fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x01a0000, 0x01a3fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); - map(0x01a4000, 0x01a5fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); + map(0x01a0000, 0x01a3fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); + map(0x01a4000, 0x01a5fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); map(0x01c0000, 0x01c001f).rw("tilegen2", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x01d0000, 0x01d1fff).rw("tilegen2", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x01d4000, 0x01d5fff).rw("tilegen2", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); // unused - map(0x01e0000, 0x01e3fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); - map(0x01e4000, 0x01e5fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); // unused + map(0x01e0000, 0x01e3fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); + map(0x01e4000, 0x01e5fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); // unused map(0x0204800, 0x0204fff).ram(); // ace? 0x10 byte increments only // 13f ff stuff map(0x0208000, 0x0208fff).ram().share("lay0"); map(0x020c000, 0x020cfff).ram().share("lay1"); @@ -504,18 +504,18 @@ void dragngun_state::dragngun_map(address_map &map) map(0x0218000, 0x021ffff).ram().share("look1"); map(0x0220000, 0x0221fff).ram().share("spriteram"); /* Main spriteram */ map(0x0228000, 0x02283ff).ram(); //0x10 byte increments only - map(0x0230000, 0x0230003).w(this, FUNC(dragngun_state::spriteram_dma_w)); + map(0x0230000, 0x0230003).w(FUNC(dragngun_state::spriteram_dma_w)); map(0x0300000, 0x03fffff).rom(); map(0x0400000, 0x0400000).rw("oki3", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x0410000, 0x0410003).w(this, FUNC(dragngun_state::volume_w)); - map(0x0418000, 0x0418003).w(this, FUNC(dragngun_state::speaker_switch_w)); - map(0x0420000, 0x0420000).rw(this, FUNC(dragngun_state::eeprom_r), FUNC(dragngun_state::eeprom_w)); - map(0x0430000, 0x043001f).w(this, FUNC(dragngun_state::lightgun_w)); - map(0x0438000, 0x0438003).r(this, FUNC(dragngun_state::lightgun_r)); + map(0x0410000, 0x0410003).w(FUNC(dragngun_state::volume_w)); + map(0x0418000, 0x0418003).w(FUNC(dragngun_state::speaker_switch_w)); + map(0x0420000, 0x0420000).rw(FUNC(dragngun_state::eeprom_r), FUNC(dragngun_state::eeprom_w)); + map(0x0430000, 0x043001f).w(FUNC(dragngun_state::lightgun_w)); + map(0x0438000, 0x0438003).r(FUNC(dragngun_state::lightgun_r)); map(0x0440000, 0x0440003).portr("IN2"); - map(0x0500000, 0x0500003).w(this, FUNC(dragngun_state::sprite_control_w)); + map(0x0500000, 0x0500003).w(FUNC(dragngun_state::sprite_control_w)); // this is clearly the dvi video related area - map(0x1000000, 0x1000007).r(this, FUNC(dragngun_state::unk_video_r)); + map(0x1000000, 0x1000007).r(FUNC(dragngun_state::unk_video_r)); map(0x1000100, 0x1007fff).ram(); map(0x10b0000, 0x10b01ff).ram(); map(0x1400000, 0x1ffffff).rom().region("dvi", 0x00000); // reads from here during boss battles when the videos should be displayed at the offsets where the DVI headers are // as a result it ends up writing what looks like pointers to the frame data in the ram area above @@ -524,30 +524,30 @@ void dragngun_state::dragngun_map(address_map &map) void dragngun_state::lockloadu_map(address_map &map) { dragngun_map(map); - map(0x0170000, 0x0170007).r(this, FUNC(dragngun_state::lockload_gun_mirror_r)); /* Not on Dragongun */ + map(0x0170000, 0x0170007).r(FUNC(dragngun_state::lockload_gun_mirror_r)); /* Not on Dragongun */ } void dragngun_state::lockload_map(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x100000, 0x11ffff).ram(); - map(0x120000, 0x127fff).rw(this, FUNC(dragngun_state::ioprot_r), FUNC(dragngun_state::ioprot_w)).umask32(0x0000ffff); + map(0x120000, 0x127fff).rw(FUNC(dragngun_state::ioprot_r), FUNC(dragngun_state::ioprot_w)).umask32(0x0000ffff); map(0x128000, 0x12800f).m(m_deco_irq, FUNC(deco_irq_device::map)).umask32(0x000000ff); - map(0x130000, 0x131fff).ram().w(this, FUNC(dragngun_state::buffered_palette_w)).share("paletteram"); + map(0x130000, 0x131fff).ram().w(FUNC(dragngun_state::buffered_palette_w)).share("paletteram"); map(0x138000, 0x138003).readonly().nopw(); //palette dma complete in bit 0x8? ack? return 0 else tight loop - map(0x138008, 0x13800b).w(this, FUNC(dragngun_state::palette_dma_w)); - map(0x170000, 0x170007).r(this, FUNC(dragngun_state::lockload_gun_mirror_r)); /* Not on Dragongun */ - map(0x178008, 0x17800f).w(this, FUNC(dragngun_state::gun_irq_ack_w)); /* Gun read ACK's */ + map(0x138008, 0x13800b).w(FUNC(dragngun_state::palette_dma_w)); + map(0x170000, 0x170007).r(FUNC(dragngun_state::lockload_gun_mirror_r)); /* Not on Dragongun */ + map(0x178008, 0x17800f).w(FUNC(dragngun_state::gun_irq_ack_w)); /* Gun read ACK's */ map(0x180000, 0x18001f).rw("tilegen1", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x190000, 0x191fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x194000, 0x195fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1a0000, 0x1a3fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); - map(0x1a4000, 0x1a5fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); + map(0x1a0000, 0x1a3fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); + map(0x1a4000, 0x1a5fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); map(0x1c0000, 0x1c001f).rw("tilegen2", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x1d0000, 0x1d1fff).rw("tilegen2", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1d4000, 0x1d5fff).rw("tilegen2", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); // unused - map(0x1e0000, 0x1e3fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); - map(0x1e4000, 0x1e5fff).ram().w(this, FUNC(dragngun_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); // unused + map(0x1e0000, 0x1e3fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); + map(0x1e4000, 0x1e5fff).ram().w(FUNC(dragngun_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); // unused map(0x204800, 0x204fff).ram(); //0x10 byte increments only map(0x208000, 0x208fff).ram().share("lay0"); map(0x20c000, 0x20cfff).ram().share("lay1"); @@ -555,12 +555,12 @@ void dragngun_state::lockload_map(address_map &map) map(0x218000, 0x21ffff).ram().share("look1"); map(0x220000, 0x221fff).ram().share("spriteram"); /* Main spriteram */ map(0x228000, 0x2283ff).ram(); //0x10 byte increments only - map(0x230000, 0x230003).w(this, FUNC(dragngun_state::spriteram_dma_w)); + map(0x230000, 0x230003).w(FUNC(dragngun_state::spriteram_dma_w)); map(0x300000, 0x3fffff).rom(); - map(0x410000, 0x410003).w(this, FUNC(dragngun_state::volume_w)); - map(0x420000, 0x420000).rw(this, FUNC(dragngun_state::eeprom_r), FUNC(dragngun_state::eeprom_w)); + map(0x410000, 0x410003).w(FUNC(dragngun_state::volume_w)); + map(0x420000, 0x420000).rw(FUNC(dragngun_state::eeprom_r), FUNC(dragngun_state::eeprom_w)); map(0x440000, 0x440003).portr("IN2"); - map(0x500000, 0x500003).w(this, FUNC(dragngun_state::sprite_control_w)); + map(0x500000, 0x500003).w(FUNC(dragngun_state::sprite_control_w)); } void nslasher_state::tattass_map(address_map &map) @@ -570,8 +570,8 @@ void nslasher_state::tattass_map(address_map &map) map(0x100000, 0x11ffff).ram(); map(0x120000, 0x120003).noprw(); /* ACIA (unused) */ map(0x130000, 0x130003).nopw(); /* Coin port (unused?) */ - map(0x140000, 0x140003).w(this, FUNC(nslasher_state::vblank_ack_w)); - map(0x150000, 0x150003).w(this, FUNC(nslasher_state::tattass_control_w)); /* Volume port/Eprom/Priority */ + map(0x140000, 0x140003).w(FUNC(nslasher_state::vblank_ack_w)); + map(0x150000, 0x150003).w(FUNC(nslasher_state::tattass_control_w)); /* Volume port/Eprom/Priority */ map(0x162000, 0x162fff).ram(); /* 'Jack' RAM!? */ map(0x163000, 0x16309f).rw(m_deco_ace, FUNC(deco_ace_device::ace_r), FUNC(deco_ace_device::ace_w)).umask32(0x0000ffff); /* 'Ace' RAM */ map(0x164000, 0x164003).nopw(); /* Palette control BG2/3 ($1a constant) */ @@ -581,26 +581,26 @@ void nslasher_state::tattass_map(address_map &map) map(0x168000, 0x169fff).rw(m_deco_ace, FUNC(deco_ace_device::buffered_palette_r), FUNC(deco_ace_device::buffered_palette_w)); map(0x16c000, 0x16c003).nopw(); map(0x16c008, 0x16c00b).w(m_deco_ace, FUNC(deco_ace_device::palette_dma_w)); - map(0x170000, 0x171fff).rw(this, FUNC(nslasher_state::spriteram_r<0>), FUNC(nslasher_state::spriteram_w<0>)); + map(0x170000, 0x171fff).rw(FUNC(nslasher_state::spriteram_r<0>), FUNC(nslasher_state::spriteram_w<0>)); map(0x174000, 0x174003).nopw(); /* Sprite DMA mode (2) */ - map(0x174010, 0x174013).w(this, FUNC(nslasher_state::buffer_spriteram_w<0>)); + map(0x174010, 0x174013).w(FUNC(nslasher_state::buffer_spriteram_w<0>)); map(0x174018, 0x17401b).nopw(); /* Sprite 'CPU' (unused) */ - map(0x178000, 0x179fff).rw(this, FUNC(nslasher_state::spriteram_r<1>), FUNC(nslasher_state::spriteram_w<1>)); + map(0x178000, 0x179fff).rw(FUNC(nslasher_state::spriteram_r<1>), FUNC(nslasher_state::spriteram_w<1>)); map(0x17c000, 0x17c003).nopw(); /* Sprite DMA mode (2) */ - map(0x17c010, 0x17c013).w(this, FUNC(nslasher_state::buffer_spriteram_w<1>)); + map(0x17c010, 0x17c013).w(FUNC(nslasher_state::buffer_spriteram_w<1>)); map(0x17c018, 0x17c01b).nopw(); /* Sprite 'CPU' (unused) */ map(0x182000, 0x183fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x184000, 0x185fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x192000, 0x193fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); - map(0x194000, 0x195fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); + map(0x192000, 0x193fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); + map(0x194000, 0x195fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); map(0x1a0000, 0x1a001f).rw("tilegen1", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x1c2000, 0x1c3fff).rw("tilegen2", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1c4000, 0x1c5fff).rw("tilegen2", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1d2000, 0x1d3fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); - map(0x1d4000, 0x1d5fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); + map(0x1d2000, 0x1d3fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); + map(0x1d4000, 0x1d5fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); map(0x1e0000, 0x1e001f).rw("tilegen2", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); - map(0x200000, 0x207fff).rw(this, FUNC(nslasher_state::ioprot_r), FUNC(nslasher_state::ioprot_w)).umask32(0xffff0000); - map(0x200000, 0x207fff).r(this, FUNC(nslasher_state::nslasher_debug_r)).umask32(0x0000ffff); + map(0x200000, 0x207fff).rw(FUNC(nslasher_state::ioprot_r), FUNC(nslasher_state::ioprot_w)).umask32(0xffff0000); + map(0x200000, 0x207fff).r(FUNC(nslasher_state::nslasher_debug_r)).umask32(0x0000ffff); } void nslasher_state::nslasher_map(address_map &map) @@ -608,9 +608,9 @@ void nslasher_state::nslasher_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x100000, 0x11ffff).ram(); map(0x120000, 0x1200ff).noprw(); /* ACIA (unused) */ - map(0x140000, 0x140003).w(this, FUNC(nslasher_state::vblank_ack_w)); - map(0x150000, 0x150000).w(this, FUNC(nslasher_state::eeprom_w)); - map(0x150001, 0x150001).w(this, FUNC(nslasher_state::volume_w)); + map(0x140000, 0x140003).w(FUNC(nslasher_state::vblank_ack_w)); + map(0x150000, 0x150000).w(FUNC(nslasher_state::eeprom_w)); + map(0x150001, 0x150001).w(FUNC(nslasher_state::volume_w)); map(0x163000, 0x16309f).rw(m_deco_ace, FUNC(deco_ace_device::ace_r), FUNC(deco_ace_device::ace_w)).umask32(0x0000ffff); /* 'Ace' RAM */ map(0x164000, 0x164003).nopw(); /* Palette control BG2/3 ($1a constant) */ map(0x164004, 0x164007).nopw(); /* Palette control Obj1 ($4 constant) */ @@ -619,26 +619,26 @@ void nslasher_state::nslasher_map(address_map &map) map(0x168000, 0x169fff).rw(m_deco_ace, FUNC(deco_ace_device::buffered_palette_r), FUNC(deco_ace_device::buffered_palette_w)); map(0x16c000, 0x16c003).nopw(); map(0x16c008, 0x16c00b).w(m_deco_ace, FUNC(deco_ace_device::palette_dma_w)); - map(0x170000, 0x171fff).rw(this, FUNC(nslasher_state::spriteram_r<0>), FUNC(nslasher_state::spriteram_w<0>)); + map(0x170000, 0x171fff).rw(FUNC(nslasher_state::spriteram_r<0>), FUNC(nslasher_state::spriteram_w<0>)); map(0x174000, 0x174003).nopw(); /* Sprite DMA mode (2) */ - map(0x174010, 0x174013).w(this, FUNC(nslasher_state::buffer_spriteram_w<0>)); + map(0x174010, 0x174013).w(FUNC(nslasher_state::buffer_spriteram_w<0>)); map(0x174018, 0x17401b).nopw(); /* Sprite 'CPU' (unused) */ - map(0x178000, 0x179fff).rw(this, FUNC(nslasher_state::spriteram_r<1>), FUNC(nslasher_state::spriteram_w<1>)); + map(0x178000, 0x179fff).rw(FUNC(nslasher_state::spriteram_r<1>), FUNC(nslasher_state::spriteram_w<1>)); map(0x17c000, 0x17c003).nopw(); /* Sprite DMA mode (2) */ - map(0x17c010, 0x17c013).w(this, FUNC(nslasher_state::buffer_spriteram_w<1>)); + map(0x17c010, 0x17c013).w(FUNC(nslasher_state::buffer_spriteram_w<1>)); map(0x17c018, 0x17c01b).nopw(); /* Sprite 'CPU' (unused) */ map(0x182000, 0x183fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x184000, 0x185fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x192000, 0x193fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); - map(0x194000, 0x195fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); + map(0x192000, 0x193fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<0>)).share("pf1_rowscroll32"); + map(0x194000, 0x195fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<1>)).share("pf2_rowscroll32"); map(0x1a0000, 0x1a001f).rw("tilegen1", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x1c2000, 0x1c3fff).rw("tilegen2", FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1c4000, 0x1c5fff).rw("tilegen2", FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1d2000, 0x1d3fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); - map(0x1d4000, 0x1d5fff).ram().w(this, FUNC(nslasher_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); + map(0x1d2000, 0x1d3fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<2>)).share("pf3_rowscroll32"); + map(0x1d4000, 0x1d5fff).ram().w(FUNC(nslasher_state::pf_rowscroll_w<3>)).share("pf4_rowscroll32"); map(0x1e0000, 0x1e001f).rw("tilegen2", FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); - map(0x200000, 0x207fff).rw(this, FUNC(nslasher_state::ioprot_r), FUNC(nslasher_state::ioprot_w)).umask32(0xffff0000); - map(0x200000, 0x207fff).r(this, FUNC(nslasher_state::nslasher_debug_r)).umask32(0x0000ffff); // seems to be debug switches / code activated by this? + map(0x200000, 0x207fff).rw(FUNC(nslasher_state::ioprot_r), FUNC(nslasher_state::ioprot_w)).umask32(0xffff0000); + map(0x200000, 0x207fff).r(FUNC(nslasher_state::nslasher_debug_r)).umask32(0x0000ffff); // seems to be debug switches / code activated by this? } // H6280 based sound @@ -680,13 +680,13 @@ void deco32_state::z80_sound_io(address_map &map) void dragngun_state::lockload_sound_map(address_map &map) { z80_sound_map(map); - map(0xe000, 0xe000).w(this, FUNC(dragngun_state::lockload_okibank_hi_w)); + map(0xe000, 0xe000).w(FUNC(dragngun_state::lockload_okibank_hi_w)); } void dragngun_state::lockloadu_sound_map(address_map &map) { h6280_sound_map(map); - map(0x150000, 0x150000).w(this, FUNC(dragngun_state::lockload_okibank_hi_w)); + map(0x150000, 0x150000).w(FUNC(dragngun_state::lockload_okibank_hi_w)); } diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp index 884ceba0f97..bea6b44a5ab 100644 --- a/src/mame/drivers/deco_ld.cpp +++ b/src/mame/drivers/deco_ld.cpp @@ -276,10 +276,10 @@ void deco_ld_state::rblaster_map(address_map &map) map(0x1001, 0x1001).portr("DSW1"); map(0x1002, 0x1002).portr("DSW2"); map(0x1003, 0x1003).portr("IN1"); - map(0x1004, 0x1004).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(this, FUNC(deco_ld_state::decold_sound_cmd_w)); - map(0x1005, 0x1005).r(this, FUNC(deco_ld_state::sound_status_r)); + map(0x1004, 0x1004).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(FUNC(deco_ld_state::decold_sound_cmd_w)); + map(0x1005, 0x1005).r(FUNC(deco_ld_state::sound_status_r)); //AM_RANGE(0x1006, 0x1007) AM_DEVREADWRITE("acia", acia6850_device, read, write) - map(0x1006, 0x1006).r(this, FUNC(deco_ld_state::acia_status_hack_r)); + map(0x1006, 0x1006).r(FUNC(deco_ld_state::acia_status_hack_r)); map(0x1007, 0x1007).rw(m_laserdisc, FUNC(sony_ldp1000_device::status_r), FUNC(sony_ldp1000_device::command_w)); map(0x1800, 0x1fff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2000, 0x27ff).ram(); diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index 31865131ee4..beabd4d7bd5 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/src/mame/drivers/deco_mlc.cpp @@ -298,22 +298,22 @@ void deco_mlc_state::avengrgs_map(address_map &map) { map(0x0000000, 0x00fffff).rom().mirror(0xff000000); map(0x0100000, 0x011ffff).ram().share("mainram").mirror(0xff000000); - map(0x0200000, 0x0200003).r(this, FUNC(deco_mlc_state::mlc_200000_r)).mirror(0xff000000); - map(0x0200004, 0x0200007).r(this, FUNC(deco_mlc_state::mlc_200004_r)).mirror(0xff000000); - map(0x0200070, 0x0200073).r(this, FUNC(deco_mlc_state::mlc_200070_r)).mirror(0xff000000); - map(0x0200074, 0x0200077).r(this, FUNC(deco_mlc_state::mlc_scanline_r)).mirror(0xff000000); - map(0x020007c, 0x020007f).r(this, FUNC(deco_mlc_state::mlc_20007c_r)).mirror(0xff000000); - map(0x0200000, 0x020007f).w(this, FUNC(deco_mlc_state::irq_ram_w)).share("irq_ram").mirror(0xff000000); + map(0x0200000, 0x0200003).r(FUNC(deco_mlc_state::mlc_200000_r)).mirror(0xff000000); + map(0x0200004, 0x0200007).r(FUNC(deco_mlc_state::mlc_200004_r)).mirror(0xff000000); + map(0x0200070, 0x0200073).r(FUNC(deco_mlc_state::mlc_200070_r)).mirror(0xff000000); + map(0x0200074, 0x0200077).r(FUNC(deco_mlc_state::mlc_scanline_r)).mirror(0xff000000); + map(0x020007c, 0x020007f).r(FUNC(deco_mlc_state::mlc_20007c_r)).mirror(0xff000000); + map(0x0200000, 0x020007f).w(FUNC(deco_mlc_state::irq_ram_w)).share("irq_ram").mirror(0xff000000); map(0x0200080, 0x02000ff).ram().share("clip_ram").mirror(0xff000000); - map(0x0204000, 0x0206fff).rw(this, FUNC(deco_mlc_state::spriteram_r), FUNC(deco_mlc_state::spriteram_w)).mirror(0xff000000); + map(0x0204000, 0x0206fff).rw(FUNC(deco_mlc_state::spriteram_r), FUNC(deco_mlc_state::spriteram_w)).mirror(0xff000000); map(0x0280000, 0x029ffff).ram().share("vram").mirror(0xff000000); map(0x0300000, 0x0307fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).cswidth(32).share("palette").mirror(0xff000000); map(0x0400000, 0x0400003).portr("INPUTS").mirror(0xff000000); map(0x0440000, 0x0440003).portr("INPUTS2").mirror(0xff000000); map(0x0440004, 0x0440007).portr("INPUTS3").mirror(0xff000000); - map(0x0440008, 0x044000b).r(this, FUNC(deco_mlc_state::mlc_440008_r)).mirror(0xff000000); - map(0x044001c, 0x044001f).rw(this, FUNC(deco_mlc_state::mlc_44001c_r), FUNC(deco_mlc_state::mlc_44001c_w)).mirror(0xff000000); - map(0x0500000, 0x0500003).w(this, FUNC(deco_mlc_state::eeprom_w)).mirror(0xff000000); + map(0x0440008, 0x044000b).r(FUNC(deco_mlc_state::mlc_440008_r)).mirror(0xff000000); + map(0x044001c, 0x044001f).rw(FUNC(deco_mlc_state::mlc_44001c_r), FUNC(deco_mlc_state::mlc_44001c_w)).mirror(0xff000000); + map(0x0500000, 0x0500003).w(FUNC(deco_mlc_state::eeprom_w)).mirror(0xff000000); map(0x0600000, 0x0600007).rw(m_ymz, FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask32(0xff000000).mirror(0xff000000); } @@ -321,24 +321,24 @@ void deco_mlc_state::decomlc_map(address_map &map) { map(0x0000000, 0x00fffff).rom(); map(0x0100000, 0x011ffff).ram().share("mainram"); - map(0x0200000, 0x0200003).r(this, FUNC(deco_mlc_state::mlc_200000_r)); - map(0x0200004, 0x0200007).r(this, FUNC(deco_mlc_state::mlc_200004_r)); - map(0x0200070, 0x0200073).r(this, FUNC(deco_mlc_state::mlc_200070_r)); - map(0x0200074, 0x0200077).r(this, FUNC(deco_mlc_state::mlc_scanline_r)); - map(0x020007c, 0x020007f).r(this, FUNC(deco_mlc_state::mlc_20007c_r)); - map(0x0200000, 0x020007f).w(this, FUNC(deco_mlc_state::irq_ram_w)).share("irq_ram"); + map(0x0200000, 0x0200003).r(FUNC(deco_mlc_state::mlc_200000_r)); + map(0x0200004, 0x0200007).r(FUNC(deco_mlc_state::mlc_200004_r)); + map(0x0200070, 0x0200073).r(FUNC(deco_mlc_state::mlc_200070_r)); + map(0x0200074, 0x0200077).r(FUNC(deco_mlc_state::mlc_scanline_r)); + map(0x020007c, 0x020007f).r(FUNC(deco_mlc_state::mlc_20007c_r)); + map(0x0200000, 0x020007f).w(FUNC(deco_mlc_state::irq_ram_w)).share("irq_ram"); map(0x0200080, 0x02000ff).ram().share("clip_ram"); - map(0x0204000, 0x0206fff).rw(this, FUNC(deco_mlc_state::spriteram_r), FUNC(deco_mlc_state::spriteram_w)); + map(0x0204000, 0x0206fff).rw(FUNC(deco_mlc_state::spriteram_r), FUNC(deco_mlc_state::spriteram_w)); map(0x0280000, 0x029ffff).ram().share("vram"); map(0x0300000, 0x0307fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).cswidth(32).share("palette"); map(0x0400000, 0x0400003).portr("INPUTS"); map(0x0440000, 0x0440003).portr("INPUTS2"); map(0x0440004, 0x0440007).portr("INPUTS3"); - map(0x0440008, 0x044000b).r(this, FUNC(deco_mlc_state::mlc_440008_r)); - map(0x044001c, 0x044001f).rw(this, FUNC(deco_mlc_state::mlc_44001c_r), FUNC(deco_mlc_state::mlc_44001c_w)); - map(0x0500000, 0x0500003).w(this, FUNC(deco_mlc_state::eeprom_w)); + map(0x0440008, 0x044000b).r(FUNC(deco_mlc_state::mlc_440008_r)); + map(0x044001c, 0x044001f).rw(FUNC(deco_mlc_state::mlc_44001c_r), FUNC(deco_mlc_state::mlc_44001c_w)); + map(0x0500000, 0x0500003).w(FUNC(deco_mlc_state::eeprom_w)); map(0x0600000, 0x0600007).rw(m_ymz, FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask32(0xff000000); - map(0x070f000, 0x070ffff).rw(this, FUNC(deco_mlc_state::sh96_protection_region_0_146_r), FUNC(deco_mlc_state::sh96_protection_region_0_146_w)).umask32(0xffff0000); + map(0x070f000, 0x070ffff).rw(FUNC(deco_mlc_state::sh96_protection_region_0_146_r), FUNC(deco_mlc_state::sh96_protection_region_0_146_w)).umask32(0xffff0000); } /******************************************************************************/ diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp index 95ed6b7e287..01e5868e5ad 100644 --- a/src/mame/drivers/decocass.cpp +++ b/src/mame/drivers/decocass.cpp @@ -83,41 +83,41 @@ READ8_MEMBER(decocass_state::mirrorcolorram_r) void decocass_state::decocass_map(address_map &map) { map(0x0000, 0x5fff).ram().share("rambase"); - map(0x6000, 0xbfff).ram().w(this, FUNC(decocass_state::decocass_charram_w)).share("charram"); /* still RMS3 RAM */ - map(0xc000, 0xc3ff).ram().w(this, FUNC(decocass_state::decocass_fgvideoram_w)).share("fgvideoram"); /* DSP3 RAM */ - map(0xc400, 0xc7ff).ram().w(this, FUNC(decocass_state::decocass_colorram_w)).share("colorram"); - map(0xc800, 0xcbff).rw(this, FUNC(decocass_state::mirrorvideoram_r), FUNC(decocass_state::mirrorvideoram_w)); - map(0xcc00, 0xcfff).rw(this, FUNC(decocass_state::mirrorcolorram_r), FUNC(decocass_state::mirrorcolorram_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(decocass_state::decocass_tileram_w)).share("tileram"); - map(0xd800, 0xdbff).ram().w(this, FUNC(decocass_state::decocass_objectram_w)).share("objectram"); - map(0xe000, 0xe0ff).ram().w(this, FUNC(decocass_state::decocass_paletteram_w)).share("paletteram"); - map(0xe300, 0xe300).portr("DSW1").w(this, FUNC(decocass_state::decocass_watchdog_count_w)); - map(0xe301, 0xe301).portr("DSW2").w(this, FUNC(decocass_state::decocass_watchdog_flip_w)); - map(0xe302, 0xe302).w(this, FUNC(decocass_state::decocass_color_missiles_w)); - map(0xe400, 0xe400).w(this, FUNC(decocass_state::decocass_reset_w)); + map(0x6000, 0xbfff).ram().w(FUNC(decocass_state::decocass_charram_w)).share("charram"); /* still RMS3 RAM */ + map(0xc000, 0xc3ff).ram().w(FUNC(decocass_state::decocass_fgvideoram_w)).share("fgvideoram"); /* DSP3 RAM */ + map(0xc400, 0xc7ff).ram().w(FUNC(decocass_state::decocass_colorram_w)).share("colorram"); + map(0xc800, 0xcbff).rw(FUNC(decocass_state::mirrorvideoram_r), FUNC(decocass_state::mirrorvideoram_w)); + map(0xcc00, 0xcfff).rw(FUNC(decocass_state::mirrorcolorram_r), FUNC(decocass_state::mirrorcolorram_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(decocass_state::decocass_tileram_w)).share("tileram"); + map(0xd800, 0xdbff).ram().w(FUNC(decocass_state::decocass_objectram_w)).share("objectram"); + map(0xe000, 0xe0ff).ram().w(FUNC(decocass_state::decocass_paletteram_w)).share("paletteram"); + map(0xe300, 0xe300).portr("DSW1").w(FUNC(decocass_state::decocass_watchdog_count_w)); + map(0xe301, 0xe301).portr("DSW2").w(FUNC(decocass_state::decocass_watchdog_flip_w)); + map(0xe302, 0xe302).w(FUNC(decocass_state::decocass_color_missiles_w)); + map(0xe400, 0xe400).w(FUNC(decocass_state::decocass_reset_w)); /* BIO-3 board */ - map(0xe402, 0xe402).w(this, FUNC(decocass_state::decocass_mode_set_w)); /* scroll mode regs + various enable regs */ - map(0xe403, 0xe403).w(this, FUNC(decocass_state::decocass_back_h_shift_w)); /* back (both) tilemap x scroll */ - map(0xe404, 0xe404).w(this, FUNC(decocass_state::decocass_back_vl_shift_w)); /* back (left) (top@rot0) tilemap y scroll */ - map(0xe405, 0xe405).w(this, FUNC(decocass_state::decocass_back_vr_shift_w)); /* back (right) (bot@rot0) tilemap y scroll */ - map(0xe406, 0xe406).w(this, FUNC(decocass_state::decocass_part_h_shift_w)); /* headlight */ - map(0xe407, 0xe407).w(this, FUNC(decocass_state::decocass_part_v_shift_w)); /* headlight */ - - map(0xe410, 0xe410).w(this, FUNC(decocass_state::decocass_color_center_bot_w)); - map(0xe411, 0xe411).w(this, FUNC(decocass_state::decocass_center_h_shift_space_w)); - map(0xe412, 0xe412).w(this, FUNC(decocass_state::decocass_center_v_shift_w)); - map(0xe413, 0xe413).w(this, FUNC(decocass_state::decocass_coin_counter_w)); - map(0xe414, 0xe414).rw(this, FUNC(decocass_state::decocass_sound_command_main_r), FUNC(decocass_state::decocass_sound_command_w)); - map(0xe415, 0xe416).w(this, FUNC(decocass_state::decocass_quadrature_decoder_reset_w)); - map(0xe417, 0xe417).w(this, FUNC(decocass_state::decocass_nmi_reset_w)); - map(0xe420, 0xe42f).w(this, FUNC(decocass_state::decocass_adc_w)); - - map(0xe500, 0xe5ff).rw(this, FUNC(decocass_state::decocass_e5xx_r), FUNC(decocass_state::decocass_e5xx_w)); /* read data from 8041/status */ - - map(0xe600, 0xe6ff).r(this, FUNC(decocass_state::decocass_input_r)); /* inputs */ - map(0xe700, 0xe700).r(this, FUNC(decocass_state::decocass_sound_data_r)); /* read sound CPU data */ - map(0xe701, 0xe701).r(this, FUNC(decocass_state::decocass_sound_ack_r)); /* read sound CPU ack status */ + map(0xe402, 0xe402).w(FUNC(decocass_state::decocass_mode_set_w)); /* scroll mode regs + various enable regs */ + map(0xe403, 0xe403).w(FUNC(decocass_state::decocass_back_h_shift_w)); /* back (both) tilemap x scroll */ + map(0xe404, 0xe404).w(FUNC(decocass_state::decocass_back_vl_shift_w)); /* back (left) (top@rot0) tilemap y scroll */ + map(0xe405, 0xe405).w(FUNC(decocass_state::decocass_back_vr_shift_w)); /* back (right) (bot@rot0) tilemap y scroll */ + map(0xe406, 0xe406).w(FUNC(decocass_state::decocass_part_h_shift_w)); /* headlight */ + map(0xe407, 0xe407).w(FUNC(decocass_state::decocass_part_v_shift_w)); /* headlight */ + + map(0xe410, 0xe410).w(FUNC(decocass_state::decocass_color_center_bot_w)); + map(0xe411, 0xe411).w(FUNC(decocass_state::decocass_center_h_shift_space_w)); + map(0xe412, 0xe412).w(FUNC(decocass_state::decocass_center_v_shift_w)); + map(0xe413, 0xe413).w(FUNC(decocass_state::decocass_coin_counter_w)); + map(0xe414, 0xe414).rw(FUNC(decocass_state::decocass_sound_command_main_r), FUNC(decocass_state::decocass_sound_command_w)); + map(0xe415, 0xe416).w(FUNC(decocass_state::decocass_quadrature_decoder_reset_w)); + map(0xe417, 0xe417).w(FUNC(decocass_state::decocass_nmi_reset_w)); + map(0xe420, 0xe42f).w(FUNC(decocass_state::decocass_adc_w)); + + map(0xe500, 0xe5ff).rw(FUNC(decocass_state::decocass_e5xx_r), FUNC(decocass_state::decocass_e5xx_w)); /* read data from 8041/status */ + + map(0xe600, 0xe6ff).r(FUNC(decocass_state::decocass_input_r)); /* inputs */ + map(0xe700, 0xe700).r(FUNC(decocass_state::decocass_sound_data_r)); /* read sound CPU data */ + map(0xe701, 0xe701).r(FUNC(decocass_state::decocass_sound_ack_r)); /* read sound CPU ack status */ map(0xf000, 0xffff).rom(); } @@ -125,14 +125,14 @@ void decocass_state::decocass_map(address_map &map) void decocass_state::decocass_sound_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x17ff).rw(this, FUNC(decocass_state::decocass_sound_nmi_enable_r), FUNC(decocass_state::decocass_sound_nmi_enable_w)); - map(0x1800, 0x1fff).rw(this, FUNC(decocass_state::decocass_sound_data_ack_reset_r), FUNC(decocass_state::decocass_sound_data_ack_reset_w)); + map(0x1000, 0x17ff).rw(FUNC(decocass_state::decocass_sound_nmi_enable_r), FUNC(decocass_state::decocass_sound_nmi_enable_w)); + map(0x1800, 0x1fff).rw(FUNC(decocass_state::decocass_sound_data_ack_reset_r), FUNC(decocass_state::decocass_sound_data_ack_reset_w)); map(0x2000, 0x2fff).w("ay1", FUNC(ay8910_device::data_w)); map(0x4000, 0x4fff).w("ay1", FUNC(ay8910_device::address_w)); map(0x6000, 0x6fff).w("ay2", FUNC(ay8910_device::data_w)); map(0x8000, 0x8fff).w("ay2", FUNC(ay8910_device::address_w)); - map(0xa000, 0xafff).r(this, FUNC(decocass_state::decocass_sound_command_r)); - map(0xc000, 0xcfff).w(this, FUNC(decocass_state::decocass_sound_data_w)); + map(0xa000, 0xafff).r(FUNC(decocass_state::decocass_sound_command_r)); + map(0xc000, 0xcfff).w(FUNC(decocass_state::decocass_sound_data_w)); map(0xf800, 0xffff).rom(); } diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp index f2978cf1553..22e02895ec9 100644 --- a/src/mame/drivers/dectalk.cpp +++ b/src/mame/drivers/dectalk.cpp @@ -797,14 +797,14 @@ void dectalk_state::m68k_mem(address_map &map) map.unmap_value_high(); map(0x000000, 0x03ffff).mirror(0x740000).rom(); /* ROM */ map(0x080000, 0x093fff).mirror(0x760000).ram(); /* RAM */ - map(0x094000, 0x0943ff).mirror(0x763c00).w(this, FUNC(dectalk_state::led_write)).umask16(0x00ff); /* LED array */ + map(0x094000, 0x0943ff).mirror(0x763c00).w(FUNC(dectalk_state::led_write)).umask16(0x00ff); /* LED array */ map(0x094000, 0x0941ff).mirror(0x763c00).rw(m_nvram, FUNC(x2212_device::read), FUNC(x2212_device::write)).umask16(0xff00); /* Xicor X2212 NVRAM */ - map(0x094200, 0x0943ff).mirror(0x763c00).rw(this, FUNC(dectalk_state::nvram_recall), FUNC(dectalk_state::nvram_store)).umask16(0xff00); /* Xicor X2212 NVRAM */ + map(0x094200, 0x0943ff).mirror(0x763c00).rw(FUNC(dectalk_state::nvram_recall), FUNC(dectalk_state::nvram_store)).umask16(0xff00); /* Xicor X2212 NVRAM */ map(0x098000, 0x09801f).mirror(0x763fe0).rw(m_duart, FUNC(scn2681_device::read), FUNC(scn2681_device::write)).umask16(0x00ff); /* DUART */ - map(0x09c000, 0x09c001).mirror(0x763ff8).rw(this, FUNC(dectalk_state::m68k_spcflags_r), FUNC(dectalk_state::m68k_spcflags_w)); /* SPC flags reg */ - map(0x09c002, 0x09c003).mirror(0x763ff8).w(this, FUNC(dectalk_state::m68k_infifo_w)); /* SPC fifo reg */ - map(0x09c004, 0x09c005).mirror(0x763ff8).rw(this, FUNC(dectalk_state::m68k_tlcflags_r), FUNC(dectalk_state::m68k_tlcflags_w)); /* telephone status flags */ - map(0x09c006, 0x09c007).mirror(0x763ff8).r(this, FUNC(dectalk_state::m68k_tlc_dtmf_r)); /* telephone dtmf read */ + map(0x09c000, 0x09c001).mirror(0x763ff8).rw(FUNC(dectalk_state::m68k_spcflags_r), FUNC(dectalk_state::m68k_spcflags_w)); /* SPC flags reg */ + map(0x09c002, 0x09c003).mirror(0x763ff8).w(FUNC(dectalk_state::m68k_infifo_w)); /* SPC fifo reg */ + map(0x09c004, 0x09c005).mirror(0x763ff8).rw(FUNC(dectalk_state::m68k_tlcflags_r), FUNC(dectalk_state::m68k_tlcflags_w)); /* telephone status flags */ + map(0x09c006, 0x09c007).mirror(0x763ff8).r(FUNC(dectalk_state::m68k_tlc_dtmf_r)); /* telephone dtmf read */ } void dectalk_state::tms32010_mem(address_map &map) @@ -814,8 +814,8 @@ void dectalk_state::tms32010_mem(address_map &map) void dectalk_state::tms32010_io(address_map &map) { - map(0, 0).w(this, FUNC(dectalk_state::spc_latch_outfifo_error_stats)); // *set* the outfifo_status_r semaphore, and also latch the error bit at D0. - map(1, 1).rw(this, FUNC(dectalk_state::spc_infifo_data_r), FUNC(dectalk_state::spc_outfifo_data_w)); //read from input fifo, write to sound fifo + map(0, 0).w(FUNC(dectalk_state::spc_latch_outfifo_error_stats)); // *set* the outfifo_status_r semaphore, and also latch the error bit at D0. + map(1, 1).rw(FUNC(dectalk_state::spc_infifo_data_r), FUNC(dectalk_state::spc_outfifo_data_w)); //read from input fifo, write to sound fifo //AM_RANGE(8, 8) //the newer firmware seems to want something mapped here? } diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp index 1e15426f8be..5a516539224 100644 --- a/src/mame/drivers/decwritr.cpp +++ b/src/mame/drivers/decwritr.cpp @@ -235,11 +235,11 @@ void decwriter_state::la120_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x27ff).rom(); - map(0x3000, 0x301f).rw(this, FUNC(decwriter_state::la120_KBD_r), FUNC(decwriter_state::la120_LED_w)).mirror(0xFE0); // keyboard read, write to status and 7seg LEDS + map(0x3000, 0x301f).rw(FUNC(decwriter_state::la120_KBD_r), FUNC(decwriter_state::la120_LED_w)).mirror(0xFE0); // keyboard read, write to status and 7seg LEDS map(0x4000, 0x43ff).mirror(0x0c00).ram(); // 1k 'low ram' map(0x5000, 0x53ff).mirror(0x0c00).ram(); // 1k 'high ram' - map(0x6000, 0x67ff) /*.mirror(0x08fe)*/ .mirror(0x800).rw(this, FUNC(decwriter_state::la120_NVR_r), FUNC(decwriter_state::la120_NVR_w)); // ER1400 EAROM; a10,9,8 are c3,2,1, a0 is clk, data i/o on d7, d0 always reads as 0 (there may have once been a second er1400 with data i/o on d0, sharing same address controls as the d7 one, not populated on shipping boards), d1-d6 read open bus - map(0x7000, 0x7003).mirror(0x0ffc).rw(this, FUNC(decwriter_state::la120_DC305_r), FUNC(decwriter_state::la120_DC305_w)); // DC305 printer controller ASIC stuff; since this can generate interrupts (dot interrupt, lf interrupt, 2.5ms interrupt) this needs to be split to its own device. + map(0x6000, 0x67ff) /*.mirror(0x08fe)*/ .mirror(0x800).rw(FUNC(decwriter_state::la120_NVR_r), FUNC(decwriter_state::la120_NVR_w)); // ER1400 EAROM; a10,9,8 are c3,2,1, a0 is clk, data i/o on d7, d0 always reads as 0 (there may have once been a second er1400 with data i/o on d0, sharing same address controls as the d7 one, not populated on shipping boards), d1-d6 read open bus + map(0x7000, 0x7003).mirror(0x0ffc).rw(FUNC(decwriter_state::la120_DC305_r), FUNC(decwriter_state::la120_DC305_w)); // DC305 printer controller ASIC stuff; since this can generate interrupts (dot interrupt, lf interrupt, 2.5ms interrupt) this needs to be split to its own device. // 8000-ffff is reserved for expansion (i.e. unused, open bus) } diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp index e89c80610b7..3a1ac0d5429 100644 --- a/src/mame/drivers/deniam.cpp +++ b/src/mame/drivers/deniam.cpp @@ -76,13 +76,13 @@ WRITE16_MEMBER(deniam_state::deniam_irq_ack_w) void deniam_state::deniam16b_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(deniam_state::deniam_videoram_w)).share("videoram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(deniam_state::deniam_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(deniam_state::deniam_videoram_w)).share("videoram"); + map(0x410000, 0x410fff).ram().w(FUNC(deniam_state::deniam_textram_w)).share("textram"); map(0x440000, 0x4407ff).writeonly().share("spriteram"); - map(0x840000, 0x840fff).w(this, FUNC(deniam_state::deniam_palette_w)).share("paletteram"); + map(0x840000, 0x840fff).w(FUNC(deniam_state::deniam_palette_w)).share("paletteram"); map(0xc40000, 0xc40000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xc40002, 0xc40003).rw(this, FUNC(deniam_state::deniam_coinctrl_r), FUNC(deniam_state::deniam_coinctrl_w)); - map(0xc40004, 0xc40005).w(this, FUNC(deniam_state::deniam_irq_ack_w)); + map(0xc40002, 0xc40003).rw(FUNC(deniam_state::deniam_coinctrl_r), FUNC(deniam_state::deniam_coinctrl_w)); + map(0xc40004, 0xc40005).w(FUNC(deniam_state::deniam_irq_ack_w)); map(0xc44000, 0xc44001).portr("SYSTEM"); map(0xc44002, 0xc44003).portr("P1"); map(0xc44004, 0xc44005).portr("P2").nopw(); @@ -103,21 +103,21 @@ void deniam_state::sound_io_map(address_map &map) map(0x01, 0x01).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x02, 0x03).w("ymsnd", FUNC(ym3812_device::write)); map(0x05, 0x05).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x07, 0x07).w(this, FUNC(deniam_state::deniam16b_oki_rom_bank_w)); + map(0x07, 0x07).w(FUNC(deniam_state::deniam16b_oki_rom_bank_w)); } /* identical to 16b, but handles sound directly */ void deniam_state::deniam16c_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(deniam_state::deniam_videoram_w)).share("videoram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(deniam_state::deniam_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(deniam_state::deniam_videoram_w)).share("videoram"); + map(0x410000, 0x410fff).ram().w(FUNC(deniam_state::deniam_textram_w)).share("textram"); map(0x440000, 0x4407ff).writeonly().share("spriteram"); - map(0x840000, 0x840fff).w(this, FUNC(deniam_state::deniam_palette_w)).share("paletteram"); + map(0x840000, 0x840fff).w(FUNC(deniam_state::deniam_palette_w)).share("paletteram"); map(0xc40001, 0xc40001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xc40002, 0xc40003).rw(this, FUNC(deniam_state::deniam_coinctrl_r), FUNC(deniam_state::deniam_coinctrl_w)); - map(0xc40004, 0xc40005).w(this, FUNC(deniam_state::deniam_irq_ack_w)); - map(0xc40006, 0xc40007).w(this, FUNC(deniam_state::deniam16c_oki_rom_bank_w)); + map(0xc40002, 0xc40003).rw(FUNC(deniam_state::deniam_coinctrl_r), FUNC(deniam_state::deniam_coinctrl_w)); + map(0xc40004, 0xc40005).w(FUNC(deniam_state::deniam_irq_ack_w)); + map(0xc40006, 0xc40007).w(FUNC(deniam_state::deniam16c_oki_rom_bank_w)); map(0xc44000, 0xc44001).portr("SYSTEM"); map(0xc44002, 0xc44003).portr("P1"); map(0xc44004, 0xc44005).portr("P2"); diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp index c0998fc0feb..2cc994363e6 100644 --- a/src/mame/drivers/deshoros.cpp +++ b/src/mame/drivers/deshoros.cpp @@ -174,16 +174,16 @@ void destiny_state::main_map(address_map &map) { map(0x0000, 0x5fff).bankr("bank1"); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).rw(this, FUNC(destiny_state::printer_status_r), FUNC(destiny_state::firq_ack_w)); - map(0x9001, 0x9001).portr("SYSTEM").w(this, FUNC(destiny_state::nmi_ack_w)); - map(0x9002, 0x9002).rw(this, FUNC(destiny_state::display_ready_r), FUNC(destiny_state::display_w)); + map(0x9000, 0x9000).rw(FUNC(destiny_state::printer_status_r), FUNC(destiny_state::firq_ack_w)); + map(0x9001, 0x9001).portr("SYSTEM").w(FUNC(destiny_state::nmi_ack_w)); + map(0x9002, 0x9002).rw(FUNC(destiny_state::display_ready_r), FUNC(destiny_state::display_w)); map(0x9003, 0x9003).portr("KEY1"); map(0x9004, 0x9004).portr("KEY2"); - map(0x9005, 0x9005).portr("DIPSW").w(this, FUNC(destiny_state::out_w)); + map(0x9005, 0x9005).portr("DIPSW").w(FUNC(destiny_state::out_w)); // AM_RANGE(0x9006, 0x9006) AM_NOP // printer motor on // AM_RANGE(0x9007, 0x9007) AM_NOP // printer data - map(0x900a, 0x900b).w(this, FUNC(destiny_state::sound_w)); - map(0x900c, 0x900c).w(this, FUNC(destiny_state::bank_select_w)); + map(0x900a, 0x900b).w(FUNC(destiny_state::sound_w)); + map(0x900c, 0x900c).w(FUNC(destiny_state::bank_select_w)); // AM_RANGE(0x900d, 0x900d) AM_NOP // printer motor off // AM_RANGE(0x900e, 0x900e) AM_NOP // printer motor jam reset map(0xc000, 0xffff).rom(); diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp index b0fcf048548..922246d3c56 100644 --- a/src/mame/drivers/destroyr.cpp +++ b/src/mame/drivers/destroyr.cpp @@ -280,16 +280,16 @@ void destroyr_state::destroyr_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x00ff).mirror(0xf00).ram(); - map(0x1000, 0x1001).mirror(0xffe).r(this, FUNC(destroyr_state::input_r)); + map(0x1000, 0x1001).mirror(0xffe).r(FUNC(destroyr_state::input_r)); map(0x1000, 0x1007).mirror(0xff0).w("outlatch", FUNC(f9334_device::write_d0)); - map(0x1008, 0x1008).mirror(0xff7).w(this, FUNC(destroyr_state::misc_w)); + map(0x1008, 0x1008).mirror(0xff7).w(FUNC(destroyr_state::misc_w)); map(0x2000, 0x2000).mirror(0xfff).portr("IN2"); map(0x3000, 0x30ff).mirror(0xf00).writeonly().share("alpha_nuram"); map(0x4000, 0x401f).mirror(0xfe0).writeonly().share("major_obj_ram"); - map(0x5000, 0x5000).mirror(0xff8).w(this, FUNC(destroyr_state::cursor_load_w)); - map(0x5001, 0x5001).mirror(0xff8).w(this, FUNC(destroyr_state::interrupt_ack_w)); + map(0x5000, 0x5000).mirror(0xff8).w(FUNC(destroyr_state::cursor_load_w)); + map(0x5001, 0x5001).mirror(0xff8).w(FUNC(destroyr_state::interrupt_ack_w)); map(0x5002, 0x5007).mirror(0xff8).writeonly().share("minor_obj_ram"); - map(0x6000, 0x6000).mirror(0xfff).r(this, FUNC(destroyr_state::scanline_r)); + map(0x6000, 0x6000).mirror(0xfff).r(FUNC(destroyr_state::scanline_r)); map(0x7000, 0x7fff).rom(); } diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp index fd27b603c56..ab64dfc7d52 100644 --- a/src/mame/drivers/dfruit.cpp +++ b/src/mame/drivers/dfruit.cpp @@ -167,20 +167,20 @@ WRITE8_MEMBER(dfruit_state::dfruit_ram_3_w) { ram_bank_w(offset, data, 3); } void dfruit_state::tc0091lvc_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0x6000, 0x7fff).r(this, FUNC(dfruit_state::dfruit_rom_r)); + map(0x6000, 0x7fff).r(FUNC(dfruit_state::dfruit_rom_r)); map(0x8000, 0x9fff).ram(); - map(0xc000, 0xcfff).rw(this, FUNC(dfruit_state::dfruit_ram_0_r), FUNC(dfruit_state::dfruit_ram_0_w)); - map(0xd000, 0xdfff).rw(this, FUNC(dfruit_state::dfruit_ram_1_r), FUNC(dfruit_state::dfruit_ram_1_w)); - map(0xe000, 0xefff).rw(this, FUNC(dfruit_state::dfruit_ram_2_r), FUNC(dfruit_state::dfruit_ram_2_w)); - map(0xf000, 0xfdff).rw(this, FUNC(dfruit_state::dfruit_ram_3_r), FUNC(dfruit_state::dfruit_ram_3_w)); + map(0xc000, 0xcfff).rw(FUNC(dfruit_state::dfruit_ram_0_r), FUNC(dfruit_state::dfruit_ram_0_w)); + map(0xd000, 0xdfff).rw(FUNC(dfruit_state::dfruit_ram_1_r), FUNC(dfruit_state::dfruit_ram_1_w)); + map(0xe000, 0xefff).rw(FUNC(dfruit_state::dfruit_ram_2_r), FUNC(dfruit_state::dfruit_ram_2_w)); + map(0xf000, 0xfdff).rw(FUNC(dfruit_state::dfruit_ram_3_r), FUNC(dfruit_state::dfruit_ram_3_w)); map(0xfe00, 0xfeff).rw(m_vdp, FUNC(tc0091lvc_device::vregs_r), FUNC(tc0091lvc_device::vregs_w)); - map(0xff00, 0xff02).rw(this, FUNC(dfruit_state::dfruit_irq_vector_r), FUNC(dfruit_state::dfruit_irq_vector_w)); - map(0xff03, 0xff03).rw(this, FUNC(dfruit_state::dfruit_irq_enable_r), FUNC(dfruit_state::dfruit_irq_enable_w)); - map(0xff04, 0xff07).rw(this, FUNC(dfruit_state::dfruit_ram_bank_r), FUNC(dfruit_state::dfruit_ram_bank_w)); - map(0xff08, 0xff08).rw(this, FUNC(dfruit_state::dfruit_rom_bank_r), FUNC(dfruit_state::dfruit_rom_bank_w)); + map(0xff00, 0xff02).rw(FUNC(dfruit_state::dfruit_irq_vector_r), FUNC(dfruit_state::dfruit_irq_vector_w)); + map(0xff03, 0xff03).rw(FUNC(dfruit_state::dfruit_irq_enable_r), FUNC(dfruit_state::dfruit_irq_enable_w)); + map(0xff04, 0xff07).rw(FUNC(dfruit_state::dfruit_ram_bank_r), FUNC(dfruit_state::dfruit_ram_bank_w)); + map(0xff08, 0xff08).rw(FUNC(dfruit_state::dfruit_rom_bank_r), FUNC(dfruit_state::dfruit_rom_bank_w)); } diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp index 06a3e98f125..355a32023d2 100644 --- a/src/mame/drivers/dgn_beta.cpp +++ b/src/mame/drivers/dgn_beta.cpp @@ -165,12 +165,12 @@ void dgn_beta_state::dgnbeta_map(address_map &map) map(0xfc80, 0xfc80).w(m_mc6845, FUNC(mc6845_device::address_w)); map(0xfc81, 0xfc81).rw(m_mc6845, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0xfc82, 0xfC9F).noprw(); - map(0xFCA0, 0xFCA3).nopr().w(this, FUNC(dgn_beta_state::dgnbeta_colour_ram_w)); /* 4x4bit colour ram for graphics modes */ + map(0xFCA0, 0xFCA3).nopr().w(FUNC(dgn_beta_state::dgnbeta_colour_ram_w)); /* 4x4bit colour ram for graphics modes */ map(0xFCC0, 0xFCC3).rw(m_pia_2, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xfcC4, 0xfcdf).noprw(); - map(0xfce0, 0xfce3).rw(this, FUNC(dgn_beta_state::dgnbeta_wd2797_r), FUNC(dgn_beta_state::dgnbeta_wd2797_w)); /* Onboard disk interface */ + map(0xfce0, 0xfce3).rw(FUNC(dgn_beta_state::dgnbeta_wd2797_r), FUNC(dgn_beta_state::dgnbeta_wd2797_w)); /* Onboard disk interface */ map(0xfce4, 0xfdff).noprw(); - map(0xFE00, 0xFE0F).rw(this, FUNC(dgn_beta_state::dgn_beta_page_r), FUNC(dgn_beta_state::dgn_beta_page_w)); + map(0xFE00, 0xFE0F).rw(FUNC(dgn_beta_state::dgn_beta_page_r), FUNC(dgn_beta_state::dgn_beta_page_w)); map(0xfe10, 0xfEff).noprw(); map(0xFF00, 0xFFFF).bankrw("bank17"); diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp index 7057b347dac..b997099f364 100644 --- a/src/mame/drivers/dgpix.cpp +++ b/src/mame/drivers/dgpix.cpp @@ -327,18 +327,18 @@ READ32_MEMBER(dgpix_state::vblank_r) void dgpix_state::cpu_map(address_map &map) { map(0x00000000, 0x007fffff).ram(); - map(0x40000000, 0x4003ffff).rw(this, FUNC(dgpix_state::vram_r), FUNC(dgpix_state::vram_w)); - map(0xe0000000, 0xe1ffffff).rw(this, FUNC(dgpix_state::flash_r), FUNC(dgpix_state::flash_w)); - map(0xe2000000, 0xe3ffffff).rw(this, FUNC(dgpix_state::flash_r), FUNC(dgpix_state::flash_w)); + map(0x40000000, 0x4003ffff).rw(FUNC(dgpix_state::vram_r), FUNC(dgpix_state::vram_w)); + map(0xe0000000, 0xe1ffffff).rw(FUNC(dgpix_state::flash_r), FUNC(dgpix_state::flash_w)); + map(0xe2000000, 0xe3ffffff).rw(FUNC(dgpix_state::flash_r), FUNC(dgpix_state::flash_w)); map(0xffc00000, 0xffffffff).rom().region("flash", 0x1c00000).share("nvram"); } void dgpix_state::io_map(address_map &map) { map(0x0200, 0x0203).nopr(); // used to sync with the protecion PIC? tested bits 0 and 1 - map(0x0400, 0x0403).rw(this, FUNC(dgpix_state::vblank_r), FUNC(dgpix_state::vbuffer_w)); + map(0x0400, 0x0403).rw(FUNC(dgpix_state::vblank_r), FUNC(dgpix_state::vbuffer_w)); map(0x0a10, 0x0a13).portr("INPUTS"); - map(0x0200, 0x0203).w(this, FUNC(dgpix_state::coin_w)); + map(0x0200, 0x0203).w(FUNC(dgpix_state::coin_w)); map(0x0c00, 0x0c03).nopw(); // writes only: 1, 0, 1 at startup map(0x0c80, 0x0c83).nopw(); // sound commands / latches map(0x0c80, 0x0c83).nopr(); //read at startup -> cmp 0xFE diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp index 06ec4bfcb85..5e4841f7558 100644 --- a/src/mame/drivers/dietgo.cpp +++ b/src/mame/drivers/dietgo.cpp @@ -61,7 +61,7 @@ void dietgo_state::dietgo_map(address_map &map) map(0x222000, 0x2227ff).writeonly().share("pf2_rowscroll"); map(0x280000, 0x2807ff).ram().share("spriteram"); map(0x300000, 0x300bff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x340000, 0x343fff).rw(this, FUNC(dietgo_state::dietgo_protection_region_0_104_r), FUNC(dietgo_state::dietgo_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ + map(0x340000, 0x343fff).rw(FUNC(dietgo_state::dietgo_protection_region_0_104_r), FUNC(dietgo_state::dietgo_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ map(0x380000, 0x38ffff).ram(); // mainram } diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp index 7388854953d..e0d464023f1 100644 --- a/src/mame/drivers/digel804.cpp +++ b/src/mame/drivers/digel804.cpp @@ -505,25 +505,25 @@ void digel804_state::z80_io_1_4(address_map &map) map.global_mask(0xff); // io bits: x 1 x x x * * * // writes to 47, 4e, 57, 5e, 67, 6e, 77, 7e, c7, ce, d7, de, e7, ee, f7, fe all go to 47, same with reads - map(0x00, 0x00).mirror(0x38).w(this, FUNC(digel804_state::op00)); // W, banked ram - map(0x40, 0x40).mirror(0xB8).rw(this, FUNC(digel804_state::ip40), FUNC(digel804_state::op40)); // RW, eprom socket data bus input/output value - map(0x41, 0x41).mirror(0xB8).w(this, FUNC(digel804_state::op41)); // W, eprom socket address low out - map(0x42, 0x42).mirror(0xB8).w(this, FUNC(digel804_state::op42)); // W, eprom socket address hi/control out - map(0x43, 0x43).mirror(0xB8).rw(this, FUNC(digel804_state::ip43), FUNC(digel804_state::op43_1_4)); // RW, mode and status register, also checks if keypad is pressed; write is unknown - map(0x44, 0x44).mirror(0xB8).w(this, FUNC(digel804_state::op44)); // W, 10937 vfd controller, z80 power and state control reg - map(0x45, 0x45).mirror(0xB8).w(this, FUNC(digel804_state::op45)); // W, speaker bit; every write inverts state - map(0x46, 0x46).mirror(0xB8).rw(this, FUNC(digel804_state::ip46), FUNC(digel804_state::op46)); // RW, reads keypad, writes controls the front panel leds. - map(0x47, 0x47).mirror(0xB8).w(this, FUNC(digel804_state::op47)); // W eprom socket power and timing control + map(0x00, 0x00).mirror(0x38).w(FUNC(digel804_state::op00)); // W, banked ram + map(0x40, 0x40).mirror(0xB8).rw(FUNC(digel804_state::ip40), FUNC(digel804_state::op40)); // RW, eprom socket data bus input/output value + map(0x41, 0x41).mirror(0xB8).w(FUNC(digel804_state::op41)); // W, eprom socket address low out + map(0x42, 0x42).mirror(0xB8).w(FUNC(digel804_state::op42)); // W, eprom socket address hi/control out + map(0x43, 0x43).mirror(0xB8).rw(FUNC(digel804_state::ip43), FUNC(digel804_state::op43_1_4)); // RW, mode and status register, also checks if keypad is pressed; write is unknown + map(0x44, 0x44).mirror(0xB8).w(FUNC(digel804_state::op44)); // W, 10937 vfd controller, z80 power and state control reg + map(0x45, 0x45).mirror(0xB8).w(FUNC(digel804_state::op45)); // W, speaker bit; every write inverts state + map(0x46, 0x46).mirror(0xB8).rw(FUNC(digel804_state::ip46), FUNC(digel804_state::op46)); // RW, reads keypad, writes controls the front panel leds. + map(0x47, 0x47).mirror(0xB8).w(FUNC(digel804_state::op47)); // W eprom socket power and timing control // io bits: 1 0 x x x * * * // writes to 80, 88, 90, 98, a0, a8, b0, b8 all go to 80, same with reads - map(0x80, 0x80).mirror(0x38).w(this, FUNC(digel804_state::acia_txd_w)); // (ACIA xmit reg) - map(0x81, 0x81).mirror(0x38).r(this, FUNC(digel804_state::acia_rxd_r)); // (ACIA rcv reg) - map(0x82, 0x82).mirror(0x38).w(this, FUNC(digel804_state::acia_reset_w)); // (ACIA reset reg) - map(0x83, 0x83).mirror(0x38).r(this, FUNC(digel804_state::acia_status_r)); // (ACIA status reg) - map(0x84, 0x84).mirror(0x38).w(this, FUNC(digel804_state::acia_command_w)); // (ACIA command reg) - map(0x85, 0x85).mirror(0x38).r(this, FUNC(digel804_state::acia_command_r)); // (ACIA command reg) - map(0x86, 0x86).mirror(0x38).w(this, FUNC(digel804_state::acia_control_w)); // (ACIA control reg) - map(0x87, 0x87).mirror(0x38).r(this, FUNC(digel804_state::acia_control_r)); // (ACIA control reg) + map(0x80, 0x80).mirror(0x38).w(FUNC(digel804_state::acia_txd_w)); // (ACIA xmit reg) + map(0x81, 0x81).mirror(0x38).r(FUNC(digel804_state::acia_rxd_r)); // (ACIA rcv reg) + map(0x82, 0x82).mirror(0x38).w(FUNC(digel804_state::acia_reset_w)); // (ACIA reset reg) + map(0x83, 0x83).mirror(0x38).r(FUNC(digel804_state::acia_status_r)); // (ACIA status reg) + map(0x84, 0x84).mirror(0x38).w(FUNC(digel804_state::acia_command_w)); // (ACIA command reg) + map(0x85, 0x85).mirror(0x38).r(FUNC(digel804_state::acia_command_r)); // (ACIA command reg) + map(0x86, 0x86).mirror(0x38).w(FUNC(digel804_state::acia_control_w)); // (ACIA control reg) + map(0x87, 0x87).mirror(0x38).r(FUNC(digel804_state::acia_control_r)); // (ACIA control reg) //AM_RANGE(0x80,0x87) AM_MIRROR(0x38) AM_SHIFT(-1) AM_DEVREADWRITE("acia", mos6551_device, read, write) // this doesn't work since we lack an AM_SHIFT command } @@ -534,24 +534,24 @@ void ep804_state::z80_io_1_2(address_map &map) map.global_mask(0xff); // io bits: x 1 x x x * * * // writes to 47, 4e, 57, 5e, 67, 6e, 77, 7e, c7, ce, d7, de, e7, ee, f7, fe all go to 47, same with reads - map(0x40, 0x40).mirror(0xB8).rw(this, FUNC(ep804_state::ip40), FUNC(ep804_state::op40)); // RW, eprom socket data bus input/output value - map(0x41, 0x41).mirror(0xB8).w(this, FUNC(ep804_state::op41)); // W, eprom socket address low out - map(0x42, 0x42).mirror(0xB8).w(this, FUNC(ep804_state::op42)); // W, eprom socket address hi/control out - map(0x43, 0x43).mirror(0xB8).rw(this, FUNC(ep804_state::ip43), FUNC(ep804_state::op43)); // RW, mode and status register, also checks if keypad is pressed; write is unknown - map(0x44, 0x44).mirror(0xB8).w(this, FUNC(ep804_state::op44)); // W, 10937 vfd controller, z80 power and state control reg - map(0x45, 0x45).mirror(0xB8).w(this, FUNC(ep804_state::op45)); // W, speaker bit; every write inverts state - map(0x46, 0x46).mirror(0xB8).rw(this, FUNC(ep804_state::ip46), FUNC(ep804_state::op46)); // RW, reads keypad, writes controls the front panel leds. - map(0x47, 0x47).mirror(0xB8).w(this, FUNC(ep804_state::op47)); // W eprom socket power and timing control + map(0x40, 0x40).mirror(0xB8).rw(FUNC(ep804_state::ip40), FUNC(ep804_state::op40)); // RW, eprom socket data bus input/output value + map(0x41, 0x41).mirror(0xB8).w(FUNC(ep804_state::op41)); // W, eprom socket address low out + map(0x42, 0x42).mirror(0xB8).w(FUNC(ep804_state::op42)); // W, eprom socket address hi/control out + map(0x43, 0x43).mirror(0xB8).rw(FUNC(ep804_state::ip43), FUNC(ep804_state::op43)); // RW, mode and status register, also checks if keypad is pressed; write is unknown + map(0x44, 0x44).mirror(0xB8).w(FUNC(ep804_state::op44)); // W, 10937 vfd controller, z80 power and state control reg + map(0x45, 0x45).mirror(0xB8).w(FUNC(ep804_state::op45)); // W, speaker bit; every write inverts state + map(0x46, 0x46).mirror(0xB8).rw(FUNC(ep804_state::ip46), FUNC(ep804_state::op46)); // RW, reads keypad, writes controls the front panel leds. + map(0x47, 0x47).mirror(0xB8).w(FUNC(ep804_state::op47)); // W eprom socket power and timing control // io bits: 1 0 x x x * * * // writes to 80, 88, 90, 98, a0, a8, b0, b8 all go to 80, same with reads - map(0x80, 0x80).mirror(0x38).w(this, FUNC(ep804_state::acia_txd_w)); // (ACIA xmit reg) - map(0x81, 0x81).mirror(0x38).r(this, FUNC(ep804_state::acia_rxd_r)); // (ACIA rcv reg) - map(0x82, 0x82).mirror(0x38).w(this, FUNC(ep804_state::acia_reset_w)); // (ACIA reset reg) - map(0x83, 0x83).mirror(0x38).r(this, FUNC(ep804_state::acia_status_r)); // (ACIA status reg) - map(0x84, 0x84).mirror(0x38).w(this, FUNC(ep804_state::acia_command_w)); // (ACIA command reg) - map(0x85, 0x85).mirror(0x38).r(this, FUNC(ep804_state::acia_command_r)); // (ACIA command reg) - map(0x86, 0x86).mirror(0x38).w(this, FUNC(ep804_state::acia_control_w)); // (ACIA control reg) - map(0x87, 0x87).mirror(0x38).r(this, FUNC(ep804_state::acia_control_r)); // (ACIA control reg) + map(0x80, 0x80).mirror(0x38).w(FUNC(ep804_state::acia_txd_w)); // (ACIA xmit reg) + map(0x81, 0x81).mirror(0x38).r(FUNC(ep804_state::acia_rxd_r)); // (ACIA rcv reg) + map(0x82, 0x82).mirror(0x38).w(FUNC(ep804_state::acia_reset_w)); // (ACIA reset reg) + map(0x83, 0x83).mirror(0x38).r(FUNC(ep804_state::acia_status_r)); // (ACIA status reg) + map(0x84, 0x84).mirror(0x38).w(FUNC(ep804_state::acia_command_w)); // (ACIA command reg) + map(0x85, 0x85).mirror(0x38).r(FUNC(ep804_state::acia_command_r)); // (ACIA command reg) + map(0x86, 0x86).mirror(0x38).w(FUNC(ep804_state::acia_control_w)); // (ACIA control reg) + map(0x87, 0x87).mirror(0x38).r(FUNC(ep804_state::acia_control_r)); // (ACIA control reg) //AM_RANGE(0x80,0x87) AM_MIRROR(0x38) AM_SHIFT(-1) AM_DEVREADWRITE("acia", mos6551_device, read, write) // this doesn't work since we lack an AM_SHIFT command } diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index 7126ce49dfd..d532bdc69ac 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -192,9 +192,9 @@ void dim68k_state::dim68k_mem(address_map &map) map(0x00ff2000, 0x00ff7fff).ram(); // Graphics Video RAM map(0x00ff8001, 0x00ff8001).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x00ff8003, 0x00ff8003).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x00ff8004, 0x00ff8005).w(this, FUNC(dim68k_state::dim68k_video_high_w)); - map(0x00ff8008, 0x00ff8009).w(this, FUNC(dim68k_state::dim68k_video_control_w)); - map(0x00ff800a, 0x00ff800b).w(this, FUNC(dim68k_state::dim68k_video_reset_w)); + map(0x00ff8004, 0x00ff8005).w(FUNC(dim68k_state::dim68k_video_high_w)); + map(0x00ff8008, 0x00ff8009).w(FUNC(dim68k_state::dim68k_video_control_w)); + map(0x00ff800a, 0x00ff800b).w(FUNC(dim68k_state::dim68k_video_reset_w)); map(0x00ff8800, 0x00ff8fff).rom().region("cop6512", 0); // slot 1 controller rom map(0x00ff9000, 0x00ff97ff).rom().region("copz80", 0); // slot 2 controller rom map(0x00ff9800, 0x00ff9fff).rom().region("cop8086", 0); // slot 3 controller rom @@ -203,14 +203,14 @@ void dim68k_state::dim68k_mem(address_map &map) map(0x00ffa800, 0x00ffafff).rom(); // slot 5 controller rom map(0x00ffb000, 0x00ffb7ff).rom(); // slot 6 controller rom #endif - map(0x00ffc400, 0x00ffc41f).rw(this, FUNC(dim68k_state::dim68k_duart_r), FUNC(dim68k_state::dim68k_duart_w)); // Signetics SCN2681AC1N40 Dual UART - map(0x00ffc800, 0x00ffc801).rw(this, FUNC(dim68k_state::dim68k_speaker_r), FUNC(dim68k_state::dim68k_speaker_w)); - map(0x00ffcc00, 0x00ffcc1f).rw(this, FUNC(dim68k_state::dim68k_game_switches_r), FUNC(dim68k_state::dim68k_reset_timers_w)); + map(0x00ffc400, 0x00ffc41f).rw(FUNC(dim68k_state::dim68k_duart_r), FUNC(dim68k_state::dim68k_duart_w)); // Signetics SCN2681AC1N40 Dual UART + map(0x00ffc800, 0x00ffc801).rw(FUNC(dim68k_state::dim68k_speaker_r), FUNC(dim68k_state::dim68k_speaker_w)); + map(0x00ffcc00, 0x00ffcc1f).rw(FUNC(dim68k_state::dim68k_game_switches_r), FUNC(dim68k_state::dim68k_reset_timers_w)); map(0x00ffd000, 0x00ffd003).m("fdc", FUNC(upd765a_device::map)).umask16(0x00ff); // NEC uPD765A - map(0x00ffd004, 0x00ffd005).rw(this, FUNC(dim68k_state::dim68k_fdc_r), FUNC(dim68k_state::dim68k_fdc_w)); + map(0x00ffd004, 0x00ffd005).rw(FUNC(dim68k_state::dim68k_fdc_r), FUNC(dim68k_state::dim68k_fdc_w)); //AM_RANGE(0x00ffd400, 0x00ffd403) emulation trap control - map(0x00ffd800, 0x00ffd801).w(this, FUNC(dim68k_state::dim68k_printer_strobe_w)); - map(0x00ffdc00, 0x00ffdc01).w(this, FUNC(dim68k_state::dim68k_banksw_w)); + map(0x00ffd800, 0x00ffd801).w(FUNC(dim68k_state::dim68k_printer_strobe_w)); + map(0x00ffdc00, 0x00ffdc01).w(FUNC(dim68k_state::dim68k_banksw_w)); } /* Input ports */ diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp index eba4909d68d..006f5fe917b 100644 --- a/src/mame/drivers/discoboy.cpp +++ b/src/mame/drivers/discoboy.cpp @@ -279,7 +279,7 @@ void discoboy_state::discoboy_map(address_map &map) map(0x8000, 0xbfff).bankr("mainbank"); map(0xc000, 0xc7ff).m(m_rambank1, FUNC(address_map_bank_device::amap8)); map(0xc800, 0xcfff).ram().share("att_ram"); - map(0xd000, 0xdfff).rw(this, FUNC(discoboy_state::rambank2_r), FUNC(discoboy_state::rambank2_w)); + map(0xd000, 0xdfff).rw(FUNC(discoboy_state::rambank2_r), FUNC(discoboy_state::rambank2_w)); map(0xe000, 0xefff).ram(); map(0xf000, 0xffff).ram(); } @@ -299,13 +299,13 @@ READ8_MEMBER(discoboy_state::port_06_r) void discoboy_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("DSWA").w(this, FUNC(discoboy_state::port_00_w)); - map(0x01, 0x01).portr("SYSTEM").w(this, FUNC(discoboy_state::port_01_w)); + map(0x00, 0x00).portr("DSWA").w(FUNC(discoboy_state::port_00_w)); + map(0x01, 0x01).portr("SYSTEM").w(FUNC(discoboy_state::port_01_w)); map(0x02, 0x02).portr("P1"); map(0x03, 0x03).portr("P2").w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x04, 0x04).portr("DSWB"); - map(0x06, 0x06).rw(this, FUNC(discoboy_state::port_06_r), FUNC(discoboy_state::port_06_w)); // ??? - map(0x07, 0x07).w(this, FUNC(discoboy_state::rambank_select_w)); // 0x20 is palette bank bit.. others? + map(0x06, 0x06).rw(FUNC(discoboy_state::port_06_r), FUNC(discoboy_state::port_06_w)); // ??? + map(0x07, 0x07).w(FUNC(discoboy_state::rambank_select_w)); // 0x20 is palette bank bit.. others? } /* Sound */ @@ -325,7 +325,7 @@ void discoboy_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("sndbank"); - map(0xe000, 0xe000).w(this, FUNC(discoboy_state::yunsung8_sound_bankswitch_w)); + map(0xe000, 0xe000).w(FUNC(discoboy_state::yunsung8_sound_bankswitch_w)); map(0xe400, 0xe400).w(m_adpcm_select, FUNC(ls157_device::ba_w)); map(0xec00, 0xec01).w("ymsnd", FUNC(ym3812_device::write)); map(0xf000, 0xf7ff).ram(); diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp index 0421442f998..340571645eb 100644 --- a/src/mame/drivers/divebomb.cpp +++ b/src/mame/drivers/divebomb.cpp @@ -106,7 +106,7 @@ To verify against original HW: void divebomb_state::divebomb_fgcpu_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xc000, 0xc7ff).ram().w(this, FUNC(divebomb_state::fgram_w)).share("fgram"); + map(0xc000, 0xc7ff).ram().w(FUNC(divebomb_state::fgram_w)).share("fgram"); map(0xe000, 0xffff).ram(); } @@ -114,12 +114,12 @@ void divebomb_state::divebomb_fgcpu_map(address_map &map) void divebomb_state::divebomb_fgcpu_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("sn0", FUNC(sn76489_device::write)); - map(0x01, 0x01).w("sn1", FUNC(sn76489_device::write)); - map(0x02, 0x02).w("sn2", FUNC(sn76489_device::write)); - map(0x03, 0x03).w("sn3", FUNC(sn76489_device::write)); - map(0x04, 0x04).w("sn4", FUNC(sn76489_device::write)); - map(0x05, 0x05).w("sn5", FUNC(sn76489_device::write)); + map(0x00, 0x00).w("sn0", FUNC(sn76489_device::command_w)); + map(0x01, 0x01).w("sn1", FUNC(sn76489_device::command_w)); + map(0x02, 0x02).w("sn2", FUNC(sn76489_device::command_w)); + map(0x03, 0x03).w("sn3", FUNC(sn76489_device::command_w)); + map(0x04, 0x04).w("sn4", FUNC(sn76489_device::command_w)); + map(0x05, 0x05).w("sn5", FUNC(sn76489_device::command_w)); map(0x10, 0x10).r(m_roz2fg_latch, FUNC(generic_latch_8_device::read)).w("fg2roz", FUNC(generic_latch_8_device::write)); map(0x20, 0x20).r(m_spr2fg_latch, FUNC(generic_latch_8_device::read)).w("fg2spr", FUNC(generic_latch_8_device::write)); map(0x30, 0x30).portr("IN0"); @@ -130,7 +130,7 @@ void divebomb_state::divebomb_fgcpu_iomap(address_map &map) map(0x34, 0x34).portr("DSW3"); map(0x35, 0x35).portr("DSW4"); map(0x36, 0x36).portr("SYSTEM"); - map(0x37, 0x37).r(this, FUNC(divebomb_state::fgcpu_comm_flags_r)); + map(0x37, 0x37).r(FUNC(divebomb_state::fgcpu_comm_flags_r)); } @@ -165,7 +165,7 @@ void divebomb_state::divebomb_spritecpu_map(address_map &map) void divebomb_state::divebomb_spritecpu_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(divebomb_state::spritecpu_port00_w)); + map(0x00, 0x00).w(FUNC(divebomb_state::spritecpu_port00_w)); map(0x80, 0x80).r("fg2spr", FUNC(generic_latch_8_device::read)).w(m_spr2fg_latch, FUNC(generic_latch_8_device::write)); } @@ -210,15 +210,15 @@ void divebomb_state::divebomb_rozcpu_map(address_map &map) void divebomb_state::divebomb_rozcpu_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(divebomb_state::rozcpu_bank_w)); - map(0x10, 0x10).w(this, FUNC(divebomb_state::rozcpu_wrap_enable_w<1>)); - map(0x12, 0x12).w(this, FUNC(divebomb_state::rozcpu_enable_w<0>)); - map(0x13, 0x13).w(this, FUNC(divebomb_state::rozcpu_enable_w<1>)); - map(0x14, 0x14).w(this, FUNC(divebomb_state::rozcpu_wrap_enable_w<0>)); + map(0x00, 0x00).w(FUNC(divebomb_state::rozcpu_bank_w)); + map(0x10, 0x10).w(FUNC(divebomb_state::rozcpu_wrap_enable_w<1>)); + map(0x12, 0x12).w(FUNC(divebomb_state::rozcpu_enable_w<0>)); + map(0x13, 0x13).w(FUNC(divebomb_state::rozcpu_enable_w<1>)); + map(0x14, 0x14).w(FUNC(divebomb_state::rozcpu_wrap_enable_w<0>)); map(0x20, 0x2f).w(m_k051316[0], FUNC(k051316_device::ctrl_w)); map(0x30, 0x3f).w(m_k051316[1], FUNC(k051316_device::ctrl_w)); map(0x40, 0x40).r("fg2roz", FUNC(generic_latch_8_device::read)).w(m_roz2fg_latch, FUNC(generic_latch_8_device::write)); - map(0x50, 0x50).w(this, FUNC(divebomb_state::rozcpu_pal_w)); + map(0x50, 0x50).w(FUNC(divebomb_state::rozcpu_pal_w)); } diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp index f5d78ba2581..f17058c5304 100644 --- a/src/mame/drivers/diverboy.cpp +++ b/src/mame/drivers/diverboy.cpp @@ -166,7 +166,7 @@ void diverboy_state::diverboy_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x040000, 0x04ffff).ram(); map(0x080000, 0x083fff).ram().share("spriteram"); - map(0x100000, 0x100001).w(this, FUNC(diverboy_state::soundcmd_w)); + map(0x100000, 0x100001).w(FUNC(diverboy_state::soundcmd_w)); map(0x140000, 0x1407ff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x180000, 0x180001).portr("P1_P2"); map(0x180002, 0x180003).portr("DSW"); @@ -183,7 +183,7 @@ void diverboy_state::snd_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(diverboy_state::okibank_w)); + map(0x9000, 0x9000).w(FUNC(diverboy_state::okibank_w)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp index d69ac528123..ab85f21956f 100644 --- a/src/mame/drivers/djboy.cpp +++ b/src/mame/drivers/djboy.cpp @@ -215,7 +215,7 @@ void djboy_state::mastercpu_am(address_map &map) void djboy_state::mastercpu_port_am(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(djboy_state::mastercpu_bankswitch_w)); + map(0x00, 0x00).w(FUNC(djboy_state::mastercpu_bankswitch_w)); } /******************************************************************************/ @@ -224,8 +224,8 @@ void djboy_state::slavecpu_am(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("slave_bank"); - map(0xc000, 0xcfff).ram().w(this, FUNC(djboy_state::djboy_videoram_w)).share("videoram"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(djboy_state::djboy_paletteram_w)).share("paletteram"); + map(0xc000, 0xcfff).ram().w(FUNC(djboy_state::djboy_videoram_w)).share("videoram"); + map(0xd000, 0xd3ff).ram().w(FUNC(djboy_state::djboy_paletteram_w)).share("paletteram"); map(0xd400, 0xd8ff).ram(); map(0xe000, 0xffff).ram().share("share1"); } @@ -233,14 +233,14 @@ void djboy_state::slavecpu_am(address_map &map) void djboy_state::slavecpu_port_am(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(djboy_state::slavecpu_bankswitch_w)); + map(0x00, 0x00).w(FUNC(djboy_state::slavecpu_bankswitch_w)); map(0x02, 0x02).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x04, 0x04).r(m_slavelatch, FUNC(generic_latch_8_device::read)).w(m_beastlatch, FUNC(generic_latch_8_device::write)); - map(0x06, 0x06).w(this, FUNC(djboy_state::djboy_scrolly_w)); - map(0x08, 0x08).w(this, FUNC(djboy_state::djboy_scrollx_w)); - map(0x0a, 0x0a).w(this, FUNC(djboy_state::trigger_nmi_on_mastercpu)); - map(0x0c, 0x0c).r(this, FUNC(djboy_state::beast_status_r)); - map(0x0e, 0x0e).w(this, FUNC(djboy_state::coin_count_w)); + map(0x06, 0x06).w(FUNC(djboy_state::djboy_scrolly_w)); + map(0x08, 0x08).w(FUNC(djboy_state::djboy_scrollx_w)); + map(0x0a, 0x0a).w(FUNC(djboy_state::trigger_nmi_on_mastercpu)); + map(0x0c, 0x0c).r(FUNC(djboy_state::beast_status_r)); + map(0x0e, 0x0e).w(FUNC(djboy_state::coin_count_w)); } /******************************************************************************/ @@ -255,7 +255,7 @@ void djboy_state::soundcpu_am(address_map &map) void djboy_state::soundcpu_port_am(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(djboy_state::soundcpu_bankswitch_w)); + map(0x00, 0x00).w(FUNC(djboy_state::soundcpu_bankswitch_w)); map(0x02, 0x03).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x06, 0x06).rw("oki_l", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp index 1e4c24c1a59..14c28a8c0ab 100644 --- a/src/mame/drivers/djmain.cpp +++ b/src/mame/drivers/djmain.cpp @@ -378,24 +378,24 @@ void djmain_state::maincpu_djmain(address_map &map) map(0x000000, 0x0fffff).rom(); // PRG ROM map(0x400000, 0x40ffff).ram(); // WORK RAM map(0x480000, 0x48443f).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // COLOR RAM - map(0x500000, 0x57ffff).rw(this, FUNC(djmain_state::sndram_r), FUNC(djmain_state::sndram_w)); // SOUND RAM + map(0x500000, 0x57ffff).rw(FUNC(djmain_state::sndram_r), FUNC(djmain_state::sndram_w)); // SOUND RAM map(0x580000, 0x58003f).rw(m_k056832, FUNC(k056832_device::long_r), FUNC(k056832_device::long_w)); // VIDEO REG (tilemap) - map(0x590000, 0x590007).w(this, FUNC(djmain_state::unknown590000_w)); // ?? + map(0x590000, 0x590007).w(FUNC(djmain_state::unknown590000_w)); // ?? map(0x5a0000, 0x5a005f).w(m_k055555, FUNC(k055555_device::K055555_long_w)); // 055555: priority encoder map(0x5b0000, 0x5b04ff).rw("k054539_1", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask32(0xff00ff00); map(0x5b0000, 0x5b04ff).rw("k054539_2", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask32(0x00ff00ff); - map(0x5c0000, 0x5c0003).r(this, FUNC(djmain_state::inp1_r)); // DSW3,BTN3,BTN2,BTN1 // input port control (buttons and DIP switches) - map(0x5c8000, 0x5c8003).r(this, FUNC(djmain_state::inp2_r)); // DSW1,DSW2,UNK2,UNK1 // input port control (DIP switches) - map(0x5d0000, 0x5d0003).w(this, FUNC(djmain_state::light_ctrl_1_w)); // light/coin blocker control - map(0x5d2000, 0x5d2003).w(this, FUNC(djmain_state::light_ctrl_2_w)); // light/coin blocker control - map(0x5d4000, 0x5d4003).w(this, FUNC(djmain_state::v_ctrl_w)); // VIDEO control - map(0x5d6000, 0x5d6003).w(this, FUNC(djmain_state::sndram_bank_w)); // SOUND RAM bank - map(0x5e0000, 0x5e0003).rw(this, FUNC(djmain_state::turntable_r), FUNC(djmain_state::turntable_select_w)); // input port control (turn tables) - map(0x600000, 0x601fff).r(this, FUNC(djmain_state::v_rom_r)); // VIDEO ROM readthrough (for POST) + map(0x5c0000, 0x5c0003).r(FUNC(djmain_state::inp1_r)); // DSW3,BTN3,BTN2,BTN1 // input port control (buttons and DIP switches) + map(0x5c8000, 0x5c8003).r(FUNC(djmain_state::inp2_r)); // DSW1,DSW2,UNK2,UNK1 // input port control (DIP switches) + map(0x5d0000, 0x5d0003).w(FUNC(djmain_state::light_ctrl_1_w)); // light/coin blocker control + map(0x5d2000, 0x5d2003).w(FUNC(djmain_state::light_ctrl_2_w)); // light/coin blocker control + map(0x5d4000, 0x5d4003).w(FUNC(djmain_state::v_ctrl_w)); // VIDEO control + map(0x5d6000, 0x5d6003).w(FUNC(djmain_state::sndram_bank_w)); // SOUND RAM bank + map(0x5e0000, 0x5e0003).rw(FUNC(djmain_state::turntable_r), FUNC(djmain_state::turntable_select_w)); // input port control (turn tables) + map(0x600000, 0x601fff).r(FUNC(djmain_state::v_rom_r)); // VIDEO ROM readthrough (for POST) map(0x801000, 0x8017ff).ram().share("obj_ram"); // OBJECT RAM - map(0x802000, 0x802fff).w(this, FUNC(djmain_state::unknown802000_w)); // ?? - map(0x803000, 0x80309f).rw(this, FUNC(djmain_state::obj_ctrl_r), FUNC(djmain_state::obj_ctrl_w)); // OBJECT REGS - map(0x803800, 0x803fff).r(this, FUNC(djmain_state::obj_rom_r)); // OBJECT ROM readthrough (for POST) + map(0x802000, 0x802fff).w(FUNC(djmain_state::unknown802000_w)); // ?? + map(0x803000, 0x80309f).rw(FUNC(djmain_state::obj_ctrl_r), FUNC(djmain_state::obj_ctrl_w)); // OBJECT REGS + map(0x803800, 0x803fff).r(FUNC(djmain_state::obj_rom_r)); // OBJECT ROM readthrough (for POST) } void djmain_state::maincpu_djmainj(address_map &map) @@ -403,17 +403,17 @@ void djmain_state::maincpu_djmainj(address_map &map) maincpu_djmain(map); map(0xc00000, 0xc01fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); // VIDEO RAM (tilemap) (beatmania) - map(0xc02000, 0xc02047).w(this, FUNC(djmain_state::unknownc02000_w)); // ?? - map(0xf00000, 0xf0000f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); // IDE control regs (beatmania) - map(0xf40000, 0xf4000f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); // IDE status control reg (beatmania) + map(0xc02000, 0xc02047).w(FUNC(djmain_state::unknownc02000_w)); // ?? + map(0xf00000, 0xf0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs (beatmania) + map(0xf40000, 0xf4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg (beatmania) } void djmain_state::maincpu_djmainu(address_map &map) { maincpu_djmain(map); - map(0xd00000, 0xd0000f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); // IDE control regs (hiphopmania) - map(0xd40000, 0xd4000f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); // IDE status control reg (hiphopmania) + map(0xd00000, 0xd0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs (hiphopmania) + map(0xd40000, 0xd4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg (hiphopmania) map(0xe00000, 0xe01fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); // VIDEO RAM (tilemap) (hiphopmania) } @@ -421,8 +421,8 @@ void djmain_state::maincpu_djmaina(address_map &map) { maincpu_djmain(map); - map(0xc00000, 0xc0000f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); // IDE control regs - map(0xc40000, 0xc4000f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); // IDE status control reg + map(0xc00000, 0xc0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs + map(0xc40000, 0xc4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg map(0xf00000, 0xf01fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); // VIDEO RAM (tilemap) } diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index 20e9e79b10c..14f61a71ecc 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -805,21 +805,21 @@ void dkong_state::dkong_map(address_map &map) map(0x0000, 0x4fff).rom(); map(0x6000, 0x6bff).ram(); map(0x7000, 0x73ff).ram().share("sprite_ram"); /* sprite set 1 */ - map(0x7400, 0x77ff).ram().w(this, FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); + map(0x7400, 0x77ff).ram().w(FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); map(0x7800, 0x780f).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)); /* P8257 control registers */ map(0x7c00, 0x7c00).portr("IN0").w("ls175.3d", FUNC(latch8_device::write)); /* IN0, sound CPU intf */ - map(0x7c80, 0x7c80).portr("IN1").w(this, FUNC(dkong_state::radarscp_grid_color_w));/* IN1 */ + map(0x7c80, 0x7c80).portr("IN1").w(FUNC(dkong_state::radarscp_grid_color_w));/* IN1 */ - map(0x7d00, 0x7d00).r(this, FUNC(dkong_state::dkong_in2_r)); /* IN2 */ + map(0x7d00, 0x7d00).r(FUNC(dkong_state::dkong_in2_r)); /* IN2 */ map(0x7d00, 0x7d07).w(m_dev_6h, FUNC(latch8_device::bit0_w)); /* Sound signals */ - map(0x7d80, 0x7d80).portr("DSW0").w(this, FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ - map(0x7d81, 0x7d81).w(this, FUNC(dkong_state::radarscp_grid_enable_w)); - map(0x7d82, 0x7d82).w(this, FUNC(dkong_state::dkong_flipscreen_w)); - map(0x7d83, 0x7d83).w(this, FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ - map(0x7d84, 0x7d84).w(this, FUNC(dkong_state::nmi_mask_w)); - map(0x7d85, 0x7d85).w(this, FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ - map(0x7d86, 0x7d87).w(this, FUNC(dkong_state::dkong_palettebank_w)); + map(0x7d80, 0x7d80).portr("DSW0").w(FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ + map(0x7d81, 0x7d81).w(FUNC(dkong_state::radarscp_grid_enable_w)); + map(0x7d82, 0x7d82).w(FUNC(dkong_state::dkong_flipscreen_w)); + map(0x7d83, 0x7d83).w(FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ + map(0x7d84, 0x7d84).w(FUNC(dkong_state::nmi_mask_w)); + map(0x7d85, 0x7d85).w(FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ + map(0x7d86, 0x7d87).w(FUNC(dkong_state::dkong_palettebank_w)); } void dkong_state::dkongjr_map(address_map &map) @@ -828,24 +828,24 @@ void dkong_state::dkongjr_map(address_map &map) map(0x6000, 0x6bff).ram(); map(0x6c00, 0x6fff).ram(); /* DK3 bootleg only */ map(0x7000, 0x73ff).ram().share("sprite_ram"); /* sprite set 1 */ - map(0x7400, 0x77ff).ram().w(this, FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); + map(0x7400, 0x77ff).ram().w(FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); map(0x7800, 0x780f).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)); /* P8257 control registers */ map(0x7c00, 0x7c00).portr("IN0").w("ls174.3d", FUNC(latch8_device::write)); /* IN0, sound interface */ map(0x7c80, 0x7c87).w("ls259.4h", FUNC(latch8_device::bit0_w)); /* latch for sound and signals above */ - map(0x7c80, 0x7c80).portr("IN1").w(this, FUNC(dkong_state::dkongjr_gfxbank_w)); + map(0x7c80, 0x7c80).portr("IN1").w(FUNC(dkong_state::dkongjr_gfxbank_w)); - map(0x7d00, 0x7d00).r(this, FUNC(dkong_state::dkong_in2_r)); /* IN2 */ + map(0x7d00, 0x7d00).r(FUNC(dkong_state::dkong_in2_r)); /* IN2 */ map(0x7d00, 0x7d07).w(m_dev_6h, FUNC(latch8_device::bit0_w)); /* Sound addrs */ map(0x7d80, 0x7d87).w("ls259.5h", FUNC(latch8_device::bit0_w)); /* latch for sound and signals above*/ - map(0x7d80, 0x7d80).portr("DSW0").w(this, FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ - map(0x7d82, 0x7d82).w(this, FUNC(dkong_state::dkong_flipscreen_w)); - map(0x7d83, 0x7d83).w(this, FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ - map(0x7d84, 0x7d84).w(this, FUNC(dkong_state::nmi_mask_w)); - map(0x7d85, 0x7d85).w(this, FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ - map(0x7d86, 0x7d87).w(this, FUNC(dkong_state::dkong_palettebank_w)); + map(0x7d80, 0x7d80).portr("DSW0").w(FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ + map(0x7d82, 0x7d82).w(FUNC(dkong_state::dkong_flipscreen_w)); + map(0x7d83, 0x7d83).w(FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ + map(0x7d84, 0x7d84).w(FUNC(dkong_state::nmi_mask_w)); + map(0x7d85, 0x7d85).w(FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ + map(0x7d86, 0x7d87).w(FUNC(dkong_state::dkong_palettebank_w)); map(0x8000, 0x9fff).rom(); /* bootleg DKjr only */ map(0xb000, 0xbfff).rom(); /* pestplce only */ @@ -858,25 +858,25 @@ void dkong_state::dkong3_map(address_map &map) map(0x6000, 0x67ff).ram(); map(0x6800, 0x6fff).ram(); map(0x7000, 0x73ff).ram().share("sprite_ram"); /* sprite set 1 */ - map(0x7400, 0x77ff).ram().w(this, FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); + map(0x7400, 0x77ff).ram().w(FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); map(0x7c00, 0x7c00).portr("IN0").w("latch1", FUNC(latch8_device::write)); map(0x7c80, 0x7c80).portr("IN1").w("latch2", FUNC(latch8_device::write)); map(0x7d00, 0x7d00).portr("DSW0").w("latch3", FUNC(latch8_device::write)); - map(0x7d80, 0x7d80).portr("DSW1").w(this, FUNC(dkong_state::dkong3_2a03_reset_w)); - map(0x7e80, 0x7e80).w(this, FUNC(dkong_state::dkong3_coin_counter_w)); - map(0x7e81, 0x7e81).w(this, FUNC(dkong_state::dkong3_gfxbank_w)); - map(0x7e82, 0x7e82).w(this, FUNC(dkong_state::dkong_flipscreen_w)); - map(0x7e83, 0x7e83).w(this, FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ - map(0x7e84, 0x7e84).w(this, FUNC(dkong_state::nmi_mask_w)); - map(0x7e85, 0x7e85).w(this, FUNC(dkong_state::dkong_z80dma_rdy_w)); /* ==> DMA Chip */ - map(0x7e86, 0x7e87).w(this, FUNC(dkong_state::dkong_palettebank_w)); + map(0x7d80, 0x7d80).portr("DSW1").w(FUNC(dkong_state::dkong3_2a03_reset_w)); + map(0x7e80, 0x7e80).w(FUNC(dkong_state::dkong3_coin_counter_w)); + map(0x7e81, 0x7e81).w(FUNC(dkong_state::dkong3_gfxbank_w)); + map(0x7e82, 0x7e82).w(FUNC(dkong_state::dkong_flipscreen_w)); + map(0x7e83, 0x7e83).w(FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ + map(0x7e84, 0x7e84).w(FUNC(dkong_state::nmi_mask_w)); + map(0x7e85, 0x7e85).w(FUNC(dkong_state::dkong_z80dma_rdy_w)); /* ==> DMA Chip */ + map(0x7e86, 0x7e87).w(FUNC(dkong_state::dkong_palettebank_w)); map(0x8000, 0x9fff).rom(); /* DK3 and bootleg DKjr only */ } void dkong_state::dkong3_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); /* dma controller */ + map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); /* dma controller */ } /* Epos conversions */ @@ -884,7 +884,7 @@ void dkong_state::dkong3_io_map(address_map &map) void dkong_state::epos_readport(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).r(this, FUNC(dkong_state::epos_decrypt_rom)); /* Switch protection logic */ + map(0x00, 0xff).r(FUNC(dkong_state::epos_decrypt_rom)); /* Switch protection logic */ } /* S2650 conversions */ @@ -895,36 +895,36 @@ void dkong_state::s2650_map(address_map &map) map(0x1000, 0x13ff).ram().share("sprite_ram"); /* 0x7000 */ map(0x1400, 0x1400).mirror(0x007f).portr("IN0").w("ls175.3d", FUNC(latch8_device::write)); map(0x1480, 0x1480).portr("IN1"); - map(0x1500, 0x1500).mirror(0x007f).r(this, FUNC(dkong_state::dkong_in2_r)); /* IN2 */ + map(0x1500, 0x1500).mirror(0x007f).r(FUNC(dkong_state::dkong_in2_r)); /* IN2 */ map(0x1500, 0x1507).w(m_dev_6h, FUNC(latch8_device::bit0_w)); /* Sound signals */ - map(0x1580, 0x1580).portr("DSW0").w(this, FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ - map(0x1582, 0x1582).w(this, FUNC(dkong_state::dkong_flipscreen_w)); - map(0x1583, 0x1583).w(this, FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ + map(0x1580, 0x1580).portr("DSW0").w(FUNC(dkong_state::dkong_audio_irq_w)); /* DSW0 */ + map(0x1582, 0x1582).w(FUNC(dkong_state::dkong_flipscreen_w)); + map(0x1583, 0x1583).w(FUNC(dkong_state::dkong_spritebank_w)); /* 2 PSL Signal */ map(0x1584, 0x1584).noprw(); /* Possibly still interrupt enable */ - map(0x1585, 0x1585).w(this, FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ - map(0x1586, 0x1587).w(this, FUNC(dkong_state::dkong_palettebank_w)); + map(0x1585, 0x1585).w(FUNC(dkong_state::p8257_drq_w)); /* P8257 ==> /DRQ0 /DRQ1 */ + map(0x1586, 0x1587).w(FUNC(dkong_state::dkong_palettebank_w)); map(0x1600, 0x17ff).ram(); /* 0x6400 spriteram location */ - map(0x1800, 0x1bff).ram().w(this, FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); /* 0x7400 */ + map(0x1800, 0x1bff).ram().w(FUNC(dkong_state::dkong_videoram_w)).share("video_ram"); /* 0x7400 */ map(0x1C00, 0x1f7f).ram(); /* 0x6000 */ map(0x1f80, 0x1f8f).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)); /* P8257 control registers */ /* 0x6800 not remapped */ map(0x2000, 0x2fff).rom(); - map(0x3000, 0x3fff).rw(this, FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); + map(0x3000, 0x3fff).rw(FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); map(0x4000, 0x4fff).rom(); - map(0x5000, 0x5fff).rw(this, FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); + map(0x5000, 0x5fff).rw(FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); map(0x6000, 0x6fff).rom(); - map(0x7000, 0x7fff).rw(this, FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); + map(0x7000, 0x7fff).rw(FUNC(dkong_state::s2650_mirror_r), FUNC(dkong_state::s2650_mirror_w)); } void dkong_state::s2650_io_map(address_map &map) { - map(0x00, 0x00).r(this, FUNC(dkong_state::s2650_port0_r)); - map(0x01, 0x01).r(this, FUNC(dkong_state::s2650_port1_r)); + map(0x00, 0x00).r(FUNC(dkong_state::s2650_port0_r)); + map(0x01, 0x01).r(FUNC(dkong_state::s2650_port1_r)); } void dkong_state::s2650_data_map(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).w(this, FUNC(dkong_state::s2650_data_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).w(FUNC(dkong_state::s2650_data_w)); } diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index 6be80bd004a..f27b24c9bae 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -387,13 +387,13 @@ void dlair_state::dlus_map(address_map &map) map(0xc000, 0xc000).mirror(0x1fc7).r("aysnd", FUNC(ay8910_device::data_r)); map(0xc008, 0xc008).mirror(0x1fc7).portr("P1"); map(0xc010, 0xc010).mirror(0x1fc7).portr("SYSTEM"); - map(0xc020, 0xc020).mirror(0x1fc7).r(this, FUNC(dlair_state::laserdisc_r)); + map(0xc020, 0xc020).mirror(0x1fc7).r(FUNC(dlair_state::laserdisc_r)); map(0xe000, 0xe000).mirror(0x1fc7).w("aysnd", FUNC(ay8910_device::data_w)); - map(0xe008, 0xe008).mirror(0x1fc7).w(this, FUNC(dlair_state::misc_w)); + map(0xe008, 0xe008).mirror(0x1fc7).w(FUNC(dlair_state::misc_w)); map(0xe010, 0xe010).mirror(0x1fc7).w("aysnd", FUNC(ay8910_device::address_w)); - map(0xe020, 0xe020).mirror(0x1fc7).w(this, FUNC(dlair_state::laserdisc_w)); - map(0xe030, 0xe037).mirror(0x1fc0).w(this, FUNC(dlair_state::led_den2_w)); - map(0xe038, 0xe03f).mirror(0x1fc0).w(this, FUNC(dlair_state::led_den1_w)); + map(0xe020, 0xe020).mirror(0x1fc7).w(FUNC(dlair_state::laserdisc_w)); + map(0xe030, 0xe037).mirror(0x1fc0).w(FUNC(dlair_state::led_den2_w)); + map(0xe038, 0xe03f).mirror(0x1fc0).w(FUNC(dlair_state::led_den1_w)); } @@ -412,16 +412,16 @@ void dlair_state::dleuro_map(address_map &map) map(0xc000, 0xc7ff).mirror(0x1800).ram().share("videoram"); map(0xe000, 0xe000).mirror(0x1f47); // WT LED 1 map(0xe008, 0xe008).mirror(0x1f47); // WT LED 2 - map(0xe010, 0xe010).mirror(0x1f47).w(this, FUNC(dlair_state::led_den1_w)); // WT EXT LED 1 - map(0xe018, 0xe018).mirror(0x1f47).w(this, FUNC(dlair_state::led_den2_w)); // WT EXT LED 2 - map(0xe020, 0xe020).mirror(0x1f47).w(this, FUNC(dlair_state::laserdisc_w)); // DISC WT - map(0xe028, 0xe028).mirror(0x1f47).w(this, FUNC(dlair_state::dleuro_misc_w)); // WT MISC + map(0xe010, 0xe010).mirror(0x1f47).w(FUNC(dlair_state::led_den1_w)); // WT EXT LED 1 + map(0xe018, 0xe018).mirror(0x1f47).w(FUNC(dlair_state::led_den2_w)); // WT EXT LED 2 + map(0xe020, 0xe020).mirror(0x1f47).w(FUNC(dlair_state::laserdisc_w)); // DISC WT + map(0xe028, 0xe028).mirror(0x1f47).w(FUNC(dlair_state::dleuro_misc_w)); // WT MISC map(0xe030, 0xe030).mirror(0x1f47).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // CLR WDOG map(0xe080, 0xe080).mirror(0x1f47).portr("P1"); // CP A map(0xe088, 0xe088).mirror(0x1f47).portr("SYSTEM"); // CP B map(0xe090, 0xe090).mirror(0x1f47).portr("DSW1"); // OPT SW A map(0xe098, 0xe098).mirror(0x1f47).portr("DSW2"); // OPT SW B - map(0xe0a0, 0xe0a0).mirror(0x1f47).r(this, FUNC(dlair_state::laserdisc_r)); // RD DISC DATA + map(0xe0a0, 0xe0a0).mirror(0x1f47).r(FUNC(dlair_state::laserdisc_r)); // RD DISC DATA } diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp index 7c6dc571668..bd58833201c 100644 --- a/src/mame/drivers/dm7000.cpp +++ b/src/mame/drivers/dm7000.cpp @@ -233,14 +233,14 @@ void dm7000_state::dm7000_mem(address_map &map) map(0x00000000, 0x01ffffff).ram(); // RAM page 0 - 32MB map(0x20000000, 0x21ffffff).ram(); // RAM page 1 - 32MB - map(0x40030000, 0x4003000f).rw(this, FUNC(dm7000_state::dm7000_iic0_r), FUNC(dm7000_state::dm7000_iic0_w)); - map(0x40040000, 0x40040007).rw(this, FUNC(dm7000_state::dm7000_scc0_r), FUNC(dm7000_state::dm7000_scc0_w)); - map(0x40060000, 0x40060047).rw(this, FUNC(dm7000_state::dm7000_gpio0_r), FUNC(dm7000_state::dm7000_gpio0_w)); - map(0x400b0000, 0x400b000f).rw(this, FUNC(dm7000_state::dm7000_iic1_r), FUNC(dm7000_state::dm7000_iic1_w)); - map(0x400c0000, 0x400c0007).rw(this, FUNC(dm7000_state::dm7000_scp0_r), FUNC(dm7000_state::dm7000_scp0_w)); + map(0x40030000, 0x4003000f).rw(FUNC(dm7000_state::dm7000_iic0_r), FUNC(dm7000_state::dm7000_iic0_w)); + map(0x40040000, 0x40040007).rw(FUNC(dm7000_state::dm7000_scc0_r), FUNC(dm7000_state::dm7000_scc0_w)); + map(0x40060000, 0x40060047).rw(FUNC(dm7000_state::dm7000_gpio0_r), FUNC(dm7000_state::dm7000_gpio0_w)); + map(0x400b0000, 0x400b000f).rw(FUNC(dm7000_state::dm7000_iic1_r), FUNC(dm7000_state::dm7000_iic1_w)); + map(0x400c0000, 0x400c0007).rw(FUNC(dm7000_state::dm7000_scp0_r), FUNC(dm7000_state::dm7000_scp0_w)); /* ENET - ASIX AX88796 */ - map(0x72000300, 0x720003ff).rw(this, FUNC(dm7000_state::dm7000_enet_r), FUNC(dm7000_state::dm7000_enet_w)); + map(0x72000300, 0x720003ff).rw(FUNC(dm7000_state::dm7000_enet_r), FUNC(dm7000_state::dm7000_enet_w)); map(0x7f800000, 0x7ffdffff).rom().region("user2", 0); map(0x7ffe0000, 0x7fffffff).rom().region("user1", 0); diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index 258f1350cc7..52deda2488a 100644 --- a/src/mame/drivers/dmax8000.cpp +++ b/src/mame/drivers/dmax8000.cpp @@ -113,11 +113,11 @@ void dmax8000_state::dmax8000_io(address_map &map) map(0x08, 0x0b).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0c, 0x0f).rw("pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); // fdd controls map(0x10, 0x13).rw("pio2", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); // centronics & parallel ports - map(0x14, 0x17).w(this, FUNC(dmax8000_state::port14_w)); // control lines for the centronics & parallel ports + map(0x14, 0x17).w(FUNC(dmax8000_state::port14_w)); // control lines for the centronics & parallel ports //AM_RANGE(0x18, 0x19) AM_MIRROR(2) AM_DEVREADWRITE("am9511", am9512_device, read, write) // optional numeric coprocessor //AM_RANGE(0x1c, 0x1d) AM_MIRROR(2) // optional hard disk controller (1C=status, 1D=data) map(0x20, 0x23).rw("dart2", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); - map(0x40, 0x40).w(this, FUNC(dmax8000_state::port40_w)); // memory bank control + map(0x40, 0x40).w(FUNC(dmax8000_state::port40_w)); // memory bank control //AM_RANGE(0x60, 0x67) // optional IEEE488 GPIB map(0x70, 0x7f).rw("rtc", FUNC(mm58274c_device::read), FUNC(mm58274c_device::write)); // optional RTC } diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp index 18a75a103de..8c225e7a672 100644 --- a/src/mame/drivers/dmndrby.cpp +++ b/src/mame/drivers/dmndrby.cpp @@ -149,13 +149,13 @@ void dmndrby_state::memmap(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x8000, 0x8fff).ram().share("nvram"); - map(0xc000, 0xc007).r(this, FUNC(dmndrby_state::input_r)); - map(0xc000, 0xc007).w(this, FUNC(dmndrby_state::output_w)); + map(0xc000, 0xc007).r(FUNC(dmndrby_state::input_r)); + map(0xc000, 0xc007).w(FUNC(dmndrby_state::output_w)); map(0xc802, 0xc802).portr("DSW1"); map(0xc803, 0xc803).portr("DSW2"); map(0xca00, 0xca00).nopw();//(vblank_irq_w) //??? map(0xca01, 0xca01).nopw(); //watchdog - map(0xca02, 0xca02).ram().w(this, FUNC(dmndrby_state::dderby_sound_w)); + map(0xca02, 0xca02).ram().w(FUNC(dmndrby_state::dderby_sound_w)); map(0xca03, 0xca03).nopw();//(timer_irq_w) //??? map(0xcc00, 0xcc05).ram().share("scroll_ram"); map(0xce08, 0xce1f).ram().share("sprite_ram"); // horse sprites diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp index 4e4dcb097d2..3dfa8f80ebd 100644 --- a/src/mame/drivers/dms5000.cpp +++ b/src/mame/drivers/dms5000.cpp @@ -70,9 +70,9 @@ void dms5000_state::dms5000_mem(address_map &map) void dms5000_state::dms5000_io(address_map &map) { map.unmap_value_high(); - map(0x20, 0x2f).r(this, FUNC(dms5000_state::status_r)).umask16(0xff00); + map(0x20, 0x2f).r(FUNC(dms5000_state::status_r)).umask16(0xff00); map(0x40, 0x4f).w("cntlatch", FUNC(ls259_device::write_d0)).umask16(0x00ff); - map(0x50, 0x57).w(this, FUNC(dms5000_state::brightness_w)).umask16(0x00ff); + map(0x50, 0x57).w(FUNC(dms5000_state::brightness_w)).umask16(0x00ff); } /* Input ports */ diff --git a/src/mame/drivers/dms86.cpp b/src/mame/drivers/dms86.cpp index 971cd1d48dd..d119417148d 100644 --- a/src/mame/drivers/dms86.cpp +++ b/src/mame/drivers/dms86.cpp @@ -99,7 +99,7 @@ void dms86_state::mem_map(address_map &map) map.unmap_value_high(); map(0x00000, 0x1ffff).ram(); map(0xfe000, 0xfffff).rom().region("roms", 0); - map(0xfed03, 0xfed03).w(this, FUNC(dms86_state::m1_ack_w)); + map(0xfed03, 0xfed03).w(FUNC(dms86_state::m1_ack_w)); } void dms86_state::io_map(address_map &map) @@ -109,8 +109,8 @@ void dms86_state::io_map(address_map &map) map(0x80, 0x87).rw("sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).umask16(0x00ff); map(0x88, 0x8f).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)).umask16(0x00ff); map(0x90, 0x97).rw("sio2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).umask16(0x00ff); - map(0x9A, 0x9B).r(this, FUNC(dms86_state::port9a_r)); // parallel SASI port - map(0x9c, 0x9d).r(this, FUNC(dms86_state::port9c_r)); + map(0x9A, 0x9B).r(FUNC(dms86_state::port9a_r)); // parallel SASI port + map(0x9c, 0x9d).r(FUNC(dms86_state::port9c_r)); map(0x9c, 0x9c).w("terminal", FUNC(generic_terminal_device::write)); } diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index 07c00bedc5e..e22b4eafb68 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -562,32 +562,32 @@ uint8_t dmv_state::program_read(address_space &space, int cas, offs_t offset) void dmv_state::dmv_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(dmv_state::program_r), FUNC(dmv_state::program_w)); + map(0x0000, 0xffff).rw(FUNC(dmv_state::program_r), FUNC(dmv_state::program_w)); } void dmv_state::dmv_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(dmv_state::leds_w)); - map(0x10, 0x10).rw(this, FUNC(dmv_state::ramsel_r), FUNC(dmv_state::ramsel_w)); - map(0x11, 0x11).rw(this, FUNC(dmv_state::romsel_r), FUNC(dmv_state::romsel_w)); - map(0x12, 0x12).w(this, FUNC(dmv_state::tc_set_w)); - map(0x13, 0x13).r(this, FUNC(dmv_state::sys_status_r)); - map(0x14, 0x14).w(this, FUNC(dmv_state::fdd_motor_w)); + map(0x00, 0x00).w(FUNC(dmv_state::leds_w)); + map(0x10, 0x10).rw(FUNC(dmv_state::ramsel_r), FUNC(dmv_state::ramsel_w)); + map(0x11, 0x11).rw(FUNC(dmv_state::romsel_r), FUNC(dmv_state::romsel_w)); + map(0x12, 0x12).w(FUNC(dmv_state::tc_set_w)); + map(0x13, 0x13).r(FUNC(dmv_state::sys_status_r)); + map(0x14, 0x14).w(FUNC(dmv_state::fdd_motor_w)); map(0x20, 0x2f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x40, 0x41).rw("kb_ctrl_mcu", FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w)); map(0x50, 0x51).m(m_fdc, FUNC(i8272a_device::map)); map(0x80, 0x83).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0xa0, 0xa1).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); - map(0xd0, 0xd7).w(this, FUNC(dmv_state::switch16_w)); - map(0xe0, 0xe7).w(this, FUNC(dmv_state::rambank_w)); - - map(0x60, 0x6f).rw(this, FUNC(dmv_state::ifsel0_r), FUNC(dmv_state::ifsel0_w)); - map(0x70, 0x7f).rw(this, FUNC(dmv_state::ifsel1_r), FUNC(dmv_state::ifsel1_w)); - map(0x30, 0x3f).rw(this, FUNC(dmv_state::ifsel2_r), FUNC(dmv_state::ifsel2_w)); - map(0xb0, 0xbf).rw(this, FUNC(dmv_state::ifsel3_r), FUNC(dmv_state::ifsel3_w)); - map(0xc0, 0xcf).rw(this, FUNC(dmv_state::ifsel4_r), FUNC(dmv_state::ifsel4_w)); + map(0xd0, 0xd7).w(FUNC(dmv_state::switch16_w)); + map(0xe0, 0xe7).w(FUNC(dmv_state::rambank_w)); + + map(0x60, 0x6f).rw(FUNC(dmv_state::ifsel0_r), FUNC(dmv_state::ifsel0_w)); + map(0x70, 0x7f).rw(FUNC(dmv_state::ifsel1_r), FUNC(dmv_state::ifsel1_w)); + map(0x30, 0x3f).rw(FUNC(dmv_state::ifsel2_r), FUNC(dmv_state::ifsel2_w)); + map(0xb0, 0xbf).rw(FUNC(dmv_state::ifsel3_r), FUNC(dmv_state::ifsel3_w)); + map(0xc0, 0xcf).rw(FUNC(dmv_state::ifsel4_r), FUNC(dmv_state::ifsel4_w)); } READ8_MEMBER(dmv_state::kb_mcu_port1_r) diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp index d83e8582a90..c0b742b3500 100644 --- a/src/mame/drivers/docastle.cpp +++ b/src/mame/drivers/docastle.cpp @@ -243,30 +243,30 @@ void docastle_state::docastle_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x97ff).ram(); map(0x9800, 0x99ff).ram().share("spriteram"); - map(0xa000, 0xa008).rw(this, FUNC(docastle_state::docastle_shared0_r), FUNC(docastle_state::docastle_shared1_w)); + map(0xa000, 0xa008).rw(FUNC(docastle_state::docastle_shared0_r), FUNC(docastle_state::docastle_shared1_w)); map(0xa800, 0xa800).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xb000, 0xb3ff).mirror(0x0800).ram().w(this, FUNC(docastle_state::docastle_videoram_w)).share("videoram"); - map(0xb400, 0xb7ff).mirror(0x0800).ram().w(this, FUNC(docastle_state::docastle_colorram_w)).share("colorram"); - map(0xe000, 0xe000).w(this, FUNC(docastle_state::docastle_nmitrigger_w)); + map(0xb000, 0xb3ff).mirror(0x0800).ram().w(FUNC(docastle_state::docastle_videoram_w)).share("videoram"); + map(0xb400, 0xb7ff).mirror(0x0800).ram().w(FUNC(docastle_state::docastle_colorram_w)).share("colorram"); + map(0xe000, 0xe000).w(FUNC(docastle_state::docastle_nmitrigger_w)); } void docastle_state::docastle_map2(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa008).rw(this, FUNC(docastle_state::docastle_shared1_r), FUNC(docastle_state::docastle_shared0_w)); - map(0xc000, 0xc007).select(0x0080).rw(this, FUNC(docastle_state::inputs_flipscreen_r), FUNC(docastle_state::flipscreen_w)); - map(0xe000, 0xe000).w("sn1", FUNC(sn76489a_device::write)); - map(0xe400, 0xe400).w("sn2", FUNC(sn76489a_device::write)); - map(0xe800, 0xe800).w("sn3", FUNC(sn76489a_device::write)); - map(0xec00, 0xec00).w("sn4", FUNC(sn76489a_device::write)); + map(0xa000, 0xa008).rw(FUNC(docastle_state::docastle_shared1_r), FUNC(docastle_state::docastle_shared0_w)); + map(0xc000, 0xc007).select(0x0080).rw(FUNC(docastle_state::inputs_flipscreen_r), FUNC(docastle_state::flipscreen_w)); + map(0xe000, 0xe000).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xe400, 0xe400).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xe800, 0xe800).w("sn3", FUNC(sn76489a_device::command_w)); + map(0xec00, 0xec00).w("sn4", FUNC(sn76489a_device::command_w)); } void docastle_state::docastle_map3(address_map &map) { map(0x0000, 0x00ff).rom(); map(0x4000, 0x47ff).ram(); - map(0x8000, 0x8008).r(this, FUNC(docastle_state::docastle_shared1_r)); // ??? + map(0x8000, 0x8008).r(FUNC(docastle_state::docastle_shared1_r)); // ??? map(0xc003, 0xc003).noprw(); // EP according to schematics map(0xc432, 0xc435).noprw(); // ??? } @@ -285,23 +285,23 @@ void docastle_state::dorunrun_map(address_map &map) map(0x2000, 0x37ff).ram(); map(0x3800, 0x39ff).ram().share("spriteram"); map(0x4000, 0x9fff).rom(); - map(0xa000, 0xa008).rw(this, FUNC(docastle_state::docastle_shared0_r), FUNC(docastle_state::docastle_shared1_w)); + map(0xa000, 0xa008).rw(FUNC(docastle_state::docastle_shared0_r), FUNC(docastle_state::docastle_shared1_w)); map(0xa800, 0xa800).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xb000, 0xb3ff).ram().w(this, FUNC(docastle_state::docastle_videoram_w)).share("videoram"); - map(0xb400, 0xb7ff).ram().w(this, FUNC(docastle_state::docastle_colorram_w)).share("colorram"); - map(0xb800, 0xb800).w(this, FUNC(docastle_state::docastle_nmitrigger_w)); + map(0xb000, 0xb3ff).ram().w(FUNC(docastle_state::docastle_videoram_w)).share("videoram"); + map(0xb400, 0xb7ff).ram().w(FUNC(docastle_state::docastle_colorram_w)).share("colorram"); + map(0xb800, 0xb800).w(FUNC(docastle_state::docastle_nmitrigger_w)); } void docastle_state::dorunrun_map2(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa000).w("sn1", FUNC(sn76489a_device::write)); - map(0xa400, 0xa400).w("sn2", FUNC(sn76489a_device::write)); - map(0xa800, 0xa800).w("sn3", FUNC(sn76489a_device::write)); - map(0xac00, 0xac00).w("sn4", FUNC(sn76489a_device::write)); - map(0xc000, 0xc007).select(0x0080).rw(this, FUNC(docastle_state::inputs_flipscreen_r), FUNC(docastle_state::flipscreen_w)); - map(0xe000, 0xe008).rw(this, FUNC(docastle_state::docastle_shared1_r), FUNC(docastle_state::docastle_shared0_w)); + map(0xa000, 0xa000).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xa400, 0xa400).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xa800, 0xa800).w("sn3", FUNC(sn76489a_device::command_w)); + map(0xac00, 0xac00).w("sn4", FUNC(sn76489a_device::command_w)); + map(0xc000, 0xc007).select(0x0080).rw(FUNC(docastle_state::inputs_flipscreen_r), FUNC(docastle_state::flipscreen_w)); + map(0xe000, 0xe008).rw(FUNC(docastle_state::docastle_shared1_r), FUNC(docastle_state::docastle_shared0_w)); } @@ -311,12 +311,12 @@ void docastle_state::idsoccer_map(address_map &map) map(0x4000, 0x57ff).ram(); map(0x5800, 0x59ff).ram().share("spriteram"); map(0x6000, 0x9fff).rom(); - map(0xa000, 0xa008).rw(this, FUNC(docastle_state::docastle_shared0_r), FUNC(docastle_state::docastle_shared1_w)); + map(0xa000, 0xa008).rw(FUNC(docastle_state::docastle_shared0_r), FUNC(docastle_state::docastle_shared1_w)); map(0xa800, 0xa800).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xb000, 0xb3ff).mirror(0x0800).ram().w(this, FUNC(docastle_state::docastle_videoram_w)).share("videoram"); - map(0xb400, 0xb7ff).mirror(0x0800).ram().w(this, FUNC(docastle_state::docastle_colorram_w)).share("colorram"); - map(0xc000, 0xc000).rw(this, FUNC(docastle_state::idsoccer_adpcm_status_r), FUNC(docastle_state::idsoccer_adpcm_w)); - map(0xe000, 0xe000).w(this, FUNC(docastle_state::docastle_nmitrigger_w)); + map(0xb000, 0xb3ff).mirror(0x0800).ram().w(FUNC(docastle_state::docastle_videoram_w)).share("videoram"); + map(0xb400, 0xb7ff).mirror(0x0800).ram().w(FUNC(docastle_state::docastle_colorram_w)).share("colorram"); + map(0xc000, 0xc000).rw(FUNC(docastle_state::idsoccer_adpcm_status_r), FUNC(docastle_state::idsoccer_adpcm_w)); + map(0xe000, 0xe000).w(FUNC(docastle_state::docastle_nmitrigger_w)); } /* Input Ports */ diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp index 9d80d4be20d..484319b7b23 100644 --- a/src/mame/drivers/dogfgt.cpp +++ b/src/mame/drivers/dogfgt.cpp @@ -52,19 +52,19 @@ void dogfgt_state::main_map(address_map &map) { map(0x0000, 0x07ff).ram().share("sharedram"); map(0x0f80, 0x0fdf).writeonly().share("spriteram"); - map(0x1000, 0x17ff).w(this, FUNC(dogfgt_state::bgvideoram_w)).share("bgvideoram"); + map(0x1000, 0x17ff).w(FUNC(dogfgt_state::bgvideoram_w)).share("bgvideoram"); map(0x1800, 0x1800).portr("P1"); - map(0x1800, 0x1800).w(this, FUNC(dogfgt_state::_1800_w)); /* text color, flip screen & coin counters */ + map(0x1800, 0x1800).w(FUNC(dogfgt_state::_1800_w)); /* text color, flip screen & coin counters */ map(0x1810, 0x1810).portr("P2"); - map(0x1810, 0x1810).w(this, FUNC(dogfgt_state::subirqtrigger_w)); + map(0x1810, 0x1810).w(FUNC(dogfgt_state::subirqtrigger_w)); map(0x1820, 0x1820).portr("DSW1"); - map(0x1820, 0x1823).w(this, FUNC(dogfgt_state::scroll_w)); - map(0x1824, 0x1824).w(this, FUNC(dogfgt_state::plane_select_w)); + map(0x1820, 0x1823).w(FUNC(dogfgt_state::scroll_w)); + map(0x1824, 0x1824).w(FUNC(dogfgt_state::plane_select_w)); map(0x1830, 0x1830).portr("DSW2"); - map(0x1830, 0x1830).w(this, FUNC(dogfgt_state::soundlatch_w)); - map(0x1840, 0x1840).w(this, FUNC(dogfgt_state::soundcontrol_w)); + map(0x1830, 0x1830).w(FUNC(dogfgt_state::soundlatch_w)); + map(0x1840, 0x1840).w(FUNC(dogfgt_state::soundcontrol_w)); map(0x1870, 0x187f).w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x2000, 0x3fff).rw(this, FUNC(dogfgt_state::bitmapram_r), FUNC(dogfgt_state::bitmapram_w)); + map(0x2000, 0x3fff).rw(FUNC(dogfgt_state::bitmapram_r), FUNC(dogfgt_state::bitmapram_w)); map(0x8000, 0xffff).rom(); } @@ -72,7 +72,7 @@ void dogfgt_state::sub_map(address_map &map) { map(0x0000, 0x07ff).ram(); map(0x2000, 0x27ff).ram().share("sharedram"); - map(0x4000, 0x4000).w(this, FUNC(dogfgt_state::sub_irqack_w)); + map(0x4000, 0x4000).w(FUNC(dogfgt_state::sub_irqack_w)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp index 043c4d8b53b..a123f8510e2 100644 --- a/src/mame/drivers/dolphunk.cpp +++ b/src/mame/drivers/dolphunk.cpp @@ -198,9 +198,9 @@ void dauphin_state::dauphin_mem(address_map &map) void dauphin_state::dauphin_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x03).w(this, FUNC(dauphin_state::port00_w)); // 4-led display - map(0x06, 0x06).w(this, FUNC(dauphin_state::port06_w)); // speaker (NOT a keyclick) - map(0x07, 0x07).r(this, FUNC(dauphin_state::port07_r)); // pushbuttons + map(0x00, 0x03).w(FUNC(dauphin_state::port00_w)); // 4-led display + map(0x06, 0x06).w(FUNC(dauphin_state::port06_w)); // speaker (NOT a keyclick) + map(0x07, 0x07).r(FUNC(dauphin_state::port07_r)); // pushbuttons } /* Input ports */ diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp index f0417b7f9f8..2b476f1eba6 100644 --- a/src/mame/drivers/dominob.cpp +++ b/src/mame/drivers/dominob.cpp @@ -186,7 +186,7 @@ void dominob_state::memmap(address_map &map) map(0xd000, 0xd001).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xd001, 0xd001).r("aysnd", FUNC(ay8910_device::data_r)); - map(0xd008, 0xd008).w(this, FUNC(dominob_state::dominob_d008_w)); + map(0xd008, 0xd008).w(FUNC(dominob_state::dominob_d008_w)); map(0xd00c, 0xd00c).portr("IN0"); map(0xd010, 0xd010).portr("IN1").nopw(); map(0xd018, 0xd018).portr("IN2").nopw(); @@ -209,7 +209,7 @@ READ8_MEMBER(dominob_state::dominob_unk_port02_r) void dominob_state::portmap(address_map &map) { map.global_mask(0xff); - map(0x02, 0x02).r(this, FUNC(dominob_state::dominob_unk_port02_r)); + map(0x02, 0x02).r(FUNC(dominob_state::dominob_unk_port02_r)); } diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index 58443893343..220dc6bd57c 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -781,15 +781,15 @@ void dooyong_z80_ym2203_state::lastday_map(address_map &map) map(0xc000, 0xc007).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xc008, 0xc00f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xc010, 0xc010).portr("SYSTEM"); - map(0xc010, 0xc010).w(this, FUNC(dooyong_z80_ym2203_state::lastday_ctrl_w)); /* coin counter, flip screen */ + map(0xc010, 0xc010).w(FUNC(dooyong_z80_ym2203_state::lastday_ctrl_w)); /* coin counter, flip screen */ map(0xc011, 0xc011).portr("P1"); - map(0xc011, 0xc011).w(this, FUNC(dooyong_z80_ym2203_state::bankswitch_w)); + map(0xc011, 0xc011).w(FUNC(dooyong_z80_ym2203_state::bankswitch_w)); map(0xc012, 0xc012).portr("P2"); map(0xc012, 0xc012).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xc013, 0xc013).portr("DSWA"); map(0xc014, 0xc014).portr("DSWB"); map(0xc800, 0xcfff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xd000, 0xdfff).rw(this, FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w)); + map(0xd000, 0xdfff).rw(FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w)); map(0xe000, 0xefff).ram(); map(0xf000, 0xffff).ram().share("spriteram"); } @@ -800,17 +800,17 @@ void dooyong_z80_ym2203_state::pollux_map(address_map &map) map(0x8000, 0xbfff).bankr(m_mainbank); map(0xc000, 0xcfff).ram(); map(0xd000, 0xdfff).ram().share("spriteram"); - map(0xe000, 0xefff).rw(this, FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w)); - map(0xf000, 0xf000).portr("DSWA").w(this, FUNC(dooyong_z80_ym2203_state::bankswitch_w)); + map(0xe000, 0xefff).rw(FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w)); + map(0xf000, 0xf000).portr("DSWA").w(FUNC(dooyong_z80_ym2203_state::bankswitch_w)); map(0xf001, 0xf001).portr("DSWB"); map(0xf002, 0xf002).portr("P1"); map(0xf003, 0xf003).portr("P2"); map(0xf004, 0xf004).portr("SYSTEM"); - map(0xf008, 0xf008).w(this, FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */ + map(0xf008, 0xf008).w(FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */ map(0xf010, 0xf010).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xf018, 0xf01f).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xf020, 0xf027).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); - map(0xf800, 0xffff).rw(this, FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_r), FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_w)); + map(0xf800, 0xffff).rw(FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_r), FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_w)); } void dooyong_z80_ym2203_state::gulfstrm_map(address_map &map) @@ -819,14 +819,14 @@ void dooyong_z80_ym2203_state::gulfstrm_map(address_map &map) map(0x8000, 0xbfff).bankr(m_mainbank); map(0xc000, 0xcfff).ram(); map(0xd000, 0xdfff).ram().share("spriteram"); - map(0xe000, 0xefff).rw(this, FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w)); + map(0xe000, 0xefff).rw(FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w)); map(0xf000, 0xf000).portr("DSWA"); - map(0xf000, 0xf000).w(this, FUNC(dooyong_z80_ym2203_state::bankswitch_w)); + map(0xf000, 0xf000).w(FUNC(dooyong_z80_ym2203_state::bankswitch_w)); map(0xf001, 0xf001).portr("DSWB"); map(0xf002, 0xf002).portr("P2"); map(0xf003, 0xf003).portr("P1"); map(0xf004, 0xf004).portr("SYSTEM"); - map(0xf008, 0xf008).w(this, FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */ + map(0xf008, 0xf008).w(FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */ map(0xf010, 0xf010).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xf018, 0xf01f).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xf020, 0xf027).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); @@ -838,18 +838,18 @@ void dooyong_z80_state::bluehawk_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr(m_mainbank); map(0xc000, 0xc000).portr("DSWA"); - map(0xc000, 0xc000).w(this, FUNC(dooyong_z80_state::flip_screen_w)); + map(0xc000, 0xc000).w(FUNC(dooyong_z80_state::flip_screen_w)); map(0xc001, 0xc001).portr("DSWB"); map(0xc002, 0xc002).portr("P1"); map(0xc003, 0xc003).portr("P2"); map(0xc004, 0xc004).portr("SYSTEM"); - map(0xc008, 0xc008).w(this, FUNC(dooyong_z80_state::bankswitch_w)); + map(0xc008, 0xc008).w(FUNC(dooyong_z80_state::bankswitch_w)); map(0xc010, 0xc010).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xc018, 0xc01f).w(m_fg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xc040, 0xc047).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xc048, 0xc04f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xc800, 0xcfff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xd000, 0xdfff).rw(this, FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w)); + map(0xd000, 0xdfff).rw(FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w)); map(0xe000, 0xefff).ram().share("spriteram"); map(0xf000, 0xffff).ram(); } @@ -861,17 +861,17 @@ void dooyong_z80_state::flytiger_map(address_map &map) map(0xc000, 0xcfff).ram().share("spriteram"); map(0xd000, 0xdfff).ram(); map(0xe000, 0xe000).portr("P1"); - map(0xe000, 0xe000).w(this, FUNC(dooyong_z80_state::bankswitch_w)); + map(0xe000, 0xe000).w(FUNC(dooyong_z80_state::bankswitch_w)); map(0xe002, 0xe002).portr("P2"); map(0xe004, 0xe004).portr("SYSTEM"); map(0xe006, 0xe006).portr("DSWA"); map(0xe008, 0xe008).portr("DSWB"); - map(0xe010, 0xe010).w(this, FUNC(dooyong_z80_state::flytiger_ctrl_w)); /* coin counter, flip screen */ + map(0xe010, 0xe010).w(FUNC(dooyong_z80_state::flytiger_ctrl_w)); /* coin counter, flip screen */ map(0xe020, 0xe020).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xe030, 0xe037).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); map(0xe040, 0xe047).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)); - map(0xe800, 0xefff).rw(this, FUNC(dooyong_z80_state::paletteram_flytiger_r), FUNC(dooyong_z80_state::paletteram_flytiger_w)); - map(0xf000, 0xffff).rw(this, FUNC(dooyong_z80_state::lastday_tx_r), FUNC(dooyong_z80_state::lastday_tx_w)); + map(0xe800, 0xefff).rw(FUNC(dooyong_z80_state::paletteram_flytiger_r), FUNC(dooyong_z80_state::paletteram_flytiger_w)); + map(0xf000, 0xffff).rw(FUNC(dooyong_z80_state::lastday_tx_r), FUNC(dooyong_z80_state::lastday_tx_w)); } void dooyong_z80_state::primella_map(address_map &map) @@ -880,10 +880,10 @@ void dooyong_z80_state::primella_map(address_map &map) map(0x8000, 0xbfff).bankr(m_mainbank); map(0xc000, 0xcfff).ram(); map(0xd000, 0xd3ff).ram(); /* what is this? looks like a palette? scratchpad RAM maybe? */ - map(0xe000, 0xefff).rw(this, FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w)); + map(0xe000, 0xefff).rw(FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w)); map(0xf000, 0xf7ff).w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf800, 0xf800).portr("DSWA"); - map(0xf800, 0xf800).w(this, FUNC(dooyong_z80_state::primella_ctrl_w)); /* bank switch, flip screen etc */ + map(0xf800, 0xf800).w(FUNC(dooyong_z80_state::primella_ctrl_w)); /* bank switch, flip screen etc */ map(0xf810, 0xf810).portr("DSWB"); map(0xf810, 0xf810).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xf820, 0xf820).portr("P1"); @@ -907,7 +907,7 @@ void rshark_state::rshark_map(address_map &map) map(0x0c4010, 0x0c401f).w(m_bg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); map(0x0c8000, 0x0c8fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x0c0013, 0x0c0013).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x0c0014, 0x0c0015).w(this, FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */ + map(0x0c0014, 0x0c0015).w(FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */ map(0x0cc000, 0x0cc00f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); map(0x0cc010, 0x0cc01f).w(m_fg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); } @@ -926,7 +926,7 @@ void rshark_state::superx_map(address_map &map) map(0x084010, 0x08401f).w(m_bg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); map(0x088000, 0x088fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x080013, 0x080013).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x080014, 0x080015).w(this, FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */ + map(0x080014, 0x080015).w(FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */ map(0x08c000, 0x08c00f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); map(0x08c010, 0x08c01f).w(m_fg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); } @@ -942,7 +942,7 @@ void popbingo_state::popbingo_map(address_map &map) map(0x0c0004, 0x0c0005).portr("P1_P2"); map(0x0c0006, 0x0c0007).portr("SYSTEM"); map(0x0c0013, 0x0c0013).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x0c0014, 0x0c0015).w(this, FUNC(popbingo_state::ctrl_w)); + map(0x0c0014, 0x0c0015).w(FUNC(popbingo_state::ctrl_w)); map(0x0c0018, 0x0c001b).nopw(); // ? map(0x0c4000, 0x0c400f).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); map(0x0c4010, 0x0c401f).w(m_bg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff); diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp index 6f1f5d0a059..d01426109d9 100644 --- a/src/mame/drivers/dorachan.cpp +++ b/src/mame/drivers/dorachan.cpp @@ -152,10 +152,10 @@ void dorachan_state::dorachan_map(address_map &map) map(0x0000, 0x17ff).rom(); map(0x1800, 0x1fff).ram(); map(0x2000, 0x23ff).rom(); - map(0x2400, 0x2400).mirror(0x03ff).r(this, FUNC(dorachan_state::protection_r)); + map(0x2400, 0x2400).mirror(0x03ff).r(FUNC(dorachan_state::protection_r)); map(0x2800, 0x2800).mirror(0x03ff).portr("IN0"); map(0x2c00, 0x2c00).mirror(0x03ff).portr("IN1"); - map(0x3800, 0x3800).mirror(0x03ff).r(this, FUNC(dorachan_state::v128_r)); + map(0x3800, 0x3800).mirror(0x03ff).r(FUNC(dorachan_state::v128_r)); map(0x4000, 0x5fff).ram().share("videoram"); map(0x6000, 0x77ff).rom(); } @@ -164,8 +164,8 @@ void dorachan_state::dorachan_io_map(address_map &map) { map.global_mask(0xff); map(0x01, 0x01).nopw(); - map(0x02, 0x02).w(this, FUNC(dorachan_state::protection_w)); - map(0x03, 0x03).w(this, FUNC(dorachan_state::control_w)); + map(0x02, 0x02).w(FUNC(dorachan_state::protection_w)); + map(0x03, 0x03).w(FUNC(dorachan_state::control_w)); } diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp index 5a942588303..2a3608546ed 100644 --- a/src/mame/drivers/dotrikun.cpp +++ b/src/mame/drivers/dotrikun.cpp @@ -145,14 +145,14 @@ uint32_t dotrikun_state::screen_update(screen_device &screen, bitmap_ind16 &bitm void dotrikun_state::dotrikun_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x8000, 0x85ff).ram().w(this, FUNC(dotrikun_state::vram_w)).share("vram"); + map(0x8000, 0x85ff).ram().w(FUNC(dotrikun_state::vram_w)).share("vram"); map(0x8600, 0x87ff).ram(); } void dotrikun_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).mirror(0xff).portr("INPUTS").w(this, FUNC(dotrikun_state::color_w)); + map(0x00, 0x00).mirror(0xff).portr("INPUTS").w(FUNC(dotrikun_state::color_w)); } diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp index 3ad63634a11..a68c7338d6b 100644 --- a/src/mame/drivers/dps1.cpp +++ b/src/mame/drivers/dps1.cpp @@ -70,14 +70,14 @@ void dps1_state::io_map(address_map &map) map.unmap_value_high(); map(0x00, 0x03).rw("uart", FUNC(mc2661_device::read), FUNC(mc2661_device::write)); // S2651 map(0xb0, 0xb1).m(m_fdc, FUNC(upd765_family_device::map)); - map(0xb2, 0xb3).w(this, FUNC(dps1_state::portb2_w)); // set dma fdc->memory - map(0xb4, 0xb5).w(this, FUNC(dps1_state::portb4_w)); // set dma memory->fdc - map(0xb6, 0xb7).w(this, FUNC(dps1_state::portb6_w)); // enable eprom - map(0xb8, 0xb9).w(this, FUNC(dps1_state::portb8_w)); // set A16-23 - map(0xba, 0xbb).w(this, FUNC(dps1_state::portba_w)); // set A8-15 - map(0xbc, 0xbd).w(this, FUNC(dps1_state::portbc_w)); // set A0-7 - map(0xbe, 0xbf).w(this, FUNC(dps1_state::portbe_w)); // disable eprom - map(0xff, 0xff).rw(this, FUNC(dps1_state::portff_r), FUNC(dps1_state::portff_w)); + map(0xb2, 0xb3).w(FUNC(dps1_state::portb2_w)); // set dma fdc->memory + map(0xb4, 0xb5).w(FUNC(dps1_state::portb4_w)); // set dma memory->fdc + map(0xb6, 0xb7).w(FUNC(dps1_state::portb6_w)); // enable eprom + map(0xb8, 0xb9).w(FUNC(dps1_state::portb8_w)); // set A16-23 + map(0xba, 0xbb).w(FUNC(dps1_state::portba_w)); // set A8-15 + map(0xbc, 0xbd).w(FUNC(dps1_state::portbc_w)); // set A0-7 + map(0xbe, 0xbf).w(FUNC(dps1_state::portbe_w)); // disable eprom + map(0xff, 0xff).rw(FUNC(dps1_state::portff_r), FUNC(dps1_state::portff_w)); // other allocated ports, optional // AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("uart2", mc2661_device, read, write) // S2651 // AM_RANGE(0x08, 0x0b) parallel ports diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp index 39010d60c0d..2c4c246707e 100644 --- a/src/mame/drivers/dragrace.cpp +++ b/src/mame/drivers/dragrace.cpp @@ -109,7 +109,7 @@ READ8_MEMBER(dragrace_state::dragrace_scanline_r) void dragrace_state::dragrace_map(address_map &map) { map(0x0080, 0x00ff).ram(); - map(0x0800, 0x083f).r(this, FUNC(dragrace_state::dragrace_input_r)); + map(0x0800, 0x083f).r(FUNC(dragrace_state::dragrace_input_r)); map(0x0900, 0x0907).w("latch_f5", FUNC(addressable_latch_device::write_d0)); map(0x0908, 0x090f).w("latch_a5", FUNC(addressable_latch_device::write_d0)); map(0x0910, 0x0917).w("latch_h5", FUNC(addressable_latch_device::write_d0)); @@ -120,8 +120,8 @@ void dragrace_state::dragrace_map(address_map &map) map(0x0938, 0x093f).w("latch_e5", FUNC(addressable_latch_device::clear)); map(0x0a00, 0x0aff).writeonly().share("playfield_ram"); map(0x0b00, 0x0bff).writeonly().share("position_ram"); - map(0x0c00, 0x0c00).r(this, FUNC(dragrace_state::dragrace_steering_r)); - map(0x0d00, 0x0d00).r(this, FUNC(dragrace_state::dragrace_scanline_r)); + map(0x0c00, 0x0c00).r(FUNC(dragrace_state::dragrace_steering_r)); + map(0x0d00, 0x0d00).r(FUNC(dragrace_state::dragrace_scanline_r)); map(0x0e00, 0x0eff).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x1000, 0x1fff).rom(); /* program */ map(0xf800, 0xffff).rom(); /* program mirror */ diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp index 36c1399e771..9404cb3351f 100644 --- a/src/mame/drivers/dreambal.cpp +++ b/src/mame/drivers/dreambal.cpp @@ -123,7 +123,7 @@ void dreambal_state::dreambal_map(address_map &map) map(0x120000, 0x123fff).ram(); map(0x140000, 0x1403ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x160000, 0x163fff).rw(this, FUNC(dreambal_state::dreambal_protection_region_0_104_r), FUNC(dreambal_state::dreambal_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ + map(0x160000, 0x163fff).rw(FUNC(dreambal_state::dreambal_protection_region_0_104_r), FUNC(dreambal_state::dreambal_protection_region_0_104_w)).share("prot16ram"); /* Protection device */ map(0x161000, 0x16100f).w(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_w)); @@ -134,7 +134,7 @@ void dreambal_state::dreambal_map(address_map &map) map(0x163000, 0x163001).nopw(); // something on bit 1 map(0x164000, 0x164001).nopw(); // something on bit 1 - map(0x165000, 0x165001).w(this, FUNC(dreambal_state::dreambal_eeprom_w)); // EEP Write? + map(0x165000, 0x165001).w(FUNC(dreambal_state::dreambal_eeprom_w)); // EEP Write? map(0x16c002, 0x16c00d).nopw(); // writes 0000 to 0005 on startup map(0x1a0000, 0x1a0003).nopw(); // RS-232C status / data ports (byte access) diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp index 0a464e4b5ab..42eca64bd34 100644 --- a/src/mame/drivers/dreamwld.cpp +++ b/src/mame/drivers/dreamwld.cpp @@ -412,18 +412,18 @@ void dreamwld_state::baryon_map(address_map &map) map(0x400000, 0x401fff).ram().share("spriteram"); map(0x600000, 0x601fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); - map(0x800000, 0x801fff).ram().w(this, FUNC(dreamwld_state::vram_w<0>)).share("vram_0"); - map(0x802000, 0x803fff).ram().w(this, FUNC(dreamwld_state::vram_w<1>)).share("vram_1"); - map(0x804000, 0x8043ff).rw(this, FUNC(dreamwld_state::lineram16_r), FUNC(dreamwld_state::lineram16_w)); // linescroll + map(0x800000, 0x801fff).ram().w(FUNC(dreamwld_state::vram_w<0>)).share("vram_0"); + map(0x802000, 0x803fff).ram().w(FUNC(dreamwld_state::vram_w<1>)).share("vram_1"); + map(0x804000, 0x8043ff).rw(FUNC(dreamwld_state::lineram16_r), FUNC(dreamwld_state::lineram16_w)); // linescroll map(0x804400, 0x805fff).ram().share("vregs"); map(0xc00000, 0xc00003).portr("INPUTS"); map(0xc00004, 0xc00007).portr("c00004"); - map(0xc0000c, 0xc0000f).w(this, FUNC(dreamwld_state::okibank_w<0>)); // sfx + map(0xc0000c, 0xc0000f).w(FUNC(dreamwld_state::okibank_w<0>)); // sfx map(0xc00018, 0xc00018).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // sfx - map(0xc00030, 0xc00033).r(this, FUNC(dreamwld_state::protdata_r)); // it reads protection data (irq code) from here and puts it at ffd000 + map(0xc00030, 0xc00033).r(FUNC(dreamwld_state::protdata_r)); // it reads protection data (irq code) from here and puts it at ffd000 map(0xfe0000, 0xffffff).ram().share("workram"); // work ram } @@ -432,7 +432,7 @@ void dreamwld_state::dreamwld_map(address_map &map) { baryon_map(map); - map(0xc0002c, 0xc0002f).w(this, FUNC(dreamwld_state::okibank_w<1>)); // sfx + map(0xc0002c, 0xc0002f).w(FUNC(dreamwld_state::okibank_w<1>)); // sfx map(0xc00028, 0xc00028).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // sfx } diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp index 8b777fe4f00..f8b015513c4 100644 --- a/src/mame/drivers/drgnmst.cpp +++ b/src/mame/drivers/drgnmst.cpp @@ -188,19 +188,19 @@ void drgnmst_state::drgnmst_main_map(address_map &map) map(0x800018, 0x800019).portr("SYSTEM"); map(0x80001a, 0x80001b).portr("DSW1"); map(0x80001c, 0x80001d).portr("DSW2"); - map(0x800030, 0x800031).w(this, FUNC(drgnmst_state::drgnmst_coin_w)); + map(0x800030, 0x800031).w(FUNC(drgnmst_state::drgnmst_coin_w)); map(0x800100, 0x80011f).writeonly().share("vidregs"); map(0x800120, 0x800121).nopw(); map(0x80014a, 0x80014b).nopw(); map(0x800154, 0x800155).writeonly().share("vidregs2"); // seems to be priority control map(0x800176, 0x800177).portr("EXTRA"); - map(0x800180, 0x800181).w(this, FUNC(drgnmst_state::drgnmst_snd_command_w)); - map(0x800188, 0x800189).w(this, FUNC(drgnmst_state::drgnmst_snd_flag_w)); + map(0x800180, 0x800181).w(FUNC(drgnmst_state::drgnmst_snd_command_w)); + map(0x800188, 0x800189).w(FUNC(drgnmst_state::drgnmst_snd_flag_w)); map(0x8001e0, 0x8001e1).nopw(); - map(0x900000, 0x903fff).ram().w(this, FUNC(drgnmst_state::drgnmst_paletteram_w)).share("paletteram"); - map(0x904000, 0x907fff).ram().w(this, FUNC(drgnmst_state::drgnmst_md_videoram_w)).share("md_videoram"); - map(0x908000, 0x90bfff).ram().w(this, FUNC(drgnmst_state::drgnmst_bg_videoram_w)).share("bg_videoram"); - map(0x90c000, 0x90ffff).ram().w(this, FUNC(drgnmst_state::drgnmst_fg_videoram_w)).share("fg_videoram"); + map(0x900000, 0x903fff).ram().w(FUNC(drgnmst_state::drgnmst_paletteram_w)).share("paletteram"); + map(0x904000, 0x907fff).ram().w(FUNC(drgnmst_state::drgnmst_md_videoram_w)).share("md_videoram"); + map(0x908000, 0x90bfff).ram().w(FUNC(drgnmst_state::drgnmst_bg_videoram_w)).share("bg_videoram"); + map(0x90c000, 0x90ffff).ram().w(FUNC(drgnmst_state::drgnmst_fg_videoram_w)).share("fg_videoram"); map(0x920000, 0x923fff).ram().share("rowscrollram"); // rowscroll ram map(0x930000, 0x9307ff).ram().share("spriteram"); // Sprites map(0xff0000, 0xffffff).ram(); diff --git a/src/mame/drivers/dribling.cpp b/src/mame/drivers/dribling.cpp index 5e5bd5b7d46..4ff4841942e 100644 --- a/src/mame/drivers/dribling.cpp +++ b/src/mame/drivers/dribling.cpp @@ -180,14 +180,14 @@ void dribling_state::dribling_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x3fff).ram().share("videoram"); map(0x4000, 0x7fff).rom(); - map(0xc000, 0xdfff).ram().w(this, FUNC(dribling_state::dribling_colorram_w)).share("colorram"); + map(0xc000, 0xdfff).ram().w(FUNC(dribling_state::dribling_colorram_w)).share("colorram"); } void dribling_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(dribling_state::ioread), FUNC(dribling_state::iowrite)); + map(0x00, 0xff).rw(FUNC(dribling_state::ioread), FUNC(dribling_state::iowrite)); } diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp index 833217702ce..8b62479ea08 100644 --- a/src/mame/drivers/drmicro.cpp +++ b/src/mame/drivers/drmicro.cpp @@ -80,18 +80,18 @@ void drmicro_state::drmicro_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).ram(); - map(0xe000, 0xefff).ram().w(this, FUNC(drmicro_state::drmicro_videoram_w)); + map(0xe000, 0xefff).ram().w(FUNC(drmicro_state::drmicro_videoram_w)); map(0xf000, 0xffff).ram(); } void drmicro_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76496_device::write)); - map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76496_device::write)); - map(0x02, 0x02).w("sn3", FUNC(sn76496_device::write)); - map(0x03, 0x03).portr("DSW1").w(this, FUNC(drmicro_state::pcm_set_w)); - map(0x04, 0x04).portr("DSW2").w(this, FUNC(drmicro_state::nmi_enable_w)); + map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76496_device::command_w)); + map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76496_device::command_w)); + map(0x02, 0x02).w("sn3", FUNC(sn76496_device::command_w)); + map(0x03, 0x03).portr("DSW1").w(FUNC(drmicro_state::pcm_set_w)); + map(0x04, 0x04).portr("DSW2").w(FUNC(drmicro_state::nmi_enable_w)); map(0x05, 0x05).noprw(); // unused? / watchdog? } diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp index 928d82f27f7..709b1ef3283 100644 --- a/src/mame/drivers/drtomy.cpp +++ b/src/mame/drivers/drtomy.cpp @@ -177,15 +177,15 @@ WRITE16_MEMBER(drtomy_state::drtomy_okibank_w) void drtomy_state::drtomy_map(address_map &map) { map(0x000000, 0x03ffff).rom(); /* ROM */ - map(0x100000, 0x100fff).ram().w(this, FUNC(drtomy_state::drtomy_vram_fg_w)).share("videorafg"); /* Video RAM FG */ - map(0x101000, 0x101fff).ram().w(this, FUNC(drtomy_state::drtomy_vram_bg_w)).share("videorabg"); /* Video RAM BG */ + map(0x100000, 0x100fff).ram().w(FUNC(drtomy_state::drtomy_vram_fg_w)).share("videorafg"); /* Video RAM FG */ + map(0x101000, 0x101fff).ram().w(FUNC(drtomy_state::drtomy_vram_bg_w)).share("videorabg"); /* Video RAM BG */ map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x440000, 0x440fff).ram().share("spriteram"); /* Sprite RAM */ map(0x700000, 0x700001).portr("DSW1"); map(0x700002, 0x700003).portr("DSW2"); map(0x700004, 0x700005).portr("P1"); map(0x700006, 0x700007).portr("P2"); - map(0x70000c, 0x70000d).w(this, FUNC(drtomy_state::drtomy_okibank_w)); /* OKI banking */ + map(0x70000c, 0x70000d).w(FUNC(drtomy_state::drtomy_okibank_w)); /* OKI banking */ map(0x70000f, 0x70000f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI 6295*/ map(0xffc000, 0xffffff).ram(); /* Work RAM */ } diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp index d153b3cc77a..808d23a7747 100644 --- a/src/mame/drivers/drw80pkr.cpp +++ b/src/mame/drivers/drw80pkr.cpp @@ -419,7 +419,7 @@ void drw80pkr_state::map(address_map &map) void drw80pkr_state::io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(drw80pkr_state::io_r), FUNC(drw80pkr_state::io_w)); + map(0x00, 0xff).rw(FUNC(drw80pkr_state::io_r), FUNC(drw80pkr_state::io_w)); } /************************* diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp index cb2fdfab783..656e87272a4 100644 --- a/src/mame/drivers/dsb46.cpp +++ b/src/mame/drivers/dsb46.cpp @@ -68,7 +68,7 @@ void dsb46_state::dsb46_io(address_map &map) map.unmap_value_high(); map(0x00, 0x03).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); map(0x08, 0x0b).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x1a, 0x1a).w(this, FUNC(dsb46_state::port1a_w)); + map(0x1a, 0x1a).w(FUNC(dsb46_state::port1a_w)); //AM_RANGE(0x10, 0x10) disk related //AM_RANGE(0x14, 0x14) ?? (read after CTC1 TRG3) //AM_RANGE(0x18, 0x18) ?? diff --git a/src/mame/drivers/dual68.cpp b/src/mame/drivers/dual68.cpp index 6ec4ab90ac4..bce136276e5 100644 --- a/src/mame/drivers/dual68.cpp +++ b/src/mame/drivers/dual68.cpp @@ -53,7 +53,7 @@ void dual68_state::dual68_mem(address_map &map) map.unmap_value_high(); map(0x00000000, 0x0000ffff).ram().share("ram"); map(0x00080000, 0x00081fff).rom().region("user1", 0); - map(0x007f0000, 0x007f0001).w(this, FUNC(dual68_state::terminal_w)); + map(0x007f0000, 0x007f0001).w(FUNC(dual68_state::terminal_w)); map(0x00800000, 0x00801fff).rom().region("user1", 0); } diff --git a/src/mame/drivers/duet16.cpp b/src/mame/drivers/duet16.cpp index 481bad2103c..20b183a8a05 100644 --- a/src/mame/drivers/duet16.cpp +++ b/src/mame/drivers/duet16.cpp @@ -150,9 +150,9 @@ void duet16_state::duet16_mem(address_map &map) map(0x00000, 0x8ffff).ram(); map(0xa8000, 0xbffff).ram().share("gvram"); map(0xc0000, 0xc0fff).ram().share("cvram"); - map(0xf8000, 0xf801f).rw(this, FUNC(duet16_state::dmapg_r), FUNC(duet16_state::dmapg_w)).umask16(0x00ff); + map(0xf8000, 0xf801f).rw(FUNC(duet16_state::dmapg_r), FUNC(duet16_state::dmapg_w)).umask16(0x00ff); map(0xf8000, 0xf801f).rw("dmac", FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask16(0xff00); - map(0xf8020, 0xf8023).rw(this, FUNC(duet16_state::pic_r), FUNC(duet16_state::pic_w)).umask16(0x00ff); + map(0xf8020, 0xf8023).rw(FUNC(duet16_state::pic_r), FUNC(duet16_state::pic_w)).umask16(0x00ff); map(0xf8040, 0xf804f).rw("itm", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); map(0xf8060, 0xf8067).rw("bgpit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0xf8080, 0xf8087).rw("sio", FUNC(upd7201_new_device::ba_cd_r), FUNC(upd7201_new_device::ba_cd_w)).umask16(0x00ff); @@ -162,13 +162,13 @@ void duet16_state::duet16_mem(address_map &map) map(0xf80c2, 0xf80c2).rw("crtc", FUNC(h46505_device::register_r), FUNC(h46505_device::register_w)); map(0xf80e0, 0xf80e3).rw("i8741", FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w)).umask16(0x00ff); map(0xf8100, 0xf8103).m("fdc", FUNC(upd765a_device::map)).umask16(0x00ff); - map(0xf8120, 0xf8120).rw(this, FUNC(duet16_state::rtc_r), FUNC(duet16_state::rtc_w)); - map(0xf8160, 0xf819f).w(this, FUNC(duet16_state::pal_w)); - map(0xf8200, 0xf8201).r(this, FUNC(duet16_state::sysstat_r)); - map(0xf8220, 0xf8220).w(this, FUNC(duet16_state::fdcctrl_w)); - map(0xf8260, 0xf8260).w(this, FUNC(duet16_state::rtc_addr_w)); - map(0xf8280, 0xf8280).r(this, FUNC(duet16_state::rtc_stat_r)); - map(0xf8280, 0xf8280).w(this, FUNC(duet16_state::dispctrl_w)); + map(0xf8120, 0xf8120).rw(FUNC(duet16_state::rtc_r), FUNC(duet16_state::rtc_w)); + map(0xf8160, 0xf819f).w(FUNC(duet16_state::pal_w)); + map(0xf8200, 0xf8201).r(FUNC(duet16_state::sysstat_r)); + map(0xf8220, 0xf8220).w(FUNC(duet16_state::fdcctrl_w)); + map(0xf8260, 0xf8260).w(FUNC(duet16_state::rtc_addr_w)); + map(0xf8280, 0xf8280).r(FUNC(duet16_state::rtc_stat_r)); + map(0xf8280, 0xf8280).w(FUNC(duet16_state::dispctrl_w)); map(0xfe000, 0xfffff).rom().region("rom", 0); } diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index 28a65424a0a..98a4ca1a19e 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -486,28 +486,28 @@ WRITE8_MEMBER(dunhuang_state::rombank_w) void dunhuang_state::dunhuang_io_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(dunhuang_state::pos_x_w)); - map(0x0001, 0x0001).w(this, FUNC(dunhuang_state::pos_y_w)); - map(0x0002, 0x0004).w(this, FUNC(dunhuang_state::tile_w)); - map(0x0005, 0x0007).w(this, FUNC(dunhuang_state::tile2_w)); + map(0x0000, 0x0000).w(FUNC(dunhuang_state::pos_x_w)); + map(0x0001, 0x0001).w(FUNC(dunhuang_state::pos_y_w)); + map(0x0002, 0x0004).w(FUNC(dunhuang_state::tile_w)); + map(0x0005, 0x0007).w(FUNC(dunhuang_state::tile2_w)); - map(0x0008, 0x0008).w(this, FUNC(dunhuang_state::vert_clear_w)); + map(0x0008, 0x0008).w(FUNC(dunhuang_state::vert_clear_w)); map(0x000c, 0x000c).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0x000f, 0x000f).w(this, FUNC(dunhuang_state::block_addr_lo_w)); - map(0x0010, 0x0010).w(this, FUNC(dunhuang_state::block_addr_hi_w)); + map(0x000f, 0x000f).w(FUNC(dunhuang_state::block_addr_lo_w)); + map(0x0010, 0x0010).w(FUNC(dunhuang_state::block_addr_hi_w)); // AM_RANGE( 0x0011, 0x0011 ) ? - map(0x0012, 0x0012).w(this, FUNC(dunhuang_state::block_c_w)); - map(0x0015, 0x0015).w(this, FUNC(dunhuang_state::block_x_w)); - map(0x0016, 0x0016).w(this, FUNC(dunhuang_state::block_y_w)); - map(0x0017, 0x0017).w(this, FUNC(dunhuang_state::block_w_w)); - map(0x0018, 0x0018).w(this, FUNC(dunhuang_state::block_h_w)); + map(0x0012, 0x0012).w(FUNC(dunhuang_state::block_c_w)); + map(0x0015, 0x0015).w(FUNC(dunhuang_state::block_x_w)); + map(0x0016, 0x0016).w(FUNC(dunhuang_state::block_y_w)); + map(0x0017, 0x0017).w(FUNC(dunhuang_state::block_w_w)); + map(0x0018, 0x0018).w(FUNC(dunhuang_state::block_h_w)); - map(0x0019, 0x0019).w(this, FUNC(dunhuang_state::clear_y_w)); - map(0x001a, 0x001a).w(this, FUNC(dunhuang_state::horiz_clear_w)); + map(0x0019, 0x0019).w(FUNC(dunhuang_state::clear_y_w)); + map(0x001a, 0x001a).w(FUNC(dunhuang_state::horiz_clear_w)); - map(0x001b, 0x001b).w(this, FUNC(dunhuang_state::block_dest_w)); + map(0x001b, 0x001b).w(FUNC(dunhuang_state::block_dest_w)); map(0x0081, 0x0081).w("ymsnd", FUNC(ym2413_device::register_port_w)); map(0x0089, 0x0089).w("ymsnd", FUNC(ym2413_device::data_port_w)); @@ -518,11 +518,11 @@ void dunhuang_state::dunhuang_io_map(address_map &map) map(0x008b, 0x008b).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x0093, 0x0093).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x0084, 0x0084).r(this, FUNC(dunhuang_state::service_r)); - map(0x0085, 0x0085).r(this, FUNC(dunhuang_state::input_r)); + map(0x0084, 0x0084).r(FUNC(dunhuang_state::service_r)); + map(0x0085, 0x0085).r(FUNC(dunhuang_state::input_r)); - map(0x0086, 0x0086).w(this, FUNC(dunhuang_state::rombank_w)); - map(0x0087, 0x0087).w(this, FUNC(dunhuang_state::layers_w)); + map(0x0086, 0x0086).w(FUNC(dunhuang_state::rombank_w)); + map(0x0087, 0x0087).w(FUNC(dunhuang_state::layers_w)); map(0x0088, 0x0088).r("ay8910", FUNC(ay8910_device::data_r)); map(0x0090, 0x0090).w("ay8910", FUNC(ay8910_device::data_w)); diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index 19e7e2e4178..26fa3564dd7 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -123,13 +123,13 @@ protected: void kcgd_state::kcgd_mem(address_map &map) { map.unmap_value_high(); - map(0000000, 0077777).rw(this, FUNC(kcgd_state::vram_mmap_r), FUNC(kcgd_state::vram_mmap_w)); + map(0000000, 0077777).rw(FUNC(kcgd_state::vram_mmap_r), FUNC(kcgd_state::vram_mmap_w)); map(0100000, 0157777).rom(); - map(0160000, 0160001).mirror(03774).rw(this, FUNC(kcgd_state::vram_addr_r), FUNC(kcgd_state::vram_addr_w)); - map(0160002, 0160003).mirror(03774).rw(this, FUNC(kcgd_state::vram_data_r), FUNC(kcgd_state::vram_data_w)); - map(0167770, 0167771).rw(this, FUNC(kcgd_state::status_r), FUNC(kcgd_state::status_w)); - map(0167772, 0167772).rw(this, FUNC(kcgd_state::palette_index_r), FUNC(kcgd_state::palette_index_w)); // reads always return 0 - map(0167773, 0167773).rw(this, FUNC(kcgd_state::palette_data_r), FUNC(kcgd_state::palette_data_w)); + map(0160000, 0160001).mirror(03774).rw(FUNC(kcgd_state::vram_addr_r), FUNC(kcgd_state::vram_addr_w)); + map(0160002, 0160003).mirror(03774).rw(FUNC(kcgd_state::vram_data_r), FUNC(kcgd_state::vram_data_w)); + map(0167770, 0167771).rw(FUNC(kcgd_state::status_r), FUNC(kcgd_state::status_w)); + map(0167772, 0167772).rw(FUNC(kcgd_state::palette_index_r), FUNC(kcgd_state::palette_index_w)); // reads always return 0 + map(0167773, 0167773).rw(FUNC(kcgd_state::palette_data_r), FUNC(kcgd_state::palette_data_w)); // map(0176560, 0176567).ram(); // USART2 -- host // map(0177560, 0177567).ram(); // USART3 -- keyboard } diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp index 53c29308118..dbb413a79f6 100644 --- a/src/mame/drivers/dwarfd.cpp +++ b/src/mame/drivers/dwarfd.cpp @@ -412,13 +412,13 @@ READ8_MEMBER(dwarfd_state::qc_b8_r) void dwarfd_state::mem_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x4fff).rw(this, FUNC(dwarfd_state::dwarfd_ram_r), FUNC(dwarfd_state::dwarfd_ram_w)); + map(0x4000, 0x4fff).rw(FUNC(dwarfd_state::dwarfd_ram_r), FUNC(dwarfd_state::dwarfd_ram_w)); } void dwarfd_state::pokeresp_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x3000, 0x3fff).rw(this, FUNC(dwarfd_state::dwarfd_ram_r), FUNC(dwarfd_state::dwarfd_ram_w)); + map(0x3000, 0x3fff).rw(FUNC(dwarfd_state::dwarfd_ram_r), FUNC(dwarfd_state::dwarfd_ram_w)); } void dwarfd_state::io_map(address_map &map) @@ -429,8 +429,8 @@ void dwarfd_state::io_map(address_map &map) map(0x20, 0x21).rw(m_crtc, FUNC(i8275_device::read), FUNC(i8275_device::write)); map(0x40, 0x40).nopw(); // unknown - map(0x60, 0x60).w(this, FUNC(dwarfd_state::output1_w)); - map(0x80, 0x80).w(this, FUNC(dwarfd_state::output2_w)); + map(0x60, 0x60).w(FUNC(dwarfd_state::output1_w)); + map(0x80, 0x80).w(FUNC(dwarfd_state::output2_w)); map(0xc0, 0xc0).portr("DSW1"); map(0xc1, 0xc1).portr("DSW2"); } @@ -438,14 +438,14 @@ void dwarfd_state::io_map(address_map &map) void dwarfd_state::qc_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8fff).rw(this, FUNC(dwarfd_state::dwarfd_ram_r), FUNC(dwarfd_state::dwarfd_ram_w)); + map(0x8000, 0x8fff).rw(FUNC(dwarfd_state::dwarfd_ram_r), FUNC(dwarfd_state::dwarfd_ram_w)); } void dwarfd_state::qc_io_map(address_map &map) { io_map(map); map.global_mask(0xff); - map(0xb8, 0xb8).r(this, FUNC(dwarfd_state::qc_b8_r)); + map(0xb8, 0xb8).r(FUNC(dwarfd_state::qc_b8_r)); } static INPUT_PORTS_START( dwarfd ) diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp index 17b7d1bfcbd..6926bdc65b2 100644 --- a/src/mame/drivers/dynadice.cpp +++ b/src/mame/drivers/dynadice.cpp @@ -127,7 +127,7 @@ WRITE8_MEMBER(dynadice_state::sound_control_w) void dynadice_state::dynadice_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x23ff).ram().w(this, FUNC(dynadice_state::videoram_w)).share("videoram"); + map(0x2000, 0x23ff).ram().w(FUNC(dynadice_state::videoram_w)).share("videoram"); map(0x4000, 0x40ff).ram().share("nvram"); } @@ -152,8 +152,8 @@ void dynadice_state::dynadice_sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x00).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x01, 0x01).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(dynadice_state::sound_data_w)); - map(0x03, 0x03).w(this, FUNC(dynadice_state::sound_control_w)); + map(0x02, 0x02).w(FUNC(dynadice_state::sound_data_w)); + map(0x03, 0x03).w(FUNC(dynadice_state::sound_control_w)); } static INPUT_PORTS_START( dynadice ) diff --git a/src/mame/drivers/dynamoah.cpp b/src/mame/drivers/dynamoah.cpp index fa0825c3f4f..5f40e01412c 100644 --- a/src/mame/drivers/dynamoah.cpp +++ b/src/mame/drivers/dynamoah.cpp @@ -70,7 +70,7 @@ void dynamoah_state::i8031_mem(address_map &map) void dynamoah_state::i8031_ext_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(dynamoah_state::ext_r), FUNC(dynamoah_state::ext_w)); + map(0x0000, 0xffff).rw(FUNC(dynamoah_state::ext_r), FUNC(dynamoah_state::ext_w)); } MACHINE_CONFIG_START(dynamoah_state::dynamoah) diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index 91f7c5f1216..289b874f55f 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -447,36 +447,36 @@ void dynax_state::jantouki_sound_mem_map(address_map &map) void dynax_state::hnoridur_banked_map(address_map &map) { map(0x00000, 0x7ffff).rom().region("maincpu", 0x10000); - map(0x80000, 0x800ff).w(this, FUNC(dynax_state::hnoridur_palette_lo_w)); - map(0xa0000, 0xa00ff).w(this, FUNC(dynax_state::hnoridur_palette_hi_w)); + map(0x80000, 0x800ff).w(FUNC(dynax_state::hnoridur_palette_lo_w)); + map(0xa0000, 0xa00ff).w(FUNC(dynax_state::hnoridur_palette_hi_w)); map(0xc0000, 0xc7fff).ram(); // hnoridur: R/W RAM } void dynax_state::mjelctrn_banked_map(address_map &map) { map(0x00000, 0x3ffff).rom().region("maincpu", 0x10000); - map(0x80000, 0x800ff).w(this, FUNC(dynax_state::nanajign_palette_lo_w)); - map(0xa0000, 0xa00ff).w(this, FUNC(dynax_state::nanajign_palette_hi_w)); + map(0x80000, 0x800ff).w(FUNC(dynax_state::nanajign_palette_lo_w)); + map(0xa0000, 0xa00ff).w(FUNC(dynax_state::nanajign_palette_hi_w)); } void dynax_state::nanajign_banked_map(address_map &map) { map(0x00000, 0x7ffff).rom().region("maincpu", 0x10000); - map(0x80000, 0x800ff).w(this, FUNC(dynax_state::nanajign_palette_lo_w)); - map(0xa0000, 0xa00ff).w(this, FUNC(dynax_state::nanajign_palette_hi_w)); + map(0x80000, 0x800ff).w(FUNC(dynax_state::nanajign_palette_lo_w)); + map(0xa0000, 0xa00ff).w(FUNC(dynax_state::nanajign_palette_hi_w)); } void dynax_state::yarunara_banked_map(address_map &map) { map(0x00000, 0x3ffff).rom().region("maincpu", 0x10000); - map(0x80000, 0x801ff).w(this, FUNC(dynax_state::tenkai_palette_w)); + map(0x80000, 0x801ff).w(FUNC(dynax_state::tenkai_palette_w)); map(0xe0000, 0xe000f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); } void dynax_state::mjangels_banked_map(address_map &map) { map(0x000000, 0x07ffff).rom().region("maincpu", 0x010000); - map(0x080000, 0x0801ff).w(this, FUNC(dynax_state::tenkai_palette_w)); + map(0x080000, 0x0801ff).w(FUNC(dynax_state::tenkai_palette_w)); map(0x0a0000, 0x0bffff).rom().region("maincpu", 0x0b0000); map(0x0e0000, 0x0e000f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); map(0x100000, 0x13ffff).rom().region("maincpu", 0x110000); @@ -487,67 +487,67 @@ void dynax_state::mjangels_banked_map(address_map &map) void dynax_state::hanamai_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X - map(0x20, 0x20).w(this, FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y - map(0x41, 0x47).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter - map(0x50, 0x50).w(this, FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select hnkochou only - map(0x60, 0x60).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 - map(0x61, 0x61).r(this, FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 - map(0x62, 0x62).portr("COINS"); // Coins - map(0x63, 0x63).r(this, FUNC(dynax_state::ret_ff)); // ? - map(0x64, 0x64).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select - map(0x65, 0x65).w(this, FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select hanamai only - map(0x66, 0x66).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack - map(0x67, 0x67).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data - map(0x68, 0x68).w(this, FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable - map(0x69, 0x69).w(this, FUNC(dynax_state::hanamai_priority_w)); // layer priority - map(0x6a, 0x6a).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x6b, 0x6b).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x6c, 0x6c).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) - map(0x6d, 0x6d).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x6e, 0x6e).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x00, 0x00).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X + map(0x20, 0x20).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0x41, 0x47).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x50, 0x50).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select hnkochou only + map(0x60, 0x60).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x61, 0x61).r(FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 + map(0x62, 0x62).portr("COINS"); // Coins + map(0x63, 0x63).r(FUNC(dynax_state::ret_ff)); // ? + map(0x64, 0x64).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x65, 0x65).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select hanamai only + map(0x66, 0x66).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x67, 0x67).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x68, 0x68).w(FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable + map(0x69, 0x69).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority + map(0x6a, 0x6a).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x6b, 0x6b).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x6c, 0x6c).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) + map(0x6d, 0x6d).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x6e, 0x6e).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color map(0x70, 0x77).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0x78, 0x79).rw("ym2203", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // 2 x DSW map(0x7a, 0x7b).w("aysnd", FUNC(ay8912_device::address_data_w)); // AY8912 -// AM_RANGE( 0x7c, 0x7c ) AM_WRITENOP // CRT Controller -// AM_RANGE( 0x7d, 0x7d ) AM_WRITENOP // - map(0x7e, 0x7e).w(this, FUNC(dynax_state::dynax_blit_romregion_w)); // Blitter ROM bank +// AM_RANGE( 0x7c, 0x7c ) AM_WRITENOP // CRT Controller +// AM_RANGE( 0x7d, 0x7d ) AM_WRITENOP // + map(0x7e, 0x7e).w(FUNC(dynax_state::dynax_blit_romregion_w)); // Blitter ROM bank } void dynax_state::hnoridur_io_map(address_map &map) { map.global_mask(0xff); - map(0x01, 0x07).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter -// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller -// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller - map(0x20, 0x20).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select - map(0x21, 0x21).portr("COINS"); // Coins - map(0x22, 0x22).r(this, FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 - map(0x23, 0x23).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 - map(0x24, 0x24).portr("DSW1"); // DSW2 - map(0x25, 0x25).portr("DSW3"); // DSW4 - map(0x26, 0x26).portr("DSW2"); // DSW3 - map(0x30, 0x30).w(this, FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset - map(0x32, 0x32).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x01, 0x07).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter +// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller +// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller + map(0x20, 0x20).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x21, 0x21).portr("COINS"); // Coins + map(0x22, 0x22).r(FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 + map(0x23, 0x23).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x24, 0x24).portr("DSW1"); // DSW2 + map(0x25, 0x25).portr("DSW3"); // DSW4 + map(0x26, 0x26).portr("DSW2"); // DSW3 + map(0x30, 0x30).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset + map(0x32, 0x32).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data map(0x34, 0x35).w("ym2413", FUNC(ym2413_device::write)); // - map(0x36, 0x36).r("aysnd", FUNC(ay8912_device::data_r)); // AY8912, DSW0 - map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 - map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); // - map(0x40, 0x40).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x41, 0x41).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x42, 0x42).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes - map(0x43, 0x43).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x44, 0x44).w(this, FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable - map(0x45, 0x45).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x46, 0x46).w(this, FUNC(dynax_state::dynax_blit_romregion_w)); // Blitter ROM bank - map(0x47, 0x47).w(this, FUNC(dynax_state::hnoridur_palbank_w)); - map(0x50, 0x50).w(this, FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X - map(0x51, 0x51).w(this, FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y - map(0x54, 0x54).w(this, FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select - map(0x55, 0x55).nopw(); // ? VBlank IRQ Ack - map(0x56, 0x56).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack - map(0x57, 0x57).r(this, FUNC(dynax_state::ret_ff)); // ? + map(0x36, 0x36).r("aysnd", FUNC(ay8912_device::data_r)); // AY8912, DSW0 + map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 + map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); // + map(0x40, 0x40).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x41, 0x41).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x42, 0x42).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes + map(0x43, 0x43).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x44, 0x44).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable + map(0x45, 0x45).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x46, 0x46).w(FUNC(dynax_state::dynax_blit_romregion_w)); // Blitter ROM bank + map(0x47, 0x47).w(FUNC(dynax_state::hnoridur_palbank_w)); + map(0x50, 0x50).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X + map(0x51, 0x51).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0x54, 0x54).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select + map(0x55, 0x55).nopw(); // ? VBlank IRQ Ack + map(0x56, 0x56).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x57, 0x57).r(FUNC(dynax_state::ret_ff)); // ? map(0x60, 0x67).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0x70, 0x77).w("outlatch", FUNC(ls259_device::write_d0)); } @@ -592,56 +592,56 @@ void dynax_state::hjingi_mem_map(address_map &map) void dynax_state::hjingi_banked_map(address_map &map) { - map(0x80000, 0x800ff).w(this, FUNC(dynax_state::hnoridur_palette_lo_w)); - map(0xa0000, 0xa00ff).w(this, FUNC(dynax_state::hnoridur_palette_hi_w)); + map(0x80000, 0x800ff).w(FUNC(dynax_state::hnoridur_palette_lo_w)); + map(0xa0000, 0xa00ff).w(FUNC(dynax_state::hnoridur_palette_hi_w)); } void dynax_state::hjingi_io_map(address_map &map) { map.global_mask(0xff); - map(0x01, 0x07).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x01, 0x07).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter -// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller -// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller +// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller +// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller - map(0x20, 0x20).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select - map(0x21, 0x21).portr("COINS"); // Coins - map(0x22, 0x22).r(this, FUNC(dynax_state::hjingi_keyboard_1_r)); // P2 + Hopper - map(0x23, 0x23).r(this, FUNC(dynax_state::hjingi_keyboard_0_r)); // P1 + Hopper - map(0x24, 0x24).portr("DSW1"); // DSW1 - map(0x25, 0x25).portr("DSW3"); // DSW3 - map(0x26, 0x26).portr("DSW2"); // DSW2 - - map(0x30, 0x30).w(this, FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset - map(0x32, 0x32).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x20, 0x20).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x21, 0x21).portr("COINS"); // Coins + map(0x22, 0x22).r(FUNC(dynax_state::hjingi_keyboard_1_r)); // P2 + Hopper + map(0x23, 0x23).r(FUNC(dynax_state::hjingi_keyboard_0_r)); // P1 + Hopper + map(0x24, 0x24).portr("DSW1"); // DSW1 + map(0x25, 0x25).portr("DSW3"); // DSW3 + map(0x26, 0x26).portr("DSW2"); // DSW2 + + map(0x30, 0x30).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset + map(0x32, 0x32).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data map(0x34, 0x35).w("ym2413", FUNC(ym2413_device::write)); // - map(0x36, 0x36).r("aysnd", FUNC(ay8912_device::data_r)); // AY8912, DSW0 - map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 - map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); // + map(0x36, 0x36).r("aysnd", FUNC(ay8912_device::data_r)); // AY8912, DSW0 + map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 + map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); // - map(0x40, 0x40).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x41, 0x41).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x42, 0x42).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes - map(0x43, 0x43).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x44, 0x44).w(this, FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable - map(0x45, 0x45).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x46, 0x46).w(this, FUNC(dynax_state::dynax_blit_romregion_w)); // Blitter ROM bank - map(0x47, 0x47).w(this, FUNC(dynax_state::hnoridur_palbank_w)); + map(0x40, 0x40).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x41, 0x41).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x42, 0x42).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes + map(0x43, 0x43).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x44, 0x44).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable + map(0x45, 0x45).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x46, 0x46).w(FUNC(dynax_state::dynax_blit_romregion_w)); // Blitter ROM bank + map(0x47, 0x47).w(FUNC(dynax_state::hnoridur_palbank_w)); - map(0x50, 0x50).w(this, FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X - map(0x51, 0x51).w(this, FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0x50, 0x50).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X + map(0x51, 0x51).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y - map(0x54, 0x54).w(this, FUNC(dynax_state::hnoridur_rombank_w)); // palette bank select + map(0x54, 0x54).w(FUNC(dynax_state::hnoridur_rombank_w)); // palette bank select - map(0x56, 0x56).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack - map(0x57, 0x57).r(this, FUNC(dynax_state::ret_ff)); // Blitter Busy + map(0x56, 0x56).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x57, 0x57).r(FUNC(dynax_state::ret_ff)); // Blitter Busy - map(0x60, 0x67).w(m_mainlatch, FUNC(ls259_device::write_d0)); // Flip screen, layer half select, etc. + map(0x60, 0x67).w(m_mainlatch, FUNC(ls259_device::write_d0)); // Flip screen, layer half select, etc. - map(0x70, 0x77).w("outlatch", FUNC(ls259_device::write_d0)); // Coin Counters, Hopper, Coin Lockout + map(0x70, 0x77).w("outlatch", FUNC(ls259_device::write_d0)); // Coin Counters, Hopper, Coin Lockout - map(0x80, 0x80).w(this, FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select + map(0x80, 0x80).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select } @@ -727,28 +727,28 @@ WRITE8_MEMBER(dynax_state::yarunara_blit_romregion_w) void dynax_state::yarunara_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(dynax_state::yarunara_input_w)); // Controls - map(0x02, 0x03).r(this, FUNC(dynax_state::yarunara_input_r)); // - map(0x11, 0x17).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter - map(0x20, 0x20).w(this, FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset - map(0x22, 0x22).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x00, 0x01).w(FUNC(dynax_state::yarunara_input_w)); // Controls + map(0x02, 0x03).r(FUNC(dynax_state::yarunara_input_r)); // + map(0x11, 0x17).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x20, 0x20).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset + map(0x22, 0x22).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data map(0x24, 0x25).w("ym2413", FUNC(ym2413_device::write)); // map(0x28, 0x28).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 map(0x2a, 0x2a).w("aysnd", FUNC(ay8912_device::address_w)); // - map(0x48, 0x48).w(this, FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X - map(0x49, 0x49).w(this, FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y - map(0x4a, 0x4a).w(this, FUNC(dynax_state::yarunara_rombank_w)); // BANK ROM Select - map(0x4b, 0x4b).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x48, 0x48).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X + map(0x49, 0x49).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0x4a, 0x4a).w(FUNC(dynax_state::yarunara_rombank_w)); // BANK ROM Select + map(0x4b, 0x4b).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack map(0x4c, 0x4c).portr("DSW0"); // DSW 1 map(0x4f, 0x4f).portr("DSW1"); // DSW 2 map(0x50, 0x57).w(m_mainlatch, FUNC(ls259_device::write_d1)); - map(0x68, 0x68).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x69, 0x69).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x6a, 0x6a).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes - map(0x6b, 0x6b).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x6c, 0x6c).w(this, FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable - map(0x6d, 0x6d).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x6e, 0x6e).w(this, FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank + map(0x68, 0x68).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x69, 0x69).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x6a, 0x6a).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes + map(0x6b, 0x6b).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x6c, 0x6c).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable + map(0x6d, 0x6d).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x6e, 0x6e).w(FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank } @@ -756,33 +756,33 @@ void dynax_state::yarunara_io_map(address_map &map) void dynax_state::mcnpshnt_io_map(address_map &map) { map.global_mask(0xff); - map(0x01, 0x07).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x01, 0x07).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter // AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller // AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller - map(0x20, 0x20).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x20, 0x20).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select map(0x21, 0x21).portr("COINS"); // Coins - map(0x22, 0x22).r(this, FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 - map(0x23, 0x23).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x22, 0x22).r(FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 + map(0x23, 0x23).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 map(0x24, 0x24).portr("DSW0"); // DSW2 map(0x26, 0x26).portr("DSW1"); // DSW3 - map(0x30, 0x30).w(this, FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset - map(0x32, 0x32).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x30, 0x30).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset + map(0x32, 0x32).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data map(0x34, 0x35).w("ym2413", FUNC(ym2413_device::write)); // map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); // - map(0x40, 0x40).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x41, 0x41).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x42, 0x42).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes - map(0x43, 0x43).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x44, 0x44).w(this, FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable - map(0x45, 0x45).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x46, 0x46).w(this, FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank - map(0x47, 0x47).w(this, FUNC(dynax_state::hnoridur_palbank_w)); - map(0x50, 0x50).w(this, FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X - map(0x51, 0x51).w(this, FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y - map(0x54, 0x54).w(this, FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select - map(0x56, 0x56).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack - map(0x57, 0x57).r(this, FUNC(dynax_state::ret_ff)); // ? + map(0x40, 0x40).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x41, 0x41).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x42, 0x42).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes + map(0x43, 0x43).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x44, 0x44).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable + map(0x45, 0x45).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x46, 0x46).w(FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank + map(0x47, 0x47).w(FUNC(dynax_state::hnoridur_palbank_w)); + map(0x50, 0x50).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X + map(0x51, 0x51).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0x54, 0x54).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select + map(0x56, 0x56).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x57, 0x57).r(FUNC(dynax_state::ret_ff)); // ? map(0x60, 0x67).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0x70, 0x77).w("outlatch", FUNC(ls259_device::write_d0)); } @@ -791,22 +791,22 @@ void dynax_state::mcnpshnt_io_map(address_map &map) void dynax_state::sprtmtch_io_map(address_map &map) { map.global_mask(0xff); - map(0x01, 0x07).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x01, 0x07).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter map(0x10, 0x11).rw("ym2203", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // 2 x DSW // AM_RANGE( 0x12, 0x12 ) AM_WRITENOP // CRT Controller // AM_RANGE( 0x13, 0x13 ) AM_WRITENOP // CRT Controller map(0x20, 0x20).portr("P1"); // P1 map(0x21, 0x21).portr("P2"); // P2 map(0x22, 0x22).portr("COINS"); // Coins - map(0x23, 0x23).r(this, FUNC(dynax_state::ret_ff)); // ? - map(0x30, 0x30).w(this, FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable - map(0x31, 0x31).w(this, FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select - map(0x32, 0x32).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x33, 0x33).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x34, 0x34).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) - map(0x35, 0x35).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x36, 0x36).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x37, 0x37).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x23, 0x23).r(FUNC(dynax_state::ret_ff)); // ? + map(0x30, 0x30).w(FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable + map(0x31, 0x31).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select + map(0x32, 0x32).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x33, 0x33).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x34, 0x34).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) + map(0x35, 0x35).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x36, 0x36).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x37, 0x37).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack map(0x40, 0x47).w(m_mainlatch, FUNC(ls259_device::write_d0)); } @@ -815,18 +815,18 @@ void dynax_state::sprtmtch_io_map(address_map &map) void dynax_state::mjfriday_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x01, 0x01).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) - map(0x02, 0x02).w(this, FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select - map(0x03, 0x03).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x00, 0x00).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x01, 0x01).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) + map(0x02, 0x02).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select + map(0x03, 0x03).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color map(0x10, 0x17).w(m_mainlatch, FUNC(ls259_device::write_d0)); - map(0x41, 0x47).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x41, 0x47).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter // AM_RANGE( 0x50, 0x50 ) AM_WRITENOP // CRT Controller // AM_RANGE( 0x51, 0x51 ) AM_WRITENOP // CRT Controller - map(0x60, 0x60).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x60, 0x60).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select map(0x61, 0x61).portr("COINS"); // Coins - map(0x62, 0x62).r(this, FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 - map(0x63, 0x63).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x62, 0x62).r(FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 + map(0x63, 0x63).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 map(0x64, 0x64).portr("DSW0"); // DSW map(0x67, 0x67).portr("DSW1"); // DSW map(0x70, 0x71).w("ym2413", FUNC(ym2413_device::write)); // @@ -837,34 +837,34 @@ void dynax_state::mjfriday_io_map(address_map &map) void dynax_state::nanajign_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset - map(0x02, 0x02).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x00, 0x00).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset + map(0x02, 0x02).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data map(0x04, 0x05).w("ym2413", FUNC(ym2413_device::write)); // map(0x08, 0x08).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 map(0x0a, 0x0a).w("aysnd", FUNC(ay8912_device::address_w)); // - map(0x10, 0x10).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x10, 0x10).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select map(0x11, 0x11).portr("COINS"); // Coins - map(0x12, 0x12).r(this, FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 - map(0x13, 0x13).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x12, 0x12).r(FUNC(dynax_state::hanamai_keyboard_1_r)); // P2 + map(0x13, 0x13).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 map(0x14, 0x14).portr("DSW0"); // DSW1 map(0x15, 0x15).portr("DSW1"); // DSW2 map(0x16, 0x16).portr("DSW2"); // DSW3 // AM_RANGE( 0x20, 0x21 ) AM_WRITENOP // CRT Controller - map(0x31, 0x37).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x31, 0x37).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter map(0x40, 0x47).w("outlatch", FUNC(ls259_device::write_d0)); // Coin Counter map(0x50, 0x57).w(m_mainlatch, FUNC(ls259_device::write_d0)); - map(0x60, 0x60).w(this, FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X - map(0x62, 0x62).w(this, FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y - map(0x6a, 0x6a).w(this, FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select - map(0x6c, 0x6c).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack - map(0x70, 0x70).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x71, 0x71).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x72, 0x72).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes - map(0x73, 0x73).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x74, 0x74).w(this, FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable - map(0x75, 0x75).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x76, 0x76).w(this, FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank - map(0x77, 0x77).w(this, FUNC(dynax_state::hnoridur_palbank_w)); + map(0x60, 0x60).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X + map(0x62, 0x62).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0x6a, 0x6a).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select + map(0x6c, 0x6c).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x70, 0x70).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x71, 0x71).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x72, 0x72).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes + map(0x73, 0x73).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x74, 0x74).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable + map(0x75, 0x75).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x76, 0x76).w(FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank + map(0x77, 0x77).w(FUNC(dynax_state::hnoridur_palbank_w)); } @@ -893,30 +893,30 @@ void dynax_state::jantouki_io_map(address_map &map) { map.global_mask(0xff); // AM_RANGE( 0x40, 0x41 ) AM_WRITENOP // CRT Controller - map(0x48, 0x48).w(this, FUNC(dynax_state::jantouki_rombank_w)); // BANK ROM Select + map(0x48, 0x48).w(FUNC(dynax_state::jantouki_rombank_w)); // BANK ROM Select map(0x49, 0x49).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU - map(0x4a, 0x4a).r(this, FUNC(dynax_state::jantouki_soundlatch_ack_r)); // Soundlatch status - map(0x4b, 0x4b).w(this, FUNC(dynax_state::dynax_blit2_dest_w)); // Destination Layer 2 - map(0x4d, 0x4d).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0x4f, 0x4f).w(this, FUNC(dynax_state::dynax_blit2_romregion_w)); // Blitter 2 ROM bank - map(0x50, 0x50).w(this, FUNC(dynax_state::jantouki_vblank_ack_w)); // VBlank IRQ Ack - map(0x51, 0x51).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select - map(0x52, 0x52).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x4a, 0x4a).r(FUNC(dynax_state::jantouki_soundlatch_ack_r)); // Soundlatch status + map(0x4b, 0x4b).w(FUNC(dynax_state::dynax_blit2_dest_w)); // Destination Layer 2 + map(0x4d, 0x4d).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0x4f, 0x4f).w(FUNC(dynax_state::dynax_blit2_romregion_w)); // Blitter 2 ROM bank + map(0x50, 0x50).w(FUNC(dynax_state::jantouki_vblank_ack_w)); // VBlank IRQ Ack + map(0x51, 0x51).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x52, 0x52).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 map(0x54, 0x54).portr("COINS"); // Coins map(0x55, 0x55).portr("DSW0"); // DSW1 map(0x56, 0x56).portr("DSW1"); // DSW2 map(0x58, 0x5f).w(m_mainlatch, FUNC(ls259_device::write_d0)); - map(0x60, 0x60).w(this, FUNC(dynax_state::dynax_blit_palette67_w)); // Layers Palettes (Low Bits) - map(0x61, 0x61).w(this, FUNC(dynax_state::dynax_blit_palette45_w)); // - map(0x62, 0x62).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x63, 0x63).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // - map(0x64, 0x64).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x65, 0x65).w(this, FUNC(dynax_state::dynax_blit2_pen_w)); // Destination Pen 2 - map(0x66, 0x66).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x67, 0x67).r(this, FUNC(dynax_state::jantouki_blitter_busy_r)); // - map(0x69, 0x6f).w(this, FUNC(dynax_state::jantouki_blitter2_rev2_w)); // Blitter 2 - map(0x71, 0x77).w(this, FUNC(dynax_state::jantouki_blitter_rev2_w)); // Blitter - map(0x78, 0x7e).w(this, FUNC(dynax_state::jantouki_layer_enable_w)); // Layers Enable + map(0x60, 0x60).w(FUNC(dynax_state::dynax_blit_palette67_w)); // Layers Palettes (Low Bits) + map(0x61, 0x61).w(FUNC(dynax_state::dynax_blit_palette45_w)); // + map(0x62, 0x62).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x63, 0x63).w(FUNC(dynax_state::dynax_blit_palette01_w)); // + map(0x64, 0x64).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x65, 0x65).w(FUNC(dynax_state::dynax_blit2_pen_w)); // Destination Pen 2 + map(0x66, 0x66).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x67, 0x67).r(FUNC(dynax_state::jantouki_blitter_busy_r)); // + map(0x69, 0x6f).w(FUNC(dynax_state::jantouki_blitter2_rev2_w)); // Blitter 2 + map(0x71, 0x77).w(FUNC(dynax_state::jantouki_blitter_rev2_w)); // Blitter + map(0x78, 0x7e).w(FUNC(dynax_state::jantouki_layer_enable_w)); // Layers Enable } /*************************************************************************** @@ -931,14 +931,14 @@ READ8_MEMBER(dynax_state::jantouki_soundlatch_status_r) void dynax_state::jantouki_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(dynax_state::jantouki_sound_rombank_w)); // BANK ROM Select - map(0x10, 0x10).w(this, FUNC(dynax_state::jantouki_sound_vblank_ack_w)); // VBlank IRQ Ack + map(0x00, 0x00).w(FUNC(dynax_state::jantouki_sound_rombank_w)); // BANK ROM Select + map(0x10, 0x10).w(FUNC(dynax_state::jantouki_sound_vblank_ack_w)); // VBlank IRQ Ack map(0x21, 0x21).r("aysnd", FUNC(ay8912_device::data_r)); // AY8912 map(0x22, 0x23).w("aysnd", FUNC(ay8912_device::data_address_w)); // map(0x28, 0x29).rw("ym2203", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // - map(0x30, 0x30).w(this, FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset - map(0x40, 0x40).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data - map(0x50, 0x50).r(this, FUNC(dynax_state::jantouki_soundlatch_status_r)); // Soundlatch status + map(0x30, 0x30).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset + map(0x40, 0x40).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x50, 0x50).r(FUNC(dynax_state::jantouki_soundlatch_status_r)); // Soundlatch status map(0x60, 0x60).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0x70, 0x70).r(m_soundlatch, FUNC(generic_latch_8_device::read)); // From Main CPU } @@ -965,35 +965,35 @@ READ8_MEMBER(dynax_state::mjelctrn_dsw_r) void dynax_state::mjelctrn_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset - map(0x02, 0x02).w(this, FUNC(dynax_state::adpcm_data_w)); // MSM5205 data + map(0x00, 0x00).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset + map(0x02, 0x02).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data map(0x04, 0x05).w("ym2413", FUNC(ym2413_device::write)); // map(0x08, 0x08).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912 map(0x0a, 0x0a).w("aysnd", FUNC(ay8912_device::address_w)); // // AM_RANGE( 0x20, 0x20 ) AM_WRITENOP // CRT Controller // AM_RANGE( 0x21, 0x21 ) AM_WRITENOP // CRT Controller map(0x40, 0x47).w("outlatch", FUNC(ls259_device::write_d0)); - map(0x60, 0x60).w(this, FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X - map(0x62, 0x62).w(this, FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y + map(0x60, 0x60).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X + map(0x62, 0x62).w(FUNC(dynax_state::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 - map(0x6a, 0x6a).w(this, FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select - map(0x80, 0x80).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x6a, 0x6a).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select + map(0x80, 0x80).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select map(0x81, 0x81).portr("COINS"); // Coins - map(0x82, 0x82).r(this, FUNC(dynax_state::mjelctrn_keyboard_1_r)); // P2 - map(0x83, 0x83).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 - map(0x84, 0x84).r(this, FUNC(dynax_state::mjelctrn_dsw_r)); // DSW8 x 4 + map(0x82, 0x82).r(FUNC(dynax_state::mjelctrn_keyboard_1_r)); // P2 + map(0x83, 0x83).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x84, 0x84).r(FUNC(dynax_state::mjelctrn_dsw_r)); // DSW8 x 4 map(0x85, 0x85).portr("SW1"); // DSW2 - map(0xa1, 0xa7).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0xa1, 0xa7).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter map(0xc0, 0xc7).w(m_mainlatch, FUNC(ls259_device::write_d0)); - map(0xe0, 0xe0).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0xe1, 0xe1).w(this, FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer - map(0xe2, 0xe2).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes - map(0xe3, 0xe3).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0xe4, 0xe4).w(this, FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable - map(0xe5, 0xe5).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0xe6, 0xe6).w(this, FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank - map(0xe7, 0xe7).w(this, FUNC(dynax_state::hnoridur_palbank_w)); + map(0xe0, 0xe0).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0xe1, 0xe1).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer + map(0xe2, 0xe2).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes + map(0xe3, 0xe3).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0xe4, 0xe4).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority and enable + map(0xe5, 0xe5).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0xe6, 0xe6).w(FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank + map(0xe7, 0xe7).w(FUNC(dynax_state::hnoridur_palbank_w)); } void dynax_state::mjembase_io_map(address_map &map) @@ -1003,24 +1003,24 @@ void dynax_state::mjembase_io_map(address_map &map) map(0x06, 0x06).r("aysnd", FUNC(ay8912_device::data_r)); // AY8912, dsw0 map(0x08, 0x08).w("aysnd", FUNC(ay8912_device::data_w)); // map(0x0a, 0x0a).w("aysnd", FUNC(ay8912_device::address_w)); // - map(0x20, 0x20).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x20, 0x20).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select map(0x21, 0x21).portr("COINS"); // Coins - map(0x22, 0x22).r(this, FUNC(dynax_state::mjelctrn_keyboard_1_r)); // P2 - map(0x23, 0x23).r(this, FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 + map(0x22, 0x22).r(FUNC(dynax_state::mjelctrn_keyboard_1_r)); // P2 + map(0x23, 0x23).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1 map(0x24, 0x24).portr("DSW3"); // AM_RANGE( 0x40, 0x40 ) AM_WRITENOP // CRT Controller // AM_RANGE( 0x41, 0x41 ) AM_WRITENOP // CRT Controller - map(0x61, 0x67).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x61, 0x67).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter map(0x80, 0x87).w(m_mainlatch, FUNC(ls259_device::write_d0)); - map(0xa0, 0xa0).w(this, FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select - map(0xc0, 0xc0).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0xc1, 0xc1).w(this, FUNC(dynax_state::mjembase_blit_dest_w)); // Destination Layer - map(0xc2, 0xc2).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes - map(0xc3, 0xc3).w(this, FUNC(dynax_state::mjembase_blit_palette23_w)); // - map(0xc4, 0xc4).w(this, FUNC(dynax_state::mjembase_priority_w)); // layer priority and enable - map(0xc5, 0xc5).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0xc6, 0xc6).w(this, FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank - map(0xc7, 0xc7).w(this, FUNC(dynax_state::hnoridur_palbank_w)); + map(0xa0, 0xa0).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select + map(0xc0, 0xc0).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0xc1, 0xc1).w(FUNC(dynax_state::mjembase_blit_dest_w)); // Destination Layer + map(0xc2, 0xc2).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes + map(0xc3, 0xc3).w(FUNC(dynax_state::mjembase_blit_palette23_w)); // + map(0xc4, 0xc4).w(FUNC(dynax_state::mjembase_priority_w)); // layer priority and enable + map(0xc5, 0xc5).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0xc6, 0xc6).w(FUNC(dynax_state::yarunara_blit_romregion_w)); // Blitter ROM bank + map(0xc7, 0xc7).w(FUNC(dynax_state::hnoridur_palbank_w)); } @@ -1238,28 +1238,28 @@ void dynax_state::tenkai_map(address_map &map) map(0x10008, 0x10008).w("aysnd", FUNC(ay8910_device::data_w)); // map(0x10010, 0x10010).w("aysnd", FUNC(ay8910_device::address_w)); // map(0x10020, 0x10021).w("ym2413", FUNC(ym2413_device::write)); // - map(0x10040, 0x10040).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x10044, 0x10044).w(this, FUNC(dynax_state::tenkai_blit_dest_w)); // Destination Layer - map(0x10048, 0x10048).w(this, FUNC(dynax_state::tenkai_blit_palette23_w)); // Layers Palettes - map(0x1004c, 0x1004c).w(this, FUNC(dynax_state::tenkai_blit_palette01_w)); // - map(0x10050, 0x10050).w(this, FUNC(dynax_state::tenkai_priority_w)); // layer priority and enable - map(0x10054, 0x10054).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x10058, 0x10058).w(this, FUNC(dynax_state::tenkai_blit_romregion_w)); // Blitter ROM bank + map(0x10040, 0x10040).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x10044, 0x10044).w(FUNC(dynax_state::tenkai_blit_dest_w)); // Destination Layer + map(0x10048, 0x10048).w(FUNC(dynax_state::tenkai_blit_palette23_w)); // Layers Palettes + map(0x1004c, 0x1004c).w(FUNC(dynax_state::tenkai_blit_palette01_w)); // + map(0x10050, 0x10050).w(FUNC(dynax_state::tenkai_priority_w)); // layer priority and enable + map(0x10054, 0x10054).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x10058, 0x10058).w(FUNC(dynax_state::tenkai_blit_romregion_w)); // Blitter ROM bank map(0x10060, 0x1007f).lw8("mainlatch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_mainlatch->write_d1(space, offset >> 2, data, mem_mask); }); - map(0x100c0, 0x100c0).w(this, FUNC(dynax_state::tenkai_ipsel_w)); - map(0x100c1, 0x100c1).w(this, FUNC(dynax_state::tenkai_ip_w)); - map(0x100c2, 0x100c3).r(this, FUNC(dynax_state::tenkai_ip_r)); - map(0x100e1, 0x100e7).w(this, FUNC(dynax_state::tenkai_blitter_rev2_w)); // Blitter (inverted scroll values) + map(0x100c0, 0x100c0).w(FUNC(dynax_state::tenkai_ipsel_w)); + map(0x100c1, 0x100c1).w(FUNC(dynax_state::tenkai_ip_w)); + map(0x100c2, 0x100c3).r(FUNC(dynax_state::tenkai_ip_r)); + map(0x100e1, 0x100e7).w(FUNC(dynax_state::tenkai_blitter_rev2_w)); // Blitter (inverted scroll values) } void dynax_state::tenkai_banked_map(address_map &map) { map(0x00000, 0x3ffff).rom().region("maincpu", 0x10000); map(0x80000, 0x8000f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x90000, 0x97fff).rw(this, FUNC(dynax_state::tenkai_palette_r), FUNC(dynax_state::tenkai_palette_w)); + map(0x90000, 0x97fff).rw(FUNC(dynax_state::tenkai_palette_r), FUNC(dynax_state::tenkai_palette_w)); } /*************************************************************************** @@ -1319,18 +1319,18 @@ void dynax_state::gekisha_banked_map(address_map &map) { map(0x00000, 0x0ffff).rom().region("maincpu", 0x8000); map(0x10000, 0x10000).nopw(); // ? 0 - map(0x10001, 0x10001).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) + map(0x10001, 0x10001).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) map(0x10002, 0x10002).nopw(); // ? 1 - map(0x10003, 0x10003).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x10003, 0x10003).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color map(0x10010, 0x10017).w(m_mainlatch, FUNC(ls259_device::write_d0)); - map(0x10020, 0x10021).w(this, FUNC(dynax_state::gekisha_hopper_w)); - map(0x10041, 0x10047).w(this, FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter + map(0x10020, 0x10021).w(FUNC(dynax_state::gekisha_hopper_w)); + map(0x10041, 0x10047).w(FUNC(dynax_state::dynax_blitter_rev2_w)); // Blitter // AM_RANGE( 0x10050, 0x10050 ) AM_WRITENOP // CRT Controller // AM_RANGE( 0x10051, 0x10051 ) AM_WRITENOP // CRT Controller - map(0x10060, 0x10060).w(this, FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select + map(0x10060, 0x10060).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select map(0x10061, 0x10061).portr("COINS"); // Coins - map(0x10062, 0x10062).r(this, FUNC(dynax_state::gekisha_keyboard_1_r)); // P2 - map(0x10063, 0x10063).r(this, FUNC(dynax_state::gekisha_keyboard_0_r)); // P1 + map(0x10062, 0x10062).r(FUNC(dynax_state::gekisha_keyboard_1_r)); // P2 + map(0x10063, 0x10063).r(FUNC(dynax_state::gekisha_keyboard_0_r)); // P1 map(0x10064, 0x10064).portr("DSW1"); // DSW map(0x10065, 0x10065).portr("DSW3"); // DSW map(0x10066, 0x10066).portr("DSW4"); // DSW @@ -1358,7 +1358,7 @@ WRITE8_MEMBER(dynax_state::cdracula_sound_rombank_w) void dynax_state::cdracula_io_map(address_map &map) { map.global_mask(0xff); - map(0x01, 0x07).w(this, FUNC(dynax_state::cdracula_blitter_rev2_w)); // Blitter + Destination Layers + map(0x01, 0x07).w(FUNC(dynax_state::cdracula_blitter_rev2_w)); // Blitter + Destination Layers map(0x10, 0x10).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x11, 0x11).noprw(); // unpopulated oki // AM_RANGE( 0x12, 0x12 ) AM_WRITENOP // CRT Controller @@ -1366,18 +1366,18 @@ void dynax_state::cdracula_io_map(address_map &map) map(0x20, 0x20).portr("P1"); // P1 map(0x21, 0x21).portr("P2"); // P2 map(0x22, 0x22).portr("COINS"); // Coins - map(0x30, 0x30).w(this, FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable + map(0x30, 0x30).w(FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable // AM_RANGE( 0x31, 0x31 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select - map(0x32, 0x32).w(this, FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen - map(0x33, 0x33).w(this, FUNC(dynax_state::dynax_blit_flags_w)); // Flags + Do Blit - map(0x34, 0x34).w(this, FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) - map(0x35, 0x35).w(this, FUNC(dynax_state::dynax_blit_palette23_w)); // - map(0x36, 0x36).w(this, FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color - map(0x37, 0x37).w(this, FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack + map(0x32, 0x32).w(FUNC(dynax_state::dynax_blit_pen_w)); // Destination Pen + map(0x33, 0x33).w(FUNC(dynax_state::dynax_blit_flags_w)); // Flags + Do Blit + map(0x34, 0x34).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits) + map(0x35, 0x35).w(FUNC(dynax_state::dynax_blit_palette23_w)); // + map(0x36, 0x36).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color + map(0x37, 0x37).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack map(0x40, 0x47).w(m_mainlatch, FUNC(ls259_device::write_d0)); map(0x60, 0x60).portr("DSW2"); map(0x61, 0x61).portr("DSW1"); - map(0x6b, 0x6b).w(this, FUNC(dynax_state::cdracula_sound_rombank_w)); // OKI Bank + map(0x6b, 0x6b).w(FUNC(dynax_state::cdracula_sound_rombank_w)); // OKI Bank } diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp index 0040de40f42..ec3a034d2f0 100644 --- a/src/mame/drivers/dynduke.cpp +++ b/src/mame/drivers/dynduke.cpp @@ -89,8 +89,8 @@ void dynduke_state::master_map(address_map &map) map(0x0b000, 0x0b001).portr("P1_P2"); map(0x0b002, 0x0b003).portr("DSW"); map(0x0b004, 0x0b005).nopw(); - map(0x0b006, 0x0b007).w(this, FUNC(dynduke_state::control_w)); - map(0x0c000, 0x0c7ff).ram().w(this, FUNC(dynduke_state::text_w)).share("videoram"); + map(0x0b006, 0x0b007).w(FUNC(dynduke_state::control_w)); + map(0x0c000, 0x0c7ff).ram().w(FUNC(dynduke_state::text_w)).share("videoram"); map(0x0d000, 0x0d00d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); map(0xa0000, 0xfffff).rom(); } @@ -98,11 +98,11 @@ void dynduke_state::master_map(address_map &map) void dynduke_state::slave_map(address_map &map) { map(0x00000, 0x05fff).ram(); - map(0x06000, 0x067ff).ram().w(this, FUNC(dynduke_state::background_w)).share("back_data"); - map(0x06800, 0x06fff).ram().w(this, FUNC(dynduke_state::foreground_w)).share("fore_data"); + map(0x06000, 0x067ff).ram().w(FUNC(dynduke_state::background_w)).share("back_data"); + map(0x06800, 0x06fff).ram().w(FUNC(dynduke_state::foreground_w)).share("fore_data"); map(0x07000, 0x07fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08000, 0x08fff).ram().share("share1"); - map(0x0a000, 0x0a001).w(this, FUNC(dynduke_state::gfxbank_w)); + map(0x0a000, 0x0a001).w(FUNC(dynduke_state::gfxbank_w)); map(0x0c000, 0x0c001).nopw(); map(0xc0000, 0xfffff).rom(); } @@ -112,14 +112,14 @@ void dynduke_state::masterj_map(address_map &map) { map(0x00000, 0x06fff).ram(); map(0x07000, 0x07fff).ram().share("spriteram"); - map(0x08000, 0x087ff).ram().w(this, FUNC(dynduke_state::text_w)).share("videoram"); + map(0x08000, 0x087ff).ram().w(FUNC(dynduke_state::text_w)).share("videoram"); map(0x09000, 0x0900d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); map(0x0c000, 0x0c0ff).ram().share("scroll_ram"); map(0x0e000, 0x0efff).ram().share("share1"); map(0x0f000, 0x0f001).portr("P1_P2"); map(0x0f002, 0x0f003).portr("DSW"); map(0x0f004, 0x0f005).nopw(); - map(0x0f006, 0x0f007).w(this, FUNC(dynduke_state::control_w)); + map(0x0f006, 0x0f007).w(FUNC(dynduke_state::control_w)); map(0xa0000, 0xfffff).rom(); } diff --git a/src/mame/drivers/e100.cpp b/src/mame/drivers/e100.cpp index 28ab574e1a8..7ee8ce3afde 100644 --- a/src/mame/drivers/e100.cpp +++ b/src/mame/drivers/e100.cpp @@ -428,7 +428,7 @@ void e100_state::e100_map(address_map &map) map(0x0000, 0x1fff).ram(); map(0x8000, 0x87ff).rom().region("roms", 0); map(0xc000, 0xc3ff).ram().share("videoram"); - map(0xc800, 0xc81f).rw(this, FUNC(e100_state::pia_r), FUNC(e100_state::pia_w)).mirror(0x07e0); + map(0xc800, 0xc81f).rw(FUNC(e100_state::pia_r), FUNC(e100_state::pia_w)).mirror(0x07e0); map(0xd000, 0xffff).rom().region("roms", 0x1000); } diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp index 7a609825479..409d2e658c6 100644 --- a/src/mame/drivers/ec184x.cpp +++ b/src/mame/drivers/ec184x.cpp @@ -211,7 +211,7 @@ void ec184x_state::ec1841_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m("mb", FUNC(ec1841_mb_device::map)); - map(0x02b0, 0x02b3).rw(this, FUNC(ec184x_state::memboard_r), FUNC(ec184x_state::memboard_w)); + map(0x02b0, 0x02b3).rw(FUNC(ec184x_state::memboard_r), FUNC(ec184x_state::memboard_w)); } void ec184x_state::ec1847_io(address_map &map) diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp index 028f8805d5d..1363a27291b 100644 --- a/src/mame/drivers/ecoinf3.cpp +++ b/src/mame/drivers/ecoinf3.cpp @@ -447,7 +447,7 @@ void ecoinf3_state::pyramid_portmap(address_map &map) map(0x58, 0x5b).rw("ppi8255_g", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5c, 0x5f).rw("ppi8255_h", FUNC(i8255_device::read), FUNC(i8255_device::write)); // frequently accesses DB after 5B, mirror? bug? - map(0xDB, 0xDB).w("sn1", FUNC(sn76489_device::write)); // no idea what the sound chip is, this sounds terrible + map(0xDB, 0xDB).w("sn1", FUNC(sn76489_device::command_w)); // no idea what the sound chip is, this sounds terrible } diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp index acf3b8b644d..0bb77d4e786 100644 --- a/src/mame/drivers/ecoinfr.cpp +++ b/src/mame/drivers/ecoinfr.cpp @@ -494,31 +494,31 @@ void ecoinfr_state::memmap(address_map &map) void ecoinfr_state::portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(ecoinfr_state::ec_port00_out_w)).portr("IN0"); // Reel 1 Write - map(0x01, 0x01).w(this, FUNC(ecoinfr_state::ec_port01_out_w)).portr("IN1"); // Reel 2 Write + Reels Opto Read - map(0x02, 0x02).w(this, FUNC(ecoinfr_state::ec_port02_out_w)).portr("IN2"); // Reel 3 Write - map(0x03, 0x03).w(this, FUNC(ecoinfr_state::ec_port03_out_w)).portr("IN3"); - map(0x04, 0x04).w(this, FUNC(ecoinfr_state::ec_port04_out_w)).portr("IN4"); - map(0x05, 0x05).w(this, FUNC(ecoinfr_state::ec_port05_out_w)).portr("IN5"); - map(0x06, 0x06).w(this, FUNC(ecoinfr_state::ec_port06_out_w)).portr("IN6"); - map(0x07, 0x07).w(this, FUNC(ecoinfr_state::ec_port07_out_w)).portr("IN7"); - map(0x08, 0x08).w(this, FUNC(ecoinfr_state::ec_port08_out_bank_strobe_w)); - map(0x09, 0x09).w(this, FUNC(ecoinfr_state::ec_port09_out_reelen_w)); // 09 Reel Enables - map(0x0a, 0x0a).w(this, FUNC(ecoinfr_state::ec_port0a_out_w)); // 10 (Sound 1) - map(0x0b, 0x0b).w(this, FUNC(ecoinfr_state::ec_port0b_out_w)); // 11 (Sound 2) - map(0x0c, 0x0c).w(this, FUNC(ecoinfr_state::ec_port0c_out_cred_strobe_w)); - map(0x0d, 0x0d).w(this, FUNC(ecoinfr_state::ec_port0d_out_cred_data_w)); + map(0x00, 0x00).w(FUNC(ecoinfr_state::ec_port00_out_w)).portr("IN0"); // Reel 1 Write + map(0x01, 0x01).w(FUNC(ecoinfr_state::ec_port01_out_w)).portr("IN1"); // Reel 2 Write + Reels Opto Read + map(0x02, 0x02).w(FUNC(ecoinfr_state::ec_port02_out_w)).portr("IN2"); // Reel 3 Write + map(0x03, 0x03).w(FUNC(ecoinfr_state::ec_port03_out_w)).portr("IN3"); + map(0x04, 0x04).w(FUNC(ecoinfr_state::ec_port04_out_w)).portr("IN4"); + map(0x05, 0x05).w(FUNC(ecoinfr_state::ec_port05_out_w)).portr("IN5"); + map(0x06, 0x06).w(FUNC(ecoinfr_state::ec_port06_out_w)).portr("IN6"); + map(0x07, 0x07).w(FUNC(ecoinfr_state::ec_port07_out_w)).portr("IN7"); + map(0x08, 0x08).w(FUNC(ecoinfr_state::ec_port08_out_bank_strobe_w)); + map(0x09, 0x09).w(FUNC(ecoinfr_state::ec_port09_out_reelen_w)); // 09 Reel Enables + map(0x0a, 0x0a).w(FUNC(ecoinfr_state::ec_port0a_out_w)); // 10 (Sound 1) + map(0x0b, 0x0b).w(FUNC(ecoinfr_state::ec_port0b_out_w)); // 11 (Sound 2) + map(0x0c, 0x0c).w(FUNC(ecoinfr_state::ec_port0c_out_cred_strobe_w)); + map(0x0d, 0x0d).w(FUNC(ecoinfr_state::ec_port0d_out_cred_data_w)); // AM_RANGE(0x0e, 0x0e) AM_WRITE(ec_port0e_out_w) - map(0x0f, 0x0f).w(this, FUNC(ecoinfr_state::ec_port0f_out_bank_segdata_w)); - map(0x10, 0x10).w(this, FUNC(ecoinfr_state::ec_port10_out_w)); // 16 (Meter) - map(0x11, 0x11).w(this, FUNC(ecoinfr_state::ec_port11_out_w)); // SEC - map(0x12, 0x12).w(this, FUNC(ecoinfr_state::ec_port12_out_w)); // SEC - map(0x13, 0x13).w(this, FUNC(ecoinfr_state::ec_port13_out_w)); - map(0x14, 0x14).w(this, FUNC(ecoinfr_state::ec_port14_out_w)); - map(0x15, 0x15).w(this, FUNC(ecoinfr_state::ec_port15_out_w)); // SEC + VDF (3rd party) - map(0x16, 0x16).w(this, FUNC(ecoinfr_state::ec_port16_out_w)); - map(0x17, 0x17).w(this, FUNC(ecoinfr_state::ec_port17_out_w)); // Hopper + VDF (3rd party) - map(0x18, 0x18).w(this, FUNC(ecoinfr_state::ec_port18_out_w)); // 24 (Watchdog) + map(0x0f, 0x0f).w(FUNC(ecoinfr_state::ec_port0f_out_bank_segdata_w)); + map(0x10, 0x10).w(FUNC(ecoinfr_state::ec_port10_out_w)); // 16 (Meter) + map(0x11, 0x11).w(FUNC(ecoinfr_state::ec_port11_out_w)); // SEC + map(0x12, 0x12).w(FUNC(ecoinfr_state::ec_port12_out_w)); // SEC + map(0x13, 0x13).w(FUNC(ecoinfr_state::ec_port13_out_w)); + map(0x14, 0x14).w(FUNC(ecoinfr_state::ec_port14_out_w)); + map(0x15, 0x15).w(FUNC(ecoinfr_state::ec_port15_out_w)); // SEC + VDF (3rd party) + map(0x16, 0x16).w(FUNC(ecoinfr_state::ec_port16_out_w)); + map(0x17, 0x17).w(FUNC(ecoinfr_state::ec_port17_out_w)); // Hopper + VDF (3rd party) + map(0x18, 0x18).w(FUNC(ecoinfr_state::ec_port18_out_w)); // 24 (Watchdog) } CUSTOM_INPUT_MEMBER(ecoinfr_state::ecoinfr_reel1_opto_r) diff --git a/src/mame/drivers/efdt.cpp b/src/mame/drivers/efdt.cpp index a9db511180c..b275c160a15 100644 --- a/src/mame/drivers/efdt.cpp +++ b/src/mame/drivers/efdt.cpp @@ -343,7 +343,7 @@ void efdt_state::efdt_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8803).rw(this, FUNC(efdt_state::main_soundlatch_r), FUNC(efdt_state::main_soundlatch_w)); + map(0x8800, 0x8803).rw(FUNC(efdt_state::main_soundlatch_r), FUNC(efdt_state::main_soundlatch_w)); // map(0x8800, 0x8803).rw("soundlatch", FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write)); // TODO... map(0x9000, 0x93ff).portr("P1"); diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp index 67280149389..e8be45a0850 100644 --- a/src/mame/drivers/egghunt.cpp +++ b/src/mame/drivers/egghunt.cpp @@ -242,8 +242,8 @@ void egghunt_state::egghunt_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xc000, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xc800, 0xcfff).ram().w(this, FUNC(egghunt_state::egghunt_atram_w)).share("atram"); - map(0xd000, 0xdfff).rw(this, FUNC(egghunt_state::egghunt_bgram_r), FUNC(egghunt_state::egghunt_bgram_w)); + map(0xc800, 0xcfff).ram().w(FUNC(egghunt_state::egghunt_atram_w)).share("atram"); + map(0xd000, 0xdfff).rw(FUNC(egghunt_state::egghunt_bgram_r), FUNC(egghunt_state::egghunt_bgram_w)); map(0xe000, 0xffff).ram(); } @@ -251,10 +251,10 @@ void egghunt_state::egghunt_map(address_map &map) void egghunt_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("DSW1").w(this, FUNC(egghunt_state::egghunt_vidram_bank_w)); - map(0x01, 0x01).portr("SYSTEM").w(this, FUNC(egghunt_state::egghunt_gfx_banking_w)); + map(0x00, 0x00).portr("DSW1").w(FUNC(egghunt_state::egghunt_vidram_bank_w)); + map(0x01, 0x01).portr("SYSTEM").w(FUNC(egghunt_state::egghunt_gfx_banking_w)); map(0x02, 0x02).portr("P1"); - map(0x03, 0x03).portr("P2").w(this, FUNC(egghunt_state::egghunt_soundlatch_w)); + map(0x03, 0x03).portr("P2").w(FUNC(egghunt_state::egghunt_soundlatch_w)); map(0x04, 0x04).portr("DSW2"); map(0x06, 0x06).portr("UNK").nopw(); map(0x07, 0x07).nopw(); @@ -264,7 +264,7 @@ void egghunt_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe001, 0xe001).rw(this, FUNC(egghunt_state::egghunt_okibanking_r), FUNC(egghunt_state::egghunt_okibanking_w)); + map(0xe001, 0xe001).rw(FUNC(egghunt_state::egghunt_okibanking_r), FUNC(egghunt_state::egghunt_okibanking_w)); map(0xe004, 0xe004).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xf000, 0xffff).ram(); } diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index b127d421876..6a189bbe3e3 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -61,8 +61,8 @@ class einstein_state : public driver_device { public: - einstein_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + einstein_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, IC_I001), m_keyboard_daisy(*this, "keyboard_daisy"), m_adc_daisy(*this, "adc_daisy"), @@ -423,19 +423,19 @@ void einstein_state::einstein_mem(address_map &map) void einstein_state::einstein_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x00).mirror(0xff04).rw(this, FUNC(einstein_state::reset_r), FUNC(einstein_state::reset_w)); + map(0x00, 0x00).mirror(0xff04).rw(FUNC(einstein_state::reset_r), FUNC(einstein_state::reset_w)); map(0x02, 0x02).mirror(0xff04).rw(m_psg, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)); map(0x03, 0x03).mirror(0xff04).w(m_psg, FUNC(ay8910_device::data_w)); - map(0x08, 0x08).mirror(0xff06).rw("vdp", FUNC(tms9129_device::vram_read), FUNC(tms9129_device::vram_write)); - map(0x09, 0x09).mirror(0xff06).rw("vdp", FUNC(tms9129_device::register_read), FUNC(tms9129_device::register_write)); + map(0x08, 0x08).mirror(0xff06).rw("vdp", FUNC(tms9129_device::vram_r), FUNC(tms9129_device::vram_w)); + map(0x09, 0x09).mirror(0xff06).rw("vdp", FUNC(tms9129_device::register_r), FUNC(tms9129_device::register_w)); map(0x10, 0x10).mirror(0xff06).rw(IC_I060, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x11, 0x11).mirror(0xff06).rw(IC_I060, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x18, 0x1b).mirror(0xff04).rw(m_fdc, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); - map(0x20, 0x20).mirror(0xff00).rw(this, FUNC(einstein_state::kybint_msk_r), FUNC(einstein_state::kybint_msk_w)); - map(0x21, 0x21).mirror(0xff00).w(this, FUNC(einstein_state::adcint_msk_w)); - map(0x23, 0x23).mirror(0xff00).w(this, FUNC(einstein_state::drsel_w)); - map(0x24, 0x24).mirror(0xff00).rw(this, FUNC(einstein_state::rom_r), FUNC(einstein_state::rom_w)); - map(0x25, 0x25).mirror(0xff00).w(this, FUNC(einstein_state::fireint_msk_w)); + map(0x20, 0x20).mirror(0xff00).rw(FUNC(einstein_state::kybint_msk_r), FUNC(einstein_state::kybint_msk_w)); + map(0x21, 0x21).mirror(0xff00).w(FUNC(einstein_state::adcint_msk_w)); + map(0x23, 0x23).mirror(0xff00).w(FUNC(einstein_state::drsel_w)); + map(0x24, 0x24).mirror(0xff00).rw(FUNC(einstein_state::rom_r), FUNC(einstein_state::rom_w)); + map(0x25, 0x25).mirror(0xff00).w(FUNC(einstein_state::fireint_msk_w)); map(0x28, 0x2b).mirror(0xff04).rw(IC_I058, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x30, 0x33).mirror(0xff04).rw(IC_I063, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x38, 0x38).mirror(0xff07).rw("adc", FUNC(adc0844_device::read), FUNC(adc0844_device::write)); @@ -588,7 +588,7 @@ MACHINE_CONFIG_START(einstein_state::einstein) MCFG_DEVICE_ADD(IC_I063, Z80PIO, XTAL_X002 / 2) MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, einstein_state, int_w<0>)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, einstein_state, ardy_w)) MCFG_Z80PIO_IN_PB_CB(READ8("user", einstein_userport_device, read)) MCFG_Z80PIO_OUT_PB_CB(WRITE8("user", einstein_userport_device, write)) diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp index 63804e285ce..0f17308a8be 100644 --- a/src/mame/drivers/electron.cpp +++ b/src/mame/drivers/electron.cpp @@ -90,17 +90,17 @@ PALETTE_INIT_MEMBER(electron_state, electron) void electron_state::electron_mem(address_map &map) { - map(0x0000, 0x7fff).rw(this, FUNC(electron_state::electron_mem_r), FUNC(electron_state::electron_mem_w)); /* 32KB of RAM */ - map(0x8000, 0xbfff).rw(this, FUNC(electron_state::electron_paged_r), FUNC(electron_state::electron_paged_w)); /* Banked ROM pages */ - map(0xc000, 0xffff).rw(this, FUNC(electron_state::electron_mos_r), FUNC(electron_state::electron_mos_w)); /* OS ROM */ - map(0xfc00, 0xfcff).rw(this, FUNC(electron_state::electron_fred_r), FUNC(electron_state::electron_fred_w)); /* FRED */ - map(0xfd00, 0xfdff).rw(this, FUNC(electron_state::electron_jim_r), FUNC(electron_state::electron_jim_w)); /* JIM */ - map(0xfe00, 0xfeff).rw(this, FUNC(electron_state::electron_sheila_r), FUNC(electron_state::electron_sheila_w)); /* SHEILA */ + map(0x0000, 0x7fff).rw(FUNC(electron_state::electron_mem_r), FUNC(electron_state::electron_mem_w)); /* 32KB of RAM */ + map(0x8000, 0xbfff).rw(FUNC(electron_state::electron_paged_r), FUNC(electron_state::electron_paged_w)); /* Banked ROM pages */ + map(0xc000, 0xffff).rw(FUNC(electron_state::electron_mos_r), FUNC(electron_state::electron_mos_w)); /* OS ROM */ + map(0xfc00, 0xfcff).rw(FUNC(electron_state::electron_fred_r), FUNC(electron_state::electron_fred_w)); /* FRED */ + map(0xfd00, 0xfdff).rw(FUNC(electron_state::electron_jim_r), FUNC(electron_state::electron_jim_w)); /* JIM */ + map(0xfe00, 0xfeff).rw(FUNC(electron_state::electron_sheila_r), FUNC(electron_state::electron_sheila_w)); /* SHEILA */ } void electron_state::electron64_opcodes(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(electron_state::electron64_fetch_r)); + map(0x0000, 0xffff).r(FUNC(electron_state::electron64_fetch_r)); } INPUT_CHANGED_MEMBER(electron_state::trigger_reset) diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp index 7c0eba3c95c..dc31e2fe446 100644 --- a/src/mame/drivers/elekscmp.cpp +++ b/src/mame/drivers/elekscmp.cpp @@ -103,8 +103,8 @@ void elekscmp_state::mem_map(address_map &map) map.unmap_value_high(); map.global_mask(0x0fff); map(0x000, 0x5ff).rom(); // ROM - map(0x700, 0x707).w(this, FUNC(elekscmp_state::hex_display_w)); - map(0x708, 0x70f).r(this, FUNC(elekscmp_state::keyboard_r)); + map(0x700, 0x707).w(FUNC(elekscmp_state::hex_display_w)); + map(0x708, 0x70f).r(FUNC(elekscmp_state::keyboard_r)); map(0x800, 0xfff).ram(); // RAM - up to 2K of RAM } diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp index fb685c77450..f851a821181 100644 --- a/src/mame/drivers/elf.cpp +++ b/src/mame/drivers/elf.cpp @@ -84,8 +84,8 @@ void elf2_state::elf2_mem(address_map &map) void elf2_state::elf2_io(address_map &map) { map.unmap_value_high(); - map(0x01, 0x01).r(this, FUNC(elf2_state::dispon_r)); - map(0x04, 0x04).rw(this, FUNC(elf2_state::data_r), FUNC(elf2_state::data_w)); + map(0x01, 0x01).r(FUNC(elf2_state::dispon_r)); + map(0x04, 0x04).rw(FUNC(elf2_state::data_r), FUNC(elf2_state::data_w)); } /* Input Ports */ diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index bc3343b41b2..c22c597b302 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -378,13 +378,13 @@ void elwro800_state::elwro800_mem(address_map &map) void elwro800_state::elwro800_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(elwro800_state::elwro800jr_io_r), FUNC(elwro800_state::elwro800jr_io_w)); + map(0x0000, 0xffff).rw(FUNC(elwro800_state::elwro800jr_io_r), FUNC(elwro800_state::elwro800jr_io_w)); } void elwro800_state::elwro800_m1(address_map &map) { map(0x0000, 0x1fff).m(m_bank1, FUNC(address_map_bank_device::amap8)); - map(0x0066, 0x0066).r(this, FUNC(elwro800_state::nmi_r)); + map(0x0066, 0x0066).r(FUNC(elwro800_state::nmi_r)); map(0x2000, 0x3fff).m(m_bank2, FUNC(address_map_bank_device::amap8)); map(0x4000, 0xffff).bankrw("rambank3"); } @@ -597,8 +597,8 @@ MACHINE_CONFIG_START(elwro800_state::elwro800) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("JOY")) - MCFG_I8255_IN_PORTB_CB(READ8("cent_data_in", input_buffer_device, read)) - MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_IN_PORTB_CB(READ8("cent_data_in", input_buffer_device, bus_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTC_CB(READ8(*this, elwro800_state, i8255_port_c_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, elwro800_state, i8255_port_c_w)) diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp index 9a69d1473df..8bea4cc0d81 100644 --- a/src/mame/drivers/embargo.cpp +++ b/src/mame/drivers/embargo.cpp @@ -179,15 +179,15 @@ void embargo_state::main_map(address_map &map) void embargo_state::main_io_map(address_map &map) { - map(0x01, 0x01).portr("IN0").w(this, FUNC(embargo_state::port_1_w)); - map(0x02, 0x02).rw(this, FUNC(embargo_state::dial_r), FUNC(embargo_state::port_2_w)); + map(0x01, 0x01).portr("IN0").w(FUNC(embargo_state::port_1_w)); + map(0x02, 0x02).rw(FUNC(embargo_state::dial_r), FUNC(embargo_state::port_2_w)); map(0x03, 0x03).nopw(); /* always 0xFE */ } void embargo_state::main_data_map(address_map &map) { map(S2650_DATA_PORT, S2650_DATA_PORT).portr("IN2"); - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(embargo_state::input_port_bit_r), FUNC(embargo_state::input_select_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(embargo_state::input_port_bit_r), FUNC(embargo_state::input_select_w)); } diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index d12c7ca93b4..860853a08fe 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -444,13 +444,13 @@ void enigma2_state::enigma2_main_cpu_map(address_map &map) map(0x0000, 0x1fff).rom().nopw(); map(0x2000, 0x3fff).mirror(0x4000).ram().share("videoram"); map(0x4000, 0x4fff).rom().nopw(); - map(0x5000, 0x57ff).r(this, FUNC(enigma2_state::dip_switch_r)).nopw(); + map(0x5000, 0x57ff).r(FUNC(enigma2_state::dip_switch_r)).nopw(); map(0x5800, 0x5800).mirror(0x07f8).noprw(); map(0x5801, 0x5801).mirror(0x07f8).portr("IN0").nopw(); map(0x5802, 0x5802).mirror(0x07f8).portr("IN1").nopw(); - map(0x5803, 0x5803).mirror(0x07f8).nopr().w(this, FUNC(enigma2_state::sound_data_w)); + map(0x5803, 0x5803).mirror(0x07f8).nopr().w(FUNC(enigma2_state::sound_data_w)); map(0x5804, 0x5804).mirror(0x07f8).noprw(); - map(0x5805, 0x5805).mirror(0x07f8).nopr().w(this, FUNC(enigma2_state::enigma2_flip_screen_w)); + map(0x5805, 0x5805).mirror(0x07f8).nopr().w(FUNC(enigma2_state::enigma2_flip_screen_w)); map(0x5806, 0x5807).mirror(0x07f8).noprw(); } @@ -460,7 +460,7 @@ void enigma2_state::enigma2a_main_cpu_map(address_map &map) map(0x0000, 0x1fff).rom().nopw(); map(0x2000, 0x3fff).mirror(0x4000).ram().share("videoram"); map(0x4000, 0x4fff).rom().nopw(); - map(0x5000, 0x57ff).r(this, FUNC(enigma2_state::dip_switch_r)).nopw(); + map(0x5000, 0x57ff).r(FUNC(enigma2_state::dip_switch_r)).nopw(); map(0x5800, 0x5fff).noprw(); } @@ -471,9 +471,9 @@ void enigma2_state::enigma2a_main_cpu_io_map(address_map &map) map(0x00, 0x00).noprw(); map(0x01, 0x01).portr("IN0").nopw(); map(0x02, 0x02).portr("IN1").nopw(); - map(0x03, 0x03).nopr().w(this, FUNC(enigma2_state::sound_data_w)); + map(0x03, 0x03).nopr().w(FUNC(enigma2_state::sound_data_w)); map(0x04, 0x04).noprw(); - map(0x05, 0x05).nopr().w(this, FUNC(enigma2_state::enigma2_flip_screen_w)); + map(0x05, 0x05).nopr().w(FUNC(enigma2_state::enigma2_flip_screen_w)); map(0x06, 0x07).noprw(); } diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index af611ded3be..91e2ed93eb4 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -226,9 +226,9 @@ void eolith_state::eolith_map(address_map &map) { map(0x00000000, 0x001fffff).ram(); // fort2b wants ram here map(0x40000000, 0x401fffff).ram(); - map(0x90000000, 0x9003ffff).rw(this, FUNC(eolith_state::eolith_vram_r), FUNC(eolith_state::eolith_vram_w)); - map(0xfc000000, 0xfc000003).r(this, FUNC(eolith_state::eolith_custom_r)); - map(0xfc400000, 0xfc400003).w(this, FUNC(eolith_state::systemcontrol_w)); + map(0x90000000, 0x9003ffff).rw(FUNC(eolith_state::eolith_vram_r), FUNC(eolith_state::eolith_vram_w)); + map(0xfc000000, 0xfc000003).r(FUNC(eolith_state::eolith_custom_r)); + map(0xfc400000, 0xfc400003).w(FUNC(eolith_state::systemcontrol_w)); map(0xfc800000, 0xfc800003).w("soundlatch", FUNC(generic_latch_8_device::write)).umask32(0x000000ff).cswidth(32); map(0xfca00000, 0xfca00003).portr("DSW1"); map(0xfcc00000, 0xfcc0005b).nopw(); // crt registers ? @@ -241,8 +241,8 @@ void eolith_state::hidctch3_map(address_map &map) eolith_map(map); map(0xfc200000, 0xfc200003).nopw(); // this generates pens vibration // It is not clear why the first reads are needed too - map(0xfce00000, 0xfce00003).mirror(0x00080000).r(this, FUNC(eolith_state::hidctch3_pen_r<0>)); - map(0xfcf00000, 0xfcf00003).mirror(0x00080000).r(this, FUNC(eolith_state::hidctch3_pen_r<1>)); + map(0xfce00000, 0xfce00003).mirror(0x00080000).r(FUNC(eolith_state::hidctch3_pen_r<0>)); + map(0xfcf00000, 0xfcf00003).mirror(0x00080000).r(FUNC(eolith_state::hidctch3_pen_r<1>)); } diff --git a/src/mame/drivers/eolith16.cpp b/src/mame/drivers/eolith16.cpp index 9a88b0fec79..eb1aefc69d4 100644 --- a/src/mame/drivers/eolith16.cpp +++ b/src/mame/drivers/eolith16.cpp @@ -78,8 +78,8 @@ void eolith16_state::eolith16_map(address_map &map) map(0x90000000, 0x9000002f).nopw(); //? map(0xff000000, 0xff1fffff).rom().region("maindata", 0); map(0xffe40001, 0xffe40001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xffe80000, 0xffe80001).w(this, FUNC(eolith16_state::eeprom_w)); - map(0xffea0000, 0xffea0001).r(this, FUNC(eolith16_state::eolith16_custom_r)); + map(0xffe80000, 0xffe80001).w(FUNC(eolith16_state::eeprom_w)); + map(0xffea0000, 0xffea0001).r(FUNC(eolith16_state::eolith16_custom_r)); map(0xffea0002, 0xffea0003).portr("SYSTEM"); map(0xffec0000, 0xffec0001).nopr(); // not used? map(0xffec0002, 0xffec0003).portr("INPUTS"); diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp index ddc38cb14bc..a3008a8036a 100644 --- a/src/mame/drivers/ep64.cpp +++ b/src/mame/drivers/ep64.cpp @@ -410,9 +410,9 @@ void ep64_state::dave_io(address_map &map) { map.global_mask(0xff); map(0x80, 0x8f).m(m_nick, FUNC(nick_device::vio_map)); - map(0xb5, 0xb5).rw(this, FUNC(ep64_state::rd0_r), FUNC(ep64_state::wr0_w)); - map(0xb6, 0xb6).r(this, FUNC(ep64_state::rd1_r)).w("cent_data_out", FUNC(output_latch_device::write)); - map(0xb7, 0xb7).w(this, FUNC(ep64_state::wr2_w)); + map(0xb5, 0xb5).rw(FUNC(ep64_state::rd0_r), FUNC(ep64_state::wr0_w)); + map(0xb6, 0xb6).r(FUNC(ep64_state::rd1_r)).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0xb7, 0xb7).w(FUNC(ep64_state::wr2_w)); } @@ -554,7 +554,7 @@ void ep64_state::machine_reset() address_space &program = m_maincpu->space(AS_PROGRAM); wr0_w(program, 0, 0); - machine().device("cent_data_out")->write(program, 0, 0); + subdevice("cent_data_out")->write(0); wr2_w(program, 0, 0); } diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp index 052245213e5..18ff8bceced 100644 --- a/src/mame/drivers/epos.cpp +++ b/src/mame/drivers/epos.cpp @@ -95,7 +95,7 @@ void epos_state::epos_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("DSW").w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x01, 0x01).portr("SYSTEM").w(this, FUNC(epos_state::port_1_w)); + map(0x01, 0x01).portr("SYSTEM").w(FUNC(epos_state::port_1_w)); map(0x02, 0x02).portr("INPUTS").w("aysnd", FUNC(ay8910_device::data_w)); map(0x03, 0x03).portr("UNK"); map(0x06, 0x06).w("aysnd", FUNC(ay8910_device::address_w)); @@ -104,9 +104,9 @@ void epos_state::epos_io_map(address_map &map) void epos_state::dealer_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0f).w(this, FUNC(epos_state::dealer_pal_w)); + map(0x00, 0x0f).w(FUNC(epos_state::dealer_pal_w)); map(0x10, 0x13).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x20, 0x24).w(this, FUNC(epos_state::dealer_decrypt_rom)); + map(0x20, 0x24).w(FUNC(epos_state::dealer_decrypt_rom)); map(0x34, 0x34).w("aysnd", FUNC(ay8910_device::data_w)); map(0x38, 0x38).r("aysnd", FUNC(ay8910_device::data_r)); map(0x3c, 0x3c).w("aysnd", FUNC(ay8910_device::address_w)); diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp index 90221777d4c..fcb7d666aba 100644 --- a/src/mame/drivers/eprom.cpp +++ b/src/mame/drivers/eprom.cpp @@ -150,15 +150,15 @@ void eprom_state::main_map(address_map &map) map(0x000000, 0x09ffff).rom(); map(0x0e0000, 0x0e0fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x160000, 0x16ffff).ram().share("share1"); - map(0x16cc00, 0x16cc01).rw(this, FUNC(eprom_state::sync_r), FUNC(eprom_state::sync_w)); + map(0x16cc00, 0x16cc01).rw(FUNC(eprom_state::sync_r), FUNC(eprom_state::sync_w)); map(0x1f0000, 0x1fffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x260000, 0x26000f).portr("260000"); - map(0x260010, 0x26001f).r(this, FUNC(eprom_state::special_port1_r)); - map(0x260020, 0x260027).mirror(0x8).r(this, FUNC(eprom_state::adc_r)).umask16(0x00ff); + map(0x260010, 0x26001f).r(FUNC(eprom_state::special_port1_r)); + map(0x260020, 0x260027).mirror(0x8).r(FUNC(eprom_state::adc_r)).umask16(0x00ff); map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_base_device::main_response_r)); map(0x2e0000, 0x2e0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x360000, 0x360001).w(this, FUNC(eprom_state::video_int_ack_w)); - map(0x360010, 0x360011).w(this, FUNC(eprom_state::eprom_latch_w)); + map(0x360000, 0x360001).w(FUNC(eprom_state::video_int_ack_w)); + map(0x360010, 0x360011).w(FUNC(eprom_state::eprom_latch_w)); map(0x360020, 0x360021).w(m_jsa, FUNC(atari_jsa_base_device::sound_reset_w)); map(0x360031, 0x360031).w(m_jsa, FUNC(atari_jsa_base_device::main_command_w)); map(0x3e0000, 0x3e0fff).ram().share("paletteram"); @@ -176,14 +176,14 @@ void eprom_state::guts_map(address_map &map) map(0x000000, 0x09ffff).rom(); map(0x0e0000, 0x0e0fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x160000, 0x16ffff).ram().share("share1"); - map(0x16cc00, 0x16cc01).rw(this, FUNC(eprom_state::sync_r), FUNC(eprom_state::sync_w)); + map(0x16cc00, 0x16cc01).rw(FUNC(eprom_state::sync_r), FUNC(eprom_state::sync_w)); map(0x1f0000, 0x1fffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x260000, 0x26000f).portr("260000"); - map(0x260010, 0x26001f).r(this, FUNC(eprom_state::special_port1_r)); - map(0x260020, 0x260027).mirror(0x8).r(this, FUNC(eprom_state::adc_r)).umask16(0x00ff); + map(0x260010, 0x26001f).r(FUNC(eprom_state::special_port1_r)); + map(0x260020, 0x260027).mirror(0x8).r(FUNC(eprom_state::adc_r)).umask16(0x00ff); map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_ii_device::main_response_r)); map(0x2e0000, 0x2e0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x360000, 0x360001).w(this, FUNC(eprom_state::video_int_ack_w)); + map(0x360000, 0x360001).w(FUNC(eprom_state::video_int_ack_w)); // AM_RANGE(0x360010, 0x360011) AM_WRITE(eprom_latch_w) map(0x360020, 0x360021).w(m_jsa, FUNC(atari_jsa_ii_device::sound_reset_w)); map(0x360031, 0x360031).w(m_jsa, FUNC(atari_jsa_ii_device::main_command_w)); @@ -208,13 +208,13 @@ void eprom_state::extra_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x160000, 0x16ffff).ram().share("share1"); - map(0x16cc00, 0x16cc01).rw(this, FUNC(eprom_state::sync_r), FUNC(eprom_state::sync_w)).share("sync_data"); + map(0x16cc00, 0x16cc01).rw(FUNC(eprom_state::sync_r), FUNC(eprom_state::sync_w)).share("sync_data"); map(0x260000, 0x26000f).portr("260000"); - map(0x260010, 0x26001f).r(this, FUNC(eprom_state::special_port1_r)); - map(0x260020, 0x260027).mirror(0x8).r(this, FUNC(eprom_state::adc_r)).umask16(0x00ff); + map(0x260010, 0x26001f).r(FUNC(eprom_state::special_port1_r)); + map(0x260020, 0x260027).mirror(0x8).r(FUNC(eprom_state::adc_r)).umask16(0x00ff); map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_base_device::main_response_r)); - map(0x360000, 0x360001).w(this, FUNC(eprom_state::video_int_ack_w)); - map(0x360010, 0x360011).w(this, FUNC(eprom_state::eprom_latch_w)); + map(0x360000, 0x360001).w(FUNC(eprom_state::video_int_ack_w)); + map(0x360010, 0x360011).w(FUNC(eprom_state::eprom_latch_w)); map(0x360020, 0x360021).w(m_jsa, FUNC(atari_jsa_base_device::sound_reset_w)); map(0x360031, 0x360031).w(m_jsa, FUNC(atari_jsa_base_device::main_command_w)); } diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index 8687f60caac..e0cc23ff0e2 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -645,20 +645,20 @@ void equites_state::equites_map(address_map &map) map.unmap_value_high(); map(0x000000, 0x00ffff).rom(); // ROM area is written several times (dev system?) map(0x040000, 0x040fff).ram(); - map(0x080000, 0x080fff).rw(this, FUNC(equites_state::equites_fg_videoram_r), FUNC(equites_state::equites_fg_videoram_w)).umask16(0x00ff); - map(0x0c0000, 0x0c01ff).ram().w(this, FUNC(equites_state::equites_bg_videoram_w)).share("bg_videoram"); + map(0x080000, 0x080fff).rw(FUNC(equites_state::equites_fg_videoram_r), FUNC(equites_state::equites_fg_videoram_w)).umask16(0x00ff); + map(0x0c0000, 0x0c01ff).ram().w(FUNC(equites_state::equites_bg_videoram_w)).share("bg_videoram"); map(0x0c0200, 0x0c0fff).ram(); map(0x100000, 0x1001ff).ram().share("spriteram"); - map(0x100000, 0x100001).r(this, FUNC(equites_state::equites_spriteram_kludge_r)); - map(0x140000, 0x1407ff).rw(this, FUNC(equites_state::mcu_ram_r), FUNC(equites_state::mcu_ram_w)).umask16(0x00ff); + map(0x100000, 0x100001).r(FUNC(equites_state::equites_spriteram_kludge_r)); + map(0x140000, 0x1407ff).rw(FUNC(equites_state::mcu_ram_r), FUNC(equites_state::mcu_ram_w)).umask16(0x00ff); map(0x180000, 0x180001).portr("IN1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x180000, 0x180000).select(0x03c000).lw8("mainlatch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_mainlatch->write_a3(space, offset >> 13, data, mem_mask); }); map(0x180001, 0x180001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x1c0000, 0x1c0001).portr("IN0").w(this, FUNC(equites_state::equites_scrollreg_w)); - map(0x380000, 0x380000).w(this, FUNC(equites_state::equites_bgcolor_w)); + map(0x1c0000, 0x1c0001).portr("IN0").w(FUNC(equites_state::equites_scrollreg_w)); + map(0x380000, 0x380000).w(FUNC(equites_state::equites_bgcolor_w)); map(0x780000, 0x780001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); } @@ -666,7 +666,7 @@ void gekisou_state::gekisou_map(address_map &map) { equites_map(map); map(0x040000, 0x040fff).ram().share("nvram"); // mainram is battery-backed - map(0x580000, 0x580001).select(0x020000).w(this, FUNC(gekisou_state::gekisou_unknown_bit_w)); + map(0x580000, 0x580001).select(0x020000).w(FUNC(gekisou_state::gekisou_unknown_bit_w)); } @@ -677,17 +677,17 @@ void splndrbt_state::splndrbt_map(address_map &map) map(0x040000, 0x040fff).ram(); map(0x080000, 0x080001).portr("IN0"); map(0x0c0000, 0x0c0001).portr("IN1"); - map(0x0c0000, 0x0c0000).select(0x020000).w(this, FUNC(splndrbt_state::equites_bgcolor_w)); + map(0x0c0000, 0x0c0000).select(0x020000).w(FUNC(splndrbt_state::equites_bgcolor_w)); map(0x0c0001, 0x0c0001).select(0x03c000).lw8("mainlatch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_mainlatch->write_a3(space, offset >> 13, data, mem_mask); }); - map(0x100000, 0x100001).w(this, FUNC(splndrbt_state::splndrbt_bg_scrollx_w)); + map(0x100000, 0x100001).w(FUNC(splndrbt_state::splndrbt_bg_scrollx_w)); map(0x140001, 0x140001).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x1c0000, 0x1c0001).w(this, FUNC(splndrbt_state::splndrbt_bg_scrolly_w)); - map(0x180000, 0x1807ff).rw(this, FUNC(splndrbt_state::mcu_ram_r), FUNC(splndrbt_state::mcu_ram_w)).umask16(0x00ff); - map(0x200000, 0x200fff).mirror(0x001000).rw(this, FUNC(splndrbt_state::equites_fg_videoram_r), FUNC(splndrbt_state::equites_fg_videoram_w)).umask16(0x00ff); - map(0x400000, 0x4007ff).ram().w(this, FUNC(splndrbt_state::equites_bg_videoram_w)).share("bg_videoram"); + map(0x1c0000, 0x1c0001).w(FUNC(splndrbt_state::splndrbt_bg_scrolly_w)); + map(0x180000, 0x1807ff).rw(FUNC(splndrbt_state::mcu_ram_r), FUNC(splndrbt_state::mcu_ram_w)).umask16(0x00ff); + map(0x200000, 0x200fff).mirror(0x001000).rw(FUNC(splndrbt_state::equites_fg_videoram_r), FUNC(splndrbt_state::equites_fg_videoram_w)).umask16(0x00ff); + map(0x400000, 0x4007ff).ram().w(FUNC(splndrbt_state::equites_bg_videoram_w)).share("bg_videoram"); map(0x400800, 0x400fff).ram(); map(0x600000, 0x6000ff).ram().share("spriteram"); // sprite RAM 0,1 map(0x600100, 0x6001ff).ram().share("spriteram_2"); // sprite RAM 2 (8-bit) @@ -701,10 +701,10 @@ void equites_state::sound_map(address_map &map) map(0xc080, 0xc08d).w(m_msm, FUNC(msm5232_device::write)); map(0xc0a0, 0xc0a1).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0xc0b0, 0xc0b0).nopw(); // n.c. - map(0xc0c0, 0xc0c0).w(this, FUNC(equites_state::equites_cymbal_ctrl_w)); - map(0xc0d0, 0xc0d0).w(this, FUNC(equites_state::equites_dac_latch_w)); // followed by 1 (and usually 0) on 8155 port B - map(0xc0e0, 0xc0e0).w(this, FUNC(equites_state::equites_dac_latch_w)); // followed by 2 (and usually 0) on 8155 port B - map(0xc0f8, 0xc0ff).w(this, FUNC(equites_state::equites_c0f8_w)); + map(0xc0c0, 0xc0c0).w(FUNC(equites_state::equites_cymbal_ctrl_w)); + map(0xc0d0, 0xc0d0).w(FUNC(equites_state::equites_dac_latch_w)); // followed by 1 (and usually 0) on 8155 port B + map(0xc0e0, 0xc0e0).w(FUNC(equites_state::equites_dac_latch_w)); // followed by 2 (and usually 0) on 8155 port B + map(0xc0f8, 0xc0ff).w(FUNC(equites_state::equites_c0f8_w)); map(0xe000, 0xe0ff).rw("audio8155", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); } diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp index 2f4c548b628..5d7532698ca 100644 --- a/src/mame/drivers/ertictac.cpp +++ b/src/mame/drivers/ertictac.cpp @@ -64,15 +64,15 @@ READ32_MEMBER(ertictac_state::ertictac_podule_r) void ertictac_state::ertictac_map(address_map &map) { - map(0x00000000, 0x01ffffff).rw(this, FUNC(ertictac_state::archimedes_memc_logical_r), FUNC(ertictac_state::archimedes_memc_logical_w)); + map(0x00000000, 0x01ffffff).rw(FUNC(ertictac_state::archimedes_memc_logical_r), FUNC(ertictac_state::archimedes_memc_logical_w)); map(0x02000000, 0x02ffffff).ram().share("physicalram"); /* physical RAM - 16 MB for now, should be 512k for the A310 */ - map(0x03000000, 0x033fffff).rw(this, FUNC(ertictac_state::archimedes_ioc_r), FUNC(ertictac_state::archimedes_ioc_w)); - map(0x03340000, 0x0334001f).r(this, FUNC(ertictac_state::ertictac_podule_r)); - map(0x033c0000, 0x033c001f).r(this, FUNC(ertictac_state::ertictac_podule_r)); - map(0x03400000, 0x035fffff).rw(this, FUNC(ertictac_state::archimedes_vidc_r), FUNC(ertictac_state::archimedes_vidc_w)); - map(0x03600000, 0x037fffff).rw(this, FUNC(ertictac_state::archimedes_memc_r), FUNC(ertictac_state::archimedes_memc_w)); - map(0x03800000, 0x03ffffff).rom().region("maincpu", 0).w(this, FUNC(ertictac_state::archimedes_memc_page_w)); + map(0x03000000, 0x033fffff).rw(FUNC(ertictac_state::archimedes_ioc_r), FUNC(ertictac_state::archimedes_ioc_w)); + map(0x03340000, 0x0334001f).r(FUNC(ertictac_state::ertictac_podule_r)); + map(0x033c0000, 0x033c001f).r(FUNC(ertictac_state::ertictac_podule_r)); + map(0x03400000, 0x035fffff).rw(FUNC(ertictac_state::archimedes_vidc_r), FUNC(ertictac_state::archimedes_vidc_w)); + map(0x03600000, 0x037fffff).rw(FUNC(ertictac_state::archimedes_memc_r), FUNC(ertictac_state::archimedes_memc_w)); + map(0x03800000, 0x03ffffff).rom().region("maincpu", 0).w(FUNC(ertictac_state::archimedes_memc_page_w)); } static INPUT_PORTS_START( ertictac ) diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp index 7e92a53b4c7..0f425e59e79 100644 --- a/src/mame/drivers/esd16.cpp +++ b/src/mame/drivers/esd16.cpp @@ -129,9 +129,9 @@ void esd16_state::esd16_io_area_dsw(address_map &map, u32 base) map(base + 0x2, base + 0x3).portr("P1_P2"); map(base + 0x4, base + 0x5).portr("SYSTEM"); map(base + 0x6, base + 0x7).portr("DSW"); - map(base + 0x8, base + 0x9).w(this, FUNC(esd16_state::esd16_tilemap0_color_w)); + map(base + 0x8, base + 0x9).w(FUNC(esd16_state::esd16_tilemap0_color_w)); map(base + 0xa, base + 0xb).nopw(); /* Unknown */ - map(base + 0xc, base + 0xd).w(this, FUNC(esd16_state::esd16_sound_command_w)); + map(base + 0xc, base + 0xd).w(FUNC(esd16_state::esd16_sound_command_w)); map(base + 0xe, base + 0xf).nopw(); /* n/c */ } @@ -140,11 +140,11 @@ void esd16_state::esd16_io_area_eeprom(address_map &map, u32 base) map(base + 0x0, base + 0x1).nopw(); /* Irq Ack */ map(base + 0x2, base + 0x3).portr("P1_P2"); map(base + 0x4, base + 0x5).portr("SYSTEM"); - map(base + 0x6, base + 0x7).r(this, FUNC(esd16_state::esd_eeprom_r)); - map(base + 0x8, base + 0x9).w(this, FUNC(esd16_state::esd16_tilemap0_color_w)); + map(base + 0x6, base + 0x7).r(FUNC(esd16_state::esd_eeprom_r)); + map(base + 0x8, base + 0x9).w(FUNC(esd16_state::esd16_tilemap0_color_w)); map(base + 0xa, base + 0xb).nopw(); /* Unknown */ - map(base + 0xc, base + 0xd).w(this, FUNC(esd16_state::esd16_sound_command_w)); - map(base + 0xe, base + 0xf).w(this, FUNC(esd16_state::esd_eeprom_w)); + map(base + 0xc, base + 0xd).w(FUNC(esd16_state::esd16_sound_command_w)); + map(base + 0xe, base + 0xf).w(FUNC(esd16_state::esd_eeprom_w)); } void esd16_state::esd16_vid_attr_area(address_map &map, u32 base) @@ -169,8 +169,8 @@ void esd16_state::esd16_sprite_area(address_map &map, u32 base) void esd16_state::esd16_vram_area(address_map &map, u32 base) { - map(base + 0x00000, base + 0x03fff).w(this, FUNC(esd16_state::esd16_vram_0_w)).share("vram_0").mirror(0x4000); - map(base + 0x20000, base + 0x23fff).w(this, FUNC(esd16_state::esd16_vram_1_w)).share("vram_1").mirror(0x4000); + map(base + 0x00000, base + 0x03fff).w(FUNC(esd16_state::esd16_vram_0_w)).share("vram_0").mirror(0x4000); + map(base + 0x20000, base + 0x23fff).w(FUNC(esd16_state::esd16_vram_1_w)).share("vram_1").mirror(0x4000); } /*** Memory Maps ***/ @@ -201,7 +201,7 @@ void esd16_state::jumppop_map(address_map &map) esd16_vram_area(map, 0x300000); esd16_vid_attr_area(map, 0x380000); - map(0x180008, 0x180009).w(this, FUNC(esd16_state::esd16_tilemap0_color_jumppop_w)); // todo + map(0x180008, 0x180009).w(FUNC(esd16_state::esd16_tilemap0_color_jumppop_w)); // todo } void esd16_state::hedpanic_map(address_map &map) @@ -215,7 +215,7 @@ void esd16_state::hedpanic_map(address_map &map) esd16_vid_attr_area(map, 0xb00000); esd16_io_area_eeprom(map, 0xc00000); - map(0xd00008, 0xd00009).w(this, FUNC(esd16_state::hedpanic_platform_w)); // protection + map(0xd00008, 0xd00009).w(FUNC(esd16_state::hedpanic_platform_w)); // protection } /* Multi Champ Deluxe, like Head Panic but different addresses */ @@ -231,7 +231,7 @@ void esd16_state::mchampdx_map(address_map &map) esd16_sprite_area(map, 0x600000); esd16_vid_attr_area(map, 0x700000); - map(0xd00008, 0xd00009).w(this, FUNC(esd16_state::hedpanic_platform_w)); // not used in mchampdx? + map(0xd00008, 0xd00009).w(FUNC(esd16_state::hedpanic_platform_w)); // not used in mchampdx? } /* Tang Tang & Deluxe 5 - like the others but again with different addresses */ @@ -246,7 +246,7 @@ void esd16_state::tangtang_map(address_map &map) esd16_vram_area(map, 0x300000); esd16_vid_attr_area(map, 0x400000); esd16_io_area_eeprom(map, 0x500000); - map(0x600008, 0x600009).w(this, FUNC(esd16_state::hedpanic_platform_w)); + map(0x600008, 0x600009).w(FUNC(esd16_state::hedpanic_platform_w)); } @@ -283,9 +283,9 @@ void esd16_state::multchmp_sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x01).w("ymsnd", FUNC(ym3812_device::write)); // YM3812 map(0x02, 0x02).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // M6295 - map(0x03, 0x03).r(this, FUNC(esd16_state::esd16_sound_command_r)); // From Main CPU + map(0x03, 0x03).r(FUNC(esd16_state::esd16_sound_command_r)); // From Main CPU map(0x04, 0x04).nopw(); // ? $00, $30 - map(0x05, 0x05).w(this, FUNC(esd16_state::esd16_sound_rombank_w)); // ROM Bank + map(0x05, 0x05).w(FUNC(esd16_state::esd16_sound_rombank_w)); // ROM Bank map(0x06, 0x06).noprw(); // ? At the start / ? 1 (End of NMI routine) } diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp index 6d76a0977d1..9ce1e0f5885 100644 --- a/src/mame/drivers/esh.cpp +++ b/src/mame/drivers/esh.cpp @@ -227,10 +227,10 @@ void esh_state::z80_0_io(address_map &map) map(0xf1, 0xf1).portr("IN1"); map(0xf2, 0xf2).portr("IN2"); map(0xf3, 0xf3).portr("IN3"); - map(0xf4, 0xf4).rw(this, FUNC(esh_state::ldp_read), FUNC(esh_state::ldp_write)); - map(0xf5, 0xf5).w(this, FUNC(esh_state::misc_write)); /* Continuously writes repeating patterns */ - map(0xf8, 0xfd).w(this, FUNC(esh_state::led_writes)); - map(0xfe, 0xfe).w(this, FUNC(esh_state::nmi_line_w)); /* Both 0xfe and 0xff flip quickly between 0 and 1 */ + map(0xf4, 0xf4).rw(FUNC(esh_state::ldp_read), FUNC(esh_state::ldp_write)); + map(0xf5, 0xf5).w(FUNC(esh_state::misc_write)); /* Continuously writes repeating patterns */ + map(0xf8, 0xfd).w(FUNC(esh_state::led_writes)); + map(0xfe, 0xfe).w(FUNC(esh_state::nmi_line_w)); /* Both 0xfe and 0xff flip quickly between 0 and 1 */ map(0xff, 0xff).noprw(); /* (they're probably not NMI enables - likely LED's like their neighbors :) */ } /* (someday 0xf8-0xff will probably be a single handler) */ diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp index d0322648551..76fa8493f45 100644 --- a/src/mame/drivers/espial.cpp +++ b/src/mame/drivers/espial.cpp @@ -109,18 +109,18 @@ void espial_state::espial_map(address_map &map) map(0x6082, 0x6082).portr("DSW1"); map(0x6083, 0x6083).portr("IN1"); map(0x6084, 0x6084).portr("IN2"); - map(0x6090, 0x6090).r("soundlatch2", FUNC(generic_latch_8_device::read)).w(this, FUNC(espial_state::espial_master_soundlatch_w)); + map(0x6090, 0x6090).r("soundlatch2", FUNC(generic_latch_8_device::read)).w(FUNC(espial_state::espial_master_soundlatch_w)); map(0x7000, 0x7000).rw("watchdog", FUNC(watchdog_timer_device::reset_r), FUNC(watchdog_timer_device::reset_w)); - map(0x7100, 0x7100).w(this, FUNC(espial_state::espial_master_interrupt_mask_w)); - map(0x7200, 0x7200).w(this, FUNC(espial_state::espial_flipscreen_w)); + map(0x7100, 0x7100).w(FUNC(espial_state::espial_master_interrupt_mask_w)); + map(0x7200, 0x7200).w(FUNC(espial_state::espial_flipscreen_w)); map(0x8000, 0x801f).ram().share("spriteram_1"); map(0x8020, 0x803f).readonly(); - map(0x8400, 0x87ff).ram().w(this, FUNC(espial_state::espial_videoram_w)).share("videoram"); + map(0x8400, 0x87ff).ram().w(FUNC(espial_state::espial_videoram_w)).share("videoram"); map(0x8800, 0x880f).writeonly().share("spriteram_3"); - map(0x8c00, 0x8fff).ram().w(this, FUNC(espial_state::espial_attributeram_w)).share("attributeram"); + map(0x8c00, 0x8fff).ram().w(FUNC(espial_state::espial_attributeram_w)).share("attributeram"); map(0x9000, 0x901f).ram().share("spriteram_2"); - map(0x9020, 0x903f).ram().w(this, FUNC(espial_state::espial_scrollram_w)).share("scrollram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(espial_state::espial_colorram_w)).share("colorram"); + map(0x9020, 0x903f).ram().w(FUNC(espial_state::espial_scrollram_w)).share("scrollram"); + map(0x9400, 0x97ff).ram().w(FUNC(espial_state::espial_colorram_w)).share("colorram"); map(0xc000, 0xcfff).rom(); } @@ -135,17 +135,17 @@ void espial_state::netwars_map(address_map &map) map(0x6082, 0x6082).portr("DSW1"); map(0x6083, 0x6083).portr("IN1"); map(0x6084, 0x6084).portr("IN2"); - map(0x6090, 0x6090).r("soundlatch2", FUNC(generic_latch_8_device::read)).w(this, FUNC(espial_state::espial_master_soundlatch_w)); + map(0x6090, 0x6090).r("soundlatch2", FUNC(generic_latch_8_device::read)).w(FUNC(espial_state::espial_master_soundlatch_w)); map(0x7000, 0x7000).rw("watchdog", FUNC(watchdog_timer_device::reset_r), FUNC(watchdog_timer_device::reset_w)); - map(0x7100, 0x7100).w(this, FUNC(espial_state::espial_master_interrupt_mask_w)); - map(0x7200, 0x7200).w(this, FUNC(espial_state::espial_flipscreen_w)); - map(0x8000, 0x87ff).ram().w(this, FUNC(espial_state::espial_videoram_w)).share("videoram"); + map(0x7100, 0x7100).w(FUNC(espial_state::espial_master_interrupt_mask_w)); + map(0x7200, 0x7200).w(FUNC(espial_state::espial_flipscreen_w)); + map(0x8000, 0x87ff).ram().w(FUNC(espial_state::espial_videoram_w)).share("videoram"); map(0x8000, 0x801f).ram().share("spriteram_1"); - map(0x8800, 0x8fff).ram().w(this, FUNC(espial_state::espial_attributeram_w)).share("attributeram"); + map(0x8800, 0x8fff).ram().w(FUNC(espial_state::espial_attributeram_w)).share("attributeram"); map(0x8800, 0x880f).ram().share("spriteram_3"); - map(0x9000, 0x97ff).ram().w(this, FUNC(espial_state::espial_colorram_w)).share("colorram"); + map(0x9000, 0x97ff).ram().w(FUNC(espial_state::espial_colorram_w)).share("colorram"); map(0x9000, 0x901f).ram().share("spriteram_2"); - map(0x9020, 0x903f).ram().w(this, FUNC(espial_state::espial_scrollram_w)).share("scrollram"); + map(0x9020, 0x903f).ram().w(FUNC(espial_state::espial_scrollram_w)).share("scrollram"); } @@ -153,7 +153,7 @@ void espial_state::espial_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x4000, 0x4000).w(this, FUNC(espial_state::espial_sound_nmi_mask_w)); + map(0x4000, 0x4000).w(FUNC(espial_state::espial_sound_nmi_mask_w)); map(0x6000, 0x6000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("soundlatch2", FUNC(generic_latch_8_device::write)); } diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp index d1e3b9a95d9..1f748a7989f 100644 --- a/src/mame/drivers/esq1.cpp +++ b/src/mame/drivers/esq1.cpp @@ -509,7 +509,7 @@ void esq1_state::esq1_map(address_map &map) map(0x4000, 0x5fff).ram(); // SEQRAM map(0x6000, 0x63ff).rw("es5503", FUNC(es5503_device::read), FUNC(es5503_device::write)); map(0x6400, 0x640f).rw(m_duart, FUNC(scn2681_device::read), FUNC(scn2681_device::write)); - map(0x6800, 0x68ff).w(this, FUNC(esq1_state::analog_w)); + map(0x6800, 0x68ff).w(FUNC(esq1_state::analog_w)); map(0x7000, 0x7fff).bankr("osbank"); map(0x8000, 0xffff).rom().region("osrom", 0x8000); // OS "high" ROM is always mapped here } @@ -521,9 +521,9 @@ void esq1_state::sq80_map(address_map &map) // AM_RANGE(0x4000, 0x5fff) AM_READWRITE(seqdosram_r, seqdosram_w) map(0x6000, 0x63ff).rw("es5503", FUNC(es5503_device::read), FUNC(es5503_device::write)); map(0x6400, 0x640f).rw(m_duart, FUNC(scn2681_device::read), FUNC(scn2681_device::write)); - map(0x6800, 0x68ff).w(this, FUNC(esq1_state::analog_w)); - map(0x6c00, 0x6dff).w(this, FUNC(esq1_state::mapper_w)); - map(0x6e00, 0x6fff).rw(this, FUNC(esq1_state::wd1772_r), FUNC(esq1_state::wd1772_w)); + map(0x6800, 0x68ff).w(FUNC(esq1_state::analog_w)); + map(0x6c00, 0x6dff).w(FUNC(esq1_state::mapper_w)); + map(0x6e00, 0x6fff).rw(FUNC(esq1_state::wd1772_r), FUNC(esq1_state::wd1772_w)); map(0x7000, 0x7fff).bankr("osbank"); map(0x8000, 0xffff).rom().region("osrom", 0x8000); // OS "high" ROM is always mapped here } diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index 1d55052ef57..fcc7289bf8e 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -241,8 +241,6 @@ public: //dmac DECLARE_WRITE8_MEMBER(dma_end); DECLARE_WRITE8_MEMBER(dma_error); - DECLARE_READ8_MEMBER(fdc_read_byte); - DECLARE_WRITE8_MEMBER(fdc_write_byte); }; FLOPPY_FORMATS_MEMBER( esq5505_state::floppy_formats ) @@ -381,7 +379,7 @@ WRITE16_MEMBER(esq5505_state::lower_w) void esq5505_state::vfx_map(address_map &map) { - map(0x000000, 0x007fff).rw(this, FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); + map(0x000000, 0x007fff).rw(FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); map(0x200000, 0x20001f).rw("otis", FUNC(es5505_device::read), FUNC(es5505_device::write)); map(0x280000, 0x28001f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0x260000, 0x2601ff).rw(m_esp, FUNC(es5510_device::host_r), FUNC(es5510_device::host_w)).umask16(0x00ff); @@ -391,7 +389,7 @@ void esq5505_state::vfx_map(address_map &map) void esq5505_state::vfxsd_map(address_map &map) { - map(0x000000, 0x00ffff).rw(this, FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); + map(0x000000, 0x00ffff).rw(FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); map(0x200000, 0x20001f).rw("otis", FUNC(es5505_device::read), FUNC(es5505_device::write)); map(0x280000, 0x28001f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0x260000, 0x2601ff).rw(m_esp, FUNC(es5510_device::host_r), FUNC(es5510_device::host_w)).umask16(0x00ff); @@ -403,7 +401,7 @@ void esq5505_state::vfxsd_map(address_map &map) void esq5505_state::eps_map(address_map &map) { - map(0x000000, 0x007fff).rw(this, FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); + map(0x000000, 0x007fff).rw(FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); map(0x200000, 0x20001f).rw("otis", FUNC(es5505_device::read), FUNC(es5505_device::write)); map(0x240000, 0x2400ff).rw(m_dmac, FUNC(hd63450_device::read), FUNC(hd63450_device::write)); map(0x280000, 0x28001f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); @@ -415,7 +413,7 @@ void esq5505_state::eps_map(address_map &map) void esq5505_state::sq1_map(address_map &map) { - map(0x000000, 0x03ffff).rw(this, FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); + map(0x000000, 0x03ffff).rw(FUNC(esq5505_state::lower_r), FUNC(esq5505_state::lower_w)); map(0x200000, 0x20001f).rw("otis", FUNC(es5505_device::read), FUNC(es5505_device::write)); map(0x260000, 0x2601ff).rw(m_esp, FUNC(es5510_device::host_r), FUNC(es5510_device::host_w)).umask16(0x00ff); map(0x280000, 0x28001f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); @@ -551,16 +549,6 @@ WRITE8_MEMBER(esq5505_state::dma_error) update_irq_to_maincpu(); } -READ8_MEMBER(esq5505_state::fdc_read_byte) -{ - return m_fdc->data_r(); -} - -WRITE8_MEMBER(esq5505_state::fdc_write_byte) -{ - m_fdc->data_w(data & 0xff); -} - #if KEYBOARD_HACK INPUT_CHANGED_MEMBER(esq5505_state::key_stroke) { @@ -681,8 +669,8 @@ MACHINE_CONFIG_START(esq5505_state::eps) MCFG_HD63450_BURST_CLOCKS(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50)) MCFG_HD63450_DMA_END_CB(WRITE8(*this, esq5505_state, dma_end)) MCFG_HD63450_DMA_ERROR_CB(WRITE8(*this, esq5505_state, dma_error)) - MCFG_HD63450_DMA_READ_0_CB(READ8(*this, esq5505_state, fdc_read_byte)) // ch 0 = fdc, ch 1 = 340001 (ADC?) - MCFG_HD63450_DMA_WRITE_0_CB(WRITE8(*this, esq5505_state, fdc_write_byte)) + MCFG_HD63450_DMA_READ_0_CB(READ8(m_fdc, wd1772_device, data_r)) // ch 0 = fdc, ch 1 = 340001 (ADC?) + MCFG_HD63450_DMA_WRITE_0_CB(WRITE8(m_fdc, wd1772_device, data_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(esq5505_state::vfxsd) diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp index 5b36c9714d6..407b76969f9 100644 --- a/src/mame/drivers/esripsys.cpp +++ b/src/mame/drivers/esripsys.cpp @@ -568,13 +568,13 @@ void esripsys_state::game_cpu_map(address_map &map) { map(0x0000, 0x3fff).ram().share("share1"); map(0x4000, 0x42ff).ram().share("pal_ram"); - map(0x4300, 0x4300).w(this, FUNC(esripsys_state::esripsys_bg_intensity_w)); + map(0x4300, 0x4300).w(FUNC(esripsys_state::esripsys_bg_intensity_w)); map(0x4400, 0x47ff).noprw(); // Collision detection RAM - map(0x4800, 0x4bff).rw(this, FUNC(esripsys_state::g_status_r), FUNC(esripsys_state::g_status_w)); - map(0x4c00, 0x4fff).rw(this, FUNC(esripsys_state::g_iobus_r), FUNC(esripsys_state::g_iobus_w)); - map(0x5000, 0x53ff).w(this, FUNC(esripsys_state::g_ioadd_w)); + map(0x4800, 0x4bff).rw(FUNC(esripsys_state::g_status_r), FUNC(esripsys_state::g_status_w)); + map(0x4c00, 0x4fff).rw(FUNC(esripsys_state::g_iobus_r), FUNC(esripsys_state::g_iobus_w)); + map(0x5000, 0x53ff).w(FUNC(esripsys_state::g_ioadd_w)); map(0x5400, 0x57ff).noprw(); - map(0x5c00, 0x5fff).rw(this, FUNC(esripsys_state::uart_r), FUNC(esripsys_state::uart_w)); + map(0x5c00, 0x5fff).rw(FUNC(esripsys_state::uart_r), FUNC(esripsys_state::uart_w)); map(0x6000, 0xdfff).bankr("bank1"); map(0xe000, 0xffff).rom(); } @@ -583,9 +583,9 @@ void esripsys_state::game_cpu_map(address_map &map) void esripsys_state::frame_cpu_map(address_map &map) { map(0x0000, 0x3fff).ram().share("share1"); - map(0x4000, 0x4fff).rw(this, FUNC(esripsys_state::fdt_r), FUNC(esripsys_state::fdt_w)); - map(0x6000, 0x6000).rw(this, FUNC(esripsys_state::f_status_r), FUNC(esripsys_state::f_status_w)); - map(0x8000, 0x8000).w(this, FUNC(esripsys_state::frame_w)); + map(0x4000, 0x4fff).rw(FUNC(esripsys_state::fdt_r), FUNC(esripsys_state::fdt_w)); + map(0x6000, 0x6000).rw(FUNC(esripsys_state::f_status_r), FUNC(esripsys_state::f_status_w)); + map(0x8000, 0x8000).w(FUNC(esripsys_state::frame_w)); map(0xc000, 0xffff).rom(); } @@ -594,12 +594,12 @@ void esripsys_state::sound_cpu_map(address_map &map) { map(0x0000, 0x07ff).ram(); map(0x0800, 0x0fff).ram(); // Not installed on later PCBs - map(0x2008, 0x2009).rw(this, FUNC(esripsys_state::tms5220_r), FUNC(esripsys_state::tms5220_w)); - map(0x200a, 0x200b).w(this, FUNC(esripsys_state::esripsys_dac_w)); - map(0x200c, 0x200c).w("dacvol", FUNC(dac_byte_interface::write)); - map(0x200d, 0x200d).w(this, FUNC(esripsys_state::control_w)); - map(0x200e, 0x200e).rw(this, FUNC(esripsys_state::s_200e_r), FUNC(esripsys_state::s_200e_w)); - map(0x200f, 0x200f).rw(this, FUNC(esripsys_state::s_200f_r), FUNC(esripsys_state::s_200f_w)); + map(0x2008, 0x2009).rw(FUNC(esripsys_state::tms5220_r), FUNC(esripsys_state::tms5220_w)); + map(0x200a, 0x200b).w(FUNC(esripsys_state::esripsys_dac_w)); + map(0x200c, 0x200c).w("dacvol", FUNC(dac_byte_interface::data_w)); + map(0x200d, 0x200d).w(FUNC(esripsys_state::control_w)); + map(0x200e, 0x200e).rw(FUNC(esripsys_state::s_200e_r), FUNC(esripsys_state::s_200e_w)); + map(0x200f, 0x200f).rw(FUNC(esripsys_state::s_200f_r), FUNC(esripsys_state::s_200f_w)); map(0x2020, 0x2027).rw("6840ptm", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0x8000, 0x9fff).bankr("bank2"); map(0xa000, 0xbfff).bankr("bank3"); diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index 032eba19305..537cabe4378 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -143,8 +143,8 @@ void et3400_state::mem_map(address_map &map) map(0x0000, 0x0fff).ram(); map(0x1000, 0x1003).mirror(0x03fc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x1400, 0x23ff).rom().region("roms", 0); - map(0xc000, 0xc0ff).r(this, FUNC(et3400_state::keypad_r)); - map(0xc100, 0xc1ff).w(this, FUNC(et3400_state::display_w)); + map(0xc000, 0xc0ff).r(FUNC(et3400_state::keypad_r)); + map(0xc100, 0xc1ff).w(FUNC(et3400_state::display_w)); map(0xfc00, 0xffff).rom().region("roms", 0x1000); } diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index 73945aaf09f..e298606cb5a 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -92,8 +92,8 @@ void eti660_state::mem_map(address_map &map) void eti660_state::io_map(address_map &map) { map(0x01, 0x01).rw(m_cti, FUNC(cdp1864_device::dispon_r), FUNC(cdp1864_device::step_bgcolor_w)); - map(0x02, 0x02).rw(this, FUNC(eti660_state::pia_r), FUNC(eti660_state::pia_w)); - map(0x03, 0x03).w(this, FUNC(eti660_state::colorram_w)); + map(0x02, 0x02).rw(FUNC(eti660_state::pia_r), FUNC(eti660_state::pia_w)); + map(0x03, 0x03).w(FUNC(eti660_state::colorram_w)); map(0x04, 0x04).rw(m_cti, FUNC(cdp1864_device::dispoff_r), FUNC(cdp1864_device::tone_latch_w)); } diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp index 772edc2382b..ee5390d58d7 100644 --- a/src/mame/drivers/ettrivia.cpp +++ b/src/mame/drivers/ettrivia.cpp @@ -159,18 +159,18 @@ void ettrivia_state::cpu_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0x9000, 0x9000).w(this, FUNC(ettrivia_state::ettrivia_control_w)); + map(0x9000, 0x9000).w(FUNC(ettrivia_state::ettrivia_control_w)); map(0x9800, 0x9800).nopw(); map(0xa000, 0xa000).nopw(); - map(0xb000, 0xb000).r(this, FUNC(ettrivia_state::b000_r)).w(this, FUNC(ettrivia_state::b000_w)); - map(0xb800, 0xb800).w(this, FUNC(ettrivia_state::b800_w)); - map(0xc000, 0xc7ff).ram().w(this, FUNC(ettrivia_state::ettrivia_fg_w)).share("fg_videoram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(ettrivia_state::ettrivia_bg_w)).share("bg_videoram"); + map(0xb000, 0xb000).r(FUNC(ettrivia_state::b000_r)).w(FUNC(ettrivia_state::b000_w)); + map(0xb800, 0xb800).w(FUNC(ettrivia_state::b800_w)); + map(0xc000, 0xc7ff).ram().w(FUNC(ettrivia_state::ettrivia_fg_w)).share("fg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(ettrivia_state::ettrivia_bg_w)).share("bg_videoram"); } void ettrivia_state::io_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(ettrivia_state::ettrivia_question_r)); + map(0x0000, 0xffff).r(FUNC(ettrivia_state::ettrivia_question_r)); } static INPUT_PORTS_START( ettrivia ) diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp index 107fee2000f..c64d4ad3055 100644 --- a/src/mame/drivers/eurocom2.cpp +++ b/src/mame/drivers/eurocom2.cpp @@ -336,10 +336,10 @@ void eurocom2_state::eurocom2_map(address_map &map) map(0xf000, 0xfcef).rom().region("maincpu", 0); map(0xfcf0, 0xfcf3).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xfcf4, 0xfcf5).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); - map(0xfcf6, 0xfcf7).w(this, FUNC(eurocom2_state::vico_w)); + map(0xfcf6, 0xfcf7).w(FUNC(eurocom2_state::vico_w)); map(0xfcf8, 0xfcfb).rw(m_pia2, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xfd30, 0xfd37).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0xfd38, 0xfd38).rw(this, FUNC(eurocom2_state::fdc_aux_r), FUNC(eurocom2_state::fdc_aux_w)); + map(0xfd38, 0xfd38).rw(FUNC(eurocom2_state::fdc_aux_r), FUNC(eurocom2_state::fdc_aux_w)); map(0xfd40, 0xffff).rom().region("maincpu", 0xd40).nopw(); } @@ -349,7 +349,7 @@ void waveterm_state::waveterm_map(address_map &map) map(0xfd00, 0xfd03).rw(m_pia3, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xfd08, 0xfd0f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0xfd10, 0xfd17).unmaprw(); - map(0xfd18, 0xfd18).r(this, FUNC(waveterm_state::waveterm_adc)); // AD558 ADC + map(0xfd18, 0xfd18).r(FUNC(waveterm_state::waveterm_adc)); // AD558 ADC // AM_RANGE(0xfd20, 0xfd20) AM_READ(waveterm_dac) // ZN432 DAC ?? } diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp index 8ace47c411b..24591707333 100644 --- a/src/mame/drivers/europc.cpp +++ b/src/mame/drivers/europc.cpp @@ -504,9 +504,9 @@ void europc_pc_state::europc_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); - map(0x0060, 0x0063).rw(this, FUNC(europc_pc_state::europc_pio_r), FUNC(europc_pc_state::europc_pio_w)); - map(0x0250, 0x025f).rw(this, FUNC(europc_pc_state::europc_jim_r), FUNC(europc_pc_state::europc_jim_w)); - map(0x02e0, 0x02e0).r(this, FUNC(europc_pc_state::europc_jim2_r)); + map(0x0060, 0x0063).rw(FUNC(europc_pc_state::europc_pio_r), FUNC(europc_pc_state::europc_pio_w)); + map(0x0250, 0x025f).rw(FUNC(europc_pc_state::europc_jim_r), FUNC(europc_pc_state::europc_jim_w)); + map(0x02e0, 0x02e0).r(FUNC(europc_pc_state::europc_jim2_r)); } /* single built-in 3.5" 720K drive, connector for optional external 3.5" or 5.25" drive */ diff --git a/src/mame/drivers/evmbug.cpp b/src/mame/drivers/evmbug.cpp index 40e837a4448..497b3a105bb 100644 --- a/src/mame/drivers/evmbug.cpp +++ b/src/mame/drivers/evmbug.cpp @@ -59,8 +59,8 @@ void evmbug_state::io_map(address_map &map) map.unmap_value_high(); //AM_RANGE(0x0000, 0x0003) AM_DEVREAD("uart1", tms9902_device, cruread) //AM_RANGE(0x0000, 0x001f) AM_DEVWRITE("uart1", tms9902_device, cruwrite) - map(0x0000, 0x0003).r(this, FUNC(evmbug_state::rs232_r)); - map(0x0000, 0x001f).w(this, FUNC(evmbug_state::rs232_w)); + map(0x0000, 0x0003).r(FUNC(evmbug_state::rs232_r)); + map(0x0000, 0x001f).w(FUNC(evmbug_state::rs232_w)); } /* Input ports */ diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index e28516c376a..c169242f3dd 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -132,19 +132,19 @@ void excali64_state::mem_map(address_map &map) void excali64_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0f).r(this, FUNC(excali64_state::port00_r)); + map(0x00, 0x0f).r(FUNC(excali64_state::port00_r)); map(0x10, 0x10).mirror(0x0e).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x11, 0x11).mirror(0x0e).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x20, 0x23).mirror(0x0c).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x30, 0x30).mirror(0x0e).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x31, 0x31).mirror(0x0e).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x50, 0x5f).r(this, FUNC(excali64_state::port50_r)); + map(0x50, 0x5f).r(FUNC(excali64_state::port50_r)); map(0x60, 0x63).mirror(0x0c).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x70, 0x7f).w(this, FUNC(excali64_state::port70_w)); - map(0xe0, 0xe3).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0xe4, 0xe7).w(this, FUNC(excali64_state::porte4_w)); - map(0xe8, 0xeb).r(this, FUNC(excali64_state::porte8_r)); - map(0xec, 0xef).w(this, FUNC(excali64_state::portec_w)); + map(0x70, 0x7f).w(FUNC(excali64_state::port70_w)); + map(0xe0, 0xe3).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0xe4, 0xe7).w(FUNC(excali64_state::porte4_w)); + map(0xe8, 0xeb).r(FUNC(excali64_state::porte8_r)); + map(0xec, 0xef).w(FUNC(excali64_state::portec_w)); map(0xf0, 0xf3).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); } @@ -569,7 +569,7 @@ MACHINE_CONFIG_START(excali64_state::excali64) //MCFG_PIT8253_CLK2(16_MHz_XTAL / 16) /* Timer 2: not used */ MCFG_DEVICE_ADD("ppi", I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) // parallel port + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) // parallel port MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, excali64_state, ppib_w)) MCFG_I8255_IN_PORTC_CB(READ8(*this, excali64_state, ppic_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, excali64_state, ppic_w)) diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp index b64dfb84521..1ab1ccbc23e 100644 --- a/src/mame/drivers/exedexes.cpp +++ b/src/mame/drivers/exedexes.cpp @@ -43,14 +43,14 @@ void exedexes_state::exedexes_map(address_map &map) map(0xc003, 0xc003).portr("DSW0"); map(0xc004, 0xc004).portr("DSW1"); map(0xc800, 0xc800).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc804, 0xc804).w(this, FUNC(exedexes_state::exedexes_c804_w)); /* coin counters + text layer enable */ + map(0xc804, 0xc804).w(FUNC(exedexes_state::exedexes_c804_w)); /* coin counters + text layer enable */ map(0xc806, 0xc806).nopw(); /* Watchdog ?? */ - map(0xd000, 0xd3ff).ram().w(this, FUNC(exedexes_state::exedexes_videoram_w)).share("videoram"); /* Video RAM */ - map(0xd400, 0xd7ff).ram().w(this, FUNC(exedexes_state::exedexes_colorram_w)).share("colorram"); /* Color RAM */ + map(0xd000, 0xd3ff).ram().w(FUNC(exedexes_state::exedexes_videoram_w)).share("videoram"); /* Video RAM */ + map(0xd400, 0xd7ff).ram().w(FUNC(exedexes_state::exedexes_colorram_w)).share("colorram"); /* Color RAM */ map(0xd800, 0xd801).writeonly().share("nbg_yscroll"); map(0xd802, 0xd803).writeonly().share("nbg_xscroll"); map(0xd804, 0xd805).writeonly().share("bg_scroll"); - map(0xd807, 0xd807).w(this, FUNC(exedexes_state::exedexes_gfxctrl_w)); /* layer enables */ + map(0xd807, 0xd807).w(FUNC(exedexes_state::exedexes_gfxctrl_w)); /* layer enables */ map(0xe000, 0xefff).ram(); /* Work RAM */ map(0xf000, 0xffff).ram().share("spriteram"); /* Sprite RAM */ } @@ -63,8 +63,8 @@ void exedexes_state::sound_map(address_map &map) map(0x4000, 0x47ff).ram(); map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x8000, 0x8001).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0x8002, 0x8002).w("sn1", FUNC(sn76489_device::write)); - map(0x8003, 0x8003).w("sn2", FUNC(sn76489_device::write)); + map(0x8002, 0x8002).w("sn1", FUNC(sn76489_device::command_w)); + map(0x8003, 0x8003).w("sn2", FUNC(sn76489_device::command_w)); } diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp index ca678154308..3a986ed4528 100644 --- a/src/mame/drivers/exelv.cpp +++ b/src/mame/drivers/exelv.cpp @@ -418,8 +418,8 @@ void exelv_state::tms7020_mem(address_map &map) map(0x012d, 0x012d).w(m_tms3556, FUNC(tms3556_device::reg_w)); map(0x012e, 0x012e).w(m_tms3556, FUNC(tms3556_device::vram_w)); - map(0x0130, 0x0130).rw(this, FUNC(exelv_state::mailbox_wx319_r), FUNC(exelv_state::mailbox_wx318_w)); - map(0x0200, 0x7fff).r(this, FUNC(exelv_state::rom_r)); + map(0x0130, 0x0130).rw(FUNC(exelv_state::mailbox_wx319_r), FUNC(exelv_state::mailbox_wx318_w)); + map(0x0200, 0x7fff).r(FUNC(exelv_state::rom_r)); map(0x8000, 0xbfff).noprw(); map(0xc000, 0xc7ff).ram(); /* CPU RAM */ map(0xc800, 0xf7ff).noprw(); @@ -434,7 +434,7 @@ void exelv_state::tms7040_mem(address_map &map) map(0x0128, 0x0128).r(m_tms3556, FUNC(tms3556_device::initptr_r)); map(0x012d, 0x012d).w(m_tms3556, FUNC(tms3556_device::reg_w)); map(0x012e, 0x012e).w(m_tms3556, FUNC(tms3556_device::vram_w)); - map(0x0130, 0x0130).rw(this, FUNC(exelv_state::mailbox_wx319_r), FUNC(exelv_state::mailbox_wx318_w)); + map(0x0130, 0x0130).rw(FUNC(exelv_state::mailbox_wx319_r), FUNC(exelv_state::mailbox_wx318_w)); map(0x0200, 0x7fff).bankr("bank1"); /* system ROM */ map(0x8000, 0xbfff).noprw(); map(0xc000, 0xc7ff).ram(); /* CPU RAM */ diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp index 74339732714..4efe32202bd 100644 --- a/src/mame/drivers/exerion.cpp +++ b/src/mame/drivers/exerion.cpp @@ -195,14 +195,14 @@ void exerion_state::main_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x67ff).ram().share("main_ram"); - map(0x6008, 0x600b).r(this, FUNC(exerion_state::exerion_protection_r)); + map(0x6008, 0x600b).r(FUNC(exerion_state::exerion_protection_r)); map(0x8000, 0x87ff).ram().share("videoram"); map(0x8800, 0x887f).ram().share("spriteram"); map(0x8880, 0x8bff).ram(); map(0xa000, 0xa000).portr("IN0"); map(0xa800, 0xa800).portr("DSW0"); map(0xb000, 0xb000).portr("DSW1"); - map(0xc000, 0xc000).w(this, FUNC(exerion_state::exerion_videoreg_w)); + map(0xc000, 0xc000).w(FUNC(exerion_state::exerion_videoreg_w)); map(0xc800, 0xc800).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xd000, 0xd001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0xd800, 0xd801).w("ay2", FUNC(ay8910_device::address_data_w)); @@ -222,8 +222,8 @@ void exerion_state::sub_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x4000, 0x47ff).ram(); map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x8000, 0x800c).w(this, FUNC(exerion_state::exerion_video_latch_w)); - map(0xa000, 0xa000).r(this, FUNC(exerion_state::exerion_video_timing_r)); + map(0x8000, 0x800c).w(FUNC(exerion_state::exerion_video_latch_w)); + map(0xa000, 0xa000).r(FUNC(exerion_state::exerion_video_timing_r)); } diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp index 4258a2111d5..ca4215c51fb 100644 --- a/src/mame/drivers/exidy.cpp +++ b/src/mame/drivers/exidy.cpp @@ -212,7 +212,7 @@ void exidy_state::exidy_map(address_map &map) map(0x5100, 0x5100).mirror(0x00fc).writeonly().share("spriteno"); map(0x5101, 0x5101).mirror(0x00fc).portr("IN0"); map(0x5101, 0x5101).mirror(0x00fc).writeonly().share("sprite_enable"); - map(0x5103, 0x5103).mirror(0x00fc).r(this, FUNC(exidy_state::exidy_interrupt_r)); + map(0x5103, 0x5103).mirror(0x00fc).r(FUNC(exidy_state::exidy_interrupt_r)); map(0x5210, 0x5212).writeonly().share("color_latch"); map(0x5213, 0x5213).portr("IN2"); } @@ -223,8 +223,8 @@ void exidy_state::sidetrac_map(address_map &map) exidy_map(map); map(0x0800, 0x3fff).rom(); map(0x4800, 0x4fff).rom().share("characterram"); - map(0x5200, 0x5200).w(this, FUNC(exidy_state::targ_audio_1_w)); - map(0x5201, 0x5201).w(this, FUNC(exidy_state::spectar_audio_2_w)); + map(0x5200, 0x5200).w(FUNC(exidy_state::targ_audio_1_w)); + map(0x5201, 0x5201).w(FUNC(exidy_state::spectar_audio_2_w)); map(0xff00, 0xffff).rom().region("maincpu", 0x3f00); } @@ -234,8 +234,8 @@ void exidy_state::targ_map(address_map &map) exidy_map(map); map(0x0800, 0x3fff).rom(); map(0x4800, 0x4fff).ram().share("characterram"); - map(0x5200, 0x5200).w(this, FUNC(exidy_state::targ_audio_1_w)); - map(0x5201, 0x5201).w(this, FUNC(exidy_state::targ_audio_2_w)); + map(0x5200, 0x5200).w(FUNC(exidy_state::targ_audio_1_w)); + map(0x5201, 0x5201).w(FUNC(exidy_state::targ_audio_2_w)); map(0xff00, 0xffff).rom().region("maincpu", 0x3f00); } @@ -245,8 +245,8 @@ void exidy_state::spectar_map(address_map &map) exidy_map(map); map(0x0800, 0x3fff).rom(); map(0x4800, 0x4fff).ram().share("characterram"); - map(0x5200, 0x5200).w(this, FUNC(exidy_state::targ_audio_1_w)); - map(0x5201, 0x5201).w(this, FUNC(exidy_state::spectar_audio_2_w)); + map(0x5200, 0x5200).w(FUNC(exidy_state::targ_audio_1_w)); + map(0x5201, 0x5201).w(FUNC(exidy_state::spectar_audio_2_w)); map(0xff00, 0xffff).rom().region("maincpu", 0x3f00); } @@ -263,9 +263,9 @@ void exidy_state::rallys_map(address_map &map) map(0x5100, 0x5100).mirror(0x00fc).writeonly().share("spriteno"); map(0x5101, 0x5101).mirror(0x00fc).portr("IN0"); map(0x5101, 0x5101).mirror(0x00fc).writeonly().share("sprite_enable"); - map(0x5103, 0x5103).mirror(0x00fc).r(this, FUNC(exidy_state::exidy_interrupt_r)); - map(0x5200, 0x5200).w(this, FUNC(exidy_state::targ_audio_1_w)); - map(0x5201, 0x5201).w(this, FUNC(exidy_state::spectar_audio_2_w)); + map(0x5103, 0x5103).mirror(0x00fc).r(FUNC(exidy_state::exidy_interrupt_r)); + map(0x5200, 0x5200).w(FUNC(exidy_state::targ_audio_1_w)); + map(0x5201, 0x5201).w(FUNC(exidy_state::spectar_audio_2_w)); map(0x5210, 0x5212).writeonly().share("color_latch"); map(0x5213, 0x5213).portr("IN2"); map(0x5300, 0x5300).writeonly().share("sprite2_xpos"); @@ -299,7 +299,7 @@ void exidy_state::fax_map(address_map &map) map(0x0400, 0x07ff).ram(); map(0x1a00, 0x1a00).portr("IN4"); map(0x1c00, 0x1c00).portr("IN3"); - map(0x2000, 0x2000).w(this, FUNC(exidy_state::fax_bank_select_w)); + map(0x2000, 0x2000).w(FUNC(exidy_state::fax_bank_select_w)); map(0x2000, 0x3fff).bankr("bank1"); map(0x5200, 0x520f).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x5213, 0x5217).nopw(); /* empty control lines on color/sound board */ diff --git a/src/mame/drivers/exidy440.cpp b/src/mame/drivers/exidy440.cpp index c064e1235f4..ddda2e3cdb3 100644 --- a/src/mame/drivers/exidy440.cpp +++ b/src/mame/drivers/exidy440.cpp @@ -468,23 +468,23 @@ void exidy440_state::machine_reset() void exidy440_state::exidy440_map(address_map &map) { map(0x0000, 0x1fff).ram().share("imageram"); - map(0x2000, 0x209f).ram().w(this, FUNC(exidy440_state::exidy440_spriteram_w)).share("spriteram"); + map(0x2000, 0x209f).ram().w(FUNC(exidy440_state::exidy440_spriteram_w)).share("spriteram"); map(0x20a0, 0x29ff).ram(); - map(0x2a00, 0x2aff).rw(this, FUNC(exidy440_state::exidy440_videoram_r), FUNC(exidy440_state::exidy440_videoram_w)); - map(0x2b00, 0x2b00).r(this, FUNC(exidy440_state::exidy440_vertical_pos_r)); - map(0x2b01, 0x2b01).rw(this, FUNC(exidy440_state::exidy440_horizontal_pos_r), FUNC(exidy440_state::exidy440_interrupt_clear_w)); + map(0x2a00, 0x2aff).rw(FUNC(exidy440_state::exidy440_videoram_r), FUNC(exidy440_state::exidy440_videoram_w)); + map(0x2b00, 0x2b00).r(FUNC(exidy440_state::exidy440_vertical_pos_r)); + map(0x2b01, 0x2b01).rw(FUNC(exidy440_state::exidy440_horizontal_pos_r), FUNC(exidy440_state::exidy440_interrupt_clear_w)); map(0x2b02, 0x2b02).ram().share("scanline"); - map(0x2b03, 0x2b03).portr("IN0").w(this, FUNC(exidy440_state::exidy440_control_w)); - map(0x2c00, 0x2dff).rw(this, FUNC(exidy440_state::exidy440_paletteram_r), FUNC(exidy440_state::exidy440_paletteram_w)); - map(0x2e00, 0x2e1f).ram().w(this, FUNC(exidy440_state::sound_command_w)); - map(0x2e20, 0x2e3f).rw(this, FUNC(exidy440_state::exidy440_input_port_3_r), FUNC(exidy440_state::exidy440_input_port_3_w)); - map(0x2e40, 0x2e5f).nopr().w(this, FUNC(exidy440_state::exidy440_coin_counter_w)); /* read: clear coin counters I/O2 */ + map(0x2b03, 0x2b03).portr("IN0").w(FUNC(exidy440_state::exidy440_control_w)); + map(0x2c00, 0x2dff).rw(FUNC(exidy440_state::exidy440_paletteram_r), FUNC(exidy440_state::exidy440_paletteram_w)); + map(0x2e00, 0x2e1f).ram().w(FUNC(exidy440_state::sound_command_w)); + map(0x2e20, 0x2e3f).rw(FUNC(exidy440_state::exidy440_input_port_3_r), FUNC(exidy440_state::exidy440_input_port_3_w)); + map(0x2e40, 0x2e5f).nopr().w(FUNC(exidy440_state::exidy440_coin_counter_w)); /* read: clear coin counters I/O2 */ map(0x2e60, 0x2e7f).portr("IN1").nopw(); map(0x2e80, 0x2e9f).portr("IN2").nopw(); - map(0x2ea0, 0x2ebf).r(this, FUNC(exidy440_state::sound_command_ack_r)).nopw(); + map(0x2ea0, 0x2ebf).r(FUNC(exidy440_state::sound_command_ack_r)).nopw(); map(0x2ec0, 0x2eff).noprw(); map(0x3000, 0x3fff).ram(); - map(0x4000, 0x7fff).bankr("bank1").w(this, FUNC(exidy440_state::bankram_w)); + map(0x4000, 0x7fff).bankr("bank1").w(FUNC(exidy440_state::bankram_w)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index 8170a4bea09..b55e082a5d2 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -697,7 +697,7 @@ void expro02_state::expro02_map(address_map &map) map(0x800000, 0x800001).portr("DSW1"); map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); map(0xa00000, 0xa00001).nopw(); /* ??? */ map(0xc80000, 0xc8ffff).ram(); map(0xe00000, 0xe00015).rw("calc1_mcu", FUNC(kaneko_hit_device::kaneko_hit_r), FUNC(kaneko_hit_device::kaneko_hit_w)); @@ -713,7 +713,7 @@ void expro02_state::fantasia_map(address_map &map) map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); map(0x800006, 0x800007).noprw(); // ? used ? - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); map(0xa00000, 0xa00001).nopw(); /* ??? */ map(0xc80000, 0xc8ffff).ram(); map(0xf00000, 0xf00000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -729,13 +729,13 @@ void expro02_state::comad_map(address_map &map) map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); // map(0x800006, 0x800007); ?? - map(0x80000a, 0x80000b).r(this, FUNC(expro02_state::comad_timer_r)); /* bits 8-a = timer? palette update code waits for them to be 111 */ - map(0x80000c, 0x80000d).r(this, FUNC(expro02_state::comad_timer_r)); /* missw96 bits 8-a = timer? palette update code waits for them to be 111 */ - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ + map(0x80000a, 0x80000b).r(FUNC(expro02_state::comad_timer_r)); /* bits 8-a = timer? palette update code waits for them to be 111 */ + map(0x80000c, 0x80000d).r(FUNC(expro02_state::comad_timer_r)); /* missw96 bits 8-a = timer? palette update code waits for them to be 111 */ + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ map(0xc00000, 0xc0ffff).ram(); map(0xc80000, 0xc8ffff).ram(); - map(0xf00000, 0xf00000).r(this, FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ - map(0xf80000, 0xf80000).r(this, FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* newfant */ + map(0xf00000, 0xf00000).r(FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ + map(0xf80000, 0xf80000).r(FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* newfant */ } void expro02_state::fantsia2_map(address_map &map) @@ -746,10 +746,10 @@ void expro02_state::fantsia2_map(address_map &map) map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); // map(0x800006, 0x800007); ?? - map(0x800008, 0x800009).r(this, FUNC(expro02_state::comad_timer_r)); /* bits 8-a = timer? palette update code waits for them to be 111 */ - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ + map(0x800008, 0x800009).r(FUNC(expro02_state::comad_timer_r)); /* bits 8-a = timer? palette update code waits for them to be 111 */ + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ map(0xa00000, 0xa00001).nopw(); /* coin counters, + ? */ - map(0xc80000, 0xc80000).r(this, FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); + map(0xc80000, 0xc80000).r(FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); map(0xf80000, 0xf8ffff).ram(); } @@ -766,7 +766,7 @@ void expro02_state::galhustl_map(address_map &map) map(0x800000, 0x800001).portr("DSW1"); map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); map(0xa00000, 0xa00001).nopw(); // ? map(0xd00000, 0xd00000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xe80000, 0xe8ffff).ram(); @@ -783,8 +783,8 @@ void expro02_state::zipzap_map(address_map &map) map(0x800000, 0x800001).portr("DSW1"); map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); - map(0xc00000, 0xc00000).r(this, FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); + map(0xc00000, 0xc00000).r(FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ map(0xc80000, 0xc8ffff).ram(); // main ram map(0x780000, 0x78001f).noprw(); // prevent sprites being flipped @@ -798,15 +798,15 @@ void expro02_state::supmodel_map(address_map &map) map(0x800000, 0x800001).portr("DSW1"); map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); - map(0x800006, 0x800007).r(this, FUNC(expro02_state::comad_timer_r)); - map(0x800008, 0x800009).r(this, FUNC(expro02_state::comad_timer_r)); - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ + map(0x800006, 0x800007).r(FUNC(expro02_state::comad_timer_r)); + map(0x800008, 0x800009).r(FUNC(expro02_state::comad_timer_r)); + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ map(0xa00000, 0xa00001).nopw(); map(0xc80000, 0xc8ffff).ram(); map(0xd80000, 0xd80001).nopw(); map(0xe00012, 0xe00013).nopw(); map(0xe80000, 0xe80001).nopw(); - map(0xf80000, 0xf80000).r(this, FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ + map(0xf80000, 0xf80000).r(FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ } void expro02_state::smissw_map(address_map &map) @@ -817,15 +817,15 @@ void expro02_state::smissw_map(address_map &map) map(0x800000, 0x800001).portr("DSW1"); map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); - map(0x800006, 0x800007).r(this, FUNC(expro02_state::comad_timer_r)); - map(0x80000e, 0x80000f).r(this, FUNC(expro02_state::comad_timer_r)); - map(0x900000, 0x900000).w(this, FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ + map(0x800006, 0x800007).r(FUNC(expro02_state::comad_timer_r)); + map(0x80000e, 0x80000f).r(FUNC(expro02_state::comad_timer_r)); + map(0x900000, 0x900000).w(FUNC(expro02_state::expro02_6295_bankswitch_w)); /* not sure */ map(0xa00000, 0xa00001).nopw(); map(0xc00000, 0xc0ffff).ram(); map(0xd80000, 0xd80001).nopw(); map(0xe00012, 0xe00013).nopw(); map(0xe80000, 0xe80001).nopw(); - map(0xf00000, 0xf00000).r(this, FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ + map(0xf00000, 0xf00000).r(FUNC(expro02_state::comad_okim6295_r)).w("oki", FUNC(okim6295_device::write)); /* fantasia, missw96 */ } void expro02_state::oki_map(address_map &map) diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp index 4c384c0997d..145d1fe4fbb 100644 --- a/src/mame/drivers/exprraid.cpp +++ b/src/mame/drivers/exprraid.cpp @@ -278,22 +278,22 @@ void exprraid_state::master_map(address_map &map) { map(0x0000, 0x05ff).ram().share("main_ram"); map(0x0600, 0x07ff).ram().share("spriteram"); - map(0x0800, 0x0bff).ram().w(this, FUNC(exprraid_state::exprraid_videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(exprraid_state::exprraid_colorram_w)).share("colorram"); + map(0x0800, 0x0bff).ram().w(FUNC(exprraid_state::exprraid_videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(exprraid_state::exprraid_colorram_w)).share("colorram"); map(0x1800, 0x1800).portr("DSW0"); /* DSW 0 */ map(0x1801, 0x1801).portr("IN1"); /* Controls */ map(0x1802, 0x1802).portr("IN2"); /* Coins */ map(0x1803, 0x1803).portr("DSW1"); /* DSW 1 */ - map(0x2000, 0x2000).w(this, FUNC(exprraid_state::exprraid_int_clear_w)); + map(0x2000, 0x2000).w(FUNC(exprraid_state::exprraid_int_clear_w)); map(0x2001, 0x2001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x2002, 0x2002).w(this, FUNC(exprraid_state::exprraid_flipscreen_w)); + map(0x2002, 0x2002).w(FUNC(exprraid_state::exprraid_flipscreen_w)); map(0x2003, 0x2003).nopw(); // DMA SWAP - Allow writes to video and sprite RAM - map(0x2800, 0x2800).r(this, FUNC(exprraid_state::exprraid_prot_data_r)); - map(0x2801, 0x2801).r(this, FUNC(exprraid_state::exprraid_prot_status_r)); - map(0x2800, 0x2803).w(this, FUNC(exprraid_state::exprraid_bgselect_w)); - map(0x2804, 0x2804).w(this, FUNC(exprraid_state::exprraid_scrolly_w)); - map(0x2805, 0x2806).w(this, FUNC(exprraid_state::exprraid_scrollx_w)); - map(0x2807, 0x2807).w(this, FUNC(exprraid_state::exprraid_prot_data_w)); + map(0x2800, 0x2800).r(FUNC(exprraid_state::exprraid_prot_data_r)); + map(0x2801, 0x2801).r(FUNC(exprraid_state::exprraid_prot_status_r)); + map(0x2800, 0x2803).w(FUNC(exprraid_state::exprraid_bgselect_w)); + map(0x2804, 0x2804).w(FUNC(exprraid_state::exprraid_scrolly_w)); + map(0x2805, 0x2806).w(FUNC(exprraid_state::exprraid_scrollx_w)); + map(0x2807, 0x2807).w(FUNC(exprraid_state::exprraid_prot_data_w)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp index c49aae5584c..587a1504c37 100644 --- a/src/mame/drivers/exterm.cpp +++ b/src/mame/drivers/exterm.cpp @@ -243,12 +243,12 @@ void exterm_state::master_map(address_map &map) { map(0x00000000, 0x000fffff).mirror(0xfc700000).ram().share("master_videoram"); map(0x00800000, 0x00bfffff).mirror(0xfc400000).ram(); - map(0x01000000, 0x013fffff).mirror(0xfc000000).rw(this, FUNC(exterm_state::host_data_r), FUNC(exterm_state::host_data_w)); - map(0x01400000, 0x0143ffff).mirror(0xfc000000).r(this, FUNC(exterm_state::trackball_port_r<0>)); - map(0x01440000, 0x0147ffff).mirror(0xfc000000).r(this, FUNC(exterm_state::trackball_port_r<1>)); + map(0x01000000, 0x013fffff).mirror(0xfc000000).rw(FUNC(exterm_state::host_data_r), FUNC(exterm_state::host_data_w)); + map(0x01400000, 0x0143ffff).mirror(0xfc000000).r(FUNC(exterm_state::trackball_port_r<0>)); + map(0x01440000, 0x0147ffff).mirror(0xfc000000).r(FUNC(exterm_state::trackball_port_r<1>)); map(0x01480000, 0x014bffff).mirror(0xfc000000).portr("DSW"); - map(0x01500000, 0x0153ffff).mirror(0xfc000000).w(this, FUNC(exterm_state::output_port_0_w)); - map(0x01580000, 0x015bffff).mirror(0xfc000000).w(this, FUNC(exterm_state::sound_latch_w)).umask16(0x00ff); + map(0x01500000, 0x0153ffff).mirror(0xfc000000).w(FUNC(exterm_state::output_port_0_w)); + map(0x01580000, 0x015bffff).mirror(0xfc000000).w(FUNC(exterm_state::sound_latch_w)).umask16(0x00ff); map(0x015c0000, 0x015fffff).mirror(0xfc000000).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x01800000, 0x01807fff).mirror(0xfc7f8000).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x02800000, 0x02807fff).mirror(0xfc7f8000).ram().share("nvram"); @@ -275,13 +275,13 @@ void exterm_state::slave_map(address_map &map) void exterm_state::sound_master_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x1800).ram(); - map(0x4000, 0x5fff).w(this, FUNC(exterm_state::ym2151_data_latch_w)); - map(0x6000, 0x67ff).w(this, FUNC(exterm_state::sound_nmi_rate_w)); + map(0x4000, 0x5fff).w(FUNC(exterm_state::ym2151_data_latch_w)); + map(0x6000, 0x67ff).w(FUNC(exterm_state::sound_nmi_rate_w)); map(0x6800, 0x6fff).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); - map(0x7000, 0x77ff).r(this, FUNC(exterm_state::sound_nmi_to_slave_r)); + map(0x7000, 0x77ff).r(FUNC(exterm_state::sound_nmi_to_slave_r)); /* AM_RANGE(0x7800, 0x7fff) unknown - to S4-13 */ map(0x8000, 0xffff).rom(); - map(0xa000, 0xbfff).w(this, FUNC(exterm_state::sound_control_w)); + map(0xa000, 0xbfff).w(FUNC(exterm_state::sound_control_w)); } @@ -290,8 +290,8 @@ void exterm_state::sound_slave_map(address_map &map) map(0x0000, 0x07ff).mirror(0x3800).ram(); map(0x4000, 0x5fff).r(m_soundlatch[1], FUNC(generic_latch_8_device::read)); map(0x8000, 0xffff).rom(); - map(0x8000, 0x8000).mirror(0x3ffe).w("dacvol", FUNC(dac_byte_interface::write)); - map(0x8001, 0x8001).mirror(0x3ffe).w("dac", FUNC(dac_byte_interface::write)); + map(0x8000, 0x8000).mirror(0x3ffe).w("dacvol", FUNC(dac_byte_interface::data_w)); + map(0x8001, 0x8001).mirror(0x3ffe).w("dac", FUNC(dac_byte_interface::data_w)); } diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index 7cee3c3dbea..053ac12b093 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -107,8 +107,8 @@ void exzisus_state::cpua_map(address_map &map) map(0xc000, 0xc5ff).ram().share("objectram1"); map(0xc600, 0xdfff).ram().share("videoram1"); map(0xe000, 0xefff).ram().share("sharedram_ac"); - map(0xf400, 0xf400).w(this, FUNC(exzisus_state::cpua_bankswitch_w)); - map(0xf404, 0xf404).w(this, FUNC(exzisus_state::cpub_reset_w)); // ?? + map(0xf400, 0xf400).w(FUNC(exzisus_state::cpua_bankswitch_w)); + map(0xf404, 0xf404).w(FUNC(exzisus_state::cpub_reset_w)); // ?? map(0xf800, 0xffff).ram().share("sharedram_ab"); } @@ -122,10 +122,10 @@ void exzisus_state::cpub_map(address_map &map) map(0xf000, 0xf000).nopr().w("ciu", FUNC(pc060ha_device::master_port_w)); map(0xf001, 0xf001).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); map(0xf400, 0xf400).portr("P1"); - map(0xf400, 0xf400).w(this, FUNC(exzisus_state::cpub_bankswitch_w)); + map(0xf400, 0xf400).w(FUNC(exzisus_state::cpub_bankswitch_w)); map(0xf401, 0xf401).portr("P2"); map(0xf402, 0xf402).portr("SYSTEM"); - map(0xf402, 0xf402).w(this, FUNC(exzisus_state::coincounter_w)); + map(0xf402, 0xf402).w(FUNC(exzisus_state::coincounter_w)); map(0xf404, 0xf404).portr("DSWA"); map(0xf404, 0xf404).nopw(); // ?? map(0xf405, 0xf405).portr("DSWB"); diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp index 680882d8f00..f4c5b082db5 100644 --- a/src/mame/drivers/f-32.cpp +++ b/src/mame/drivers/f-32.cpp @@ -107,7 +107,7 @@ void mosaicf2_state::mosaicf2_io(address_map &map) map(0x4003, 0x4003).r("oki", FUNC(okim6295_device::read)); map(0x4813, 0x4813).r("ymsnd", FUNC(ym2151_device::status_r)); map(0x5000, 0x5003).portr("P1"); - map(0x5200, 0x5203).r(this, FUNC(mosaicf2_state::f32_input_port_1_r)); + map(0x5200, 0x5203).r(FUNC(mosaicf2_state::f32_input_port_1_r)); map(0x5400, 0x5403).portr("EEPROMIN"); map(0x6003, 0x6003).w("oki", FUNC(okim6295_device::write)); map(0x6803, 0x6803).w("ymsnd", FUNC(ym2151_device::data_w)); diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp index a2d8ad79c8d..9634e1f98f7 100644 --- a/src/mame/drivers/f1gp.cpp +++ b/src/mame/drivers/f1gp.cpp @@ -58,26 +58,26 @@ void f1gp_state::f1gp_cpu1_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x2fffff).rom().region("user1", 0); map(0xa00000, 0xbfffff).rom().region("user2", 0); - map(0xc00000, 0xc3ffff).rw(this, FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); - map(0xd00000, 0xd01fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); - map(0xd02000, 0xd03fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd04000, 0xd05fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd06000, 0xd07fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xc00000, 0xc3ffff).rw(FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); + map(0xd00000, 0xd01fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); + map(0xd02000, 0xd03fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd04000, 0xd05fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd06000, 0xd07fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ map(0xe00000, 0xe03fff).ram().share("spr1cgram"); // SPR-1 CG RAM map(0xe04000, 0xe07fff).ram().share("spr2cgram"); // SPR-2 CG RAM map(0xf00000, 0xf003ff).ram().share("spr1vram"); // SPR-1 VRAM map(0xf10000, 0xf103ff).ram().share("spr2vram"); // SPR-2 VRAM map(0xff8000, 0xffbfff).ram(); // WORK RAM-1 map(0xffc000, 0xffcfff).ram().share("sharedram"); // DUAL RAM - map(0xffd000, 0xffdfff).ram().w(this, FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER + map(0xffd000, 0xffdfff).ram().w(FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // PALETTE map(0xfff000, 0xfff001).portr("INPUTS"); - map(0xfff000, 0xfff001).w(this, FUNC(f1gp_state::f1gp_gfxctrl_w)); + map(0xfff000, 0xfff001).w(FUNC(f1gp_state::f1gp_gfxctrl_w)); map(0xfff002, 0xfff003).portr("WHEEL"); map(0xfff004, 0xfff005).portr("DSW1"); - map(0xfff002, 0xfff005).w(this, FUNC(f1gp_state::f1gp_fgscroll_w)); + map(0xfff002, 0xfff005).w(FUNC(f1gp_state::f1gp_fgscroll_w)); map(0xfff006, 0xfff007).portr("DSW2"); - map(0xfff009, 0xfff009).r(this, FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff009, 0xfff009).r(FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0xfff020, 0xfff023).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff); map(0xfff040, 0xfff05f).w(m_k053936, FUNC(k053936_device::ctrl_w)); map(0xfff050, 0xfff051).portr("DSW3"); @@ -88,20 +88,20 @@ void f1gp_state::f1gp2_cpu1_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x2fffff).rom().region("user1", 0); map(0xa00000, 0xa07fff).ram().share("sprcgram"); // SPR-1 CG RAM + SPR-2 CG RAM - map(0xd00000, 0xd01fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); // BACK VRAM + map(0xd00000, 0xd01fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); // BACK VRAM map(0xe00000, 0xe00fff).ram().share("spritelist"); // not checked + SPR-1 VRAM + SPR-2 VRAM map(0xff8000, 0xffbfff).ram(); // WORK RAM-1 map(0xffc000, 0xffcfff).ram().share("sharedram"); // DUAL RAM - map(0xffd000, 0xffdfff).ram().w(this, FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER + map(0xffd000, 0xffdfff).ram().w(FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // PALETTE - map(0xfff000, 0xfff001).portr("INPUTS").w(this, FUNC(f1gp_state::f1gp2_gfxctrl_w)); + map(0xfff000, 0xfff001).portr("INPUTS").w(FUNC(f1gp_state::f1gp2_gfxctrl_w)); map(0xfff002, 0xfff003).portr("WHEEL"); map(0xfff004, 0xfff005).portr("DSW1"); map(0xfff006, 0xfff007).portr("DSW2"); - map(0xfff009, 0xfff009).r(this, FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff009, 0xfff009).r(FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0xfff00a, 0xfff00b).portr("DSW3"); map(0xfff020, 0xfff03f).w(m_k053936, FUNC(k053936_device::ctrl_w)); - map(0xfff044, 0xfff047).w(this, FUNC(f1gp_state::f1gp_fgscroll_w)); + map(0xfff044, 0xfff047).w(FUNC(f1gp_state::f1gp_fgscroll_w)); } void f1gp_state::f1gp_cpu2_map(address_map &map) @@ -122,8 +122,8 @@ void f1gp_state::sound_map(address_map &map) void f1gp_state::sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp - map(0x0c, 0x0c).w(this, FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp2 + map(0x00, 0x00).w(FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp + map(0x0c, 0x0c).w(FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp2 map(0x14, 0x14).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0x18, 0x1b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } @@ -159,18 +159,18 @@ void f1gp_state::f1gpb_cpu1_map(address_map &map) map(0x100000, 0x2fffff).rom().region("user1", 0); map(0xa00000, 0xbfffff).rom().region("user2", 0); map(0x800000, 0x801fff).ram().share("spriteram"); - map(0xc00000, 0xc3ffff).rw(this, FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); - map(0xd00000, 0xd01fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); - map(0xd02000, 0xd03fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd04000, 0xd05fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd06000, 0xd07fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xc00000, 0xc3ffff).rw(FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); + map(0xd00000, 0xd01fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); + map(0xd02000, 0xd03fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd04000, 0xd05fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd06000, 0xd07fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ map(0xe00000, 0xe03fff).ram(); //unused map(0xe04000, 0xe07fff).ram(); //unused map(0xf00000, 0xf003ff).ram(); //unused map(0xf10000, 0xf103ff).ram(); //unused map(0xff8000, 0xffbfff).ram(); map(0xffc000, 0xffcfff).ram().share("sharedram"); - map(0xffd000, 0xffdfff).ram().w(this, FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); + map(0xffd000, 0xffdfff).ram().w(FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("INPUTS"); map(0xfff002, 0xfff003).portr("WHEEL"); @@ -180,7 +180,7 @@ void f1gp_state::f1gpb_cpu1_map(address_map &map) map(0xfff006, 0xfff007).nopw(); map(0xfff00a, 0xfff00b).ram().share("fgregs"); map(0xfff00f, 0xfff00f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xfff00c, 0xfff00d).w(this, FUNC(f1gp_state::f1gpb_misc_w)); + map(0xfff00c, 0xfff00d).w(FUNC(f1gp_state::f1gpb_misc_w)); map(0xfff010, 0xfff011).nopw(); map(0xfff020, 0xfff023).nopw(); // GGA access map(0xfff050, 0xfff051).portr("DSW3"); diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp index ca558d8ac7b..8e4e2cafb67 100644 --- a/src/mame/drivers/famibox.cpp +++ b/src/mame/drivers/famibox.cpp @@ -377,10 +377,10 @@ void famibox_state::famibox_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(famibox_state::sprite_dma_w)); - map(0x4016, 0x4016).rw(this, FUNC(famibox_state::famibox_IN0_r), FUNC(famibox_state::famibox_IN0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(this, FUNC(famibox_state::famibox_IN1_r)); /* IN1 - input port 2 / PSG second control register */ - map(0x5000, 0x5fff).rw(this, FUNC(famibox_state::famibox_system_r), FUNC(famibox_state::famibox_system_w)); + map(0x4014, 0x4014).w(FUNC(famibox_state::sprite_dma_w)); + map(0x4016, 0x4016).rw(FUNC(famibox_state::famibox_IN0_r), FUNC(famibox_state::famibox_IN0_w)); /* IN0 - input port 1 */ + map(0x4017, 0x4017).r(FUNC(famibox_state::famibox_IN1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x5000, 0x5fff).rw(FUNC(famibox_state::famibox_system_r), FUNC(famibox_state::famibox_system_w)); map(0x6000, 0x7fff).ram(); map(0x8000, 0xbfff).bankr("cpubank1"); map(0xc000, 0xffff).bankr("cpubank2"); diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index 390480ff650..c6ecfe7520f 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -131,11 +131,11 @@ void fantland_state::fantland_map(address_map &map) map(0xa2000, 0xa21ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xa3000, 0xa3001).portr("a3000").w(this, FUNC(fantland_state::fantland_nmi_enable_16_w)); - map(0xa3002, 0xa3003).portr("a3002").w(this, FUNC(fantland_state::fantland_soundlatch_16_w)); + map(0xa3000, 0xa3001).portr("a3000").w(FUNC(fantland_state::fantland_nmi_enable_16_w)); + map(0xa3002, 0xa3003).portr("a3002").w(FUNC(fantland_state::fantland_soundlatch_16_w)); - map(0xa4000, 0xa67ff).rw(this, FUNC(fantland_state::spriteram_16_r), FUNC(fantland_state::spriteram_16_w)).share("spriteram"); - map(0xc0000, 0xcffff).rw(this, FUNC(fantland_state::spriteram2_16_r), FUNC(fantland_state::spriteram2_16_w)).share("spriteram2"); + map(0xa4000, 0xa67ff).rw(FUNC(fantland_state::spriteram_16_r), FUNC(fantland_state::spriteram_16_w)).share("spriteram"); + map(0xc0000, 0xcffff).rw(FUNC(fantland_state::spriteram2_16_r), FUNC(fantland_state::spriteram2_16_w)).share("spriteram2"); map(0xe0000, 0xfffff).rom(); } @@ -152,9 +152,9 @@ void fantland_state::galaxygn_map(address_map &map) map(0x52000, 0x521ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x53000, 0x53000).portr("P1").w(this, FUNC(fantland_state::fantland_nmi_enable_w)); + map(0x53000, 0x53000).portr("P1").w(FUNC(fantland_state::fantland_nmi_enable_w)); map(0x53001, 0x53001).portr("P2"); - map(0x53002, 0x53002).portr("DSW1").w(this, FUNC(fantland_state::fantland_soundlatch_w)); + map(0x53002, 0x53002).portr("DSW1").w(FUNC(fantland_state::fantland_soundlatch_w)); map(0x53003, 0x53003).portr("DSW2"); map(0x54000, 0x567ff).ram().share("spriteram"); @@ -244,8 +244,8 @@ void fantland_state::borntofi_map(address_map &map) map(0x10000, 0x2ffff).rom(); map(0x52000, 0x521ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x53000, 0x53001).rw(this, FUNC(fantland_state::borntofi_inputs_r), FUNC(fantland_state::borntofi_nmi_enable_w)); - map(0x53002, 0x53002).portr("DSW").w(this, FUNC(fantland_state::fantland_soundlatch_w)); + map(0x53000, 0x53001).rw(FUNC(fantland_state::borntofi_inputs_r), FUNC(fantland_state::borntofi_nmi_enable_w)); + map(0x53002, 0x53002).portr("DSW").w(FUNC(fantland_state::fantland_soundlatch_w)); map(0x53003, 0x53003).portr("Controls"); map(0x54000, 0x567ff).ram().share("spriteram"); @@ -275,9 +275,9 @@ void fantland_state::wheelrun_map(address_map &map) map(0x52000, 0x521ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x53000, 0x53000).portr("53000").w(this, FUNC(fantland_state::borntofi_nmi_enable_w)); + map(0x53000, 0x53000).portr("53000").w(FUNC(fantland_state::borntofi_nmi_enable_w)); map(0x53001, 0x53001).portr("53001"); - map(0x53002, 0x53002).portr("53002").w(this, FUNC(fantland_state::fantland_soundlatch_w)); + map(0x53002, 0x53002).portr("53002").w(FUNC(fantland_state::fantland_soundlatch_w)); map(0x53003, 0x53003).portr("53003").nopw(); map(0x54000, 0x567ff).ram().share("spriteram"); @@ -305,7 +305,7 @@ void fantland_state::fantland_sound_iomap(address_map &map) { map(0x0080, 0x0080).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x0100, 0x0101).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x0180, 0x0180).w("dac", FUNC(dac_byte_interface::write)); + map(0x0180, 0x0180).w("dac", FUNC(dac_byte_interface::data_w)); } void fantland_state::galaxygn_sound_iomap(address_map &map) @@ -411,7 +411,7 @@ void fantland_state::borntofi_sound_map(address_map &map) { map(0x00000, 0x003ff).ram(); map(0x04000, 0x04000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x04000, 0x0401f).w(this, FUNC(fantland_state::borntofi_msm5205_w)); + map(0x04000, 0x0401f).w(FUNC(fantland_state::borntofi_msm5205_w)); map(0x08000, 0x0ffff).rom(); map(0xf8000, 0xfffff).rom(); } diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp index ffd311633f6..a245cf167c8 100644 --- a/src/mame/drivers/fanucspmg.cpp +++ b/src/mame/drivers/fanucspmg.cpp @@ -735,12 +735,12 @@ void fanucspmg_state::maincpu_mem(address_map &map) map(0xf001c, 0xf001c).rw(m_usart3, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xf001e, 0xf001e).rw(m_usart3, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xf0020, 0xf0029).rw(m_dmac, FUNC(i8257_device::read), FUNC(i8257_device::write)); - map(0xf0042, 0xf0043).r(this, FUNC(fanucspmg_state::magic_r)); - map(0xf0046, 0xf0046).w(this, FUNC(fanucspmg_state::dma_page_w)); + map(0xf0042, 0xf0043).r(FUNC(fanucspmg_state::magic_r)); + map(0xf0046, 0xf0046).w(FUNC(fanucspmg_state::dma_page_w)); map(0xf0048, 0xf004f).rw(m_pit1, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0xf2000, 0xf2003).rw(m_pic1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0xf8000, 0xf9fff).rw(this, FUNC(fanucspmg_state::shared_r), FUNC(fanucspmg_state::shared_w)); + map(0xf8000, 0xf9fff).rw(FUNC(fanucspmg_state::shared_r), FUNC(fanucspmg_state::shared_w)); map(0xfc000, 0xfffff).rom().region(MAINCPU_TAG, 0); } @@ -823,18 +823,18 @@ void fanucspmg_state::subcpu_mem(address_map &map) { map(0x0000, 0x3fff).rom().region(SUBCPU_TAG, 0); - map(0x4000, 0x45ff).rw(this, FUNC(fanucspmg_state::vram1_r), FUNC(fanucspmg_state::vram1_w)); - map(0x4800, 0x4dff).rw(this, FUNC(fanucspmg_state::vram2_r), FUNC(fanucspmg_state::vram2_w)); + map(0x4000, 0x45ff).rw(FUNC(fanucspmg_state::vram1_r), FUNC(fanucspmg_state::vram1_w)); + map(0x4800, 0x4dff).rw(FUNC(fanucspmg_state::vram2_r), FUNC(fanucspmg_state::vram2_w)); map(0x5000, 0x5000).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x5001, 0x5001).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x5008, 0x5008).w(this, FUNC(fanucspmg_state::keyboard_row_w)); - map(0x5009, 0x5009).r(this, FUNC(fanucspmg_state::keyboard_r)); + map(0x5008, 0x5008).w(FUNC(fanucspmg_state::keyboard_row_w)); + map(0x5009, 0x5009).r(FUNC(fanucspmg_state::keyboard_r)); map(0x500a, 0x500b).nopw(); // keyboard rows 2 and 3 control what's written here. dip switches? - map(0x500c, 0x500c).w(this, FUNC(fanucspmg_state::vbl_ctrl_w)); - map(0x500d, 0x500d).w(this, FUNC(fanucspmg_state::vram_bank_w)); - map(0x500e, 0x500e).r(this, FUNC(fanucspmg_state::vblank_ack_r)); - map(0x5018, 0x5018).w(this, FUNC(fanucspmg_state::video_ctrl_w)); + map(0x500c, 0x500c).w(FUNC(fanucspmg_state::vbl_ctrl_w)); + map(0x500d, 0x500d).w(FUNC(fanucspmg_state::vram_bank_w)); + map(0x500e, 0x500e).r(FUNC(fanucspmg_state::vblank_ack_r)); + map(0x5018, 0x5018).w(FUNC(fanucspmg_state::video_ctrl_w)); map(0xe000, 0xffff).ram().share(SHARED_TAG); // shared RAM } diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp index 7fd738761c4..2ea3e352547 100644 --- a/src/mame/drivers/fastfred.cpp +++ b/src/mame/drivers/fastfred.cpp @@ -194,8 +194,8 @@ void fastfred_state::fastfred_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xd000, 0xd3ff).mirror(0x400).ram().w(this, FUNC(fastfred_state::fastfred_videoram_w)).share("videoram"); - map(0xd800, 0xd83f).ram().w(this, FUNC(fastfred_state::fastfred_attributes_w)).share("attributesram"); + map(0xd000, 0xd3ff).mirror(0x400).ram().w(FUNC(fastfred_state::fastfred_videoram_w)).share("videoram"); + map(0xd800, 0xd83f).ram().w(FUNC(fastfred_state::fastfred_attributes_w)).share("attributesram"); map(0xd840, 0xd85f).ram().share("spriteram"); map(0xd860, 0xdbff).ram(); // Unused, but initialized map(0xe000, 0xe000).portr("BUTTONS").writeonly().share("bgcolor"); @@ -210,10 +210,10 @@ void fastfred_state::jumpcoas_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xd000, 0xd03f).ram().w(this, FUNC(fastfred_state::fastfred_attributes_w)).share("attributesram"); + map(0xd000, 0xd03f).ram().w(FUNC(fastfred_state::fastfred_attributes_w)).share("attributesram"); map(0xd040, 0xd05f).ram().share("spriteram"); map(0xd060, 0xd3ff).ram(); - map(0xd800, 0xdbff).mirror(0x400).ram().w(this, FUNC(fastfred_state::fastfred_videoram_w)).share("videoram"); + map(0xd800, 0xdbff).mirror(0x400).ram().w(FUNC(fastfred_state::fastfred_videoram_w)).share("videoram"); map(0xe000, 0xe000).writeonly().share("bgcolor"); map(0xe800, 0xe800).portr("DSW1"); map(0xe801, 0xe801).portr("DSW2"); @@ -228,14 +228,14 @@ void fastfred_state::jumpcoas_map(address_map &map) void fastfred_state::imago_map(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x1000, 0x1fff).r(this, FUNC(fastfred_state::imago_sprites_offset_r)); + map(0x1000, 0x1fff).r(FUNC(fastfred_state::imago_sprites_offset_r)); map(0x2000, 0x6fff).rom(); map(0xb000, 0xb3ff).ram(); // same fg videoram (which one of the 2 is really used?) - map(0xb800, 0xbfff).ram().w(this, FUNC(fastfred_state::imago_sprites_dma_w)); + map(0xb800, 0xbfff).ram().w(FUNC(fastfred_state::imago_sprites_dma_w)); map(0xc000, 0xc7ff).ram(); - map(0xc800, 0xcbff).ram().w(this, FUNC(fastfred_state::imago_fg_videoram_w)).share("imago_fg_vram"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(fastfred_state::fastfred_videoram_w)).share("videoram"); - map(0xd800, 0xd83f).ram().w(this, FUNC(fastfred_state::fastfred_attributes_w)).share("attributesram"); + map(0xc800, 0xcbff).ram().w(FUNC(fastfred_state::imago_fg_videoram_w)).share("imago_fg_vram"); + map(0xd000, 0xd3ff).ram().w(FUNC(fastfred_state::fastfred_videoram_w)).share("videoram"); + map(0xd800, 0xd83f).ram().w(FUNC(fastfred_state::fastfred_attributes_w)).share("attributesram"); map(0xd840, 0xd85f).ram().share("spriteram"); map(0xd860, 0xd8ff).ram(); // Unused, but initialized map(0xe000, 0xe000).portr("BUTTONS"); @@ -243,7 +243,7 @@ void fastfred_state::imago_map(address_map &map) map(0xf000, 0xf000).portr("DSW"); map(0xf000, 0xf007).mirror(0x03f8).w("outlatch", FUNC(ls259_device::write_d0)); map(0xf400, 0xf400).nopw(); // writes 0 or 2 - map(0xf401, 0xf401).w(this, FUNC(fastfred_state::imago_sprites_bank_w)); + map(0xf401, 0xf401).w(FUNC(fastfred_state::imago_sprites_bank_w)); map(0xf800, 0xf800).nopr().w("soundlatch", FUNC(generic_latch_8_device::write)); } @@ -251,7 +251,7 @@ void fastfred_state::sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x3000, 0x3000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(this, FUNC(fastfred_state::sound_nmi_mask_w)); + map(0x3000, 0x3000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(FUNC(fastfred_state::sound_nmi_mask_w)); map(0x4000, 0x4000).writeonly(); // Reset PSG's map(0x5000, 0x5001).w("ay8910.1", FUNC(ay8910_device::address_data_w)); map(0x6000, 0x6001).w("ay8910.2", FUNC(ay8910_device::address_data_w)); diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp index 7f50948cb66..e9673e9e990 100644 --- a/src/mame/drivers/fastinvaders.cpp +++ b/src/mame/drivers/fastinvaders.cpp @@ -527,18 +527,18 @@ void fastinvaders_state::fastinvaders_6845_io(address_map &map) map(0x20, 0x20).w(m_crtc6845, FUNC(mc6845_device::address_w)); map(0x21, 0x21).rw(m_crtc6845, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x30, 0x33).rw(m_pic8259, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x40, 0x4f).w(this, FUNC(fastinvaders_state::io_40_w)); //ds4 //latch + map(0x40, 0x4f).w(FUNC(fastinvaders_state::io_40_w)); //ds4 //latch //AM_RANGE(0x50, 0x50) AM_READ(io_50_r) //ds5 //latch - map(0x60, 0x60).r(this, FUNC(fastinvaders_state::io_60_r)); - map(0x70, 0x70).w(this, FUNC(fastinvaders_state::io_70_w)); //ds7 rest55,rest65,trap, irq0 clear + map(0x60, 0x60).r(FUNC(fastinvaders_state::io_60_r)); + map(0x70, 0x70).w(FUNC(fastinvaders_state::io_70_w)); //ds7 rest55,rest65,trap, irq0 clear map(0x80, 0x80).noprw(); //ds8 write here a LOT ????? - map(0x90, 0x90).w(this, FUNC(fastinvaders_state::io_90_w)); //ds9 sound command - map(0xa0, 0xa0).w(this, FUNC(fastinvaders_state::io_a0_w)); //ds10 irq1 clear - map(0xb0, 0xb0).w(this, FUNC(fastinvaders_state::io_b0_w)); //ds11 irq2 clear - map(0xc0, 0xc0).w(this, FUNC(fastinvaders_state::io_c0_w)); //ds12 irq3 clear - map(0xd0, 0xd0).w(this, FUNC(fastinvaders_state::io_d0_w)); //ds13 irq5 clear - map(0xe0, 0xe0).w(this, FUNC(fastinvaders_state::io_e0_w)); //ds14 irq4 clear - map(0xf0, 0xf0).w(this, FUNC(fastinvaders_state::io_f0_w)); //ds15 irq6 clear + map(0x90, 0x90).w(FUNC(fastinvaders_state::io_90_w)); //ds9 sound command + map(0xa0, 0xa0).w(FUNC(fastinvaders_state::io_a0_w)); //ds10 irq1 clear + map(0xb0, 0xb0).w(FUNC(fastinvaders_state::io_b0_w)); //ds11 irq2 clear + map(0xc0, 0xc0).w(FUNC(fastinvaders_state::io_c0_w)); //ds12 irq3 clear + map(0xd0, 0xd0).w(FUNC(fastinvaders_state::io_d0_w)); //ds13 irq5 clear + map(0xe0, 0xe0).w(FUNC(fastinvaders_state::io_e0_w)); //ds14 irq4 clear + map(0xf0, 0xf0).w(FUNC(fastinvaders_state::io_f0_w)); //ds15 irq6 clear } @@ -550,19 +550,19 @@ void fastinvaders_state::fastinvaders_8275_io(address_map &map) map(0x10, 0x1f).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)); map(0x30, 0x33).rw(m_pic8259, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x40, 0x4f).w(this, FUNC(fastinvaders_state::io_40_w)); //ds4 //latch + map(0x40, 0x4f).w(FUNC(fastinvaders_state::io_40_w)); //ds4 //latch //AM_RANGE(0x50, 0x50) AM_READ(io_50_r) //ds5 //latch - map(0x60, 0x60).r(this, FUNC(fastinvaders_state::io_60_r)); - map(0x70, 0x70).w(this, FUNC(fastinvaders_state::io_70_w)); //ds7 rest55,rest65,trap, irq0 clear + map(0x60, 0x60).r(FUNC(fastinvaders_state::io_60_r)); + map(0x70, 0x70).w(FUNC(fastinvaders_state::io_70_w)); //ds7 rest55,rest65,trap, irq0 clear map(0x80, 0x80).noprw(); //write here a LOT //AM_RANGE(0x80, 0x80) AM_WRITE(io_80_w) //ds8 ???? - map(0x90, 0x90).w(this, FUNC(fastinvaders_state::io_90_w)); //ds9 sound command - map(0xa0, 0xa0).w(this, FUNC(fastinvaders_state::io_a0_w)); //ds10 irq1 clear - map(0xb0, 0xb0).w(this, FUNC(fastinvaders_state::io_b0_w)); //ds11 irq2 clear - map(0xc0, 0xc0).w(this, FUNC(fastinvaders_state::io_c0_w)); //ds12 irq3 clear - map(0xd0, 0xd0).w(this, FUNC(fastinvaders_state::io_d0_w)); //ds13 irq5 clear - map(0xe0, 0xe0).w(this, FUNC(fastinvaders_state::io_e0_w)); //ds14 irq4 clear - map(0xf0, 0xf0).w(this, FUNC(fastinvaders_state::io_f0_w)); //ds15 irq6 clear + map(0x90, 0x90).w(FUNC(fastinvaders_state::io_90_w)); //ds9 sound command + map(0xa0, 0xa0).w(FUNC(fastinvaders_state::io_a0_w)); //ds10 irq1 clear + map(0xb0, 0xb0).w(FUNC(fastinvaders_state::io_b0_w)); //ds11 irq2 clear + map(0xc0, 0xc0).w(FUNC(fastinvaders_state::io_c0_w)); //ds12 irq3 clear + map(0xd0, 0xd0).w(FUNC(fastinvaders_state::io_d0_w)); //ds13 irq5 clear + map(0xe0, 0xe0).w(FUNC(fastinvaders_state::io_e0_w)); //ds14 irq4 clear + map(0xf0, 0xf0).w(FUNC(fastinvaders_state::io_f0_w)); //ds15 irq6 clear } diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp index 29047e0c1dc..0773eb0d4c6 100644 --- a/src/mame/drivers/fastlane.cpp +++ b/src/mame/drivers/fastlane.cpp @@ -79,7 +79,7 @@ WRITE8_MEMBER(fastlane_state::fastlane_k2_k007232_w) } void fastlane_state::fastlane_map(address_map &map) { - map(0x0000, 0x005f).ram().w(this, FUNC(fastlane_state::k007121_registers_w)).share("k007121_regs"); /* 007121 registers */ + map(0x0000, 0x005f).ram().w(FUNC(fastlane_state::k007121_registers_w)).share("k007121_regs"); /* 007121 registers */ map(0x0800, 0x0800).portr("DSW3"); map(0x0801, 0x0801).portr("P2"); map(0x0802, 0x0802).portr("P1"); @@ -87,14 +87,14 @@ void fastlane_state::fastlane_map(address_map &map) map(0x0900, 0x0900).portr("DSW1"); map(0x0901, 0x0901).portr("DSW2"); map(0x0b00, 0x0b00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0c00, 0x0c00).w(this, FUNC(fastlane_state::fastlane_bankswitch_w)); /* bankswitch control */ - map(0x0d00, 0x0d0d).rw(this, FUNC(fastlane_state::fastlane_k1_k007232_r), FUNC(fastlane_state::fastlane_k1_k007232_w)); /* 007232 registers (chip 1) */ - map(0x0e00, 0x0e0d).rw(this, FUNC(fastlane_state::fastlane_k2_k007232_r), FUNC(fastlane_state::fastlane_k2_k007232_w)); /* 007232 registers (chip 2) */ + map(0x0c00, 0x0c00).w(FUNC(fastlane_state::fastlane_bankswitch_w)); /* bankswitch control */ + map(0x0d00, 0x0d0d).rw(FUNC(fastlane_state::fastlane_k1_k007232_r), FUNC(fastlane_state::fastlane_k1_k007232_w)); /* 007232 registers (chip 1) */ + map(0x0e00, 0x0e0d).rw(FUNC(fastlane_state::fastlane_k2_k007232_r), FUNC(fastlane_state::fastlane_k2_k007232_w)); /* 007232 registers (chip 2) */ map(0x0f00, 0x0f1f).rw("k051733", FUNC(k051733_device::read), FUNC(k051733_device::write)); /* 051733 (protection) */ map(0x1000, 0x17ff).ram().w(m_palette, FUNC(palette_device::write_indirect)).share("palette"); map(0x1800, 0x1fff).ram(); /* Work RAM */ - map(0x2000, 0x27ff).ram().w(this, FUNC(fastlane_state::fastlane_vram1_w)).share("videoram1"); /* Video RAM (chip 1) */ - map(0x2800, 0x2fff).ram().w(this, FUNC(fastlane_state::fastlane_vram2_w)).share("videoram2"); /* Video RAM (chip 2) */ + map(0x2000, 0x27ff).ram().w(FUNC(fastlane_state::fastlane_vram1_w)).share("videoram1"); /* Video RAM (chip 1) */ + map(0x2800, 0x2fff).ram().w(FUNC(fastlane_state::fastlane_vram2_w)).share("videoram2"); /* Video RAM (chip 2) */ map(0x3000, 0x3fff).ram().share("spriteram"); /* Sprite RAM */ map(0x4000, 0x7fff).bankr("bank1"); /* banked ROM */ map(0x8000, 0xffff).rom(); /* ROM */ diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp index 3198f85814d..ea7334cc11f 100644 --- a/src/mame/drivers/fc100.cpp +++ b/src/mame/drivers/fc100.cpp @@ -132,19 +132,19 @@ void fc100_state::fc100_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x0F).r(this, FUNC(fc100_state::port00_r)); + map(0x00, 0x0F).r(FUNC(fc100_state::port00_r)); // AM_RANGE(0x10, 0x10) AM_WRITE(port10_w) // vdg, unknown effects map(0x21, 0x21).w("psg", FUNC(ay8910_device::data_w)); map(0x22, 0x22).r("psg", FUNC(ay8910_device::data_r)); map(0x23, 0x23).w("psg", FUNC(ay8910_device::address_w)); - map(0x31, 0x31).w(this, FUNC(fc100_state::port31_w)); - map(0x33, 0x33).w(this, FUNC(fc100_state::port33_w)); - map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::write)); + map(0x31, 0x31).w(FUNC(fc100_state::port31_w)); + map(0x33, 0x33).w(FUNC(fc100_state::port33_w)); + map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::bus_w)); map(0x42, 0x42).nopw(); // bit 0 could be printer select - map(0x43, 0x43).w(this, FUNC(fc100_state::port43_w)); - map(0x44, 0x44).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0x60, 0x61).w(this, FUNC(fc100_state::port60_w)); - map(0x70, 0x71).w(this, FUNC(fc100_state::port70_w)); + map(0x43, 0x43).w(FUNC(fc100_state::port43_w)); + map(0x44, 0x44).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0x60, 0x61).w(FUNC(fc100_state::port60_w)); + map(0x70, 0x71).w(FUNC(fc100_state::port70_w)); map(0xb0, 0xb0).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xb8, 0xb8).rw(m_uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); } diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index c1eed300943..e0dcb408d73 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -331,8 +331,8 @@ private: void cpu30_state::cpu30_mem(address_map &map) { map.unmap_value_high(); - map(0x00000000, 0x00000007).ram().w(this, FUNC(cpu30_state::bootvect_w)); /* After first write we act as RAM */ - map(0x00000000, 0x00000007).rom().r(this, FUNC(cpu30_state::bootvect_r)); /* ROM mirror just during reset */ + map(0x00000000, 0x00000007).ram().w(FUNC(cpu30_state::bootvect_w)); /* After first write we act as RAM */ + map(0x00000000, 0x00000007).rom().r(FUNC(cpu30_state::bootvect_r)); /* ROM mirror just during reset */ // AM_RANGE (0x00000008, 0x003fffff) AM_RAM /* RAM installed in machine start */ map(0xff000000, 0xff7fffff).rom().region("roms", 0x000000); map(0xff800c00, 0xff800dff).rw(m_pit1, FUNC(pit68230_device::read), FUNC(pit68230_device::write)); @@ -341,10 +341,10 @@ void cpu30_state::cpu30_mem(address_map &map) map(0xff802200, 0xff8023ff).rw("duscc2", FUNC(duscc68562_device::read), FUNC(duscc68562_device::write)); /* Port 3&4 - Dual serial port DUSCC */ map(0xff803000, 0xff8031ff).rw(m_rtc, FUNC(rtc72423_device::read), FUNC(rtc72423_device::write)); // AM_RANGE (0xff803400, 0xff8035ff) AM_DEVREADWRITE8("scsi", mb87033_device, read, write, 0xffffffff) /* TODO: implement MB87344 SCSI device */ - map(0xff803400, 0xff8035ff).rw(this, FUNC(cpu30_state::scsi_r), FUNC(cpu30_state::scsi_w)).umask32(0x000000ff); /* mock driver to log calls to device */ + map(0xff803400, 0xff8035ff).rw(FUNC(cpu30_state::scsi_r), FUNC(cpu30_state::scsi_w)).umask32(0x000000ff); /* mock driver to log calls to device */ // AM_RANGE (0xff803800, 0xff80397f) AM_DEVREADWRITE8("fdc", wd37c65c_device, read, write, 0xffffffff) /* TODO: implement WD3/C65C fdc controller */ - map(0xff803800, 0xff80397f).rw(this, FUNC(cpu30_state::fdc_r), FUNC(cpu30_state::fdc_w)).umask32(0x000000ff); /* mock driver to log calls to device */ - map(0xff803980, 0xff8039ff).r(this, FUNC(cpu30_state::slot1_status_r)).umask32(0x000000ff); + map(0xff803800, 0xff80397f).rw(FUNC(cpu30_state::fdc_r), FUNC(cpu30_state::fdc_w)).umask32(0x000000ff); /* mock driver to log calls to device */ + map(0xff803980, 0xff8039ff).r(FUNC(cpu30_state::slot1_status_r)).umask32(0x000000ff); map(0xffc00000, 0xffcfffff).ram().share("nvram"); /* On-board SRAM with battery backup (nvram) */ map(0xffd00000, 0xffdfffff).rw(m_fga002, FUNC(fga002_device::read), FUNC(fga002_device::write)); /* FGA-002 Force Gate Array */ map(0xffe00000, 0xffefffff).rom().region("roms", 0x800000); diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp index dc22509af7d..d56ae9b5510 100644 --- a/src/mame/drivers/fcombat.cpp +++ b/src/mame/drivers/fcombat.cpp @@ -119,18 +119,18 @@ void fcombat_state::main_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xd000, 0xd7ff).ram().share("videoram"); map(0xd800, 0xd8ff).ram().share("spriteram"); - map(0xe000, 0xe000).r(this, FUNC(fcombat_state::fcombat_port01_r)); + map(0xe000, 0xe000).r(FUNC(fcombat_state::fcombat_port01_r)); map(0xe100, 0xe100).portr("DSW0"); map(0xe200, 0xe200).portr("DSW1"); - map(0xe300, 0xe300).r(this, FUNC(fcombat_state::e300_r)); - map(0xe400, 0xe400).r(this, FUNC(fcombat_state::fcombat_protection_r)); // protection? - map(0xe800, 0xe800).w(this, FUNC(fcombat_state::fcombat_videoreg_w)); // at least bit 0 for flip screen and joystick input multiplexor - map(0xe900, 0xe900).w(this, FUNC(fcombat_state::e900_w)); - map(0xea00, 0xea00).w(this, FUNC(fcombat_state::ea00_w)); - map(0xeb00, 0xeb00).w(this, FUNC(fcombat_state::eb00_w)); - map(0xec00, 0xec00).w(this, FUNC(fcombat_state::ec00_w)); - map(0xed00, 0xed00).w(this, FUNC(fcombat_state::ed00_w)); - map(0xee00, 0xee00).w(this, FUNC(fcombat_state::ee00_w)); // related to protection ? - doesn't seem to have any effect + map(0xe300, 0xe300).r(FUNC(fcombat_state::e300_r)); + map(0xe400, 0xe400).r(FUNC(fcombat_state::fcombat_protection_r)); // protection? + map(0xe800, 0xe800).w(FUNC(fcombat_state::fcombat_videoreg_w)); // at least bit 0 for flip screen and joystick input multiplexor + map(0xe900, 0xe900).w(FUNC(fcombat_state::e900_w)); + map(0xea00, 0xea00).w(FUNC(fcombat_state::ea00_w)); + map(0xeb00, 0xeb00).w(FUNC(fcombat_state::eb00_w)); + map(0xec00, 0xec00).w(FUNC(fcombat_state::ec00_w)); + map(0xed00, 0xed00).w(FUNC(fcombat_state::ed00_w)); + map(0xee00, 0xee00).w(FUNC(fcombat_state::ee00_w)); // related to protection ? - doesn't seem to have any effect map(0xef00, 0xef00).w("soundlatch", FUNC(generic_latch_8_device::write)); } diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index 915942b4a80..de39b461942 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -671,15 +671,15 @@ void cps_state::knightsb_map(address_map &map) map(0x800000, 0x800001).portr("IN1"); /* Player input ports */ map(0x800002, 0x800003).portr("IN2"); /* Player 3 controls */ map(0x800004, 0x800005).nopw(); // writes 0000 here - map(0x800006, 0x800007).w(this, FUNC(cps_state::fcrash_soundlatch_w)); /* Sound command */ - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x800006, 0x800007).w(FUNC(cps_state::fcrash_soundlatch_w)); /* Sound command */ + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ map(0x800030, 0x800037).nopw(); //AM_WRITE(cps1_coinctrl_w) only writes bit 15 map(0x800100, 0x80013f).ram().share("cps_a_regs"); /* CPS-A custom */ map(0x800140, 0x80017f).ram().share("cps_b_regs"); /* CPS-B custom */ map(0x800180, 0x800181).nopw(); //AM_WRITE(cps1_soundlatch2_w) /* Sound timer fade */ map(0x880000, 0x880001).nopw(); // unknown - map(0x900000, 0x93ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); - map(0x980000, 0x98002f).w(this, FUNC(cps_state::knightsb_layer_w)); + map(0x900000, 0x93ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x980000, 0x98002f).w(FUNC(cps_state::knightsb_layer_w)); map(0x990000, 0x990001).nopw(); // same as 880000 map(0xff0000, 0xffffff).ram(); } @@ -688,18 +688,18 @@ void cps_state::dinopic_map(address_map &map) { map(0x000000, 0x3fffff).rom(); map(0x800000, 0x800007).portr("IN1"); /* Player input ports */ - map(0x800006, 0x800007).w(this, FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); - map(0x800222, 0x800223).w(this, FUNC(cps_state::dinopic_layer2_w)); + map(0x800006, 0x800007).w(FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); + map(0x800222, 0x800223).w(FUNC(cps_state::dinopic_layer2_w)); map(0x880000, 0x880001).nopw(); // always 0 - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); - map(0x980000, 0x98000b).w(this, FUNC(cps_state::dinopic_layer_w)); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x980000, 0x98000b).w(FUNC(cps_state::dinopic_layer_w)); map(0xf18000, 0xf19fff).ram(); map(0xf1c000, 0xf1c001).portr("IN2"); /* Player 3 controls (later games) */ - map(0xf1c004, 0xf1c005).w(this, FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ + map(0xf1c004, 0xf1c005).w(FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ map(0xf1c006, 0xf1c007).portr("EEPROMIN").portw("EEPROMOUT"); map(0xff0000, 0xffffff).ram(); } @@ -707,14 +707,14 @@ void cps_state::dinopic_map(address_map &map) void cps_state::fcrash_map(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x800030, 0x800031).w(this, FUNC(cps_state::cps1_coinctrl_w)); + map(0x800030, 0x800031).w(FUNC(cps_state::cps1_coinctrl_w)); map(0x800100, 0x80013f).ram().share("cps_a_regs"); /* CPS-A custom */ map(0x800140, 0x80017f).ram().share("cps_b_regs"); /* CPS-B custom */ map(0x880000, 0x880001).portr("IN1"); /* Player input ports */ - map(0x880006, 0x880007).w(this, FUNC(cps_state::fcrash_soundlatch_w)); /* Sound command */ - map(0x880008, 0x88000f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x880006, 0x880007).w(FUNC(cps_state::fcrash_soundlatch_w)); /* Sound command */ + map(0x880008, 0x88000f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ map(0x890000, 0x890001).nopw(); // palette related? - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); map(0xff0000, 0xffffff).ram(); } @@ -722,14 +722,14 @@ void cps_state::punipic_map(address_map &map) { map(0x000000, 0x3fffff).rom(); map(0x800000, 0x800007).portr("IN1"); /* Player input ports */ - map(0x800006, 0x800007).w(this, FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); + map(0x800006, 0x800007).w(FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); map(0x880000, 0x880001).nopw(); // same as 98000C - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); - map(0x980000, 0x98000f).w(this, FUNC(cps_state::punipic_layer_w)); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x980000, 0x98000f).w(FUNC(cps_state::punipic_layer_w)); map(0x990000, 0x990001).nopw(); // unknown map(0x991000, 0x991017).nopw(); // unknown map(0xf18000, 0xf19fff).ram(); @@ -741,16 +741,16 @@ void cps_state::sf2m1_map(address_map &map) { map(0x000000, 0x3fffff).rom(); map(0x800000, 0x800007).portr("IN1"); /* Player input ports */ - map(0x800006, 0x800007).w(this, FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ - map(0x800012, 0x800013).r(this, FUNC(cps_state::cps1_in2_r)); /* Buttons 4,5,6 for both players */ - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); + map(0x800006, 0x800007).w(FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */ + map(0x800012, 0x800013).r(FUNC(cps_state::cps1_in2_r)); /* Buttons 4,5,6 for both players */ + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); map(0x800180, 0x800181).nopw(); // only once at boot, for 80010c - map(0x800188, 0x80018f).w(this, FUNC(cps_state::cps1_soundlatch2_w)); /* Sound timer fade */ + map(0x800188, 0x80018f).w(FUNC(cps_state::cps1_soundlatch2_w)); /* Sound timer fade */ map(0x880000, 0x880001).nopw(); // unknown - map(0x900000, 0x93ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); - map(0x980000, 0x9801ff).w(this, FUNC(cps_state::sf2m1_layer_w)); + map(0x900000, 0x93ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x980000, 0x9801ff).w(FUNC(cps_state::sf2m1_layer_w)); map(0x990000, 0x990001).nopw(); // same as 880000 map(0xff0000, 0xffffff).ram(); } @@ -758,48 +758,48 @@ void cps_state::sf2m1_map(address_map &map) void cps_state::sf2mdt_map(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x708100, 0x7081ff).w(this, FUNC(cps_state::sf2mdta_layer_w)); + map(0x708100, 0x7081ff).w(FUNC(cps_state::sf2mdta_layer_w)); map(0x70c000, 0x70c001).portr("IN1"); map(0x70c008, 0x70c009).portr("IN2"); - map(0x70c018, 0x70c01f).r(this, FUNC(cps_state::cps1_hack_dsw_r)); - map(0x70c106, 0x70c107).w(this, FUNC(cps_state::cawingbl_soundlatch_w)); + map(0x70c018, 0x70c01f).r(FUNC(cps_state::cps1_hack_dsw_r)); + map(0x70c106, 0x70c107).w(FUNC(cps_state::cawingbl_soundlatch_w)); map(0x70d000, 0x70d001).nopw(); // writes FFFF //AM_RANGE(0x800030, 0x800031) AM_WRITE(cps1_coinctrl_w) map(0x800100, 0x80013f).ram().share("cps_a_regs"); /* CPS-A custom */ map(0x800140, 0x80017f).ram().share("cps_b_regs"); /* CPS-B custom */ - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); map(0xff0000, 0xffffff).ram(); } void cps_state::sf2b_map(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x708100, 0x7081ff).w(this, FUNC(cps_state::sf2mdta_layer_w)); + map(0x708100, 0x7081ff).w(FUNC(cps_state::sf2mdta_layer_w)); map(0x70c000, 0x70c001).portr("IN1"); map(0x70c008, 0x70c009).portr("IN2"); - map(0x70c018, 0x70c01f).r(this, FUNC(cps_state::cps1_hack_dsw_r)); - map(0x70c106, 0x70c107).w(this, FUNC(cps_state::cawingbl_soundlatch_w)); + map(0x70c018, 0x70c01f).r(FUNC(cps_state::cps1_hack_dsw_r)); + map(0x70c106, 0x70c107).w(FUNC(cps_state::cawingbl_soundlatch_w)); map(0x70d000, 0x70d001).nopw(); // writes FFFF //AM_RANGE(0x800030, 0x800031) AM_WRITE(cps1_coinctrl_w) map(0x800100, 0x80013f).ram().share("cps_a_regs"); /* CPS-A custom */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); /* CPS-B custom */ - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); /* CPS-B custom */ + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); map(0xff0000, 0xffffff).ram(); } void cps_state::sgyxz_map(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x800030, 0x800031).w(this, FUNC(cps_state::cps1_coinctrl_w)); + map(0x800030, 0x800031).w(FUNC(cps_state::cps1_coinctrl_w)); map(0x800100, 0x80013f).ram().share("cps_a_regs"); /* CPS-A custom */ map(0x800140, 0x80017f).ram().share("cps_b_regs"); /* CPS-B custom */ map(0x880000, 0x880001).portr("IN1"); /* Player input ports */ - map(0x880006, 0x88000d).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ - map(0x88000e, 0x88000f).w(this, FUNC(cps_state::cps1_soundlatch_w)); - map(0x880e78, 0x880e79).r(this, FUNC(cps_state::cps1_in2_r)); /* Player 3 controls (later games) */ - map(0x890000, 0x890001).w(this, FUNC(cps_state::cps1_soundlatch2_w)); - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); - map(0xf1c004, 0xf1c005).w(this, FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ + map(0x880006, 0x88000d).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x88000e, 0x88000f).w(FUNC(cps_state::cps1_soundlatch_w)); + map(0x880e78, 0x880e79).r(FUNC(cps_state::cps1_in2_r)); /* Player 3 controls (later games) */ + map(0x890000, 0x890001).w(FUNC(cps_state::cps1_soundlatch2_w)); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0xf1c004, 0xf1c005).w(FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ map(0xf1c006, 0xf1c007).portr("EEPROMIN").portw("EEPROMOUT"); map(0xff0000, 0xffffff).ram(); } @@ -807,16 +807,16 @@ void cps_state::sgyxz_map(address_map &map) void cps_state::wofabl_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0x800030, 0x800031).w(this, FUNC(cps_state::cps1_coinctrl_w)); + map(0x800030, 0x800031).w(FUNC(cps_state::cps1_coinctrl_w)); map(0x800100, 0x80013f).ram().share("cps_a_regs"); /* CPS-A custom */ map(0x800140, 0x80017f).ram().share("cps_b_regs"); /* CPS-B custom */ map(0x880000, 0x880001).portr("IN1"); /* Player input ports */ - map(0x880006, 0x880007).w(this, FUNC(cps_state::cps1_soundlatch_w)); - map(0x880008, 0x88000f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ - map(0x880e78, 0x880e79).r(this, FUNC(cps_state::cps1_in2_r)); /* Player 3 controls (later games) */ - map(0x890000, 0x890001).w(this, FUNC(cps_state::cps1_soundlatch2_w)); - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); - map(0xf1c004, 0xf1c005).w(this, FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ + map(0x880006, 0x880007).w(FUNC(cps_state::cps1_soundlatch_w)); + map(0x880008, 0x88000f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x880e78, 0x880e79).r(FUNC(cps_state::cps1_in2_r)); /* Player 3 controls (later games) */ + map(0x890000, 0x890001).w(FUNC(cps_state::cps1_soundlatch2_w)); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0xf1c004, 0xf1c005).w(FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ map(0xf1c006, 0xf1c007).portr("EEPROMIN").portw("EEPROMOUT"); map(0xff0000, 0xffffff).ram(); } @@ -826,17 +826,17 @@ void cps_state::slampic_map(address_map &map) map(0x000000, 0x3fffff).rom(); map(0x800006, 0x800007).nopw(); //AM_WRITE(cps1_soundlatch2_w) map(0x800000, 0x800007).portr("IN1"); /* Player input ports */ - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); /* System input ports / Dip Switches */ + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); /* CPS-A custom */ + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); map(0x880000, 0x880001).nopw(); //AM_WRITE(cps1_soundlatch_w) /* Sound command */ - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); - map(0x980000, 0x98000d).w(this, FUNC(cps_state::slampic_layer_w)); - map(0xf00000, 0xf0ffff).r(this, FUNC(cps_state::qsound_rom_r)); /* Slammasters protection */ + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x980000, 0x98000d).w(FUNC(cps_state::slampic_layer_w)); + map(0xf00000, 0xf0ffff).r(FUNC(cps_state::qsound_rom_r)); /* Slammasters protection */ map(0xf18000, 0xf19fff).ram(); map(0xf1c000, 0xf1c001).portr("IN2"); /* Player 3 controls (later games) */ - map(0xf1c004, 0xf1c005).w(this, FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ + map(0xf1c004, 0xf1c005).w(FUNC(cps_state::cpsq_coinctrl2_w)); /* Coin control2 (later games) */ map(0xf1c006, 0xf1c007).portr("EEPROMIN").portw("EEPROMOUT"); map(0xf1f000, 0xf1ffff).noprw(); // writes 0 to range, then reads F1F6EC map(0xff0000, 0xffffff).ram(); @@ -849,10 +849,10 @@ void cps_state::sound_map(address_map &map) map(0xd000, 0xd7ff).ram(); map(0xd800, 0xd801).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xdc00, 0xdc01).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0xe000, 0xe000).w(this, FUNC(cps_state::fcrash_snd_bankswitch_w)); + map(0xe000, 0xe000).w(FUNC(cps_state::fcrash_snd_bankswitch_w)); map(0xe400, 0xe400).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe800, 0xe800).w(this, FUNC(cps_state::fcrash_msm5205_0_data_w)); - map(0xec00, 0xec00).w(this, FUNC(cps_state::fcrash_msm5205_1_data_w)); + map(0xe800, 0xe800).w(FUNC(cps_state::fcrash_msm5205_0_data_w)); + map(0xec00, 0xec00).w(FUNC(cps_state::fcrash_msm5205_1_data_w)); } void cps_state::kodb_sound_map(address_map &map) @@ -872,9 +872,9 @@ void cps_state::sf2mdt_z80map(address_map &map) map(0xd000, 0xd7ff).ram(); map(0xd800, 0xd801).rw("2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xdc00, 0xdc00).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe000, 0xe000).w(this, FUNC(cps_state::sf2mdt_snd_bankswitch_w)); - map(0xe400, 0xe400).w(this, FUNC(cps_state::fcrash_msm5205_0_data_w)); - map(0xe800, 0xe800).w(this, FUNC(cps_state::fcrash_msm5205_1_data_w)); + map(0xe000, 0xe000).w(FUNC(cps_state::sf2mdt_snd_bankswitch_w)); + map(0xe400, 0xe400).w(FUNC(cps_state::fcrash_msm5205_0_data_w)); + map(0xe800, 0xe800).w(FUNC(cps_state::fcrash_msm5205_1_data_w)); } void cps_state::knightsb_z80map(address_map &map) @@ -885,9 +885,9 @@ void cps_state::knightsb_z80map(address_map &map) map(0xd000, 0xd7ff).ram(); map(0xd800, 0xd801).rw("2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xdc00, 0xdc00).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe000, 0xe000).w(this, FUNC(cps_state::knightsb_snd_bankswitch_w)); - map(0xe400, 0xe400).w(this, FUNC(cps_state::fcrash_msm5205_0_data_w)); - map(0xe800, 0xe800).w(this, FUNC(cps_state::fcrash_msm5205_1_data_w)); + map(0xe000, 0xe000).w(FUNC(cps_state::knightsb_snd_bankswitch_w)); + map(0xe400, 0xe400).w(FUNC(cps_state::fcrash_msm5205_0_data_w)); + map(0xe800, 0xe800).w(FUNC(cps_state::fcrash_msm5205_1_data_w)); } void cps_state::sgyxz_sound_map(address_map &map) @@ -897,8 +897,8 @@ void cps_state::sgyxz_sound_map(address_map &map) map(0xd000, 0xd7ff).ram(); map(0xf000, 0xf001).rw("2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xf002, 0xf002).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xf004, 0xf004).w(this, FUNC(cps_state::cps1_snd_bankswitch_w)); - map(0xf006, 0xf006).w(this, FUNC(cps_state::cps1_oki_pin7_w)); /* controls pin 7 of OKI chip */ + map(0xf004, 0xf004).w(FUNC(cps_state::cps1_snd_bankswitch_w)); + map(0xf006, 0xf006).w(FUNC(cps_state::cps1_oki_pin7_w)); /* controls pin 7 of OKI chip */ map(0xf008, 0xf008).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* Sound command */ map(0xf00a, 0xf00a).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); /* Sound timer fade */ } @@ -3096,14 +3096,14 @@ void cps_state::varthb_map(address_map &map) { map(0x000000, 0x1fffff).rom(); map(0x800000, 0x800001).portr("IN1"); - map(0x800006, 0x800007).w(this, FUNC(cps_state::cps1_soundlatch_w)); - map(0x800018, 0x80001f).r(this, FUNC(cps_state::cps1_dsw_r)); - map(0x800030, 0x800037).w(this, FUNC(cps_state::cps1_coinctrl_w)); - map(0x800100, 0x80013f).w(this, FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); - map(0x800140, 0x80017f).rw(this, FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); - map(0x800188, 0x800189).w(this, FUNC(cps_state::varthb_layer_w)); - map(0x980000, 0x98000b).w(this, FUNC(cps_state::dinopic_layer_w)); - map(0x900000, 0x92ffff).ram().w(this, FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); + map(0x800006, 0x800007).w(FUNC(cps_state::cps1_soundlatch_w)); + map(0x800018, 0x80001f).r(FUNC(cps_state::cps1_dsw_r)); + map(0x800030, 0x800037).w(FUNC(cps_state::cps1_coinctrl_w)); + map(0x800100, 0x80013f).w(FUNC(cps_state::cps1_cps_a_w)).share("cps_a_regs"); + map(0x800140, 0x80017f).rw(FUNC(cps_state::cps1_cps_b_r), FUNC(cps_state::cps1_cps_b_w)).share("cps_b_regs"); + map(0x800188, 0x800189).w(FUNC(cps_state::varthb_layer_w)); + map(0x980000, 0x98000b).w(FUNC(cps_state::dinopic_layer_w)); + map(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram"); map(0xff0000, 0xffffff).ram().share("mainram"); } diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp index ae4861309e2..a6cb737a775 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/src/mame/drivers/feversoc.cpp @@ -202,10 +202,10 @@ void feversoc_state::feversoc_map(address_map &map) map(0x02030000, 0x0203ffff).ram().share("nvram"); map(0x02034000, 0x0203dfff).ram().share("workram2"); //work ram map(0x0203e000, 0x0203ffff).ram().share("spriteram"); - map(0x06000000, 0x06000001).w(this, FUNC(feversoc_state::output_w)); - map(0x06000002, 0x06000003).w(this, FUNC(feversoc_state::output2_w)); - map(0x06000006, 0x06000007).w(this, FUNC(feversoc_state::feversoc_irq_ack)); - map(0x06000008, 0x0600000b).r(this, FUNC(feversoc_state::in_r)); + map(0x06000000, 0x06000001).w(FUNC(feversoc_state::output_w)); + map(0x06000002, 0x06000003).w(FUNC(feversoc_state::output2_w)); + map(0x06000006, 0x06000007).w(FUNC(feversoc_state::feversoc_irq_ack)); + map(0x06000008, 0x0600000b).r(FUNC(feversoc_state::in_r)); map(0x0600000d, 0x0600000d).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); //AM_RANGE(0x06010000, 0x0601007f) AM_DEVREADWRITE("obj", seibu_encrypted_sprite_device, read, write) AM_RAM map(0x06010060, 0x06010063).nopw(); // sprite buffering diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp index a86b5e0904b..134efc3cd08 100644 --- a/src/mame/drivers/fgoal.cpp +++ b/src/mame/drivers/fgoal.cpp @@ -212,31 +212,31 @@ void fgoal_state::cpu_map(address_map &map) map(0x0000, 0x00ef).ram(); - map(0x00f0, 0x00f0).r(this, FUNC(fgoal_state::row_r)); - map(0x00f1, 0x00f1).r(this, FUNC(fgoal_state::analog_r)); + map(0x00f0, 0x00f0).r(FUNC(fgoal_state::row_r)); + map(0x00f1, 0x00f1).r(FUNC(fgoal_state::analog_r)); map(0x00f2, 0x00f2).portr("IN0"); map(0x00f3, 0x00f3).portr("IN1"); - map(0x00f4, 0x00f4).r(this, FUNC(fgoal_state::address_hi_r)); - map(0x00f5, 0x00f5).r(this, FUNC(fgoal_state::address_lo_r)); - map(0x00f6, 0x00f6).r(this, FUNC(fgoal_state::shifter_r)); - map(0x00f7, 0x00f7).r(this, FUNC(fgoal_state::shifter_reverse_r)); - map(0x00f8, 0x00fb).r(this, FUNC(fgoal_state::nmi_reset_r)); - map(0x00fc, 0x00ff).r(this, FUNC(fgoal_state::irq_reset_r)); - - map(0x00f0, 0x00f0).w(this, FUNC(fgoal_state::row_w)); - map(0x00f1, 0x00f1).w(this, FUNC(fgoal_state::col_w)); - map(0x00f2, 0x00f2).w(this, FUNC(fgoal_state::row_w)); - map(0x00f3, 0x00f3).w(this, FUNC(fgoal_state::col_w)); + map(0x00f4, 0x00f4).r(FUNC(fgoal_state::address_hi_r)); + map(0x00f5, 0x00f5).r(FUNC(fgoal_state::address_lo_r)); + map(0x00f6, 0x00f6).r(FUNC(fgoal_state::shifter_r)); + map(0x00f7, 0x00f7).r(FUNC(fgoal_state::shifter_reverse_r)); + map(0x00f8, 0x00fb).r(FUNC(fgoal_state::nmi_reset_r)); + map(0x00fc, 0x00ff).r(FUNC(fgoal_state::irq_reset_r)); + + map(0x00f0, 0x00f0).w(FUNC(fgoal_state::row_w)); + map(0x00f1, 0x00f1).w(FUNC(fgoal_state::col_w)); + map(0x00f2, 0x00f2).w(FUNC(fgoal_state::row_w)); + map(0x00f3, 0x00f3).w(FUNC(fgoal_state::col_w)); map(0x00f4, 0x00f7).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x00f8, 0x00fb).w(this, FUNC(fgoal_state::sound1_w)); - map(0x00fc, 0x00ff).w(this, FUNC(fgoal_state::sound2_w)); + map(0x00f8, 0x00fb).w(FUNC(fgoal_state::sound1_w)); + map(0x00fc, 0x00ff).w(FUNC(fgoal_state::sound2_w)); map(0x0100, 0x03ff).ram(); map(0x4000, 0x7fff).ram().share("video_ram"); - map(0x8000, 0x8000).w(this, FUNC(fgoal_state::ypos_w)); - map(0x8001, 0x8001).w(this, FUNC(fgoal_state::xpos_w)); - map(0x8002, 0x8002).w(this, FUNC(fgoal_state::color_w)); + map(0x8000, 0x8000).w(FUNC(fgoal_state::ypos_w)); + map(0x8001, 0x8001).w(FUNC(fgoal_state::xpos_w)); + map(0x8002, 0x8002).w(FUNC(fgoal_state::color_w)); map(0xa000, 0xbfff).rom(); map(0xd000, 0xffff).rom(); diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index f816d4942f6..948b0b4d2f5 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -1259,11 +1259,11 @@ void fidel6502_state::eas_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0fff).ram().share("nvram"); - map(0x2000, 0x5fff).r(this, FUNC(fidel6502_state::cartridge_r)); + map(0x2000, 0x5fff).r(FUNC(fidel6502_state::cartridge_r)); map(0x7000, 0x7003).rw(m_ppi8255, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x7020, 0x7027).w(this, FUNC(fidel6502_state::eas_segment_w)).nopr(); - map(0x7030, 0x7037).w(this, FUNC(fidel6502_state::eas_led_w)).nopr(); - map(0x7050, 0x7050).r(this, FUNC(fidel6502_state::eas_input_r)); + map(0x7020, 0x7027).w(FUNC(fidel6502_state::eas_segment_w)).nopr(); + map(0x7030, 0x7037).w(FUNC(fidel6502_state::eas_led_w)).nopr(); + map(0x7050, 0x7050).r(FUNC(fidel6502_state::eas_input_r)); map(0x8000, 0x9fff).rom(); map(0xc000, 0xffff).rom(); } @@ -1272,11 +1272,11 @@ void fidel6502_state::eag_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x1fff).ram().share("nvram"); - map(0x2000, 0x5fff).r(this, FUNC(fidel6502_state::cartridge_r)); + map(0x2000, 0x5fff).r(FUNC(fidel6502_state::cartridge_r)); map(0x7000, 0x7003).rw(m_ppi8255, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x7020, 0x7027).w(this, FUNC(fidel6502_state::eas_segment_w)).nopr(); - map(0x7030, 0x7037).w(this, FUNC(fidel6502_state::eas_led_w)).nopr(); - map(0x7050, 0x7050).r(this, FUNC(fidel6502_state::eas_input_r)); + map(0x7020, 0x7027).w(FUNC(fidel6502_state::eas_segment_w)).nopr(); + map(0x7030, 0x7037).w(FUNC(fidel6502_state::eas_led_w)).nopr(); + map(0x7050, 0x7050).r(FUNC(fidel6502_state::eas_input_r)); map(0x8000, 0x9fff).ram(); map(0xa000, 0xbfff).bankr("rombank"); map(0xc000, 0xffff).rom(); @@ -1286,13 +1286,13 @@ void fidel6502_state::pc_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x1fff).ram(); - map(0x2000, 0x5fff).r(this, FUNC(fidel6502_state::cartridge_r)); - map(0x7000, 0x7000).w(this, FUNC(fidel6502_state::eas_ppi_porta_w)); - map(0x7010, 0x7010).r(this, FUNC(fidel6502_state::eas_ppi_portb_r)); - map(0x7020, 0x7027).w(this, FUNC(fidel6502_state::eas_segment_w)).nopr(); - map(0x7030, 0x7037).w(this, FUNC(fidel6502_state::eas_led_w)).nopr(); - map(0x7040, 0x7040).w(this, FUNC(fidel6502_state::eas_ppi_portc_w)); - map(0x7050, 0x7050).r(this, FUNC(fidel6502_state::eas_input_r)); + map(0x2000, 0x5fff).r(FUNC(fidel6502_state::cartridge_r)); + map(0x7000, 0x7000).w(FUNC(fidel6502_state::eas_ppi_porta_w)); + map(0x7010, 0x7010).r(FUNC(fidel6502_state::eas_ppi_portb_r)); + map(0x7020, 0x7027).w(FUNC(fidel6502_state::eas_segment_w)).nopr(); + map(0x7030, 0x7037).w(FUNC(fidel6502_state::eas_led_w)).nopr(); + map(0x7040, 0x7040).w(FUNC(fidel6502_state::eas_ppi_portc_w)); + map(0x7050, 0x7050).r(FUNC(fidel6502_state::eas_input_r)); map(0x8000, 0x9fff).ram(); map(0xb000, 0xffff).rom(); } @@ -1304,17 +1304,17 @@ void fidel6502_state::sc9_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x07ff).mirror(0x1800).ram(); - map(0x2000, 0x5fff).r(this, FUNC(fidel6502_state::cartridge_r)); - map(0x6000, 0x6000).mirror(0x1fff).w(this, FUNC(fidel6502_state::sc9_control_w)); - map(0x8000, 0x8007).mirror(0x1ff8).w(this, FUNC(fidel6502_state::sc9_led_w)).nopr(); - map(0xa000, 0xa000).mirror(0x1fff).r(this, FUNC(fidel6502_state::sc9_input_r)); + map(0x2000, 0x5fff).r(FUNC(fidel6502_state::cartridge_r)); + map(0x6000, 0x6000).mirror(0x1fff).w(FUNC(fidel6502_state::sc9_control_w)); + map(0x8000, 0x8007).mirror(0x1ff8).w(FUNC(fidel6502_state::sc9_led_w)).nopr(); + map(0xa000, 0xa000).mirror(0x1fff).r(FUNC(fidel6502_state::sc9_input_r)); map(0xc000, 0xffff).rom(); } void fidel6502_state::sc9d_map(address_map &map) { sc9_map(map); - map(0xa000, 0xa007).mirror(0x1ff8).r(this, FUNC(fidel6502_state::sc9d_input_r)); + map(0xa000, 0xa007).mirror(0x1ff8).r(FUNC(fidel6502_state::sc9d_input_r)); } @@ -1322,17 +1322,17 @@ void fidel6502_state::sc9d_map(address_map &map) void fidel6502_state::sc12_trampoline(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(fidel6502_state::sc12_trampoline_r), FUNC(fidel6502_state::sc12_trampoline_w)); + map(0x0000, 0xffff).rw(FUNC(fidel6502_state::sc12_trampoline_r), FUNC(fidel6502_state::sc12_trampoline_w)); } void fidel6502_state::sc12_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0fff).ram(); - map(0x2000, 0x5fff).r(this, FUNC(fidel6502_state::cartridge_r)); - map(0x6000, 0x6000).mirror(0x1fff).w(this, FUNC(fidel6502_state::sc12_control_w)); + map(0x2000, 0x5fff).r(FUNC(fidel6502_state::cartridge_r)); + map(0x6000, 0x6000).mirror(0x1fff).w(FUNC(fidel6502_state::sc12_control_w)); map(0x8000, 0x9fff).rom(); - map(0xa000, 0xa007).mirror(0x1ff8).r(this, FUNC(fidel6502_state::sc12_input_r)); + map(0xa000, 0xa007).mirror(0x1ff8).r(FUNC(fidel6502_state::sc12_input_r)); map(0xc000, 0xcfff).mirror(0x1000).rom(); map(0xe000, 0xffff).rom(); } @@ -1341,11 +1341,11 @@ void fidel6502_state::as12_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0fff).ram(); - map(0x1800, 0x1807).w(this, FUNC(fidel6502_state::as12_led_w)).nopr(); - map(0x2000, 0x5fff).r(this, FUNC(fidel6502_state::cartridge_r)); - map(0x6000, 0x6000).mirror(0x1fff).w(this, FUNC(fidel6502_state::as12_control_w)); + map(0x1800, 0x1807).w(FUNC(fidel6502_state::as12_led_w)).nopr(); + map(0x2000, 0x5fff).r(FUNC(fidel6502_state::cartridge_r)); + map(0x6000, 0x6000).mirror(0x1fff).w(FUNC(fidel6502_state::as12_control_w)); map(0x8000, 0x9fff).rom(); - map(0xa000, 0xa007).mirror(0x1ff8).r(this, FUNC(fidel6502_state::as12_input_r)); + map(0xa000, 0xa007).mirror(0x1ff8).r(FUNC(fidel6502_state::as12_input_r)); map(0xc000, 0xffff).rom(); } @@ -1355,7 +1355,7 @@ void fidel6502_state::as12_map(address_map &map) void fidel6502_state::fexcel_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x3800).ram(); - map(0x4000, 0x4007).mirror(0x3ff8).rw(this, FUNC(fidel6502_state::fexcel_ttl_r), FUNC(fidel6502_state::fexcel_ttl_w)); + map(0x4000, 0x4007).mirror(0x3ff8).rw(FUNC(fidel6502_state::fexcel_ttl_r), FUNC(fidel6502_state::fexcel_ttl_w)); //map(0x8000, 0x8000).nopr(); // checks for opening book module, but hw doesn't have a module slot map(0xc000, 0xffff).rom(); } @@ -1363,14 +1363,14 @@ void fidel6502_state::fexcel_map(address_map &map) void fidel6502_state::fexcelp_map(address_map &map) { map(0x0000, 0x1fff).mirror(0x2000).ram(); - map(0x4000, 0x4007).mirror(0x3ff8).rw(this, FUNC(fidel6502_state::fexcel_ttl_r), FUNC(fidel6502_state::fexcel_ttl_w)); + map(0x4000, 0x4007).mirror(0x3ff8).rw(FUNC(fidel6502_state::fexcel_ttl_r), FUNC(fidel6502_state::fexcel_ttl_w)); map(0x8000, 0xffff).rom(); } void fidel6502_state::fexcelb_map(address_map &map) { map(0x0000, 0x1fff).mirror(0x2000).ram(); - map(0x4000, 0x4007).mirror(0x3ff8).rw(this, FUNC(fidel6502_state::fexcelb_ttl_r), FUNC(fidel6502_state::fexcel_ttl_w)); + map(0x4000, 0x4007).mirror(0x3ff8).rw(FUNC(fidel6502_state::fexcelb_ttl_r), FUNC(fidel6502_state::fexcel_ttl_w)); map(0x8000, 0xffff).rom(); } @@ -1380,9 +1380,9 @@ void fidel6502_state::fexcelb_map(address_map &map) void fidel6502_state::fdesdis_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2007).mirror(0x1ff8).rw(this, FUNC(fidel6502_state::fdesdis_input_r), FUNC(fidel6502_state::fdesdis_control_w)); + map(0x2000, 0x2007).mirror(0x1ff8).rw(FUNC(fidel6502_state::fdesdis_input_r), FUNC(fidel6502_state::fdesdis_control_w)); map(0x4000, 0x7fff).bankr("rombank"); - map(0x6000, 0x6007).mirror(0x1ff8).w(this, FUNC(fidel6502_state::fdesdis_lcd_w)); + map(0x6000, 0x6007).mirror(0x1ff8).w(FUNC(fidel6502_state::fdesdis_lcd_w)); map(0x8000, 0xffff).rom(); } @@ -1396,16 +1396,16 @@ void fidel6502_state::fphantom_map(address_map &map) void fidel6502_state::chesster_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2007).mirror(0x1ff8).rw(this, FUNC(fidel6502_state::fdesdis_input_r), FUNC(fidel6502_state::chesster_control_w)); + map(0x2000, 0x2007).mirror(0x1ff8).rw(FUNC(fidel6502_state::fdesdis_input_r), FUNC(fidel6502_state::chesster_control_w)); map(0x4000, 0x7fff).bankr("rombank"); - map(0x6000, 0x6000).mirror(0x1fff).w("dac8", FUNC(dac_byte_interface::write)); + map(0x6000, 0x6000).mirror(0x1fff).w("dac8", FUNC(dac_byte_interface::data_w)); map(0x8000, 0xffff).rom(); } void fidel6502_state::kishon_map(address_map &map) { chesster_map(map); - map(0x2000, 0x2007).mirror(0x1ff8).rw(this, FUNC(fidel6502_state::fdesdis_input_r), FUNC(fidel6502_state::kishon_control_w)); + map(0x2000, 0x2007).mirror(0x1ff8).rw(FUNC(fidel6502_state::fdesdis_input_r), FUNC(fidel6502_state::kishon_control_w)); } diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index c589def460e..86cbd6a1429 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -397,11 +397,11 @@ WRITE8_MEMBER(fidel68k_state::eag_mux_w) void fidel68k_state::fex68k_map(address_map &map) { map(0x000000, 0x00ffff).rom(); - map(0x000000, 0x00000f).mirror(0x00fff0).w(this, FUNC(fidel68k_state::eag_leds_w)).umask16(0x00ff); - map(0x000000, 0x00000f).mirror(0x00fff0).w(this, FUNC(fidel68k_state::eag_7seg_w)).umask16(0xff00); + map(0x000000, 0x00000f).mirror(0x00fff0).w(FUNC(fidel68k_state::eag_leds_w)).umask16(0x00ff); + map(0x000000, 0x00000f).mirror(0x00fff0).w(FUNC(fidel68k_state::eag_7seg_w)).umask16(0xff00); map(0x044000, 0x047fff).ram(); - map(0x100000, 0x10000f).mirror(0x03fff0).r(this, FUNC(fidel68k_state::eag_input1_r)).umask16(0x00ff); - map(0x140000, 0x14000f).mirror(0x03fff0).w(this, FUNC(fidel68k_state::fex68k_mux_w)).umask16(0x00ff); + map(0x100000, 0x10000f).mirror(0x03fff0).r(FUNC(fidel68k_state::eag_input1_r)).umask16(0x00ff); + map(0x140000, 0x14000f).mirror(0x03fff0).w(FUNC(fidel68k_state::fex68k_mux_w)).umask16(0x00ff); } void fidel68k_state::fex68km2_map(address_map &map) @@ -423,20 +423,20 @@ void fidel68k_state::fdes2265_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x00ffff).rom(); - map(0x000000, 0x00000f).w(this, FUNC(fidel68k_state::fdes68k_lcd_w)).umask16(0x00ff); + map(0x000000, 0x00000f).w(FUNC(fidel68k_state::fdes68k_lcd_w)).umask16(0x00ff); map(0x044000, 0x047fff).ram(); map(0x100000, 0x10ffff).ram(); - map(0x140000, 0x14000f).r(this, FUNC(fidel68k_state::fdes68k_input_r)).umask16(0xff00); - map(0x140000, 0x14000f).w(this, FUNC(fidel68k_state::fdes68k_control_w)).umask16(0x00ff); + map(0x140000, 0x14000f).r(FUNC(fidel68k_state::fdes68k_input_r)).umask16(0xff00); + map(0x140000, 0x14000f).w(FUNC(fidel68k_state::fdes68k_control_w)).umask16(0x00ff); } void fidel68k_state::fdes2325_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x00ffff).rom(); - map(0x100000, 0x10000f).w(this, FUNC(fidel68k_state::fdes68k_lcd_w)).umask32(0x00ff00ff); - map(0x140000, 0x14000f).w(this, FUNC(fidel68k_state::fdes68k_control_w)).umask32(0x00ff00ff); - map(0x180000, 0x18000f).r(this, FUNC(fidel68k_state::fdes68k_input_r)).umask32(0xff00ff00); + map(0x100000, 0x10000f).w(FUNC(fidel68k_state::fdes68k_lcd_w)).umask32(0x00ff00ff); + map(0x140000, 0x14000f).w(FUNC(fidel68k_state::fdes68k_control_w)).umask32(0x00ff00ff); + map(0x180000, 0x18000f).r(FUNC(fidel68k_state::fdes68k_input_r)).umask32(0xff00ff00); map(0x300000, 0x37ffff).ram(); map(0x500000, 0x507fff).ram(); } @@ -454,13 +454,13 @@ void fidel68k_state::eag_map(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x104000, 0x107fff).ram(); - map(0x300000, 0x30000f).mirror(0x000010).w(this, FUNC(fidel68k_state::eag_7seg_w)).umask16(0xff00).nopr(); - map(0x300000, 0x30000f).mirror(0x000010).rw(this, FUNC(fidel68k_state::eag_input1_r), FUNC(fidel68k_state::eag_leds_w)).umask16(0x00ff); - map(0x400000, 0x407fff).r(this, FUNC(fidel68k_state::cartridge_r)).umask16(0xff00); - map(0x400001, 0x400001).w(this, FUNC(fidel68k_state::eag_mux_w)); + map(0x300000, 0x30000f).mirror(0x000010).w(FUNC(fidel68k_state::eag_7seg_w)).umask16(0xff00).nopr(); + map(0x300000, 0x30000f).mirror(0x000010).rw(FUNC(fidel68k_state::eag_input1_r), FUNC(fidel68k_state::eag_leds_w)).umask16(0x00ff); + map(0x400000, 0x407fff).r(FUNC(fidel68k_state::cartridge_r)).umask16(0xff00); + map(0x400001, 0x400001).w(FUNC(fidel68k_state::eag_mux_w)); map(0x400002, 0x400007).nopw(); // ? map(0x604000, 0x607fff).ram().share("nvram"); - map(0x700003, 0x700003).r(this, FUNC(fidel68k_state::eag_input2_r)); + map(0x700003, 0x700003).r(FUNC(fidel68k_state::eag_input2_r)); } void fidel68k_state::eagv7_map(address_map &map) @@ -468,13 +468,13 @@ void fidel68k_state::eagv7_map(address_map &map) map(0x000000, 0x01ffff).rom(); map(0x104000, 0x107fff).ram(); map(0x200000, 0x2fffff).ram(); - map(0x300000, 0x30000f).mirror(0x000010).w(this, FUNC(fidel68k_state::eag_7seg_w)).umask32(0xff00ff00).nopr(); - map(0x300000, 0x30000f).mirror(0x000010).rw(this, FUNC(fidel68k_state::eag_input1_r), FUNC(fidel68k_state::eag_leds_w)).umask32(0x00ff00ff); - map(0x400000, 0x407fff).r(this, FUNC(fidel68k_state::cartridge_r)).umask32(0xff00ff00); - map(0x400001, 0x400001).w(this, FUNC(fidel68k_state::eag_mux_w)); + map(0x300000, 0x30000f).mirror(0x000010).w(FUNC(fidel68k_state::eag_7seg_w)).umask32(0xff00ff00).nopr(); + map(0x300000, 0x30000f).mirror(0x000010).rw(FUNC(fidel68k_state::eag_input1_r), FUNC(fidel68k_state::eag_leds_w)).umask32(0x00ff00ff); + map(0x400000, 0x407fff).r(FUNC(fidel68k_state::cartridge_r)).umask32(0xff00ff00); + map(0x400001, 0x400001).w(FUNC(fidel68k_state::eag_mux_w)); map(0x400004, 0x400007).nopw(); // ? map(0x604000, 0x607fff).ram().share("nvram"); - map(0x700003, 0x700003).r(this, FUNC(fidel68k_state::eag_input2_r)); + map(0x700003, 0x700003).r(FUNC(fidel68k_state::eag_input2_r)); map(0x800000, 0x807fff).ram(); } @@ -482,13 +482,13 @@ void fidel68k_state::eagv11_map(address_map &map) { map(0x00000000, 0x0001ffff).rom(); map(0x00200000, 0x003fffff).ram(); - map(0x00b00000, 0x00b0000f).mirror(0x00000010).w(this, FUNC(fidel68k_state::eag_7seg_w)).umask32(0xff00ff00).nopr(); - map(0x00b00000, 0x00b0000f).mirror(0x00000010).rw(this, FUNC(fidel68k_state::eag_input1_r), FUNC(fidel68k_state::eag_leds_w)).umask32(0x00ff00ff); - map(0x00c00000, 0x00c07fff).r(this, FUNC(fidel68k_state::cartridge_r)).umask32(0xff00ff00); - map(0x00c00001, 0x00c00001).w(this, FUNC(fidel68k_state::eag_mux_w)); + map(0x00b00000, 0x00b0000f).mirror(0x00000010).w(FUNC(fidel68k_state::eag_7seg_w)).umask32(0xff00ff00).nopr(); + map(0x00b00000, 0x00b0000f).mirror(0x00000010).rw(FUNC(fidel68k_state::eag_input1_r), FUNC(fidel68k_state::eag_leds_w)).umask32(0x00ff00ff); + map(0x00c00000, 0x00c07fff).r(FUNC(fidel68k_state::cartridge_r)).umask32(0xff00ff00); + map(0x00c00001, 0x00c00001).w(FUNC(fidel68k_state::eag_mux_w)); map(0x00c00004, 0x00c00007).nopw(); // ? map(0x00e04000, 0x00e07fff).ram().share("nvram"); - map(0x00f00003, 0x00f00003).r(this, FUNC(fidel68k_state::eag_input2_r)); + map(0x00f00003, 0x00f00003).r(FUNC(fidel68k_state::eag_input2_r)); map(0x01000000, 0x0101ffff).ram(); } diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index fe3a14dc346..f031de3f5fb 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -1162,7 +1162,7 @@ void fidelz80_state::bcc_map(address_map &map) void fidelz80_state::bcc_io(address_map &map) { map.global_mask(0x07); - map(0x00, 0x07).rw(this, FUNC(fidelz80_state::bcc_input_r), FUNC(fidelz80_state::bcc_control_w)); + map(0x00, 0x07).rw(FUNC(fidelz80_state::bcc_input_r), FUNC(fidelz80_state::bcc_control_w)); } @@ -1177,7 +1177,7 @@ void fidelz80_state::scc_map(address_map &map) void fidelz80_state::scc_io(address_map &map) { map.global_mask(0x07); - map(0x00, 0x07).rw(this, FUNC(fidelz80_state::scc_input_r), FUNC(fidelz80_state::scc_control_w)); + map(0x00, 0x07).rw(FUNC(fidelz80_state::scc_input_r), FUNC(fidelz80_state::scc_control_w)); } @@ -1214,7 +1214,7 @@ WRITE8_MEMBER(fidelz80_state::vsc_io_trampoline_w) void fidelz80_state::vsc_io(address_map &map) { map.global_mask(0x0f); - map(0x00, 0x0f).rw(this, FUNC(fidelz80_state::vsc_io_trampoline_r), FUNC(fidelz80_state::vsc_io_trampoline_w)); + map(0x00, 0x0f).rw(FUNC(fidelz80_state::vsc_io_trampoline_r), FUNC(fidelz80_state::vsc_io_trampoline_w)); } @@ -1225,7 +1225,7 @@ void fidelz80_state::vbrc_main_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x5fff).rom(); map(0x6000, 0x63ff).mirror(0x1c00).ram(); - map(0xe000, 0xe000).mirror(0x1fff).w(this, FUNC(fidelz80_state::vbrc_speech_w)); + map(0xe000, 0xe000).mirror(0x1fff).w(FUNC(fidelz80_state::vbrc_speech_w)); } void fidelz80_state::vbrc_main_io(address_map &map) @@ -1241,9 +1241,9 @@ void fidelz80_state::dsc_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x1fff).rom(); - map(0x4000, 0x4000).mirror(0x1fff).w(this, FUNC(fidelz80_state::dsc_control_w)); - map(0x6000, 0x6000).mirror(0x1fff).w(this, FUNC(fidelz80_state::dsc_select_w)); - map(0x8000, 0x8000).mirror(0x1fff).r(this, FUNC(fidelz80_state::dsc_input_r)); + map(0x4000, 0x4000).mirror(0x1fff).w(FUNC(fidelz80_state::dsc_control_w)); + map(0x6000, 0x6000).mirror(0x1fff).w(FUNC(fidelz80_state::dsc_select_w)); + map(0x8000, 0x8000).mirror(0x1fff).r(FUNC(fidelz80_state::dsc_input_r)); map(0xa000, 0xa3ff).mirror(0x1c00).ram(); } diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp index f796b7b47af..bc509bfa3d3 100644 --- a/src/mame/drivers/finalizr.cpp +++ b/src/mame/drivers/finalizr.cpp @@ -107,8 +107,8 @@ WRITE8_MEMBER(finalizr_state::i8039_T0_w) void finalizr_state::main_map(address_map &map) { map(0x0001, 0x0001).writeonly().share("scroll"); - map(0x0003, 0x0003).w(this, FUNC(finalizr_state::finalizr_videoctrl_w)); - map(0x0004, 0x0004).w(this, FUNC(finalizr_state::finalizr_flipscreen_w)); + map(0x0003, 0x0003).w(FUNC(finalizr_state::finalizr_videoctrl_w)); + map(0x0004, 0x0004).w(FUNC(finalizr_state::finalizr_flipscreen_w)); // AM_RANGE(0x0020, 0x003f) AM_WRITEONLY AM_SHARE("scroll") map(0x0800, 0x0800).portr("DSW3"); map(0x0808, 0x0808).portr("DSW2"); @@ -117,10 +117,10 @@ void finalizr_state::main_map(address_map &map) map(0x0812, 0x0812).portr("P2"); map(0x0813, 0x0813).portr("DSW1"); map(0x0818, 0x0818).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0819, 0x0819).w(this, FUNC(finalizr_state::finalizr_coin_w)); - map(0x081a, 0x081a).w("snsnd", FUNC(sn76489a_device::write)); /* This address triggers the SN chip to read the data port. */ + map(0x0819, 0x0819).w(FUNC(finalizr_state::finalizr_coin_w)); + map(0x081a, 0x081a).w("snsnd", FUNC(sn76489a_device::command_w)); /* This address triggers the SN chip to read the data port. */ map(0x081b, 0x081b).nopw(); /* Loads the snd command into the snd latch */ - map(0x081c, 0x081c).w(this, FUNC(finalizr_state::finalizr_i8039_irq_w)); /* custom sound chip */ + map(0x081c, 0x081c).w(FUNC(finalizr_state::finalizr_i8039_irq_w)); /* custom sound chip */ map(0x081d, 0x081d).w("soundlatch", FUNC(generic_latch_8_device::write)); /* custom sound chip */ map(0x2000, 0x23ff).ram().share("colorram"); map(0x2400, 0x27ff).ram().share("videoram"); @@ -273,7 +273,7 @@ MACHINE_CONFIG_START(finalizr_state::finalizr) MCFG_DEVICE_ADD("audiocpu", I8039,XTAL(18'432'000)/2) /* 9.216MHz clkin ?? */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_IO_MAP(sound_io_map) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, finalizr_state, i8039_irqen_w)) //MCFG_MCS48_PORT_T0_CLK_CUSTOM(finalizr_state, i8039_T0_w) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, finalizr_state, i8039_T1_r)) diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp index c259c5a95fe..d5ebdfc86ba 100644 --- a/src/mame/drivers/fireball.cpp +++ b/src/mame/drivers/fireball.cpp @@ -298,10 +298,10 @@ void fireball_state::fireball_map(address_map &map) void fireball_state::fireball_io_map(address_map &map) { - map(0x00, 0x01).rw(this, FUNC(fireball_state::io_00_r), FUNC(fireball_state::io_00_w)); - map(0x02, 0x03).rw(this, FUNC(fireball_state::io_02_r), FUNC(fireball_state::io_02_w)); - map(0x04, 0x05).rw(this, FUNC(fireball_state::io_04_r), FUNC(fireball_state::io_04_w)); - map(0x06, 0x07).rw(this, FUNC(fireball_state::io_06_r), FUNC(fireball_state::io_06_w)); + map(0x00, 0x01).rw(FUNC(fireball_state::io_00_r), FUNC(fireball_state::io_00_w)); + map(0x02, 0x03).rw(FUNC(fireball_state::io_02_r), FUNC(fireball_state::io_02_w)); + map(0x04, 0x05).rw(FUNC(fireball_state::io_04_r), FUNC(fireball_state::io_04_w)); + map(0x06, 0x07).rw(FUNC(fireball_state::io_06_r), FUNC(fireball_state::io_06_w)); } diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index fbd98e0708a..f7e6d10a135 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -936,15 +936,15 @@ MACHINE_START_MEMBER(firebeat_state,firebeat) void firebeat_state::firebeat_map(address_map &map) { map(0x00000000, 0x01ffffff).ram().share("work_ram"); - map(0x70000000, 0x70000fff).rw(this, FUNC(firebeat_state::midi_uart_r), FUNC(firebeat_state::midi_uart_w)).umask32(0xff000000); - map(0x70006000, 0x70006003).w(this, FUNC(firebeat_state::extend_board_irq_w)); - map(0x70008000, 0x7000800f).r(this, FUNC(firebeat_state::keyboard_wheel_r)); - map(0x7000a000, 0x7000a003).r(this, FUNC(firebeat_state::extend_board_irq_r)); - map(0x74000000, 0x740003ff).rw(this, FUNC(firebeat_state::ppc_spu_share_r), FUNC(firebeat_state::ppc_spu_share_w)); // SPU shared RAM - map(0x7d000200, 0x7d00021f).r(this, FUNC(firebeat_state::cabinet_r)); - map(0x7d000340, 0x7d000347).r(this, FUNC(firebeat_state::sensor_r)); + map(0x70000000, 0x70000fff).rw(FUNC(firebeat_state::midi_uart_r), FUNC(firebeat_state::midi_uart_w)).umask32(0xff000000); + map(0x70006000, 0x70006003).w(FUNC(firebeat_state::extend_board_irq_w)); + map(0x70008000, 0x7000800f).r(FUNC(firebeat_state::keyboard_wheel_r)); + map(0x7000a000, 0x7000a003).r(FUNC(firebeat_state::extend_board_irq_r)); + map(0x74000000, 0x740003ff).rw(FUNC(firebeat_state::ppc_spu_share_r), FUNC(firebeat_state::ppc_spu_share_w)); // SPU shared RAM + map(0x7d000200, 0x7d00021f).r(FUNC(firebeat_state::cabinet_r)); + map(0x7d000340, 0x7d000347).r(FUNC(firebeat_state::sensor_r)); map(0x7d000400, 0x7d000401).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0x7d000800, 0x7d000803).r(this, FUNC(firebeat_state::input_r)); + map(0x7d000800, 0x7d000803).r(FUNC(firebeat_state::input_r)); map(0x7d400000, 0x7d5fffff).rw("flash_main", FUNC(fujitsu_29f016a_device::read), FUNC(fujitsu_29f016a_device::write)); map(0x7d800000, 0x7d9fffff).rw("flash_snd1", FUNC(fujitsu_29f016a_device::read), FUNC(fujitsu_29f016a_device::write)); map(0x7da00000, 0x7dbfffff).rw("flash_snd2", FUNC(fujitsu_29f016a_device::read), FUNC(fujitsu_29f016a_device::write)); @@ -952,8 +952,8 @@ void firebeat_state::firebeat_map(address_map &map) map(0x7e000000, 0x7e00003f).rw("rtc", FUNC(rtc65271_device::rtc_r), FUNC(rtc65271_device::rtc_w)); map(0x7e000100, 0x7e00013f).rw("rtc", FUNC(rtc65271_device::xram_r), FUNC(rtc65271_device::xram_w)); map(0x7e800000, 0x7e8000ff).rw("gcu0", FUNC(k057714_device::read), FUNC(k057714_device::write)); - map(0x7fe00000, 0x7fe0000f).rw(this, FUNC(firebeat_state::ata_command_r), FUNC(firebeat_state::ata_command_w)); - map(0x7fe80000, 0x7fe8000f).rw(this, FUNC(firebeat_state::ata_control_r), FUNC(firebeat_state::ata_control_w)); + map(0x7fe00000, 0x7fe0000f).rw(FUNC(firebeat_state::ata_command_r), FUNC(firebeat_state::ata_command_w)); + map(0x7fe80000, 0x7fe8000f).rw(FUNC(firebeat_state::ata_control_r), FUNC(firebeat_state::ata_control_w)); map(0x7ff80000, 0x7fffffff).rom().region("user1", 0); /* System BIOS */ } @@ -967,13 +967,13 @@ void firebeat_state::spu_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x13ffff).ram(); - map(0x200000, 0x200001).r(this, FUNC(firebeat_state::spu_unk_r)); - map(0x220000, 0x220001).w(this, FUNC(firebeat_state::spu_220000_w)); - map(0x230000, 0x230001).w(this, FUNC(firebeat_state::spu_irq_ack_w)); - map(0x260000, 0x260001).w(this, FUNC(firebeat_state::spu_sdram_bank_w)); - map(0x280000, 0x2807ff).rw(this, FUNC(firebeat_state::m68k_spu_share_r), FUNC(firebeat_state::m68k_spu_share_w)); - map(0x300000, 0x30000f).rw(m_spuata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); - map(0x340000, 0x34000f).rw(m_spuata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); + map(0x200000, 0x200001).r(FUNC(firebeat_state::spu_unk_r)); + map(0x220000, 0x220001).w(FUNC(firebeat_state::spu_220000_w)); + map(0x230000, 0x230001).w(FUNC(firebeat_state::spu_irq_ack_w)); + map(0x260000, 0x260001).w(FUNC(firebeat_state::spu_sdram_bank_w)); + map(0x280000, 0x2807ff).rw(FUNC(firebeat_state::m68k_spu_share_r), FUNC(firebeat_state::m68k_spu_share_w)); + map(0x300000, 0x30000f).rw(m_spuata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); + map(0x340000, 0x34000f).rw(m_spuata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); map(0x400000, 0x400fff).rw("rf5c400", FUNC(rf5c400_device::rf5c400_r), FUNC(rf5c400_device::rf5c400_w)); map(0x800000, 0x83ffff).ram(); // SDRAM map(0xfc0000, 0xffffff).ram(); // SDRAM diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp index 5dc9f062f2e..ed874331a70 100644 --- a/src/mame/drivers/firefox.cpp +++ b/src/mame/drivers/firefox.cpp @@ -471,32 +471,32 @@ void firefox_state::machine_start() void firefox_state::main_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x1fff).ram().w(this, FUNC(firefox_state::tileram_w)).share("tileram"); + map(0x1000, 0x1fff).ram().w(FUNC(firefox_state::tileram_w)).share("tileram"); map(0x2000, 0x27ff).ram().share("spriteram"); - map(0x2800, 0x2aff).ram().w(this, FUNC(firefox_state::sprite_palette_w)).share("sprite_palette"); - map(0x2b00, 0x2b00).mirror(0x04ff).w(this, FUNC(firefox_state::firefox_objram_bank_w)); - map(0x2c00, 0x2eff).ram().w(this, FUNC(firefox_state::tile_palette_w)).share("tile_palette"); + map(0x2800, 0x2aff).ram().w(FUNC(firefox_state::sprite_palette_w)).share("sprite_palette"); + map(0x2b00, 0x2b00).mirror(0x04ff).w(FUNC(firefox_state::firefox_objram_bank_w)); + map(0x2c00, 0x2eff).ram().w(FUNC(firefox_state::tile_palette_w)).share("tile_palette"); map(0x3000, 0x3fff).bankr("mainbank"); - map(0x4000, 0x40ff).rw(this, FUNC(firefox_state::nvram_r), FUNC(firefox_state::nvram_w)); /* NOVRAM */ + map(0x4000, 0x40ff).rw(FUNC(firefox_state::nvram_r), FUNC(firefox_state::nvram_w)); /* NOVRAM */ map(0x4100, 0x4100).mirror(0x00f8).portr("rdin0"); /* RDIN0 */ map(0x4101, 0x4101).mirror(0x00f8).portr("rdin1"); /* RDIN1 */ - map(0x4102, 0x4102).mirror(0x00f8).r(this, FUNC(firefox_state::firefox_disc_status_r)); /* RDIN2 */ + map(0x4102, 0x4102).mirror(0x00f8).r(FUNC(firefox_state::firefox_disc_status_r)); /* RDIN2 */ map(0x4103, 0x4103).mirror(0x00f8).portr("opt0"); /* OPT0 */ map(0x4104, 0x4104).mirror(0x00f8).portr("opt1"); /* OPT1 */ - map(0x4105, 0x4105).mirror(0x00f8).r(this, FUNC(firefox_state::firefox_disc_data_r)); /* DREAD */ + map(0x4105, 0x4105).mirror(0x00f8).r(FUNC(firefox_state::firefox_disc_data_r)); /* DREAD */ map(0x4106, 0x4106).mirror(0x00f8).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); /* RDSOUND */ map(0x4107, 0x4107).mirror(0x00f8).r("adc", FUNC(adc0808_device::data_r)); /* ADC */ - map(0x4200, 0x4200).mirror(0x0047).w(this, FUNC(firefox_state::main_irq_clear_w)); /* RSTIRQ */ - map(0x4208, 0x4208).mirror(0x0047).w(this, FUNC(firefox_state::main_firq_clear_w)); /* RSTFIRQ */ + map(0x4200, 0x4200).mirror(0x0047).w(FUNC(firefox_state::main_irq_clear_w)); /* RSTIRQ */ + map(0x4208, 0x4208).mirror(0x0047).w(FUNC(firefox_state::main_firq_clear_w)); /* RSTFIRQ */ map(0x4210, 0x4210).mirror(0x0047).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* WDCLK */ - map(0x4218, 0x4218).mirror(0x0047).w(this, FUNC(firefox_state::firefox_disc_read_w)); /* DSKREAD */ + map(0x4218, 0x4218).mirror(0x0047).w(FUNC(firefox_state::firefox_disc_read_w)); /* DSKREAD */ map(0x4220, 0x4223).mirror(0x0044).w("adc", FUNC(adc0808_device::address_offset_start_w)); /* ADCSTART */ - map(0x4230, 0x4230).mirror(0x0047).w(this, FUNC(firefox_state::self_reset_w)); /* AMUCK */ + map(0x4230, 0x4230).mirror(0x0047).w(FUNC(firefox_state::self_reset_w)); /* AMUCK */ map(0x4280, 0x4287).mirror(0x0040).w("latch0", FUNC(ls259_device::write_d7)); map(0x4288, 0x428f).mirror(0x0040).w("latch1", FUNC(ls259_device::write_d7)); - map(0x4290, 0x4290).mirror(0x0047).w(this, FUNC(firefox_state::rom_bank_w)); /* WRTREG */ + map(0x4290, 0x4290).mirror(0x0047).w(FUNC(firefox_state::rom_bank_w)); /* WRTREG */ map(0x4298, 0x4298).mirror(0x0047).w(m_soundlatch, FUNC(generic_latch_8_device::write)); /* WRSOUND */ - map(0x42a0, 0x42a0).mirror(0x0047).w(this, FUNC(firefox_state::firefox_disc_data_w)); /* DSKLATCH */ + map(0x42a0, 0x42a0).mirror(0x0047).w(FUNC(firefox_state::firefox_disc_data_w)); /* DSKLATCH */ map(0x4400, 0xffff).rom(); } diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp index e7cc9e506eb..78812bac80a 100644 --- a/src/mame/drivers/firetrap.cpp +++ b/src/mame/drivers/firetrap.cpp @@ -339,7 +339,7 @@ WRITE_LINE_MEMBER(firetrap_state::firetrap_adpcm_int) WRITE8_MEMBER(firetrap_state::adpcm_data_w) { m_audiocpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); - m_adpcm_select->ba_w(data); + m_adpcm_select->write_ba(data); } WRITE8_MEMBER(firetrap_state::flip_screen_w) @@ -352,20 +352,20 @@ void firetrap_state::firetrap_base_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram(); - map(0xd000, 0xd7ff).ram().w(this, FUNC(firetrap_state::firetrap_bg1videoram_w)).share("bg1videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(firetrap_state::firetrap_bg2videoram_w)).share("bg2videoram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(firetrap_state::firetrap_fgvideoram_w)).share("fgvideoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(firetrap_state::firetrap_bg1videoram_w)).share("bg1videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(firetrap_state::firetrap_bg2videoram_w)).share("bg2videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(firetrap_state::firetrap_fgvideoram_w)).share("fgvideoram"); map(0xe800, 0xe97f).ram().share("spriteram"); map(0xf000, 0xf000).nopw(); /* IRQ acknowledge */ map(0xf001, 0xf001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xf002, 0xf002).w(this, FUNC(firetrap_state::firetrap_bankselect_w)); - map(0xf003, 0xf003).w(this, FUNC(firetrap_state::flip_screen_w)); - map(0xf004, 0xf004).w(this, FUNC(firetrap_state::firetrap_nmi_disable_w)); - map(0xf005, 0xf005).w(this, FUNC(firetrap_state::firetrap_8751_w)); - map(0xf008, 0xf009).w(this, FUNC(firetrap_state::firetrap_bg1_scrollx_w)); - map(0xf00a, 0xf00b).w(this, FUNC(firetrap_state::firetrap_bg1_scrolly_w)); - map(0xf00c, 0xf00d).w(this, FUNC(firetrap_state::firetrap_bg2_scrollx_w)); - map(0xf00e, 0xf00f).w(this, FUNC(firetrap_state::firetrap_bg2_scrolly_w)); + map(0xf002, 0xf002).w(FUNC(firetrap_state::firetrap_bankselect_w)); + map(0xf003, 0xf003).w(FUNC(firetrap_state::flip_screen_w)); + map(0xf004, 0xf004).w(FUNC(firetrap_state::firetrap_nmi_disable_w)); + map(0xf005, 0xf005).w(FUNC(firetrap_state::firetrap_8751_w)); + map(0xf008, 0xf009).w(FUNC(firetrap_state::firetrap_bg1_scrollx_w)); + map(0xf00a, 0xf00b).w(FUNC(firetrap_state::firetrap_bg1_scrolly_w)); + map(0xf00c, 0xf00d).w(FUNC(firetrap_state::firetrap_bg2_scrollx_w)); + map(0xf00e, 0xf00f).w(FUNC(firetrap_state::firetrap_bg2_scrolly_w)); map(0xf010, 0xf010).portr("IN0"); map(0xf011, 0xf011).portr("IN1"); map(0xf012, 0xf012).portr("IN2"); @@ -376,13 +376,13 @@ void firetrap_state::firetrap_base_map(address_map &map) void firetrap_state::firetrap_map(address_map &map) { firetrap_base_map(map); - map(0xf016, 0xf016).r(this, FUNC(firetrap_state::firetrap_8751_r)); + map(0xf016, 0xf016).r(FUNC(firetrap_state::firetrap_8751_r)); } void firetrap_state::firetrap_bootleg_map(address_map &map) { firetrap_base_map(map); - map(0xf016, 0xf016).r(this, FUNC(firetrap_state::firetrap_8751_bootleg_r)); + map(0xf016, 0xf016).r(FUNC(firetrap_state::firetrap_8751_bootleg_r)); map(0xf800, 0xf8ff).rom(); /* extra ROM in the bootleg with unprotection code */ } @@ -390,9 +390,9 @@ void firetrap_state::sound_map(address_map &map) { map(0x0000, 0x07ff).ram(); map(0x1000, 0x1001).w("ymsnd", FUNC(ym3526_device::write)); - map(0x2000, 0x2000).w(this, FUNC(firetrap_state::adpcm_data_w)); - map(0x2400, 0x2400).w(this, FUNC(firetrap_state::sound_flip_flop_w)); - map(0x2800, 0x2800).w(this, FUNC(firetrap_state::sound_bankselect_w)); + map(0x2000, 0x2000).w(FUNC(firetrap_state::adpcm_data_w)); + map(0x2400, 0x2400).w(FUNC(firetrap_state::sound_flip_flop_w)); + map(0x2800, 0x2800).w(FUNC(firetrap_state::sound_bankselect_w)); map(0x3400, 0x3400).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x4000, 0x7fff).bankr("bank2"); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp index ca36c99ed87..9aafa181af9 100644 --- a/src/mame/drivers/firetrk.cpp +++ b/src/mame/drivers/firetrk.cpp @@ -302,22 +302,22 @@ void firetrk_state::firetrk_map(address_map &map) map(0x0800, 0x08ff).mirror(0x0700).ram().share("playfield_ram"); map(0x1000, 0x1000).mirror(0x001f).writeonly().share("scroll_y"); map(0x1020, 0x1020).mirror(0x001f).writeonly().share("scroll_x"); - map(0x1040, 0x1040).mirror(0x001f).w(this, FUNC(firetrk_state::crash_reset_w)); - map(0x1060, 0x1060).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_skid_reset_w)); + map(0x1040, 0x1040).mirror(0x001f).w(FUNC(firetrk_state::crash_reset_w)); + map(0x1060, 0x1060).mirror(0x001f).w(FUNC(firetrk_state::firetrk_skid_reset_w)); map(0x1080, 0x1080).mirror(0x001f).writeonly().share("car_rot"); - map(0x10a0, 0x10a0).mirror(0x001f).w(this, FUNC(firetrk_state::steer_reset_w)); + map(0x10a0, 0x10a0).mirror(0x001f).w(FUNC(firetrk_state::steer_reset_w)); map(0x10c0, 0x10c0).mirror(0x001f).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x10e0, 0x10e0).mirror(0x001f).w(this, FUNC(firetrk_state::blink_on_w)).share("blink"); - map(0x1400, 0x1400).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_motor_snd_w)); - map(0x1420, 0x1420).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_crash_snd_w)); - map(0x1440, 0x1440).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_skid_snd_w)); + map(0x10e0, 0x10e0).mirror(0x001f).w(FUNC(firetrk_state::blink_on_w)).share("blink"); + map(0x1400, 0x1400).mirror(0x001f).w(FUNC(firetrk_state::firetrk_motor_snd_w)); + map(0x1420, 0x1420).mirror(0x001f).w(FUNC(firetrk_state::firetrk_crash_snd_w)); + map(0x1440, 0x1440).mirror(0x001f).w(FUNC(firetrk_state::firetrk_skid_snd_w)); map(0x1460, 0x1460).mirror(0x001f).writeonly().share("drone_x"); map(0x1480, 0x1480).mirror(0x001f).writeonly().share("drone_y"); map(0x14a0, 0x14a0).mirror(0x001f).writeonly().share("drone_rot"); - map(0x14c0, 0x14c0).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_output_w)); - map(0x14e0, 0x14e0).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_xtndply_w)); - map(0x1800, 0x1807).mirror(0x03f8).r(this, FUNC(firetrk_state::firetrk_input_r)).nopw(); - map(0x1c00, 0x1c03).mirror(0x03fc).r(this, FUNC(firetrk_state::firetrk_dip_r)); + map(0x14c0, 0x14c0).mirror(0x001f).w(FUNC(firetrk_state::firetrk_output_w)); + map(0x14e0, 0x14e0).mirror(0x001f).w(FUNC(firetrk_state::firetrk_xtndply_w)); + map(0x1800, 0x1807).mirror(0x03f8).r(FUNC(firetrk_state::firetrk_input_r)).nopw(); + map(0x1c00, 0x1c03).mirror(0x03fc).r(FUNC(firetrk_state::firetrk_dip_r)); map(0x2000, 0x3fff).rom(); } @@ -328,19 +328,19 @@ void firetrk_state::superbug_map(address_map &map) map(0x0000, 0x00ff).ram(); map(0x0100, 0x0100).mirror(0x001f).writeonly().share("scroll_y"); map(0x0120, 0x0120).mirror(0x001f).writeonly().share("scroll_x"); - map(0x0140, 0x0140).mirror(0x001f).w(this, FUNC(firetrk_state::crash_reset_w)); - map(0x0160, 0x0160).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_skid_reset_w)); + map(0x0140, 0x0140).mirror(0x001f).w(FUNC(firetrk_state::crash_reset_w)); + map(0x0160, 0x0160).mirror(0x001f).w(FUNC(firetrk_state::firetrk_skid_reset_w)); map(0x0180, 0x0180).mirror(0x001f).writeonly().share("car_rot"); - map(0x01a0, 0x01a0).mirror(0x001f).w(this, FUNC(firetrk_state::steer_reset_w)); + map(0x01a0, 0x01a0).mirror(0x001f).w(FUNC(firetrk_state::steer_reset_w)); map(0x01c0, 0x01c0).mirror(0x001f).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x01e0, 0x01e0).mirror(0x001f).w(this, FUNC(firetrk_state::blink_on_w)).share("blink"); - map(0x0200, 0x0207).mirror(0x0018).r(this, FUNC(firetrk_state::firetrk_input_r)); - map(0x0220, 0x0220).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_xtndply_w)); - map(0x0240, 0x0243).mirror(0x001c).r(this, FUNC(firetrk_state::firetrk_dip_r)); - map(0x0260, 0x026f).mirror(0x0010).w(this, FUNC(firetrk_state::superbug_output_w)); - map(0x0280, 0x0280).mirror(0x001f).w(this, FUNC(firetrk_state::superbug_motor_snd_w)); - map(0x02a0, 0x02a0).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_crash_snd_w)); - map(0x02c0, 0x02c0).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_skid_snd_w)); + map(0x01e0, 0x01e0).mirror(0x001f).w(FUNC(firetrk_state::blink_on_w)).share("blink"); + map(0x0200, 0x0207).mirror(0x0018).r(FUNC(firetrk_state::firetrk_input_r)); + map(0x0220, 0x0220).mirror(0x001f).w(FUNC(firetrk_state::firetrk_xtndply_w)); + map(0x0240, 0x0243).mirror(0x001c).r(FUNC(firetrk_state::firetrk_dip_r)); + map(0x0260, 0x026f).mirror(0x0010).w(FUNC(firetrk_state::superbug_output_w)); + map(0x0280, 0x0280).mirror(0x001f).w(FUNC(firetrk_state::superbug_motor_snd_w)); + map(0x02a0, 0x02a0).mirror(0x001f).w(FUNC(firetrk_state::firetrk_crash_snd_w)); + map(0x02c0, 0x02c0).mirror(0x001f).w(FUNC(firetrk_state::firetrk_skid_snd_w)); map(0x0400, 0x041f).ram().share("alpha_num_ram"); map(0x0500, 0x05ff).ram().share("playfield_ram"); map(0x0800, 0x1fff).rom(); @@ -354,22 +354,22 @@ void firetrk_state::montecar_map(address_map &map) map(0x0800, 0x08ff).mirror(0x0700).ram().share("playfield_ram"); map(0x1000, 0x1000).mirror(0x001f).writeonly().share("scroll_y"); map(0x1020, 0x1020).mirror(0x001f).writeonly().share("scroll_x"); - map(0x1040, 0x1040).mirror(0x001f).w(this, FUNC(firetrk_state::montecar_drone_reset_w)); - map(0x1060, 0x1060).mirror(0x001f).w(this, FUNC(firetrk_state::montecar_car_reset_w)); + map(0x1040, 0x1040).mirror(0x001f).w(FUNC(firetrk_state::montecar_drone_reset_w)); + map(0x1060, 0x1060).mirror(0x001f).w(FUNC(firetrk_state::montecar_car_reset_w)); map(0x1080, 0x1080).mirror(0x001f).writeonly().share("car_rot"); - map(0x10a0, 0x10a0).mirror(0x001f).w(this, FUNC(firetrk_state::steer_reset_w)); + map(0x10a0, 0x10a0).mirror(0x001f).w(FUNC(firetrk_state::steer_reset_w)); map(0x10c0, 0x10c0).mirror(0x001f).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x10e0, 0x10e0).mirror(0x001f).w(this, FUNC(firetrk_state::montecar_skid_reset_w)); - map(0x1400, 0x1400).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_motor_snd_w)); - map(0x1420, 0x1420).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_crash_snd_w)); - map(0x1440, 0x1440).mirror(0x001f).w(this, FUNC(firetrk_state::firetrk_skid_snd_w)); + map(0x10e0, 0x10e0).mirror(0x001f).w(FUNC(firetrk_state::montecar_skid_reset_w)); + map(0x1400, 0x1400).mirror(0x001f).w(FUNC(firetrk_state::firetrk_motor_snd_w)); + map(0x1420, 0x1420).mirror(0x001f).w(FUNC(firetrk_state::firetrk_crash_snd_w)); + map(0x1440, 0x1440).mirror(0x001f).w(FUNC(firetrk_state::firetrk_skid_snd_w)); map(0x1460, 0x1460).mirror(0x001f).writeonly().share("drone_x"); map(0x1480, 0x1480).mirror(0x001f).writeonly().share("drone_y"); map(0x14a0, 0x14a0).mirror(0x001f).writeonly().share("drone_rot"); - map(0x14c0, 0x14c0).mirror(0x001f).w(this, FUNC(firetrk_state::montecar_output_1_w)); - map(0x14e0, 0x14e0).mirror(0x001f).w(this, FUNC(firetrk_state::montecar_output_2_w)); - map(0x1800, 0x1807).mirror(0x03f8).r(this, FUNC(firetrk_state::montecar_input_r)).nopw(); - map(0x1c00, 0x1c03).mirror(0x03fc).r(this, FUNC(firetrk_state::montecar_dip_r)); + map(0x14c0, 0x14c0).mirror(0x001f).w(FUNC(firetrk_state::montecar_output_1_w)); + map(0x14e0, 0x14e0).mirror(0x001f).w(FUNC(firetrk_state::montecar_output_2_w)); + map(0x1800, 0x1807).mirror(0x03f8).r(FUNC(firetrk_state::montecar_input_r)).nopw(); + map(0x1c00, 0x1c03).mirror(0x03fc).r(FUNC(firetrk_state::montecar_dip_r)); map(0x2000, 0x3fff).rom(); } diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp index acecff7ad7b..138d34dccc0 100644 --- a/src/mame/drivers/fitfight.cpp +++ b/src/mame/drivers/fitfight.cpp @@ -153,7 +153,7 @@ void fitfight_state::fitfight_main_map(address_map &map) // @0x000037a6/0x000030e6: 0x??dd byte from 0xe08c05, 0xF101 then 0xF001/0xF157 then 0xF057 // AM_RANGE(0x700000, 0x700001) AM_READ(xxxx) /* see init */ - map(0x700000, 0x700001).w(this, FUNC(fitfight_state::fitfight_700000_w)).share("fof_700000"); + map(0x700000, 0x700001).w(FUNC(fitfight_state::fitfight_700000_w)).share("fof_700000"); // kept at 0xe07900/0xe04c56 map(0x800000, 0x800001).ram().share("fof_800000"); @@ -168,9 +168,9 @@ void fitfight_state::fitfight_main_map(address_map &map) // histryma: @0x000031be,@0x00001d8e map(0xb00000, 0xb03fff).ram(); /* unused layer? */ - map(0xb04000, 0xb07fff).ram().w(this, FUNC(fitfight_state::fof_bak_tileram_w)).share("fof_bak_tileram"); - map(0xb08000, 0xb0bfff).ram().w(this, FUNC(fitfight_state::fof_mid_tileram_w)).share("fof_mid_tileram"); - map(0xb0c000, 0xb0ffff).ram().w(this, FUNC(fitfight_state::fof_txt_tileram_w)).share("fof_txt_tileram"); + map(0xb04000, 0xb07fff).ram().w(FUNC(fitfight_state::fof_bak_tileram_w)).share("fof_bak_tileram"); + map(0xb08000, 0xb0bfff).ram().w(FUNC(fitfight_state::fof_mid_tileram_w)).share("fof_mid_tileram"); + map(0xb0c000, 0xb0ffff).ram().w(FUNC(fitfight_state::fof_txt_tileram_w)).share("fof_txt_tileram"); map(0xb10000, 0xb13fff).ram(); //used by histryma @0x0000b25a map(0xb14000, 0xb17fff).ram(); //used by histryma @0x0000b25a,b270 @@ -197,16 +197,16 @@ void fitfight_state::bbprot_main_map(address_map &map) map(0x600000, 0x600001).writeonly().share("fof_600000"); - map(0x700000, 0x700001).rw(this, FUNC(fitfight_state::bbprot_700000_r), FUNC(fitfight_state::fitfight_700000_w)).share("fof_700000"); + map(0x700000, 0x700001).rw(FUNC(fitfight_state::bbprot_700000_r), FUNC(fitfight_state::fitfight_700000_w)).share("fof_700000"); map(0x800000, 0x800001).writeonly().share("fof_800000"); map(0x900000, 0x900001).writeonly().share("fof_900000"); map(0xa00000, 0xa00001).writeonly().share("fof_a00000"); map(0xb00000, 0xb03fff).nopw(); /* unused layer? */ - map(0xb04000, 0xb07fff).ram().w(this, FUNC(fitfight_state::fof_bak_tileram_w)).share("fof_bak_tileram"); - map(0xb08000, 0xb0bfff).ram().w(this, FUNC(fitfight_state::fof_mid_tileram_w)).share("fof_mid_tileram"); - map(0xb0c000, 0xb0ffff).ram().w(this, FUNC(fitfight_state::fof_txt_tileram_w)).share("fof_txt_tileram"); + map(0xb04000, 0xb07fff).ram().w(FUNC(fitfight_state::fof_bak_tileram_w)).share("fof_bak_tileram"); + map(0xb08000, 0xb0bfff).ram().w(FUNC(fitfight_state::fof_mid_tileram_w)).share("fof_mid_tileram"); + map(0xb0c000, 0xb0ffff).ram().w(FUNC(fitfight_state::fof_txt_tileram_w)).share("fof_txt_tileram"); map(0xc00000, 0xc00fff).readonly(); map(0xc00000, 0xc03fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp index bff9d64776a..de3a39718b2 100644 --- a/src/mame/drivers/fk1.cpp +++ b/src/mame/drivers/fk1.cpp @@ -324,12 +324,12 @@ void fk1_state::fk1_io(address_map &map) map(0x00, 0x03).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x10, 0x13).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x20, 0x23).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x30, 0x30).rw(this, FUNC(fk1_state::fk1_bank_ram_r), FUNC(fk1_state::fk1_intr_w)); + map(0x30, 0x30).rw(FUNC(fk1_state::fk1_bank_ram_r), FUNC(fk1_state::fk1_intr_w)); map(0x40, 0x40).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x41, 0x41).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x50, 0x50).rw(this, FUNC(fk1_state::fk1_bank_rom_r), FUNC(fk1_state::fk1_disk_w)); + map(0x50, 0x50).rw(FUNC(fk1_state::fk1_bank_rom_r), FUNC(fk1_state::fk1_disk_w)); map(0x60, 0x63).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x70, 0x70).rw(this, FUNC(fk1_state::fk1_mouse_r), FUNC(fk1_state::fk1_reset_int_w)); + map(0x70, 0x70).rw(FUNC(fk1_state::fk1_mouse_r), FUNC(fk1_state::fk1_reset_int_w)); } /* Input ports */ diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp index 52c70edbc29..9b25f7e335c 100644 --- a/src/mame/drivers/flicker.cpp +++ b/src/mame/drivers/flicker.cpp @@ -111,14 +111,14 @@ void flicker_state::flicker_status(address_map &map) void flicker_state::flicker_rom_ports(address_map &map) { - map(0x0000, 0x000f).mirror(0x0700).w(this, FUNC(flicker_state::rom0_out)); - map(0x0010, 0x001f).mirror(0x0700).w(this, FUNC(flicker_state::rom1_out)); - map(0x0020, 0x002f).mirror(0x0700).r(this, FUNC(flicker_state::rom2_in)); + map(0x0000, 0x000f).mirror(0x0700).w(FUNC(flicker_state::rom0_out)); + map(0x0010, 0x001f).mirror(0x0700).w(FUNC(flicker_state::rom1_out)); + map(0x0020, 0x002f).mirror(0x0700).r(FUNC(flicker_state::rom2_in)); } void flicker_state::flicker_ram_ports(address_map &map) { - map(0x00, 0x00).w(this, FUNC(flicker_state::ram0_out)); + map(0x00, 0x00).w(FUNC(flicker_state::ram0_out)); } static INPUT_PORTS_START( flicker ) diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp index d772daceb0e..d37721261ef 100644 --- a/src/mame/drivers/flipjack.cpp +++ b/src/mame/drivers/flipjack.cpp @@ -312,11 +312,11 @@ void flipjack_state::flipjack_main_map(address_map &map) map(0x4000, 0x5fff).ram(); map(0x6000, 0x67ff).ram(); map(0x6800, 0x6803).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x7000, 0x7000).w(this, FUNC(flipjack_state::flipjack_soundlatch_w)); + map(0x7000, 0x7000).w(FUNC(flipjack_state::flipjack_soundlatch_w)); map(0x7010, 0x7010).w(m_crtc, FUNC(hd6845_device::address_w)); map(0x7011, 0x7011).w(m_crtc, FUNC(hd6845_device::register_w)); map(0x7020, 0x7020).portr("DSW"); - map(0x7800, 0x7800).w(this, FUNC(flipjack_state::flipjack_layer_w)); + map(0x7800, 0x7800).w(FUNC(flipjack_state::flipjack_layer_w)); map(0x8000, 0x9fff).rom(); map(0xa000, 0xbfff).ram().share("cram"); map(0xc000, 0xdfff).ram().share("vram"); @@ -326,7 +326,7 @@ void flipjack_state::flipjack_main_map(address_map &map) void flipjack_state::flipjack_main_io_map(address_map &map) { map.global_mask(0xff); - map(0xff, 0xff).w(this, FUNC(flipjack_state::flipjack_bank_w)); + map(0xff, 0xff).w(FUNC(flipjack_state::flipjack_bank_w)); } void flipjack_state::flipjack_sound_map(address_map &map) @@ -342,7 +342,7 @@ void flipjack_state::flipjack_sound_map(address_map &map) void flipjack_state::flipjack_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(flipjack_state::flipjack_sound_nmi_ack_w)); + map(0x00, 0x00).w(FUNC(flipjack_state::flipjack_sound_nmi_ack_w)); } diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index 42463fd0c17..6c6a9629756 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -94,12 +94,12 @@ WRITE8_MEMBER(flkatck_state::multiply_w) void flkatck_state::flkatck_map(address_map &map) { - map(0x0000, 0x0007).ram().w(this, FUNC(flkatck_state::flkatck_k007121_regs_w)); /* 007121 registers */ + map(0x0000, 0x0007).ram().w(FUNC(flkatck_state::flkatck_k007121_regs_w)); /* 007121 registers */ map(0x0008, 0x03ff).ram(); /* RAM */ - map(0x0400, 0x041f).rw(this, FUNC(flkatck_state::flkatck_ls138_r), FUNC(flkatck_state::flkatck_ls138_w)); /* inputs, DIPS, bankswitch, counters, sound command */ + map(0x0400, 0x041f).rw(FUNC(flkatck_state::flkatck_ls138_r), FUNC(flkatck_state::flkatck_ls138_w)); /* inputs, DIPS, bankswitch, counters, sound command */ map(0x0800, 0x0bff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); /* palette */ map(0x1000, 0x1fff).ram(); /* RAM */ - map(0x2000, 0x3fff).ram().w(this, FUNC(flkatck_state::flkatck_k007121_w)).share("k007121_ram"); /* Video RAM (007121) */ + map(0x2000, 0x3fff).ram().w(FUNC(flkatck_state::flkatck_k007121_w)).share("k007121_ram"); /* Video RAM (007121) */ map(0x4000, 0x5fff).bankr("bank1"); /* banked ROM */ map(0x6000, 0xffff).rom(); /* ROM */ } @@ -108,9 +108,9 @@ void flkatck_state::flkatck_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); /* ROM */ map(0x8000, 0x87ff).ram(); /* RAM */ - map(0x9000, 0x9000).r(this, FUNC(flkatck_state::multiply_r)); // 007452: Protection (see wecleman, but unused here?) + map(0x9000, 0x9000).r(FUNC(flkatck_state::multiply_r)); // 007452: Protection (see wecleman, but unused here?) map(0x9001, 0x9001).nopr(); // 007452: ? - map(0x9000, 0x9001).w(this, FUNC(flkatck_state::multiply_w)); // 007452: Protection (see wecleman, but unused here?) + map(0x9000, 0x9001).w(FUNC(flkatck_state::multiply_w)); // 007452: Protection (see wecleman, but unused here?) map(0x9004, 0x9004).nopr(); // 007452: ? map(0x9006, 0x9006).nopw(); // 007452: ? map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index 3763dd21c46..c72c4e76437 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -340,20 +340,20 @@ void flower_state::shared_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0xc000, 0xdfff).ram().share("workram"); map(0xa000, 0xa000).nopw(); - map(0xa001, 0xa001).w(this, FUNC(flower_state::flipscreen_w)); + map(0xa001, 0xa001).w(FUNC(flower_state::flipscreen_w)); map(0xa002, 0xa002).nopw(); // master irq related (0 at start, 1 at end) map(0xa003, 0xa003).nopw(); // slave irq related (0 at start, 1 at end) - map(0xa004, 0xa004).w(this, FUNC(flower_state::coin_counter_w)); + map(0xa004, 0xa004).w(FUNC(flower_state::coin_counter_w)); map(0xa005, 0xa005).nopw(); map(0xa100, 0xa100).portr("P1"); map(0xa101, 0xa101).portr("P2"); map(0xa102, 0xa102).portr("DSW1"); map(0xa103, 0xa103).portr("DSW2"); - map(0xa400, 0xa400).w(this, FUNC(flower_state::sound_command_w)); + map(0xa400, 0xa400).w(FUNC(flower_state::sound_command_w)); map(0xe000, 0xefff).ram().share("txvram"); - map(0xf000, 0xf1ff).ram().w(this, FUNC(flower_state::fgvram_w)).share("fgvram"); + map(0xf000, 0xf1ff).ram().w(FUNC(flower_state::fgvram_w)).share("fgvram"); map(0xf200, 0xf200).ram().share("fgscroll"); - map(0xf800, 0xf9ff).ram().w(this, FUNC(flower_state::bgvram_w)).share("bgvram"); + map(0xf800, 0xf9ff).ram().w(FUNC(flower_state::bgvram_w)).share("bgvram"); map(0xfa00, 0xfa00).ram().share("bgscroll"); } @@ -361,7 +361,7 @@ void flower_state::audio_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x4000).nopw(); // audio irq related (0 at start, 1 at end) - map(0x4001, 0x4001).w(this, FUNC(flower_state::audio_nmi_mask_w)); + map(0x4001, 0x4001).w(FUNC(flower_state::audio_nmi_mask_w)); map(0x6000, 0x6000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x8000, 0x803f).w("flower", FUNC(flower_sound_device::lower_write)); map(0xa000, 0xa03f).w("flower", FUNC(flower_sound_device::upper_write)); diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp index d071134e2dd..8eb99d49fe3 100644 --- a/src/mame/drivers/flstory.cpp +++ b/src/mame/drivers/flstory.cpp @@ -38,16 +38,16 @@ void flstory_state::base_map(address_map &map) // rumba lumber reads area 0xc800-0xcfff // onna34ro checks the whole range during POST but having a mirror or not doesn't make any difference for the check to pass - map(0xc000, 0xc7ff).mirror(0x800).ram().w(this, FUNC(flstory_state::flstory_videoram_w)).share("videoram"); + map(0xc000, 0xc7ff).mirror(0x800).ram().w(FUNC(flstory_state::flstory_videoram_w)).share("videoram"); map(0xd001, 0xd001).nopw(); /* watchdog */ map(0xd002, 0xd002).noprw(); /* unknown read & coin lock out? */ map(0xd400, 0xd400).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0xd400, 0xd400).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xd403, 0xd403).nopr().w(this, FUNC(flstory_state::snd_reset_w)); // unknown read (set/clr side effect?) + map(0xd403, 0xd403).nopr().w(FUNC(flstory_state::snd_reset_w)); // unknown read (set/clr side effect?) - map(0xd401, 0xd401).r(this, FUNC(flstory_state::snd_flag_r)); + map(0xd401, 0xd401).r(FUNC(flstory_state::snd_flag_r)); map(0xd800, 0xd800).portr("DSW0"); map(0xd801, 0xd801).portr("DSW1"); map(0xd802, 0xd802).portr("DSW2"); @@ -56,9 +56,9 @@ void flstory_state::base_map(address_map &map) map(0xd806, 0xd806).portr("P2"); map(0xdc00, 0xdc9f).ram().share("spriteram"); - map(0xdca0, 0xdcbf).ram().w(this, FUNC(flstory_state::flstory_scrlram_w)).share("scrlram"); + map(0xdca0, 0xdcbf).ram().w(FUNC(flstory_state::flstory_scrlram_w)).share("scrlram"); - map(0xdd00, 0xdeff).rw(this, FUNC(flstory_state::flstory_palette_r), FUNC(flstory_state::flstory_palette_w)); + map(0xdd00, 0xdeff).rw(FUNC(flstory_state::flstory_palette_r), FUNC(flstory_state::flstory_palette_w)); // victorious nine read 0xf80a during attract, unknown purpose map(0xe000, 0xe7ff).mirror(0x1800).ram().share("workram"); /* work RAM */ @@ -69,10 +69,10 @@ void flstory_state::flstory_map(address_map &map) base_map(map); map(0xd000, 0xd000).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0xd805, 0xd805).r(this, FUNC(flstory_state::flstory_mcu_status_r)); + map(0xd805, 0xd805).r(FUNC(flstory_state::flstory_mcu_status_r)); // AM_RANGE(0xda00, 0xda00) AM_WRITEONLY map(0xdcc0, 0xdcff).ram(); /* unknown */ - map(0xdf03, 0xdf03).w(this, FUNC(flstory_state::flstory_gfxctrl_w)); + map(0xdf03, 0xdf03).w(FUNC(flstory_state::flstory_gfxctrl_w)); } void flstory_state::onna34ro_map(address_map &map) @@ -82,14 +82,14 @@ void flstory_state::onna34ro_map(address_map &map) // AM_RANGE(0xd805, 0xd805) AM_READ(flstory_mcu_status_r) // AM_RANGE(0xda00, 0xda00) AM_WRITEONLY map(0xdcc0, 0xdcff).ram(); /* unknown */ - map(0xdf03, 0xdf03).w(this, FUNC(flstory_state::flstory_gfxctrl_w)); + map(0xdf03, 0xdf03).w(FUNC(flstory_state::flstory_gfxctrl_w)); } void flstory_state::onna34ro_mcu_map(address_map &map) { onna34ro_map(map); map(0xd000, 0xd000).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0xd805, 0xd805).r(this, FUNC(flstory_state::flstory_mcu_status_r)); + map(0xd805, 0xd805).r(FUNC(flstory_state::flstory_mcu_status_r)); } CUSTOM_INPUT_MEMBER(flstory_state::victnine_mcu_status_bit01_r) @@ -102,12 +102,12 @@ CUSTOM_INPUT_MEMBER(flstory_state::victnine_mcu_status_bit01_r) void flstory_state::victnine_map(address_map &map) { base_map(map); - map(0xd000, 0xd000).rw(this, FUNC(flstory_state::victnine_mcu_r), FUNC(flstory_state::victnine_mcu_w)); + map(0xd000, 0xd000).rw(FUNC(flstory_state::victnine_mcu_r), FUNC(flstory_state::victnine_mcu_w)); map(0xd805, 0xd805).portr("EXTRA_P1"); /* also mcu */ map(0xd807, 0xd807).portr("EXTRA_P2"); // AM_RANGE(0xda00, 0xda00) AM_WRITEONLY - map(0xdce0, 0xdce0).rw(this, FUNC(flstory_state::victnine_gfxctrl_r), FUNC(flstory_state::victnine_gfxctrl_w)); + map(0xdce0, 0xdce0).rw(FUNC(flstory_state::victnine_gfxctrl_r), FUNC(flstory_state::victnine_gfxctrl_w)); map(0xdce1, 0xdce1).nopw(); /* unknown */ } @@ -116,10 +116,10 @@ void flstory_state::rumba_map(address_map &map) base_map(map); map(0xd000, 0xd000).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0xd805, 0xd805).r(this, FUNC(flstory_state::flstory_mcu_status_r)); + map(0xd805, 0xd805).r(FUNC(flstory_state::flstory_mcu_status_r)); map(0xd807, 0xd807).portr("EXTRA_P2"); // AM_RANGE(0xda00, 0xda00) AM_WRITEONLY - map(0xdce0, 0xdce0).rw(this, FUNC(flstory_state::victnine_gfxctrl_r), FUNC(flstory_state::victnine_gfxctrl_w)); + map(0xdce0, 0xdce0).rw(FUNC(flstory_state::victnine_gfxctrl_r), FUNC(flstory_state::victnine_gfxctrl_w)); // AM_RANGE(0xdce1, 0xdce1) AM_WRITENOP /* unknown */ } @@ -174,13 +174,13 @@ void flstory_state::sound_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xc800, 0xc801).w(m_ay, FUNC(ym2149_device::address_data_w)); map(0xca00, 0xca0d).w(m_msm, FUNC(msm5232_device::write)); - map(0xcc00, 0xcc00).w(this, FUNC(flstory_state::sound_control_0_w)); - map(0xce00, 0xce00).w(this, FUNC(flstory_state::sound_control_1_w)); + map(0xcc00, 0xcc00).w(FUNC(flstory_state::sound_control_0_w)); + map(0xce00, 0xce00).w(FUNC(flstory_state::sound_control_1_w)); map(0xd800, 0xd800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xd800, 0xd800).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); - map(0xda00, 0xda00).r(this, FUNC(flstory_state::snd_flag_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<1>)); + map(0xda00, 0xda00).r(FUNC(flstory_state::snd_flag_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<1>)); map(0xdc00, 0xdc00).w(m_soundnmi, FUNC(input_merger_device::in_clear<1>)); - map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::write)); /* signed 8-bit DAC & unknown read */ + map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::data_w)); /* signed 8-bit DAC & unknown read */ map(0xe000, 0xefff).rom(); /* space for diagnostics ROM */ } diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index 4f6905e7a79..1e2c97ce1a1 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -306,16 +306,16 @@ void flyball_state::flyball_map(address_map &map) map.global_mask(0x1fff); map(0x0000, 0x00ff).mirror(0x100).ram(); map(0x0800, 0x0800).noprw(); - map(0x0801, 0x0801).w(this, FUNC(flyball_state::pitcher_pic_w)); - map(0x0802, 0x0802).r(this, FUNC(flyball_state::scanline_r)); - map(0x0803, 0x0803).r(this, FUNC(flyball_state::potsense_r)); - map(0x0804, 0x0804).w(this, FUNC(flyball_state::ball_vert_w)); - map(0x0805, 0x0805).w(this, FUNC(flyball_state::ball_horz_w)); - map(0x0806, 0x0806).w(this, FUNC(flyball_state::pitcher_vert_w)); - map(0x0807, 0x0807).w(this, FUNC(flyball_state::pitcher_horz_w)); - map(0x0900, 0x0900).w(this, FUNC(flyball_state::potmask_w)); - map(0x0a00, 0x0a07).w(this, FUNC(flyball_state::misc_w)); - map(0x0b00, 0x0b00).r(this, FUNC(flyball_state::input_r)); + map(0x0801, 0x0801).w(FUNC(flyball_state::pitcher_pic_w)); + map(0x0802, 0x0802).r(FUNC(flyball_state::scanline_r)); + map(0x0803, 0x0803).r(FUNC(flyball_state::potsense_r)); + map(0x0804, 0x0804).w(FUNC(flyball_state::ball_vert_w)); + map(0x0805, 0x0805).w(FUNC(flyball_state::ball_horz_w)); + map(0x0806, 0x0806).w(FUNC(flyball_state::pitcher_vert_w)); + map(0x0807, 0x0807).w(FUNC(flyball_state::pitcher_horz_w)); + map(0x0900, 0x0900).w(FUNC(flyball_state::potmask_w)); + map(0x0a00, 0x0a07).w(FUNC(flyball_state::misc_w)); + map(0x0b00, 0x0b00).r(FUNC(flyball_state::input_r)); map(0x0d00, 0x0eff).writeonly().share("playfield_ram"); map(0x1000, 0x1fff).rom().region("maincpu", 0); } diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index eb5f21c793d..39ee24f2d33 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -824,7 +824,7 @@ WRITE8_MEMBER(fm7_state::fm7_cassette_printer_w) break; case 1: // Printer data - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); break; } } @@ -1432,28 +1432,28 @@ void fm7_state::fm7_mem(address_map &map) map(0x0000, 0x7fff).ram(); map(0x8000, 0xfbff).bankr("bank1").bankw("bank2"); // also F-BASIC ROM, when enabled map(0xfc00, 0xfc7f).ram(); - map(0xfc80, 0xfcff).rw(this, FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); + map(0xfc80, 0xfcff).rw(FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); // I/O space (FD00-FDFF) - map(0xfd00, 0xfd01).rw(this, FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); - map(0xfd02, 0xfd02).rw(this, FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask - map(0xfd03, 0xfd03).rw(this, FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags - map(0xfd04, 0xfd04).r(this, FUNC(fm7_state::fm7_fd04_r)); - map(0xfd05, 0xfd05).rw(this, FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); - map(0xfd06, 0xfd0c).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd0d, 0xfd0d).rw(this, FUNC(fm7_state::fm7_psg_select_r), FUNC(fm7_state::fm7_psg_select_w)); - map(0xfd0e, 0xfd0e).rw(this, FUNC(fm7_state::fm7_psg_data_r), FUNC(fm7_state::fm7_psg_data_w)); - map(0xfd0f, 0xfd0f).rw(this, FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); - map(0xfd10, 0xfd17).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd18, 0xfd1f).rw(this, FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); - map(0xfd20, 0xfd23).rw(this, FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); - map(0xfd24, 0xfd36).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd37, 0xfd37).w(this, FUNC(fm7_state::fm7_multipage_w)); - map(0xfd38, 0xfd3f).rw(this, FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); - map(0xfd40, 0xfdff).r(this, FUNC(fm7_state::fm7_unknown_r)); + map(0xfd00, 0xfd01).rw(FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); + map(0xfd02, 0xfd02).rw(FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask + map(0xfd03, 0xfd03).rw(FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags + map(0xfd04, 0xfd04).r(FUNC(fm7_state::fm7_fd04_r)); + map(0xfd05, 0xfd05).rw(FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); + map(0xfd06, 0xfd0c).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd0d, 0xfd0d).rw(FUNC(fm7_state::fm7_psg_select_r), FUNC(fm7_state::fm7_psg_select_w)); + map(0xfd0e, 0xfd0e).rw(FUNC(fm7_state::fm7_psg_data_r), FUNC(fm7_state::fm7_psg_data_w)); + map(0xfd0f, 0xfd0f).rw(FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); + map(0xfd10, 0xfd17).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd18, 0xfd1f).rw(FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); + map(0xfd20, 0xfd23).rw(FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); + map(0xfd24, 0xfd36).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd37, 0xfd37).w(FUNC(fm7_state::fm7_multipage_w)); + map(0xfd38, 0xfd3f).rw(FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); + map(0xfd40, 0xfdff).r(FUNC(fm7_state::fm7_unknown_r)); // Boot ROM map(0xfe00, 0xffdf).bankr("bank17"); map(0xffe0, 0xffef).ram(); - map(0xfff0, 0xffff).rw(this, FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); + map(0xfff0, 0xffff).rw(FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); } void fm7_state::fm8_mem(address_map &map) @@ -1461,26 +1461,26 @@ void fm7_state::fm8_mem(address_map &map) map(0x0000, 0x7fff).ram(); map(0x8000, 0xfbff).bankr("bank1").bankw("bank2"); // also F-BASIC ROM, when enabled map(0xfc00, 0xfc7f).ram(); - map(0xfc80, 0xfcff).rw(this, FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); + map(0xfc80, 0xfcff).rw(FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); // I/O space (FD00-FDFF) - map(0xfd00, 0xfd01).rw(this, FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); - map(0xfd02, 0xfd02).rw(this, FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask - map(0xfd03, 0xfd03).rw(this, FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags - map(0xfd04, 0xfd04).r(this, FUNC(fm7_state::fm7_fd04_r)); - map(0xfd05, 0xfd05).rw(this, FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); - map(0xfd06, 0xfd0c).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd0f, 0xfd0f).rw(this, FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); - map(0xfd10, 0xfd17).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd18, 0xfd1f).rw(this, FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); - map(0xfd20, 0xfd23).rw(this, FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); - map(0xfd24, 0xfd36).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd37, 0xfd37).w(this, FUNC(fm7_state::fm7_multipage_w)); - map(0xfd38, 0xfd3f).rw(this, FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); - map(0xfd40, 0xfdff).r(this, FUNC(fm7_state::fm7_unknown_r)); + map(0xfd00, 0xfd01).rw(FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); + map(0xfd02, 0xfd02).rw(FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask + map(0xfd03, 0xfd03).rw(FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags + map(0xfd04, 0xfd04).r(FUNC(fm7_state::fm7_fd04_r)); + map(0xfd05, 0xfd05).rw(FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); + map(0xfd06, 0xfd0c).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd0f, 0xfd0f).rw(FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); + map(0xfd10, 0xfd17).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd18, 0xfd1f).rw(FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); + map(0xfd20, 0xfd23).rw(FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); + map(0xfd24, 0xfd36).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd37, 0xfd37).w(FUNC(fm7_state::fm7_multipage_w)); + map(0xfd38, 0xfd3f).rw(FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); + map(0xfd40, 0xfdff).r(FUNC(fm7_state::fm7_unknown_r)); // Boot ROM map(0xfe00, 0xffdf).bankr("bank17"); map(0xffe0, 0xffef).ram(); - map(0xfff0, 0xffff).rw(this, FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); + map(0xfff0, 0xffff).rw(FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); } /* @@ -1496,19 +1496,19 @@ void fm7_state::fm8_mem(address_map &map) void fm7_state::fm7_sub_mem(address_map &map) { - map(0x0000, 0xbfff).rw(this, FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM + map(0x0000, 0xbfff).rw(FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM map(0xc000, 0xcfff).ram(); // Console RAM map(0xd000, 0xd37f).ram(); // Work RAM map(0xd380, 0xd3ff).ram().share("shared_ram"); // I/O space (D400-D4FF) - map(0xd400, 0xd401).r(this, FUNC(fm7_state::fm7_sub_keyboard_r)); - map(0xd402, 0xd402).r(this, FUNC(fm7_state::fm7_cancel_ack)); - map(0xd403, 0xd403).r(this, FUNC(fm7_state::fm7_sub_beeper_r)); - map(0xd404, 0xd404).r(this, FUNC(fm7_state::fm7_attn_irq_r)); - map(0xd408, 0xd408).rw(this, FUNC(fm7_state::fm7_crt_r), FUNC(fm7_state::fm7_crt_w)); - map(0xd409, 0xd409).rw(this, FUNC(fm7_state::fm7_vram_access_r), FUNC(fm7_state::fm7_vram_access_w)); - map(0xd40a, 0xd40a).rw(this, FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); - map(0xd40e, 0xd40f).w(this, FUNC(fm7_state::fm7_vram_offset_w)); + map(0xd400, 0xd401).r(FUNC(fm7_state::fm7_sub_keyboard_r)); + map(0xd402, 0xd402).r(FUNC(fm7_state::fm7_cancel_ack)); + map(0xd403, 0xd403).r(FUNC(fm7_state::fm7_sub_beeper_r)); + map(0xd404, 0xd404).r(FUNC(fm7_state::fm7_attn_irq_r)); + map(0xd408, 0xd408).rw(FUNC(fm7_state::fm7_crt_r), FUNC(fm7_state::fm7_crt_w)); + map(0xd409, 0xd409).rw(FUNC(fm7_state::fm7_vram_access_r), FUNC(fm7_state::fm7_vram_access_w)); + map(0xd40a, 0xd40a).rw(FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); + map(0xd40e, 0xd40f).w(FUNC(fm7_state::fm7_vram_offset_w)); map(0xd800, 0xffff).rom(); } @@ -1531,49 +1531,49 @@ void fm7_state::fm11_mem(address_map &map) map(0xe000, 0xefff).rw("av_bank15", FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0xf000, 0xfbff).rw("av_bank16", FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0xfc00, 0xfc7f).ram(); - map(0xfc80, 0xfcff).rw(this, FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); + map(0xfc80, 0xfcff).rw(FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); // I/O space (FD00-FDFF) - map(0xfd00, 0xfd01).rw(this, FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); - map(0xfd02, 0xfd02).rw(this, FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask - map(0xfd03, 0xfd03).rw(this, FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags - map(0xfd04, 0xfd04).r(this, FUNC(fm7_state::fm7_fd04_r)); - map(0xfd05, 0xfd05).rw(this, FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); - map(0xfd06, 0xfd0a).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd0b, 0xfd0b).r(this, FUNC(fm7_state::fm77av_boot_mode_r)); - map(0xfd0c, 0xfd0c).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd0f, 0xfd0f).rw(this, FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); - map(0xfd10, 0xfd10).w(this, FUNC(fm7_state::fm7_init_en_w)); - map(0xfd11, 0xfd11).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd12, 0xfd12).rw(this, FUNC(fm7_state::fm77av_sub_modestatus_r), FUNC(fm7_state::fm77av_sub_modestatus_w)); - map(0xfd13, 0xfd13).w(this, FUNC(fm7_state::fm77av_sub_bank_w)); - map(0xfd14, 0xfd14).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd17, 0xfd17).r(this, FUNC(fm7_state::fm7_fmirq_r)); - map(0xfd18, 0xfd1f).rw(this, FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); - map(0xfd20, 0xfd23).rw(this, FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); - map(0xfd24, 0xfd2b).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd30, 0xfd34).w(this, FUNC(fm7_state::fm77av_analog_palette_w)); - map(0xfd35, 0xfd36).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd37, 0xfd37).w(this, FUNC(fm7_state::fm7_multipage_w)); - map(0xfd38, 0xfd3f).rw(this, FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); - map(0xfd40, 0xfd7f).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd80, 0xfd93).rw(this, FUNC(fm7_state::fm7_mmr_r), FUNC(fm7_state::fm7_mmr_w)); - map(0xfd94, 0xfdff).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfe00, 0xffdf).ram().w(this, FUNC(fm7_state::fm77av_bootram_w)).share("boot_ram"); + map(0xfd00, 0xfd01).rw(FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); + map(0xfd02, 0xfd02).rw(FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask + map(0xfd03, 0xfd03).rw(FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags + map(0xfd04, 0xfd04).r(FUNC(fm7_state::fm7_fd04_r)); + map(0xfd05, 0xfd05).rw(FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); + map(0xfd06, 0xfd0a).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd0b, 0xfd0b).r(FUNC(fm7_state::fm77av_boot_mode_r)); + map(0xfd0c, 0xfd0c).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd0f, 0xfd0f).rw(FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); + map(0xfd10, 0xfd10).w(FUNC(fm7_state::fm7_init_en_w)); + map(0xfd11, 0xfd11).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd12, 0xfd12).rw(FUNC(fm7_state::fm77av_sub_modestatus_r), FUNC(fm7_state::fm77av_sub_modestatus_w)); + map(0xfd13, 0xfd13).w(FUNC(fm7_state::fm77av_sub_bank_w)); + map(0xfd14, 0xfd14).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd17, 0xfd17).r(FUNC(fm7_state::fm7_fmirq_r)); + map(0xfd18, 0xfd1f).rw(FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); + map(0xfd20, 0xfd23).rw(FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); + map(0xfd24, 0xfd2b).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd30, 0xfd34).w(FUNC(fm7_state::fm77av_analog_palette_w)); + map(0xfd35, 0xfd36).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd37, 0xfd37).w(FUNC(fm7_state::fm7_multipage_w)); + map(0xfd38, 0xfd3f).rw(FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); + map(0xfd40, 0xfd7f).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd80, 0xfd93).rw(FUNC(fm7_state::fm7_mmr_r), FUNC(fm7_state::fm7_mmr_w)); + map(0xfd94, 0xfdff).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfe00, 0xffdf).ram().w(FUNC(fm7_state::fm77av_bootram_w)).share("boot_ram"); map(0xffe0, 0xffef).ram(); - map(0xfff0, 0xffff).rw(this, FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); + map(0xfff0, 0xffff).rw(FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); } // Much of this is guesswork at the moment void fm7_state::fm11_sub_mem(address_map &map) { - map(0x0000, 0x7fff).rw(this, FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM + map(0x0000, 0x7fff).rw(FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM map(0x8000, 0x8fff).ram(); // Console RAM(?) map(0x9000, 0x9f7f).ram(); // Work RAM(?) map(0x9f80, 0x9fff).ram().share("shared_ram"); map(0xafe0, 0xafe3).ram(); // AM_RANGE(0xafe4,0xafe4) AM_READWRITE(fm7_sub_busyflag_r,fm7_sub_busyflag_w) - map(0xafe6, 0xafe6).rw(this, FUNC(fm7_state::fm77av_video_flags_r), FUNC(fm7_state::fm77av_video_flags_w)); - map(0xaff0, 0xaff0).rw(this, FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); + map(0xafe6, 0xafe6).rw(FUNC(fm7_state::fm77av_video_flags_r), FUNC(fm7_state::fm77av_video_flags_w)); + map(0xaff0, 0xaff0).rw(FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); map(0xc000, 0xffff).rom(); // sybsystem ROM } @@ -1586,20 +1586,20 @@ void fm7_state::fm11_x86_mem(address_map &map) void fm7_state::fm11_x86_io(address_map &map) { - map(0xfd00, 0xfd01).rw(this, FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); - map(0xfd02, 0xfd02).rw(this, FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask - map(0xfd03, 0xfd03).rw(this, FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags - map(0xfd04, 0xfd04).r(this, FUNC(fm7_state::fm7_fd04_r)); - map(0xfd05, 0xfd05).rw(this, FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); - map(0xfd06, 0xfd0c).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd0f, 0xfd0f).rw(this, FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); - map(0xfd10, 0xfd17).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd18, 0xfd1f).rw(this, FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); - map(0xfd20, 0xfd23).rw(this, FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); - map(0xfd24, 0xfd36).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd37, 0xfd37).w(this, FUNC(fm7_state::fm7_multipage_w)); - map(0xfd38, 0xfd3f).rw(this, FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); - map(0xfd40, 0xfdff).r(this, FUNC(fm7_state::fm7_unknown_r)); + map(0xfd00, 0xfd01).rw(FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); + map(0xfd02, 0xfd02).rw(FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask + map(0xfd03, 0xfd03).rw(FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags + map(0xfd04, 0xfd04).r(FUNC(fm7_state::fm7_fd04_r)); + map(0xfd05, 0xfd05).rw(FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); + map(0xfd06, 0xfd0c).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd0f, 0xfd0f).rw(FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); + map(0xfd10, 0xfd17).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd18, 0xfd1f).rw(FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); + map(0xfd20, 0xfd23).rw(FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); + map(0xfd24, 0xfd36).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd37, 0xfd37).w(FUNC(fm7_state::fm7_multipage_w)); + map(0xfd38, 0xfd3f).rw(FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); + map(0xfd40, 0xfdff).r(FUNC(fm7_state::fm7_unknown_r)); } void fm7_state::fm16_mem(address_map &map) @@ -1610,25 +1610,25 @@ void fm7_state::fm16_mem(address_map &map) void fm7_state::fm16_io(address_map &map) { - map(0xfd00, 0xfd01).rw(this, FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); - map(0xfd02, 0xfd02).rw(this, FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask - map(0xfd03, 0xfd03).rw(this, FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags - map(0xfd04, 0xfd04).r(this, FUNC(fm7_state::fm7_fd04_r)); - map(0xfd05, 0xfd05).rw(this, FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); + map(0xfd00, 0xfd01).rw(FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); + map(0xfd02, 0xfd02).rw(FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask + map(0xfd03, 0xfd03).rw(FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags + map(0xfd04, 0xfd04).r(FUNC(fm7_state::fm7_fd04_r)); + map(0xfd05, 0xfd05).rw(FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); // AM_RANGE(0xfd06,0xfd0c) AM_READ8(fm7_unknown_r,0xffff) - map(0xfd0f, 0xfd0f).rw(this, FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); + map(0xfd0f, 0xfd0f).rw(FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); // AM_RANGE(0xfd10,0xfd17) AM_READ8(fm7_unknown_r,0xffff) - map(0xfd18, 0xfd1f).rw(this, FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); - map(0xfd20, 0xfd23).rw(this, FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); + map(0xfd18, 0xfd1f).rw(FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); + map(0xfd20, 0xfd23).rw(FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); // AM_RANGE(0xfd24,0xfd36) AM_READ8(fm7_unknown_r,0xffff) - map(0xfd37, 0xfd37).w(this, FUNC(fm7_state::fm7_multipage_w)); - map(0xfd38, 0xfd3f).rw(this, FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); + map(0xfd37, 0xfd37).w(FUNC(fm7_state::fm7_multipage_w)); + map(0xfd38, 0xfd3f).rw(FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); // AM_RANGE(0xfd40,0xfdff) AM_READ8(fm7_unknown_r,0xffff) } void fm7_state::fm16_sub_mem(address_map &map) { - map(0x0000, 0xafff).rw(this, FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM + map(0x0000, 0xafff).rw(FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM map(0xb000, 0xffff).rom(); // subsystem ROM } @@ -1651,61 +1651,61 @@ void fm7_state::fm77av_mem(address_map &map) map(0xe000, 0xefff).rw("av_bank15", FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0xf000, 0xfbff).rw("av_bank16", FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0xfc00, 0xfc7f).ram(); - map(0xfc80, 0xfcff).rw(this, FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); + map(0xfc80, 0xfcff).rw(FUNC(fm7_state::fm7_main_shared_r), FUNC(fm7_state::fm7_main_shared_w)); // I/O space (FD00-FDFF) - map(0xfd00, 0xfd01).rw(this, FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); - map(0xfd02, 0xfd02).rw(this, FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask - map(0xfd03, 0xfd03).rw(this, FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags - map(0xfd04, 0xfd04).r(this, FUNC(fm7_state::fm7_fd04_r)); - map(0xfd05, 0xfd05).rw(this, FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); - map(0xfd06, 0xfd0a).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd0b, 0xfd0b).r(this, FUNC(fm7_state::fm77av_boot_mode_r)); - map(0xfd0c, 0xfd0c).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd0d, 0xfd0d).rw(this, FUNC(fm7_state::fm7_psg_select_r), FUNC(fm7_state::fm7_psg_select_w)); - map(0xfd0e, 0xfd0e).rw(this, FUNC(fm7_state::fm7_psg_data_r), FUNC(fm7_state::fm7_psg_data_w)); - map(0xfd0f, 0xfd0f).rw(this, FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); - map(0xfd10, 0xfd10).w(this, FUNC(fm7_state::fm7_init_en_w)); - map(0xfd11, 0xfd11).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd12, 0xfd12).rw(this, FUNC(fm7_state::fm77av_sub_modestatus_r), FUNC(fm7_state::fm77av_sub_modestatus_w)); - map(0xfd13, 0xfd13).w(this, FUNC(fm7_state::fm77av_sub_bank_w)); - map(0xfd14, 0xfd14).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd15, 0xfd15).rw(this, FUNC(fm7_state::fm7_psg_select_r), FUNC(fm7_state::fm77av_ym_select_w)); - map(0xfd16, 0xfd16).rw(this, FUNC(fm7_state::fm7_psg_data_r), FUNC(fm7_state::fm7_psg_data_w)); - map(0xfd17, 0xfd17).r(this, FUNC(fm7_state::fm7_fmirq_r)); - map(0xfd18, 0xfd1f).rw(this, FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); - map(0xfd20, 0xfd23).rw(this, FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); - map(0xfd24, 0xfd2b).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd30, 0xfd34).w(this, FUNC(fm7_state::fm77av_analog_palette_w)); - map(0xfd35, 0xfd36).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd37, 0xfd37).w(this, FUNC(fm7_state::fm7_multipage_w)); - map(0xfd38, 0xfd3f).rw(this, FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); - map(0xfd40, 0xfd7f).r(this, FUNC(fm7_state::fm7_unknown_r)); - map(0xfd80, 0xfd93).rw(this, FUNC(fm7_state::fm7_mmr_r), FUNC(fm7_state::fm7_mmr_w)); - map(0xfd94, 0xfdff).r(this, FUNC(fm7_state::fm7_unknown_r)); + map(0xfd00, 0xfd01).rw(FUNC(fm7_state::fm7_keyboard_r), FUNC(fm7_state::fm7_cassette_printer_w)); + map(0xfd02, 0xfd02).rw(FUNC(fm7_state::fm7_cassette_printer_r), FUNC(fm7_state::fm7_irq_mask_w)); // IRQ mask + map(0xfd03, 0xfd03).rw(FUNC(fm7_state::fm7_irq_cause_r), FUNC(fm7_state::fm7_beeper_w)); // IRQ flags + map(0xfd04, 0xfd04).r(FUNC(fm7_state::fm7_fd04_r)); + map(0xfd05, 0xfd05).rw(FUNC(fm7_state::fm7_subintf_r), FUNC(fm7_state::fm7_subintf_w)); + map(0xfd06, 0xfd0a).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd0b, 0xfd0b).r(FUNC(fm7_state::fm77av_boot_mode_r)); + map(0xfd0c, 0xfd0c).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd0d, 0xfd0d).rw(FUNC(fm7_state::fm7_psg_select_r), FUNC(fm7_state::fm7_psg_select_w)); + map(0xfd0e, 0xfd0e).rw(FUNC(fm7_state::fm7_psg_data_r), FUNC(fm7_state::fm7_psg_data_w)); + map(0xfd0f, 0xfd0f).rw(FUNC(fm7_state::fm7_rom_en_r), FUNC(fm7_state::fm7_rom_en_w)); + map(0xfd10, 0xfd10).w(FUNC(fm7_state::fm7_init_en_w)); + map(0xfd11, 0xfd11).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd12, 0xfd12).rw(FUNC(fm7_state::fm77av_sub_modestatus_r), FUNC(fm7_state::fm77av_sub_modestatus_w)); + map(0xfd13, 0xfd13).w(FUNC(fm7_state::fm77av_sub_bank_w)); + map(0xfd14, 0xfd14).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd15, 0xfd15).rw(FUNC(fm7_state::fm7_psg_select_r), FUNC(fm7_state::fm77av_ym_select_w)); + map(0xfd16, 0xfd16).rw(FUNC(fm7_state::fm7_psg_data_r), FUNC(fm7_state::fm7_psg_data_w)); + map(0xfd17, 0xfd17).r(FUNC(fm7_state::fm7_fmirq_r)); + map(0xfd18, 0xfd1f).rw(FUNC(fm7_state::fm7_fdc_r), FUNC(fm7_state::fm7_fdc_w)); + map(0xfd20, 0xfd23).rw(FUNC(fm7_state::fm7_kanji_r), FUNC(fm7_state::fm7_kanji_w)); + map(0xfd24, 0xfd2b).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd30, 0xfd34).w(FUNC(fm7_state::fm77av_analog_palette_w)); + map(0xfd35, 0xfd36).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd37, 0xfd37).w(FUNC(fm7_state::fm7_multipage_w)); + map(0xfd38, 0xfd3f).rw(FUNC(fm7_state::fm7_palette_r), FUNC(fm7_state::fm7_palette_w)); + map(0xfd40, 0xfd7f).r(FUNC(fm7_state::fm7_unknown_r)); + map(0xfd80, 0xfd93).rw(FUNC(fm7_state::fm7_mmr_r), FUNC(fm7_state::fm7_mmr_w)); + map(0xfd94, 0xfdff).r(FUNC(fm7_state::fm7_unknown_r)); // Boot ROM (RAM on FM77AV and later) - map(0xfe00, 0xffdf).ram().w(this, FUNC(fm7_state::fm77av_bootram_w)).share("boot_ram"); + map(0xfe00, 0xffdf).ram().w(FUNC(fm7_state::fm77av_bootram_w)).share("boot_ram"); map(0xffe0, 0xffef).ram(); - map(0xfff0, 0xffff).rw(this, FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); + map(0xfff0, 0xffff).rw(FUNC(fm7_state::vector_r), FUNC(fm7_state::vector_w)); } void fm7_state::fm77av_sub_mem(address_map &map) { - map(0x0000, 0xbfff).rw(this, FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM + map(0x0000, 0xbfff).rw(FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM map(0xc000, 0xcfff).ram().region("maincpu", 0x1c000); // Console RAM map(0xd000, 0xd37f).ram().region("maincpu", 0x1d000); // Work RAM map(0xd380, 0xd3ff).ram().share("shared_ram"); // I/O space (D400-D4FF) - map(0xd400, 0xd401).r(this, FUNC(fm7_state::fm7_sub_keyboard_r)); - map(0xd402, 0xd402).r(this, FUNC(fm7_state::fm7_cancel_ack)); - map(0xd403, 0xd403).r(this, FUNC(fm7_state::fm7_sub_beeper_r)); - map(0xd404, 0xd404).r(this, FUNC(fm7_state::fm7_attn_irq_r)); - map(0xd408, 0xd408).rw(this, FUNC(fm7_state::fm7_crt_r), FUNC(fm7_state::fm7_crt_w)); - map(0xd409, 0xd409).rw(this, FUNC(fm7_state::fm7_vram_access_r), FUNC(fm7_state::fm7_vram_access_w)); - map(0xd40a, 0xd40a).rw(this, FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); - map(0xd40e, 0xd40f).w(this, FUNC(fm7_state::fm7_vram_offset_w)); - map(0xd410, 0xd42b).rw(this, FUNC(fm7_state::fm77av_alu_r), FUNC(fm7_state::fm77av_alu_w)); - map(0xd430, 0xd430).rw(this, FUNC(fm7_state::fm77av_video_flags_r), FUNC(fm7_state::fm77av_video_flags_w)); - map(0xd431, 0xd432).rw(this, FUNC(fm7_state::fm77av_key_encoder_r), FUNC(fm7_state::fm77av_key_encoder_w)); + map(0xd400, 0xd401).r(FUNC(fm7_state::fm7_sub_keyboard_r)); + map(0xd402, 0xd402).r(FUNC(fm7_state::fm7_cancel_ack)); + map(0xd403, 0xd403).r(FUNC(fm7_state::fm7_sub_beeper_r)); + map(0xd404, 0xd404).r(FUNC(fm7_state::fm7_attn_irq_r)); + map(0xd408, 0xd408).rw(FUNC(fm7_state::fm7_crt_r), FUNC(fm7_state::fm7_crt_w)); + map(0xd409, 0xd409).rw(FUNC(fm7_state::fm7_vram_access_r), FUNC(fm7_state::fm7_vram_access_w)); + map(0xd40a, 0xd40a).rw(FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); + map(0xd40e, 0xd40f).w(FUNC(fm7_state::fm7_vram_offset_w)); + map(0xd410, 0xd42b).rw(FUNC(fm7_state::fm77av_alu_r), FUNC(fm7_state::fm77av_alu_w)); + map(0xd430, 0xd430).rw(FUNC(fm7_state::fm77av_video_flags_r), FUNC(fm7_state::fm77av_video_flags_w)); + map(0xd431, 0xd432).rw(FUNC(fm7_state::fm77av_key_encoder_r), FUNC(fm7_state::fm77av_key_encoder_w)); map(0xd500, 0xd7ff).ram().region("maincpu", 0x1d500); // Work RAM map(0xd800, 0xdfff).bankr("bank20"); map(0xe000, 0xffff).bankr("bank21"); @@ -1717,22 +1717,22 @@ void fm7_state::fm7_banked_mem(address_map &map) map(0x00000, 0x0ffff).ram().region("maincpu", 0x00000); // Sub CPU space - map(0x10000, 0x1bfff).rw(this, FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM + map(0x10000, 0x1bfff).rw(FUNC(fm7_state::fm7_vram_r), FUNC(fm7_state::fm7_vram_w)); // VRAM map(0x1c000, 0x1cfff).ram().region("maincpu", 0x1c000); // Console RAM map(0x1d000, 0x1d37f).ram().region("maincpu", 0x1d000); // Work RAM map(0x1d380, 0x1d3ff).ram().share("shared_ram"); // I/O space (D400-D4FF) - map(0x1d400, 0x1d401).r(this, FUNC(fm7_state::fm7_sub_keyboard_r)); - map(0x1d402, 0x1d402).r(this, FUNC(fm7_state::fm7_cancel_ack)); - map(0x1d403, 0x1d403).r(this, FUNC(fm7_state::fm7_sub_beeper_r)); - map(0x1d404, 0x1d404).r(this, FUNC(fm7_state::fm7_attn_irq_r)); - map(0x1d408, 0x1d408).rw(this, FUNC(fm7_state::fm7_crt_r), FUNC(fm7_state::fm7_crt_w)); - map(0x1d409, 0x1d409).rw(this, FUNC(fm7_state::fm7_vram_access_r), FUNC(fm7_state::fm7_vram_access_w)); - map(0x1d40a, 0x1d40a).rw(this, FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); - map(0x1d40e, 0x1d40f).w(this, FUNC(fm7_state::fm7_vram_offset_w)); - map(0x1d410, 0x1d42b).rw(this, FUNC(fm7_state::fm77av_alu_r), FUNC(fm7_state::fm77av_alu_w)); - map(0x1d430, 0x1d430).rw(this, FUNC(fm7_state::fm77av_video_flags_r), FUNC(fm7_state::fm77av_video_flags_w)); - map(0x1d431, 0x1d432).rw(this, FUNC(fm7_state::fm77av_key_encoder_r), FUNC(fm7_state::fm77av_key_encoder_w)); + map(0x1d400, 0x1d401).r(FUNC(fm7_state::fm7_sub_keyboard_r)); + map(0x1d402, 0x1d402).r(FUNC(fm7_state::fm7_cancel_ack)); + map(0x1d403, 0x1d403).r(FUNC(fm7_state::fm7_sub_beeper_r)); + map(0x1d404, 0x1d404).r(FUNC(fm7_state::fm7_attn_irq_r)); + map(0x1d408, 0x1d408).rw(FUNC(fm7_state::fm7_crt_r), FUNC(fm7_state::fm7_crt_w)); + map(0x1d409, 0x1d409).rw(FUNC(fm7_state::fm7_vram_access_r), FUNC(fm7_state::fm7_vram_access_w)); + map(0x1d40a, 0x1d40a).rw(FUNC(fm7_state::fm7_sub_busyflag_r), FUNC(fm7_state::fm7_sub_busyflag_w)); + map(0x1d40e, 0x1d40f).w(FUNC(fm7_state::fm7_vram_offset_w)); + map(0x1d410, 0x1d42b).rw(FUNC(fm7_state::fm77av_alu_r), FUNC(fm7_state::fm77av_alu_w)); + map(0x1d430, 0x1d430).rw(FUNC(fm7_state::fm77av_video_flags_r), FUNC(fm7_state::fm77av_video_flags_w)); + map(0x1d431, 0x1d432).rw(FUNC(fm7_state::fm77av_key_encoder_r), FUNC(fm7_state::fm77av_key_encoder_w)); map(0x1d500, 0x1d7ff).ram().region("maincpu", 0x1d500); // Work RAM map(0x1d800, 0x1dfff).bankr("bank20"); map(0x1e000, 0x1ffff).bankr("bank21"); diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index 46fab8b21ef..20de8512052 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2182,26 +2182,26 @@ void towns_state::towns_mem(address_map &map) // memory map based on FM-Towns/Bochs (Bochs modified to emulate the FM-Towns) // may not be (and probably is not) correct map(0x00000000, 0x000bffff).ram(); - map(0x000c0000, 0x000c7fff).rw(this, FUNC(towns_state::towns_gfx_r), FUNC(towns_state::towns_gfx_w)); - map(0x000c8000, 0x000cafff).rw(this, FUNC(towns_state::towns_spriteram_low_r), FUNC(towns_state::towns_spriteram_low_w)); + map(0x000c0000, 0x000c7fff).rw(FUNC(towns_state::towns_gfx_r), FUNC(towns_state::towns_gfx_w)); + map(0x000c8000, 0x000cafff).rw(FUNC(towns_state::towns_spriteram_low_r), FUNC(towns_state::towns_spriteram_low_w)); map(0x000cb000, 0x000cbfff).bankr("bank_cb000_r").bankw("bank_cb000_w"); map(0x000cc000, 0x000cff7f).ram(); - map(0x000cff80, 0x000cffff).rw(this, FUNC(towns_state::towns_video_cff80_mem_r), FUNC(towns_state::towns_video_cff80_mem_w)); + map(0x000cff80, 0x000cffff).rw(FUNC(towns_state::towns_video_cff80_mem_r), FUNC(towns_state::towns_video_cff80_mem_w)); map(0x000d0000, 0x000d7fff).ram(); - map(0x000d8000, 0x000d9fff).rw(this, FUNC(towns_state::towns_cmos_low_r), FUNC(towns_state::towns_cmos_low_w)).share("nvram"); // CMOS? RAM + map(0x000d8000, 0x000d9fff).rw(FUNC(towns_state::towns_cmos_low_r), FUNC(towns_state::towns_cmos_low_w)).share("nvram"); // CMOS? RAM map(0x000da000, 0x000effff).ram(); //READWRITE(SMH_BANK(11),SMH_BANK(11)) map(0x000f0000, 0x000f7fff).ram(); //READWRITE(SMH_BANK(12),SMH_BANK(12)) map(0x000f8000, 0x000fffff).bankr("bank_f8000_r").bankw("bank_f8000_w"); // AM_RANGE(0x00100000, 0x005fffff) AM_RAM // some extra RAM - map(0x80000000, 0x8007ffff).rw(this, FUNC(towns_state::towns_gfx_high_r), FUNC(towns_state::towns_gfx_high_w)).mirror(0x80000); // VRAM - map(0x80100000, 0x8017ffff).rw(this, FUNC(towns_state::towns_gfx_packed_r), FUNC(towns_state::towns_gfx_packed_w)).mirror(0x80000); // VRAM - map(0x81000000, 0x8101ffff).rw(this, FUNC(towns_state::towns_spriteram_r), FUNC(towns_state::towns_spriteram_w)); // Sprite RAM + map(0x80000000, 0x8007ffff).rw(FUNC(towns_state::towns_gfx_high_r), FUNC(towns_state::towns_gfx_high_w)).mirror(0x80000); // VRAM + map(0x80100000, 0x8017ffff).rw(FUNC(towns_state::towns_gfx_packed_r), FUNC(towns_state::towns_gfx_packed_w)).mirror(0x80000); // VRAM + map(0x81000000, 0x8101ffff).rw(FUNC(towns_state::towns_spriteram_r), FUNC(towns_state::towns_spriteram_w)); // Sprite RAM map(0xc0000000, 0xc0ffffff).rw(m_icmemcard, FUNC(fmt_icmem_device::static_mem_read), FUNC(fmt_icmem_device::static_mem_write)); map(0xc1000000, 0xc1ffffff).rw(m_icmemcard, FUNC(fmt_icmem_device::mem_read), FUNC(fmt_icmem_device::mem_write)); map(0xc2000000, 0xc207ffff).rom().region("user", 0x000000); // OS ROM map(0xc2080000, 0xc20fffff).rom().region("user", 0x100000); // DIC ROM map(0xc2100000, 0xc213ffff).rom().region("user", 0x180000); // FONT ROM - map(0xc2140000, 0xc2141fff).rw(this, FUNC(towns_state::towns_cmos_r), FUNC(towns_state::towns_cmos_w)); // CMOS (mirror?) + map(0xc2140000, 0xc2141fff).rw(FUNC(towns_state::towns_cmos_r), FUNC(towns_state::towns_cmos_w)); // CMOS (mirror?) map(0xc2180000, 0xc21fffff).rom().region("user", 0x080000); // F20 ROM map(0xc2200000, 0xc2200fff).rw("pcm", FUNC(rf5c68_device::rf5c68_mem_r), FUNC(rf5c68_device::rf5c68_mem_w)); // WAVE RAM map(0xfffc0000, 0xffffffff).rom().region("user", 0x200000); // SYSTEM ROM @@ -2210,22 +2210,22 @@ void towns_state::towns_mem(address_map &map) void towns_state::marty_mem(address_map &map) { map(0x00000000, 0x000bffff).ram(); - map(0x000c0000, 0x000c7fff).rw(this, FUNC(towns_state::towns_gfx_r), FUNC(towns_state::towns_gfx_w)); - map(0x000c8000, 0x000cafff).rw(this, FUNC(towns_state::towns_spriteram_low_r), FUNC(towns_state::towns_spriteram_low_w)); + map(0x000c0000, 0x000c7fff).rw(FUNC(towns_state::towns_gfx_r), FUNC(towns_state::towns_gfx_w)); + map(0x000c8000, 0x000cafff).rw(FUNC(towns_state::towns_spriteram_low_r), FUNC(towns_state::towns_spriteram_low_w)); map(0x000cb000, 0x000cbfff).bankr("bank_cb000_r").bankw("bank_cb000_w"); map(0x000cc000, 0x000cff7f).ram(); - map(0x000cff80, 0x000cffff).rw(this, FUNC(towns_state::towns_video_cff80_mem_r), FUNC(towns_state::towns_video_cff80_mem_w)); + map(0x000cff80, 0x000cffff).rw(FUNC(towns_state::towns_video_cff80_mem_r), FUNC(towns_state::towns_video_cff80_mem_w)); map(0x000d0000, 0x000d7fff).ram(); - map(0x000d8000, 0x000d9fff).rw(this, FUNC(towns_state::towns_cmos_low_r), FUNC(towns_state::towns_cmos_low_w)).share("nvram16"); // CMOS? RAM + map(0x000d8000, 0x000d9fff).rw(FUNC(towns_state::towns_cmos_low_r), FUNC(towns_state::towns_cmos_low_w)).share("nvram16"); // CMOS? RAM map(0x000da000, 0x000effff).ram(); //READWRITE(SMH_BANK(11),SMH_BANK(11)) map(0x000f0000, 0x000f7fff).ram(); //READWRITE(SMH_BANK(12),SMH_BANK(12)) map(0x000f8000, 0x000fffff).bankr("bank_f8000_r").bankw("bank_f8000_w"); // AM_RANGE(0x00100000, 0x005fffff) AM_RAM // some extra RAM - the Marty has 6MB RAM (not upgradable) map(0x00600000, 0x0067ffff).rom().region("user", 0x000000); // OS map(0x00680000, 0x0087ffff).rom().region("user", 0x280000); // EX ROM - map(0x00a00000, 0x00a7ffff).rw(this, FUNC(towns_state::towns_gfx_high_r), FUNC(towns_state::towns_gfx_high_w)).mirror(0x180000); // VRAM + map(0x00a00000, 0x00a7ffff).rw(FUNC(towns_state::towns_gfx_high_r), FUNC(towns_state::towns_gfx_high_w)).mirror(0x180000); // VRAM map(0x00b00000, 0x00b7ffff).rom().region("user", 0x180000); // FONT - map(0x00c00000, 0x00c1ffff).rw(this, FUNC(towns_state::towns_spriteram_r), FUNC(towns_state::towns_spriteram_w)); // Sprite RAM + map(0x00c00000, 0x00c1ffff).rw(FUNC(towns_state::towns_spriteram_r), FUNC(towns_state::towns_spriteram_w)); // Sprite RAM map(0x00d00000, 0x00dfffff).rw(m_icmemcard, FUNC(fmt_icmem_device::mem_read), FUNC(fmt_icmem_device::mem_write)); map(0x00e80000, 0x00efffff).rom().region("user", 0x100000); // DIC ROM map(0x00f00000, 0x00f7ffff).rom().region("user", 0x180000); // FONT @@ -2236,20 +2236,20 @@ void towns_state::marty_mem(address_map &map) void towns_state::ux_mem(address_map &map) { map(0x00000000, 0x000bffff).ram(); - map(0x000c0000, 0x000c7fff).rw(this, FUNC(towns_state::towns_gfx_r), FUNC(towns_state::towns_gfx_w)); - map(0x000c8000, 0x000cafff).rw(this, FUNC(towns_state::towns_spriteram_low_r), FUNC(towns_state::towns_spriteram_low_w)); + map(0x000c0000, 0x000c7fff).rw(FUNC(towns_state::towns_gfx_r), FUNC(towns_state::towns_gfx_w)); + map(0x000c8000, 0x000cafff).rw(FUNC(towns_state::towns_spriteram_low_r), FUNC(towns_state::towns_spriteram_low_w)); map(0x000cb000, 0x000cbfff).bankr("bank_cb000_r").bankw("bank_cb000_w"); map(0x000cc000, 0x000cff7f).ram(); - map(0x000cff80, 0x000cffff).rw(this, FUNC(towns_state::towns_video_cff80_mem_r), FUNC(towns_state::towns_video_cff80_mem_w)); + map(0x000cff80, 0x000cffff).rw(FUNC(towns_state::towns_video_cff80_mem_r), FUNC(towns_state::towns_video_cff80_mem_w)); map(0x000d0000, 0x000d7fff).ram(); - map(0x000d8000, 0x000d9fff).rw(this, FUNC(towns_state::towns_cmos_low_r), FUNC(towns_state::towns_cmos_low_w)).share("nvram16"); // CMOS? RAM + map(0x000d8000, 0x000d9fff).rw(FUNC(towns_state::towns_cmos_low_r), FUNC(towns_state::towns_cmos_low_w)).share("nvram16"); // CMOS? RAM map(0x000da000, 0x000effff).ram(); //READWRITE(SMH_BANK(11),SMH_BANK(11)) map(0x000f0000, 0x000f7fff).ram(); //READWRITE(SMH_BANK(12),SMH_BANK(12)) map(0x000f8000, 0x000fffff).bankr("bank_f8000_r").bankw("bank_f8000_w"); // AM_RANGE(0x00680000, 0x0087ffff) AM_ROM AM_REGION("user",0x280000) // EX ROM - map(0x00a00000, 0x00a7ffff).rw(this, FUNC(towns_state::towns_gfx_high_r), FUNC(towns_state::towns_gfx_high_w)).mirror(0x180000); // VRAM + map(0x00a00000, 0x00a7ffff).rw(FUNC(towns_state::towns_gfx_high_r), FUNC(towns_state::towns_gfx_high_w)).mirror(0x180000); // VRAM map(0x00b00000, 0x00b7ffff).rom().region("user", 0x180000); // FONT - map(0x00c00000, 0x00c1ffff).rw(this, FUNC(towns_state::towns_spriteram_r), FUNC(towns_state::towns_spriteram_w)); // Sprite RAM + map(0x00c00000, 0x00c1ffff).rw(FUNC(towns_state::towns_spriteram_r), FUNC(towns_state::towns_spriteram_w)); // Sprite RAM map(0x00d00000, 0x00dfffff).rw(m_icmemcard, FUNC(fmt_icmem_device::mem_read), FUNC(fmt_icmem_device::mem_write)); map(0x00e00000, 0x00e7ffff).rom().region("user", 0x000000); // OS map(0x00e80000, 0x00efffff).rom().region("user", 0x100000); // DIC ROM @@ -2265,57 +2265,57 @@ void towns_state::towns_io(address_map &map) map.unmap_value_high(); map(0x0000, 0x0003).rw(m_pic_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask32(0x00ff00ff); map(0x0010, 0x0013).rw(m_pic_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask32(0x00ff00ff); - map(0x0020, 0x0033).rw(this, FUNC(towns_state::towns_system_r), FUNC(towns_state::towns_system_w)); + map(0x0020, 0x0033).rw(FUNC(towns_state::towns_system_r), FUNC(towns_state::towns_system_w)); map(0x0040, 0x0047).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask32(0x00ff00ff); map(0x0050, 0x0057).rw("pit2", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask32(0x00ff00ff); - map(0x0060, 0x0060).rw(this, FUNC(towns_state::towns_port60_r), FUNC(towns_state::towns_port60_w)); - map(0x0068, 0x006b).rw(this, FUNC(towns_state::towns_intervaltimer2_r), FUNC(towns_state::towns_intervaltimer2_w)); - map(0x006c, 0x006c).rw(this, FUNC(towns_state::towns_sys6c_r), FUNC(towns_state::towns_sys6c_w)); + map(0x0060, 0x0060).rw(FUNC(towns_state::towns_port60_r), FUNC(towns_state::towns_port60_w)); + map(0x0068, 0x006b).rw(FUNC(towns_state::towns_intervaltimer2_r), FUNC(towns_state::towns_intervaltimer2_w)); + map(0x006c, 0x006c).rw(FUNC(towns_state::towns_sys6c_r), FUNC(towns_state::towns_sys6c_w)); // 0x0070/0x0080 - CMOS RTC - map(0x0070, 0x0070).rw(this, FUNC(towns_state::towns_rtc_r), FUNC(towns_state::towns_rtc_w)); - map(0x0080, 0x0080).w(this, FUNC(towns_state::towns_rtc_select_w)); + map(0x0070, 0x0070).rw(FUNC(towns_state::towns_rtc_r), FUNC(towns_state::towns_rtc_w)); + map(0x0080, 0x0080).w(FUNC(towns_state::towns_rtc_select_w)); // DMA controllers (uPD71071) - map(0x00a0, 0x00af).rw(this, FUNC(towns_state::towns_dma_r<0>), FUNC(towns_state::towns_dma_w<0>)); - map(0x00b0, 0x00bf).rw(this, FUNC(towns_state::towns_dma_r<1>), FUNC(towns_state::towns_dma_w<1>)); + map(0x00a0, 0x00af).rw(FUNC(towns_state::towns_dma_r<0>), FUNC(towns_state::towns_dma_w<0>)); + map(0x00b0, 0x00bf).rw(FUNC(towns_state::towns_dma_r<1>), FUNC(towns_state::towns_dma_w<1>)); // Floppy controller - map(0x0200, 0x020f).rw(this, FUNC(towns_state::towns_floppy_r), FUNC(towns_state::towns_floppy_w)); + map(0x0200, 0x020f).rw(FUNC(towns_state::towns_floppy_r), FUNC(towns_state::towns_floppy_w)); // CRTC / Video - map(0x0400, 0x0400).r(this, FUNC(towns_state::towns_video_unknown_r)); // R/O (0x400) - map(0x0404, 0x0404).rw(this, FUNC(towns_state::towns_video_404_r), FUNC(towns_state::towns_video_404_w)); // R/W (0x404) - map(0x0440, 0x045f).rw(this, FUNC(towns_state::towns_video_440_r), FUNC(towns_state::towns_video_440_w)); + map(0x0400, 0x0400).r(FUNC(towns_state::towns_video_unknown_r)); // R/O (0x400) + map(0x0404, 0x0404).rw(FUNC(towns_state::towns_video_404_r), FUNC(towns_state::towns_video_404_w)); // R/W (0x404) + map(0x0440, 0x045f).rw(FUNC(towns_state::towns_video_440_r), FUNC(towns_state::towns_video_440_w)); // System port - map(0x0480, 0x0480).rw(this, FUNC(towns_state::towns_sys480_r), FUNC(towns_state::towns_sys480_w)); // R/W (0x480) + map(0x0480, 0x0480).rw(FUNC(towns_state::towns_sys480_r), FUNC(towns_state::towns_sys480_w)); // R/W (0x480) // IC Memory Card map(0x048a, 0x048a).r(m_icmemcard, FUNC(fmt_icmem_device::status_r)); map(0x0490, 0x0491).rw(m_icmemcard, FUNC(fmt_icmem_device::bank_r), FUNC(fmt_icmem_device::bank_w)); // CD-ROM - map(0x04c0, 0x04cf).rw(this, FUNC(towns_state::towns_cdrom_r), FUNC(towns_state::towns_cdrom_w)).umask32(0x00ff00ff); + map(0x04c0, 0x04cf).rw(FUNC(towns_state::towns_cdrom_r), FUNC(towns_state::towns_cdrom_w)).umask32(0x00ff00ff); // Joystick / Mouse ports - map(0x04d0, 0x04d3).r(this, FUNC(towns_state::towns_padport_r)).umask32(0x00ff00ff); - map(0x04d6, 0x04d6).w(this, FUNC(towns_state::towns_pad_mask_w)); + map(0x04d0, 0x04d3).r(FUNC(towns_state::towns_padport_r)).umask32(0x00ff00ff); + map(0x04d6, 0x04d6).w(FUNC(towns_state::towns_pad_mask_w)); // Sound (YM3438 [FM], RF5c68 [PCM]) map(0x04d8, 0x04df).rw("fm", FUNC(ym3438_device::read), FUNC(ym3438_device::write)).umask32(0x00ff00ff); - map(0x04e0, 0x04e3).rw(this, FUNC(towns_state::towns_volume_r), FUNC(towns_state::towns_volume_w)); // R/W -- volume ports - map(0x04e4, 0x04e7).r(this, FUNC(towns_state::unksnd_r)); - map(0x04e8, 0x04ef).rw(this, FUNC(towns_state::towns_sound_ctrl_r), FUNC(towns_state::towns_sound_ctrl_w)); + map(0x04e0, 0x04e3).rw(FUNC(towns_state::towns_volume_r), FUNC(towns_state::towns_volume_w)); // R/W -- volume ports + map(0x04e4, 0x04e7).r(FUNC(towns_state::unksnd_r)); + map(0x04e8, 0x04ef).rw(FUNC(towns_state::towns_sound_ctrl_r), FUNC(towns_state::towns_sound_ctrl_w)); map(0x04f0, 0x04fb).w("pcm", FUNC(rf5c68_device::rf5c68_w)); // CRTC / Video - map(0x05c8, 0x05cb).rw(this, FUNC(towns_state::towns_video_5c8_r), FUNC(towns_state::towns_video_5c8_w)); + map(0x05c8, 0x05cb).rw(FUNC(towns_state::towns_video_5c8_r), FUNC(towns_state::towns_video_5c8_w)); // System ports - map(0x05e8, 0x05ef).rw(this, FUNC(towns_state::towns_sys5e8_r), FUNC(towns_state::towns_sys5e8_w)).umask32(0x00ff00ff); + map(0x05e8, 0x05ef).rw(FUNC(towns_state::towns_sys5e8_r), FUNC(towns_state::towns_sys5e8_w)).umask32(0x00ff00ff); // Keyboard (8042 MCU) - map(0x0600, 0x0607).rw(this, FUNC(towns_state::towns_keyboard_r), FUNC(towns_state::towns_keyboard_w)).umask32(0x00ff00ff); + map(0x0600, 0x0607).rw(FUNC(towns_state::towns_keyboard_r), FUNC(towns_state::towns_keyboard_w)).umask32(0x00ff00ff); // RS-232C interface - map(0x0a00, 0x0a0b).rw(this, FUNC(towns_state::towns_serial_r), FUNC(towns_state::towns_serial_w)).umask32(0x00ff00ff); + map(0x0a00, 0x0a0b).rw(FUNC(towns_state::towns_serial_r), FUNC(towns_state::towns_serial_w)).umask32(0x00ff00ff); // SCSI controller map(0x0c30, 0x0c37).rw("fmscsi", FUNC(fmscsi_device::fmscsi_r), FUNC(fmscsi_device::fmscsi_w)).umask32(0x00ff00ff); // CMOS - map(0x3000, 0x4fff).rw(this, FUNC(towns_state::towns_cmos_r), FUNC(towns_state::towns_cmos_w)).umask32(0x00ff00ff); + map(0x3000, 0x4fff).rw(FUNC(towns_state::towns_cmos_r), FUNC(towns_state::towns_cmos_w)).umask32(0x00ff00ff); // Something (MS-DOS wants this 0x41ff to be 1) //AM_RANGE(0x41fc,0x41ff) AM_READ8(towns_41ff_r,0xff000000) // CRTC / Video (again) - map(0xfd90, 0xfda3).rw(this, FUNC(towns_state::towns_video_fd90_r), FUNC(towns_state::towns_video_fd90_w)); - map(0xff80, 0xffff).rw(this, FUNC(towns_state::towns_video_cff80_r), FUNC(towns_state::towns_video_cff80_w)); + map(0xfd90, 0xfda3).rw(FUNC(towns_state::towns_video_fd90_r), FUNC(towns_state::towns_video_fd90_w)); + map(0xff80, 0xffff).rw(FUNC(towns_state::towns_video_cff80_r), FUNC(towns_state::towns_video_cff80_w)); } void towns_state::towns16_io(address_map &map) @@ -2324,57 +2324,57 @@ void towns_state::towns16_io(address_map &map) map.unmap_value_high(); map(0x0000, 0x0003).rw(m_pic_master, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x0010, 0x0013).rw(m_pic_slave, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x0020, 0x0033).rw(this, FUNC(towns_state::towns_system_r), FUNC(towns_state::towns_system_w)); + map(0x0020, 0x0033).rw(FUNC(towns_state::towns_system_r), FUNC(towns_state::towns_system_w)); map(0x0040, 0x0047).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0x0050, 0x0057).rw("pit2", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); - map(0x0060, 0x0060).rw(this, FUNC(towns_state::towns_port60_r), FUNC(towns_state::towns_port60_w)); - map(0x0068, 0x006b).rw(this, FUNC(towns_state::towns_intervaltimer2_r), FUNC(towns_state::towns_intervaltimer2_w)); - map(0x006c, 0x006c).rw(this, FUNC(towns_state::towns_sys6c_r), FUNC(towns_state::towns_sys6c_w)); + map(0x0060, 0x0060).rw(FUNC(towns_state::towns_port60_r), FUNC(towns_state::towns_port60_w)); + map(0x0068, 0x006b).rw(FUNC(towns_state::towns_intervaltimer2_r), FUNC(towns_state::towns_intervaltimer2_w)); + map(0x006c, 0x006c).rw(FUNC(towns_state::towns_sys6c_r), FUNC(towns_state::towns_sys6c_w)); // 0x0070/0x0080 - CMOS RTC - map(0x0070, 0x0070).rw(this, FUNC(towns_state::towns_rtc_r), FUNC(towns_state::towns_rtc_w)); - map(0x0080, 0x0080).w(this, FUNC(towns_state::towns_rtc_select_w)); + map(0x0070, 0x0070).rw(FUNC(towns_state::towns_rtc_r), FUNC(towns_state::towns_rtc_w)); + map(0x0080, 0x0080).w(FUNC(towns_state::towns_rtc_select_w)); // DMA controllers (uPD71071) - map(0x00a0, 0x00af).rw(this, FUNC(towns_state::towns_dma_r<0>), FUNC(towns_state::towns_dma_w<0>)); - map(0x00b0, 0x00bf).rw(this, FUNC(towns_state::towns_dma_r<1>), FUNC(towns_state::towns_dma_w<1>)); + map(0x00a0, 0x00af).rw(FUNC(towns_state::towns_dma_r<0>), FUNC(towns_state::towns_dma_w<0>)); + map(0x00b0, 0x00bf).rw(FUNC(towns_state::towns_dma_r<1>), FUNC(towns_state::towns_dma_w<1>)); // Floppy controller - map(0x0200, 0x020f).rw(this, FUNC(towns_state::towns_floppy_r), FUNC(towns_state::towns_floppy_w)); + map(0x0200, 0x020f).rw(FUNC(towns_state::towns_floppy_r), FUNC(towns_state::towns_floppy_w)); // CRTC / Video - map(0x0400, 0x0400).r(this, FUNC(towns_state::towns_video_unknown_r)); // R/O (0x400) - map(0x0404, 0x0407).rw(this, FUNC(towns_state::towns_video_404_r), FUNC(towns_state::towns_video_404_w)); // R/W (0x404) - map(0x0440, 0x045f).rw(this, FUNC(towns_state::towns_video_440_r), FUNC(towns_state::towns_video_440_w)); + map(0x0400, 0x0400).r(FUNC(towns_state::towns_video_unknown_r)); // R/O (0x400) + map(0x0404, 0x0407).rw(FUNC(towns_state::towns_video_404_r), FUNC(towns_state::towns_video_404_w)); // R/W (0x404) + map(0x0440, 0x045f).rw(FUNC(towns_state::towns_video_440_r), FUNC(towns_state::towns_video_440_w)); // System port - map(0x0480, 0x0480).rw(this, FUNC(towns_state::towns_sys480_r), FUNC(towns_state::towns_sys480_w)); // R/W (0x480) + map(0x0480, 0x0480).rw(FUNC(towns_state::towns_sys480_r), FUNC(towns_state::towns_sys480_w)); // R/W (0x480) // IC Memory Card map(0x048a, 0x048a).r(m_icmemcard, FUNC(fmt_icmem_device::status_r)); map(0x0490, 0x0491).rw(m_icmemcard, FUNC(fmt_icmem_device::bank_r), FUNC(fmt_icmem_device::bank_w)); // CD-ROM - map(0x04c0, 0x04cf).rw(this, FUNC(towns_state::towns_cdrom_r), FUNC(towns_state::towns_cdrom_w)).umask16(0x00ff); + map(0x04c0, 0x04cf).rw(FUNC(towns_state::towns_cdrom_r), FUNC(towns_state::towns_cdrom_w)).umask16(0x00ff); // Joystick / Mouse ports - map(0x04d0, 0x04d3).r(this, FUNC(towns_state::towns_padport_r)).umask16(0x00ff); - map(0x04d6, 0x04d6).w(this, FUNC(towns_state::towns_pad_mask_w)); + map(0x04d0, 0x04d3).r(FUNC(towns_state::towns_padport_r)).umask16(0x00ff); + map(0x04d6, 0x04d6).w(FUNC(towns_state::towns_pad_mask_w)); // Sound (YM3438 [FM], RF5c68 [PCM]) map(0x04d8, 0x04df).rw("fm", FUNC(ym3438_device::read), FUNC(ym3438_device::write)).umask16(0x00ff); - map(0x04e0, 0x04e3).rw(this, FUNC(towns_state::towns_volume_r), FUNC(towns_state::towns_volume_w)); // R/W -- volume ports - map(0x04e4, 0x04e7).r(this, FUNC(towns_state::unksnd_r)); - map(0x04e8, 0x04ef).rw(this, FUNC(towns_state::towns_sound_ctrl_r), FUNC(towns_state::towns_sound_ctrl_w)); + map(0x04e0, 0x04e3).rw(FUNC(towns_state::towns_volume_r), FUNC(towns_state::towns_volume_w)); // R/W -- volume ports + map(0x04e4, 0x04e7).r(FUNC(towns_state::unksnd_r)); + map(0x04e8, 0x04ef).rw(FUNC(towns_state::towns_sound_ctrl_r), FUNC(towns_state::towns_sound_ctrl_w)); map(0x04f0, 0x04fb).w("pcm", FUNC(rf5c68_device::rf5c68_w)); // CRTC / Video - map(0x05c8, 0x05cb).rw(this, FUNC(towns_state::towns_video_5c8_r), FUNC(towns_state::towns_video_5c8_w)); + map(0x05c8, 0x05cb).rw(FUNC(towns_state::towns_video_5c8_r), FUNC(towns_state::towns_video_5c8_w)); // System ports - map(0x05e8, 0x05ef).rw(this, FUNC(towns_state::towns_sys5e8_r), FUNC(towns_state::towns_sys5e8_w)).umask16(0x00ff); + map(0x05e8, 0x05ef).rw(FUNC(towns_state::towns_sys5e8_r), FUNC(towns_state::towns_sys5e8_w)).umask16(0x00ff); // Keyboard (8042 MCU) - map(0x0600, 0x0607).rw(this, FUNC(towns_state::towns_keyboard_r), FUNC(towns_state::towns_keyboard_w)).umask16(0x00ff); + map(0x0600, 0x0607).rw(FUNC(towns_state::towns_keyboard_r), FUNC(towns_state::towns_keyboard_w)).umask16(0x00ff); // RS-232C interface - map(0x0a00, 0x0a0b).rw(this, FUNC(towns_state::towns_serial_r), FUNC(towns_state::towns_serial_w)).umask16(0x00ff); + map(0x0a00, 0x0a0b).rw(FUNC(towns_state::towns_serial_r), FUNC(towns_state::towns_serial_w)).umask16(0x00ff); // SCSI controller map(0x0c30, 0x0c37).rw("fmscsi", FUNC(fmscsi_device::fmscsi_r), FUNC(fmscsi_device::fmscsi_w)).umask16(0x00ff); // CMOS - map(0x3000, 0x4fff).rw(this, FUNC(towns_state::towns_cmos_r), FUNC(towns_state::towns_cmos_w)).umask16(0x00ff); + map(0x3000, 0x4fff).rw(FUNC(towns_state::towns_cmos_r), FUNC(towns_state::towns_cmos_w)).umask16(0x00ff); // Something (MS-DOS wants this 0x41ff to be 1) //AM_RANGE(0x41fc,0x41ff) AM_READ8(towns_41ff_r,0xff000000) // CRTC / Video (again) - map(0xfd90, 0xfda3).rw(this, FUNC(towns_state::towns_video_fd90_r), FUNC(towns_state::towns_video_fd90_w)); - map(0xff80, 0xffff).rw(this, FUNC(towns_state::towns_video_cff80_r), FUNC(towns_state::towns_video_cff80_w)); + map(0xfd90, 0xfda3).rw(FUNC(towns_state::towns_video_fd90_r), FUNC(towns_state::towns_video_fd90_w)); + map(0xff80, 0xffff).rw(FUNC(towns_state::towns_video_cff80_r), FUNC(towns_state::towns_video_cff80_w)); } void towns_state::pcm_mem(address_map &map) diff --git a/src/mame/drivers/fontwriter.cpp b/src/mame/drivers/fontwriter.cpp index 62e1afd8b68..25de2f3b850 100644 --- a/src/mame/drivers/fontwriter.cpp +++ b/src/mame/drivers/fontwriter.cpp @@ -85,7 +85,7 @@ void fontwriter_state::main_map(address_map &map) void fontwriter_state::io_map(address_map &map) { - map(M37710_PORT6, M37710_PORT6).r(this, FUNC(fontwriter_state::vbl_r)); + map(M37710_PORT6, M37710_PORT6).r(FUNC(fontwriter_state::vbl_r)); } static INPUT_PORTS_START( fontwriter ) diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp index 41435bd8ec4..7a838b8d439 100644 --- a/src/mame/drivers/foodf.cpp +++ b/src/mame/drivers/foodf.cpp @@ -199,9 +199,9 @@ void foodf_state::main_map(address_map &map) map(0x940001, 0x940001).mirror(0x023ffe).r("adc", FUNC(adc0809_device::data_r)); map(0x944000, 0x944007).mirror(0x023ff8).w("adc", FUNC(adc0809_device::address_offset_start_w)).umask16(0x00ff); map(0x948000, 0x948001).mirror(0x023ffe).portr("SYSTEM"); - map(0x948001, 0x948001).mirror(0x023ffe).w(this, FUNC(foodf_state::digital_w)); - map(0x950000, 0x9501ff).mirror(0x023e00).w(this, FUNC(foodf_state::foodf_paletteram_w)).share("paletteram"); - map(0x954000, 0x954001).mirror(0x023ffe).w(this, FUNC(foodf_state::nvram_recall_w)); + map(0x948001, 0x948001).mirror(0x023ffe).w(FUNC(foodf_state::digital_w)); + map(0x950000, 0x9501ff).mirror(0x023e00).w(FUNC(foodf_state::foodf_paletteram_w)).share("paletteram"); + map(0x954000, 0x954001).mirror(0x023ffe).w(FUNC(foodf_state::nvram_recall_w)); map(0x958000, 0x958001).mirror(0x023ffe).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); map(0xa40000, 0xa4001f).mirror(0x03ffe0).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)).umask16(0x00ff); map(0xa80000, 0xa8001f).mirror(0x03ffe0).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)).umask16(0x00ff); diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index 0eac5d21e9b..80f2da7131b 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -236,7 +236,7 @@ private: void force68k_state::force68k_mem(address_map &map) { map.unmap_value_high(); - map(0x000000, 0x000007).rom().r(this, FUNC(force68k_state::bootvect_r)); /* Vectors mapped from System EPROM */ + map(0x000000, 0x000007).rom().r(FUNC(force68k_state::bootvect_r)); /* Vectors mapped from System EPROM */ map(0x000008, 0x01ffff).ram(); /* DRAM CPU-1B */ //AM_RANGE (0x020000, 0x07ffff) AM_RAM /* Additional DRAM CPU-1D */ map(0x080000, 0x083fff).rom(); /* System EPROM Area 16Kb DEBUGGER supplied as default on CPU-1B/D */ @@ -248,8 +248,8 @@ void force68k_state::force68k_mem(address_map &map) map(0x0c0400, 0x0c042f).rw(m_rtc, FUNC(mm58167_device::read), FUNC(mm58167_device::write)).umask16(0x00ff); map(0x0e0000, 0x0e0035).rw(m_pit, FUNC(pit68230_device::read), FUNC(pit68230_device::write)).umask16(0x00ff); //AM_RANGE(0x0e0200, 0x0e0380) AM_READWRITE(fpu_r, fpu_w) /* optional FPCP 68881 FPU interface */ - map(0x100000, 0xfeffff).rw(this, FUNC(force68k_state::vme_a24_r), FUNC(force68k_state::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) */ - map(0xff0000, 0xffffff).rw(this, FUNC(force68k_state::vme_a16_r), FUNC(force68k_state::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) */ + map(0x100000, 0xfeffff).rw(FUNC(force68k_state::vme_a24_r), FUNC(force68k_state::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) */ + map(0xff0000, 0xffffff).rw(FUNC(force68k_state::vme_a16_r), FUNC(force68k_state::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) */ } /* Input ports */ @@ -587,7 +587,7 @@ MACHINE_CONFIG_START(force68k_state::fccpu1) /* PIT Parallel Interface and Timer device, assuming strapped for on board clock */ MCFG_DEVICE_ADD ("pit", PIT68230, XTAL(16'000'000) / 2) - MCFG_PIT68230_PA_OUTPUT_CB (WRITE8 ("cent_data_out", output_latch_device, write)) + MCFG_PIT68230_PA_OUTPUT_CB (WRITE8 ("cent_data_out", output_latch_device, bus_w)) MCFG_PIT68230_H2_CB (WRITELINE ("centronics", centronics_device, write_strobe)) // Centronics diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp index 9377ebf2b06..d279a2b1626 100644 --- a/src/mame/drivers/forte2.cpp +++ b/src/mame/drivers/forte2.cpp @@ -48,8 +48,8 @@ class forte2_state : public driver_device { public: forte2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") { } void init_pesadelo(); @@ -82,8 +82,8 @@ void forte2_state::io_mem(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x98, 0x98).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x99, 0x99).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); + map(0x98, 0x98).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x99, 0x99).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); map(0xa0, 0xa1).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xa2, 0xa2).r("aysnd", FUNC(ay8910_device::data_r)); // AM_RANGE(0xa8, 0xa8) AM_RAM // Ports a8-ab are originally for communicating with the i8255 PPI on MSX. diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index 1362efb700c..216ed229083 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -223,11 +223,11 @@ void fp1100_state::io_map(address_map &map) { map.unmap_value_high(); //AM_RANGE(0x0000, 0xfeff) slot memory area - map(0xff00, 0xff7f).rw(this, FUNC(fp1100_state::slot_id_r), FUNC(fp1100_state::slot_bank_w)); - map(0xff80, 0xffff).r(this, FUNC(fp1100_state::sub_to_main_r)); - map(0xff80, 0xff9f).w(this, FUNC(fp1100_state::irq_mask_w)); - map(0xffa0, 0xffbf).w(this, FUNC(fp1100_state::main_bank_w)); - map(0xffc0, 0xffff).w(this, FUNC(fp1100_state::main_to_sub_w)); + map(0xff00, 0xff7f).rw(FUNC(fp1100_state::slot_id_r), FUNC(fp1100_state::slot_bank_w)); + map(0xff80, 0xffff).r(FUNC(fp1100_state::sub_to_main_r)); + map(0xff80, 0xff9f).w(FUNC(fp1100_state::irq_mask_w)); + map(0xffa0, 0xffbf).w(FUNC(fp1100_state::main_bank_w)); + map(0xffc0, 0xffff).w(FUNC(fp1100_state::main_to_sub_w)); } READ8_MEMBER( fp1100_state::main_to_sub_r ) @@ -283,10 +283,10 @@ void fp1100_state::sub_map(address_map &map) map(0x2000, 0xdfff).ram().share("videoram"); //vram B/R/G map(0xe000, 0xe000).mirror(0x3fe).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0xe001, 0xe001).mirror(0x3fe).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0xe400, 0xe7ff).portr("DSW").w(this, FUNC(fp1100_state::kbd_row_w)); - map(0xe800, 0xebff).rw(this, FUNC(fp1100_state::main_to_sub_r), FUNC(fp1100_state::sub_to_main_w)); + map(0xe400, 0xe7ff).portr("DSW").w(FUNC(fp1100_state::kbd_row_w)); + map(0xe800, 0xebff).rw(FUNC(fp1100_state::main_to_sub_r), FUNC(fp1100_state::sub_to_main_w)); //AM_RANGE(0xec00, 0xefff) "Acknowledge of INT0" is coded in but isn't currently executed - map(0xf000, 0xf3ff).w(this, FUNC(fp1100_state::colour_control_w)); + map(0xf000, 0xf3ff).w(FUNC(fp1100_state::colour_control_w)); map(0xf400, 0xff7f).rom().region("sub_ipl", 0x2400); } @@ -643,7 +643,7 @@ MACHINE_CONFIG_START(fp1100_state::fp1100) MCFG_DEVICE_PROGRAM_MAP(sub_map) MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, fp1100_state, porta_w)) MCFG_UPD7810_PORTB_READ_CB(READ8(*this, fp1100_state, portb_r)) - MCFG_UPD7810_PORTB_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_UPD7810_PORTB_WRITE_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_UPD7810_PORTC_READ_CB(READ8(*this, fp1100_state, portc_r)) MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, fp1100_state, portc_w)) MCFG_UPD7810_TXD(WRITELINE(*this, fp1100_state, cass_w)) diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp index 121cac00a63..86f78a66e1b 100644 --- a/src/mame/drivers/fp200.cpp +++ b/src/mame/drivers/fp200.cpp @@ -424,7 +424,7 @@ void fp200_state::fp200_map(address_map &map) void fp200_state::fp200_io(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(fp200_state::fp200_io_r), FUNC(fp200_state::fp200_io_w)); + map(0x00, 0xff).rw(FUNC(fp200_state::fp200_io_r), FUNC(fp200_state::fp200_io_w)); } INPUT_CHANGED_MEMBER(fp200_state::keyb_irq) diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp index c57caacf626..286bad59327 100644 --- a/src/mame/drivers/fp6000.cpp +++ b/src/mame/drivers/fp6000.cpp @@ -182,7 +182,7 @@ void fp6000_state::fp6000_map(address_map &map) map(0x00000, 0xbffff).ram(); map(0xc0000, 0xdffff).ram().share("gvram");//gvram map(0xe0000, 0xe0fff).ram().share("vram"); - map(0xe7000, 0xe7fff).rw(this, FUNC(fp6000_state::fp6000_pcg_r), FUNC(fp6000_state::fp6000_pcg_w)); + map(0xe7000, 0xe7fff).rw(FUNC(fp6000_state::fp6000_pcg_r), FUNC(fp6000_state::fp6000_pcg_w)); map(0xf0000, 0xfffff).rom().region("ipl", 0); } @@ -230,14 +230,14 @@ READ16_MEMBER(fp6000_state::pit_r) void fp6000_state::fp6000_io(address_map &map) { map.unmap_value_high(); - map(0x08, 0x09).r(this, FUNC(fp6000_state::ex_board_r)); // BIOS of some sort ... + map(0x08, 0x09).r(FUNC(fp6000_state::ex_board_r)); // BIOS of some sort ... map(0x0a, 0x0b).portr("DSW"); // installed RAM id? map(0x10, 0x11).nopr(); - map(0x20, 0x23).rw(this, FUNC(fp6000_state::fp6000_key_r), FUNC(fp6000_state::fp6000_key_w)).umask16(0x00ff); - map(0x38, 0x39).r(this, FUNC(fp6000_state::pit_r)); // pit? - map(0x70, 0x70).w(this, FUNC(fp6000_state::fp6000_6845_address_w)); - map(0x72, 0x72).w(this, FUNC(fp6000_state::fp6000_6845_data_w)); - map(0x74, 0x75).r(this, FUNC(fp6000_state::unk_r)); //bit 6 busy flag + map(0x20, 0x23).rw(FUNC(fp6000_state::fp6000_key_r), FUNC(fp6000_state::fp6000_key_w)).umask16(0x00ff); + map(0x38, 0x39).r(FUNC(fp6000_state::pit_r)); // pit? + map(0x70, 0x70).w(FUNC(fp6000_state::fp6000_6845_address_w)); + map(0x72, 0x72).w(FUNC(fp6000_state::fp6000_6845_data_w)); + map(0x74, 0x75).r(FUNC(fp6000_state::unk_r)); //bit 6 busy flag } /* Input ports */ diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index 506aeef3242..0f4c46d3b89 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -199,7 +199,7 @@ void freekick_state::omega_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); // ram is 2x sony cxk5813d-55 - map(0xd000, 0xd7ff).ram().w(this, FUNC(freekick_state::freek_videoram_w)).share("videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(freekick_state::freek_videoram_w)).share("videoram"); map(0xd800, 0xd8ff).ram().share("spriteram"); map(0xd900, 0xdfff).ram(); map(0xe000, 0xe000).portr("IN0"); @@ -207,10 +207,10 @@ void freekick_state::omega_map(address_map &map) map(0xe800, 0xe800).portr("IN1"); map(0xf000, 0xf000).portr("DSW1").nopw(); //bankswitch ? map(0xf800, 0xf800).portr("DSW2"); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); } void freekick_state::pbillrd_map(address_map &map) @@ -218,18 +218,18 @@ void freekick_state::pbillrd_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram(); - map(0xd000, 0xd7ff).ram().w(this, FUNC(freekick_state::freek_videoram_w)).share("videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(freekick_state::freek_videoram_w)).share("videoram"); map(0xd800, 0xd8ff).ram().share("spriteram"); map(0xd900, 0xdfff).ram(); map(0xe000, 0xe000).portr("IN0"); map(0xe000, 0xe007).w("outlatch", FUNC(ls259_device::write_d0)); map(0xe800, 0xe800).portr("IN1"); - map(0xf000, 0xf000).portr("DSW1").w(this, FUNC(freekick_state::pbillrd_bankswitch_w)); + map(0xf000, 0xf000).portr("DSW1").w(FUNC(freekick_state::pbillrd_bankswitch_w)); map(0xf800, 0xf800).portr("DSW2"); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); } void freekick_state::decrypted_opcodes_map(address_map &map) @@ -242,26 +242,26 @@ void freekick_state::freekick_map(address_map &map) { map(0x0000, 0xcfff).rom(); map(0xd000, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(freekick_state::freek_videoram_w)).share("videoram"); // tilemap + map(0xe000, 0xe7ff).ram().w(FUNC(freekick_state::freek_videoram_w)).share("videoram"); // tilemap map(0xe800, 0xe8ff).ram().share("spriteram"); // sprites map(0xec00, 0xec03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf000, 0xf003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf800, 0xf800).portr("IN0"); map(0xf801, 0xf801).portr("IN1"); map(0xf802, 0xf802).nopr(); //MUST return bit 0 = 0, otherwise game resets - map(0xf803, 0xf803).r(this, FUNC(freekick_state::spinner_r)); + map(0xf803, 0xf803).r(FUNC(freekick_state::spinner_r)); map(0xf800, 0xf807).w("outlatch", FUNC(ls259_device::write_d0)); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); } void freekick_state::gigas_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); - map(0xd000, 0xd7ff).ram().w(this, FUNC(freekick_state::freek_videoram_w)).share("videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(freekick_state::freek_videoram_w)).share("videoram"); map(0xd800, 0xd8ff).ram().share("spriteram"); map(0xd900, 0xdfff).ram(); map(0xe000, 0xe000).portr("IN0"); @@ -269,40 +269,40 @@ void freekick_state::gigas_map(address_map &map) map(0xe800, 0xe800).portr("IN1"); map(0xf000, 0xf000).portr("DSW1").nopw(); //bankswitch ? map(0xf800, 0xf800).portr("DSW2"); - map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::write)); - map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::write)); - map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::write)); - map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::write)); + map(0xfc00, 0xfc00).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xfc01, 0xfc01).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xfc02, 0xfc02).w("sn3", FUNC(sn76489a_device::command_w)); + map(0xfc03, 0xfc03).w("sn4", FUNC(sn76489a_device::command_w)); } void freekick_state::omega_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(freekick_state::spinner_r), FUNC(freekick_state::gigas_spinner_select_w)); + map(0x00, 0x00).rw(FUNC(freekick_state::spinner_r), FUNC(freekick_state::gigas_spinner_select_w)); map(0x01, 0x01).portr("DSW3"); } void freekick_state::gigas_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(freekick_state::spinner_r), FUNC(freekick_state::gigas_spinner_select_w)); + map(0x00, 0x00).rw(FUNC(freekick_state::spinner_r), FUNC(freekick_state::gigas_spinner_select_w)); map(0x01, 0x01).nopr(); //unused dip 3 } void freekick_state::oigas_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(freekick_state::spinner_r), FUNC(freekick_state::gigas_spinner_select_w)); + map(0x00, 0x00).rw(FUNC(freekick_state::spinner_r), FUNC(freekick_state::gigas_spinner_select_w)); map(0x01, 0x01).nopr(); //unused dip 3 - map(0x02, 0x02).r(this, FUNC(freekick_state::oigas_2_r)); - map(0x03, 0x03).r(this, FUNC(freekick_state::oigas_3_r)); - map(0x05, 0x05).w(this, FUNC(freekick_state::oigas_5_w)); + map(0x02, 0x02).r(FUNC(freekick_state::oigas_2_r)); + map(0x03, 0x03).r(FUNC(freekick_state::oigas_3_r)); + map(0x05, 0x05).w(FUNC(freekick_state::oigas_5_w)); } void freekick_state::freekick_io_map(address_map &map) { map.global_mask(0xff); - map(0xff, 0xff).rw(this, FUNC(freekick_state::freekick_ff_r), FUNC(freekick_state::freekick_ff_w)); + map(0xff, 0xff).rw(FUNC(freekick_state::freekick_ff_r), FUNC(freekick_state::freekick_ff_w)); } diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp index dd9bcec0ebe..3ce058a48bf 100644 --- a/src/mame/drivers/fresh.cpp +++ b/src/mame/drivers/fresh.cpp @@ -173,21 +173,21 @@ void fresh_state::fresh_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0xc00000, 0xc0ffff).ram().w(this, FUNC(fresh_state::fresh_bg_2_videoram_w)).share("bg_videoram_2"); - map(0xc10000, 0xc1ffff).ram().w(this, FUNC(fresh_state::fresh_attr_2_videoram_w)).share("attr_videoram_2"); - map(0xc20000, 0xc2ffff).ram().w(this, FUNC(fresh_state::fresh_bg_videoram_w)).share("bg_videoram"); - map(0xc30000, 0xc3ffff).ram().w(this, FUNC(fresh_state::fresh_attr_videoram_w)).share("attr_videoram"); + map(0xc00000, 0xc0ffff).ram().w(FUNC(fresh_state::fresh_bg_2_videoram_w)).share("bg_videoram_2"); + map(0xc10000, 0xc1ffff).ram().w(FUNC(fresh_state::fresh_attr_2_videoram_w)).share("attr_videoram_2"); + map(0xc20000, 0xc2ffff).ram().w(FUNC(fresh_state::fresh_bg_videoram_w)).share("bg_videoram"); + map(0xc30000, 0xc3ffff).ram().w(FUNC(fresh_state::fresh_attr_videoram_w)).share("attr_videoram"); // AM_RANGE(0xc70000, 0xc70001) AM_RAM // AM_RANGE(0xc70002, 0xc70003) AM_RAM - map(0xc71000, 0xc71001).w(this, FUNC(fresh_state::c71000_write)); + map(0xc71000, 0xc71001).w(FUNC(fresh_state::c71000_write)); // AM_RANGE(0xc72000, 0xc72001) AM_RAM // AM_RANGE(0xc72002, 0xc72003) AM_RAM // AM_RANGE(0xc73000, 0xc73001) AM_RAM // AM_RANGE(0xc73002, 0xc73003) AM_RAM - map(0xc74000, 0xc74001).w(this, FUNC(fresh_state::c74000_write)); - map(0xc75000, 0xc75001).w(this, FUNC(fresh_state::c75000_write)); - map(0xc76000, 0xc76001).w(this, FUNC(fresh_state::c76000_write)); + map(0xc74000, 0xc74001).w(FUNC(fresh_state::c74000_write)); + map(0xc75000, 0xc75001).w(FUNC(fresh_state::c75000_write)); + map(0xc76000, 0xc76001).w(FUNC(fresh_state::c76000_write)); // AM_RANGE(0xc77000, 0xc77001) AM_RAM // AM_RANGE(0xc77002, 0xc77003) AM_RAM @@ -199,7 +199,7 @@ void fresh_state::fresh_map(address_map &map) map(0xd00001, 0xd00001).w("ymsnd", FUNC(ym2413_device::register_port_w)); map(0xd10001, 0xd10001).w("ymsnd", FUNC(ym2413_device::data_port_w)); - map(0xd30000, 0xd30001).w(this, FUNC(fresh_state::d30000_write)); + map(0xd30000, 0xd30001).w(FUNC(fresh_state::d30000_write)); map(0xd40000, 0xd40001).portr("IN0"); //AM_WRITENOP // checks for 0x10 // AM_RANGE(0xd40002, 0xd40003) AM_WRITENOP map(0xd70000, 0xd70001).portr("IN1"); // checks for 0x10, dead loop if fail diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index e8ecc854cbc..6ebd5ed7766 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -164,31 +164,31 @@ void fromanc2_state::fromanc2_main_map(address_map &map) map(0x000000, 0x07ffff).rom(); // MAIN ROM map(0x802000, 0x802fff).nopr(); // ??? - map(0x800000, 0x803fff).w(this, FUNC(fromanc2_state::fromanc2_videoram_0_w)); // VRAM 0, 1 (1P) - map(0x880000, 0x883fff).w(this, FUNC(fromanc2_state::fromanc2_videoram_1_w)); // VRAM 2, 3 (1P) - map(0x900000, 0x903fff).w(this, FUNC(fromanc2_state::fromanc2_videoram_2_w)); // VRAM 0, 1 (2P) - map(0x980000, 0x983fff).w(this, FUNC(fromanc2_state::fromanc2_videoram_3_w)); // VRAM 2, 3 (2P) + map(0x800000, 0x803fff).w(FUNC(fromanc2_state::fromanc2_videoram_0_w)); // VRAM 0, 1 (1P) + map(0x880000, 0x883fff).w(FUNC(fromanc2_state::fromanc2_videoram_1_w)); // VRAM 2, 3 (1P) + map(0x900000, 0x903fff).w(FUNC(fromanc2_state::fromanc2_videoram_2_w)); // VRAM 0, 1 (2P) + map(0x980000, 0x983fff).w(FUNC(fromanc2_state::fromanc2_videoram_3_w)); // VRAM 2, 3 (2P) map(0xa00000, 0xa00fff).ram().w(m_lpalette, FUNC(palette_device::write16)).share("lpalette"); // PALETTE (1P) map(0xa80000, 0xa80fff).ram().w(m_rpalette, FUNC(palette_device::write16)).share("rpalette"); // PALETTE (2P) - map(0xd00000, 0xd00023).w(this, FUNC(fromanc2_state::fromanc2_gfxreg_0_w)); // SCROLL REG (1P/2P) - map(0xd00100, 0xd00123).w(this, FUNC(fromanc2_state::fromanc2_gfxreg_2_w)); // SCROLL REG (1P/2P) - map(0xd00200, 0xd00223).w(this, FUNC(fromanc2_state::fromanc2_gfxreg_1_w)); // SCROLL REG (1P/2P) - map(0xd00300, 0xd00323).w(this, FUNC(fromanc2_state::fromanc2_gfxreg_3_w)); // SCROLL REG (1P/2P) + map(0xd00000, 0xd00023).w(FUNC(fromanc2_state::fromanc2_gfxreg_0_w)); // SCROLL REG (1P/2P) + map(0xd00100, 0xd00123).w(FUNC(fromanc2_state::fromanc2_gfxreg_2_w)); // SCROLL REG (1P/2P) + map(0xd00200, 0xd00223).w(FUNC(fromanc2_state::fromanc2_gfxreg_1_w)); // SCROLL REG (1P/2P) + map(0xd00300, 0xd00323).w(FUNC(fromanc2_state::fromanc2_gfxreg_3_w)); // SCROLL REG (1P/2P) map(0xd00400, 0xd00413).nopw(); // ??? map(0xd00500, 0xd00513).nopw(); // ??? - map(0xd01000, 0xd01001).w(this, FUNC(fromanc2_state::sndcmd_w)); // SOUND REQ (1P/2P) + map(0xd01000, 0xd01001).w(FUNC(fromanc2_state::sndcmd_w)); // SOUND REQ (1P/2P) map(0xd01100, 0xd01101).portr("SYSTEM"); - map(0xd01200, 0xd01201).w(this, FUNC(fromanc2_state::subcpu_w)); // SUB CPU WRITE - map(0xd01300, 0xd01301).r(this, FUNC(fromanc2_state::subcpu_r)); // SUB CPU READ - map(0xd01400, 0xd01401).w(this, FUNC(fromanc2_state::fromanc2_gfxbank_0_w)); // GFXBANK (1P) - map(0xd01500, 0xd01501).w(this, FUNC(fromanc2_state::fromanc2_gfxbank_1_w)); // GFXBANK (2P) + map(0xd01200, 0xd01201).w(FUNC(fromanc2_state::subcpu_w)); // SUB CPU WRITE + map(0xd01300, 0xd01301).r(FUNC(fromanc2_state::subcpu_r)); // SUB CPU READ + map(0xd01400, 0xd01401).w(FUNC(fromanc2_state::fromanc2_gfxbank_0_w)); // GFXBANK (1P) + map(0xd01500, 0xd01501).w(FUNC(fromanc2_state::fromanc2_gfxbank_1_w)); // GFXBANK (2P) map(0xd01600, 0xd01601).portw("EEPROMOUT"); // EEPROM DATA - map(0xd01800, 0xd01801).r(this, FUNC(fromanc2_state::keymatrix_r)); // INPUT KEY MATRIX - map(0xd01a00, 0xd01a01).w(this, FUNC(fromanc2_state::portselect_w)); // PORT SELECT (1P/2P) + map(0xd01800, 0xd01801).r(FUNC(fromanc2_state::keymatrix_r)); // INPUT KEY MATRIX + map(0xd01a00, 0xd01a01).w(FUNC(fromanc2_state::portselect_w)); // PORT SELECT (1P/2P) map(0xd80000, 0xd8ffff).ram(); // WORK RAM } @@ -197,27 +197,27 @@ void fromanc2_state::fromancr_main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // MAIN ROM - map(0x800000, 0x803fff).w(this, FUNC(fromanc2_state::fromancr_videoram_0_w)); // VRAM BG (1P/2P) - map(0x880000, 0x883fff).w(this, FUNC(fromanc2_state::fromancr_videoram_1_w)); // VRAM FG (1P/2P) - map(0x900000, 0x903fff).w(this, FUNC(fromanc2_state::fromancr_videoram_2_w)); // VRAM TEXT (1P/2P) + map(0x800000, 0x803fff).w(FUNC(fromanc2_state::fromancr_videoram_0_w)); // VRAM BG (1P/2P) + map(0x880000, 0x883fff).w(FUNC(fromanc2_state::fromancr_videoram_1_w)); // VRAM FG (1P/2P) + map(0x900000, 0x903fff).w(FUNC(fromanc2_state::fromancr_videoram_2_w)); // VRAM TEXT (1P/2P) map(0x980000, 0x983fff).nopw(); // VRAM Unused ? map(0xa00000, 0xa00fff).ram().w(m_lpalette, FUNC(palette_device::write16)).share("lpalette"); // PALETTE (1P) map(0xa80000, 0xa80fff).ram().w(m_rpalette, FUNC(palette_device::write16)).share("rpalette"); // PALETTE (2P) - map(0xd00000, 0xd00023).w(this, FUNC(fromanc2_state::fromancr_gfxreg_1_w)); // SCROLL REG (1P/2P) + map(0xd00000, 0xd00023).w(FUNC(fromanc2_state::fromancr_gfxreg_1_w)); // SCROLL REG (1P/2P) map(0xd00200, 0xd002ff).nopw(); // ? map(0xd00400, 0xd00413).nopw(); // ??? map(0xd00500, 0xd00513).nopw(); // ??? - map(0xd01000, 0xd01001).w(this, FUNC(fromanc2_state::sndcmd_w)); // SOUND REQ (1P/2P) - map(0xd00100, 0xd00123).w(this, FUNC(fromanc2_state::fromancr_gfxreg_0_w)); // SCROLL REG (1P/2P) + map(0xd01000, 0xd01001).w(FUNC(fromanc2_state::sndcmd_w)); // SOUND REQ (1P/2P) + map(0xd00100, 0xd00123).w(FUNC(fromanc2_state::fromancr_gfxreg_0_w)); // SCROLL REG (1P/2P) map(0xd01100, 0xd01101).portr("SYSTEM"); - map(0xd01200, 0xd01201).w(this, FUNC(fromanc2_state::subcpu_w)); // SUB CPU WRITE - map(0xd01300, 0xd01301).r(this, FUNC(fromanc2_state::subcpu_r)); // SUB CPU READ + map(0xd01200, 0xd01201).w(FUNC(fromanc2_state::subcpu_w)); // SUB CPU WRITE + map(0xd01300, 0xd01301).r(FUNC(fromanc2_state::subcpu_r)); // SUB CPU READ map(0xd01400, 0xd01401).nopw(); // COIN COUNTER ? - map(0xd01600, 0xd01601).w(this, FUNC(fromanc2_state::fromancr_gfxbank_eeprom_w)); // EEPROM DATA, GFXBANK (1P/2P) - map(0xd01800, 0xd01801).r(this, FUNC(fromanc2_state::keymatrix_r)); // INPUT KEY MATRIX - map(0xd01a00, 0xd01a01).w(this, FUNC(fromanc2_state::portselect_w)); // PORT SELECT (1P/2P) + map(0xd01600, 0xd01601).w(FUNC(fromanc2_state::fromancr_gfxbank_eeprom_w)); // EEPROM DATA, GFXBANK (1P/2P) + map(0xd01800, 0xd01801).r(FUNC(fromanc2_state::keymatrix_r)); // INPUT KEY MATRIX + map(0xd01a00, 0xd01a01).w(FUNC(fromanc2_state::portselect_w)); // PORT SELECT (1P/2P) map(0xd80000, 0xd8ffff).ram(); // WORK RAM } @@ -229,27 +229,27 @@ void fromanc2_state::fromanc4_main_map(address_map &map) map(0x800000, 0x81ffff).ram(); // WORK RAM - map(0xd00000, 0xd00001).w(this, FUNC(fromanc2_state::portselect_w)); // PORT SELECT (1P/2P) + map(0xd00000, 0xd00001).w(FUNC(fromanc2_state::portselect_w)); // PORT SELECT (1P/2P) map(0xd10000, 0xd10001).nopw(); // ? map(0xd30000, 0xd30001).nopw(); // ? map(0xd50000, 0xd50001).portw("EEPROMOUT"); // EEPROM DATA - map(0xd70000, 0xd70001).w(this, FUNC(fromanc2_state::sndcmd_w)); // SOUND REQ (1P/2P) + map(0xd70000, 0xd70001).w(FUNC(fromanc2_state::sndcmd_w)); // SOUND REQ (1P/2P) - map(0xd80000, 0xd8ffff).w(this, FUNC(fromanc2_state::fromanc4_videoram_0_w)); // VRAM FG (1P/2P) - map(0xd90000, 0xd9ffff).w(this, FUNC(fromanc2_state::fromanc4_videoram_1_w)); // VRAM BG (1P/2P) - map(0xda0000, 0xdaffff).w(this, FUNC(fromanc2_state::fromanc4_videoram_2_w)); // VRAM TEXT (1P/2P) + map(0xd80000, 0xd8ffff).w(FUNC(fromanc2_state::fromanc4_videoram_0_w)); // VRAM FG (1P/2P) + map(0xd90000, 0xd9ffff).w(FUNC(fromanc2_state::fromanc4_videoram_1_w)); // VRAM BG (1P/2P) + map(0xda0000, 0xdaffff).w(FUNC(fromanc2_state::fromanc4_videoram_2_w)); // VRAM TEXT (1P/2P) map(0xdb0000, 0xdb0fff).ram().w(m_lpalette, FUNC(palette_device::write16)).share("lpalette"); // PALETTE (1P) map(0xdc0000, 0xdc0fff).ram().w(m_rpalette, FUNC(palette_device::write16)).share("rpalette"); // PALETTE (2P) - map(0xd10000, 0xd10001).r(this, FUNC(fromanc2_state::keymatrix_r)); // INPUT KEY MATRIX + map(0xd10000, 0xd10001).r(FUNC(fromanc2_state::keymatrix_r)); // INPUT KEY MATRIX map(0xd20000, 0xd20001).portr("SYSTEM"); - map(0xe00000, 0xe0001d).w(this, FUNC(fromanc2_state::fromanc4_gfxreg_0_w)); // SCROLL, GFXBANK (1P/2P) - map(0xe10000, 0xe1001d).w(this, FUNC(fromanc2_state::fromanc4_gfxreg_1_w)); // SCROLL, GFXBANK (1P/2P) - map(0xe20000, 0xe2001d).w(this, FUNC(fromanc2_state::fromanc4_gfxreg_2_w)); // SCROLL, GFXBANK (1P/2P) + map(0xe00000, 0xe0001d).w(FUNC(fromanc2_state::fromanc4_gfxreg_0_w)); // SCROLL, GFXBANK (1P/2P) + map(0xe10000, 0xe1001d).w(FUNC(fromanc2_state::fromanc4_gfxreg_1_w)); // SCROLL, GFXBANK (1P/2P) + map(0xe20000, 0xe2001d).w(FUNC(fromanc2_state::fromanc4_gfxreg_2_w)); // SCROLL, GFXBANK (1P/2P) map(0xe30000, 0xe30013).nopw(); // ??? map(0xe40000, 0xe40013).nopw(); // ??? @@ -269,10 +269,10 @@ void fromanc2_state::fromanc2_sub_map(address_map &map) void fromanc2_state::fromanc2_sub_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(fromanc2_state::subcpu_rombank_w)); - map(0x02, 0x02).rw(this, FUNC(fromanc2_state::maincpu_r_l), FUNC(fromanc2_state::maincpu_w_l)); // to/from MAIN CPU - map(0x04, 0x04).rw(this, FUNC(fromanc2_state::maincpu_r_h), FUNC(fromanc2_state::maincpu_w_h)); // to/from MAIN CPU - map(0x06, 0x06).w(this, FUNC(fromanc2_state::subcpu_nmi_clr)); + map(0x00, 0x00).w(FUNC(fromanc2_state::subcpu_rombank_w)); + map(0x02, 0x02).rw(FUNC(fromanc2_state::maincpu_r_l), FUNC(fromanc2_state::maincpu_w_l)); // to/from MAIN CPU + map(0x04, 0x04).rw(FUNC(fromanc2_state::maincpu_r_h), FUNC(fromanc2_state::maincpu_w_h)); // to/from MAIN CPU + map(0x06, 0x06).w(FUNC(fromanc2_state::subcpu_nmi_clr)); } @@ -288,7 +288,7 @@ void fromanc2_state::fromanc2_sound_io_map(address_map &map) map(0x00, 0x00).r(m_soundlatch, FUNC(generic_latch_8_device::read)).nopw(); // snd cmd (1P) / ? map(0x04, 0x04).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); // snd cmd (2P) map(0x08, 0x0b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x0c, 0x0c).r(this, FUNC(fromanc2_state::sndcpu_nmi_clr)); + map(0x0c, 0x0c).r(FUNC(fromanc2_state::sndcpu_nmi_clr)); } diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index 64b7fe0dc00..fb3efdd7016 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -229,10 +229,10 @@ void fromance_state::nekkyoku_main_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).ram(); - map(0xf000, 0xf000).portr("SERVICE").w(this, FUNC(fromance_state::fromance_portselect_w)); - map(0xf001, 0xf001).r(this, FUNC(fromance_state::fromance_keymatrix_r)).nopw(); - map(0xf002, 0xf002).portr("COIN").w(this, FUNC(fromance_state::fromance_coinctr_w)); - map(0xf003, 0xf003).r(this, FUNC(fromance_state::fromance_busycheck_main_r)).w(m_sublatch, FUNC(generic_latch_8_device::write)); + map(0xf000, 0xf000).portr("SERVICE").w(FUNC(fromance_state::fromance_portselect_w)); + map(0xf001, 0xf001).r(FUNC(fromance_state::fromance_keymatrix_r)).nopw(); + map(0xf002, 0xf002).portr("COIN").w(FUNC(fromance_state::fromance_coinctr_w)); + map(0xf003, 0xf003).r(FUNC(fromance_state::fromance_busycheck_main_r)).w(m_sublatch, FUNC(generic_latch_8_device::write)); map(0xf004, 0xf004).portr("DSW2"); map(0xf005, 0xf005).portr("DSW1"); } @@ -242,10 +242,10 @@ void fromance_state::fromance_main_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0xc000, 0xdfff).ram(); map(0x9e89, 0x9e89).nopr(); // unknown (idolmj) - map(0xe000, 0xe000).portr("SERVICE").w(this, FUNC(fromance_state::fromance_portselect_w)); - map(0xe001, 0xe001).r(this, FUNC(fromance_state::fromance_keymatrix_r)); - map(0xe002, 0xe002).portr("COIN").w(this, FUNC(fromance_state::fromance_coinctr_w)); - map(0xe003, 0xe003).r(this, FUNC(fromance_state::fromance_busycheck_main_r)).w(m_sublatch, FUNC(generic_latch_8_device::write)); + map(0xe000, 0xe000).portr("SERVICE").w(FUNC(fromance_state::fromance_portselect_w)); + map(0xe001, 0xe001).r(FUNC(fromance_state::fromance_keymatrix_r)); + map(0xe002, 0xe002).portr("COIN").w(FUNC(fromance_state::fromance_coinctr_w)); + map(0xe003, 0xe003).r(FUNC(fromance_state::fromance_busycheck_main_r)).w(m_sublatch, FUNC(generic_latch_8_device::write)); map(0xe004, 0xe004).portr("DSW2"); map(0xe005, 0xe005).portr("DSW1"); } @@ -262,9 +262,9 @@ void fromance_state::nekkyoku_sub_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xefff).rw(this, FUNC(fromance_state::fromance_videoram_r), FUNC(fromance_state::fromance_videoram_w)); + map(0xc000, 0xefff).rw(FUNC(fromance_state::fromance_videoram_r), FUNC(fromance_state::fromance_videoram_w)); map(0xf000, 0xf7ff).ram(); - map(0xf800, 0xffff).rw(this, FUNC(fromance_state::fromance_paletteram_r), FUNC(fromance_state::fromance_paletteram_w)); + map(0xf800, 0xffff).rw(FUNC(fromance_state::fromance_paletteram_r), FUNC(fromance_state::fromance_paletteram_w)); } void fromance_state::fromance_sub_map(address_map &map) @@ -272,8 +272,8 @@ void fromance_state::fromance_sub_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram(); - map(0xc800, 0xcfff).rw(this, FUNC(fromance_state::fromance_paletteram_r), FUNC(fromance_state::fromance_paletteram_w)); - map(0xd000, 0xffff).rw(this, FUNC(fromance_state::fromance_videoram_r), FUNC(fromance_state::fromance_videoram_w)); + map(0xc800, 0xcfff).rw(FUNC(fromance_state::fromance_paletteram_r), FUNC(fromance_state::fromance_paletteram_w)); + map(0xd000, 0xffff).rw(FUNC(fromance_state::fromance_videoram_r), FUNC(fromance_state::fromance_videoram_w)); } @@ -289,12 +289,12 @@ void fromance_state::nekkyoku_sub_io_map(address_map &map) map.global_mask(0xff); map(0x10, 0x11).w(m_gga, FUNC(vsystem_gga_device::write)); map(0x12, 0x12).nopr(); // unknown - map(0xe0, 0xe0).w(this, FUNC(fromance_state::fromance_rombank_w)); - map(0xe1, 0xe1).r(this, FUNC(fromance_state::fromance_busycheck_sub_r)).w(this, FUNC(fromance_state::fromance_gfxreg_w)); - map(0xe2, 0xe5).w(this, FUNC(fromance_state::fromance_scroll_w)); + map(0xe0, 0xe0).w(FUNC(fromance_state::fromance_rombank_w)); + map(0xe1, 0xe1).r(FUNC(fromance_state::fromance_busycheck_sub_r)).w(FUNC(fromance_state::fromance_gfxreg_w)); + map(0xe2, 0xe5).w(FUNC(fromance_state::fromance_scroll_w)); map(0xe6, 0xe6).rw(m_sublatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); - map(0xe7, 0xe7).w(this, FUNC(fromance_state::fromance_adpcm_reset_w)); - map(0xe8, 0xe8).w(this, FUNC(fromance_state::fromance_adpcm_w)); + map(0xe7, 0xe7).w(FUNC(fromance_state::fromance_adpcm_reset_w)); + map(0xe8, 0xe8).w(FUNC(fromance_state::fromance_adpcm_w)); map(0xe9, 0xea).w("aysnd", FUNC(ay8910_device::data_address_w)); } @@ -303,12 +303,12 @@ void fromance_state::idolmj_sub_io_map(address_map &map) map.global_mask(0xff); map(0x10, 0x11).w(m_gga, FUNC(vsystem_gga_device::write)); map(0x12, 0x12).nopr(); // unknown - map(0x20, 0x20).w(this, FUNC(fromance_state::fromance_rombank_w)); - map(0x21, 0x21).r(this, FUNC(fromance_state::fromance_busycheck_sub_r)).w(this, FUNC(fromance_state::fromance_gfxreg_w)); - map(0x22, 0x25).w(this, FUNC(fromance_state::fromance_scroll_w)); + map(0x20, 0x20).w(FUNC(fromance_state::fromance_rombank_w)); + map(0x21, 0x21).r(FUNC(fromance_state::fromance_busycheck_sub_r)).w(FUNC(fromance_state::fromance_gfxreg_w)); + map(0x22, 0x25).w(FUNC(fromance_state::fromance_scroll_w)); map(0x26, 0x26).rw(m_sublatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); - map(0x27, 0x27).w(this, FUNC(fromance_state::fromance_adpcm_reset_w)); - map(0x28, 0x28).w(this, FUNC(fromance_state::fromance_adpcm_w)); + map(0x27, 0x27).w(FUNC(fromance_state::fromance_adpcm_reset_w)); + map(0x28, 0x28).w(FUNC(fromance_state::fromance_adpcm_w)); map(0x29, 0x2a).w("aysnd", FUNC(ym2149_device::data_address_w)); } @@ -317,12 +317,12 @@ void fromance_state::fromance_sub_io_map(address_map &map) map.global_mask(0xff); map(0x10, 0x11).w(m_gga, FUNC(vsystem_gga_device::write)); map(0x12, 0x12).nopr(); // unknown - map(0x20, 0x20).w(this, FUNC(fromance_state::fromance_rombank_w)); - map(0x21, 0x21).r(this, FUNC(fromance_state::fromance_busycheck_sub_r)).w(this, FUNC(fromance_state::fromance_gfxreg_w)); - map(0x22, 0x25).w(this, FUNC(fromance_state::fromance_scroll_w)); + map(0x20, 0x20).w(FUNC(fromance_state::fromance_rombank_w)); + map(0x21, 0x21).r(FUNC(fromance_state::fromance_busycheck_sub_r)).w(FUNC(fromance_state::fromance_gfxreg_w)); + map(0x22, 0x25).w(FUNC(fromance_state::fromance_scroll_w)); map(0x26, 0x26).rw(m_sublatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); - map(0x27, 0x27).w(this, FUNC(fromance_state::fromance_adpcm_reset_w)); - map(0x28, 0x28).w(this, FUNC(fromance_state::fromance_adpcm_w)); + map(0x27, 0x27).w(FUNC(fromance_state::fromance_adpcm_reset_w)); + map(0x28, 0x28).w(FUNC(fromance_state::fromance_adpcm_w)); map(0x2a, 0x2b).w("ymsnd", FUNC(ym2413_device::write)); } diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index dcfadf14a63..a1dfa49a7a3 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -79,12 +79,12 @@ void fruitpc_state::fruitpc_map(address_map &map) void fruitpc_state::fruitpc_io(address_map &map) { pcat32_io_common(map); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); - map(0x0310, 0x0313).r(this, FUNC(fruitpc_state::fruit_inp_r)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); + map(0x0310, 0x0313).r(FUNC(fruitpc_state::fruit_inp_r)); map(0x03b0, 0x03bf).rw("vga", FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::read_cs1), FUNC(ide_controller_device::write_cs1)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); } static INPUT_PORTS_START( fruitpc ) diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp index 40f3fcb652c..d645004ec7d 100644 --- a/src/mame/drivers/ft68m.cpp +++ b/src/mame/drivers/ft68m.cpp @@ -59,7 +59,7 @@ void ft68m_state::mem_map(address_map &map) map(0x800000, 0x800003).mirror(0x1ffffc).rw("stc", FUNC(am9513_device::read16), FUNC(am9513_device::write16)); map(0xa00000, 0xbfffff).ram(); //Page Map map(0xc00000, 0xdfffff).ram(); //Segment Map - map(0xe00000, 0xffffff).r(this, FUNC(ft68m_state::switches_r)); //Context Register + map(0xe00000, 0xffffff).r(FUNC(ft68m_state::switches_r)); //Context Register } diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp index 7d397d5f9d5..a53711f3416 100644 --- a/src/mame/drivers/funkball.cpp +++ b/src/mame/drivers/funkball.cpp @@ -341,10 +341,10 @@ void funkball_state::funkball_map(address_map &map) map(0x000f4000, 0x000f7fff).bankr("bios_bank2"); map(0x000f8000, 0x000fbfff).bankr("bios_bank3"); map(0x000fc000, 0x000fffff).bankr("bios_bank4"); - map(0x000e0000, 0x000fffff).w(this, FUNC(funkball_state::bios_ram_w)); + map(0x000e0000, 0x000fffff).w(FUNC(funkball_state::bios_ram_w)); map(0x00100000, 0x07ffffff).ram(); // AM_RANGE(0x08000000, 0x0fffffff) AM_NOP - map(0x40008000, 0x400080ff).rw(this, FUNC(funkball_state::biu_ctrl_r), FUNC(funkball_state::biu_ctrl_w)); + map(0x40008000, 0x400080ff).rw(FUNC(funkball_state::biu_ctrl_r), FUNC(funkball_state::biu_ctrl_w)); map(0x40010e00, 0x40010eff).ram().share("unk_ram"); map(0xff000000, 0xfffdffff).rw(m_voodoo, FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); map(0xfffe0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ @@ -361,19 +361,19 @@ void funkball_state::flashbank_map(address_map &map) void funkball_state::funkball_io(address_map &map) { pcat32_io_common(map); - map(0x0022, 0x0023).rw(this, FUNC(funkball_state::io20_r), FUNC(funkball_state::io20_w)); + map(0x0022, 0x0023).rw(FUNC(funkball_state::io20_r), FUNC(funkball_state::io20_w)); map(0x00e8, 0x00ef).noprw(); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::read_cs1), FUNC(ide_controller_device::write_cs1)); - map(0x03f8, 0x03ff).rw(this, FUNC(funkball_state::serial_r), FUNC(funkball_state::serial_w)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); + map(0x03f8, 0x03ff).rw(FUNC(funkball_state::serial_r), FUNC(funkball_state::serial_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); - map(0x0360, 0x0363).w(this, FUNC(funkball_state::flash_w)); + map(0x0360, 0x0363).w(FUNC(funkball_state::flash_w)); // AM_RANGE(0x0320, 0x0323) AM_READ(test_r) - map(0x0360, 0x036f).r(this, FUNC(funkball_state::in_r)); // inputs + map(0x0360, 0x036f).r(FUNC(funkball_state::in_r)); // inputs } static INPUT_PORTS_START( funkball ) diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp index 9361eb8455f..450737c3f42 100644 --- a/src/mame/drivers/funkybee.cpp +++ b/src/mame/drivers/funkybee.cpp @@ -103,12 +103,12 @@ void funkybee_state::funkybee_map(address_map &map) { map(0x0000, 0x4fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xbfff).ram().w(this, FUNC(funkybee_state::funkybee_videoram_w)).share("videoram"); - map(0xc000, 0xdfff).ram().w(this, FUNC(funkybee_state::funkybee_colorram_w)).share("colorram"); - map(0xe000, 0xe000).w(this, FUNC(funkybee_state::funkybee_scroll_w)); + map(0xa000, 0xbfff).ram().w(FUNC(funkybee_state::funkybee_videoram_w)).share("videoram"); + map(0xc000, 0xdfff).ram().w(FUNC(funkybee_state::funkybee_colorram_w)).share("colorram"); + map(0xe000, 0xe000).w(FUNC(funkybee_state::funkybee_scroll_w)); map(0xe800, 0xe807).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xf000, 0xf000).nopr(); /* IRQ Ack */ - map(0xf800, 0xf800).r(this, FUNC(funkybee_state::funkybee_input_port_0_r)).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); + map(0xf800, 0xf800).r(FUNC(funkybee_state::funkybee_input_port_0_r)).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0xf801, 0xf801).portr("IN1"); map(0xf802, 0xf802).portr("IN2"); } diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp index 7a2a6c2b3eb..24f6064896a 100644 --- a/src/mame/drivers/funkyjet.cpp +++ b/src/mame/drivers/funkyjet.cpp @@ -134,7 +134,7 @@ void funkyjet_state::funkyjet_map(address_map &map) map(0x120000, 0x1207ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x140000, 0x143fff).ram(); map(0x160000, 0x1607ff).ram().share("spriteram"); - map(0x180000, 0x183fff).rw(this, FUNC(funkyjet_state::funkyjet_protection_region_0_146_r), FUNC(funkyjet_state::funkyjet_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ // unlikely to be cs0 region + map(0x180000, 0x183fff).rw(FUNC(funkyjet_state::funkyjet_protection_region_0_146_r), FUNC(funkyjet_state::funkyjet_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ // unlikely to be cs0 region map(0x184000, 0x184001).nopw(); map(0x188000, 0x188001).nopw(); map(0x300000, 0x30000f).w(m_deco_tilegen, FUNC(deco16ic_device::pf_control_w)); diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp index 7ff36da7d1c..3d23a46091e 100644 --- a/src/mame/drivers/funtech.cpp +++ b/src/mame/drivers/funtech.cpp @@ -257,10 +257,10 @@ void fun_tech_corp_state::funtech_map(address_map &map) map(0xd800, 0xdfff).ram().share("nvram"); - map(0xe000, 0xefff).ram().w(this, FUNC(fun_tech_corp_state::fgram_w)).share("fgram"); - map(0xf000, 0xf1ff).ram().w(this, FUNC(fun_tech_corp_state::reel1_ram_w)).share("reel1ram"); - map(0xf200, 0xf3ff).ram().w(this, FUNC(fun_tech_corp_state::reel2_ram_w)).share("reel2ram"); - map(0xf400, 0xf5ff).ram().w(this, FUNC(fun_tech_corp_state::reel3_ram_w)).share("reel3ram"); + map(0xe000, 0xefff).ram().w(FUNC(fun_tech_corp_state::fgram_w)).share("fgram"); + map(0xf000, 0xf1ff).ram().w(FUNC(fun_tech_corp_state::reel1_ram_w)).share("reel1ram"); + map(0xf200, 0xf3ff).ram().w(FUNC(fun_tech_corp_state::reel2_ram_w)).share("reel2ram"); + map(0xf400, 0xf5ff).ram().w(FUNC(fun_tech_corp_state::reel3_ram_w)).share("reel3ram"); map(0xf600, 0xf7ff).ram(); map(0xf840, 0xf87f).ram().share("reel1_scroll"); @@ -321,10 +321,10 @@ void fun_tech_corp_state::funtech_io_map(address_map &map) { map.global_mask(0xff); // lamps? - map(0x00, 0x00).w(this, FUNC(fun_tech_corp_state::lamps_w)); - map(0x01, 0x01).w(this, FUNC(fun_tech_corp_state::coins_w)); + map(0x00, 0x00).w(FUNC(fun_tech_corp_state::lamps_w)); + map(0x01, 0x01).w(FUNC(fun_tech_corp_state::coins_w)); - map(0x03, 0x03).w(this, FUNC(fun_tech_corp_state::vreg_w)); + map(0x03, 0x03).w(FUNC(fun_tech_corp_state::vreg_w)); map(0x04, 0x04).portr("IN0"); map(0x05, 0x05).portr("IN1"); diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 5bec2d2580b..dac8e165478 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -1075,8 +1075,8 @@ void funworld_state::funworld_map(address_map &map) map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w)); map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x2000, 0x2fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x3000, 0x3fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x2000, 0x2fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x3000, 0x3fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x4000, 0x4000).nopr(); map(0x8000, 0xbfff).rom(); map(0xc000, 0xffff).rom(); @@ -1111,11 +1111,11 @@ void funworld_state::funquiz_map(address_map &map) map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x1800, 0x1800).w(this, FUNC(funworld_state::question_bank_w)); + map(0x1800, 0x1800).w(FUNC(funworld_state::question_bank_w)); - map(0x2000, 0x2fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x3000, 0x3fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); - map(0x4000, 0x7fff).r(this, FUNC(funworld_state::questions_r)); + map(0x2000, 0x2fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x3000, 0x3fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x4000, 0x7fff).r(FUNC(funworld_state::questions_r)); map(0xc000, 0xffff).rom(); } @@ -1132,8 +1132,8 @@ void funworld_state::magicrd2_map(address_map &map) map(0x2c00, 0x2cff).ram(); /* range for protection */ map(0x3600, 0x36ff).ram(); /* some games use $3603-05 range for protection */ map(0x3c00, 0x3cff).ram(); /* range for protection */ - map(0x4000, 0x4fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x5000, 0x5fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x4000, 0x4fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x5000, 0x5fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x6000, 0xffff).rom(); } @@ -1149,8 +1149,8 @@ void funworld_state::cuoreuno_map(address_map &map) map(0x2000, 0x2000).nopr(); /* some unknown reads */ map(0x3e00, 0x3fff).ram(); /* some games use $3e03-05 range for protection */ map(0x4000, 0x5fff).rom(); /* used by rcdino4 (dino4 hw ) */ - map(0x6000, 0x6fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x7000, 0x7fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x6000, 0x6fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x7000, 0x7fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } @@ -1176,10 +1176,10 @@ void funworld_state::chinatow_map(address_map &map) map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x2000, 0x2000).nopr(); /* some unknown reads */ - map(0x32f0, 0x32ff).r(this, FUNC(funworld_state::chinatow_r_32f0)); + map(0x32f0, 0x32ff).r(FUNC(funworld_state::chinatow_r_32f0)); map(0x4000, 0x5fff).rom(); /* used by rcdino4 (dino4 hw ) */ - map(0x6000, 0x6fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x7000, 0x7fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x6000, 0x6fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x7000, 0x7fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } @@ -1192,8 +1192,8 @@ void funworld_state::lunapark_map(address_map &map) map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w)); map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x4000, 0x4fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram").mirror(0x2000); - map(0x5000, 0x5fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram").mirror(0x2000); + map(0x4000, 0x4fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram").mirror(0x2000); + map(0x5000, 0x5fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram").mirror(0x2000); map(0x8000, 0xffff).bankr("bank1"); } @@ -1210,8 +1210,8 @@ void funworld_state::saloon_map(address_map &map) map(0x1800, 0x1800).r("ay8910", FUNC(ay8910_device::data_r)); map(0x1800, 0x1801).w("ay8910", FUNC(ay8910_device::address_data_w)); // AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads... maybe a DSW */ - map(0x6000, 0x6fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x7000, 0x7fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x6000, 0x6fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x7000, 0x7fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } @@ -1237,8 +1237,8 @@ void funworld_state::witchryl_map(address_map &map) map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w)); map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x4000, 0x4fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x5000, 0x5fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x4000, 0x4fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x5000, 0x5fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x6000, 0x6000).portr("DSW2"); map(0x8000, 0xffff).rom(); } @@ -1248,12 +1248,12 @@ void funworld_state::intergames_map(address_map &map) map(0x0000, 0x07ff).ram().share("nvram"); map(0x0c00, 0x0c00).r("ay8910", FUNC(ay8910_device::data_r)); // WRONG. just a placeholder... map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w)); // WRONG. just a placeholder... - map(0x2000, 0x2fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x2000, 0x2fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); map(0x3000, 0x3000).w("crtc", FUNC(mc6845_device::address_w)); map(0x3001, 0x3001).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x3400, 0x3403).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // the bookkeeping mode requests a byte from $3400 to advance pages... map(0x3800, 0x3803).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // WRONG. just a placeholder... - map(0x7000, 0x7fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x7000, 0x7fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } @@ -1266,8 +1266,8 @@ void funworld_state::fw_a7_11_map(address_map &map) map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w)); map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w)); map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x2000, 0x2fff).ram().w(this, FUNC(funworld_state::funworld_videoram_w)).share("videoram"); - map(0x3000, 0x3fff).ram().w(this, FUNC(funworld_state::funworld_colorram_w)).share("colorram"); + map(0x2000, 0x2fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram"); + map(0x3000, 0x3fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram"); map(0x4000, 0x4000).nopr(); map(0x8000, 0xbfff).ram(); map(0xc000, 0xffff).rom(); diff --git a/src/mame/drivers/funybubl.cpp b/src/mame/drivers/funybubl.cpp index 27e39a2d434..30291b5cd42 100644 --- a/src/mame/drivers/funybubl.cpp +++ b/src/mame/drivers/funybubl.cpp @@ -85,7 +85,7 @@ void funybubl_state::funybubl_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank2"); // banked port 1? - map(0xc400, 0xcfff).ram().w(this, FUNC(funybubl_state::funybubl_paldatawrite)).share("paletteram"); // palette + map(0xc400, 0xcfff).ram().w(FUNC(funybubl_state::funybubl_paldatawrite)).share("paletteram"); // palette map(0xd000, 0xdfff).bankrw("bank1"); // banked port 0? map(0xe000, 0xffff).ram(); } @@ -93,10 +93,10 @@ void funybubl_state::funybubl_map(address_map &map) void funybubl_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("SYSTEM").w(this, FUNC(funybubl_state::funybubl_vidram_bank_w)); // vidram bank - map(0x01, 0x01).portr("P1").w(this, FUNC(funybubl_state::funybubl_cpurombank_w)); // rom bank? + map(0x00, 0x00).portr("SYSTEM").w(FUNC(funybubl_state::funybubl_vidram_bank_w)); // vidram bank + map(0x01, 0x01).portr("P1").w(FUNC(funybubl_state::funybubl_cpurombank_w)); // rom bank? map(0x02, 0x02).portr("P2"); - map(0x03, 0x03).portr("DSW").w(this, FUNC(funybubl_state::funybubl_soundcommand_w)); + map(0x03, 0x03).portr("DSW").w(FUNC(funybubl_state::funybubl_soundcommand_w)); map(0x06, 0x06).nopr(); /* Nothing is done with the data read */ map(0x06, 0x06).nopw(); /* Written directly after IO port 0 */ map(0x07, 0x07).nopw(); /* Reset something on startup - Sound CPU ?? */ @@ -108,7 +108,7 @@ void funybubl_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(funybubl_state::funybubl_oki_bank_sw)); + map(0x9000, 0x9000).w(FUNC(funybubl_state::funybubl_oki_bank_sw)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp index 8a508869e38..f5047c01b11 100644 --- a/src/mame/drivers/fuukifg2.cpp +++ b/src/mame/drivers/fuukifg2.cpp @@ -94,17 +94,17 @@ void fuuki16_state::fuuki16_map(address_map &map) { map(0x000000, 0x0fffff).rom(); // ROM map(0x400000, 0x40ffff).ram(); // RAM - map(0x500000, 0x501fff).ram().w(this, FUNC(fuuki16_state::vram_w<0>)).share("vram.0"); // Layers - map(0x502000, 0x503fff).ram().w(this, FUNC(fuuki16_state::vram_w<1>)).share("vram.1"); // - map(0x504000, 0x505fff).ram().w(this, FUNC(fuuki16_state::vram_w<2>)).share("vram.2"); // - map(0x506000, 0x507fff).ram().w(this, FUNC(fuuki16_state::vram_w<3>)).share("vram.3"); // + map(0x500000, 0x501fff).ram().w(FUNC(fuuki16_state::vram_w<0>)).share("vram.0"); // Layers + map(0x502000, 0x503fff).ram().w(FUNC(fuuki16_state::vram_w<1>)).share("vram.1"); // + map(0x504000, 0x505fff).ram().w(FUNC(fuuki16_state::vram_w<2>)).share("vram.2"); // + map(0x506000, 0x507fff).ram().w(FUNC(fuuki16_state::vram_w<3>)).share("vram.3"); // map(0x600000, 0x601fff).mirror(0x008000).rw(m_fuukivid, FUNC(fuukivid_device::fuuki_sprram_r), FUNC(fuukivid_device::fuuki_sprram_w)).share("spriteram"); // Sprites, mirrored? map(0x700000, 0x703fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x800000, 0x800001).portr("SYSTEM"); map(0x810000, 0x810001).portr("P1_P2"); map(0x880000, 0x880001).portr("DSW"); - map(0x8a0001, 0x8a0001).w(this, FUNC(fuuki16_state::sound_command_w)); // To Sound CPU - map(0x8c0000, 0x8c001f).ram().w(this, FUNC(fuuki16_state::vregs_w)).share("vregs"); // Video Registers + map(0x8a0001, 0x8a0001).w(FUNC(fuuki16_state::sound_command_w)); // To Sound CPU + map(0x8c0000, 0x8c001f).ram().w(FUNC(fuuki16_state::vregs_w)).share("vregs"); // Video Registers map(0x8d0000, 0x8d0003).ram().share("unknown"); // map(0x8e0000, 0x8e0001).ram().share("priority"); // } @@ -146,9 +146,9 @@ void fuuki16_state::fuuki16_sound_map(address_map &map) void fuuki16_state::fuuki16_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(fuuki16_state::sound_rombank_w)); // ROM Bank + map(0x00, 0x00).w(FUNC(fuuki16_state::sound_rombank_w)); // ROM Bank map(0x11, 0x11).r(m_soundlatch, FUNC(generic_latch_8_device::read)).nopw(); // From Main CPU / ? To Main CPU ? - map(0x20, 0x20).w(this, FUNC(fuuki16_state::oki_banking_w)); // Oki Banking + map(0x20, 0x20).w(FUNC(fuuki16_state::oki_banking_w)); // Oki Banking map(0x30, 0x30).nopw(); // ? In the NMI routine map(0x40, 0x41).w("ym1", FUNC(ym2203_device::write)); map(0x50, 0x51).rw("ym2", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp index 86321eabf52..cf3cf8f50c6 100644 --- a/src/mame/drivers/fuukifg3.cpp +++ b/src/mame/drivers/fuukifg3.cpp @@ -213,10 +213,10 @@ void fuuki32_state::fuuki32_map(address_map &map) map(0x400000, 0x40ffff).ram(); // Work RAM map(0x410000, 0x41ffff).ram(); // Work RAM (used by asurabus) - map(0x500000, 0x501fff).ram().w(this, FUNC(fuuki32_state::vram_w<0>)).share("vram.0"); // Tilemap 1 - map(0x502000, 0x503fff).ram().w(this, FUNC(fuuki32_state::vram_w<1>)).share("vram.1"); // Tilemap 2 - map(0x504000, 0x505fff).ram().w(this, FUNC(fuuki32_state::vram_w<2>)).share("vram.2"); // Tilemap bg - map(0x506000, 0x507fff).ram().w(this, FUNC(fuuki32_state::vram_w<3>)).share("vram.3"); // Tilemap bg2 + map(0x500000, 0x501fff).ram().w(FUNC(fuuki32_state::vram_w<0>)).share("vram.0"); // Tilemap 1 + map(0x502000, 0x503fff).ram().w(FUNC(fuuki32_state::vram_w<1>)).share("vram.1"); // Tilemap 2 + map(0x504000, 0x505fff).ram().w(FUNC(fuuki32_state::vram_w<2>)).share("vram.2"); // Tilemap bg + map(0x506000, 0x507fff).ram().w(FUNC(fuuki32_state::vram_w<3>)).share("vram.3"); // Tilemap bg2 map(0x508000, 0x517fff).ram(); // More tilemap, or linescroll? Seems to be empty all of the time map(0x600000, 0x601fff).ram().rw(m_fuukivid, FUNC(fuukivid_device::fuuki_sprram_r), FUNC(fuukivid_device::fuuki_sprram_w)); // Sprites map(0x700000, 0x703fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // Palette @@ -226,10 +226,10 @@ void fuuki32_state::fuuki32_map(address_map &map) map(0x880000, 0x880003).portr("880000"); // Service + DIPS map(0x890000, 0x890003).portr("890000"); // More DIPS - map(0x8c0000, 0x8c001f).ram().w(this, FUNC(fuuki32_state::vregs_w)).share("vregs"); // Video Registers + map(0x8c0000, 0x8c001f).ram().w(FUNC(fuuki32_state::vregs_w)).share("vregs"); // Video Registers map(0x8d0000, 0x8d0003).ram(); // Flipscreen Related map(0x8e0000, 0x8e0003).ram().share("priority"); // Controls layer order - map(0x903fe0, 0x903fff).rw(this, FUNC(fuuki32_state::snd_020_r), FUNC(fuuki32_state::snd_020_w)).umask32(0x00ff00ff); // Shared with Z80 + map(0x903fe0, 0x903fff).rw(FUNC(fuuki32_state::snd_020_r), FUNC(fuuki32_state::snd_020_w)).umask32(0x00ff00ff); // Shared with Z80 map(0xa00000, 0xa00003).writeonly().share("tilebank"); // Tilebank } @@ -256,7 +256,7 @@ void fuuki32_state::fuuki32_sound_map(address_map &map) void fuuki32_state::fuuki32_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(fuuki32_state::sound_bw_w)); + map(0x00, 0x00).w(FUNC(fuuki32_state::sound_bw_w)); map(0x30, 0x30).nopw(); // leftover/unused nmi handler related map(0x40, 0x45).rw("ymf", FUNC(ymf278b_device::read), FUNC(ymf278b_device::write)); } diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp index 7a4cb0045e2..582d6c0e10e 100644 --- a/src/mame/drivers/g627.cpp +++ b/src/mame/drivers/g627.cpp @@ -94,8 +94,8 @@ void g627_state::mem_map(address_map &map) void g627_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x02).w(this, FUNC(g627_state::disp_w)); - map(0x03, 0x07).w(this, FUNC(g627_state::lamp_w)); + map(0x00, 0x02).w(FUNC(g627_state::disp_w)); + map(0x03, 0x07).w(FUNC(g627_state::lamp_w)); map(0x10, 0x17).w("astrocade", FUNC(astrocade_io_device::write)); map(0x20, 0x27).rw("i8156", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); } diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index 431de80378e..abc32400171 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -109,7 +109,7 @@ WRITE16_MEMBER(gaelco_state::thoop_encrypted_w) void gaelco_state::bigkarnk_map(address_map &map) { map(0x000000, 0x07ffff).rom(); /* ROM */ - map(0x100000, 0x101fff).ram().w(this, FUNC(gaelco_state::gaelco_vram_w)).share("videoram"); /* Video RAM */ + map(0x100000, 0x101fff).ram().w(FUNC(gaelco_state::gaelco_vram_w)).share("videoram"); /* Video RAM */ map(0x102000, 0x103fff).ram(); /* Screen RAM */ map(0x108000, 0x108007).writeonly().share("vregs"); /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_DEVWRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ @@ -141,7 +141,7 @@ void gaelco_state::bigkarnk_snd_map(address_map &map) void gaelco_state::maniacsq_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x100000, 0x101fff).ram().w(this, FUNC(gaelco_state::gaelco_vram_w)).share("videoram"); /* Video RAM */ + map(0x100000, 0x101fff).ram().w(FUNC(gaelco_state::gaelco_vram_w)).share("videoram"); /* Video RAM */ map(0x102000, 0x103fff).ram(); /* Screen RAM */ map(0x108000, 0x108007).writeonly().share("vregs"); /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ @@ -151,7 +151,7 @@ void gaelco_state::maniacsq_map(address_map &map) map(0x700002, 0x700003).portr("DSW1"); map(0x700004, 0x700005).portr("P1"); map(0x700006, 0x700007).portr("P2"); - map(0x70000d, 0x70000d).w(this, FUNC(gaelco_state::OKIM6295_bankswitch_w)); + map(0x70000d, 0x70000d).w(FUNC(gaelco_state::OKIM6295_bankswitch_w)); map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status register */ map(0xff0000, 0xffffff).ram(); /* Work RAM */ } @@ -159,8 +159,8 @@ void gaelco_state::maniacsq_map(address_map &map) void gaelco_state::squash_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x100000, 0x101fff).ram().w(this, FUNC(gaelco_state::gaelco_vram_encrypted_w)).share("videoram"); /* Video RAM */ - map(0x102000, 0x103fff).ram().w(this, FUNC(gaelco_state::gaelco_encrypted_w)).share("screenram"); /* Screen RAM */ + map(0x100000, 0x101fff).ram().w(FUNC(gaelco_state::gaelco_vram_encrypted_w)).share("videoram"); /* Video RAM */ + map(0x102000, 0x103fff).ram().w(FUNC(gaelco_state::gaelco_encrypted_w)).share("screenram"); /* Screen RAM */ map(0x108000, 0x108007).writeonly().share("vregs"); /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette */ @@ -173,7 +173,7 @@ void gaelco_state::squash_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_outlatch->write_d0(space, offset >> 3, data, mem_mask); }); - map(0x70000d, 0x70000d).w(this, FUNC(gaelco_state::OKIM6295_bankswitch_w)); + map(0x70000d, 0x70000d).w(FUNC(gaelco_state::OKIM6295_bankswitch_w)); map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status register */ map(0xff0000, 0xffffff).ram(); /* Work RAM */ } @@ -181,8 +181,8 @@ void gaelco_state::squash_map(address_map &map) void gaelco_state::thoop_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x100000, 0x101fff).ram().w(this, FUNC(gaelco_state::thoop_vram_encrypted_w)).share("videoram"); /* Video RAM */ - map(0x102000, 0x103fff).ram().w(this, FUNC(gaelco_state::thoop_encrypted_w)).share("screenram"); /* Screen RAM */ + map(0x100000, 0x101fff).ram().w(FUNC(gaelco_state::thoop_vram_encrypted_w)).share("videoram"); /* Video RAM */ + map(0x102000, 0x103fff).ram().w(FUNC(gaelco_state::thoop_encrypted_w)).share("screenram"); /* Screen RAM */ map(0x108000, 0x108007).writeonly().share("vregs"); /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette */ @@ -195,7 +195,7 @@ void gaelco_state::thoop_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_outlatch->write_d0(space, offset >> 3, data, mem_mask); }); - map(0x70000d, 0x70000d).w(this, FUNC(gaelco_state::OKIM6295_bankswitch_w)); + map(0x70000d, 0x70000d).w(FUNC(gaelco_state::OKIM6295_bankswitch_w)); map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status register */ map(0xff0000, 0xffffff).ram(); /* Work RAM */ } diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index 9c00406019f..63f8f2219bf 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -74,7 +74,7 @@ GFXDECODEINFO(0x0400000, 128) void gaelco2_state::mcu_hostmem_map(address_map &map) { - map(0x8000, 0xffff).rw(this, FUNC(gaelco2_state::shareram_r), FUNC(gaelco2_state::shareram_w)); // confirmed that 0x8000 - 0xffff is a window into 68k shared RAM + map(0x8000, 0xffff).rw(FUNC(gaelco2_state::shareram_r), FUNC(gaelco2_state::shareram_w)); // confirmed that 0x8000 - 0xffff is a window into 68k shared RAM } @@ -85,15 +85,15 @@ void gaelco2_state::mcu_hostmem_map(address_map &map) void gaelco2_state::maniacsq_map(address_map &map) { map(0x000000, 0x03ffff).rom(); /* ROM */ - map(0x200000, 0x20ffff).ram().w(this, FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ + map(0x200000, 0x20ffff).ram().w(FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ map(0x202890, 0x2028ff).rw("gaelco", FUNC(gaelco_gae1_device::gaelcosnd_r), FUNC(gaelco_gae1_device::gaelcosnd_w)); /* Sound Registers */ - map(0x210000, 0x211fff).ram().w(this, FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ + map(0x210000, 0x211fff).ram().w(FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ map(0x218004, 0x218009).ram().share("vregs"); /* Video Registers */ map(0x300000, 0x300001).portr("IN0"); /* DSW #1 + Input 1P */ map(0x300002, 0x300003).portr("IN1"); /* DSW #2 + Input 2P */ map(0x30004a, 0x30004b).nopw(); /* Sound muting? */ map(0x320000, 0x320001).portr("COIN"); /* COINSW + SERVICESW */ - map(0x500000, 0x500001).w(this, FUNC(gaelco2_state::alighunt_coin_w)); /* Coin lockout + counters */ + map(0x500000, 0x500001).w(FUNC(gaelco2_state::alighunt_coin_w)); /* Coin lockout + counters */ map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ map(0xfe8000, 0xfeffff).ram().share("shareram"); /* Work RAM */ } @@ -496,16 +496,16 @@ void gaelco2_state::play2000_map(address_map &map) map(0x000000, 0x03ffff).rom(); /* ROM */ map(0x100000, 0x100001).portr("IN0"); /* Coins + other buttons? */ // AM_RANGE(0x110000, 0x110001) ? - map(0x200000, 0x20ffff).ram().w(this, FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ + map(0x200000, 0x20ffff).ram().w(FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ map(0x202890, 0x2028ff).rw("gaelco", FUNC(gaelco_gae1_device::gaelcosnd_r), FUNC(gaelco_gae1_device::gaelcosnd_w)); /* Sound Registers */ - map(0x214000, 0x214fff).ram().w(this, FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ + map(0x214000, 0x214fff).ram().w(FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ map(0x215000, 0x217fff).ram(); /* Written to, but unused? */ map(0x218000, 0x218003).ram(); /* Written to, but unused? */ map(0x218004, 0x218009).ram().share("vregs"); /* Video Registers */ map(0x21800a, 0x218fff).ram(); /* Written to, but unused? */ // AM_RANGE(0x843100, 0x84315e) ? map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ - map(0xfe8000, 0xfeffff).rw(this, FUNC(gaelco2_state::play2000_shareram_68k_r), FUNC(gaelco2_state::play2000_shareram_68k_w)).share("shareram"); /* Work RAM */ + map(0xfe8000, 0xfeffff).rw(FUNC(gaelco2_state::play2000_shareram_68k_r), FUNC(gaelco2_state::play2000_shareram_68k_w)).share("shareram"); /* Work RAM */ } static INPUT_PORTS_START( play2000 ) @@ -655,9 +655,9 @@ READ16_MEMBER(bang_state::p2_gun_y){return (m_light1_y->read() * 240 / 0x100) - void bang_state::bang_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x200000, 0x20ffff).ram().w(this, FUNC(bang_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ + map(0x200000, 0x20ffff).ram().w(FUNC(bang_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ map(0x202890, 0x2028ff).rw("gaelco", FUNC(gaelco_cg1v_device::gaelcosnd_r), FUNC(gaelco_cg1v_device::gaelcosnd_w)); /* Sound Registers */ - map(0x210000, 0x211fff).ram().w(this, FUNC(bang_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ + map(0x210000, 0x211fff).ram().w(FUNC(bang_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ map(0x218004, 0x218009).readonly(); /* Video Registers */ map(0x218004, 0x218007).writeonly().share("vregs"); /* Video Registers */ map(0x218008, 0x218009).nopw(); /* CLR INT Video */ @@ -666,10 +666,10 @@ void bang_state::bang_map(address_map &map) map(0x300000, 0x30000f).w(m_mainlatch, FUNC(ls259_device::write_d0)).umask16(0x00ff); /* Coin Counters & serial EEPROM */ map(0x300010, 0x300011).portr("P2"); map(0x300020, 0x300021).portr("COIN"); - map(0x310000, 0x310001).r(this, FUNC(bang_state::p1_gun_x)).w(this, FUNC(bang_state::bang_clr_gun_int_w)); /* Gun 1P X */ /* CLR INT Gun */ - map(0x310002, 0x310003).r(this, FUNC(bang_state::p2_gun_x)); /* Gun 2P X */ - map(0x310004, 0x310005).r(this, FUNC(bang_state::p1_gun_y)); /* Gun 1P Y */ - map(0x310006, 0x310007).r(this, FUNC(bang_state::p2_gun_y)); /* Gun 2P Y */ + map(0x310000, 0x310001).r(FUNC(bang_state::p1_gun_x)).w(FUNC(bang_state::bang_clr_gun_int_w)); /* Gun 1P X */ /* CLR INT Gun */ + map(0x310002, 0x310003).r(FUNC(bang_state::p2_gun_x)); /* Gun 2P X */ + map(0x310004, 0x310005).r(FUNC(bang_state::p1_gun_y)); /* Gun 1P Y */ + map(0x310006, 0x310007).r(FUNC(bang_state::p2_gun_y)); /* Gun 2P Y */ map(0xfe0000, 0xfeffff).ram(); /* Work RAM */ } @@ -860,14 +860,14 @@ ROM_END void gaelco2_state::alighunt_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x200000, 0x20ffff).ram().w(this, FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ + map(0x200000, 0x20ffff).ram().w(FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ map(0x202890, 0x2028ff).rw("gaelco", FUNC(gaelco_gae1_device::gaelcosnd_r), FUNC(gaelco_gae1_device::gaelcosnd_w)); /* Sound Registers */ - map(0x210000, 0x211fff).ram().w(this, FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ + map(0x210000, 0x211fff).ram().w(FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ map(0x218004, 0x218009).ram().share("vregs"); /* Video Registers */ map(0x300000, 0x300001).portr("IN0"); /* DSW #1 + Input 1P */ map(0x300002, 0x300003).portr("IN1"); /* DSW #2 + Input 2P */ map(0x320000, 0x320001).portr("COIN"); /* COINSW + SERVICESW */ - map(0x500000, 0x500001).w(this, FUNC(gaelco2_state::alighunt_coin_w)); /* Coin lockout + counters */ + map(0x500000, 0x500001).w(FUNC(gaelco2_state::alighunt_coin_w)); /* Coin lockout + counters */ map(0x500006, 0x500007).nopw(); /* ??? */ map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ map(0xfe8000, 0xfeffff).ram().share("shareram"); /* Work RAM (shared with D5002FP) */ @@ -1129,15 +1129,15 @@ ROM_END void gaelco2_state::touchgo_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x200000, 0x20ffff).ram().w(this, FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ + map(0x200000, 0x20ffff).ram().w(FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ map(0x202890, 0x2028ff).rw("gaelco", FUNC(gaelco_gae1_device::gaelcosnd_r), FUNC(gaelco_gae1_device::gaelcosnd_w)); /* Sound Registers */ - map(0x210000, 0x211fff).ram().w(this, FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ + map(0x210000, 0x211fff).ram().w(FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ map(0x218004, 0x218009).ram().share("vregs"); /* Video Registers */ map(0x300000, 0x300001).portr("IN0"); /* DSW #1 + Input 1P */ map(0x300002, 0x300003).portr("IN1"); /* DSW #2 + Input 2P */ map(0x300004, 0x300005).portr("IN2"); /* COINSW + Input 3P */ map(0x300006, 0x300007).portr("IN3"); /* SERVICESW + Input 4P */ - map(0x500000, 0x500001).select(0x0038).w(this, FUNC(gaelco2_state::wrally2_latch_w)); /* Coin counters */ + map(0x500000, 0x500001).select(0x0038).w(FUNC(gaelco2_state::wrally2_latch_w)); /* Coin counters */ map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ map(0xfe8000, 0xfeffff).ram().share("shareram"); /* Work RAM (shared with D5002FP) */ } @@ -1508,16 +1508,16 @@ ROM_END void gaelco2_state::snowboar_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x200000, 0x20ffff).ram().w(this, FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ + map(0x200000, 0x20ffff).ram().w(FUNC(gaelco2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ map(0x202890, 0x2028ff).rw("gaelco", FUNC(gaelco_cg1v_device::gaelcosnd_r), FUNC(gaelco_cg1v_device::gaelcosnd_w)); /* Sound Registers */ - map(0x210000, 0x211fff).ram().w(this, FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ + map(0x210000, 0x211fff).ram().w(FUNC(gaelco2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ map(0x212000, 0x213fff).ram(); /* Extra RAM */ map(0x218004, 0x218009).ram().share("vregs"); /* Video Registers */ map(0x300000, 0x300001).portr("P1"); map(0x300000, 0x30000f).w(m_mainlatch, FUNC(ls259_device::write_d0)).umask16(0x00ff); /* Coin Counters & serial EEPROM */ map(0x300010, 0x300011).portr("P2"); map(0x300020, 0x300021).portr("COIN"); - map(0x310000, 0x31ffff).rw(this, FUNC(gaelco2_state::snowboar_protection_r), FUNC(gaelco2_state::snowboar_protection_w)).share("snowboar_prot"); /* Protection */ + map(0x310000, 0x31ffff).rw(FUNC(gaelco2_state::snowboar_protection_r), FUNC(gaelco2_state::snowboar_protection_w)).share("snowboar_prot"); /* Protection */ map(0xfe0000, 0xfeffff).ram(); /* Work RAM */ } @@ -1739,16 +1739,16 @@ ROM_END void wrally2_state::wrally2_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x200000, 0x20ffff).ram().w(this, FUNC(wrally2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ + map(0x200000, 0x20ffff).ram().w(FUNC(wrally2_state::gaelco2_vram_w)).share("spriteram"); /* Video RAM */ map(0x202890, 0x2028ff).rw("gaelco", FUNC(gaelco_gae1_device::gaelcosnd_r), FUNC(gaelco_gae1_device::gaelcosnd_w)); /* Sound Registers */ - map(0x210000, 0x211fff).ram().w(this, FUNC(wrally2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ + map(0x210000, 0x211fff).ram().w(FUNC(wrally2_state::gaelco2_palette_w)).share("paletteram"); /* Palette */ map(0x212000, 0x213fff).ram(); /* Extra RAM */ map(0x218004, 0x218009).ram().share("vregs"); /* Video Registers */ map(0x300000, 0x300001).portr("IN0"); /* DIPSW #2 + Inputs 1P */ map(0x300002, 0x300003).portr("IN1"); /* DIPSW #1 */ map(0x300004, 0x300005).portr("IN2"); /* Inputs 2P + COINSW */ map(0x300006, 0x300007).portr("IN3"); /* SERVICESW */ - map(0x400000, 0x400001).select(0x0038).w(this, FUNC(wrally2_state::wrally2_latch_w)); /* Coin counters, etc. */ + map(0x400000, 0x400001).select(0x0038).w(FUNC(wrally2_state::wrally2_latch_w)); /* Coin counters, etc. */ map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ map(0xfe8000, 0xfeffff).ram().share("shareram"); /* Work RAM (shared with D5002FP) */ } diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp index f2c9e376379..d9c1c228b93 100644 --- a/src/mame/drivers/gaelco3d.cpp +++ b/src/mame/drivers/gaelco3d.cpp @@ -670,14 +670,14 @@ void gaelco3d_state::main_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(gaelco3d_state::gaelco3d_paletteram_w)).share("paletteram"); + map(0x400000, 0x40ffff).ram().w(FUNC(gaelco3d_state::gaelco3d_paletteram_w)).share("paletteram"); map(0x51000c, 0x51000d).portr("IN0"); map(0x51001c, 0x51001d).portr("IN1"); map(0x51002c, 0x51002d).portr("IN2"); map(0x51003c, 0x51003d).portr("IN3"); map(0x510041, 0x510041).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x510042, 0x510043).r(this, FUNC(gaelco3d_state::sound_status_r)); - map(0x510100, 0x510101).rw(this, FUNC(gaelco3d_state::eeprom_data_r), FUNC(gaelco3d_state::irq_ack_w)); + map(0x510042, 0x510043).r(FUNC(gaelco3d_state::sound_status_r)); + map(0x510100, 0x510101).rw(FUNC(gaelco3d_state::eeprom_data_r), FUNC(gaelco3d_state::irq_ack_w)); map(0x510103, 0x510103).r(m_serial, FUNC(gaelco_serial_device::data_r)); map(0x510103, 0x510103).select(0x000038).lw8("mainlatch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { @@ -689,21 +689,21 @@ void gaelco3d_state::main_map(address_map &map) m_outlatch->write_d0(space, offset >> 3, data, mem_mask); }); map(0xfe0000, 0xfeffff).ram().share("m68k_ram_base"); - map(0xfe7f80, 0xfe7fff).w(this, FUNC(gaelco3d_state::tms_comm_w)).share("tms_comm_base"); + map(0xfe7f80, 0xfe7fff).w(FUNC(gaelco3d_state::tms_comm_w)).share("tms_comm_base"); } void gaelco3d_state::main020_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(gaelco3d_state::gaelco3d_paletteram_020_w)).share("paletteram"); + map(0x400000, 0x40ffff).ram().w(FUNC(gaelco3d_state::gaelco3d_paletteram_020_w)).share("paletteram"); map(0x51000c, 0x51000f).portr("IN0"); map(0x51001c, 0x51001f).portr("IN1"); map(0x51002c, 0x51002f).portr("IN2"); map(0x51003c, 0x51003f).portr("IN3"); map(0x510041, 0x510041).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x510042, 0x510043).r(this, FUNC(gaelco3d_state::sound_status_r)); - map(0x510100, 0x510101).rw(this, FUNC(gaelco3d_state::eeprom_data_r), FUNC(gaelco3d_state::irq_ack_w)); + map(0x510042, 0x510043).r(FUNC(gaelco3d_state::sound_status_r)); + map(0x510100, 0x510101).rw(FUNC(gaelco3d_state::eeprom_data_r), FUNC(gaelco3d_state::irq_ack_w)); map(0x510103, 0x510103).r(m_serial, FUNC(gaelco_serial_device::data_r)); map(0x510103, 0x510103).select(0x000038).lw8("mainlatch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { @@ -715,14 +715,14 @@ void gaelco3d_state::main020_map(address_map &map) m_outlatch->write_d0(space, offset >> 2, data, mem_mask); }); map(0xfe0000, 0xfeffff).ram().share("m68k_ram_base"); - map(0xfe7f80, 0xfe7fff).w(this, FUNC(gaelco3d_state::tms_comm_w)).share("tms_comm_base"); + map(0xfe7f80, 0xfe7fff).w(FUNC(gaelco3d_state::tms_comm_w)).share("tms_comm_base"); } void gaelco3d_state::tms_map(address_map &map) { - map(0x000000, 0x007fff).rw(this, FUNC(gaelco3d_state::tms_m68k_ram_r), FUNC(gaelco3d_state::tms_m68k_ram_w)); + map(0x000000, 0x007fff).rw(FUNC(gaelco3d_state::tms_m68k_ram_r), FUNC(gaelco3d_state::tms_m68k_ram_w)); map(0x400000, 0x7fffff).rom().region("user2", 0); - map(0xc00000, 0xc00007).w(this, FUNC(gaelco3d_state::gaelco3d_render_w)); + map(0xc00000, 0xc00007).w(FUNC(gaelco3d_state::gaelco3d_render_w)); } @@ -734,12 +734,12 @@ void gaelco3d_state::adsp_program_map(address_map &map) void gaelco3d_state::adsp_data_map(address_map &map) { - map(0x0000, 0x0001).w(this, FUNC(gaelco3d_state::adsp_rombank_w)); + map(0x0000, 0x0001).w(FUNC(gaelco3d_state::adsp_rombank_w)); map(0x0000, 0x1fff).bankr("adspbank"); map(0x2000, 0x2000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).umask16(0x00ff); - map(0x2000, 0x2000).w(this, FUNC(gaelco3d_state::sound_status_w)); + map(0x2000, 0x2000).w(FUNC(gaelco3d_state::sound_status_w)); map(0x3800, 0x39ff).ram().share("adsp_fastram"); /* 512 words internal RAM */ - map(0x3fe0, 0x3fff).w(this, FUNC(gaelco3d_state::adsp_control_w)).share("adsp_regs"); + map(0x3fe0, 0x3fff).w(FUNC(gaelco3d_state::adsp_control_w)).share("adsp_regs"); } diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index 1a5ed669e67..065dfc3cd93 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -391,63 +391,63 @@ void gaiden_state::gaiden_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x060000, 0x063fff).ram(); - map(0x070000, 0x070fff).ram().w(this, FUNC(gaiden_state::tx_videoram_w)).share("videoram1"); - map(0x072000, 0x073fff).ram().w(this, FUNC(gaiden_state::fg_videoram_w)).share("videoram2"); - map(0x074000, 0x075fff).ram().w(this, FUNC(gaiden_state::bg_videoram_w)).share("videoram3"); + map(0x070000, 0x070fff).ram().w(FUNC(gaiden_state::tx_videoram_w)).share("videoram1"); + map(0x072000, 0x073fff).ram().w(FUNC(gaiden_state::fg_videoram_w)).share("videoram2"); + map(0x074000, 0x075fff).ram().w(FUNC(gaiden_state::bg_videoram_w)).share("videoram3"); map(0x076000, 0x077fff).ram().share("spriteram"); map(0x078000, 0x079fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x07a000, 0x07a001).portr("SYSTEM"); - map(0x07a002, 0x07a003).portr("P1_P2").w(this, FUNC(gaiden_state::gaiden_sproffsety_w)); + map(0x07a002, 0x07a003).portr("P1_P2").w(FUNC(gaiden_state::gaiden_sproffsety_w)); map(0x07a004, 0x07a005).portr("DSW"); - map(0x07a104, 0x07a105).w(this, FUNC(gaiden_state::gaiden_txscrolly_w)); - map(0x07a108, 0x07a109).w(this, FUNC(gaiden_state::gaiden_txoffsety_w)); - map(0x07a10c, 0x07a10d).w(this, FUNC(gaiden_state::gaiden_txscrollx_w)); - map(0x07a204, 0x07a205).w(this, FUNC(gaiden_state::gaiden_fgscrolly_w)); - map(0x07a208, 0x07a209).w(this, FUNC(gaiden_state::gaiden_fgoffsety_w)); - map(0x07a20c, 0x07a20d).w(this, FUNC(gaiden_state::gaiden_fgscrollx_w)); - map(0x07a304, 0x07a305).w(this, FUNC(gaiden_state::gaiden_bgscrolly_w)); - map(0x07a308, 0x07a309).w(this, FUNC(gaiden_state::gaiden_bgoffsety_w)); - map(0x07a30c, 0x07a30d).w(this, FUNC(gaiden_state::gaiden_bgscrollx_w)); + map(0x07a104, 0x07a105).w(FUNC(gaiden_state::gaiden_txscrolly_w)); + map(0x07a108, 0x07a109).w(FUNC(gaiden_state::gaiden_txoffsety_w)); + map(0x07a10c, 0x07a10d).w(FUNC(gaiden_state::gaiden_txscrollx_w)); + map(0x07a204, 0x07a205).w(FUNC(gaiden_state::gaiden_fgscrolly_w)); + map(0x07a208, 0x07a209).w(FUNC(gaiden_state::gaiden_fgoffsety_w)); + map(0x07a20c, 0x07a20d).w(FUNC(gaiden_state::gaiden_fgscrollx_w)); + map(0x07a304, 0x07a305).w(FUNC(gaiden_state::gaiden_bgscrolly_w)); + map(0x07a308, 0x07a309).w(FUNC(gaiden_state::gaiden_bgoffsety_w)); + map(0x07a30c, 0x07a30d).w(FUNC(gaiden_state::gaiden_bgscrollx_w)); map(0x07a800, 0x07a801).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // Ninja Gaiden writes only to the lower byte; Tecmo Knight and Strato Fighter write to the upper byte instead. // It's not clear which 8 data lines are actually connected, but byte smearing is almost certainly involved. map(0x07a802, 0x07a803).w("soundlatch", FUNC(generic_latch_8_device::write)).umask16(0x00ff).cswidth(16); - map(0x07a806, 0x07a807).w(this, FUNC(gaiden_state::irq_ack_w)); - map(0x07a808, 0x07a809).w(this, FUNC(gaiden_state::gaiden_flip_w)); + map(0x07a806, 0x07a807).w(FUNC(gaiden_state::irq_ack_w)); + map(0x07a808, 0x07a809).w(FUNC(gaiden_state::gaiden_flip_w)); } void gaiden_state::wildfang_map(address_map &map) { gaiden_map(map); - map(0x07a006, 0x07a007).r(this, FUNC(gaiden_state::wildfang_protection_r)); - map(0x07a804, 0x07a805).w(this, FUNC(gaiden_state::wildfang_protection_w)); + map(0x07a006, 0x07a007).r(FUNC(gaiden_state::wildfang_protection_r)); + map(0x07a804, 0x07a805).w(FUNC(gaiden_state::wildfang_protection_w)); } void gaiden_state::raiga_map(address_map &map) { gaiden_map(map); - map(0x07a006, 0x07a007).r(this, FUNC(gaiden_state::raiga_protection_r)); - map(0x07a804, 0x07a805).w(this, FUNC(gaiden_state::raiga_protection_w)); + map(0x07a006, 0x07a007).r(FUNC(gaiden_state::raiga_protection_r)); + map(0x07a804, 0x07a805).w(FUNC(gaiden_state::raiga_protection_w)); } void gaiden_state::drgnbowl_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x060000, 0x063fff).ram(); - map(0x070000, 0x070fff).ram().w(this, FUNC(gaiden_state::tx_videoram_w)).share("videoram1"); - map(0x072000, 0x073fff).ram().w(this, FUNC(gaiden_state::fg_videoram_w)).share("videoram2"); - map(0x074000, 0x075fff).ram().w(this, FUNC(gaiden_state::bg_videoram_w)).share("videoram3"); + map(0x070000, 0x070fff).ram().w(FUNC(gaiden_state::tx_videoram_w)).share("videoram1"); + map(0x072000, 0x073fff).ram().w(FUNC(gaiden_state::fg_videoram_w)).share("videoram2"); + map(0x074000, 0x075fff).ram().w(FUNC(gaiden_state::bg_videoram_w)).share("videoram3"); map(0x076000, 0x077fff).ram().share("spriteram"); map(0x078000, 0x079fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x07a000, 0x07a001).portr("SYSTEM"); map(0x07a002, 0x07a003).portr("P1_P2"); map(0x07a004, 0x07a005).portr("DSW"); map(0x07a00e, 0x07a00e).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x07e000, 0x07e000).w(this, FUNC(gaiden_state::drgnbowl_irq_ack_w)); - map(0x07f000, 0x07f001).w(this, FUNC(gaiden_state::gaiden_bgscrolly_w)); - map(0x07f002, 0x07f003).w(this, FUNC(gaiden_state::gaiden_bgscrollx_w)); - map(0x07f004, 0x07f005).w(this, FUNC(gaiden_state::gaiden_fgscrolly_w)); - map(0x07f006, 0x07f007).w(this, FUNC(gaiden_state::gaiden_fgscrollx_w)); + map(0x07e000, 0x07e000).w(FUNC(gaiden_state::drgnbowl_irq_ack_w)); + map(0x07f000, 0x07f001).w(FUNC(gaiden_state::gaiden_bgscrolly_w)); + map(0x07f002, 0x07f003).w(FUNC(gaiden_state::gaiden_bgscrollx_w)); + map(0x07f004, 0x07f005).w(FUNC(gaiden_state::gaiden_fgscrolly_w)); + map(0x07f006, 0x07f007).w(FUNC(gaiden_state::gaiden_fgscrollx_w)); } void gaiden_state::sound_map(address_map &map) @@ -937,7 +937,7 @@ void gaiden_state::mastninj_sound_map(address_map &map) map(0xc800, 0xc801).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xcc00, 0xcc00).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xd000, 0xd000).w("adpcm_select2", FUNC(ls157_device::ba_w)); - map(0xd400, 0xd400).w(this, FUNC(gaiden_state::adpcm_bankswitch_w)); + map(0xd400, 0xd400).w(FUNC(gaiden_state::adpcm_bankswitch_w)); map(0xd800, 0xd800).w("adpcm_select1", FUNC(ls157_device::ba_w)); map(0xf000, 0xf7ff).ram(); } @@ -975,9 +975,9 @@ void gaiden_state::mastninj_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x060000, 0x063fff).ram(); - map(0x070000, 0x070fff).ram().w(this, FUNC(gaiden_state::tx_videoram_w)).share("videoram1"); - map(0x072000, 0x073fff).ram().w(this, FUNC(gaiden_state::fg_videoram_w)).share("videoram2"); - map(0x074000, 0x075fff).ram().w(this, FUNC(gaiden_state::bg_videoram_w)).share("videoram3"); + map(0x070000, 0x070fff).ram().w(FUNC(gaiden_state::tx_videoram_w)).share("videoram1"); + map(0x072000, 0x073fff).ram().w(FUNC(gaiden_state::fg_videoram_w)).share("videoram2"); + map(0x074000, 0x075fff).ram().w(FUNC(gaiden_state::bg_videoram_w)).share("videoram3"); map(0x076000, 0x077fff).ram().share("spriteram"); map(0x078000, 0x079fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // AM_RANGE(0x078800, 0x079fff) AM_RAM @@ -986,15 +986,15 @@ void gaiden_state::mastninj_map(address_map &map) map(0x07a004, 0x07a005).portr("DSW"); // AM_RANGE(0x07a104, 0x07a105) AM_WRITE(gaiden_txscrolly_w) // AM_RANGE(0x07a10c, 0x07a10d) AM_WRITE(gaiden_txscrollx_w) - map(0x07f000, 0x07f001).w(this, FUNC(gaiden_state::gaiden_bgscrolly_w)); - map(0x07f002, 0x07f003).w(this, FUNC(gaiden_state::gaiden_bgscrollx_w)); - map(0x07f004, 0x07f005).w(this, FUNC(gaiden_state::gaiden_fgscrolly_w)); - map(0x07f006, 0x07f007).w(this, FUNC(gaiden_state::gaiden_fgscrollx_w)); + map(0x07f000, 0x07f001).w(FUNC(gaiden_state::gaiden_bgscrolly_w)); + map(0x07f002, 0x07f003).w(FUNC(gaiden_state::gaiden_bgscrollx_w)); + map(0x07f004, 0x07f005).w(FUNC(gaiden_state::gaiden_fgscrolly_w)); + map(0x07f006, 0x07f007).w(FUNC(gaiden_state::gaiden_fgscrollx_w)); map(0x07a800, 0x07a801).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // AM_RANGE(0x07a806, 0x07a807) AM_WRITENOP // AM_RANGE(0x07a808, 0x07a809) AM_WRITE(gaiden_flip_w) map(0x07a00e, 0x07a00e).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x07e000, 0x07e000).w(this, FUNC(gaiden_state::drgnbowl_irq_ack_w)); + map(0x07e000, 0x07e000).w(FUNC(gaiden_state::drgnbowl_irq_ack_w)); } MACHINE_CONFIG_START(gaiden_state::mastninj) diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 59e852f0029..59ee0526f1c 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -343,7 +343,7 @@ void gal3_state::cpu_mst_map(address_map &map) map(0x20000000, 0x20001fff).ram().share("nvmem"); //NVRAM /// AM_RANGE(0x40000000, 0x4000ffff) AM_WRITE() // map(0x44000000, 0x44000003).portr("DSW_CPU_mst"); - map(0x44800000, 0x44800003).r(this, FUNC(gal3_state::led_mst_r)).w(this, FUNC(gal3_state::led_mst_w)); //LEDs + map(0x44800000, 0x44800003).r(FUNC(gal3_state::led_mst_r)).w(FUNC(gal3_state::led_mst_w)); //LEDs map(0x48000000, 0x48000003).nopr(); //irq1 v-blank ack map(0x4c000000, 0x4c000003).nopr(); //irq3 ack map(0x60000000, 0x60007fff).ram().share("share1"); //CRAM @@ -352,7 +352,7 @@ void gal3_state::cpu_mst_map(address_map &map) /// AM_RANGE(0xc0000000, 0xc000000b) AM_WRITENOP //upload? map(0xc000000c, 0xc000000f).nopr(); //irq2 ack /// AM_RANGE(0xd8000000, 0xd800000f) AM_RAM // protection or 68681? - map(0xf2800000, 0xf2800fff).rw(this, FUNC(gal3_state::rso_r), FUNC(gal3_state::rso_w)); //RSO PCB + map(0xf2800000, 0xf2800fff).rw(FUNC(gal3_state::rso_r), FUNC(gal3_state::rso_w)); //RSO PCB } void gal3_state::cpu_slv_map(address_map &map) @@ -360,7 +360,7 @@ void gal3_state::cpu_slv_map(address_map &map) map(0x00000000, 0x0007ffff).rom(); /// AM_RANGE(0x40000000, 0x4000ffff) AM_WRITE() // map(0x44000000, 0x44000003).portr("DSW_CPU_slv"); - map(0x44800000, 0x44800003).r(this, FUNC(gal3_state::led_slv_r)).w(this, FUNC(gal3_state::led_slv_w)); //LEDs + map(0x44800000, 0x44800003).r(FUNC(gal3_state::led_slv_r)).w(FUNC(gal3_state::led_slv_w)); //LEDs map(0x48000000, 0x48000003).nopr(); //irq1 ack /// AM_RANGE(0x50000000, 0x50000003) AM_READ() AM_WRITE() /// AM_RANGE(0x54000000, 0x54000003) AM_READ() AM_WRITE() @@ -373,10 +373,10 @@ void gal3_state::cpu_slv_map(address_map &map) /// AM_RANGE(0xf1440000, 0xf1440003) AM_READWRITE(pointram_data_r,pointram_data_w) /// AM_RANGE(0x440002, 0x47ffff) AM_WRITENOP /* (frame buffer?) */ /// AM_RANGE(0xf1480000, 0xf14807ff) AM_READWRITE(namcos21_depthcue_r,namcos21_depthcue_w) - map(0xf1700000, 0xf170ffff).rw(this, FUNC(gal3_state::c355_obj_ram_r), FUNC(gal3_state::c355_obj_ram_w)).share("objram"); - map(0xf1720000, 0xf1720007).rw(this, FUNC(gal3_state::c355_obj_position_r), FUNC(gal3_state::c355_obj_position_w)); - map(0xf1740000, 0xf175ffff).rw(this, FUNC(gal3_state::paletteram32_r), FUNC(gal3_state::paletteram32_w)); - map(0xf1760000, 0xf1760003).rw(this, FUNC(gal3_state::namcos21_video_enable_r), FUNC(gal3_state::namcos21_video_enable_w)); + map(0xf1700000, 0xf170ffff).rw(FUNC(gal3_state::c355_obj_ram_r), FUNC(gal3_state::c355_obj_ram_w)).share("objram"); + map(0xf1720000, 0xf1720007).rw(FUNC(gal3_state::c355_obj_position_r), FUNC(gal3_state::c355_obj_position_w)); + map(0xf1740000, 0xf175ffff).rw(FUNC(gal3_state::paletteram32_r), FUNC(gal3_state::paletteram32_w)); + map(0xf1760000, 0xf1760003).rw(FUNC(gal3_state::namcos21_video_enable_r), FUNC(gal3_state::namcos21_video_enable_w)); map(0xf2200000, 0xf220ffff).ram(); map(0xf2700000, 0xf270ffff).ram(); //AM_READWRITE16(c355_obj_ram_r,c355_obj_ram_w,0xffffffff) AM_SHARE("objram") diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index 5e6361d9e15..fa0c5aa4bd8 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -841,21 +841,21 @@ void battles_state::machine_reset() void bosco_state::bosco_map(address_map &map) { map(0x0000, 0x3fff).rom().nopw(); /* the only area different for each CPU */ - map(0x6800, 0x6807).r(this, FUNC(bosco_state::bosco_dsw_r)); + map(0x6800, 0x6807).r(FUNC(bosco_state::bosco_dsw_r)); map(0x6800, 0x681f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); map(0x6820, 0x6827).w("misclatch", FUNC(ls259_device::write_d0)); map(0x6830, 0x6830).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x7000, 0x70ff).rw("06xx_0", FUNC(namco_06xx_device::data_r), FUNC(namco_06xx_device::data_w)); map(0x7100, 0x7100).rw("06xx_0", FUNC(namco_06xx_device::ctrl_r), FUNC(namco_06xx_device::ctrl_w)); map(0x7800, 0x7fff).ram().share("share1"); - map(0x8000, 0x8fff).ram().w(this, FUNC(bosco_state::bosco_videoram_w)).share("videoram");/* + sprite registers */ + map(0x8000, 0x8fff).ram().w(FUNC(bosco_state::bosco_videoram_w)).share("videoram");/* + sprite registers */ map(0x9000, 0x90ff).rw("06xx_1", FUNC(namco_06xx_device::data_r), FUNC(namco_06xx_device::data_w)); map(0x9100, 0x9100).rw("06xx_1", FUNC(namco_06xx_device::ctrl_r), FUNC(namco_06xx_device::ctrl_w)); map(0x9800, 0x980f).writeonly().share("bosco_radarattr"); - map(0x9810, 0x9810).w(this, FUNC(bosco_state::bosco_scrollx_w)); - map(0x9820, 0x9820).w(this, FUNC(bosco_state::bosco_scrolly_w)); + map(0x9810, 0x9810).w(FUNC(bosco_state::bosco_scrollx_w)); + map(0x9820, 0x9820).w(FUNC(bosco_state::bosco_scrolly_w)); map(0x9830, 0x9830).writeonly().share("starcontrol"); - map(0x9840, 0x9840).w(this, FUNC(bosco_state::bosco_starclr_w)); + map(0x9840, 0x9840).w(FUNC(bosco_state::bosco_starclr_w)); map(0x9870, 0x9877).w(m_videolatch, FUNC(ls259_device::write_d0)); } @@ -863,13 +863,13 @@ void bosco_state::bosco_map(address_map &map) void galaga_state::galaga_map(address_map &map) { map(0x0000, 0x3fff).rom().nopw(); /* the only area different for each CPU */ - map(0x6800, 0x6807).r(this, FUNC(galaga_state::bosco_dsw_r)); + map(0x6800, 0x6807).r(FUNC(galaga_state::bosco_dsw_r)); map(0x6800, 0x681f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); map(0x6820, 0x6827).w("misclatch", FUNC(ls259_device::write_d0)); map(0x6830, 0x6830).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x7000, 0x70ff).rw("06xx", FUNC(namco_06xx_device::data_r), FUNC(namco_06xx_device::data_w)); map(0x7100, 0x7100).rw("06xx", FUNC(namco_06xx_device::ctrl_r), FUNC(namco_06xx_device::ctrl_w)); - map(0x8000, 0x87ff).ram().w(this, FUNC(galaga_state::galaga_videoram_w)).share("videoram"); + map(0x8000, 0x87ff).ram().w(FUNC(galaga_state::galaga_videoram_w)).share("videoram"); map(0x8800, 0x8bff).ram().share("galaga_ram1"); map(0x9000, 0x93ff).ram().share("galaga_ram2"); map(0x9800, 0x9bff).ram().share("galaga_ram3"); @@ -886,7 +886,7 @@ void galaga_state::gatsbee_main_map(address_map &map) void xevious_state::xevious_map(address_map &map) { map(0x0000, 0x3fff).rom().nopw(); /* the only area different for each CPU */ - map(0x6800, 0x6807).r(this, FUNC(xevious_state::bosco_dsw_r)); + map(0x6800, 0x6807).r(FUNC(xevious_state::bosco_dsw_r)); map(0x6800, 0x681f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); map(0x6820, 0x6827).w("misclatch", FUNC(ls259_device::write_d0)); map(0x6830, 0x6830).w("watchdog", FUNC(watchdog_timer_device::reset_w)); @@ -896,12 +896,12 @@ void xevious_state::xevious_map(address_map &map) map(0x8000, 0x87ff).ram().share("xevious_sr1"); /* work RAM + sprite registers */ map(0x9000, 0x97ff).ram().share("xevious_sr2"); /* work RAM + sprite registers */ map(0xa000, 0xa7ff).ram().share("xevious_sr3"); /* work RAM + sprite registers */ - map(0xb000, 0xb7ff).ram().w(this, FUNC(xevious_state::xevious_fg_colorram_w)).share("fg_colorram"); - map(0xb800, 0xbfff).ram().w(this, FUNC(xevious_state::xevious_bg_colorram_w)).share("bg_colorram"); - map(0xc000, 0xc7ff).ram().w(this, FUNC(xevious_state::xevious_fg_videoram_w)).share("fg_videoram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(xevious_state::xevious_bg_videoram_w)).share("bg_videoram"); - map(0xd000, 0xd07f).w(this, FUNC(xevious_state::xevious_vh_latch_w)); - map(0xf000, 0xffff).rw(this, FUNC(xevious_state::xevious_bb_r), FUNC(xevious_state::xevious_bs_w)); + map(0xb000, 0xb7ff).ram().w(FUNC(xevious_state::xevious_fg_colorram_w)).share("fg_colorram"); + map(0xb800, 0xbfff).ram().w(FUNC(xevious_state::xevious_bg_colorram_w)).share("bg_colorram"); + map(0xc000, 0xc7ff).ram().w(FUNC(xevious_state::xevious_fg_videoram_w)).share("fg_videoram"); + map(0xc800, 0xcfff).ram().w(FUNC(xevious_state::xevious_bg_videoram_w)).share("bg_videoram"); + map(0xd000, 0xd07f).w(FUNC(xevious_state::xevious_vh_latch_w)); + map(0xf000, 0xffff).rw(FUNC(xevious_state::xevious_bb_r), FUNC(xevious_state::xevious_bs_w)); } @@ -913,7 +913,7 @@ void digdug_state::digdug_map(address_map &map) map(0x6830, 0x6830).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x7000, 0x70ff).rw("06xx", FUNC(namco_06xx_device::data_r), FUNC(namco_06xx_device::data_w)); map(0x7100, 0x7100).rw("06xx", FUNC(namco_06xx_device::ctrl_r), FUNC(namco_06xx_device::ctrl_w)); - map(0x8000, 0x83ff).ram().w(this, FUNC(digdug_state::digdug_videoram_w)).share("videoram"); /* tilemap RAM (bottom half of RAM 0 */ + map(0x8000, 0x83ff).ram().w(FUNC(digdug_state::digdug_videoram_w)).share("videoram"); /* tilemap RAM (bottom half of RAM 0 */ map(0x8400, 0x87ff).ram().share("share1"); /* work RAM (top half for RAM 0 */ map(0x8800, 0x8bff).ram().share("digdug_objram"); /* work RAM + sprite registers */ map(0x9000, 0x93ff).ram().share("digdug_posram"); /* work RAM + sprite registers */ @@ -935,11 +935,11 @@ void galaga_state::galaga_mem4(address_map &map) void battles_state::battles_mem4(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x4000, 0x4003).r(this, FUNC(battles_state::input_port_r)); - map(0x4001, 0x4001).w(this, FUNC(battles_state::cpu4_coin_w)); - map(0x5000, 0x5000).w(this, FUNC(battles_state::noise_sound_w)); - map(0x6000, 0x6000).rw(this, FUNC(battles_state::customio3_r), FUNC(battles_state::customio3_w)); - map(0x7000, 0x7000).rw(this, FUNC(battles_state::customio_data3_r), FUNC(battles_state::customio_data3_w)); + map(0x4000, 0x4003).r(FUNC(battles_state::input_port_r)); + map(0x4001, 0x4001).w(FUNC(battles_state::cpu4_coin_w)); + map(0x5000, 0x5000).w(FUNC(battles_state::noise_sound_w)); + map(0x6000, 0x6000).rw(FUNC(battles_state::customio3_r), FUNC(battles_state::customio3_w)); + map(0x7000, 0x7000).rw(FUNC(battles_state::customio_data3_r), FUNC(battles_state::customio_data3_w)); map(0x8000, 0x80ff).ram(); } diff --git a/src/mame/drivers/galastrm.cpp b/src/mame/drivers/galastrm.cpp index c3b74d09250..f861412d4a1 100644 --- a/src/mame/drivers/galastrm.cpp +++ b/src/mame/drivers/galastrm.cpp @@ -111,9 +111,9 @@ void galastrm_state::galastrm_map(address_map &map) map(0x600000, 0x6007ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); /* Sound shared ram */ map(0x800000, 0x80ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::long_r), FUNC(tc0480scp_device::long_w)); /* tilemaps */ map(0x830000, 0x83002f).rw(m_tc0480scp, FUNC(tc0480scp_device::ctrl_long_r), FUNC(tc0480scp_device::ctrl_long_w)); - map(0x900000, 0x900003).w(this, FUNC(galastrm_state::galastrm_palette_w)); /* TC0110PCR */ - map(0xb00000, 0xb00003).w(this, FUNC(galastrm_state::galastrm_tc0610_0_w)); /* TC0610 */ - map(0xc00000, 0xc00003).w(this, FUNC(galastrm_state::galastrm_tc0610_1_w)); + map(0x900000, 0x900003).w(FUNC(galastrm_state::galastrm_palette_w)); /* TC0110PCR */ + map(0xb00000, 0xb00003).w(FUNC(galastrm_state::galastrm_tc0610_0_w)); /* TC0610 */ + map(0xc00000, 0xc00003).w(FUNC(galastrm_state::galastrm_tc0610_1_w)); map(0xd00000, 0xd0ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::long_r), FUNC(tc0100scn_device::long_w)); /* piv tilemaps */ map(0xd20000, 0xd2000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_long_r), FUNC(tc0100scn_device::ctrl_long_w)); } diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp index 435e99299e7..9651a089adf 100644 --- a/src/mame/drivers/galaxi.cpp +++ b/src/mame/drivers/galaxi.cpp @@ -314,20 +314,20 @@ void galaxi_state::galaxi_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x1003ff).ram().w(this, FUNC(galaxi_state::bg1_w)).share("bg1_ram"); - map(0x100400, 0x1007ff).ram().w(this, FUNC(galaxi_state::bg2_w)).share("bg2_ram"); - map(0x100800, 0x100bff).ram().w(this, FUNC(galaxi_state::bg3_w)).share("bg3_ram"); - map(0x100c00, 0x100fff).ram().w(this, FUNC(galaxi_state::bg4_w)).share("bg4_ram"); + map(0x100000, 0x1003ff).ram().w(FUNC(galaxi_state::bg1_w)).share("bg1_ram"); + map(0x100400, 0x1007ff).ram().w(FUNC(galaxi_state::bg2_w)).share("bg2_ram"); + map(0x100800, 0x100bff).ram().w(FUNC(galaxi_state::bg3_w)).share("bg3_ram"); + map(0x100c00, 0x100fff).ram().w(FUNC(galaxi_state::bg4_w)).share("bg4_ram"); - map(0x101000, 0x101fff).ram().w(this, FUNC(galaxi_state::fg_w)).share("fg_ram"); + map(0x101000, 0x101fff).ram().w(FUNC(galaxi_state::fg_w)).share("fg_ram"); map(0x102000, 0x107fff).nopr(); // unknown map(0x300000, 0x3007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x500001).portr("INPUTS"); - map(0x500000, 0x500001).w(this, FUNC(galaxi_state::_500000_w)); - map(0x500002, 0x500003).w(this, FUNC(galaxi_state::_500002_w)); - map(0x500004, 0x500005).w(this, FUNC(galaxi_state::_500004_w)); + map(0x500000, 0x500001).w(FUNC(galaxi_state::_500000_w)); + map(0x500002, 0x500003).w(FUNC(galaxi_state::_500002_w)); + map(0x500004, 0x500005).w(FUNC(galaxi_state::_500004_w)); map(0x700001, 0x700001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -340,20 +340,20 @@ void galaxi_state::lastfour_map(address_map &map) map(0x000000, 0x03ffff).rom(); // bg3+4 / 1+2 seem to be swapped, order, palettes, scroll register etc. all suggest this - map(0x100000, 0x1003ff).ram().w(this, FUNC(galaxi_state::bg3_w)).share("bg3_ram"); - map(0x100400, 0x1007ff).ram().w(this, FUNC(galaxi_state::bg4_w)).share("bg4_ram"); - map(0x100800, 0x100bff).ram().w(this, FUNC(galaxi_state::bg1_w)).share("bg1_ram"); - map(0x100c00, 0x100fff).ram().w(this, FUNC(galaxi_state::bg2_w)).share("bg2_ram"); + map(0x100000, 0x1003ff).ram().w(FUNC(galaxi_state::bg3_w)).share("bg3_ram"); + map(0x100400, 0x1007ff).ram().w(FUNC(galaxi_state::bg4_w)).share("bg4_ram"); + map(0x100800, 0x100bff).ram().w(FUNC(galaxi_state::bg1_w)).share("bg1_ram"); + map(0x100c00, 0x100fff).ram().w(FUNC(galaxi_state::bg2_w)).share("bg2_ram"); - map(0x101000, 0x101fff).ram().w(this, FUNC(galaxi_state::fg_w)).share("fg_ram"); + map(0x101000, 0x101fff).ram().w(FUNC(galaxi_state::fg_w)).share("fg_ram"); map(0x102000, 0x107fff).nopr(); // unknown map(0x300000, 0x3007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x500001).portr("INPUTS"); - map(0x500000, 0x500001).w(this, FUNC(galaxi_state::_500000_w)); - map(0x500002, 0x500003).w(this, FUNC(galaxi_state::_500002_w)); - map(0x500004, 0x500005).w(this, FUNC(galaxi_state::_500004_w)); + map(0x500000, 0x500001).w(FUNC(galaxi_state::_500000_w)); + map(0x500002, 0x500003).w(FUNC(galaxi_state::_500002_w)); + map(0x500004, 0x500005).w(FUNC(galaxi_state::_500004_w)); map(0x700001, 0x700001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp index 47eb8402164..e27a8d09b29 100644 --- a/src/mame/drivers/galaxia.cpp +++ b/src/mame/drivers/galaxia.cpp @@ -150,7 +150,7 @@ void galaxia_state::galaxia_mem_map(address_map &map) map(0x1500, 0x15ff).mirror(0x6000).rw(m_s2636_0, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); map(0x1600, 0x16ff).mirror(0x6000).rw(m_s2636_1, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); map(0x1700, 0x17ff).mirror(0x6000).rw(m_s2636_2, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); - map(0x1800, 0x1bff).mirror(0x6000).r(this, FUNC(galaxia_state::cvs_video_or_color_ram_r)).w(this, FUNC(galaxia_state::galaxia_video_w)).share("video_ram"); + map(0x1800, 0x1bff).mirror(0x6000).r(FUNC(galaxia_state::cvs_video_or_color_ram_r)).w(FUNC(galaxia_state::galaxia_video_w)).share("video_ram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x33ff).rom(); map(0x7214, 0x7214).portr("IN0"); @@ -161,7 +161,7 @@ void galaxia_state::astrowar_mem_map(address_map &map) map(0x0000, 0x13ff).rom(); map(0x1400, 0x14ff).mirror(0x6000).ram(); map(0x1500, 0x15ff).mirror(0x6000).rw(m_s2636_0, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); - map(0x1800, 0x1bff).mirror(0x6000).r(this, FUNC(galaxia_state::cvs_video_or_color_ram_r)).w(this, FUNC(galaxia_state::galaxia_video_w)).share("video_ram"); + map(0x1800, 0x1bff).mirror(0x6000).r(FUNC(galaxia_state::cvs_video_or_color_ram_r)).w(FUNC(galaxia_state::galaxia_video_w)).share("video_ram"); map(0x1c00, 0x1cff).mirror(0x6000).ram().share("bullet_ram"); map(0x2000, 0x33ff).rom(); } @@ -169,7 +169,7 @@ void galaxia_state::astrowar_mem_map(address_map &map) void galaxia_state::galaxia_io_map(address_map &map) { map.unmap_value_high(); - map(0x00, 0x00).w(this, FUNC(galaxia_state::galaxia_scroll_w)).portr("IN0"); + map(0x00, 0x00).w(FUNC(galaxia_state::galaxia_scroll_w)).portr("IN0"); map(0x02, 0x02).portr("IN1"); map(0x05, 0x05).nopr(); map(0x06, 0x06).portr("DSW0"); @@ -179,8 +179,8 @@ void galaxia_state::galaxia_io_map(address_map &map) void galaxia_state::galaxia_data_map(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(galaxia_state::galaxia_collision_r), FUNC(galaxia_state::galaxia_ctrlport_w)); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(galaxia_state::galaxia_collision_clear), FUNC(galaxia_state::galaxia_dataport_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(galaxia_state::galaxia_collision_r), FUNC(galaxia_state::galaxia_ctrlport_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(galaxia_state::galaxia_collision_clear), FUNC(galaxia_state::galaxia_dataport_w)); } diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 5ee24834755..9c45c059f23 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -1560,20 +1560,20 @@ void galaxian_state::galaxian_map_base(address_map &map) map.unmap_value_high(); map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).mirror(0x0400).ram(); - map(0x5000, 0x53ff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5800, 0x58ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x5000, 0x53ff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5800, 0x58ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0x6000, 0x6000).mirror(0x07ff).portr("IN0"); - map(0x6000, 0x6001).mirror(0x07f8).w(this, FUNC(galaxian_state::start_lamp_w)); - map(0x6002, 0x6002).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_lock_w)); - map(0x6003, 0x6003).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); + map(0x6000, 0x6001).mirror(0x07f8).w(FUNC(galaxian_state::start_lamp_w)); + map(0x6002, 0x6002).mirror(0x07f8).w(FUNC(galaxian_state::coin_lock_w)); + map(0x6003, 0x6003).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); //AM_RANGE(0x6004, 0x6007) AM_MIRROR(0x07f8) AM_DEVWRITE("cust", galaxian_sound_device, lfo_freq_w) map(0x6800, 0x6800).mirror(0x07ff).portr("IN1"); //AM_RANGE(0x6800, 0x6807) AM_MIRROR(0x07f8) AM_DEVWRITE("cust", galaxian_sound_device, sound_w) map(0x7000, 0x7000).mirror(0x07ff).portr("IN2"); - map(0x7001, 0x7001).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x7004, 0x7004).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0x7006, 0x7006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x7007, 0x7007).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x7001, 0x7001).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x7004, 0x7004).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x7006, 0x7006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x7007, 0x7007).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); //AM_RANGE(0x7800, 0x7800) AM_MIRROR(0x07ff) AM_DEVWRITE("cust", galaxian_sound_device, pitch_w) map(0x7800, 0x7800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -1598,19 +1598,19 @@ void galaxian_state::mooncrst_map_base(address_map &map) map.unmap_value_high(); map(0x0000, 0x3fff).rom(); map(0x8000, 0x83ff).mirror(0x0400).ram(); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9800, 0x98ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9800, 0x98ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0xa000, 0xa000).mirror(0x07ff).portr("IN0"); - map(0xa000, 0xa002).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_gfxbank_w)); - map(0xa003, 0xa003).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); + map(0xa000, 0xa002).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_gfxbank_w)); + map(0xa003, 0xa003).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); // AM_RANGE(0xa004, 0xa007) AM_MIRROR(0x07f8) AM_DEVWRITE("cust", galaxian_sound_device, lfo_freq_w) map(0xa800, 0xa800).mirror(0x07ff).portr("IN1"); // AM_RANGE(0xa800, 0xa807) AM_MIRROR(0x07f8) AM_DEVWRITE("cust", galaxian_sound_device, sound_w) map(0xb000, 0xb000).mirror(0x07ff).portr("IN2"); - map(0xb000, 0xb000).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xb004, 0xb004).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0xb006, 0xb006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0xb007, 0xb007).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0xb000, 0xb000).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0xb004, 0xb004).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0xb006, 0xb006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0xb007, 0xb007).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); // AM_RANGE(0xb800, 0xb800) AM_MIRROR(0x07ff) AM_DEVWRITE("cust", galaxian_sound_device, pitch_w) map(0xb800, 0xb800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -1636,12 +1636,12 @@ void galaxian_state::fantastc_map(address_map &map) map(0x880b, 0x880b).w("8910.0", FUNC(ay8910_device::data_w)); map(0x880c, 0x880c).w("8910.1", FUNC(ay8910_device::address_w)); map(0x880e, 0x880e).w("8910.1", FUNC(ay8910_device::data_w)); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9800, 0x98ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9800, 0x98ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0xa000, 0xa000).mirror(0x07ff).portr("IN0"); map(0xa800, 0xa800).mirror(0x07ff).portr("IN1"); map(0xb000, 0xb000).mirror(0x07ff).portr("IN2"); - map(0xb000, 0xb000).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); + map(0xb000, 0xb000).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); map(0xb800, 0xb800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xfffe, 0xfffe).noprw(); // ? } @@ -1655,13 +1655,13 @@ void galaxian_state::timefgtr_map(address_map &map) map(0x880b, 0x880b).w("8910.0", FUNC(ay8910_device::data_w)); map(0x880c, 0x880c).w("8910.1", FUNC(ay8910_device::address_w)); map(0x880e, 0x880e).w("8910.1", FUNC(ay8910_device::data_w)); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9800, 0x9bff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9800, 0x9bff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0xa000, 0xa000).mirror(0x07ff).portr("IN0"); map(0xa800, 0xa800).mirror(0x07ff).portr("IN1"); map(0xb000, 0xb000).mirror(0x07ff).portr("IN2"); - map(0xb000, 0xb000).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xb004, 0xb004).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0xb000, 0xb000).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0xb004, 0xb004).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); map(0xb800, 0xb800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); // AM_RANGE(0xb800, 0xb800) AM_WRITENOP // ? // AM_RANGE(0xfff8, 0xffff) AM_WRITENOP // sound related? @@ -1674,19 +1674,19 @@ void galaxian_state::zigzag_map(address_map &map) map(0x2000, 0x2fff).bankr("bank1"); map(0x3000, 0x3fff).bankr("bank2"); map(0x4000, 0x43ff).mirror(0x0400).ram(); - map(0x4800, 0x4fff).w(this, FUNC(galaxian_state::zigzag_ay8910_w)); - map(0x5000, 0x53ff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5800, 0x58ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x4800, 0x4fff).w(FUNC(galaxian_state::zigzag_ay8910_w)); + map(0x5000, 0x53ff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5800, 0x58ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0x6000, 0x6000).mirror(0x07ff).portr("IN0"); - map(0x6000, 0x6001).mirror(0x07f8).w(this, FUNC(galaxian_state::start_lamp_w)); - map(0x6003, 0x6003).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); + map(0x6000, 0x6001).mirror(0x07f8).w(FUNC(galaxian_state::start_lamp_w)); + map(0x6003, 0x6003).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); map(0x6800, 0x6800).mirror(0x07ff).portr("IN1"); map(0x7000, 0x7000).mirror(0x07ff).portr("IN2"); - map(0x7001, 0x7001).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x7002, 0x7002).mirror(0x07f8).w(this, FUNC(galaxian_state::zigzag_bankswap_w)); - map(0x7004, 0x7004).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0x7006, 0x7006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x7007, 0x7007).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x7001, 0x7001).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x7002, 0x7002).mirror(0x07f8).w(FUNC(galaxian_state::zigzag_bankswap_w)); + map(0x7004, 0x7004).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x7006, 0x7006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x7007, 0x7007).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x7800, 0x7800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -1697,17 +1697,17 @@ void galaxian_state::theend_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5000, 0x50ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0x6801, 0x6801).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x6802, 0x6802).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0x6803, 0x6803).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_enable_w)); - map(0x6804, 0x6804).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x4800, 0x4bff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5000, 0x50ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x6801, 0x6801).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x6802, 0x6802).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0x6803, 0x6803).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_enable_w)); + map(0x6804, 0x6804).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); map(0x6805, 0x6805).mirror(0x07f8); //POUT2 - map(0x6806, 0x6806).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x6807, 0x6807).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x6806, 0x6806).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x6807, 0x6807).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x7000, 0x7000).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0x8000, 0xffff).rw(this, FUNC(galaxian_state::theend_ppi8255_r), FUNC(galaxian_state::theend_ppi8255_w)); + map(0x8000, 0xffff).rw(FUNC(galaxian_state::theend_ppi8255_r), FUNC(galaxian_state::theend_ppi8255_w)); } /* map not derived from schematics. Used by explorer and takeoff */ @@ -1716,23 +1716,23 @@ void galaxian_state::explorer_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5000, 0x50ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x4800, 0x4bff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5000, 0x50ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0x6800, 0x6800).nopw(); // ???? - map(0x6801, 0x6801).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x6802, 0x6802).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0x6803, 0x6803).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_enable_w)); - map(0x6804, 0x6804).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x6801, 0x6801).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x6802, 0x6802).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0x6803, 0x6803).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_enable_w)); + map(0x6804, 0x6804).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); map(0x6805, 0x6805).mirror(0x07f8); //POUT2 - map(0x6806, 0x6806).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x6807, 0x6807).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x6806, 0x6806).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x6807, 0x6807).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x7000, 0x7000).mirror(0x07ff).rw("watchdog", FUNC(watchdog_timer_device::reset_r), FUNC(watchdog_timer_device::reset_w)); /* watchdog works for writes as well? (or is it just disabled?) */ map(0x8000, 0x8000).mirror(0x0ffc).portr("IN0"); map(0x8000, 0x8000).mirror(0x0fff).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x8001, 0x8001).mirror(0x0ffc).portr("IN1"); map(0x8002, 0x8002).mirror(0x0ffc).portr("IN2"); map(0x8003, 0x8003).mirror(0x0ffc).portr("IN3"); - map(0x9000, 0x9000).mirror(0x0fff).w(this, FUNC(galaxian_state::explorer_sound_control_w)); + map(0x9000, 0x9000).mirror(0x0fff).w(FUNC(galaxian_state::explorer_sound_control_w)); } /* map derived from schematics */ @@ -1741,17 +1741,17 @@ void galaxian_state::scobra_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).mirror(0x4000).ram(); - map(0x8800, 0x8bff).mirror(0x4400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9000, 0x90ff).mirror(0x4700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x8800, 0x8bff).mirror(0x4400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9000, 0x90ff).mirror(0x4700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0x9800, 0x9803).mirror(0x47fc).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xa000, 0xa003).mirror(0x47fc).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa801, 0xa801).mirror(0x47f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xa802, 0xa802).mirror(0x47f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0xa803, 0xa803).mirror(0x47f8).w(this, FUNC(galaxian_state::scramble_background_enable_w)); - map(0xa804, 0xa804).mirror(0x47f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0xa801, 0xa801).mirror(0x47f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0xa802, 0xa802).mirror(0x47f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0xa803, 0xa803).mirror(0x47f8).w(FUNC(galaxian_state::scramble_background_enable_w)); + map(0xa804, 0xa804).mirror(0x47f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); map(0xa805, 0xa805).mirror(0x47f8); /* POUT2 */ - map(0xa806, 0xa806).mirror(0x47f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0xa807, 0xa807).mirror(0x47f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0xa806, 0xa806).mirror(0x47f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0xa807, 0xa807).mirror(0x47f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0xb000, 0xb000).mirror(0x47ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -1761,15 +1761,15 @@ void galaxian_state::anteateruk_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x03ff).rom(); map(0x0400, 0x0bff).ram(); - map(0x0c00, 0x0fff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x1001, 0x1001).mirror(0x01f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x1002, 0x1002).mirror(0x01f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0x1003, 0x1003).mirror(0x01f8).w(this, FUNC(galaxian_state::scramble_background_enable_w)); - map(0x1004, 0x1004).mirror(0x01f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x0c00, 0x0fff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x1001, 0x1001).mirror(0x01f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x1002, 0x1002).mirror(0x01f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0x1003, 0x1003).mirror(0x01f8).w(FUNC(galaxian_state::scramble_background_enable_w)); + map(0x1004, 0x1004).mirror(0x01f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); map(0x1005, 0x1005).mirror(0x01f8); //POUT2 - map(0x1006, 0x1006).mirror(0x01f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x1007, 0x1007).mirror(0x01f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); - map(0x1200, 0x12ff).mirror(0x0100).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x1006, 0x1006).mirror(0x01f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x1007, 0x1007).mirror(0x01f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x1200, 0x12ff).mirror(0x0100).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0x1400, 0x1400).mirror(0x03ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x4000, 0xbfff).rom(); map(0xc000, 0xc003).mirror(0x3efc).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -1783,7 +1783,7 @@ void galaxian_state::spactrai_map(address_map &map) map(0x0000, 0x01ff).rom(); map(0x0200, 0x05ff).ram(); // this sits over ROM, does the 0x400 bytes of ROM underneath bank or appear elsewhere? map(0x0600, 0x11ff).rom(); - map(0x1200, 0x15ff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); // see above comment + map(0x1200, 0x15ff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); // see above comment map(0x1600, 0x4fff).rom(); // cleared on startup @@ -1796,10 +1796,10 @@ void galaxian_state::spactrai_map(address_map &map) map(0x6800, 0x6807).mirror(0x07f8).w("cust", FUNC(galaxian_sound_device::sound_w)); map(0x7800, 0x7800).mirror(0x07ff).w("cust", FUNC(galaxian_sound_device::pitch_w)); - map(0x7001, 0x7001).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x7004, 0x7004).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0x7006, 0x7006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x7007, 0x7007).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x7001, 0x7001).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x7004, 0x7004).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x7006, 0x7006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x7007, 0x7007).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x6000, 0x6000).portr("IN0"); @@ -1808,7 +1808,7 @@ void galaxian_state::spactrai_map(address_map &map) map(0x7000, 0x7000).portr("IN2"); map(0x7800, 0x7800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xfe00, 0xfeff).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0xfe00, 0xfeff).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); } @@ -1817,18 +1817,18 @@ void galaxian_state::anteaterg_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x03ff).rom(); map(0x0400, 0x0bff).ram(); - map(0x0c00, 0x0fff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x2000, 0x20ff).mirror(0x0300).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x0c00, 0x0fff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x2000, 0x20ff).mirror(0x0300).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0x2400, 0x2403).mirror(0x01fc).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x2601, 0x2601).mirror(0x01f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x2602, 0x2602).mirror(0x01f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0x2603, 0x2603).mirror(0x01f8).w(this, FUNC(galaxian_state::scramble_background_enable_w)); - map(0x2604, 0x2604).mirror(0x01f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x2601, 0x2601).mirror(0x01f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x2602, 0x2602).mirror(0x01f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0x2603, 0x2603).mirror(0x01f8).w(FUNC(galaxian_state::scramble_background_enable_w)); + map(0x2604, 0x2604).mirror(0x01f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); map(0x2605, 0x2605).mirror(0x01f8); //POUT2 - map(0x2606, 0x2606).mirror(0x01f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x2607, 0x2607).mirror(0x01f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x2606, 0x2606).mirror(0x01f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x2607, 0x2607).mirror(0x01f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x4000, 0x7bff).rom(); - map(0x7c00, 0x7fff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); /* mirror! */ + map(0x7c00, 0x7fff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); /* mirror! */ map(0x8000, 0xbfff).rom(); map(0xf400, 0xf400).mirror(0x01ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xf600, 0xf603).mirror(0x01fc).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -1840,8 +1840,8 @@ void galaxian_state::anteatergg_map(address_map &map) galaxian_map_discrete(map); map(0x0000, 0x3fff).rom(); map(0x4000, 0x4fff).ram(); - map(0x5000, 0x53ff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5800, 0x58ff).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x5000, 0x53ff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5800, 0x58ff).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); // AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM map(0x6000, 0x6000).mirror(0x07ff).portr("IN0"); // AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x07f8) AM_WRITE(start_lamp_w) @@ -1849,10 +1849,10 @@ void galaxian_state::anteatergg_map(address_map &map) // AM_RANGE(0x6003, 0x6003) AM_MIRROR(0x07f8) AM_WRITE(coin_count_0_w) map(0x6800, 0x6800).mirror(0x07ff).portr("IN1"); map(0x7000, 0x7000).mirror(0x07ff).portr("IN2"); - map(0x7001, 0x7001).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x7004, 0x7004).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0x7006, 0x7006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x7007, 0x7007).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x7001, 0x7001).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x7004, 0x7004).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x7006, 0x7006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x7007, 0x7007).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x7800, 0x7800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -1861,17 +1861,17 @@ void galaxian_state::jungsub_map(address_map &map) // TODO: preliminary map.unmap_value_high(); map(0x0000, 0x3fff).rom(); map(0x4000, 0x4fff).ram(); - map(0x5000, 0x53ff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5800, 0x58ff).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); // but also at 0x5900-059ff and 0x5a00-5aff? + map(0x5000, 0x53ff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5800, 0x58ff).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); // but also at 0x5900-059ff and 0x5a00-5aff? map(0x5900, 0x5aff).nopr().nopw(); map(0x6000, 0x6000).mirror(0x07ff).portr("IN0"); // seems ok map(0x6003, 0x6003).nopw(); // always 0x01? - map(0x6184, 0x6184).w(this, FUNC(galaxian_state::coin_count_0_w)); // seems ok - map(0x6186, 0x6186).w(this, FUNC(galaxian_state::coin_count_1_w)); // seems ok + map(0x6184, 0x6184).w(FUNC(galaxian_state::coin_count_0_w)); // seems ok + map(0x6186, 0x6186).w(FUNC(galaxian_state::coin_count_1_w)); // seems ok map(0x6800, 0x6800).mirror(0x07ff).portr("IN1"); // seems ok - map(0x7001, 0x7001).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); // seems ok - map(0x7006, 0x7006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); // seems ok - map(0x7007, 0x7007).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); // seems ok + map(0x7001, 0x7001).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); // seems ok + map(0x7006, 0x7006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); // seems ok + map(0x7007, 0x7007).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); // seems ok map(0x7800, 0x7800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); // seems ok map(0x7800, 0x7800).nopw(); // always 0xff? } @@ -1890,14 +1890,14 @@ void galaxian_state::frogger_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); map(0x8800, 0x8800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xa800, 0xabff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0xb000, 0xb0ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0xb808, 0xb808).mirror(0x07e3).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xb80c, 0xb80c).mirror(0x07e3).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); - map(0xb810, 0xb810).mirror(0x07e3).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0xb818, 0xb818).mirror(0x07e3).w(this, FUNC(galaxian_state::coin_count_0_w)); /* IOPC7 */ - map(0xb81c, 0xb81c).mirror(0x07e3).w(this, FUNC(galaxian_state::coin_count_1_w)); /* POUT1 */ - map(0xc000, 0xffff).rw(this, FUNC(galaxian_state::frogger_ppi8255_r), FUNC(galaxian_state::frogger_ppi8255_w)); + map(0xa800, 0xabff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0xb000, 0xb0ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0xb808, 0xb808).mirror(0x07e3).w(FUNC(galaxian_state::irq_enable_w)); + map(0xb80c, 0xb80c).mirror(0x07e3).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0xb810, 0xb810).mirror(0x07e3).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0xb818, 0xb818).mirror(0x07e3).w(FUNC(galaxian_state::coin_count_0_w)); /* IOPC7 */ + map(0xb81c, 0xb81c).mirror(0x07e3).w(FUNC(galaxian_state::coin_count_1_w)); /* POUT1 */ + map(0xc000, 0xffff).rw(FUNC(galaxian_state::frogger_ppi8255_r), FUNC(galaxian_state::frogger_ppi8255_w)); } @@ -1907,19 +1907,19 @@ void galaxian_state::turtles_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).mirror(0x4000).ram(); - map(0x9000, 0x93ff).mirror(0x4400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9800, 0x98ff).mirror(0x4700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0xa000, 0xa000).mirror(0x47c7).w(this, FUNC(galaxian_state::scramble_background_red_w)); - map(0xa008, 0xa008).mirror(0x47c7).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xa010, 0xa010).mirror(0x47c7).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); - map(0xa018, 0xa018).mirror(0x47c7).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0xa020, 0xa020).mirror(0x47c7).w(this, FUNC(galaxian_state::scramble_background_green_w)); - map(0xa028, 0xa028).mirror(0x47c7).w(this, FUNC(galaxian_state::scramble_background_blue_w)); - map(0xa030, 0xa030).mirror(0x47c7).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0xa038, 0xa038).mirror(0x47c7).w(this, FUNC(galaxian_state::coin_count_1_w)); + map(0x9000, 0x93ff).mirror(0x4400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9800, 0x98ff).mirror(0x4700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0xa000, 0xa000).mirror(0x47c7).w(FUNC(galaxian_state::scramble_background_red_w)); + map(0xa008, 0xa008).mirror(0x47c7).w(FUNC(galaxian_state::irq_enable_w)); + map(0xa010, 0xa010).mirror(0x47c7).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0xa018, 0xa018).mirror(0x47c7).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0xa020, 0xa020).mirror(0x47c7).w(FUNC(galaxian_state::scramble_background_green_w)); + map(0xa028, 0xa028).mirror(0x47c7).w(FUNC(galaxian_state::scramble_background_blue_w)); + map(0xa030, 0xa030).mirror(0x47c7).w(FUNC(galaxian_state::coin_count_0_w)); + map(0xa038, 0xa038).mirror(0x47c7).w(FUNC(galaxian_state::coin_count_1_w)); map(0xa800, 0xa800).mirror(0x47ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xb000, 0xb03f).mirror(0x47c0).rw(this, FUNC(galaxian_state::turtles_ppi8255_0_r), FUNC(galaxian_state::turtles_ppi8255_0_w)); - map(0xb800, 0xb83f).mirror(0x47c0).rw(this, FUNC(galaxian_state::turtles_ppi8255_1_r), FUNC(galaxian_state::turtles_ppi8255_1_w)); + map(0xb000, 0xb03f).mirror(0x47c0).rw(FUNC(galaxian_state::turtles_ppi8255_0_r), FUNC(galaxian_state::turtles_ppi8255_0_w)); + map(0xb800, 0xb83f).mirror(0x47c0).rw(FUNC(galaxian_state::turtles_ppi8255_1_r), FUNC(galaxian_state::turtles_ppi8255_1_w)); } @@ -1931,18 +1931,18 @@ void galaxian_state::amigo2_map(address_map &map) map(0x4001, 0x4001).portr("IN1"); map(0x4002, 0x4002).portr("IN2"); map(0x4003, 0x4003).portr("IN3"); - map(0x5000, 0x5000).w(this, FUNC(galaxian_state::konami_sound_control_w)); + map(0x5000, 0x5000).w(FUNC(galaxian_state::konami_sound_control_w)); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9000, 0x90ff).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0xa000, 0xa000).w(this, FUNC(galaxian_state::scramble_background_red_w)); - map(0xa008, 0xa008).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xa010, 0xa010).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); - map(0xa018, 0xa018).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0xa020, 0xa020).w(this, FUNC(galaxian_state::scramble_background_green_w)); - map(0xa028, 0xa028).w(this, FUNC(galaxian_state::scramble_background_blue_w)); - map(0xa030, 0xa030).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0xa038, 0xa038).w(this, FUNC(galaxian_state::coin_count_1_w)); + map(0x8800, 0x8bff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9000, 0x90ff).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0xa000, 0xa000).w(FUNC(galaxian_state::scramble_background_red_w)); + map(0xa008, 0xa008).w(FUNC(galaxian_state::irq_enable_w)); + map(0xa010, 0xa010).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0xa018, 0xa018).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0xa020, 0xa020).w(FUNC(galaxian_state::scramble_background_green_w)); + map(0xa028, 0xa028).w(FUNC(galaxian_state::scramble_background_blue_w)); + map(0xa030, 0xa030).w(FUNC(galaxian_state::coin_count_0_w)); + map(0xa038, 0xa038).w(FUNC(galaxian_state::coin_count_1_w)); map(0xa800, 0xa800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -1950,14 +1950,14 @@ void galaxian_state::turpins_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9800, 0x98ff).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9800, 0x98ff).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0xa000, 0xa003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa030, 0xa030).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0xa038, 0xa038).w(this, FUNC(galaxian_state::coin_count_1_w)); - map(0xa801, 0xa801).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xa806, 0xa806).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0xa807, 0xa807).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0xa030, 0xa030).w(FUNC(galaxian_state::coin_count_0_w)); + map(0xa038, 0xa038).w(FUNC(galaxian_state::coin_count_1_w)); + map(0xa801, 0xa801).w(FUNC(galaxian_state::irq_enable_w)); + map(0xa806, 0xa806).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0xa807, 0xa807).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xc000, 0xc003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); } @@ -1970,18 +1970,18 @@ void galaxian_state::sfx_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5000, 0x50ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0x6800, 0x6800).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_red_w)); - map(0x6801, 0x6801).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x6802, 0x6802).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0x6803, 0x6803).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_blue_w)); - map(0x6804, 0x6804).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0x6805, 0x6805).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_green_w)); - map(0x6806, 0x6806).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x6807, 0x6807).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x4800, 0x4bff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5000, 0x50ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x6800, 0x6800).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_red_w)); + map(0x6801, 0x6801).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x6802, 0x6802).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0x6803, 0x6803).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_blue_w)); + map(0x6804, 0x6804).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x6805, 0x6805).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_green_w)); + map(0x6806, 0x6806).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x6807, 0x6807).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x7000, 0x7fff).rom(); - map(0x8000, 0xbfff).rw(this, FUNC(galaxian_state::theend_ppi8255_r), FUNC(galaxian_state::theend_ppi8255_w)); + map(0x8000, 0xbfff).rw(FUNC(galaxian_state::theend_ppi8255_r), FUNC(galaxian_state::theend_ppi8255_w)); map(0xc000, 0xefff).rom(); } @@ -1991,19 +1991,19 @@ void galaxian_state::monsterz_map(address_map &map) map(0x0000, 0x37ff).rom(); map(0x3800, 0x3fff).ram(); // extra RAM used by protection map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5000, 0x50ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0x6800, 0x6800).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_red_w)); - map(0x6801, 0x6801).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x6802, 0x6802).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0x6803, 0x6803).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_blue_w)); - map(0x6804, 0x6804).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0x6805, 0x6805).mirror(0x07f8).w(this, FUNC(galaxian_state::scramble_background_green_w)); - map(0x6806, 0x6806).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x6807, 0x6807).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); - map(0x8000, 0xbfff).rw(this, FUNC(galaxian_state::theend_ppi8255_r), FUNC(galaxian_state::theend_ppi8255_w)); + map(0x4800, 0x4bff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5000, 0x50ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x6800, 0x6800).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_red_w)); + map(0x6801, 0x6801).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x6802, 0x6802).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0x6803, 0x6803).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_blue_w)); + map(0x6804, 0x6804).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x6805, 0x6805).mirror(0x07f8).w(FUNC(galaxian_state::scramble_background_green_w)); + map(0x6806, 0x6806).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x6807, 0x6807).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x8000, 0xbfff).rw(FUNC(galaxian_state::theend_ppi8255_r), FUNC(galaxian_state::theend_ppi8255_w)); map(0xc000, 0xd7ff).rom(); - map(0xd800, 0xd800).r(this, FUNC(galaxian_state::monsterz_protection_r)); + map(0xd800, 0xd800).r(FUNC(galaxian_state::monsterz_protection_r)); } @@ -2021,21 +2021,21 @@ void galaxian_state::jumpbug_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x5000, 0x50ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x4800, 0x4bff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x5000, 0x50ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0x5800, 0x5800).mirror(0x00ff).w("8910.0", FUNC(ay8910_device::data_w)); map(0x5900, 0x5900).mirror(0x00ff).w("8910.0", FUNC(ay8910_device::address_w)); map(0x6000, 0x6000).mirror(0x07ff).portr("IN0"); - map(0x6002, 0x6006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_gfxbank_w)); + map(0x6002, 0x6006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_gfxbank_w)); map(0x6800, 0x6800).mirror(0x07ff).portr("IN1"); map(0x7000, 0x7000).mirror(0x07ff).portr("IN2"); - map(0x7001, 0x7001).mirror(0x07f8).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0x7002, 0x7002).mirror(0x07f8).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0x7004, 0x7004).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0x7006, 0x7006).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0x7007, 0x7007).mirror(0x07f8).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0x7001, 0x7001).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w)); + map(0x7002, 0x7002).mirror(0x07f8).w(FUNC(galaxian_state::coin_count_0_w)); + map(0x7004, 0x7004).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0x7006, 0x7006).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0x7007, 0x7007).mirror(0x07f8).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); map(0x8000, 0xafff).rom(); - map(0xb000, 0xbfff).r(this, FUNC(galaxian_state::jumpbug_protection_r)); + map(0xb000, 0xbfff).r(FUNC(galaxian_state::jumpbug_protection_r)); } @@ -2044,15 +2044,15 @@ void galaxian_state::frogf_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9000, 0x90ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0xa802, 0xa802).mirror(0x07f1).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); - map(0xa804, 0xa804).mirror(0x07f1).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xa806, 0xa806).mirror(0x07f1).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); - map(0xa808, 0xa808).mirror(0x07f1).w(this, FUNC(galaxian_state::coin_count_1_w)); - map(0xa80e, 0xa80e).mirror(0x07f1).w(this, FUNC(galaxian_state::coin_count_0_w)); + map(0x8800, 0x8bff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9000, 0x90ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0xa802, 0xa802).mirror(0x07f1).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); + map(0xa804, 0xa804).mirror(0x07f1).w(FUNC(galaxian_state::irq_enable_w)); + map(0xa806, 0xa806).mirror(0x07f1).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); + map(0xa808, 0xa808).mirror(0x07f1).w(FUNC(galaxian_state::coin_count_1_w)); + map(0xa80e, 0xa80e).mirror(0x07f1).w(FUNC(galaxian_state::coin_count_0_w)); map(0xb800, 0xb800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xc000, 0xffff).rw(this, FUNC(galaxian_state::frogf_ppi8255_r), FUNC(galaxian_state::frogf_ppi8255_w)); + map(0xc000, 0xffff).rw(FUNC(galaxian_state::frogf_ppi8255_r), FUNC(galaxian_state::frogf_ppi8255_w)); } @@ -2062,14 +2062,14 @@ void galaxian_state::mshuttle_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x7fff).rom(); map(0x8000, 0x83ff).ram(); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0x9800, 0x98ff).mirror(0x0700).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0x9800, 0x98ff).mirror(0x0700).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); map(0xa000, 0xa000).portr("IN0"); - map(0xa000, 0xa000).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xa001, 0xa001).w(this, FUNC(galaxian_state::galaxian_stars_enable_w)); - map(0xa002, 0xa002).w(this, FUNC(galaxian_state::galaxian_flip_screen_xy_w)); + map(0xa000, 0xa000).w(FUNC(galaxian_state::irq_enable_w)); + map(0xa001, 0xa001).w(FUNC(galaxian_state::galaxian_stars_enable_w)); + map(0xa002, 0xa002).w(FUNC(galaxian_state::galaxian_flip_screen_xy_w)); map(0xa004, 0xa004).w("cclimber_audio", FUNC(cclimber_audio_device::sample_trigger_w)); - map(0xa007, 0xa007).w(this, FUNC(galaxian_state::mshuttle_ay8910_cs_w)); + map(0xa007, 0xa007).w(FUNC(galaxian_state::mshuttle_ay8910_cs_w)); map(0xa800, 0xa800).portr("IN1"); map(0xa800, 0xa800).w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w)); map(0xb000, 0xb000).portr("IN2"); @@ -2086,9 +2086,9 @@ void galaxian_state::mshuttle_portmap(address_map &map) { map.unmap_value_high(); map.global_mask(0x0f); - map(0x08, 0x08).w(this, FUNC(galaxian_state::mshuttle_ay8910_control_w)); - map(0x09, 0x09).w(this, FUNC(galaxian_state::mshuttle_ay8910_data_w)); - map(0x0c, 0x0c).r(this, FUNC(galaxian_state::mshuttle_ay8910_data_r)); + map(0x08, 0x08).w(FUNC(galaxian_state::mshuttle_ay8910_control_w)); + map(0x09, 0x09).w(FUNC(galaxian_state::mshuttle_ay8910_data_w)); + map(0x0c, 0x0c).r(FUNC(galaxian_state::mshuttle_ay8910_data_r)); } @@ -2113,11 +2113,11 @@ void galaxian_state::tenspot_select_map(address_map &map) map(0x0000, 0x07ff).rom(); map(0x2000, 0x23ff).ram(); map(0x4000, 0x4000).portr("SELECT2"); - map(0x6000, 0x6000).w(this, FUNC(galaxian_state::tenspot_unk_6000_w)); + map(0x6000, 0x6000).w(FUNC(galaxian_state::tenspot_unk_6000_w)); map(0xc000, 0xc000).portr("SELECT"); - map(0x8000, 0x8000).w(this, FUNC(galaxian_state::tenspot_unk_8000_w)); + map(0x8000, 0x8000).w(FUNC(galaxian_state::tenspot_unk_8000_w)); map(0xa000, 0xa03f).ram(); - map(0xe000, 0xe000).w(this, FUNC(galaxian_state::tenspot_unk_e000_w)); + map(0xe000, 0xe000).w(FUNC(galaxian_state::tenspot_unk_e000_w)); } @@ -2142,15 +2142,15 @@ void galaxian_state::froggeram_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x2fff).rom(); - map(0x4000, 0x43ff).rw(this, FUNC(galaxian_state::froggeram_ppi8255_r), FUNC(galaxian_state::froggeram_ppi8255_w)); + map(0x4000, 0x43ff).rw(FUNC(galaxian_state::froggeram_ppi8255_r), FUNC(galaxian_state::froggeram_ppi8255_w)); map(0x8000, 0x87ff).ram(); map(0x8800, 0x8800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xa800, 0xabff).ram().w(this, FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); - map(0xb000, 0xb0ff).ram().w(this, FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); - map(0xb801, 0xb801).w(this, FUNC(galaxian_state::irq_enable_w)); - map(0xb802, 0xb802).w(this, FUNC(galaxian_state::coin_count_0_w)); - map(0xb806, 0xb806).w(this, FUNC(galaxian_state::galaxian_flip_screen_x_w)); // always set to 0? - map(0xb807, 0xb807).w(this, FUNC(galaxian_state::galaxian_flip_screen_y_w)); // always set to 0? + map(0xa800, 0xabff).ram().w(FUNC(galaxian_state::galaxian_videoram_w)).share("videoram"); + map(0xb000, 0xb0ff).ram().w(FUNC(galaxian_state::galaxian_objram_w)).share("spriteram"); + map(0xb801, 0xb801).w(FUNC(galaxian_state::irq_enable_w)); + map(0xb802, 0xb802).w(FUNC(galaxian_state::coin_count_0_w)); + map(0xb806, 0xb806).w(FUNC(galaxian_state::galaxian_flip_screen_x_w)); // always set to 0? + map(0xb807, 0xb807).w(FUNC(galaxian_state::galaxian_flip_screen_y_w)); // always set to 0? } /************************************* @@ -2165,13 +2165,13 @@ void galaxian_state::frogger_sound_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).mirror(0x1c00).ram(); - map(0x6000, 0x6fff).mirror(0x1000).w(this, FUNC(galaxian_state::konami_sound_filter_w)); + map(0x6000, 0x6fff).mirror(0x1000).w(FUNC(galaxian_state::konami_sound_filter_w)); } void galaxian_state::frogger_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(galaxian_state::frogger_ay8910_r), FUNC(galaxian_state::frogger_ay8910_w)); + map(0x00, 0xff).rw(FUNC(galaxian_state::frogger_ay8910_r), FUNC(galaxian_state::frogger_ay8910_w)); } @@ -2180,13 +2180,13 @@ void galaxian_state::konami_sound_map(address_map &map) { map(0x0000, 0x2fff).rom(); map(0x8000, 0x83ff).mirror(0x6c00).ram(); - map(0x9000, 0x9fff).mirror(0x6000).w(this, FUNC(galaxian_state::konami_sound_filter_w)); + map(0x9000, 0x9fff).mirror(0x6000).w(FUNC(galaxian_state::konami_sound_filter_w)); } void galaxian_state::konami_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(galaxian_state::konami_ay8910_r), FUNC(galaxian_state::konami_ay8910_w)); + map(0x00, 0xff).rw(FUNC(galaxian_state::konami_ay8910_r), FUNC(galaxian_state::konami_ay8910_w)); } @@ -2231,7 +2231,7 @@ void galaxian_state::takeoff_sound_portmap(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x20, 0x20).r(this, FUNC(galaxian_state::konami_sound_timer_r)); + map(0x20, 0x20).r(FUNC(galaxian_state::konami_sound_timer_r)); map(0x40, 0x40).w("8912", FUNC(ay8912_device::address_w)); map(0x80, 0x80).rw("8912", FUNC(ay8912_device::data_r), FUNC(ay8912_device::data_w)); } @@ -2249,7 +2249,7 @@ void galaxian_state::kingball_sound_portmap(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).mirror(0xff).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(galaxian_state::kingball_dac_w)); + map(0x00, 0x00).mirror(0xff).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(galaxian_state::kingball_dac_w)); } @@ -2263,13 +2263,13 @@ void galaxian_state::sfx_sample_map(address_map &map) void galaxian_state::sfx_sample_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(galaxian_state::sfx_sample_io_r), FUNC(galaxian_state::sfx_sample_io_w)); + map(0x00, 0xff).rw(FUNC(galaxian_state::sfx_sample_io_r), FUNC(galaxian_state::sfx_sample_io_w)); } void galaxian_state::turpins_sound_map(address_map &map) { konami_sound_map(map); - map(0x9000, 0x9000).r(this, FUNC(galaxian_state::konami_sound_timer_r)); // why does it read it here AND from the AY port? + map(0x9000, 0x9000).r(FUNC(galaxian_state::konami_sound_timer_r)); // why does it read it here AND from the AY port? } diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index fd2391d38f4..ad0d27851fd 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -149,16 +149,16 @@ void galaxold_state::galaxold_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x5000, 0x53ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x5400, 0x57ff).r(this, FUNC(galaxold_state::galaxold_videoram_r)); - map(0x5800, 0x583f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x5000, 0x53ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x5400, 0x57ff).r(FUNC(galaxold_state::galaxold_videoram_r)); + map(0x5800, 0x583f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x5840, 0x585f).ram().share("spriteram"); map(0x5860, 0x587f).ram().share("bulletsram"); map(0x5880, 0x58ff).ram(); map(0x6000, 0x6000).portr("IN0"); - map(0x6000, 0x6001).w(this, FUNC(galaxold_state::galaxold_leds_w)); - map(0x6002, 0x6002).w(this, FUNC(galaxold_state::galaxold_coin_lockout_w)); - map(0x6003, 0x6003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x6000, 0x6001).w(FUNC(galaxold_state::galaxold_leds_w)); + map(0x6002, 0x6002).w(FUNC(galaxold_state::galaxold_coin_lockout_w)); + map(0x6003, 0x6003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x6004, 0x6007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0x6800, 0x6800).portr("IN1"); map(0x6800, 0x6802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); @@ -166,10 +166,10 @@ void galaxold_state::galaxold_map(address_map &map) map(0x6805, 0x6805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0x6806, 0x6807).w("cust", FUNC(galaxian_sound_device::vol_w)); map(0x7000, 0x7000).portr("IN2"); - map(0x7001, 0x7001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0x7004, 0x7004).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0x7006, 0x7006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x7007, 0x7007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x7001, 0x7001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x7004, 0x7004).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0x7006, 0x7006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x7007, 0x7007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x7800, 0x7fff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x7800, 0x7800).w("cust", FUNC(galaxian_sound_device::pitch_w)); map(0xfffc, 0xffff).ram(); @@ -180,25 +180,25 @@ void galaxold_state::mooncrst_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x9400, 0x97ff).r(this, FUNC(galaxold_state::galaxold_videoram_r)); - map(0x9800, 0x983f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9400, 0x97ff).r(FUNC(galaxold_state::galaxold_videoram_r)); + map(0x9800, 0x983f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0x9880, 0x98ff).ram(); map(0xa000, 0xa000).portr("IN0"); - map(0xa002, 0xa002).w(this, FUNC(galaxold_state::galaxold_gfxbank_w)); - map(0xa003, 0xa003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0xa002, 0xa002).w(FUNC(galaxold_state::galaxold_gfxbank_w)); + map(0xa003, 0xa003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0xa004, 0xa007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0xa800, 0xa800).portr("IN1"); map(0xa800, 0xa802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); map(0xa803, 0xa803).w("cust", FUNC(galaxian_sound_device::noise_enable_w)); map(0xa805, 0xa805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0xa806, 0xa807).w("cust", FUNC(galaxian_sound_device::vol_w)); - map(0xb000, 0xb000).portr("DSW0").w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0xb004, 0xb004).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xb000, 0xb000).portr("DSW0").w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb004, 0xb004).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xb800, 0xb800).w("cust", FUNC(galaxian_sound_device::pitch_w)); } @@ -209,14 +209,14 @@ void galaxold_state::hustlerb3_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x9800, 0x983f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9800, 0x983f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0x9880, 0x98ff).ram(); - map(0xb001, 0xb001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xb001, 0xb001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); map(0xa000, 0xa000).portr("IN0"); map(0xa800, 0xa800).portr("IN1"); map(0xb000, 0xb000).portr("DSW0"); @@ -234,31 +234,31 @@ void galaxold_state::hustlerb3_map(address_map &map) void galaxold_state::rockclim_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x47ff).rw(this, FUNC(galaxold_state::rockclim_videoram_r), FUNC(galaxold_state::rockclim_videoram_w)).share("rockclim_vram");//4800 - 4803 = bg scroll ? - map(0x4800, 0x4803).w(this, FUNC(galaxold_state::rockclim_scroll_w)); + map(0x4000, 0x47ff).rw(FUNC(galaxold_state::rockclim_videoram_r), FUNC(galaxold_state::rockclim_videoram_w)).share("rockclim_vram");//4800 - 4803 = bg scroll ? + map(0x4800, 0x4803).w(FUNC(galaxold_state::rockclim_scroll_w)); map(0x5000, 0x53ff).ram(); //? map(0x5800, 0x5800).portr("IN2"); map(0x6000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0x8800, 0x8800).portr("DSW1"); - map(0x9000, 0x93ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x9400, 0x97ff).r(this, FUNC(galaxold_state::galaxold_videoram_r)); - map(0x9800, 0x983f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9400, 0x97ff).r(FUNC(galaxold_state::galaxold_videoram_r)); + map(0x9800, 0x983f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0x9880, 0x98ff).ram(); map(0xa000, 0xa000).portr("IN0"); - map(0xa000, 0xa002).w(this, FUNC(galaxold_state::galaxold_gfxbank_w));// a002 - sprite bank - map(0xa003, 0xa003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0xa000, 0xa002).w(FUNC(galaxold_state::galaxold_gfxbank_w));// a002 - sprite bank + map(0xa003, 0xa003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0xa004, 0xa007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0xa800, 0xa800).portr("IN1"); map(0xa800, 0xa802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); map(0xa803, 0xa803).w("cust", FUNC(galaxian_sound_device::noise_enable_w)); map(0xa805, 0xa805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0xa806, 0xa807).w("cust", FUNC(galaxian_sound_device::vol_w)); - map(0xb000, 0xb000).portr("DSW0").w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xb000, 0xb000).portr("DSW0").w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xb800, 0xb800).w("cust", FUNC(galaxian_sound_device::pitch_w)); } @@ -268,15 +268,15 @@ void galaxold_state::ckongg_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); - map(0x9000, 0x93ff).rw(this, FUNC(galaxold_state::galaxold_videoram_r), FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x9800, 0x983f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).rw(FUNC(galaxold_state::galaxold_videoram_r), FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9800, 0x983f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0x9880, 0x98ff).ram(); map(0xc000, 0xc000).portr("IN0"); - map(0xc000, 0xc001).w(this, FUNC(galaxold_state::galaxold_leds_w)); - map(0xc002, 0xc002).w(this, FUNC(galaxold_state::galaxold_coin_lockout_w)); - map(0xc003, 0xc003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0xc000, 0xc001).w(FUNC(galaxold_state::galaxold_leds_w)); + map(0xc002, 0xc002).w(FUNC(galaxold_state::galaxold_coin_lockout_w)); + map(0xc003, 0xc003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0xc004, 0xc007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0xc400, 0xc400).portr("IN1"); map(0xc400, 0xc402).w("cust", FUNC(galaxian_sound_device::background_enable_w)); @@ -284,10 +284,10 @@ void galaxold_state::ckongg_map(address_map &map) map(0xc405, 0xc405).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0xc406, 0xc407).w("cust", FUNC(galaxian_sound_device::vol_w)); map(0xc800, 0xc800).portr("DSW"); - map(0xc801, 0xc801).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xc801, 0xc801).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); map(0xc804, 0xc804).nopw(); // link cut - map(0xc806, 0xc806).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0xc807, 0xc807).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xc806, 0xc806).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xc807, 0xc807).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0xcc00, 0xcc00).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); } @@ -296,13 +296,13 @@ void galaxold_state::ckongmc_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); - map(0x9000, 0x93ff).rw(this, FUNC(galaxold_state::galaxold_videoram_r), FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x9800, 0x983f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).rw(FUNC(galaxold_state::galaxold_videoram_r), FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9800, 0x983f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0x9880, 0x98ff).ram(); map(0xa000, 0xa000).portr("IN0"); - map(0xa001, 0xa002).w(this, FUNC(galaxold_state::galaxold_leds_w)); /* GUESS */ + map(0xa001, 0xa002).w(FUNC(galaxold_state::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 */ map(0xa004, 0xa007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); /* GUESS */ @@ -312,10 +312,10 @@ void galaxold_state::ckongmc_map(address_map &map) map(0xa805, 0xa805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); /* GUESS */ map(0xa806, 0xa807).w("cust", FUNC(galaxian_sound_device::vol_w)); /* GUESS */ map(0xb000, 0xb000).portr("DSW"); - map(0xb001, 0xb001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb001, 0xb001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); map(0xb004, 0xb004).nopw(); /* AM_WRITE(galaxold_stars_enable_w) */ - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); /* GUESS */ - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); /* GUESS */ + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); /* GUESS */ + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); /* GUESS */ map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); /* GUESS */ } @@ -324,14 +324,14 @@ void galaxold_state::scramblb_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x5000, 0x503f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x5000, 0x503f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); map(0x6000, 0x6000).portr("IN0"); map(0x6000, 0x6001).nopw(); /* sound triggers */ - map(0x6003, 0x6003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x6003, 0x6003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x6004, 0x6007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0x6800, 0x6800).portr("IN1"); map(0x6800, 0x6802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); @@ -339,16 +339,16 @@ void galaxold_state::scramblb_map(address_map &map) map(0x6805, 0x6805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0x6806, 0x6807).w("cust", FUNC(galaxian_sound_device::vol_w)); map(0x7000, 0x7000).portr("IN2"); - map(0x7001, 0x7001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0x7002, 0x7002).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); - map(0x7003, 0x7003).w(this, FUNC(galaxold_state::scrambold_background_enable_w)); - map(0x7004, 0x7004).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0x7006, 0x7006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x7007, 0x7007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x7001, 0x7001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x7002, 0x7002).w(FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x7003, 0x7003).w(FUNC(galaxold_state::scrambold_background_enable_w)); + map(0x7004, 0x7004).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0x7006, 0x7006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x7007, 0x7007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x7800, 0x7800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x7800, 0x7800).w("cust", FUNC(galaxian_sound_device::pitch_w)); - map(0x8102, 0x8102).r(this, FUNC(galaxold_state::scramblb_protection_1_r)); - map(0x8202, 0x8202).r(this, FUNC(galaxold_state::scramblb_protection_2_r)); + map(0x8102, 0x8102).r(FUNC(galaxold_state::scramblb_protection_1_r)); + map(0x8202, 0x8202).r(FUNC(galaxold_state::scramblb_protection_2_r)); } READ8_MEMBER(galaxold_state::scramb2_protection_r){ return 0x25; } @@ -360,24 +360,24 @@ void galaxold_state::scramb2_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).w(this, FUNC(galaxold_state::galaxold_videoram_w)); // mirror - map(0x5000, 0x503f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).w(FUNC(galaxold_state::galaxold_videoram_w)); // mirror + map(0x5000, 0x503f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); - map(0x5800, 0x5fff).r(this, FUNC(galaxold_state::scramb2_protection_r)); // must return 0x25 - map(0x6000, 0x6007).r(this, FUNC(galaxold_state::scramb2_port0_r)); // reads from 8 addresses, 1 bit per address - map(0x6800, 0x6807).r(this, FUNC(galaxold_state::scramb2_port1_r)); // reads from 8 addresses, 1 bit per address - map(0x6801, 0x6801).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0x6802, 0x6802).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); - map(0x6804, 0x6804).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0x6806, 0x6806).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x6807, 0x6807).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x5800, 0x5fff).r(FUNC(galaxold_state::scramb2_protection_r)); // must return 0x25 + map(0x6000, 0x6007).r(FUNC(galaxold_state::scramb2_port0_r)); // reads from 8 addresses, 1 bit per address + map(0x6800, 0x6807).r(FUNC(galaxold_state::scramb2_port1_r)); // reads from 8 addresses, 1 bit per address + map(0x6801, 0x6801).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x6802, 0x6802).w(FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x6804, 0x6804).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0x6806, 0x6806).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x6807, 0x6807).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x7000, 0x7007).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x7006, 0x7006).nopw(); map(0x7007, 0x7007).nopw(); - map(0x7800, 0x7807).r(this, FUNC(galaxold_state::scramb2_port2_r)); // reads from 8 addresses, 1 bit per address + map(0x7800, 0x7807).r(FUNC(galaxold_state::scramb2_port2_r)); // reads from 8 addresses, 1 bit per address map(0x7800, 0x7800).w("cust", FUNC(galaxian_sound_device::pitch_w)); } @@ -395,32 +395,32 @@ void galaxold_state::scrambler_map(address_map &map) map(0x4800, 0x4bff).ram(); // mirror, leftovers? - map(0x5000, 0x53ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x5000, 0x53ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x5800, 0x587f).ram(); - map(0x5880, 0x58bf).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x5880, 0x58bf).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x58c0, 0x58df).ram().share("spriteram"); map(0x58e0, 0x58ff).ram().share("bulletsram"); map(0x6000, 0x6000).portr("IN0"); map(0x6000, 0x6001).nopw(); /* sound triggers */ - map(0x6003, 0x6003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x6003, 0x6003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x6004, 0x6007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0x6800, 0x6800).portr("IN1"); map(0x6800, 0x6802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); map(0x6803, 0x6803).w("cust", FUNC(galaxian_sound_device::noise_enable_w)); // should this disable the stars too? map(0x6805, 0x6805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0x6806, 0x6807).w("cust", FUNC(galaxian_sound_device::vol_w)); - map(0x7000, 0x7000).portr("IN2").w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x7000, 0x7000).portr("IN2").w(FUNC(galaxold_state::galaxold_nmi_enable_w)); // AM_RANGE(0x7001, 0x7001) - map(0x7002, 0x7002).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); - map(0x7003, 0x7003).w(this, FUNC(galaxold_state::scrambold_background_enable_w)); - map(0x7004, 0x7004).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0x7006, 0x7006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x7007, 0x7007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x7002, 0x7002).w(FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x7003, 0x7003).w(FUNC(galaxold_state::scrambold_background_enable_w)); + map(0x7004, 0x7004).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0x7006, 0x7006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x7007, 0x7007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x7800, 0x7800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x7800, 0x7800).w("cust", FUNC(galaxian_sound_device::pitch_w)); // AM_RANGE(0x8102, 0x8102) AM_READ(scramblb_protection_1_r) - map(0x8202, 0x8202).r(this, FUNC(galaxold_state::scrambler_protection_2_r)); + map(0x8202, 0x8202).r(FUNC(galaxold_state::scrambler_protection_2_r)); } WRITE8_MEMBER( galaxold_state::guttang_rombank_w ) @@ -444,14 +444,14 @@ void galaxold_state::guttang_map(address_map &map) map(0x0000, 0x3fff).rom().nopw(); // 0x2000-0x27ff is banked (so they have room for the new music player), see init map(0x4000, 0x47ff).ram(); - map(0x5000, 0x53ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x5000, 0x53ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x5800, 0x583f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x5800, 0x583f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x5840, 0x585f).ram().share("spriteram"); map(0x5860, 0x587f).ram().share("bulletsram"); map(0x5880, 0x58ff).ram(); - map(0x6000, 0x6000).portr("IN0").w(this, FUNC(galaxold_state::guttang_rombank_w)); + map(0x6000, 0x6000).portr("IN0").w(FUNC(galaxold_state::guttang_rombank_w)); map(0x6800, 0x6800).portr("IN1"); map(0x6800, 0x6802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); @@ -461,7 +461,7 @@ void galaxold_state::guttang_map(address_map &map) map(0x7000, 0x7000).portr("IN2"); - map(0x7001, 0x7001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x7001, 0x7001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); map(0x7800, 0x7800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); @@ -472,16 +472,16 @@ void galaxold_state::_4in1_map(address_map &map) { map(0x0000, 0x3fff).bankr("bank1"); /* banked game code */ map(0x4000, 0x47ff).ram(); - map(0x5000, 0x53ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x5400, 0x57ff).r(this, FUNC(galaxold_state::galaxold_videoram_r)); - map(0x5800, 0x583f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x5000, 0x53ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x5400, 0x57ff).r(FUNC(galaxold_state::galaxold_videoram_r)); + map(0x5800, 0x583f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x5840, 0x585f).ram().share("spriteram"); map(0x5860, 0x587f).ram().share("bulletsram"); map(0x5880, 0x58ff).ram(); map(0x6000, 0x6000).portr("IN0"); - map(0x6000, 0x6001).w(this, FUNC(galaxold_state::galaxold_leds_w)); + map(0x6000, 0x6001).w(FUNC(galaxold_state::galaxold_leds_w)); // AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxold_coin_lockout_w) - map(0x6003, 0x6003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x6003, 0x6003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x6004, 0x6007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0x6800, 0x6800).portr("IN1"); map(0x6800, 0x6802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); @@ -489,13 +489,13 @@ void galaxold_state::_4in1_map(address_map &map) map(0x6805, 0x6805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0x6806, 0x6807).w("cust", FUNC(galaxian_sound_device::vol_w)); map(0x7000, 0x7000).portr("DSW0"); - map(0x7001, 0x7001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0x7004, 0x7004).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0x7006, 0x7006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x7007, 0x7007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x7001, 0x7001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x7004, 0x7004).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0x7006, 0x7006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x7007, 0x7007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x7800, 0x78ff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x7800, 0x78ff).w("cust", FUNC(galaxian_sound_device::pitch_w)); - map(0x8000, 0x8000).w(this, FUNC(galaxold_state::_4in1_bank_w)); + map(0x8000, 0x8000).w(FUNC(galaxold_state::_4in1_bank_w)); map(0xc000, 0xdfff).rom(); /* fixed menu code */ } @@ -504,21 +504,21 @@ void galaxold_state::bagmanmc_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x67ff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x9400, 0x97ff).r(this, FUNC(galaxold_state::galaxold_videoram_r)); - map(0x9800, 0x983f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9400, 0x97ff).r(FUNC(galaxold_state::galaxold_videoram_r)); + map(0x9800, 0x983f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0x9880, 0x98ff).ram(); map(0xa000, 0xa000).portr("IN0"); - map(0xa003, 0xa003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0xa003, 0xa003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0xa800, 0xa800).portr("IN1"); map(0xa803, 0xa803).w("cust", FUNC(galaxian_sound_device::noise_enable_w)); map(0xb000, 0xb000).portr("DSW"); - map(0xb001, 0xb001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0xb002, 0xb002).w(this, FUNC(galaxold_state::galaxold_gfxbank_w)); - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xb001, 0xb001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb002, 0xb002).w(FUNC(galaxold_state::galaxold_gfxbank_w)); + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); } @@ -528,12 +528,12 @@ void galaxold_state::dkongjrm_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); map(0x7000, 0x7fff).rom(); - map(0x9000, 0x93ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x9800, 0x983f).w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9800, 0x983f).w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x987f).writeonly().share("spriteram"); map(0x98c0, 0x98ff).writeonly().share("spriteram2"); map(0xa000, 0xa0ff).portr("IN0"); - map(0xa003, 0xa003).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0xa003, 0xa003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); //AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w) map(0xa800, 0xa8ff).portr("IN1"); map(0xa800, 0xa802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); @@ -541,11 +541,11 @@ void galaxold_state::dkongjrm_map(address_map &map) //AM_RANGE(0xa805, 0xa805) AM_WRITE(galaxian) map(0xa806, 0xa807).w("cust", FUNC(galaxian_sound_device::vol_w)); map(0xb000, 0xb0ff).portr("DSW"); - map(0xb000, 0xb000).w(this, FUNC(galaxold_state::galaxold_gfxbank_w)); - map(0xb001, 0xb001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb000, 0xb000).w(FUNC(galaxold_state::galaxold_gfxbank_w)); + map(0xb001, 0xb001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); //AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxold_stars_enable_w) - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); } @@ -554,23 +554,23 @@ void galaxold_state::dkongjrmc_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); - map(0x7000, 0x73ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)); - map(0x7000, 0x70ff).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x7000, 0x73ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)); + map(0x7000, 0x70ff).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x7100, 0x71ff).ram().share("spriteram"); - map(0x7400, 0x77ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x7400, 0x77ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x7800, 0x7800).portr("DSW"); - map(0x7801, 0x7801).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0x7802, 0x7802).w(this, FUNC(galaxold_state::galaxold_leds_w)); - map(0x7804, 0x7804).w(this, FUNC(galaxold_state::galaxold_gfxbank_w)); - map(0x7806, 0x7806).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x7807, 0x7807).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x7801, 0x7801).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x7802, 0x7802).w(FUNC(galaxold_state::galaxold_leds_w)); + map(0x7804, 0x7804).w(FUNC(galaxold_state::galaxold_gfxbank_w)); + map(0x7806, 0x7806).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x7807, 0x7807).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x7d00, 0x7d02).mirror(0x0080).w("cust", FUNC(galaxian_sound_device::background_enable_w)); map(0x7d03, 0x7d03).mirror(0x0080).w("cust", FUNC(galaxian_sound_device::noise_enable_w)); map(0x7d05, 0x7d05).mirror(0x0080).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0x7d06, 0x7d07).mirror(0x0080).w("cust", FUNC(galaxian_sound_device::vol_w)); map(0x8000, 0x8000).portr("IN0"); map(0x8100, 0x8100).portr("IN1"); - map(0x8103, 0x8103).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x8103, 0x8103).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x8104, 0x8107).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0x8200, 0x8200).w("cust", FUNC(galaxian_sound_device::pitch_w)); map(0x9000, 0x9fff).rom(); @@ -582,23 +582,23 @@ void galaxold_state::tazzmang(address_map &map) map(0x0000, 0x5fff).rom(); map(0x7000, 0x7000).portr("DSW0"); /* mirror */ map(0x8000, 0x87ff).ram(); - map(0x8800, 0x883f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x8800, 0x883f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x8840, 0x885f).ram().share("spriteram"); map(0x8860, 0x887f).ram().share("bulletsram"); map(0x8880, 0x8bff).nopw(); - map(0x9000, 0x93ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9000, 0x93ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x9800, 0x9800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xa000, 0xa000).portr("IN0"); map(0xa7ff, 0xa7ff).portr("IN0"); /* mirror */ map(0xa800, 0xa800).portr("IN1").w("cust", FUNC(galaxian_sound_device::background_enable_w)); - map(0xa803, 0xa803).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0xa803, 0xa803).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0xa805, 0xa805).w("cust", FUNC(galaxian_sound_device::fire_enable_w)); map(0xa806, 0xa807).w("cust", FUNC(galaxian_sound_device::vol_w)); map(0xb000, 0xb000).portr("DSW0"); - map(0xb001, 0xb001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0xb004, 0xb004).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xb001, 0xb001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb004, 0xb004).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); } @@ -608,18 +608,18 @@ void galaxold_state::bongo(address_map &map) map(0x0000, 0x5fff).rom(); map(0x8000, 0x83ff).ram(); map(0x8400, 0x87ff).nopw(); // not used - map(0x9000, 0x93ff).ram().w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x9000, 0x93ff).ram().w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x9400, 0x97ff).nopw(); // not used - map(0x9800, 0x983f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9800, 0x983f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0xa000, 0xa000).portr("IN0"); map(0xa800, 0xa800).portr("IN1"); map(0xb000, 0xb000).portr("DSW0"); - map(0xb001, 0xb001).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0xb004, 0xb004).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0xb006, 0xb006).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0xb007, 0xb007).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0xb001, 0xb001).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0xb004, 0xb004).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0xb006, 0xb006).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0xb007, 0xb007).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).nopw(); } @@ -636,14 +636,14 @@ void galaxold_state::ozon1_map(address_map &map) map(0x0000, 0x2fff).rom(); map(0x4000, 0x4200).ram(); map(0x4300, 0x43ff).ram(); - map(0x4800, 0x4bff).rw(this, FUNC(galaxold_state::galaxold_videoram_r), FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).w(this, FUNC(galaxold_state::galaxold_videoram_w)); - map(0x5000, 0x503f).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).rw(FUNC(galaxold_state::galaxold_videoram_r), FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).w(FUNC(galaxold_state::galaxold_videoram_w)); + map(0x5000, 0x503f).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x6801, 0x6801).nopw(); //continuosly 0 and 1 - map(0x6802, 0x6802).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); - map(0x6806, 0x6806).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x6807, 0x6807).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x6802, 0x6802).w(FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x6806, 0x6806).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x6807, 0x6807).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x8100, 0x8100).portr("IN0"); map(0x8101, 0x8101).portr("IN1"); map(0x8102, 0x8102).portr("IN2"); @@ -660,22 +660,22 @@ void galaxold_state::ozon1_io_map(address_map &map) void galaxold_state::hunchbkg(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x1480, 0x14bf).mirror(0x6000).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x1480, 0x14bf).mirror(0x6000).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x14c0, 0x14ff).mirror(0x6000).writeonly().share("spriteram"); map(0x1500, 0x1500).mirror(0x6000).portr("IN0"); - map(0x1500, 0x1501).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_leds_w)); /* not connected ... */ - map(0x1502, 0x1502).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_coin_lockout_w)); /* not connected ... */ - map(0x1503, 0x1503).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x1500, 0x1501).mirror(0x6000).w(FUNC(galaxold_state::galaxold_leds_w)); /* not connected ... */ + map(0x1502, 0x1502).mirror(0x6000).w(FUNC(galaxold_state::galaxold_coin_lockout_w)); /* not connected ... */ + map(0x1503, 0x1503).mirror(0x6000).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x1504, 0x1507).mirror(0x6000).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0x1580, 0x1580).mirror(0x6000).portr("IN1"); map(0x1580, 0x1587).mirror(0x6000).w("cust", FUNC(galaxian_sound_device::sound_w)); map(0x1600, 0x1600).mirror(0x6000).portr("DSW0"); - map(0x1601, 0x1601).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0x1604, 0x1604).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0x1606, 0x1606).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x1607, 0x1607).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x1601, 0x1601).mirror(0x6000).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x1604, 0x1604).mirror(0x6000).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0x1606, 0x1606).mirror(0x6000).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x1607, 0x1607).mirror(0x6000).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x1680, 0x1680).mirror(0x6000).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); - map(0x1800, 0x1bff).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).mirror(0x6000).w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x2fff).rom(); map(0x4000, 0x4fff).rom(); @@ -686,24 +686,24 @@ void galaxold_state::hunchbkg(address_map &map) void galaxold_state::spcwarp(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x1480, 0x14bf).mirror(0x6000).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x1480, 0x14bf).mirror(0x6000).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x14c0, 0x14ff).mirror(0x6000).writeonly().share("spriteram"); map(0x1500, 0x1500).mirror(0x6000).portr("IN0"); - map(0x1500, 0x1501).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_leds_w)); - map(0x1502, 0x1502).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_coin_lockout_w)); - map(0x1503, 0x1503).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x1500, 0x1501).mirror(0x6000).w(FUNC(galaxold_state::galaxold_leds_w)); + map(0x1502, 0x1502).mirror(0x6000).w(FUNC(galaxold_state::galaxold_coin_lockout_w)); + map(0x1503, 0x1503).mirror(0x6000).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x1504, 0x1507).mirror(0x6000).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); map(0x1580, 0x1580).mirror(0x6000).portr("IN1"); map(0x1580, 0x1587).mirror(0x6000).w("cust", FUNC(galaxian_sound_device::sound_w)); // everything else in the $16xx range is moved to $17xx map(0x1680, 0x1680).mirror(0x6000).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w("cust", FUNC(galaxian_sound_device::pitch_w)); map(0x1700, 0x1700).mirror(0x6000).portr("DSW0"); - map(0x1701, 0x1701).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_nmi_enable_w)); - map(0x1704, 0x1704).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_stars_enable_w)); - map(0x1706, 0x1706).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x1707, 0x1707).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x1701, 0x1701).mirror(0x6000).w(FUNC(galaxold_state::galaxold_nmi_enable_w)); + map(0x1704, 0x1704).mirror(0x6000).w(FUNC(galaxold_state::galaxold_stars_enable_w)); + map(0x1706, 0x1706).mirror(0x6000).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x1707, 0x1707).mirror(0x6000).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); // the rest - map(0x1800, 0x1bff).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).mirror(0x6000).w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x2fff).rom(); map(0x4000, 0x4fff).rom(); @@ -719,10 +719,10 @@ void galaxold_state::hunchbkg_data(address_map &map) void galaxold_state::drivfrcg(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x1480, 0x14bf).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x1480, 0x14bf).mirror(0x6000).w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x14c0, 0x14ff).mirror(0x6000).writeonly().share("spriteram"); map(0x1500, 0x1500).mirror(0x6000).portr("IN0"); - map(0x1503, 0x1503).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_coin_counter_w)); + map(0x1503, 0x1503).mirror(0x6000).w(FUNC(galaxold_state::galaxold_coin_counter_w)); map(0x1580, 0x1580).mirror(0x6000).portr("IN1"); map(0x1580, 0x1582).mirror(0x6000).w("cust", FUNC(galaxian_sound_device::background_enable_w)); map(0x1583, 0x1583).mirror(0x6000).nopw(); @@ -732,7 +732,7 @@ void galaxold_state::drivfrcg(address_map &map) map(0x1700, 0x1700).mirror(0x6000).portr("DSW1").nopw(); map(0x1701, 0x1701).mirror(0x6000).nopw(); map(0x1704, 0x1707).mirror(0x6000).w("cust", FUNC(galaxian_sound_device::vol_w)); - map(0x1800, 0x1bff).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).mirror(0x6000).w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x2fff).rom(); map(0x4000, 0x4fff).rom(); @@ -741,26 +741,26 @@ void galaxold_state::drivfrcg(address_map &map) void galaxold_state::drivfrcg_io(address_map &map) { - map(0x00, 0x00).r(this, FUNC(galaxold_state::drivfrcg_port0_r)); + map(0x00, 0x00).r(FUNC(galaxold_state::drivfrcg_port0_r)); } void galaxold_state::racknrol(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x1400, 0x143f).mirror(0x6000).ram().w(this, FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); + map(0x1400, 0x143f).mirror(0x6000).ram().w(FUNC(galaxold_state::galaxold_attributesram_w)).share("attributesram"); map(0x1440, 0x14bf).mirror(0x6000).ram().share("spriteram"); map(0x14c0, 0x14ff).mirror(0x6000).ram(); map(0x1500, 0x1500).mirror(0x6000).portr("IN0"); map(0x1580, 0x1580).mirror(0x6000).portr("IN1"); map(0x1600, 0x1600).mirror(0x6000).portr("DSW0"); map(0x1600, 0x1601).mirror(0x6000).nopw(); - map(0x1606, 0x1606).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_flip_screen_x_w)); - map(0x1607, 0x1607).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_flip_screen_y_w)); + map(0x1606, 0x1606).mirror(0x6000).w(FUNC(galaxold_state::galaxold_flip_screen_x_w)); + map(0x1607, 0x1607).mirror(0x6000).w(FUNC(galaxold_state::galaxold_flip_screen_y_w)); map(0x1680, 0x1680).mirror(0x6000).nopr(); // AM_RANGE(0x1700, 0x1700) AM_MIRROR(0x6000) AM_READ(trvchlng_question_r) // AM_RANGE(0x1701, 0x1703) AM_MIRROR(0x6000) AM_READ(trvchlng_question_w) - map(0x1800, 0x1bff).mirror(0x6000).w(this, FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).mirror(0x6000).w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x2fff).rom(); map(0x4000, 0x4fff).rom(); @@ -769,10 +769,10 @@ void galaxold_state::racknrol(address_map &map) void galaxold_state::racknrol_io(address_map &map) { - map(0x1d, 0x1d).w("snsnd", FUNC(sn76489a_device::write)); + map(0x1d, 0x1d).w("snsnd", FUNC(sn76489a_device::command_w)); // AM_RANGE(0x1e, 0x1e) AM_WRITENOP // AM_RANGE(0x1f, 0x1f) AM_WRITENOP - map(0x20, 0x3f).w(this, FUNC(galaxold_state::racknrol_tiles_bank_w)).share("racknrol_tbank"); + map(0x20, 0x3f).w(FUNC(galaxold_state::racknrol_tiles_bank_w)).share("racknrol_tbank"); } READ8_MEMBER(galaxold_state::hexpoola_data_port_r) @@ -792,12 +792,12 @@ READ8_MEMBER(galaxold_state::hexpoola_data_port_r) void galaxold_state::hexpoola_io(address_map &map) { map(0x00, 0x00).nopr(); - map(0x20, 0x3f).w(this, FUNC(galaxold_state::racknrol_tiles_bank_w)).share("racknrol_tbank"); + map(0x20, 0x3f).w(FUNC(galaxold_state::racknrol_tiles_bank_w)).share("racknrol_tbank"); } void galaxold_state::hexpoola_data(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(this, FUNC(galaxold_state::hexpoola_data_port_r)).w("snsnd", FUNC(sn76496_device::write)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(galaxold_state::hexpoola_data_port_r)).w("snsnd", FUNC(sn76496_device::command_w)); } READ8_MEMBER(galaxold_state::bullsdrtg_data_port_r) @@ -823,7 +823,7 @@ READ8_MEMBER(galaxold_state::bullsdrtg_data_port_r) void galaxold_state::bullsdrtg_data_map(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(this, FUNC(galaxold_state::bullsdrtg_data_port_r)).w("snsnd", FUNC(sn76496_device::write)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(galaxold_state::bullsdrtg_data_port_r)).w("snsnd", FUNC(sn76496_device::command_w)); } /* Lives Dips are spread across two input ports */ diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp index 0d5600fa09e..7b5c40ee11e 100644 --- a/src/mame/drivers/galaxy.cpp +++ b/src/mame/drivers/galaxy.cpp @@ -50,16 +50,16 @@ void galaxy_state::galaxyp_io(address_map &map) void galaxy_state::galaxy_mem(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x2000, 0x2037).mirror(0x07c0).r(this, FUNC(galaxy_state::galaxy_keyboard_r)); - map(0x2038, 0x203f).mirror(0x07c0).w(this, FUNC(galaxy_state::galaxy_latch_w)); + map(0x2000, 0x2037).mirror(0x07c0).r(FUNC(galaxy_state::galaxy_keyboard_r)); + map(0x2038, 0x203f).mirror(0x07c0).w(FUNC(galaxy_state::galaxy_latch_w)); } void galaxy_state::galaxyp_mem(address_map &map) { map(0x0000, 0x0fff).rom(); // ROM A map(0x1000, 0x1fff).rom(); // ROM B - map(0x2000, 0x2037).mirror(0x07c0).r(this, FUNC(galaxy_state::galaxy_keyboard_r)); - map(0x2038, 0x203f).mirror(0x07c0).w(this, FUNC(galaxy_state::galaxy_latch_w)); + map(0x2000, 0x2037).mirror(0x07c0).r(FUNC(galaxy_state::galaxy_keyboard_r)); + map(0x2038, 0x203f).mirror(0x07c0).w(FUNC(galaxy_state::galaxy_latch_w)); map(0xe000, 0xefff).rom(); // ROM C map(0xf000, 0xffff).rom(); // ROM D } diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp index 01a1f62298a..0880b7f94dc 100644 --- a/src/mame/drivers/galeb.cpp +++ b/src/mame/drivers/galeb.cpp @@ -67,10 +67,10 @@ READ8_MEMBER(galeb_state::tape_data_r) void galeb_state::galeb_mem(address_map &map) { map(0x0000, 0x1fff).ram(); // RAM - map(0xbfe0, 0xbfe7).r(this, FUNC(galeb_state::keyboard_r)); - map(0xbfe0, 0xbfe0).w(this, FUNC(galeb_state::dac_w)); - map(0xbffe, 0xbffe).r(this, FUNC(galeb_state::tape_status_r)); - map(0xbfff, 0xbfff).rw(this, FUNC(galeb_state::tape_data_r), FUNC(galeb_state::tape_data_w)); + map(0xbfe0, 0xbfe7).r(FUNC(galeb_state::keyboard_r)); + map(0xbfe0, 0xbfe0).w(FUNC(galeb_state::dac_w)); + map(0xbffe, 0xbffe).r(FUNC(galeb_state::tape_status_r)); + map(0xbfff, 0xbfff).rw(FUNC(galeb_state::tape_data_r), FUNC(galeb_state::tape_data_w)); map(0xb000, 0xb3ff).ram().share("video_ram"); // video ram map(0xc000, 0xc7ff).rom(); // BASIC 01 ROM map(0xc800, 0xcfff).rom(); // BASIC 02 ROM diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp index 00a074d3fa2..be3fdb718c4 100644 --- a/src/mame/drivers/galgame.cpp +++ b/src/mame/drivers/galgame.cpp @@ -289,12 +289,12 @@ WRITE16_MEMBER(galaxygame_state::clk_w) void galaxygame_state::galaxygame_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0xfec0, 0xfecf).rw(this, FUNC(galaxygame_state::ke_r), FUNC(galaxygame_state::ke_w)); - map(0xff52, 0xff53).rw(this, FUNC(galaxygame_state::y_r), FUNC(galaxygame_state::y_w)); // 177522 Y + map(0xfec0, 0xfecf).rw(FUNC(galaxygame_state::ke_r), FUNC(galaxygame_state::ke_w)); + map(0xff52, 0xff53).rw(FUNC(galaxygame_state::y_r), FUNC(galaxygame_state::y_w)); // 177522 Y map(0xff54, 0xff55).portr("COINAC"); // 177524 COINAC - map(0xff5a, 0xff5b).rw(this, FUNC(galaxygame_state::x_r), FUNC(galaxygame_state::x_w)); // 177532 X + map(0xff5a, 0xff5b).rw(FUNC(galaxygame_state::x_r), FUNC(galaxygame_state::x_w)); // 177532 X map(0xff5c, 0xff5d).portr("SR"); // 177534 SR - map(0xff66, 0xff67).w(this, FUNC(galaxygame_state::clk_w)); // 177546 KW11 line frequency clock + map(0xff66, 0xff67).w(FUNC(galaxygame_state::clk_w)); // 177546 KW11 line frequency clock } diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp index 8c7111e1405..970d7296238 100644 --- a/src/mame/drivers/galgames.cpp +++ b/src/mame/drivers/galgames.cpp @@ -561,10 +561,10 @@ WRITE_LINE_MEMBER(galgames_cart_device::eeprom_cs_write) void galgames_slot_device::slot_map(address_map &map) { - map( 0x000000, 0x1fffff ).r(this, FUNC(galgames_slot_device::rom0_r)); - map( 0x000000, 0x03ffff ).rw(this, FUNC(galgames_slot_device::rom0_or_ram_r), FUNC(galgames_slot_device::ram_w)).share("ram"); - map( 0x200000, 0x3fffff ).r(this, FUNC(galgames_slot_device::rom_r)); - map( 0x200000, 0x23ffff ).rw(this, FUNC(galgames_slot_device::rom_or_ram_r), FUNC(galgames_slot_device::ram_w)); + map( 0x000000, 0x1fffff ).r(FUNC(galgames_slot_device::rom0_r)); + map( 0x000000, 0x03ffff ).rw(FUNC(galgames_slot_device::rom0_or_ram_r), FUNC(galgames_slot_device::ram_w)).share("ram"); + map( 0x200000, 0x3fffff ).r(FUNC(galgames_slot_device::rom_r)); + map( 0x200000, 0x23ffff ).rw(FUNC(galgames_slot_device::rom_or_ram_r), FUNC(galgames_slot_device::ram_w)); } galgames_slot_device::galgames_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : @@ -869,16 +869,16 @@ void galgames_state::galgames_map(address_map &map) map(0x400014, 0x400015).w(m_blitter, FUNC(cesblit_device::color_w)); map(0x400020, 0x400021).r(m_blitter, FUNC(cesblit_device::status_r)); - map(0x600000, 0x600001).r(this, FUNC(galgames_state::fpga_status_r)); - map(0x700000, 0x700001).r(this, FUNC(galgames_state::fpga_status_r)).nopw(); + map(0x600000, 0x600001).r(FUNC(galgames_state::fpga_status_r)); + map(0x700000, 0x700001).r(FUNC(galgames_state::fpga_status_r)).nopw(); map(0x800020, 0x80003f).noprw(); // ? map(0x900000, 0x900001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0xa00001, 0xa00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xb00000, 0xb7ffff).rw(this, FUNC(galgames_state::galgames_okiram_r), FUNC(galgames_state::galgames_okiram_w)); // (only low bytes tested) 4x N341024SJ-15 + map(0xb00000, 0xb7ffff).rw(FUNC(galgames_state::galgames_okiram_r), FUNC(galgames_state::galgames_okiram_w)); // (only low bytes tested) 4x N341024SJ-15 - map(0xc00000, 0xc00001).w(this, FUNC(galgames_state::galgames_palette_offset_w)); - map(0xc00002, 0xc00003).w(this, FUNC(galgames_state::galgames_palette_data_w)); + map(0xc00000, 0xc00001).w(FUNC(galgames_state::galgames_palette_offset_w)); + map(0xc00002, 0xc00003).w(FUNC(galgames_state::galgames_palette_data_w)); map(0xd00000, 0xd00001).portr("TRACKBALL_1_X"); map(0xd00000, 0xd00001).nopw(); // bit 0: FPGA programming serial in (lsb first) @@ -887,7 +887,7 @@ void galgames_state::galgames_map(address_map &map) map(0xd00006, 0xd00007).portr("TRACKBALL_2_Y"); map(0xd00008, 0xd00009).portr("P1"); map(0xd0000a, 0xd0000b).portr("P2"); - map(0xd0000c, 0xd0000d).portr("SYSTEM").w(this, FUNC(galgames_state::outputs_w)); + map(0xd0000c, 0xd0000d).portr("SYSTEM").w(FUNC(galgames_state::outputs_w)); map(0xd0000e, 0xd0000f).nopr(); map(0xd0000f, 0xd0000f).w(m_slot, FUNC(galgames_slot_device::cart_sel_w)); diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 2c44f41f01e..067f9f1088b 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -63,7 +63,7 @@ void galivan_state::galivan_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).bankr("bank1"); - map(0xd800, 0xdfff).w(this, FUNC(galivan_state::galivan_videoram_w)).share("videoram"); + map(0xd800, 0xdfff).w(FUNC(galivan_state::galivan_videoram_w)).share("videoram"); map(0xe000, 0xe0ff).ram().share("spriteram"); map(0xe100, 0xffff).ram(); @@ -74,7 +74,7 @@ void galivan_state::ninjemak_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).bankr("bank1"); - map(0xd800, 0xdfff).w(this, FUNC(galivan_state::galivan_videoram_w)).share("videoram"); + map(0xd800, 0xdfff).w(FUNC(galivan_state::galivan_videoram_w)).share("videoram"); map(0xe000, 0xe1ff).ram().share("spriteram"); map(0xe200, 0xffff).ram(); @@ -88,13 +88,13 @@ void galivan_state::io_map(address_map &map) map(0x02, 0x02).portr("SYSTEM"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x40, 0x40).w(this, FUNC(galivan_state::galivan_gfxbank_w)); - map(0x41, 0x42).w(this, FUNC(galivan_state::galivan_scrollx_w)); - map(0x43, 0x44).w(this, FUNC(galivan_state::galivan_scrolly_w)); - map(0x45, 0x45).w(this, FUNC(galivan_state::galivan_sound_command_w)); + map(0x40, 0x40).w(FUNC(galivan_state::galivan_gfxbank_w)); + map(0x41, 0x42).w(FUNC(galivan_state::galivan_scrollx_w)); + map(0x43, 0x44).w(FUNC(galivan_state::galivan_scrolly_w)); + map(0x45, 0x45).w(FUNC(galivan_state::galivan_sound_command_w)); // AM_RANGE(0x46, 0x46) AM_WRITENOP // AM_RANGE(0x47, 0x47) AM_WRITENOP - map(0xc0, 0xc0).r(this, FUNC(galivan_state::IO_port_c0_r)); /* dangar needs to return 0x58 */ + map(0xc0, 0xc0).r(FUNC(galivan_state::IO_port_c0_r)); /* dangar needs to return 0x58 */ } void dangarj_state::dangarj_io_map(address_map &map) @@ -114,13 +114,13 @@ WRITE8_MEMBER(galivan_state::blit_trigger_w) void galivan_state::ninjemak_io_map(address_map &map) { map.global_mask(0xff); - map(0x80, 0x80).portr("P1").w(this, FUNC(galivan_state::ninjemak_gfxbank_w)); + map(0x80, 0x80).portr("P1").w(FUNC(galivan_state::ninjemak_gfxbank_w)); map(0x81, 0x81).portr("P2"); map(0x82, 0x82).portr("SYSTEM"); map(0x83, 0x83).portr("SERVICE"); map(0x84, 0x84).portr("DSW1"); - map(0x85, 0x85).portr("DSW2").w(this, FUNC(galivan_state::galivan_sound_command_w)); - map(0x86, 0x86).w(this, FUNC(galivan_state::blit_trigger_w)); // ?? + map(0x85, 0x85).portr("DSW2").w(FUNC(galivan_state::galivan_sound_command_w)); + map(0x86, 0x86).w(FUNC(galivan_state::blit_trigger_w)); // ?? // AM_RANGE(0x87, 0x87) AM_WRITENOP // ?? } @@ -134,9 +134,9 @@ void galivan_state::sound_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).w("ymsnd", FUNC(ym3526_device::write)); - map(0x02, 0x02).w("dac1", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w("dac2", FUNC(dac_byte_interface::write)); - map(0x04, 0x04).r(this, FUNC(galivan_state::soundlatch_clear_r)); + map(0x02, 0x02).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w("dac2", FUNC(dac_byte_interface::data_w)); + map(0x04, 0x04).r(FUNC(galivan_state::soundlatch_clear_r)); map(0x06, 0x06).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp index b5479cd56f4..0097127de1a 100644 --- a/src/mame/drivers/galpani2.cpp +++ b/src/mame/drivers/galpani2.cpp @@ -359,7 +359,7 @@ void galpani2_state::galpani2_mem1(address_map &map) // AM_RANGE(0x30c000, 0x30c001) AM_WRITENOP // ? hblank effect ? map(0x310000, 0x3101ff).ram().w(m_bg8palette, FUNC(palette_device::write16)).share("bg8palette"); // ? map(0x314000, 0x314001).nopw(); // ? flip backgrounds ? - map(0x318000, 0x318001).rw(this, FUNC(galpani2_state::galpani2_eeprom_r), FUNC(galpani2_state::galpani2_eeprom_w)); // EEPROM + map(0x318000, 0x318001).rw(FUNC(galpani2_state::galpani2_eeprom_r), FUNC(galpani2_state::galpani2_eeprom_w)); // EEPROM map(0x380000, 0x387fff).ram(); // Palette? map(0x388000, 0x38ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette // AM_RANGE(0x390000, 0x3901ff) AM_WRITENOP // ? at startup of service mode @@ -384,17 +384,17 @@ void galpani2_state::galpani2_mem1(address_map &map) map(0x5405ca, 0x5405cb).nopr(); // ? galpani2 at F148 map(0x600000, 0x600001).noprw(); // Watchdog - map(0x640001, 0x640001).w(this, FUNC(galpani2_state::galpani2_mcu_init_w)); // ? 0 before resetting and at startup, Reset mcu ? - map(0x680001, 0x680001).w(this, FUNC(galpani2_state::galpani2_mcu_nmi1_w)); // ? 0 -> 1 -> 0 (lev 5) / 0 -> $10 -> 0 - map(0x6c0000, 0x6c0000).w(this, FUNC(galpani2_state::galpani2_coin_lockout_w)); // Coin + Card Lockout + map(0x640001, 0x640001).w(FUNC(galpani2_state::galpani2_mcu_init_w)); // ? 0 before resetting and at startup, Reset mcu ? + map(0x680001, 0x680001).w(FUNC(galpani2_state::galpani2_mcu_nmi1_w)); // ? 0 -> 1 -> 0 (lev 5) / 0 -> $10 -> 0 + map(0x6c0000, 0x6c0000).w(FUNC(galpani2_state::galpani2_coin_lockout_w)); // Coin + Card Lockout map(0x780000, 0x780001).portr("DSW1_P1"); map(0x780002, 0x780003).portr("DSW2_P2"); map(0x780004, 0x780005).portr("SPECIAL"); map(0x780006, 0x780007).portr("SERVICE"); map(0xc00001, 0xc00001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // 2 x OKIM6295 map(0xc40001, 0xc40001).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // - map(0xc80001, 0xc80001).w(this, FUNC(galpani2_state::galpani2_oki1_bank_w)); // - map(0xcc0001, 0xcc0001).w(this, FUNC(galpani2_state::galpani2_oki2_bank_w)); // + map(0xc80001, 0xc80001).w(FUNC(galpani2_state::galpani2_oki1_bank_w)); // + map(0xcc0001, 0xcc0001).w(FUNC(galpani2_state::galpani2_oki2_bank_w)); // } @@ -427,8 +427,8 @@ void galpani2_state::galpani2_mem2(address_map &map) // AM_RANGE(0x6c0000, 0x6c0001) AM_WRITENOP // ? 0 at startup only map(0x700000, 0x700001).noprw(); // Watchdog // AM_RANGE(0x740000, 0x740001) AM_WRITENOP // ? Reset mcu - map(0x780001, 0x780001).w(this, FUNC(galpani2_state::galpani2_mcu_nmi2_w)); // ? 0 -> 1 -> 0 (lev 5) - map(0x7c0000, 0x7c0001).w(this, FUNC(galpani2_state::subdatabank_select_w)); // Rom Bank + map(0x780001, 0x780001).w(FUNC(galpani2_state::galpani2_mcu_nmi2_w)); // ? 0 -> 1 -> 0 (lev 5) + map(0x7c0000, 0x7c0001).w(FUNC(galpani2_state::subdatabank_select_w)); // Rom Bank map(0x800000, 0xffffff).bankr("subdatabank"); } diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp index 5f41da8f804..fdf1401ed48 100644 --- a/src/mame/drivers/galpani3.cpp +++ b/src/mame/drivers/galpani3.cpp @@ -397,8 +397,8 @@ void galpani3_state::galpani3_map(address_map &map) map(0x200000, 0x20ffff).ram(); // area [B] - Work RAM map(0x280000, 0x287fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // area [A] - palette for sprites - map(0x300000, 0x303fff).ram().w(this, FUNC(galpani3_state::galpani3_suprnova_sprite32_w)).share("spriteram"); - map(0x380000, 0x38003f).ram().w(this, FUNC(galpani3_state::galpani3_suprnova_sprite32regs_w)).share("sprregs"); + map(0x300000, 0x303fff).ram().w(FUNC(galpani3_state::galpani3_suprnova_sprite32_w)).share("spriteram"); + map(0x380000, 0x38003f).ram().w(FUNC(galpani3_state::galpani3_suprnova_sprite32regs_w)).share("sprregs"); map(0x400000, 0x40ffff).ram().share("mcuram"); // area [C] @@ -414,8 +414,8 @@ void galpani3_state::galpani3_map(address_map &map) // ?? priority / alpha buffer? map(0xe00000, 0xe7ffff).ram().share("priority_buffer"); // area [J] - A area ? odd bytes only, initialized 00..ff,00..ff,..., then cleared - map(0xe80000, 0xe80001).w(this, FUNC(galpani3_state::galpani3_priority_buffer_scrollx_w)); // scroll? - map(0xe80002, 0xe80003).w(this, FUNC(galpani3_state::galpani3_priority_buffer_scrolly_w)); // scroll? + map(0xe80000, 0xe80001).w(FUNC(galpani3_state::galpani3_priority_buffer_scrollx_w)); // scroll? + map(0xe80002, 0xe80003).w(FUNC(galpani3_state::galpani3_priority_buffer_scrolly_w)); // scroll? map(0xf00000, 0xf00001).noprw(); // ? written once (2nd opcode, $1.b) diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp index 7d292f5837c..8267d41d8fa 100644 --- a/src/mame/drivers/galpanic.cpp +++ b/src/mame/drivers/galpanic.cpp @@ -138,15 +138,15 @@ void galpanic_state::galpanic_map(address_map &map) map(0x000000, 0x3fffff).rom(); map(0x400001, 0x400001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x500000, 0x51ffff).ram().share("fgvideoram"); - map(0x520000, 0x53ffff).ram().w(this, FUNC(galpanic_state::bgvideoram_w)).share("bgvideoram"); /* + work RAM */ + map(0x520000, 0x53ffff).ram().w(FUNC(galpanic_state::bgvideoram_w)).share("bgvideoram"); /* + work RAM */ map(0x600000, 0x6007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* 1024 colors, but only 512 seem to be used */ map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); map(0x702000, 0x704fff).ram(); map(0x800000, 0x800001).portr("DSW1"); map(0x800002, 0x800003).portr("DSW2"); map(0x800004, 0x800005).portr("SYSTEM"); - map(0x900000, 0x900001).w(this, FUNC(galpanic_state::m6295_bankswitch_w)); - map(0xa00000, 0xa00001).w(this, FUNC(galpanic_state::coin_w)); /* coin counters */ + map(0x900000, 0x900001).w(FUNC(galpanic_state::m6295_bankswitch_w)); + map(0xa00000, 0xa00001).w(FUNC(galpanic_state::coin_w)); /* coin counters */ map(0xb00000, 0xb00001).nopw(); /* ??? */ map(0xc00000, 0xc00001).nopw(); /* ??? */ map(0xd00000, 0xd00001).nopw(); /* ??? */ diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp index 29e559516c1..477a3047f76 100644 --- a/src/mame/drivers/galspnbl.cpp +++ b/src/mame/drivers/galspnbl.cpp @@ -75,7 +75,7 @@ void galspnbl_state::main_map(address_map &map) map(0xa01000, 0xa017ff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xa01800, 0xa027ff).nopw(); /* more palette ? */ map(0xa80000, 0xa80001).portr("IN0"); - map(0xa80010, 0xa80011).portr("IN1").w(this, FUNC(galspnbl_state::soundcommand_w)); + map(0xa80010, 0xa80011).portr("IN1").w(FUNC(galspnbl_state::soundcommand_w)); map(0xa80020, 0xa80021).portr("SYSTEM").nopw(); /* w - could be watchdog, but causes resets when picture is shown */ map(0xa80030, 0xa80031).portr("DSW1").nopw(); /* w - irq ack? */ map(0xa80040, 0xa80041).portr("DSW2"); diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp index 148ca67f50c..9c063f06076 100644 --- a/src/mame/drivers/gamate.cpp +++ b/src/mame/drivers/gamate.cpp @@ -119,14 +119,14 @@ READ8_MEMBER(gamate_state::read_cart) void gamate_state::gamate_mem(address_map &map) { map(0x0000, 0x03ff).mirror(0x1c00).ram(); - map(0x4000, 0x400f).mirror(0x03f0).rw(this, FUNC(gamate_state::sound_r), FUNC(gamate_state::sound_w)); + map(0x4000, 0x400f).mirror(0x03f0).rw(FUNC(gamate_state::sound_r), FUNC(gamate_state::sound_w)); map(0x4400, 0x4400).mirror(0x03ff).portr("JOY"); - map(0x4800, 0x4800).mirror(0x03ff).r(this, FUNC(gamate_state::gamate_nmi_r)); + map(0x4800, 0x4800).mirror(0x03ff).r(FUNC(gamate_state::gamate_nmi_r)); map(0x5000, 0x5007).mirror(0x03f8).m("video", FUNC(gamate_video_device::regs_map)); - map(0x5800, 0x5800).r(this, FUNC(gamate_state::card_available_set)); - map(0x5900, 0x5900).w(this, FUNC(gamate_state::card_reset)); - map(0x5a00, 0x5a00).r(this, FUNC(gamate_state::card_available_check)); - map(0x6000, 0xdfff).rw(this, FUNC(gamate_state::read_cart), FUNC(gamate_state::write_cart)); + map(0x5800, 0x5800).r(FUNC(gamate_state::card_available_set)); + map(0x5900, 0x5900).w(FUNC(gamate_state::card_reset)); + map(0x5a00, 0x5a00).r(FUNC(gamate_state::card_available_check)); + map(0x6000, 0xdfff).rw(FUNC(gamate_state::read_cart), FUNC(gamate_state::write_cart)); map(0xe000, 0xefff).mirror(0x1000).rom().share("bios").region("maincpu", 0); } diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp index ce3238b8e64..9b950063e6c 100644 --- a/src/mame/drivers/gambl186.cpp +++ b/src/mame/drivers/gambl186.cpp @@ -373,7 +373,7 @@ void gambl186_state::gambl186_io(address_map &map) map(0x03b0, 0x03bf).rw("vga", FUNC(cirrus_gd5428_device::port_03b0_r), FUNC(cirrus_gd5428_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(cirrus_gd5428_device::port_03c0_r), FUNC(cirrus_gd5428_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(cirrus_gd5428_device::port_03d0_r), FUNC(cirrus_gd5428_device::port_03d0_w)); - map(0x0400, 0x0401).w(this, FUNC(gambl186_state::upd_w)); // upd7759 sample index/input + map(0x0400, 0x0401).w(FUNC(gambl186_state::upd_w)); // upd7759 sample index/input map(0x0500, 0x0501).portr("IN0"); map(0x0502, 0x0503).portr("IN1"); map(0x0504, 0x0505).portr("IN2"); // Seems to writes more upd7759 params in MSB... @@ -383,8 +383,8 @@ void gambl186_state::gambl186_io(address_map &map) map(0x0582, 0x0583).portr("JOY"); map(0x0584, 0x0585).portr("DSW0").nopw(); // Watchdog: bit 8 // AM_RANGE(0x0600, 0x0603) AM_WRITENOP // lamps - map(0x0680, 0x0683).rw(this, FUNC(gambl186_state::comms_r), FUNC(gambl186_state::comms_w)); - map(0x0700, 0x0701).w(this, FUNC(gambl186_state::data_bank_w)); + map(0x0680, 0x0683).rw(FUNC(gambl186_state::comms_r), FUNC(gambl186_state::comms_w)); + map(0x0700, 0x0701).w(FUNC(gambl186_state::data_bank_w)); } diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp index f280c62ebcb..176e687d4d1 100644 --- a/src/mame/drivers/gamecom.cpp +++ b/src/mame/drivers/gamecom.cpp @@ -37,9 +37,9 @@ Game Status: void gamecom_state::gamecom_mem_map(address_map &map) { map(0x0000, 0x0013).ram().region("maincpu", 0x00); - map(0x0014, 0x0017).rw(this, FUNC(gamecom_state::gamecom_pio_r), FUNC(gamecom_state::gamecom_pio_w)); // buttons + map(0x0014, 0x0017).rw(FUNC(gamecom_state::gamecom_pio_r), FUNC(gamecom_state::gamecom_pio_w)); // buttons map(0x0018, 0x001F).ram().region("maincpu", 0x18); - map(0x0020, 0x007F).rw(this, FUNC(gamecom_state::gamecom_internal_r), FUNC(gamecom_state::gamecom_internal_w));/* CPU internal register file */ + map(0x0020, 0x007F).rw(FUNC(gamecom_state::gamecom_internal_r), FUNC(gamecom_state::gamecom_internal_w));/* CPU internal register file */ map(0x0080, 0x03FF).ram().region("maincpu", 0x80); /* RAM */ map(0x0400, 0x0FFF).noprw(); /* Nothing */ map(0x1000, 0x1FFF).rom(); /* Internal ROM (initially), or External ROM/Flash. Controlled by MMU0 (never swapped out in game.com) */ diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index f8212570fed..895903a9371 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -354,7 +354,7 @@ void gamecstl_state::gamecstl_map(address_map &map) map(0x000b0000, 0x000b7fff).ram().share("cga_ram"); map(0x000e0000, 0x000effff).ram(); map(0x000f0000, 0x000fffff).bankr("bank1"); - map(0x000f0000, 0x000fffff).w(this, FUNC(gamecstl_state::bios_ram_w)); + map(0x000f0000, 0x000fffff).w(FUNC(gamecstl_state::bios_ram_w)); map(0x00100000, 0x01ffffff).ram(); map(0xfffc0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ } @@ -364,12 +364,12 @@ void gamecstl_state::gamecstl_io(address_map &map) pcat32_io_common(map); map(0x00e8, 0x00eb).noprw(); map(0x00ec, 0x00ef).noprw(); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); map(0x0300, 0x03af).noprw(); map(0x03b0, 0x03df).noprw(); - map(0x0278, 0x027b).w(this, FUNC(gamecstl_state::pnp_config_w)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::read_cs1), FUNC(ide_controller_device::write_cs1)); - map(0x0a78, 0x0a7b).w(this, FUNC(gamecstl_state::pnp_data_w)); + map(0x0278, 0x027b).w(FUNC(gamecstl_state::pnp_config_w)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); + map(0x0a78, 0x0a7b).w(FUNC(gamecstl_state::pnp_data_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); } diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp index 276f2116b4b..37ee0a0d05b 100644 --- a/src/mame/drivers/gameking.cpp +++ b/src/mame/drivers/gameking.cpp @@ -150,11 +150,11 @@ READ8_MEMBER(gameking_state::lcd_r) void gameking_state::gameking_mem(address_map &map) { - map(0x0000, 0x007f).rw(this, FUNC(gameking_state::io_r), FUNC(gameking_state::io_w)); + map(0x0000, 0x007f).rw(FUNC(gameking_state::io_r), FUNC(gameking_state::io_w)); map(0x0080, 0x01ff).ram(); map(0x0200, 0x03ff).ram(); // lcd 2nd copy - map(0x0600, 0x077f).rw(this, FUNC(gameking_state::lcd_r), FUNC(gameking_state::lcd_w)); + map(0x0600, 0x077f).rw(FUNC(gameking_state::lcd_r), FUNC(gameking_state::lcd_w)); map(0x0d00, 0x0fff).ram(); // d00, e00, f00 prooved on handheld // AM_RANGE(0x1000, 0x1fff) AM_RAM // sthero writes to $19xx diff --git a/src/mame/drivers/gamemasters.cpp b/src/mame/drivers/gamemasters.cpp index fe2d1df251a..055db762d55 100644 --- a/src/mame/drivers/gamemasters.cpp +++ b/src/mame/drivers/gamemasters.cpp @@ -64,12 +64,12 @@ WRITE8_MEMBER(gamemasters_state::output_1540) void gamemasters_state::mem_map(address_map &map) { map(0x0000, 0x07ff).ram().share("nvram"); - map(0x1100, 0x1100).w(this, FUNC(gamemasters_state::output_1100)); - map(0x1300, 0x1300).w(this, FUNC(gamemasters_state::output_1300)); + map(0x1100, 0x1100).w(FUNC(gamemasters_state::output_1100)); + map(0x1300, 0x1300).w(FUNC(gamemasters_state::output_1300)); map(0x1400, 0x1400).portr("IN0"); map(0x1500, 0x1500).portr("IN1"); - map(0x1520, 0x1520).w(this, FUNC(gamemasters_state::output_1520)); - map(0x1540, 0x1540).select(0x20).w(this, FUNC(gamemasters_state::output_1540)); + map(0x1520, 0x1520).w(FUNC(gamemasters_state::output_1520)); + map(0x1540, 0x1540).select(0x20).w(FUNC(gamemasters_state::output_1540)); map(0x1600, 0x1601).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x1601, 0x1601).r("aysnd", FUNC(ay8910_device::data_r)); map(0xe000, 0xffff).rom().region("maincpu", 0); diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp index 94dfd96b8e5..7e00c6939b6 100644 --- a/src/mame/drivers/gamtor.cpp +++ b/src/mame/drivers/gamtor.cpp @@ -63,7 +63,7 @@ void gaminator_state::gaminator_map(address_map &map) { map(0x00000000, 0x07ffffff).rom(); map(0x08000000, 0x0bffffff).ram(); - map(0x1e040008, 0x1e04000b).w(this, FUNC(gaminator_state::gamtor_unk_w)); + map(0x1e040008, 0x1e04000b).w(FUNC(gaminator_state::gamtor_unk_w)); map(0x20000000, 0x2003ffff).ram(); diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index 028b8002048..1af2b4392a9 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -280,26 +280,26 @@ WRITE_LINE_MEMBER(gaplus_state::gapluso_vblank_irq) void gaplus_state::cpu1_map(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(gaplus_state::videoram_w)).share("videoram"); /* tilemap RAM (shared with CPU #2) */ + map(0x0000, 0x07ff).ram().w(FUNC(gaplus_state::videoram_w)).share("videoram"); /* tilemap RAM (shared with CPU #2) */ map(0x0800, 0x1fff).ram().share("spriteram"); /* shared RAM with CPU #2 (includes sprite RAM) */ map(0x6000, 0x63ff).rw(m_namco_15xx, FUNC(namco_15xx_device::sharedram_r), FUNC(namco_15xx_device::sharedram_w)); /* shared RAM with CPU #3 */ map(0x6800, 0x680f).rw("namcoio_1", FUNC(namcoio_device::read), FUNC(namcoio_device::write)); /* custom I/O chips interface */ map(0x6810, 0x681f).rw("namcoio_2", FUNC(namcoio_device::read), FUNC(namcoio_device::write)); /* custom I/O chips interface */ - map(0x6820, 0x682f).rw(this, FUNC(gaplus_state::customio_3_r), FUNC(gaplus_state::customio_3_w)).share("customio_3"); /* custom I/O chip #3 interface */ - map(0x7000, 0x7fff).w(this, FUNC(gaplus_state::irq_1_ctrl_w)); /* main CPU irq control */ + map(0x6820, 0x682f).rw(FUNC(gaplus_state::customio_3_r), FUNC(gaplus_state::customio_3_w)).share("customio_3"); /* custom I/O chip #3 interface */ + map(0x7000, 0x7fff).w(FUNC(gaplus_state::irq_1_ctrl_w)); /* main CPU irq control */ map(0x7800, 0x7fff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0x8000, 0x8fff).w(this, FUNC(gaplus_state::sreset_w)); /* reset CPU #2 & #3, enable sound */ - map(0x9000, 0x9fff).w(this, FUNC(gaplus_state::freset_w)); /* reset I/O chips */ - map(0xa000, 0xa7ff).w(this, FUNC(gaplus_state::starfield_control_w)); /* starfield control */ + map(0x8000, 0x8fff).w(FUNC(gaplus_state::sreset_w)); /* reset CPU #2 & #3, enable sound */ + map(0x9000, 0x9fff).w(FUNC(gaplus_state::freset_w)); /* reset I/O chips */ + map(0xa000, 0xa7ff).w(FUNC(gaplus_state::starfield_control_w)); /* starfield control */ map(0xa000, 0xffff).rom(); /* ROM */ } void gaplus_state::cpu2_map(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(gaplus_state::videoram_w)).share("videoram"); /* tilemap RAM (shared with CPU #1) */ + map(0x0000, 0x07ff).ram().w(FUNC(gaplus_state::videoram_w)).share("videoram"); /* tilemap RAM (shared with CPU #1) */ map(0x0800, 0x1fff).ram().share("spriteram"); /* shared RAM with CPU #1 */ // AM_RANGE(0x500f, 0x500f) AM_WRITENOP /* ??? written 256 times on startup */ - map(0x6000, 0x6fff).w(this, FUNC(gaplus_state::irq_2_ctrl_w)); /* IRQ 2 control */ + map(0x6000, 0x6fff).w(FUNC(gaplus_state::irq_2_ctrl_w)); /* IRQ 2 control */ map(0xa000, 0xffff).rom(); /* ROM */ } @@ -307,7 +307,7 @@ void gaplus_state::cpu3_map(address_map &map) { map(0x0000, 0x03ff).rw(m_namco_15xx, FUNC(namco_15xx_device::sharedram_r), FUNC(namco_15xx_device::sharedram_w)); /* shared RAM with the main CPU + sound registers */ map(0x2000, 0x3fff).rw("watchdog", FUNC(watchdog_timer_device::reset_r), FUNC(watchdog_timer_device::reset_w)); /* watchdog? */ - map(0x4000, 0x7fff).w(this, FUNC(gaplus_state::irq_3_ctrl_w)); /* interrupt enable/disable */ + map(0x4000, 0x7fff).w(FUNC(gaplus_state::irq_3_ctrl_w)); /* interrupt enable/disable */ map(0xe000, 0xffff).rom(); /* ROM */ } diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp index e7808d681dd..4a4f76ef5f0 100644 --- a/src/mame/drivers/gatron.cpp +++ b/src/mame/drivers/gatron.cpp @@ -447,10 +447,10 @@ WRITE8_MEMBER(gatron_state::output_port_1_w) void gatron_state::gat_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0x6000, 0x63ff).ram().w(this, FUNC(gatron_state::videoram_w)).share("videoram"); + map(0x6000, 0x63ff).ram().w(FUNC(gatron_state::videoram_w)).share("videoram"); map(0x8000, 0x87ff).ram().share("nvram"); /* battery backed RAM */ - map(0xa000, 0xa000).w("snsnd", FUNC(sn76489_device::write)); /* PSG */ - map(0xe000, 0xe000).w(this, FUNC(gatron_state::output_port_0_w)); /* lamps */ + map(0xa000, 0xa000).w("snsnd", FUNC(sn76489_device::command_w)); /* PSG */ + map(0xe000, 0xe000).w(FUNC(gatron_state::output_port_0_w)); /* lamps */ } void gatron_state::gat_portmap(address_map &map) diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp index 004b4640d54..e4b5fce641a 100644 --- a/src/mame/drivers/gauntlet.cpp +++ b/src/mame/drivers/gauntlet.cpp @@ -289,7 +289,7 @@ void gauntlet_state::main_map(address_map &map) map(0x80300f, 0x80300f).mirror(0x2fcef0).r(m_soundcomm, FUNC(atari_sound_comm_device::main_response_r)); map(0x803100, 0x803101).mirror(0x2fce8e).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x803120, 0x803121).mirror(0x2fce8e).w(m_soundcomm, FUNC(atari_sound_comm_device::sound_reset_w)); - map(0x803140, 0x803141).mirror(0x2fce8e).w(this, FUNC(gauntlet_state::video_int_ack_w)); + map(0x803140, 0x803141).mirror(0x2fce8e).w(FUNC(gauntlet_state::video_int_ack_w)); map(0x803150, 0x803151).mirror(0x2fce8e).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x803171, 0x803171).mirror(0x2fce8e).w(m_soundcomm, FUNC(atari_sound_comm_device::main_command_w)); @@ -298,10 +298,10 @@ void gauntlet_state::main_map(address_map &map) map(0x902000, 0x903fff).mirror(0x2c8000).ram().share("mob"); map(0x904000, 0x904fff).mirror(0x2c8000).ram(); map(0x905000, 0x905f7f).mirror(0x2c8000).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); - map(0x905f6e, 0x905f6f).mirror(0x2c8000).ram().w(this, FUNC(gauntlet_state::gauntlet_yscroll_w)).share("yscroll"); + map(0x905f6e, 0x905f6f).mirror(0x2c8000).ram().w(FUNC(gauntlet_state::gauntlet_yscroll_w)).share("yscroll"); map(0x905f80, 0x905fff).mirror(0x2c8000).ram().share("mob:slip"); map(0x910000, 0x9107ff).mirror(0x2cf800).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x930000, 0x930001).mirror(0x2cfffe).w(this, FUNC(gauntlet_state::gauntlet_xscroll_w)).share("xscroll"); + map(0x930000, 0x930001).mirror(0x2cfffe).w(FUNC(gauntlet_state::gauntlet_xscroll_w)).share("xscroll"); } @@ -319,8 +319,8 @@ void gauntlet_state::sound_map(address_map &map) map(0x0000, 0x0fff).mirror(0x2000).ram(); map(0x1000, 0x100f).mirror(0x27c0).w(m_soundcomm, FUNC(atari_sound_comm_device::sound_response_w)); map(0x1010, 0x101f).mirror(0x27c0).r(m_soundcomm, FUNC(atari_sound_comm_device::sound_command_r)); - map(0x1020, 0x102f).mirror(0x27c0).portr("COIN").w(this, FUNC(gauntlet_state::mixer_w)); - map(0x1030, 0x1030).mirror(0x27cf).r(this, FUNC(gauntlet_state::switch_6502_r)); + map(0x1020, 0x102f).mirror(0x27c0).portr("COIN").w(FUNC(gauntlet_state::mixer_w)); + map(0x1030, 0x1030).mirror(0x27cf).r(FUNC(gauntlet_state::switch_6502_r)); map(0x1030, 0x1037).mirror(0x27c8).w(m_soundctl, FUNC(ls259_device::write_d7)); map(0x1800, 0x180f).mirror(0x27c0).rw(m_pokey, FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x1810, 0x1811).mirror(0x27ce).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp index 30a5b327709..ed76681bf86 100644 --- a/src/mame/drivers/gb.cpp +++ b/src/mame/drivers/gb.cpp @@ -406,76 +406,76 @@ WRITE8_MEMBER(megaduck_state::bank2_w) void gb_state::gameboy_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x7fff).rw(this, FUNC(gb_state::gb_cart_r), FUNC(gb_state::gb_bank_w)); + map(0x0000, 0x7fff).rw(FUNC(gb_state::gb_cart_r), FUNC(gb_state::gb_bank_w)); map(0x8000, 0x9fff).rw(m_ppu, FUNC(dmg_ppu_device::vram_r), FUNC(dmg_ppu_device::vram_w)); /* 8k VRAM */ - map(0xa000, 0xbfff).rw(this, FUNC(gb_state::gb_ram_r), FUNC(gb_state::gb_ram_w)); /* 8k switched RAM bank (cartridge) */ + map(0xa000, 0xbfff).rw(FUNC(gb_state::gb_ram_r), FUNC(gb_state::gb_ram_w)); /* 8k switched RAM bank (cartridge) */ map(0xc000, 0xdfff).ram(); /* 8k low RAM */ - map(0xe000, 0xfdff).rw(this, FUNC(gb_state::gb_echo_r), FUNC(gb_state::gb_echo_w)); + map(0xe000, 0xfdff).rw(FUNC(gb_state::gb_echo_r), FUNC(gb_state::gb_echo_w)); map(0xfe00, 0xfeff).rw(m_ppu, FUNC(dmg_ppu_device::oam_r), FUNC(dmg_ppu_device::oam_w)); /* OAM RAM */ - map(0xff00, 0xff0f).rw(this, FUNC(gb_state::gb_io_r), FUNC(gb_state::gb_io_w)); /* I/O */ + map(0xff00, 0xff0f).rw(FUNC(gb_state::gb_io_r), FUNC(gb_state::gb_io_w)); /* I/O */ map(0xff10, 0xff26).rw(m_apu, FUNC(gameboy_sound_device::sound_r), FUNC(gameboy_sound_device::sound_w)); /* sound registers */ map(0xff27, 0xff2f).noprw(); /* unused */ map(0xff30, 0xff3f).rw(m_apu, FUNC(gameboy_sound_device::wave_r), FUNC(gameboy_sound_device::wave_w)); /* Wave ram */ - map(0xff40, 0xff7f).r(m_ppu, FUNC(dmg_ppu_device::video_r)).w(this, FUNC(gb_state::gb_io2_w)); /* Video controller & BIOS flip-flop */ + map(0xff40, 0xff7f).r(m_ppu, FUNC(dmg_ppu_device::video_r)).w(FUNC(gb_state::gb_io2_w)); /* Video controller & BIOS flip-flop */ map(0xff80, 0xfffe).ram(); /* High RAM */ - map(0xffff, 0xffff).rw(this, FUNC(gb_state::gb_ie_r), FUNC(gb_state::gb_ie_w)); /* Interrupt enable register */ + map(0xffff, 0xffff).rw(FUNC(gb_state::gb_ie_r), FUNC(gb_state::gb_ie_w)); /* Interrupt enable register */ } void gb_state::sgb_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x7fff).rw(this, FUNC(gb_state::gb_cart_r), FUNC(gb_state::gb_bank_w)); + map(0x0000, 0x7fff).rw(FUNC(gb_state::gb_cart_r), FUNC(gb_state::gb_bank_w)); map(0x8000, 0x9fff).rw(m_ppu, FUNC(sgb_ppu_device::vram_r), FUNC(sgb_ppu_device::vram_w)); /* 8k VRAM */ - map(0xa000, 0xbfff).rw(this, FUNC(gb_state::gb_ram_r), FUNC(gb_state::gb_ram_w)); /* 8k switched RAM bank (cartridge) */ + map(0xa000, 0xbfff).rw(FUNC(gb_state::gb_ram_r), FUNC(gb_state::gb_ram_w)); /* 8k switched RAM bank (cartridge) */ map(0xc000, 0xdfff).ram(); /* 8k low RAM */ - map(0xe000, 0xfdff).rw(this, FUNC(gb_state::gb_echo_r), FUNC(gb_state::gb_echo_w)); + map(0xe000, 0xfdff).rw(FUNC(gb_state::gb_echo_r), FUNC(gb_state::gb_echo_w)); map(0xfe00, 0xfeff).rw(m_ppu, FUNC(sgb_ppu_device::oam_r), FUNC(sgb_ppu_device::oam_w)); /* OAM RAM */ - map(0xff00, 0xff0f).rw(this, FUNC(gb_state::gb_io_r), FUNC(gb_state::sgb_io_w)); /* I/O */ + map(0xff00, 0xff0f).rw(FUNC(gb_state::gb_io_r), FUNC(gb_state::sgb_io_w)); /* I/O */ map(0xff10, 0xff26).rw(m_apu, FUNC(gameboy_sound_device::sound_r), FUNC(gameboy_sound_device::sound_w)); /* sound registers */ map(0xff27, 0xff2f).noprw(); /* unused */ map(0xff30, 0xff3f).rw(m_apu, FUNC(gameboy_sound_device::wave_r), FUNC(gameboy_sound_device::wave_w)); /* Wave RAM */ - map(0xff40, 0xff7f).r(m_ppu, FUNC(sgb_ppu_device::video_r)).w(this, FUNC(gb_state::gb_io2_w)); /* Video controller & BIOS flip-flop */ + map(0xff40, 0xff7f).r(m_ppu, FUNC(sgb_ppu_device::video_r)).w(FUNC(gb_state::gb_io2_w)); /* Video controller & BIOS flip-flop */ map(0xff80, 0xfffe).ram(); /* High RAM */ - map(0xffff, 0xffff).rw(this, FUNC(gb_state::gb_ie_r), FUNC(gb_state::gb_ie_w)); /* Interrupt enable register */ + map(0xffff, 0xffff).rw(FUNC(gb_state::gb_ie_r), FUNC(gb_state::gb_ie_w)); /* Interrupt enable register */ } void gb_state::gbc_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x7fff).rw(this, FUNC(gb_state::gbc_cart_r), FUNC(gb_state::gb_bank_w)); + map(0x0000, 0x7fff).rw(FUNC(gb_state::gbc_cart_r), FUNC(gb_state::gb_bank_w)); map(0x8000, 0x9fff).rw(m_ppu, FUNC(cgb_ppu_device::vram_r), FUNC(cgb_ppu_device::vram_w)); /* 8k banked VRAM */ - map(0xa000, 0xbfff).rw(this, FUNC(gb_state::gb_ram_r), FUNC(gb_state::gb_ram_w)); /* 8k switched RAM bank (cartridge) */ + map(0xa000, 0xbfff).rw(FUNC(gb_state::gb_ram_r), FUNC(gb_state::gb_ram_w)); /* 8k switched RAM bank (cartridge) */ map(0xc000, 0xcfff).ram(); /* 4k fixed RAM bank */ map(0xd000, 0xdfff).bankrw("cgb_ram"); /* 4k switched RAM bank */ - map(0xe000, 0xfdff).rw(this, FUNC(gb_state::gb_echo_r), FUNC(gb_state::gb_echo_w)); + map(0xe000, 0xfdff).rw(FUNC(gb_state::gb_echo_r), FUNC(gb_state::gb_echo_w)); map(0xfe00, 0xfeff).rw(m_ppu, FUNC(cgb_ppu_device::oam_r), FUNC(cgb_ppu_device::oam_w)); /* OAM RAM */ - map(0xff00, 0xff0f).rw(this, FUNC(gb_state::gb_io_r), FUNC(gb_state::gbc_io_w)); /* I/O */ + map(0xff00, 0xff0f).rw(FUNC(gb_state::gb_io_r), FUNC(gb_state::gbc_io_w)); /* I/O */ map(0xff10, 0xff26).rw(m_apu, FUNC(gameboy_sound_device::sound_r), FUNC(gameboy_sound_device::sound_w)); /* sound controller */ map(0xff27, 0xff2f).noprw(); /* unused */ map(0xff30, 0xff3f).rw(m_apu, FUNC(gameboy_sound_device::wave_r), FUNC(gameboy_sound_device::wave_w)); /* Wave RAM */ - map(0xff40, 0xff7f).rw(this, FUNC(gb_state::gbc_io2_r), FUNC(gb_state::gbc_io2_w)); /* Other I/O and video controller */ + map(0xff40, 0xff7f).rw(FUNC(gb_state::gbc_io2_r), FUNC(gb_state::gbc_io2_w)); /* Other I/O and video controller */ map(0xff80, 0xfffe).ram(); /* high RAM */ - map(0xffff, 0xffff).rw(this, FUNC(gb_state::gb_ie_r), FUNC(gb_state::gb_ie_w)); /* Interrupt enable register */ + map(0xffff, 0xffff).rw(FUNC(gb_state::gb_ie_r), FUNC(gb_state::gb_ie_w)); /* Interrupt enable register */ } void megaduck_state::megaduck_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x7fff).rw(this, FUNC(megaduck_state::cart_r), FUNC(megaduck_state::bank1_w)); + map(0x0000, 0x7fff).rw(FUNC(megaduck_state::cart_r), FUNC(megaduck_state::bank1_w)); map(0x8000, 0x9fff).rw(m_ppu, FUNC(dmg_ppu_device::vram_r), FUNC(dmg_ppu_device::vram_w)); /* 8k VRAM */ map(0xa000, 0xafff).noprw(); /* unused? */ - map(0xb000, 0xb000).w(this, FUNC(megaduck_state::bank2_w)); + map(0xb000, 0xb000).w(FUNC(megaduck_state::bank2_w)); map(0xb001, 0xbfff).noprw(); /* unused? */ map(0xc000, 0xfdff).ram(); /* 8k/16k? RAM */ map(0xfe00, 0xfeff).rw(m_ppu, FUNC(dmg_ppu_device::oam_r), FUNC(dmg_ppu_device::oam_w)); /* OAM RAM */ - map(0xff00, 0xff0f).rw(this, FUNC(megaduck_state::gb_io_r), FUNC(megaduck_state::gb_io_w)); /* I/O */ - map(0xff10, 0xff1f).rw(this, FUNC(megaduck_state::megaduck_video_r), FUNC(megaduck_state::megaduck_video_w)); /* video controller */ - map(0xff20, 0xff2f).rw(this, FUNC(megaduck_state::megaduck_sound_r1), FUNC(megaduck_state::megaduck_sound_w1)); /* sound controller pt1 */ + map(0xff00, 0xff0f).rw(FUNC(megaduck_state::gb_io_r), FUNC(megaduck_state::gb_io_w)); /* I/O */ + map(0xff10, 0xff1f).rw(FUNC(megaduck_state::megaduck_video_r), FUNC(megaduck_state::megaduck_video_w)); /* video controller */ + map(0xff20, 0xff2f).rw(FUNC(megaduck_state::megaduck_sound_r1), FUNC(megaduck_state::megaduck_sound_w1)); /* sound controller pt1 */ map(0xff30, 0xff3f).rw(m_apu, FUNC(gameboy_sound_device::wave_r), FUNC(gameboy_sound_device::wave_w)); /* wave ram */ - map(0xff40, 0xff46).rw(this, FUNC(megaduck_state::megaduck_sound_r2), FUNC(megaduck_state::megaduck_sound_w2)); /* sound controller pt2 */ + map(0xff40, 0xff46).rw(FUNC(megaduck_state::megaduck_sound_r2), FUNC(megaduck_state::megaduck_sound_w2)); /* sound controller pt2 */ map(0xff47, 0xff7f).noprw(); /* unused */ map(0xff80, 0xfffe).ram(); /* high RAM */ - map(0xffff, 0xffff).rw(this, FUNC(megaduck_state::gb_ie_r), FUNC(megaduck_state::gb_ie_w)); /* interrupt enable register */ + map(0xffff, 0xffff).rw(FUNC(megaduck_state::gb_ie_r), FUNC(megaduck_state::gb_ie_w)); /* interrupt enable register */ } diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp index d28d8c48723..e1cfdf6f537 100644 --- a/src/mame/drivers/gba.cpp +++ b/src/mame/drivers/gba.cpp @@ -1240,18 +1240,18 @@ WRITE_LINE_MEMBER(gba_state::dma_vblank_callback) void gba_state::gba_map(address_map &map) { map.unmap_value_high(); // for "Fruit Mura no Doubutsu Tachi" and "Classic NES Series" - map(0x00000000, 0x00003fff).rom().mirror(0x01ffc000).r(this, FUNC(gba_state::gba_bios_r)); + map(0x00000000, 0x00003fff).rom().mirror(0x01ffc000).r(FUNC(gba_state::gba_bios_r)); map(0x02000000, 0x0203ffff).ram().mirror(0xfc0000); map(0x03000000, 0x03007fff).ram().mirror(0xff8000); map(0x04000000, 0x0400005f).rw("lcd", FUNC(gba_lcd_device::video_r), FUNC(gba_lcd_device::video_w)); - map(0x04000060, 0x040003ff).rw(this, FUNC(gba_state::gba_io_r), FUNC(gba_state::gba_io_w)); + map(0x04000060, 0x040003ff).rw(FUNC(gba_state::gba_io_r), FUNC(gba_state::gba_io_w)); map(0x04000400, 0x04ffffff).noprw(); // Not used map(0x05000000, 0x050003ff).mirror(0x00fffc00).rw("lcd", FUNC(gba_lcd_device::gba_pram_r), FUNC(gba_lcd_device::gba_pram_w)); // Palette RAM map(0x06000000, 0x06017fff).mirror(0x00fe0000).rw("lcd", FUNC(gba_lcd_device::gba_vram_r), FUNC(gba_lcd_device::gba_vram_w)); // VRAM map(0x06018000, 0x0601ffff).mirror(0x00fe0000).rw("lcd", FUNC(gba_lcd_device::gba_vram_r), FUNC(gba_lcd_device::gba_vram_w)); // VRAM map(0x07000000, 0x070003ff).mirror(0x00fffc00).rw("lcd", FUNC(gba_lcd_device::gba_oam_r), FUNC(gba_lcd_device::gba_oam_w)); // OAM //AM_RANGE(0x08000000, 0x0cffffff) // cart ROM + mirrors, mapped here at machine_start if a cart is present - map(0x10000000, 0xffffffff).r(this, FUNC(gba_state::gba_10000000_r)); // for "Justice League Chronicles" (game bug) + map(0x10000000, 0xffffffff).r(FUNC(gba_state::gba_10000000_r)); // for "Justice League Chronicles" (game bug) } static INPUT_PORTS_START( gbadv ) diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index e1fe2860c34..0518e4b64e5 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -151,24 +151,24 @@ WRITE8_MEMBER(gberet_state::gberet_flipscreen_w) WRITE8_MEMBER(gberet_state::gberet_sound_w) { - m_sn->write(space, 0, *m_soundlatch); + m_sn->write(*m_soundlatch); } void gberet_state::gberet_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc7ff).ram().w(this, FUNC(gberet_state::gberet_colorram_w)).share("colorram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(gberet_state::gberet_videoram_w)).share("videoram"); + map(0xc000, 0xc7ff).ram().w(FUNC(gberet_state::gberet_colorram_w)).share("colorram"); + map(0xc800, 0xcfff).ram().w(FUNC(gberet_state::gberet_videoram_w)).share("videoram"); map(0xd000, 0xd0ff).ram().share("spriteram2"); map(0xd100, 0xd1ff).ram().share("spriteram"); map(0xd200, 0xdfff).ram(); - map(0xe000, 0xe03f).ram().w(this, FUNC(gberet_state::gberet_scroll_w)).share("scrollram"); + map(0xe000, 0xe03f).ram().w(FUNC(gberet_state::gberet_scroll_w)).share("scrollram"); map(0xe040, 0xe042).nopw(); // ??? - map(0xe043, 0xe043).w(this, FUNC(gberet_state::gberet_sprite_bank_w)); - map(0xe044, 0xe044).w(this, FUNC(gberet_state::gberet_flipscreen_w)); - map(0xf000, 0xf000).w(this, FUNC(gberet_state::gberet_coin_counter_w)); + map(0xe043, 0xe043).w(FUNC(gberet_state::gberet_sprite_bank_w)); + map(0xe044, 0xe044).w(FUNC(gberet_state::gberet_flipscreen_w)); + map(0xf000, 0xf000).w(FUNC(gberet_state::gberet_coin_counter_w)); map(0xf200, 0xf200).portr("DSW2").writeonly().share("soundlatch"); - map(0xf400, 0xf400).portr("DSW3").w(this, FUNC(gberet_state::gberet_sound_w)); + map(0xf400, 0xf400).portr("DSW3").w(FUNC(gberet_state::gberet_sound_w)); map(0xf600, 0xf600).portr("DSW1").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xf601, 0xf601).portr("P2"); map(0xf602, 0xf602).portr("P1"); @@ -178,18 +178,18 @@ void gberet_state::gberet_map(address_map &map) void gberet_state::mrgoemon_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc7ff).ram().w(this, FUNC(gberet_state::gberet_colorram_w)).share("colorram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(gberet_state::gberet_videoram_w)).share("videoram"); + map(0xc000, 0xc7ff).ram().w(FUNC(gberet_state::gberet_colorram_w)).share("colorram"); + map(0xc800, 0xcfff).ram().w(FUNC(gberet_state::gberet_videoram_w)).share("videoram"); map(0xd000, 0xd0ff).ram().share("spriteram2"); map(0xd100, 0xd1ff).ram().share("spriteram"); map(0xd200, 0xdfff).ram(); - map(0xe000, 0xe03f).ram().w(this, FUNC(gberet_state::gberet_scroll_w)).share("scrollram"); + map(0xe000, 0xe03f).ram().w(FUNC(gberet_state::gberet_scroll_w)).share("scrollram"); map(0xe040, 0xe042).nopw(); // ??? - map(0xe043, 0xe043).w(this, FUNC(gberet_state::gberet_sprite_bank_w)); - map(0xe044, 0xe044).w(this, FUNC(gberet_state::gberet_flipscreen_w)); - map(0xf000, 0xf000).w(this, FUNC(gberet_state::mrgoemon_coin_counter_w)); + map(0xe043, 0xe043).w(FUNC(gberet_state::gberet_sprite_bank_w)); + map(0xe044, 0xe044).w(FUNC(gberet_state::gberet_flipscreen_w)); + map(0xf000, 0xf000).w(FUNC(gberet_state::mrgoemon_coin_counter_w)); map(0xf200, 0xf200).portr("DSW2").writeonly().share("soundlatch"); - map(0xf400, 0xf400).portr("DSW3").w(this, FUNC(gberet_state::gberet_sound_w)); + map(0xf400, 0xf400).portr("DSW3").w(FUNC(gberet_state::gberet_sound_w)); map(0xf600, 0xf600).portr("DSW1").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xf601, 0xf601).portr("P2"); map(0xf602, 0xf602).portr("P1"); @@ -217,23 +217,23 @@ WRITE8_MEMBER(gberet_state::gberetb_nmi_ack_w) void gberet_state::gberetb_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc7ff).ram().w(this, FUNC(gberet_state::gberet_colorram_w)).share("colorram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(gberet_state::gberet_videoram_w)).share("videoram"); + map(0xc000, 0xc7ff).ram().w(FUNC(gberet_state::gberet_colorram_w)).share("colorram"); + map(0xc800, 0xcfff).ram().w(FUNC(gberet_state::gberet_videoram_w)).share("videoram"); map(0xd000, 0xdfff).ram(); map(0xe000, 0xe03f).ram(); map(0xe040, 0xe043).nopw(); // ??? - map(0xe044, 0xe044).w(this, FUNC(gberet_state::gberetb_flipscreen_w)); // did hw even support flipscreen? + map(0xe044, 0xe044).w(FUNC(gberet_state::gberetb_flipscreen_w)); // did hw even support flipscreen? map(0xe800, 0xe8ff).ram(); map(0xe900, 0xe9ff).ram().share("spriteram"); map(0xf000, 0xf000).nopw(); // coin counter not supported map(0xf200, 0xf200).portr("DSW2"); - map(0xf400, 0xf400).w(m_sn, FUNC(sn76489a_device::write)); + map(0xf400, 0xf400).w(m_sn, FUNC(sn76489a_device::command_w)); map(0xf600, 0xf600).portr("P2"); map(0xf601, 0xf601).portr("DSW1"); map(0xf602, 0xf602).portr("P1"); map(0xf603, 0xf603).portr("SYSTEM"); - map(0xf800, 0xf800).rw(this, FUNC(gberet_state::gberetb_irq_ack_r), FUNC(gberet_state::gberetb_nmi_ack_w)); - map(0xf900, 0xf901).w(this, FUNC(gberet_state::gberetb_scroll_w)); + map(0xf800, 0xf800).rw(FUNC(gberet_state::gberetb_irq_ack_r), FUNC(gberet_state::gberetb_nmi_ack_w)); + map(0xf900, 0xf901).w(FUNC(gberet_state::gberetb_scroll_w)); } diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index b5fb2f3cff3..34252bd0d76 100644 --- a/src/mame/drivers/gcpinbal.cpp +++ b/src/mame/drivers/gcpinbal.cpp @@ -177,18 +177,18 @@ WRITE8_MEMBER(gcpinbal_state::es8712_reset_w) void gcpinbal_state::gcpinbal_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0xc00000, 0xc03fff).rw(this, FUNC(gcpinbal_state::gcpinbal_tilemaps_word_r), FUNC(gcpinbal_state::gcpinbal_tilemaps_word_w)).share("tilemapram"); + map(0xc00000, 0xc03fff).rw(FUNC(gcpinbal_state::gcpinbal_tilemaps_word_r), FUNC(gcpinbal_state::gcpinbal_tilemaps_word_w)).share("tilemapram"); map(0xc80000, 0xc81fff).rw(m_sprgen, FUNC(excellent_spr_device::read), FUNC(excellent_spr_device::write)).umask16(0x00ff); map(0xd00000, 0xd00fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xd80010, 0xd8002f).ram().w(this, FUNC(gcpinbal_state::d80010_w)).share("d80010"); - map(0xd80040, 0xd8005b).w(this, FUNC(gcpinbal_state::d80040_w)).umask16(0x00ff); - map(0xd80060, 0xd80077).ram().w(this, FUNC(gcpinbal_state::d80060_w)).share("d80060"); + map(0xd80010, 0xd8002f).ram().w(FUNC(gcpinbal_state::d80010_w)).share("d80010"); + map(0xd80040, 0xd8005b).w(FUNC(gcpinbal_state::d80040_w)).umask16(0x00ff); + map(0xd80060, 0xd80077).ram().w(FUNC(gcpinbal_state::d80060_w)).share("d80060"); map(0xd80080, 0xd80081).portr("DSW"); map(0xd80084, 0xd80085).portr("IN0"); map(0xd80086, 0xd80087).portr("IN1"); - map(0xd80088, 0xd80088).w(this, FUNC(gcpinbal_state::bank_w)); - map(0xd8008a, 0xd8008a).w(this, FUNC(gcpinbal_state::eeprom_w)); - map(0xd8008e, 0xd8008e).w(this, FUNC(gcpinbal_state::es8712_reset_w)); + map(0xd80088, 0xd80088).w(FUNC(gcpinbal_state::bank_w)); + map(0xd8008a, 0xd8008a).w(FUNC(gcpinbal_state::eeprom_w)); + map(0xd8008e, 0xd8008e).w(FUNC(gcpinbal_state::es8712_reset_w)); map(0xd800a0, 0xd800a0).mirror(0x2).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xd800c0, 0xd800cd).w(m_essnd, FUNC(es8712_device::write)).umask16(0xff00); map(0xff0000, 0xffffff).ram(); /* RAM */ diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp index acd73ee15a6..647fe1ffda8 100644 --- a/src/mame/drivers/gei.cpp +++ b/src/mame/drivers/gei.cpp @@ -355,20 +355,20 @@ void gei_state::getrivia_map(address_map &map) map(0x4000, 0x47ff).ram().share("nvram"); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x600f, 0x600f).w(this, FUNC(gei_state::banksel_w<8>)); - map(0x6017, 0x6017).w(this, FUNC(gei_state::banksel_w<6>)); - map(0x601b, 0x601b).w(this, FUNC(gei_state::banksel_w<4>)); - map(0x601d, 0x601d).w(this, FUNC(gei_state::banksel_w<2>)); - map(0x601e, 0x601e).w(this, FUNC(gei_state::banksel_w<0>)); - map(0x608f, 0x608f).w(this, FUNC(gei_state::banksel_w<9>)); - map(0x6097, 0x6097).w(this, FUNC(gei_state::banksel_w<7>)); - map(0x609b, 0x609b).w(this, FUNC(gei_state::banksel_w<5>)); - map(0x609d, 0x609d).w(this, FUNC(gei_state::banksel_w<3>)); - map(0x609e, 0x609e).w(this, FUNC(gei_state::banksel_w<1>)); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); + map(0x600f, 0x600f).w(FUNC(gei_state::banksel_w<8>)); + map(0x6017, 0x6017).w(FUNC(gei_state::banksel_w<6>)); + map(0x601b, 0x601b).w(FUNC(gei_state::banksel_w<4>)); + map(0x601d, 0x601d).w(FUNC(gei_state::banksel_w<2>)); + map(0x601e, 0x601e).w(FUNC(gei_state::banksel_w<0>)); + map(0x608f, 0x608f).w(FUNC(gei_state::banksel_w<9>)); + map(0x6097, 0x6097).w(FUNC(gei_state::banksel_w<7>)); + map(0x609b, 0x609b).w(FUNC(gei_state::banksel_w<5>)); + map(0x609d, 0x609d).w(FUNC(gei_state::banksel_w<3>)); + map(0x609e, 0x609e).w(FUNC(gei_state::banksel_w<1>)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); map(0x8000, 0x9fff).rom(); /* space for diagnostic ROM? */ map(0xa000, 0xbfff).rom(); - map(0xc000, 0xffff).ram().w(this, FUNC(gei_state::gei_bitmap_w)); + map(0xc000, 0xffff).ram().w(FUNC(gei_state::gei_bitmap_w)); } void gei_state::gselect_map(address_map &map) @@ -376,14 +376,14 @@ void gei_state::gselect_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x3fff).bankr("rombank"); map(0x4000, 0x40ff).ram().share("nvram"); - map(0x4400, 0x4400).w(this, FUNC(gei_state::banksel_w<0>)); - map(0x4401, 0x4401).w(this, FUNC(gei_state::banksel_w<1>)); - map(0x4402, 0x4402).w(this, FUNC(gei_state::banksel_w<2>)); - map(0x4403, 0x4403).w(this, FUNC(gei_state::banksel_w<3>)); + map(0x4400, 0x4400).w(FUNC(gei_state::banksel_w<0>)); + map(0x4401, 0x4401).w(FUNC(gei_state::banksel_w<1>)); + map(0x4402, 0x4402).w(FUNC(gei_state::banksel_w<2>)); + map(0x4403, 0x4403).w(FUNC(gei_state::banksel_w<3>)); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); - map(0xc000, 0xffff).ram().w(this, FUNC(gei_state::gei_bitmap_w)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); + map(0xc000, 0xffff).ram().w(FUNC(gei_state::gei_bitmap_w)); } // TODO: where are mapped the lower 0x2000 bytes of the banks? @@ -394,14 +394,14 @@ void gei_state::amuse_map(address_map &map) map(0x4000, 0x47ff).ram().share("nvram"); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x606f, 0x606f).w(this, FUNC(gei_state::banksel_w<8>)); - map(0x6077, 0x6077).w(this, FUNC(gei_state::banksel_w<6>)); - map(0x607b, 0x607b).w(this, FUNC(gei_state::banksel_w<4>)); - map(0x607d, 0x607d).w(this, FUNC(gei_state::banksel_w<2>)); - map(0x607e, 0x607e).w(this, FUNC(gei_state::banksel_w<0>)); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); + map(0x606f, 0x606f).w(FUNC(gei_state::banksel_w<8>)); + map(0x6077, 0x6077).w(FUNC(gei_state::banksel_w<6>)); + map(0x607b, 0x607b).w(FUNC(gei_state::banksel_w<4>)); + map(0x607d, 0x607d).w(FUNC(gei_state::banksel_w<2>)); + map(0x607e, 0x607e).w(FUNC(gei_state::banksel_w<0>)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); map(0x8000, 0xbfff).rom(); - map(0xc000, 0xffff).ram().w(this, FUNC(gei_state::gei_bitmap_w)); + map(0xc000, 0xffff).ram().w(FUNC(gei_state::gei_bitmap_w)); } void gei_state::gepoker_map(address_map &map) @@ -411,14 +411,14 @@ void gei_state::gepoker_map(address_map &map) map(0x4000, 0x47ff).ram().share("nvram"); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x60ef, 0x60ef).w(this, FUNC(gei_state::banksel_w<4>)); - map(0x60f7, 0x60f7).w(this, FUNC(gei_state::banksel_w<3>)); - map(0x60fb, 0x60fb).w(this, FUNC(gei_state::banksel_w<2>)); - map(0x60fd, 0x60fd).w(this, FUNC(gei_state::banksel_w<1>)); - map(0x60fe, 0x60fe).w(this, FUNC(gei_state::banksel_w<0>)); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); + map(0x60ef, 0x60ef).w(FUNC(gei_state::banksel_w<4>)); + map(0x60f7, 0x60f7).w(FUNC(gei_state::banksel_w<3>)); + map(0x60fb, 0x60fb).w(FUNC(gei_state::banksel_w<2>)); + map(0x60fd, 0x60fd).w(FUNC(gei_state::banksel_w<1>)); + map(0x60fe, 0x60fe).w(FUNC(gei_state::banksel_w<0>)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); map(0x8000, 0xbfff).rom(); /* space for diagnostic ROM? */ - map(0xc000, 0xffff).ram().w(this, FUNC(gei_state::gei_bitmap_w)); + map(0xc000, 0xffff).ram().w(FUNC(gei_state::gei_bitmap_w)); map(0xe000, 0xffff).rom(); } @@ -427,58 +427,58 @@ void gei_state::amuse1_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x3fff).bankr("rombank"); map(0x4000, 0x43ff).ram().share("nvram"); - map(0x4400, 0x4400).w(this, FUNC(gei_state::banksel_w<0>)); - map(0x4401, 0x4401).w(this, FUNC(gei_state::banksel_w<2>)); - map(0x4402, 0x4402).w(this, FUNC(gei_state::banksel_w<4>)); - map(0x4403, 0x4403).w(this, FUNC(gei_state::banksel_w<6>)); + map(0x4400, 0x4400).w(FUNC(gei_state::banksel_w<0>)); + map(0x4401, 0x4401).w(FUNC(gei_state::banksel_w<2>)); + map(0x4402, 0x4402).w(FUNC(gei_state::banksel_w<4>)); + map(0x4403, 0x4403).w(FUNC(gei_state::banksel_w<6>)); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5800, 0x5fff).rom(); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); map(0x8000, 0xbfff).rom(); /* space for diagnostic ROM? */ - map(0xc000, 0xffff).ram().w(this, FUNC(gei_state::gei_bitmap_w)); + map(0xc000, 0xffff).ram().w(FUNC(gei_state::gei_bitmap_w)); map(0xe000, 0xffff).rom(); } void gei_state::findout_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(gei_state::catchall)); + map(0x0000, 0xffff).r(FUNC(gei_state::catchall)); map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram().share("nvram"); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* banked ROMs are enabled by low 6 bits of the address */ - map(0x601f, 0x601f).w(this, FUNC(gei_state::banksel_w<0>)); - map(0x602f, 0x602f).w(this, FUNC(gei_state::banksel_w<5>)); - map(0x6037, 0x6037).w(this, FUNC(gei_state::banksel_w<4>)); - map(0x603b, 0x603b).w(this, FUNC(gei_state::banksel_w<3>)); - map(0x603d, 0x603d).w(this, FUNC(gei_state::banksel_w<2>)); - map(0x603e, 0x603e).w(this, FUNC(gei_state::banksel_w<1>)); - map(0x6200, 0x6200).w(this, FUNC(gei_state::signature_w)); - map(0x6400, 0x6400).r(this, FUNC(gei_state::signature_r)); + map(0x601f, 0x601f).w(FUNC(gei_state::banksel_w<0>)); + map(0x602f, 0x602f).w(FUNC(gei_state::banksel_w<5>)); + map(0x6037, 0x6037).w(FUNC(gei_state::banksel_w<4>)); + map(0x603b, 0x603b).w(FUNC(gei_state::banksel_w<3>)); + map(0x603d, 0x603d).w(FUNC(gei_state::banksel_w<2>)); + map(0x603e, 0x603e).w(FUNC(gei_state::banksel_w<1>)); + map(0x6200, 0x6200).w(FUNC(gei_state::signature_w)); + map(0x6400, 0x6400).r(FUNC(gei_state::signature_r)); map(0x7800, 0x7fff).rom(); /*space for diagnostic ROM?*/ map(0x8000, 0xffff).bankr("rombank"); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); - map(0xc000, 0xffff).w(this, FUNC(gei_state::gei_bitmap_w)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); + map(0xc000, 0xffff).w(FUNC(gei_state::gei_bitmap_w)); } void gei_state::quizvid_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(gei_state::catchall)); + map(0x0000, 0xffff).r(FUNC(gei_state::catchall)); map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram().share("nvram"); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* banked ROMs are enabled by low 6 bits of the address */ - map(0x602f, 0x602f).r(this, FUNC(gei_state::banksel_r<5>)); - map(0x6037, 0x6037).r(this, FUNC(gei_state::banksel_r<4>)); - map(0x603b, 0x603b).r(this, FUNC(gei_state::banksel_r<3>)); - map(0x603d, 0x603d).r(this, FUNC(gei_state::banksel_r<2>)); - map(0x603e, 0x603e).r(this, FUNC(gei_state::banksel_r<1>)); + map(0x602f, 0x602f).r(FUNC(gei_state::banksel_r<5>)); + map(0x6037, 0x6037).r(FUNC(gei_state::banksel_r<4>)); + map(0x603b, 0x603b).r(FUNC(gei_state::banksel_r<3>)); + map(0x603d, 0x603d).r(FUNC(gei_state::banksel_r<2>)); + map(0x603e, 0x603e).r(FUNC(gei_state::banksel_r<1>)); map(0x7800, 0x7fff).rom(); /*space for diagnostic ROM?*/ map(0x8000, 0xffff).bankr("rombank"); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); - map(0xc000, 0xffff).w(this, FUNC(gei_state::gei_bitmap_w)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); + map(0xc000, 0xffff).w(FUNC(gei_state::gei_bitmap_w)); } void gei_state::suprpokr_map(address_map &map) @@ -487,10 +487,10 @@ void gei_state::suprpokr_map(address_map &map) map(0x4000, 0x47ff).ram().share("nvram"); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x6200, 0x6200).w(this, FUNC(gei_state::signature_w)); - map(0x6400, 0x6400).r(this, FUNC(gei_state::signature_r)); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); - map(0xc000, 0xffff).w(this, FUNC(gei_state::gei_bitmap_w)); + map(0x6200, 0x6200).w(FUNC(gei_state::signature_w)); + map(0x6400, 0x6400).r(FUNC(gei_state::signature_r)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); + map(0xc000, 0xffff).w(FUNC(gei_state::gei_bitmap_w)); map(0x8000, 0xffff).rom(); } @@ -500,13 +500,13 @@ void gei_state::sprtauth_map(address_map &map) map(0x4000, 0x47ff).ram().share("nvram"); map(0x4800, 0x4803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x5000, 0x5003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x5600, 0x5600).r(this, FUNC(gei_state::signature_r)); - map(0x5800, 0x5800).w(this, FUNC(gei_state::signature_w)); - map(0x5a00, 0x5cff).w(this, FUNC(gei_state::geimulti_bank_w)); + map(0x5600, 0x5600).r(FUNC(gei_state::signature_r)); + map(0x5800, 0x5800).w(FUNC(gei_state::signature_w)); + map(0x5a00, 0x5cff).w(FUNC(gei_state::geimulti_bank_w)); map(0x6000, 0x7fff).rom(); - map(0x8000, 0x8002).w(this, FUNC(gei_state::gei_drawctrl_w)); + map(0x8000, 0x8002).w(FUNC(gei_state::gei_drawctrl_w)); map(0x8000, 0xffff).bankr("rombank"); - map(0xc000, 0xffff).w(this, FUNC(gei_state::gei_bitmap_w)); + map(0xc000, 0xffff).w(FUNC(gei_state::gei_bitmap_w)); } static INPUT_PORTS_START(reelfun_standard) diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp index dae59af9103..8d8ded314bd 100644 --- a/src/mame/drivers/geneve.cpp +++ b/src/mame/drivers/geneve.cpp @@ -309,10 +309,10 @@ void geneve_state::memmap(address_map &map) */ void geneve_state::crumap(address_map &map) { - map(0x0000, 0x0fff).r(this, FUNC(geneve_state::cruread)); + map(0x0000, 0x0fff).r(FUNC(geneve_state::cruread)); map(0x0000, 0x0003).r(m_tms9901, FUNC(tms9901_device::read)); - map(0x0000, 0x7fff).w(this, FUNC(geneve_state::cruwrite)); + map(0x0000, 0x7fff).w(FUNC(geneve_state::cruwrite)); map(0x0000, 0x001f).w(m_tms9901, FUNC(tms9901_device::write)); } diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp index c7097b2597e..3ed91eff70e 100644 --- a/src/mame/drivers/geniusiq.cpp +++ b/src/mame/drivers/geniusiq.cpp @@ -423,19 +423,19 @@ void geniusiq_state::geniusiq_mem(address_map &map) map(0x300000, 0x30FFFF).ram().share("vram"); map(0x310000, 0x31FFFF).ram(); map(0x400000, 0x41ffff).mirror(0x0e0000).rw("flash", FUNC(intelfsh8_device::read), FUNC(intelfsh8_device::write)).umask16(0x00ff); - map(0x600300, 0x600301).r(this, FUNC(geniusiq_state::input_r)); + map(0x600300, 0x600301).r(FUNC(geniusiq_state::input_r)); //AM_RANGE(0x600500, 0x60050f) // read during IRQ 5 //AM_RANGE(0x600600, 0x600605) // sound ?? - map(0x600606, 0x600609).w(this, FUNC(geniusiq_state::gfx_base_w)); - map(0x60060a, 0x60060b).w(this, FUNC(geniusiq_state::gfx_idx_w)); - map(0x600802, 0x600803).r(this, FUNC(geniusiq_state::cart_state_r)); // cartridge state - map(0x600108, 0x600109).r(this, FUNC(geniusiq_state::unk0_r)); // read before run a BASIC program - map(0x600918, 0x600919).r(this, FUNC(geniusiq_state::unk0_r)); // loop at start if bit 0 is set - map(0x601008, 0x601009).r(this, FUNC(geniusiq_state::unk_r)); // unknown, read at start and expect that bit 2 changes several times before continue - map(0x601010, 0x601011).r(this, FUNC(geniusiq_state::unk0_r)); // loop at start if bit 1 is set - map(0x601018, 0x60101b).w(this, FUNC(geniusiq_state::gfx_dest_w)); - map(0x60101c, 0x60101f).w(this, FUNC(geniusiq_state::gfx_color_w)); - map(0x601060, 0x601063).w(this, FUNC(geniusiq_state::mouse_pos_w)); + map(0x600606, 0x600609).w(FUNC(geniusiq_state::gfx_base_w)); + map(0x60060a, 0x60060b).w(FUNC(geniusiq_state::gfx_idx_w)); + map(0x600802, 0x600803).r(FUNC(geniusiq_state::cart_state_r)); // cartridge state + map(0x600108, 0x600109).r(FUNC(geniusiq_state::unk0_r)); // read before run a BASIC program + map(0x600918, 0x600919).r(FUNC(geniusiq_state::unk0_r)); // loop at start if bit 0 is set + map(0x601008, 0x601009).r(FUNC(geniusiq_state::unk_r)); // unknown, read at start and expect that bit 2 changes several times before continue + map(0x601010, 0x601011).r(FUNC(geniusiq_state::unk0_r)); // loop at start if bit 1 is set + map(0x601018, 0x60101b).w(FUNC(geniusiq_state::gfx_dest_w)); + map(0x60101c, 0x60101f).w(FUNC(geniusiq_state::gfx_color_w)); + map(0x601060, 0x601063).w(FUNC(geniusiq_state::mouse_pos_w)); map(0x601100, 0x6011ff).ram().share("mouse_gfx"); // mouse cursor gfx (24x16) map(0xa00000, 0xafffff).r(m_cart, FUNC(generic_slot_device::read16_rom)); // 0x600000 : some memory mapped hardware diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp index 8f9801740f8..95bed40b3b4 100644 --- a/src/mame/drivers/ggconnie.cpp +++ b/src/mame/drivers/ggconnie.cpp @@ -79,7 +79,7 @@ void ggconnie_state::sgx_mem(address_map &map) map(0x1f7100, 0x1f7100).portr("SWB"); map(0x1f7200, 0x1f7200).portr("SWC"); map(0x1f7700, 0x1f7700).portr("IN1"); - map(0x1f7800, 0x1f7800).w(this, FUNC(ggconnie_state::output_w)); + map(0x1f7800, 0x1f7800).w(FUNC(ggconnie_state::output_w)); map(0x1fe000, 0x1fe007).rw("huc6270_0", FUNC(huc6270_device::read), FUNC(huc6270_device::write)).mirror(0x03E0); map(0x1fe008, 0x1fe00f).rw("huc6202", FUNC(huc6202_device::read), FUNC(huc6202_device::write)).mirror(0x03E0); map(0x1fe010, 0x1fe017).rw("huc6270_1", FUNC(huc6270_device::read), FUNC(huc6270_device::write)).mirror(0x03E0); @@ -87,9 +87,9 @@ void ggconnie_state::sgx_mem(address_map &map) map(0x1fe800, 0x1febff).rw("c6280", FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w)); map(0x1fec00, 0x1fefff).rw(m_maincpu, FUNC(h6280_device::timer_r), FUNC(h6280_device::timer_w)); map(0x1f7300, 0x1f7300).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x1f7400, 0x1f74ff).w(this, FUNC(ggconnie_state::oki_bank_w)); + map(0x1f7400, 0x1f74ff).w(FUNC(ggconnie_state::oki_bank_w)); map(0x1f7500, 0x1f750f).rw(m_rtc, FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x1ff000, 0x1ff000).portr("IN0").w(this, FUNC(ggconnie_state::lamp_w)); + map(0x1ff000, 0x1ff000).portr("IN0").w(FUNC(ggconnie_state::lamp_w)); map(0x1ff400, 0x1ff7ff).rw(m_maincpu, FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w)); } diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp index 0993736d393..8b516f76627 100644 --- a/src/mame/drivers/ghosteo.cpp +++ b/src/mame/drivers/ghosteo.cpp @@ -427,7 +427,7 @@ void ghosteo_state::bballoon_map(address_map &map) void ghosteo_state::touryuu_map(address_map &map) { - map(0x10000000, 0x10000003).r(this, FUNC(ghosteo_state::touryuu_port_10000000_r)); + map(0x10000000, 0x10000003).r(FUNC(ghosteo_state::touryuu_port_10000000_r)); map(0x10100000, 0x10100003).portr("10100000"); map(0x10200000, 0x10200003).portr("10200000"); map(0x10300000, 0x10300000).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask32(0x000000ff).cswidth(32); diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp index fe033ae3a32..59c33961516 100644 --- a/src/mame/drivers/giclassic.cpp +++ b/src/mame/drivers/giclassic.cpp @@ -150,8 +150,8 @@ void giclassic_state::satellite_main(address_map &map) map(0x200000, 0x200fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x800000, 0x801fff).ram().rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); map(0x900000, 0x90003f).rw(m_k056832, FUNC(k056832_device::word_r), FUNC(k056832_device::word_w)); - map(0xb00000, 0xb01fff).r(this, FUNC(giclassic_state::vrom_r)); - map(0xc00000, 0xc00001).w(this, FUNC(giclassic_state::control_w)); + map(0xb00000, 0xb01fff).r(FUNC(giclassic_state::vrom_r)); + map(0xc00000, 0xc00001).w(FUNC(giclassic_state::control_w)); map(0xd00000, 0xd0003f).ram(); // these must read/write or 26S (LCD controller) fails map(0xe00000, 0xe0001f).w(m_k056832, FUNC(k056832_device::b_w)).umask16(0xff00); map(0xf00000, 0xf00001).noprw().nopw(); // watchdog reset @@ -279,7 +279,7 @@ void giclassicsvr_state::server_main(address_map &map) map(0x320000, 0x32001f).rw("k053252a", FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); // CRTC 1 map(0x320000, 0x32001f).rw("k053252b", FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0xff00); // CRTC 2 map(0x380000, 0x380001).nopw(); // watchdog reset - map(0x398000, 0x398001).rw(this, FUNC(giclassicsvr_state::control_r), FUNC(giclassicsvr_state::control_w)); + map(0x398000, 0x398001).rw(FUNC(giclassicsvr_state::control_r), FUNC(giclassicsvr_state::control_w)); map(0x400000, 0x41ffff).ram(); } diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp index 4e0e7fd0086..711f5aebef0 100644 --- a/src/mame/drivers/gijoe.cpp +++ b/src/mame/drivers/gijoe.cpp @@ -212,12 +212,12 @@ void gijoe_state::gijoe_map(address_map &map) map(0x1a0000, 0x1a001f).w(m_k053251, FUNC(k053251_device::lsb_w)); map(0x1b0000, 0x1b003f).w(m_k056832, FUNC(k056832_device::word_w)); map(0x1c0000, 0x1c001f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); - map(0x1d0000, 0x1d0001).w(this, FUNC(gijoe_state::sound_irq_w)); + map(0x1d0000, 0x1d0001).w(FUNC(gijoe_state::sound_irq_w)); map(0x1e0000, 0x1e0001).portr("P1_P2"); map(0x1e0002, 0x1e0003).portr("P3_P4"); map(0x1e4000, 0x1e4001).portr("SYSTEM"); map(0x1e4002, 0x1e4003).portr("START"); - map(0x1e8000, 0x1e8001).rw(this, FUNC(gijoe_state::control2_r), FUNC(gijoe_state::control2_w)); + map(0x1e8000, 0x1e8001).rw(FUNC(gijoe_state::control2_r), FUNC(gijoe_state::control2_w)); map(0x1f0000, 0x1f0001).r(m_k053246, FUNC(k053247_device::k053246_word_r)); #if JOE_DEBUG map(0x110000, 0x110007).r(m_k053246, FUNC(k053247_device::k053246_reg_word_r)); diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp index f36402a961b..d876b075d15 100644 --- a/src/mame/drivers/gimix.cpp +++ b/src/mame/drivers/gimix.cpp @@ -185,8 +185,8 @@ void gimix_state::gimix_banked_mem(address_map &map) map(0x0e210, 0x0e21f).rw("timer", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0x0e220, 0x0e23f).rw("rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)); map(0x0e240, 0x0e3af).ram(); - map(0x0e3b0, 0x0e3b3).rw(this, FUNC(gimix_state::dma_r), FUNC(gimix_state::dma_w)); // DMA controller (custom?) - map(0x0e3b4, 0x0e3b7).rw(this, FUNC(gimix_state::fdc_r), FUNC(gimix_state::fdc_w)); // FD1797 FDC + map(0x0e3b0, 0x0e3b3).rw(FUNC(gimix_state::dma_r), FUNC(gimix_state::dma_w)); // DMA controller (custom?) + map(0x0e3b4, 0x0e3b7).rw(FUNC(gimix_state::fdc_r), FUNC(gimix_state::fdc_w)); // FD1797 FDC map(0x0e400, 0x0e7ff).ram(); // scratchpad RAM map(0x0e800, 0x0efff).ram(); map(0x0f000, 0x0f7ff).bankr("rombank2"); @@ -212,7 +212,7 @@ void gimix_state::gimix_mem(address_map &map) map(0xd000, 0xdfff).rw(m_bank14, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0xe000, 0xefff).rw(m_bank15, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); map(0xf000, 0xfeff).rw(m_bank16, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); - map(0xff00, 0xffff).bankr("fixedrombank").w(this, FUNC(gimix_state::system_w)); + map(0xff00, 0xffff).bankr("fixedrombank").w(FUNC(gimix_state::system_w)); } static INPUT_PORTS_START( gimix ) @@ -429,13 +429,13 @@ WRITE_LINE_MEMBER(gimix_state::fdc_drq_w) if(DMA_DIRECTION) { // write to disk - m_fdc->data_w(m_ram->read(m_dma_current_addr)); + m_fdc->write_data(m_ram->read(m_dma_current_addr)); // logerror("DMA: read from RAM %05x\n",m_dma_current_addr); } else { // read from disk - m_ram->write(m_dma_current_addr,m_fdc->data_r()); + m_ram->write(m_dma_current_addr,m_fdc->read_data()); // logerror("DMA: write to RAM %05x\n",m_dma_current_addr); } m_dma_current_addr++; diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp index eacbd4721ca..5335770ea2a 100644 --- a/src/mame/drivers/ginganin.cpp +++ b/src/mame/drivers/ginganin.cpp @@ -81,11 +81,11 @@ void ginganin_state::ginganin_map(address_map &map) /* The ROM area: 10000-13fff is written with: 0000 0000 0000 0001, at startup only. Why? */ map(0x000000, 0x01ffff).rom(); map(0x020000, 0x023fff).ram(); - map(0x030000, 0x0307ff).ram().w(this, FUNC(ginganin_state::ginganin_txtram16_w)).share("txtram"); + map(0x030000, 0x0307ff).ram().w(FUNC(ginganin_state::ginganin_txtram16_w)).share("txtram"); map(0x040000, 0x0407ff).ram().share("spriteram"); map(0x050000, 0x0507ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x060000, 0x06000f).ram().w(this, FUNC(ginganin_state::ginganin_vregs16_w)).share("vregs"); - map(0x068000, 0x06bfff).ram().w(this, FUNC(ginganin_state::ginganin_fgram16_w)).share("fgram"); + map(0x060000, 0x06000f).ram().w(FUNC(ginganin_state::ginganin_vregs16_w)).share("vregs"); + map(0x068000, 0x06bfff).ram().w(FUNC(ginganin_state::ginganin_fgram16_w)).share("fgram"); map(0x070000, 0x070001).portr("P1_P2"); map(0x070002, 0x070003).portr("DSW"); } diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index 5839bc93f14..4aa3b655f35 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -247,26 +247,26 @@ void igt_gameking_state::igt_gameking_map(address_map &map) // 28060000: COLOR SEL // 28070000: OUT SEL // map(0x28010000, 0x2801007f).rw("quart1", FUNC(sc28c94_device::read), FUNC(sc28c94_device::write)).umask32(0x00ff00ff); - map(0x28010008, 0x2801000b).r(this, FUNC(igt_gameking_state::uart_status_r)); + map(0x28010008, 0x2801000b).r(FUNC(igt_gameking_state::uart_status_r)); map(0x2801001c, 0x2801001f).nopw(); - map(0x28010030, 0x28010033).r(this, FUNC(igt_gameking_state::uart_status_r)); // channel D - map(0x28010034, 0x28010037).w(this, FUNC(igt_gameking_state::uart_w)); // channel D + map(0x28010030, 0x28010033).r(FUNC(igt_gameking_state::uart_status_r)); // channel D + map(0x28010034, 0x28010037).w(FUNC(igt_gameking_state::uart_w)); // channel D map(0x28020000, 0x280205ff).ram(); // CMOS? -// map(0x28020000, 0x2802007f).r(this, FUNC(igt_gameking_state::igt_gk_28010008_r)).nopw(); +// map(0x28020000, 0x2802007f).r(FUNC(igt_gameking_state::igt_gk_28010008_r)).nopw(); map(0x28030000, 0x28030003).portr("IN0"); // map(0x28040000, 0x2804007f).rw("quart2", FUNC(sc28c94_device::read), FUNC(sc28c94_device::write)).umask32(0x00ff00ff); - map(0x2804000a, 0x2804000a).w(this, FUNC(igt_gameking_state::unk_w)); - map(0x28040008, 0x28040008).rw(this, FUNC(igt_gameking_state::irq_vector_r), FUNC(igt_gameking_state::irq_enable_w)); + map(0x2804000a, 0x2804000a).w(FUNC(igt_gameking_state::unk_w)); + map(0x28040008, 0x28040008).rw(FUNC(igt_gameking_state::irq_vector_r), FUNC(igt_gameking_state::irq_enable_w)); map(0x28040018, 0x2804001b).portr("IN1").nopw(); map(0x2804001c, 0x2804001f).portr("IN4").nopw(); map(0x28040028, 0x2804002b).nopr(); - map(0x2804002a, 0x2804002a).w(this, FUNC(igt_gameking_state::irq_ack_w)); -// map(0x28040038, 0x2804003b).r(this, FUNC(igt_gameking_state::timer_r)).umask32(0x00ff0000); + map(0x2804002a, 0x2804002a).w(FUNC(igt_gameking_state::irq_ack_w)); +// map(0x28040038, 0x2804003b).r(FUNC(igt_gameking_state::timer_r)).umask32(0x00ff0000); map(0x28040038, 0x2804003b).portr("IN2").nopw(); map(0x2804003c, 0x2804003f).portr("IN3").nopw(); - map(0x28040050, 0x28040050).r(this, FUNC(igt_gameking_state::frame_number_r)); + map(0x28040050, 0x28040050).r(FUNC(igt_gameking_state::frame_number_r)); map(0x28040054, 0x28040057).nopw(); -// map(0x28040054, 0x28040057).w(this, FUNC(igt_gameking_state::irq_ack_w).umask32(0x000000ff); +// map(0x28040054, 0x28040057).w(FUNC(igt_gameking_state::irq_ack_w).umask32(0x000000ff); map(0x28050000, 0x28050003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask32(0x00ff00ff); map(0x28060000, 0x28060000).w("ramdac", FUNC(ramdac_device::index_w)); @@ -293,8 +293,8 @@ READ8_MEMBER(igt_gameking_state::timer_r) void igt_gameking_state::igt_ms72c_map(address_map &map) { igt_gameking_map(map); - map(0x18200000, 0x18200001).r(this, FUNC(igt_gameking_state::version_r)); - map(0x2804003a, 0x2804003a).r(this, FUNC(igt_gameking_state::timer_r)); + map(0x18200000, 0x18200001).r(FUNC(igt_gameking_state::version_r)); + map(0x2804003a, 0x2804003a).r(FUNC(igt_gameking_state::timer_r)); } static INPUT_PORTS_START( igt_gameking ) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index fe1c88384ce..6b190f29efa 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -619,19 +619,19 @@ void ppking_state::ppking_cpu1_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcbff).ram().share("spriteram"); - map(0xcc00, 0xcfff).w(this, FUNC(ppking_state::ppking_video_registers_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(ppking_state::paletteram_w)).share("paletteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(ppking_state::videoram_w)).share("videoram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(ppking_state::colorram_w)).share("colorram"); - map(0xe800, 0xefff).ram().w(this, FUNC(ppking_state::textram_w)).share("textram"); + map(0xcc00, 0xcfff).w(FUNC(ppking_state::ppking_video_registers_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(ppking_state::paletteram_w)).share("paletteram"); + map(0xd800, 0xdfff).ram().w(FUNC(ppking_state::videoram_w)).share("videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(ppking_state::colorram_w)).share("colorram"); + map(0xe800, 0xefff).ram().w(FUNC(ppking_state::textram_w)).share("textram"); map(0xf000, 0xf7ff).ram().share("nvram"); /* battery backed RAM */ } void ppking_state::ppking_cpu3_map(address_map &map) { - map(0x1000, 0x1fff).w(this, FUNC(ppking_state::ppking_adpcm_w)); - map(0x2000, 0x2fff).r(this, FUNC(ppking_state::adpcm_command_r)); + map(0x1000, 0x1fff).w(FUNC(ppking_state::ppking_adpcm_w)); + map(0x2000, 0x2fff).r(FUNC(ppking_state::adpcm_command_r)); map(0x8000, 0xffff).rom().nopw(); } @@ -640,19 +640,19 @@ void ppking_state::ppking_cpu1_io(address_map &map) // ADDRESS_MAP_GLOBAL_MASK(0xff) map(0xc000, 0xc007).w("mainlatch", FUNC(ls259_device::write_d0)); // map(0xc004, 0xc004) AM_NOP // WRITE(ppking_irq_patch_w) - map(0xc09e, 0xc09f).r(this, FUNC(ppking_state::ppking_qx0_r)).w(this, FUNC(ppking_state::ppking_qx0_w)); + map(0xc09e, 0xc09f).r(FUNC(ppking_state::ppking_qx0_r)).w(FUNC(ppking_state::ppking_qx0_w)); map(0xc0bf, 0xc0bf).noprw(); // watchdog - map(0xc0c0, 0xc0c1).r(this, FUNC(ppking_state::ppking_qxcomu_r)).w(this, FUNC(ppking_state::ppking_qxcomu_w)); + map(0xc0c0, 0xc0c1).r(FUNC(ppking_state::ppking_qxcomu_r)).w(FUNC(ppking_state::ppking_qxcomu_w)); } void ppking_state::ppking_cpu2_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x20, 0x21).r(this, FUNC(ppking_state::ppking_qx1_r)).w(this, FUNC(ppking_state::ppking_qx1_w)); - map(0x40, 0x40).w(this, FUNC(ppking_state::cpu2_irq_ack_w)); - map(0x80, 0x81).rw(this, FUNC(ppking_state::ppking_qx3_r), FUNC(ppking_state::ppking_qx3_w)); - map(0xe0, 0xe0).w(this, FUNC(ppking_state::adpcm_command_w)); + map(0x20, 0x21).r(FUNC(ppking_state::ppking_qx1_r)).w(FUNC(ppking_state::ppking_qx1_w)); + map(0x40, 0x40).w(FUNC(ppking_state::cpu2_irq_ack_w)); + map(0x80, 0x81).rw(FUNC(ppking_state::ppking_qx3_r), FUNC(ppking_state::ppking_qx3_w)); + map(0xe0, 0xe0).w(FUNC(ppking_state::adpcm_command_w)); } @@ -663,11 +663,11 @@ void gladiatr_state::gladiatr_cpu1_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0xbfff).bankr("bank1"); map(0xc000, 0xcbff).ram().share("spriteram"); - map(0xcc00, 0xcfff).w(this, FUNC(gladiatr_state::gladiatr_video_registers_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(gladiatr_state::paletteram_w)).share("paletteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(gladiatr_state::videoram_w)).share("videoram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(gladiatr_state::colorram_w)).share("colorram"); - map(0xe800, 0xefff).ram().w(this, FUNC(gladiatr_state::textram_w)).share("textram"); + map(0xcc00, 0xcfff).w(FUNC(gladiatr_state::gladiatr_video_registers_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(gladiatr_state::paletteram_w)).share("paletteram"); + map(0xd800, 0xdfff).ram().w(FUNC(gladiatr_state::videoram_w)).share("videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(gladiatr_state::colorram_w)).share("colorram"); + map(0xe800, 0xefff).ram().w(FUNC(gladiatr_state::textram_w)).share("textram"); map(0xf000, 0xf7ff).ram().share("nvram"); /* battery backed RAM */ } @@ -679,8 +679,8 @@ void gladiatr_state_base::cpu2_map(address_map &map) void gladiatr_state::gladiatr_cpu3_map(address_map &map) { - map(0x1000, 0x1fff).w(this, FUNC(gladiatr_state::gladiator_adpcm_w)); - map(0x2000, 0x2fff).r(this, FUNC(gladiatr_state::adpcm_command_r)); + map(0x1000, 0x1fff).w(FUNC(gladiatr_state::gladiator_adpcm_w)); + map(0x2000, 0x2fff).r(FUNC(gladiatr_state::adpcm_command_r)); map(0x4000, 0xffff).bankr("bank2").nopw(); } @@ -688,7 +688,7 @@ void gladiatr_state::gladiatr_cpu3_map(address_map &map) void gladiatr_state::gladiatr_cpu1_io(address_map &map) { map(0xc000, 0xc007).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xc004, 0xc004).w(this, FUNC(gladiatr_state::gladiatr_irq_patch_w)); /* !!! patch to 2nd CPU IRQ !!! */ + map(0xc004, 0xc004).w(FUNC(gladiatr_state::gladiatr_irq_patch_w)); /* !!! patch to 2nd CPU IRQ !!! */ map(0xc09e, 0xc09f).rw(m_ucpu, FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w)); map(0xc0bf, 0xc0bf).noprw(); // watchdog_reset_w doesn't work } @@ -702,7 +702,7 @@ void gladiatr_state::gladiatr_cpu2_io(address_map &map) map(0x60, 0x61).rw(m_cctl, FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w)); map(0x80, 0x81).rw(m_ccpu, FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w)); map(0xa0, 0xa7).w("filtlatch", FUNC(ls259_device::write_d0)); - map(0xe0, 0xe0).w(this, FUNC(gladiatr_state::adpcm_command_w)); + map(0xe0, 0xe0).w(FUNC(gladiatr_state::adpcm_command_w)); } diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp index 302a6c128ae..5ba5be5176f 100644 --- a/src/mame/drivers/glasgow.cpp +++ b/src/mame/drivers/glasgow.cpp @@ -230,9 +230,9 @@ void glasgow_state::glasgow_mem(address_map &map) { map.global_mask(0x1ffff); map(0x000000, 0x00ffff).rom(); - map(0x010000, 0x010000).w(this, FUNC(glasgow_state::glasgow_lcd_w)); - map(0x010002, 0x010002).rw(this, FUNC(glasgow_state::glasgow_keys_r), FUNC(glasgow_state::glasgow_keys_w)); - map(0x010004, 0x010004).w(this, FUNC(glasgow_state::glasgow_lcd_flag_w)); + map(0x010000, 0x010000).w(FUNC(glasgow_state::glasgow_lcd_w)); + map(0x010002, 0x010002).rw(FUNC(glasgow_state::glasgow_keys_r), FUNC(glasgow_state::glasgow_keys_w)); + map(0x010004, 0x010004).w(FUNC(glasgow_state::glasgow_lcd_flag_w)); map(0x010006, 0x010006).rw("board", FUNC(mephisto_board_device::input_r), FUNC(mephisto_board_device::led_w)); map(0x010008, 0x010008).w("board", FUNC(mephisto_board_device::mux_w)); map(0x01c000, 0x01ffff).ram(); // 16KB @@ -242,12 +242,12 @@ void amsterd_state::amsterd_mem(address_map &map) { // ADDRESS_MAP_GLOBAL_MASK(0x7FFFF) map(0x000000, 0x00ffff).rom(); - map(0x800002, 0x800002).w(this, FUNC(amsterd_state::write_lcd)); - map(0x800008, 0x800008).w(this, FUNC(amsterd_state::write_lcd_flag)); - map(0x800004, 0x800004).w(this, FUNC(amsterd_state::write_beeper)); - map(0x800010, 0x800010).w(this, FUNC(amsterd_state::write_board)); + map(0x800002, 0x800002).w(FUNC(amsterd_state::write_lcd)); + map(0x800008, 0x800008).w(FUNC(amsterd_state::write_lcd_flag)); + map(0x800004, 0x800004).w(FUNC(amsterd_state::write_beeper)); + map(0x800010, 0x800010).w(FUNC(amsterd_state::write_board)); map(0x800020, 0x800020).r("board", FUNC(mephisto_board_device::input_r)); - map(0x800040, 0x800040).r(this, FUNC(amsterd_state::read_newkeys)); + map(0x800040, 0x800040).r(FUNC(amsterd_state::read_newkeys)); map(0x800088, 0x800088).w("board", FUNC(mephisto_board_device::led_w)); map(0xffc000, 0xffffff).ram(); // 16KB } @@ -257,12 +257,12 @@ void amsterd_state::dallas32_mem(address_map &map) // ADDRESS_MAP_GLOBAL_MASK(0x1FFFF) map(0x000000, 0x00ffff).rom(); map(0x010000, 0x01ffff).ram(); // 64KB - map(0x800002, 0x800002).w(this, FUNC(amsterd_state::write_lcd32)); - map(0x800004, 0x800004).w(this, FUNC(amsterd_state::write_beeper)); - map(0x800008, 0x800008).w(this, FUNC(amsterd_state::write_lcd_flag)); - map(0x800010, 0x800010).w(this, FUNC(amsterd_state::write_board)); + map(0x800002, 0x800002).w(FUNC(amsterd_state::write_lcd32)); + map(0x800004, 0x800004).w(FUNC(amsterd_state::write_beeper)); + map(0x800008, 0x800008).w(FUNC(amsterd_state::write_lcd_flag)); + map(0x800010, 0x800010).w(FUNC(amsterd_state::write_board)); map(0x800020, 0x800020).r("board", FUNC(mephisto_board_device::input_r)); - map(0x800040, 0x800040).r(this, FUNC(amsterd_state::read_newkeys)); + map(0x800040, 0x800040).r(FUNC(amsterd_state::read_newkeys)); map(0x800088, 0x800088).w("board", FUNC(mephisto_board_device::led_w)); } diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp index 6cf030cdb91..a7416bb83fd 100644 --- a/src/mame/drivers/glass.cpp +++ b/src/mame/drivers/glass.cpp @@ -106,28 +106,28 @@ WRITE_LINE_MEMBER(glass_state::coin2_counter_w) void glass_state::mcu_hostmem_map(address_map &map) { - map(0x0000, 0xffff).mask(0x3fff).rw(this, FUNC(glass_state::shareram_r), FUNC(glass_state::shareram_w)); // shared RAM with the main CPU + map(0x0000, 0xffff).mask(0x3fff).rw(FUNC(glass_state::shareram_r), FUNC(glass_state::shareram_w)); // shared RAM with the main CPU } void glass_state::glass_map(address_map &map) { - map(0x000000, 0x0fffff).rom(); // ROM - map(0x100000, 0x101fff).ram().w(this, FUNC(glass_state::vram_w)).share("videoram"); // Video RAM - map(0x102000, 0x102fff).ram(); // Extra Video RAM - map(0x108000, 0x108007).writeonly().share("vregs"); // Video Registers - map(0x108008, 0x108009).w(this, FUNC(glass_state::clr_int_w)); // CLR INT Video - map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0x440000, 0x440fff).ram().share("spriteram"); // Sprite RAM + map(0x000000, 0x0fffff).rom(); // ROM + map(0x100000, 0x101fff).ram().w(FUNC(glass_state::vram_w)).share("videoram"); // Video RAM + map(0x102000, 0x102fff).ram(); // Extra Video RAM + map(0x108000, 0x108007).writeonly().share("vregs"); // Video Registers + map(0x108008, 0x108009).w(FUNC(glass_state::clr_int_w)); // CLR INT Video + map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette + map(0x440000, 0x440fff).ram().share("spriteram"); // Sprite RAM map(0x700000, 0x700001).portr("DSW2"); map(0x700002, 0x700003).portr("DSW1"); map(0x700004, 0x700005).portr("P1"); map(0x700006, 0x700007).portr("P2"); - map(0x700008, 0x700009).w(this, FUNC(glass_state::blitter_w)); // serial blitter - map(0x70000a, 0x70000b).select(0x000070).w(this, FUNC(glass_state::coin_w)); // Coin Counters/Lockout - map(0x70000c, 0x70000d).w(this, FUNC(glass_state::OKIM6295_bankswitch_w)); // OKI6295 bankswitch - map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // OKI6295 status register - map(0xfec000, 0xfeffff).ram().share("shareram"); // Work RAM (partially shared with DS5002FP) + map(0x700008, 0x700009).w(FUNC(glass_state::blitter_w)); // serial blitter + map(0x70000a, 0x70000b).select(0x000070).w(FUNC(glass_state::coin_w)); // Coin Counters/Lockout + map(0x70000c, 0x70000d).w(FUNC(glass_state::OKIM6295_bankswitch_w)); // OKI6295 bankswitch + map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // OKI6295 status register + map(0xfec000, 0xfeffff).ram().share("shareram"); // Work RAM (partially shared with DS5002FP) } diff --git a/src/mame/drivers/globalfr.cpp b/src/mame/drivers/globalfr.cpp index 8629643baa8..82b8feb017e 100644 --- a/src/mame/drivers/globalfr.cpp +++ b/src/mame/drivers/globalfr.cpp @@ -57,7 +57,7 @@ void globalfr_state::globalfr_map(address_map &map) map(0x002000, 0x002fff).ram(); map(0x008000, 0x07ffff).rom().region("maincpu", 0x8000); map(0x0a0000, 0x0a01ff).ram(); - map(0x7e0040, 0x7e0041).w(this, FUNC(globalfr_state::vfd_w)); + map(0x7e0040, 0x7e0041).w(FUNC(globalfr_state::vfd_w)); } static INPUT_PORTS_START( globalfr ) diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp index 28c31d60c50..01f4d9094f6 100644 --- a/src/mame/drivers/gluck2.cpp +++ b/src/mame/drivers/gluck2.cpp @@ -314,14 +314,14 @@ void gluck2_state::gluck2_map(address_map &map) map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w)); map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x084b).noprw(); /* see below */ - map(0x1000, 0x13ff).ram().w(this, FUNC(gluck2_state::videoram_w)).share("videoram"); /* 6116 #1 (2K x 8) RAM (only 1st half used) */ - map(0x1800, 0x1bff).ram().w(this, FUNC(gluck2_state::colorram_w)).share("colorram"); /* 6116 #2 (2K x 8) RAM (only 1st half used) */ + map(0x1000, 0x13ff).ram().w(FUNC(gluck2_state::videoram_w)).share("videoram"); /* 6116 #1 (2K x 8) RAM (only 1st half used) */ + map(0x1800, 0x1bff).ram().w(FUNC(gluck2_state::colorram_w)).share("colorram"); /* 6116 #2 (2K x 8) RAM (only 1st half used) */ map(0x2000, 0x2000).portr("SW1"); map(0x2d00, 0x2d01).w("ymsnd", FUNC(ym2413_device::write)); map(0x3400, 0x3400).portr("IN0"); map(0x3500, 0x3500).portr("IN1"); map(0x3600, 0x3600).portr("IN2"); - map(0x3700, 0x3700).w(this, FUNC(gluck2_state::counters_w)); + map(0x3700, 0x3700).w(FUNC(gluck2_state::counters_w)); map(0x3d00, 0x3d01).rw("ay8910", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp index 0fb7992ddaa..4a352fc8599 100644 --- a/src/mame/drivers/gmaster.cpp +++ b/src/mame/drivers/gmaster.cpp @@ -240,7 +240,7 @@ WRITE8_MEMBER(gmaster_state::gmaster_portf_w) void gmaster_state::gmaster_mem(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x7fff).rw(this, FUNC(gmaster_state::gmaster_io_r), FUNC(gmaster_state::gmaster_io_w)); + map(0x4000, 0x7fff).rw(FUNC(gmaster_state::gmaster_io_r), FUNC(gmaster_state::gmaster_io_w)); //AM_RANGE(0x8000, 0xfeff) // mapped by the cartslot } diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index 41a59fd6ac9..2ed772784d0 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -69,8 +69,8 @@ void gng_state::gng_map(address_map &map) { map(0x0000, 0x1dff).ram(); map(0x1e00, 0x1fff).ram().share("spriteram"); - map(0x2000, 0x27ff).ram().w(this, FUNC(gng_state::gng_fgvideoram_w)).share("fgvideoram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(gng_state::gng_bgvideoram_w)).share("bgvideoram"); + map(0x2000, 0x27ff).ram().w(FUNC(gng_state::gng_fgvideoram_w)).share("fgvideoram"); + map(0x2800, 0x2fff).ram().w(FUNC(gng_state::gng_bgvideoram_w)).share("bgvideoram"); map(0x3000, 0x3000).portr("SYSTEM"); map(0x3001, 0x3001).portr("P1"); map(0x3002, 0x3002).portr("P2"); @@ -79,11 +79,11 @@ void gng_state::gng_map(address_map &map) map(0x3800, 0x38ff).w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x3900, 0x39ff).w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x3a00, 0x3a00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x3b08, 0x3b09).w(this, FUNC(gng_state::gng_bgscrollx_w)); - map(0x3b0a, 0x3b0b).w(this, FUNC(gng_state::gng_bgscrolly_w)); + map(0x3b08, 0x3b09).w(FUNC(gng_state::gng_bgscrollx_w)); + map(0x3b0a, 0x3b0b).w(FUNC(gng_state::gng_bgscrolly_w)); map(0x3c00, 0x3c00).noprw(); /* watchdog? */ map(0x3d00, 0x3d07).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x3e00, 0x3e00).w(this, FUNC(gng_state::gng_bankswitch_w)); + map(0x3e00, 0x3e00).w(FUNC(gng_state::gng_bankswitch_w)); map(0x4000, 0x5fff).bankr("bank1"); map(0x6000, 0xffff).rom(); } @@ -92,8 +92,8 @@ void gng_state::diamond_map(address_map &map) { map(0x0000, 0x1dff).ram(); map(0x1e00, 0x1fff).ram().share("spriteram"); - map(0x2000, 0x27ff).ram().w(this, FUNC(gng_state::gng_fgvideoram_w)).share("fgvideoram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(gng_state::gng_bgvideoram_w)).share("bgvideoram"); + map(0x2000, 0x27ff).ram().w(FUNC(gng_state::gng_fgvideoram_w)).share("fgvideoram"); + map(0x2800, 0x2fff).ram().w(FUNC(gng_state::gng_bgvideoram_w)).share("bgvideoram"); map(0x3000, 0x33ff).noprw(); // faulty POST? map(0x3000, 0x3000).portr("SYSTEM"); map(0x3001, 0x3001).portr("P1"); @@ -103,15 +103,15 @@ void gng_state::diamond_map(address_map &map) map(0x3800, 0x38ff).w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x3900, 0x39ff).w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x3a00, 0x3a00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x3b08, 0x3b09).w(this, FUNC(gng_state::gng_bgscrollx_w)); - map(0x3b0a, 0x3b0b).w(this, FUNC(gng_state::gng_bgscrolly_w)); + map(0x3b08, 0x3b09).w(FUNC(gng_state::gng_bgscrollx_w)); + map(0x3b0a, 0x3b0b).w(FUNC(gng_state::gng_bgscrolly_w)); map(0x3c00, 0x3c00).noprw(); /* watchdog? */ map(0x3d00, 0x3d00).nopw(); // ? (writes $01 and $0F) map(0x3d01, 0x3d01).nopw(); // ? - map(0x3e00, 0x3e00).w(this, FUNC(gng_state::gng_bankswitch_w)); + map(0x3e00, 0x3e00).w(FUNC(gng_state::gng_bankswitch_w)); map(0x4000, 0x5fff).bankr("bank1"); map(0x6000, 0xffff).rom(); - map(0x6000, 0x6000).r(this, FUNC(gng_state::diamond_hack_r)); + map(0x6000, 0x6000).r(FUNC(gng_state::diamond_hack_r)); map(0x6048, 0x6048).nopw(); // ? } diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp index 4c8a015b3ff..c767e12fb62 100644 --- a/src/mame/drivers/go2000.cpp +++ b/src/mame/drivers/go2000.cpp @@ -94,7 +94,7 @@ void go2000_state::go2000_map(address_map &map) map(0x800000, 0x800fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xa00000, 0xa00001).portr("INPUTS"); map(0xa00002, 0xa00003).portr("DSW"); - map(0x620002, 0x620003).w(this, FUNC(go2000_state::sound_cmd_w)); + map(0x620002, 0x620003).w(FUNC(go2000_state::sound_cmd_w)); // AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // AM_RANGE(0xe00010, 0xe00011) AM_WRITENOP // AM_RANGE(0xe00020, 0xe00021) AM_WRITENOP @@ -115,8 +115,8 @@ void go2000_state::go2000_sound_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x00, 0x00).w("dac", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w(this, FUNC(go2000_state::go2000_pcm_1_bankswitch_w)); + map(0x00, 0x00).w("dac", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w(FUNC(go2000_state::go2000_pcm_1_bankswitch_w)); } diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp index 4a0f3d872c4..3eb4b7d09b9 100644 --- a/src/mame/drivers/goal92.cpp +++ b/src/mame/drivers/goal92.cpp @@ -55,20 +55,20 @@ void goal92_state::goal92_map(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x100000, 0x1007ff).ram(); - map(0x100800, 0x100fff).ram().w(this, FUNC(goal92_state::goal92_background_w)).share("bg_data"); - map(0x101000, 0x1017ff).ram().w(this, FUNC(goal92_state::goal92_foreground_w)).share("fg_data"); + map(0x100800, 0x100fff).ram().w(FUNC(goal92_state::goal92_background_w)).share("bg_data"); + map(0x101000, 0x1017ff).ram().w(FUNC(goal92_state::goal92_foreground_w)).share("fg_data"); map(0x101800, 0x101fff).ram(); // it has tiles for clouds, but they aren't used - map(0x102000, 0x102fff).ram().w(this, FUNC(goal92_state::goal92_text_w)).share("tx_data"); + map(0x102000, 0x102fff).ram().w(FUNC(goal92_state::goal92_text_w)).share("tx_data"); map(0x103000, 0x103fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x104000, 0x13ffff).ram(); map(0x140000, 0x1407ff).ram().share("spriteram"); map(0x140800, 0x140801).nopw(); map(0x140802, 0x140803).nopw(); - map(0x180000, 0x18000f).r(this, FUNC(goal92_state::goal92_inputs_r)); - map(0x180008, 0x180009).w(this, FUNC(goal92_state::goal92_sound_command_w)); + map(0x180000, 0x18000f).r(FUNC(goal92_state::goal92_inputs_r)); + map(0x180008, 0x180009).w(FUNC(goal92_state::goal92_sound_command_w)); map(0x18000a, 0x18000b).nopw(); map(0x180010, 0x180017).writeonly().share("scrollram"); - map(0x18001c, 0x18001d).rw(this, FUNC(goal92_state::goal92_fg_bank_r), FUNC(goal92_state::goal92_fg_bank_w)); + map(0x18001c, 0x18001d).rw(FUNC(goal92_state::goal92_fg_bank_r), FUNC(goal92_state::goal92_fg_bank_w)); } /* Sound CPU */ @@ -89,8 +89,8 @@ void goal92_state::sound_cpu(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xe000, 0xe000).w(this, FUNC(goal92_state::adpcm_control_w)); - map(0xe400, 0xe400).w(this, FUNC(goal92_state::adpcm_data_w)); + map(0xe000, 0xe000).w(FUNC(goal92_state::adpcm_control_w)); + map(0xe400, 0xe400).w(FUNC(goal92_state::adpcm_data_w)); map(0xe800, 0xe801).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xec00, 0xec01).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf000, 0xf7ff).ram(); diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp index 83adf775fff..f687ac48942 100644 --- a/src/mame/drivers/goindol.cpp +++ b/src/mame/drivers/goindol.cpp @@ -87,7 +87,7 @@ void goindol_state::goindol_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram().share("ram"); map(0xc800, 0xc800).nopr().w("soundlatch", FUNC(generic_latch_8_device::write)); // watchdog? - map(0xc810, 0xc810).w(this, FUNC(goindol_state::goindol_bankswitch_w)); + map(0xc810, 0xc810).w(FUNC(goindol_state::goindol_bankswitch_w)); map(0xc820, 0xc820).portr("DIAL"); map(0xc820, 0xd820).writeonly().share("fg_scrolly"); map(0xc830, 0xc830).portr("P1"); @@ -95,17 +95,17 @@ void goindol_state::goindol_map(address_map &map) map(0xc834, 0xc834).portr("P2"); map(0xd000, 0xd03f).ram().share("spriteram"); map(0xd040, 0xd7ff).ram(); - map(0xd800, 0xdfff).ram().w(this, FUNC(goindol_state::goindol_bg_videoram_w)).share("bg_videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(goindol_state::goindol_bg_videoram_w)).share("bg_videoram"); map(0xe000, 0xe03f).ram().share("spriteram2"); map(0xe040, 0xe7ff).ram(); - map(0xe800, 0xefff).ram().w(this, FUNC(goindol_state::goindol_fg_videoram_w)).share("fg_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(goindol_state::goindol_fg_videoram_w)).share("fg_videoram"); map(0xf000, 0xf000).portr("DSW1"); - map(0xf422, 0xf422).r(this, FUNC(goindol_state::prot_f422_r)); + map(0xf422, 0xf422).r(FUNC(goindol_state::prot_f422_r)); map(0xf800, 0xf800).portr("DSW2"); - map(0xfc44, 0xfc44).w(this, FUNC(goindol_state::prot_fc44_w)); - map(0xfc66, 0xfc66).w(this, FUNC(goindol_state::prot_fc66_w)); - map(0xfcb0, 0xfcb0).w(this, FUNC(goindol_state::prot_fcb0_w)); - map(0xfd99, 0xfd99).w(this, FUNC(goindol_state::prot_fd99_w)); + map(0xfc44, 0xfc44).w(FUNC(goindol_state::prot_fc44_w)); + map(0xfc66, 0xfc66).w(FUNC(goindol_state::prot_fc66_w)); + map(0xfcb0, 0xfcb0).w(FUNC(goindol_state::prot_fcb0_w)); + map(0xfd99, 0xfd99).w(FUNC(goindol_state::prot_fd99_w)); } void goindol_state::sound_map(address_map &map) diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp index 099e9b6688a..ea64c198d67 100644 --- a/src/mame/drivers/goldngam.cpp +++ b/src/mame/drivers/goldngam.cpp @@ -335,7 +335,7 @@ void goldngam_state::swisspkr_map(address_map &map) map(0x500208, 0x500209).nopr(); //? map(0x50020c, 0x50020d).nopr(); //? map(0x500300, 0x500301).nopr(); //? - map(0x50030f, 0x50030f).r(this, FUNC(goldngam_state::unk_r)); + map(0x50030f, 0x50030f).r(FUNC(goldngam_state::unk_r)); map(0x501500, 0x501501).nopw(); //? map(0x503000, 0x503001).ram(); //int ack ? map(0x503002, 0x503003).ram(); //int ack ? diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index ea15658b6f2..85ca75d688a 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1849,8 +1849,8 @@ void goldnpkr_state::goldnpkr_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x7fff).rom(); /* superdbl uses 0x2000..0x3fff address space */ } @@ -1862,8 +1862,8 @@ void goldnpkr_state::pottnpkr_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x3fff).rom(); } @@ -1875,8 +1875,8 @@ void goldnpkr_state::witchcrd_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x2000).portr("SW2"); // map(0x2108, 0x210b).noprw(); /* unknown 40-pin device */ map(0x2800, 0x2fff).ram(); @@ -1901,8 +1901,8 @@ void goldnpkr_state::witchcrd_falcon_map(address_map &map) map(0x0000, 0x07ff).ram().share("nvram"); /* battery backed RAM */ map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x2000).portr("SW2"); map(0x2100, 0x2100).w("crtc", FUNC(mc6845_device::address_w)); map(0x2101, 0x2101).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); @@ -1917,8 +1917,8 @@ void goldnpkr_state::wildcard_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x2000).portr("SW2"); map(0x2200, 0x27ff).rom(); /* for VK set */ map(0x2800, 0x2fff).ram(); /* for VK set */ @@ -1939,8 +1939,8 @@ void goldnpkr_state::wcrdxtnd_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x2000).portr("SW2"); map(0x2200, 0x27ff).rom(); /* for VK hardware */ map(0x2800, 0x2fff).ram().share("nvram"); /* Dallas ds1210 + battery backed RAM */ @@ -1959,8 +1959,8 @@ void goldnpkr_state::wildcrdb_map(address_map &map) map(0x0000, 0x07ff).ram().share("nvram"); /* battery backed RAM */ map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x2000).portr("SW2"); map(0x2100, 0x2100).w("crtc", FUNC(mc6845_device::address_w)); map(0x2101, 0x2101).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); @@ -1997,8 +1997,8 @@ void goldnpkr_state::genie_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x17ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1fff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x17ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1fff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x3fff).rom(); } @@ -2011,8 +2011,8 @@ void goldnpkr_state::mondial_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x4000, 0x7fff).bankr("bank1"); } @@ -2024,8 +2024,8 @@ void goldnpkr_state::bchancep_map(address_map &map) map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x13ff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram"); map(0x2000, 0x7fff).rom(); } @@ -4631,17 +4631,17 @@ void blitz_state::megadpkr_map(address_map &map) map(0x10f4, 0x10f7).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x10f8, 0x10fb).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); */ - map(0x1000, 0x13ff).ram().w(this, FUNC(blitz_state::goldnpkr_videoram_w)).share("videoram"); - map(0x1800, 0x1bff).ram().w(this, FUNC(blitz_state::goldnpkr_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(blitz_state::goldnpkr_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(blitz_state::goldnpkr_colorram_w)).share("colorram"); map(0x4000, 0x7fff).rw(m_bankdev, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); - map(0x8000, 0xbfff).nopr().w(this, FUNC(blitz_state::mcu_command_w)); + map(0x8000, 0xbfff).nopr().w(FUNC(blitz_state::mcu_command_w)); map(0xc000, 0xffff).rom(); } void blitz_state::megadpkr_banked_map(address_map &map) { - map(0x00000, 0x07fff).r(this, FUNC(blitz_state::cpubank_decrypt_r)); + map(0x00000, 0x07fff).r(FUNC(blitz_state::cpubank_decrypt_r)); map(0x08000, 0x087ff).rw("timekpr", FUNC(m48t02_device::read), FUNC(m48t02_device::write)); } diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 00137e21ff5..97beb30255e 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -335,11 +335,11 @@ void goldstar_state::goldstar_map(address_map &map) map(0x0000, 0xb7ff).rom(); map(0xb800, 0xbfff).ram().share("nvram"); map(0xc000, 0xc7ff).rom(); - map(0xc800, 0xcfff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0xd800, 0xd9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xe000, 0xe1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xe800, 0xe9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xc800, 0xcfff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xd000, 0xd7ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xd800, 0xd9ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xe000, 0xe1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xe800, 0xe9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf040, 0xf07f).ram().share("reel1_scroll"); map(0xf080, 0xf0bf).ram().share("reel2_scroll"); map(0xf0c0, 0xf0ff).ram().share("reel3_scroll"); @@ -356,11 +356,11 @@ void goldstar_state::goldstar_map(address_map &map) map(0xf820, 0xf820).portr("DSW2"); map(0xf830, 0xf830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xf840, 0xf840).w("aysnd", FUNC(ay8910_device::address_w)); - map(0xf900, 0xf900).w(this, FUNC(goldstar_state::p1_lamps_w)); - map(0xfa00, 0xfa00).w(this, FUNC(goldstar_state::goldstar_fa00_w)); + map(0xf900, 0xf900).w(FUNC(goldstar_state::p1_lamps_w)); + map(0xfa00, 0xfa00).w(FUNC(goldstar_state::goldstar_fa00_w)); map(0xfb00, 0xfb00).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xfd00, 0xfdff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xfe00, 0xfe00).rw(this, FUNC(goldstar_state::protection_r), FUNC(goldstar_state::protection_w)); + map(0xfe00, 0xfe00).rw(FUNC(goldstar_state::protection_r), FUNC(goldstar_state::protection_w)); } void goldstar_state::goldstar_readport(address_map &map) @@ -374,8 +374,8 @@ void sanghopm_state::star100_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc800, 0xcfff).ram().w(this, FUNC(sanghopm_state::fg_vidram_w)).share("fg_vidram"); // videoram 1 - map(0xd000, 0xd7ff).ram().w(this, FUNC(sanghopm_state::fg_atrram_w)).share("fg_atrram"); // atrram 1 + map(0xc800, 0xcfff).ram().w(FUNC(sanghopm_state::fg_vidram_w)).share("fg_vidram"); // videoram 1 + map(0xd000, 0xd7ff).ram().w(FUNC(sanghopm_state::fg_atrram_w)).share("fg_atrram"); // atrram 1 map(0xd800, 0xd83f).ram().share("reel1_scroll"); map(0xd840, 0xd9ff).ram(); @@ -384,17 +384,17 @@ void sanghopm_state::star100_map(address_map &map) map(0xdc00, 0xdc3f).ram().share("reel3_scroll"); map(0xdc40, 0xdfff).ram(); - map(0xe000, 0xe1ff).ram().w(this, FUNC(sanghopm_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xe200, 0xe3ff).ram().w(this, FUNC(sanghopm_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xe400, 0xe5ff).ram().w(this, FUNC(sanghopm_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xe000, 0xe1ff).ram().w(FUNC(sanghopm_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xe200, 0xe3ff).ram().w(FUNC(sanghopm_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xe400, 0xe5ff).ram().w(FUNC(sanghopm_state::goldstar_reel3_ram_w)).share("reel3_ram"); - map(0xe600, 0xe7ff).ram().w(this, FUNC(sanghopm_state::bg_vidram_w)).share("bg_vidram"); // videoram 2 + map(0xe600, 0xe7ff).ram().w(FUNC(sanghopm_state::bg_vidram_w)).share("bg_vidram"); // videoram 2 - map(0xe800, 0xe9ff).ram().w(this, FUNC(sanghopm_state::reel1_attrram_w)).share("reel1_attrram"); - map(0xea00, 0xebff).ram().w(this, FUNC(sanghopm_state::reel2_attrram_w)).share("reel2_attrram"); - map(0xec00, 0xedff).ram().w(this, FUNC(sanghopm_state::reel3_attrram_w)).share("reel3_attrram"); + map(0xe800, 0xe9ff).ram().w(FUNC(sanghopm_state::reel1_attrram_w)).share("reel1_attrram"); + map(0xea00, 0xebff).ram().w(FUNC(sanghopm_state::reel2_attrram_w)).share("reel2_attrram"); + map(0xec00, 0xedff).ram().w(FUNC(sanghopm_state::reel3_attrram_w)).share("reel3_attrram"); - map(0xee00, 0xefff).ram().w(this, FUNC(sanghopm_state::bg_atrram_w)).share("bg_atrram"); // atrram 2 + map(0xee00, 0xefff).ram().w(FUNC(sanghopm_state::bg_atrram_w)).share("bg_atrram"); // atrram 2 map(0xf000, 0xf7ff).ram().share("nvram"); map(0xf800, 0xffff).ram(); @@ -446,13 +446,13 @@ void sanghopm_state::star100_readport(address_map &map) map(0x20, 0x20).portr("DSW4-0"); // the first 4 bits map to DSW4 1 to 4. map(0x21, 0x21).portr("DSW4-1"); // the first 4 bits map to DSW4 5 to 8. - map(0x24, 0x24).w(this, FUNC(sanghopm_state::coincount_w)); // coin counters. + map(0x24, 0x24).w(FUNC(sanghopm_state::coincount_w)); // coin counters. map(0x25, 0x25).portr("DSW2"); map(0x26, 0x26).portr("DSW3"); map(0xe0, 0xe0).nopw(); // Writing 0's and 1's constantly. Watchdog feeder? - map(0xe1, 0xe1).w(this, FUNC(sanghopm_state::enable_w)); // enable/disable reels register. + map(0xe1, 0xe1).w(FUNC(sanghopm_state::enable_w)); // enable/disable reels register. } @@ -611,11 +611,11 @@ void cb3_state::ncb3_map(address_map &map) map(0x0000, 0xb7ff).rom(); map(0xb800, 0xbfff).ram().share("nvram"); map(0xc000, 0xc7ff).rom(); - map(0xc800, 0xcfff).ram().w(this, FUNC(cb3_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(cb3_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0xd800, 0xd9ff).ram().w(this, FUNC(cb3_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xe000, 0xe1ff).ram().w(this, FUNC(cb3_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xe800, 0xe9ff).ram().w(this, FUNC(cb3_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xc800, 0xcfff).ram().w(FUNC(cb3_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xd000, 0xd7ff).ram().w(FUNC(cb3_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xd800, 0xd9ff).ram().w(FUNC(cb3_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xe000, 0xe1ff).ram().w(FUNC(cb3_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xe800, 0xe9ff).ram().w(FUNC(cb3_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf040, 0xf07f).ram().share("reel1_scroll"); map(0xf080, 0xf0bf).ram().share("reel2_scroll"); map(0xf100, 0xf17f).ram().share("reel3_scroll"); // moved compared to goldstar @@ -623,13 +623,13 @@ void cb3_state::ncb3_map(address_map &map) map(0xf800, 0xf803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports */ map(0xf810, 0xf813).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports */ map(0xf820, 0xf823).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input/Output Ports */ - map(0xf822, 0xf822).w(this, FUNC(cb3_state::goldstar_fa00_w)); // hack (connected to ppi output port?, needed for colour banking) + map(0xf822, 0xf822).w(FUNC(cb3_state::goldstar_fa00_w)); // hack (connected to ppi output port?, needed for colour banking) map(0xf830, 0xf830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xf840, 0xf840).w("aysnd", FUNC(ay8910_device::address_w)); - map(0xf850, 0xf850).w(this, FUNC(cb3_state::p1_lamps_w)); /* Control Set 1 lamps */ - map(0xf860, 0xf860).w(this, FUNC(cb3_state::p2_lamps_w)); /* Control Set 2 lamps */ - map(0xf870, 0xf870).w("snsnd", FUNC(sn76489_device::write)); /* guess... device is initialized, but doesn't seems to be used.*/ + map(0xf850, 0xf850).w(FUNC(cb3_state::p1_lamps_w)); /* Control Set 1 lamps */ + map(0xf860, 0xf860).w(FUNC(cb3_state::p2_lamps_w)); /* Control Set 2 lamps */ + map(0xf870, 0xf870).w("snsnd", FUNC(sn76489_device::command_w)); /* guess... device is initialized, but doesn't seems to be used.*/ } void goldstar_state::ncb3_readwriteport(address_map &map) @@ -640,7 +640,7 @@ void goldstar_state::ncb3_readwriteport(address_map &map) // AM_RANGE(0x06, 0x06) AM_READ(ncb3_unkread_r) // unknown... // AM_RANGE(0x08, 0x08) AM_READ(ncb3_unkread_r) // unknown... map(0x10, 0x10).portr("DSW5"); /* confirmed for ncb3 */ - map(0x81, 0x81).w(this, FUNC(goldstar_state::ncb3_port81_w)); // ---> large writes. + map(0x81, 0x81).w(FUNC(goldstar_state::ncb3_port81_w)); // ---> large writes. } @@ -683,11 +683,11 @@ void goldstar_state::wcherry_map(address_map &map) map(0xc000, 0xc7ff).rom(); /* Video RAM and reels stuff are there just as placeholder, and obviously in wrong offset */ - map(0xc800, 0xcfff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0xd800, 0xd9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xe000, 0xe1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xe800, 0xe9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xc800, 0xcfff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xd000, 0xd7ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xd800, 0xd9ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xe000, 0xe1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xe800, 0xe9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf040, 0xf07f).ram().share("reel1_scroll"); map(0xf080, 0xf0bf).ram().share("reel2_scroll"); map(0xf0c0, 0xf0ff).ram().share("reel3_scroll"); @@ -701,7 +701,7 @@ void goldstar_state::wcherry_map(address_map &map) map(0xf640, 0xf640).w("aysnd", FUNC(ay8910_device::address_w)); map(0xf650, 0xf650).nopw(); // AM_WRITE(output_w) // unknown register: 0x3e map(0xf660, 0xf660).nopw(); // AM_WRITE(output_w) // unknown register: 0x3e - map(0xf670, 0xf670).w("snsnd", FUNC(sn76489_device::write)); /* guess... device is initialized, but doesn't seems to be used.*/ + map(0xf670, 0xf670).w("snsnd", FUNC(sn76489_device::command_w)); /* guess... device is initialized, but doesn't seems to be used.*/ map(0xf800, 0xffff).ram(); } @@ -739,12 +739,12 @@ void goldstar_state::cm_map(address_map &map) map(0xd000, 0xd7ff).ram().share("nvram"); map(0xd800, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xe800, 0xefff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xe000, 0xe7ff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xe800, 0xefff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0xf000, 0xf1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xf200, 0xf3ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xf400, 0xf5ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xf000, 0xf1ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xf200, 0xf3ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xf400, 0xf5ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf600, 0xf7ff).ram(); map(0xf800, 0xf87f).ram().share("reel1_scroll"); @@ -762,12 +762,12 @@ void goldstar_state::nfm_map(address_map &map) map(0xd800, 0xdfff).ram().share("nvram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xe800, 0xefff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xe000, 0xe7ff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xe800, 0xefff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0xf000, 0xf1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xf200, 0xf3ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xf400, 0xf5ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xf000, 0xf1ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xf200, 0xf3ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xf400, 0xf5ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf600, 0xf7ff).ram(); map(0xf800, 0xf87f).ram().share("reel1_scroll"); @@ -811,11 +811,11 @@ void cmaster_state::cm_portmap(address_map &map) map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x04, 0x07).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Inputs */ map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* DIP switches */ - map(0x10, 0x10).w(this, FUNC(cmaster_state::outport0_w)); - map(0x11, 0x11).w(this, FUNC(cmaster_state::cm_coincount_w)); - map(0x12, 0x12).w(this, FUNC(cmaster_state::p1_lamps_w)); - map(0x13, 0x13).w(this, FUNC(cmaster_state::background_col_w)); - map(0x14, 0x14).w(this, FUNC(cmaster_state::girl_scroll_w)); + map(0x10, 0x10).w(FUNC(cmaster_state::outport0_w)); + map(0x11, 0x11).w(FUNC(cmaster_state::cm_coincount_w)); + map(0x12, 0x12).w(FUNC(cmaster_state::p1_lamps_w)); + map(0x13, 0x13).w(FUNC(cmaster_state::background_col_w)); + map(0x14, 0x14).w(FUNC(cmaster_state::girl_scroll_w)); } @@ -833,9 +833,9 @@ void goldstar_state::pkrmast_portmap(address_map &map) map(0x20, 0x20).portr("DSW3-0"); map(0x21, 0x21).portr("DSW3-1"); - map(0x22, 0x22).w(this, FUNC(goldstar_state::p1_lamps_w)); + map(0x22, 0x22).w(FUNC(goldstar_state::p1_lamps_w)); - map(0x24, 0x24).w(this, FUNC(goldstar_state::cm_coincount_w)); + map(0x24, 0x24).w(FUNC(goldstar_state::cm_coincount_w)); map(0x25, 0x25).portr("DSW1"); map(0x26, 0x26).portr("DSW2"); @@ -860,10 +860,10 @@ void cmaster_state::amcoe1_portmap(address_map &map) map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x04, 0x07).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports */ map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* DIP switches */ - map(0x10, 0x10).w(this, FUNC(cmaster_state::outport0_w)); - map(0x11, 0x11).w(this, FUNC(cmaster_state::cm_coincount_w)); - map(0x12, 0x12).w(this, FUNC(cmaster_state::p1_lamps_w)); - map(0x13, 0x13).w(this, FUNC(cmaster_state::background_col_w)); + map(0x10, 0x10).w(FUNC(cmaster_state::outport0_w)); + map(0x11, 0x11).w(FUNC(cmaster_state::cm_coincount_w)); + map(0x12, 0x12).w(FUNC(cmaster_state::p1_lamps_w)); + map(0x13, 0x13).w(FUNC(cmaster_state::background_col_w)); map(0x20, 0x20).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -874,10 +874,10 @@ void cmaster_state::amcoe2_portmap(address_map &map) map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x04, 0x07).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports */ map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* DIP switches */ - map(0x10, 0x10).w(this, FUNC(cmaster_state::outport0_w)); - map(0x11, 0x11).w(this, FUNC(cmaster_state::cm_coincount_w)); - map(0x12, 0x12).w(this, FUNC(cmaster_state::p1_lamps_w)); - map(0x13, 0x13).w(this, FUNC(cmaster_state::background_col_w)); + map(0x10, 0x10).w(FUNC(cmaster_state::outport0_w)); + map(0x11, 0x11).w(FUNC(cmaster_state::cm_coincount_w)); + map(0x12, 0x12).w(FUNC(cmaster_state::p1_lamps_w)); + map(0x13, 0x13).w(FUNC(cmaster_state::background_col_w)); } @@ -885,11 +885,11 @@ void goldstar_state::lucky8_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0x9800, 0x99ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xa000, 0xa1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xa800, 0xa9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0x8800, 0x8fff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0x9000, 0x97ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0x9800, 0x99ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xa800, 0xa9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xb040, 0xb07f).ram().share("reel1_scroll"); map(0xb080, 0xb0bf).ram().share("reel2_scroll"); map(0xb100, 0xb17f).ram().share("reel3_scroll"); @@ -899,9 +899,9 @@ void goldstar_state::lucky8_map(address_map &map) map(0xb820, 0xb823).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input/Output Ports */ map(0xb830, 0xb830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ - map(0xb850, 0xb850).w(this, FUNC(goldstar_state::p1_lamps_w)); - map(0xb860, 0xb860).w(this, FUNC(goldstar_state::p2_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ + map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); + map(0xb860, 0xb860).w(FUNC(goldstar_state::p2_lamps_w)); + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ map(0xc000, 0xf7ff).rom(); // could be used by some sets like super972. map(0xf800, 0xffff).ram(); } @@ -910,14 +910,14 @@ void goldstar_state::flaming7_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0x8800, 0x8fff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0x9000, 0x97ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0x9800, 0x99ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0x9800, 0x99ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); // AM_RANGE(0x9a00, 0x9fff) AM_RAM - map(0xa000, 0xa1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); // AM_RANGE(0xa200, 0xa7ff) AM_RAM - map(0xa800, 0xa9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xa800, 0xa9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); // AM_RANGE(0xaa00, 0xafff) AM_RAM // AM_RANGE(0xb000, 0xb03f) AM_RAM @@ -932,9 +932,9 @@ void goldstar_state::flaming7_map(address_map &map) map(0xb820, 0xb823).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input/Output Ports (90) */ map(0xb830, 0xb830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ - map(0xb850, 0xb850).w(this, FUNC(goldstar_state::p1_lamps_w)); - map(0xb860, 0xb860).w(this, FUNC(goldstar_state::p2_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ + map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); + map(0xb860, 0xb860).w(FUNC(goldstar_state::p2_lamps_w)); + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ // AM_RANGE(0xc000, 0xd3ff) AM_RAM map(0xf800, 0xffff).ram(); } @@ -970,11 +970,11 @@ void goldstar_state::mbstar_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0x9800, 0x99ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xa000, 0xa1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xa800, 0xa9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0x8800, 0x8fff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0x9000, 0x97ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0x9800, 0x99ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xa800, 0xa9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xb040, 0xb07f).ram().share("reel1_scroll"); map(0xb080, 0xb0bf).ram().share("reel2_scroll"); map(0xb100, 0xb17f).ram().share("reel3_scroll"); @@ -984,9 +984,9 @@ void goldstar_state::mbstar_map(address_map &map) map(0xb820, 0xb823).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input/Output Ports */ map(0xb830, 0xb830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ - map(0xb850, 0xb850).w(this, FUNC(goldstar_state::p1_lamps_w)); - map(0xb860, 0xb860).w(this, FUNC(goldstar_state::p2_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ + map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); + map(0xb860, 0xb860).w(FUNC(goldstar_state::p2_lamps_w)); + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ map(0xc000, 0xf7ff).rom(); map(0xf800, 0xffff).ram(); } @@ -1023,11 +1023,11 @@ void wingco_state::magodds_map(address_map &map) map(0x0000, 0x7fff).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? map(0x8000, 0x87ff).ram().share("nvram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(wingco_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(wingco_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0x9800, 0x99ff).ram().w(this, FUNC(wingco_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xa000, 0xa1ff).ram().w(this, FUNC(wingco_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xa900, 0xaaff).ram().w(this, FUNC(wingco_state::goldstar_reel3_ram_w)).share("reel3_ram"); // +0x100 compared to lucky8 + map(0x8800, 0x8fff).ram().w(FUNC(wingco_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0x9000, 0x97ff).ram().w(FUNC(wingco_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0x9800, 0x99ff).ram().w(FUNC(wingco_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(wingco_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xa900, 0xaaff).ram().w(FUNC(wingco_state::goldstar_reel3_ram_w)).share("reel3_ram"); // +0x100 compared to lucky8 map(0xb040, 0xb07f).ram().share("reel1_scroll"); map(0xb080, 0xb0bf).ram().share("reel2_scroll"); map(0xb100, 0xb17f).ram().share("reel3_scroll"); @@ -1037,9 +1037,9 @@ void wingco_state::magodds_map(address_map &map) map(0xb820, 0xb823).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input/Output Ports */ map(0xb830, 0xb830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ - map(0xb850, 0xb850).w(this, FUNC(wingco_state::magodds_outb850_w)); /* lamps */ - map(0xb860, 0xb860).w(this, FUNC(wingco_state::magodds_outb860_w)); /* watchdog */ - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ + map(0xb850, 0xb850).w(FUNC(wingco_state::magodds_outb850_w)); /* lamps */ + map(0xb860, 0xb860).w(FUNC(wingco_state::magodds_outb860_w)); /* watchdog */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ map(0xc000, 0xffff).rom().region("maincpu", 0xc000); } @@ -1047,11 +1047,11 @@ void goldstar_state::kkotnoli_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); /* definitely no NVRAM */ - map(0x8800, 0x8fff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0x9800, 0x99ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xa000, 0xa1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xa800, 0xa9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0x8800, 0x8fff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0x9000, 0x97ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0x9800, 0x99ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xa800, 0xa9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xb040, 0xb07f).ram().share("reel1_scroll"); map(0xb080, 0xb0bf).ram().share("reel2_scroll"); map(0xb100, 0xb17f).ram().share("reel3_scroll"); @@ -1061,8 +1061,8 @@ void goldstar_state::kkotnoli_map(address_map &map) map(0xb820, 0xb823).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Port */ map(0xb830, 0xb830).nopw(); /* no ay8910 */ map(0xb840, 0xb840).nopw(); /* no ay8910 */ - map(0xb850, 0xb850).w(this, FUNC(goldstar_state::p1_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ + map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ map(0xf800, 0xffff).ram(); } @@ -1087,11 +1087,11 @@ void goldstar_state::ladylinr_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0x9800, 0x99ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xa000, 0xa1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xa800, 0xa9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0x8800, 0x8fff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0x9000, 0x97ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0x9800, 0x99ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xa800, 0xa9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xb040, 0xb07f).ram().share("reel1_scroll"); map(0xb080, 0xb0bf).ram().share("reel2_scroll"); map(0xb100, 0xb17f).ram().share("reel3_scroll"); @@ -1101,7 +1101,7 @@ void goldstar_state::ladylinr_map(address_map &map) map(0xb830, 0xb830).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... unused? */ map(0xb840, 0xb840).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb850, 0xb850).nopw(); /* just turn off the lamps, if exist */ - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ map(0xf800, 0xffff).ram(); } @@ -1109,11 +1109,11 @@ void goldstar_state::wcat3_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0x9800, 0x99ff).ram().w(this, FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xa000, 0xa1ff).ram().w(this, FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xa800, 0xa9ff).ram().w(this, FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0x8800, 0x8fff).ram().w(FUNC(goldstar_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0x9000, 0x97ff).ram().w(FUNC(goldstar_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0x9800, 0x99ff).ram().w(FUNC(goldstar_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(goldstar_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xa800, 0xa9ff).ram().w(FUNC(goldstar_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xb040, 0xb07f).ram().share("reel1_scroll"); map(0xb080, 0xb0bf).ram().share("reel2_scroll"); map(0xb100, 0xb17f).ram().share("reel3_scroll"); @@ -1123,8 +1123,8 @@ void goldstar_state::wcat3_map(address_map &map) map(0xb820, 0xb823).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input/Output Ports */ map(0xb830, 0xb830).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xb840, 0xb840).w("aysnd", FUNC(ay8910_device::address_w)); /* no sound... only use both ports for DSWs */ - map(0xb850, 0xb850).w(this, FUNC(goldstar_state::p1_lamps_w)); - map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::write)); /* sound */ + map(0xb850, 0xb850).w(FUNC(goldstar_state::p1_lamps_w)); + map(0xb870, 0xb870).w("snsnd", FUNC(sn76489_device::command_w)); /* sound */ // AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_3", i8255_device, read, write) /* Other PPI initialized? */ map(0xd000, 0xefff).rom(); map(0xf000, 0xffff).ram(); @@ -1145,16 +1145,16 @@ void unkch_state::unkch_map(address_map &map) map(0xd900, 0xd93f).ram().share("reel3_scroll"); map(0xdfc0, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(unkch_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xe800, 0xefff).ram().w(this, FUNC(unkch_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xe000, 0xe7ff).ram().w(FUNC(unkch_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xe800, 0xefff).ram().w(FUNC(unkch_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0xf000, 0xf1ff).ram().w(this, FUNC(unkch_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xf200, 0xf3ff).ram().w(this, FUNC(unkch_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xf400, 0xf5ff).ram().w(this, FUNC(unkch_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xf000, 0xf1ff).ram().w(FUNC(unkch_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xf200, 0xf3ff).ram().w(FUNC(unkch_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xf400, 0xf5ff).ram().w(FUNC(unkch_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf600, 0xf7ff).ram(); - map(0xf800, 0xf9ff).ram().w(this, FUNC(unkch_state::reel1_attrram_w)).share("reel1_attrram"); - map(0xfa00, 0xfbff).ram().w(this, FUNC(unkch_state::reel2_attrram_w)).share("reel2_attrram"); - map(0xfc00, 0xfdff).ram().w(this, FUNC(unkch_state::reel3_attrram_w)).share("reel3_attrram"); + map(0xf800, 0xf9ff).ram().w(FUNC(unkch_state::reel1_attrram_w)).share("reel1_attrram"); + map(0xfa00, 0xfbff).ram().w(FUNC(unkch_state::reel2_attrram_w)).share("reel2_attrram"); + map(0xfc00, 0xfdff).ram().w(FUNC(unkch_state::reel3_attrram_w)).share("reel3_attrram"); map(0xfe00, 0xffff).ram(); } @@ -1225,9 +1225,9 @@ void unkch_state::unkch_portmap(address_map &map) { map.global_mask(0xff); - map(0x01, 0x01).w(this, FUNC(unkch_state::coincount_w)); - map(0x02, 0x02).w(this, FUNC(unkch_state::unkcm_0x02_w)); - map(0x03, 0x03).w(this, FUNC(unkch_state::unkcm_0x03_w)); + map(0x01, 0x01).w(FUNC(unkch_state::coincount_w)); + map(0x02, 0x02).w(FUNC(unkch_state::unkcm_0x02_w)); + map(0x03, 0x03).w(FUNC(unkch_state::unkcm_0x03_w)); map(0x08, 0x08).portr("IN0"); map(0x09, 0x09).portr("IN1"); @@ -1252,16 +1252,16 @@ void unkch_state::megaline_map(address_map &map) map(0xd900, 0xd93f).ram().share("reel3_scroll"); map(0xdfc0, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(unkch_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xe800, 0xefff).ram().w(this, FUNC(unkch_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xe000, 0xe7ff).ram().w(FUNC(unkch_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xe800, 0xefff).ram().w(FUNC(unkch_state::goldstar_fg_atrram_w)).share("fg_atrram"); - map(0xf000, 0xf1ff).ram().w(this, FUNC(unkch_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xf200, 0xf3ff).ram().w(this, FUNC(unkch_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xf400, 0xf5ff).ram().w(this, FUNC(unkch_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xf000, 0xf1ff).ram().w(FUNC(unkch_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xf200, 0xf3ff).ram().w(FUNC(unkch_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xf400, 0xf5ff).ram().w(FUNC(unkch_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf600, 0xf7ff).ram(); - map(0xf800, 0xf9ff).ram().w(this, FUNC(unkch_state::reel1_attrram_w)).share("reel1_attrram"); - map(0xfa00, 0xfbff).ram().w(this, FUNC(unkch_state::reel2_attrram_w)).share("reel2_attrram"); - map(0xfc00, 0xfdff).ram().w(this, FUNC(unkch_state::reel3_attrram_w)).share("reel3_attrram"); + map(0xf800, 0xf9ff).ram().w(FUNC(unkch_state::reel1_attrram_w)).share("reel1_attrram"); + map(0xfa00, 0xfbff).ram().w(FUNC(unkch_state::reel2_attrram_w)).share("reel2_attrram"); + map(0xfc00, 0xfdff).ram().w(FUNC(unkch_state::reel3_attrram_w)).share("reel3_attrram"); map(0xfe00, 0xffff).ram(); } @@ -1274,9 +1274,9 @@ void unkch_state::megaline_map(address_map &map) void goldstar_state::megaline_portmap(address_map &map) { map.global_mask(0xff); - map(0xa0, 0xa0).w("sn1", FUNC(sn76489_device::write)); /* SN76489 #1 */ - map(0xc0, 0xc0).w("sn2", FUNC(sn76489_device::write)); /* SN76489 #2 */ - map(0xe0, 0xe0).w("sn3", FUNC(sn76489_device::write)); /* SN76489 #3 */ + map(0xa0, 0xa0).w("sn1", FUNC(sn76489_device::command_w)); /* SN76489 #1 */ + map(0xc0, 0xc0).w("sn2", FUNC(sn76489_device::command_w)); /* SN76489 #2 */ + map(0xe0, 0xe0).w("sn3", FUNC(sn76489_device::command_w)); /* SN76489 #3 */ map(0x60, 0x60).w("aysnd", FUNC(ay8910_device::address_w)); /* AY8910 control? */ map(0x80, 0x80).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); /* AY8910 Input? */ // AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_device, data_r) @@ -1292,21 +1292,21 @@ void unkch_state::bonusch_map(address_map &map) map(0xd800, 0xdfff).ram(); //AM_SHARE("nvram") - map(0xe000, 0xe7ff).ram().w(this, FUNC(unkch_state::goldstar_fg_vidram_w)).share("fg_vidram"); - map(0xe800, 0xefff).ram().w(this, FUNC(unkch_state::goldstar_fg_atrram_w)).share("fg_atrram"); + map(0xe000, 0xe7ff).ram().w(FUNC(unkch_state::goldstar_fg_vidram_w)).share("fg_vidram"); + map(0xe800, 0xefff).ram().w(FUNC(unkch_state::goldstar_fg_atrram_w)).share("fg_atrram"); /* just placeholders */ - map(0xf000, 0xf1ff).ram().w(this, FUNC(unkch_state::goldstar_reel1_ram_w)).share("reel1_ram"); - map(0xf200, 0xf3ff).ram().w(this, FUNC(unkch_state::goldstar_reel2_ram_w)).share("reel2_ram"); - map(0xf400, 0xf5ff).ram().w(this, FUNC(unkch_state::goldstar_reel3_ram_w)).share("reel3_ram"); + map(0xf000, 0xf1ff).ram().w(FUNC(unkch_state::goldstar_reel1_ram_w)).share("reel1_ram"); + map(0xf200, 0xf3ff).ram().w(FUNC(unkch_state::goldstar_reel2_ram_w)).share("reel2_ram"); + map(0xf400, 0xf5ff).ram().w(FUNC(unkch_state::goldstar_reel3_ram_w)).share("reel3_ram"); map(0xf640, 0xf67f).ram().share("reel1_scroll"); map(0xf680, 0xf6bf).ram().share("reel2_scroll"); map(0xf700, 0xf73f).ram().share("reel3_scroll"); - map(0xf800, 0xf9ff).ram().w(this, FUNC(unkch_state::reel1_attrram_w)).share("reel1_attrram"); - map(0xfa00, 0xfbff).ram().w(this, FUNC(unkch_state::reel2_attrram_w)).share("reel2_attrram"); - map(0xfc00, 0xfdff).ram().w(this, FUNC(unkch_state::reel3_attrram_w)).share("reel3_attrram"); + map(0xf800, 0xf9ff).ram().w(FUNC(unkch_state::reel1_attrram_w)).share("reel1_attrram"); + map(0xfa00, 0xfbff).ram().w(FUNC(unkch_state::reel2_attrram_w)).share("reel2_attrram"); + map(0xfc00, 0xfdff).ram().w(FUNC(unkch_state::reel3_attrram_w)).share("reel3_attrram"); } /* Bonus Chance W-8 @@ -1331,10 +1331,10 @@ void goldstar_state::bonusch_portmap(address_map &map) map.global_mask(0xff); map(0x10, 0x10).portr("IN0"); map(0x20, 0x20).portr("IN1"); - map(0x50, 0x50).w("sn1", FUNC(sn76489_device::write)); /* SN76489 #1 */ - map(0x51, 0x51).w("sn2", FUNC(sn76489_device::write)); /* SN76489 #2 */ - map(0x52, 0x52).w("sn3", FUNC(sn76489_device::write)); /* SN76489 #3 */ - map(0x53, 0x53).w("sn4", FUNC(sn76489_device::write)); /* SN76489 #4 */ + map(0x50, 0x50).w("sn1", FUNC(sn76489_device::command_w)); /* SN76489 #1 */ + map(0x51, 0x51).w("sn2", FUNC(sn76489_device::command_w)); /* SN76489 #2 */ + map(0x52, 0x52).w("sn3", FUNC(sn76489_device::command_w)); /* SN76489 #3 */ + map(0x53, 0x53).w("sn4", FUNC(sn76489_device::command_w)); /* SN76489 #4 */ map(0x60, 0x60).portr("IN3"); } diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp index 6e7b157f61a..ca1c4cf4f8a 100644 --- a/src/mame/drivers/gomoku.cpp +++ b/src/mame/drivers/gomoku.cpp @@ -49,13 +49,13 @@ void gomoku_state::gomoku_map(address_map &map) { map(0x0000, 0x47ff).rom(); map(0x4800, 0x4fff).ram(); - map(0x5000, 0x53ff).ram().w(this, FUNC(gomoku_state::gomoku_videoram_w)).share("videoram"); - map(0x5400, 0x57ff).ram().w(this, FUNC(gomoku_state::gomoku_colorram_w)).share("colorram"); - map(0x5800, 0x58ff).ram().w(this, FUNC(gomoku_state::gomoku_bgram_w)).share("bgram"); + map(0x5000, 0x53ff).ram().w(FUNC(gomoku_state::gomoku_videoram_w)).share("videoram"); + map(0x5400, 0x57ff).ram().w(FUNC(gomoku_state::gomoku_colorram_w)).share("colorram"); + map(0x5800, 0x58ff).ram().w(FUNC(gomoku_state::gomoku_bgram_w)).share("bgram"); map(0x6000, 0x601f).w("gomoku", FUNC(gomoku_sound_device::sound1_w)); map(0x6800, 0x681f).w("gomoku", FUNC(gomoku_sound_device::sound2_w)); map(0x7000, 0x7007).w("latch", FUNC(ls259_device::write_d1)); - map(0x7800, 0x7807).r(this, FUNC(gomoku_state::input_port_r)); + map(0x7800, 0x7807).r(FUNC(gomoku_state::input_port_r)); map(0x7800, 0x7800).nopw(); } diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp index 77a45f3826c..fcf3e5d8026 100644 --- a/src/mame/drivers/good.cpp +++ b/src/mame/drivers/good.cpp @@ -127,8 +127,8 @@ void good_state::good_map(address_map &map) map(0x800000, 0x8007ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x820000, 0x820fff).ram().w(this, FUNC(good_state::fg_tilemapram_w)).share("fg_tilemapram"); - map(0x822000, 0x822fff).ram().w(this, FUNC(good_state::bg_tilemapram_w)).share("bg_tilemapram"); + map(0x820000, 0x820fff).ram().w(FUNC(good_state::fg_tilemapram_w)).share("fg_tilemapram"); + map(0x822000, 0x822fff).ram().w(FUNC(good_state::bg_tilemapram_w)).share("bg_tilemapram"); map(0xff0000, 0xffefff).ram(); } diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index 7e654567063..099e0cbd73c 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -440,12 +440,12 @@ WRITE16_MEMBER(goodejan_state::mahjong_panel_w) void goodejan_state::goodejan_map(address_map &map) { map(0x00000, 0x0afff).ram(); - map(0x0c000, 0x0c7ff).ram().w(this, FUNC(goodejan_state::seibucrtc_sc0vram_w)).share("sc0_vram"); - map(0x0c800, 0x0cfff).ram().w(this, FUNC(goodejan_state::seibucrtc_sc3vram_w)).share("sc3_vram"); + map(0x0c000, 0x0c7ff).ram().w(FUNC(goodejan_state::seibucrtc_sc0vram_w)).share("sc0_vram"); + map(0x0c800, 0x0cfff).ram().w(FUNC(goodejan_state::seibucrtc_sc3vram_w)).share("sc3_vram"); map(0x0d000, 0x0dfff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /*Guess: these two aren't used/initialized at all.*/ - map(0x0e000, 0x0e7ff).ram().w(this, FUNC(goodejan_state::seibucrtc_sc1vram_w)).share("sc1_vram"); - map(0x0e800, 0x0efff).ram().w(this, FUNC(goodejan_state::seibucrtc_sc2vram_w)).share("sc2_vram"); + map(0x0e000, 0x0e7ff).ram().w(FUNC(goodejan_state::seibucrtc_sc1vram_w)).share("sc1_vram"); + map(0x0e800, 0x0efff).ram().w(FUNC(goodejan_state::seibucrtc_sc2vram_w)).share("sc2_vram"); map(0x0f800, 0x0ffff).ram().share("sprite_ram"); map(0xc0000, 0xfffff).rom(); } @@ -453,12 +453,12 @@ void goodejan_state::goodejan_map(address_map &map) /* totmejan CRTC is at 8000-804f,goodejan is at 8000-807f */ void goodejan_state::common_io_map(address_map &map) { - map(0x9000, 0x9001).w(this, FUNC(goodejan_state::gfxbank_w)); + map(0x9000, 0x9001).w(FUNC(goodejan_state::gfxbank_w)); map(0xb000, 0xb003).nopw(); - map(0xb004, 0xb005).w(this, FUNC(goodejan_state::mahjong_panel_w)); + map(0xb004, 0xb005).w(FUNC(goodejan_state::mahjong_panel_w)); map(0xc000, 0xc001).portr("DSW1"); - map(0xc002, 0xc003).r(this, FUNC(goodejan_state::mahjong_panel_r)); + map(0xc002, 0xc003).r(FUNC(goodejan_state::mahjong_panel_r)); map(0xc004, 0xc005).portr("DSW2"); // switches map(0xd000, 0xd00f).rw("seibu_sound", FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); } diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp index 4328a8b8b53..ce25c4c57e9 100644 --- a/src/mame/drivers/gotcha.cpp +++ b/src/mame/drivers/gotcha.cpp @@ -95,20 +95,20 @@ void gotcha_state::gotcha_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100001, 0x100001).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x100002, 0x100003).w(this, FUNC(gotcha_state::gotcha_lamps_w)); - map(0x100004, 0x100004).w(this, FUNC(gotcha_state::gotcha_oki_bank_w)); + map(0x100002, 0x100003).w(FUNC(gotcha_state::gotcha_lamps_w)); + map(0x100004, 0x100004).w(FUNC(gotcha_state::gotcha_oki_bank_w)); map(0x120000, 0x12ffff).ram(); map(0x140000, 0x1405ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x160000, 0x1607ff).ram().share("spriteram"); map(0x180000, 0x180001).portr("INPUTS"); map(0x180002, 0x180003).portr("SYSTEM"); map(0x180004, 0x180005).portr("DSW"); - map(0x300000, 0x300001).w(this, FUNC(gotcha_state::gotcha_gfxbank_select_w)); - map(0x300002, 0x300009).w(this, FUNC(gotcha_state::gotcha_scroll_w)); + map(0x300000, 0x300001).w(FUNC(gotcha_state::gotcha_gfxbank_select_w)); + map(0x300002, 0x300009).w(FUNC(gotcha_state::gotcha_scroll_w)); // { 0x30000c, 0x30000d, - map(0x30000e, 0x30000f).w(this, FUNC(gotcha_state::gotcha_gfxbank_w)); - map(0x320000, 0x320fff).w(this, FUNC(gotcha_state::gotcha_fgvideoram_w)).share("fgvideoram"); - map(0x322000, 0x322fff).w(this, FUNC(gotcha_state::gotcha_bgvideoram_w)).share("bgvideoram"); + map(0x30000e, 0x30000f).w(FUNC(gotcha_state::gotcha_gfxbank_w)); + map(0x320000, 0x320fff).w(FUNC(gotcha_state::gotcha_fgvideoram_w)).share("fgvideoram"); + map(0x322000, 0x322fff).w(FUNC(gotcha_state::gotcha_bgvideoram_w)).share("bgvideoram"); } diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 5ed47353714..b9ec037e753 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -755,14 +755,14 @@ void gottlieb_state::reactor_map(address_map &map) map.global_mask(0xffff); map(0x0000, 0x1fff).ram(); map(0x2000, 0x20ff).mirror(0x0f00).writeonly().share("spriteram"); /* FRSEL */ - map(0x3000, 0x33ff).mirror(0x0c00).ram().w(this, FUNC(gottlieb_state::gottlieb_videoram_w)).share("videoram"); /* BRSEL */ - map(0x4000, 0x4fff).ram().w(this, FUNC(gottlieb_state::gottlieb_charram_w)).share("charram"); /* BOJRSEL1 */ + map(0x3000, 0x33ff).mirror(0x0c00).ram().w(FUNC(gottlieb_state::gottlieb_videoram_w)).share("videoram"); /* BRSEL */ + map(0x4000, 0x4fff).ram().w(FUNC(gottlieb_state::gottlieb_charram_w)).share("charram"); /* BOJRSEL1 */ /* AM_RANGE(0x5000, 0x5fff) AM_WRITE() */ /* BOJRSEL2 */ - map(0x6000, 0x601f).mirror(0x0fe0).w(this, FUNC(gottlieb_state::gottlieb_paletteram_w)).share("paletteram"); /* COLSEL */ + map(0x6000, 0x601f).mirror(0x0fe0).w(FUNC(gottlieb_state::gottlieb_paletteram_w)).share("paletteram"); /* COLSEL */ map(0x7000, 0x7000).mirror(0x0ff8).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x7001, 0x7001).mirror(0x0ff8).w(this, FUNC(gottlieb_state::gottlieb_analog_reset_w)); /* A1J2 interface */ - map(0x7002, 0x7002).mirror(0x0ff8).w(this, FUNC(gottlieb_state::gottlieb_sh_w)); /* trackball H */ - map(0x7003, 0x7003).mirror(0x0ff8).w(this, FUNC(gottlieb_state::reactor_output_w)); /* trackball V */ + map(0x7001, 0x7001).mirror(0x0ff8).w(FUNC(gottlieb_state::gottlieb_analog_reset_w)); /* A1J2 interface */ + map(0x7002, 0x7002).mirror(0x0ff8).w(FUNC(gottlieb_state::gottlieb_sh_w)); /* trackball H */ + map(0x7003, 0x7003).mirror(0x0ff8).w(FUNC(gottlieb_state::reactor_output_w)); /* trackball V */ map(0x7000, 0x7000).mirror(0x0ff8).portr("DSW"); map(0x7001, 0x7001).mirror(0x0ff8).portr("IN1"); /* buttons */ map(0x7002, 0x7002).mirror(0x0ff8).portr("IN2"); /* trackball H */ @@ -779,13 +779,13 @@ void gottlieb_state::gottlieb_map(address_map &map) map(0x1000, 0x1fff).ram().region("maincpu", 0x1000); /* or ROM */ map(0x2000, 0x2fff).ram().region("maincpu", 0x2000); /* or ROM */ map(0x3000, 0x30ff).mirror(0x0700).writeonly().share("spriteram"); /* FRSEL */ - map(0x3800, 0x3bff).mirror(0x0400).ram().w(this, FUNC(gottlieb_state::gottlieb_videoram_w)).share("videoram"); /* BRSEL */ - map(0x4000, 0x4fff).ram().w(this, FUNC(gottlieb_state::gottlieb_charram_w)).share("charram"); /* BOJRSEL1 */ - map(0x5000, 0x501f).mirror(0x07e0).w(this, FUNC(gottlieb_state::gottlieb_paletteram_w)).share("paletteram"); /* COLSEL */ + map(0x3800, 0x3bff).mirror(0x0400).ram().w(FUNC(gottlieb_state::gottlieb_videoram_w)).share("videoram"); /* BRSEL */ + map(0x4000, 0x4fff).ram().w(FUNC(gottlieb_state::gottlieb_charram_w)).share("charram"); /* BOJRSEL1 */ + map(0x5000, 0x501f).mirror(0x07e0).w(FUNC(gottlieb_state::gottlieb_paletteram_w)).share("paletteram"); /* COLSEL */ map(0x5800, 0x5800).mirror(0x07f8).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x5801, 0x5801).mirror(0x07f8).w(this, FUNC(gottlieb_state::gottlieb_analog_reset_w)); /* A1J2 interface */ - map(0x5802, 0x5802).mirror(0x07f8).w(this, FUNC(gottlieb_state::gottlieb_sh_w)); /* OP20-27 */ - map(0x5803, 0x5803).mirror(0x07f8).w(this, FUNC(gottlieb_state::general_output_w)); /* OP30-37 */ + map(0x5801, 0x5801).mirror(0x07f8).w(FUNC(gottlieb_state::gottlieb_analog_reset_w)); /* A1J2 interface */ + map(0x5802, 0x5802).mirror(0x07f8).w(FUNC(gottlieb_state::gottlieb_sh_w)); /* OP20-27 */ + map(0x5803, 0x5803).mirror(0x07f8).w(FUNC(gottlieb_state::general_output_w)); /* OP30-37 */ /* AM_RANGE(0x5804, 0x5804) AM_MIRROR(0x07f8) AM_WRITE()*/ /* OP40-47 */ map(0x5800, 0x5800).mirror(0x07f8).portr("DSW"); map(0x5801, 0x5801).mirror(0x07f8).portr("IN1"); /* IP10-17 */ diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp index d5d9c10503a..e2780b5863b 100644 --- a/src/mame/drivers/gotya.cpp +++ b/src/mame/drivers/gotya.cpp @@ -75,12 +75,12 @@ void gotya_state::gotya_map(address_map &map) map(0x6000, 0x6000).portr("P1"); map(0x6001, 0x6001).portr("P2"); map(0x6002, 0x6002).portr("DSW"); - map(0x6004, 0x6004).w(this, FUNC(gotya_state::gotya_video_control_w)); - map(0x6005, 0x6005).w(this, FUNC(gotya_state::gotya_soundlatch_w)); + map(0x6004, 0x6004).w(FUNC(gotya_state::gotya_video_control_w)); + map(0x6005, 0x6005).w(FUNC(gotya_state::gotya_soundlatch_w)); map(0x6006, 0x6006).writeonly().share("scroll"); map(0x6007, 0x6007).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xc000, 0xc7ff).ram().w(this, FUNC(gotya_state::gotya_videoram_w)).share("videoram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(gotya_state::gotya_colorram_w)).share("colorram"); + map(0xc000, 0xc7ff).ram().w(FUNC(gotya_state::gotya_videoram_w)).share("videoram"); + map(0xc800, 0xcfff).ram().w(FUNC(gotya_state::gotya_colorram_w)).share("colorram"); map(0xd000, 0xd3df).ram().share("videoram2"); map(0xd3e0, 0xd3ff).ram().share("spriteram"); } diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp index 1ced61edf03..17abd6d8e2f 100644 --- a/src/mame/drivers/goupil.cpp +++ b/src/mame/drivers/goupil.cpp @@ -196,7 +196,7 @@ void goupil_g2_state::goupil_g2_mem(address_map &map) map(0xE871, 0xE871).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0xE8F0, 0xE8FF).rw(m_fdc, FUNC(fd1791_device::read), FUNC(fd1791_device::write)); - map(0xEC00, 0xF3FF).rw(this, FUNC(goupil_g2_state::visu24x80_ram_r), FUNC(goupil_g2_state::visu24x80_ram_w)); + map(0xEC00, 0xF3FF).rw(FUNC(goupil_g2_state::visu24x80_ram_r), FUNC(goupil_g2_state::visu24x80_ram_w)); map(0xF400, 0xF7FF).rom().region("maincpu", 0xF400); // Monitor (MON 1) map(0xF800, 0xFFFF).rom().region("maincpu", 0xF800); // Monitor (MON 2) } diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp index 520f31074ec..03b75a01d5a 100644 --- a/src/mame/drivers/gp2x.cpp +++ b/src/mame/drivers/gp2x.cpp @@ -347,13 +347,13 @@ void gp2x_state::gp2x_map(address_map &map) { map(0x00000000, 0x00007fff).rom(); map(0x01000000, 0x04ffffff).ram().share("ram"); // 64 MB of RAM - map(0x9c000000, 0x9c00001f).rw(this, FUNC(gp2x_state::nand_r), FUNC(gp2x_state::nand_w)); - map(0xc0000a00, 0xc0000a03).r(this, FUNC(gp2x_state::timer_r)); - map(0xc0001208, 0xc000120b).r(this, FUNC(gp2x_state::tx_status_r)); - map(0xc0001210, 0xc0001213).w(this, FUNC(gp2x_state::tx_xmit_w)); - map(0xc0001508, 0xc000150b).r(this, FUNC(gp2x_state::sdcard_r)); - map(0xc0002800, 0xc00029ff).rw(this, FUNC(gp2x_state::gp2x_lcdc_r), FUNC(gp2x_state::gp2x_lcdc_w)); - map(0xc0003a38, 0xc0003a3b).rw(this, FUNC(gp2x_state::nand_ctrl_r), FUNC(gp2x_state::nand_ctrl_w)); + map(0x9c000000, 0x9c00001f).rw(FUNC(gp2x_state::nand_r), FUNC(gp2x_state::nand_w)); + map(0xc0000a00, 0xc0000a03).r(FUNC(gp2x_state::timer_r)); + map(0xc0001208, 0xc000120b).r(FUNC(gp2x_state::tx_status_r)); + map(0xc0001210, 0xc0001213).w(FUNC(gp2x_state::tx_xmit_w)); + map(0xc0001508, 0xc000150b).r(FUNC(gp2x_state::sdcard_r)); + map(0xc0002800, 0xc00029ff).rw(FUNC(gp2x_state::gp2x_lcdc_r), FUNC(gp2x_state::gp2x_lcdc_w)); + map(0xc0003a38, 0xc0003a3b).rw(FUNC(gp2x_state::nand_ctrl_r), FUNC(gp2x_state::nand_ctrl_w)); } static INPUT_PORTS_START( gp2x ) diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp index 9ab0b23b44f..6ea829a7ee6 100644 --- a/src/mame/drivers/gp32.cpp +++ b/src/mame/drivers/gp32.cpp @@ -1628,25 +1628,25 @@ void gp32_state::gp32_map(address_map &map) { map(0x00000000, 0x0007ffff).rom(); map(0x0c000000, 0x0c7fffff).ram().share("s3c240x_ram"); - map(0x14000000, 0x1400003b).rw(this, FUNC(gp32_state::s3c240x_memcon_r), FUNC(gp32_state::s3c240x_memcon_w)); - map(0x14200000, 0x1420005b).rw(this, FUNC(gp32_state::s3c240x_usb_host_r), FUNC(gp32_state::s3c240x_usb_host_w)); - map(0x14400000, 0x14400017).rw(this, FUNC(gp32_state::s3c240x_irq_r), FUNC(gp32_state::s3c240x_irq_w)); - map(0x14600000, 0x1460007b).rw(this, FUNC(gp32_state::s3c240x_dma_r), FUNC(gp32_state::s3c240x_dma_w)); - map(0x14800000, 0x14800017).rw(this, FUNC(gp32_state::s3c240x_clkpow_r), FUNC(gp32_state::s3c240x_clkpow_w)); - map(0x14a00000, 0x14a003ff).rw(this, FUNC(gp32_state::s3c240x_lcd_r), FUNC(gp32_state::s3c240x_lcd_w)); - map(0x14a00400, 0x14a007ff).rw(this, FUNC(gp32_state::s3c240x_lcd_palette_r), FUNC(gp32_state::s3c240x_lcd_palette_w)); - map(0x15000000, 0x1500002b).rw(this, FUNC(gp32_state::s3c240x_uart_0_r), FUNC(gp32_state::s3c240x_uart_0_w)); - map(0x15004000, 0x1500402b).rw(this, FUNC(gp32_state::s3c240x_uart_1_r), FUNC(gp32_state::s3c240x_uart_1_w)); - map(0x15100000, 0x15100043).rw(this, FUNC(gp32_state::s3c240x_pwm_r), FUNC(gp32_state::s3c240x_pwm_w)); - map(0x15200140, 0x152001fb).rw(this, FUNC(gp32_state::s3c240x_usb_device_r), FUNC(gp32_state::s3c240x_usb_device_w)); - map(0x15300000, 0x1530000b).rw(this, FUNC(gp32_state::s3c240x_watchdog_r), FUNC(gp32_state::s3c240x_watchdog_w)); - map(0x15400000, 0x1540000f).rw(this, FUNC(gp32_state::s3c240x_iic_r), FUNC(gp32_state::s3c240x_iic_w)); - map(0x15508000, 0x15508013).rw(this, FUNC(gp32_state::s3c240x_iis_r), FUNC(gp32_state::s3c240x_iis_w)); - map(0x15600000, 0x1560005b).rw(this, FUNC(gp32_state::s3c240x_gpio_r), FUNC(gp32_state::s3c240x_gpio_w)); - map(0x15700040, 0x1570008b).rw(this, FUNC(gp32_state::s3c240x_rtc_r), FUNC(gp32_state::s3c240x_rtc_w)); - map(0x15800000, 0x15800007).rw(this, FUNC(gp32_state::s3c240x_adc_r), FUNC(gp32_state::s3c240x_adc_w)); - map(0x15900000, 0x15900017).rw(this, FUNC(gp32_state::s3c240x_spi_r), FUNC(gp32_state::s3c240x_spi_w)); - map(0x15a00000, 0x15a0003f).rw(this, FUNC(gp32_state::s3c240x_mmc_r), FUNC(gp32_state::s3c240x_mmc_w)); + map(0x14000000, 0x1400003b).rw(FUNC(gp32_state::s3c240x_memcon_r), FUNC(gp32_state::s3c240x_memcon_w)); + map(0x14200000, 0x1420005b).rw(FUNC(gp32_state::s3c240x_usb_host_r), FUNC(gp32_state::s3c240x_usb_host_w)); + map(0x14400000, 0x14400017).rw(FUNC(gp32_state::s3c240x_irq_r), FUNC(gp32_state::s3c240x_irq_w)); + map(0x14600000, 0x1460007b).rw(FUNC(gp32_state::s3c240x_dma_r), FUNC(gp32_state::s3c240x_dma_w)); + map(0x14800000, 0x14800017).rw(FUNC(gp32_state::s3c240x_clkpow_r), FUNC(gp32_state::s3c240x_clkpow_w)); + map(0x14a00000, 0x14a003ff).rw(FUNC(gp32_state::s3c240x_lcd_r), FUNC(gp32_state::s3c240x_lcd_w)); + map(0x14a00400, 0x14a007ff).rw(FUNC(gp32_state::s3c240x_lcd_palette_r), FUNC(gp32_state::s3c240x_lcd_palette_w)); + map(0x15000000, 0x1500002b).rw(FUNC(gp32_state::s3c240x_uart_0_r), FUNC(gp32_state::s3c240x_uart_0_w)); + map(0x15004000, 0x1500402b).rw(FUNC(gp32_state::s3c240x_uart_1_r), FUNC(gp32_state::s3c240x_uart_1_w)); + map(0x15100000, 0x15100043).rw(FUNC(gp32_state::s3c240x_pwm_r), FUNC(gp32_state::s3c240x_pwm_w)); + map(0x15200140, 0x152001fb).rw(FUNC(gp32_state::s3c240x_usb_device_r), FUNC(gp32_state::s3c240x_usb_device_w)); + map(0x15300000, 0x1530000b).rw(FUNC(gp32_state::s3c240x_watchdog_r), FUNC(gp32_state::s3c240x_watchdog_w)); + map(0x15400000, 0x1540000f).rw(FUNC(gp32_state::s3c240x_iic_r), FUNC(gp32_state::s3c240x_iic_w)); + map(0x15508000, 0x15508013).rw(FUNC(gp32_state::s3c240x_iis_r), FUNC(gp32_state::s3c240x_iis_w)); + map(0x15600000, 0x1560005b).rw(FUNC(gp32_state::s3c240x_gpio_r), FUNC(gp32_state::s3c240x_gpio_w)); + map(0x15700040, 0x1570008b).rw(FUNC(gp32_state::s3c240x_rtc_r), FUNC(gp32_state::s3c240x_rtc_w)); + map(0x15800000, 0x15800007).rw(FUNC(gp32_state::s3c240x_adc_r), FUNC(gp32_state::s3c240x_adc_w)); + map(0x15900000, 0x15900017).rw(FUNC(gp32_state::s3c240x_spi_r), FUNC(gp32_state::s3c240x_spi_w)); + map(0x15a00000, 0x15a0003f).rw(FUNC(gp32_state::s3c240x_mmc_r), FUNC(gp32_state::s3c240x_mmc_w)); } static INPUT_PORTS_START( gp32 ) diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index 582f591f03f..37078eb0270 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -325,14 +325,14 @@ void gpworld_state::mainmem(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram().share("sprite_ram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(gpworld_state::palette_write)).share("palette_ram"); /* The memory test reads at 0xc800 */ + map(0xc800, 0xcfff).ram().w(FUNC(gpworld_state::palette_write)).share("palette_ram"); /* The memory test reads at 0xc800 */ map(0xd000, 0xd7ff).ram().share("tile_ram"); - map(0xd800, 0xd800).rw(this, FUNC(gpworld_state::ldp_read), FUNC(gpworld_state::ldp_write)); + map(0xd800, 0xd800).rw(FUNC(gpworld_state::ldp_read), FUNC(gpworld_state::ldp_write)); /* AM_RANGE(0xd801,0xd801) AM_READ(???) */ map(0xda00, 0xda00).portr("INWHEEL"); //8255 here.... /* AM_RANGE(0xda01,0xda01) AM_WRITE(???) */ /* These inputs are interesting - there are writes and reads all over these addr's */ - map(0xda02, 0xda02).w(this, FUNC(gpworld_state::brake_gas_write)); /*bit 0 select gas/brake input */ - map(0xda20, 0xda20).r(this, FUNC(gpworld_state::pedal_in)); + map(0xda02, 0xda02).w(FUNC(gpworld_state::brake_gas_write)); /*bit 0 select gas/brake input */ + map(0xda20, 0xda20).r(FUNC(gpworld_state::pedal_in)); map(0xe000, 0xffff).ram(); /* Potentially not all work RAM? */ } @@ -342,7 +342,7 @@ void gpworld_state::mainmem(address_map &map) void gpworld_state::mainport(address_map &map) { map.global_mask(0xff); - map(0x01, 0x01).w(this, FUNC(gpworld_state::misc_io_write)); + map(0x01, 0x01).w(FUNC(gpworld_state::misc_io_write)); map(0x80, 0x80).portr("IN0"); map(0x81, 0x81).portr("IN1"); map(0x82, 0x82).portr("DSW1"); diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp index 9065b6535eb..64f6ddbdf79 100644 --- a/src/mame/drivers/gradius3.cpp +++ b/src/mame/drivers/gradius3.cpp @@ -154,20 +154,20 @@ void gradius3_state::gradius3_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x040000, 0x043fff).ram(); map(0x080000, 0x080fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x0c0000, 0x0c0001).w(this, FUNC(gradius3_state::cpuA_ctrl_w)); /* halt cpu B, irq enable, priority, coin counters, other? */ + map(0x0c0000, 0x0c0001).w(FUNC(gradius3_state::cpuA_ctrl_w)); /* halt cpu B, irq enable, priority, coin counters, other? */ map(0x0c8000, 0x0c8001).portr("SYSTEM"); map(0x0c8002, 0x0c8003).portr("P1"); map(0x0c8004, 0x0c8005).portr("P2"); map(0x0c8006, 0x0c8007).portr("DSW3"); map(0x0d0000, 0x0d0001).portr("DSW1"); map(0x0d0002, 0x0d0003).portr("DSW2"); - map(0x0d8000, 0x0d8001).w(this, FUNC(gradius3_state::cpuB_irqtrigger_w)); + map(0x0d8000, 0x0d8001).w(FUNC(gradius3_state::cpuB_irqtrigger_w)); map(0x0e0000, 0x0e0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x0e8000, 0x0e8000).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x0f0000, 0x0f0001).w(this, FUNC(gradius3_state::sound_irq_w)); + map(0x0f0000, 0x0f0001).w(FUNC(gradius3_state::sound_irq_w)); map(0x100000, 0x103fff).ram().share("share1"); - map(0x14c000, 0x153fff).rw(this, FUNC(gradius3_state::k052109_halfword_r), FUNC(gradius3_state::k052109_halfword_w)); - map(0x180000, 0x19ffff).ram().w(this, FUNC(gradius3_state::gradius3_gfxram_w)).share("k052109"); + map(0x14c000, 0x153fff).rw(FUNC(gradius3_state::k052109_halfword_r), FUNC(gradius3_state::k052109_halfword_w)); + map(0x180000, 0x19ffff).ram().w(FUNC(gradius3_state::gradius3_gfxram_w)).share("k052109"); } @@ -175,20 +175,20 @@ void gradius3_state::gradius3_map2(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x100000, 0x103fff).ram(); - map(0x140000, 0x140001).w(this, FUNC(gradius3_state::cpuB_irqenable_w)); + map(0x140000, 0x140001).w(FUNC(gradius3_state::cpuB_irqenable_w)); map(0x200000, 0x203fff).ram().share("share1"); - map(0x24c000, 0x253fff).rw(this, FUNC(gradius3_state::k052109_halfword_r), FUNC(gradius3_state::k052109_halfword_w)); - map(0x280000, 0x29ffff).ram().w(this, FUNC(gradius3_state::gradius3_gfxram_w)).share("k052109"); - map(0x2c0000, 0x2c000f).rw(this, FUNC(gradius3_state::k051937_halfword_r), FUNC(gradius3_state::k051937_halfword_w)); - map(0x2c0800, 0x2c0fff).rw(this, FUNC(gradius3_state::k051960_halfword_r), FUNC(gradius3_state::k051960_halfword_w)); - map(0x400000, 0x5fffff).r(this, FUNC(gradius3_state::gradius3_gfxrom_r)); /* gfx ROMs are mapped here, and copied to RAM */ + map(0x24c000, 0x253fff).rw(FUNC(gradius3_state::k052109_halfword_r), FUNC(gradius3_state::k052109_halfword_w)); + map(0x280000, 0x29ffff).ram().w(FUNC(gradius3_state::gradius3_gfxram_w)).share("k052109"); + map(0x2c0000, 0x2c000f).rw(FUNC(gradius3_state::k051937_halfword_r), FUNC(gradius3_state::k051937_halfword_w)); + map(0x2c0800, 0x2c0fff).rw(FUNC(gradius3_state::k051960_halfword_r), FUNC(gradius3_state::k051960_halfword_w)); + map(0x400000, 0x5fffff).r(FUNC(gradius3_state::gradius3_gfxrom_r)); /* gfx ROMs are mapped here, and copied to RAM */ } void gradius3_state::gradius3_s_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf000).w(this, FUNC(gradius3_state::sound_bank_w)); /* 007232 bankswitch */ + map(0xf000, 0xf000).w(FUNC(gradius3_state::sound_bank_w)); /* 007232 bankswitch */ map(0xf010, 0xf010).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xf020, 0xf02d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xf030, 0xf031).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp index 8223b48dfa4..c550d7b5c2a 100644 --- a/src/mame/drivers/grchamp.cpp +++ b/src/mame/drivers/grchamp.cpp @@ -559,18 +559,18 @@ void grchamp_state::main_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).mirror(0x78).portr("ACCEL"); - map(0x02, 0x02).mirror(0x78).r(this, FUNC(grchamp_state::sub_to_main_comm_r)); + map(0x02, 0x02).mirror(0x78).r(FUNC(grchamp_state::sub_to_main_comm_r)); map(0x03, 0x03).mirror(0x78).portr("WHEEL"); map(0x04, 0x04).mirror(0x78).portr("DSWA"); map(0x05, 0x05).mirror(0x78).portr("DSWB"); map(0x06, 0x06).mirror(0x78).portr("TILT"); - map(0x01, 0x01).mirror(0x60).r(this, FUNC(grchamp_state::pc3259_0_r)); - map(0x09, 0x09).mirror(0x60).r(this, FUNC(grchamp_state::pc3259_1_r)); - map(0x11, 0x11).mirror(0x60).r(this, FUNC(grchamp_state::pc3259_2_r)); - map(0x19, 0x19).mirror(0x60).r(this, FUNC(grchamp_state::pc3259_3_r)); - map(0x00, 0x0f).mirror(0x40).w(this, FUNC(grchamp_state::cpu0_outputs_w)); - map(0x10, 0x13).mirror(0x40).w(this, FUNC(grchamp_state::main_to_sub_comm_w)); - map(0x20, 0x20).select(0x0c).mirror(0x53).w(this, FUNC(grchamp_state::led_board_w)); + map(0x01, 0x01).mirror(0x60).r(FUNC(grchamp_state::pc3259_0_r)); + map(0x09, 0x09).mirror(0x60).r(FUNC(grchamp_state::pc3259_1_r)); + map(0x11, 0x11).mirror(0x60).r(FUNC(grchamp_state::pc3259_2_r)); + map(0x19, 0x19).mirror(0x60).r(FUNC(grchamp_state::pc3259_3_r)); + map(0x00, 0x0f).mirror(0x40).w(FUNC(grchamp_state::cpu0_outputs_w)); + map(0x10, 0x13).mirror(0x40).w(FUNC(grchamp_state::main_to_sub_comm_w)); + map(0x20, 0x20).select(0x0c).mirror(0x53).w(FUNC(grchamp_state::led_board_w)); } @@ -578,9 +578,9 @@ void grchamp_state::main_portmap(address_map &map) void grchamp_state::sub_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x27ff).ram().w(this, FUNC(grchamp_state::left_w)).share("leftram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(grchamp_state::right_w)).share("rightram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(grchamp_state::center_w)).share("centerram"); + map(0x2000, 0x27ff).ram().w(FUNC(grchamp_state::left_w)).share("leftram"); + map(0x2800, 0x2fff).ram().w(FUNC(grchamp_state::right_w)).share("rightram"); + map(0x3000, 0x37ff).ram().w(FUNC(grchamp_state::center_w)).share("centerram"); map(0x4000, 0x43ff).mirror(0x0400).ram(); map(0x5000, 0x6fff).rom(); } @@ -589,8 +589,8 @@ void grchamp_state::sub_map(address_map &map) void grchamp_state::sub_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x03).r(this, FUNC(grchamp_state::main_to_sub_comm_r)); - map(0x00, 0x0f).mirror(0x70).w(this, FUNC(grchamp_state::cpu1_outputs_w)); + map(0x00, 0x03).r(FUNC(grchamp_state::main_to_sub_comm_r)); + map(0x00, 0x0f).mirror(0x70).w(FUNC(grchamp_state::cpu1_outputs_w)); } @@ -635,8 +635,8 @@ void grchamp_state::sound_map(address_map &map) map(0x4803, 0x4803).mirror(0x07f8).r("ay2", FUNC(ay8910_device::data_r)); map(0x4804, 0x4805).mirror(0x07fa).w("ay3", FUNC(ay8910_device::address_data_w)); map(0x4805, 0x4805).mirror(0x07fa).r("ay3", FUNC(ay8910_device::data_r)); - map(0x5000, 0x5000).mirror(0x07fc).r(this, FUNC(grchamp_state::soundlatch_r)).w(this, FUNC(grchamp_state::soundlatch_clear7_w)); - map(0x5001, 0x5001).mirror(0x07fc).r(this, FUNC(grchamp_state::soundlatch_flags_r)).nopw(); // writes here on taitosj reset the secondary semaphore, which doesn't exist on grchamp, but the code tries to reset it anyway! + map(0x5000, 0x5000).mirror(0x07fc).r(FUNC(grchamp_state::soundlatch_r)).w(FUNC(grchamp_state::soundlatch_clear7_w)); + map(0x5001, 0x5001).mirror(0x07fc).r(FUNC(grchamp_state::soundlatch_flags_r)).nopw(); // writes here on taitosj reset the secondary semaphore, which doesn't exist on grchamp, but the code tries to reset it anyway! } diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp index 2bd4aa5f860..ee1fd50820a 100644 --- a/src/mame/drivers/gridcomp.cpp +++ b/src/mame/drivers/gridcomp.cpp @@ -325,7 +325,7 @@ void gridcomp_state::grid1101_map(address_map &map) map(0xdfec0, 0xdfecf).rw(m_modem, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); // incl. DTMF generator map(0xdff40, 0xdff5f).noprw(); // ?? machine ID EAROM, RTC map(0xdff80, 0xdff8f).rw("hpib", FUNC(tms9914_device::reg8_r), FUNC(tms9914_device::reg8_w)).umask16(0x00ff); - map(0xdffc0, 0xdffcf).rw(this, FUNC(gridcomp_state::grid_keyb_r), FUNC(gridcomp_state::grid_keyb_w)); // Intel 8741 MCU + map(0xdffc0, 0xdffcf).rw(FUNC(gridcomp_state::grid_keyb_r), FUNC(gridcomp_state::grid_keyb_w)); // Intel 8741 MCU map(0xfc000, 0xfffff).rom().region("user1", 0); } @@ -342,7 +342,7 @@ void gridcomp_state::grid1121_map(address_map &map) map(0xdfec0, 0xdfecf).rw(m_modem, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); // incl. DTMF generator map(0xdff40, 0xdff5f).noprw(); // ?? machine ID EAROM, RTC map(0xdff80, 0xdff8f).rw("hpib", FUNC(tms9914_device::reg8_r), FUNC(tms9914_device::reg8_w)).umask16(0x00ff); - map(0xdffc0, 0xdffcf).rw(this, FUNC(gridcomp_state::grid_keyb_r), FUNC(gridcomp_state::grid_keyb_w)); // Intel 8741 MCU + map(0xdffc0, 0xdffcf).rw(FUNC(gridcomp_state::grid_keyb_r), FUNC(gridcomp_state::grid_keyb_w)); // Intel 8741 MCU map(0xfc000, 0xfffff).rom().region("user1", 0); } diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp index 51bc67f1366..24d43452297 100644 --- a/src/mame/drivers/gridlee.cpp +++ b/src/mame/drivers/gridlee.cpp @@ -288,19 +288,19 @@ WRITE_LINE_MEMBER(gridlee_state::coin_counter_w) void gridlee_state::cpu1_map(address_map &map) { map(0x0000, 0x07ff).ram().share("spriteram"); - map(0x0800, 0x7fff).ram().w(this, FUNC(gridlee_state::gridlee_videoram_w)).share("videoram"); + map(0x0800, 0x7fff).ram().w(FUNC(gridlee_state::gridlee_videoram_w)).share("videoram"); map(0x9000, 0x9000).select(0x0070).lw8("latch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_latch->write_d0(space, offset >> 4, data, mem_mask); }); - map(0x9200, 0x9200).w(this, FUNC(gridlee_state::gridlee_palette_select_w)); + map(0x9200, 0x9200).w(FUNC(gridlee_state::gridlee_palette_select_w)); map(0x9380, 0x9380).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x9500, 0x9501).r(this, FUNC(gridlee_state::analog_port_r)); + map(0x9500, 0x9501).r(FUNC(gridlee_state::analog_port_r)); map(0x9502, 0x9502).portr("IN0"); map(0x9503, 0x9503).portr("IN1"); map(0x9600, 0x9600).portr("DSW"); map(0x9700, 0x9700).portr("IN2").nopw(); - map(0x9820, 0x9820).r(this, FUNC(gridlee_state::random_num_r)); + map(0x9820, 0x9820).r(FUNC(gridlee_state::random_num_r)); map(0x9828, 0x993f).w("gridlee", FUNC(gridlee_sound_device::gridlee_sound_w)); map(0x9c00, 0x9cff).ram().share("nvram"); map(0xa000, 0xffff).rom(); diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp index 764ded874f2..457cce66383 100644 --- a/src/mame/drivers/groundfx.cpp +++ b/src/mame/drivers/groundfx.cpp @@ -133,7 +133,7 @@ void groundfx_state::groundfx_map(address_map &map) map(0x000000, 0x1fffff).rom(); map(0x200000, 0x21ffff).ram().share("ram"); /* main CPUA ram */ map(0x300000, 0x303fff).ram().share("spriteram"); /* sprite ram */ - map(0x400000, 0x400003).w(this, FUNC(groundfx_state::motor_control_w)); /* gun vibration */ + map(0x400000, 0x400003).w(FUNC(groundfx_state::motor_control_w)); /* gun vibration */ map(0x500000, 0x500007).rw("tc0510nio", FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)); map(0x600000, 0x600007).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask32(0xffffffff); map(0x700000, 0x7007ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); @@ -144,7 +144,7 @@ void groundfx_state::groundfx_map(address_map &map) map(0xa00000, 0xa0ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0xb00000, 0xb003ff).ram(); // ?? single bytes, blending ?? map(0xc00000, 0xc00007).nopr(); /* Network? */ - map(0xd00000, 0xd00003).w(this, FUNC(groundfx_state::rotate_control_w)); /* perhaps port based rotate control? */ + map(0xd00000, 0xd00003).w(FUNC(groundfx_state::rotate_control_w)); /* perhaps port based rotate control? */ /* f00000 is seat control? */ } diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp index 86e32de1f8b..bb05d83951a 100644 --- a/src/mame/drivers/gstream.cpp +++ b/src/mame/drivers/gstream.cpp @@ -265,15 +265,15 @@ void gstream_state::gstream_32bit_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("workram"); // work ram // map(0x40000000, 0x40ffffff).ram(); // ?? lots of data gets copied here if present, but game runs without it?? - map(0x80000000, 0x80003fff).ram().w(this, FUNC(gstream_state::vram_w)).share("vram"); // video ram + map(0x80000000, 0x80003fff).ram().w(FUNC(gstream_state::vram_w)).share("vram"); // video ram map(0x4E000000, 0x4e1fffff).rom().region("maindata", 0); // main game rom - map(0x4f000000, 0x4f000003).w(this, FUNC(gstream_state::scrollx_w<2>)).umask32(0xffff0000).cswidth(32); - map(0x4f200000, 0x4f200003).w(this, FUNC(gstream_state::scrolly_w<2>)).umask32(0xffff0000).cswidth(32); + map(0x4f000000, 0x4f000003).w(FUNC(gstream_state::scrollx_w<2>)).umask32(0xffff0000).cswidth(32); + map(0x4f200000, 0x4f200003).w(FUNC(gstream_state::scrolly_w<2>)).umask32(0xffff0000).cswidth(32); map(0x4f400000, 0x4f406fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); - map(0x4f800000, 0x4f800003).w(this, FUNC(gstream_state::scrollx_w<0>)).umask32(0xffff0000).cswidth(32); - map(0x4fa00000, 0x4fa00003).w(this, FUNC(gstream_state::scrolly_w<0>)).umask32(0xffff0000).cswidth(32); - map(0x4fc00000, 0x4fc00003).w(this, FUNC(gstream_state::scrollx_w<1>)).umask32(0xffff0000).cswidth(32); - map(0x4fe00000, 0x4fe00003).w(this, FUNC(gstream_state::scrolly_w<1>)).umask32(0xffff0000).cswidth(32); + map(0x4f800000, 0x4f800003).w(FUNC(gstream_state::scrollx_w<0>)).umask32(0xffff0000).cswidth(32); + map(0x4fa00000, 0x4fa00003).w(FUNC(gstream_state::scrolly_w<0>)).umask32(0xffff0000).cswidth(32); + map(0x4fc00000, 0x4fc00003).w(FUNC(gstream_state::scrollx_w<1>)).umask32(0xffff0000).cswidth(32); + map(0x4fe00000, 0x4fe00003).w(FUNC(gstream_state::scrolly_w<1>)).umask32(0xffff0000).cswidth(32); map(0xffc00000, 0xffc01fff).ram().share("nvram"); // Backup RAM map(0xfff80000, 0xffffffff).rom().region("maincpu", 0); // boot rom } @@ -348,8 +348,8 @@ void gstream_state::gstream_io(address_map &map) map(0x4000, 0x4003).portr("IN0"); map(0x4010, 0x4013).portr("IN1"); map(0x4020, 0x4023).portr("IN2"); // extra coin switches etc - map(0x4030, 0x4033).w(this, FUNC(gstream_state::gstream_oki_banking_w)); // oki banking - map(0x4040, 0x4043).w(this, FUNC(gstream_state::gstream_oki_4040_w)); // some clocking? + map(0x4030, 0x4033).w(FUNC(gstream_state::gstream_oki_banking_w)); // oki banking + map(0x4040, 0x4043).w(FUNC(gstream_state::gstream_oki_4040_w)); // some clocking? map(0x4053, 0x4053).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // music and samples map(0x4063, 0x4063).rw(m_oki[1], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // music and samples } @@ -359,16 +359,16 @@ void gstream_state::x2222_32bit_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("workram"); // work ram map(0x40000000, 0x403fffff).ram(); // ?? data gets copied here if present, but game runs without it?? - map(0x80000000, 0x80003fff).ram().w(this, FUNC(gstream_state::vram_w)).share("vram"); // video ram + map(0x80000000, 0x80003fff).ram().w(FUNC(gstream_state::vram_w)).share("vram"); // video ram - map(0x4fc00000, 0x4fc00003).w(this, FUNC(gstream_state::scrolly_w<1>)).umask32(0xffff0000).cswidth(32); - map(0x4fd00000, 0x4fd00003).w(this, FUNC(gstream_state::scrollx_w<1>)).umask32(0xffff0000).cswidth(32); + map(0x4fc00000, 0x4fc00003).w(FUNC(gstream_state::scrolly_w<1>)).umask32(0xffff0000).cswidth(32); + map(0x4fd00000, 0x4fd00003).w(FUNC(gstream_state::scrollx_w<1>)).umask32(0xffff0000).cswidth(32); - map(0x4fa00000, 0x4fa00003).w(this, FUNC(gstream_state::scrolly_w<2>)).umask32(0xffff0000).cswidth(32); - map(0x4fb00000, 0x4fb00003).w(this, FUNC(gstream_state::scrollx_w<2>)).umask32(0xffff0000).cswidth(32); + map(0x4fa00000, 0x4fa00003).w(FUNC(gstream_state::scrolly_w<2>)).umask32(0xffff0000).cswidth(32); + map(0x4fb00000, 0x4fb00003).w(FUNC(gstream_state::scrollx_w<2>)).umask32(0xffff0000).cswidth(32); - map(0x4fe00000, 0x4fe00003).w(this, FUNC(gstream_state::scrolly_w<0>)).umask32(0xffff0000).cswidth(32); - map(0x4ff00000, 0x4ff00003).w(this, FUNC(gstream_state::scrollx_w<0>)).umask32(0xffff0000).cswidth(32); + map(0x4fe00000, 0x4fe00003).w(FUNC(gstream_state::scrolly_w<0>)).umask32(0xffff0000).cswidth(32); + map(0x4ff00000, 0x4ff00003).w(FUNC(gstream_state::scrollx_w<0>)).umask32(0xffff0000).cswidth(32); map(0xffc00000, 0xffc01fff).ram().share("nvram"); // Backup RAM (maybe) map(0xfff00000, 0xffffffff).rom().region("maincpu", 0); // boot rom @@ -387,7 +387,7 @@ void gstream_state::x2222_io(address_map &map) map(0x4004, 0x4007).portr("P2"); map(0x4008, 0x400b).portr("SYS"); map(0x4010, 0x4013).portr("DSW"); - map(0x4028, 0x402b).w(this, FUNC(gstream_state::x2222_sound_w)); + map(0x4028, 0x402b).w(FUNC(gstream_state::x2222_sound_w)); map(0x4034, 0x4037).portr("IN4"); } diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp index 571f6d6f1c4..86af212e71f 100644 --- a/src/mame/drivers/gstriker.cpp +++ b/src/mame/drivers/gstriker.cpp @@ -282,7 +282,7 @@ void gstriker_state::sound_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x04, 0x04).w(this, FUNC(gstriker_state::sh_bankswitch_w)); + map(0x04, 0x04).w(FUNC(gstriker_state::sh_bankswitch_w)); map(0x08, 0x08).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0x0c, 0x0c).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp index f2b8e84b8a3..4ffe3855bc1 100644 --- a/src/mame/drivers/gsword.cpp +++ b/src/mame/drivers/gsword.cpp @@ -463,11 +463,11 @@ void gsword_state_base::cpu1_map(address_map &map) map(0xa380, 0xa3ff).ram().share("spritetile_ram"); map(0xa400, 0xa77f).ram(); map(0xa780, 0xa7ff).ram().share("spritexy_ram"); - map(0xa980, 0xa980).w(this, FUNC(gsword_state_base::charbank_w)); - map(0xaa80, 0xaa80).w(this, FUNC(gsword_state_base::videoctrl_w)); /* flip screen, char palette bank */ - map(0xab00, 0xab00).w(this, FUNC(gsword_state_base::scroll_w)); + map(0xa980, 0xa980).w(FUNC(gsword_state_base::charbank_w)); + map(0xaa80, 0xaa80).w(FUNC(gsword_state_base::videoctrl_w)); /* flip screen, char palette bank */ + map(0xab00, 0xab00).w(FUNC(gsword_state_base::scroll_w)); map(0xab80, 0xabff).writeonly().share("spriteattram"); - map(0xb000, 0xb7ff).readonly().w(this, FUNC(gsword_state_base::videoram_w)).share("videoram"); + map(0xb000, 0xb7ff).readonly().w(FUNC(gsword_state_base::videoram_w)).share("videoram"); } @@ -481,7 +481,7 @@ void gsword_state::cpu2_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram().share("cpu2_ram"); - map(0x6000, 0x6000).w(this, FUNC(gsword_state::sound_command_w)); + map(0x6000, 0x6000).w(FUNC(gsword_state::sound_command_w)); } void gsword_state::cpu2_io_map(address_map &map) @@ -490,9 +490,9 @@ void gsword_state::cpu2_io_map(address_map &map) map(0x00, 0x01).rw("taito8741", FUNC(taito8741_4pack_device::read_2), FUNC(taito8741_4pack_device::write_2)); map(0x20, 0x21).rw("taito8741", FUNC(taito8741_4pack_device::read_3), FUNC(taito8741_4pack_device::write_3)); map(0x40, 0x41).rw("taito8741", FUNC(taito8741_4pack_device::read_1), FUNC(taito8741_4pack_device::write_1)); - map(0x60, 0x60).rw(this, FUNC(gsword_state::fake_0_r), FUNC(gsword_state::ay8910_control_port_0_w)); + map(0x60, 0x60).rw(FUNC(gsword_state::fake_0_r), FUNC(gsword_state::ay8910_control_port_0_w)); map(0x61, 0x61).rw(m_ay0, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0x80, 0x80).rw(this, FUNC(gsword_state::fake_1_r), FUNC(gsword_state::ay8910_control_port_1_w)); + map(0x80, 0x80).rw(FUNC(gsword_state::fake_1_r), FUNC(gsword_state::ay8910_control_port_1_w)); map(0x81, 0x81).rw(m_ay1, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xe0, 0xe0).nopr(); /* ?? */ @@ -503,7 +503,7 @@ void gsword_state::cpu2_io_map(address_map &map) void gsword_state::cpu3_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8000).w(this, FUNC(gsword_state::adpcm_data_w)); + map(0x8000, 0x8000).w(FUNC(gsword_state::adpcm_data_w)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -529,13 +529,13 @@ void josvolly_state::josvolly_cpu2_map(address_map &map) void josvolly_state::josvolly_cpu2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(josvolly_state::fake_0_r), FUNC(josvolly_state::ay8910_control_port_0_w)); + map(0x00, 0x00).rw(FUNC(josvolly_state::fake_0_r), FUNC(josvolly_state::ay8910_control_port_0_w)); map(0x01, 0x01).rw(m_ay0, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0x40, 0x40).rw(this, FUNC(josvolly_state::fake_1_r), FUNC(josvolly_state::ay8910_control_port_1_w)); + map(0x40, 0x40).rw(FUNC(josvolly_state::fake_1_r), FUNC(josvolly_state::ay8910_control_port_1_w)); map(0x41, 0x41).rw(m_ay1, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0x81, 0x81).w(this, FUNC(josvolly_state::cpu2_nmi_enable_w)); - map(0xC1, 0xC1).w(this, FUNC(josvolly_state::cpu2_irq_clear_w)); + map(0x81, 0x81).w(FUNC(josvolly_state::cpu2_nmi_enable_w)); + map(0xC1, 0xC1).w(FUNC(josvolly_state::cpu2_irq_clear_w)); } diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp index a26e419b979..cb3a8bde3ab 100644 --- a/src/mame/drivers/gticlub.cpp +++ b/src/mame/drivers/gticlub.cpp @@ -521,15 +521,15 @@ MACHINE_START_MEMBER(gticlub_state,gticlub) void gticlub_state::gticlub_map(address_map &map) { map(0x00000000, 0x000fffff).ram().share("work_ram"); /* Work RAM */ - map(0x74000000, 0x740000ff).rw(this, FUNC(gticlub_state::gticlub_k001604_reg_r), FUNC(gticlub_state::gticlub_k001604_reg_w)); - map(0x74010000, 0x7401ffff).ram().w(this, FUNC(gticlub_state::paletteram32_w)).share("paletteram"); - map(0x74020000, 0x7403ffff).rw(this, FUNC(gticlub_state::gticlub_k001604_tile_r), FUNC(gticlub_state::gticlub_k001604_tile_w)); - map(0x74040000, 0x7407ffff).rw(this, FUNC(gticlub_state::gticlub_k001604_char_r), FUNC(gticlub_state::gticlub_k001604_char_w)); + map(0x74000000, 0x740000ff).rw(FUNC(gticlub_state::gticlub_k001604_reg_r), FUNC(gticlub_state::gticlub_k001604_reg_w)); + map(0x74010000, 0x7401ffff).ram().w(FUNC(gticlub_state::paletteram32_w)).share("paletteram"); + map(0x74020000, 0x7403ffff).rw(FUNC(gticlub_state::gticlub_k001604_tile_r), FUNC(gticlub_state::gticlub_k001604_tile_w)); + map(0x74040000, 0x7407ffff).rw(FUNC(gticlub_state::gticlub_k001604_char_r), FUNC(gticlub_state::gticlub_k001604_char_w)); map(0x78000000, 0x7800ffff).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_r_ppc), FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); map(0x78040000, 0x7804000f).rw(m_k001006_1, FUNC(k001006_device::read), FUNC(k001006_device::write)); map(0x78080000, 0x7808000f).rw(m_k001006_2, FUNC(k001006_device::read), FUNC(k001006_device::write)); map(0x780c0000, 0x780c0003).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_comm_r_ppc), FUNC(konppc_device::cgboard_dsp_comm_w_ppc)); - map(0x7e000000, 0x7e003fff).rw(this, FUNC(gticlub_state::sysreg_r), FUNC(gticlub_state::sysreg_w)); + map(0x7e000000, 0x7e003fff).rw(FUNC(gticlub_state::sysreg_r), FUNC(gticlub_state::sysreg_w)); map(0x7e008000, 0x7e009fff).rw("k056230", FUNC(k056230_device::read), FUNC(k056230_device::write)); map(0x7e00a000, 0x7e00bfff).rw("k056230", FUNC(k056230_device::lanc_ram_r), FUNC(k056230_device::lanc_ram_w)); map(0x7e00c000, 0x7e00c00f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)); @@ -541,13 +541,13 @@ void gticlub_state::gticlub_map(address_map &map) void gticlub_state::hangplt_map(address_map &map) { map(0x00000000, 0x000fffff).ram().share("work_ram"); /* Work RAM */ - map(0x74000000, 0x740000ff).rw(this, FUNC(gticlub_state::gticlub_k001604_reg_r), FUNC(gticlub_state::gticlub_k001604_reg_w)); - map(0x74010000, 0x7401ffff).ram().w(this, FUNC(gticlub_state::paletteram32_w)).share("paletteram"); - map(0x74020000, 0x7403ffff).rw(this, FUNC(gticlub_state::gticlub_k001604_tile_r), FUNC(gticlub_state::gticlub_k001604_tile_w)); - map(0x74040000, 0x7407ffff).rw(this, FUNC(gticlub_state::gticlub_k001604_char_r), FUNC(gticlub_state::gticlub_k001604_char_w)); + map(0x74000000, 0x740000ff).rw(FUNC(gticlub_state::gticlub_k001604_reg_r), FUNC(gticlub_state::gticlub_k001604_reg_w)); + map(0x74010000, 0x7401ffff).ram().w(FUNC(gticlub_state::paletteram32_w)).share("paletteram"); + map(0x74020000, 0x7403ffff).rw(FUNC(gticlub_state::gticlub_k001604_tile_r), FUNC(gticlub_state::gticlub_k001604_tile_w)); + map(0x74040000, 0x7407ffff).rw(FUNC(gticlub_state::gticlub_k001604_char_r), FUNC(gticlub_state::gticlub_k001604_char_w)); map(0x78000000, 0x7800ffff).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_r_ppc), FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); map(0x780c0000, 0x780c0003).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_comm_r_ppc), FUNC(konppc_device::cgboard_dsp_comm_w_ppc)); - map(0x7e000000, 0x7e003fff).rw(this, FUNC(gticlub_state::sysreg_r), FUNC(gticlub_state::sysreg_w)); + map(0x7e000000, 0x7e003fff).rw(FUNC(gticlub_state::sysreg_r), FUNC(gticlub_state::sysreg_w)); map(0x7e008000, 0x7e009fff).rw("k056230", FUNC(k056230_device::read), FUNC(k056230_device::write)); map(0x7e00a000, 0x7e00bfff).rw("k056230", FUNC(k056230_device::lanc_ram_r), FUNC(k056230_device::lanc_ram_w)); map(0x7e00c000, 0x7e00c00f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)); @@ -564,8 +564,8 @@ void gticlub_state::sound_memmap(address_map &map) map(0x200000, 0x20ffff).ram(); map(0x300000, 0x30001f).rw(m_k056800, FUNC(k056800_device::sound_r), FUNC(k056800_device::sound_w)).umask16(0x00ff); map(0x400000, 0x400fff).rw("rfsnd", FUNC(rf5c400_device::rf5c400_r), FUNC(rf5c400_device::rf5c400_w)); /* Ricoh RF5C400 */ - map(0x500000, 0x500001).w(this, FUNC(gticlub_state::soundtimer_en_w)).nopr(); - map(0x600000, 0x600001).w(this, FUNC(gticlub_state::soundtimer_count_w)).nopr(); + map(0x500000, 0x500001).w(FUNC(gticlub_state::soundtimer_en_w)).nopr(); + map(0x600000, 0x600001).w(FUNC(gticlub_state::soundtimer_count_w)).nopr(); } /*****************************************************************************/ @@ -593,7 +593,7 @@ WRITE32_MEMBER(gticlub_state::dsp_dataram1_w) void gticlub_state::sharc_map(address_map &map) { map(0x400000, 0x41ffff).rw(m_konppc, FUNC(konppc_device::cgboard_0_shared_sharc_r), FUNC(konppc_device::cgboard_0_shared_sharc_w)); - map(0x500000, 0x5fffff).rw(this, FUNC(gticlub_state::dsp_dataram0_r), FUNC(gticlub_state::dsp_dataram0_w)); + map(0x500000, 0x5fffff).rw(FUNC(gticlub_state::dsp_dataram0_r), FUNC(gticlub_state::dsp_dataram0_w)); map(0x600000, 0x6fffff).rw(m_k001005, FUNC(k001005_device::read), FUNC(k001005_device::write)); map(0x700000, 0x7000ff).rw(m_konppc, FUNC(konppc_device::cgboard_0_comm_sharc_r), FUNC(konppc_device::cgboard_0_comm_sharc_w)); } @@ -601,7 +601,7 @@ void gticlub_state::sharc_map(address_map &map) void gticlub_state::hangplt_sharc0_map(address_map &map) { map(0x0400000, 0x041ffff).rw(m_konppc, FUNC(konppc_device::cgboard_0_shared_sharc_r), FUNC(konppc_device::cgboard_0_shared_sharc_w)); - map(0x0500000, 0x05fffff).rw(this, FUNC(gticlub_state::dsp_dataram0_r), FUNC(gticlub_state::dsp_dataram0_w)); + map(0x0500000, 0x05fffff).rw(FUNC(gticlub_state::dsp_dataram0_r), FUNC(gticlub_state::dsp_dataram0_w)); map(0x1400000, 0x14fffff).ram(); map(0x2400000, 0x27fffff).r(m_konppc, FUNC(konppc_device::nwk_voodoo_0_r)).w("voodoo0", FUNC(voodoo_device::voodoo_w)); map(0x3400000, 0x34000ff).rw(m_konppc, FUNC(konppc_device::cgboard_0_comm_sharc_r), FUNC(konppc_device::cgboard_0_comm_sharc_w)); @@ -613,7 +613,7 @@ void gticlub_state::hangplt_sharc0_map(address_map &map) void gticlub_state::hangplt_sharc1_map(address_map &map) { map(0x0400000, 0x041ffff).rw(m_konppc, FUNC(konppc_device::cgboard_1_shared_sharc_r), FUNC(konppc_device::cgboard_1_shared_sharc_w)); - map(0x0500000, 0x05fffff).rw(this, FUNC(gticlub_state::dsp_dataram1_r), FUNC(gticlub_state::dsp_dataram1_w)); + map(0x0500000, 0x05fffff).rw(FUNC(gticlub_state::dsp_dataram1_r), FUNC(gticlub_state::dsp_dataram1_w)); map(0x1400000, 0x14fffff).ram(); map(0x2400000, 0x27fffff).r(m_konppc, FUNC(konppc_device::nwk_voodoo_1_r)).w("voodoo1", FUNC(voodoo_device::voodoo_w)); map(0x3400000, 0x34000ff).rw(m_konppc, FUNC(konppc_device::cgboard_1_comm_sharc_r), FUNC(konppc_device::cgboard_1_comm_sharc_w)); diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp index 7f2b54e8830..c29117b2465 100644 --- a/src/mame/drivers/gts1.cpp +++ b/src/mame/drivers/gts1.cpp @@ -142,7 +142,7 @@ void gts1_state::gts1_data(address_map &map) void gts1_state::gts1_io(address_map &map) { - map(0x0000, 0x00ff).r(this, FUNC(gts1_state::gts1_io_r)).w(this, FUNC(gts1_state::gts1_io_w)); // catch undecoded I/O accesss + map(0x0000, 0x00ff).r(FUNC(gts1_state::gts1_io_r)).w(FUNC(gts1_state::gts1_io_w)); // catch undecoded I/O accesss map(0x0020, 0x002f).rw("u4", FUNC(ra17xx_device::io_r), FUNC(ra17xx_device::io_w)); // (U4) solenoid map(0x0030, 0x003f).rw("u3", FUNC(r10696_device::io_r), FUNC(r10696_device::io_w)); // (U3) solenoid + dips diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp index 9e50825cfdd..28e5ae51691 100644 --- a/src/mame/drivers/gts3.cpp +++ b/src/mame/drivers/gts3.cpp @@ -79,7 +79,7 @@ void gts3_state::gts3_map(address_map &map) map(0x0000, 0x1fff).ram().share("nvram"); map(0x2000, 0x200f).rw(m_u4, FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0x2010, 0x201f).rw(m_u5, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x2020, 0x2023).mirror(0x0c).w(this, FUNC(gts3_state::segbank_w)); + map(0x2020, 0x2023).mirror(0x0c).w(FUNC(gts3_state::segbank_w)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp index 3f4d7cbb88b..b4f57c4d753 100644 --- a/src/mame/drivers/gts3a.cpp +++ b/src/mame/drivers/gts3a.cpp @@ -80,7 +80,7 @@ void gts3a_state::gts3a_map(address_map &map) map(0x0000, 0x1fff).ram().share("nvram"); map(0x2000, 0x200f).rw(m_u4, FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0x2010, 0x201f).rw(m_u5, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x2020, 0x2023).mirror(0x0c).w(this, FUNC(gts3a_state::segbank_w)); + map(0x2020, 0x2023).mirror(0x0c).w(FUNC(gts3a_state::segbank_w)); map(0x4000, 0xffff).rom(); } @@ -91,8 +91,8 @@ void gts3a_state::gts3a_dmd_map(address_map &map) map(0x2001, 0x2001).r("crtc", FUNC(mc6845_device::register_r)); map(0x2800, 0x2800).w("crtc", FUNC(mc6845_device::address_w)); map(0x2801, 0x2801).w("crtc", FUNC(mc6845_device::register_w)); - map(0x3000, 0x3000).r(this, FUNC(gts3a_state::dmd_r)); - map(0x3800, 0x3800).w(this, FUNC(gts3a_state::dmd_w)); + map(0x3000, 0x3000).r(FUNC(gts3a_state::dmd_r)); + map(0x3800, 0x3800).w(FUNC(gts3a_state::dmd_w)); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom().region("dmdcpu", 0x78000); } diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index ad46cbf2c41..cd3da109d72 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -139,7 +139,7 @@ void guab_state::guab_map(address_map &map) map(0x080000, 0x080fff).ram(); map(0x100001, 0x100001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)); map(0x100003, 0x100003).w("ef9369", FUNC(ef9369_device::address_w)); - map(0x800000, 0xb0ffff).rw(this, FUNC(guab_state::tms34061_r), FUNC(guab_state::tms34061_w)); + map(0x800000, 0xb0ffff).rw(FUNC(guab_state::tms34061_r), FUNC(guab_state::tms34061_w)); map(0xb10000, 0xb1ffff).ram(); map(0xb80000, 0xb8ffff).ram(); map(0xb90000, 0xb9ffff).ram(); diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp index 6b7547989da..0c780b45a22 100644 --- a/src/mame/drivers/gumbo.cpp +++ b/src/mame/drivers/gumbo.cpp @@ -60,8 +60,8 @@ void gumbo_state::gumbo_map(address_map &map) map(0x1c0100, 0x1c0101).portr("P1_P2"); map(0x1c0200, 0x1c0201).portr("DSW"); map(0x1c0301, 0x1c0301).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x1e0000, 0x1e0fff).ram().w(this, FUNC(gumbo_state::gumbo_bg_videoram_w)).share("bg_videoram"); // bg tilemap - map(0x1f0000, 0x1f3fff).ram().w(this, FUNC(gumbo_state::gumbo_fg_videoram_w)).share("fg_videoram"); // fg tilemap + map(0x1e0000, 0x1e0fff).ram().w(FUNC(gumbo_state::gumbo_bg_videoram_w)).share("bg_videoram"); // bg tilemap + map(0x1f0000, 0x1f3fff).ram().w(FUNC(gumbo_state::gumbo_fg_videoram_w)).share("fg_videoram"); // fg tilemap } /* Miss Puzzle has a different memory map */ @@ -70,12 +70,12 @@ void gumbo_state::mspuzzle_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); // main ram - map(0x190000, 0x197fff).ram().w(this, FUNC(gumbo_state::gumbo_fg_videoram_w)).share("fg_videoram"); // fg tilemap + map(0x190000, 0x197fff).ram().w(FUNC(gumbo_state::gumbo_fg_videoram_w)).share("fg_videoram"); // fg tilemap map(0x1a0000, 0x1a03ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x1b0100, 0x1b0101).portr("P1_P2"); map(0x1b0200, 0x1b0201).portr("DSW"); map(0x1b0301, 0x1b0301).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x1c0000, 0x1c1fff).ram().w(this, FUNC(gumbo_state::gumbo_bg_videoram_w)).share("bg_videoram"); // bg tilemap + map(0x1c0000, 0x1c1fff).ram().w(FUNC(gumbo_state::gumbo_bg_videoram_w)).share("bg_videoram"); // bg tilemap } void gumbo_state::dblpoint_map(address_map &map) @@ -86,8 +86,8 @@ void gumbo_state::dblpoint_map(address_map &map) map(0x1c0100, 0x1c0101).portr("P1_P2"); map(0x1c0200, 0x1c0201).portr("DSW"); map(0x1c0301, 0x1c0301).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x1e0000, 0x1e3fff).ram().w(this, FUNC(gumbo_state::gumbo_fg_videoram_w)).share("fg_videoram"); // fg tilemap - map(0x1f0000, 0x1f0fff).ram().w(this, FUNC(gumbo_state::gumbo_bg_videoram_w)).share("bg_videoram"); // bg tilemap + map(0x1e0000, 0x1e3fff).ram().w(FUNC(gumbo_state::gumbo_fg_videoram_w)).share("fg_videoram"); // fg tilemap + map(0x1f0000, 0x1f0fff).ram().w(FUNC(gumbo_state::gumbo_bg_videoram_w)).share("bg_videoram"); // bg tilemap } static INPUT_PORTS_START( gumbo ) diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp index 89a3ca63a29..bf67867c66f 100644 --- a/src/mame/drivers/gunbustr.cpp +++ b/src/mame/drivers/gunbustr.cpp @@ -120,10 +120,10 @@ void gunbustr_state::gunbustr_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x21ffff).ram().share("ram"); /* main CPUA ram */ map(0x300000, 0x301fff).ram().share("spriteram"); /* Sprite ram */ - map(0x380000, 0x380003).w(this, FUNC(gunbustr_state::motor_control_w)); /* motor, lamps etc. */ + map(0x380000, 0x380003).w(FUNC(gunbustr_state::motor_control_w)); /* motor, lamps etc. */ map(0x390000, 0x3907ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); /* Sound shared ram */ map(0x400000, 0x400007).rw("tc0510nio", FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)); - map(0x500000, 0x500003).rw(this, FUNC(gunbustr_state::gunbustr_gun_r), FUNC(gunbustr_state::gunbustr_gun_w)); /* gun coord read */ + map(0x500000, 0x500003).rw(FUNC(gunbustr_state::gunbustr_gun_r), FUNC(gunbustr_state::gunbustr_gun_w)); /* gun coord read */ map(0x800000, 0x80ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::long_r), FUNC(tc0480scp_device::long_w)); map(0x830000, 0x83002f).rw(m_tc0480scp, FUNC(tc0480scp_device::ctrl_long_r), FUNC(tc0480scp_device::ctrl_long_w)); map(0x900000, 0x901fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp index 250f5ee6cd0..e1feee5a3f4 100644 --- a/src/mame/drivers/gundealr.cpp +++ b/src/mame/drivers/gundealr.cpp @@ -107,25 +107,25 @@ void gundealr_state::base_map(address_map &map) map(0xc004, 0xc004).portr("IN0"); map(0xc005, 0xc005).portr("IN1"); map(0xc006, 0xc006).portr("IN2"); - map(0xc016, 0xc016).w(this, FUNC(gundealr_state::bankswitch_w)); - map(0xc400, 0xc7ff).ram().w(this, FUNC(gundealr_state::paletteram_w)).share("paletteram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(gundealr_state::bg_videoram_w)).share("bg_videoram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(gundealr_state::fg_videoram_w)).share("fg_videoram"); + map(0xc016, 0xc016).w(FUNC(gundealr_state::bankswitch_w)); + map(0xc400, 0xc7ff).ram().w(FUNC(gundealr_state::paletteram_w)).share("paletteram"); + map(0xc800, 0xcfff).ram().w(FUNC(gundealr_state::bg_videoram_w)).share("bg_videoram"); + map(0xd000, 0xdfff).ram().w(FUNC(gundealr_state::fg_videoram_w)).share("fg_videoram"); map(0xe000, 0xffff).ram().share("rambase"); } void gundealr_state::gundealr_main_map(address_map &map) { base_map(map); - map(0xc014, 0xc014).w(this, FUNC(gundealr_state::flipscreen_w<0>)); - map(0xc020, 0xc023).w(this, FUNC(gundealr_state::fg_scroll_w<1>)); + map(0xc014, 0xc014).w(FUNC(gundealr_state::flipscreen_w<0>)); + map(0xc020, 0xc023).w(FUNC(gundealr_state::fg_scroll_w<1>)); } void gundealr_state::yamyam_main_map(address_map &map) { base_map(map); - map(0xc010, 0xc013).w(this, FUNC(gundealr_state::fg_scroll_w<0>)); - map(0xc014, 0xc014).w(this, FUNC(gundealr_state::flipscreen_w<7>)); + map(0xc010, 0xc013).w(FUNC(gundealr_state::fg_scroll_w<0>)); + map(0xc014, 0xc014).w(FUNC(gundealr_state::flipscreen_w<7>)); map(0xc015, 0xc015).nopw(); // Bit 7 = MCU reset? } diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp index 6f94fbf4bf8..7684925ea58 100644 --- a/src/mame/drivers/gunpey.cpp +++ b/src/mame/drivers/gunpey.cpp @@ -1093,21 +1093,21 @@ void gunpey_state::mem_map(address_map &map) void gunpey_state::io_map(address_map &map) { - map(0x7f40, 0x7f45).r(this, FUNC(gunpey_state::inputs_r)); + map(0x7f40, 0x7f45).r(FUNC(gunpey_state::inputs_r)); - map(0x7f48, 0x7f48).w(this, FUNC(gunpey_state::output_w)); + map(0x7f48, 0x7f48).w(FUNC(gunpey_state::output_w)); map(0x7f80, 0x7f81).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); map(0x7f88, 0x7f88).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x7fc8, 0x7fc9).rw(this, FUNC(gunpey_state::status_r), FUNC(gunpey_state::status_w)); - map(0x7fd0, 0x7fdf).w(this, FUNC(gunpey_state::blitter_w)); - map(0x7fe0, 0x7fe5).w(this, FUNC(gunpey_state::blitter_upper_w)); - map(0x7ff0, 0x7ff5).w(this, FUNC(gunpey_state::blitter_upper2_w)); + map(0x7fc8, 0x7fc9).rw(FUNC(gunpey_state::status_r), FUNC(gunpey_state::status_w)); + map(0x7fd0, 0x7fdf).w(FUNC(gunpey_state::blitter_w)); + map(0x7fe0, 0x7fe5).w(FUNC(gunpey_state::blitter_upper_w)); + map(0x7ff0, 0x7ff5).w(FUNC(gunpey_state::blitter_upper2_w)); //AM_RANGE(0x7FF0, 0x7FF1) AM_RAM - map(0x7fec, 0x7fed).w(this, FUNC(gunpey_state::vregs_addr_w)); - map(0x7fee, 0x7fef).w(this, FUNC(gunpey_state::vram_bank_w)); + map(0x7fec, 0x7fed).w(FUNC(gunpey_state::vregs_addr_w)); + map(0x7fee, 0x7fef).w(FUNC(gunpey_state::vram_bank_w)); } diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp index 548f8eef228..d9611c70493 100644 --- a/src/mame/drivers/gunsmoke.cpp +++ b/src/mame/drivers/gunsmoke.cpp @@ -114,15 +114,15 @@ void gunsmoke_state::gunsmoke_map(address_map &map) map(0xc002, 0xc002).portr("P2"); map(0xc003, 0xc003).portr("DSW1"); map(0xc004, 0xc004).portr("DSW2"); - map(0xc4c9, 0xc4cb).r(this, FUNC(gunsmoke_state::gunsmoke_protection_r)); + map(0xc4c9, 0xc4cb).r(FUNC(gunsmoke_state::gunsmoke_protection_r)); map(0xc800, 0xc800).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc804, 0xc804).w(this, FUNC(gunsmoke_state::gunsmoke_c804_w)); // ROM bank switch, screen flip + map(0xc804, 0xc804).w(FUNC(gunsmoke_state::gunsmoke_c804_w)); // ROM bank switch, screen flip map(0xc806, 0xc806).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xd000, 0xd3ff).ram().w(this, FUNC(gunsmoke_state::gunsmoke_videoram_w)).share("videoram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(gunsmoke_state::gunsmoke_colorram_w)).share("colorram"); + map(0xd000, 0xd3ff).ram().w(FUNC(gunsmoke_state::gunsmoke_videoram_w)).share("videoram"); + map(0xd400, 0xd7ff).ram().w(FUNC(gunsmoke_state::gunsmoke_colorram_w)).share("colorram"); map(0xd800, 0xd801).ram().share("scrollx"); map(0xd802, 0xd802).ram().share("scrolly"); - map(0xd806, 0xd806).w(this, FUNC(gunsmoke_state::gunsmoke_d806_w)); // sprites and bg enable + map(0xd806, 0xd806).w(FUNC(gunsmoke_state::gunsmoke_d806_w)); // sprites and bg enable map(0xe000, 0xefff).ram(); map(0xf000, 0xffff).ram().share("spriteram"); } diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp index 251e092fa25..b99b740917a 100644 --- a/src/mame/drivers/gyruss.cpp +++ b/src/mame/drivers/gyruss.cpp @@ -194,7 +194,7 @@ void gyruss_state::main_cpu1_map(address_map &map) map(0x9000, 0x9fff).ram(); map(0xa000, 0xa7ff).ram().share("share1"); map(0xc000, 0xc000).portr("DSW2").nopw(); /* watchdog reset */ - map(0xc080, 0xc080).portr("SYSTEM").w(this, FUNC(gyruss_state::gyruss_sh_irqtrigger_w)); + map(0xc080, 0xc080).portr("SYSTEM").w(FUNC(gyruss_state::gyruss_sh_irqtrigger_w)); map(0xc0a0, 0xc0a0).portr("P1"); map(0xc0c0, 0xc0c0).portr("P2"); map(0xc0e0, 0xc0e0).portr("DSW1"); @@ -204,10 +204,10 @@ void gyruss_state::main_cpu1_map(address_map &map) void gyruss_state::main_cpu2_map(address_map &map) { - map(0x0000, 0x0000).r(this, FUNC(gyruss_state::gyruss_scanline_r)); - map(0x2000, 0x2000).w(this, FUNC(gyruss_state::slave_irq_mask_w)).nopr(); + map(0x0000, 0x0000).r(FUNC(gyruss_state::gyruss_scanline_r)); + map(0x2000, 0x2000).w(FUNC(gyruss_state::slave_irq_mask_w)).nopr(); map(0x4000, 0x403f).ram(); - map(0x4040, 0x40ff).ram().w(this, FUNC(gyruss_state::gyruss_spriteram_w)).share("spriteram"); + map(0x4040, 0x40ff).ram().w(FUNC(gyruss_state::gyruss_spriteram_w)).share("spriteram"); map(0x4100, 0x47ff).ram(); map(0x6000, 0x67ff).ram().share("share1"); map(0xe000, 0xffff).rom(); @@ -238,7 +238,7 @@ void gyruss_state::audio_cpu1_io_map(address_map &map) map(0x10, 0x10).w("ay5", FUNC(ay8910_device::address_w)); map(0x11, 0x11).r("ay5", FUNC(ay8910_device::data_r)); map(0x12, 0x12).w("ay5", FUNC(ay8910_device::data_w)); - map(0x14, 0x14).w(this, FUNC(gyruss_state::gyruss_i8039_irq_w)); + map(0x14, 0x14).w(FUNC(gyruss_state::gyruss_i8039_irq_w)); map(0x18, 0x18).w("soundlatch2", FUNC(generic_latch_8_device::write)); } diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index c38b7a44a8b..28c17da6469 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -173,10 +173,10 @@ void h19_state::io_map(address_map &map) map(0x40, 0x47).mirror(0x18).rw(m_ace, FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); map(0x60, 0x60).mirror(0x1E).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x61, 0x61).mirror(0x1E).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x80, 0x80).mirror(0x1f).r(this, FUNC(h19_state::kbd_key_r)); - map(0xA0, 0xA0).mirror(0x1f).r(this, FUNC(h19_state::kbd_flags_r)); - map(0xC0, 0xC0).mirror(0x1f).w(this, FUNC(h19_state::h19_keyclick_w)); - map(0xE0, 0xE0).mirror(0x1f).w(this, FUNC(h19_state::h19_bell_w)); + map(0x80, 0x80).mirror(0x1f).r(FUNC(h19_state::kbd_key_r)); + map(0xA0, 0xA0).mirror(0x1f).r(FUNC(h19_state::kbd_flags_r)); + map(0xC0, 0xC0).mirror(0x1f).w(FUNC(h19_state::h19_keyclick_w)); + map(0xE0, 0xE0).mirror(0x1f).w(FUNC(h19_state::h19_bell_w)); } /* Input ports */ diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp index 221fe4b78ea..4c9cf9e55d5 100644 --- a/src/mame/drivers/h8.cpp +++ b/src/mame/drivers/h8.cpp @@ -193,8 +193,8 @@ void h8_state::h8_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0xf0, 0xf0).rw(this, FUNC(h8_state::portf0_r), FUNC(h8_state::portf0_w)); - map(0xf1, 0xf1).w(this, FUNC(h8_state::portf1_w)); + map(0xf0, 0xf0).rw(FUNC(h8_state::portf0_r), FUNC(h8_state::portf0_w)); + map(0xf1, 0xf1).w(FUNC(h8_state::portf1_w)); map(0xf8, 0xf8).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xf9, 0xf9).rw(m_uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); // optional connection to a serial terminal @ 600 baud diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp index c8da36109f1..88985d48b1e 100644 --- a/src/mame/drivers/h89.cpp +++ b/src/mame/drivers/h89.cpp @@ -84,7 +84,7 @@ void h89_state::h89_io(address_map &map) // the H19 code could be connected and ran // as a separate thread. // AM_RANGE(0xf0, 0xf1) // ports defined on the H8 - on the H89, access to these addresses causes a NMI - map(0xf2, 0xf2).w(this, FUNC(h89_state::port_f2_w)).portr("SW501"); + map(0xf2, 0xf2).w(FUNC(h89_state::port_f2_w)).portr("SW501"); // AM_RANGE(0xf3, 0xf3) // ports defined on the H8 - on the H89, access to these addresses causes a NMI } diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp index 0e1c9069de5..3b2f80dfe4a 100644 --- a/src/mame/drivers/halleys.cpp +++ b/src/mame/drivers/halleys.cpp @@ -1635,29 +1635,29 @@ READ8_MEMBER(halleys_state::io_mirror_r) void halleys_state::halleys_map(address_map &map) { - map(0x0000, 0x0fff).rw(this, FUNC(halleys_state::blitter_r), FUNC(halleys_state::blitter_w)).share("blitter_ram"); - map(0x1f00, 0x1fff).w(this, FUNC(halleys_state::bgtile_w)); // background tiles?(Ben Bero Beh only) + map(0x0000, 0x0fff).rw(FUNC(halleys_state::blitter_r), FUNC(halleys_state::blitter_w)).share("blitter_ram"); + map(0x1f00, 0x1fff).w(FUNC(halleys_state::bgtile_w)); // background tiles?(Ben Bero Beh only) map(0x1000, 0xefff).rom(); map(0xf000, 0xfeff).ram(); // work ram map(0xff00, 0xffbf).ram().share("io_ram"); // I/O write fall-through - map(0xff66, 0xff66).r(this, FUNC(halleys_state::collision_id_r)); // HACK: collision detection bypass(Halley's Comet only) - map(0xff71, 0xff71).r(this, FUNC(halleys_state::blitter_status_r)); - map(0xff80, 0xff83).r(this, FUNC(halleys_state::io_mirror_r)); - map(0xff8a, 0xff8a).w(this, FUNC(halleys_state::soundcommand_w)); + map(0xff66, 0xff66).r(FUNC(halleys_state::collision_id_r)); // HACK: collision detection bypass(Halley's Comet only) + map(0xff71, 0xff71).r(FUNC(halleys_state::blitter_status_r)); + map(0xff80, 0xff83).r(FUNC(halleys_state::io_mirror_r)); + map(0xff8a, 0xff8a).w(FUNC(halleys_state::soundcommand_w)); map(0xff90, 0xff90).portr("IN0"); // coin/start map(0xff91, 0xff91).portr("IN1"); // player 1 map(0xff92, 0xff92).portr("IN2"); // player 2 map(0xff93, 0xff93).portr("IN3"); // unused? - map(0xff94, 0xff94).r(this, FUNC(halleys_state::coin_lockout_r)); + map(0xff94, 0xff94).r(FUNC(halleys_state::coin_lockout_r)); map(0xff95, 0xff95).portr("DSW1"); // dipswitch 4 map(0xff96, 0xff96).portr("DSW2"); // dipswitch 3 map(0xff97, 0xff97).portr("DSW3"); // dipswitch 2 - map(0xff9c, 0xff9c).w(this, FUNC(halleys_state::firq_ack_w)); + map(0xff9c, 0xff9c).w(FUNC(halleys_state::firq_ack_w)); - map(0xffc0, 0xffdf).rw(this, FUNC(halleys_state::paletteram_r), FUNC(halleys_state::paletteram_w)); - map(0xffe0, 0xffff).r(this, FUNC(halleys_state::vector_r)); + map(0xffc0, 0xffdf).rw(FUNC(halleys_state::paletteram_r), FUNC(halleys_state::paletteram_w)); + map(0xffe0, 0xffff).r(FUNC(halleys_state::vector_r)); } diff --git a/src/mame/drivers/hanaawas.cpp b/src/mame/drivers/hanaawas.cpp index 5d62615fd89..9d6124346bf 100644 --- a/src/mame/drivers/hanaawas.cpp +++ b/src/mame/drivers/hanaawas.cpp @@ -104,18 +104,18 @@ void hanaawas_state::hanaawas_map(address_map &map) map(0x0000, 0x2fff).rom(); map(0x4000, 0x4fff).rom(); map(0x6000, 0x6fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(hanaawas_state::hanaawas_videoram_w)).share("videoram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(hanaawas_state::hanaawas_colorram_w)).share("colorram"); + map(0x8000, 0x83ff).ram().w(FUNC(hanaawas_state::hanaawas_videoram_w)).share("videoram"); + map(0x8400, 0x87ff).ram().w(FUNC(hanaawas_state::hanaawas_colorram_w)).share("colorram"); map(0x8800, 0x8bff).ram(); - map(0xb000, 0xb000).w(this, FUNC(hanaawas_state::irq_ack_w)); + map(0xb000, 0xb000).w(FUNC(hanaawas_state::irq_ack_w)); } void hanaawas_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(hanaawas_state::hanaawas_input_port_0_r), FUNC(hanaawas_state::hanaawas_inputs_mux_w)); - map(0x01, 0x01).nopr().w(this, FUNC(hanaawas_state::key_matrix_status_w)); /* r bit 1: status ready, presumably of the input mux device / w = configure device? */ + map(0x00, 0x00).rw(FUNC(hanaawas_state::hanaawas_input_port_0_r), FUNC(hanaawas_state::hanaawas_inputs_mux_w)); + map(0x01, 0x01).nopr().w(FUNC(hanaawas_state::key_matrix_status_w)); /* r bit 1: status ready, presumably of the input mux device / w = configure device? */ map(0x10, 0x10).r("aysnd", FUNC(ay8910_device::data_r)); map(0x10, 0x11).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xc0, 0xc0).nopw(); // watchdog diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index c6f4f887a82..ac636694e64 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -542,19 +542,19 @@ void harddriv_state::driver_68k_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x0fffff).rom(); - map(0x600000, 0x603fff).r(this, FUNC(harddriv_state::hd68k_port0_r)); - map(0x604000, 0x607fff).w(this, FUNC(harddriv_state::hd68k_nwr_w)); + map(0x600000, 0x603fff).r(FUNC(harddriv_state::hd68k_port0_r)); + map(0x604000, 0x607fff).w(FUNC(harddriv_state::hd68k_nwr_w)); map(0x608000, 0x60bfff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x60c000, 0x60ffff).w(this, FUNC(harddriv_state::hd68k_irq_ack_w)); - map(0xa00000, 0xa7ffff).w(this, FUNC(harddriv_state::hd68k_wr0_write)); - map(0xa80000, 0xafffff).r(this, FUNC(harddriv_state::hd68k_a80000_r)).w(this, FUNC(harddriv_state::hd68k_wr1_write)); + map(0x60c000, 0x60ffff).w(FUNC(harddriv_state::hd68k_irq_ack_w)); + map(0xa00000, 0xa7ffff).w(FUNC(harddriv_state::hd68k_wr0_write)); + map(0xa80000, 0xafffff).r(FUNC(harddriv_state::hd68k_a80000_r)).w(FUNC(harddriv_state::hd68k_wr1_write)); map(0xb00001, 0xb00001).mirror(0x7fffe).r("adc8", FUNC(adc0808_device::data_r)); - map(0xb00000, 0xb7ffff).w(this, FUNC(harddriv_state::hd68k_wr2_write)); - map(0xb80000, 0xbfffff).rw(this, FUNC(harddriv_state::hd68k_adc12_r), FUNC(harddriv_state::hd68k_adc_control_w)); - map(0xc00000, 0xc03fff).rw(this, FUNC(harddriv_state::hd68k_gsp_io_r), FUNC(harddriv_state::hd68k_gsp_io_w)); - map(0xc04000, 0xc07fff).rw(this, FUNC(harddriv_state::hd68k_msp_io_r), FUNC(harddriv_state::hd68k_msp_io_w)); + map(0xb00000, 0xb7ffff).w(FUNC(harddriv_state::hd68k_wr2_write)); + map(0xb80000, 0xbfffff).rw(FUNC(harddriv_state::hd68k_adc12_r), FUNC(harddriv_state::hd68k_adc_control_w)); + map(0xc00000, 0xc03fff).rw(FUNC(harddriv_state::hd68k_gsp_io_r), FUNC(harddriv_state::hd68k_gsp_io_w)); + map(0xc04000, 0xc07fff).rw(FUNC(harddriv_state::hd68k_msp_io_r), FUNC(harddriv_state::hd68k_msp_io_w)); map(0xff0000, 0xff001f).rw("duartn68681", FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0xff00); - map(0xff4000, 0xff4fff).rw(this, FUNC(harddriv_state::hd68k_zram_r), FUNC(harddriv_state::hd68k_zram_w)); + map(0xff4000, 0xff4fff).rw(FUNC(harddriv_state::hd68k_zram_r), FUNC(harddriv_state::hd68k_zram_w)); map(0xff8000, 0xffffff).ram(); } @@ -563,12 +563,12 @@ void harddriv_state::driver_gsp_map(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x0000200f).noprw(); /* hit during self-test */ - map(0x02000000, 0x0207ffff).rw(this, FUNC(harddriv_state::hdgsp_vram_2bpp_r), FUNC(harddriv_state::hdgsp_vram_1bpp_w)); + map(0x02000000, 0x0207ffff).rw(FUNC(harddriv_state::hdgsp_vram_2bpp_r), FUNC(harddriv_state::hdgsp_vram_1bpp_w)); map(0xc0000000, 0xc00001ff).rw("gsp", FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); - map(0xf4000000, 0xf40000ff).rw(this, FUNC(harddriv_state::hdgsp_control_lo_r), FUNC(harddriv_state::hdgsp_control_lo_w)).share("gsp_control_lo"); - map(0xf4800000, 0xf48000ff).rw(this, FUNC(harddriv_state::hdgsp_control_hi_r), FUNC(harddriv_state::hdgsp_control_hi_w)).share("gsp_control_hi"); - map(0xf5000000, 0xf5000fff).rw(this, FUNC(harddriv_state::hdgsp_paletteram_lo_r), FUNC(harddriv_state::hdgsp_paletteram_lo_w)).share("gsp_palram_lo"); - map(0xf5800000, 0xf5800fff).rw(this, FUNC(harddriv_state::hdgsp_paletteram_hi_r), FUNC(harddriv_state::hdgsp_paletteram_hi_w)).share("gsp_palram_hi"); + map(0xf4000000, 0xf40000ff).rw(FUNC(harddriv_state::hdgsp_control_lo_r), FUNC(harddriv_state::hdgsp_control_lo_w)).share("gsp_control_lo"); + map(0xf4800000, 0xf48000ff).rw(FUNC(harddriv_state::hdgsp_control_hi_r), FUNC(harddriv_state::hdgsp_control_hi_w)).share("gsp_control_hi"); + map(0xf5000000, 0xf5000fff).rw(FUNC(harddriv_state::hdgsp_paletteram_lo_r), FUNC(harddriv_state::hdgsp_paletteram_lo_w)).share("gsp_palram_lo"); + map(0xf5800000, 0xf5800fff).rw(FUNC(harddriv_state::hdgsp_paletteram_hi_r), FUNC(harddriv_state::hdgsp_paletteram_hi_w)).share("gsp_palram_hi"); map(0xff800000, 0xffffffff).ram().share("gsp_vram"); } @@ -594,18 +594,18 @@ void harddriv_state::multisync_68k_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x0fffff).rom(); - map(0x604000, 0x607fff).rw(this, FUNC(harddriv_state::hd68k_sound_reset_r), FUNC(harddriv_state::hd68k_nwr_w)); + map(0x604000, 0x607fff).rw(FUNC(harddriv_state::hd68k_sound_reset_r), FUNC(harddriv_state::hd68k_nwr_w)); map(0x608000, 0x60bfff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x60c000, 0x60ffff).rw(this, FUNC(harddriv_state::hd68k_port0_r), FUNC(harddriv_state::hd68k_irq_ack_w)); - map(0xa00000, 0xa7ffff).w(this, FUNC(harddriv_state::hd68k_wr0_write)); - map(0xa80000, 0xafffff).r(this, FUNC(harddriv_state::hd68k_a80000_r)).w(this, FUNC(harddriv_state::hd68k_wr1_write)); + map(0x60c000, 0x60ffff).rw(FUNC(harddriv_state::hd68k_port0_r), FUNC(harddriv_state::hd68k_irq_ack_w)); + map(0xa00000, 0xa7ffff).w(FUNC(harddriv_state::hd68k_wr0_write)); + map(0xa80000, 0xafffff).r(FUNC(harddriv_state::hd68k_a80000_r)).w(FUNC(harddriv_state::hd68k_wr1_write)); map(0xb00001, 0xb00001).mirror(0x7fffe).r("adc8", FUNC(adc0808_device::data_r)); - map(0xb00000, 0xb7ffff).w(this, FUNC(harddriv_state::hd68k_wr2_write)); - map(0xb80000, 0xbfffff).rw(this, FUNC(harddriv_state::hd68k_adc12_r), FUNC(harddriv_state::hd68k_adc_control_w)); - map(0xc00000, 0xc03fff).rw(this, FUNC(harddriv_state::hd68k_gsp_io_r), FUNC(harddriv_state::hd68k_gsp_io_w)); - map(0xc04000, 0xc07fff).rw(this, FUNC(harddriv_state::hd68k_msp_io_r), FUNC(harddriv_state::hd68k_msp_io_w)); + map(0xb00000, 0xb7ffff).w(FUNC(harddriv_state::hd68k_wr2_write)); + map(0xb80000, 0xbfffff).rw(FUNC(harddriv_state::hd68k_adc12_r), FUNC(harddriv_state::hd68k_adc_control_w)); + map(0xc00000, 0xc03fff).rw(FUNC(harddriv_state::hd68k_gsp_io_r), FUNC(harddriv_state::hd68k_gsp_io_w)); + map(0xc04000, 0xc07fff).rw(FUNC(harddriv_state::hd68k_msp_io_r), FUNC(harddriv_state::hd68k_msp_io_w)); map(0xff0000, 0xff001f).rw("duartn68681", FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0xff00); - map(0xff4000, 0xff4fff).rw(this, FUNC(harddriv_state::hd68k_zram_r), FUNC(harddriv_state::hd68k_zram_w)); + map(0xff4000, 0xff4fff).rw(FUNC(harddriv_state::hd68k_zram_r), FUNC(harddriv_state::hd68k_zram_w)); map(0xff8000, 0xffffff).ram(); } @@ -614,12 +614,12 @@ void harddriv_state::multisync_gsp_map(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x0000200f).noprw(); /* hit during self-test */ - map(0x02000000, 0x020fffff).rw(this, FUNC(harddriv_state::hdgsp_vram_2bpp_r), FUNC(harddriv_state::hdgsp_vram_2bpp_w)); - map(0xc0000000, 0xc00001ff).r("gsp", FUNC(tms34010_device::io_register_r)).w(this, FUNC(harddriv_state::hdgsp_io_w)); - map(0xf4000000, 0xf40000ff).rw(this, FUNC(harddriv_state::hdgsp_control_lo_r), FUNC(harddriv_state::hdgsp_control_lo_w)).share("gsp_control_lo"); - map(0xf4800000, 0xf48000ff).rw(this, FUNC(harddriv_state::hdgsp_control_hi_r), FUNC(harddriv_state::hdgsp_control_hi_w)).share("gsp_control_hi"); - map(0xf5000000, 0xf5000fff).rw(this, FUNC(harddriv_state::hdgsp_paletteram_lo_r), FUNC(harddriv_state::hdgsp_paletteram_lo_w)).share("gsp_palram_lo"); - map(0xf5800000, 0xf5800fff).rw(this, FUNC(harddriv_state::hdgsp_paletteram_hi_r), FUNC(harddriv_state::hdgsp_paletteram_hi_w)).share("gsp_palram_hi"); + map(0x02000000, 0x020fffff).rw(FUNC(harddriv_state::hdgsp_vram_2bpp_r), FUNC(harddriv_state::hdgsp_vram_2bpp_w)); + map(0xc0000000, 0xc00001ff).r("gsp", FUNC(tms34010_device::io_register_r)).w(FUNC(harddriv_state::hdgsp_io_w)); + map(0xf4000000, 0xf40000ff).rw(FUNC(harddriv_state::hdgsp_control_lo_r), FUNC(harddriv_state::hdgsp_control_lo_w)).share("gsp_control_lo"); + map(0xf4800000, 0xf48000ff).rw(FUNC(harddriv_state::hdgsp_control_hi_r), FUNC(harddriv_state::hdgsp_control_hi_w)).share("gsp_control_hi"); + map(0xf5000000, 0xf5000fff).rw(FUNC(harddriv_state::hdgsp_paletteram_lo_r), FUNC(harddriv_state::hdgsp_paletteram_lo_w)).share("gsp_palram_lo"); + map(0xf5800000, 0xf5800fff).rw(FUNC(harddriv_state::hdgsp_paletteram_hi_r), FUNC(harddriv_state::hdgsp_paletteram_hi_w)).share("gsp_palram_hi"); map(0xff800000, 0xffbfffff).mirror(0x0400000).ram().share("gsp_vram"); } @@ -635,18 +635,18 @@ void harddriv_state::multisync2_68k_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).rom(); - map(0x604000, 0x607fff).w(this, FUNC(harddriv_state::hd68k_nwr_w)); + map(0x604000, 0x607fff).w(FUNC(harddriv_state::hd68k_nwr_w)); map(0x608000, 0x60bfff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x60c000, 0x60ffff).rw(this, FUNC(harddriv_state::hd68k_port0_r), FUNC(harddriv_state::hd68k_irq_ack_w)); - map(0xa00000, 0xa7ffff).w(this, FUNC(harddriv_state::hd68k_wr0_write)); - map(0xa80000, 0xafffff).r(this, FUNC(harddriv_state::hd68k_a80000_r)).w(this, FUNC(harddriv_state::hd68k_wr1_write)); + map(0x60c000, 0x60ffff).rw(FUNC(harddriv_state::hd68k_port0_r), FUNC(harddriv_state::hd68k_irq_ack_w)); + map(0xa00000, 0xa7ffff).w(FUNC(harddriv_state::hd68k_wr0_write)); + map(0xa80000, 0xafffff).r(FUNC(harddriv_state::hd68k_a80000_r)).w(FUNC(harddriv_state::hd68k_wr1_write)); map(0xb00001, 0xb00001).mirror(0x7fffe).r("adc8", FUNC(adc0808_device::data_r)); - map(0xb00000, 0xb7ffff).w(this, FUNC(harddriv_state::hd68k_wr2_write)); - map(0xb80000, 0xbfffff).rw(this, FUNC(harddriv_state::hd68k_adc12_r), FUNC(harddriv_state::hd68k_adc_control_w)); - map(0xc00000, 0xc03fff).rw(this, FUNC(harddriv_state::hd68k_gsp_io_r), FUNC(harddriv_state::hd68k_gsp_io_w)); - map(0xc04000, 0xc07fff).rw(this, FUNC(harddriv_state::hd68k_msp_io_r), FUNC(harddriv_state::hd68k_msp_io_w)); + map(0xb00000, 0xb7ffff).w(FUNC(harddriv_state::hd68k_wr2_write)); + map(0xb80000, 0xbfffff).rw(FUNC(harddriv_state::hd68k_adc12_r), FUNC(harddriv_state::hd68k_adc_control_w)); + map(0xc00000, 0xc03fff).rw(FUNC(harddriv_state::hd68k_gsp_io_r), FUNC(harddriv_state::hd68k_gsp_io_w)); + map(0xc04000, 0xc07fff).rw(FUNC(harddriv_state::hd68k_msp_io_r), FUNC(harddriv_state::hd68k_msp_io_w)); map(0xfc0000, 0xfc001f).rw("duartn68681", FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0xff00); - map(0xfd0000, 0xfd0fff).mirror(0x004000).rw(this, FUNC(harddriv_state::hd68k_zram_r), FUNC(harddriv_state::hd68k_zram_w)); + map(0xfd0000, 0xfd0fff).mirror(0x004000).rw(FUNC(harddriv_state::hd68k_zram_r), FUNC(harddriv_state::hd68k_zram_w)); map(0xff0000, 0xffffff).ram(); } @@ -656,12 +656,12 @@ void harddriv_state::multisync2_gsp_map(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x0000200f).noprw(); /* hit during self-test */ - map(0x02000000, 0x020fffff).rw(this, FUNC(harddriv_state::hdgsp_vram_2bpp_r), FUNC(harddriv_state::hdgsp_vram_2bpp_w)); - map(0xc0000000, 0xc00001ff).r("gsp", FUNC(tms34010_device::io_register_r)).w(this, FUNC(harddriv_state::hdgsp_io_w)); - map(0xf4000000, 0xf40000ff).rw(this, FUNC(harddriv_state::hdgsp_control_lo_r), FUNC(harddriv_state::hdgsp_control_lo_w)).share("gsp_control_lo"); - map(0xf4800000, 0xf48000ff).rw(this, FUNC(harddriv_state::hdgsp_control_hi_r), FUNC(harddriv_state::hdgsp_control_hi_w)).share("gsp_control_hi"); - map(0xf5000000, 0xf5000fff).rw(this, FUNC(harddriv_state::hdgsp_paletteram_lo_r), FUNC(harddriv_state::hdgsp_paletteram_lo_w)).share("gsp_palram_lo"); - map(0xf5800000, 0xf5800fff).rw(this, FUNC(harddriv_state::hdgsp_paletteram_hi_r), FUNC(harddriv_state::hdgsp_paletteram_hi_w)).share("gsp_palram_hi"); + map(0x02000000, 0x020fffff).rw(FUNC(harddriv_state::hdgsp_vram_2bpp_r), FUNC(harddriv_state::hdgsp_vram_2bpp_w)); + map(0xc0000000, 0xc00001ff).r("gsp", FUNC(tms34010_device::io_register_r)).w(FUNC(harddriv_state::hdgsp_io_w)); + map(0xf4000000, 0xf40000ff).rw(FUNC(harddriv_state::hdgsp_control_lo_r), FUNC(harddriv_state::hdgsp_control_lo_w)).share("gsp_control_lo"); + map(0xf4800000, 0xf48000ff).rw(FUNC(harddriv_state::hdgsp_control_hi_r), FUNC(harddriv_state::hdgsp_control_hi_w)).share("gsp_control_hi"); + map(0xf5000000, 0xf5000fff).rw(FUNC(harddriv_state::hdgsp_paletteram_lo_r), FUNC(harddriv_state::hdgsp_paletteram_lo_w)).share("gsp_palram_lo"); + map(0xf5800000, 0xf5800fff).rw(FUNC(harddriv_state::hdgsp_paletteram_hi_r), FUNC(harddriv_state::hdgsp_paletteram_hi_w)).share("gsp_palram_hi"); map(0xff800000, 0xffffffff).ram().share("gsp_vram"); } @@ -685,7 +685,7 @@ void harddriv_state::adsp_data_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x1fff).ram().share("adsp_data"); - map(0x2000, 0x2fff).rw(this, FUNC(harddriv_state::hdadsp_special_r), FUNC(harddriv_state::hdadsp_special_w)); + map(0x2000, 0x2fff).rw(FUNC(harddriv_state::hdadsp_special_r), FUNC(harddriv_state::hdadsp_special_w)); } @@ -707,9 +707,9 @@ void harddriv_state::ds3_data_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x1fff).ram().share("adsp_data"); - map(0x2000, 0x3fff).rw(this, FUNC(harddriv_state::hdds3_special_r), FUNC(harddriv_state::hdds3_special_w)); + map(0x2000, 0x3fff).rw(FUNC(harddriv_state::hdds3_special_r), FUNC(harddriv_state::hdds3_special_w)); map(0x3800, 0x3bff).ram(); /* internal RAM */ - map(0x3fe0, 0x3fff).rw(this, FUNC(harddriv_state::hdds3_control_r), FUNC(harddriv_state::hdds3_control_w)); /* adsp control regs */ + map(0x3fe0, 0x3fff).rw(FUNC(harddriv_state::hdds3_control_r), FUNC(harddriv_state::hdds3_control_w)); /* adsp control regs */ } @@ -722,9 +722,9 @@ void harddriv_state::ds3sdsp_program_map(address_map &map) void harddriv_state::ds3sdsp_data_map(address_map &map) { map.unmap_value_high(); - map(0x2000, 0x3fff).rw(this, FUNC(harddriv_state::hdds3_sdsp_special_r), FUNC(harddriv_state::hdds3_sdsp_special_w)); + map(0x2000, 0x3fff).rw(FUNC(harddriv_state::hdds3_sdsp_special_r), FUNC(harddriv_state::hdds3_sdsp_special_w)); map(0x3800, 0x39ff).ram(); /* internal RAM */ - map(0x3fe0, 0x3fff).rw(this, FUNC(harddriv_state::hdds3_sdsp_control_r), FUNC(harddriv_state::hdds3_sdsp_control_w)); + map(0x3fe0, 0x3fff).rw(FUNC(harddriv_state::hdds3_sdsp_control_r), FUNC(harddriv_state::hdds3_sdsp_control_w)); } @@ -739,7 +739,7 @@ void harddriv_state::ds3xdsp_data_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x1fff).ram(); // TODO map(0x3800, 0x39ff).ram(); /* internal RAM */ - map(0x3fe0, 0x3fff).rw(this, FUNC(harddriv_state::hdds3_xdsp_control_r), FUNC(harddriv_state::hdds3_xdsp_control_w)); + map(0x3fe0, 0x3fff).rw(FUNC(harddriv_state::hdds3_xdsp_control_r), FUNC(harddriv_state::hdds3_xdsp_control_w)); } diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp index f09bc18d2e7..4e2b1abec85 100644 --- a/src/mame/drivers/harriet.cpp +++ b/src/mame/drivers/harriet.cpp @@ -57,12 +57,12 @@ READ8_MEMBER(harriet_state::unk_status_r) void harriet_state::harriet_map(address_map &map) { map(0x000000, 0x007fff).rom().region("monitor", 0); - map(0x040000, 0x040fff).rw(this, FUNC(harriet_state::zpram_r), FUNC(harriet_state::zpram_w)).umask16(0xff00); + map(0x040000, 0x040fff).rw(FUNC(harriet_state::zpram_r), FUNC(harriet_state::zpram_w)).umask16(0xff00); map(0x040000, 0x040fff).rw("timekpr", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0x00ff); map(0x7f0000, 0x7fffff).ram(); map(0xf10000, 0xf1001f).rw("duart", FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0xf20000, 0xf2002f).rw("mfp", FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff); - map(0xf4003f, 0xf4003f).r(this, FUNC(harriet_state::unk_status_r)); + map(0xf4003f, 0xf4003f).r(FUNC(harriet_state::unk_status_r)); } static INPUT_PORTS_START( harriet ) diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index 0eb983a8e97..6af85e74140 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -478,18 +478,18 @@ void hazl1500_state::hazl1500_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x07ff).rom(); - map(0x3000, 0x377f).rw(this, FUNC(hazl1500_state::ram_r), FUNC(hazl1500_state::ram_w)); + map(0x3000, 0x377f).rw(FUNC(hazl1500_state::ram_r), FUNC(hazl1500_state::ram_w)); map(0x3780, 0x37ff).ram(); } void hazl1500_state::hazl1500_io(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).rw(this, FUNC(hazl1500_state::status_reg_2_r), FUNC(hazl1500_state::status_reg_3_w)); - map(0xbf, 0xbf).rw(this, FUNC(hazl1500_state::uart_r), FUNC(hazl1500_state::uart_w)); - map(0xdf, 0xdf).r(this, FUNC(hazl1500_state::kbd_encoder_r)); - map(0xef, 0xef).rw(this, FUNC(hazl1500_state::system_test_r), FUNC(hazl1500_state::refresh_address_w)); - map(0xf7, 0xf7).r(this, FUNC(hazl1500_state::kbd_status_latch_r)); + map(0x7f, 0x7f).rw(FUNC(hazl1500_state::status_reg_2_r), FUNC(hazl1500_state::status_reg_3_w)); + map(0xbf, 0xbf).rw(FUNC(hazl1500_state::uart_r), FUNC(hazl1500_state::uart_w)); + map(0xdf, 0xdf).r(FUNC(hazl1500_state::kbd_encoder_r)); + map(0xef, 0xef).rw(FUNC(hazl1500_state::system_test_r), FUNC(hazl1500_state::refresh_address_w)); + map(0xf7, 0xf7).r(FUNC(hazl1500_state::kbd_status_latch_r)); } /* diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp index 76d49f54a0e..ec4c8b0004d 100644 --- a/src/mame/drivers/hcastle.cpp +++ b/src/mame/drivers/hcastle.cpp @@ -43,26 +43,26 @@ WRITE8_MEMBER(hcastle_state::hcastle_coin_w) void hcastle_state::hcastle_map(address_map &map) { - map(0x0000, 0x0007).w(this, FUNC(hcastle_state::hcastle_pf1_control_w)); + map(0x0000, 0x0007).w(FUNC(hcastle_state::hcastle_pf1_control_w)); map(0x0020, 0x003f).ram(); /* rowscroll? */ - map(0x0200, 0x0207).w(this, FUNC(hcastle_state::hcastle_pf2_control_w)); + map(0x0200, 0x0207).w(FUNC(hcastle_state::hcastle_pf2_control_w)); map(0x0220, 0x023f).ram(); /* rowscroll? */ - map(0x0400, 0x0400).w(this, FUNC(hcastle_state::hcastle_bankswitch_w)); + map(0x0400, 0x0400).w(FUNC(hcastle_state::hcastle_bankswitch_w)); map(0x0404, 0x0404).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x0408, 0x0408).w(this, FUNC(hcastle_state::hcastle_soundirq_w)); + map(0x0408, 0x0408).w(FUNC(hcastle_state::hcastle_soundirq_w)); map(0x040c, 0x040c).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0410, 0x0410).portr("SYSTEM").w(this, FUNC(hcastle_state::hcastle_coin_w)); + map(0x0410, 0x0410).portr("SYSTEM").w(FUNC(hcastle_state::hcastle_coin_w)); map(0x0411, 0x0411).portr("P1"); map(0x0412, 0x0412).portr("P2"); map(0x0413, 0x0413).portr("DSW3"); map(0x0414, 0x0414).portr("DSW1"); map(0x0415, 0x0415).portr("DSW2"); - map(0x0418, 0x0418).rw(this, FUNC(hcastle_state::hcastle_gfxbank_r), FUNC(hcastle_state::hcastle_gfxbank_w)); + map(0x0418, 0x0418).rw(FUNC(hcastle_state::hcastle_gfxbank_r), FUNC(hcastle_state::hcastle_gfxbank_w)); map(0x0600, 0x06ff).ram().w(m_palette, FUNC(palette_device::write_indirect)).share("palette"); map(0x0700, 0x1fff).ram(); - map(0x2000, 0x2fff).ram().w(this, FUNC(hcastle_state::hcastle_pf1_video_w)).share("pf1_videoram"); + map(0x2000, 0x2fff).ram().w(FUNC(hcastle_state::hcastle_pf1_video_w)).share("pf1_videoram"); map(0x3000, 0x3fff).ram().share("spriteram"); - map(0x4000, 0x4fff).ram().w(this, FUNC(hcastle_state::hcastle_pf2_video_w)).share("pf2_videoram"); + map(0x4000, 0x4fff).ram().w(FUNC(hcastle_state::hcastle_pf2_video_w)).share("pf2_videoram"); map(0x5000, 0x5fff).ram().share("spriteram2"); map(0x6000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom(); @@ -84,7 +84,7 @@ void hcastle_state::sound_map(address_map &map) map(0x9800, 0x98ff).m("k051649", FUNC(k051649_device::scc_map)); map(0xa000, 0xa001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); - map(0xc000, 0xc000).w(this, FUNC(hcastle_state::sound_bank_w)); /* 7232 bankswitch */ + map(0xc000, 0xc000).w(FUNC(hcastle_state::sound_bank_w)); /* 7232 bankswitch */ map(0xd000, 0xd000).r("soundlatch", FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp index 528f7e4fce9..b9072cb35ae 100644 --- a/src/mame/drivers/headonb.cpp +++ b/src/mame/drivers/headonb.cpp @@ -101,7 +101,7 @@ WRITE8_MEMBER(headonb_state::video_ram_w) void headonb_state::headonb_map(address_map &map) { map(0x0000, 0x3fff).rom().mirror(0x4000); - map(0xe000, 0xe3ff).ram().w(this, FUNC(headonb_state::video_ram_w)).share("video_ram"); + map(0xe000, 0xe3ff).ram().w(FUNC(headonb_state::video_ram_w)).share("video_ram"); map(0xff00, 0xffff).ram(); } diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp index 3c9f8f0bfe4..2e8e32d2be7 100644 --- a/src/mame/drivers/hec2hrp.cpp +++ b/src/mame/drivers/hec2hrp.cpp @@ -101,13 +101,13 @@ void hec2hrp_state::hecdisc2_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); // ROM page handling - map(0x000, 0x00f).rw(this, FUNC(hec2hrp_state::disc2_io00_port_r), FUNC(hec2hrp_state::disc2_io00_port_w)); + map(0x000, 0x00f).rw(FUNC(hec2hrp_state::disc2_io00_port_r), FUNC(hec2hrp_state::disc2_io00_port_w)); // RS232 - 8251 comms handling - map(0x020, 0x02f).rw(this, FUNC(hec2hrp_state::disc2_io20_port_r), FUNC(hec2hrp_state::disc2_io20_port_w)); + map(0x020, 0x02f).rw(FUNC(hec2hrp_state::disc2_io20_port_r), FUNC(hec2hrp_state::disc2_io20_port_w)); // Hector comms handling - map(0x030, 0x03f).rw(this, FUNC(hec2hrp_state::disc2_io30_port_r), FUNC(hec2hrp_state::disc2_io30_port_w)); - map(0x040, 0x04f).rw(this, FUNC(hec2hrp_state::disc2_io40_port_r), FUNC(hec2hrp_state::disc2_io40_port_w)); - map(0x050, 0x05f).rw(this, FUNC(hec2hrp_state::disc2_io50_port_r), FUNC(hec2hrp_state::disc2_io50_port_w)); + map(0x030, 0x03f).rw(FUNC(hec2hrp_state::disc2_io30_port_r), FUNC(hec2hrp_state::disc2_io30_port_w)); + map(0x040, 0x04f).rw(FUNC(hec2hrp_state::disc2_io40_port_r), FUNC(hec2hrp_state::disc2_io40_port_w)); + map(0x050, 0x05f).rw(FUNC(hec2hrp_state::disc2_io50_port_r), FUNC(hec2hrp_state::disc2_io50_port_w)); // uPD765 link map(0x060, 0x061).m(m_upd_fdc, FUNC(upd765a_device::map)); map(0x070, 0x07f).rw(m_upd_fdc, FUNC(upd765a_device::mdma_r), FUNC(upd765a_device::mdma_w)); @@ -120,13 +120,13 @@ void hec2hrp_state::hec2hrp_mem(address_map &map) map(0x0000, 0x3fff).rom(); /* Hardware address mapping */ - map(0x0800, 0x0808).w(this, FUNC(hec2hrp_state::switch_bank_w));/* Bank handling */ - map(0x1000, 0x1000).w(this, FUNC(hec2hrp_state::color_a_w)); /* Color c0/c1 */ - map(0x1800, 0x1800).w(this, FUNC(hec2hrp_state::color_b_w)); /* Color c2/c3 */ - map(0x2000, 0x2003).w(this, FUNC(hec2hrp_state::sn_2000_w)); /* Sound */ - map(0x2800, 0x2803).w(this, FUNC(hec2hrp_state::sn_2800_w)); /* Sound */ - map(0x3000, 0x3000).rw(this, FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w)); /* Write necessary */ - map(0x3800, 0x3807).rw(this, FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w)); /* Keyboard */ + map(0x0800, 0x0808).w(FUNC(hec2hrp_state::switch_bank_w));/* Bank handling */ + map(0x1000, 0x1000).w(FUNC(hec2hrp_state::color_a_w)); /* Color c0/c1 */ + map(0x1800, 0x1800).w(FUNC(hec2hrp_state::color_b_w)); /* Color c2/c3 */ + map(0x2000, 0x2003).w(FUNC(hec2hrp_state::sn_2000_w)); /* Sound */ + map(0x2800, 0x2803).w(FUNC(hec2hrp_state::sn_2800_w)); /* Sound */ + map(0x3000, 0x3000).rw(FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w)); /* Write necessary */ + map(0x3800, 0x3807).rw(FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w)); /* Keyboard */ /* Video br mapping */ map(0x4000, 0x49ff).ram().share("videoram"); @@ -143,13 +143,13 @@ void hec2hrp_state::hec2hrx_mem(address_map &map) map(0x0000, 0x3fff).bankr("bank2"); /* Hardware address mapping*/ - map(0x0800, 0x0808).w(this, FUNC(hec2hrp_state::switch_bank_w));/* Bank handling */ - map(0x1000, 0x1000).w(this, FUNC(hec2hrp_state::color_a_w)); /* Color c0/c1 */ - map(0x1800, 0x1800).w(this, FUNC(hec2hrp_state::color_b_w)); /* Color c2/c3 */ - map(0x2000, 0x2003).w(this, FUNC(hec2hrp_state::sn_2000_w)); /* Sound */ - map(0x2800, 0x2803).w(this, FUNC(hec2hrp_state::sn_2800_w)); /* Sound */ - map(0x3000, 0x3000).rw(this, FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w)); /* Write necessary */ - map(0x3800, 0x3807).rw(this, FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w)); /* Keyboard */ + map(0x0800, 0x0808).w(FUNC(hec2hrp_state::switch_bank_w));/* Bank handling */ + map(0x1000, 0x1000).w(FUNC(hec2hrp_state::color_a_w)); /* Color c0/c1 */ + map(0x1800, 0x1800).w(FUNC(hec2hrp_state::color_b_w)); /* Color c2/c3 */ + map(0x2000, 0x2003).w(FUNC(hec2hrp_state::sn_2000_w)); /* Sound */ + map(0x2800, 0x2803).w(FUNC(hec2hrp_state::sn_2800_w)); /* Sound */ + map(0x3000, 0x3000).rw(FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w)); /* Write necessary */ + map(0x3800, 0x3807).rw(FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w)); /* Keyboard */ /* Video br mapping */ map(0x4000, 0x49ff).ram().share("videoram"); @@ -163,14 +163,14 @@ void hec2hrp_state::hec2hrp_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x000, 0x0ff).rw(this, FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); + map(0x000, 0x0ff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); } void hec2hrp_state::hec2hrx_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x0f0, 0x0ff).rw(this, FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); + map(0x0f0, 0x0ff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); } void hec2hrp_state::hec2mdhrx_io(address_map &map) @@ -180,24 +180,24 @@ void hec2hrp_state::hec2mdhrx_io(address_map &map) // Minidisc commands and changing the rom page */ map(0x04, 0x07).rw(m_minidisc_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0x08, 0x08).w(this, FUNC(hec2hrp_state::minidisc_control_w)); - map(0x0f0, 0x0ff).rw(this, FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); + map(0x08, 0x08).w(FUNC(hec2hrp_state::minidisc_control_w)); + map(0x0f0, 0x0ff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); } void hec2hrp_state::hec2mx40_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x000, 0x0ef).w(this, FUNC(hec2hrp_state::mx40_io_port_w)); - map(0x0f0, 0x0f3).rw(this, FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); + map(0x000, 0x0ef).w(FUNC(hec2hrp_state::mx40_io_port_w)); + map(0x0f0, 0x0f3).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); } void hec2hrp_state::hec2mx80_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x000, 0x0ef).w(this, FUNC(hec2hrp_state::mx80_io_port_w)); - map(0x0f0, 0x0f3).rw(this, FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); + map(0x000, 0x0ef).w(FUNC(hec2hrp_state::mx80_io_port_w)); + map(0x0f0, 0x0f3).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w)); } diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp index 4ee5a13f505..587db83f3e6 100644 --- a/src/mame/drivers/hexion.cpp +++ b/src/mame/drivers/hexion.cpp @@ -126,8 +126,8 @@ void hexion_state::hexion_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); map(0xa000, 0xbfff).ram(); - map(0xc000, 0xdffe).rw(this, FUNC(hexion_state::bankedram_r), FUNC(hexion_state::bankedram_w)); - map(0xdfff, 0xdfff).w(this, FUNC(hexion_state::bankctrl_w)); + map(0xc000, 0xdffe).rw(FUNC(hexion_state::bankedram_r), FUNC(hexion_state::bankedram_w)); + map(0xdfff, 0xdfff).w(FUNC(hexion_state::bankctrl_w)); map(0xe000, 0xe000).noprw(); map(0xe800, 0xe8ff).m("k051649", FUNC(k051649_device::scc_map)); map(0xf000, 0xf00f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)); @@ -138,9 +138,9 @@ void hexion_state::hexion_map(address_map &map) map(0xf403, 0xf403).portr("P2"); map(0xf440, 0xf440).portr("DSW3"); map(0xf441, 0xf441).portr("SYSTEM"); - map(0xf480, 0xf480).w(this, FUNC(hexion_state::bankswitch_w)); - map(0xf4c0, 0xf4c0).w(this, FUNC(hexion_state::coincntr_w)); - map(0xf500, 0xf500).w(this, FUNC(hexion_state::gfxrom_select_w)); + map(0xf480, 0xf480).w(FUNC(hexion_state::bankswitch_w)); + map(0xf4c0, 0xf4c0).w(FUNC(hexion_state::coincntr_w)); + map(0xf500, 0xf500).w(FUNC(hexion_state::gfxrom_select_w)); map(0xf540, 0xf540).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -149,8 +149,8 @@ void hexion_state::hexionb_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); map(0xa000, 0xbfff).ram(); - map(0xc000, 0xdffe).rw(this, FUNC(hexion_state::bankedram_r), FUNC(hexion_state::bankedram_w)); - map(0xdfff, 0xdfff).w(this, FUNC(hexion_state::bankctrl_w)); + map(0xc000, 0xdffe).rw(FUNC(hexion_state::bankedram_r), FUNC(hexion_state::bankedram_w)); + map(0xdfff, 0xdfff).w(FUNC(hexion_state::bankctrl_w)); map(0xe000, 0xe000).noprw(); map(0xe800, 0xe87f).noprw(); // all the code to use the k051649 is still present map(0xe880, 0xe889).noprw(); // but the bootleg has an additional M6295 @ 0xf5c0 instead @@ -165,9 +165,9 @@ void hexion_state::hexionb_map(address_map &map) map(0xf403, 0xf403).portr("P2"); map(0xf440, 0xf440).portr("DSW3"); map(0xf441, 0xf441).portr("SYSTEM"); - map(0xf480, 0xf480).w(this, FUNC(hexion_state::bankswitch_w)); - map(0xf4c0, 0xf4c0).w(this, FUNC(hexion_state::coincntr_w)); - map(0xf500, 0xf500).w(this, FUNC(hexion_state::gfxrom_select_w)); + map(0xf480, 0xf480).w(FUNC(hexion_state::bankswitch_w)); + map(0xf4c0, 0xf4c0).w(FUNC(hexion_state::coincntr_w)); + map(0xf500, 0xf500).w(FUNC(hexion_state::gfxrom_select_w)); map(0xf540, 0xf540).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xf5c0, 0xf5c0).w("oki2", FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 2802be6982d..27535ab6ed6 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -1579,7 +1579,7 @@ MACHINE_CONFIG_START(bship82_state::bship82) MCFG_DEVICE_ADD("maincpu", COP420, 750000) // approximation - RC osc. R=14K, C=100pF MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed MCFG_COP400_WRITE_D_CB(WRITE8(*this, bship82_state, write_d)) - MCFG_COP400_WRITE_G_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_COP400_WRITE_G_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_COP400_READ_L_CB(READ8(*this, bship82_state, read_l)) MCFG_COP400_READ_IN_CB(READ8(*this, bship82_state, read_in)) MCFG_COP400_WRITE_SO_CB(WRITELINE(*this, bship82_state, write_so)) @@ -1802,7 +1802,7 @@ MACHINE_CONFIG_START(vidchal_state::vidchal) MCFG_DEVICE_ADD("maincpu", COP420, 900000) // approximation MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed MCFG_COP400_WRITE_D_CB(WRITE8(*this, vidchal_state, write_d)) - MCFG_COP400_WRITE_G_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_COP400_WRITE_G_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_COP400_WRITE_L_CB(WRITE8(*this, vidchal_state, write_l)) MCFG_COP400_READ_IN_CB(IOPORT("IN.0")) MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, vidchal_state, write_sk)) diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp index fb80b78ce31..e938270e8e7 100644 --- a/src/mame/drivers/higemaru.cpp +++ b/src/mame/drivers/higemaru.cpp @@ -41,11 +41,11 @@ void higemaru_state::higemaru_map(address_map &map) map(0xc002, 0xc002).portr("SYSTEM"); map(0xc003, 0xc003).portr("DSW1"); map(0xc004, 0xc004).portr("DSW2"); - map(0xc800, 0xc800).w(this, FUNC(higemaru_state::higemaru_c800_w)); + map(0xc800, 0xc800).w(FUNC(higemaru_state::higemaru_c800_w)); map(0xc801, 0xc802).w("ay1", FUNC(ay8910_device::address_data_w)); map(0xc803, 0xc804).w("ay2", FUNC(ay8910_device::address_data_w)); - map(0xd000, 0xd3ff).ram().w(this, FUNC(higemaru_state::higemaru_videoram_w)).share("videoram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(higemaru_state::higemaru_colorram_w)).share("colorram"); + map(0xd000, 0xd3ff).ram().w(FUNC(higemaru_state::higemaru_videoram_w)).share("videoram"); + map(0xd400, 0xd7ff).ram().w(FUNC(higemaru_state::higemaru_colorram_w)).share("colorram"); map(0xd880, 0xd9ff).ram().share("spriteram"); map(0xe000, 0xefff).ram(); } diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index 6b40faa1962..22bc43434a4 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -328,15 +328,15 @@ void highvdeo_state::tv_vcf_map(address_map &map) void highvdeo_state::tv_vcf_io(address_map &map) { - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps - map(0x0006, 0x0007).w(this, FUNC(highvdeo_state::tv_oki6376_w)); - map(0x0008, 0x0009).r(this, FUNC(highvdeo_state::read0_r)); - map(0x000a, 0x000b).r(this, FUNC(highvdeo_state::read1_r)); - map(0x000c, 0x000d).r(this, FUNC(highvdeo_state::read2_r)); + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps + map(0x0006, 0x0007).w(FUNC(highvdeo_state::tv_oki6376_w)); + map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r)); + map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r)); + map(0x000c, 0x000d).r(FUNC(highvdeo_state::read2_r)); map(0x0010, 0x0010).w("ramdac", FUNC(ramdac_device::index_w)); map(0x0012, 0x0012).w("ramdac", FUNC(ramdac_device::mask_w)); map(0x0014, 0x0014).w("ramdac", FUNC(ramdac_device::pal_w)); - map(0x0030, 0x0031).w(this, FUNC(highvdeo_state::bankselect_w<0x03>)).r(this, FUNC(highvdeo_state::tv_oki6376_r)); + map(0x0030, 0x0031).w(FUNC(highvdeo_state::bankselect_w<0x03>)).r(FUNC(highvdeo_state::tv_oki6376_r)); } @@ -378,12 +378,12 @@ void highvdeo_state::tv_ncf_map(address_map &map) void highvdeo_state::tv_ncf_io(address_map &map) { - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps - map(0x0008, 0x0009).w(this, FUNC(highvdeo_state::tv_ncf_oki6376_w)); - map(0x000a, 0x000b).w(this, FUNC(highvdeo_state::tv_ncf_oki6376_st_w)); - map(0x000c, 0x000d).r(this, FUNC(highvdeo_state::read0_r)); - map(0x0010, 0x0011).r(this, FUNC(highvdeo_state::tv_ncf_read1_r)); - map(0x0012, 0x0013).r(this, FUNC(highvdeo_state::read2_r)); + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps + map(0x0008, 0x0009).w(FUNC(highvdeo_state::tv_ncf_oki6376_w)); + map(0x000a, 0x000b).w(FUNC(highvdeo_state::tv_ncf_oki6376_st_w)); + map(0x000c, 0x000d).r(FUNC(highvdeo_state::read0_r)); + map(0x0010, 0x0011).r(FUNC(highvdeo_state::tv_ncf_read1_r)); + map(0x0012, 0x0013).r(FUNC(highvdeo_state::read2_r)); map(0x0030, 0x0030).w("ramdac", FUNC(ramdac_device::index_w)); map(0x0032, 0x0032).w("ramdac", FUNC(ramdac_device::mask_w)); map(0x0034, 0x0034).w("ramdac", FUNC(ramdac_device::pal_w)); @@ -400,17 +400,17 @@ void highvdeo_state::nyjoker_map(address_map &map) void highvdeo_state::nyjoker_io(address_map &map) { - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps map(0x0002, 0x0003).nopw(); // alternate coin counter (bits 0 and 2) - map(0x0004, 0x0005).w(this, FUNC(highvdeo_state::nyj_write2_w)); // coin and note counter + map(0x0004, 0x0005).w(FUNC(highvdeo_state::nyj_write2_w)); // coin and note counter // AM_RANGE(0x0006, 0x0007) AM_WRITENOP - map(0x0008, 0x0009).w(this, FUNC(highvdeo_state::tv_ncf_oki6376_w)); - map(0x000a, 0x000b).w(this, FUNC(highvdeo_state::tv_ncf_oki6376_st_w)); + map(0x0008, 0x0009).w(FUNC(highvdeo_state::tv_ncf_oki6376_w)); + map(0x000a, 0x000b).w(FUNC(highvdeo_state::tv_ncf_oki6376_st_w)); map(0x000c, 0x000d).portr("IN0"); map(0x000e, 0x000f).portr("DSW"); map(0x0010, 0x0011).portr("IN2"); map(0x0012, 0x0013).portr("IN3"); - map(0x0014, 0x0015).r(this, FUNC(highvdeo_state::tv_ncf_read1_r)); + map(0x0014, 0x0015).r(FUNC(highvdeo_state::tv_ncf_read1_r)); map(0x0020, 0x0021).nopw(); map(0x0030, 0x0030).w("ramdac", FUNC(ramdac_device::index_w)); map(0x0032, 0x0032).w("ramdac", FUNC(ramdac_device::mask_w)); @@ -444,11 +444,11 @@ void highvdeo_state::tv_tcf_map(address_map &map) void highvdeo_state::tv_tcf_io(address_map &map) { - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps - map(0x0006, 0x0007).w(this, FUNC(highvdeo_state::tv_oki6376_w)); - map(0x0008, 0x0009).r(this, FUNC(highvdeo_state::read0_r)); - map(0x000a, 0x000b).r(this, FUNC(highvdeo_state::read1_r)); - map(0x0030, 0x0031).r(this, FUNC(highvdeo_state::read2_r)).w(this, FUNC(highvdeo_state::bankselect_w<0x07>)); + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps + map(0x0006, 0x0007).w(FUNC(highvdeo_state::tv_oki6376_w)); + map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r)); + map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r)); + map(0x0030, 0x0031).r(FUNC(highvdeo_state::read2_r)).w(FUNC(highvdeo_state::bankselect_w<0x07>)); } /**************************** @@ -474,7 +474,7 @@ READ16_MEMBER(highvdeo_state::ciclone_status_r) void highvdeo_state::ciclone_io(address_map &map) { tv_tcf_io(map); - map(0x0030, 0x0033).r(this, FUNC(highvdeo_state::ciclone_status_r)); + map(0x0030, 0x0033).r(FUNC(highvdeo_state::ciclone_status_r)); } /**************************** @@ -542,15 +542,15 @@ void highvdeo_state::newmcard_map(address_map &map) void highvdeo_state::newmcard_io_base(address_map &map) { - map(0x0030, 0x0031).w(this, FUNC(highvdeo_state::bankselect_w<0x07>)); - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps - map(0x0002, 0x0003).w(this, FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout - map(0x0004, 0x0005).w(this, FUNC(highvdeo_state::newmcard_vblank_w)); - map(0x0006, 0x0007).w(this, FUNC(highvdeo_state::tv_oki6376_w)); - map(0x0008, 0x0009).r(this, FUNC(highvdeo_state::read0_r)); - map(0x000a, 0x000b).r(this, FUNC(highvdeo_state::read1_r)); - map(0x000c, 0x000d).r(this, FUNC(highvdeo_state::newmcard_vblank_r)); - map(0x000e, 0x000f).r(this, FUNC(highvdeo_state::read2_r)); + map(0x0030, 0x0031).w(FUNC(highvdeo_state::bankselect_w<0x07>)); + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps + map(0x0002, 0x0003).w(FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout + map(0x0004, 0x0005).w(FUNC(highvdeo_state::newmcard_vblank_w)); + map(0x0006, 0x0007).w(FUNC(highvdeo_state::tv_oki6376_w)); + map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r)); + map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r)); + map(0x000c, 0x000d).r(FUNC(highvdeo_state::newmcard_vblank_r)); + map(0x000e, 0x000f).r(FUNC(highvdeo_state::read2_r)); map(0x0010, 0x0010).w("ramdac", FUNC(ramdac_device::index_w)); map(0x0012, 0x0012).w("ramdac", FUNC(ramdac_device::mask_w)); map(0x0014, 0x0014).w("ramdac", FUNC(ramdac_device::pal_w)); @@ -559,13 +559,13 @@ void highvdeo_state::newmcard_io_base(address_map &map) void highvdeo_state::newmcard_io(address_map &map) { newmcard_io_base(map); - map(0x0030, 0x0033).r(this, FUNC(highvdeo_state::newmcard_status_r)); + map(0x0030, 0x0033).r(FUNC(highvdeo_state::newmcard_status_r)); } void highvdeo_state::record_io(address_map &map) { newmcard_io_base(map); - map(0x0030, 0x0033).r(this, FUNC(highvdeo_state::record_status_r)); + map(0x0030, 0x0033).r(FUNC(highvdeo_state::record_status_r)); } /**************************** @@ -665,14 +665,14 @@ void highvdeo_state::brasil_map(address_map &map) void highvdeo_state::brasil_io(address_map &map) { - map(0x0030, 0x0033).r(this, FUNC(highvdeo_state::brasil_status_r)); - map(0x0030, 0x0031).w(this, FUNC(highvdeo_state::brasil_status_w)); - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps - map(0x0002, 0x0003).w(this, FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout - map(0x0006, 0x0007).w(this, FUNC(highvdeo_state::tv_oki6376_w)); - map(0x0008, 0x0009).r(this, FUNC(highvdeo_state::read0_r)); - map(0x000a, 0x000b).r(this, FUNC(highvdeo_state::read1_r)); - map(0x000e, 0x000f).r(this, FUNC(highvdeo_state::read2_r)); + map(0x0030, 0x0033).r(FUNC(highvdeo_state::brasil_status_r)); + map(0x0030, 0x0031).w(FUNC(highvdeo_state::brasil_status_w)); + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps + map(0x0002, 0x0003).w(FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout + map(0x0006, 0x0007).w(FUNC(highvdeo_state::tv_oki6376_w)); + map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r)); + map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r)); + map(0x000e, 0x000f).r(FUNC(highvdeo_state::read2_r)); // AM_RANGE(0x000e, 0x000f) AM_WRITE // AM_RANGE(0xffa2, 0xffa3) AM_WRITE } @@ -693,34 +693,34 @@ WRITE16_MEMBER(highvdeo_state::fashion_output_w) void highvdeo_state::fashion_io(address_map &map) { brasil_io(map); - map(0x0002, 0x0003).w(this, FUNC(highvdeo_state::fashion_output_w)); + map(0x0002, 0x0003).w(FUNC(highvdeo_state::fashion_output_w)); } void highvdeo_state::grancapi_io(address_map &map) { - map(0x0030, 0x0033).r(this, FUNC(highvdeo_state::grancapi_status_r)); - map(0x000e, 0x000f).w(this, FUNC(highvdeo_state::grancapi_status_w)); - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps - map(0x0002, 0x0003).w(this, FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout - map(0x0006, 0x0007).w(this, FUNC(highvdeo_state::tv_oki6376_w)); - map(0x0008, 0x0009).r(this, FUNC(highvdeo_state::read0_r)); - map(0x000a, 0x000b).r(this, FUNC(highvdeo_state::read1_r)); - map(0x000e, 0x000f).r(this, FUNC(highvdeo_state::read2_r)); + map(0x0030, 0x0033).r(FUNC(highvdeo_state::grancapi_status_r)); + map(0x000e, 0x000f).w(FUNC(highvdeo_state::grancapi_status_w)); + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps + map(0x0002, 0x0003).w(FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout + map(0x0006, 0x0007).w(FUNC(highvdeo_state::tv_oki6376_w)); + map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r)); + map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r)); + map(0x000e, 0x000f).r(FUNC(highvdeo_state::read2_r)); // AM_RANGE(0x000e, 0x000f) AM_WRITE // AM_RANGE(0xffa2, 0xffa3) AM_WRITE } void highvdeo_state::magicbom_io(address_map &map) { - map(0x0002, 0x0003).w(this, FUNC(highvdeo_state::fashion_output_w)); - map(0x0030, 0x0033).r(this, FUNC(highvdeo_state::magicbom_status_r)); - map(0x000e, 0x000f).w(this, FUNC(highvdeo_state::grancapi_status_w)); - map(0x0000, 0x0001).w(this, FUNC(highvdeo_state::write1_w)); // lamps - map(0x0002, 0x0003).w(this, FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout - map(0x0006, 0x0007).w(this, FUNC(highvdeo_state::tv_oki6376_w)); - map(0x0008, 0x0009).r(this, FUNC(highvdeo_state::read0_r)); - map(0x000a, 0x000b).r(this, FUNC(highvdeo_state::read1_r)); - map(0x000e, 0x000f).r(this, FUNC(highvdeo_state::read2_r)); + map(0x0002, 0x0003).w(FUNC(highvdeo_state::fashion_output_w)); + map(0x0030, 0x0033).r(FUNC(highvdeo_state::magicbom_status_r)); + map(0x000e, 0x000f).w(FUNC(highvdeo_state::grancapi_status_w)); + map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps + map(0x0002, 0x0003).w(FUNC(highvdeo_state::write2_w)); // coin counter & coin lockout + map(0x0006, 0x0007).w(FUNC(highvdeo_state::tv_oki6376_w)); + map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r)); + map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r)); + map(0x000e, 0x000f).r(FUNC(highvdeo_state::read2_r)); // AM_RANGE(0x000e, 0x000f) AM_WRITE // AM_RANGE(0xffa2, 0xffa3) AM_WRITE } diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp index 9f8552140f9..a9b51b1a2c8 100644 --- a/src/mame/drivers/himesiki.cpp +++ b/src/mame/drivers/himesiki.cpp @@ -130,7 +130,7 @@ void himesiki_state::himesiki_prm0(address_map &map) map(0xa000, 0xa0ff).ram().share("spriteram"); map(0xa100, 0xa7ff).ram().share("sprram_p103a"); // not on Android map(0xa800, 0xafff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xb000, 0xbfff).ram().w(this, FUNC(himesiki_state::himesiki_bg_ram_w)).share("bg_ram"); + map(0xb000, 0xbfff).ram().w(FUNC(himesiki_state::himesiki_bg_ram_w)).share("bg_ram"); map(0xc000, 0xffff).bankr("bank1"); } @@ -139,9 +139,9 @@ void himesiki_state::himesiki_iom0(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); // inputs map(0x04, 0x07).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); // dips + rombank - map(0x08, 0x08).w(this, FUNC(himesiki_state::himesiki_scrolly_w)); - map(0x09, 0x0a).w(this, FUNC(himesiki_state::himesiki_scrollx_w)); - map(0x0b, 0x0b).w(this, FUNC(himesiki_state::himesiki_sound_w)); + map(0x08, 0x08).w(FUNC(himesiki_state::himesiki_scrolly_w)); + map(0x09, 0x0a).w(FUNC(himesiki_state::himesiki_scrollx_w)); + map(0x0b, 0x0b).w(FUNC(himesiki_state::himesiki_sound_w)); } diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp index 7acef4835e5..fc45ef9f5ee 100644 --- a/src/mame/drivers/hitme.cpp +++ b/src/mame/drivers/hitme.cpp @@ -224,29 +224,29 @@ void hitme_state::hitme_map(address_map &map) { map.global_mask(0x1fff); map(0x0000, 0x09ff).rom(); - map(0x0c00, 0x0eff).ram().w(this, FUNC(hitme_state::hitme_vidram_w)).share("videoram"); + map(0x0c00, 0x0eff).ram().w(FUNC(hitme_state::hitme_vidram_w)).share("videoram"); map(0x1000, 0x10ff).mirror(0x300).ram(); - map(0x1400, 0x14ff).r(this, FUNC(hitme_state::hitme_port_0_r)); - map(0x1500, 0x15ff).r(this, FUNC(hitme_state::hitme_port_1_r)); - map(0x1600, 0x16ff).r(this, FUNC(hitme_state::hitme_port_2_r)); - map(0x1700, 0x17ff).r(this, FUNC(hitme_state::hitme_port_3_r)); + map(0x1400, 0x14ff).r(FUNC(hitme_state::hitme_port_0_r)); + map(0x1500, 0x15ff).r(FUNC(hitme_state::hitme_port_1_r)); + map(0x1600, 0x16ff).r(FUNC(hitme_state::hitme_port_2_r)); + map(0x1700, 0x17ff).r(FUNC(hitme_state::hitme_port_3_r)); map(0x1800, 0x18ff).portr("IN4"); map(0x1900, 0x19ff).portr("IN5"); - map(0x1d00, 0x1dff).w(this, FUNC(hitme_state::output_port_0_w)); - map(0x1e00, 0x1fff).w(this, FUNC(hitme_state::output_port_1_w)); + map(0x1d00, 0x1dff).w(FUNC(hitme_state::output_port_0_w)); + map(0x1e00, 0x1fff).w(FUNC(hitme_state::output_port_1_w)); } void hitme_state::hitme_portmap(address_map &map) { - map(0x14, 0x14).r(this, FUNC(hitme_state::hitme_port_0_r)); - map(0x15, 0x15).r(this, FUNC(hitme_state::hitme_port_1_r)); - map(0x16, 0x16).r(this, FUNC(hitme_state::hitme_port_2_r)); - map(0x17, 0x17).r(this, FUNC(hitme_state::hitme_port_3_r)); + map(0x14, 0x14).r(FUNC(hitme_state::hitme_port_0_r)); + map(0x15, 0x15).r(FUNC(hitme_state::hitme_port_1_r)); + map(0x16, 0x16).r(FUNC(hitme_state::hitme_port_2_r)); + map(0x17, 0x17).r(FUNC(hitme_state::hitme_port_3_r)); map(0x18, 0x18).portr("IN4"); map(0x19, 0x19).portr("IN5"); - map(0x1d, 0x1d).w(this, FUNC(hitme_state::output_port_0_w)); - map(0x1e, 0x1f).w(this, FUNC(hitme_state::output_port_1_w)); + map(0x1d, 0x1d).w(FUNC(hitme_state::output_port_0_w)); + map(0x1e, 0x1f).w(FUNC(hitme_state::output_port_1_w)); } diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp index 100a3d05b81..5d3b1a0f040 100644 --- a/src/mame/drivers/hitpoker.cpp +++ b/src/mame/drivers/hitpoker.cpp @@ -278,26 +278,26 @@ void hitpoker_state::hitpoker_map(address_map &map) map(0x0000, 0x00ff).ram(); // stack ram map(0x1000, 0x103f).ram(); // internal I/O - map(0x8000, 0xb5ff).rw(this, FUNC(hitpoker_state::hitpoker_vram_r), FUNC(hitpoker_state::hitpoker_vram_w)); + map(0x8000, 0xb5ff).rw(FUNC(hitpoker_state::hitpoker_vram_r), FUNC(hitpoker_state::hitpoker_vram_w)); map(0xb600, 0xbdff).ram(); map(0xbe0a, 0xbe0a).portr("IN0"); - map(0xbe0c, 0xbe0c).r(this, FUNC(hitpoker_state::irq_clear_r)); - map(0xbe0d, 0xbe0d).r(this, FUNC(hitpoker_state::rtc_r)); + map(0xbe0c, 0xbe0c).r(FUNC(hitpoker_state::irq_clear_r)); + map(0xbe0d, 0xbe0d).r(FUNC(hitpoker_state::rtc_r)); map(0xbe0e, 0xbe0e).portr("IN1"); - map(0xbe50, 0xbe51).w(this, FUNC(hitpoker_state::eeprom_offset_w)); - map(0xbe53, 0xbe53).rw(this, FUNC(hitpoker_state::eeprom_r), FUNC(hitpoker_state::eeprom_w)); + map(0xbe50, 0xbe51).w(FUNC(hitpoker_state::eeprom_offset_w)); + map(0xbe53, 0xbe53).rw(FUNC(hitpoker_state::eeprom_r), FUNC(hitpoker_state::eeprom_w)); map(0xbe80, 0xbe80).w("crtc", FUNC(mc6845_device::address_w)); map(0xbe81, 0xbe81).w("crtc", FUNC(mc6845_device::register_w)); map(0xbe90, 0xbe91).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0xbea0, 0xbea0).portr("VBLANK"); //probably other bits as well // AM_RANGE(0xbe00, 0xbeff) AM_READ(test_r) - map(0xc000, 0xdfff).rw(this, FUNC(hitpoker_state::hitpoker_cram_r), FUNC(hitpoker_state::hitpoker_cram_w)); - map(0xe000, 0xefff).rw(this, FUNC(hitpoker_state::hitpoker_paletteram_r), FUNC(hitpoker_state::hitpoker_paletteram_w)); + map(0xc000, 0xdfff).rw(FUNC(hitpoker_state::hitpoker_cram_r), FUNC(hitpoker_state::hitpoker_cram_w)); + map(0xe000, 0xefff).rw(FUNC(hitpoker_state::hitpoker_paletteram_r), FUNC(hitpoker_state::hitpoker_paletteram_w)); } void hitpoker_state::hitpoker_io(address_map &map) { - map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(this, FUNC(hitpoker_state::hitpoker_pic_r), FUNC(hitpoker_state::hitpoker_pic_w)).share("sys_regs"); + map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(FUNC(hitpoker_state::hitpoker_pic_r), FUNC(hitpoker_state::hitpoker_pic_w)).share("sys_regs"); } static INPUT_PORTS_START( hitpoker ) diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp index 8b5cb7667fb..3f668014f18 100644 --- a/src/mame/drivers/hk68v10.cpp +++ b/src/mame/drivers/hk68v10.cpp @@ -225,8 +225,8 @@ required_device m_sccterm; void hk68v10_state::hk68v10_mem(address_map &map) { map.unmap_value_high(); -map(0x000000, 0x000007).ram().w(this, FUNC(hk68v10_state::bootvect_w)); /* After first write we act as RAM */ -map(0x000000, 0x000007).rom().r(this, FUNC(hk68v10_state::bootvect_r)); /* ROM mirror just durin reset */ +map(0x000000, 0x000007).ram().w(FUNC(hk68v10_state::bootvect_w)); /* After first write we act as RAM */ +map(0x000000, 0x000007).rom().r(FUNC(hk68v10_state::bootvect_r)); /* ROM mirror just durin reset */ map(0x000008, 0x1fffff).ram(); /* 2 Mb RAM */ map(0xFC0000, 0xFC3fff).rom(); /* System EPROM Area 16Kb HBUG */ map(0xFC4000, 0xFDffff).rom(); /* System EPROM Area an additional 112Kb for System ROM */ diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp index 0a0df6d5b72..49c5f53ce04 100644 --- a/src/mame/drivers/hnayayoi.cpp +++ b/src/mame/drivers/hnayayoi.cpp @@ -119,18 +119,18 @@ void hnayayoi_state::hnayayoi_io_map(address_map &map) map(0x00, 0x01).w("ymsnd", FUNC(ym2203_device::write)); map(0x02, 0x03).r("ymsnd", FUNC(ym2203_device::read)); map(0x04, 0x04).portr("DSW3"); - map(0x06, 0x06).w(this, FUNC(hnayayoi_state::adpcm_data_w)); + map(0x06, 0x06).w(FUNC(hnayayoi_state::adpcm_data_w)); map(0x08, 0x08).w("crtc", FUNC(hd6845_device::address_w)); map(0x09, 0x09).w("crtc", FUNC(hd6845_device::register_w)); - map(0x0a, 0x0a).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_start_w)); - map(0x0c, 0x0c).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_clear_w)); + map(0x0a, 0x0a).w(FUNC(hnayayoi_state::dynax_blitter_rev1_start_w)); + map(0x0c, 0x0c).w(FUNC(hnayayoi_state::dynax_blitter_rev1_clear_w)); map(0x20, 0x27).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x40, 0x40).w(this, FUNC(hnayayoi_state::keyboard_w)); - map(0x41, 0x41).r(this, FUNC(hnayayoi_state::keyboard_0_r)); - map(0x42, 0x42).r(this, FUNC(hnayayoi_state::keyboard_1_r)); + map(0x40, 0x40).w(FUNC(hnayayoi_state::keyboard_w)); + map(0x41, 0x41).r(FUNC(hnayayoi_state::keyboard_0_r)); + map(0x42, 0x42).r(FUNC(hnayayoi_state::keyboard_1_r)); map(0x43, 0x43).portr("COIN"); - map(0x60, 0x61).w(this, FUNC(hnayayoi_state::hnayayoi_palbank_w)); - map(0x62, 0x67).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_param_w)); + map(0x60, 0x61).w(FUNC(hnayayoi_state::hnayayoi_palbank_w)); + map(0x62, 0x67).w(FUNC(hnayayoi_state::dynax_blitter_rev1_param_w)); } void hnayayoi_state::hnfubuki_map(address_map &map) @@ -141,18 +141,18 @@ void hnayayoi_state::hnfubuki_map(address_map &map) map(0xff00, 0xff01).w("ymsnd", FUNC(ym2203_device::write)); map(0xff02, 0xff03).r("ymsnd", FUNC(ym2203_device::read)); map(0xff04, 0xff04).portr("DSW3"); - map(0xff06, 0xff06).w(this, FUNC(hnayayoi_state::adpcm_data_w)); + map(0xff06, 0xff06).w(FUNC(hnayayoi_state::adpcm_data_w)); map(0xff08, 0xff08).w("crtc", FUNC(hd6845_device::address_w)); map(0xff09, 0xff09).w("crtc", FUNC(hd6845_device::register_w)); - map(0xff0a, 0xff0a).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_start_w)); - map(0xff0c, 0xff0c).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_clear_w)); + map(0xff0a, 0xff0a).w(FUNC(hnayayoi_state::dynax_blitter_rev1_start_w)); + map(0xff0c, 0xff0c).w(FUNC(hnayayoi_state::dynax_blitter_rev1_clear_w)); map(0xff20, 0xff27).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xff40, 0xff40).w(this, FUNC(hnayayoi_state::keyboard_w)); - map(0xff41, 0xff41).r(this, FUNC(hnayayoi_state::keyboard_0_r)); - map(0xff42, 0xff42).r(this, FUNC(hnayayoi_state::keyboard_1_r)); + map(0xff40, 0xff40).w(FUNC(hnayayoi_state::keyboard_w)); + map(0xff41, 0xff41).r(FUNC(hnayayoi_state::keyboard_0_r)); + map(0xff42, 0xff42).r(FUNC(hnayayoi_state::keyboard_1_r)); map(0xff43, 0xff43).portr("COIN"); - map(0xff60, 0xff61).w(this, FUNC(hnayayoi_state::hnayayoi_palbank_w)); - map(0xff62, 0xff67).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_param_w)); + map(0xff60, 0xff61).w(FUNC(hnayayoi_state::hnayayoi_palbank_w)); + map(0xff62, 0xff67).w(FUNC(hnayayoi_state::dynax_blitter_rev1_param_w)); } void hnayayoi_state::untoucha_map(address_map &map) @@ -168,15 +168,15 @@ void hnayayoi_state::untoucha_io_map(address_map &map) map(0x10, 0x10).w("ymsnd", FUNC(ym2203_device::control_port_w)); map(0x11, 0x11).r("ymsnd", FUNC(ym2203_device::status_port_r)); map(0x12, 0x12).w("crtc", FUNC(hd6845_device::address_w)); - map(0x13, 0x13).w(this, FUNC(hnayayoi_state::adpcm_data_w)); + map(0x13, 0x13).w(FUNC(hnayayoi_state::adpcm_data_w)); map(0x14, 0x14).portr("COIN"); - map(0x15, 0x15).r(this, FUNC(hnayayoi_state::keyboard_1_r)); - map(0x16, 0x16).r(this, FUNC(hnayayoi_state::keyboard_0_r)); // bit 7 = blitter busy flag - map(0x17, 0x17).w(this, FUNC(hnayayoi_state::keyboard_w)); - map(0x18, 0x19).w(this, FUNC(hnayayoi_state::hnayayoi_palbank_w)); - map(0x1a, 0x1f).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_param_w)); - map(0x20, 0x20).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_clear_w)); - map(0x28, 0x28).w(this, FUNC(hnayayoi_state::dynax_blitter_rev1_start_w)); + map(0x15, 0x15).r(FUNC(hnayayoi_state::keyboard_1_r)); + map(0x16, 0x16).r(FUNC(hnayayoi_state::keyboard_0_r)); // bit 7 = blitter busy flag + map(0x17, 0x17).w(FUNC(hnayayoi_state::keyboard_w)); + map(0x18, 0x19).w(FUNC(hnayayoi_state::hnayayoi_palbank_w)); + map(0x1a, 0x1f).w(FUNC(hnayayoi_state::dynax_blitter_rev1_param_w)); + map(0x20, 0x20).w(FUNC(hnayayoi_state::dynax_blitter_rev1_clear_w)); + map(0x28, 0x28).w(FUNC(hnayayoi_state::dynax_blitter_rev1_start_w)); map(0x30, 0x37).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x50, 0x50).w("ymsnd", FUNC(ym2203_device::write_port_w)); map(0x51, 0x51).r("ymsnd", FUNC(ym2203_device::read_port_r)); diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp index 20f88bf0b8a..6db4675d2b9 100644 --- a/src/mame/drivers/hng64.cpp +++ b/src/mame/drivers/hng64.cpp @@ -954,47 +954,47 @@ void hng64_state::hng_map(address_map &map) map(0x04000000, 0x05ffffff).nopw().rom().region("gameprg", 0).share("cart"); // Ports - map(0x1f700000, 0x1f702fff).rw(this, FUNC(hng64_state::hng64_sysregs_r), FUNC(hng64_state::hng64_sysregs_w)).share("sysregs"); + map(0x1f700000, 0x1f702fff).rw(FUNC(hng64_state::hng64_sysregs_r), FUNC(hng64_state::hng64_sysregs_w)).share("sysregs"); // SRAM. Coin data, Player Statistics, etc. map(0x1F800000, 0x1F803fff).ram().share("nvram"); // Dualport RAM - map(0x1F808000, 0x1F8087ff).rw(this, FUNC(hng64_state::hng64_dualport_r), FUNC(hng64_state::hng64_dualport_w)).share("dualport"); + map(0x1F808000, 0x1F8087ff).rw(FUNC(hng64_state::hng64_dualport_r), FUNC(hng64_state::hng64_dualport_w)).share("dualport"); // BIOS map(0x1fc00000, 0x1fc7ffff).nopw().rom().region("user1", 0).share("rombase"); // Video map(0x20000000, 0x2000bfff).ram().share("spriteram"); - map(0x2000d800, 0x2000e3ff).w(this, FUNC(hng64_state::hng64_sprite_clear_even_w)); - map(0x2000e400, 0x2000efff).w(this, FUNC(hng64_state::hng64_sprite_clear_odd_w)); + map(0x2000d800, 0x2000e3ff).w(FUNC(hng64_state::hng64_sprite_clear_even_w)); + map(0x2000e400, 0x2000efff).w(FUNC(hng64_state::hng64_sprite_clear_odd_w)); map(0x20010000, 0x20010013).ram().share("spriteregs"); - map(0x20100000, 0x2017ffff).ram().w(this, FUNC(hng64_state::hng64_videoram_w)).share("videoram"); // Tilemap - map(0x20190000, 0x20190037).ram().w(this, FUNC(hng64_state::hng64_vregs_w)).share("videoregs"); + map(0x20100000, 0x2017ffff).ram().w(FUNC(hng64_state::hng64_videoram_w)).share("videoram"); // Tilemap + map(0x20190000, 0x20190037).ram().w(FUNC(hng64_state::hng64_vregs_w)).share("videoregs"); map(0x20200000, 0x20203fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); - map(0x20208000, 0x2020805f).rw(this, FUNC(hng64_state::tcram_r), FUNC(hng64_state::tcram_w)).share("tcram"); // Transition Control - map(0x20300000, 0x203001ff).w(this, FUNC(hng64_state::dl_w)); // 3d Display List - map(0x20300200, 0x20300203).w(this, FUNC(hng64_state::dl_upload_w)); // 3d Display List Upload - map(0x20300214, 0x20300217).w(this, FUNC(hng64_state::dl_control_w)); - map(0x20300218, 0x2030021b).r(this, FUNC(hng64_state::unk_vreg_r)); + map(0x20208000, 0x2020805f).rw(FUNC(hng64_state::tcram_r), FUNC(hng64_state::tcram_w)).share("tcram"); // Transition Control + map(0x20300000, 0x203001ff).w(FUNC(hng64_state::dl_w)); // 3d Display List + map(0x20300200, 0x20300203).w(FUNC(hng64_state::dl_upload_w)); // 3d Display List Upload + map(0x20300214, 0x20300217).w(FUNC(hng64_state::dl_control_w)); + map(0x20300218, 0x2030021b).r(FUNC(hng64_state::unk_vreg_r)); // 3d? map(0x30000000, 0x3000002f).ram().share("3dregs"); - map(0x30100000, 0x3015ffff).rw(this, FUNC(hng64_state::hng64_3d_1_r), FUNC(hng64_state::hng64_3d_1_w)).share("3d_1"); // 3D Display Buffer A - map(0x30200000, 0x3025ffff).rw(this, FUNC(hng64_state::hng64_3d_2_r), FUNC(hng64_state::hng64_3d_2_w)).share("3d_2"); // 3D Display Buffer B + map(0x30100000, 0x3015ffff).rw(FUNC(hng64_state::hng64_3d_1_r), FUNC(hng64_state::hng64_3d_1_w)).share("3d_1"); // 3D Display Buffer A + map(0x30200000, 0x3025ffff).rw(FUNC(hng64_state::hng64_3d_2_r), FUNC(hng64_state::hng64_3d_2_w)).share("3d_2"); // 3D Display Buffer B // Sound - map(0x60000000, 0x601fffff).rw(this, FUNC(hng64_state::hng64_soundram2_r), FUNC(hng64_state::hng64_soundram2_w)); // actually seems unmapped, see note in audio/hng64.c - map(0x60200000, 0x603fffff).rw(this, FUNC(hng64_state::hng64_soundram_r), FUNC(hng64_state::hng64_soundram_w)); // program + data for V53A gets uploaded here + map(0x60000000, 0x601fffff).rw(FUNC(hng64_state::hng64_soundram2_r), FUNC(hng64_state::hng64_soundram2_w)); // actually seems unmapped, see note in audio/hng64.c + map(0x60200000, 0x603fffff).rw(FUNC(hng64_state::hng64_soundram_r), FUNC(hng64_state::hng64_soundram_w)); // program + data for V53A gets uploaded here // These are sound ports of some sort - map(0x68000000, 0x6800000f).rw(this, FUNC(hng64_state::main_sound_comms_r), FUNC(hng64_state::main_sound_comms_w)); - map(0x6f000000, 0x6f000003).w(this, FUNC(hng64_state::hng64_soundcpu_enable_w)); + map(0x68000000, 0x6800000f).rw(FUNC(hng64_state::main_sound_comms_r), FUNC(hng64_state::main_sound_comms_w)); + map(0x6f000000, 0x6f000003).w(FUNC(hng64_state::hng64_soundcpu_enable_w)); // Communications - map(0xc0000000, 0xc0000fff).rw(this, FUNC(hng64_state::hng64_com_r), FUNC(hng64_state::hng64_com_w)).share("com_ram"); - map(0xc0001000, 0xc0001007).rw(this, FUNC(hng64_state::hng64_com_share_mips_r), FUNC(hng64_state::hng64_com_share_mips_w)); + map(0xc0000000, 0xc0000fff).rw(FUNC(hng64_state::hng64_com_r), FUNC(hng64_state::hng64_com_w)).share("com_ram"); + map(0xc0001000, 0xc0001007).rw(FUNC(hng64_state::hng64_com_share_mips_r), FUNC(hng64_state::hng64_com_share_mips_w)); /* 6e000000-6fffffff */ /* 80000000-81ffffff */ diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp index f15efd7987e..87bb3d32e64 100644 --- a/src/mame/drivers/holeland.cpp +++ b/src/mame/drivers/holeland.cpp @@ -36,8 +36,8 @@ void holeland_state::holeland_map(address_map &map) map(0xa000, 0xbfff).rom(); map(0xa000, 0xa000).w("speech", FUNC(sp0256_device::ald_w)); map(0xc000, 0xc007).w(m_latch, FUNC(ls259_device::write_d0)).nopr(); - map(0xe000, 0xe3ff).ram().w(this, FUNC(holeland_state::colorram_w)).share("colorram"); - map(0xe400, 0xe7ff).ram().w(this, FUNC(holeland_state::videoram_w)).share("videoram"); + map(0xe000, 0xe3ff).ram().w(FUNC(holeland_state::colorram_w)).share("colorram"); + map(0xe400, 0xe7ff).ram().w(FUNC(holeland_state::videoram_w)).share("videoram"); map(0xf000, 0xf3ff).ram().share("spriteram"); } @@ -45,10 +45,10 @@ void holeland_state::crzrally_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram().share("nvram"); - map(0xe000, 0xe3ff).ram().w(this, FUNC(holeland_state::colorram_w)).share("colorram"); - map(0xe400, 0xe7ff).ram().w(this, FUNC(holeland_state::videoram_w)).share("videoram"); + map(0xe000, 0xe3ff).ram().w(FUNC(holeland_state::colorram_w)).share("colorram"); + map(0xe400, 0xe7ff).ram().w(FUNC(holeland_state::videoram_w)).share("videoram"); map(0xe800, 0xebff).ram().share("spriteram"); - map(0xf000, 0xf000).w(this, FUNC(holeland_state::scroll_w)); + map(0xf000, 0xf000).w(FUNC(holeland_state::scroll_w)); map(0xf800, 0xf807).w(m_latch, FUNC(ls259_device::write_d0)); } diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index efc1c99a5c2..73ceebbc730 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -505,7 +505,7 @@ WRITE8_MEMBER(homedata_state::pteacher_upd7807_portc_w) machine().bookkeeping().coin_counter_w(0, ~data & 0x80); if (BIT(m_upd7807_portc, 5) && !BIT(data, 5)) /* clock 1->0 */ - m_sn->write(space, 0, m_upd7807_porta); + m_sn->write(m_upd7807_porta); m_upd7807_portc = data; } @@ -530,23 +530,23 @@ WRITE8_MEMBER(homedata_state::bankswitch_w) void homedata_state::mrokumei_map(address_map &map) { - map(0x0000, 0x3fff).ram().w(this, FUNC(homedata_state::mrokumei_videoram_w)).share("videoram"); + map(0x0000, 0x3fff).ram().w(FUNC(homedata_state::mrokumei_videoram_w)).share("videoram"); map(0x4000, 0x5fff).ram(); map(0x6000, 0x6fff).ram(); /* work ram */ map(0x7000, 0x77ff).ram(); /* hourouki expects this to act as RAM */ map(0x7800, 0x7800).ram(); /* only used to store the result of the ROM check */ - map(0x7801, 0x7802).r(this, FUNC(homedata_state::mrokumei_keyboard_r)); // also vblank and active page + map(0x7801, 0x7802).r(FUNC(homedata_state::mrokumei_keyboard_r)); // also vblank and active page map(0x7803, 0x7803).portr("IN0"); // coin, service map(0x7804, 0x7804).portr("DSW1"); // DSW1 map(0x7805, 0x7805).portr("DSW2"); // DSW2 map(0x7ff0, 0x7ffd).writeonly().share("vreg"); map(0x7ffe, 0x7ffe).nopr(); // ??? read every vblank, value discarded - map(0x8000, 0x8000).w(this, FUNC(homedata_state::mrokumei_blitter_start_w)); // in some games also ROM bank switch to access service ROM - map(0x8001, 0x8001).w(this, FUNC(homedata_state::mrokumei_keyboard_select_w)); - map(0x8002, 0x8002).w(this, FUNC(homedata_state::mrokumei_sound_cmd_w)); - map(0x8003, 0x8003).w(m_sn, FUNC(sn76489a_device::write)); - map(0x8006, 0x8006).w(this, FUNC(homedata_state::homedata_blitter_param_w)); - map(0x8007, 0x8007).w(this, FUNC(homedata_state::mrokumei_blitter_bank_w)); + map(0x8000, 0x8000).w(FUNC(homedata_state::mrokumei_blitter_start_w)); // in some games also ROM bank switch to access service ROM + map(0x8001, 0x8001).w(FUNC(homedata_state::mrokumei_keyboard_select_w)); + map(0x8002, 0x8002).w(FUNC(homedata_state::mrokumei_sound_cmd_w)); + map(0x8003, 0x8003).w(m_sn, FUNC(sn76489a_device::command_w)); + map(0x8006, 0x8006).w(FUNC(homedata_state::homedata_blitter_param_w)); + map(0x8007, 0x8007).w(FUNC(homedata_state::mrokumei_blitter_bank_w)); map(0x8000, 0xffff).rom(); } @@ -555,36 +555,36 @@ void homedata_state::mrokumei_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); // TODO: might be that the entire area is sound_bank_w map(0xfffc, 0xfffd).nopw(); /* stack writes happen here, but there's no RAM */ - map(0x8080, 0x8080).w(this, FUNC(homedata_state::mrokumei_sound_bank_w)); - map(0xffbf, 0xffbf).w(this, FUNC(homedata_state::mrokumei_sound_bank_w)); // hourouki mirror + map(0x8080, 0x8080).w(FUNC(homedata_state::mrokumei_sound_bank_w)); + map(0xffbf, 0xffbf).w(FUNC(homedata_state::mrokumei_sound_bank_w)); // hourouki mirror } void homedata_state::mrokumei_sound_io_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(homedata_state::mrokumei_sound_io_r)); /* read address is 16-bit */ - map(0x0040, 0x0040).mirror(0xff00).w("dac", FUNC(dac_byte_interface::write)); /* write address is only 8-bit */ + map(0x0000, 0xffff).r(FUNC(homedata_state::mrokumei_sound_io_r)); /* read address is 16-bit */ + map(0x0040, 0x0040).mirror(0xff00).w("dac", FUNC(dac_byte_interface::data_w)); /* write address is only 8-bit */ // hourouki mirror... - map(0x007f, 0x007f).mirror(0xff00).w("dac", FUNC(dac_byte_interface::write)); /* write address is only 8-bit */ + map(0x007f, 0x007f).mirror(0xff00).w("dac", FUNC(dac_byte_interface::data_w)); /* write address is only 8-bit */ } /********************************************************************************/ void homedata_state::reikaids_map(address_map &map) { - map(0x0000, 0x3fff).ram().w(this, FUNC(homedata_state::reikaids_videoram_w)).share("videoram"); + map(0x0000, 0x3fff).ram().w(FUNC(homedata_state::reikaids_videoram_w)).share("videoram"); map(0x4000, 0x5fff).ram(); map(0x6000, 0x6fff).ram(); /* work RAM */ map(0x7800, 0x7800).ram(); /* behaves as normal RAM */ map(0x7801, 0x7801).portr("IN0"); map(0x7802, 0x7802).portr("IN1"); - map(0x7803, 0x7803).r(this, FUNC(homedata_state::reikaids_io_r)); // coin, blitter, upd7807 + map(0x7803, 0x7803).r(FUNC(homedata_state::reikaids_io_r)); // coin, blitter, upd7807 map(0x7ff0, 0x7ffd).writeonly().share("vreg"); - map(0x7ffe, 0x7ffe).w(this, FUNC(homedata_state::reikaids_blitter_bank_w)); - map(0x7fff, 0x7fff).w(this, FUNC(homedata_state::reikaids_blitter_start_w)); - map(0x8000, 0x8000).w(this, FUNC(homedata_state::bankswitch_w)); - map(0x8002, 0x8002).w(this, FUNC(homedata_state::reikaids_snd_command_w)); - map(0x8005, 0x8005).w(this, FUNC(homedata_state::reikaids_gfx_bank_w)); - map(0x8006, 0x8006).w(this, FUNC(homedata_state::homedata_blitter_param_w)); + map(0x7ffe, 0x7ffe).w(FUNC(homedata_state::reikaids_blitter_bank_w)); + map(0x7fff, 0x7fff).w(FUNC(homedata_state::reikaids_blitter_start_w)); + map(0x8000, 0x8000).w(FUNC(homedata_state::bankswitch_w)); + map(0x8002, 0x8002).w(FUNC(homedata_state::reikaids_snd_command_w)); + map(0x8005, 0x8005).w(FUNC(homedata_state::reikaids_gfx_bank_w)); + map(0x8006, 0x8006).w(FUNC(homedata_state::homedata_blitter_param_w)); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xffff).rom(); } @@ -599,27 +599,27 @@ void homedata_state::reikaids_upd7807_map(address_map &map) void homedata_state::pteacher_map(address_map &map) { - map(0x0000, 0x3fff).ram().w(this, FUNC(homedata_state::mrokumei_videoram_w)).share("videoram"); + map(0x0000, 0x3fff).ram().w(FUNC(homedata_state::mrokumei_videoram_w)).share("videoram"); map(0x4000, 0x5eff).ram(); map(0x5f00, 0x5fff).ram(); map(0x6000, 0x6fff).ram(); /* work ram */ map(0x7800, 0x7800).ram(); /* behaves as normal RAM */ - map(0x7801, 0x7801).r(this, FUNC(homedata_state::pteacher_io_r)); // vblank, visible page - map(0x7ff2, 0x7ff2).r(this, FUNC(homedata_state::pteacher_snd_r)); + map(0x7801, 0x7801).r(FUNC(homedata_state::pteacher_io_r)); // vblank, visible page + map(0x7ff2, 0x7ff2).r(FUNC(homedata_state::pteacher_snd_r)); map(0x7ff0, 0x7ffd).writeonly().share("vreg"); - map(0x7fff, 0x7fff).w(this, FUNC(homedata_state::pteacher_blitter_start_w)); - map(0x8000, 0x8000).w(this, FUNC(homedata_state::bankswitch_w)); - map(0x8002, 0x8002).w(this, FUNC(homedata_state::pteacher_snd_command_w)); - map(0x8005, 0x8005).w(this, FUNC(homedata_state::pteacher_blitter_bank_w)); - map(0x8006, 0x8006).w(this, FUNC(homedata_state::homedata_blitter_param_w)); - map(0x8007, 0x8007).w(this, FUNC(homedata_state::pteacher_gfx_bank_w)); + map(0x7fff, 0x7fff).w(FUNC(homedata_state::pteacher_blitter_start_w)); + map(0x8000, 0x8000).w(FUNC(homedata_state::bankswitch_w)); + map(0x8002, 0x8002).w(FUNC(homedata_state::pteacher_snd_command_w)); + map(0x8005, 0x8005).w(FUNC(homedata_state::pteacher_blitter_bank_w)); + map(0x8006, 0x8006).w(FUNC(homedata_state::homedata_blitter_param_w)); + map(0x8007, 0x8007).w(FUNC(homedata_state::pteacher_gfx_bank_w)); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xffff).rom(); } void homedata_state::pteacher_upd7807_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(homedata_state::pteacher_snd_answer_w)); + map(0x0000, 0x0000).w(FUNC(homedata_state::pteacher_snd_answer_w)); map(0x0000, 0xfeff).bankr("bank2"); /* External ROM (Banked) */ } @@ -1276,7 +1276,7 @@ MACHINE_CONFIG_START(homedata_state::reikaids) MCFG_DEVICE_PROGRAM_MAP(reikaids_upd7807_map) MCFG_UPD7807_PORTA_READ_CB(READ8(*this, homedata_state, reikaids_upd7807_porta_r)) MCFG_UPD7807_PORTA_WRITE_CB(WRITE8(*this, homedata_state, reikaids_upd7807_porta_w)) - MCFG_UPD7807_PORTB_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_UPD7807_PORTB_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_UPD7807_PORTC_WRITE_CB(WRITE8(*this, homedata_state, reikaids_upd7807_portc_w)) MCFG_UPD7807_PORTT_READ_CB(READ8(*this, homedata_state, reikaids_snd_command_r)) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homedata_state, upd7807_irq) @@ -1332,7 +1332,7 @@ MACHINE_CONFIG_START(homedata_state::pteacher) MCFG_DEVICE_PROGRAM_MAP(pteacher_upd7807_map) MCFG_UPD7807_PORTA_READ_CB(READ8(*this, homedata_state, pteacher_upd7807_porta_r)) MCFG_UPD7807_PORTA_WRITE_CB(WRITE8(*this, homedata_state, pteacher_upd7807_porta_w)) - MCFG_UPD7807_PORTB_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_UPD7807_PORTB_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_UPD7807_PORTC_READ_CB(IOPORT("COIN")) MCFG_UPD7807_PORTC_WRITE_CB(WRITE8(*this, homedata_state, pteacher_upd7807_portc_w)) MCFG_UPD7807_PORTT_READ_CB(READ8(*this, homedata_state, pteacher_keyboard_r)) @@ -1422,11 +1422,11 @@ WRITE8_MEMBER(homedata_state::mirderby_prot_w) void homedata_state::cpu2_map(address_map &map) { - map(0x0000, 0x3fff).ram().w(this, FUNC(homedata_state::mrokumei_videoram_w)).share("videoram"); + map(0x0000, 0x3fff).ram().w(FUNC(homedata_state::mrokumei_videoram_w)).share("videoram"); map(0x4000, 0x5fff).ram(); map(0x6000, 0x6fff).ram(); /* work ram */ map(0x7000, 0x77ff).ram(); - map(0x7800, 0x7800).rw(this, FUNC(homedata_state::mirderby_prot_r), FUNC(homedata_state::mirderby_prot_w)); // protection check? (or sound comms?) + map(0x7800, 0x7800).rw(FUNC(homedata_state::mirderby_prot_r), FUNC(homedata_state::mirderby_prot_w)); // protection check? (or sound comms?) map(0x7ffe, 0x7ffe).nopr(); //watchdog map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index f2cafed0095..7985386190e 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -215,17 +215,17 @@ void homelab_state::homelab2_mem(address_map &map) map(0x2000, 0x27ff).rom(); // ROM 5 map(0x2800, 0x2fff).rom(); // ROM 6 map(0x3000, 0x37ff).rom(); // Empty - map(0x3800, 0x3fff).rw(this, FUNC(homelab_state::key_r), FUNC(homelab_state::cass_w)); + map(0x3800, 0x3fff).rw(FUNC(homelab_state::key_r), FUNC(homelab_state::cass_w)); map(0x4000, 0x7fff).ram(); map(0xc000, 0xc3ff).ram().region("maincpu", 0xc000); - map(0xe000, 0xe0ff).r(this, FUNC(homelab_state::cass2_r)); + map(0xe000, 0xe0ff).r(FUNC(homelab_state::cass2_r)); } void homelab_state::homelab3_mem(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x7fff).ram(); - map(0xe800, 0xefff).r(this, FUNC(homelab_state::exxx_r)); + map(0xe800, 0xefff).r(FUNC(homelab_state::exxx_r)); map(0xf800, 0xffff).ram().region("maincpu", 0xf800); } @@ -233,8 +233,8 @@ void homelab_state::homelab3_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x7f, 0x7f).w(this, FUNC(homelab_state::port7f_w)); - map(0xff, 0xff).w(this, FUNC(homelab_state::portff_w)); + map(0x7f, 0x7f).w(FUNC(homelab_state::port7f_w)); + map(0xff, 0xff).w(FUNC(homelab_state::portff_w)); } void homelab_state::brailab4_mem(address_map &map) @@ -242,7 +242,7 @@ void homelab_state::brailab4_mem(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0xcfff).ram(); map(0xd000, 0xdfff).rom(); - map(0xe800, 0xefff).r(this, FUNC(homelab_state::exxx_r)); + map(0xe800, 0xefff).r(FUNC(homelab_state::exxx_r)); map(0xf800, 0xffff).bankrw("bank1"); } @@ -251,8 +251,8 @@ void homelab_state::brailab4_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0xf8, 0xf9).rw("mea8000", FUNC(mea8000_device::read), FUNC(mea8000_device::write)); - map(0x7f, 0x7f).w(this, FUNC(homelab_state::brailab4_port7f_w)); - map(0xff, 0xff).w(this, FUNC(homelab_state::brailab4_portff_w)); + map(0x7f, 0x7f).w(FUNC(homelab_state::brailab4_port7f_w)); + map(0xff, 0xff).w(FUNC(homelab_state::brailab4_portff_w)); } diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp index 6019747e3ee..ea5aed0bb65 100644 --- a/src/mame/drivers/homerun.cpp +++ b/src/mame/drivers/homerun.cpp @@ -107,17 +107,17 @@ void homerun_state::homerun_memmap(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x7fff).bankr("bank1"); - map(0x8000, 0x9fff).ram().w(this, FUNC(homerun_state::homerun_videoram_w)).share("videoram"); + map(0x8000, 0x9fff).ram().w(FUNC(homerun_state::homerun_videoram_w)).share("videoram"); map(0xa000, 0xa0ff).ram().share("spriteram"); - map(0xb000, 0xb03f).ram().w(this, FUNC(homerun_state::homerun_color_w)).share("colorram"); + map(0xb000, 0xb03f).ram().w(FUNC(homerun_state::homerun_color_w)).share("colorram"); map(0xc000, 0xdfff).ram(); } void homerun_state::homerun_iomap(address_map &map) { map.global_mask(0xff); - map(0x10, 0x10).w(this, FUNC(homerun_state::homerun_d7756_sample_w)); - map(0x20, 0x20).w(this, FUNC(homerun_state::homerun_control_w)); + map(0x10, 0x10).w(FUNC(homerun_state::homerun_d7756_sample_w)); + map(0x20, 0x20).w(FUNC(homerun_state::homerun_control_w)); map(0x30, 0x33).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x40, 0x40).portr("IN0"); map(0x50, 0x50).portr("IN2"); diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index 8a59195809b..6936a028089 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -63,7 +63,7 @@ void homez80_state::homez80_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x0fff).rom(); // Monitor map(0x2000, 0x23ff).ram().share("videoram"); // Video RAM - map(0x7020, 0x702f).r(this, FUNC(homez80_state::homez80_keyboard_r)); + map(0x7020, 0x702f).r(FUNC(homez80_state::homez80_keyboard_r)); map(0x8000, 0xffff).ram(); // 32 K RAM } diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp index bd465a857b4..85cd3184667 100644 --- a/src/mame/drivers/horizon.cpp +++ b/src/mame/drivers/horizon.cpp @@ -90,7 +90,7 @@ void horizon_state::horizon_mem(address_map &map) map(0xea11, 0xea11); map(0xea21, 0xea21); map(0xea31, 0xea31); - map(0xeb10, 0xeb17).r(this, FUNC(horizon_state::ff_r)); + map(0xeb10, 0xeb17).r(FUNC(horizon_state::ff_r)); map(0xeb20, 0xeb20); map(0xeb35, 0xeb35); map(0xeb40, 0xeb40); diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index d176bd2da3c..e28d847ada0 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -736,21 +736,21 @@ WRITE16_MEMBER(hornet_state::soundtimer_count_w) void hornet_state::hornet_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("workram"); /* Work RAM */ - map(0x74000000, 0x740000ff).rw(this, FUNC(hornet_state::hornet_k037122_reg_r), FUNC(hornet_state::hornet_k037122_reg_w)); - map(0x74020000, 0x7403ffff).rw(this, FUNC(hornet_state::hornet_k037122_sram_r), FUNC(hornet_state::hornet_k037122_sram_w)); - map(0x74040000, 0x7407ffff).rw(this, FUNC(hornet_state::hornet_k037122_char_r), FUNC(hornet_state::hornet_k037122_char_w)); - map(0x74080000, 0x7408000f).rw(this, FUNC(hornet_state::gun_r), FUNC(hornet_state::gun_w)); + map(0x74000000, 0x740000ff).rw(FUNC(hornet_state::hornet_k037122_reg_r), FUNC(hornet_state::hornet_k037122_reg_w)); + map(0x74020000, 0x7403ffff).rw(FUNC(hornet_state::hornet_k037122_sram_r), FUNC(hornet_state::hornet_k037122_sram_w)); + map(0x74040000, 0x7407ffff).rw(FUNC(hornet_state::hornet_k037122_char_r), FUNC(hornet_state::hornet_k037122_char_w)); + map(0x74080000, 0x7408000f).rw(FUNC(hornet_state::gun_r), FUNC(hornet_state::gun_w)); map(0x78000000, 0x7800ffff).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_r_ppc), FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); map(0x780c0000, 0x780c0003).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_comm_r_ppc), FUNC(konppc_device::cgboard_dsp_comm_w_ppc)); - map(0x7d000000, 0x7d00ffff).r(this, FUNC(hornet_state::sysreg_r)); - map(0x7d010000, 0x7d01ffff).w(this, FUNC(hornet_state::sysreg_w)); + map(0x7d000000, 0x7d00ffff).r(FUNC(hornet_state::sysreg_r)); + map(0x7d010000, 0x7d01ffff).w(FUNC(hornet_state::sysreg_w)); map(0x7d020000, 0x7d021fff).rw("m48t58", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); /* M48T58Y RTC/NVRAM */ map(0x7d030000, 0x7d03000f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)); - map(0x7d040004, 0x7d040007).rw(this, FUNC(hornet_state::comm_eeprom_r), FUNC(hornet_state::comm_eeprom_w)); + map(0x7d040004, 0x7d040007).rw(FUNC(hornet_state::comm_eeprom_r), FUNC(hornet_state::comm_eeprom_w)); map(0x7d042000, 0x7d043fff).ram(); /* COMM BOARD 0 */ - map(0x7d044000, 0x7d044007).r(this, FUNC(hornet_state::comm0_unk_r)); - map(0x7d048000, 0x7d048003).w(this, FUNC(hornet_state::comm1_w)); - map(0x7d04a000, 0x7d04a003).w(this, FUNC(hornet_state::comm_rombank_w)); + map(0x7d044000, 0x7d044007).r(FUNC(hornet_state::comm0_unk_r)); + map(0x7d048000, 0x7d048003).w(FUNC(hornet_state::comm1_w)); + map(0x7d04a000, 0x7d04a003).w(FUNC(hornet_state::comm_rombank_w)); map(0x7d050000, 0x7d05ffff).bankr("bank1"); /* COMM BOARD 1 */ map(0x7e000000, 0x7e7fffff).rom().region("user2", 0); /* Data ROM */ map(0x7f000000, 0x7f3fffff).rom().share("share2"); @@ -767,8 +767,8 @@ void hornet_state::sound_memmap(address_map &map) map(0x300000, 0x30001f).rw(m_k056800, FUNC(k056800_device::sound_r), FUNC(k056800_device::sound_w)).umask16(0x00ff); map(0x480000, 0x480001).nopw(); map(0x4c0000, 0x4c0001).nopw(); - map(0x500000, 0x500001).w(this, FUNC(hornet_state::soundtimer_en_w)).nopr(); - map(0x600000, 0x600001).w(this, FUNC(hornet_state::soundtimer_count_w)).nopr(); + map(0x500000, 0x500001).w(FUNC(hornet_state::soundtimer_en_w)).nopr(); + map(0x600000, 0x600001).w(FUNC(hornet_state::soundtimer_count_w)).nopr(); } /*****************************************************************************/ @@ -805,9 +805,9 @@ void hornet_state::gn680_memmap(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x200000, 0x203fff).ram(); - map(0x300000, 0x300001).w(this, FUNC(hornet_state::gn680_sysctrl)); + map(0x300000, 0x300001).w(FUNC(hornet_state::gn680_sysctrl)); map(0x314000, 0x317fff).ram(); - map(0x400000, 0x400003).rw(this, FUNC(hornet_state::gn680_latch_r), FUNC(hornet_state::gn680_latch_w)); + map(0x400000, 0x400003).rw(FUNC(hornet_state::gn680_latch_r), FUNC(hornet_state::gn680_latch_w)); map(0x400008, 0x400009).nopw(); // writes 0001 00fe each time IRQ 6 triggers } @@ -836,7 +836,7 @@ WRITE32_MEMBER(hornet_state::dsp_dataram1_w) void hornet_state::sharc0_map(address_map &map) { map(0x0400000, 0x041ffff).rw(m_konppc, FUNC(konppc_device::cgboard_0_shared_sharc_r), FUNC(konppc_device::cgboard_0_shared_sharc_w)); - map(0x0500000, 0x05fffff).rw(this, FUNC(hornet_state::dsp_dataram0_r), FUNC(hornet_state::dsp_dataram0_w)).share("sharc_dataram0"); + map(0x0500000, 0x05fffff).rw(FUNC(hornet_state::dsp_dataram0_r), FUNC(hornet_state::dsp_dataram0_w)).share("sharc_dataram0"); map(0x1400000, 0x14fffff).ram(); map(0x2400000, 0x27fffff).rw("voodoo0", FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); map(0x3400000, 0x34000ff).rw(m_konppc, FUNC(konppc_device::cgboard_0_comm_sharc_r), FUNC(konppc_device::cgboard_0_comm_sharc_w)); @@ -847,7 +847,7 @@ void hornet_state::sharc0_map(address_map &map) void hornet_state::sharc1_map(address_map &map) { map(0x0400000, 0x041ffff).rw(m_konppc, FUNC(konppc_device::cgboard_1_shared_sharc_r), FUNC(konppc_device::cgboard_1_shared_sharc_w)); - map(0x0500000, 0x05fffff).rw(this, FUNC(hornet_state::dsp_dataram1_r), FUNC(hornet_state::dsp_dataram1_w)).share("sharc_dataram1"); + map(0x0500000, 0x05fffff).rw(FUNC(hornet_state::dsp_dataram1_r), FUNC(hornet_state::dsp_dataram1_w)).share("sharc_dataram1"); map(0x1400000, 0x14fffff).ram(); map(0x2400000, 0x27fffff).rw("voodoo1", FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); map(0x3400000, 0x34000ff).rw(m_konppc, FUNC(konppc_device::cgboard_1_comm_sharc_r), FUNC(konppc_device::cgboard_1_comm_sharc_w)); diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp index d21a1e818fa..17683f253b4 100644 --- a/src/mame/drivers/hotblock.cpp +++ b/src/mame/drivers/hotblock.cpp @@ -133,14 +133,14 @@ WRITE8_MEMBER(hotblock_state::video_write) void hotblock_state::hotblock_map(address_map &map) { map(0x00000, 0x0ffff).ram(); - map(0x10000, 0x1ffff).rw(this, FUNC(hotblock_state::video_read), FUNC(hotblock_state::video_write)).share("vram"); + map(0x10000, 0x1ffff).rw(FUNC(hotblock_state::video_read), FUNC(hotblock_state::video_write)).share("vram"); map(0x20000, 0xfffff).rom(); } void hotblock_state::hotblock_io(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(hotblock_state::port0_w)); - map(0x0004, 0x0004).rw(this, FUNC(hotblock_state::port4_r), FUNC(hotblock_state::port4_w)); + map(0x0000, 0x0000).w(FUNC(hotblock_state::port0_w)); + map(0x0004, 0x0004).rw(FUNC(hotblock_state::port4_r), FUNC(hotblock_state::port4_w)); map(0x8000, 0x8001).w("aysnd", FUNC(ym2149_device::address_data_w)); map(0x8001, 0x8001).r("aysnd", FUNC(ym2149_device::data_r)); } diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp index c612f21868b..5c1b7e288f1 100644 --- a/src/mame/drivers/hp16500.cpp +++ b/src/mame/drivers/hp16500.cpp @@ -223,26 +223,26 @@ void hp16500_state::hp1650_map(address_map &map) { map(0x000000, 0x00ffff).rom().region("bios", 0); - map(0x201000, 0x201001).w(this, FUNC(hp16500_state::maskval_w)); + map(0x201000, 0x201001).w(FUNC(hp16500_state::maskval_w)); - map(0x204001, 0x204001).w(this, FUNC(hp16500_state::pal_ctrl_w)); - map(0x205001, 0x205001).w(this, FUNC(hp16500_state::pal_r_w)); + map(0x204001, 0x204001).w(FUNC(hp16500_state::pal_ctrl_w)); + map(0x205001, 0x205001).w(FUNC(hp16500_state::pal_r_w)); map(0x2050fe, 0x2050ff).noprw(); map(0x206000, 0x206001).nopr(); - map(0x206001, 0x206001).w(this, FUNC(hp16500_state::pal_g_w)); - map(0x207001, 0x207001).w(this, FUNC(hp16500_state::pal_b_w)); + map(0x206001, 0x206001).w(FUNC(hp16500_state::pal_g_w)); + map(0x207001, 0x207001).w(FUNC(hp16500_state::pal_b_w)); map(0x20a000, 0x20a007).rw("epci", FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0x00ff); map(0x20c001, 0x20c001).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x20c003, 0x20c003).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x20e000, 0x20e001).rw(this, FUNC(hp16500_state::vbl_ack16_r), FUNC(hp16500_state::vbl_ack16_w)); + map(0x20e000, 0x20e001).rw(FUNC(hp16500_state::vbl_ack16_r), FUNC(hp16500_state::vbl_ack16_w)); map(0x20f000, 0x20f001).noprw(); - map(0x600000, 0x61ffff).w(this, FUNC(hp16500_state::vram_w)); - map(0x600000, 0x67ffff).r(this, FUNC(hp16500_state::vram_r)).umask16(0x00ff); + map(0x600000, 0x61ffff).w(FUNC(hp16500_state::vram_w)); + map(0x600000, 0x67ffff).r(FUNC(hp16500_state::vram_r)).umask16(0x00ff); map(0x900000, 0x9fffff).ram(); } @@ -252,26 +252,26 @@ void hp16500_state::hp1651_map(address_map &map) { map(0x000000, 0x00ffff).rom().region("bios", 0); - map(0x201000, 0x201001).w(this, FUNC(hp16500_state::maskval_w)); + map(0x201000, 0x201001).w(FUNC(hp16500_state::maskval_w)); - map(0x204001, 0x204001).w(this, FUNC(hp16500_state::pal_ctrl_w)); - map(0x205001, 0x205001).w(this, FUNC(hp16500_state::pal_r_w)); + map(0x204001, 0x204001).w(FUNC(hp16500_state::pal_ctrl_w)); + map(0x205001, 0x205001).w(FUNC(hp16500_state::pal_r_w)); map(0x2050fe, 0x2050ff).noprw(); map(0x206000, 0x206001).nopr(); - map(0x206001, 0x206001).w(this, FUNC(hp16500_state::pal_g_w)); - map(0x207001, 0x207001).w(this, FUNC(hp16500_state::pal_b_w)); + map(0x206001, 0x206001).w(FUNC(hp16500_state::pal_g_w)); + map(0x207001, 0x207001).w(FUNC(hp16500_state::pal_b_w)); map(0x20a000, 0x20a007).rw("epci", FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0x00ff); map(0x20c001, 0x20c001).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x20c003, 0x20c003).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x20e000, 0x20e001).rw(this, FUNC(hp16500_state::vbl_ack16_r), FUNC(hp16500_state::vbl_ack16_w)); + map(0x20e000, 0x20e001).rw(FUNC(hp16500_state::vbl_ack16_r), FUNC(hp16500_state::vbl_ack16_w)); map(0x20f000, 0x20f001).noprw(); - map(0x600000, 0x61ffff).w(this, FUNC(hp16500_state::vram_w)); - map(0x600000, 0x67ffff).r(this, FUNC(hp16500_state::vram_r)).umask16(0x00ff); + map(0x600000, 0x61ffff).w(FUNC(hp16500_state::vram_w)); + map(0x600000, 0x67ffff).r(FUNC(hp16500_state::vram_r)).umask16(0x00ff); map(0x980000, 0xa7ffff).ram(); } @@ -280,20 +280,20 @@ void hp16500_state::hp16500a_map(address_map &map) { map(0x000000, 0x00ffff).rom().region("bios", 0); - map(0x201000, 0x201001).w(this, FUNC(hp16500_state::maskval_w)); + map(0x201000, 0x201001).w(FUNC(hp16500_state::maskval_w)); - map(0x204001, 0x204001).w(this, FUNC(hp16500_state::pal_ctrl_w)); - map(0x205001, 0x205001).w(this, FUNC(hp16500_state::pal_r_w)); - map(0x206001, 0x206001).w(this, FUNC(hp16500_state::pal_g_w)); - map(0x207001, 0x207001).w(this, FUNC(hp16500_state::pal_b_w)); + map(0x204001, 0x204001).w(FUNC(hp16500_state::pal_ctrl_w)); + map(0x205001, 0x205001).w(FUNC(hp16500_state::pal_r_w)); + map(0x206001, 0x206001).w(FUNC(hp16500_state::pal_g_w)); + map(0x207001, 0x207001).w(FUNC(hp16500_state::pal_b_w)); map(0x20c001, 0x20c001).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x20c003, 0x20c003).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x20e000, 0x20e001).rw(this, FUNC(hp16500_state::vbl_ack16_r), FUNC(hp16500_state::vbl_ack16_w)); + map(0x20e000, 0x20e001).rw(FUNC(hp16500_state::vbl_ack16_r), FUNC(hp16500_state::vbl_ack16_w)); - map(0x600000, 0x61ffff).w(this, FUNC(hp16500_state::vram_w)); - map(0x600000, 0x67ffff).r(this, FUNC(hp16500_state::vram_r)).umask16(0x00ff); + map(0x600000, 0x61ffff).w(FUNC(hp16500_state::vram_w)); + map(0x600000, 0x67ffff).r(FUNC(hp16500_state::vram_r)).umask16(0x00ff); map(0x980000, 0xa7ffff).ram(); } @@ -306,19 +306,19 @@ uint32_t hp16500_state::screen_update_hp16500a(screen_device &screen, bitmap_rgb void hp16500_state::hp16500_map(address_map &map) { map(0x00000000, 0x0001ffff).rom().region("bios", 0); - map(0x0020f000, 0x0020f003).w(this, FUNC(hp16500_state::palette_w)); + map(0x0020f000, 0x0020f003).w(FUNC(hp16500_state::palette_w)); - map(0x00202800, 0x00202803).w(this, FUNC(hp16500_state::vbl_ack_w)); - map(0x00203000, 0x00203003).w(this, FUNC(hp16500_state::vbl_ack_w)); - map(0x00209800, 0x00209803).r(this, FUNC(hp16500_state::vbl_state_r)); + map(0x00202800, 0x00202803).w(FUNC(hp16500_state::vbl_ack_w)); + map(0x00203000, 0x00203003).w(FUNC(hp16500_state::vbl_ack_w)); + map(0x00209800, 0x00209803).r(FUNC(hp16500_state::vbl_state_r)); map(0x0020b800, 0x0020b8ff).ram(); // system ram test is really strange. map(0x0020f800, 0x0020f80f).rw(m_mlc, FUNC(hp_hil_mlc_device::read), FUNC(hp_hil_mlc_device::write)); - map(0x00600000, 0x0061ffff).w(this, FUNC(hp16500_state::vram_w)); - map(0x00600000, 0x0067ffff).r(this, FUNC(hp16500_state::vram_r)).umask32(0x00ff00ff); - map(0x00700000, 0x00700000).w(this, FUNC(hp16500_state::mask_w)); - map(0x00740000, 0x00740000).w(this, FUNC(hp16500_state::val_w)); + map(0x00600000, 0x0061ffff).w(FUNC(hp16500_state::vram_w)); + map(0x00600000, 0x0067ffff).r(FUNC(hp16500_state::vram_r)).umask32(0x00ff00ff); + map(0x00700000, 0x00700000).w(FUNC(hp16500_state::mask_w)); + map(0x00740000, 0x00740000).w(FUNC(hp16500_state::val_w)); map(0x00800000, 0x009fffff).ram(); } diff --git a/src/mame/drivers/hp2620.cpp b/src/mame/drivers/hp2620.cpp index 376d2056c51..cb3ed88143c 100644 --- a/src/mame/drivers/hp2620.cpp +++ b/src/mame/drivers/hp2620.cpp @@ -84,13 +84,13 @@ void hp2620_state::mem_map(address_map &map) void hp2620_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x7f).rw(this, FUNC(hp2620_state::nvram_r), FUNC(hp2620_state::nvram_w)).share("nvram"); - map(0x80, 0x80).r(this, FUNC(hp2620_state::keystat_r)); - map(0x90, 0x90).r(this, FUNC(hp2620_state::sysstat_r)); + map(0x00, 0x7f).rw(FUNC(hp2620_state::nvram_r), FUNC(hp2620_state::nvram_w)).share("nvram"); + map(0x80, 0x80).r(FUNC(hp2620_state::keystat_r)); + map(0x90, 0x90).r(FUNC(hp2620_state::sysstat_r)); map(0xa0, 0xa3).w("acia", FUNC(mos6551_device::write)); map(0xa4, 0xa7).r("acia", FUNC(mos6551_device::read)); - map(0xa8, 0xa8).w(this, FUNC(hp2620_state::modem_w)); - map(0xb8, 0xb8).w(this, FUNC(hp2620_state::keydisp_w)); + map(0xa8, 0xa8).w(FUNC(hp2620_state::modem_w)); + map(0xb8, 0xb8).w(FUNC(hp2620_state::keydisp_w)); } static INPUT_PORTS_START( hp2622 ) diff --git a/src/mame/drivers/hp2640.cpp b/src/mame/drivers/hp2640.cpp index ce954a39179..0a1a1d7264b 100644 --- a/src/mame/drivers/hp2640.cpp +++ b/src/mame/drivers/hp2640.cpp @@ -940,18 +940,18 @@ void hp2645_state::cpu_mem_map(address_map &map) map.unmap_value_low(); map(0x0000, 0x57ff).rom(); map(0x8100, 0x8100).r(m_uart, FUNC(ay51013_device::receive)); - map(0x8120, 0x8120).r(this, FUNC(hp2645_state::async_status_r)); - map(0x8140, 0x8140).w(this, FUNC(hp2645_state::async_control_w)); + map(0x8120, 0x8120).r(FUNC(hp2645_state::async_status_r)); + map(0x8140, 0x8140).w(FUNC(hp2645_state::async_control_w)); map(0x8160, 0x8160).w(m_uart, FUNC(ay51013_device::transmit)); - map(0x8300, 0x8300).w(this, FUNC(hp2645_state::kb_led_w)); - map(0x8300, 0x830d).r(this, FUNC(hp2645_state::kb_r)); - map(0x830e, 0x830e).r(this, FUNC(hp2645_state::switches_ah_r)); - map(0x830f, 0x830f).r(this, FUNC(hp2645_state::datacomm_sw_r)); - map(0x8320, 0x8320).w(this, FUNC(hp2645_state::kb_prev_w)); - map(0x8380, 0x8380).rw(this, FUNC(hp2645_state::switches_jr_r), FUNC(hp2645_state::kb_reset_w)); - map(0x83a0, 0x83a0).r(this, FUNC(hp2645_state::switches_sz_r)); - map(0x8700, 0x8700).w(this, FUNC(hp2645_state::cx_w)); - map(0x8720, 0x8720).w(this, FUNC(hp2645_state::cy_w)); + map(0x8300, 0x8300).w(FUNC(hp2645_state::kb_led_w)); + map(0x8300, 0x830d).r(FUNC(hp2645_state::kb_r)); + map(0x830e, 0x830e).r(FUNC(hp2645_state::switches_ah_r)); + map(0x830f, 0x830f).r(FUNC(hp2645_state::datacomm_sw_r)); + map(0x8320, 0x8320).w(FUNC(hp2645_state::kb_prev_w)); + map(0x8380, 0x8380).rw(FUNC(hp2645_state::switches_jr_r), FUNC(hp2645_state::kb_reset_w)); + map(0x83a0, 0x83a0).r(FUNC(hp2645_state::switches_sz_r)); + map(0x8700, 0x8700).w(FUNC(hp2645_state::cx_w)); + map(0x8720, 0x8720).w(FUNC(hp2645_state::cy_w)); map(0x9100, 0x91ff).ram(); map(0xc000, 0xffff).ram(); } @@ -959,7 +959,7 @@ void hp2645_state::cpu_mem_map(address_map &map) void hp2645_state::cpu_io_map(address_map &map) { map.unmap_value_low(); - map(0x00, 0xff).w(this, FUNC(hp2645_state::mode_byte_w)); + map(0x00, 0xff).w(FUNC(hp2645_state::mode_byte_w)); } MACHINE_CONFIG_START(hp2645_state::hp2645) diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index e35f7671d0c..7b403d3597d 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -327,8 +327,8 @@ private: void hp64k_state::cpu_mem_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x7fff).rw(this, FUNC(hp64k_state::hp64k_slot_r), FUNC(hp64k_state::hp64k_slot_w)); - map(0x8000, 0x8001).w(this, FUNC(hp64k_state::hp64k_crtc_w)); + map(0x4000, 0x7fff).rw(FUNC(hp64k_state::hp64k_slot_r), FUNC(hp64k_state::hp64k_slot_w)); + map(0x8000, 0x8001).w(FUNC(hp64k_state::hp64k_crtc_w)); map(0x8002, 0xffff).ram(); } @@ -336,34 +336,34 @@ void hp64k_state::cpu_io_map(address_map &map) { // PA = 0, IC = [0..3] // Keyboard input - map(HP_MAKE_IOADDR( 0, 0), HP_MAKE_IOADDR( 0, 3)).r(this, FUNC(hp64k_state::hp64k_kb_r)); + map(HP_MAKE_IOADDR( 0, 0), HP_MAKE_IOADDR( 0, 3)).r(FUNC(hp64k_state::hp64k_kb_r)); // PA = 2, IC = [0..3] // Line sync interrupt clear/watchdog reset - map(HP_MAKE_IOADDR( 2, 0), HP_MAKE_IOADDR( 2, 3)).rw(this, FUNC(hp64k_state::hp64k_deltat_r), FUNC(hp64k_state::hp64k_deltat_w)); + map(HP_MAKE_IOADDR( 2, 0), HP_MAKE_IOADDR( 2, 3)).rw(FUNC(hp64k_state::hp64k_deltat_r), FUNC(hp64k_state::hp64k_deltat_w)); // PA = 4, IC = [0..3] // Floppy I/F - map(HP_MAKE_IOADDR( 4, 0), HP_MAKE_IOADDR( 4, 3)).rw(this, FUNC(hp64k_state::hp64k_flp_r), FUNC(hp64k_state::hp64k_flp_w)); + map(HP_MAKE_IOADDR( 4, 0), HP_MAKE_IOADDR( 4, 3)).rw(FUNC(hp64k_state::hp64k_flp_r), FUNC(hp64k_state::hp64k_flp_w)); // PA = 5, IC = [0..3] // Write to USART - map(HP_MAKE_IOADDR( 5, 0), HP_MAKE_IOADDR( 5, 3)).w(this, FUNC(hp64k_state::hp64k_usart_w)); + map(HP_MAKE_IOADDR( 5, 0), HP_MAKE_IOADDR( 5, 3)).w(FUNC(hp64k_state::hp64k_usart_w)); // PA = 6, IC = [0..3] // Read from USART - map(HP_MAKE_IOADDR( 6, 0), HP_MAKE_IOADDR( 6, 3)).r(this, FUNC(hp64k_state::hp64k_usart_r)); + map(HP_MAKE_IOADDR( 6, 0), HP_MAKE_IOADDR( 6, 3)).r(FUNC(hp64k_state::hp64k_usart_r)); // PA = 7, IC = 1 // PHI - map(HP_MAKE_IOADDR( 7, 1), HP_MAKE_IOADDR( 7, 1)).rw(this, FUNC(hp64k_state::hp64k_phi_r), FUNC(hp64k_state::hp64k_phi_w)); + map(HP_MAKE_IOADDR( 7, 1), HP_MAKE_IOADDR( 7, 1)).rw(FUNC(hp64k_state::hp64k_phi_r), FUNC(hp64k_state::hp64k_phi_w)); // PA = 7, IC = 2 // Rear-panel switches and loopback relay control - map(HP_MAKE_IOADDR( 7, 2), HP_MAKE_IOADDR( 7, 2)).rw(this, FUNC(hp64k_state::hp64k_rear_sw_r), FUNC(hp64k_state::hp64k_loopback_w)); + map(HP_MAKE_IOADDR( 7, 2), HP_MAKE_IOADDR( 7, 2)).rw(FUNC(hp64k_state::hp64k_rear_sw_r), FUNC(hp64k_state::hp64k_loopback_w)); // PA = 9, IC = [0..3] // Beeper control & interrupt status read - map(HP_MAKE_IOADDR( 9, 0), HP_MAKE_IOADDR( 9, 3)).w(this, FUNC(hp64k_state::hp64k_beep_w)); + map(HP_MAKE_IOADDR( 9, 0), HP_MAKE_IOADDR( 9, 3)).w(FUNC(hp64k_state::hp64k_beep_w)); // PA = 10, IC = [0..3] // Slot selection - map(HP_MAKE_IOADDR(10, 0), HP_MAKE_IOADDR(10, 3)).w(this, FUNC(hp64k_state::hp64k_slot_sel_w)); + map(HP_MAKE_IOADDR(10, 0), HP_MAKE_IOADDR(10, 3)).w(FUNC(hp64k_state::hp64k_slot_sel_w)); // PA = 12, IC = [0..3] // Interrupt mask - map(HP_MAKE_IOADDR(12, 0), HP_MAKE_IOADDR(12, 3)).w(this, FUNC(hp64k_state::hp64k_irl_mask_w)); + map(HP_MAKE_IOADDR(12, 0), HP_MAKE_IOADDR(12, 3)).w(FUNC(hp64k_state::hp64k_irl_mask_w)); } hp64k_state::hp64k_state(const machine_config &mconfig, device_type type, const char *tag) @@ -426,7 +426,7 @@ void hp64k_state::machine_reset() m_floppy0_wpt = false; m_floppy1_wpt = false; m_beeper->set_state(0); - m_baud_rate->str_w((m_s5_sw->read() >> 1) & 0xf); + m_baud_rate->write_str((m_s5_sw->read() >> 1) & 0xf); m_16x_clk = (m_rs232_sw->read() & 0x02) != 0; m_loopback = false; m_txd_state = true; @@ -709,7 +709,7 @@ WRITE16_MEMBER(hp64k_state::hp64k_flp_w) case 0: // DMA transfer, not at TC if (m_floppy_if_state == HP64K_FLPST_DMAWR1) { - m_fdc->data_w(~m_floppy_in_latch_msb); + m_fdc->write_data(~m_floppy_in_latch_msb); m_floppy_if_state = HP64K_FLPST_DMAWR2; } else { logerror("write to IC=0 with floppy state %d\n" , m_floppy_if_state); @@ -760,7 +760,7 @@ WRITE16_MEMBER(hp64k_state::hp64k_flp_w) case 2: // DMA transfer, at TC if (m_floppy_if_state == HP64K_FLPST_DMAWR1) { - m_fdc->data_w(~m_floppy_in_latch_msb); + m_fdc->write_data(~m_floppy_in_latch_msb); m_floppy_if_state = HP64K_FLPST_DMAWR2; m_floppy_dmaen = false; m_floppy_dmai = true; @@ -799,18 +799,18 @@ void hp64k_state::hp64k_update_floppy_dma(void) m_floppy_if_state = HP64K_FLPST_DMAWR1; } else { // DMA reads - m_floppy_out_latch_msb = ~m_fdc->data_r(); + m_floppy_out_latch_msb = ~m_fdc->read_data(); m_floppy_if_state = HP64K_FLPST_DMARD1; } break; case HP64K_FLPST_DMAWR2: - m_fdc->data_w(~m_floppy_in_latch_lsb); + m_fdc->write_data(~m_floppy_in_latch_lsb); m_floppy_if_state = HP64K_FLPST_IDLE; break; case HP64K_FLPST_DMARD1: - m_floppy_out_latch_lsb = ~m_fdc->data_r(); + m_floppy_out_latch_lsb = ~m_fdc->read_data(); m_cpu->dmar_w(1); m_floppy_if_state = HP64K_FLPST_DMARD2; break; diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp index b7b0fd24429..6ff76d07a0f 100644 --- a/src/mame/drivers/hp80.cpp +++ b/src/mame/drivers/hp80.cpp @@ -1305,20 +1305,20 @@ void hp85_state::cpu_mem_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x7fff).m(m_rombank, FUNC(address_map_bank_device::amap8)); map(0x8000, 0xbfff).ram(); - map(0xff00, 0xff00).w(this, FUNC(hp85_state::ginten_w)); - map(0xff01, 0xff01).w(this, FUNC(hp85_state::gintdis_w)); - map(0xff02, 0xff02).rw(this, FUNC(hp85_state::keysts_r), FUNC(hp85_state::keysts_w)); - map(0xff03, 0xff03).rw(this, FUNC(hp85_state::keycod_r), FUNC(hp85_state::keycod_w)); - map(0xff04, 0xff07).rw(this, FUNC(hp85_state::crtc_r), FUNC(hp85_state::crtc_w)); + map(0xff00, 0xff00).w(FUNC(hp85_state::ginten_w)); + map(0xff01, 0xff01).w(FUNC(hp85_state::gintdis_w)); + map(0xff02, 0xff02).rw(FUNC(hp85_state::keysts_r), FUNC(hp85_state::keysts_w)); + map(0xff03, 0xff03).rw(FUNC(hp85_state::keycod_r), FUNC(hp85_state::keycod_w)); + map(0xff04, 0xff07).rw(FUNC(hp85_state::crtc_r), FUNC(hp85_state::crtc_w)); map(0xff08, 0xff09).rw("tape", FUNC(hp_1ma6_device::reg_r), FUNC(hp_1ma6_device::reg_w)); - map(0xff0a, 0xff0a).rw(this, FUNC(hp85_state::clksts_r), FUNC(hp85_state::clksts_w)); - map(0xff0b, 0xff0b).rw(this, FUNC(hp85_state::clkdat_r), FUNC(hp85_state::clkdat_w)); - map(0xff0c, 0xff0c).w(this, FUNC(hp85_state::prtlen_w)); - map(0xff0d, 0xff0d).rw(this, FUNC(hp85_state::prchar_r), FUNC(hp85_state::prchar_w)); - map(0xff0e, 0xff0e).rw(this, FUNC(hp85_state::prtsts_r), FUNC(hp85_state::prtctl_w)); - map(0xff0f, 0xff0f).w(this, FUNC(hp85_state::prtdat_w)); - map(0xff18, 0xff18).w(this, FUNC(hp85_state::rselec_w)); - map(0xff40, 0xff40).rw(this, FUNC(hp85_state::intrsc_r), FUNC(hp85_state::intrsc_w)); + map(0xff0a, 0xff0a).rw(FUNC(hp85_state::clksts_r), FUNC(hp85_state::clksts_w)); + map(0xff0b, 0xff0b).rw(FUNC(hp85_state::clkdat_r), FUNC(hp85_state::clkdat_w)); + map(0xff0c, 0xff0c).w(FUNC(hp85_state::prtlen_w)); + map(0xff0d, 0xff0d).rw(FUNC(hp85_state::prchar_r), FUNC(hp85_state::prchar_w)); + map(0xff0e, 0xff0e).rw(FUNC(hp85_state::prtsts_r), FUNC(hp85_state::prtctl_w)); + map(0xff0f, 0xff0f).w(FUNC(hp85_state::prtdat_w)); + map(0xff18, 0xff18).w(FUNC(hp85_state::rselec_w)); + map(0xff40, 0xff40).rw(FUNC(hp85_state::intrsc_r), FUNC(hp85_state::intrsc_w)); } void hp85_state::rombank_mem_map(address_map &map) diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 1a739436b4b..8deffdc25f5 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -3716,13 +3716,13 @@ void hp9845_base_state::ppu_io_map(address_map &map) map(HP_MAKE_IOADDR(PRINTER_PA, 0), HP_MAKE_IOADDR(PRINTER_PA, 1)).rw("printer", FUNC(hp9845_printer_device::printer_r), FUNC(hp9845_printer_device::printer_w)); // PA = 0, IC = 2 // Keyboard scancode input - map(HP_MAKE_IOADDR(0, 2), HP_MAKE_IOADDR(0, 2)).r(this, FUNC(hp9845_base_state::kb_scancode_r)); + map(HP_MAKE_IOADDR(0, 2), HP_MAKE_IOADDR(0, 2)).r(FUNC(hp9845_base_state::kb_scancode_r)); // PA = 0, IC = 3 // Keyboard status input & keyboard interrupt clear - map(HP_MAKE_IOADDR(0, 3), HP_MAKE_IOADDR(0, 3)).rw(this, FUNC(hp9845_base_state::kb_status_r), FUNC(hp9845_base_state::kb_irq_clear_w)); + map(HP_MAKE_IOADDR(0, 3), HP_MAKE_IOADDR(0, 3)).rw(FUNC(hp9845_base_state::kb_status_r), FUNC(hp9845_base_state::kb_irq_clear_w)); // PA = 13, IC = 0..3 // Graphic video - map(HP_MAKE_IOADDR(GVIDEO_PA, 0), HP_MAKE_IOADDR(GVIDEO_PA, 3)).rw(this, FUNC(hp9845_base_state::graphic_r), FUNC(hp9845_base_state::graphic_w)); + map(HP_MAKE_IOADDR(GVIDEO_PA, 0), HP_MAKE_IOADDR(GVIDEO_PA, 3)).rw(FUNC(hp9845_base_state::graphic_r), FUNC(hp9845_base_state::graphic_w)); // PA = 14, IC = 0..3 // Left-hand side tape drive (T14) map(HP_MAKE_IOADDR(T14_PA, 0), HP_MAKE_IOADDR(T14_PA, 3)).rw("t14", FUNC(hp_taco_device::reg_r), FUNC(hp_taco_device::reg_w)); diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp index da7b315dc23..8ee7b458dad 100644 --- a/src/mame/drivers/hp9k.cpp +++ b/src/mame/drivers/hp9k.cpp @@ -310,18 +310,18 @@ void hp9k_state::hp9k_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x000909).rom().region("bootrom", 0); - map(0x00090a, 0x00090d).rw(this, FUNC(hp9k_state::leds_r), FUNC(hp9k_state::leds_w)); + map(0x00090a, 0x00090d).rw(FUNC(hp9k_state::leds_r), FUNC(hp9k_state::leds_w)); map(0x00090e, 0x00ffff).rom().region("bootrom", 0x90e); - map(0x010000, 0x427fff).rw(this, FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); - map(0x428000, 0x428fff).rw(this, FUNC(hp9k_state::keyboard_r), FUNC(hp9k_state::keyboard_w)); - map(0x429000, 0x50ffff).rw(this, FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); - map(0x510000, 0x51ffff).rw(this, FUNC(hp9k_state::hp9k_videoram_r), FUNC(hp9k_state::hp9k_videoram_w)); - map(0x520000, 0x52ffff).rw(this, FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); + map(0x010000, 0x427fff).rw(FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); + map(0x428000, 0x428fff).rw(FUNC(hp9k_state::keyboard_r), FUNC(hp9k_state::keyboard_w)); + map(0x429000, 0x50ffff).rw(FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); + map(0x510000, 0x51ffff).rw(FUNC(hp9k_state::hp9k_videoram_r), FUNC(hp9k_state::hp9k_videoram_w)); + map(0x520000, 0x52ffff).rw(FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); map(0x530000, 0x53ffff).ram(); // graphic memory - map(0x540000, 0x5effff).rw(this, FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); - map(0x5f0000, 0x5f3fff).rw(this, FUNC(hp9k_state::hp9k_prom_r), FUNC(hp9k_state::hp9k_prom_w)); + map(0x540000, 0x5effff).rw(FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); + map(0x5f0000, 0x5f3fff).rw(FUNC(hp9k_state::hp9k_prom_r), FUNC(hp9k_state::hp9k_prom_w)); //AM_RANGE(0x5f0000, 0x5f3fff) AM_READWRITE(buserror_r,buserror_w) - map(0x5f4000, 0xfbffff).rw(this, FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); + map(0x5f4000, 0xfbffff).rw(FUNC(hp9k_state::buserror_r), FUNC(hp9k_state::buserror_w)); map(0xFC0000, 0xffffff).ram(); // system ram } diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index 5c9e7feacc9..57bad7b0e88 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -198,11 +198,11 @@ uint32_t hp9k3xx_state::hp_medres_update(screen_device &screen, bitmap_rgb32 &bi // shared mappings for all 9000/3xx systems void hp9k3xx_state::hp9k3xx_common(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); - map(0x00000000, 0x0001ffff).rom().region("maincpu", 0).w(this, FUNC(hp9k3xx_state::led_w)); // writes to 1fffc are the LED + map(0x00000000, 0xffffffff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); + map(0x00000000, 0x0001ffff).rom().region("maincpu", 0).w(FUNC(hp9k3xx_state::led_w)); // writes to 1fffc are the LED map(0x00428000, 0x00428003).rw(m_iocpu, FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w)).umask32(0x00ff00ff); - map(0x00470000, 0x0047001f).mirror(0x0000ffe0).rw(this, FUNC(hp9k3xx_state::gpib_r), FUNC(hp9k3xx_state::gpib_w)).umask16(0x00ff); + map(0x00470000, 0x0047001f).mirror(0x0000ffe0).rw(FUNC(hp9k3xx_state::gpib_r), FUNC(hp9k3xx_state::gpib_w)).umask16(0x00ff); map(0x005f8000, 0x005f800f).rw(PTM6840_TAG, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask32(0x00ff00ff); @@ -216,14 +216,14 @@ void hp9k3xx_state::hp9k310_map(address_map &map) map(0x000000, 0x01ffff).rom().region("maincpu", 0).nopw(); // writes to 1fffc are the LED map(0x428000, 0x428003).rw(m_iocpu, FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w)).umask16(0x00ff); - map(0x470000, 0x47001f).mirror(0x00ffe0).rw(this, FUNC(hp9k3xx_state::gpib_r), FUNC(hp9k3xx_state::gpib_w)).umask16(0x00ff); + map(0x470000, 0x47001f).mirror(0x00ffe0).rw(FUNC(hp9k3xx_state::gpib_r), FUNC(hp9k3xx_state::gpib_w)).umask16(0x00ff); - map(0x510000, 0x510003).rw(this, FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // no "Alpha display" - map(0x538000, 0x538003).rw(this, FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // no "Graphics" - map(0x5c0000, 0x5c0003).rw(this, FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // no add-on FP coprocessor + map(0x510000, 0x510003).rw(FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // no "Alpha display" + map(0x538000, 0x538003).rw(FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // no "Graphics" + map(0x5c0000, 0x5c0003).rw(FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // no add-on FP coprocessor map(0x5f8000, 0x5f800f).rw(PTM6840_TAG, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); - map(0x600000, 0x7fffff).rw(this, FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // prevent reading invalid DIO slots + map(0x600000, 0x7fffff).rw(FUNC(hp9k3xx_state::buserror16_r), FUNC(hp9k3xx_state::buserror16_w)); // prevent reading invalid DIO slots map(0x800000, 0xffffff).ram(); } @@ -246,7 +246,7 @@ void hp9k3xx_state::hp9k330_map(address_map &map) { hp9k3xx_common(map); - map(0xffb00000, 0xffbfffff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); + map(0xffb00000, 0xffbfffff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); map(0xffc00000, 0xffffffff).ram(); } @@ -258,7 +258,7 @@ void hp9k3xx_state::hp9k332_map(address_map &map) map(0x00200000, 0x002fffff).ram().share("vram"); // 98544 mono framebuffer map(0x00560000, 0x00563fff).rom().region("graphics", 0x0000); // 98544 mono ROM - map(0xffb00000, 0xffbfffff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); + map(0xffb00000, 0xffbfffff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); map(0xffc00000, 0xffffffff).ram(); } @@ -267,7 +267,7 @@ void hp9k3xx_state::hp9k370_map(address_map &map) { hp9k3xx_common(map); - map(0xff700000, 0xff7fffff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); + map(0xff700000, 0xff7fffff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); map(0xff800000, 0xffffffff).ram(); } @@ -276,9 +276,9 @@ void hp9k3xx_state::hp9k380_map(address_map &map) { hp9k3xx_common(map); - map(0x0051a000, 0x0051afff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); // no "Alpha display" + map(0x0051a000, 0x0051afff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); // no "Alpha display" - map(0xc0000000, 0xff7fffff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); + map(0xc0000000, 0xff7fffff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); map(0xff800000, 0xffffffff).ram(); } @@ -287,10 +287,10 @@ void hp9k3xx_state::hp9k382_map(address_map &map) { hp9k3xx_common(map); - map(0xffb00000, 0xffbfffff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); + map(0xffb00000, 0xffbfffff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); map(0xffc00000, 0xffffffff).ram(); - map(0x0051a000, 0x0051afff).rw(this, FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); // no "Alpha display" + map(0x0051a000, 0x0051afff).rw(FUNC(hp9k3xx_state::buserror_r), FUNC(hp9k3xx_state::buserror_w)); // no "Alpha display" } void hp9k3xx_state::iocpu_map(address_map &map) diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index 7539c3aac34..b4a205a86a2 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -475,18 +475,18 @@ void hp_ipc_state::set_bus_error(uint32_t address, bool write, uint16_t mem_mask void hp_ipc_state::hp_ipc_mem_outer(address_map &map) { - map(0x000000, 0xFFFFFF).rw(this, FUNC(hp_ipc_state::mem_r), FUNC(hp_ipc_state::mem_w)); + map(0x000000, 0xFFFFFF).rw(FUNC(hp_ipc_state::mem_r), FUNC(hp_ipc_state::mem_w)); } void hp_ipc_state::hp_ipc_mem_inner_base(address_map &map) { // bus error handler - map(0x0000000, 0x1FFFFFF).rw(this, FUNC(hp_ipc_state::trap_r), FUNC(hp_ipc_state::trap_w)); + map(0x0000000, 0x1FFFFFF).rw(FUNC(hp_ipc_state::trap_r), FUNC(hp_ipc_state::trap_w)); // user mode - map(0x1000000, 0x17FFFFF).rw(this, FUNC(hp_ipc_state::ram_r), FUNC(hp_ipc_state::ram_w)); + map(0x1000000, 0x17FFFFF).rw(FUNC(hp_ipc_state::ram_r), FUNC(hp_ipc_state::ram_w)); map(0x1800000, 0x187FFFF).rom().region("maincpu", 0); - map(0x1E00000, 0x1E0FFFF).rw(this, FUNC(hp_ipc_state::mmu_r), FUNC(hp_ipc_state::mmu_w)); + map(0x1E00000, 0x1E0FFFF).rw(FUNC(hp_ipc_state::mmu_r), FUNC(hp_ipc_state::mmu_w)); map(0x1E20000, 0x1E2000F).rw("gpu", FUNC(hp1ll3_device::read), FUNC(hp1ll3_device::write)).umask16(0x00ff); map(0x1E40000, 0x1E4002F).rw("rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)).umask16(0x00ff); @@ -494,8 +494,8 @@ void hp_ipc_state::hp_ipc_mem_inner_base(address_map &map) map(0x0000000, 0x007FFFF).rom().region("maincpu", 0); // Internal ROM (operating system PCA) map(0x0080000, 0x00FFFFF).unmaprw(); // Internal ROM (option ROM PCA) map(0x0100000, 0x04FFFFF).unmaprw(); // External ROM modules - map(0x0600000, 0x060FFFF).rw(this, FUNC(hp_ipc_state::mmu_r), FUNC(hp_ipc_state::mmu_w)); - map(0x0610000, 0x0610007).rw(this, FUNC(hp_ipc_state::floppy_id_r), FUNC(hp_ipc_state::floppy_id_w)).umask16(0x00ff); + map(0x0600000, 0x060FFFF).rw(FUNC(hp_ipc_state::mmu_r), FUNC(hp_ipc_state::mmu_w)); + map(0x0610000, 0x0610007).rw(FUNC(hp_ipc_state::floppy_id_r), FUNC(hp_ipc_state::floppy_id_w)).umask16(0x00ff); map(0x0610008, 0x061000F).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)).umask16(0x00ff); map(0x0620000, 0x062000F).rw("gpu", FUNC(hp1ll3_device::read), FUNC(hp1ll3_device::write)).umask16(0x00ff); map(0x0630000, 0x063FFFF).mask(0xf).rw("hpib" , FUNC(tms9914_device::reg8_r) , FUNC(tms9914_device::reg8_w)).umask16(0x00ff); @@ -504,7 +504,7 @@ void hp_ipc_state::hp_ipc_mem_inner_base(address_map &map) map(0x0670000, 0x067FFFF).noprw(); // Speaker (NatSemi COP 452) map(0x0680000, 0x068FFFF).noprw(); // 'SIMON (98628) fast HP-IB card' -- sys/simon.h map(0x0700000, 0x07FFFFF).unmaprw(); // External I/O - map(0x0800000, 0x0FFFFFF).rw(this, FUNC(hp_ipc_state::ram_r), FUNC(hp_ipc_state::ram_w)); + map(0x0800000, 0x0FFFFFF).rw(FUNC(hp_ipc_state::ram_r), FUNC(hp_ipc_state::ram_w)); } void hp_ipc_state::hp_ipc_mem_inner_9807a(address_map &map) diff --git a/src/mame/drivers/hpz80unk.cpp b/src/mame/drivers/hpz80unk.cpp index 92d2d1c0259..ebc31d35587 100644 --- a/src/mame/drivers/hpz80unk.cpp +++ b/src/mame/drivers/hpz80unk.cpp @@ -111,16 +111,16 @@ void hpz80unk_state::hpz80unk_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(hpz80unk_state::port00_r)); // uart1 status + map(0x00, 0x00).r(FUNC(hpz80unk_state::port00_r)); // uart1 status map(0x01, 0x01).rw("uart1", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); // uart1 data - map(0x02, 0x02).r(this, FUNC(hpz80unk_state::port02_r)); - map(0x03, 0x03).r(this, FUNC(hpz80unk_state::port03_r)); // uart2 status + map(0x02, 0x02).r(FUNC(hpz80unk_state::port02_r)); + map(0x03, 0x03).r(FUNC(hpz80unk_state::port03_r)); // uart2 status map(0x04, 0x04).rw("uart2", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); // uart2 data - map(0x0d, 0x0d).r(this, FUNC(hpz80unk_state::port0d_r)); // uart3 status + map(0x0d, 0x0d).r(FUNC(hpz80unk_state::port0d_r)); // uart3 status map(0x0e, 0x0e).w("uart3", FUNC(ay31015_device::transmit)); // uart3 data map(0x1d, 0x1e); // top of memory is written here, big-endian map(0x1f, 0x1f).portr("DSW"); // select which uarts to use - map(0xfc, 0xfc).r(this, FUNC(hpz80unk_state::portfc_r)); + map(0xfc, 0xfc).r(FUNC(hpz80unk_state::portfc_r)); } /* Input ports */ diff --git a/src/mame/drivers/ht6000.cpp b/src/mame/drivers/ht6000.cpp index 964956f7edf..406fa4fab5f 100644 --- a/src/mame/drivers/ht6000.cpp +++ b/src/mame/drivers/ht6000.cpp @@ -73,18 +73,18 @@ void ht6000_state::maincpu_map(address_map &map) map(0x0000, 0x7fff).rom().region("maincpu", 0); map(0x8000, 0x9fff).ram(); map(0xa000, 0xbfff).ram(); - map(0xc000, 0xcfff).w(this, FUNC(ht6000_state::music_w)); // UPD935G - map(0xd000, 0xd0ff).w(this, FUNC(ht6000_state::pg1_w)); // MSM6294-07 - map(0xd100, 0xd1ff).w(this, FUNC(ht6000_state::pg2_w)); // MSM6294-08 - map(0xd200, 0xd2ff).w(this, FUNC(ht6000_state::pg3_w)); // MSM6294-09 - map(0xd300, 0xd3ff).w(this, FUNC(ht6000_state::led_w)); - map(0xd400, 0xd4ff).w(this, FUNC(ht6000_state::led_addr_w)); - map(0xd500, 0xd5ff).w(this, FUNC(ht6000_state::led_data_w)); - map(0xd600, 0xd6ff).r(this, FUNC(ht6000_state::switches_r)); - map(0xd700, 0xd7ff).r(this, FUNC(ht6000_state::keys_r)); - map(0xd800, 0xd8ff).w(this, FUNC(ht6000_state::ram_card_l_w)); - map(0xd900, 0xd9ff).w(this, FUNC(ht6000_state::ram_card_h_w)); - map(0xe000, 0xefff).r(this, FUNC(ht6000_state::rom2_r)); + map(0xc000, 0xcfff).w(FUNC(ht6000_state::music_w)); // UPD935G + map(0xd000, 0xd0ff).w(FUNC(ht6000_state::pg1_w)); // MSM6294-07 + map(0xd100, 0xd1ff).w(FUNC(ht6000_state::pg2_w)); // MSM6294-08 + map(0xd200, 0xd2ff).w(FUNC(ht6000_state::pg3_w)); // MSM6294-09 + map(0xd300, 0xd3ff).w(FUNC(ht6000_state::led_w)); + map(0xd400, 0xd4ff).w(FUNC(ht6000_state::led_addr_w)); + map(0xd500, 0xd5ff).w(FUNC(ht6000_state::led_data_w)); + map(0xd600, 0xd6ff).r(FUNC(ht6000_state::switches_r)); + map(0xd700, 0xd7ff).r(FUNC(ht6000_state::keys_r)); + map(0xd800, 0xd8ff).w(FUNC(ht6000_state::ram_card_l_w)); + map(0xd900, 0xd9ff).w(FUNC(ht6000_state::ram_card_h_w)); + map(0xe000, 0xefff).r(FUNC(ht6000_state::rom2_r)); } diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp index 7fa54d896b2..d555e4f9a81 100644 --- a/src/mame/drivers/huebler.cpp +++ b/src/mame/drivers/huebler.cpp @@ -99,7 +99,7 @@ void amu880_state::amu880_io(address_map &map) // AM_RANGE(0x00, 0x00) AM_MIRROR(0x03) AM_WRITE(power_off_w) // AM_RANGE(0x04, 0x04) AM_MIRROR(0x02) AM_WRITE(tone_off_w) // AM_RANGE(0x05, 0x05) AM_MIRROR(0x02) AM_WRITE(tone_on_w) - map(0x08, 0x09).mirror(0x02).r(this, FUNC(amu880_state::keyboard_r)); + map(0x08, 0x09).mirror(0x02).r(FUNC(amu880_state::keyboard_r)); map(0x0c, 0x0f).rw(Z80PIO2_TAG, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x10, 0x13).rw(Z80PIO1_TAG, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x14, 0x17).rw(Z80CTC_TAG, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp index 150fba474f4..ad43ca0f858 100644 --- a/src/mame/drivers/hunter2.cpp +++ b/src/mame/drivers/hunter2.cpp @@ -113,14 +113,14 @@ void hunter2_state::hunter2_io(address_map &map) map(0x21, 0x21).rw("lcdc", FUNC(hd61830_device::status_r), FUNC(hd61830_device::control_w)); map(0x3e, 0x3e).r("lcdc", FUNC(hd61830_device::data_r)); map(0x40, 0x4f).rw("rtc", FUNC(mm58274c_device::read), FUNC(mm58274c_device::write)); - map(0x60, 0x60).w(this, FUNC(hunter2_state::display_ctrl_w)); - map(0x80, 0x80).w(this, FUNC(hunter2_state::port80_w)); - map(0x81, 0x81).w(this, FUNC(hunter2_state::serial_tx_w)); - map(0x82, 0x82).w(this, FUNC(hunter2_state::serial_dtr_w)); - map(0x84, 0x84).w(this, FUNC(hunter2_state::serial_rts_w)); - map(0x86, 0x86).w(this, FUNC(hunter2_state::speaker_w)); - map(0xbb, 0xbb).w(this, FUNC(hunter2_state::irqctrl_w)); - map(0xe0, 0xe0).w(this, FUNC(hunter2_state::memmap_w)); + map(0x60, 0x60).w(FUNC(hunter2_state::display_ctrl_w)); + map(0x80, 0x80).w(FUNC(hunter2_state::port80_w)); + map(0x81, 0x81).w(FUNC(hunter2_state::serial_tx_w)); + map(0x82, 0x82).w(FUNC(hunter2_state::serial_dtr_w)); + map(0x84, 0x84).w(FUNC(hunter2_state::serial_rts_w)); + map(0x86, 0x86).w(FUNC(hunter2_state::speaker_w)); + map(0xbb, 0xbb).w(FUNC(hunter2_state::irqctrl_w)); + map(0xe0, 0xe0).w(FUNC(hunter2_state::memmap_w)); } diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index adb9199daa9..b6a50e242fd 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -400,9 +400,9 @@ void hvyunit_state::master_memory(address_map &map) void hvyunit_state::master_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(hvyunit_state::master_bankswitch_w)); - map(0x01, 0x01).w(this, FUNC(hvyunit_state::master_bankswitch_w)); // correct? - map(0x02, 0x02).w(this, FUNC(hvyunit_state::trigger_nmi_on_slave_cpu)); + map(0x00, 0x00).w(FUNC(hvyunit_state::master_bankswitch_w)); + map(0x01, 0x01).w(FUNC(hvyunit_state::master_bankswitch_w)); // correct? + map(0x02, 0x02).w(FUNC(hvyunit_state::trigger_nmi_on_slave_cpu)); } @@ -410,8 +410,8 @@ void hvyunit_state::slave_memory(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("slave_bank"); - map(0xc000, 0xc3ff).ram().w(this, FUNC(hvyunit_state::videoram_w)).share("videoram"); - map(0xc400, 0xc7ff).ram().w(this, FUNC(hvyunit_state::colorram_w)).share("colorram"); + map(0xc000, 0xc3ff).ram().w(FUNC(hvyunit_state::videoram_w)).share("videoram"); + map(0xc400, 0xc7ff).ram().w(FUNC(hvyunit_state::colorram_w)).share("colorram"); map(0xd000, 0xdfff).ram(); map(0xd000, 0xd1ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xd800, 0xd9ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); @@ -421,14 +421,14 @@ void hvyunit_state::slave_memory(address_map &map) void hvyunit_state::slave_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(hvyunit_state::slave_bankswitch_w)); + map(0x00, 0x00).w(FUNC(hvyunit_state::slave_bankswitch_w)); map(0x02, 0x02).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x04, 0x04).r(m_slavelatch, FUNC(generic_latch_8_device::read)); map(0x04, 0x04).w(m_mermaidlatch, FUNC(generic_latch_8_device::write)); - map(0x06, 0x06).w(this, FUNC(hvyunit_state::scrolly_w)); - map(0x08, 0x08).w(this, FUNC(hvyunit_state::scrollx_w)); - map(0x0c, 0x0c).r(this, FUNC(hvyunit_state::mermaid_status_r)); - map(0x0e, 0x0e).w(this, FUNC(hvyunit_state::coin_count_w)); + map(0x06, 0x06).w(FUNC(hvyunit_state::scrolly_w)); + map(0x08, 0x08).w(FUNC(hvyunit_state::scrollx_w)); + map(0x0c, 0x0c).r(FUNC(hvyunit_state::mermaid_status_r)); + map(0x0e, 0x0e).w(FUNC(hvyunit_state::coin_count_w)); // AM_RANGE(0x22, 0x22) AM_READ(hu_scrolly_hi_reset) //22/a2 taken from ram $f065 // AM_RANGE(0xa2, 0xa2) AM_READ(hu_scrolly_hi_set) @@ -445,7 +445,7 @@ void hvyunit_state::sound_memory(address_map &map) void hvyunit_state::sound_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(hvyunit_state::sound_bankswitch_w)); + map(0x00, 0x00).w(FUNC(hvyunit_state::sound_bankswitch_w)); map(0x02, 0x03).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp index 839ad466370..9f4fb83fe4a 100644 --- a/src/mame/drivers/hx20.cpp +++ b/src/mame/drivers/hx20.cpp @@ -551,16 +551,16 @@ WRITE8_MEMBER( hx20_state::slave_p4_w ) void hx20_state::hx20_mem(address_map &map) { map(0x0000, 0x001f).rw(m_maincpu, FUNC(hd63701_cpu_device::m6801_io_r), FUNC(hd63701_cpu_device::m6801_io_w)); - map(0x0020, 0x0020).w(this, FUNC(hx20_state::ksc_w)); - map(0x0022, 0x0022).r(this, FUNC(hx20_state::krtn07_r)); - map(0x0026, 0x0026).w(this, FUNC(hx20_state::lcd_cs_w)); - map(0x0028, 0x0028).r(this, FUNC(hx20_state::krtn89_r)); - map(0x002a, 0x002a).w(this, FUNC(hx20_state::lcd_data_w)); + map(0x0020, 0x0020).w(FUNC(hx20_state::ksc_w)); + map(0x0022, 0x0022).r(FUNC(hx20_state::krtn07_r)); + map(0x0026, 0x0026).w(FUNC(hx20_state::lcd_cs_w)); + map(0x0028, 0x0028).r(FUNC(hx20_state::krtn89_r)); + map(0x002a, 0x002a).w(FUNC(hx20_state::lcd_data_w)); map(0x002c, 0x002c); // mask interruption by using IC 8E in sleep mode map(0x0040, 0x007f).rw(m_rtc, FUNC(mc146818_device::read), FUNC(mc146818_device::write)); map(0x0080, 0x00ff).ram(); map(0x0100, 0x3fff).ram(); - map(0x6000, 0x7fff).rom().r(this, FUNC(hx20_state::optrom_r)); + map(0x6000, 0x7fff).rom().r(FUNC(hx20_state::optrom_r)); map(0x8000, 0xffff).rom().region(HD6301V1_MAIN_TAG, 0); } @@ -571,8 +571,8 @@ void hx20_state::hx20_mem(address_map &map) void hx20_state::hx20_io(address_map &map) { - map(M6801_PORT1, M6801_PORT1).rw(this, FUNC(hx20_state::main_p1_r), FUNC(hx20_state::main_p1_w)); - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(hx20_state::main_p2_r), FUNC(hx20_state::main_p2_w)); + map(M6801_PORT1, M6801_PORT1).rw(FUNC(hx20_state::main_p1_r), FUNC(hx20_state::main_p1_w)); + map(M6801_PORT2, M6801_PORT2).rw(FUNC(hx20_state::main_p2_r), FUNC(hx20_state::main_p2_w)); map(M6801_PORT3, M6801_PORT3).noprw(); // A0-A7, D0-D7 map(M6801_PORT4, M6801_PORT4).noprw(); // A8-A15 } @@ -596,10 +596,10 @@ void hx20_state::hx20_sub_mem(address_map &map) void hx20_state::hx20_sub_io(address_map &map) { - map(M6801_PORT1, M6801_PORT1).rw(this, FUNC(hx20_state::slave_p1_r), FUNC(hx20_state::slave_p1_w)); - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(hx20_state::slave_p2_r), FUNC(hx20_state::slave_p2_w)); - map(M6801_PORT3, M6801_PORT3).rw(this, FUNC(hx20_state::slave_p3_r), FUNC(hx20_state::slave_p3_w)); - map(M6801_PORT4, M6801_PORT4).rw(this, FUNC(hx20_state::slave_p4_r), FUNC(hx20_state::slave_p4_w)); + map(M6801_PORT1, M6801_PORT1).rw(FUNC(hx20_state::slave_p1_r), FUNC(hx20_state::slave_p1_w)); + map(M6801_PORT2, M6801_PORT2).rw(FUNC(hx20_state::slave_p2_r), FUNC(hx20_state::slave_p2_w)); + map(M6801_PORT3, M6801_PORT3).rw(FUNC(hx20_state::slave_p3_r), FUNC(hx20_state::slave_p3_w)); + map(M6801_PORT4, M6801_PORT4).rw(FUNC(hx20_state::slave_p4_r), FUNC(hx20_state::slave_p4_w)); } diff --git a/src/mame/drivers/hyhoo.cpp b/src/mame/drivers/hyhoo.cpp index 95dea8895db..0971df3656c 100644 --- a/src/mame/drivers/hyhoo.cpp +++ b/src/mame/drivers/hyhoo.cpp @@ -48,12 +48,12 @@ void hyhoo_state::hyhoo_io_map(address_map &map) map(0x81, 0x81).r("aysnd", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).portr("SYSTEM"); - map(0x90, 0x97).w(this, FUNC(hyhoo_state::hyhoo_blitter_w)); + map(0x90, 0x97).w(FUNC(hyhoo_state::hyhoo_blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xcf).writeonly().share("clut"); - map(0xd0, 0xd0).nopr().w("dac", FUNC(dac_byte_interface::write)); // unknown read - map(0xe0, 0xe0).w(this, FUNC(hyhoo_state::hyhoo_romsel_w)); + map(0xd0, 0xd0).nopr().w("dac", FUNC(dac_byte_interface::data_w)); // unknown read + map(0xe0, 0xe0).w(FUNC(hyhoo_state::hyhoo_romsel_w)); map(0xe0, 0xe1).r(m_nb1413m3, FUNC(nb1413m3_device::gfxrom_r)); map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); // AM_RANGE(0xf0, 0xf0) AM_WRITENOP diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index 034fb39e7cc..c16ef9bf83b 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -589,7 +589,7 @@ void hyperscan_state::spg290_mem(address_map &map) { map.global_mask(0x1fffffff); map(0x00000000, 0x00ffffff).ram().mirror(0x07000000); - map(0x08000000, 0x09ffffff).rw(this, FUNC(hyperscan_state::spg290_regs_r), FUNC(hyperscan_state::spg290_regs_w)); + map(0x08000000, 0x09ffffff).rw(FUNC(hyperscan_state::spg290_regs_r), FUNC(hyperscan_state::spg290_regs_w)); map(0x0a000000, 0x0a003fff).ram(); // internal SRAM map(0x0b000000, 0x0b007fff).rom().region("spg290", 0); // internal ROM map(0x10000000, 0x100fffff).rom().region("bios", 0).mirror(0x0e000000); diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp index 7bba4916232..fc77b67790e 100644 --- a/src/mame/drivers/hyperspt.cpp +++ b/src/mame/drivers/hyperspt.cpp @@ -59,8 +59,8 @@ void hyperspt_state::common_map(address_map &map) map(0x1600, 0x1600).portr("DSW2"); map(0x1680, 0x1680).portr("SYSTEM"); map(0x1683, 0x1683).portr("DSW1"); - map(0x2000, 0x27ff).ram().w(this, FUNC(hyperspt_state::videoram_w)).share("videoram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(hyperspt_state::colorram_w)).share("colorram"); + map(0x2000, 0x27ff).ram().w(FUNC(hyperspt_state::videoram_w)).share("videoram"); + map(0x2800, 0x2fff).ram().w(FUNC(hyperspt_state::colorram_w)).share("colorram"); map(0x3000, 0x37ff).ram(); map(0x3800, 0x3fff).ram().share("nvram"); map(0x4000, 0xffff).rom(); @@ -86,9 +86,9 @@ void hyperspt_state::common_sound_map(address_map &map) map(0x4000, 0x4fff).ram(); map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x8000, 0x8000).r(m_soundbrd, FUNC(trackfld_audio_device::hyperspt_sh_timer_r)); - map(0xe000, 0xe000).w(m_dac, FUNC(dac_byte_interface::write)); - map(0xe001, 0xe001).w(this, FUNC(hyperspt_state::konami_SN76496_latch_w)); /* Loads the snd command into the snd latch */ - map(0xe002, 0xe002).w(this, FUNC(hyperspt_state::konami_SN76496_w)); /* This address triggers the SN chip to read the data port. */ + map(0xe000, 0xe000).w(m_dac, FUNC(dac_byte_interface::data_w)); + map(0xe001, 0xe001).w(FUNC(hyperspt_state::konami_SN76496_latch_w)); /* Loads the snd command into the snd latch */ + map(0xe002, 0xe002).w(FUNC(hyperspt_state::konami_SN76496_w)); /* This address triggers the SN chip to read the data port. */ } void hyperspt_state::hyperspt_sound_map(address_map &map) diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp index ca7d3f92d79..bf1d731d909 100644 --- a/src/mame/drivers/hyprduel.cpp +++ b/src/mame/drivers/hyprduel.cpp @@ -261,9 +261,9 @@ void hyprduel_state::hyprduel_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x400000, 0x47ffff).m(m_vdp, FUNC(imagetek_i4220_device::v2_map)); - map(0x4788a2, 0x4788a3).rw(this, FUNC(hyprduel_state::irq_cause_r), FUNC(hyprduel_state::irq_cause_w)); /* IRQ Cause,Acknowledge */ + map(0x4788a2, 0x4788a3).rw(FUNC(hyprduel_state::irq_cause_r), FUNC(hyprduel_state::irq_cause_w)); /* IRQ Cause,Acknowledge */ map(0x4788a4, 0x4788a5).ram().share("irq_enable"); /* IRQ Enable */ - map(0x800000, 0x800001).w(this, FUNC(hyprduel_state::subcpu_control_w)); + map(0x800000, 0x800001).w(FUNC(hyprduel_state::subcpu_control_w)); map(0xc00000, 0xc07fff).ram().share("sharedram1"); map(0xe00000, 0xe00001).portr("SERVICE").nopw(); map(0xe00002, 0xe00003).portr("DSW"); @@ -291,9 +291,9 @@ void hyprduel_state::hyprduel_map2(address_map &map) void hyprduel_state::magerror_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x400000, 0x400001).w(this, FUNC(hyprduel_state::subcpu_control_w)); + map(0x400000, 0x400001).w(FUNC(hyprduel_state::subcpu_control_w)); map(0x800000, 0x87ffff).m(m_vdp, FUNC(imagetek_i4220_device::v2_map)); - map(0x8788a2, 0x8788a3).rw(this, FUNC(hyprduel_state::irq_cause_r), FUNC(hyprduel_state::irq_cause_w)); /* IRQ Cause, Acknowledge */ + map(0x8788a2, 0x8788a3).rw(FUNC(hyprduel_state::irq_cause_r), FUNC(hyprduel_state::irq_cause_w)); /* IRQ Cause, Acknowledge */ map(0x8788a4, 0x8788a5).ram().share("irq_enable"); /* IRQ Enable */ map(0xc00000, 0xc1ffff).ram().share("sharedram1"); map(0xe00000, 0xe00001).portr("SERVICE").nopw(); diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index 3901903e3e6..35d9b25b5d3 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -683,7 +683,7 @@ READ8_MEMBER(ibm6580_state::floppy_r) void ibm6580_state::ibm6580_mem(address_map &map) { map.unmap_value_high(); - map(0x90000, 0x90001).w(this, FUNC(ibm6580_state::unk_latch_w)); + map(0x90000, 0x90001).w(FUNC(ibm6580_state::unk_latch_w)); map(0xef000, 0xeffff).ram().share("videoram"); // 66-line vram starts at 0xec000 map(0xfc000, 0xfffff).rom().region("user1", 0); } @@ -692,10 +692,10 @@ void ibm6580_state::ibm6580_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0007).rw(m_pic8259, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x0008, 0x000f).w(this, FUNC(ibm6580_state::pic_latch_w)); + map(0x0008, 0x000f).w(FUNC(ibm6580_state::pic_latch_w)); map(0x0010, 0x0017).rw(m_ppi8255, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); map(0x0020, 0x003f).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)).umask16(0x00ff); - map(0x0040, 0x005f).rw(this, FUNC(ibm6580_state::p40_r), FUNC(ibm6580_state::p40_w)).umask16(0x00ff); + map(0x0040, 0x005f).rw(FUNC(ibm6580_state::p40_r), FUNC(ibm6580_state::p40_w)).umask16(0x00ff); map(0x0070, 0x007f).unmaprw(); map(0x0120, 0x0127).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0x0140, 0x0140).rw("upd8251a", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); @@ -706,10 +706,10 @@ void ibm6580_state::ibm6580_io(address_map &map) map(0x5000, 0x500f).unmaprw(); map(0x6000, 0x601f).unmaprw(); map(0x8060, 0x807f).unmaprw(); - map(0x8150, 0x815f).rw(this, FUNC(ibm6580_state::floppy_r), FUNC(ibm6580_state::floppy_w)).umask16(0x00ff); // HLE of floppy board + map(0x8150, 0x815f).rw(FUNC(ibm6580_state::floppy_r), FUNC(ibm6580_state::floppy_w)).umask16(0x00ff); // HLE of floppy board map(0x81a0, 0x81af).unmaprw(); map(0xc000, 0xc00f).unmaprw(); - map(0xe000, 0xe02f).rw(this, FUNC(ibm6580_state::video_r), FUNC(ibm6580_state::video_w)).umask16(0x00ff); + map(0xe000, 0xe02f).rw(FUNC(ibm6580_state::video_r), FUNC(ibm6580_state::video_w)).umask16(0x00ff); } diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 85eb6452306..3813372af12 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -560,9 +560,9 @@ void pcjr_state::ibmpcjr_io(address_map &map) map(0x0020, 0x0021).rw(m_pic8259, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x0040, 0x0043).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x0060, 0x0063).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x00a0, 0x00a0).rw(this, FUNC(pcjr_state::pcjr_nmi_enable_r), FUNC(pcjr_state::pc_nmi_enable_w)); - map(0x00c0, 0x00c0).w("sn76496", FUNC(sn76496_device::write)); - map(0x00f2, 0x00f2).w(this, FUNC(pcjr_state::pcjr_fdc_dor_w)); + map(0x00a0, 0x00a0).rw(FUNC(pcjr_state::pcjr_nmi_enable_r), FUNC(pcjr_state::pc_nmi_enable_w)); + map(0x00c0, 0x00c0).w("sn76496", FUNC(sn76496_device::command_w)); + map(0x00f2, 0x00f2).w(FUNC(pcjr_state::pcjr_fdc_dor_w)); map(0x00f4, 0x00f5).m(m_fdc, FUNC(upd765a_device::map)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); map(0x02f8, 0x02ff).rw("ins8250", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); @@ -584,7 +584,7 @@ void pcjr_state::ibmpcjx_io(address_map &map) { map.unmap_value_high(); ibmpcjr_io(map); - map(0x01ff, 0x01ff).rw(this, FUNC(pcjr_state::pcjx_port_1ff_r), FUNC(pcjr_state::pcjx_port_1ff_w)); + map(0x01ff, 0x01ff).rw(FUNC(pcjr_state::pcjx_port_1ff_r), FUNC(pcjr_state::pcjx_port_1ff_w)); } MACHINE_CONFIG_START(pcjr_state::ibmpcjr) diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp index 2bed07c3f37..bf55b38652c 100644 --- a/src/mame/drivers/icatel.cpp +++ b/src/mame/drivers/icatel.cpp @@ -86,11 +86,11 @@ void icatel_state::i80c31_io(address_map &map) map(0x8000, 0x8002).ram(); /* HACK! */ map(0x8040, 0x8040).mirror(0x3F1E).w(m_lcdc, FUNC(hd44780_device::control_write)); // not sure yet. CI12 (73LS273) map(0x8041, 0x8041).mirror(0x3F1E).w(m_lcdc, FUNC(hd44780_device::data_write)); // not sure yet. CI12 - map(0x8060, 0x8060).mirror(0x3F1F).rw(this, FUNC(icatel_state::ci8_r), FUNC(icatel_state::ci8_w)); - map(0x8080, 0x8080).mirror(0x3F1F).rw(this, FUNC(icatel_state::ci16_r), FUNC(icatel_state::ci16_w)); // card reader (?) - map(0x80C0, 0x80C0).mirror(0x3F1F).rw(this, FUNC(icatel_state::ci15_r), FUNC(icatel_state::ci15_w)); // 74LS244 (tristate buffer) - map(0xC000, 0xCFFF).rw(this, FUNC(icatel_state::cn8_extension_r), FUNC(icatel_state::cn8_extension_w)); - map(0xE000, 0xEFFF).rw(this, FUNC(icatel_state::modem_r), FUNC(icatel_state::modem_w)); + map(0x8060, 0x8060).mirror(0x3F1F).rw(FUNC(icatel_state::ci8_r), FUNC(icatel_state::ci8_w)); + map(0x8080, 0x8080).mirror(0x3F1F).rw(FUNC(icatel_state::ci16_r), FUNC(icatel_state::ci16_w)); // card reader (?) + map(0x80C0, 0x80C0).mirror(0x3F1F).rw(FUNC(icatel_state::ci15_r), FUNC(icatel_state::ci15_w)); // 74LS244 (tristate buffer) + map(0xC000, 0xCFFF).rw(FUNC(icatel_state::cn8_extension_r), FUNC(icatel_state::cn8_extension_w)); + map(0xE000, 0xEFFF).rw(FUNC(icatel_state::modem_r), FUNC(icatel_state::modem_w)); } void icatel_state::i80c31_data(address_map &map) diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp index 31ad93edf24..fbf49fee9ff 100644 --- a/src/mame/drivers/icecold.cpp +++ b/src/mame/drivers/icecold.cpp @@ -93,7 +93,7 @@ void icecold_state::icecold_map(address_map &map) map(0x4020, 0x4023).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x4040, 0x4043).rw("pia2", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // not used map(0x4080, 0x4081).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write)); - map(0x4100, 0x4100).w(this, FUNC(icecold_state::motors_w)); + map(0x4100, 0x4100).w(FUNC(icecold_state::motors_w)); map(0xa000, 0xffff).rom(); } diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp index 0780a588d5d..6bff408e4de 100644 --- a/src/mame/drivers/idsa.cpp +++ b/src/mame/drivers/idsa.cpp @@ -96,9 +96,9 @@ void idsa_state::maincpu_io_map(address_map &map) map(0x50, 0x5f).portr("X5"); map(0x60, 0x6f).portr("X6"); map(0x70, 0x7f).portr("X7"); - map(0x80, 0x8f).w(this, FUNC(idsa_state::port80_w)); - map(0x90, 0x9f).w(this, FUNC(idsa_state::port90_w)); - map(0xb0, 0xb3).r(this, FUNC(idsa_state::portb0_r)); + map(0x80, 0x8f).w(FUNC(idsa_state::port80_w)); + map(0x90, 0x9f).w(FUNC(idsa_state::port90_w)); + map(0xb0, 0xb3).r(FUNC(idsa_state::portb0_r)); map(0xbd, 0xbd).portr("X8"); map(0xd0, 0xdf).w(m_speech, FUNC(sp0256_device::ald_w)); map(0xe0, 0xef).rw("aysnd1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index 6b2cec25b48..07b0489d93a 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -490,19 +490,19 @@ void igs009_state::jingbell_portmap(address_map &map) { map(0x0000, 0x003f).ram(); // Z180 internal regs - map(0x1000, 0x11ff).ram().w(this, FUNC(igs009_state::bg_scroll_w)).share("bg_scroll"); + map(0x1000, 0x11ff).ram().w(FUNC(igs009_state::bg_scroll_w)).share("bg_scroll"); map(0x2000, 0x23ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2400, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0x3000, 0x33ff).ram().w(this, FUNC(igs009_state::reel1_ram_w)).share("reel1_ram"); - map(0x3400, 0x37ff).ram().w(this, FUNC(igs009_state::reel2_ram_w)).share("reel2_ram"); - map(0x3800, 0x3bff).ram().w(this, FUNC(igs009_state::reel3_ram_w)).share("reel3_ram"); - map(0x3c00, 0x3fff).ram().w(this, FUNC(igs009_state::reel4_ram_w)).share("reel4_ram"); + map(0x3000, 0x33ff).ram().w(FUNC(igs009_state::reel1_ram_w)).share("reel1_ram"); + map(0x3400, 0x37ff).ram().w(FUNC(igs009_state::reel2_ram_w)).share("reel2_ram"); + map(0x3800, 0x3bff).ram().w(FUNC(igs009_state::reel3_ram_w)).share("reel3_ram"); + map(0x3c00, 0x3fff).ram().w(FUNC(igs009_state::reel4_ram_w)).share("reel4_ram"); map(0x4000, 0x407f).ram().share("bg_scroll2"); - map(0x5000, 0x5fff).ram().w(this, FUNC(igs009_state::fg_tile_w)).share("fg_tile_ram"); + map(0x5000, 0x5fff).ram().w(FUNC(igs009_state::fg_tile_w)).share("fg_tile_ram"); map(0x6480, 0x6483).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* NMI and coins (w), service (r), coins (r) */ map(0x6490, 0x6493).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* buttons 1 (r), video and leds (w), leds (w) */ @@ -513,9 +513,9 @@ void igs009_state::jingbell_portmap(address_map &map) map(0x64c0, 0x64c0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x64d0, 0x64d1).rw(this, FUNC(igs009_state::magic_r), FUNC(igs009_state::magic_w)); // DSW1-5 + map(0x64d0, 0x64d1).rw(FUNC(igs009_state::magic_r), FUNC(igs009_state::magic_w)); // DSW1-5 - map(0x7000, 0x7fff).ram().w(this, FUNC(igs009_state::fg_color_w)).share("fg_color_ram"); + map(0x7000, 0x7fff).ram().w(FUNC(igs009_state::fg_color_w)).share("fg_color_ram"); map(0x8000, 0xffff).rom().region("data", 0); } @@ -525,36 +525,36 @@ void igs009_state::gp98_portmap(address_map &map) { map(0x0000, 0x003f).ram(); // Z180 internal regs - map(0x1000, 0x11ff).ram().w(this, FUNC(igs009_state::bg_scroll_w)).share("bg_scroll"); + map(0x1000, 0x11ff).ram().w(FUNC(igs009_state::bg_scroll_w)).share("bg_scroll"); map(0x2000, 0x23ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2400, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0x3000, 0x33ff).ram().w(this, FUNC(igs009_state::reel1_ram_w)).share("reel1_ram"); - map(0x3400, 0x37ff).ram().w(this, FUNC(igs009_state::reel2_ram_w)).share("reel2_ram"); - map(0x3800, 0x3bff).ram().w(this, FUNC(igs009_state::reel3_ram_w)).share("reel3_ram"); - map(0x3c00, 0x3fff).ram().w(this, FUNC(igs009_state::reel4_ram_w)).share("reel4_ram"); + map(0x3000, 0x33ff).ram().w(FUNC(igs009_state::reel1_ram_w)).share("reel1_ram"); + map(0x3400, 0x37ff).ram().w(FUNC(igs009_state::reel2_ram_w)).share("reel2_ram"); + map(0x3800, 0x3bff).ram().w(FUNC(igs009_state::reel3_ram_w)).share("reel3_ram"); + map(0x3c00, 0x3fff).ram().w(FUNC(igs009_state::reel4_ram_w)).share("reel4_ram"); map(0x4000, 0x407f).ram().share("bg_scroll2"); - map(0x5000, 0x5fff).ram().w(this, FUNC(igs009_state::fg_tile_w)).share("fg_tile_ram"); + map(0x5000, 0x5fff).ram().w(FUNC(igs009_state::fg_tile_w)).share("fg_tile_ram"); // seems to lack PPI devices... - map(0x6480, 0x6480).w(this, FUNC(igs009_state::nmi_and_coins_w)); + map(0x6480, 0x6480).w(FUNC(igs009_state::nmi_and_coins_w)); map(0x6481, 0x6481).portr("SERVICE"); map(0x6482, 0x6482).portr("COINS"); map(0x6490, 0x6490).portr("BUTTONS1"); - map(0x6491, 0x6491).w(this, FUNC(igs009_state::video_and_leds_w)); - map(0x6492, 0x6492).w(this, FUNC(igs009_state::leds_w)); + map(0x6491, 0x6491).w(FUNC(igs009_state::video_and_leds_w)); + map(0x6492, 0x6492).w(FUNC(igs009_state::leds_w)); map(0x64a0, 0x64a0).portr("BUTTONS2"); map(0x64b0, 0x64b1).w("ymsnd", FUNC(ym2413_device::write)); map(0x64c0, 0x64c0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x64d0, 0x64d1).rw(this, FUNC(igs009_state::magic_r), FUNC(igs009_state::magic_w)); // DSW1-5 + map(0x64d0, 0x64d1).rw(FUNC(igs009_state::magic_r), FUNC(igs009_state::magic_w)); // DSW1-5 - map(0x7000, 0x7fff).ram().w(this, FUNC(igs009_state::fg_color_w)).share("fg_color_ram"); + map(0x7000, 0x7fff).ram().w(FUNC(igs009_state::fg_color_w)).share("fg_color_ram"); map(0x8000, 0xffff).rom().region("data", 0); } diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index 8c0c84eaefb..0070789dfa1 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -2583,30 +2583,30 @@ void igs011_state::drgnwrld(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram().share("nvram"); map(0x200000, 0x200fff).ram().share("priority_ram"); - map(0x400000, 0x401fff).ram().w(this, FUNC(igs011_state::igs011_palette)).share("paletteram"); + map(0x400000, 0x401fff).ram().w(FUNC(igs011_state::igs011_palette)).share("paletteram"); map(0x500000, 0x500001).portr("COIN"); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x700000, 0x700003).w("ymsnd", FUNC(ym3812_device::write)).umask16(0x00ff); - map(0x800000, 0x800003).w(this, FUNC(igs011_state::drgnwrld_igs003_w)); - map(0x800002, 0x800003).r(this, FUNC(igs011_state::drgnwrld_igs003_r)); + map(0x800000, 0x800003).w(FUNC(igs011_state::drgnwrld_igs003_w)); + map(0x800002, 0x800003).r(FUNC(igs011_state::drgnwrld_igs003_r)); - map(0xa20000, 0xa20001).w(this, FUNC(igs011_state::igs011_priority_w)); - map(0xa40000, 0xa40001).w(this, FUNC(igs011_state::igs_dips_w)); + map(0xa20000, 0xa20001).w(FUNC(igs011_state::igs011_priority_w)); + map(0xa40000, 0xa40001).w(FUNC(igs011_state::igs_dips_w)); - map(0xa50000, 0xa50001).w(this, FUNC(igs011_state::igs011_prot_addr_w)); + map(0xa50000, 0xa50001).w(FUNC(igs011_state::igs011_prot_addr_w)); // AM_RANGE( 0xa50000, 0xa50005 ) AM_READ(igs011_prot_fake_r ) - map(0xa58000, 0xa58001).w(this, FUNC(igs011_state::igs011_blit_x_w)); - map(0xa58800, 0xa58801).w(this, FUNC(igs011_state::igs011_blit_y_w)); - map(0xa59000, 0xa59001).w(this, FUNC(igs011_state::igs011_blit_w_w)); - map(0xa59800, 0xa59801).w(this, FUNC(igs011_state::igs011_blit_h_w)); - map(0xa5a000, 0xa5a001).w(this, FUNC(igs011_state::igs011_blit_gfx_lo_w)); - map(0xa5a800, 0xa5a801).w(this, FUNC(igs011_state::igs011_blit_gfx_hi_w)); - map(0xa5b000, 0xa5b001).w(this, FUNC(igs011_state::igs011_blit_flags_w)); - map(0xa5b800, 0xa5b801).w(this, FUNC(igs011_state::igs011_blit_pen_w)); - map(0xa5c000, 0xa5c001).w(this, FUNC(igs011_state::igs011_blit_depth_w)); - map(0xa88000, 0xa88001).r(this, FUNC(igs011_state::igs_3_dips_r)); + map(0xa58000, 0xa58001).w(FUNC(igs011_state::igs011_blit_x_w)); + map(0xa58800, 0xa58801).w(FUNC(igs011_state::igs011_blit_y_w)); + map(0xa59000, 0xa59001).w(FUNC(igs011_state::igs011_blit_w_w)); + map(0xa59800, 0xa59801).w(FUNC(igs011_state::igs011_blit_h_w)); + map(0xa5a000, 0xa5a001).w(FUNC(igs011_state::igs011_blit_gfx_lo_w)); + map(0xa5a800, 0xa5a801).w(FUNC(igs011_state::igs011_blit_gfx_hi_w)); + map(0xa5b000, 0xa5b001).w(FUNC(igs011_state::igs011_blit_flags_w)); + map(0xa5b800, 0xa5b801).w(FUNC(igs011_state::igs011_blit_pen_w)); + map(0xa5c000, 0xa5c001).w(FUNC(igs011_state::igs011_blit_depth_w)); + map(0xa88000, 0xa88001).r(FUNC(igs011_state::igs_3_dips_r)); } void igs011_state::drgnwrld_igs012(address_map &map) @@ -2614,21 +2614,21 @@ void igs011_state::drgnwrld_igs012(address_map &map) drgnwrld(map); // IGS012 - map(0x001600, 0x00160f).w(this, FUNC(igs011_state::igs012_prot_swap_w)).mirror(0x01c000); // swap (a5 / 55) - map(0x001610, 0x00161f).r(this, FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 0) - map(0x001620, 0x00162f).w(this, FUNC(igs011_state::igs012_prot_dec_inc_w)).mirror(0x01c000); // dec (aa), inc (fa) - map(0x001630, 0x00163f).w(this, FUNC(igs011_state::igs012_prot_inc_w)).mirror(0x01c000); // inc (ff) - map(0x001640, 0x00164f).w(this, FUNC(igs011_state::igs012_prot_copy_w)).mirror(0x01c000); // copy (22) - map(0x001650, 0x00165f).w(this, FUNC(igs011_state::igs012_prot_dec_copy_w)).mirror(0x01c000); // dec (5a), copy (33) - map(0x001660, 0x00166f).r(this, FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 1) - map(0x001670, 0x00167f).w(this, FUNC(igs011_state::igs012_prot_mode_w)).mirror(0x01c000); // mode (cc / dd) - - map(0x00d400, 0x00d43f).w(this, FUNC(igs011_state::igs011_prot2_dec_w)); // dec (33) - map(0x00d440, 0x00d47f).w(this, FUNC(igs011_state::drgnwrld_igs011_prot2_swap_w)); // swap (33) - map(0x00d480, 0x00d4bf).w(this, FUNC(igs011_state::igs011_prot2_reset_w)); // reset (33) - map(0x00d4c0, 0x00d4ff).r(this, FUNC(igs011_state::drgnwrldv20j_igs011_prot2_r)); // read - - map(0x902000, 0x902fff).w(this, FUNC(igs011_state::igs012_prot_reset_w)); // reset? + map(0x001600, 0x00160f).w(FUNC(igs011_state::igs012_prot_swap_w)).mirror(0x01c000); // swap (a5 / 55) + map(0x001610, 0x00161f).r(FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 0) + map(0x001620, 0x00162f).w(FUNC(igs011_state::igs012_prot_dec_inc_w)).mirror(0x01c000); // dec (aa), inc (fa) + map(0x001630, 0x00163f).w(FUNC(igs011_state::igs012_prot_inc_w)).mirror(0x01c000); // inc (ff) + map(0x001640, 0x00164f).w(FUNC(igs011_state::igs012_prot_copy_w)).mirror(0x01c000); // copy (22) + map(0x001650, 0x00165f).w(FUNC(igs011_state::igs012_prot_dec_copy_w)).mirror(0x01c000); // dec (5a), copy (33) + map(0x001660, 0x00166f).r(FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 1) + map(0x001670, 0x00167f).w(FUNC(igs011_state::igs012_prot_mode_w)).mirror(0x01c000); // mode (cc / dd) + + map(0x00d400, 0x00d43f).w(FUNC(igs011_state::igs011_prot2_dec_w)); // dec (33) + map(0x00d440, 0x00d47f).w(FUNC(igs011_state::drgnwrld_igs011_prot2_swap_w)); // swap (33) + map(0x00d480, 0x00d4bf).w(FUNC(igs011_state::igs011_prot2_reset_w)); // reset (33) + map(0x00d4c0, 0x00d4ff).r(FUNC(igs011_state::drgnwrldv20j_igs011_prot2_r)); // read + + map(0x902000, 0x902fff).w(FUNC(igs011_state::igs012_prot_reset_w)); // reset? // AM_RANGE( 0x902000, 0x902005 ) AM_WRITE(igs012_prot_fake_r ) } @@ -2661,38 +2661,38 @@ void igs011_state::lhb(address_map &map) // AM_RANGE( 0x008340, 0x008347 ) AM_WRITE(igs011_prot1_w ) // AM_RANGE( 0x008348, 0x008349 ) AM_READ ( igs011_prot1_r ) - map(0x010000, 0x010001).w(this, FUNC(igs011_state::lhb_okibank_w)); + map(0x010000, 0x010001).w(FUNC(igs011_state::lhb_okibank_w)); - map(0x010200, 0x0103ff).w(this, FUNC(igs011_state::igs011_prot2_inc_w)); - map(0x010400, 0x0105ff).w(this, FUNC(igs011_state::lhb_igs011_prot2_swap_w)); - map(0x010600, 0x0107ff).r(this, FUNC(igs011_state::lhb_igs011_prot2_r)); + map(0x010200, 0x0103ff).w(FUNC(igs011_state::igs011_prot2_inc_w)); + map(0x010400, 0x0105ff).w(FUNC(igs011_state::lhb_igs011_prot2_swap_w)); + map(0x010600, 0x0107ff).r(FUNC(igs011_state::lhb_igs011_prot2_r)); // no reset map(0x100000, 0x103fff).ram().share("nvram"); map(0x200000, 0x200fff).ram().share("priority_ram"); - map(0x300000, 0x3fffff).rw(this, FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); - map(0x400000, 0x401fff).ram().w(this, FUNC(igs011_state::igs011_palette)).share("paletteram"); + map(0x300000, 0x3fffff).rw(FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); + map(0x400000, 0x401fff).ram().w(FUNC(igs011_state::igs011_palette)).share("paletteram"); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x700000, 0x700001).portr("COIN"); - map(0x700002, 0x700005).r(this, FUNC(igs011_state::lhb_inputs_r)); - map(0x700002, 0x700003).w(this, FUNC(igs011_state::lhb_inputs_w)); - map(0x820000, 0x820001).w(this, FUNC(igs011_state::igs011_priority_w)); - map(0x838000, 0x838001).w(this, FUNC(igs011_state::lhb_irq_enable_w)); - map(0x840000, 0x840001).w(this, FUNC(igs011_state::igs_dips_w)); + map(0x700002, 0x700005).r(FUNC(igs011_state::lhb_inputs_r)); + map(0x700002, 0x700003).w(FUNC(igs011_state::lhb_inputs_w)); + map(0x820000, 0x820001).w(FUNC(igs011_state::igs011_priority_w)); + map(0x838000, 0x838001).w(FUNC(igs011_state::lhb_irq_enable_w)); + map(0x840000, 0x840001).w(FUNC(igs011_state::igs_dips_w)); - map(0x850000, 0x850001).w(this, FUNC(igs011_state::igs011_prot_addr_w)); + map(0x850000, 0x850001).w(FUNC(igs011_state::igs011_prot_addr_w)); // AM_RANGE( 0x850000, 0x850005 ) AM_WRITE(igs011_prot_fake_r ) - map(0x858000, 0x858001).w(this, FUNC(igs011_state::igs011_blit_x_w)); - map(0x858800, 0x858801).w(this, FUNC(igs011_state::igs011_blit_y_w)); - map(0x859000, 0x859001).w(this, FUNC(igs011_state::igs011_blit_w_w)); - map(0x859800, 0x859801).w(this, FUNC(igs011_state::igs011_blit_h_w)); - map(0x85a000, 0x85a001).w(this, FUNC(igs011_state::igs011_blit_gfx_lo_w)); - map(0x85a800, 0x85a801).w(this, FUNC(igs011_state::igs011_blit_gfx_hi_w)); - map(0x85b000, 0x85b001).w(this, FUNC(igs011_state::igs011_blit_flags_w)); - map(0x85b800, 0x85b801).w(this, FUNC(igs011_state::igs011_blit_pen_w)); - map(0x85c000, 0x85c001).w(this, FUNC(igs011_state::igs011_blit_depth_w)); - map(0x888000, 0x888001).r(this, FUNC(igs011_state::igs_5_dips_r)); + map(0x858000, 0x858001).w(FUNC(igs011_state::igs011_blit_x_w)); + map(0x858800, 0x858801).w(FUNC(igs011_state::igs011_blit_y_w)); + map(0x859000, 0x859001).w(FUNC(igs011_state::igs011_blit_w_w)); + map(0x859800, 0x859801).w(FUNC(igs011_state::igs011_blit_h_w)); + map(0x85a000, 0x85a001).w(FUNC(igs011_state::igs011_blit_gfx_lo_w)); + map(0x85a800, 0x85a801).w(FUNC(igs011_state::igs011_blit_gfx_hi_w)); + map(0x85b000, 0x85b001).w(FUNC(igs011_state::igs011_blit_flags_w)); + map(0x85b800, 0x85b801).w(FUNC(igs011_state::igs011_blit_pen_w)); + map(0x85c000, 0x85c001).w(FUNC(igs011_state::igs011_blit_depth_w)); + map(0x888000, 0x888001).r(FUNC(igs011_state::igs_5_dips_r)); } void igs011_state::xymg(address_map &map) @@ -2703,37 +2703,37 @@ void igs011_state::xymg(address_map &map) // AM_RANGE( 0x008340, 0x008347 ) AM_WRITE(igs011_prot1_w ) // AM_RANGE( 0x008348, 0x008349 ) AM_READ ( igs011_prot1_r ) - map(0x010000, 0x010001).w(this, FUNC(igs011_state::lhb_okibank_w)); + map(0x010000, 0x010001).w(FUNC(igs011_state::lhb_okibank_w)); - map(0x010200, 0x0103ff).w(this, FUNC(igs011_state::igs011_prot2_inc_w)); // inc (33) - map(0x010400, 0x0105ff).w(this, FUNC(igs011_state::lhb_igs011_prot2_swap_w)); // swap (33) - map(0x010600, 0x0107ff).r(this, FUNC(igs011_state::lhb_igs011_prot2_r)); // read + map(0x010200, 0x0103ff).w(FUNC(igs011_state::igs011_prot2_inc_w)); // inc (33) + map(0x010400, 0x0105ff).w(FUNC(igs011_state::lhb_igs011_prot2_swap_w)); // swap (33) + map(0x010600, 0x0107ff).r(FUNC(igs011_state::lhb_igs011_prot2_r)); // read // no reset map(0x100000, 0x103fff).ram(); map(0x1f0000, 0x1f3fff).ram().share("nvram"); // extra ram map(0x200000, 0x200fff).ram().share("priority_ram"); - map(0x300000, 0x3fffff).rw(this, FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); - map(0x400000, 0x401fff).ram().w(this, FUNC(igs011_state::igs011_palette)).share("paletteram"); + map(0x300000, 0x3fffff).rw(FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); + map(0x400000, 0x401fff).ram().w(FUNC(igs011_state::igs011_palette)).share("paletteram"); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x700000, 0x700003).w(this, FUNC(igs011_state::xymg_igs003_w)); - map(0x700002, 0x700003).r(this, FUNC(igs011_state::xymg_igs003_r)); - map(0x820000, 0x820001).w(this, FUNC(igs011_state::igs011_priority_w)); - map(0x840000, 0x840001).w(this, FUNC(igs011_state::igs_dips_w)); + map(0x700000, 0x700003).w(FUNC(igs011_state::xymg_igs003_w)); + map(0x700002, 0x700003).r(FUNC(igs011_state::xymg_igs003_r)); + map(0x820000, 0x820001).w(FUNC(igs011_state::igs011_priority_w)); + map(0x840000, 0x840001).w(FUNC(igs011_state::igs_dips_w)); - map(0x850000, 0x850001).w(this, FUNC(igs011_state::igs011_prot_addr_w)); + map(0x850000, 0x850001).w(FUNC(igs011_state::igs011_prot_addr_w)); // AM_RANGE( 0x850000, 0x850005 ) AM_WRITE(igs011_prot_fake_r ) - map(0x858000, 0x858001).w(this, FUNC(igs011_state::igs011_blit_x_w)); - map(0x858800, 0x858801).w(this, FUNC(igs011_state::igs011_blit_y_w)); - map(0x859000, 0x859001).w(this, FUNC(igs011_state::igs011_blit_w_w)); - map(0x859800, 0x859801).w(this, FUNC(igs011_state::igs011_blit_h_w)); - map(0x85a000, 0x85a001).w(this, FUNC(igs011_state::igs011_blit_gfx_lo_w)); - map(0x85a800, 0x85a801).w(this, FUNC(igs011_state::igs011_blit_gfx_hi_w)); - map(0x85b000, 0x85b001).w(this, FUNC(igs011_state::igs011_blit_flags_w)); - map(0x85b800, 0x85b801).w(this, FUNC(igs011_state::igs011_blit_pen_w)); - map(0x85c000, 0x85c001).w(this, FUNC(igs011_state::igs011_blit_depth_w)); - map(0x888000, 0x888001).r(this, FUNC(igs011_state::igs_3_dips_r)); + map(0x858000, 0x858001).w(FUNC(igs011_state::igs011_blit_x_w)); + map(0x858800, 0x858801).w(FUNC(igs011_state::igs011_blit_y_w)); + map(0x859000, 0x859001).w(FUNC(igs011_state::igs011_blit_w_w)); + map(0x859800, 0x859801).w(FUNC(igs011_state::igs011_blit_h_w)); + map(0x85a000, 0x85a001).w(FUNC(igs011_state::igs011_blit_gfx_lo_w)); + map(0x85a800, 0x85a801).w(FUNC(igs011_state::igs011_blit_gfx_hi_w)); + map(0x85b000, 0x85b001).w(FUNC(igs011_state::igs011_blit_flags_w)); + map(0x85b800, 0x85b801).w(FUNC(igs011_state::igs011_blit_pen_w)); + map(0x85c000, 0x85c001).w(FUNC(igs011_state::igs011_blit_depth_w)); + map(0x888000, 0x888001).r(FUNC(igs011_state::igs_3_dips_r)); } void igs011_state::wlcc(address_map &map) @@ -2742,36 +2742,36 @@ void igs011_state::wlcc(address_map &map) // AM_RANGE( 0x008340, 0x008347 ) AM_WRITE(igs011_prot1_w ) // AM_RANGE( 0x008348, 0x008349 ) AM_READ(igs011_prot1_r ) - map(0x518000, 0x5181ff).w(this, FUNC(igs011_state::igs011_prot2_inc_w)); // inc (33) - map(0x518200, 0x5183ff).w(this, FUNC(igs011_state::wlcc_igs011_prot2_swap_w)); // swap (33) - map(0x518800, 0x5189ff).r(this, FUNC(igs011_state::igs011_prot2_reset_r)); // reset - map(0x519000, 0x5195ff).r(this, FUNC(igs011_state::lhb_igs011_prot2_r)); // read + map(0x518000, 0x5181ff).w(FUNC(igs011_state::igs011_prot2_inc_w)); // inc (33) + map(0x518200, 0x5183ff).w(FUNC(igs011_state::wlcc_igs011_prot2_swap_w)); // swap (33) + map(0x518800, 0x5189ff).r(FUNC(igs011_state::igs011_prot2_reset_r)); // reset + map(0x519000, 0x5195ff).r(FUNC(igs011_state::lhb_igs011_prot2_r)); // read map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram().share("nvram"); map(0x200000, 0x200fff).ram().share("priority_ram"); - map(0x300000, 0x3fffff).rw(this, FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); - map(0x400000, 0x401fff).ram().w(this, FUNC(igs011_state::igs011_palette)).share("paletteram"); + map(0x300000, 0x3fffff).rw(FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); + map(0x400000, 0x401fff).ram().w(FUNC(igs011_state::igs011_palette)).share("paletteram"); map(0x520000, 0x520001).portr("COIN"); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x800000, 0x800003).w(this, FUNC(igs011_state::wlcc_igs003_w)); - map(0x800002, 0x800003).r(this, FUNC(igs011_state::wlcc_igs003_r)); - map(0xa20000, 0xa20001).w(this, FUNC(igs011_state::igs011_priority_w)); - map(0xa40000, 0xa40001).w(this, FUNC(igs011_state::igs_dips_w)); + map(0x800000, 0x800003).w(FUNC(igs011_state::wlcc_igs003_w)); + map(0x800002, 0x800003).r(FUNC(igs011_state::wlcc_igs003_r)); + map(0xa20000, 0xa20001).w(FUNC(igs011_state::igs011_priority_w)); + map(0xa40000, 0xa40001).w(FUNC(igs011_state::igs_dips_w)); - map(0xa50000, 0xa50001).w(this, FUNC(igs011_state::igs011_prot_addr_w)); + map(0xa50000, 0xa50001).w(FUNC(igs011_state::igs011_prot_addr_w)); // AM_RANGE( 0xa50000, 0xa50005 ) AM_READ(igs011_prot_fake_r ) - map(0xa58000, 0xa58001).w(this, FUNC(igs011_state::igs011_blit_x_w)); - map(0xa58800, 0xa58801).w(this, FUNC(igs011_state::igs011_blit_y_w)); - map(0xa59000, 0xa59001).w(this, FUNC(igs011_state::igs011_blit_w_w)); - map(0xa59800, 0xa59801).w(this, FUNC(igs011_state::igs011_blit_h_w)); - map(0xa5a000, 0xa5a001).w(this, FUNC(igs011_state::igs011_blit_gfx_lo_w)); - map(0xa5a800, 0xa5a801).w(this, FUNC(igs011_state::igs011_blit_gfx_hi_w)); - map(0xa5b000, 0xa5b001).w(this, FUNC(igs011_state::igs011_blit_flags_w)); - map(0xa5b800, 0xa5b801).w(this, FUNC(igs011_state::igs011_blit_pen_w)); - map(0xa5c000, 0xa5c001).w(this, FUNC(igs011_state::igs011_blit_depth_w)); - map(0xa88000, 0xa88001).r(this, FUNC(igs011_state::igs_4_dips_r)); + map(0xa58000, 0xa58001).w(FUNC(igs011_state::igs011_blit_x_w)); + map(0xa58800, 0xa58801).w(FUNC(igs011_state::igs011_blit_y_w)); + map(0xa59000, 0xa59001).w(FUNC(igs011_state::igs011_blit_w_w)); + map(0xa59800, 0xa59801).w(FUNC(igs011_state::igs011_blit_h_w)); + map(0xa5a000, 0xa5a001).w(FUNC(igs011_state::igs011_blit_gfx_lo_w)); + map(0xa5a800, 0xa5a801).w(FUNC(igs011_state::igs011_blit_gfx_hi_w)); + map(0xa5b000, 0xa5b001).w(FUNC(igs011_state::igs011_blit_flags_w)); + map(0xa5b800, 0xa5b801).w(FUNC(igs011_state::igs011_blit_pen_w)); + map(0xa5c000, 0xa5c001).w(FUNC(igs011_state::igs011_blit_depth_w)); + map(0xa88000, 0xa88001).r(FUNC(igs011_state::igs_4_dips_r)); } @@ -2784,36 +2784,36 @@ void igs011_state::lhb2(address_map &map) // AM_RANGE( 0x01ff80, 0x01ff87 ) AM_WRITE(igs011_prot1_w ) // AM_RANGE( 0x01ff88, 0x01ff89 ) AM_READ ( igs011_prot1_r ) - map(0x020000, 0x0201ff).w(this, FUNC(igs011_state::igs011_prot2_inc_w)); // inc (55) - map(0x020200, 0x0203ff).w(this, FUNC(igs011_state::lhb_igs011_prot2_swap_w)); // swap (33) - map(0x020400, 0x0205ff).r(this, FUNC(igs011_state::lhb2_igs011_prot2_r)); // read - map(0x020600, 0x0207ff).w(this, FUNC(igs011_state::igs011_prot2_reset_w)); // reset (55) + map(0x020000, 0x0201ff).w(FUNC(igs011_state::igs011_prot2_inc_w)); // inc (55) + map(0x020200, 0x0203ff).w(FUNC(igs011_state::lhb_igs011_prot2_swap_w)); // swap (33) + map(0x020400, 0x0205ff).r(FUNC(igs011_state::lhb2_igs011_prot2_r)); // read + map(0x020600, 0x0207ff).w(FUNC(igs011_state::igs011_prot2_reset_w)); // reset (55) map(0x100000, 0x103fff).ram().share("nvram"); map(0x200001, 0x200001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x204000, 0x204003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); - map(0x208000, 0x208003).w(this, FUNC(igs011_state::lhb2_igs003_w)); - map(0x208002, 0x208003).r(this, FUNC(igs011_state::lhb2_igs003_r)); + map(0x208000, 0x208003).w(FUNC(igs011_state::lhb2_igs003_w)); + map(0x208002, 0x208003).r(FUNC(igs011_state::lhb2_igs003_r)); map(0x20c000, 0x20cfff).ram().share("priority_ram"); - map(0x210000, 0x211fff).ram().w(this, FUNC(igs011_state::igs011_palette)).share("paletteram"); + map(0x210000, 0x211fff).ram().w(FUNC(igs011_state::igs011_palette)).share("paletteram"); map(0x214000, 0x214001).portr("COIN"); - map(0x300000, 0x3fffff).rw(this, FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); - map(0xa20000, 0xa20001).w(this, FUNC(igs011_state::igs011_priority_w)); - map(0xa40000, 0xa40001).w(this, FUNC(igs011_state::igs_dips_w)); + map(0x300000, 0x3fffff).rw(FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); + map(0xa20000, 0xa20001).w(FUNC(igs011_state::igs011_priority_w)); + map(0xa40000, 0xa40001).w(FUNC(igs011_state::igs_dips_w)); - map(0xa50000, 0xa50001).w(this, FUNC(igs011_state::igs011_prot_addr_w)); + map(0xa50000, 0xa50001).w(FUNC(igs011_state::igs011_prot_addr_w)); // AM_RANGE( 0xa50000, 0xa50005 ) AM_READ(igs011_prot_fake_r ) - map(0xa58000, 0xa58001).w(this, FUNC(igs011_state::igs011_blit_x_w)); - map(0xa58800, 0xa58801).w(this, FUNC(igs011_state::igs011_blit_y_w)); - map(0xa59000, 0xa59001).w(this, FUNC(igs011_state::igs011_blit_w_w)); - map(0xa59800, 0xa59801).w(this, FUNC(igs011_state::igs011_blit_h_w)); - map(0xa5a000, 0xa5a001).w(this, FUNC(igs011_state::igs011_blit_gfx_lo_w)); - map(0xa5a800, 0xa5a801).w(this, FUNC(igs011_state::igs011_blit_gfx_hi_w)); - map(0xa5b000, 0xa5b001).w(this, FUNC(igs011_state::igs011_blit_flags_w)); - map(0xa5b800, 0xa5b801).w(this, FUNC(igs011_state::igs011_blit_pen_w)); - map(0xa5c000, 0xa5c001).w(this, FUNC(igs011_state::igs011_blit_depth_w)); - map(0xa88000, 0xa88001).r(this, FUNC(igs011_state::igs_3_dips_r)); + map(0xa58000, 0xa58001).w(FUNC(igs011_state::igs011_blit_x_w)); + map(0xa58800, 0xa58801).w(FUNC(igs011_state::igs011_blit_y_w)); + map(0xa59000, 0xa59001).w(FUNC(igs011_state::igs011_blit_w_w)); + map(0xa59800, 0xa59801).w(FUNC(igs011_state::igs011_blit_h_w)); + map(0xa5a000, 0xa5a001).w(FUNC(igs011_state::igs011_blit_gfx_lo_w)); + map(0xa5a800, 0xa5a801).w(FUNC(igs011_state::igs011_blit_gfx_hi_w)); + map(0xa5b000, 0xa5b001).w(FUNC(igs011_state::igs011_blit_flags_w)); + map(0xa5b800, 0xa5b801).w(FUNC(igs011_state::igs011_blit_pen_w)); + map(0xa5c000, 0xa5c001).w(FUNC(igs011_state::igs011_blit_depth_w)); + map(0xa88000, 0xa88001).r(FUNC(igs011_state::igs_3_dips_r)); } @@ -2827,37 +2827,37 @@ void igs011_state::nkishusp(address_map &map) // AM_RANGE( 0x01ff88, 0x01ff89 ) AM_READ ( igs011_prot1_r ) // to be done: - map(0x023000, 0x0231ff).w(this, FUNC(igs011_state::igs011_prot2_inc_w)); // inc (55) - map(0x023200, 0x0233ff).w(this, FUNC(igs011_state::lhb_igs011_prot2_swap_w)); // swap (33) - map(0x023400, 0x0235ff).r(this, FUNC(igs011_state::lhb2_igs011_prot2_r)); // read - map(0x023600, 0x0237ff).w(this, FUNC(igs011_state::igs011_prot2_reset_w)); // reset (55) + map(0x023000, 0x0231ff).w(FUNC(igs011_state::igs011_prot2_inc_w)); // inc (55) + map(0x023200, 0x0233ff).w(FUNC(igs011_state::lhb_igs011_prot2_swap_w)); // swap (33) + map(0x023400, 0x0235ff).r(FUNC(igs011_state::lhb2_igs011_prot2_r)); // read + map(0x023600, 0x0237ff).w(FUNC(igs011_state::igs011_prot2_reset_w)); // reset (55) map(0x100000, 0x103fff).ram().share("nvram"); map(0x200001, 0x200001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x204000, 0x204003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); - map(0x208000, 0x208003).w(this, FUNC(igs011_state::lhb2_igs003_w)); - map(0x208002, 0x208003).r(this, FUNC(igs011_state::lhb2_igs003_r)); + map(0x208000, 0x208003).w(FUNC(igs011_state::lhb2_igs003_w)); + map(0x208002, 0x208003).r(FUNC(igs011_state::lhb2_igs003_r)); map(0x20c000, 0x20cfff).ram().share("priority_ram"); - map(0x210000, 0x211fff).ram().w(this, FUNC(igs011_state::igs011_palette)).share("paletteram"); + map(0x210000, 0x211fff).ram().w(FUNC(igs011_state::igs011_palette)).share("paletteram"); map(0x214000, 0x214001).portr("COIN"); - map(0x300000, 0x3fffff).rw(this, FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); - map(0xa20000, 0xa20001).w(this, FUNC(igs011_state::igs011_priority_w)); - map(0xa38000, 0xa38001).w(this, FUNC(igs011_state::lhb_irq_enable_w)); - map(0xa40000, 0xa40001).w(this, FUNC(igs011_state::igs_dips_w)); + map(0x300000, 0x3fffff).rw(FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); + map(0xa20000, 0xa20001).w(FUNC(igs011_state::igs011_priority_w)); + map(0xa38000, 0xa38001).w(FUNC(igs011_state::lhb_irq_enable_w)); + map(0xa40000, 0xa40001).w(FUNC(igs011_state::igs_dips_w)); - map(0xa50000, 0xa50001).w(this, FUNC(igs011_state::igs011_prot_addr_w)); + map(0xa50000, 0xa50001).w(FUNC(igs011_state::igs011_prot_addr_w)); // AM_RANGE( 0xa50000, 0xa50005 ) AM_READ(igs011_prot_fake_r ) - map(0xa58000, 0xa58001).w(this, FUNC(igs011_state::igs011_blit_x_w)); - map(0xa58800, 0xa58801).w(this, FUNC(igs011_state::igs011_blit_y_w)); - map(0xa59000, 0xa59001).w(this, FUNC(igs011_state::igs011_blit_w_w)); - map(0xa59800, 0xa59801).w(this, FUNC(igs011_state::igs011_blit_h_w)); - map(0xa5a000, 0xa5a001).w(this, FUNC(igs011_state::igs011_blit_gfx_lo_w)); - map(0xa5a800, 0xa5a801).w(this, FUNC(igs011_state::igs011_blit_gfx_hi_w)); - map(0xa5b000, 0xa5b001).w(this, FUNC(igs011_state::igs011_blit_flags_w)); - map(0xa5b800, 0xa5b801).w(this, FUNC(igs011_state::igs011_blit_pen_w)); - map(0xa5c000, 0xa5c001).w(this, FUNC(igs011_state::igs011_blit_depth_w)); - map(0xa88000, 0xa88001).r(this, FUNC(igs011_state::igs_3_dips_r)); + map(0xa58000, 0xa58001).w(FUNC(igs011_state::igs011_blit_x_w)); + map(0xa58800, 0xa58801).w(FUNC(igs011_state::igs011_blit_y_w)); + map(0xa59000, 0xa59001).w(FUNC(igs011_state::igs011_blit_w_w)); + map(0xa59800, 0xa59801).w(FUNC(igs011_state::igs011_blit_h_w)); + map(0xa5a000, 0xa5a001).w(FUNC(igs011_state::igs011_blit_gfx_lo_w)); + map(0xa5a800, 0xa5a801).w(FUNC(igs011_state::igs011_blit_gfx_hi_w)); + map(0xa5b000, 0xa5b001).w(FUNC(igs011_state::igs011_blit_flags_w)); + map(0xa5b800, 0xa5b801).w(FUNC(igs011_state::igs011_blit_pen_w)); + map(0xa5c000, 0xa5c001).w(FUNC(igs011_state::igs011_blit_depth_w)); + map(0xa88000, 0xa88001).r(FUNC(igs011_state::igs_3_dips_r)); } @@ -2930,73 +2930,73 @@ void igs011_state::vbowl(address_map &map) // AM_RANGE( 0x008348, 0x008349 ) AM_READ(igs011_prot1_r ) // IGS012 - map(0x001600, 0x00160f).w(this, FUNC(igs011_state::igs012_prot_swap_w)).mirror(0x01c000); // swap (a5 / 55) - map(0x001610, 0x00161f).r(this, FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 0) - map(0x001620, 0x00162f).w(this, FUNC(igs011_state::igs012_prot_dec_inc_w)).mirror(0x01c000); // dec (aa), inc (fa) - map(0x001630, 0x00163f).w(this, FUNC(igs011_state::igs012_prot_inc_w)).mirror(0x01c000); // inc (ff) - map(0x001640, 0x00164f).w(this, FUNC(igs011_state::igs012_prot_copy_w)).mirror(0x01c000); // copy (22) - map(0x001650, 0x00165f).w(this, FUNC(igs011_state::igs012_prot_dec_copy_w)).mirror(0x01c000); // dec (5a), copy (33) - map(0x001660, 0x00166f).r(this, FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 1) - map(0x001670, 0x00167f).w(this, FUNC(igs011_state::igs012_prot_mode_w)).mirror(0x01c000); // mode (cc / dd) - - map(0x00d400, 0x00d43f).w(this, FUNC(igs011_state::igs011_prot2_dec_w)); // dec (33) - map(0x00d440, 0x00d47f).w(this, FUNC(igs011_state::drgnwrld_igs011_prot2_swap_w)); // swap (33) - map(0x00d480, 0x00d4bf).w(this, FUNC(igs011_state::igs011_prot2_reset_w)); // reset (33) - map(0x00d4c0, 0x00d4ff).r(this, FUNC(igs011_state::drgnwrldv20j_igs011_prot2_r)); // read - - map(0x50f000, 0x50f1ff).w(this, FUNC(igs011_state::igs011_prot2_dec_w)); // dec (33) - map(0x50f200, 0x50f3ff).w(this, FUNC(igs011_state::vbowl_igs011_prot2_swap_w)); // swap (33) - map(0x50f400, 0x50f5ff).w(this, FUNC(igs011_state::igs011_prot2_reset_w)); // reset (33) - map(0x50f600, 0x50f7ff).r(this, FUNC(igs011_state::vbowl_igs011_prot2_r)); // read - - map(0x902000, 0x902fff).w(this, FUNC(igs011_state::igs012_prot_reset_w)); // reset? + map(0x001600, 0x00160f).w(FUNC(igs011_state::igs012_prot_swap_w)).mirror(0x01c000); // swap (a5 / 55) + map(0x001610, 0x00161f).r(FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 0) + map(0x001620, 0x00162f).w(FUNC(igs011_state::igs012_prot_dec_inc_w)).mirror(0x01c000); // dec (aa), inc (fa) + map(0x001630, 0x00163f).w(FUNC(igs011_state::igs012_prot_inc_w)).mirror(0x01c000); // inc (ff) + map(0x001640, 0x00164f).w(FUNC(igs011_state::igs012_prot_copy_w)).mirror(0x01c000); // copy (22) + map(0x001650, 0x00165f).w(FUNC(igs011_state::igs012_prot_dec_copy_w)).mirror(0x01c000); // dec (5a), copy (33) + map(0x001660, 0x00166f).r(FUNC(igs011_state::igs012_prot_r)).mirror(0x01c000); // read (mode 1) + map(0x001670, 0x00167f).w(FUNC(igs011_state::igs012_prot_mode_w)).mirror(0x01c000); // mode (cc / dd) + + map(0x00d400, 0x00d43f).w(FUNC(igs011_state::igs011_prot2_dec_w)); // dec (33) + map(0x00d440, 0x00d47f).w(FUNC(igs011_state::drgnwrld_igs011_prot2_swap_w)); // swap (33) + map(0x00d480, 0x00d4bf).w(FUNC(igs011_state::igs011_prot2_reset_w)); // reset (33) + map(0x00d4c0, 0x00d4ff).r(FUNC(igs011_state::drgnwrldv20j_igs011_prot2_r)); // read + + map(0x50f000, 0x50f1ff).w(FUNC(igs011_state::igs011_prot2_dec_w)); // dec (33) + map(0x50f200, 0x50f3ff).w(FUNC(igs011_state::vbowl_igs011_prot2_swap_w)); // swap (33) + map(0x50f400, 0x50f5ff).w(FUNC(igs011_state::igs011_prot2_reset_w)); // reset (33) + map(0x50f600, 0x50f7ff).r(FUNC(igs011_state::vbowl_igs011_prot2_r)); // read + + map(0x902000, 0x902fff).w(FUNC(igs011_state::igs012_prot_reset_w)); // reset? // AM_RANGE( 0x902000, 0x902005 ) AM_WRITE(igs012_prot_fake_r ) map(0x100000, 0x103fff).ram().share("nvram"); map(0x200000, 0x200fff).ram().share("priority_ram"); - map(0x300000, 0x3fffff).rw(this, FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); - map(0x400000, 0x401fff).ram().w(this, FUNC(igs011_state::igs011_palette)).share("paletteram"); + map(0x300000, 0x3fffff).rw(FUNC(igs011_state::igs011_layers_r), FUNC(igs011_state::igs011_layers_w)); + map(0x400000, 0x401fff).ram().w(FUNC(igs011_state::igs011_palette)).share("paletteram"); map(0x520000, 0x520001).portr("COIN"); - map(0x600000, 0x600007).rw(this, FUNC(igs011_state::ics2115_word_r), FUNC(igs011_state::ics2115_word_w)); + map(0x600000, 0x600007).rw(FUNC(igs011_state::ics2115_word_r), FUNC(igs011_state::ics2115_word_w)); map(0x700000, 0x700003).ram().share("vbowl_trackball"); - map(0x700004, 0x700005).w(this, FUNC(igs011_state::vbowl_pen_hi_w)); - map(0x800000, 0x800003).w(this, FUNC(igs011_state::vbowl_igs003_w)); - map(0x800002, 0x800003).r(this, FUNC(igs011_state::vbowl_igs003_r)); + map(0x700004, 0x700005).w(FUNC(igs011_state::vbowl_pen_hi_w)); + map(0x800000, 0x800003).w(FUNC(igs011_state::vbowl_igs003_w)); + map(0x800002, 0x800003).r(FUNC(igs011_state::vbowl_igs003_r)); - map(0xa00000, 0xa00001).w(this, FUNC(igs011_state::vbowl_link_0_w)); - map(0xa08000, 0xa08001).w(this, FUNC(igs011_state::vbowl_link_1_w)); - map(0xa10000, 0xa10001).w(this, FUNC(igs011_state::vbowl_link_2_w)); - map(0xa18000, 0xa18001).w(this, FUNC(igs011_state::vbowl_link_3_w)); + map(0xa00000, 0xa00001).w(FUNC(igs011_state::vbowl_link_0_w)); + map(0xa08000, 0xa08001).w(FUNC(igs011_state::vbowl_link_1_w)); + map(0xa10000, 0xa10001).w(FUNC(igs011_state::vbowl_link_2_w)); + map(0xa18000, 0xa18001).w(FUNC(igs011_state::vbowl_link_3_w)); - map(0xa20000, 0xa20001).w(this, FUNC(igs011_state::igs011_priority_w)); + map(0xa20000, 0xa20001).w(FUNC(igs011_state::igs011_priority_w)); // AM_RANGE( 0xa38000, 0xa38001 ) AM_WRITE(lhb_irq_enable_w ) - map(0xa40000, 0xa40001).w(this, FUNC(igs011_state::igs_dips_w)); + map(0xa40000, 0xa40001).w(FUNC(igs011_state::igs_dips_w)); - map(0xa48000, 0xa48001).w(this, FUNC(igs011_state::igs011_prot_addr_w)); + map(0xa48000, 0xa48001).w(FUNC(igs011_state::igs011_prot_addr_w)); // AM_RANGE( 0xa48000, 0xa48005 ) AM_WRITE(igs011_prot_fake_r ) - map(0xa58000, 0xa58001).w(this, FUNC(igs011_state::igs011_blit_x_w)); - map(0xa58800, 0xa58801).w(this, FUNC(igs011_state::igs011_blit_y_w)); - map(0xa59000, 0xa59001).w(this, FUNC(igs011_state::igs011_blit_w_w)); - map(0xa59800, 0xa59801).w(this, FUNC(igs011_state::igs011_blit_h_w)); - map(0xa5a000, 0xa5a001).w(this, FUNC(igs011_state::igs011_blit_gfx_lo_w)); - map(0xa5a800, 0xa5a801).w(this, FUNC(igs011_state::igs011_blit_gfx_hi_w)); - map(0xa5b000, 0xa5b001).w(this, FUNC(igs011_state::igs011_blit_flags_w)); - map(0xa5b800, 0xa5b801).w(this, FUNC(igs011_state::igs011_blit_pen_w)); - map(0xa5c000, 0xa5c001).w(this, FUNC(igs011_state::igs011_blit_depth_w)); - - map(0xa80000, 0xa80001).r(this, FUNC(igs011_state::vbowl_unk_r)); // comm - map(0xa88000, 0xa88001).r(this, FUNC(igs011_state::igs_4_dips_r)); - map(0xa90000, 0xa90001).r(this, FUNC(igs011_state::vbowl_unk_r)); // comm - map(0xa98000, 0xa98001).r(this, FUNC(igs011_state::vbowl_unk_r)); // comm + map(0xa58000, 0xa58001).w(FUNC(igs011_state::igs011_blit_x_w)); + map(0xa58800, 0xa58801).w(FUNC(igs011_state::igs011_blit_y_w)); + map(0xa59000, 0xa59001).w(FUNC(igs011_state::igs011_blit_w_w)); + map(0xa59800, 0xa59801).w(FUNC(igs011_state::igs011_blit_h_w)); + map(0xa5a000, 0xa5a001).w(FUNC(igs011_state::igs011_blit_gfx_lo_w)); + map(0xa5a800, 0xa5a801).w(FUNC(igs011_state::igs011_blit_gfx_hi_w)); + map(0xa5b000, 0xa5b001).w(FUNC(igs011_state::igs011_blit_flags_w)); + map(0xa5b800, 0xa5b801).w(FUNC(igs011_state::igs011_blit_pen_w)); + map(0xa5c000, 0xa5c001).w(FUNC(igs011_state::igs011_blit_depth_w)); + + map(0xa80000, 0xa80001).r(FUNC(igs011_state::vbowl_unk_r)); // comm + map(0xa88000, 0xa88001).r(FUNC(igs011_state::igs_4_dips_r)); + map(0xa90000, 0xa90001).r(FUNC(igs011_state::vbowl_unk_r)); // comm + map(0xa98000, 0xa98001).r(FUNC(igs011_state::vbowl_unk_r)); // comm } void igs011_state::vbowlhk(address_map &map) { vbowl(map); - map(0x800000, 0x800003).w(this, FUNC(igs011_state::vbowlhk_igs003_w)); - map(0x50f600, 0x50f7ff).r(this, FUNC(igs011_state::vbowlhk_igs011_prot2_r)); // read + map(0x800000, 0x800003).w(FUNC(igs011_state::vbowlhk_igs003_w)); + map(0x50f600, 0x50f7ff).r(FUNC(igs011_state::vbowlhk_igs011_prot2_r)); // read } diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index f34bc674f60..6510505f651 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -1580,7 +1580,7 @@ void igs017_state::iqblocka_io(address_map &map) map(0x0000, 0x003f).ram(); // internal regs - map(0x2010, 0x2011).w(this, FUNC(igs017_state::iqblocka_remap_addr_w)); + map(0x2010, 0x2011).w(FUNC(igs017_state::iqblocka_remap_addr_w)); map(0x8000, 0x8000).w ("igs_bitswap", FUNC(igs_bitswap_device::address_w)); map(0x8001, 0x8001).rw("igs_bitswap", FUNC(igs_bitswap_device::data_r), FUNC(igs_bitswap_device::data_w)); @@ -1852,7 +1852,7 @@ void igs017_state::mgcs(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x300000, 0x303fff).ram(); - map(0x49c000, 0x49c003).w(this, FUNC(igs017_state::mgcs_magic_w)).r(this, FUNC(igs017_state::mgcs_magic_r)); + map(0x49c000, 0x49c003).w(FUNC(igs017_state::mgcs_magic_w)).r(FUNC(igs017_state::mgcs_magic_r)); map(0xa00000, 0xa0ffff).rw(m_igs017_igs031, FUNC(igs017_igs031_device::read), FUNC(igs017_igs031_device::write)).umask16(0x00ff); @@ -1939,8 +1939,8 @@ void igs017_state::sdmg2(address_map &map) map(0x200000, 0x20ffff).rw(m_igs017_igs031, FUNC(igs017_igs031_device::read), FUNC(igs017_igs031_device::write)).umask16(0x00ff); map(0x210001, 0x210001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x300000, 0x300003).w(this, FUNC(igs017_state::sdmg2_magic_w)); - map(0x300002, 0x300003).r(this, FUNC(igs017_state::sdmg2_magic_r)); + map(0x300000, 0x300003).w(FUNC(igs017_state::sdmg2_magic_w)); + map(0x300002, 0x300003).r(FUNC(igs017_state::sdmg2_magic_r)); } @@ -2048,8 +2048,8 @@ void igs017_state::mgdha_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x600000, 0x603fff).ram(); - map(0x876000, 0x876003).w(this, FUNC(igs017_state::mgdha_magic_w)); - map(0x876002, 0x876003).r(this, FUNC(igs017_state::mgdha_magic_r)); + map(0x876000, 0x876003).w(FUNC(igs017_state::mgdha_magic_w)); + map(0x876002, 0x876003).r(FUNC(igs017_state::mgdha_magic_r)); map(0xa00000, 0xa0ffff).rw(m_igs017_igs031, FUNC(igs017_igs031_device::read), FUNC(igs017_igs031_device::write)).umask16(0x00ff); @@ -2112,8 +2112,8 @@ READ8_MEMBER(igs017_state::tjsb_input_r) void igs017_state::tjsb_map(address_map &map) { map(0x00000, 0x0dfff).rom(); - map(0x0e000, 0x0e000).w(this, FUNC(igs017_state::input_select_w)); - map(0x0e001, 0x0e001).rw(this, FUNC(igs017_state::tjsb_input_r), FUNC(igs017_state::tjsb_output_w)); + map(0x0e000, 0x0e000).w(FUNC(igs017_state::input_select_w)); + map(0x0e001, 0x0e001).rw(FUNC(igs017_state::tjsb_input_r), FUNC(igs017_state::tjsb_output_w)); map(0x0e002, 0x0efff).ram(); map(0x0f000, 0x0ffff).ram(); map(0x10000, 0x3ffff).rom(); @@ -2173,8 +2173,8 @@ void igs017_state::spkrform_io(address_map &map) map(0xa000, 0xa000).portr("A000"); // Game selection map(0xa001, 0xa001).portr("A001"); - map(0xb000, 0xb000).w(this, FUNC(igs017_state::input_select_w)); - map(0xb001, 0xb001).r(this, FUNC(igs017_state::spkrform_input_r)); + map(0xb000, 0xb000).w(FUNC(igs017_state::input_select_w)); + map(0xb001, 0xb001).r(FUNC(igs017_state::spkrform_input_r)); } @@ -2242,8 +2242,8 @@ void igs017_state::lhzb2(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x500000, 0x503fff).ram(); - map(0x910000, 0x910003).w(this, FUNC(igs017_state::lhzb2_magic_w)); - map(0x910002, 0x910003).r(this, FUNC(igs017_state::lhzb2_magic_r)); + map(0x910000, 0x910003).w(FUNC(igs017_state::lhzb2_magic_w)); + map(0x910002, 0x910003).r(FUNC(igs017_state::lhzb2_magic_r)); map(0xb00000, 0xb0ffff).rw(m_igs017_igs031, FUNC(igs017_igs031_device::read), FUNC(igs017_igs031_device::write)).umask16(0x00ff); @@ -2349,7 +2349,7 @@ void igs017_state::lhzb2a(address_map &map) map(0xb00000, 0xb0ffff).rw(m_igs017_igs031, FUNC(igs017_igs031_device::read), FUNC(igs017_igs031_device::write)).umask16(0x00ff); map(0xb10001, 0xb10001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xb12000, 0xb12001).w(this, FUNC(igs017_state::lhzb2a_input_select_w)); + map(0xb12000, 0xb12001).w(FUNC(igs017_state::lhzb2a_input_select_w)); // Inputs dynamically mapped at xx8000, protection at xx4000 (xx = f0 initially). xx written to xxc000 } @@ -2408,8 +2408,8 @@ void igs017_state::slqz2(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); - map(0x602000, 0x602003).w(this, FUNC(igs017_state::slqz2_magic_w)); - map(0x602002, 0x602003).r(this, FUNC(igs017_state::slqz2_magic_r)); + map(0x602000, 0x602003).w(FUNC(igs017_state::slqz2_magic_w)); + map(0x602002, 0x602003).r(FUNC(igs017_state::slqz2_magic_r)); map(0x900000, 0x90ffff).rw(m_igs017_igs031, FUNC(igs017_igs031_device::read), FUNC(igs017_igs031_device::write)).umask16(0x00ff); diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index b2a21eb3bd2..8db7983430e 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -399,7 +399,7 @@ void igspoker_state::igspoker_prg_map(address_map &map) void igspoker_state::igspoker_io_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(igspoker_state::exp_rom_r)); + map(0x0000, 0xffff).r(FUNC(igspoker_state::exp_rom_r)); map(0x2000, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2800, 0x2fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x4000, 0x4000).portr("DSW1"); /* DSW1 */ @@ -408,14 +408,14 @@ void igspoker_state::igspoker_io_map(address_map &map) map(0x4003, 0x4003).portr("DSW4"); /* DSW4 */ map(0x4004, 0x4004).portr("DSW5"); /* DSW5 */ map(0x5080, 0x5083).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x5090, 0x5090).w(this, FUNC(igspoker_state::custom_io_w)); - map(0x5091, 0x5091).r(this, FUNC(igspoker_state::custom_io_r)).w(this, FUNC(igspoker_state::igs_lamps_w)); /* Keyboard */ + map(0x5090, 0x5090).w(FUNC(igspoker_state::custom_io_w)); + map(0x5091, 0x5091).r(FUNC(igspoker_state::custom_io_r)).w(FUNC(igspoker_state::igs_lamps_w)); /* Keyboard */ map(0x50a0, 0x50a0).portr("BUTTONS2"); /* Not connected */ map(0x50b0, 0x50b1).w("ymsnd", FUNC(ym2413_device::write)); - map(0x50c0, 0x50c0).r(this, FUNC(igspoker_state::igs_irqack_r)).w(this, FUNC(igspoker_state::igs_irqack_w)); - map(0x6800, 0x6fff).ram().w(this, FUNC(igspoker_state::bg_tile_w)).share("bg_tile_ram"); - map(0x7000, 0x77ff).ram().w(this, FUNC(igspoker_state::fg_tile_w)).share("fg_tile_ram"); - map(0x7800, 0x7fff).ram().w(this, FUNC(igspoker_state::fg_color_w)).share("fg_color_ram"); + map(0x50c0, 0x50c0).r(FUNC(igspoker_state::igs_irqack_r)).w(FUNC(igspoker_state::igs_irqack_w)); + map(0x6800, 0x6fff).ram().w(FUNC(igspoker_state::bg_tile_w)).share("bg_tile_ram"); + map(0x7000, 0x77ff).ram().w(FUNC(igspoker_state::fg_tile_w)).share("fg_tile_ram"); + map(0x7800, 0x7fff).ram().w(FUNC(igspoker_state::fg_color_w)).share("fg_color_ram"); } @@ -1152,7 +1152,7 @@ INPUT_PORTS_END void igspoker_state::number10_io_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(igspoker_state::exp_rom_r)); + map(0x0000, 0xffff).r(FUNC(igspoker_state::exp_rom_r)); map(0x2000, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2800, 0x2fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x4000, 0x4000).portr("DSW1"); /* DSW1 */ @@ -1162,21 +1162,21 @@ void igspoker_state::number10_io_map(address_map &map) map(0x4004, 0x4004).portr("DSW5"); /* DSW5 */ map(0x4006, 0x4006).portr("DSW6"); map(0x4007, 0x4007).portr("DSW7"); - map(0x50f0, 0x50f0).w(this, FUNC(igspoker_state::igs_nmi_and_coins_w)); + map(0x50f0, 0x50f0).w(FUNC(igspoker_state::igs_nmi_and_coins_w)); map(0x5080, 0x5080).portr("SERVICE"); /* Services */ - map(0x5090, 0x5090).w(this, FUNC(igspoker_state::custom_io_w)); - map(0x5091, 0x5091).r(this, FUNC(igspoker_state::custom_io_r)).w(this, FUNC(igspoker_state::igs_lamps_w)); /* Keyboard */ + map(0x5090, 0x5090).w(FUNC(igspoker_state::custom_io_w)); + map(0x5091, 0x5091).r(FUNC(igspoker_state::custom_io_r)).w(FUNC(igspoker_state::igs_lamps_w)); /* Keyboard */ map(0x50a0, 0x50a0).portr("BUTTONS2"); /* Sound synthesys has been patched out, replaced by ADPCM samples */ map(0x50b0, 0x50b0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x50c0, 0x50c0).r(this, FUNC(igspoker_state::igs_irqack_r)).w(this, FUNC(igspoker_state::igs_irqack_w)); - map(0x7000, 0x77ff).ram().w(this, FUNC(igspoker_state::fg_tile_w)).share("fg_tile_ram"); - map(0x7800, 0x7fff).ram().w(this, FUNC(igspoker_state::fg_color_w)).share("fg_color_ram"); + map(0x50c0, 0x50c0).r(FUNC(igspoker_state::igs_irqack_r)).w(FUNC(igspoker_state::igs_irqack_w)); + map(0x7000, 0x77ff).ram().w(FUNC(igspoker_state::fg_tile_w)).share("fg_tile_ram"); + map(0x7800, 0x7fff).ram().w(FUNC(igspoker_state::fg_color_w)).share("fg_color_ram"); } void igspoker_state::cpokerpk_io_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(igspoker_state::exp_rom_r)); + map(0x0000, 0xffff).r(FUNC(igspoker_state::exp_rom_r)); map(0x2000, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2800, 0x2fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x4000, 0x4000).portr("DSW1"); /* DSW1 */ @@ -1184,17 +1184,17 @@ void igspoker_state::cpokerpk_io_map(address_map &map) map(0x4002, 0x4002).portr("DSW3"); /* DSW3 */ map(0x4003, 0x4003).portr("DSW4"); /* DSW4 */ map(0x4004, 0x4004).portr("DSW5"); /* DSW5 */ - map(0x50f0, 0x50f0).w(this, FUNC(igspoker_state::igs_nmi_and_coins_w)); + map(0x50f0, 0x50f0).w(FUNC(igspoker_state::igs_nmi_and_coins_w)); map(0x5081, 0x5081).portr("SERVICE"); /* Services */ map(0x5082, 0x5082).portr("COINS"); /* Coing & Kbd */ - map(0x5090, 0x5090).w(this, FUNC(igspoker_state::custom_io_w)); - map(0x5091, 0x5091).r(this, FUNC(igspoker_state::custom_io_r)).w(this, FUNC(igspoker_state::igs_lamps_w)); /* Keyboard */ + map(0x5090, 0x5090).w(FUNC(igspoker_state::custom_io_w)); + map(0x5091, 0x5091).r(FUNC(igspoker_state::custom_io_r)).w(FUNC(igspoker_state::igs_lamps_w)); /* Keyboard */ map(0x50a0, 0x50a0).portr("BUTTONS2"); /* Sound synthesys has been patched out, replaced by ADPCM samples */ map(0x50b0, 0x50b0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x50c0, 0x50c0).r(this, FUNC(igspoker_state::igs_irqack_r)).w(this, FUNC(igspoker_state::igs_irqack_w)); - map(0x7000, 0x77ff).ram().w(this, FUNC(igspoker_state::fg_tile_w)).share("fg_tile_ram"); - map(0x7800, 0x7fff).ram().w(this, FUNC(igspoker_state::fg_color_w)).share("fg_color_ram"); + map(0x50c0, 0x50c0).r(FUNC(igspoker_state::igs_irqack_r)).w(FUNC(igspoker_state::igs_irqack_w)); + map(0x7000, 0x77ff).ram().w(FUNC(igspoker_state::fg_tile_w)).share("fg_tile_ram"); + map(0x7800, 0x7fff).ram().w(FUNC(igspoker_state::fg_color_w)).share("fg_color_ram"); } static INPUT_PORTS_START( number10 ) diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp index 5d471fd9e53..0611ae7a29e 100644 --- a/src/mame/drivers/ikki.cpp +++ b/src/mame/drivers/ikki.cpp @@ -66,14 +66,14 @@ void ikki_state::ikki_cpu1(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); map(0xd000, 0xd7ff).ram().share("videoram"); - map(0xe000, 0xe000).r(this, FUNC(ikki_state::ikki_e000_r)); + map(0xe000, 0xe000).r(FUNC(ikki_state::ikki_e000_r)); map(0xe001, 0xe001).portr("DSW1"); map(0xe002, 0xe002).portr("DSW2"); map(0xe003, 0xe003).portr("SYSTEM"); map(0xe004, 0xe004).portr("P1"); map(0xe005, 0xe005).portr("P2"); - map(0xe008, 0xe008).w(this, FUNC(ikki_state::ikki_scrn_ctrl_w)); - map(0xe009, 0xe009).w(this, FUNC(ikki_state::ikki_coin_counters)); + map(0xe008, 0xe008).w(FUNC(ikki_state::ikki_scrn_ctrl_w)); + map(0xe009, 0xe009).w(FUNC(ikki_state::ikki_coin_counters)); map(0xe00a, 0xe00b).writeonly().share("scroll"); } @@ -82,8 +82,8 @@ void ikki_state::ikki_cpu2(address_map &map) map(0x0000, 0x1fff).rom(); map(0xc000, 0xc7ff).ram().share("spriteram"); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::write)); - map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::write)); + map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::command_w)); + map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::command_w)); } diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index e692230c9a2..da9a28b51ce 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -112,23 +112,23 @@ void imds2_state::ipc_mem_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(imds2_state::ipc_mem_read), FUNC(imds2_state::ipc_mem_write)); + map(0x0000, 0xffff).rw(FUNC(imds2_state::ipc_mem_read), FUNC(imds2_state::ipc_mem_write)); } void imds2_state::ipc_io_map(address_map &map) { map.unmap_value_low(); - map(0xc0, 0xc0).rw(this, FUNC(imds2_state::imds2_ipc_dbbout_r), FUNC(imds2_state::imds2_ipc_dbbin_data_w)); - map(0xc1, 0xc1).rw(this, FUNC(imds2_state::imds2_ipc_status_r), FUNC(imds2_state::imds2_ipc_dbbin_cmd_w)); - map(0xf0, 0xf3).rw(m_ipctimer, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0xf4, 0xf4).rw(m_ipcusart0, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); - map(0xf5, 0xf5).rw(m_ipcusart0, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0xf6, 0xf6).rw(m_ipcusart1, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); - map(0xf7, 0xf7).rw(m_ipcusart1, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); + map(0xc0, 0xc0).rw(FUNC(imds2_state::imds2_ipc_dbbout_r), FUNC(imds2_state::imds2_ipc_dbbin_data_w)); + map(0xc1, 0xc1).rw(FUNC(imds2_state::imds2_ipc_status_r), FUNC(imds2_state::imds2_ipc_dbbin_cmd_w)); + map(0xf0, 0xf3).rw(m_ipctimer, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); + map(0xf4, 0xf4).rw(m_ipcusart0, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); + map(0xf5, 0xf5).rw(m_ipcusart0, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); + map(0xf6, 0xf6).rw(m_ipcusart1, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); + map(0xf7, 0xf7).rw(m_ipcusart1, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xf8, 0xf9).rw(m_iocpio, FUNC(i8041_device::upi41_master_r), FUNC(i8041_device::upi41_master_w)); - map(0xfa, 0xfb).rw(this, FUNC(imds2_state::imds2_ipclocpic_r), FUNC(imds2_state::imds2_ipclocpic_w)); - map(0xfc, 0xfd).rw(this, FUNC(imds2_state::imds2_ipcsyspic_r), FUNC(imds2_state::imds2_ipcsyspic_w)); - map(0xff, 0xff).w(this, FUNC(imds2_state::imds2_ipc_control_w)); + map(0xfa, 0xfb).rw(FUNC(imds2_state::imds2_ipclocpic_r), FUNC(imds2_state::imds2_ipclocpic_w)); + map(0xfc, 0xfd).rw(FUNC(imds2_state::imds2_ipcsyspic_r), FUNC(imds2_state::imds2_ipcsyspic_w)); + map(0xff, 0xff).w(FUNC(imds2_state::imds2_ipc_control_w)); } void imds2_state::ioc_mem_map(address_map &map) @@ -141,16 +141,16 @@ void imds2_state::ioc_mem_map(address_map &map) void imds2_state::ioc_io_map(address_map &map) { map.unmap_value_high(); - map(0x00, 0x0f).w(this, FUNC(imds2_state::imds2_ioc_dbbout_w)); - map(0x20, 0x2f).w(this, FUNC(imds2_state::imds2_ioc_f0_w)); - map(0x30, 0x3f).w(this, FUNC(imds2_state::imds2_ioc_set_f1_w)); - map(0x40, 0x4f).w(this, FUNC(imds2_state::imds2_ioc_reset_f1_w)); - map(0x50, 0x5f).w(this, FUNC(imds2_state::imds2_start_timer_w)); - map(0x60, 0x6f).w(this, FUNC(imds2_state::imds2_miscout_w)); - map(0x80, 0x8f).r(this, FUNC(imds2_state::imds2_miscin_r)); - map(0x90, 0x9f).r(this, FUNC(imds2_state::imds2_kb_read)); - map(0xa0, 0xaf).r(this, FUNC(imds2_state::imds2_ioc_status_r)); - map(0xb0, 0xbf).r(this, FUNC(imds2_state::imds2_ioc_dbbin_r)); + map(0x00, 0x0f).w(FUNC(imds2_state::imds2_ioc_dbbout_w)); + map(0x20, 0x2f).w(FUNC(imds2_state::imds2_ioc_f0_w)); + map(0x30, 0x3f).w(FUNC(imds2_state::imds2_ioc_set_f1_w)); + map(0x40, 0x4f).w(FUNC(imds2_state::imds2_ioc_reset_f1_w)); + map(0x50, 0x5f).w(FUNC(imds2_state::imds2_start_timer_w)); + map(0x60, 0x6f).w(FUNC(imds2_state::imds2_miscout_w)); + map(0x80, 0x8f).r(FUNC(imds2_state::imds2_miscin_r)); + map(0x90, 0x9f).r(FUNC(imds2_state::imds2_kb_read)); + map(0xa0, 0xaf).r(FUNC(imds2_state::imds2_ioc_status_r)); + map(0xb0, 0xbf).r(FUNC(imds2_state::imds2_ioc_dbbin_r)); map(0xc0, 0xcf).m(m_iocfdc, FUNC(i8271_device::map)); map(0xd0, 0xdf).rw(m_ioccrtc, FUNC(i8275_device::read), FUNC(i8275_device::write)); map(0xe0, 0xef).rw(m_ioctimer, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp index ab4ceaf93c0..f6864706c52 100644 --- a/src/mame/drivers/imolagp.cpp +++ b/src/mame/drivers/imolagp.cpp @@ -344,14 +344,14 @@ void imolagp_state::imolagp_master_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); map(0x2800, 0x2803).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x3000, 0x3000).w(this, FUNC(imolagp_state::vreg_control_w)); + map(0x3000, 0x3000).w(FUNC(imolagp_state::vreg_control_w)); map(0x37f0, 0x37f0).w("aysnd", FUNC(ay8910_device::address_w)); // AM_RANGE(0x37f7, 0x37f7) AM_NOP - map(0x3800, 0x3800).rw(this, FUNC(imolagp_state::vreg_data_r), FUNC(imolagp_state::vreg_data_w)); + map(0x3800, 0x3800).rw(FUNC(imolagp_state::vreg_data_r), FUNC(imolagp_state::vreg_data_w)); map(0x3810, 0x3810).w("aysnd", FUNC(ay8910_device::data_w)); map(0x4000, 0x4000).portr("DSWA"); - map(0x47ff, 0x4800).w(this, FUNC(imolagp_state::transmit_data_w)); - map(0x5000, 0x50ff).w(this, FUNC(imolagp_state::imola_led_board_w)); + map(0x47ff, 0x4800).w(FUNC(imolagp_state::transmit_data_w)); + map(0x5000, 0x50ff).w(FUNC(imolagp_state::imola_led_board_w)); map(0x5800, 0x5800).portr("DSWA"); // assume mirror map(0x6000, 0x6000).portr("DSWB"); } @@ -359,7 +359,7 @@ void imolagp_state::imolagp_master_map(address_map &map) void imolagp_state::imolagp_master_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(imolagp_state::trigger_slave_nmi_r)); + map(0x00, 0x00).r(FUNC(imolagp_state::trigger_slave_nmi_r)); } @@ -367,14 +367,14 @@ void imolagp_state::imolagp_slave_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x9fff, 0xa000).r(this, FUNC(imolagp_state::receive_data_r)); - map(0xc000, 0xffff).w(this, FUNC(imolagp_state::screenram_w)); + map(0x9fff, 0xa000).r(FUNC(imolagp_state::receive_data_r)); + map(0xc000, 0xffff).w(FUNC(imolagp_state::screenram_w)); } void imolagp_state::imolagp_slave_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).r(this, FUNC(imolagp_state::imola_draw_mode_r)); + map(0x00, 0xff).r(FUNC(imolagp_state::imola_draw_mode_r)); } diff --git a/src/mame/drivers/imsai.cpp b/src/mame/drivers/imsai.cpp index 7d23fc6579b..534791e7979 100644 --- a/src/mame/drivers/imsai.cpp +++ b/src/mame/drivers/imsai.cpp @@ -64,15 +64,15 @@ void imsai_state::imsai_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x02, 0x02).r(this, FUNC(imsai_state::keyin_r)).w(m_terminal, FUNC(generic_terminal_device::write)); - map(0x03, 0x03).r(this, FUNC(imsai_state::status_r)); + map(0x02, 0x02).r(FUNC(imsai_state::keyin_r)).w(m_terminal, FUNC(generic_terminal_device::write)); + map(0x03, 0x03).r(FUNC(imsai_state::status_r)); map(0x04, 0x04).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x05, 0x05).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x12, 0x12).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x13, 0x13).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x14, 0x14).r(this, FUNC(imsai_state::keyin_r)).w(m_terminal, FUNC(generic_terminal_device::write)); - map(0x15, 0x15).r(this, FUNC(imsai_state::status_r)); - map(0xf3, 0xf3).w(this, FUNC(imsai_state::control_w)); + map(0x14, 0x14).r(FUNC(imsai_state::keyin_r)).w(m_terminal, FUNC(generic_terminal_device::write)); + map(0x15, 0x15).r(FUNC(imsai_state::status_r)); + map(0xf3, 0xf3).w(FUNC(imsai_state::control_w)); } /* Input ports */ diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp index 7fef98159a1..a1dc937bad2 100644 --- a/src/mame/drivers/inder.cpp +++ b/src/mame/drivers/inder.cpp @@ -121,24 +121,24 @@ private: void inder_state::brvteam_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x20ff).w(this, FUNC(inder_state::disp_w)); + map(0x2000, 0x20ff).w(FUNC(inder_state::disp_w)); map(0x4000, 0x43ff).ram(); // pair of 2114 map(0x4400, 0x44ff).ram().share("nvram"); // pair of 5101, battery-backed - map(0x4800, 0x480a).rw(this, FUNC(inder_state::sw_r), FUNC(inder_state::sw_w)); - map(0x4900, 0x4900).w(this, FUNC(inder_state::sol_brvteam_w)); - map(0x4901, 0x4907).w(this, FUNC(inder_state::lamp_w)); - map(0x4b00, 0x4b00).w(this, FUNC(inder_state::sn_w)); + map(0x4800, 0x480a).rw(FUNC(inder_state::sw_r), FUNC(inder_state::sw_w)); + map(0x4900, 0x4900).w(FUNC(inder_state::sol_brvteam_w)); + map(0x4901, 0x4907).w(FUNC(inder_state::lamp_w)); + map(0x4b00, 0x4b00).w(FUNC(inder_state::sn_w)); } void inder_state::canasta_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x20ff).w(this, FUNC(inder_state::disp_w)); + map(0x2000, 0x20ff).w(FUNC(inder_state::disp_w)); map(0x4000, 0x43ff).ram(); // pair of 2114 map(0x4400, 0x44ff).ram().share("nvram"); // pair of 5101, battery-backed - map(0x4800, 0x480a).rw(this, FUNC(inder_state::sw_r), FUNC(inder_state::sw_w)); - map(0x4900, 0x4900).w(this, FUNC(inder_state::sol_canasta_w)); - map(0x4901, 0x4907).w(this, FUNC(inder_state::lamp_w)); + map(0x4800, 0x480a).rw(FUNC(inder_state::sw_r), FUNC(inder_state::sw_w)); + map(0x4900, 0x4900).w(FUNC(inder_state::sol_canasta_w)); + map(0x4901, 0x4907).w(FUNC(inder_state::lamp_w)); map(0x4b00, 0x4b00).w("ay", FUNC(ay8910_device::address_w)); map(0x4b01, 0x4b01).r("ay", FUNC(ay8910_device::data_r)); map(0x4b02, 0x4b02).w("ay", FUNC(ay8910_device::data_w)); @@ -147,13 +147,13 @@ void inder_state::canasta_map(address_map &map) void inder_state::lapbylap_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x20ff).w(this, FUNC(inder_state::disp_w)); + map(0x2000, 0x20ff).w(FUNC(inder_state::disp_w)); map(0x4000, 0x43ff).ram(); // pair of 2114 map(0x4400, 0x44ff).ram().share("nvram"); // pair of 5101, battery-backed - map(0x4800, 0x480a).rw(this, FUNC(inder_state::sw_r), FUNC(inder_state::sw_w)); - map(0x4900, 0x4900).w(this, FUNC(inder_state::sol_canasta_w)); - map(0x4901, 0x4907).w(this, FUNC(inder_state::lamp_w)); - map(0x4b00, 0x4b00).w(this, FUNC(inder_state::sndcmd_lapbylap_w)); + map(0x4800, 0x480a).rw(FUNC(inder_state::sw_r), FUNC(inder_state::sw_w)); + map(0x4900, 0x4900).w(FUNC(inder_state::sol_canasta_w)); + map(0x4901, 0x4907).w(FUNC(inder_state::lamp_w)); + map(0x4b00, 0x4b00).w(FUNC(inder_state::sndcmd_lapbylap_w)); } void inder_state::lapbylap_sub_map(address_map &map) @@ -176,8 +176,8 @@ void inder_state::inder_map(address_map &map) map(0x6400, 0x6403).mirror(0x13fc).rw("ppi64", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x6800, 0x6803).mirror(0x13fc).rw("ppi68", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x6c00, 0x6c03).mirror(0x131c).rw("ppi6c", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x6c20, 0x6c3f).mirror(0x1300).w(this, FUNC(inder_state::sndcmd_w)); - map(0x6c60, 0x6c7f).mirror(0x1300).w(this, FUNC(inder_state::disp_w)); + map(0x6c20, 0x6c3f).mirror(0x1300).w(FUNC(inder_state::sndcmd_w)); + map(0x6c60, 0x6c7f).mirror(0x1300).w(FUNC(inder_state::disp_w)); map(0x6ce0, 0x6ce0).nopw(); } @@ -186,8 +186,8 @@ void inder_state::inder_sub_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x27ff).mirror(0x1800).ram(); // 6116 map(0x4000, 0x4003).mirror(0x1ffc).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x6000, 0x6000).w(this, FUNC(inder_state::sndbank_w)); - map(0x8000, 0x8000).r(this, FUNC(inder_state::sndcmd_r)); + map(0x6000, 0x6000).w(FUNC(inder_state::sndbank_w)); + map(0x8000, 0x8000).r(FUNC(inder_state::sndcmd_r)); } static INPUT_PORTS_START( brvteam ) @@ -1140,7 +1140,7 @@ WRITE8_MEMBER( inder_state::sw_w ) WRITE8_MEMBER( inder_state::sn_w ) { - m_sn->write(space, 0, bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7)); + m_sn->write(bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7)); } WRITE8_MEMBER( inder_state::sndcmd_lapbylap_w ) @@ -1265,9 +1265,9 @@ WRITE8_MEMBER( inder_state::sndbank_w ) void inder_state::update_mus() { if ((m_sound_addr < 0x40000) && (m_sndbank != 0xff)) - m_13->ba_w(m_p_speech[m_sound_addr]); + m_13->write_ba(m_p_speech[m_sound_addr]); else - m_13->ba_w(0); + m_13->write_ba(0); } WRITE_LINE_MEMBER( inder_state::qc7a_w ) diff --git a/src/mame/drivers/inderp.cpp b/src/mame/drivers/inderp.cpp index f6fce490832..cb07d6a4cc7 100644 --- a/src/mame/drivers/inderp.cpp +++ b/src/mame/drivers/inderp.cpp @@ -50,7 +50,7 @@ void inderp_state::maincpu_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x00ff).mirror(0x500).ram(); // 2x 5101/2101, battery-backed map(0x0200, 0x02ff).mirror(0x400); // outputs CI-110 (displays) - map(0x0300, 0x030f).mirror(0x4c0).rw(this, FUNC(inderp_state::inputs_r), FUNC(inderp_state::inputs_w)); // outputs, one per address CI-118; inputs: whole range CI-159 + map(0x0300, 0x030f).mirror(0x4c0).rw(FUNC(inderp_state::inputs_r), FUNC(inderp_state::inputs_w)); // outputs, one per address CI-118; inputs: whole range CI-159 map(0x0310, 0x0310).mirror(0x4cf); // outputs, D0-D2, BOB0-7 (solenoids) CI-121 map(0x0320, 0x0320).mirror(0x4cf); // outputs, D0-D3, (sound) CI-122 map(0x0330, 0x0337).mirror(0x4c8); // outputs, D0-D7, one per address to 16 sets of 4-bit outputs (lamps) diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index 23e1021059e..ee9c2ad581a 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -475,8 +475,8 @@ void indigo_state::indigo_map(address_map &map) map(0x0c000000, 0x0c7fffff).ram().share("share8"); map(0x10000000, 0x107fffff).ram().share("share9"); map(0x18000000, 0x187fffff).ram().share("share1"); - map(0x1fb80000, 0x1fb8ffff).rw(this, FUNC(indigo_state::hpc_r), FUNC(indigo_state::hpc_w)); - map(0x1fbd9000, 0x1fbd903f).rw(this, FUNC(indigo_state::int_r), FUNC(indigo_state::int_w)); + map(0x1fb80000, 0x1fb8ffff).rw(FUNC(indigo_state::hpc_r), FUNC(indigo_state::hpc_w)); + map(0x1fbd9000, 0x1fbd903f).rw(FUNC(indigo_state::int_r), FUNC(indigo_state::int_w)); } void indigo_state::indigo3k_map(address_map &map) diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index e3b450449c4..cc809d5bc18 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -155,7 +155,7 @@ WRITE32_MEMBER(ip22_state::ip22_write_ram) void ip22_state::ip225015_map(address_map &map) { map(0x00000000, 0x0007ffff).bankrw("bank1"); /* mirror of first 512k of main RAM */ - map(0x08000000, 0x0fffffff).share("mainram").ram().w(this, FUNC(ip22_state::ip22_write_ram)); /* 128 MB of main RAM */ + map(0x08000000, 0x0fffffff).share("mainram").ram().w(FUNC(ip22_state::ip22_write_ram)); /* 128 MB of main RAM */ map(0x1f0f0000, 0x1f0f1fff).rw(m_newport, FUNC(newport_video_device::rex3_r), FUNC(newport_video_device::rex3_w)); map(0x1fa00000, 0x1fa1ffff).rw(m_sgi_mc, FUNC(sgi_mc_device::read), FUNC(sgi_mc_device::write)); map(0x1fb90000, 0x1fb9ffff).rw(m_hpc3, FUNC(hpc3_device::hd_enet_r), FUNC(hpc3_device::hd_enet_w)); @@ -171,7 +171,7 @@ void ip22_state::ip225015_map(address_map &map) map(0x1fbdd000, 0x1fbdd3ff).ram(); map(0x1fbe0000, 0x1fbe04ff).rw(m_rtc, FUNC(ds1386_device::data_r), FUNC(ds1386_device::data_w)).umask32(0x000000ff); map(0x1fc00000, 0x1fc7ffff).rom().region("user1", 0); - map(0x20000000, 0x27ffffff).share("mainram").ram().w(this, FUNC(ip22_state::ip22_write_ram)); + map(0x20000000, 0x27ffffff).share("mainram").ram().w(FUNC(ip22_state::ip22_write_ram)); } void ip22_state::machine_reset() diff --git a/src/mame/drivers/instantm.cpp b/src/mame/drivers/instantm.cpp index 06a460be7d2..661aebd69e5 100644 --- a/src/mame/drivers/instantm.cpp +++ b/src/mame/drivers/instantm.cpp @@ -99,13 +99,13 @@ void instantm_state::main_map(address_map &map) void instantm_state::sub_map(address_map &map) { map(0x0000, 0xffff).rom(); - map(0x0000, 0x0000).w("dac", FUNC(dac_byte_interface::write)); + map(0x0000, 0x0000).w("dac", FUNC(dac_byte_interface::data_w)); } void instantm_state::sub_io(address_map &map) { map.global_mask(0xff); - map(0x01, 0x01).rw(this, FUNC(instantm_state::port01_r), FUNC(instantm_state::port01_w)); + map(0x01, 0x01).rw(FUNC(instantm_state::port01_r), FUNC(instantm_state::port01_w)); } static INPUT_PORTS_START( instantm ) diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index 40e3d4c85e3..998d4633612 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -225,7 +225,7 @@ void instruct_state::mem_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0ffe).ram().share("mainram"); - map(0x0fff, 0x0fff).rw(this, FUNC(instruct_state::port_r), FUNC(instruct_state::port_w)); + map(0x0fff, 0x0fff).rw(FUNC(instruct_state::port_r), FUNC(instruct_state::port_w)); map(0x1780, 0x17ff).ram().share("smiram"); map(0x1800, 0x1fff).rom().region("roms", 0); map(0x2000, 0x7fff).ram().share("extram"); @@ -234,19 +234,19 @@ void instruct_state::mem_map(address_map &map) void instruct_state::io_map(address_map &map) { map.unmap_value_high(); - map(0x07, 0x07).rw(this, FUNC(instruct_state::port_r), FUNC(instruct_state::port_w)); - map(0xf8, 0xf8).w(this, FUNC(instruct_state::portf8_w)); - map(0xf9, 0xf9).w(this, FUNC(instruct_state::portf9_w)); - map(0xfa, 0xfa).w(this, FUNC(instruct_state::portfa_w)); - map(0xfc, 0xfc).r(this, FUNC(instruct_state::portfc_r)); - map(0xfd, 0xfd).r(this, FUNC(instruct_state::portfd_r)); - map(0xfe, 0xfe).r(this, FUNC(instruct_state::portfe_r)); + map(0x07, 0x07).rw(FUNC(instruct_state::port_r), FUNC(instruct_state::port_w)); + map(0xf8, 0xf8).w(FUNC(instruct_state::portf8_w)); + map(0xf9, 0xf9).w(FUNC(instruct_state::portf9_w)); + map(0xfa, 0xfa).w(FUNC(instruct_state::portfa_w)); + map(0xfc, 0xfc).r(FUNC(instruct_state::portfc_r)); + map(0xfd, 0xfd).r(FUNC(instruct_state::portfd_r)); + map(0xfe, 0xfe).r(FUNC(instruct_state::portfe_r)); } void instruct_state::data_map(address_map &map) { map.unmap_value_high(); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(instruct_state::port_r), FUNC(instruct_state::port_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(instruct_state::port_r), FUNC(instruct_state::port_w)); } /* Input ports */ diff --git a/src/mame/drivers/intellec4.cpp b/src/mame/drivers/intellec4.cpp index 399badace3d..765072fa2ad 100644 --- a/src/mame/drivers/intellec4.cpp +++ b/src/mame/drivers/intellec4.cpp @@ -746,12 +746,12 @@ void intellec4_state::intellec4_rom_port_banks(address_map &map) map.unmap_value_high(); // 0x0000...0x07ff MON - map(0x0000, 0x000f).mirror(0x1f00).rw(this, FUNC(intellec4_state::rom0_in), FUNC(intellec4_state::rom0_out)); - map(0x0010, 0x001f).mirror(0x1f00).w(this, FUNC(intellec4_state::rom1_out)); - map(0x0020, 0x002f).mirror(0x1f00).rw(this, FUNC(intellec4_state::rom2_in), FUNC(intellec4_state::rom2_out)); - map(0x0030, 0x003f).mirror(0x1f00).rw(this, FUNC(intellec4_state::rom3_in), FUNC(intellec4_state::rom3_out)); - map(0x00e0, 0x00ef).mirror(0x1f00).rw(this, FUNC(intellec4_state::rome_in), FUNC(intellec4_state::rome_out)); - map(0x00f0, 0x00ff).mirror(0x1f00).rw(this, FUNC(intellec4_state::romf_in), FUNC(intellec4_state::romf_out)); + map(0x0000, 0x000f).mirror(0x1f00).rw(FUNC(intellec4_state::rom0_in), FUNC(intellec4_state::rom0_out)); + map(0x0010, 0x001f).mirror(0x1f00).w(FUNC(intellec4_state::rom1_out)); + map(0x0020, 0x002f).mirror(0x1f00).rw(FUNC(intellec4_state::rom2_in), FUNC(intellec4_state::rom2_out)); + map(0x0030, 0x003f).mirror(0x1f00).rw(FUNC(intellec4_state::rom3_in), FUNC(intellec4_state::rom3_out)); + map(0x00e0, 0x00ef).mirror(0x1f00).rw(FUNC(intellec4_state::rome_in), FUNC(intellec4_state::rome_out)); + map(0x00f0, 0x00ff).mirror(0x1f00).rw(FUNC(intellec4_state::romf_in), FUNC(intellec4_state::romf_out)); // 0x0800...0x0fff PROM @@ -791,14 +791,14 @@ void intellec4_state::intellec4_ram_status(address_map &map) void intellec4_state::intellec4_ram_ports(address_map &map) { - map(0x00, 0x00).w(this, FUNC(intellec4_state::ram0_out)); - map(0x01, 0x01).w(this, FUNC(intellec4_state::ram1_out)); + map(0x00, 0x00).w(FUNC(intellec4_state::ram0_out)); + map(0x01, 0x01).w(FUNC(intellec4_state::ram1_out)); } void intellec4_state::intellec4_program_memory(address_map &map) { map.unmap_value_low(); - map(0x0000, 0x01ff).rw(this, FUNC(intellec4_state::pm_read), FUNC(intellec4_state::pm_write)); + map(0x0000, 0x01ff).rw(FUNC(intellec4_state::pm_read), FUNC(intellec4_state::pm_write)); } diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp index bfd9ead3b5d..cd2fc2e8e0b 100644 --- a/src/mame/drivers/interact.cpp +++ b/src/mame/drivers/interact.cpp @@ -91,12 +91,12 @@ void interact_state::interact_mem(address_map &map) /* Hardware address mapping*/ /* AM_RANGE(0x0800,0x0808) AM_WRITE(switch_bank_w)// Bank management not udsed in BR machine*/ - map(0x1000, 0x1000).w(this, FUNC(interact_state::color_a_w)); /* Color c0/c1*/ - map(0x1800, 0x1800).w(this, FUNC(interact_state::color_b_w)); /* Color c2/c3*/ - map(0x2000, 0x2003).w(this, FUNC(interact_state::sn_2000_w)); /* Sound*/ - map(0x2800, 0x2803).w(this, FUNC(interact_state::sn_2800_w)); /* Sound*/ - map(0x3000, 0x3000).rw(this, FUNC(interact_state::cassette_r), FUNC(interact_state::sn_3000_w));/* Write necessary*/ - map(0x3800, 0x3807).rw(this, FUNC(interact_state::keyboard_r), FUNC(interact_state::keyboard_w)); /* Keyboard*/ + map(0x1000, 0x1000).w(FUNC(interact_state::color_a_w)); /* Color c0/c1*/ + map(0x1800, 0x1800).w(FUNC(interact_state::color_b_w)); /* Color c2/c3*/ + map(0x2000, 0x2003).w(FUNC(interact_state::sn_2000_w)); /* Sound*/ + map(0x2800, 0x2803).w(FUNC(interact_state::sn_2800_w)); /* Sound*/ + map(0x3000, 0x3000).rw(FUNC(interact_state::cassette_r), FUNC(interact_state::sn_3000_w));/* Write necessary*/ + map(0x3800, 0x3807).rw(FUNC(interact_state::keyboard_r), FUNC(interact_state::keyboard_w)); /* Keyboard*/ /* Video br mapping*/ map(0x4000, 0x49ff).ram().share("videoram"); diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index cfac9cd4204..bccd84dbc4d 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -385,12 +385,12 @@ void interpro_state::interpro_common_map(address_map &map) map(0x4f007e00, 0x4f007eff).m(m_sga, FUNC(interpro_sga_device::map)); map(0x7f000100, 0x7f00011f).m(m_fdc, FUNC(upd765_family_device::map)).umask32(0x000000ff); - map(0x7f000300, 0x7f000301).r(this, FUNC(interpro_state::sreg_error_r)); - map(0x7f000304, 0x7f000305).rw(this, FUNC(interpro_state::sreg_status_r), FUNC(interpro_state::sreg_led_w)); - map(0x7f000308, 0x7f000309).rw(this, FUNC(interpro_state::sreg_ctrl1_r), FUNC(interpro_state::sreg_ctrl1_w)); - map(0x7f00030c, 0x7f00030d).rw(this, FUNC(interpro_state::sreg_ctrl2_r), FUNC(interpro_state::sreg_ctrl2_w)); + map(0x7f000300, 0x7f000301).r(FUNC(interpro_state::sreg_error_r)); + map(0x7f000304, 0x7f000305).rw(FUNC(interpro_state::sreg_status_r), FUNC(interpro_state::sreg_led_w)); + map(0x7f000308, 0x7f000309).rw(FUNC(interpro_state::sreg_ctrl1_r), FUNC(interpro_state::sreg_ctrl1_w)); + map(0x7f00030c, 0x7f00030d).rw(FUNC(interpro_state::sreg_ctrl2_r), FUNC(interpro_state::sreg_ctrl2_w)); - map(0x7f00031c, 0x7f00031d).rw(this, FUNC(interpro_state::sreg_ctrl3_r), FUNC(interpro_state::sreg_ctrl3_w)); + map(0x7f00031c, 0x7f00031d).rw(FUNC(interpro_state::sreg_ctrl3_r), FUNC(interpro_state::sreg_ctrl3_w)); map(0x7f000400, 0x7f00040f).rw(m_scc1, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0x000000ff); map(0x7f000410, 0x7f00041f).rw(m_scc2, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0x000000ff); @@ -429,7 +429,7 @@ void emerald_state::emerald_base_map(address_map &map) map(0x7f000229, 0x7f000229).w(m_scsi, FUNC(ncr53c90a_device::test_w)); map(0x7f00022d, 0x7f00022d).rw(m_scsi, FUNC(ncr53c90a_device::conf2_r), FUNC(ncr53c90a_device::conf2_w)); - map(0x7f000300, 0x7f000300).w(this, FUNC(emerald_state::sreg_error_w)); + map(0x7f000300, 0x7f000300).w(FUNC(emerald_state::sreg_error_w)); map(0x7f000600, 0x7f00067f).rom().region(INTERPRO_NODEID_TAG, 0); } @@ -462,7 +462,7 @@ void turquoise_state::turquoise_base_map(address_map &map) map(0x7f000229, 0x7f000229).w(m_scsi, FUNC(ncr53c90a_device::test_w)); map(0x7f00022d, 0x7f00022d).rw(m_scsi, FUNC(ncr53c90a_device::conf2_r), FUNC(ncr53c90a_device::conf2_w)); - map(0x7f000300, 0x7f000300).w(this, FUNC(turquoise_state::sreg_error_w)); + map(0x7f000300, 0x7f000300).w(FUNC(turquoise_state::sreg_error_w)); map(0x7f000600, 0x7f00067f).rom().region(INTERPRO_NODEID_TAG, 0); } @@ -482,7 +482,7 @@ void sapphire_state::sapphire_base_map(address_map &map) map(0x40000000, 0x4000004f).m(INTERPRO_MCGA_TAG, FUNC(interpro_fmcc_device::map)); map(0x7f000200, 0x7f0002ff).m(m_arbga, FUNC(interpro_arbga_device::map)); - map(0x7f000600, 0x7f00060f).r(this, FUNC(sapphire_state::nodeid_r)).umask32(0x000000ff); + map(0x7f000600, 0x7f00060f).r(FUNC(sapphire_state::nodeid_r)).umask32(0x000000ff); // scsi registers have unusual address mapping map(0x7f001001, 0x7f001001).rw(m_scsi, FUNC(ncr53c94_device::tcounter_lo_r), FUNC(ncr53c94_device::tcount_lo_w)); @@ -503,7 +503,7 @@ void sapphire_state::sapphire_base_map(address_map &map) void sapphire_state::sapphire_main_map(address_map &map) { - //map(0x00000000, 0xffffffff).rw(this, FUNC(sapphire_state::unmapped_r), FUNC(sapphire_state::unmapped_w)); + //map(0x00000000, 0xffffffff).rw(FUNC(sapphire_state::unmapped_r), FUNC(sapphire_state::unmapped_w)); sapphire_base_map(map); @@ -536,7 +536,7 @@ void turquoise_state::turquoise_io_map(address_map &map) void sapphire_state::sapphire_io_map(address_map &map) { - //map(0x00000000, 0xffffffff).rw(this, FUNC(sapphire_state::unmapped_r), FUNC(sapphire_state::unmapped_w)); + //map(0x00000000, 0xffffffff).rw(FUNC(sapphire_state::unmapped_r), FUNC(sapphire_state::unmapped_w)); sapphire_base_map(map); diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp index ff8943aebbd..b46ca7d6670 100644 --- a/src/mame/drivers/intv.cpp +++ b/src/mame/drivers/intv.cpp @@ -281,16 +281,16 @@ INPUT_PORTS_END void intv_state::intv_mem(address_map &map) { - map(0x0000, 0x003f).rw(this, FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); - map(0x0100, 0x01ef).rw(this, FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); + map(0x0000, 0x003f).rw(FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); + map(0x0100, 0x01ef).rw(FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); map(0x01f0, 0x01ff).rw(m_sound, FUNC(ay8914_device::read), FUNC(ay8914_device::write)).umask16(0x00ff); - map(0x0200, 0x035f).rw(this, FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); + map(0x0200, 0x035f).rw(FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); map(0x0400, 0x04ff).r(m_cart, FUNC(intv_cart_slot_device::read_rom04)); map(0x1000, 0x1fff).rom().region("maincpu", 0x1000 << 1); // Exec ROM, 10-bits wide map(0x2000, 0x2fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom20)); map(0x3000, 0x37ff).r(m_stic, FUNC(stic_device::grom_read)); // GROM, 8-bits wide - map(0x3800, 0x39ff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM, 8-bits wide - map(0x3a00, 0x3bff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM Alias, 8-bits wide + map(0x3800, 0x39ff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM, 8-bits wide + map(0x3a00, 0x3bff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM Alias, 8-bits wide map(0x4000, 0x47ff).r(m_cart, FUNC(intv_cart_slot_device::read_rom40)); map(0x4800, 0x4fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom48)); map(0x5000, 0x5fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom50)); @@ -308,17 +308,17 @@ void intv_state::intv_mem(address_map &map) void intv_state::intvoice_mem(address_map &map) { - map(0x0000, 0x003f).rw(this, FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); + map(0x0000, 0x003f).rw(FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); map(0x0080, 0x0081).rw("voice", FUNC(intv_voice_device::read_speech), FUNC(intv_voice_device::write_speech)); // Intellivoice - map(0x0100, 0x01ef).rw(this, FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); + map(0x0100, 0x01ef).rw(FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); map(0x01f0, 0x01ff).rw(m_sound, FUNC(ay8914_device::read), FUNC(ay8914_device::write)).umask16(0x00ff); - map(0x0200, 0x035f).rw(this, FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); + map(0x0200, 0x035f).rw(FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); map(0x0400, 0x04ff).r("voice", FUNC(intv_voice_device::read_rom04)); map(0x1000, 0x1fff).rom().region("maincpu", 0x1000 << 1); // Exec ROM, 10-bits wide map(0x2000, 0x2fff).r("voice", FUNC(intv_voice_device::read_rom20)); map(0x3000, 0x37ff).r(m_stic, FUNC(stic_device::grom_read)); // GROM, 8-bits wide - map(0x3800, 0x39ff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM, 8-bits wide - map(0x3a00, 0x3bff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM Alias, 8-bits wide + map(0x3800, 0x39ff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM, 8-bits wide + map(0x3a00, 0x3bff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM Alias, 8-bits wide map(0x4000, 0x47ff).r("voice", FUNC(intv_voice_device::read_rom40)); map(0x4800, 0x4fff).r("voice", FUNC(intv_voice_device::read_rom48)); map(0x5000, 0x5fff).r("voice", FUNC(intv_voice_device::read_rom50)); @@ -336,16 +336,16 @@ void intv_state::intvoice_mem(address_map &map) void intv_state::intv2_mem(address_map &map) { - map(0x0000, 0x003f).rw(this, FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); - map(0x0100, 0x01ef).rw(this, FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); + map(0x0000, 0x003f).rw(FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); + map(0x0100, 0x01ef).rw(FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); map(0x01f0, 0x01ff).rw(m_sound, FUNC(ay8914_device::read), FUNC(ay8914_device::write)).umask16(0x00ff); - map(0x0200, 0x035f).rw(this, FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); + map(0x0200, 0x035f).rw(FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); map(0x0400, 0x04ff).rom().region("maincpu", 0x400 << 1); // Exec ROM, 10-bits wide map(0x1000, 0x1fff).rom().region("maincpu", 0x1000 << 1); // Exec ROM, 10-bits wide map(0x2000, 0x2fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom20)); map(0x3000, 0x37ff).r(m_stic, FUNC(stic_device::grom_read)); // GROM, 8-bits wide - map(0x3800, 0x39ff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM, 8-bits wide - map(0x3a00, 0x3bff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM Alias, 8-bits wide + map(0x3800, 0x39ff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM, 8-bits wide + map(0x3a00, 0x3bff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); // GRAM Alias, 8-bits wide map(0x4000, 0x47ff).r(m_cart, FUNC(intv_cart_slot_device::read_rom40)); map(0x4800, 0x4fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom48)); map(0x5000, 0x5fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom50)); @@ -363,19 +363,19 @@ void intv_state::intv2_mem(address_map &map) void intv_state::intvecs_mem(address_map &map) { - map(0x0000, 0x003f).rw(this, FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); + map(0x0000, 0x003f).rw(FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); map(0x0080, 0x0081).rw("speech", FUNC(sp0256_device::spb640_r), FUNC(sp0256_device::spb640_w)); /* Intellivoice */ // AM_RANGE(0x00E0, 0x00E3) AM_READWRITE( intv_ecs_uart_r, intv_ecs_uart_w ) map(0x00f0, 0x00ff).rw("ecs", FUNC(intv_ecs_device::read_ay), FUNC(intv_ecs_device::write_ay)); /* ecs psg */ - map(0x0100, 0x01ef).rw(this, FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); + map(0x0100, 0x01ef).rw(FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); map(0x01f0, 0x01ff).rw(m_sound, FUNC(ay8914_device::read), FUNC(ay8914_device::write)).umask16(0x00ff); - map(0x0200, 0x035f).rw(this, FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); + map(0x0200, 0x035f).rw(FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); map(0x0400, 0x04ff).r("ecs", FUNC(intv_ecs_device::read_rom04)); map(0x1000, 0x1fff).rom().region("maincpu", 0x1000<<1); /* Exec ROM, 10-bits wide */ map(0x2000, 0x2fff).rw("ecs", FUNC(intv_ecs_device::read_rom20), FUNC(intv_ecs_device::write_rom20)); map(0x3000, 0x37ff).r(m_stic, FUNC(stic_device::grom_read)); /* GROM, 8-bits wide */ - map(0x3800, 0x39ff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM, 8-bits wide */ - map(0x3a00, 0x3bff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM Alias, 8-bits wide */ + map(0x3800, 0x39ff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM, 8-bits wide */ + map(0x3a00, 0x3bff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM Alias, 8-bits wide */ map(0x4000, 0x47ff).rw("ecs", FUNC(intv_ecs_device::read_ram), FUNC(intv_ecs_device::write_ram)); map(0x4800, 0x4fff).r("ecs", FUNC(intv_ecs_device::read_rom48)); map(0x5000, 0x5fff).r("ecs", FUNC(intv_ecs_device::read_rom50)); @@ -393,22 +393,22 @@ void intv_state::intvecs_mem(address_map &map) void intv_state::intvkbd_mem(address_map &map) { - map(0x0000, 0x003f).rw(this, FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); - map(0x0100, 0x01ef).rw(this, FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); + map(0x0000, 0x003f).rw(FUNC(intv_state::intv_stic_r), FUNC(intv_state::intv_stic_w)); + map(0x0100, 0x01ef).rw(FUNC(intv_state::intv_ram8_r), FUNC(intv_state::intv_ram8_w)); map(0x01f0, 0x01ff).rw(m_sound, FUNC(ay8914_device::read), FUNC(ay8914_device::write)).umask16(0x00ff); - map(0x0200, 0x035f).rw(this, FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); + map(0x0200, 0x035f).rw(FUNC(intv_state::intv_ram16_r), FUNC(intv_state::intv_ram16_w)); map(0x0400, 0x04ff).r(m_cart, FUNC(intv_cart_slot_device::read_rom04)); map(0x1000, 0x1fff).rom().region("maincpu", 0x1000<<1); /* Exec ROM, 10-bits wide */ map(0x2000, 0x2fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom20)); map(0x3000, 0x37ff).r(m_stic, FUNC(stic_device::grom_read)); /* GROM, 8-bits wide */ - map(0x3800, 0x39ff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM, 8-bits wide */ - map(0x3a00, 0x3bff).rw(this, FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM Alias, 8-bits wide */ + map(0x3800, 0x39ff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM, 8-bits wide */ + map(0x3a00, 0x3bff).rw(FUNC(intv_state::intv_gram_r), FUNC(intv_state::intv_gram_w)); /* GRAM Alias, 8-bits wide */ map(0x4000, 0x47ff).r(m_cart, FUNC(intv_cart_slot_device::read_rom40)); map(0x4800, 0x4fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom48)); map(0x5000, 0x5fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom50)); map(0x6000, 0x6fff).r(m_cart, FUNC(intv_cart_slot_device::read_rom60)); map(0x7000, 0x7fff).rom().region("maincpu", 0x7000<<1); /* Keyboard ROM */ - map(0x8000, 0xbfff).ram().w(this, FUNC(intv_state::intvkbd_dualport16_w)).share("dualport_ram"); /* Dual-port RAM */ + map(0x8000, 0xbfff).ram().w(FUNC(intv_state::intvkbd_dualport16_w)).share("dualport_ram"); /* Dual-port RAM */ map(0xc000, 0xcfff).r(m_cart, FUNC(intv_cart_slot_device::read_romc0)); map(0xd000, 0xdfff).r(m_cart, FUNC(intv_cart_slot_device::read_romd0)); map(0xe000, 0xefff).r(m_cart, FUNC(intv_cart_slot_device::read_rome0)); @@ -418,14 +418,14 @@ void intv_state::intvkbd_mem(address_map &map) void intv_state::intvkbd2_mem(address_map &map) { map.unmap_value_high(); /* Required because of probing */ - map(0x0000, 0x3fff).rw(this, FUNC(intv_state::intvkbd_dualport8_lsb_r), FUNC(intv_state::intvkbd_dualport8_lsb_w)); /* Dual-port RAM */ - map(0x4000, 0x40bf).rw(this, FUNC(intv_state::intvkbd_io_r), FUNC(intv_state::intvkbd_io_w)); + map(0x0000, 0x3fff).rw(FUNC(intv_state::intvkbd_dualport8_lsb_r), FUNC(intv_state::intvkbd_dualport8_lsb_w)); /* Dual-port RAM */ + map(0x4000, 0x40bf).rw(FUNC(intv_state::intvkbd_io_r), FUNC(intv_state::intvkbd_io_w)); map(0x40c0, 0x40cf).rw(m_crtc, FUNC(tms9927_device::read), FUNC(tms9927_device::write)); - map(0x4200, 0x7fff).rw(this, FUNC(intv_state::intvkbd_dualport8_msb_r), FUNC(intv_state::intvkbd_dualport8_msb_w)); /* Dual-port RAM */ - map(0xb7f8, 0xb7ff).rw(this, FUNC(intv_state::intvkbd_periph_r), FUNC(intv_state::intvkbd_periph_w)); + map(0x4200, 0x7fff).rw(FUNC(intv_state::intvkbd_dualport8_msb_r), FUNC(intv_state::intvkbd_dualport8_msb_w)); /* Dual-port RAM */ + map(0xb7f8, 0xb7ff).rw(FUNC(intv_state::intvkbd_periph_r), FUNC(intv_state::intvkbd_periph_w)); map(0xb800, 0xbfff).ram().share("videoram"); /* Text Display */ map(0xc000, 0xdfff).rom(); - map(0xe000, 0xffff).r(this, FUNC(intv_state::intvkb_iocart_r)); + map(0xe000, 0xffff).r(FUNC(intv_state::intvkb_iocart_r)); } void intv_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp index dff3f5f3a39..aea4d7c3cca 100644 --- a/src/mame/drivers/inufuku.cpp +++ b/src/mame/drivers/inufuku.cpp @@ -129,14 +129,14 @@ void inufuku_state::inufuku_map(address_map &map) map(0x300000, 0x301fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // palette ram map(0x380000, 0x3801ff).writeonly().share("bg_rasterram"); // bg raster ram - map(0x400000, 0x401fff).rw(this, FUNC(inufuku_state::inufuku_bg_videoram_r), FUNC(inufuku_state::inufuku_bg_videoram_w)).share("bg_videoram"); // bg ram - map(0x402000, 0x403fff).rw(this, FUNC(inufuku_state::inufuku_tx_videoram_r), FUNC(inufuku_state::inufuku_tx_videoram_w)).share("tx_videoram"); // text ram + map(0x400000, 0x401fff).rw(FUNC(inufuku_state::inufuku_bg_videoram_r), FUNC(inufuku_state::inufuku_bg_videoram_w)).share("bg_videoram"); // bg ram + map(0x402000, 0x403fff).rw(FUNC(inufuku_state::inufuku_tx_videoram_r), FUNC(inufuku_state::inufuku_tx_videoram_w)).share("tx_videoram"); // text ram map(0x404000, 0x40ffff).ram(); // ?? mirror (3on3dunk) map(0x580000, 0x581fff).ram().share("spriteram1"); // sprite table + sprite attribute map(0x600000, 0x61ffff).ram().share("spriteram2"); // cell table - map(0x780000, 0x780013).w(this, FUNC(inufuku_state::inufuku_palettereg_w)); // bg & text palettebank register - map(0x7a0000, 0x7a0023).w(this, FUNC(inufuku_state::inufuku_scrollreg_w)); // bg & text scroll register + map(0x780000, 0x780013).w(FUNC(inufuku_state::inufuku_palettereg_w)); // bg & text palettebank register + map(0x7a0000, 0x7a0023).w(FUNC(inufuku_state::inufuku_scrollreg_w)); // bg & text scroll register // AM_RANGE(0x7e0000, 0x7e0001) AM_WRITENOP // ? map(0x800000, 0xbfffff).rom(); // data rom @@ -160,7 +160,7 @@ void inufuku_state::inufuku_sound_map(address_map &map) void inufuku_state::inufuku_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(inufuku_state::inufuku_soundrombank_w)); + map(0x00, 0x00).w(FUNC(inufuku_state::inufuku_soundrombank_w)); map(0x04, 0x04).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0x08, 0x0b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp index 55a09f0b7b2..6cd5a22edd2 100644 --- a/src/mame/drivers/invqix.cpp +++ b/src/mame/drivers/invqix.cpp @@ -281,23 +281,23 @@ void invqix_state::invqix_prg_map(address_map &map) { map(0x000000, 0x1fffff).rom().region("program", 0); map(0x200000, 0x21ffff).ram(); - map(0x400001, 0x400001).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x400001, 0x400001).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x400000, 0x400000).w("oki", FUNC(okim9810_device::write)); map(0x400002, 0x400002).r("oki", FUNC(okim9810_device::read)); map(0x600000, 0x61ffff).ram().share("vram"); - map(0x620004, 0x620005).w(this, FUNC(invqix_state::vctl_w)); + map(0x620004, 0x620005).w(FUNC(invqix_state::vctl_w)); } void invqix_state::invqix_io_map(address_map &map) { map(h8_device::PORT_1, h8_device::PORT_1).portr("P1"); map(h8_device::PORT_2, h8_device::PORT_2).portr("SYSTEM").nopw(); - map(h8_device::PORT_3, h8_device::PORT_3).rw(this, FUNC(invqix_state::port3_r), FUNC(invqix_state::port3_w)); + map(h8_device::PORT_3, h8_device::PORT_3).rw(FUNC(invqix_state::port3_r), FUNC(invqix_state::port3_w)); map(h8_device::PORT_4, h8_device::PORT_4).portr("P4"); - map(h8_device::PORT_5, h8_device::PORT_5).rw(this, FUNC(invqix_state::port5_r), FUNC(invqix_state::port5_w)); - map(h8_device::PORT_6, h8_device::PORT_6).rw(this, FUNC(invqix_state::port6_r), FUNC(invqix_state::port6_w)); - map(h8_device::PORT_A, h8_device::PORT_A).r(this, FUNC(invqix_state::porta_r)); - map(h8_device::PORT_G, h8_device::PORT_G).r(this, FUNC(invqix_state::portg_r)).nopw(); + map(h8_device::PORT_5, h8_device::PORT_5).rw(FUNC(invqix_state::port5_r), FUNC(invqix_state::port5_w)); + map(h8_device::PORT_6, h8_device::PORT_6).rw(FUNC(invqix_state::port6_r), FUNC(invqix_state::port6_w)); + map(h8_device::PORT_A, h8_device::PORT_A).r(FUNC(invqix_state::porta_r)); + map(h8_device::PORT_G, h8_device::PORT_G).r(FUNC(invqix_state::portg_r)).nopw(); } static INPUT_PORTS_START( invqix ) diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 60a68aa850b..e615db8815e 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -74,9 +74,9 @@ void ipds_state::ipds_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xb0, 0xb0).r(this, FUNC(ipds_state::ipds_b0_r)); - map(0xb1, 0xb1).rw(this, FUNC(ipds_state::ipds_b1_r), FUNC(ipds_state::ipds_b1_w)); - map(0xc0, 0xc0).r(this, FUNC(ipds_state::ipds_c0_r)); + map(0xb0, 0xb0).r(FUNC(ipds_state::ipds_b0_r)); + map(0xb1, 0xb1).rw(FUNC(ipds_state::ipds_b1_r), FUNC(ipds_state::ipds_b1_w)); + map(0xc0, 0xc0).r(FUNC(ipds_state::ipds_c0_r)); } /* Input ports */ diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp index 95f1cb01204..b9b8ccfeb54 100644 --- a/src/mame/drivers/iq151.cpp +++ b/src/mame/drivers/iq151.cpp @@ -216,7 +216,7 @@ WRITE8_MEMBER(iq151_state::cartslot_io_w) void iq151_state::iq151_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(iq151_state::cartslot_r), FUNC(iq151_state::cartslot_w)); + map(0x0000, 0xffff).rw(FUNC(iq151_state::cartslot_r), FUNC(iq151_state::cartslot_w)); map(0x0000, 0x07ff).bankrw("boot"); map(0x0800, 0x7fff).ram(); @@ -227,9 +227,9 @@ void iq151_state::iq151_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(iq151_state::cartslot_io_r), FUNC(iq151_state::cartslot_io_w)); + map(0x00, 0xff).rw(FUNC(iq151_state::cartslot_io_r), FUNC(iq151_state::cartslot_io_w)); - map(0x80, 0x80).w(this, FUNC(iq151_state::boot_bank_w)); + map(0x80, 0x80).w(FUNC(iq151_state::boot_bank_w)); map(0x84, 0x87).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x88, 0x89).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); } diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp index 06addda8f76..94c39dbad34 100644 --- a/src/mame/drivers/iqblock.cpp +++ b/src/mame/drivers/iqblock.cpp @@ -124,10 +124,10 @@ void iqblock_state::main_portmap(address_map &map) map(0x5090, 0x5090).portr("SW0"); map(0x50a0, 0x50a0).portr("SW1"); map(0x50b0, 0x50b1).w("ymsnd", FUNC(ym2413_device::write)); // UM3567_data_port_0_w - map(0x50c0, 0x50c0).w(this, FUNC(iqblock_state::irqack_w)); - map(0x6000, 0x603f).w(this, FUNC(iqblock_state::fgscroll_w)); - map(0x6800, 0x69ff).w(this, FUNC(iqblock_state::fgvideoram_w)).share("fgvideoram"); /* initialized up to 6fff... bug or larger tilemap? */ - map(0x7000, 0x7fff).ram().w(this, FUNC(iqblock_state::bgvideoram_w)).share("bgvideoram"); + map(0x50c0, 0x50c0).w(FUNC(iqblock_state::irqack_w)); + map(0x6000, 0x603f).w(FUNC(iqblock_state::fgscroll_w)); + map(0x6800, 0x69ff).w(FUNC(iqblock_state::fgvideoram_w)).share("fgvideoram"); /* initialized up to 6fff... bug or larger tilemap? */ + map(0x7000, 0x7fff).ram().w(FUNC(iqblock_state::bgvideoram_w)).share("bgvideoram"); map(0x8000, 0xffff).rom().region("user1", 0); } diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index d63644f3232..625d706c389 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -379,23 +379,23 @@ void sgi_ip2_state::sgi_ip2_map(address_map &map) map(0x00000000, 0x00ffffff).ram().share("mainram"); map(0x02100000, 0x0210ffff).ram().share("bss"); // ??? I don't understand the need for this... map(0x30000000, 0x30017fff).rom().region("maincpu", 0); - map(0x30800000, 0x30800003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_m_but_r), FUNC(sgi_ip2_state::sgi_ip2_m_but_w)); - map(0x31000000, 0x31000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_m_quad_r), FUNC(sgi_ip2_state::sgi_ip2_m_quad_w)); - map(0x31800000, 0x31800003).r(this, FUNC(sgi_ip2_state::sgi_ip2_swtch_r)); + map(0x30800000, 0x30800003).rw(FUNC(sgi_ip2_state::sgi_ip2_m_but_r), FUNC(sgi_ip2_state::sgi_ip2_m_but_w)); + map(0x31000000, 0x31000003).rw(FUNC(sgi_ip2_state::sgi_ip2_m_quad_r), FUNC(sgi_ip2_state::sgi_ip2_m_quad_w)); + map(0x31800000, 0x31800003).r(FUNC(sgi_ip2_state::sgi_ip2_swtch_r)); map(0x32000000, 0x3200000f).rw(m_duarta, FUNC(mc68681_device::read), FUNC(mc68681_device::write)); map(0x32800000, 0x3280000f).rw(m_duartb, FUNC(mc68681_device::read), FUNC(mc68681_device::write)); map(0x33000000, 0x330007ff).ram(); - map(0x34000000, 0x34000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_clock_ctl_r), FUNC(sgi_ip2_state::sgi_ip2_clock_ctl_w)); - map(0x35000000, 0x35000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_clock_data_r), FUNC(sgi_ip2_state::sgi_ip2_clock_data_w)); - map(0x36000000, 0x36000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_os_base_r), FUNC(sgi_ip2_state::sgi_ip2_os_base_w)); - map(0x38000000, 0x38000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_status_r), FUNC(sgi_ip2_state::sgi_ip2_status_w)); - map(0x39000000, 0x39000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_parctl_r), FUNC(sgi_ip2_state::sgi_ip2_parctl_w)); - map(0x3a000000, 0x3a000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_mbp_r), FUNC(sgi_ip2_state::sgi_ip2_mbp_w)); - map(0x3b000000, 0x3b003fff).rw(this, FUNC(sgi_ip2_state::sgi_ip2_ptmap_r), FUNC(sgi_ip2_state::sgi_ip2_ptmap_w)).share("ptmap"); - map(0x3c000000, 0x3c000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_tdbase_r), FUNC(sgi_ip2_state::sgi_ip2_tdbase_w)); - map(0x3d000000, 0x3d000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_tdlmt_r), FUNC(sgi_ip2_state::sgi_ip2_tdlmt_w)); - map(0x3e000000, 0x3e000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_stkbase_r), FUNC(sgi_ip2_state::sgi_ip2_stkbase_w)); - map(0x3f000000, 0x3f000003).rw(this, FUNC(sgi_ip2_state::sgi_ip2_stklmt_r), FUNC(sgi_ip2_state::sgi_ip2_stklmt_w)); + map(0x34000000, 0x34000003).rw(FUNC(sgi_ip2_state::sgi_ip2_clock_ctl_r), FUNC(sgi_ip2_state::sgi_ip2_clock_ctl_w)); + map(0x35000000, 0x35000003).rw(FUNC(sgi_ip2_state::sgi_ip2_clock_data_r), FUNC(sgi_ip2_state::sgi_ip2_clock_data_w)); + map(0x36000000, 0x36000003).rw(FUNC(sgi_ip2_state::sgi_ip2_os_base_r), FUNC(sgi_ip2_state::sgi_ip2_os_base_w)); + map(0x38000000, 0x38000003).rw(FUNC(sgi_ip2_state::sgi_ip2_status_r), FUNC(sgi_ip2_state::sgi_ip2_status_w)); + map(0x39000000, 0x39000003).rw(FUNC(sgi_ip2_state::sgi_ip2_parctl_r), FUNC(sgi_ip2_state::sgi_ip2_parctl_w)); + map(0x3a000000, 0x3a000003).rw(FUNC(sgi_ip2_state::sgi_ip2_mbp_r), FUNC(sgi_ip2_state::sgi_ip2_mbp_w)); + map(0x3b000000, 0x3b003fff).rw(FUNC(sgi_ip2_state::sgi_ip2_ptmap_r), FUNC(sgi_ip2_state::sgi_ip2_ptmap_w)).share("ptmap"); + map(0x3c000000, 0x3c000003).rw(FUNC(sgi_ip2_state::sgi_ip2_tdbase_r), FUNC(sgi_ip2_state::sgi_ip2_tdbase_w)); + map(0x3d000000, 0x3d000003).rw(FUNC(sgi_ip2_state::sgi_ip2_tdlmt_r), FUNC(sgi_ip2_state::sgi_ip2_tdlmt_w)); + map(0x3e000000, 0x3e000003).rw(FUNC(sgi_ip2_state::sgi_ip2_stkbase_r), FUNC(sgi_ip2_state::sgi_ip2_stkbase_w)); + map(0x3f000000, 0x3f000003).rw(FUNC(sgi_ip2_state::sgi_ip2_stklmt_r), FUNC(sgi_ip2_state::sgi_ip2_stklmt_w)); } /*************************************************************************** diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp index a6506ac631f..b29e9b6f4bf 100644 --- a/src/mame/drivers/irisha.cpp +++ b/src/mame/drivers/irisha.cpp @@ -79,7 +79,7 @@ void irisha_state::irisha_mem(address_map &map) void irisha_state::irisha_io(address_map &map) { - map(0x04, 0x05).r(this, FUNC(irisha_state::irisha_keyboard_r)); + map(0x04, 0x05).r(FUNC(irisha_state::irisha_keyboard_r)); map(0x06, 0x06).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x07, 0x07).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x08, 0x0B).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp index ff6c82e9d72..4eb863ee031 100644 --- a/src/mame/drivers/irobot.cpp +++ b/src/mame/drivers/irobot.cpp @@ -126,7 +126,7 @@ READ8_MEMBER(irobot_state::quad_pokeyn_r) int control = (offset & 0x20) >> 2; int pokey_reg = (offset % 8) | control; - return m_pokey[pokey_num]->read(pokey_reg); + return m_pokey[pokey_num]->read(space, pokey_reg); } WRITE8_MEMBER(irobot_state::quad_pokeyn_w) @@ -135,7 +135,7 @@ WRITE8_MEMBER(irobot_state::quad_pokeyn_w) int control = (offset & 0x20) >> 2; int pokey_reg = (offset % 8) | control; - m_pokey[pokey_num]->write(pokey_reg, data); + m_pokey[pokey_num]->write(space, pokey_reg, data); } @@ -151,21 +151,21 @@ void irobot_state::irobot_map(address_map &map) map(0x0800, 0x0fff).bankrw("bank2"); map(0x1000, 0x103f).portr("IN0"); map(0x1040, 0x1040).portr("IN1"); - map(0x1080, 0x1080).r(this, FUNC(irobot_state::irobot_status_r)); + map(0x1080, 0x1080).r(FUNC(irobot_state::irobot_status_r)); map(0x10c0, 0x10c0).portr("DSW1"); - map(0x1100, 0x1100).w(this, FUNC(irobot_state::irobot_clearirq_w)); - map(0x1140, 0x1140).w(this, FUNC(irobot_state::irobot_statwr_w)); - map(0x1180, 0x1180).w(this, FUNC(irobot_state::irobot_out0_w)); - map(0x11c0, 0x11c0).w(this, FUNC(irobot_state::irobot_rom_banksel_w)); - map(0x1200, 0x12ff).ram().w(this, FUNC(irobot_state::irobot_nvram_w)).share("nvram"); + map(0x1100, 0x1100).w(FUNC(irobot_state::irobot_clearirq_w)); + map(0x1140, 0x1140).w(FUNC(irobot_state::irobot_statwr_w)); + map(0x1180, 0x1180).w(FUNC(irobot_state::irobot_out0_w)); + map(0x11c0, 0x11c0).w(FUNC(irobot_state::irobot_rom_banksel_w)); + map(0x1200, 0x12ff).ram().w(FUNC(irobot_state::irobot_nvram_w)).share("nvram"); map(0x1300, 0x1300).mirror(0xff).r("adc", FUNC(adc0809_device::data_r)); - map(0x1400, 0x143f).rw(this, FUNC(irobot_state::quad_pokeyn_r), FUNC(irobot_state::quad_pokeyn_w)); - map(0x1800, 0x18ff).w(this, FUNC(irobot_state::irobot_paletteram_w)); + map(0x1400, 0x143f).rw(FUNC(irobot_state::quad_pokeyn_r), FUNC(irobot_state::quad_pokeyn_w)); + map(0x1800, 0x18ff).w(FUNC(irobot_state::irobot_paletteram_w)); map(0x1900, 0x19ff).writeonly(); /* Watchdog reset */ - map(0x1a00, 0x1a00).w(this, FUNC(irobot_state::irobot_clearfirq_w)); + map(0x1a00, 0x1a00).w(FUNC(irobot_state::irobot_clearfirq_w)); map(0x1b00, 0x1b03).mirror(0xfc).w("adc", FUNC(adc0809_device::address_offset_start_w)); map(0x1c00, 0x1fff).ram().share("videoram"); - map(0x2000, 0x3fff).rw(this, FUNC(irobot_state::irobot_sharedmem_r), FUNC(irobot_state::irobot_sharedmem_w)); + map(0x2000, 0x3fff).rw(FUNC(irobot_state::irobot_sharedmem_r), FUNC(irobot_state::irobot_sharedmem_w)); map(0x4000, 0x5fff).bankr("bank1"); map(0x6000, 0xffff).rom(); } diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 02fed52fc59..39776e397bc 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -62,24 +62,24 @@ WRITE8_MEMBER(ironhors_state::filter_w) void ironhors_state::master_map(address_map &map) { map(0x0000, 0x0002).ram(); - map(0x0003, 0x0003).ram().w(this, FUNC(ironhors_state::charbank_w)); + map(0x0003, 0x0003).ram().w(FUNC(ironhors_state::charbank_w)); map(0x0004, 0x0004).ram().share("int_enable"); map(0x0005, 0x001f).ram(); map(0x0020, 0x003f).ram().share("scroll"); map(0x0040, 0x005f).ram(); map(0x0060, 0x00df).ram(); map(0x0800, 0x0800).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x0900, 0x0900).portr("DSW3").w(this, FUNC(ironhors_state::sh_irqtrigger_w)); - map(0x0a00, 0x0a00).portr("DSW2").w(this, FUNC(ironhors_state::palettebank_w)); - map(0x0b00, 0x0b00).portr("DSW1").w(this, FUNC(ironhors_state::flipscreen_w)); + map(0x0900, 0x0900).portr("DSW3").w(FUNC(ironhors_state::sh_irqtrigger_w)); + map(0x0a00, 0x0a00).portr("DSW2").w(FUNC(ironhors_state::palettebank_w)); + map(0x0b00, 0x0b00).portr("DSW1").w(FUNC(ironhors_state::flipscreen_w)); map(0x0b01, 0x0b01).portr("P2"); map(0x0b02, 0x0b02).portr("P1"); map(0x0b03, 0x0b03).portr("SYSTEM"); map(0x1800, 0x1800).nopw(); // ??? map(0x1a00, 0x1a01).nopw(); // ??? map(0x1c00, 0x1dff).nopw(); // ??? - map(0x2000, 0x23ff).ram().w(this, FUNC(ironhors_state::colorram_w)).share("colorram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(ironhors_state::videoram_w)).share("videoram"); + map(0x2000, 0x23ff).ram().w(FUNC(ironhors_state::colorram_w)).share("colorram"); + map(0x2400, 0x27ff).ram().w(FUNC(ironhors_state::videoram_w)).share("videoram"); map(0x2800, 0x2fff).ram(); map(0x3000, 0x30ff).ram().share("spriteram2"); map(0x3100, 0x37ff).ram(); @@ -112,22 +112,22 @@ void ironhors_state::farwest_master_map(address_map &map) map(0x0040, 0x005f).ram(); map(0x0060, 0x00ff).ram(); map(0x0800, 0x0800).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x0900, 0x0900) /*.protr("DSW3") */ .w(this, FUNC(ironhors_state::sh_irqtrigger_w)); - map(0x0a00, 0x0a00).portr("DSW2"); //.w(this, FUNC(ironhors_state::palettebank_w)); - map(0x0b00, 0x0b00).portr("DSW1").w(this, FUNC(ironhors_state::flipscreen_w)); - map(0x0b01, 0x0b01).portr("DSW2"); //.w(this, FUNC(ironhors_state::palettebank_w)); + map(0x0900, 0x0900) /*.protr("DSW3") */ .w(FUNC(ironhors_state::sh_irqtrigger_w)); + map(0x0a00, 0x0a00).portr("DSW2"); //.w(FUNC(ironhors_state::palettebank_w)); + map(0x0b00, 0x0b00).portr("DSW1").w(FUNC(ironhors_state::flipscreen_w)); + map(0x0b01, 0x0b01).portr("DSW2"); //.w(FUNC(ironhors_state::palettebank_w)); map(0x0b02, 0x0b02).portr("P1"); map(0x0b03, 0x0b03).portr("SYSTEM"); - map(0x1800, 0x1800).w(this, FUNC(ironhors_state::sh_irqtrigger_w)); + map(0x1800, 0x1800).w(FUNC(ironhors_state::sh_irqtrigger_w)); map(0x1a00, 0x1a00).ram().share("int_enable"); - map(0x1a01, 0x1a01).ram().w(this, FUNC(ironhors_state::charbank_w)); - map(0x1a02, 0x1a02).w(this, FUNC(ironhors_state::palettebank_w)); + map(0x1a01, 0x1a01).ram().w(FUNC(ironhors_state::charbank_w)); + map(0x1a02, 0x1a02).w(FUNC(ironhors_state::palettebank_w)); // map(0x1c00, 0x1fff).ram(); - map(0x2000, 0x23ff).ram().w(this, FUNC(ironhors_state::colorram_w)).share("colorram"); - map(0x2400, 0x27ff).ram().w(this, FUNC(ironhors_state::videoram_w)).share("videoram"); + map(0x2000, 0x23ff).ram().w(FUNC(ironhors_state::colorram_w)).share("colorram"); + map(0x2400, 0x27ff).ram().w(FUNC(ironhors_state::videoram_w)).share("videoram"); map(0x2800, 0x2fff).ram(); map(0x1c00, 0x1dff).ram().share("spriteram2"); map(0x3000, 0x38ff).ram(); diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index ff7a4706f7d..48f8807154d 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -157,8 +157,8 @@ void isbc_state::isbc8605_io(address_map &map) void isbc_state::isbc8630_io(address_map &map) { rpc86_io(map); - map(0x00c0, 0x00c7).w(this, FUNC(isbc_state::edge_intr_clear_w)).umask16(0xff00); - map(0x00c8, 0x00df).w(this, FUNC(isbc_state::status_register_w)).umask16(0xff00); + map(0x00c0, 0x00c7).w(FUNC(isbc_state::edge_intr_clear_w)).umask16(0xff00); + map(0x00c8, 0x00df).w(FUNC(isbc_state::status_register_w)).umask16(0xff00); map(0x0100, 0x0100).w("isbc_215g", FUNC(isbc_215g_device::write)); } @@ -196,7 +196,7 @@ void isbc_state::isbc286_io(address_map &map) map(0x00c0, 0x00c3).rw(m_pic_0, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x00c4, 0x00c7).rw(m_pic_1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x00c8, 0x00cf).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x00c8, 0x00cf).w(this, FUNC(isbc_state::upperen_w)).umask16(0xff00); + map(0x00c8, 0x00cf).w(FUNC(isbc_state::upperen_w)).umask16(0xff00); map(0x00d0, 0x00d7).rw("pit", FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask16(0x00ff); map(0x00d8, 0x00df).rw(m_uart8274, FUNC(i8274_new_device::cd_ba_r), FUNC(i8274_new_device::cd_ba_w)).umask16(0x00ff); map(0x0100, 0x0100).w("isbc_215g", FUNC(isbc_215g_device::write)); @@ -214,7 +214,7 @@ void isbc_state::isbc2861_mem(address_map &map) { map.unmap_value_high(); map(0x00000, 0xdffff).ram(); - map(0xe0000, 0xfffff).rw(this, FUNC(isbc_state::bioslo_r), FUNC(isbc_state::bioslo_w)).share("biosram"); + map(0xe0000, 0xfffff).rw(FUNC(isbc_state::bioslo_r), FUNC(isbc_state::bioslo_w)).share("biosram"); // AM_RANGE(0x100000, 0x1fffff) AM_RAM // FIXME: XENIX doesn't like this, IRMX is okay with it map(0xff0000, 0xffffff).rom().region("user1", 0); } @@ -483,8 +483,8 @@ MACHINE_CONFIG_START(isbc_state::isbc286) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, isbc_state, isbc286_tmr2_w)) MCFG_DEVICE_ADD("ppi", I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) - MCFG_I8255_IN_PORTB_CB(READ8("cent_status_in", input_buffer_device, read)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) + MCFG_I8255_IN_PORTB_CB(READ8("cent_status_in", input_buffer_device, bus_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, isbc_state, ppi_c_w)) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp index 7f6fe9b2f9e..d4fbdab5bcf 100644 --- a/src/mame/drivers/istellar.cpp +++ b/src/mame/drivers/istellar.cpp @@ -154,7 +154,7 @@ void istellar_state::z80_2_mem(address_map &map) { map(0x0000, 0x17ff).rom(); map(0x1800, 0x1fff).ram(); - map(0xc000, 0xc000).r(this, FUNC(istellar_state::z80_2_unknown_read)); /* Seems to be thrown away every time it's read - maybe interrupt related? */ + map(0xc000, 0xc000).r(FUNC(istellar_state::z80_2_unknown_read)); /* Seems to be thrown away every time it's read - maybe interrupt related? */ } @@ -180,7 +180,7 @@ void istellar_state::z80_1_io(address_map &map) void istellar_state::z80_2_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(istellar_state::z80_2_ldp_read), FUNC(istellar_state::z80_2_ldp_write)); + map(0x00, 0x00).rw(FUNC(istellar_state::z80_2_ldp_read), FUNC(istellar_state::z80_2_ldp_write)); map(0x01, 0x01).r("latch2", FUNC(generic_latch_8_device::read)).w("latch1", FUNC(generic_latch_8_device::write)); map(0x02, 0x02).r("latch2", FUNC(generic_latch_8_device::acknowledge_r)); /* AM_RANGE(0x03,0x03) AM_WRITE(z80_2_ldtrans_write)*/ diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp index 38d2875b402..12558aabdc1 100644 --- a/src/mame/drivers/istrebiteli.cpp +++ b/src/mame/drivers/istrebiteli.cpp @@ -380,20 +380,20 @@ void istrebiteli_state::io_map(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xb0, 0xbf).w(this, FUNC(istrebiteli_state::tileram_w)); - map(0xc0, 0xc3).rw(this, FUNC(istrebiteli_state::ppi0_r), FUNC(istrebiteli_state::ppi0_w)); - map(0xc4, 0xc7).rw(this, FUNC(istrebiteli_state::ppi1_r), FUNC(istrebiteli_state::ppi1_w)); - map(0xc8, 0xcf).w(this, FUNC(istrebiteli_state::spr_xy_w)); + map(0xb0, 0xbf).w(FUNC(istrebiteli_state::tileram_w)); + map(0xc0, 0xc3).rw(FUNC(istrebiteli_state::ppi0_r), FUNC(istrebiteli_state::ppi0_w)); + map(0xc4, 0xc7).rw(FUNC(istrebiteli_state::ppi1_r), FUNC(istrebiteli_state::ppi1_w)); + map(0xc8, 0xcf).w(FUNC(istrebiteli_state::spr_xy_w)); } void istrebiteli_state::moto_io_map(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x30, 0x37).w(this, FUNC(istrebiteli_state::moto_spr_xy_w)); + map(0x30, 0x37).w(FUNC(istrebiteli_state::moto_spr_xy_w)); map(0x38, 0x3b).rw(m_ppi0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x3c, 0x3f).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x40, 0x4f).w(this, FUNC(istrebiteli_state::moto_tileram_w)); + map(0x40, 0x4f).w(FUNC(istrebiteli_state::moto_tileram_w)); } CUSTOM_INPUT_MEMBER(istrebiteli_state::collision_r) diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp index 1568eeaf09c..b3d6352ef5a 100644 --- a/src/mame/drivers/itech32.cpp +++ b/src/mame/drivers/itech32.cpp @@ -903,14 +903,14 @@ void itech32_state::timekill_map(address_map &map) map(0x000000, 0x003fff).ram().share("nvram"); map(0x040000, 0x040001).portr("P1"); map(0x048000, 0x048001).portr("P2"); - map(0x050000, 0x050001).portr("SYSTEM").w(this, FUNC(itech32_state::timekill_intensity_w)); + map(0x050000, 0x050001).portr("SYSTEM").w(FUNC(itech32_state::timekill_intensity_w)); map(0x058000, 0x058001).portr("DIPS").w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x060000, 0x060001).w(this, FUNC(itech32_state::timekill_colora_w)); - map(0x068000, 0x068001).w(this, FUNC(itech32_state::timekill_colorbc_w)); + map(0x060000, 0x060001).w(FUNC(itech32_state::timekill_colora_w)); + map(0x068000, 0x068001).w(FUNC(itech32_state::timekill_colorbc_w)); map(0x070000, 0x070001).nopw(); /* noisy */ - map(0x078000, 0x078001).w(this, FUNC(itech32_state::sound_data_w)); - map(0x080000, 0x08007f).rw(this, FUNC(itech32_state::itech32_video_r), FUNC(itech32_state::itech32_video_w)).share("video"); - map(0x0a0000, 0x0a0001).w(this, FUNC(itech32_state::int1_ack_w)); + map(0x078000, 0x078001).w(FUNC(itech32_state::sound_data_w)); + map(0x080000, 0x08007f).rw(FUNC(itech32_state::itech32_video_r), FUNC(itech32_state::itech32_video_w)).share("video"); + map(0x0a0000, 0x0a0001).w(FUNC(itech32_state::int1_ack_w)); map(0x0c0000, 0x0c7fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x100000, 0x17ffff).rom().region("user1", 0).share("main_rom"); } @@ -920,18 +920,18 @@ void itech32_state::timekill_map(address_map &map) void itech32_state::bloodstm_map(address_map &map) { map(0x000000, 0x00ffff).ram().share("nvram"); - map(0x080000, 0x080001).portr("P1").w(this, FUNC(itech32_state::int1_ack_w)); + map(0x080000, 0x080001).portr("P1").w(FUNC(itech32_state::int1_ack_w)); map(0x100000, 0x100001).portr("P2"); map(0x180000, 0x180001).portr("P3"); map(0x200000, 0x200001).portr("P4").w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x280000, 0x280001).portr("DIPS"); - map(0x300000, 0x300001).w(this, FUNC(itech32_state::bloodstm_color1_w)); - map(0x380000, 0x380001).w(this, FUNC(itech32_state::bloodstm_color2_w)); + map(0x300000, 0x300001).w(FUNC(itech32_state::bloodstm_color1_w)); + map(0x380000, 0x380001).w(FUNC(itech32_state::bloodstm_color2_w)); map(0x400000, 0x400001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x480000, 0x480001).w(this, FUNC(itech32_state::sound_data_w)); - map(0x500000, 0x5000ff).rw(this, FUNC(itech32_state::bloodstm_video_r), FUNC(itech32_state::bloodstm_video_w)).share("video"); - map(0x580000, 0x59ffff).ram().w(this, FUNC(itech32_state::bloodstm_paletteram_w)).share("palette"); - map(0x700000, 0x700001).w(this, FUNC(itech32_state::bloodstm_plane_w)); + map(0x480000, 0x480001).w(FUNC(itech32_state::sound_data_w)); + map(0x500000, 0x5000ff).rw(FUNC(itech32_state::bloodstm_video_r), FUNC(itech32_state::bloodstm_video_w)).share("video"); + map(0x580000, 0x59ffff).ram().w(FUNC(itech32_state::bloodstm_paletteram_w)).share("palette"); + map(0x700000, 0x700001).w(FUNC(itech32_state::bloodstm_plane_w)); map(0x780000, 0x780001).portr("EXTRA"); map(0x800000, 0x87ffff).mirror(0x780000).rom().region("user1", 0).share("main_rom"); } @@ -982,27 +982,27 @@ void itech32_state::drivedge_map(address_map &map) { map(0x000000, 0x03ffff).mirror(0x40000).ram().share("nvram"); #if LOG_DRIVEDGE_UNINIT_RAM -map(0x000100, 0x0003ff).mirror(0x40000).rw(this, FUNC(itech32_state::test1_r), FUNC(itech32_state::test1_w)); -map(0x000c00, 0x007fff).mirror(0x40000).rw(this, FUNC(itech32_state::test2_r), FUNC(itech32_state::test2_w)); +map(0x000100, 0x0003ff).mirror(0x40000).rw(FUNC(itech32_state::test1_r), FUNC(itech32_state::test1_w)); +map(0x000c00, 0x007fff).mirror(0x40000).rw(FUNC(itech32_state::test2_r), FUNC(itech32_state::test2_w)); #endif map(0x080000, 0x080003).portr("80000"); map(0x082000, 0x082003).portr("82000"); - map(0x084000, 0x084003).rw(this, FUNC(itech32_state::sound_data32_r), FUNC(itech32_state::sound_data32_w)); + map(0x084000, 0x084003).rw(FUNC(itech32_state::sound_data32_r), FUNC(itech32_state::sound_data32_w)); // AM_RANGE(0x086000, 0x08623f) AM_RAM -- networking -- first 0x40 bytes = our data, next 0x40*8 bytes = their data, r/w on IRQ2 - map(0x088000, 0x088003).r(this, FUNC(itech32_state::drivedge_steering_r)); - map(0x08a000, 0x08a003).r(this, FUNC(itech32_state::drivedge_gas_r)).nopw(); + map(0x088000, 0x088003).r(FUNC(itech32_state::drivedge_steering_r)); + map(0x08a000, 0x08a003).r(FUNC(itech32_state::drivedge_gas_r)).nopw(); map(0x08c000, 0x08c003).portr("8c000"); map(0x08e000, 0x08e003).portr("8e000").nopw(); - map(0x100000, 0x10000f).w(this, FUNC(itech32_state::drivedge_zbuf_control_w)).share("drivedge_zctl"); - map(0x180000, 0x180003).w(this, FUNC(itech32_state::drivedge_color0_w)); + map(0x100000, 0x10000f).w(FUNC(itech32_state::drivedge_zbuf_control_w)).share("drivedge_zctl"); + map(0x180000, 0x180003).w(FUNC(itech32_state::drivedge_color0_w)); map(0x1a0000, 0x1bffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x1c0000, 0x1c0003).nopw(); - map(0x1e0000, 0x1e0113).rw(this, FUNC(itech32_state::itech020_video_r), FUNC(itech32_state::itech020_video_w)).share("video"); - map(0x1e4000, 0x1e4003).w(this, FUNC(itech32_state::tms_reset_assert_w)); - map(0x1ec000, 0x1ec003).w(this, FUNC(itech32_state::tms_reset_clear_w)); + map(0x1e0000, 0x1e0113).rw(FUNC(itech32_state::itech020_video_r), FUNC(itech32_state::itech020_video_w)).share("video"); + map(0x1e4000, 0x1e4003).w(FUNC(itech32_state::tms_reset_assert_w)); + map(0x1ec000, 0x1ec003).w(FUNC(itech32_state::tms_reset_clear_w)); map(0x200000, 0x200003).portr("200000"); - map(0x280000, 0x280fff).ram().w(this, FUNC(itech32_state::tms1_68k_ram_w)).share("tms1_ram"); - map(0x300000, 0x300fff).ram().w(this, FUNC(itech32_state::tms2_68k_ram_w)).share("tms2_ram"); + map(0x280000, 0x280fff).ram().w(FUNC(itech32_state::tms1_68k_ram_w)).share("tms1_ram"); + map(0x300000, 0x300fff).ram().w(FUNC(itech32_state::tms2_68k_ram_w)).share("tms2_ram"); map(0x380000, 0x380003).nopw(); // AM_DEVWRITE("watchdog", watchdog_timer_device, reset16_w) map(0x600000, 0x607fff).rom().region("user1", 0).share("main_rom"); } @@ -1010,13 +1010,13 @@ map(0x000c00, 0x007fff).mirror(0x40000).rw(this, FUNC(itech32_state::test2_r), F void itech32_state::drivedge_tms1_map(address_map &map) { map(0x000000, 0x001fff).ram().share("tms1_boot"); - map(0x008000, 0x0083ff).mirror(0x400).ram().w(this, FUNC(itech32_state::tms1_trigger_w)).share("tms1_ram"); + map(0x008000, 0x0083ff).mirror(0x400).ram().w(FUNC(itech32_state::tms1_trigger_w)).share("tms1_ram"); map(0x080000, 0x0bffff).ram(); } void itech32_state::drivedge_tms2_map(address_map &map) { - map(0x000000, 0x0003ff).mirror(0x8400).ram().w(this, FUNC(itech32_state::tms2_trigger_w)).share("tms2_ram"); + map(0x000000, 0x0003ff).mirror(0x8400).ram().w(FUNC(itech32_state::tms2_trigger_w)).share("tms2_ram"); map(0x080000, 0x08ffff).ram(); } @@ -1025,23 +1025,23 @@ void itech32_state::drivedge_tms2_map(address_map &map) void itech32_state::itech020_map(address_map &map) { map(0x000000, 0x007fff).ram().share("main_ram"); - map(0x080000, 0x080003).portr("P1").w(this, FUNC(itech32_state::int1_ack32_w)); + map(0x080000, 0x080003).portr("P1").w(FUNC(itech32_state::int1_ack32_w)); map(0x100000, 0x100003).portr("P2"); map(0x180000, 0x180003).portr("P3"); map(0x200000, 0x200003).portr("P4"); map(0x280000, 0x280003).portr("DIPS"); - map(0x300000, 0x300003).w(this, FUNC(itech32_state::itech020_color1_w)); - map(0x380000, 0x380003).w(this, FUNC(itech32_state::itech020_color2_w)); + map(0x300000, 0x300003).w(FUNC(itech32_state::itech020_color1_w)); + map(0x380000, 0x380003).w(FUNC(itech32_state::itech020_color2_w)); map(0x400000, 0x400003).w("watchdog", FUNC(watchdog_timer_device::reset32_w)); - map(0x480000, 0x480003).w(this, FUNC(itech32_state::sound_data32_w)); - map(0x500000, 0x5000ff).rw(this, FUNC(itech32_state::itech020_video_r), FUNC(itech32_state::itech020_video_w)).share("video"); + map(0x480000, 0x480003).w(FUNC(itech32_state::sound_data32_w)); + map(0x500000, 0x5000ff).rw(FUNC(itech32_state::itech020_video_r), FUNC(itech32_state::itech020_video_w)).share("video"); map(0x578000, 0x57ffff).nopr(); /* touched by protection */ map(0x580000, 0x59ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x600000, 0x603fff).ram().share("nvram"); /* ? */ map(0x61ff00, 0x61ffff).nopw(); /* Unknown Writes */ - map(0x680000, 0x680003).r(this, FUNC(itech32_state::itech020_prot_result_r)).nopw(); + map(0x680000, 0x680003).r(FUNC(itech32_state::itech020_prot_result_r)).nopw(); /* ! */ map(0x680800, 0x68083f).readonly().nopw(); /* Serial DUART Channel A/B & Top LED sign - To Do! */ - map(0x700000, 0x700003).w(this, FUNC(itech32_state::itech020_plane_w)); + map(0x700000, 0x700003).w(FUNC(itech32_state::itech020_plane_w)); map(0x800000, 0xbfffff).rom().region("user1", 0).share("main_rom"); } @@ -1056,10 +1056,10 @@ void itech32_state::itech020_map(address_map &map) /*------ Rev 1 sound board memory layout ------*/ void itech32_state::sound_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(itech32_state::sound_return_w)); - map(0x0400, 0x0400).r(this, FUNC(itech32_state::sound_data_r)); + map(0x0000, 0x0000).w(FUNC(itech32_state::sound_return_w)); + map(0x0400, 0x0400).r(FUNC(itech32_state::sound_data_r)); map(0x0800, 0x083f).mirror(0x80).rw("ensoniq", FUNC(es5506_device::read), FUNC(es5506_device::write)); - map(0x0c00, 0x0c00).w(this, FUNC(itech32_state::sound_bank_w)); + map(0x0c00, 0x0c00).w(FUNC(itech32_state::sound_bank_w)); map(0x1000, 0x1000).nopw(); /* noisy */ map(0x1400, 0x140f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0x2000, 0x3fff).ram(); @@ -1071,11 +1071,11 @@ void itech32_state::sound_map(address_map &map) /*------ Rev 2 sound board memory layout ------*/ void itech32_state::sound_020_map(address_map &map) { - map(0x0000, 0x0000).mirror(0x400).r(this, FUNC(itech32_state::sound_data_r)); + map(0x0000, 0x0000).mirror(0x400).r(FUNC(itech32_state::sound_data_r)); map(0x0800, 0x083f).mirror(0x80).rw("ensoniq", FUNC(es5506_device::read), FUNC(es5506_device::write)); - map(0x0c00, 0x0c00).w(this, FUNC(itech32_state::sound_bank_w)); - map(0x1400, 0x1400).w(this, FUNC(itech32_state::firq_clear_w)); - map(0x1800, 0x1800).r(this, FUNC(itech32_state::sound_data_buffer_r)).nopw(); + map(0x0c00, 0x0c00).w(FUNC(itech32_state::sound_bank_w)); + map(0x1400, 0x1400).w(FUNC(itech32_state::firq_clear_w)); + map(0x1800, 0x1800).r(FUNC(itech32_state::sound_data_buffer_r)).nopw(); map(0x2000, 0x3fff).ram(); map(0x4000, 0x7fff).bankr("soundbank"); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index 35ce958e8a5..7797eea896d 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -869,15 +869,15 @@ WRITE8_MEMBER(itech8_state::ninclown_palette_w) /*------ common layout with TMS34061 at 0000 ------*/ void itech8_state::tmslo_map(address_map &map) { - map(0x0000, 0x0fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); + map(0x0000, 0x0fff).rw(FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); map(0x1100, 0x1100).nopw(); - map(0x1120, 0x1120).w(this, FUNC(itech8_state::sound_data_w)); - map(0x1140, 0x1140).portr("40").w(this, FUNC(itech8_state::grom_bank_w)); - map(0x1160, 0x1160).portr("60").w(this, FUNC(itech8_state::page_w)); + map(0x1120, 0x1120).w(FUNC(itech8_state::sound_data_w)); + map(0x1140, 0x1140).portr("40").w(FUNC(itech8_state::grom_bank_w)); + map(0x1160, 0x1160).portr("60").w(FUNC(itech8_state::page_w)); map(0x1180, 0x1180).portr("80").w(m_tms34061, FUNC(tms34061_device::latch_w)); - map(0x11a0, 0x11a0).w(this, FUNC(itech8_state::nmi_ack_w)); - map(0x11c0, 0x11df).r(this, FUNC(itech8_state::blitter_r)).w(this, FUNC(itech8_state::blitter_bank_w)); - map(0x11e0, 0x11ff).w(this, FUNC(itech8_state::palette_w)); + map(0x11a0, 0x11a0).w(FUNC(itech8_state::nmi_ack_w)); + map(0x11c0, 0x11df).r(FUNC(itech8_state::blitter_r)).w(FUNC(itech8_state::blitter_bank_w)); + map(0x11e0, 0x11ff).w(FUNC(itech8_state::palette_w)); map(0x2000, 0x3fff).ram().share("nvram"); map(0x4000, 0xffff).bankr("bank1"); } @@ -886,15 +886,15 @@ void itech8_state::tmslo_map(address_map &map) /*------ common layout with TMS34061 at 1000 ------*/ void itech8_state::tmshi_map(address_map &map) { - map(0x1000, 0x1fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); + map(0x1000, 0x1fff).rw(FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); map(0x0100, 0x0100).nopw(); - map(0x0120, 0x0120).w(this, FUNC(itech8_state::sound_data_w)); - map(0x0140, 0x0140).portr("40").w(this, FUNC(itech8_state::grom_bank_w)); - map(0x0160, 0x0160).portr("60").w(this, FUNC(itech8_state::page_w)); + map(0x0120, 0x0120).w(FUNC(itech8_state::sound_data_w)); + map(0x0140, 0x0140).portr("40").w(FUNC(itech8_state::grom_bank_w)); + map(0x0160, 0x0160).portr("60").w(FUNC(itech8_state::page_w)); map(0x0180, 0x0180).portr("80").w(m_tms34061, FUNC(tms34061_device::latch_w)); - map(0x01a0, 0x01a0).w(this, FUNC(itech8_state::nmi_ack_w)); - map(0x01c0, 0x01df).r(this, FUNC(itech8_state::blitter_r)).w(this, FUNC(itech8_state::blitter_bank_w)); - map(0x01e0, 0x01ff).w(this, FUNC(itech8_state::palette_w)); + map(0x01a0, 0x01a0).w(FUNC(itech8_state::nmi_ack_w)); + map(0x01c0, 0x01df).r(FUNC(itech8_state::blitter_r)).w(FUNC(itech8_state::blitter_bank_w)); + map(0x01e0, 0x01ff).w(FUNC(itech8_state::palette_w)); map(0x2000, 0x3fff).ram().share("nvram"); map(0x4000, 0xffff).bankr("bank1"); } @@ -903,15 +903,15 @@ void itech8_state::tmshi_map(address_map &map) /*------ Golden Tee Golf II 1992 layout ------*/ void itech8_state::gtg2_map(address_map &map) { - map(0x0100, 0x0100).portr("40").w(this, FUNC(itech8_state::nmi_ack_w)); - map(0x0120, 0x0120).portr("60").w(this, FUNC(itech8_state::page_w)); - map(0x0140, 0x015f).w(this, FUNC(itech8_state::palette_w)); + map(0x0100, 0x0100).portr("40").w(FUNC(itech8_state::nmi_ack_w)); + map(0x0120, 0x0120).portr("60").w(FUNC(itech8_state::page_w)); + map(0x0140, 0x015f).w(FUNC(itech8_state::palette_w)); map(0x0140, 0x0140).portr("80"); - map(0x0160, 0x0160).w(this, FUNC(itech8_state::grom_bank_w)); - map(0x0180, 0x019f).r(this, FUNC(itech8_state::blitter_r)).w(this, FUNC(itech8_state::blitter_bank_w)); - map(0x01c0, 0x01c0).w(this, FUNC(itech8_state::gtg2_sound_data_w)); + map(0x0160, 0x0160).w(FUNC(itech8_state::grom_bank_w)); + map(0x0180, 0x019f).r(FUNC(itech8_state::blitter_r)).w(FUNC(itech8_state::blitter_bank_w)); + map(0x01c0, 0x01c0).w(FUNC(itech8_state::gtg2_sound_data_w)); map(0x01e0, 0x01e0).w(m_tms34061, FUNC(tms34061_device::latch_w)); - map(0x1000, 0x1fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); + map(0x1000, 0x1fff).rw(FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); map(0x2000, 0x3fff).ram().share("nvram"); map(0x4000, 0xffff).bankr("bank1"); } @@ -922,15 +922,15 @@ void itech8_state::ninclown_map(address_map &map) map(0x000000, 0x00007f).ram().region("maincpu", 0); map(0x000080, 0x003fff).ram().share("nvram"); map(0x004000, 0x03ffff).rom(); - map(0x040000, 0x07ffff).r(this, FUNC(itech8_state::rom_constant_r)); - map(0x100080, 0x100080).w(this, FUNC(itech8_state::sound_data_w)); - map(0x100100, 0x100101).portr("40").w(this, FUNC(itech8_state::grom_bank16_w)); - map(0x100180, 0x100181).portr("60").w(this, FUNC(itech8_state::display_page16_w)); + map(0x040000, 0x07ffff).r(FUNC(itech8_state::rom_constant_r)); + map(0x100080, 0x100080).w(FUNC(itech8_state::sound_data_w)); + map(0x100100, 0x100101).portr("40").w(FUNC(itech8_state::grom_bank16_w)); + map(0x100180, 0x100181).portr("60").w(FUNC(itech8_state::display_page16_w)); map(0x100240, 0x100240).w(m_tms34061, FUNC(tms34061_device::latch_w)); map(0x100280, 0x100281).portr("80").nopw(); - map(0x100300, 0x10031f).rw(this, FUNC(itech8_state::blitter_r), FUNC(itech8_state::blitter_w)); - map(0x100380, 0x1003ff).rw(this, FUNC(itech8_state::ninclown_palette_r), FUNC(itech8_state::ninclown_palette_w)).umask16(0xff00); - map(0x110000, 0x110fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); + map(0x100300, 0x10031f).rw(FUNC(itech8_state::blitter_r), FUNC(itech8_state::blitter_w)); + map(0x100380, 0x1003ff).rw(FUNC(itech8_state::ninclown_palette_r), FUNC(itech8_state::ninclown_palette_w)).umask16(0xff00); + map(0x110000, 0x110fff).rw(FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); } @@ -945,7 +945,7 @@ void itech8_state::ninclown_map(address_map &map) void itech8_state::sound2203_map(address_map &map) { map(0x0000, 0x0000).nopw(); - map(0x1000, 0x1000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x1000, 0x1000).r(FUNC(itech8_state::sound_data_r)); map(0x2000, 0x2001).mirror(0x0002).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0x3000, 0x37ff).ram(); map(0x4000, 0x4000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -957,7 +957,7 @@ void itech8_state::sound2203_map(address_map &map) void itech8_state::sound2608b_map(address_map &map) { map(0x1000, 0x1000).nopw(); - map(0x2000, 0x2000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x2000, 0x2000).r(FUNC(itech8_state::sound_data_r)); map(0x4000, 0x4003).rw("ymsnd", FUNC(ym2608_device::read), FUNC(ym2608_device::write)); map(0x6000, 0x67ff).ram(); map(0x8000, 0xffff).rom(); @@ -968,7 +968,7 @@ void itech8_state::sound2608b_map(address_map &map) void itech8_state::sound3812_map(address_map &map) { map(0x0000, 0x0000).nopw(); - map(0x1000, 0x1000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x1000, 0x1000).r(FUNC(itech8_state::sound_data_r)); map(0x2000, 0x2001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x3000, 0x37ff).ram(); map(0x4000, 0x4000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -981,7 +981,7 @@ void itech8_state::sound3812_map(address_map &map) void itech8_state::sound3812_external_map(address_map &map) { map(0x0000, 0x0000).nopw(); - map(0x1000, 0x1000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x1000, 0x1000).r(FUNC(itech8_state::sound_data_r)); map(0x2000, 0x2001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x3000, 0x37ff).ram(); map(0x4000, 0x4000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -1006,7 +1006,7 @@ void itech8_state::slikz80_mem_map(address_map &map) void itech8_state::slikz80_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(itech8_state::slikz80_port_r), FUNC(itech8_state::slikz80_port_w)); + map(0x00, 0x00).rw(FUNC(itech8_state::slikz80_port_r), FUNC(itech8_state::slikz80_port_w)); } diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index aa8befe2552..5de12713707 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -310,11 +310,11 @@ void itt3030_state::itt3030_io(address_map &map) map.global_mask(0xff); map(0x20, 0x2f).rw(m_crtc, FUNC(crt5027_device::read), FUNC(crt5027_device::write)); map(0x30, 0x31).rw(m_kbdmcu, FUNC(i8741_device::upi41_master_r), FUNC(i8741_device::upi41_master_w)); - map(0x32, 0x32).w(this, FUNC(itt3030_state::beep_w)); - map(0x35, 0x35).r(this, FUNC(itt3030_state::vsync_r)); - map(0x50, 0x53).rw(this, FUNC(itt3030_state::fdc_r), FUNC(itt3030_state::fdc_w)); - map(0x54, 0x54).rw(this, FUNC(itt3030_state::fdc_stat_r), FUNC(itt3030_state::fdc_cmd_w)); - map(0xf6, 0xf6).w(this, FUNC(itt3030_state::bank_w)); + map(0x32, 0x32).w(FUNC(itt3030_state::beep_w)); + map(0x35, 0x35).r(FUNC(itt3030_state::vsync_r)); + map(0x50, 0x53).rw(FUNC(itt3030_state::fdc_r), FUNC(itt3030_state::fdc_w)); + map(0x54, 0x54).rw(FUNC(itt3030_state::fdc_stat_r), FUNC(itt3030_state::fdc_cmd_w)); + map(0xf6, 0xf6).w(FUNC(itt3030_state::bank_w)); } diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp index d4953a3f7aa..d199e292b00 100644 --- a/src/mame/drivers/jack.cpp +++ b/src/mame/drivers/jack.cpp @@ -189,10 +189,10 @@ void jack_state::jack_map(address_map &map) map(0xb503, 0xb503).portr("IN1"); map(0xb504, 0xb504).portr("IN2"); map(0xb505, 0xb505).portr("IN3"); - map(0xb506, 0xb507).rw(this, FUNC(jack_state::jack_flipscreen_r), FUNC(jack_state::jack_flipscreen_w)); + map(0xb506, 0xb507).rw(FUNC(jack_state::jack_flipscreen_r), FUNC(jack_state::jack_flipscreen_w)); map(0xb600, 0xb61f).w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xb800, 0xbbff).ram().w(this, FUNC(jack_state::jack_videoram_w)).share("videoram"); - map(0xbc00, 0xbfff).ram().w(this, FUNC(jack_state::jack_colorram_w)).share("colorram"); + map(0xb800, 0xbbff).ram().w(FUNC(jack_state::jack_videoram_w)).share("videoram"); + map(0xbc00, 0xbfff).ram().w(FUNC(jack_state::jack_colorram_w)).share("colorram"); map(0xc000, 0xffff).rom(); } @@ -205,7 +205,7 @@ void jack_state::striv_map(address_map &map) { jack_map(map); map(0xb000, 0xb0ff).nopw(); - map(0xc000, 0xcfff).r(this, FUNC(jack_state::striv_question_r)); + map(0xc000, 0xcfff).r(FUNC(jack_state::striv_question_r)); } @@ -214,17 +214,17 @@ void jack_state::joinem_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); map(0xb000, 0xb07f).ram().share("spriteram"); - map(0xb080, 0xb0ff).ram().w(this, FUNC(jack_state::joinem_scroll_w)).share("scrollram"); + map(0xb080, 0xb0ff).ram().w(FUNC(jack_state::joinem_scroll_w)).share("scrollram"); map(0xb400, 0xb400).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xb500, 0xb500).portr("DSW1"); map(0xb501, 0xb501).portr("DSW2"); map(0xb502, 0xb502).portr("IN0"); map(0xb503, 0xb503).portr("IN1"); map(0xb504, 0xb504).portr("IN2"); - map(0xb506, 0xb507).rw(this, FUNC(jack_state::jack_flipscreen_r), FUNC(jack_state::jack_flipscreen_w)); - map(0xb700, 0xb700).w(this, FUNC(jack_state::joinem_control_w)); - map(0xb800, 0xbbff).ram().w(this, FUNC(jack_state::jack_videoram_w)).share("videoram"); - map(0xbc00, 0xbfff).ram().w(this, FUNC(jack_state::jack_colorram_w)).share("colorram"); + map(0xb506, 0xb507).rw(FUNC(jack_state::jack_flipscreen_r), FUNC(jack_state::jack_flipscreen_w)); + map(0xb700, 0xb700).w(FUNC(jack_state::joinem_control_w)); + map(0xb800, 0xbbff).ram().w(FUNC(jack_state::jack_videoram_w)).share("videoram"); + map(0xbc00, 0xbfff).ram().w(FUNC(jack_state::jack_colorram_w)).share("colorram"); } void jack_state::unclepoo_map(address_map &map) diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp index 7f29d8a154c..0154c98fa45 100644 --- a/src/mame/drivers/jackal.cpp +++ b/src/mame/drivers/jackal.cpp @@ -165,19 +165,19 @@ WRITE8_MEMBER(jackal_state::jackal_spriteram_w) void jackal_state::master_map(address_map &map) { map(0x0000, 0x0003).ram().share("videoctrl"); // scroll + other things - map(0x0004, 0x0004).w(this, FUNC(jackal_state::jackal_flipscreen_w)); + map(0x0004, 0x0004).w(FUNC(jackal_state::jackal_flipscreen_w)); map(0x0010, 0x0010).portr("DSW1"); map(0x0011, 0x0011).portr("IN1"); map(0x0012, 0x0012).portr("IN2"); map(0x0013, 0x0013).portr("IN0"); - map(0x0014, 0x0015).r(this, FUNC(jackal_state::jackalr_rotary_r)); + map(0x0014, 0x0015).r(FUNC(jackal_state::jackalr_rotary_r)); map(0x0018, 0x0018).portr("DSW2"); map(0x0019, 0x0019).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x001c, 0x001c).w(this, FUNC(jackal_state::jackal_rambank_w)); - map(0x0020, 0x005f).rw(this, FUNC(jackal_state::jackal_zram_r), FUNC(jackal_state::jackal_zram_w)); // MAIN Z RAM,SUB Z RAM + map(0x001c, 0x001c).w(FUNC(jackal_state::jackal_rambank_w)); + map(0x0020, 0x005f).rw(FUNC(jackal_state::jackal_zram_r), FUNC(jackal_state::jackal_zram_w)); // MAIN Z RAM,SUB Z RAM map(0x0060, 0x1fff).ram().share("share1"); // M COMMON RAM,S COMMON RAM - map(0x2000, 0x2fff).rw(this, FUNC(jackal_state::jackal_voram_r), FUNC(jackal_state::jackal_voram_w)); // MAIN V O RAM,SUB V O RAM - map(0x3000, 0x3fff).rw(this, FUNC(jackal_state::jackal_spriteram_r), FUNC(jackal_state::jackal_spriteram_w)); // MAIN V O RAM,SUB V O RAM + map(0x2000, 0x2fff).rw(FUNC(jackal_state::jackal_voram_r), FUNC(jackal_state::jackal_voram_w)); // MAIN V O RAM,SUB V O RAM + map(0x3000, 0x3fff).rw(FUNC(jackal_state::jackal_spriteram_r), FUNC(jackal_state::jackal_spriteram_w)); // MAIN V O RAM,SUB V O RAM map(0x4000, 0xbfff).bankr("bank1"); map(0xc000, 0xffff).rom(); } diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index f8d4e869d3c..a385c907104 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -406,12 +406,12 @@ void jackie_state::jackie_prg_map(address_map &map) void jackie_state::jackie_io_map(address_map &map) { - map(0x0520, 0x0524).w(this, FUNC(jackie_state::unk_reg1_lo_w)); - map(0x0d20, 0x0d24).w(this, FUNC(jackie_state::unk_reg1_hi_w)); - map(0x0560, 0x0564).w(this, FUNC(jackie_state::unk_reg2_lo_w)); - map(0x0d60, 0x0d64).w(this, FUNC(jackie_state::unk_reg2_hi_w)); - map(0x05a0, 0x05a4).w(this, FUNC(jackie_state::unk_reg3_lo_w)); - map(0x0da0, 0x0da4).w(this, FUNC(jackie_state::unk_reg3_hi_w)); + map(0x0520, 0x0524).w(FUNC(jackie_state::unk_reg1_lo_w)); + map(0x0d20, 0x0d24).w(FUNC(jackie_state::unk_reg1_hi_w)); + map(0x0560, 0x0564).w(FUNC(jackie_state::unk_reg2_lo_w)); + map(0x0d60, 0x0d64).w(FUNC(jackie_state::unk_reg2_hi_w)); + map(0x05a0, 0x05a4).w(FUNC(jackie_state::unk_reg3_lo_w)); + map(0x0da0, 0x0da4).w(FUNC(jackie_state::unk_reg3_hi_w)); map(0x1000, 0x1107).ram().share("bg_scroll2"); map(0x2000, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2800, 0x2fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); @@ -424,14 +424,14 @@ void jackie_state::jackie_io_map(address_map &map) map(0x5090, 0x5093).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x50a0, 0x50a0).portr("BUTTONS2"); map(0x50b0, 0x50b1).w("ymsnd", FUNC(ym2413_device::write)); - map(0x50c0, 0x50c0).r(this, FUNC(jackie_state::igs_irqack_r)).w(this, FUNC(jackie_state::igs_irqack_w)); - map(0x6000, 0x60ff).ram().w(this, FUNC(jackie_state::bg_scroll_w)).share("bg_scroll"); - map(0x6800, 0x69ff).ram().w(this, FUNC(jackie_state::reel1_ram_w)).share("reel1_ram"); - map(0x6a00, 0x6bff).ram().w(this, FUNC(jackie_state::reel2_ram_w)).share("reel2_ram"); - map(0x6c00, 0x6dff).ram().w(this, FUNC(jackie_state::reel3_ram_w)).share("reel3_ram"); - map(0x7000, 0x77ff).ram().w(this, FUNC(jackie_state::fg_tile_w)).share("fg_tile_ram"); - map(0x7800, 0x7fff).ram().w(this, FUNC(jackie_state::fg_color_w)).share("fg_color_ram"); - map(0x8000, 0xffff).r(this, FUNC(jackie_state::expram_r)); + map(0x50c0, 0x50c0).r(FUNC(jackie_state::igs_irqack_r)).w(FUNC(jackie_state::igs_irqack_w)); + map(0x6000, 0x60ff).ram().w(FUNC(jackie_state::bg_scroll_w)).share("bg_scroll"); + map(0x6800, 0x69ff).ram().w(FUNC(jackie_state::reel1_ram_w)).share("reel1_ram"); + map(0x6a00, 0x6bff).ram().w(FUNC(jackie_state::reel2_ram_w)).share("reel2_ram"); + map(0x6c00, 0x6dff).ram().w(FUNC(jackie_state::reel3_ram_w)).share("reel3_ram"); + map(0x7000, 0x77ff).ram().w(FUNC(jackie_state::fg_tile_w)).share("fg_tile_ram"); + map(0x7800, 0x7fff).ram().w(FUNC(jackie_state::fg_color_w)).share("fg_color_ram"); + map(0x8000, 0xffff).r(FUNC(jackie_state::expram_r)); } CUSTOM_INPUT_MEMBER(jackie_state::hopper_r) diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp index f72733550d5..e2da694eefd 100644 --- a/src/mame/drivers/jackpool.cpp +++ b/src/mame/drivers/jackpool.cpp @@ -147,7 +147,7 @@ void jackpool_state::jackpool_mem(address_map &map) map(0x348000, 0x34ffff).ram(); //<- vram banks 2 & 3? map(0x360000, 0x3603ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x380000, 0x38002f).r(this, FUNC(jackpool_state::jackpool_io_r)).umask16(0x00ff); + map(0x380000, 0x38002f).r(FUNC(jackpool_state::jackpool_io_r)).umask16(0x00ff); map(0x380030, 0x38003f).w("latch1", FUNC(ls259_device::write_d0)).umask16(0x00ff); map(0x380040, 0x38004f).w("latch2", FUNC(ls259_device::write_d0)).umask16(0x00ff); map(0x380050, 0x38005f).w("latch3", FUNC(ls259_device::write_d0)).umask16(0x00ff); diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index ae3603ff3d4..3835509d78e 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -1122,22 +1122,22 @@ WRITE16_MEMBER(jaguar_state::gpu_ram_w16){ if (!(offset&1)) { gpu_ram_w(space, o void jaguar_state::jaguar_map(address_map &map) { map.global_mask(0xffffff); - map(0x000000, 0x1fffff).mirror(0x200000).rw(this, FUNC(jaguar_state::shared_ram_r16), FUNC(jaguar_state::shared_ram_w16)); - map(0x800000, 0xdfffff).rw(this, FUNC(jaguar_state::cart_base_r16), FUNC(jaguar_state::cart_base_w16)); - map(0xe00000, 0xe1ffff).rw(this, FUNC(jaguar_state::rom_base_r16), FUNC(jaguar_state::rom_base_w16)); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); // might be reversed endian of the others.. - map(0xf00400, 0xf005ff).mirror(0x000200).rw(this, FUNC(jaguar_state::gpu_clut_r16), FUNC(jaguar_state::gpu_clut_w16)); - map(0xf02100, 0xf021ff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpuctrl_r16), FUNC(jaguar_state::gpuctrl_w16)); - map(0xf02200, 0xf022ff).mirror(0x008000).rw(this, FUNC(jaguar_state::blitter_r16), FUNC(jaguar_state::blitter_w16)); - map(0xf03000, 0xf03fff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpu_ram_r16), FUNC(jaguar_state::gpu_ram_w16)); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); // might be reversed endian of the others.. - map(0xf14000, 0xf14003).rw(this, FUNC(jaguar_state::joystick_r16), FUNC(jaguar_state::joystick_w16)); - map(0xf14800, 0xf14803).rw(this, FUNC(jaguar_state::eeprom_clk16), FUNC(jaguar_state::eeprom_w16)); // GPI00 - map(0xf15000, 0xf15003).r(this, FUNC(jaguar_state::eeprom_cs16)); // GPI01 - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r16), FUNC(jaguar_state::dspctrl_w16)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r16), FUNC(jaguar_state::serial_w16)); - map(0xf1b000, 0xf1cfff).rw(this, FUNC(jaguar_state::dsp_ram_r16), FUNC(jaguar_state::dsp_ram_w16)); - map(0xf1d000, 0xf1dfff).rw(this, FUNC(jaguar_state::wave_rom_r16), FUNC(jaguar_state::wave_rom_w16)); + map(0x000000, 0x1fffff).mirror(0x200000).rw(FUNC(jaguar_state::shared_ram_r16), FUNC(jaguar_state::shared_ram_w16)); + map(0x800000, 0xdfffff).rw(FUNC(jaguar_state::cart_base_r16), FUNC(jaguar_state::cart_base_w16)); + map(0xe00000, 0xe1ffff).rw(FUNC(jaguar_state::rom_base_r16), FUNC(jaguar_state::rom_base_w16)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); // might be reversed endian of the others.. + map(0xf00400, 0xf005ff).mirror(0x000200).rw(FUNC(jaguar_state::gpu_clut_r16), FUNC(jaguar_state::gpu_clut_w16)); + map(0xf02100, 0xf021ff).mirror(0x008000).rw(FUNC(jaguar_state::gpuctrl_r16), FUNC(jaguar_state::gpuctrl_w16)); + map(0xf02200, 0xf022ff).mirror(0x008000).rw(FUNC(jaguar_state::blitter_r16), FUNC(jaguar_state::blitter_w16)); + map(0xf03000, 0xf03fff).mirror(0x008000).rw(FUNC(jaguar_state::gpu_ram_r16), FUNC(jaguar_state::gpu_ram_w16)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); // might be reversed endian of the others.. + map(0xf14000, 0xf14003).rw(FUNC(jaguar_state::joystick_r16), FUNC(jaguar_state::joystick_w16)); + map(0xf14800, 0xf14803).rw(FUNC(jaguar_state::eeprom_clk16), FUNC(jaguar_state::eeprom_w16)); // GPI00 + map(0xf15000, 0xf15003).r(FUNC(jaguar_state::eeprom_cs16)); // GPI01 + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r16), FUNC(jaguar_state::dspctrl_w16)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r16), FUNC(jaguar_state::serial_w16)); + map(0xf1b000, 0xf1cfff).rw(FUNC(jaguar_state::dsp_ram_r16), FUNC(jaguar_state::dsp_ram_w16)); + map(0xf1d000, 0xf1dfff).rw(FUNC(jaguar_state::wave_rom_r16), FUNC(jaguar_state::wave_rom_w16)); } /* @@ -1311,23 +1311,23 @@ WRITE32_MEMBER(jaguar_state::butch_regs_w) void jaguar_state::jaguarcd_map(address_map &map) { map.global_mask(0xffffff); - map(0x000000, 0x1fffff).mirror(0x200000).rw(this, FUNC(jaguar_state::shared_ram_r16), FUNC(jaguar_state::shared_ram_w16)); + map(0x000000, 0x1fffff).mirror(0x200000).rw(FUNC(jaguar_state::shared_ram_r16), FUNC(jaguar_state::shared_ram_w16)); map(0x800000, 0x83ffff).rom().region("cdbios", 0); - map(0xdfff00, 0xdfff3f).rw(this, FUNC(jaguar_state::butch_regs_r16), FUNC(jaguar_state::butch_regs_w16)); - map(0xe00000, 0xe1ffff).rw(this, FUNC(jaguar_state::rom_base_r16), FUNC(jaguar_state::rom_base_w16)); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); // might be reversed endian of the others.. - map(0xf00400, 0xf005ff).mirror(0x000200).rw(this, FUNC(jaguar_state::gpu_clut_r16), FUNC(jaguar_state::gpu_clut_w16)); - map(0xf02100, 0xf021ff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpuctrl_r16), FUNC(jaguar_state::gpuctrl_w16)); - map(0xf02200, 0xf022ff).mirror(0x008000).rw(this, FUNC(jaguar_state::blitter_r16), FUNC(jaguar_state::blitter_w16)); - map(0xf03000, 0xf03fff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpu_ram_r16), FUNC(jaguar_state::gpu_ram_w16)); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); // might be reversed endian of the others.. - map(0xf14000, 0xf14003).rw(this, FUNC(jaguar_state::joystick_r16), FUNC(jaguar_state::joystick_w16)); - map(0xf14800, 0xf14803).rw(this, FUNC(jaguar_state::eeprom_clk16), FUNC(jaguar_state::eeprom_w16)); // GPI00 - map(0xf15000, 0xf15003).r(this, FUNC(jaguar_state::eeprom_cs16)); // GPI01 - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r16), FUNC(jaguar_state::dspctrl_w16)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r16), FUNC(jaguar_state::serial_w16)); - map(0xf1b000, 0xf1cfff).rw(this, FUNC(jaguar_state::dsp_ram_r16), FUNC(jaguar_state::dsp_ram_w16)); - map(0xf1d000, 0xf1dfff).rw(this, FUNC(jaguar_state::wave_rom_r16), FUNC(jaguar_state::wave_rom_w16)); + map(0xdfff00, 0xdfff3f).rw(FUNC(jaguar_state::butch_regs_r16), FUNC(jaguar_state::butch_regs_w16)); + map(0xe00000, 0xe1ffff).rw(FUNC(jaguar_state::rom_base_r16), FUNC(jaguar_state::rom_base_w16)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); // might be reversed endian of the others.. + map(0xf00400, 0xf005ff).mirror(0x000200).rw(FUNC(jaguar_state::gpu_clut_r16), FUNC(jaguar_state::gpu_clut_w16)); + map(0xf02100, 0xf021ff).mirror(0x008000).rw(FUNC(jaguar_state::gpuctrl_r16), FUNC(jaguar_state::gpuctrl_w16)); + map(0xf02200, 0xf022ff).mirror(0x008000).rw(FUNC(jaguar_state::blitter_r16), FUNC(jaguar_state::blitter_w16)); + map(0xf03000, 0xf03fff).mirror(0x008000).rw(FUNC(jaguar_state::gpu_ram_r16), FUNC(jaguar_state::gpu_ram_w16)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); // might be reversed endian of the others.. + map(0xf14000, 0xf14003).rw(FUNC(jaguar_state::joystick_r16), FUNC(jaguar_state::joystick_w16)); + map(0xf14800, 0xf14803).rw(FUNC(jaguar_state::eeprom_clk16), FUNC(jaguar_state::eeprom_w16)); // GPI00 + map(0xf15000, 0xf15003).r(FUNC(jaguar_state::eeprom_cs16)); // GPI01 + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r16), FUNC(jaguar_state::dspctrl_w16)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r16), FUNC(jaguar_state::serial_w16)); + map(0xf1b000, 0xf1cfff).rw(FUNC(jaguar_state::dsp_ram_r16), FUNC(jaguar_state::dsp_ram_w16)); + map(0xf1d000, 0xf1dfff).rw(FUNC(jaguar_state::wave_rom_r16), FUNC(jaguar_state::wave_rom_w16)); } /************************************* @@ -1339,29 +1339,29 @@ void jaguar_state::jaguarcd_map(address_map &map) void jaguar_state::r3000_map(address_map &map) { map(0x04000000, 0x047fffff).ram().share("sharedram"); - map(0x04e00030, 0x04e0003f).rw(m_ide, FUNC(vt83c461_device::read_config), FUNC(vt83c461_device::write_config)); - map(0x04e001f0, 0x04e001f7).rw(m_ide, FUNC(vt83c461_device::read_cs0), FUNC(vt83c461_device::write_cs0)); - map(0x04e003f0, 0x04e003f7).rw(m_ide, FUNC(vt83c461_device::read_cs1), FUNC(vt83c461_device::write_cs1)); - map(0x04f00000, 0x04f003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); + map(0x04e00030, 0x04e0003f).rw(m_ide, FUNC(vt83c461_device::config_r), FUNC(vt83c461_device::config_w)); + map(0x04e001f0, 0x04e001f7).rw(m_ide, FUNC(vt83c461_device::cs0_r), FUNC(vt83c461_device::cs0_w)); + map(0x04e003f0, 0x04e003f7).rw(m_ide, FUNC(vt83c461_device::cs1_r), FUNC(vt83c461_device::cs1_w)); + map(0x04f00000, 0x04f003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); map(0x04f00400, 0x04f007ff).ram().share("gpuclut"); - map(0x04f02100, 0x04f021ff).rw(this, FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); - map(0x04f02200, 0x04f022ff).rw(this, FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); + map(0x04f02100, 0x04f021ff).rw(FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); + map(0x04f02200, 0x04f022ff).rw(FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); map(0x04f03000, 0x04f03fff).mirror(0x00008000).ram().share("gpuram"); - map(0x04f10000, 0x04f103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); - map(0x04f16000, 0x04f1600b).r(this, FUNC(jaguar_state::cojag_gun_input_r)); // GPI02 + map(0x04f10000, 0x04f103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0x04f16000, 0x04f1600b).r(FUNC(jaguar_state::cojag_gun_input_r)); // GPI02 map(0x04f17000, 0x04f17003).portr("SYSTEM"); // GPI03 - map(0x04f17800, 0x04f17803).w(this, FUNC(jaguar_state::latch_w)); // GPI04 + map(0x04f17800, 0x04f17803).w(FUNC(jaguar_state::latch_w)); // GPI04 map(0x04f17c00, 0x04f17c03).portr("P1_P2"); // GPI05 - map(0x04f1a100, 0x04f1a13f).rw(this, FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); - map(0x04f1a140, 0x04f1a17f).rw(this, FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); + map(0x04f1a100, 0x04f1a13f).rw(FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); + map(0x04f1a140, 0x04f1a17f).rw(FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); map(0x04f1b000, 0x04f1cfff).ram().share("dspram"); - map(0x06000000, 0x06000003).rw(this, FUNC(jaguar_state::misc_control_r), FUNC(jaguar_state::misc_control_w)); + map(0x06000000, 0x06000003).rw(FUNC(jaguar_state::misc_control_r), FUNC(jaguar_state::misc_control_w)); map(0x10000000, 0x1007ffff).ram().share("mainram"); map(0x12000000, 0x120fffff).ram().share("mainram2"); // tested in self-test only? map(0x14000004, 0x14000007).w("watchdog", FUNC(watchdog_timer_device::reset32_w)); - map(0x16000000, 0x16000003).w(this, FUNC(jaguar_state::eeprom_enable_w)); - map(0x18000000, 0x18001fff).rw(this, FUNC(jaguar_state::eeprom_data_r), FUNC(jaguar_state::eeprom_data_w)).share("nvram"); + map(0x16000000, 0x16000003).w(FUNC(jaguar_state::eeprom_enable_w)); + map(0x18000000, 0x18001fff).rw(FUNC(jaguar_state::eeprom_data_r), FUNC(jaguar_state::eeprom_data_w)).share("nvram"); map(0x1fc00000, 0x1fdfffff).rom().region("maincpu", 0).share("rom"); } @@ -1378,26 +1378,26 @@ void jaguar_state::m68020_map(address_map &map) map(0x000000, 0x7fffff).ram().share("sharedram"); map(0x800000, 0x9fffff).rom().region("maincpu", 0).share("rom"); map(0xa00000, 0xa1ffff).ram().share("mainram"); - map(0xa20000, 0xa21fff).rw(this, FUNC(jaguar_state::eeprom_data_r), FUNC(jaguar_state::eeprom_data_w)).share("nvram"); + map(0xa20000, 0xa21fff).rw(FUNC(jaguar_state::eeprom_data_r), FUNC(jaguar_state::eeprom_data_w)).share("nvram"); map(0xa30000, 0xa30003).w("watchdog", FUNC(watchdog_timer_device::reset32_w)); - map(0xa40000, 0xa40003).w(this, FUNC(jaguar_state::eeprom_enable_w)); - map(0xb70000, 0xb70003).rw(this, FUNC(jaguar_state::misc_control_r), FUNC(jaguar_state::misc_control_w)); + map(0xa40000, 0xa40003).w(FUNC(jaguar_state::eeprom_enable_w)); + map(0xb70000, 0xb70003).rw(FUNC(jaguar_state::misc_control_r), FUNC(jaguar_state::misc_control_w)); map(0xc00000, 0xdfffff).bankr("mainsndbank"); - map(0xe00030, 0xe0003f).rw(m_ide, FUNC(vt83c461_device::read_config), FUNC(vt83c461_device::write_config)); - map(0xe001f0, 0xe001f7).rw(m_ide, FUNC(vt83c461_device::read_cs0), FUNC(vt83c461_device::write_cs0)); - map(0xe003f0, 0xe003f7).rw(m_ide, FUNC(vt83c461_device::read_cs1), FUNC(vt83c461_device::write_cs1)); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); + map(0xe00030, 0xe0003f).rw(m_ide, FUNC(vt83c461_device::config_r), FUNC(vt83c461_device::config_w)); + map(0xe001f0, 0xe001f7).rw(m_ide, FUNC(vt83c461_device::cs0_r), FUNC(vt83c461_device::cs0_w)); + map(0xe003f0, 0xe003f7).rw(m_ide, FUNC(vt83c461_device::cs1_r), FUNC(vt83c461_device::cs1_w)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); map(0xf00400, 0xf007ff).ram().share("gpuclut"); - map(0xf02100, 0xf021ff).rw(this, FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); - map(0xf02200, 0xf022ff).rw(this, FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); + map(0xf02100, 0xf021ff).rw(FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); + map(0xf02200, 0xf022ff).rw(FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); map(0xf03000, 0xf03fff).mirror(0x008000).ram().share("gpuram"); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); - map(0xf16000, 0xf1600b).r(this, FUNC(jaguar_state::cojag_gun_input_r)); // GPI02 + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0xf16000, 0xf1600b).r(FUNC(jaguar_state::cojag_gun_input_r)); // GPI02 map(0xf17000, 0xf17003).portr("SYSTEM"); // GPI03 // AM_RANGE(0xf17800, 0xf17803) AM_WRITE(latch_w) // GPI04 map(0xf17c00, 0xf17c03).portr("P1_P2"); // GPI05 - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); map(0xf1b000, 0xf1cfff).ram().share("dspram"); } @@ -1411,15 +1411,15 @@ void jaguar_state::m68020_map(address_map &map) void jaguar_state::gpu_map(address_map &map) { map(0x000000, 0x7fffff).ram().share("sharedram"); - map(0xe00030, 0xe0003f).rw(m_ide, FUNC(vt83c461_device::read_config), FUNC(vt83c461_device::write_config)); - map(0xe001f0, 0xe001f7).rw(m_ide, FUNC(vt83c461_device::read_cs0), FUNC(vt83c461_device::write_cs0)); - map(0xe003f0, 0xe003f7).rw(m_ide, FUNC(vt83c461_device::read_cs1), FUNC(vt83c461_device::write_cs1)); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); + map(0xe00030, 0xe0003f).rw(m_ide, FUNC(vt83c461_device::config_r), FUNC(vt83c461_device::config_w)); + map(0xe001f0, 0xe001f7).rw(m_ide, FUNC(vt83c461_device::cs0_r), FUNC(vt83c461_device::cs0_w)); + map(0xe003f0, 0xe003f7).rw(m_ide, FUNC(vt83c461_device::cs1_r), FUNC(vt83c461_device::cs1_w)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); map(0xf00400, 0xf007ff).ram().share("gpuclut"); - map(0xf02100, 0xf021ff).rw(this, FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); - map(0xf02200, 0xf022ff).rw(this, FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); + map(0xf02100, 0xf021ff).rw(FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); + map(0xf02200, 0xf022ff).rw(FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); map(0xf03000, 0xf03fff).ram().share("gpuram"); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); } void jaguar_state::gpu_rom_map(address_map &map) @@ -1439,11 +1439,11 @@ void jaguar_state::gpu_rom_map(address_map &map) void jaguar_state::dsp_map(address_map &map) { map(0x000000, 0x7fffff).ram().share("sharedram"); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); map(0xf1b000, 0xf1cfff).ram().share("dspram"); - map(0xf1d000, 0xf1dfff).r(this, FUNC(jaguar_state::wave_rom_r)).share("waverom").region("waverom", 0); + map(0xf1d000, 0xf1dfff).r(FUNC(jaguar_state::wave_rom_r)).share("waverom").region("waverom", 0); } void jaguar_state::dsp_rom_map(address_map &map) @@ -1461,15 +1461,15 @@ void jaguar_state::jag_gpu_map(address_map &map) map(0x000000, 0x1fffff).ram().mirror(0x200000).share("sharedram").region("maincpu", 0); map(0x800000, 0xdfffff).rom().share("cart").region("maincpu", 0x800000); map(0xe00000, 0xe1ffff).rom().share("rom").region("maincpu", 0xe00000); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); map(0xf00400, 0xf005ff).mirror(0x000200).ram().share("gpuclut"); - map(0xf02100, 0xf021ff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); - map(0xf02200, 0xf022ff).mirror(0x008000).rw(this, FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); + map(0xf02100, 0xf021ff).mirror(0x008000).rw(FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); + map(0xf02200, 0xf022ff).mirror(0x008000).rw(FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); map(0xf03000, 0xf03fff).mirror(0x008000).ram().share("gpuram"); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); - map(0xf14000, 0xf14003).rw(this, FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0xf14000, 0xf14003).rw(FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); map(0xf1b000, 0xf1cfff).ram().share("dspram"); map(0xf1d000, 0xf1dfff).rom().share("waverom").region("waverom", 0); } @@ -1480,15 +1480,15 @@ void jaguar_state::jag_dsp_map(address_map &map) map(0x000000, 0x1fffff).mirror(0x200000).ram().share("sharedram").region("maincpu", 0); map(0x800000, 0xdfffff).rom().share("cart").region("maincpu", 0x800000); map(0xe00000, 0xe1ffff).rom().share("rom").region("maincpu", 0xe00000); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); map(0xf00400, 0xf005ff).mirror(0x000200).ram().share("gpuclut"); - map(0xf02100, 0xf021ff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); - map(0xf02200, 0xf022ff).mirror(0x008000).rw(this, FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); + map(0xf02100, 0xf021ff).mirror(0x008000).rw(FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); + map(0xf02200, 0xf022ff).mirror(0x008000).rw(FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); map(0xf03000, 0xf03fff).mirror(0x008000).ram().share("gpuram"); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); - map(0xf14000, 0xf14003).rw(this, FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0xf14000, 0xf14003).rw(FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); map(0xf1b000, 0xf1cfff).ram().share("dspram"); map(0xf1d000, 0xf1dfff).rom().region("waverom", 0); } @@ -1498,17 +1498,17 @@ void jaguar_state::jagcd_gpu_map(address_map &map) map.global_mask(0xffffff); map(0x000000, 0x1fffff).ram().mirror(0x200000).share("sharedram").region("maincpu", 0); map(0x800000, 0x83ffff).rom().region("cdbios", 0); - map(0xdfff00, 0xdfff3f).rw(this, FUNC(jaguar_state::butch_regs_r), FUNC(jaguar_state::butch_regs_w)); + map(0xdfff00, 0xdfff3f).rw(FUNC(jaguar_state::butch_regs_r), FUNC(jaguar_state::butch_regs_w)); map(0xe00000, 0xe1ffff).rom().share("rom").region("maincpu", 0xe00000); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); map(0xf00400, 0xf005ff).mirror(0x000200).ram().share("gpuclut"); - map(0xf02100, 0xf021ff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); - map(0xf02200, 0xf022ff).mirror(0x008000).rw(this, FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); + map(0xf02100, 0xf021ff).mirror(0x008000).rw(FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); + map(0xf02200, 0xf022ff).mirror(0x008000).rw(FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); map(0xf03000, 0xf03fff).mirror(0x008000).ram().share("gpuram"); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); - map(0xf14000, 0xf14003).rw(this, FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0xf14000, 0xf14003).rw(FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); map(0xf1b000, 0xf1cfff).ram().share("dspram"); map(0xf1d000, 0xf1dfff).rom().share("waverom").region("waverom", 0); } @@ -1518,17 +1518,17 @@ void jaguar_state::jagcd_dsp_map(address_map &map) map.global_mask(0xffffff); map(0x000000, 0x1fffff).mirror(0x200000).ram().share("sharedram").region("maincpu", 0); map(0x800000, 0x83ffff).rom().region("cdbios", 0); - map(0xdfff00, 0xdfff3f).rw(this, FUNC(jaguar_state::butch_regs_r), FUNC(jaguar_state::butch_regs_w)); + map(0xdfff00, 0xdfff3f).rw(FUNC(jaguar_state::butch_regs_r), FUNC(jaguar_state::butch_regs_w)); map(0xe00000, 0xe1ffff).rom().share("rom").region("maincpu", 0xe00000); - map(0xf00000, 0xf003ff).rw(this, FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); + map(0xf00000, 0xf003ff).rw(FUNC(jaguar_state::tom_regs_r), FUNC(jaguar_state::tom_regs_w)); map(0xf00400, 0xf005ff).mirror(0x000200).ram().share("gpuclut"); - map(0xf02100, 0xf021ff).mirror(0x008000).rw(this, FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); - map(0xf02200, 0xf022ff).mirror(0x008000).rw(this, FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); + map(0xf02100, 0xf021ff).mirror(0x008000).rw(FUNC(jaguar_state::gpuctrl_r), FUNC(jaguar_state::gpuctrl_w)); + map(0xf02200, 0xf022ff).mirror(0x008000).rw(FUNC(jaguar_state::blitter_r), FUNC(jaguar_state::blitter_w)); map(0xf03000, 0xf03fff).mirror(0x008000).ram().share("gpuram"); - map(0xf10000, 0xf103ff).rw(this, FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); - map(0xf14000, 0xf14003).rw(this, FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); - map(0xf1a100, 0xf1a13f).rw(this, FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); - map(0xf1a140, 0xf1a17f).rw(this, FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); + map(0xf10000, 0xf103ff).rw(FUNC(jaguar_state::jerry_regs_r), FUNC(jaguar_state::jerry_regs_w)); + map(0xf14000, 0xf14003).rw(FUNC(jaguar_state::joystick_r), FUNC(jaguar_state::joystick_w)); + map(0xf1a100, 0xf1a13f).rw(FUNC(jaguar_state::dspctrl_r), FUNC(jaguar_state::dspctrl_w)); + map(0xf1a140, 0xf1a17f).rw(FUNC(jaguar_state::serial_r), FUNC(jaguar_state::serial_w)); map(0xf1b000, 0xf1cfff).ram().share("dspram"); map(0xf1d000, 0xf1dfff).rom().region("waverom", 0); } diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp index 0388df95d56..98073e12096 100644 --- a/src/mame/drivers/jailbrek.cpp +++ b/src/mame/drivers/jailbrek.cpp @@ -138,8 +138,8 @@ WRITE8_MEMBER(jailbrek_state::speech_w) void jailbrek_state::jailbrek_map(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(jailbrek_state::colorram_w)).share("colorram"); - map(0x0800, 0x0fff).ram().w(this, FUNC(jailbrek_state::videoram_w)).share("videoram"); + map(0x0000, 0x07ff).ram().w(FUNC(jailbrek_state::colorram_w)).share("colorram"); + map(0x0800, 0x0fff).ram().w(FUNC(jailbrek_state::videoram_w)).share("videoram"); map(0x1000, 0x10bf).ram().share("spriteram"); map(0x10c0, 0x14ff).ram(); /* ??? */ map(0x1500, 0x1fff).ram(); /* work ram */ @@ -148,17 +148,17 @@ void jailbrek_state::jailbrek_map(address_map &map) map(0x2041, 0x2041).nopw(); /* ??? */ map(0x2042, 0x2042).ram().share("scroll_dir"); /* bit 2 = scroll direction */ map(0x2043, 0x2043).nopw(); /* ??? */ - map(0x2044, 0x2044).w(this, FUNC(jailbrek_state::ctrl_w)); /* irq, nmi enable, screen flip */ - map(0x3000, 0x3000).w(this, FUNC(jailbrek_state::coin_w)); - map(0x3100, 0x3100).portr("DSW2").w("snsnd", FUNC(sn76489a_device::write)); + map(0x2044, 0x2044).w(FUNC(jailbrek_state::ctrl_w)); /* irq, nmi enable, screen flip */ + map(0x3000, 0x3000).w(FUNC(jailbrek_state::coin_w)); + map(0x3100, 0x3100).portr("DSW2").w("snsnd", FUNC(sn76489a_device::command_w)); map(0x3200, 0x3200).portr("DSW3").nopw(); /* mirror of the previous? */ map(0x3300, 0x3300).portr("SYSTEM").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3301, 0x3301).portr("P1"); map(0x3302, 0x3302).portr("P2"); map(0x3303, 0x3303).portr("DSW1"); - map(0x4000, 0x4000).w(this, FUNC(jailbrek_state::speech_w)); /* speech pins */ + map(0x4000, 0x4000).w(FUNC(jailbrek_state::speech_w)); /* speech pins */ map(0x5000, 0x5000).w(m_vlm, FUNC(vlm5030_device::data_w)); /* speech data */ - map(0x6000, 0x6000).r(this, FUNC(jailbrek_state::speech_r)); + map(0x6000, 0x6000).r(FUNC(jailbrek_state::speech_r)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp index 5c578686ae7..276b5d55425 100644 --- a/src/mame/drivers/jalmah.cpp +++ b/src/mame/drivers/jalmah.cpp @@ -1023,20 +1023,20 @@ void jalmah_state::jalmah(address_map &map) map(0x080000, 0x080001).portr("SYSTEM"); map(0x080002, 0x080003).portr("DSW"); // 0x080004, 0x080005 MCU read,different for each game - map(0x080010, 0x080011).w(this, FUNC(jalmah_state::jalmah_flip_screen_w)); + map(0x080010, 0x080011).w(FUNC(jalmah_state::jalmah_flip_screen_w)); // 0x080012, 0x080013 MCU write related,same for each game // 0x080014, 0x080015 MCU write related,same for each game -/**/map(0x080016, 0x080017).ram().w(this, FUNC(jalmah_state::jalmah_tilebank_w)); - map(0x080018, 0x080019).w(this, FUNC(jalmah_state::jalmah_okibank_w)); - map(0x08001a, 0x08001b).w(this, FUNC(jalmah_state::jalmah_okirom_w)); -/**/map(0x080020, 0x08003f).ram().w(this, FUNC(jalmah_state::jalmah_scroll_w)); +/**/map(0x080016, 0x080017).ram().w(FUNC(jalmah_state::jalmah_tilebank_w)); + map(0x080018, 0x080019).w(FUNC(jalmah_state::jalmah_okibank_w)); + map(0x08001a, 0x08001b).w(FUNC(jalmah_state::jalmah_okirom_w)); +/**/map(0x080020, 0x08003f).ram().w(FUNC(jalmah_state::jalmah_scroll_w)); map(0x080041, 0x080041).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // 0x084000, 0x084001 ? map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette RAM */ - map(0x090000, 0x093fff).ram().w(this, FUNC(jalmah_state::sc0_vram_w)).share("sc0_vram"); - map(0x094000, 0x097fff).ram().w(this, FUNC(jalmah_state::sc1_vram_w)).share("sc1_vram"); - map(0x098000, 0x09bfff).ram().w(this, FUNC(jalmah_state::sc2_vram_w)).share("sc2_vram"); - map(0x09c000, 0x09ffff).ram().w(this, FUNC(jalmah_state::sc3_vram_w)).share("sc3_vram"); + map(0x090000, 0x093fff).ram().w(FUNC(jalmah_state::sc0_vram_w)).share("sc0_vram"); + map(0x094000, 0x097fff).ram().w(FUNC(jalmah_state::sc1_vram_w)).share("sc1_vram"); + map(0x098000, 0x09bfff).ram().w(FUNC(jalmah_state::sc2_vram_w)).share("sc2_vram"); + map(0x09c000, 0x09ffff).ram().w(FUNC(jalmah_state::sc3_vram_w)).share("sc3_vram"); map(0x0f0000, 0x0f0fff).ram().share("jshared_ram");/*shared with MCU*/ map(0x0f1000, 0x0fffff).ram(); /*Work Ram*/ map(0x100000, 0x10ffff).ram().share("jmcu_code");/*extra RAM for MCU code prg (NOT ON REAL HW!!!)*/ @@ -1048,25 +1048,25 @@ void jalmah_state::urashima(address_map &map) map(0x080000, 0x080001).portr("SYSTEM"); map(0x080002, 0x080003).portr("DSW"); // 0x080004, 0x080005 MCU read,different for each game - map(0x080010, 0x080011).w(this, FUNC(jalmah_state::jalmah_flip_screen_w)); + map(0x080010, 0x080011).w(FUNC(jalmah_state::jalmah_flip_screen_w)); // 0x080012, 0x080013 MCU write related,same for each game // 0x080014, 0x080015 MCU write related,same for each game -/**/map(0x080016, 0x080017).ram().w(this, FUNC(jalmah_state::urashima_dma_w)); - map(0x080018, 0x080019).w(this, FUNC(jalmah_state::jalmah_okibank_w)); - map(0x08001a, 0x08001b).w(this, FUNC(jalmah_state::jalmah_okirom_w)); -/**/map(0x08001c, 0x08001d).ram().w(this, FUNC(jalmah_state::urashima_bank_w)); +/**/map(0x080016, 0x080017).ram().w(FUNC(jalmah_state::urashima_dma_w)); + map(0x080018, 0x080019).w(FUNC(jalmah_state::jalmah_okibank_w)); + map(0x08001a, 0x08001b).w(FUNC(jalmah_state::jalmah_okirom_w)); +/**/map(0x08001c, 0x08001d).ram().w(FUNC(jalmah_state::urashima_bank_w)); map(0x080041, 0x080041).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // 0x084000, 0x084001 ? map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette RAM */ - map(0x090000, 0x093fff).ram().w(this, FUNC(jalmah_state::urashima_sc0_vram_w)).share("sc0_vram"); - map(0x094000, 0x097fff).ram().w(this, FUNC(jalmah_state::urashima_sc0_vram_w)); - map(0x098000, 0x09bfff).ram().w(this, FUNC(jalmah_state::urashima_sc0_vram_w)); + map(0x090000, 0x093fff).ram().w(FUNC(jalmah_state::urashima_sc0_vram_w)).share("sc0_vram"); + map(0x094000, 0x097fff).ram().w(FUNC(jalmah_state::urashima_sc0_vram_w)); + map(0x098000, 0x09bfff).ram().w(FUNC(jalmah_state::urashima_sc0_vram_w)); // AM_RANGE(0x094000, 0x097fff) AM_RAM_WRITE(urashima_sc1_vram_w) AM_SHARE("sc1_vram")/*unused*/ // AM_RANGE(0x098000, 0x09bfff) AM_RAM_WRITE(urashima_sc2_vram_w) AM_SHARE("sc2_vram")/*unused*/ /*$9c000-$9cfff Video Registers*/ -/**/map(0x09c000, 0x09dfff).w(this, FUNC(jalmah_state::urashima_vregs_w)); +/**/map(0x09c000, 0x09dfff).w(FUNC(jalmah_state::urashima_vregs_w)); /**///AM_RANGE(0x09c480, 0x09c49f) AM_RAM_WRITE(urashima_sc2vregs_w) - map(0x09e000, 0x0a1fff).ram().w(this, FUNC(jalmah_state::urashima_sc3_vram_w)).share("sc3_vram"); + map(0x09e000, 0x0a1fff).ram().w(FUNC(jalmah_state::urashima_sc3_vram_w)).share("sc3_vram"); map(0x0f0000, 0x0f0fff).ram().share("jshared_ram");/*shared with MCU*/ map(0x0f1000, 0x0fffff).ram(); /*Work Ram*/ map(0x100000, 0x10ffff).ram().share("jmcu_code");/*extra RAM for MCU code prg (NOT ON REAL HW!!!)*/ diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index efd4663b49e..b032c162a78 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -356,12 +356,12 @@ void jangou_state::cpu0_io(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r("aysnd", FUNC(ay8910_device::data_r)); map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW").w(this, FUNC(jangou_state::output_w)); //dsw + blitter busy flag - map(0x11, 0x11).w(this, FUNC(jangou_state::mux_w)); + map(0x10, 0x10).portr("DSW").w(FUNC(jangou_state::output_w)); //dsw + blitter busy flag + map(0x11, 0x11).w(FUNC(jangou_state::mux_w)); map(0x12, 0x17).m(m_blitter, FUNC(jangou_blitter_device::blit_v1_regs)); map(0x20, 0x2f).w(m_blitter, FUNC(jangou_blitter_device::vregs_w)); map(0x30, 0x30).nopw(); //? polls 0x03 continuously - map(0x31, 0x31).w(this, FUNC(jangou_state::sound_latch_w)); + map(0x31, 0x31).w(FUNC(jangou_state::sound_latch_w)); } @@ -373,8 +373,8 @@ void jangou_state::cpu1_map(address_map &map) void jangou_state::cpu1_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(jangou_state::sound_latch_r)); - map(0x01, 0x01).w(this, FUNC(jangou_state::cvsd_w)); + map(0x00, 0x00).r(FUNC(jangou_state::sound_latch_r)); + map(0x01, 0x01).w(FUNC(jangou_state::cvsd_w)); map(0x02, 0x02).nopw(); // Echoes sound command - acknowledge? } @@ -389,7 +389,7 @@ void jangou_state::jngolady_cpu0_map(address_map &map) { map(0x0000, 0x9fff).rom(); map(0xc000, 0xc7ff).ram().share("share1"); - map(0xe000, 0xe000).rw(this, FUNC(jangou_state::master_com_r), FUNC(jangou_state::master_com_w)); + map(0xe000, 0xe000).rw(FUNC(jangou_state::master_com_r), FUNC(jangou_state::master_com_w)); } @@ -401,8 +401,8 @@ void jangou_state::jngolady_cpu1_map(address_map &map) void jangou_state::jngolady_cpu1_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(jangou_state::sound_latch_r)); - map(0x01, 0x01).w(this, FUNC(jangou_state::adpcm_w)); + map(0x00, 0x00).r(FUNC(jangou_state::sound_latch_r)); + map(0x01, 0x01).w(FUNC(jangou_state::adpcm_w)); map(0x02, 0x02).nopw(); } @@ -411,7 +411,7 @@ void jangou_state::nsc_map(address_map &map) { map(0x0000, 0x007f).ram(); //internal ram for irq etc. map(0x8000, 0x8000).nopw(); //write-only,irq related? - map(0x9000, 0x9000).rw(this, FUNC(jangou_state::slave_com_r), FUNC(jangou_state::slave_com_w)); + map(0x9000, 0x9000).rw(FUNC(jangou_state::slave_com_r), FUNC(jangou_state::slave_com_w)); map(0xc000, 0xc7ff).ram().share("share1"); map(0xf000, 0xffff).rom(); } @@ -435,8 +435,8 @@ void jangou_state::cntrygrl_cpu0_io(address_map &map) map(0x01, 0x01).r("aysnd", FUNC(ay8910_device::data_r)); map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x10, 0x10).portr("DSW"); //dsw + blitter busy flag - map(0x10, 0x10).w(this, FUNC(jangou_state::output_w)); - map(0x11, 0x11).w(this, FUNC(jangou_state::mux_w)); + map(0x10, 0x10).w(FUNC(jangou_state::output_w)); + map(0x11, 0x11).w(FUNC(jangou_state::mux_w)); map(0x12, 0x17).m(m_blitter, FUNC(jangou_blitter_device::blit_v1_regs)); map(0x20, 0x2f).w(m_blitter, FUNC(jangou_blitter_device::vregs_w)); map(0x30, 0x30).nopw(); //? polls 0x03 continuously @@ -462,7 +462,7 @@ void jangou_state::roylcrdn_cpu0_io(address_map &map) map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x10, 0x10).portr("DSW"); /* DSW + blitter busy flag */ map(0x10, 0x10).nopw(); /* Writes continuosly 0's in attract mode, and 1's in game */ - map(0x11, 0x11).w(this, FUNC(jangou_state::mux_w)); + map(0x11, 0x11).w(FUNC(jangou_state::mux_w)); map(0x12, 0x17).m(m_blitter, FUNC(jangou_blitter_device::blit_v1_regs)); map(0x13, 0x13).nopr(); /* Often reads bit7 with unknown purposes */ map(0x20, 0x2f).w(m_blitter, FUNC(jangou_blitter_device::vregs_w)); diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index 51fcaafb088..4a650a68392 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -399,7 +399,7 @@ MACHINE_CONFIG_START(jankenmn_state::jankenmn) MCFG_DEVICE_ADD("ppi8255_1", I8255, 0) /* (20-23) Mode 0 - Ports A, B, high C & low C set as output. */ - MCFG_I8255_OUT_PORTA_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, jankenmn_state, lamps1_w)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jankenmn_state, lamps2_w)) diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index 8ee0a2a38c7..b1fedb0f74b 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -338,17 +338,17 @@ void jantotsu_state::jantotsu_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xe000, 0xffff).rw(this, FUNC(jantotsu_state::jantotsu_bitmap_r), FUNC(jantotsu_state::jantotsu_bitmap_w)); + map(0xe000, 0xffff).rw(FUNC(jantotsu_state::jantotsu_bitmap_r), FUNC(jantotsu_state::jantotsu_bitmap_w)); } void jantotsu_state::jantotsu_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("DSW1").w("sn1", FUNC(sn76489a_device::write)); - map(0x01, 0x01).r(this, FUNC(jantotsu_state::jantotsu_dsw2_r)).w("sn2", FUNC(sn76489a_device::write)); - map(0x02, 0x03).w(this, FUNC(jantotsu_state::jan_adpcm_w)); - map(0x04, 0x04).rw(this, FUNC(jantotsu_state::jantotsu_mux_r), FUNC(jantotsu_state::jantotsu_mux_w)); - map(0x07, 0x07).w(this, FUNC(jantotsu_state::bankaddr_w)); + map(0x00, 0x00).portr("DSW1").w("sn1", FUNC(sn76489a_device::command_w)); + map(0x01, 0x01).r(FUNC(jantotsu_state::jantotsu_dsw2_r)).w("sn2", FUNC(sn76489a_device::command_w)); + map(0x02, 0x03).w(FUNC(jantotsu_state::jan_adpcm_w)); + map(0x04, 0x04).rw(FUNC(jantotsu_state::jantotsu_mux_r), FUNC(jantotsu_state::jantotsu_mux_w)); + map(0x07, 0x07).w(FUNC(jantotsu_state::bankaddr_w)); } diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp index 0917ebdf2bd..39e7eed0640 100644 --- a/src/mame/drivers/jchan.cpp +++ b/src/mame/drivers/jchan.cpp @@ -464,12 +464,12 @@ void jchan_state::jchan_main(address_map &map) map(0x400000, 0x403fff).ram().share("mainsub_shared"); /* 1st sprite layer */ - map(0x500000, 0x503fff).ram().w(this, FUNC(jchan_state::sknsspr_sprite32_w<0>)).share("spriteram_1"); - map(0x600000, 0x60003f).ram().w(this, FUNC(jchan_state::sknsspr_sprite32regs_w<0>)).share("sprregs_1"); + map(0x500000, 0x503fff).ram().w(FUNC(jchan_state::sknsspr_sprite32_w<0>)).share("spriteram_1"); + map(0x600000, 0x60003f).ram().w(FUNC(jchan_state::sknsspr_sprite32regs_w<0>)).share("sprregs_1"); map(0x700000, 0x70ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // palette - map(0xf00000, 0xf00007).rw(this, FUNC(jchan_state::ctrl_r), FUNC(jchan_state::ctrl_w)).share("ctrl"); + map(0xf00000, 0xf00007).rw(FUNC(jchan_state::ctrl_r), FUNC(jchan_state::ctrl_w)).share("ctrl"); map(0xf80000, 0xf80001).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); } @@ -487,8 +487,8 @@ void jchan_state::jchan_sub(address_map &map) map(0x600000, 0x60001f).rw(m_view2, FUNC(kaneko_view2_tilemap_device::kaneko_tmap_regs_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_regs_w)); /* background sprites */ - map(0x700000, 0x703fff).ram().w(this, FUNC(jchan_state::sknsspr_sprite32_w<1>)).share("spriteram_2"); - map(0x780000, 0x78003f).ram().w(this, FUNC(jchan_state::sknsspr_sprite32regs_w<1>)).share("sprregs_2"); + map(0x700000, 0x703fff).ram().w(FUNC(jchan_state::sknsspr_sprite32_w<1>)).share("spriteram_2"); + map(0x780000, 0x78003f).ram().w(FUNC(jchan_state::sknsspr_sprite32regs_w<1>)).share("sprregs_2"); map(0x800000, 0x800003).w("ymz", FUNC(ymz280b_device::write)).umask16(0x00ff); // sound diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index b849f97ba1b..b01af988bb8 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -584,37 +584,37 @@ void jclub2o_state::jclub2o_map(address_map &map) map(0x000000, 0x27ffff).rom(); map(0x400000, 0x41ffff).ram().share("nvram"); // battery - map(0x490000, 0x490003).w(this, FUNC(jclub2o_state::eeprom_s29290_w)); + map(0x490000, 0x490003).w(FUNC(jclub2o_state::eeprom_s29290_w)); - map(0x4a0000, 0x4a0003).w(this, FUNC(jclub2o_state::out2_w)); + map(0x4a0000, 0x4a0003).w(FUNC(jclub2o_state::out2_w)); // AM_RANGE(0x4a0010, 0x4a0013) AM_WRITE // AM_RANGE(0x4a0020, 0x4a0023) AM_WRITE // AM_RANGE(0x4a0030, 0x4a0033) AM_WRITE // ST-0016 - map(0x4b0000, 0x4b0003).rw(this, FUNC(jclub2o_state::cmd1_word_r), FUNC(jclub2o_state::cmd1_word_w)); - map(0x4b0004, 0x4b0007).rw(this, FUNC(jclub2o_state::cmd2_word_r), FUNC(jclub2o_state::cmd2_word_w)); - map(0x4b0008, 0x4b000b).r(this, FUNC(jclub2o_state::cmd_stat_word_r)); + map(0x4b0000, 0x4b0003).rw(FUNC(jclub2o_state::cmd1_word_r), FUNC(jclub2o_state::cmd1_word_w)); + map(0x4b0004, 0x4b0007).rw(FUNC(jclub2o_state::cmd2_word_r), FUNC(jclub2o_state::cmd2_word_w)); + map(0x4b0008, 0x4b000b).r(FUNC(jclub2o_state::cmd_stat_word_r)); map(0x4d0000, 0x4d0003).nopr().nopw(); // reads seem unused? this write would go to two 7-segs (but the code is never called) map(0x4d0004, 0x4d0007).nopr(); map(0x4d0008, 0x4d000b).nopr(); map(0x4d000c, 0x4d000f).nopr(); - map(0x4e0000, 0x4e0003).r(this, FUNC(jclub2o_state::p2_r)).w(this, FUNC(jclub2o_state::input_sel2_w)); + map(0x4e0000, 0x4e0003).r(FUNC(jclub2o_state::p2_r)).w(FUNC(jclub2o_state::input_sel2_w)); map(0x580000, 0x580003).portr("EEPROM"); - map(0x580004, 0x580007).r(this, FUNC(jclub2o_state::p1_r)); + map(0x580004, 0x580007).r(FUNC(jclub2o_state::p1_r)); map(0x580008, 0x58000b).portr("COIN"); - map(0x58000c, 0x58000f).w(this, FUNC(jclub2o_state::input_sel1_out3_w)); - map(0x580010, 0x580013).w(this, FUNC(jclub2o_state::out1_w)); + map(0x58000c, 0x58000f).w(FUNC(jclub2o_state::input_sel1_out3_w)); + map(0x580010, 0x580013).w(FUNC(jclub2o_state::out1_w)); // AM_RANGE(0x580018, 0x58001b) AM_WRITE // AM_RANGE(0x58001c, 0x58001f) AM_WRITE map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x580401, 0x580401).rw(this, FUNC(jclub2o_state::console_r), FUNC(jclub2o_state::console_w)); - map(0x580421, 0x580421).r(this, FUNC(jclub2o_state::console_status_r)); //AM_WRITE + map(0x580401, 0x580401).rw(FUNC(jclub2o_state::console_r), FUNC(jclub2o_state::console_w)); + map(0x580421, 0x580421).r(FUNC(jclub2o_state::console_status_r)); //AM_WRITE // AM_RANGE(0x580440, 0x580443) AM_WRITE // ST-0020 @@ -676,10 +676,10 @@ void jclub2o_state::st0016_io(address_map &map) { map.global_mask(0xff); //AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) - map(0xc0, 0xc0).rw(this, FUNC(jclub2o_state::cmd1_r), FUNC(jclub2o_state::cmd1_w)); - map(0xc1, 0xc1).rw(this, FUNC(jclub2o_state::cmd2_r), FUNC(jclub2o_state::cmd2_w)); - map(0xc2, 0xc2).r(this, FUNC(jclub2o_state::cmd_stat_r)); - map(0xe1, 0xe1).w(this, FUNC(jclub2o_state::st0016_rom_bank_w)); + map(0xc0, 0xc0).rw(FUNC(jclub2o_state::cmd1_r), FUNC(jclub2o_state::cmd1_w)); + map(0xc1, 0xc1).rw(FUNC(jclub2o_state::cmd2_r), FUNC(jclub2o_state::cmd2_w)); + map(0xc2, 0xc2).r(FUNC(jclub2o_state::cmd_stat_r)); + map(0xe1, 0xe1).w(FUNC(jclub2o_state::st0016_rom_bank_w)); map(0xe7, 0xe7).nopw(); // watchdog? //AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r) } @@ -710,29 +710,29 @@ void jclub2_state::jclub2_map(address_map &map) map(0x000000, 0x27ffff).rom(); map(0x400000, 0x41ffff).ram().share("nvram"); // battery - map(0x490000, 0x490003).w(this, FUNC(jclub2_state::eeprom_93c46_w)); + map(0x490000, 0x490003).w(FUNC(jclub2_state::eeprom_93c46_w)); - map(0x4a0000, 0x4a0003).w(this, FUNC(jclub2_state::out2_w)); + map(0x4a0000, 0x4a0003).w(FUNC(jclub2_state::out2_w)); map(0x4d0000, 0x4d0003).nopr().nopw(); // reads seem unused? this write would go to two 7-segs (but the code is never called) map(0x4d0004, 0x4d0007).nopr(); map(0x4d0008, 0x4d000b).nopr(); map(0x4d000c, 0x4d000f).nopr(); - map(0x4e0000, 0x4e0003).r(this, FUNC(jclub2_state::p2_r)).w(this, FUNC(jclub2_state::input_sel2_w)); + map(0x4e0000, 0x4e0003).r(FUNC(jclub2_state::p2_r)).w(FUNC(jclub2_state::input_sel2_w)); map(0x580000, 0x580003).portr("EEPROM"); - map(0x580004, 0x580007).r(this, FUNC(jclub2_state::p1_r)); + map(0x580004, 0x580007).r(FUNC(jclub2_state::p1_r)); map(0x580008, 0x58000b).portr("COIN"); - map(0x58000c, 0x58000f).w(this, FUNC(jclub2_state::input_sel1_out3_w)); - map(0x580010, 0x580013).w(this, FUNC(jclub2_state::out1_w)); + map(0x58000c, 0x58000f).w(FUNC(jclub2_state::input_sel1_out3_w)); + map(0x580010, 0x580013).w(FUNC(jclub2_state::out1_w)); // AM_RANGE(0x580018, 0x58001b) AM_WRITE // AM_RANGE(0x58001c, 0x58001f) AM_WRITE map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x580401, 0x580401).rw(this, FUNC(jclub2_state::console_r), FUNC(jclub2_state::console_w)); - map(0x580421, 0x580421).r(this, FUNC(jclub2_state::console_status_r)); //AM_WRITE + map(0x580401, 0x580401).rw(FUNC(jclub2_state::console_r), FUNC(jclub2_state::console_w)); + map(0x580421, 0x580421).r(FUNC(jclub2_state::console_status_r)); //AM_WRITE // AM_RANGE(0x580440, 0x580443) AM_WRITE // ST-0032 @@ -800,13 +800,13 @@ void darkhors_state::darkhors_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x400000, 0x41ffff).ram().share("nvram"); // battery - map(0x490040, 0x490043).w(this, FUNC(darkhors_state::eeprom_93c46_w)); - map(0x4e0080, 0x4e0083).portr("SERVICE").w(this, FUNC(darkhors_state::out1_w)); + map(0x490040, 0x490043).w(FUNC(darkhors_state::eeprom_93c46_w)); + map(0x4e0080, 0x4e0083).portr("SERVICE").w(FUNC(darkhors_state::out1_w)); map(0x580000, 0x580003).portr("UNKNOWN"); map(0x580004, 0x580007).portr("COIN"); - map(0x580008, 0x58000b).r(this, FUNC(darkhors_state::input_r)); - map(0x58000c, 0x58000f).w(this, FUNC(darkhors_state::input_sel_w)); + map(0x580008, 0x58000b).r(FUNC(darkhors_state::input_r)); + map(0x58000c, 0x58000f).w(FUNC(darkhors_state::input_sel_w)); // AM_RANGE(0x580010, 0x580013) AM_WRITE // AM_RANGE(0x580018, 0x58001b) AM_WRITE // AM_RANGE(0x58001c, 0x58001f) AM_WRITE @@ -814,12 +814,12 @@ void darkhors_state::darkhors_map(address_map &map) // AM_RANGE(0x58008c, 0x58008f) AM_WRITE map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x580401, 0x580401).rw(this, FUNC(darkhors_state::console_r), FUNC(darkhors_state::console_w)); - map(0x580421, 0x580421).r(this, FUNC(darkhors_state::console_status_r)); + map(0x580401, 0x580401).rw(FUNC(darkhors_state::console_r), FUNC(darkhors_state::console_w)); + map(0x580421, 0x580421).r(FUNC(darkhors_state::console_status_r)); map(0x800000, 0x86bfff).ram(); - map(0x86c000, 0x86ffff).ram().w(this, FUNC(darkhors_state::tmapram_w)).share("tmapram"); - map(0x870000, 0x873fff).ram().w(this, FUNC(darkhors_state::tmapram2_w)).share("tmapram2"); + map(0x86c000, 0x86ffff).ram().w(FUNC(darkhors_state::tmapram_w)).share("tmapram"); + map(0x870000, 0x873fff).ram().w(FUNC(darkhors_state::tmapram2_w)).share("tmapram2"); map(0x874000, 0x87dfff).ram(); map(0x87e000, 0x87ffff).ram().share("spriteram"); map(0x880000, 0x89ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp index 2cb948d001b..7411bd5590f 100644 --- a/src/mame/drivers/jedi.cpp +++ b/src/mame/drivers/jedi.cpp @@ -250,26 +250,26 @@ WRITE8_MEMBER(jedi_state::nvram_enable_w) void jedi_state::main_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x0800, 0x08ff).mirror(0x0300).ram().w(this, FUNC(jedi_state::nvram_data_w)).share("nvram"); + map(0x0800, 0x08ff).mirror(0x0300).ram().w(FUNC(jedi_state::nvram_data_w)).share("nvram"); map(0x0c00, 0x0c00).mirror(0x03fe).portr("0c00").nopw(); map(0x0c01, 0x0c01).mirror(0x03fe).portr("0c01").nopw(); map(0x1000, 0x13ff).noprw(); - map(0x1400, 0x1400).mirror(0x03ff).r(this, FUNC(jedi_state::jedi_audio_ack_latch_r)).nopw(); + map(0x1400, 0x1400).mirror(0x03ff).r(FUNC(jedi_state::jedi_audio_ack_latch_r)).nopw(); map(0x1800, 0x1800).mirror(0x03ff).r("adc", FUNC(adc0808_device::data_r)).nopw(); - map(0x1c00, 0x1c01).mirror(0x007e).nopr().w(this, FUNC(jedi_state::nvram_enable_w)); + map(0x1c00, 0x1c01).mirror(0x007e).nopr().w(FUNC(jedi_state::nvram_enable_w)); map(0x1c80, 0x1c87).mirror(0x0078).nopr().w("adc", FUNC(adc0808_device::address_offset_start_w)); map(0x1d00, 0x1d00).mirror(0x007f).noprw(); /* write: NVRAM store */ map(0x1d80, 0x1d80).mirror(0x007f).nopr().w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x1e00, 0x1e00).mirror(0x007f).nopr().w(this, FUNC(jedi_state::main_irq_ack_w)); + map(0x1e00, 0x1e00).mirror(0x007f).nopr().w(FUNC(jedi_state::main_irq_ack_w)); map(0x1e80, 0x1e87).mirror(0x0078).nopr().w("outlatch", FUNC(ls259_device::write_d7)); - map(0x1f00, 0x1f00).mirror(0x007f).nopr().w(this, FUNC(jedi_state::jedi_audio_latch_w)); - map(0x1f80, 0x1f80).mirror(0x007f).nopr().w(this, FUNC(jedi_state::rom_banksel_w)); + map(0x1f00, 0x1f00).mirror(0x007f).nopr().w(FUNC(jedi_state::jedi_audio_latch_w)); + map(0x1f80, 0x1f80).mirror(0x007f).nopr().w(FUNC(jedi_state::rom_banksel_w)); map(0x2000, 0x27ff).ram().share("backgroundram"); map(0x2800, 0x2fff).ram().share("paletteram"); map(0x3000, 0x37bf).ram().share("foregroundram"); map(0x37c0, 0x3bff).ram().share("spriteram"); - map(0x3c00, 0x3c01).mirror(0x00fe).nopr().w(this, FUNC(jedi_state::jedi_vscroll_w)); - map(0x3d00, 0x3d01).mirror(0x00fe).nopr().w(this, FUNC(jedi_state::jedi_hscroll_w)); + map(0x3c00, 0x3c01).mirror(0x00fe).nopr().w(FUNC(jedi_state::jedi_vscroll_w)); + map(0x3d00, 0x3d01).mirror(0x00fe).nopr().w(FUNC(jedi_state::jedi_hscroll_w)); map(0x3e00, 0x3e00).mirror(0x01ff).writeonly().share("smoothing_table"); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp index 7c3e32d5541..2a85e252f56 100644 --- a/src/mame/drivers/jeutel.cpp +++ b/src/mame/drivers/jeutel.cpp @@ -92,7 +92,7 @@ void jeutel_state::jeutel_cpu3(address_map &map) map.unmap_value_high(); map(0x0000, 0x0fff).rom().region("roms", 0x3000); map(0x4000, 0x43ff).ram(); - map(0x8000, 0x8000).w(this, FUNC(jeutel_state::sndcmd_w)); + map(0x8000, 0x8000).w(FUNC(jeutel_state::sndcmd_w)); } void jeutel_state::jeutel_cpu3_io(address_map &map) diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp index 7a7a91cf426..c3bac14cc78 100644 --- a/src/mame/drivers/joctronic.cpp +++ b/src/mame/drivers/joctronic.cpp @@ -132,17 +132,17 @@ void joctronic_state::maincpu_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x3fff).mirror(0x4000).rom(); map(0x8000, 0x87ff).mirror(0x0800).ram().share("nvram"); - map(0x9000, 0x9007).mirror(0x0ff8).r(this, FUNC(joctronic_state::csin_r)); // CSIN + map(0x9000, 0x9007).mirror(0x0ff8).r(FUNC(joctronic_state::csin_r)); // CSIN map(0xa000, 0xa007).mirror(0x0ff8).w("mainlatch", FUNC(ls259_device::write_d0)); // PORTDS - map(0xc000, 0xc000).mirror(0x0fc7).w(this, FUNC(joctronic_state::display_1_w)); // CSD1 - map(0xc008, 0xc008).mirror(0x0fc7).w(this, FUNC(joctronic_state::display_2_w)); // CSD2 - map(0xc010, 0xc010).mirror(0x0fc7).w(this, FUNC(joctronic_state::display_3_w)); // CSD3 - map(0xc018, 0xc018).mirror(0x0fc7).w(this, FUNC(joctronic_state::display_4_w)); // CSD4 - map(0xc020, 0xc020).mirror(0x0fc7).w(this, FUNC(joctronic_state::display_a_w)); // CSDA - map(0xc028, 0xc028).mirror(0x0fc7).w(this, FUNC(joctronic_state::drivers_l_w)); // OL - map(0xc030, 0xc030).mirror(0x0fc7).w(this, FUNC(joctronic_state::drivers_b_w)); // OB - map(0xc038, 0xc03f).mirror(0x0fc0).w(this, FUNC(joctronic_state::drivers_w)); // OA - map(0xe000, 0xe000).mirror(0x0fff).w(this, FUNC(joctronic_state::soundlatch_nmi_w)); // PSON + map(0xc000, 0xc000).mirror(0x0fc7).w(FUNC(joctronic_state::display_1_w)); // CSD1 + map(0xc008, 0xc008).mirror(0x0fc7).w(FUNC(joctronic_state::display_2_w)); // CSD2 + map(0xc010, 0xc010).mirror(0x0fc7).w(FUNC(joctronic_state::display_3_w)); // CSD3 + map(0xc018, 0xc018).mirror(0x0fc7).w(FUNC(joctronic_state::display_4_w)); // CSD4 + map(0xc020, 0xc020).mirror(0x0fc7).w(FUNC(joctronic_state::display_a_w)); // CSDA + map(0xc028, 0xc028).mirror(0x0fc7).w(FUNC(joctronic_state::drivers_l_w)); // OL + map(0xc030, 0xc030).mirror(0x0fc7).w(FUNC(joctronic_state::drivers_b_w)); // OB + map(0xc038, 0xc03f).mirror(0x0fc0).w(FUNC(joctronic_state::drivers_w)); // OA + map(0xe000, 0xe000).mirror(0x0fff).w(FUNC(joctronic_state::soundlatch_nmi_w)); // PSON } READ8_MEMBER(joctronic_state::inputs_r) @@ -184,15 +184,15 @@ void joctronic_state::slalom03_maincpu_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).mirror(0x0800).ram().share("nvram"); map(0x9000, 0x9007).mirror(0x0ff8).w("mainlatch", FUNC(ls259_device::write_d0)); // CSPORT - map(0xa008, 0xa008).mirror(0x0fc7).w(this, FUNC(joctronic_state::display_strobe_w)); // STROBE - map(0xa010, 0xa017).mirror(0x0fc0).w(this, FUNC(joctronic_state::drivers_w)); - map(0xa018, 0xa018).mirror(0x0fc7).w(this, FUNC(joctronic_state::display_ck_w)); // CKD - map(0xa020, 0xa020).mirror(0x0fc7).r(this, FUNC(joctronic_state::inputs_r)); // CSS + map(0xa008, 0xa008).mirror(0x0fc7).w(FUNC(joctronic_state::display_strobe_w)); // STROBE + map(0xa010, 0xa017).mirror(0x0fc0).w(FUNC(joctronic_state::drivers_w)); + map(0xa018, 0xa018).mirror(0x0fc7).w(FUNC(joctronic_state::display_ck_w)); // CKD + map(0xa020, 0xa020).mirror(0x0fc7).r(FUNC(joctronic_state::inputs_r)); // CSS map(0xa028, 0xa028).mirror(0x0fc7).nopr(); // N.C. map(0xa030, 0xa030).mirror(0x0fc7).nopr(); // N.C. - map(0xa038, 0xa038).mirror(0x0fc7).r(this, FUNC(joctronic_state::ports_r)); // CSP - map(0xe000, 0xe000).mirror(0x0fff).r(this, FUNC(joctronic_state::csint_r)); // CSINT - map(0xf000, 0xf000).mirror(0x0fff).w(this, FUNC(joctronic_state::soundlatch_nmi_pulse_w)); // CSSON + map(0xa038, 0xa038).mirror(0x0fc7).r(FUNC(joctronic_state::ports_r)); // CSP + map(0xe000, 0xe000).mirror(0x0fff).r(FUNC(joctronic_state::csint_r)); // CSINT + map(0xf000, 0xf000).mirror(0x0fff).w(FUNC(joctronic_state::soundlatch_nmi_pulse_w)); // CSSON } READ8_MEMBER(joctronic_state::bldyrolr_unknown_r) @@ -209,7 +209,7 @@ WRITE8_MEMBER(joctronic_state::bldyrolr_unknown_w) void joctronic_state::bldyrolr_maincpu_map(address_map &map) { slalom03_maincpu_map(map); - map(0xc000, 0xc000).rw(this, FUNC(joctronic_state::bldyrolr_unknown_r), FUNC(joctronic_state::bldyrolr_unknown_w)); + map(0xc000, 0xc000).rw(FUNC(joctronic_state::bldyrolr_unknown_r), FUNC(joctronic_state::bldyrolr_unknown_w)); } void joctronic_state::maincpu_io_map(address_map &map) @@ -269,8 +269,8 @@ void joctronic_state::joctronic_sound_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x4000).rom(); map(0x8000, 0x87ff).mirror(0x1800).ram(); // only lower half of 2016 used? - map(0xc000, 0xc000).mirror(0x1fff).r(this, FUNC(joctronic_state::soundlatch_nmi_r)); // SCSP - map(0xe000, 0xe000).mirror(0x1fff).w(this, FUNC(joctronic_state::resint_w)); + map(0xc000, 0xc000).mirror(0x1fff).r(FUNC(joctronic_state::soundlatch_nmi_r)); // SCSP + map(0xe000, 0xe000).mirror(0x1fff).w(FUNC(joctronic_state::resint_w)); } void joctronic_state::joctronic_sound_io_map(address_map &map) @@ -296,8 +296,8 @@ void joctronic_state::slalom03_sound_io_map(address_map &map) map(0x01, 0x01).w("aysnd1", FUNC(ay8910_device::data_w)); map(0x02, 0x02).w("aysnd2", FUNC(ay8910_device::address_w)); map(0x03, 0x03).w("aysnd2", FUNC(ay8910_device::data_w)); - map(0x04, 0x04).mirror(0x01).r(this, FUNC(joctronic_state::soundlatch_r)); // CSPORT - map(0x06, 0x06).mirror(0x01).w(this, FUNC(joctronic_state::resint_w)); // RESINT + map(0x04, 0x04).mirror(0x01).r(FUNC(joctronic_state::soundlatch_r)); // CSPORT + map(0x06, 0x06).mirror(0x01).w(FUNC(joctronic_state::resint_w)); // RESINT } static const z80_daisy_config daisy_chain[] = @@ -363,8 +363,8 @@ MACHINE_CONFIG_START(joctronic_state::joctronic) // Datasheet suggests YM2203 as a possible replacement for this AY8910 MCFG_DEVICE_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r1", dac_8bit_r2r_device, write)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("r2r2", dac_8bit_r2r_device, write)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r1", dac_8bit_r2r_device, data_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("r2r2", dac_8bit_r2r_device, data_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_DEVICE_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz @@ -415,7 +415,7 @@ MACHINE_CONFIG_START(joctronic_state::slalom03) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_DEVICE_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r", dac_8bit_r2r_device, write)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r", dac_8bit_r2r_device, data_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_DEVICE_ADD("r2r", DAC_8BIT_R2R, 0) diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp index af7afd78370..a823960cb02 100644 --- a/src/mame/drivers/jokrwild.cpp +++ b/src/mame/drivers/jokrwild.cpp @@ -180,9 +180,9 @@ READ8_MEMBER(jokrwild_state::rng_r) void jokrwild_state::jokrwild_map(address_map &map) { - map(0x0000, 0x03ff).ram().w(this, FUNC(jokrwild_state::jokrwild_videoram_w)).share("videoram"); + map(0x0000, 0x03ff).ram().w(FUNC(jokrwild_state::jokrwild_videoram_w)).share("videoram"); map(0x0400, 0x07ff).ram(); //FIXME: backup RAM - map(0x2000, 0x23ff).ram().w(this, FUNC(jokrwild_state::jokrwild_colorram_w)).share("colorram"); + map(0x2000, 0x23ff).ram().w(FUNC(jokrwild_state::jokrwild_colorram_w)).share("colorram"); map(0x2400, 0x27ff).ram(); //stack RAM map(0x4004, 0x4007).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x4008, 0x400b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); //optical sensor is here @@ -190,7 +190,7 @@ void jokrwild_state::jokrwild_map(address_map &map) map(0x6000, 0x6000).w("crtc", FUNC(mc6845_device::address_w)); map(0x6001, 0x6001).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x6100, 0x6100).portr("SW1"); - map(0x6200, 0x6203).r(this, FUNC(jokrwild_state::rng_r));//another PIA? + map(0x6200, 0x6203).r(FUNC(jokrwild_state::rng_r));//another PIA? map(0x6300, 0x6300).portr("SW2"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index 8546a8ed25a..81d2f76b76f 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -251,11 +251,11 @@ void jollyjgr_state::jollyjgr_map(address_map &map) map(0x8ff9, 0x8ff9).portr("INPUTS"); map(0x8ff8, 0x8ff8).w("aysnd", FUNC(ay8910_device::address_w)); map(0x8ffa, 0x8ffa).portr("SYSTEM").w("aysnd", FUNC(ay8910_device::data_w)); - map(0x8ffc, 0x8ffc).w(this, FUNC(jollyjgr_state::jollyjgr_misc_w)); - map(0x8ffd, 0x8ffd).w(this, FUNC(jollyjgr_state::jollyjgr_coin_lookout_w)); + map(0x8ffc, 0x8ffc).w(FUNC(jollyjgr_state::jollyjgr_misc_w)); + map(0x8ffd, 0x8ffd).w(FUNC(jollyjgr_state::jollyjgr_coin_lookout_w)); map(0x8fff, 0x8fff).portr("DSW2"); - map(0x9000, 0x93ff).ram().w(this, FUNC(jollyjgr_state::jollyjgr_videoram_w)).share("videoram"); - map(0x9800, 0x983f).ram().w(this, FUNC(jollyjgr_state::jollyjgr_attrram_w)).share("colorram"); + map(0x9000, 0x93ff).ram().w(FUNC(jollyjgr_state::jollyjgr_videoram_w)).share("videoram"); + map(0x9800, 0x983f).ram().w(FUNC(jollyjgr_state::jollyjgr_attrram_w)).share("colorram"); map(0x9840, 0x987f).ram().share("spriteram"); map(0x9880, 0x9bff).ram(); map(0xa000, 0xffff).ram().share("bitmap"); @@ -269,11 +269,11 @@ void jollyjgr_state::fspider_map(address_map &map) map(0x8ff9, 0x8ff9).portr("INPUTS"); map(0x8ff8, 0x8ff8).w("aysnd", FUNC(ay8910_device::address_w)); map(0x8ffa, 0x8ffa).portr("SYSTEM").w("aysnd", FUNC(ay8910_device::data_w)); - map(0x8ffc, 0x8ffc).w(this, FUNC(jollyjgr_state::jollyjgr_misc_w)); - map(0x8ffd, 0x8ffd).w(this, FUNC(jollyjgr_state::jollyjgr_coin_lookout_w)); + map(0x8ffc, 0x8ffc).w(FUNC(jollyjgr_state::jollyjgr_misc_w)); + map(0x8ffd, 0x8ffd).w(FUNC(jollyjgr_state::jollyjgr_coin_lookout_w)); map(0x8fff, 0x8fff).portr("DSW2"); - map(0x9000, 0x93ff).ram().w(this, FUNC(jollyjgr_state::jollyjgr_videoram_w)).share("videoram"); - map(0x9800, 0x983f).ram().w(this, FUNC(jollyjgr_state::jollyjgr_attrram_w)).share("colorram"); + map(0x9000, 0x93ff).ram().w(FUNC(jollyjgr_state::jollyjgr_videoram_w)).share("videoram"); + map(0x9800, 0x983f).ram().w(FUNC(jollyjgr_state::jollyjgr_attrram_w)).share("colorram"); map(0x9840, 0x987f).ram().share("spriteram"); map(0x9880, 0x989f).ram(); // ? map(0x98a0, 0x98af).ram().share("bulletram"); diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp index eceee46920f..b9ddbcc257e 100644 --- a/src/mame/drivers/jongkyo.cpp +++ b/src/mame/drivers/jongkyo.cpp @@ -244,7 +244,7 @@ WRITE8_MEMBER(jongkyo_state::unknown_w) void jongkyo_state::jongkyo_memmap(address_map &map) { - map(0x0000, 0x3fff).rom().w(this, FUNC(jongkyo_state::videoram2_w)); // wrong, this doesn't seem to be video ram on write.. + map(0x0000, 0x3fff).rom().w(FUNC(jongkyo_state::videoram2_w)); // wrong, this doesn't seem to be video ram on write.. map(0x4000, 0x6bff).rom(); // fixed rom map(0x6c00, 0x6fff).bankr("bank1"); // banked (8 banks) map(0x7000, 0x77ff).ram(); @@ -265,12 +265,12 @@ void jongkyo_state::jongkyo_portmap(address_map &map) map(0x01, 0x01).r("aysnd", FUNC(ay8910_device::data_r)); map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW").w(this, FUNC(jongkyo_state::jongkyo_coin_counter_w)); - map(0x11, 0x11).portr("IN0").w(this, FUNC(jongkyo_state::mux_w)); + map(0x10, 0x10).portr("DSW").w(FUNC(jongkyo_state::jongkyo_coin_counter_w)); + map(0x11, 0x11).portr("IN0").w(FUNC(jongkyo_state::mux_w)); // W 11 select keyboard row (fe fd fb f7) map(0x40, 0x40).nopr(); // unknown, if (A & 0xf) == 0x0a then a bit 0 write to 0x7520 doesn't occur - map(0x40, 0x45).w(this, FUNC(jongkyo_state::bank_select_w)); - map(0x46, 0x4f).w(this, FUNC(jongkyo_state::unknown_w)); + map(0x40, 0x45).w(FUNC(jongkyo_state::bank_select_w)); + map(0x46, 0x4f).w(FUNC(jongkyo_state::unknown_w)); } /************************************* diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp index 9cf14b1cd17..8a79461400c 100644 --- a/src/mame/drivers/jonos.cpp +++ b/src/mame/drivers/jonos.cpp @@ -57,9 +57,9 @@ void jonos_state::jonos_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x0fff).rom().region("roms", 0); map(0x1800, 0x27ff).ram().share("videoram"); - map(0x3000, 0x3001).w(this, FUNC(jonos_state::cursor_w)); // unknown device + map(0x3000, 0x3001).w(FUNC(jonos_state::cursor_w)); // unknown device map(0x4000, 0x4001); // unknown device - map(0x5000, 0x5003).r(this, FUNC(jonos_state::keyboard_r)); // unknown device + map(0x5000, 0x5003).r(FUNC(jonos_state::keyboard_r)); // unknown device map(0x6000, 0x6001); // unknown device } diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index 1acba3dc91e..d0bc240abf6 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -429,7 +429,7 @@ READ16_MEMBER(joystand_state::cart_r) { int which = offset / 0x80000; int addr = offset & 0x7ffff; - return (m_cart_flash[which * 2 + 0]->read(addr) << 8) | m_cart_flash[which * 2 + 1]->read(addr); + return (m_cart_flash[which * 2 + 0]->read(space, addr) << 8) | m_cart_flash[which * 2 + 1]->read(space, addr); } WRITE16_MEMBER(joystand_state::cart_w) @@ -438,9 +438,9 @@ WRITE16_MEMBER(joystand_state::cart_w) int addr = offset & 0x7ffff; if (ACCESSING_BITS_0_7) - m_cart_flash[which * 2 + 1]->write(addr, data & 0xff); + m_cart_flash[which * 2 + 1]->write(space, addr, data & 0xff); if (ACCESSING_BITS_8_15) - m_cart_flash[which * 2 + 0]->write(addr, data >> 8); + m_cart_flash[which * 2 + 0]->write(space, addr, data >> 8); bg15_tiles_dirty = true; } @@ -452,26 +452,26 @@ void joystand_state::joystand_map(address_map &map) map(0x200000, 0x200003).w("ym2413", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x200009, 0x200009).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x200010, 0x200011).portr("IN0"); // r/w - map(0x200012, 0x200013).ram().w(this, FUNC(joystand_state::outputs_w)).share("outputs"); // r/w - map(0x200014, 0x200015).rw(this, FUNC(joystand_state::fpga_r), FUNC(joystand_state::oki_bank_w)); // r/w + map(0x200012, 0x200013).ram().w(FUNC(joystand_state::outputs_w)).share("outputs"); // r/w + map(0x200014, 0x200015).rw(FUNC(joystand_state::fpga_r), FUNC(joystand_state::oki_bank_w)); // r/w // AM_RANGE(0x200016, 0x200017) // write $9190 at boot - map(0x400000, 0x47ffff).ram().w(this, FUNC(joystand_state::bg15_0_w)).share("bg15_0_ram"); // r5g5b5 200x200 pixel-based + map(0x400000, 0x47ffff).ram().w(FUNC(joystand_state::bg15_0_w)).share("bg15_0_ram"); // r5g5b5 200x200 pixel-based map(0x480000, 0x4fffff).ram(); // more rgb layers? (writes at offset 0) map(0x500000, 0x57ffff).ram(); // "" map(0x580000, 0x5fffff).ram(); // "" - map(0x600000, 0x603fff).ram().w(this, FUNC(joystand_state::bg2_w)).share("bg2_ram"); - map(0x604000, 0x605fff).ram().w(this, FUNC(joystand_state::bg1_w)).share("bg1_ram"); - map(0x606000, 0x607fff).ram().w(this, FUNC(joystand_state::bg15_1_w)).share("bg15_1_ram"); // r5g5b5 200x200 tile-based + map(0x600000, 0x603fff).ram().w(FUNC(joystand_state::bg2_w)).share("bg2_ram"); + map(0x604000, 0x605fff).ram().w(FUNC(joystand_state::bg1_w)).share("bg1_ram"); + map(0x606000, 0x607fff).ram().w(FUNC(joystand_state::bg15_1_w)).share("bg15_1_ram"); // r5g5b5 200x200 tile-based map(0x608000, 0x609fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x60c000, 0x60c003).ram().share("scroll"); // write map(0x60c00c, 0x60c00d).ram().share("enable"); // write - map(0x800000, 0xdfffff).rw(this, FUNC(joystand_state::cart_r), FUNC(joystand_state::cart_w)); // r/w (cart flash) + map(0x800000, 0xdfffff).rw(FUNC(joystand_state::cart_r), FUNC(joystand_state::cart_w)); // r/w (cart flash) // AM_RANGE(0xe00080, 0xe00081) // write (bit 0 = cart? bit 1 = ? bit 3 = ?) - map(0xe00000, 0xe00001).r(this, FUNC(joystand_state::e00000_r)); // copy slot - map(0xe00020, 0xe00021).r(this, FUNC(joystand_state::e00020_r)); // master slot + map(0xe00000, 0xe00001).r(FUNC(joystand_state::e00000_r)); // copy slot + map(0xe00020, 0xe00021).r(FUNC(joystand_state::e00020_r)); // master slot map(0xe80040, 0xe8005f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)).umask16(0x00ff); diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp index 1d6612742d1..e2ab1017a7c 100644 --- a/src/mame/drivers/jp.cpp +++ b/src/mame/drivers/jp.cpp @@ -91,17 +91,17 @@ void jp_state::jp_map(address_map &map) map(0x6000, 0x6000).mirror(0x1ffc).w("ay", FUNC(ay8910_device::address_w)); map(0x6001, 0x6001).mirror(0x1ffc).r("ay", FUNC(ay8910_device::data_r)); map(0x6002, 0x6002).mirror(0x1ffc).w("ay", FUNC(ay8910_device::data_w)); - map(0xa000, 0xa007).mirror(0x1ff8).w(this, FUNC(jp_state::out1_w)); - map(0xc000, 0xc007).mirror(0x1ff8).w(this, FUNC(jp_state::out2_w)); + map(0xa000, 0xa007).mirror(0x1ff8).w(FUNC(jp_state::out1_w)); + map(0xc000, 0xc007).mirror(0x1ff8).w(FUNC(jp_state::out2_w)); } void jp_state::jp_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); // includes ADPCM data from 0x0400 to 0x3fff map(0x4000, 0x47ff).ram(); - map(0x5000, 0x5000).w(this, FUNC(jp_state::sample_bank_w)); + map(0x5000, 0x5000).w(FUNC(jp_state::sample_bank_w)); map(0x6000, 0x6000).w(m_adpcm_select, FUNC(ls157_device::ba_w)); - map(0x7000, 0x7000).w(this, FUNC(jp_state::adpcm_reset_w)); + map(0x7000, 0x7000).w(FUNC(jp_state::adpcm_reset_w)); map(0x8000, 0xffff).bankr("adpcm_bank"); } diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp index 5ac682f9b23..46af39a3737 100644 --- a/src/mame/drivers/jpmimpct.cpp +++ b/src/mame/drivers/jpmimpct.cpp @@ -592,18 +592,18 @@ void jpmimpct_state::m68k_program_map(address_map &map) map(0x00000000, 0x000fffff).rom(); map(0x00100000, 0x001fffff).rom(); map(0x00400000, 0x00403fff).ram().share("nvram"); - map(0x00480000, 0x0048001f).rw(this, FUNC(jpmimpct_state::duart_1_r), FUNC(jpmimpct_state::duart_1_w)); - map(0x00480020, 0x00480033).r(this, FUNC(jpmimpct_state::inputs1_r)); - map(0x00480034, 0x00480035).r(this, FUNC(jpmimpct_state::unk_r)); - map(0x00480060, 0x00480067).rw(this, FUNC(jpmimpct_state::unk_r), FUNC(jpmimpct_state::unk_w));//PPI - map(0x00480080, 0x00480081).w(this, FUNC(jpmimpct_state::upd7759_w)); - map(0x00480082, 0x00480083).w(this, FUNC(jpmimpct_state::volume_w)); - map(0x00480084, 0x00480085).r(this, FUNC(jpmimpct_state::upd7759_r)); - map(0x004800a0, 0x004800af).rw(this, FUNC(jpmimpct_state::jpmio_r), FUNC(jpmimpct_state::jpmio_w)); - map(0x004800e0, 0x004800e1).w(this, FUNC(jpmimpct_state::unk_w)); - map(0x004801dc, 0x004801dd).r(this, FUNC(jpmimpct_state::unk_r)); - map(0x004801de, 0x004801df).r(this, FUNC(jpmimpct_state::unk_r)); - map(0x004801e0, 0x004801ff).rw(this, FUNC(jpmimpct_state::duart_2_r), FUNC(jpmimpct_state::duart_2_w)); + map(0x00480000, 0x0048001f).rw(FUNC(jpmimpct_state::duart_1_r), FUNC(jpmimpct_state::duart_1_w)); + map(0x00480020, 0x00480033).r(FUNC(jpmimpct_state::inputs1_r)); + map(0x00480034, 0x00480035).r(FUNC(jpmimpct_state::unk_r)); + map(0x00480060, 0x00480067).rw(FUNC(jpmimpct_state::unk_r), FUNC(jpmimpct_state::unk_w));//PPI + map(0x00480080, 0x00480081).w(FUNC(jpmimpct_state::upd7759_w)); + map(0x00480082, 0x00480083).w(FUNC(jpmimpct_state::volume_w)); + map(0x00480084, 0x00480085).r(FUNC(jpmimpct_state::upd7759_r)); + map(0x004800a0, 0x004800af).rw(FUNC(jpmimpct_state::jpmio_r), FUNC(jpmimpct_state::jpmio_w)); + map(0x004800e0, 0x004800e1).w(FUNC(jpmimpct_state::unk_w)); + map(0x004801dc, 0x004801dd).r(FUNC(jpmimpct_state::unk_r)); + map(0x004801de, 0x004801df).r(FUNC(jpmimpct_state::unk_r)); + map(0x004801e0, 0x004801ff).rw(FUNC(jpmimpct_state::duart_2_r), FUNC(jpmimpct_state::duart_2_w)); map(0x00800000, 0x00800007).rw(m_dsp, FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w)); map(0x00c00000, 0x00cfffff).rom(); map(0x00d00000, 0x00dfffff).rom(); @@ -620,23 +620,23 @@ void jpmimpct_state::awp68k_program_map(address_map &map) { map(0x00000000, 0x000fffff).rom(); // most games are 0x00000000 - 0x0003ffff, but some QPS ones go up to fffff, check for any mirroring etc. map(0x00400000, 0x00403fff).ram().share("nvram"); - map(0x00480000, 0x0048001f).rw(this, FUNC(jpmimpct_state::duart_1_r), FUNC(jpmimpct_state::duart_1_w)); - map(0x00480020, 0x00480033).r(this, FUNC(jpmimpct_state::inputs1awp_r)); - map(0x00480034, 0x00480035).r(this, FUNC(jpmimpct_state::ump_r)); - map(0x00480040, 0x00480041).r(this, FUNC(jpmimpct_state::optos_r)); + map(0x00480000, 0x0048001f).rw(FUNC(jpmimpct_state::duart_1_r), FUNC(jpmimpct_state::duart_1_w)); + map(0x00480020, 0x00480033).r(FUNC(jpmimpct_state::inputs1awp_r)); + map(0x00480034, 0x00480035).r(FUNC(jpmimpct_state::ump_r)); + map(0x00480040, 0x00480041).r(FUNC(jpmimpct_state::optos_r)); map(0x00480060, 0x00480067).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x00480080, 0x00480081).w(this, FUNC(jpmimpct_state::upd7759_w)); - map(0x00480082, 0x00480083).w(this, FUNC(jpmimpct_state::volume_w)); - map(0x00480084, 0x00480085).r(this, FUNC(jpmimpct_state::upd7759_r)); - map(0x00480086, 0x0048009f).r(this, FUNC(jpmimpct_state::prot_1_r)); - map(0x004800a0, 0x004800af).rw(this, FUNC(jpmimpct_state::jpmio_r), FUNC(jpmimpct_state::jpmioawp_w)); + map(0x00480080, 0x00480081).w(FUNC(jpmimpct_state::upd7759_w)); + map(0x00480082, 0x00480083).w(FUNC(jpmimpct_state::volume_w)); + map(0x00480084, 0x00480085).r(FUNC(jpmimpct_state::upd7759_r)); + map(0x00480086, 0x0048009f).r(FUNC(jpmimpct_state::prot_1_r)); + map(0x004800a0, 0x004800af).rw(FUNC(jpmimpct_state::jpmio_r), FUNC(jpmimpct_state::jpmioawp_w)); // AM_RANGE(0x004800b0, 0x004800df) AM_READ(prot_1_r) // AM_RANGE(0x004800e0, 0x004800e1) AM_WRITE(unk_w) // AM_RANGE(0x00480086, 0x006576ff) AM_READ(prot_1_r) - map(0x004801dc, 0x004801dd).r(this, FUNC(jpmimpct_state::prot_1_r)); - map(0x004801de, 0x006575ff).r(this, FUNC(jpmimpct_state::prot_1_r)); - map(0x00657600, 0x00657601).r(this, FUNC(jpmimpct_state::prot_0_r)); - map(0x00657602, 0x00ffffff).r(this, FUNC(jpmimpct_state::prot_1_r)); + map(0x004801dc, 0x004801dd).r(FUNC(jpmimpct_state::prot_1_r)); + map(0x004801de, 0x006575ff).r(FUNC(jpmimpct_state::prot_1_r)); + map(0x00657600, 0x00657601).r(FUNC(jpmimpct_state::prot_0_r)); + map(0x00657602, 0x00ffffff).r(FUNC(jpmimpct_state::prot_1_r)); // AM_RANGE(0x004801dc, 0x004801dd) AM_READ(unk_r) // AM_RANGE(0x004801de, 0x004801df) AM_READ(unk_r) @@ -661,7 +661,7 @@ void jpmimpct_state::tms_program_map(address_map &map) map(0x00800000, 0x00ffffff).mirror(0xf8000000).rom().region("user1", 0x100000); map(0x02000000, 0x027fffff).mirror(0xf8000000).rom().region("user1", 0); // AM_RANGE(0x01000000, 0x0100003f) AM_MIRROR(0xf87fffc0) AM_READWRITE(jpmimpct_bt477_r, jpmimpct_bt477_w) - map(0x01000000, 0x017fffff).mirror(0xf8000000).mask(0x1f).rw(this, FUNC(jpmimpct_state::jpmimpct_bt477_r), FUNC(jpmimpct_state::jpmimpct_bt477_w)); + map(0x01000000, 0x017fffff).mirror(0xf8000000).mask(0x1f).rw(FUNC(jpmimpct_state::jpmimpct_bt477_r), FUNC(jpmimpct_state::jpmimpct_bt477_w)); map(0x07800000, 0x07bfffff).mirror(0xf8400000).ram(); map(0xc0000000, 0xc00001ff).rw(m_dsp, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); } diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp index f7d8d89c05c..9d93ed80713 100644 --- a/src/mame/drivers/jpmsys5.cpp +++ b/src/mame/drivers/jpmsys5.cpp @@ -286,33 +286,33 @@ void jpmsys5_state::jpm_sys5_common_map(address_map &map) map(0x046080, 0x046083).rw("acia6850_1", FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0x04608c, 0x04608f).rw("acia6850_2", FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0x0460c0, 0x0460c1).nopw(); - map(0x048000, 0x04801f).rw(this, FUNC(jpmsys5_state::coins_r), FUNC(jpmsys5_state::coins_w)); - map(0x04c000, 0x04c0ff).r(this, FUNC(jpmsys5_state::mux_r)).w(this, FUNC(jpmsys5_state::mux_w)); + map(0x048000, 0x04801f).rw(FUNC(jpmsys5_state::coins_r), FUNC(jpmsys5_state::coins_w)); + map(0x04c000, 0x04c0ff).r(FUNC(jpmsys5_state::mux_r)).w(FUNC(jpmsys5_state::mux_w)); } void jpmsys5_state::m68000_awp_map(address_map &map) { jpm_sys5_common_map(map); map(0x0460a0, 0x0460a3).w("ym2413", FUNC(ym2413_device::write)).umask16(0x00ff); - map(0x04c100, 0x04c105).rw(this, FUNC(jpmsys5_state::jpm_upd7759_r), FUNC(jpmsys5_state::jpm_upd7759_w)); + map(0x04c100, 0x04c105).rw(FUNC(jpmsys5_state::jpm_upd7759_r), FUNC(jpmsys5_state::jpm_upd7759_w)); } void jpmsys5_state::m68000_awp_map_saa(address_map &map) { jpm_sys5_common_map(map); map(0x0460a0, 0x0460a3).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff); - map(0x04c100, 0x04c105).rw(this, FUNC(jpmsys5_state::jpm_upd7759_r), FUNC(jpmsys5_state::jpm_upd7759_w)); // do the SAA boards have the UPD? + map(0x04c100, 0x04c105).rw(FUNC(jpmsys5_state::jpm_upd7759_r), FUNC(jpmsys5_state::jpm_upd7759_w)); // do the SAA boards have the UPD? } void jpmsys5v_state::m68000_map(address_map &map) { jpm_sys5_common_map(map); - map(0x01fffe, 0x01ffff).w(this, FUNC(jpmsys5v_state::rombank_w)); // extra on video system (rom board?) (although regular games do write here?) + map(0x01fffe, 0x01ffff).w(FUNC(jpmsys5v_state::rombank_w)); // extra on video system (rom board?) (although regular games do write here?) map(0x020000, 0x03ffff).bankr("bank1"); // extra on video system (rom board?) map(0x0460a0, 0x0460a3).w("ym2413", FUNC(ym2413_device::write)).umask16(0x00ff); - map(0x0460e0, 0x0460e5).w(this, FUNC(jpmsys5v_state::ramdac_w)); // extra on video system (rom board?) - map(0x04c100, 0x04c105).rw(this, FUNC(jpmsys5v_state::jpm_upd7759_r), FUNC(jpmsys5v_state::jpm_upd7759_w)); - map(0x800000, 0xcfffff).rw(this, FUNC(jpmsys5v_state::sys5_tms34061_r), FUNC(jpmsys5v_state::sys5_tms34061_w)); // extra on video system (rom board?) + map(0x0460e0, 0x0460e5).w(FUNC(jpmsys5v_state::ramdac_w)); // extra on video system (rom board?) + map(0x04c100, 0x04c105).rw(FUNC(jpmsys5v_state::jpm_upd7759_r), FUNC(jpmsys5v_state::jpm_upd7759_w)); + map(0x800000, 0xcfffff).rw(FUNC(jpmsys5v_state::sys5_tms34061_r), FUNC(jpmsys5v_state::sys5_tms34061_w)); // extra on video system (rom board?) } diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index f4e62befc94..d1cd8fbc757 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -136,7 +136,7 @@ void jr100_state::jr100_mem(address_map &map) map(0x0000, 0x3fff).ram().share("ram"); map(0xc000, 0xc0ff).ram().share("pcg"); map(0xc100, 0xc3ff).ram().share("vram"); - map(0xc800, 0xc80f).r(m_via, FUNC(via6522_device::read)).w(this, FUNC(jr100_state::jr100_via_w)); + map(0xc800, 0xc80f).r(m_via, FUNC(via6522_device::read)).w(FUNC(jr100_state::jr100_via_w)); map(0xe000, 0xffff).rom(); } diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp index a70e203302b..2e5f3f9f648 100644 --- a/src/mame/drivers/jr200.cpp +++ b/src/mame/drivers/jr200.cpp @@ -384,15 +384,15 @@ void jr200_state::jr200_mem(address_map &map) map(0xa000, 0xbfff).rom(); - map(0xc000, 0xc0ff).rw(this, FUNC(jr200_state::jr200_pcg_1_r), FUNC(jr200_state::jr200_pcg_1_w)); //PCG area (1) + map(0xc000, 0xc0ff).rw(FUNC(jr200_state::jr200_pcg_1_r), FUNC(jr200_state::jr200_pcg_1_w)); //PCG area (1) map(0xc100, 0xc3ff).ram().share("vram"); - map(0xc400, 0xc4ff).rw(this, FUNC(jr200_state::jr200_pcg_2_r), FUNC(jr200_state::jr200_pcg_2_w)); //PCG area (2) + map(0xc400, 0xc4ff).rw(FUNC(jr200_state::jr200_pcg_2_r), FUNC(jr200_state::jr200_pcg_2_w)); //PCG area (2) map(0xc500, 0xc7ff).ram().share("cram"); // 0xc800 - 0xcfff I / O area - map(0xc800, 0xcfff).rw(this, FUNC(jr200_state::mn1271_io_r), FUNC(jr200_state::mn1271_io_w)).share("mn1271_ram"); + map(0xc800, 0xcfff).rw(FUNC(jr200_state::mn1271_io_r), FUNC(jr200_state::mn1271_io_w)).share("mn1271_ram"); - map(0xd000, 0xd7ff).rw(this, FUNC(jr200_state::jr200_bios_char_r), FUNC(jr200_state::jr200_bios_char_w)); //BIOS PCG RAM area + map(0xd000, 0xd7ff).rw(FUNC(jr200_state::jr200_bios_char_r), FUNC(jr200_state::jr200_bios_char_w)); //BIOS PCG RAM area map(0xd800, 0xdfff).rom(); // cart space (header 0x7e) map(0xe000, 0xffff).rom(); } diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp index 948b257c874..d3b01cc5291 100644 --- a/src/mame/drivers/jrpacman.cpp +++ b/src/mame/drivers/jrpacman.cpp @@ -145,7 +145,7 @@ WRITE_LINE_MEMBER(jrpacman_state::irq_mask_w) void jrpacman_state::main_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x47ff).ram().w(this, FUNC(jrpacman_state::jrpacman_videoram_w)).share("videoram"); + map(0x4000, 0x47ff).ram().w(FUNC(jrpacman_state::jrpacman_videoram_w)).share("videoram"); map(0x4800, 0x4fef).ram(); map(0x4ff0, 0x4fff).ram().share("spriteram"); map(0x5000, 0x503f).portr("P1"); @@ -155,7 +155,7 @@ void jrpacman_state::main_map(address_map &map) map(0x5060, 0x506f).writeonly().share("spriteram2"); map(0x5070, 0x5077).w("latch2", FUNC(ls259_device::write_d0)); map(0x5080, 0x50bf).portr("DSW"); - map(0x5080, 0x5080).w(this, FUNC(jrpacman_state::jrpacman_scroll_w)); + map(0x5080, 0x5080).w(FUNC(jrpacman_state::jrpacman_scroll_w)); map(0x50c0, 0x50c0).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x8000, 0xdfff).rom(); } @@ -164,7 +164,7 @@ void jrpacman_state::main_map(address_map &map) void jrpacman_state::port_map(address_map &map) { map.global_mask(0xff); - map(0, 0).w(this, FUNC(jrpacman_state::jrpacman_interrupt_vector_w)); + map(0, 0).w(FUNC(jrpacman_state::jrpacman_interrupt_vector_w)); } diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index ec22b523b76..5b2038a1e1e 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -278,8 +278,8 @@ void jtces40_state::jtc_es40_mem(address_map &map) { map.unmap_value_high(); map(0x0800, 0x1fff).rom(); - map(0x4000, 0x5fff).rw(this, FUNC(jtces40_state::videoram_r), FUNC(jtces40_state::videoram_w)); - map(0x6000, 0x63ff).w(this, FUNC(jtces40_state::banksel_w)); + map(0x4000, 0x5fff).rw(FUNC(jtces40_state::videoram_r), FUNC(jtces40_state::videoram_w)); + map(0x6000, 0x63ff).w(FUNC(jtces40_state::banksel_w)); map(0x7001, 0x7001).mirror(0x0ff0).portr("Y1"); map(0x7002, 0x7002).mirror(0x0ff0).portr("Y2"); map(0x7003, 0x7003).mirror(0x0ff0).portr("Y3"); diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp index 5fcd9252a77..c246267ca53 100644 --- a/src/mame/drivers/jubilee.cpp +++ b/src/mame/drivers/jubilee.cpp @@ -312,8 +312,8 @@ void jubilee_state::jubileep_map(address_map &map) Working RAM = 3400-37FF Color RAM = 3800-3BFF (lower 4-bits) */ - map(0x3000, 0x37ff).ram().w(this, FUNC(jubilee_state::jubileep_videoram_w)).share("videoworkram"); /* TC5517AP battery backed RAM */ - map(0x3800, 0x3bff).ram().w(this, FUNC(jubilee_state::jubileep_colorram_w)).share("colorram"); /* Whole 2114 RAM */ + map(0x3000, 0x37ff).ram().w(FUNC(jubilee_state::jubileep_videoram_w)).share("videoworkram"); /* TC5517AP battery backed RAM */ + map(0x3800, 0x3bff).ram().w(FUNC(jubilee_state::jubileep_colorram_w)).share("colorram"); /* Whole 2114 RAM */ /* CRTC *is* mapped here. Read 00-01 and then write on them. Then does the same for 02-03. Initialization seems incomplete since @@ -578,8 +578,8 @@ READ8_MEMBER(jubilee_state::mux_port_r) void jubilee_state::jubileep_cru_map(address_map &map) { - map(0x00c8, 0x00c8).r(this, FUNC(jubilee_state::mux_port_r)); /* multiplexed input port */ - map(0x0000, 0x07ff).w(this, FUNC(jubilee_state::unk_w)); + map(0x00c8, 0x00c8).r(FUNC(jubilee_state::mux_port_r)); /* multiplexed input port */ + map(0x0000, 0x07ff).w(FUNC(jubilee_state::unk_w)); } /* I/O byte R/W diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp index f69bdec1e7c..0f51f0e4899 100644 --- a/src/mame/drivers/juicebox.cpp +++ b/src/mame/drivers/juicebox.cpp @@ -291,7 +291,7 @@ void juicebox_state::machine_reset() void juicebox_state::juicebox_map(address_map &map) { map(0x00000000, 0x007fffff).rom(); - map(0x04000000, 0x04ffffff).rw(this, FUNC(juicebox_state::juicebox_nand_r), FUNC(juicebox_state::juicebox_nand_w)); + map(0x04000000, 0x04ffffff).rw(FUNC(juicebox_state::juicebox_nand_r), FUNC(juicebox_state::juicebox_nand_w)); map(0x0c000000, 0x0c1fffff).ram().mirror(0x00600000); } @@ -327,7 +327,7 @@ MACHINE_CONFIG_START(juicebox_state::juicebox) MCFG_DEVICE_ADD("s3c44b0", S3C44B0, 10000000) MCFG_S3C44B0_GPIO_PORT_R_CB(READ32(*this, juicebox_state, s3c44b0_gpio_port_r)) MCFG_S3C44B0_GPIO_PORT_W_CB(WRITE32(*this, juicebox_state, s3c44b0_gpio_port_w)) - MCFG_S3C44B0_I2S_DATA_W_CB(WRITE16("dac", dac_word_interface, write)) + MCFG_S3C44B0_I2S_DATA_W_CB(WRITE16("dac", dac_word_interface, data_w)) MCFG_DEVICE_ADD("smartmedia", SMARTMEDIA, 0) diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp index a17f007f5e6..19050485088 100644 --- a/src/mame/drivers/junofrst.cpp +++ b/src/mame/drivers/junofrst.cpp @@ -296,10 +296,10 @@ void junofrst_state::main_map(address_map &map) map(0x8028, 0x8028).portr("P2"); map(0x802c, 0x802c).portr("DSW1"); map(0x8030, 0x8037).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x8040, 0x8040).w(this, FUNC(junofrst_state::sh_irqtrigger_w)); + map(0x8040, 0x8040).w(FUNC(junofrst_state::sh_irqtrigger_w)); map(0x8050, 0x8050).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x8060, 0x8060).w(this, FUNC(junofrst_state::bankselect_w)); - map(0x8070, 0x8073).w(this, FUNC(junofrst_state::blitter_w)); + map(0x8060, 0x8060).w(FUNC(junofrst_state::bankselect_w)); + map(0x8070, 0x8073).w(FUNC(junofrst_state::blitter_w)); map(0x8100, 0x8fff).ram(); map(0x9000, 0x9fff).bankr("bank1"); map(0xa000, 0xffff).rom(); @@ -315,7 +315,7 @@ void junofrst_state::audio_map(address_map &map) map(0x4001, 0x4001).r("aysnd", FUNC(ay8910_device::data_r)); map(0x4002, 0x4002).w("aysnd", FUNC(ay8910_device::data_w)); map(0x5000, 0x5000).w("soundlatch2", FUNC(generic_latch_8_device::write)); - map(0x6000, 0x6000).w(this, FUNC(junofrst_state::i8039_irq_w)); + map(0x6000, 0x6000).w(FUNC(junofrst_state::i8039_irq_w)); } @@ -416,7 +416,7 @@ MACHINE_CONFIG_START(junofrst_state::junofrst) MCFG_DEVICE_ADD("mcu", I8039,8000000) /* 8MHz crystal */ MCFG_DEVICE_PROGRAM_MAP(mcu_map) MCFG_DEVICE_IO_MAP(mcu_io_map) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, junofrst_state, i8039_irqen_and_status_w)) MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B3 diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index a74e0bddb93..15dc311998e 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -429,16 +429,16 @@ void ace_state::ace_mem(address_map &map) void ace_state::ace_io(address_map &map) { - map(0x00, 0x00).mirror(0x00fe).select(0xff00).rw(this, FUNC(ace_state::io_r), FUNC(ace_state::io_w)); + map(0x00, 0x00).mirror(0x00fe).select(0xff00).rw(FUNC(ace_state::io_r), FUNC(ace_state::io_w)); map(0x01, 0x01).mirror(0xff00).portr("JOY"); - map(0x41, 0x41).mirror(0xff80).rw(this, FUNC(ace_state::ppi_pa_r), FUNC(ace_state::ppi_pa_w)); - map(0x43, 0x43).mirror(0xff80).rw(this, FUNC(ace_state::ppi_pb_r), FUNC(ace_state::ppi_pb_w)); - map(0x45, 0x45).mirror(0xff80).rw(this, FUNC(ace_state::ppi_pc_r), FUNC(ace_state::ppi_pc_w)); - map(0x47, 0x47).mirror(0xff80).rw(this, FUNC(ace_state::ppi_control_r), FUNC(ace_state::ppi_control_w)); - map(0x81, 0x81).mirror(0xff38).rw(this, FUNC(ace_state::pio_ad_r), FUNC(ace_state::pio_ad_w)); - map(0x83, 0x83).mirror(0xff38).rw(this, FUNC(ace_state::pio_bd_r), FUNC(ace_state::pio_bd_w)); - map(0x85, 0x85).mirror(0xff38).rw(this, FUNC(ace_state::pio_ac_r), FUNC(ace_state::pio_ac_w)); - map(0x87, 0x87).mirror(0xff38).rw(this, FUNC(ace_state::pio_bc_r), FUNC(ace_state::pio_bc_w)); + map(0x41, 0x41).mirror(0xff80).rw(FUNC(ace_state::ppi_pa_r), FUNC(ace_state::ppi_pa_w)); + map(0x43, 0x43).mirror(0xff80).rw(FUNC(ace_state::ppi_pb_r), FUNC(ace_state::ppi_pb_w)); + map(0x45, 0x45).mirror(0xff80).rw(FUNC(ace_state::ppi_pc_r), FUNC(ace_state::ppi_pc_w)); + map(0x47, 0x47).mirror(0xff80).rw(FUNC(ace_state::ppi_control_r), FUNC(ace_state::ppi_control_w)); + map(0x81, 0x81).mirror(0xff38).rw(FUNC(ace_state::pio_ad_r), FUNC(ace_state::pio_ad_w)); + map(0x83, 0x83).mirror(0xff38).rw(FUNC(ace_state::pio_bd_r), FUNC(ace_state::pio_bd_w)); + map(0x85, 0x85).mirror(0xff38).rw(FUNC(ace_state::pio_ac_r), FUNC(ace_state::pio_ac_w)); + map(0x87, 0x87).mirror(0xff38).rw(FUNC(ace_state::pio_bc_r), FUNC(ace_state::pio_bc_w)); map(0xfd, 0xfd).mirror(0xff00).w(AY8910_TAG, FUNC(ay8910_device::address_w)); map(0xff, 0xff).mirror(0xff00).rw(AY8910_TAG, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); } @@ -798,7 +798,7 @@ MACHINE_CONFIG_START(ace_state::ace) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, ace_state, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, ace_state, pio_pa_w)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp index 539cc4b913b..dcf7829d840 100644 --- a/src/mame/drivers/jupiter.cpp +++ b/src/mame/drivers/jupiter.cpp @@ -149,9 +149,9 @@ void jupiter3_state::jupiter3_mem(address_map &map) void jupiter3_state::jupiter3_io(address_map &map) { map.global_mask(0xff); - map(0xa1, 0xa4).r(this, FUNC(jupiter3_state::ff_r)); - map(0xb0, 0xb0).r(this, FUNC(jupiter3_state::status_r)); - map(0xb2, 0xb2).r(this, FUNC(jupiter3_state::key_r)); + map(0xa1, 0xa4).r(FUNC(jupiter3_state::ff_r)); + map(0xb0, 0xb0).r(FUNC(jupiter3_state::status_r)); + map(0xb2, 0xb2).r(FUNC(jupiter3_state::key_r)); } READ8_MEMBER( jupiter3_state::ff_r ) diff --git a/src/mame/drivers/k1003.cpp b/src/mame/drivers/k1003.cpp index cee0837a538..2ae7770bc22 100644 --- a/src/mame/drivers/k1003.cpp +++ b/src/mame/drivers/k1003.cpp @@ -128,12 +128,12 @@ WRITE8_MEMBER( k1003_state::disp_w ) void k1003_state::k1003_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x00).r(this, FUNC(k1003_state::key_r)); - map(0x02, 0x02).r(this, FUNC(k1003_state::port2_r)); + map(0x00, 0x00).r(FUNC(k1003_state::key_r)); + map(0x02, 0x02).r(FUNC(k1003_state::port2_r)); - map(0x08, 0x08).w(this, FUNC(k1003_state::disp_w)); - map(0x09, 0x09).w(this, FUNC(k1003_state::disp_2_w)); - map(0x10, 0x10).w(this, FUNC(k1003_state::disp_1_w)); + map(0x08, 0x08).w(FUNC(k1003_state::disp_w)); + map(0x09, 0x09).w(FUNC(k1003_state::disp_2_w)); + map(0x10, 0x10).w(FUNC(k1003_state::disp_1_w)); } /* Input ports */ diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp index 7c4c9ecde0a..d307f17be72 100644 --- a/src/mame/drivers/k8915.cpp +++ b/src/mame/drivers/k8915.cpp @@ -66,7 +66,7 @@ void k8915_state::io_map(address_map &map) map.global_mask(0xff); map(0x50, 0x53).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); map(0x58, 0x5b).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0xa8, 0xa8).w(this, FUNC(k8915_state::k8915_a8_w)); + map(0xa8, 0xa8).w(FUNC(k8915_state::k8915_a8_w)); } /* Input ports */ diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index cda66326665..765e1f6d0c3 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -300,22 +300,22 @@ void kaneko16_berlwall_state::berlwall(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM map(0x200000, 0x20ffff).ram(); // Work RAM - map(0x30e000, 0x30ffff).rw(this, FUNC(kaneko16_berlwall_state::berlwall_spriteram_r), FUNC(kaneko16_berlwall_state::berlwall_spriteram_w)).share("spriteram"); // Sprites (scrambled RAM) + map(0x30e000, 0x30ffff).rw(FUNC(kaneko16_berlwall_state::berlwall_spriteram_r), FUNC(kaneko16_berlwall_state::berlwall_spriteram_w)).share("spriteram"); // Sprites (scrambled RAM) map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x480000, 0x480001).ram().share("bg15_scroll"); // High Color Background - map(0x500000, 0x500001).rw(this, FUNC(kaneko16_berlwall_state::kaneko16_bg15_bright_r), FUNC(kaneko16_berlwall_state::kaneko16_bg15_bright_w)).share("bg15_bright"); // "" - map(0x580000, 0x580001).rw(this, FUNC(kaneko16_berlwall_state::kaneko16_bg15_select_r), FUNC(kaneko16_berlwall_state::kaneko16_bg15_select_w)).share("bg15_select"); // "" - map(0x600000, 0x60003f).rw(this, FUNC(kaneko16_berlwall_state::berlwall_spriteregs_r), FUNC(kaneko16_berlwall_state::berlwall_spriteregs_w)); // Sprite Regs (scrambled RAM) + map(0x500000, 0x500001).rw(FUNC(kaneko16_berlwall_state::kaneko16_bg15_bright_r), FUNC(kaneko16_berlwall_state::kaneko16_bg15_bright_w)).share("bg15_bright"); // "" + map(0x580000, 0x580001).rw(FUNC(kaneko16_berlwall_state::kaneko16_bg15_select_r), FUNC(kaneko16_berlwall_state::kaneko16_bg15_select_w)).share("bg15_select"); // "" + map(0x600000, 0x60003f).rw(FUNC(kaneko16_berlwall_state::berlwall_spriteregs_r), FUNC(kaneko16_berlwall_state::berlwall_spriteregs_w)); // Sprite Regs (scrambled RAM) map(0x680000, 0x680001).portr("P1"); map(0x680002, 0x680003).portr("P2"); map(0x680004, 0x680005).portr("SYSTEM"); // map(0x680006, 0x680007) AM_READ_PORT("UNK") - map(0x700000, 0x700001).w(this, FUNC(kaneko16_berlwall_state::kaneko16_coin_lockout_w)); // Coin Lockout + map(0x700000, 0x700001).w(FUNC(kaneko16_berlwall_state::kaneko16_coin_lockout_w)); // Coin Lockout map(0x780000, 0x780001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x800000, 0x80001f).rw(this, FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_r<0>), FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_w<0>)); // Sound - map(0x800200, 0x80021f).rw(this, FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_r<1>), FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_w<1>)); + map(0x800000, 0x80001f).rw(FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_r<0>), FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_w<0>)); // Sound + map(0x800200, 0x80021f).rw(FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_r<1>), FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_w<1>)); map(0x8003fe, 0x8003ff).noprw(); // for OKI when accessed as .l - map(0x800400, 0x800401).rw(this, FUNC(kaneko16_berlwall_state::berlwall_oki_r), FUNC(kaneko16_berlwall_state::berlwall_oki_w)); + map(0x800400, 0x800401).rw(FUNC(kaneko16_berlwall_state::berlwall_oki_r), FUNC(kaneko16_berlwall_state::berlwall_oki_w)); map(0xc00000, 0xc03fff).rw("view2_0", FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_w)); map(0xd00000, 0xd0001f).rw("view2_0", FUNC(kaneko_view2_tilemap_device::kaneko_tmap_regs_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_regs_w)); } @@ -333,10 +333,10 @@ void kaneko16_state::bakubrkr(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x10ffff).ram(); // Work RAM - map(0x400000, 0x40001f).r(this, FUNC(kaneko16_state::kaneko16_ay_YM2149_r<0>)); // Sound - map(0x400000, 0x40001d).w(this, FUNC(kaneko16_state::kaneko16_ay_YM2149_w<0>)); - map(0x40001f, 0x40001f).w(this, FUNC(kaneko16_state::oki_bank0_w<7>)); // OKI bank Switch - map(0x400200, 0x40021f).rw(this, FUNC(kaneko16_state::kaneko16_ay_YM2149_r<1>), FUNC(kaneko16_state::kaneko16_ay_YM2149_w<1>)); // Sound + map(0x400000, 0x40001f).r(FUNC(kaneko16_state::kaneko16_ay_YM2149_r<0>)); // Sound + map(0x400000, 0x40001d).w(FUNC(kaneko16_state::kaneko16_ay_YM2149_w<0>)); + map(0x40001f, 0x40001f).w(FUNC(kaneko16_state::oki_bank0_w<7>)); // OKI bank Switch + map(0x400200, 0x40021f).rw(FUNC(kaneko16_state::kaneko16_ay_YM2149_r<1>), FUNC(kaneko16_state::kaneko16_ay_YM2149_w<1>)); // Sound map(0x400401, 0x400401).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // map(0x500000, 0x503fff).rw("view2_0", FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_w)); map(0x580000, 0x583fff).rw("view2_1", FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_w)); @@ -346,7 +346,7 @@ void kaneko16_state::bakubrkr(address_map &map) map(0x900000, 0x90001f).rw(m_kaneko_spr, FUNC(kaneko16_sprite_device::kaneko16_sprites_regs_r), FUNC(kaneko16_sprite_device::kaneko16_sprites_regs_w)); map(0xa80000, 0xa80001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); map(0xb00000, 0xb0001f).rw("view2_1", FUNC(kaneko_view2_tilemap_device::kaneko_tmap_regs_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_regs_w)); - map(0xd00000, 0xd00001).w(this, FUNC(kaneko16_state::kaneko16_eeprom_w)); // EEPROM + map(0xd00000, 0xd00001).w(FUNC(kaneko16_state::kaneko16_eeprom_w)); // EEPROM map(0xe00000, 0xe00001).portr("P1"); map(0xe00002, 0xe00003).portr("P2"); map(0xe00004, 0xe00005).portr("SYSTEM"); @@ -372,7 +372,7 @@ void kaneko16_state::blazeon(address_map &map) map(0xc00002, 0xc00003).portr("DSW1_P2"); map(0xc00004, 0xc00005).portr("UNK"); map(0xc00006, 0xc00007).portr("SYSTEM"); - map(0xd00000, 0xd00001).w(this, FUNC(kaneko16_state::kaneko16_coin_lockout_w)); // Coin Lockout + map(0xd00000, 0xd00001).w(FUNC(kaneko16_state::kaneko16_coin_lockout_w)); // Coin Lockout map(0xe00000, 0xe00001).nopr(); // Read = IRQ Ack ? map(0xe00000, 0xe00000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xe40000, 0xe40001).nopr(); // IRQ Ack ? @@ -420,11 +420,11 @@ void kaneko16_gtmr_state::bloodwar(address_map &map) map(0xb00002, 0xb00003).portr("P2"); map(0xb00004, 0xb00005).portr("SYSTEM"); map(0xb00006, 0xb00007).portr("EXTRA"); - map(0xb80000, 0xb80001).w(this, FUNC(kaneko16_gtmr_state::bloodwar_coin_lockout_w)); // Coin Lockout - map(0xc00000, 0xc00001).w(this, FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); + map(0xb80000, 0xb80001).w(FUNC(kaneko16_gtmr_state::bloodwar_coin_lockout_w)); // Coin Lockout + map(0xc00000, 0xc00001).w(FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); map(0xd00000, 0xd00001).r("toybox", FUNC(kaneko_toybox_device::mcu_status_r)); - map(0xe00001, 0xe00001).w(this, FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); - map(0xe80001, 0xe80001).w(this, FUNC(kaneko16_gtmr_state::oki_bank1_w<0x3>)); + map(0xe00001, 0xe00001).w(FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); + map(0xe80001, 0xe80001).w(FUNC(kaneko16_gtmr_state::oki_bank1_w<0x3>)); } @@ -456,11 +456,11 @@ void kaneko16_gtmr_state::bonkadv(address_map &map) map(0xb00002, 0xb00003).portr("P2"); map(0xb00004, 0xb00005).portr("SYSTEM"); map(0xb00006, 0xb00007).portr("UNK"); - map(0xb80000, 0xb80001).w(this, FUNC(kaneko16_gtmr_state::bloodwar_coin_lockout_w)); // Coin Lockout - map(0xc00000, 0xc00001).w(this, FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); + map(0xb80000, 0xb80001).w(FUNC(kaneko16_gtmr_state::bloodwar_coin_lockout_w)); // Coin Lockout + map(0xc00000, 0xc00001).w(FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); map(0xd00000, 0xd00001).r("toybox", FUNC(kaneko_toybox_device::mcu_status_r)); - map(0xe00001, 0xe00001).w(this, FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); - map(0xe80001, 0xe80001).w(this, FUNC(kaneko16_gtmr_state::oki_bank1_w<0xf>)); + map(0xe00001, 0xe00001).w(FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); + map(0xe80001, 0xe80001).w(FUNC(kaneko16_gtmr_state::oki_bank1_w<0xf>)); } @@ -486,7 +486,7 @@ READ16_MEMBER(kaneko16_gtmr_state::gtmr_wheel_r) void kaneko16_gtmr_state::gtmr_map(address_map &map) { map(0x000000, 0x0ffffd).rom(); // ROM - map(0x0ffffe, 0x0fffff).r(this, FUNC(kaneko16_gtmr_state::gtmr_wheel_r)); // Wheel Value + map(0x0ffffe, 0x0fffff).r(FUNC(kaneko16_gtmr_state::gtmr_wheel_r)); // Wheel Value map(0x100000, 0x10ffff).ram(); // Work RAM map(0x200000, 0x20ffff).ram().share("mcuram"); // Shared With MCU @@ -518,13 +518,13 @@ void kaneko16_gtmr_state::gtmr_map(address_map &map) map(0xb00002, 0xb00003).portr("P2"); map(0xb00004, 0xb00005).portr("SYSTEM"); map(0xb00006, 0xb00007).portr("UNK"); - map(0xb80000, 0xb80001).w(this, FUNC(kaneko16_gtmr_state::kaneko16_coin_lockout_w)); // Coin Lockout - map(0xc00000, 0xc00001).w(this, FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); // might do more than that + map(0xb80000, 0xb80001).w(FUNC(kaneko16_gtmr_state::kaneko16_coin_lockout_w)); // Coin Lockout + map(0xc00000, 0xc00001).w(FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); // might do more than that map(0xd00000, 0xd00001).r("toybox", FUNC(kaneko_toybox_device::mcu_status_r)); - map(0xe00001, 0xe00001).w(this, FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); // Samples Bankswitching - map(0xe80001, 0xe80001).w(this, FUNC(kaneko16_gtmr_state::oki_bank1_w<0x1>)); + map(0xe00001, 0xe00001).w(FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); // Samples Bankswitching + map(0xe80001, 0xe80001).w(FUNC(kaneko16_gtmr_state::oki_bank1_w<0x1>)); } /*************************************************************************** @@ -556,7 +556,7 @@ READ16_MEMBER(kaneko16_gtmr_state::gtmr2_IN1_r) void kaneko16_gtmr_state::gtmr2_map(address_map &map) { map(0x000000, 0x0ffffd).rom(); // ROM - map(0x0ffffe, 0x0fffff).r(this, FUNC(kaneko16_gtmr_state::gtmr2_wheel_r)); // Wheel Value + map(0x0ffffe, 0x0fffff).r(FUNC(kaneko16_gtmr_state::gtmr2_wheel_r)); // Wheel Value map(0x100000, 0x10ffff).ram(); // Work RAM map(0x200000, 0x20ffff).ram().share("mcuram"); // Shared With MCU @@ -584,16 +584,16 @@ void kaneko16_gtmr_state::gtmr2_map(address_map &map) map(0xb00000, 0xb00001).portr("P1"); // map(0xb00002, 0xb00003) AM_READ_PORT("P2") - map(0xb00002, 0xb00003).r(this, FUNC(kaneko16_gtmr_state::gtmr2_IN1_r)); + map(0xb00002, 0xb00003).r(FUNC(kaneko16_gtmr_state::gtmr2_IN1_r)); map(0xb00004, 0xb00005).portr("SYSTEM"); map(0xb00006, 0xb00007).portr("EXTRA"); - map(0xb80000, 0xb80001).w(this, FUNC(kaneko16_gtmr_state::kaneko16_coin_lockout_w)); // Coin Lockout - map(0xc00000, 0xc00001).w(this, FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); // might do more than that + map(0xb80000, 0xb80001).w(FUNC(kaneko16_gtmr_state::kaneko16_coin_lockout_w)); // Coin Lockout + map(0xc00000, 0xc00001).w(FUNC(kaneko16_gtmr_state::kaneko16_display_enable)); // might do more than that map(0xd00000, 0xd00001).r("toybox", FUNC(kaneko_toybox_device::mcu_status_r)); - map(0xe00001, 0xe00001).w(this, FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); // Samples Bankswitching - map(0xe80001, 0xe80001).w(this, FUNC(kaneko16_gtmr_state::oki_bank1_w<0x1>)); + map(0xe00001, 0xe00001).w(FUNC(kaneko16_gtmr_state::oki_bank0_w<0xf>)); // Samples Bankswitching + map(0xe80001, 0xe80001).w(FUNC(kaneko16_gtmr_state::oki_bank1_w<0x1>)); } /*************************************************************************** @@ -604,8 +604,8 @@ void kaneko16_state::mgcrystl(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0x300000, 0x30ffff).ram(); // Work RAM - map(0x400000, 0x40001f).rw(this, FUNC(kaneko16_state::kaneko16_ay_YM2149_r<0>), FUNC(kaneko16_state::kaneko16_ay_YM2149_w<0>)); // Sound - map(0x400200, 0x40021f).rw(this, FUNC(kaneko16_state::kaneko16_ay_YM2149_r<1>), FUNC(kaneko16_state::kaneko16_ay_YM2149_w<1>)); + map(0x400000, 0x40001f).rw(FUNC(kaneko16_state::kaneko16_ay_YM2149_r<0>), FUNC(kaneko16_state::kaneko16_ay_YM2149_w<0>)); // Sound + map(0x400200, 0x40021f).rw(FUNC(kaneko16_state::kaneko16_ay_YM2149_r<1>), FUNC(kaneko16_state::kaneko16_ay_YM2149_w<1>)); map(0x400401, 0x400401).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x500000, 0x500fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x600000, 0x603fff).rw("view2_0", FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_w)); @@ -618,7 +618,7 @@ void kaneko16_state::mgcrystl(address_map &map) map(0xc00000, 0xc00001).portr("DSW_P1"); map(0xc00002, 0xc00003).portr("P2"); map(0xc00004, 0xc00005).portr("SYSTEM"); - map(0xd00000, 0xd00001).w(this, FUNC(kaneko16_state::kaneko16_eeprom_w)); // EEPROM + map(0xd00000, 0xd00001).w(FUNC(kaneko16_state::kaneko16_eeprom_w)); // EEPROM } @@ -660,7 +660,7 @@ void kaneko16_shogwarr_state::shogwarr(address_map &map) map(0xb80004, 0xb80005).portr("SYSTEM"); map(0xb80006, 0xb80007).portr("UNK"); map(0xd00000, 0xd00001).noprw(); // ? (bit 0) - map(0xe00000, 0xe00001).w(this, FUNC(kaneko16_shogwarr_state::shogwarr_oki_bank_w)); // Samples Bankswitching + map(0xe00000, 0xe00001).w(FUNC(kaneko16_shogwarr_state::shogwarr_oki_bank_w)); // Samples Bankswitching } /*************************************************************************** @@ -700,7 +700,7 @@ void kaneko16_state::wingforc_soundport(address_map &map) map(0x02, 0x03).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x06, 0x06).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x0a, 0x0a).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x0c, 0x0c).w(this, FUNC(kaneko16_state::oki_bank0_w<0x3>)); + map(0x0c, 0x0c).w(FUNC(kaneko16_state::oki_bank0_w<0x3>)); } diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp index a6651d1b415..080b34d5d55 100644 --- a/src/mame/drivers/kangaroo.cpp +++ b/src/mame/drivers/kangaroo.cpp @@ -254,13 +254,13 @@ WRITE8_MEMBER(kangaroo_state::kangaroo_coin_counter_w) void kangaroo_state::main_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0x8000, 0xbfff).w(this, FUNC(kangaroo_state::kangaroo_videoram_w)); + map(0x8000, 0xbfff).w(FUNC(kangaroo_state::kangaroo_videoram_w)); map(0xc000, 0xdfff).bankr("bank1"); map(0xe000, 0xe3ff).ram(); map(0xe400, 0xe400).mirror(0x03ff).portr("DSW0"); - map(0xe800, 0xe80a).mirror(0x03f0).w(this, FUNC(kangaroo_state::kangaroo_video_control_w)).share("video_control"); + map(0xe800, 0xe80a).mirror(0x03f0).w(FUNC(kangaroo_state::kangaroo_video_control_w)).share("video_control"); map(0xec00, 0xec00).mirror(0x00ff).portr("IN0").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xed00, 0xed00).mirror(0x00ff).portr("IN1").w(this, FUNC(kangaroo_state::kangaroo_coin_counter_w)); + map(0xed00, 0xed00).mirror(0x00ff).portr("IN1").w(FUNC(kangaroo_state::kangaroo_coin_counter_w)); map(0xee00, 0xee00).mirror(0x00ff).portr("IN2"); } diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp index dcfee9c0010..057c289232f 100644 --- a/src/mame/drivers/karnov.cpp +++ b/src/mame/drivers/karnov.cpp @@ -433,12 +433,12 @@ void karnov_state::karnov_map(address_map &map) map(0x000000, 0x05ffff).rom(); map(0x060000, 0x063fff).ram().share("ram"); map(0x080000, 0x080fff).ram().share("spriteram"); - map(0x0a0000, 0x0a07ff).ram().w(this, FUNC(karnov_state::karnov_videoram_w)).share("videoram"); - map(0x0a0800, 0x0a0fff).w(this, FUNC(karnov_state::karnov_videoram_w)); /* Wndrplnt Mirror */ + map(0x0a0000, 0x0a07ff).ram().w(FUNC(karnov_state::karnov_videoram_w)).share("videoram"); + map(0x0a0800, 0x0a0fff).w(FUNC(karnov_state::karnov_videoram_w)); /* Wndrplnt Mirror */ map(0x0a1000, 0x0a17ff).writeonly().share("pf_data"); - map(0x0a1800, 0x0a1fff).w(this, FUNC(karnov_state::karnov_playfield_swap_w)); - map(0x0c0000, 0x0c0007).r(this, FUNC(karnov_state::karnov_control_r)); - map(0x0c0000, 0x0c000f).w(this, FUNC(karnov_state::karnov_control_w)); + map(0x0a1800, 0x0a1fff).w(FUNC(karnov_state::karnov_playfield_swap_w)); + map(0x0c0000, 0x0c0007).r(FUNC(karnov_state::karnov_control_r)); + map(0x0c0000, 0x0c000f).w(FUNC(karnov_state::karnov_control_w)); } diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp index 2e8ebc434dd..4f7bef01d91 100644 --- a/src/mame/drivers/kas89.cpp +++ b/src/mame/drivers/kas89.cpp @@ -537,12 +537,12 @@ void kas89_state::kas89_io(address_map &map) { map.global_mask(0xff); map(0x40, 0x43).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); - map(0x80, 0x80).w(this, FUNC(kas89_state::mux_w)); - map(0x81, 0x81).r(this, FUNC(kas89_state::mux_r)); - map(0x82, 0x82).w(this, FUNC(kas89_state::control_w)); /* Bit6 trigger the 138Hz osc. tied to main Z80's NMI.*/ - map(0x83, 0x83).w(this, FUNC(kas89_state::led_mux_data_w)); - map(0x84, 0x84).w(this, FUNC(kas89_state::led_mux_select_w)); - map(0x85, 0x85).w(this, FUNC(kas89_state::sound_comm_w)); + map(0x80, 0x80).w(FUNC(kas89_state::mux_w)); + map(0x81, 0x81).r(FUNC(kas89_state::mux_r)); + map(0x82, 0x82).w(FUNC(kas89_state::control_w)); /* Bit6 trigger the 138Hz osc. tied to main Z80's NMI.*/ + map(0x83, 0x83).w(FUNC(kas89_state::led_mux_data_w)); + map(0x84, 0x84).w(FUNC(kas89_state::led_mux_select_w)); + map(0x85, 0x85).w(FUNC(kas89_state::sound_comm_w)); } /* @@ -592,7 +592,7 @@ void kas89_state::audio_map(address_map &map) void kas89_state::audio_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(kas89_state::int_ack_w)); // comm out (1st Z80). seems to write here the value previously read through soundlatch (port 0x02). + map(0x00, 0x00).w(FUNC(kas89_state::int_ack_w)); // comm out (1st Z80). seems to write here the value previously read through soundlatch (port 0x02). map(0x02, 0x02).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x04, 0x04).r("aysnd", FUNC(ay8910_device::data_r)); map(0x04, 0x05).w("aysnd", FUNC(ay8910_device::data_address_w)); diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index ac80b167aba..900ed0cf116 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -92,11 +92,11 @@ void kaypro_state::kaypro484_io(address_map &map) map(0x08, 0x0b).w("brg", FUNC(com8116_device::stt_w)); map(0x0c, 0x0f).rw("sio_2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); map(0x10, 0x13).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0x14, 0x17).rw(this, FUNC(kaypro_state::kaypro484_system_port_r), FUNC(kaypro_state::kaypro484_system_port_w)); - map(0x18, 0x1b).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x1c, 0x1c).rw(this, FUNC(kaypro_state::kaypro484_status_r), FUNC(kaypro_state::kaypro484_index_w)); - map(0x1d, 0x1d).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(kaypro_state::kaypro484_register_w)); - map(0x1f, 0x1f).rw(this, FUNC(kaypro_state::kaypro484_videoram_r), FUNC(kaypro_state::kaypro484_videoram_w)); + map(0x14, 0x17).rw(FUNC(kaypro_state::kaypro484_system_port_r), FUNC(kaypro_state::kaypro484_system_port_w)); + map(0x18, 0x1b).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x1c, 0x1c).rw(FUNC(kaypro_state::kaypro484_status_r), FUNC(kaypro_state::kaypro484_index_w)); + map(0x1d, 0x1d).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(kaypro_state::kaypro484_register_w)); + map(0x1f, 0x1f).rw(FUNC(kaypro_state::kaypro484_videoram_r), FUNC(kaypro_state::kaypro484_videoram_w)); /* The below are not emulated */ /* map(0x20, 0x23).rw("z80pio", FUNC(z80pio_device::kaypro484_pio_r), FUNC(z80pio_device::kaypro484_pio_w)) - for RTC and Modem @@ -110,7 +110,7 @@ void kaypro_state::kaypro484_io(address_map &map) map(0x86, 0x86) Hard Drive Size / Drive / Head register I/O map(0x87, 0x87) Hard Drive READ status register, WRITE command register */ map(0x20, 0x86).noprw(); - map(0x87, 0x87).r(this, FUNC(kaypro_state::kaypro484_87_r)); + map(0x87, 0x87).r(FUNC(kaypro_state::kaypro484_87_r)); } @@ -248,7 +248,7 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_DEVICE_ADD("z80pio_g", Z80PIO, 20_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_DEVICE_ADD("z80pio_s", Z80PIO, 20_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index 322679b32b4..2956b795b12 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -25,10 +25,10 @@ void kc85_4_state::kc85_4_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(kc85_4_state::expansion_io_read), FUNC(kc85_4_state::expansion_io_write)); + map(0x0000, 0xffff).rw(FUNC(kc85_4_state::expansion_io_read), FUNC(kc85_4_state::expansion_io_write)); - map(0x0084, 0x0085).mirror(0xff00).rw(this, FUNC(kc85_4_state::kc85_4_84_r), FUNC(kc85_4_state::kc85_4_84_w)); - map(0x0086, 0x0087).mirror(0xff00).rw(this, FUNC(kc85_4_state::kc85_4_86_r), FUNC(kc85_4_state::kc85_4_86_w)); + map(0x0084, 0x0085).mirror(0xff00).rw(FUNC(kc85_4_state::kc85_4_84_r), FUNC(kc85_4_state::kc85_4_84_w)); + map(0x0086, 0x0087).mirror(0xff00).rw(FUNC(kc85_4_state::kc85_4_86_r), FUNC(kc85_4_state::kc85_4_86_w)); map(0x0088, 0x008b).mirror(0xff00).rw(m_z80pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x008c, 0x008f).mirror(0xff00).rw(m_z80ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); } @@ -57,7 +57,7 @@ void kc_state::kc85_3_mem(address_map &map) void kc_state::kc85_3_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(kc_state::expansion_io_read), FUNC(kc_state::expansion_io_write)); + map(0x0000, 0xffff).rw(FUNC(kc_state::expansion_io_read), FUNC(kc_state::expansion_io_write)); map(0x0088, 0x008b).mirror(0xff00).rw(m_z80pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x008c, 0x008f).mirror(0xff00).rw(m_z80ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp index 648bf851283..cd5a4ee9aa6 100644 --- a/src/mame/drivers/kchamp.cpp +++ b/src/mame/drivers/kchamp.cpp @@ -108,8 +108,8 @@ void kchamp_state::kchampvs_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); - map(0xd000, 0xd3ff).ram().w(this, FUNC(kchamp_state::kchamp_videoram_w)).share("videoram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(kchamp_state::kchamp_colorram_w)).share("colorram"); + map(0xd000, 0xd3ff).ram().w(FUNC(kchamp_state::kchamp_videoram_w)).share("videoram"); + map(0xd400, 0xd7ff).ram().w(FUNC(kchamp_state::kchamp_colorram_w)).share("colorram"); map(0xd800, 0xd8ff).ram().share("spriteram"); map(0xd900, 0xdfff).ram(); map(0xe000, 0xffff).rom(); @@ -143,7 +143,7 @@ void kchamp_state::kchampvs_sound_io_map(address_map &map) map(0x01, 0x01).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x02, 0x03).w("ay2", FUNC(ay8910_device::data_address_w)); map(0x04, 0x04).w(m_adpcm_select, FUNC(ls157_device::ab_w)); - map(0x05, 0x05).w(this, FUNC(kchamp_state::sound_control_w)); + map(0x05, 0x05).w(FUNC(kchamp_state::sound_control_w)); } @@ -173,8 +173,8 @@ void kchamp_state::kchamp_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).ram(); - map(0xe000, 0xe3ff).ram().w(this, FUNC(kchamp_state::kchamp_videoram_w)).share("videoram"); - map(0xe400, 0xe7ff).ram().w(this, FUNC(kchamp_state::kchamp_colorram_w)).share("colorram"); + map(0xe000, 0xe3ff).ram().w(FUNC(kchamp_state::kchamp_videoram_w)).share("videoram"); + map(0xe400, 0xe7ff).ram().w(FUNC(kchamp_state::kchamp_colorram_w)).share("colorram"); map(0xea00, 0xeaff).ram().share("spriteram"); map(0xeb00, 0xffff).ram(); } @@ -187,7 +187,7 @@ void kchamp_state::kchamp_io_map(address_map &map) map(0x90, 0x90).portr("P1"); map(0x98, 0x98).portr("P2"); map(0xa0, 0xa0).portr("SYSTEM"); - map(0xa8, 0xa8).r(this, FUNC(kchamp_state::sound_reset_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0xa8, 0xa8).r(FUNC(kchamp_state::sound_reset_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } void kchamp_state::kchamp_sound_map(address_map &map) @@ -201,8 +201,8 @@ void kchamp_state::kchamp_sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x01).w("ay1", FUNC(ay8910_device::data_address_w)); map(0x02, 0x03).w("ay2", FUNC(ay8910_device::data_address_w)); - map(0x04, 0x04).w(m_dac, FUNC(dac_byte_interface::write)); - map(0x05, 0x05).w(this, FUNC(kchamp_state::kc_sound_control_w)); + map(0x04, 0x04).w(m_dac, FUNC(dac_byte_interface::data_w)); + map(0x05, 0x05).w(FUNC(kchamp_state::kc_sound_control_w)); map(0x06, 0x06).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp index 8bae7ada729..dd04cc33e91 100644 --- a/src/mame/drivers/kdt6.cpp +++ b/src/mame/drivers/kdt6.cpp @@ -41,29 +41,29 @@ class kdt6_state : public driver_device { public: kdt6_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_cpu(*this, "maincpu"), - m_dma(*this, "dma"), - m_sio(*this, "sio"), - m_crtc(*this, "crtc"), - m_page_r(*this, "page%x_r", 0), m_page_w(*this, "page%x_w", 0), - m_boot(*this, "boot"), - m_palette(*this, "palette"), - m_gfx(*this, "gfx"), - m_rtc(*this, "rtc"), - m_fdc(*this, "fdc"), - m_floppy0(*this, "fdc:0"), - m_floppy1(*this, "fdc:1"), - m_beeper(*this, "beeper"), - m_beep_timer(*this, "beep_timer"), - m_centronics(*this, "centronics"), - m_dip_s2(*this, "S2"), - m_keyboard(*this, "kbd"), - m_rs232b(*this, "rs232b"), - m_sasi_dma(false), - m_dma_map(0), - m_status0(0), m_status1(0), m_status2(0), - m_video_address(0) + driver_device(mconfig, type, tag), + m_cpu(*this, "maincpu"), + m_dma(*this, "dma"), + m_sio(*this, "sio"), + m_crtc(*this, "crtc"), + m_page_r(*this, "page%x_r", 0), m_page_w(*this, "page%x_w", 0), + m_boot(*this, "boot"), + m_palette(*this, "palette"), + m_gfx(*this, "gfx"), + m_rtc(*this, "rtc"), + m_fdc(*this, "fdc"), + m_floppy0(*this, "fdc:0"), + m_floppy1(*this, "fdc:1"), + m_beeper(*this, "beeper"), + m_beep_timer(*this, "beep_timer"), + m_centronics(*this, "centronics"), + m_dip_s2(*this, "S2"), + m_keyboard(*this, "kbd"), + m_rs232b(*this, "rs232b"), + m_sasi_dma(false), + m_dma_map(0), + m_status0(0), m_status1(0), m_status2(0), + m_video_address(0) { } DECLARE_WRITE_LINE_MEMBER(busreq_w); @@ -173,7 +173,7 @@ void kdt6_state::psi98_mem(address_map &map) void kdt6_state::psi98_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); + map(0x00, 0x00).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); map(0x04, 0x07).rw(m_sio, FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); map(0x08, 0x0b).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0c, 0x0f).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); @@ -182,27 +182,27 @@ void kdt6_state::psi98_io(address_map &map) map(0x15, 0x15).rw(m_fdc, FUNC(upd765a_device::fifo_r), FUNC(upd765a_device::fifo_w)); map(0x18, 0x18).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x19, 0x19).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x1c, 0x1c).w(this, FUNC(kdt6_state::status0_w)); + map(0x1c, 0x1c).w(FUNC(kdt6_state::status0_w)); map(0x1d, 0x1d).r(m_keyboard, FUNC(psi_keyboard_bus_device::key_data_r)); map(0x1e, 0x1e).rw(m_fdc, FUNC(upd765a_device::mdma_r), FUNC(upd765a_device::mdma_w)); - map(0x1f, 0x1f).w(this, FUNC(kdt6_state::fdc_tc_w)); - map(0x20, 0x2f).rw(this, FUNC(kdt6_state::mapper_r), FUNC(kdt6_state::mapper_w)); - map(0x30, 0x30).rw(this, FUNC(kdt6_state::video_data_r), FUNC(kdt6_state::video_data_w)); - map(0x31, 0x31).w(this, FUNC(kdt6_state::video_data_inc_w)); - map(0x36, 0x36).w(this, FUNC(kdt6_state::video_data_dec_w)); - map(0x37, 0x37).w(this, FUNC(kdt6_state::video_data_inc_w)); - map(0x38, 0x38).w(this, FUNC(kdt6_state::status1_w)); - map(0x39, 0x39).r(this, FUNC(kdt6_state::status1_r)); - map(0x3a, 0x3a).w(this, FUNC(kdt6_state::status2_w)); - map(0x3b, 0x3b).rw(this, FUNC(kdt6_state::sasi_ctrl_r), FUNC(kdt6_state::sasi_ctrl_w)); - map(0x3c, 0x3c).w(this, FUNC(kdt6_state::dma_map_w)); + map(0x1f, 0x1f).w(FUNC(kdt6_state::fdc_tc_w)); + map(0x20, 0x2f).rw(FUNC(kdt6_state::mapper_r), FUNC(kdt6_state::mapper_w)); + map(0x30, 0x30).rw(FUNC(kdt6_state::video_data_r), FUNC(kdt6_state::video_data_w)); + map(0x31, 0x31).w(FUNC(kdt6_state::video_data_inc_w)); + map(0x36, 0x36).w(FUNC(kdt6_state::video_data_dec_w)); + map(0x37, 0x37).w(FUNC(kdt6_state::video_data_inc_w)); + map(0x38, 0x38).w(FUNC(kdt6_state::status1_w)); + map(0x39, 0x39).r(FUNC(kdt6_state::status1_r)); + map(0x3a, 0x3a).w(FUNC(kdt6_state::status2_w)); + map(0x3b, 0x3b).rw(FUNC(kdt6_state::sasi_ctrl_r), FUNC(kdt6_state::sasi_ctrl_w)); + map(0x3c, 0x3c).w(FUNC(kdt6_state::dma_map_w)); #if 0 map(0x3d, 0x3d) WATCHDOG map(0x3e, 0x3e) WATCHDOG TRIGGER map(0x3f, 0x3f) SASI DATA #endif - map(0x40, 0x40).w(this, FUNC(kdt6_state::video_address_latch_high_w)); - map(0x41, 0x41).w(this, FUNC(kdt6_state::video_address_latch_low_w)); + map(0x40, 0x40).w(FUNC(kdt6_state::video_address_latch_high_w)); + map(0x41, 0x41).w(FUNC(kdt6_state::video_address_latch_low_w)); } @@ -691,8 +691,8 @@ MACHINE_CONFIG_START(kdt6_state::psi98) MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kdt6_state, pio_porta_w)) - MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, read)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, bus_r)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp index 41e816814d3..03d4dd86b70 100644 --- a/src/mame/drivers/kickgoal.cpp +++ b/src/mame/drivers/kickgoal.cpp @@ -480,12 +480,12 @@ void kickgoal_state::kickgoal_program_map(address_map &map) map(0x800000, 0x800001).portr("P1_P2"); map(0x800002, 0x800003).portr("SYSTEM"); /// AM_RANGE(0x800004, 0x800005) AM_DEVWRITE("soundlatch", generic_latch_16_device, write) - map(0x800004, 0x800005).w(this, FUNC(kickgoal_state::actionhw_snd_w)); - map(0x900000, 0x900005).w(this, FUNC(kickgoal_state::kickgoal_eeprom_w)); - map(0x900006, 0x900007).r(this, FUNC(kickgoal_state::kickgoal_eeprom_r)); - map(0xa00000, 0xa03fff).ram().w(this, FUNC(kickgoal_state::kickgoal_fgram_w)).share("fgram"); /* FG Layer */ - map(0xa04000, 0xa07fff).ram().w(this, FUNC(kickgoal_state::kickgoal_bgram_w)).share("bgram"); /* Higher BG Layer */ - map(0xa08000, 0xa0bfff).ram().w(this, FUNC(kickgoal_state::kickgoal_bg2ram_w)).share("bg2ram"); /* Lower BG Layer */ + map(0x800004, 0x800005).w(FUNC(kickgoal_state::actionhw_snd_w)); + map(0x900000, 0x900005).w(FUNC(kickgoal_state::kickgoal_eeprom_w)); + map(0x900006, 0x900007).r(FUNC(kickgoal_state::kickgoal_eeprom_r)); + map(0xa00000, 0xa03fff).ram().w(FUNC(kickgoal_state::kickgoal_fgram_w)).share("fgram"); /* FG Layer */ + map(0xa04000, 0xa07fff).ram().w(FUNC(kickgoal_state::kickgoal_bgram_w)).share("bgram"); /* Higher BG Layer */ + map(0xa08000, 0xa0bfff).ram().w(FUNC(kickgoal_state::kickgoal_bg2ram_w)).share("bg2ram"); /* Lower BG Layer */ map(0xa0c000, 0xa0ffff).ram(); // more tilemap? map(0xa10000, 0xa1000f).writeonly().share("scrram"); /* Scroll Registers */ map(0xb00000, 0xb007ff).writeonly().share("spriteram"); /* Sprites */ diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp index 2037e57d070..308e7eedcfb 100644 --- a/src/mame/drivers/kingdrby.cpp +++ b/src/mame/drivers/kingdrby.cpp @@ -432,8 +432,8 @@ void kingdrby_state::master_map(address_map &map) { map(0x0000, 0x2fff).rom(); map(0x3000, 0x33ff).ram().mirror(0xc00).share("share1"); - map(0x4000, 0x43ff).ram().w(this, FUNC(kingdrby_state::sc0_vram_w)).share("vram"); - map(0x5000, 0x53ff).ram().w(this, FUNC(kingdrby_state::sc0_attr_w)).share("attr"); + map(0x4000, 0x43ff).ram().w(FUNC(kingdrby_state::sc0_vram_w)).share("vram"); + map(0x5000, 0x53ff).ram().w(FUNC(kingdrby_state::sc0_attr_w)).share("attr"); } void kingdrby_state::master_io_map(address_map &map) @@ -453,7 +453,7 @@ void kingdrby_state::slave_map(address_map &map) map(0x7400, 0x74ff).ram().share("spriteram"); map(0x7600, 0x7600).w("crtc", FUNC(mc6845_device::address_w)); map(0x7601, 0x7601).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x7801, 0x780f).w(this, FUNC(kingdrby_state::led_array_w)); + map(0x7801, 0x780f).w(FUNC(kingdrby_state::led_array_w)); map(0x7a00, 0x7a00).ram(); //buffer for the key matrix map(0x7c00, 0x7c00).portr("DSW"); } @@ -478,7 +478,7 @@ void kingdrby_state::slave_1986_map(address_map &map) map(0x7801, 0x7801).portr("KEY1"); map(0x7802, 0x7802).portr("KEY2"); map(0x7803, 0x7803).portr("KEY3"); - map(0x7800, 0x7803).w(this, FUNC(kingdrby_state::kingdrbb_lamps_w)); + map(0x7800, 0x7803).w(FUNC(kingdrby_state::kingdrbb_lamps_w)); map(0x7a00, 0x7a00).portr("SYSTEM"); map(0x7c00, 0x7c00).portr("DSW"); } diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp index 00941770e84..5f7ff56bf8c 100644 --- a/src/mame/drivers/kingobox.cpp +++ b/src/mame/drivers/kingobox.cpp @@ -59,12 +59,12 @@ void kingofb_state::kingobox_map(address_map &map) map(0xe000, 0xe7ff).ram().share("share2"); /* shared with sprite cpu */ map(0xe800, 0xefff).ram().share("share1"); /* shared with video cpu */ map(0xf000, 0xf7ff).ram(); /* ???? */ - map(0xf800, 0xf800).w(this, FUNC(kingofb_state::kingofb_f800_w)); /* NMI enable, palette bank */ + map(0xf800, 0xf800).w(FUNC(kingofb_state::kingofb_f800_w)); /* NMI enable, palette bank */ map(0xf801, 0xf801).nopw(); /* ???? */ map(0xf802, 0xf802).writeonly().share("scroll_y"); - map(0xf803, 0xf803).w(this, FUNC(kingofb_state::scroll_interrupt_w)); - map(0xf804, 0xf804).w(this, FUNC(kingofb_state::video_interrupt_w)); - map(0xf807, 0xf807).w(this, FUNC(kingofb_state::sound_command_w)); /* sound latch */ + map(0xf803, 0xf803).w(FUNC(kingofb_state::scroll_interrupt_w)); + map(0xf804, 0xf804).w(FUNC(kingofb_state::video_interrupt_w)); + map(0xf807, 0xf807).w(FUNC(kingofb_state::sound_command_w)); /* sound latch */ map(0xfc00, 0xfc00).portr("DSW1"); map(0xfc01, 0xfc01).portr("DSW2"); map(0xfc02, 0xfc02).portr("P1"); @@ -78,10 +78,10 @@ void kingofb_state::kingobox_video_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); /* work ram */ map(0xa000, 0xa7ff).ram().share("share1"); /* shared with main */ - map(0xc000, 0xc0ff).ram().w(this, FUNC(kingofb_state::kingofb_videoram_w)).share("videoram"); /* background vram */ - map(0xc400, 0xc4ff).ram().w(this, FUNC(kingofb_state::kingofb_colorram_w)).share("colorram"); /* background colorram */ - map(0xc800, 0xcbff).ram().w(this, FUNC(kingofb_state::kingofb_videoram2_w)).share("videoram2"); /* foreground vram */ - map(0xcc00, 0xcfff).ram().w(this, FUNC(kingofb_state::kingofb_colorram2_w)).share("colorram2"); /* foreground colorram */ + map(0xc000, 0xc0ff).ram().w(FUNC(kingofb_state::kingofb_videoram_w)).share("videoram"); /* background vram */ + map(0xc400, 0xc4ff).ram().w(FUNC(kingofb_state::kingofb_colorram_w)).share("colorram"); /* background colorram */ + map(0xc800, 0xcbff).ram().w(FUNC(kingofb_state::kingofb_videoram2_w)).share("videoram2"); /* foreground vram */ + map(0xcc00, 0xcfff).ram().w(FUNC(kingofb_state::kingofb_colorram2_w)).share("colorram2"); /* foreground colorram */ } void kingofb_state::kingobox_sprite_map(address_map &map) @@ -103,7 +103,7 @@ void kingofb_state::kingobox_sound_map(address_map &map) void kingofb_state::kingobox_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("dac", FUNC(dac_byte_interface::write)); + map(0x00, 0x00).w("dac", FUNC(dac_byte_interface::data_w)); map(0x08, 0x08).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0x0c, 0x0c).w("aysnd", FUNC(ay8910_device::address_w)); } @@ -115,10 +115,10 @@ void kingofb_state::ringking_map(address_map &map) map(0xc000, 0xc3ff).ram(); /* work ram */ map(0xc800, 0xcfff).ram().share("share2"); /* shared with sprite cpu */ map(0xd000, 0xd7ff).ram().share("share1"); /* shared with video cpu */ - map(0xd800, 0xd800).w(this, FUNC(kingofb_state::kingofb_f800_w)); - map(0xd801, 0xd801).w(this, FUNC(kingofb_state::sprite_interrupt_w)); - map(0xd802, 0xd802).w(this, FUNC(kingofb_state::video_interrupt_w)); - map(0xd803, 0xd803).w(this, FUNC(kingofb_state::sound_command_w)); + map(0xd800, 0xd800).w(FUNC(kingofb_state::kingofb_f800_w)); + map(0xd801, 0xd801).w(FUNC(kingofb_state::sprite_interrupt_w)); + map(0xd802, 0xd802).w(FUNC(kingofb_state::video_interrupt_w)); + map(0xd803, 0xd803).w(FUNC(kingofb_state::sound_command_w)); map(0xe000, 0xe000).portr("DSW1"); map(0xe001, 0xe001).portr("DSW2"); map(0xe002, 0xe002).portr("P1"); @@ -134,10 +134,10 @@ void kingofb_state::ringking_video_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); /* work ram */ map(0xc000, 0xc7ff).ram().share("share1"); /* shared with main */ - map(0xa800, 0xa8ff).ram().w(this, FUNC(kingofb_state::kingofb_videoram_w)).share("videoram"); /* background vram */ - map(0xac00, 0xacff).ram().w(this, FUNC(kingofb_state::kingofb_colorram_w)).share("colorram"); /* background colorram */ - map(0xa000, 0xa3ff).ram().w(this, FUNC(kingofb_state::kingofb_videoram2_w)).share("videoram2"); /* foreground vram */ - map(0xa400, 0xa7ff).ram().w(this, FUNC(kingofb_state::kingofb_colorram2_w)).share("colorram2"); /* foreground colorram */ + map(0xa800, 0xa8ff).ram().w(FUNC(kingofb_state::kingofb_videoram_w)).share("videoram"); /* background vram */ + map(0xac00, 0xacff).ram().w(FUNC(kingofb_state::kingofb_colorram_w)).share("colorram"); /* background colorram */ + map(0xa000, 0xa3ff).ram().w(FUNC(kingofb_state::kingofb_videoram2_w)).share("videoram2"); /* foreground vram */ + map(0xa400, 0xa7ff).ram().w(FUNC(kingofb_state::kingofb_colorram2_w)).share("colorram2"); /* foreground colorram */ } void kingofb_state::ringking_sprite_map(address_map &map) @@ -152,7 +152,7 @@ void kingofb_state::ringking_sprite_map(address_map &map) void kingofb_state::ringking_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("dac", FUNC(dac_byte_interface::write)); + map(0x00, 0x00).w("dac", FUNC(dac_byte_interface::data_w)); map(0x02, 0x02).r("aysnd", FUNC(ay8910_device::data_r)); map(0x02, 0x03).w("aysnd", FUNC(ay8910_device::data_address_w)); } diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp index 043604b34bc..721febc25b6 100644 --- a/src/mame/drivers/kingpin.cpp +++ b/src/mame/drivers/kingpin.cpp @@ -90,9 +90,9 @@ void kingpin_state::kingpin_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x10, 0x13).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x20, 0x20).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x21, 0x21).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0x60, 0x60).w(this, FUNC(kingpin_state::sound_nmi_w)); + map(0x20, 0x20).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x21, 0x21).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0x60, 0x60).w(FUNC(kingpin_state::sound_nmi_w)); //AM_RANGE(0x30, 0x30) AM_WRITENOP // lamps? //AM_RANGE(0x40, 0x40) AM_WRITENOP // lamps? //AM_RANGE(0x50, 0x50) AM_WRITENOP // ? diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp index 8092485725b..893993c628d 100644 --- a/src/mame/drivers/kinst.cpp +++ b/src/mame/drivers/kinst.cpp @@ -476,9 +476,9 @@ void kinst_state::main_map(address_map &map) map.unmap_value_high(); map(0x00000000, 0x0007ffff).ram().share("rambase"); map(0x08000000, 0x087fffff).ram().share("rambase2"); - map(0x10000080, 0x100000ff).rw(this, FUNC(kinst_state::control_r), FUNC(kinst_state::control_w)).share("control"); - map(0x10000100, 0x1000013f).rw(this, FUNC(kinst_state::ide_r), FUNC(kinst_state::ide_w)); - map(0x10000170, 0x10000173).rw(this, FUNC(kinst_state::ide_extra_r), FUNC(kinst_state::ide_extra_w)); + map(0x10000080, 0x100000ff).rw(FUNC(kinst_state::control_r), FUNC(kinst_state::control_w)).share("control"); + map(0x10000100, 0x1000013f).rw(FUNC(kinst_state::ide_r), FUNC(kinst_state::ide_w)); + map(0x10000170, 0x10000173).rw(FUNC(kinst_state::ide_extra_r), FUNC(kinst_state::ide_extra_w)); map(0x1fc00000, 0x1fc7ffff).rom().region("user1", 0).share("rombase"); } diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp index 98d4213c4b8..1cc01ddb2a4 100644 --- a/src/mame/drivers/klax.cpp +++ b/src/mame/drivers/klax.cpp @@ -84,11 +84,11 @@ void klax_state::klax_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x0e0000, 0x0e0fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x1f0000, 0x1fffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); - map(0x260000, 0x260001).portr("P1").w(this, FUNC(klax_state::klax_latch_w)); + map(0x260000, 0x260001).portr("P1").w(FUNC(klax_state::klax_latch_w)); map(0x260002, 0x260003).portr("P2"); map(0x270001, 0x270001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x2e0000, 0x2e0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x360000, 0x360001).w(this, FUNC(klax_state::interrupt_ack_w)); + map(0x360000, 0x360001).w(FUNC(klax_state::interrupt_ack_w)); map(0x3e0000, 0x3e07ff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0xff00).share("palette"); map(0x3f0000, 0x3f0f7f).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); map(0x3f0f80, 0x3f0fff).ram().share("mob:slip"); @@ -102,11 +102,11 @@ void klax_state::klax2bl_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x0e0000, 0x0e0fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x1f0000, 0x1fffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); - map(0x260000, 0x260001).portr("P1").w(this, FUNC(klax_state::klax_latch_w)); + map(0x260000, 0x260001).portr("P1").w(FUNC(klax_state::klax_latch_w)); map(0x260002, 0x260003).portr("P2"); // AM_RANGE(0x270000, 0x270001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) // no OKI here map(0x2e0000, 0x2e0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x360000, 0x360001).w(this, FUNC(klax_state::interrupt_ack_w)); + map(0x360000, 0x360001).w(FUNC(klax_state::interrupt_ack_w)); map(0x3e0000, 0x3e07ff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0xff00).share("palette"); map(0x3f0000, 0x3f0f7f).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); map(0x3f0f80, 0x3f0fff).ram().share("mob:slip"); diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp index e386c5449a0..19a0dddd13f 100644 --- a/src/mame/drivers/kncljoe.cpp +++ b/src/mame/drivers/kncljoe.cpp @@ -48,17 +48,17 @@ WRITE8_MEMBER(kncljoe_state::sound_cmd_w) void kncljoe_state::main_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xcfff).ram().w(this, FUNC(kncljoe_state::kncljoe_videoram_w)).share("videoram"); - map(0xd000, 0xd001).w(this, FUNC(kncljoe_state::kncljoe_scroll_w)).share("scrollregs"); + map(0xc000, 0xcfff).ram().w(FUNC(kncljoe_state::kncljoe_videoram_w)).share("videoram"); + map(0xd000, 0xd001).w(FUNC(kncljoe_state::kncljoe_scroll_w)).share("scrollregs"); map(0xd800, 0xd800).portr("SYSTEM"); map(0xd801, 0xd801).portr("P1"); map(0xd802, 0xd802).portr("P2"); map(0xd803, 0xd803).portr("DSWA"); map(0xd804, 0xd804).portr("DSWB"); - map(0xd800, 0xd800).w(this, FUNC(kncljoe_state::sound_cmd_w)); - map(0xd801, 0xd801).w(this, FUNC(kncljoe_state::kncljoe_control_w)); - map(0xd802, 0xd802).w("sn1", FUNC(sn76489_device::write)); - map(0xd803, 0xd803).w("sn2", FUNC(sn76489_device::write)); + map(0xd800, 0xd800).w(FUNC(kncljoe_state::sound_cmd_w)); + map(0xd801, 0xd801).w(FUNC(kncljoe_state::kncljoe_control_w)); + map(0xd802, 0xd802).w("sn1", FUNC(sn76489_device::command_w)); + map(0xd803, 0xd803).w("sn2", FUNC(sn76489_device::command_w)); map(0xd807, 0xd807).nopr(); /* unknown read */ map(0xd817, 0xd817).nopr(); /* unknown read */ map(0xe800, 0xefff).ram().share("spriteram"); @@ -108,14 +108,14 @@ void kncljoe_state::sound_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x0fff).nopw(); - map(0x1000, 0x1fff).w(this, FUNC(kncljoe_state::sound_irq_ack_w)); + map(0x1000, 0x1fff).w(FUNC(kncljoe_state::sound_irq_ack_w)); map(0x2000, 0x7fff).rom(); } void kncljoe_state::sound_portmap(address_map &map) { - map(M6801_PORT1, M6801_PORT1).rw(this, FUNC(kncljoe_state::m6803_port1_r), FUNC(kncljoe_state::m6803_port1_w)); - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(kncljoe_state::m6803_port2_r), FUNC(kncljoe_state::m6803_port2_w)); + map(M6801_PORT1, M6801_PORT1).rw(FUNC(kncljoe_state::m6803_port1_r), FUNC(kncljoe_state::m6803_port1_w)); + map(M6801_PORT2, M6801_PORT2).rw(FUNC(kncljoe_state::m6803_port2_r), FUNC(kncljoe_state::m6803_port2_w)); } diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp index 6426ff949cf..925a4de6803 100644 --- a/src/mame/drivers/koftball.cpp +++ b/src/mame/drivers/koftball.cpp @@ -154,15 +154,15 @@ void koftball_state::koftball_mem(address_map &map) map(0x000000, 0x01ffff).rom(); map(0x220000, 0x22ffff).ram().share("main_ram"); - map(0x260000, 0x260fff).w(this, FUNC(koftball_state::bmc_1_videoram_w)).share("bmc_1_videoram"); - map(0x261000, 0x261fff).w(this, FUNC(koftball_state::bmc_2_videoram_w)).share("bmc_2_videoram"); + map(0x260000, 0x260fff).w(FUNC(koftball_state::bmc_1_videoram_w)).share("bmc_1_videoram"); + map(0x261000, 0x261fff).w(FUNC(koftball_state::bmc_2_videoram_w)).share("bmc_2_videoram"); map(0x262000, 0x26ffff).ram(); map(0x280000, 0x28ffff).ram(); /* unused ? */ map(0x2a0000, 0x2a001f).nopw(); - map(0x2a0000, 0x2a001f).r(this, FUNC(koftball_state::random_number_r)); - map(0x2b0000, 0x2b0003).r(this, FUNC(koftball_state::random_number_r)); - map(0x2d8000, 0x2d8001).r(this, FUNC(koftball_state::random_number_r)); + map(0x2a0000, 0x2a001f).r(FUNC(koftball_state::random_number_r)); + map(0x2b0000, 0x2b0003).r(FUNC(koftball_state::random_number_r)); + map(0x2d8000, 0x2d8001).r(FUNC(koftball_state::random_number_r)); map(0x2da000, 0x2da003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0xff00); map(0x2db001, 0x2db001).w("ramdac", FUNC(ramdac_device::index_w)); @@ -173,8 +173,8 @@ void koftball_state::koftball_mem(address_map &map) map(0x2f0000, 0x2f0003).portr("INPUTS"); map(0x300000, 0x300001).nopw(); map(0x320000, 0x320001).nopw(); - map(0x340000, 0x340001).r(this, FUNC(koftball_state::prot_r)); - map(0x360000, 0x360001).w(this, FUNC(koftball_state::prot_w)); + map(0x340000, 0x340001).r(FUNC(koftball_state::prot_r)); + map(0x360000, 0x360001).w(FUNC(koftball_state::prot_w)); } void koftball_state::ramdac_map(address_map &map) diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp index 8434d362c58..a6bf26f85ff 100644 --- a/src/mame/drivers/koikoi.cpp +++ b/src/mame/drivers/koikoi.cpp @@ -236,9 +236,9 @@ void koikoi_state::koikoi_map(address_map &map) { map(0x0000, 0x2fff).rom(); map(0x6000, 0x67ff).ram(); - map(0x7000, 0x77ff).ram().w(this, FUNC(koikoi_state::vram_w)).share("videoram"); + map(0x7000, 0x77ff).ram().w(FUNC(koikoi_state::vram_w)).share("videoram"); map(0x8000, 0x8000).portr("DSW"); - map(0x9000, 0x9007).rw(this, FUNC(koikoi_state::io_r), FUNC(koikoi_state::io_w)); + map(0x9000, 0x9007).rw(FUNC(koikoi_state::io_r), FUNC(koikoi_state::io_w)); } void koikoi_state::koikoi_io_map(address_map &map) diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp index 879a152d852..45acd6e35bb 100644 --- a/src/mame/drivers/konamigq.cpp +++ b/src/mame/drivers/konamigq.cpp @@ -171,7 +171,7 @@ void konamigq_state::konamigq_map(address_map &map) { map(0x1f000000, 0x1f00001f).rw(m_am53cf96, FUNC(am53cf96_device::read), FUNC(am53cf96_device::write)).umask32(0x00ff00ff); map(0x1f100000, 0x1f10001f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)).umask32(0x00ff00ff); - map(0x1f180000, 0x1f180001).w(this, FUNC(konamigq_state::eeprom_w)); + map(0x1f180000, 0x1f180001).w(FUNC(konamigq_state::eeprom_w)); map(0x1f198000, 0x1f198003).nopw(); /* cabinet lamps? */ map(0x1f1a0000, 0x1f1a0003).nopw(); /* indicates gun trigger */ map(0x1f200000, 0x1f200003).portr("GUNX1"); @@ -183,7 +183,7 @@ void konamigq_state::konamigq_map(address_map &map) map(0x1f230000, 0x1f230003).portr("P1_P2"); map(0x1f230004, 0x1f230007).portr("P3_SERVICE"); map(0x1f238000, 0x1f238003).portr("DSW"); - map(0x1f300000, 0x1f5fffff).rw(this, FUNC(konamigq_state::pcmram_r), FUNC(konamigq_state::pcmram_w)).umask32(0x00ff00ff); + map(0x1f300000, 0x1f5fffff).rw(FUNC(konamigq_state::pcmram_r), FUNC(konamigq_state::pcmram_w)).umask32(0x00ff00ff); map(0x1f680000, 0x1f68001f).rw("mb89371", FUNC(mb89371_device::read), FUNC(mb89371_device::write)).umask32(0x00ff00ff); map(0x1f780000, 0x1f780003).nopw(); /* watchdog? */ } @@ -237,9 +237,9 @@ void konamigq_state::konamigq_sound_map(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x200000, 0x2004ff).rw("k054539_1", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0xff00); map(0x200000, 0x2004ff).rw("k054539_2", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); - map(0x300000, 0x300001).rw(this, FUNC(konamigq_state::tms57002_data_word_r), FUNC(konamigq_state::tms57002_data_word_w)); + map(0x300000, 0x300001).rw(FUNC(konamigq_state::tms57002_data_word_r), FUNC(konamigq_state::tms57002_data_word_w)); map(0x400000, 0x40001f).rw(m_k056800, FUNC(k056800_device::sound_r), FUNC(k056800_device::sound_w)).umask16(0x00ff); - map(0x500000, 0x500001).rw(this, FUNC(konamigq_state::tms57002_status_word_r), FUNC(konamigq_state::tms57002_control_word_w)); + map(0x500000, 0x500001).rw(FUNC(konamigq_state::tms57002_status_word_r), FUNC(konamigq_state::tms57002_control_word_w)); map(0x580000, 0x580001).nopw(); // 'NRES' - D2: K056602 /RESET } diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp index 5a6cbd49845..f7944aaabf0 100644 --- a/src/mame/drivers/konamigv.cpp +++ b/src/mame/drivers/konamigv.cpp @@ -220,9 +220,9 @@ void simpbowl_state::simpbowl_map(address_map &map) { konamigv_map(map); - map(0x1f680080, 0x1f68008f).rw(this, FUNC(simpbowl_state::flash_r), FUNC(simpbowl_state::flash_w)); + map(0x1f680080, 0x1f68008f).rw(FUNC(simpbowl_state::flash_r), FUNC(simpbowl_state::flash_w)); map(0x1f6800c0, 0x1f6800c7).r("upd", FUNC(upd4701_device::read_xy)).umask32(0xff00ff00); - map(0x1f6800c9, 0x1f6800c9).r("upd", FUNC(upd4701_device::reset_xy)); + map(0x1f6800c9, 0x1f6800c9).r("upd", FUNC(upd4701_device::reset_xy_r)); } void konamigv_state::btchamp_map(address_map &map) @@ -232,7 +232,7 @@ void konamigv_state::btchamp_map(address_map &map) map(0x1f380000, 0x1f3fffff).rw("flash", FUNC(intelfsh16_device::read), FUNC(intelfsh16_device::write)); map(0x1f680080, 0x1f680087).r("upd1", FUNC(upd4701_device::read_xy)).umask32(0xff00ff00); map(0x1f680080, 0x1f680087).r("upd2", FUNC(upd4701_device::read_xy)).umask32(0x00ff00ff); - map(0x1f680088, 0x1f680089).w(this, FUNC(konamigv_state::btc_trackball_w)); + map(0x1f680088, 0x1f680089).w(FUNC(konamigv_state::btc_trackball_w)); map(0x1f6800e0, 0x1f6800e3).nopw(); } @@ -253,8 +253,8 @@ void konamigv_state::tmosh_map(address_map &map) { konamigv_map(map); - map(0x1f680080, 0x1f680081).r(this, FUNC(konamigv_state::tokimeki_serial_r)); - map(0x1f680090, 0x1f680091).w(this, FUNC(konamigv_state::tokimeki_serial_w)); + map(0x1f680080, 0x1f680081).r(FUNC(konamigv_state::tokimeki_serial_r)); + map(0x1f680090, 0x1f680091).w(FUNC(konamigv_state::tokimeki_serial_w)); } /* SCSI */ @@ -467,8 +467,8 @@ READ16_MEMBER(simpbowl_state::flash_r) { int chip = (m_flash_address >= 0x200000) ? 2 : 0; - int ret = ( m_flash8[chip]->read(m_flash_address & 0x1fffff) & 0xff ) | - ( m_flash8[chip+1]->read(m_flash_address & 0x1fffff) << 8 ); + int ret = ( m_flash8[chip]->read(space, m_flash_address & 0x1fffff) & 0xff ) | + ( m_flash8[chip+1]->read(space, m_flash_address & 0x1fffff) << 8 ); m_flash_address++; @@ -486,8 +486,8 @@ WRITE16_MEMBER(simpbowl_state::flash_w) { case 0: chip = (m_flash_address >= 0x200000) ? 2 : 0; - m_flash8[chip]->write(m_flash_address & 0x1fffff, data&0xff); - m_flash8[chip+1]->write(m_flash_address & 0x1fffff, (data>>8)&0xff); + m_flash8[chip]->write(space, m_flash_address & 0x1fffff, data&0xff); + m_flash8[chip+1]->write(space, m_flash_address & 0x1fffff, (data>>8)&0xff); break; case 1: diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index 42c60706af5..f08967a5dcf 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -996,7 +996,7 @@ void konamigx_state::gx_base_memmap(address_map &map) map(0xd21000, 0xd21fff).ram(); // second bank of sprite RAM, accessed thru ESC map(0xd22000, 0xd23fff).ram(); // extra bank checked at least by sexyparo, pending further investigation. map(0xd40000, 0xd4003f).w(m_k056832, FUNC(k056832_device::long_w)); - map(0xd44000, 0xd4400f).w(this, FUNC(konamigx_state::konamigx_tilebank_w)); + map(0xd44000, 0xd4400f).w(FUNC(konamigx_state::konamigx_tilebank_w)); map(0xd48000, 0xd48007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); map(0xd4a000, 0xd4a00f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); map(0xd4a010, 0xd4a01f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w)); @@ -1004,8 +1004,8 @@ void konamigx_state::gx_base_memmap(address_map &map) map(0xd4e000, 0xd4e01f).nopw(); // left-over for "secondary" CCU, apparently (used by type 3/4 for slave screen?) map(0xd50000, 0xd500ff).w(m_k055555, FUNC(k055555_device::K055555_long_w)); map(0xd52000, 0xd5201f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)).umask32(0xff00ff00); - map(0xd56000, 0xd56003).w(this, FUNC(konamigx_state::eeprom_w)); - map(0xd58000, 0xd58003).w(this, FUNC(konamigx_state::control_w)); + map(0xd56000, 0xd56003).w(FUNC(konamigx_state::eeprom_w)); + map(0xd58000, 0xd58003).w(FUNC(konamigx_state::control_w)); map(0xd5a000, 0xd5a003).portr("SYSTEM_DSW"); map(0xd5c000, 0xd5c003).portr("INPUTS"); map(0xd5e000, 0xd5e003).portr("SERVICE"); @@ -1022,14 +1022,14 @@ void konamigx_state::gx_type1_map(address_map &map) map(0xdd0000, 0xdd00ff).nopr().nopw(); // LAN board map(0xdda000, 0xddafff).portw("ADC-WRPORT"); map(0xddc000, 0xddcfff).portr("ADC-RDPORT"); - map(0xdde000, 0xdde003).w(this, FUNC(konamigx_state::type1_cablamps_w)); + map(0xdde000, 0xdde003).w(FUNC(konamigx_state::type1_cablamps_w)); map(0xe00000, 0xe0001f).ram().share("k053936_0_ctrl"); map(0xe20000, 0xe2000f).nopw(); map(0xe40000, 0xe40003).nopw(); map(0xe80000, 0xe81fff).ram().share("k053936_0_line"); // chips 21L+19L / S - map(0xec0000, 0xedffff).ram().w(this, FUNC(konamigx_state::konamigx_t1_psacmap_w)).share("psacram"); // chips 20J+23J+18J / S - map(0xf00000, 0xf3ffff).r(this, FUNC(konamigx_state::type1_roz_r1)); // ROM readback - map(0xf40000, 0xf7ffff).r(this, FUNC(konamigx_state::type1_roz_r2)); // ROM readback + map(0xec0000, 0xedffff).ram().w(FUNC(konamigx_state::konamigx_t1_psacmap_w)).share("psacram"); // chips 20J+23J+18J / S + map(0xf00000, 0xf3ffff).r(FUNC(konamigx_state::type1_roz_r1)); // ROM readback + map(0xf40000, 0xf7ffff).r(FUNC(konamigx_state::type1_roz_r2)); // ROM readback map(0xf80000, 0xf80fff).ram(); // chip 21Q / S map(0xfc0000, 0xfc00ff).ram(); // chip 22N / S } @@ -1037,7 +1037,7 @@ void konamigx_state::gx_type1_map(address_map &map) void konamigx_state::gx_type2_map(address_map &map) { gx_base_memmap(map); - map(0xcc0000, 0xcc0003).w(this, FUNC(konamigx_state::esc_w)); + map(0xcc0000, 0xcc0003).w(FUNC(konamigx_state::esc_w)); map(0xd90000, 0xd97fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); } @@ -1048,18 +1048,18 @@ void konamigx_state::gx_type3_map(address_map &map) //AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w) map(0xe00000, 0xe0001f).ram().share("k053936_0_ctrl"); //AM_RANGE(0xe20000, 0xe20003) AM_WRITENOP - map(0xe40000, 0xe40003).w(this, FUNC(konamigx_state::konamigx_type3_psac2_bank_w)).share("psac2_bank"); + map(0xe40000, 0xe40003).w(FUNC(konamigx_state::konamigx_type3_psac2_bank_w)).share("psac2_bank"); map(0xe60000, 0xe60fff).ram().share("k053936_0_line"); map(0xe80000, 0xe83fff).ram().share("paletteram"); // main monitor palette map(0xea0000, 0xea3fff).ram().share("subpaletteram"); - map(0xec0000, 0xec0003).r(this, FUNC(konamigx_state::type3_sync_r)); + map(0xec0000, 0xec0003).r(FUNC(konamigx_state::type3_sync_r)); //AM_RANGE(0xf00000, 0xf07fff) AM_RAM } void konamigx_state::gx_type4_map(address_map &map) { gx_base_memmap(map); - map(0xcc0000, 0xcc0007).w(this, FUNC(konamigx_state::type4_prot_w)); + map(0xcc0000, 0xcc0007).w(FUNC(konamigx_state::type4_prot_w)); map(0xd90000, 0xd97fff).ram(); map(0xe00000, 0xe0001f).ram().share("k053936_0_ctrl"); map(0xe20000, 0xe20003).nopw(); @@ -1067,8 +1067,8 @@ void konamigx_state::gx_type4_map(address_map &map) map(0xe60000, 0xe60fff).ram().share("k053936_0_line"); // 29C & 29G (PSAC2 line control) map(0xe80000, 0xe87fff).ram().share("paletteram"); // 11G/13G/15G (main screen palette RAM) map(0xea0000, 0xea7fff).ram().share("subpaletteram"); // 5G/7G/9G (sub screen palette RAM) - map(0xec0000, 0xec0003).r(this, FUNC(konamigx_state::type3_sync_r)); // type 4 polls this too - map(0xf00000, 0xf07fff).ram().w(this, FUNC(konamigx_state::konamigx_t4_psacmap_w)).share("psacram"); // PSAC2 tilemap + map(0xec0000, 0xec0003).r(FUNC(konamigx_state::type3_sync_r)); // type 4 polls this too + map(0xf00000, 0xf07fff).ram().w(FUNC(konamigx_state::konamigx_t4_psacmap_w)).share("psacram"); // PSAC2 tilemap // AM_RANGE(0xf00000, 0xf07fff) AM_RAM } @@ -1115,9 +1115,9 @@ void konamigx_state::gxsndmap(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x200000, 0x2004ff).rw(m_k054539_1, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0xff00); map(0x200000, 0x2004ff).rw(m_k054539_2, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); - map(0x300000, 0x300001).rw(this, FUNC(konamigx_state::tms57002_data_word_r), FUNC(konamigx_state::tms57002_data_word_w)); + map(0x300000, 0x300001).rw(FUNC(konamigx_state::tms57002_data_word_r), FUNC(konamigx_state::tms57002_data_word_w)); map(0x400000, 0x40001f).rw(m_k056800, FUNC(k056800_device::sound_r), FUNC(k056800_device::sound_w)).umask16(0x00ff); - map(0x500000, 0x500001).rw(this, FUNC(konamigx_state::tms57002_status_word_r), FUNC(konamigx_state::tms57002_control_word_w)); + map(0x500000, 0x500001).rw(FUNC(konamigx_state::tms57002_status_word_r), FUNC(konamigx_state::tms57002_control_word_w)); map(0x580000, 0x580001).nopw(); // 'NRES' - D2: K056602 /RESET } diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp index 0bf44a1fcbf..374186fa2c1 100644 --- a/src/mame/drivers/konamim2.cpp +++ b/src/mame/drivers/konamim2.cpp @@ -1173,35 +1173,35 @@ READ8_MEMBER(konamim2_state::id7_r) void konamim2_state::m2_main(address_map &map) { map(0x00000000, 0x0000007f).ram(); // ??? - map(0x00010040, 0x00010047).rw(this, FUNC(konamim2_state::irq_enable_r), FUNC(konamim2_state::irq_enable_w)); - map(0x00010050, 0x00010057).r(this, FUNC(konamim2_state::irq_active_r)); - map(0x00020000, 0x00020007).rw(this, FUNC(konamim2_state::unk4_r), FUNC(konamim2_state::unk4_w)); + map(0x00010040, 0x00010047).rw(FUNC(konamim2_state::irq_enable_r), FUNC(konamim2_state::irq_enable_w)); + map(0x00010050, 0x00010057).r(FUNC(konamim2_state::irq_active_r)); + map(0x00020000, 0x00020007).rw(FUNC(konamim2_state::unk4_r), FUNC(konamim2_state::unk4_w)); map(0x00020400, 0x000207ff).ram(); // ??? map(0x00020800, 0x00020807).ram(); // ??? - map(0x00030000, 0x00030007).r(this, FUNC(konamim2_state::unk30000_r)); - map(0x00030010, 0x00030017).w(this, FUNC(konamim2_state::video_w)); - map(0x00030030, 0x00030037).r(this, FUNC(konamim2_state::unk30030_r)); - map(0x00030404, 0x00030407).w(this, FUNC(konamim2_state::video_irq_ack_w)); + map(0x00030000, 0x00030007).r(FUNC(konamim2_state::unk30000_r)); + map(0x00030010, 0x00030017).w(FUNC(konamim2_state::video_w)); + map(0x00030030, 0x00030037).r(FUNC(konamim2_state::unk30030_r)); + map(0x00030404, 0x00030407).w(FUNC(konamim2_state::video_irq_ack_w)); - map(0x01000000, 0x01000fff).rw(this, FUNC(konamim2_state::cde_r), FUNC(konamim2_state::cde_w)); + map(0x01000000, 0x01000fff).rw(FUNC(konamim2_state::cde_r), FUNC(konamim2_state::cde_w)); - map(0x02000000, 0x02000fff).r(this, FUNC(konamim2_state::device2_r)); + map(0x02000000, 0x02000fff).r(FUNC(konamim2_state::device2_r)); - map(0x03000001, 0x03000001).r(this, FUNC(konamim2_state::id3_r)); + map(0x03000001, 0x03000001).r(FUNC(konamim2_state::id3_r)); - map(0x04000001, 0x04000001).r(this, FUNC(konamim2_state::id4_r)); - map(0x04000017, 0x04000017).w(this, FUNC(konamim2_state::serial_w)); - map(0x04000018, 0x0400001f).r(this, FUNC(konamim2_state::unk1_r)); // serial status - map(0x04000020, 0x04000027).w(this, FUNC(konamim2_state::reset_w)); - map(0x04000418, 0x0400041f).w(this, FUNC(konamim2_state::unk4000418_w)); // serial status ack - map(0x04000208, 0x0400020f).r(this, FUNC(konamim2_state::unk3_r)); - map(0x04000280, 0x04000287).r(this, FUNC(konamim2_state::unk4000280_r)); + map(0x04000001, 0x04000001).r(FUNC(konamim2_state::id4_r)); + map(0x04000017, 0x04000017).w(FUNC(konamim2_state::serial_w)); + map(0x04000018, 0x0400001f).r(FUNC(konamim2_state::unk1_r)); // serial status + map(0x04000020, 0x04000027).w(FUNC(konamim2_state::reset_w)); + map(0x04000418, 0x0400041f).w(FUNC(konamim2_state::unk4000418_w)); // serial status ack + map(0x04000208, 0x0400020f).r(FUNC(konamim2_state::unk3_r)); + map(0x04000280, 0x04000287).r(FUNC(konamim2_state::unk4000280_r)); - map(0x05000001, 0x05000001).r(this, FUNC(konamim2_state::id5_r)); + map(0x05000001, 0x05000001).r(FUNC(konamim2_state::id5_r)); - map(0x06000001, 0x06000001).r(this, FUNC(konamim2_state::id6_r)); + map(0x06000001, 0x06000001).r(FUNC(konamim2_state::id6_r)); - map(0x07000001, 0x07000001).r(this, FUNC(konamim2_state::id7_r)); + map(0x07000001, 0x07000001).r(FUNC(konamim2_state::id7_r)); map(0x10000008, 0x10001007).noprw(); // ??? @@ -1213,13 +1213,13 @@ void konamim2_state::m2_main(address_map &map) void konamim2_state::m2_main_m(address_map &map) { m2_main(map); - map(0x10000000, 0x10000007).r(this, FUNC(konamim2_state::cpu_r)); + map(0x10000000, 0x10000007).r(FUNC(konamim2_state::cpu_r)); } void konamim2_state::m2_main_s(address_map &map) { m2_main(map); - map(0x10000000, 0x10000007).r(this, FUNC(konamim2_state::cpu_r)); + map(0x10000000, 0x10000007).r(FUNC(konamim2_state::cpu_r)); } void konamim2_state::_3do_m2_main(address_map &map) @@ -1233,13 +1233,13 @@ void konamim2_state::_3do_m2_main(address_map &map) void konamim2_state::_3do_m2_main_m(address_map &map) { _3do_m2_main(map); - map(0x10000000, 0x10000007).r(this, FUNC(konamim2_state::cpu_r)); + map(0x10000000, 0x10000007).r(FUNC(konamim2_state::cpu_r)); } void konamim2_state::_3do_m2_main_s(address_map &map) { _3do_m2_main(map); - map(0x10000000, 0x10000007).r(this, FUNC(konamim2_state::cpu_r)); + map(0x10000000, 0x10000007).r(FUNC(konamim2_state::cpu_r)); } diff --git a/src/mame/drivers/konblands.cpp b/src/mame/drivers/konblands.cpp index 6dbb19fae0c..e0ca08f1a3d 100644 --- a/src/mame/drivers/konblands.cpp +++ b/src/mame/drivers/konblands.cpp @@ -150,16 +150,16 @@ WRITE8_MEMBER(konblands_state::firq_enable_w) void konblands_state::konblands_map(address_map &map) { map(0x0000, 0x0000).portr("DSW1").nopw(); // sn latch - map(0x0800, 0x0800).portr("DSW2").w(this, FUNC(konblands_state::ldp_w)); - map(0x1000, 0x1000).nopw().r(this, FUNC(konblands_state::ldp_r)); // led + map(0x0800, 0x0800).portr("DSW2").w(FUNC(konblands_state::ldp_w)); + map(0x1000, 0x1000).nopw().r(FUNC(konblands_state::ldp_r)); // led map(0x1001, 0x1001).nopw(); // coin counter 2 map(0x1002, 0x1002).nopw(); // coin counter 1 map(0x1003, 0x1003).nopw(); // enable overlay transparency - map(0x1004, 0x1004).w(this, FUNC(konblands_state::nmi_enable_w)); + map(0x1004, 0x1004).w(FUNC(konblands_state::nmi_enable_w)); map(0x1005, 0x1005).nopw(); // enable audio - map(0x1006, 0x1006).w(this, FUNC(konblands_state::irq_enable_w)); - map(0x1007, 0x1007).w(this, FUNC(konblands_state::firq_enable_w)); - map(0x1800, 0x1800).portr("INPUTS").w("sn", FUNC(sn76496_device::write)); + map(0x1006, 0x1006).w(FUNC(konblands_state::irq_enable_w)); + map(0x1007, 0x1007).w(FUNC(konblands_state::firq_enable_w)); + map(0x1800, 0x1800).portr("INPUTS").w("sn", FUNC(sn76496_device::command_w)); map(0x4000, 0x47ff).ram().share("vram"); map(0x4800, 0x4bff).ram(); map(0x5800, 0x5800).nopw(); // watchdog @@ -169,15 +169,15 @@ void konblands_state::konblands_map(address_map &map) void konblands_state::konblandsh_map(address_map &map) { - map(0x0000, 0x0000).r(this, FUNC(konblands_state::ldp_r)); - map(0x0400, 0x0400).w(this, FUNC(konblands_state::ldp_w)); + map(0x0000, 0x0000).r(FUNC(konblands_state::ldp_r)); + map(0x0400, 0x0400).w(FUNC(konblands_state::ldp_w)); map(0x0802, 0x0802).nopw(); // led map(0x0803, 0x0803).nopw(); // enable overlay transparency - map(0x0806, 0x0806).nopr().w(this, FUNC(konblands_state::irq_enable_w)); - map(0x0807, 0x0807).nopr().w(this, FUNC(konblands_state::firq_enable_w)); + map(0x0806, 0x0806).nopr().w(FUNC(konblands_state::irq_enable_w)); + map(0x0807, 0x0807).nopr().w(FUNC(konblands_state::firq_enable_w)); map(0x0c00, 0x0c00).portr("INPUTS"); map(0x1000, 0x1000).portr("DSW1"); - map(0x1400, 0x1400).w("sn", FUNC(sn76496_device::write)); + map(0x1400, 0x1400).w("sn", FUNC(sn76496_device::command_w)); map(0x1800, 0x1800).nopw(); // sn latch map(0x2000, 0x27ff).ram().share("vram"); map(0x2800, 0x2fff).ram(); diff --git a/src/mame/drivers/konendev.cpp b/src/mame/drivers/konendev.cpp index 5beceb9c593..b6b6b11027b 100644 --- a/src/mame/drivers/konendev.cpp +++ b/src/mame/drivers/konendev.cpp @@ -217,14 +217,14 @@ WRITE32_MEMBER(konendev_state::sound_data_w) void konendev_state::konendev_map(address_map &map) { map(0x00000000, 0x00ffffff).ram(); - map(0x78000000, 0x78000003).r(this, FUNC(konendev_state::mcu2_r)); - map(0x78080000, 0x7808000f).rw(this, FUNC(konendev_state::rtc_r), FUNC(konendev_state::rtc_w)); - map(0x780c0000, 0x780c0003).rw(this, FUNC(konendev_state::sound_data_r), FUNC(konendev_state::sound_data_w)); - map(0x78100000, 0x78100003).w(this, FUNC(konendev_state::eeprom_w)); - map(0x78800000, 0x78800003).r(this, FUNC(konendev_state::ifu2_r)); - map(0x78800004, 0x78800007).r(this, FUNC(konendev_state::ctrl0_r)); - map(0x78a00000, 0x78a0001f).r(this, FUNC(konendev_state::ctrl1_r)); - map(0x78e00000, 0x78e00003).r(this, FUNC(konendev_state::ctrl2_r)); + map(0x78000000, 0x78000003).r(FUNC(konendev_state::mcu2_r)); + map(0x78080000, 0x7808000f).rw(FUNC(konendev_state::rtc_r), FUNC(konendev_state::rtc_w)); + map(0x780c0000, 0x780c0003).rw(FUNC(konendev_state::sound_data_r), FUNC(konendev_state::sound_data_w)); + map(0x78100000, 0x78100003).w(FUNC(konendev_state::eeprom_w)); + map(0x78800000, 0x78800003).r(FUNC(konendev_state::ifu2_r)); + map(0x78800004, 0x78800007).r(FUNC(konendev_state::ctrl0_r)); + map(0x78a00000, 0x78a0001f).r(FUNC(konendev_state::ctrl1_r)); + map(0x78e00000, 0x78e00003).r(FUNC(konendev_state::ctrl2_r)); map(0x79000000, 0x79000003).w(m_gcu, FUNC(k057714_device::fifo_w)); map(0x79800000, 0x798000ff).rw(m_gcu, FUNC(k057714_device::read), FUNC(k057714_device::write)); map(0x7a000000, 0x7a01ffff).ram().share("nvram0"); diff --git a/src/mame/drivers/konin.cpp b/src/mame/drivers/konin.cpp index b5cfd06c31c..7f7a257ff98 100644 --- a/src/mame/drivers/konin.cpp +++ b/src/mame/drivers/konin.cpp @@ -102,7 +102,7 @@ void konin_state::konin_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x24, 0x24).w(this, FUNC(konin_state::picu_b_w)); + map(0x24, 0x24).w(FUNC(konin_state::picu_b_w)); map(0x80, 0x83).lrw8("ioppi_rw", [this](address_space &space, offs_t offset, u8 mem_mask) { return m_ioppi->read(space, offset^3, mem_mask); diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index 8aa0cbb2932..e3a0f8ac83b 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -232,17 +232,17 @@ void konmedal_state::medal_main(address_map &map) map(0xa000, 0xafff).ram(); // work RAM? map(0xb800, 0xbfff).ram(); // stack goes here map(0xc000, 0xc03f).w(m_k056832, FUNC(k056832_device::write)); - map(0xc100, 0xc100).w(this, FUNC(konmedal_state::control2_w)); - map(0xc400, 0xc400).w(this, FUNC(konmedal_state::bankswitch_w)); + map(0xc100, 0xc100).w(FUNC(konmedal_state::control2_w)); + map(0xc400, 0xc400).w(FUNC(konmedal_state::bankswitch_w)); map(0xc500, 0xc500).noprw(); // read to reset watchdog map(0xc700, 0xc700).portr("DSW2"); map(0xc701, 0xc701).portr("DSW1"); map(0xc702, 0xc702).portr("IN1"); map(0xc703, 0xc703).portr("IN2"); map(0xc800, 0xc80f).w(m_k056832, FUNC(k056832_device::b_w)); - map(0xc80f, 0xc80f).r(this, FUNC(konmedal_state::magic_r)); + map(0xc80f, 0xc80f).r(FUNC(konmedal_state::magic_r)); map(0xd000, 0xd001).rw(m_ymz, FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0xe000, 0xffff).rw(this, FUNC(konmedal_state::vram_r), FUNC(konmedal_state::vram_w)); + map(0xe000, 0xffff).rw(FUNC(konmedal_state::vram_r), FUNC(konmedal_state::vram_w)); } void konmedal_state::ddboy_main(address_map &map) @@ -251,17 +251,17 @@ void konmedal_state::ddboy_main(address_map &map) map(0x8000, 0x9fff).bankr("bank1"); map(0xa000, 0xbfff).ram(); // work RAM map(0xc000, 0xc03f).w(m_k056832, FUNC(k056832_device::write)); - map(0xc100, 0xc100).w(this, FUNC(konmedal_state::control2_w)); - map(0xc400, 0xc400).w(this, FUNC(konmedal_state::bankswitch_w)); + map(0xc100, 0xc100).w(FUNC(konmedal_state::control2_w)); + map(0xc400, 0xc400).w(FUNC(konmedal_state::bankswitch_w)); map(0xc500, 0xc500).noprw(); // read to reset watchdog map(0xc702, 0xc702).portr("IN1"); map(0xc703, 0xc703).portr("IN2"); map(0xc800, 0xc80f).w(m_k056832, FUNC(k056832_device::b_w)); - map(0xc80f, 0xc80f).r(this, FUNC(konmedal_state::magic_r)); + map(0xc80f, 0xc80f).r(FUNC(konmedal_state::magic_r)); map(0xcc00, 0xcc00).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xd000, 0xd000).nopw(); // ??? writes 00 and 3f every frame map(0xd800, 0xd8ff).m("k051649", FUNC(k051649_device::scc_map)); - map(0xe000, 0xffff).rw(this, FUNC(konmedal_state::vram_r), FUNC(konmedal_state::vram_w)); + map(0xe000, 0xffff).rw(FUNC(konmedal_state::vram_r), FUNC(konmedal_state::vram_w)); } void konmedal_state::shuriboy_main(address_map &map) @@ -273,15 +273,15 @@ void konmedal_state::shuriboy_main(address_map &map) map(0x8802, 0x8802).portr("DSW1"); map(0x8803, 0x8803).portr("DSW2"); map(0x8b00, 0x8b00).nopw(); // watchdog? - map(0x8c00, 0x8c00).w(this, FUNC(konmedal_state::shuri_bank_w)); + map(0x8c00, 0x8c00).w(FUNC(konmedal_state::shuri_bank_w)); map(0x9800, 0x98ff).m("k051649", FUNC(k051649_device::scc_map)); map(0xa000, 0xbfff).bankr("bank1"); map(0xc000, 0xdbff).rw(m_k052109, FUNC(k052109_device::read), FUNC(k052109_device::write)); - map(0xdd00, 0xdd00).rw(this, FUNC(konmedal_state::shuri_irq_r), FUNC(konmedal_state::shuri_irq_w)); - map(0xdd80, 0xdd80).w(this, FUNC(konmedal_state::shuri_control_w)); - map(0xde00, 0xde00).w(this, FUNC(konmedal_state::shuri_vrom_addr_w)); - map(0xdf00, 0xdf00).w(this, FUNC(konmedal_state::shuri_vrom_bank_w)); - map(0xe000, 0xffff).rw(this, FUNC(konmedal_state::shuri_video_r), FUNC(konmedal_state::shuri_video_w)); + map(0xdd00, 0xdd00).rw(FUNC(konmedal_state::shuri_irq_r), FUNC(konmedal_state::shuri_irq_w)); + map(0xdd80, 0xdd80).w(FUNC(konmedal_state::shuri_control_w)); + map(0xde00, 0xde00).w(FUNC(konmedal_state::shuri_vrom_addr_w)); + map(0xdf00, 0xdf00).w(FUNC(konmedal_state::shuri_vrom_bank_w)); + map(0xe000, 0xffff).rw(FUNC(konmedal_state::shuri_video_r), FUNC(konmedal_state::shuri_video_w)); } static INPUT_PORTS_START( konmedal ) diff --git a/src/mame/drivers/konmedal68k.cpp b/src/mame/drivers/konmedal68k.cpp index 1761144ce98..3bed7632fec 100644 --- a/src/mame/drivers/konmedal68k.cpp +++ b/src/mame/drivers/konmedal68k.cpp @@ -192,11 +192,11 @@ void konmedal68k_state::kzaurus_main(address_map &map) { map(0x000000, 0x07ffff).rom().region("maincpu", 0); map(0x400000, 0x403fff).ram(); - map(0x800000, 0x800001).w(this, FUNC(konmedal68k_state::control_w)); + map(0x800000, 0x800001).w(FUNC(konmedal68k_state::control_w)); map(0x800004, 0x800005).portr("DSW"); map(0x800006, 0x800007).portr("IN1"); map(0x800008, 0x800009).portr("IN0"); - map(0x810000, 0x810001).w(this, FUNC(konmedal68k_state::control2_w)); + map(0x810000, 0x810001).w(FUNC(konmedal68k_state::control2_w)); map(0x830000, 0x83003f).rw(m_k056832, FUNC(k056832_device::word_r), FUNC(k056832_device::word_w)); map(0x840000, 0x84000f).w(m_k056832, FUNC(k056832_device::b_word_w)); map(0x85001c, 0x85001f).nopw(); @@ -205,7 +205,7 @@ void konmedal68k_state::kzaurus_main(address_map &map) map(0xa00000, 0xa01fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); map(0xa02000, 0xa03fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); map(0xb00000, 0xb01fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xc00000, 0xc01fff).r(this, FUNC(konmedal68k_state::vrom_r)); + map(0xc00000, 0xc01fff).r(FUNC(konmedal68k_state::vrom_r)); } static INPUT_PORTS_START( kzaurus ) diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp index 3bb919e7eba..31f4de0f33f 100644 --- a/src/mame/drivers/kontest.cpp +++ b/src/mame/drivers/kontest.cpp @@ -177,9 +177,9 @@ void kontest_state::kontest_map(address_map &map) void kontest_state::kontest_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("sn1", FUNC(sn76489a_device::write)); - map(0x04, 0x04).w("sn2", FUNC(sn76489a_device::write)); - map(0x08, 0x08).w(this, FUNC(kontest_state::control_w)); + map(0x00, 0x00).w("sn1", FUNC(sn76489a_device::command_w)); + map(0x04, 0x04).w("sn2", FUNC(sn76489a_device::command_w)); + map(0x08, 0x08).w(FUNC(kontest_state::control_w)); map(0x0c, 0x0c).portr("IN0"); map(0x0d, 0x0d).portr("IN1"); map(0x0e, 0x0e).portr("IN2"); diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp index dd6e52f4405..8fbacc46d01 100644 --- a/src/mame/drivers/kopunch.cpp +++ b/src/mame/drivers/kopunch.cpp @@ -76,8 +76,8 @@ void kopunch_state::kopunch_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x6000, 0x63ff).ram().w(this, FUNC(kopunch_state::vram_fg_w)).share("vram_fg"); - map(0x7000, 0x70ff).ram().w(this, FUNC(kopunch_state::vram_bg_w)).share("vram_bg"); + map(0x6000, 0x63ff).ram().w(FUNC(kopunch_state::vram_fg_w)).share("vram_fg"); + map(0x7000, 0x70ff).ram().w(FUNC(kopunch_state::vram_bg_w)).share("vram_bg"); map(0x7100, 0x73ff).ram(); // unused vram map(0x7400, 0x7bff).ram(); // more unused vram? or accidental writes? } diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp index 1b3e82f9002..3bb07c3391c 100644 --- a/src/mame/drivers/kron.cpp +++ b/src/mame/drivers/kron.cpp @@ -200,14 +200,14 @@ void kron180_state::kron180_mem(address_map &map) void kron180_state::kron180_iomap(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x000f).w(this, FUNC(kron180_state::sn74259_w)); - map(0x0010, 0x001f).rw(this, FUNC(kron180_state::ap5_r), FUNC(kron180_state::ap5_w)); - map(0x0020, 0x002f).w(this, FUNC(kron180_state::wkb_w)); - map(0x0030, 0x003f).r(this, FUNC(kron180_state::sn74299_r)); - map(0x0040, 0x004f).w(this, FUNC(kron180_state::sn74299_w)); - map(0x0050, 0x005f).w(this, FUNC(kron180_state::txen_w)); - map(0x0060, 0x006f).w(this, FUNC(kron180_state::kbd_reset_w)); - map(0x0070, 0x007f).w(this, FUNC(kron180_state::dreq_w)); + map(0x0000, 0x000f).w(FUNC(kron180_state::sn74259_w)); + map(0x0010, 0x001f).rw(FUNC(kron180_state::ap5_r), FUNC(kron180_state::ap5_w)); + map(0x0020, 0x002f).w(FUNC(kron180_state::wkb_w)); + map(0x0030, 0x003f).r(FUNC(kron180_state::sn74299_r)); + map(0x0040, 0x004f).w(FUNC(kron180_state::sn74299_w)); + map(0x0050, 0x005f).w(FUNC(kron180_state::txen_w)); + map(0x0060, 0x006f).w(FUNC(kron180_state::kbd_reset_w)); + map(0x0070, 0x007f).w(FUNC(kron180_state::dreq_w)); } /* Input ports */ diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp index e3fa2809942..ccf430abe49 100644 --- a/src/mame/drivers/ksayakyu.cpp +++ b/src/mame/drivers/ksayakyu.cpp @@ -123,12 +123,12 @@ void ksayakyu_state::maincpu_map(address_map &map) map(0xa801, 0xa801).portr("P2"); map(0xa802, 0xa802).portr("DSW"); map(0xa803, 0xa803).nopr(); /* watchdog ? */ - map(0xa804, 0xa804).w(this, FUNC(ksayakyu_state::ksayakyu_videoctrl_w)); - map(0xa805, 0xa805).w(this, FUNC(ksayakyu_state::latch_w)); - map(0xa806, 0xa806).r(this, FUNC(ksayakyu_state::sound_status_r)); - map(0xa807, 0xa807).r(this, FUNC(ksayakyu_state::int_ack_r)); - map(0xa808, 0xa808).w(this, FUNC(ksayakyu_state::bank_select_w)); - map(0xb000, 0xb7ff).ram().w(this, FUNC(ksayakyu_state::ksayakyu_videoram_w)).share("videoram"); + map(0xa804, 0xa804).w(FUNC(ksayakyu_state::ksayakyu_videoctrl_w)); + map(0xa805, 0xa805).w(FUNC(ksayakyu_state::latch_w)); + map(0xa806, 0xa806).r(FUNC(ksayakyu_state::sound_status_r)); + map(0xa807, 0xa807).r(FUNC(ksayakyu_state::int_ack_r)); + map(0xa808, 0xa808).w(FUNC(ksayakyu_state::bank_select_w)); + map(0xb000, 0xb7ff).ram().w(FUNC(ksayakyu_state::ksayakyu_videoram_w)).share("videoram"); map(0xb800, 0xbfff).ram().share("spriteram"); } @@ -139,8 +139,8 @@ void ksayakyu_state::soundcpu_map(address_map &map) map(0xa001, 0xa001).r("ay1", FUNC(ay8910_device::data_r)); map(0xa002, 0xa003).w("ay1", FUNC(ay8910_device::data_address_w)); map(0xa006, 0xa007).w("ay2", FUNC(ay8910_device::data_address_w)); - map(0xa008, 0xa008).w("dac", FUNC(dac_byte_interface::write)); - map(0xa00c, 0xa00c).w(this, FUNC(ksayakyu_state::tomaincpu_w)); + map(0xa008, 0xa008).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xa00c, 0xa00c).w(FUNC(ksayakyu_state::tomaincpu_w)); map(0xa010, 0xa010).nopw(); //a timer of some sort? } diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index da970f9b948..a4ca67b6c68 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -628,14 +628,14 @@ void ksys573_state::konami573_map(address_map &map) map(0x1f400004, 0x1f400007).portr("IN1"); map(0x1f400008, 0x1f40000b).portr("IN2"); map(0x1f40000c, 0x1f40000f).portr("IN3"); - map(0x1f480000, 0x1f48000f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); - map(0x1f500000, 0x1f500001).rw(this, FUNC(ksys573_state::control_r), FUNC(ksys573_state::control_w)); // Konami can't make a game without a "control" register. - map(0x1f560000, 0x1f560001).w(this, FUNC(ksys573_state::atapi_reset_w)); + map(0x1f480000, 0x1f48000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); + map(0x1f500000, 0x1f500001).rw(FUNC(ksys573_state::control_r), FUNC(ksys573_state::control_w)); // Konami can't make a game without a "control" register. + map(0x1f560000, 0x1f560001).w(FUNC(ksys573_state::atapi_reset_w)); map(0x1f5c0000, 0x1f5c0003).nopw(); // watchdog? map(0x1f600000, 0x1f600003).portw("LAMPS"); map(0x1f620000, 0x1f623fff).rw("m48t58", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask32(0x00ff00ff); map(0x1f680000, 0x1f68001f).rw(m_duart, FUNC(mb89371_device::read), FUNC(mb89371_device::write)).umask32(0x00ff00ff); - map(0x1f6a0000, 0x1f6a0001).rw(this, FUNC(ksys573_state::security_r), FUNC(ksys573_state::security_w)); + map(0x1f6a0000, 0x1f6a0001).rw(FUNC(ksys573_state::security_r), FUNC(ksys573_state::security_w)); } void ksys573_state::flashbank_map(address_map &map) @@ -661,19 +661,19 @@ void ksys573_state::konami573d_map(address_map &map) void ksys573_state::konami573a_map(address_map &map) { konami573_map(map); - map(0x1f640000, 0x1f6400ff).rw(this, FUNC(ksys573_state::gx700pwbf_io_r), FUNC(ksys573_state::gx700pwbf_io_w)); + map(0x1f640000, 0x1f6400ff).rw(FUNC(ksys573_state::gx700pwbf_io_r), FUNC(ksys573_state::gx700pwbf_io_w)); } void ksys573_state::fbaitbc_map(address_map &map) { konami573_map(map); - map(0x1f640000, 0x1f6400ff).rw(this, FUNC(ksys573_state::ge765pwbba_r), FUNC(ksys573_state::ge765pwbba_w)); + map(0x1f640000, 0x1f6400ff).rw(FUNC(ksys573_state::ge765pwbba_r), FUNC(ksys573_state::ge765pwbba_w)); } void ksys573_state::gunmania_map(address_map &map) { konami573_map(map); - map(0x1f640000, 0x1f6400ff).rw(this, FUNC(ksys573_state::gunmania_r), FUNC(ksys573_state::gunmania_w)); + map(0x1f640000, 0x1f6400ff).rw(FUNC(ksys573_state::gunmania_r), FUNC(ksys573_state::gunmania_w)); } READ16_MEMBER( ksys573_state::control_r ) diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp index b55c89bfa9f..950931dc81f 100644 --- a/src/mame/drivers/kungfur.cpp +++ b/src/mame/drivers/kungfur.cpp @@ -231,8 +231,8 @@ WRITE_LINE_MEMBER(kungfur_state::kfr_adpcm2_int) void kungfur_state::kungfur_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x4000, 0x4000).w(this, FUNC(kungfur_state::kungfur_adpcm1_w)); - map(0x4004, 0x4004).w(this, FUNC(kungfur_state::kungfur_adpcm2_w)); + map(0x4000, 0x4000).w(FUNC(kungfur_state::kungfur_adpcm1_w)); + map(0x4004, 0x4004).w(FUNC(kungfur_state::kungfur_adpcm2_w)); map(0x4008, 0x400b).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x400c, 0x400f).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc000, 0xffff).rom(); diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index 864dbf23e01..38ca813618c 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -526,11 +526,11 @@ void kurukuru_state::kurukuru_map(address_map &map) void kurukuru_state::kurukuru_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_out_latch_w)); + map(0x00, 0x00).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_out_latch_w)); map(0x10, 0x10).mirror(0x0f).portr("DSW1"); map(0x20, 0x20).mirror(0x0f).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x80, 0x83).mirror(0x0c).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); - map(0x90, 0x90).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_bankswitch_w)); + map(0x90, 0x90).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_bankswitch_w)); map(0xa0, 0xa0).mirror(0x0f).portr("IN0"); map(0xb0, 0xb0).mirror(0x0f).portr("IN1"); map(0xc0, 0xc0).mirror(0x0f).rw("ym2149", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)); @@ -547,11 +547,11 @@ void kurukuru_state::ppj_map(address_map &map) void kurukuru_state::ppj_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_bankswitch_w)); + map(0x00, 0x00).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_bankswitch_w)); map(0x10, 0x13).mirror(0x0c).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); map(0x30, 0x30).mirror(0x0f).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x40, 0x40).mirror(0x0f).portr("DSW1"); - map(0x50, 0x50).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_out_latch_w)); + map(0x50, 0x50).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_out_latch_w)); map(0x60, 0x60).mirror(0x0f).portr("IN1"); map(0x70, 0x70).mirror(0x0f).portr("IN0"); map(0xc0, 0xc0).mirror(0x0f).w("ym2149", FUNC(ay8910_device::address_w)); @@ -619,10 +619,10 @@ void kurukuru_state::kurukuru_audio_map(address_map &map) void kurukuru_state::kurukuru_audio_io(address_map &map) { map.global_mask(0x7f); - map(0x40, 0x40).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_adpcm_data_w)); - map(0x50, 0x50).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_adpcm_reset_w)); + map(0x40, 0x40).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_adpcm_data_w)); + map(0x50, 0x50).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_adpcm_reset_w)); map(0x60, 0x60).mirror(0x0f).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x70, 0x70).mirror(0x0f).r(this, FUNC(kurukuru_state::kurukuru_adpcm_timer_irqack_r)); + map(0x70, 0x70).mirror(0x0f).r(FUNC(kurukuru_state::kurukuru_adpcm_timer_irqack_r)); } void kurukuru_state::ppj_audio_map(address_map &map) @@ -634,10 +634,10 @@ void kurukuru_state::ppj_audio_map(address_map &map) void kurukuru_state::ppj_audio_io(address_map &map) { map.global_mask(0x7f); - map(0x20, 0x20).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_adpcm_data_w)); - map(0x30, 0x30).mirror(0x0f).w(this, FUNC(kurukuru_state::kurukuru_adpcm_reset_w)); + map(0x20, 0x20).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_adpcm_data_w)); + map(0x30, 0x30).mirror(0x0f).w(FUNC(kurukuru_state::kurukuru_adpcm_reset_w)); map(0x40, 0x40).mirror(0x0f).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x50, 0x50).mirror(0x0f).r(this, FUNC(kurukuru_state::kurukuru_adpcm_timer_irqack_r)); + map(0x50, 0x50).mirror(0x0f).r(FUNC(kurukuru_state::kurukuru_adpcm_timer_irqack_r)); } /* 30h -W --> 0x0b diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp index 99623364369..c4f5c9a153c 100644 --- a/src/mame/drivers/kyocera.cpp +++ b/src/mame/drivers/kyocera.cpp @@ -594,32 +594,32 @@ void kc85_state::kc85_io(address_map &map) // AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x0f) optional modem map(0xb0, 0xb7).mirror(0x08).rw(I8155_TAG, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); map(0xc0, 0xc0).mirror(0x0f).rw(m_uart, FUNC(im6402_device::read), FUNC(im6402_device::write)); - map(0xd0, 0xd0).mirror(0x0f).rw(this, FUNC(kc85_state::uart_status_r), FUNC(kc85_state::uart_ctrl_w)); - map(0xe0, 0xe0).mirror(0x0f).rw(this, FUNC(kc85_state::keyboard_r), FUNC(kc85_state::ctrl_w)); - map(0xf0, 0xf1).mirror(0x0e).rw(this, FUNC(kc85_state::lcd_r), FUNC(kc85_state::lcd_w)); + map(0xd0, 0xd0).mirror(0x0f).rw(FUNC(kc85_state::uart_status_r), FUNC(kc85_state::uart_ctrl_w)); + map(0xe0, 0xe0).mirror(0x0f).rw(FUNC(kc85_state::keyboard_r), FUNC(kc85_state::ctrl_w)); + map(0xf0, 0xf1).mirror(0x0e).rw(FUNC(kc85_state::lcd_r), FUNC(kc85_state::lcd_w)); } void kc85_state::trsm100_io(address_map &map) { kc85_io(map); - map(0xa0, 0xa0).mirror(0x0f).w(this, FUNC(kc85_state::modem_w)); + map(0xa0, 0xa0).mirror(0x0f).w(FUNC(kc85_state::modem_w)); } void pc8201_state::pc8201_io(address_map &map) { map.unmap_value_high(); // AM_RANGE(0x70, 0x70) AM_MIRROR(0x0f) optional video interface 8255 - map(0x80, 0x80).mirror(0x03).w(this, FUNC(pc8201_state::romah_w)); - map(0x84, 0x84).mirror(0x03).w(this, FUNC(pc8201_state::romal_w)); - map(0x88, 0x88).mirror(0x03).w(this, FUNC(pc8201_state::romam_w)); - map(0x8c, 0x8c).mirror(0x03).r(this, FUNC(pc8201_state::romrd_r)); - map(0x90, 0x90).mirror(0x0f).w(this, FUNC(pc8201_state::scp_w)); - map(0xa0, 0xa0).mirror(0x0f).rw(this, FUNC(pc8201_state::bank_r), FUNC(pc8201_state::bank_w)); + map(0x80, 0x80).mirror(0x03).w(FUNC(pc8201_state::romah_w)); + map(0x84, 0x84).mirror(0x03).w(FUNC(pc8201_state::romal_w)); + map(0x88, 0x88).mirror(0x03).w(FUNC(pc8201_state::romam_w)); + map(0x8c, 0x8c).mirror(0x03).r(FUNC(pc8201_state::romrd_r)); + map(0x90, 0x90).mirror(0x0f).w(FUNC(pc8201_state::scp_w)); + map(0xa0, 0xa0).mirror(0x0f).rw(FUNC(pc8201_state::bank_r), FUNC(pc8201_state::bank_w)); map(0xb0, 0xb7).mirror(0x08).rw(I8155_TAG, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); map(0xc0, 0xc0).mirror(0x0f).rw(m_uart, FUNC(im6402_device::read), FUNC(im6402_device::write)); - map(0xd0, 0xd0).mirror(0x0f).r(this, FUNC(pc8201_state::uart_status_r)).w(this, FUNC(pc8201_state::uart_ctrl_w)); - map(0xe0, 0xe0).mirror(0x0f).r(this, FUNC(pc8201_state::keyboard_r)); - map(0xf0, 0xf1).mirror(0x0e).rw(this, FUNC(pc8201_state::lcd_r), FUNC(pc8201_state::lcd_w)); + map(0xd0, 0xd0).mirror(0x0f).r(FUNC(pc8201_state::uart_status_r)).w(FUNC(pc8201_state::uart_ctrl_w)); + map(0xe0, 0xe0).mirror(0x0f).r(FUNC(pc8201_state::keyboard_r)); + map(0xf0, 0xf1).mirror(0x0e).rw(FUNC(pc8201_state::lcd_r), FUNC(pc8201_state::lcd_w)); } void tandy200_state::tandy200_io(address_map &map) @@ -630,8 +630,8 @@ void tandy200_state::tandy200_io(address_map &map) map(0xb0, 0xb7).mirror(0x08).rw(I8155_TAG, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); map(0xc0, 0xc0).mirror(0x0e).rw(I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xc1, 0xc1).mirror(0x0e).rw(I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0xd0, 0xd0).mirror(0x0f).rw(this, FUNC(tandy200_state::bank_r), FUNC(tandy200_state::bank_w)); - map(0xe0, 0xe0).mirror(0x0f).rw(this, FUNC(tandy200_state::stbk_r), FUNC(tandy200_state::stbk_w)); + map(0xd0, 0xd0).mirror(0x0f).rw(FUNC(tandy200_state::bank_r), FUNC(tandy200_state::bank_w)); + map(0xe0, 0xe0).mirror(0x0f).rw(FUNC(tandy200_state::stbk_r), FUNC(tandy200_state::stbk_w)); map(0xf0, 0xf0).mirror(0x0e).rw(m_lcdc, FUNC(hd61830_device::data_r), FUNC(hd61830_device::data_w)); map(0xf1, 0xf1).mirror(0x0e).rw(m_lcdc, FUNC(hd61830_device::status_r), FUNC(hd61830_device::control_w)); } @@ -1085,7 +1085,7 @@ WRITE8_MEMBER( tandy200_state::i8155_pa_w ) */ - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); m_keylatch = (m_keylatch & 0x100) | data; } diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp index 52ecf39a81d..c4174157658 100644 --- a/src/mame/drivers/kyugo.cpp +++ b/src/mame/drivers/kyugo.cpp @@ -43,14 +43,14 @@ void kyugo_state::kyugo_main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(this, FUNC(kyugo_state::bgvideoram_w)).share("bgvideoram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(kyugo_state::bgattribram_w)).share("bgattribram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(kyugo_state::fgvideoram_w)).share("fgvideoram"); - map(0x9800, 0x9fff).ram().r(this, FUNC(kyugo_state::spriteram_2_r)).share("spriteram_2"); + map(0x8000, 0x87ff).ram().w(FUNC(kyugo_state::bgvideoram_w)).share("bgvideoram"); + map(0x8800, 0x8fff).ram().w(FUNC(kyugo_state::bgattribram_w)).share("bgattribram"); + map(0x9000, 0x97ff).ram().w(FUNC(kyugo_state::fgvideoram_w)).share("fgvideoram"); + map(0x9800, 0x9fff).ram().r(FUNC(kyugo_state::spriteram_2_r)).share("spriteram_2"); map(0xa000, 0xa7ff).ram().share("spriteram_1"); - map(0xa800, 0xa800).w(this, FUNC(kyugo_state::scroll_x_lo_w)); - map(0xb000, 0xb000).w(this, FUNC(kyugo_state::gfxctrl_w)); - map(0xb800, 0xb800).w(this, FUNC(kyugo_state::scroll_y_w)); + map(0xa800, 0xa800).w(FUNC(kyugo_state::scroll_x_lo_w)); + map(0xb000, 0xb000).w(FUNC(kyugo_state::gfxctrl_w)); + map(0xb800, 0xb800).w(FUNC(kyugo_state::scroll_y_w)); map(0xf000, 0xf7ff).ram().share("shared_ram"); } @@ -165,7 +165,7 @@ void kyugo_state::repulse_sub_portmap(address_map &map) map(0x00, 0x01).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x02, 0x02).r("ay1", FUNC(ay8910_device::data_r)); map(0x40, 0x41).w("ay2", FUNC(ay8910_device::address_data_w)); - map(0xc0, 0xc1).w(this, FUNC(kyugo_state::coin_counter_w)); + map(0xc0, 0xc1).w(FUNC(kyugo_state::coin_counter_w)); } @@ -175,7 +175,7 @@ void kyugo_state::flashgala_sub_portmap(address_map &map) map(0x40, 0x41).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x42, 0x42).r("ay1", FUNC(ay8910_device::data_r)); map(0x80, 0x81).w("ay2", FUNC(ay8910_device::address_data_w)); - map(0xc0, 0xc1).w(this, FUNC(kyugo_state::coin_counter_w)); + map(0xc0, 0xc1).w(FUNC(kyugo_state::coin_counter_w)); } @@ -185,7 +185,7 @@ void kyugo_state::srdmissn_sub_portmap(address_map &map) map(0x80, 0x81).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x82, 0x82).r("ay1", FUNC(ay8910_device::data_r)); map(0x84, 0x85).w("ay2", FUNC(ay8910_device::address_data_w)); - map(0x90, 0x91).w(this, FUNC(kyugo_state::coin_counter_w)); + map(0x90, 0x91).w(FUNC(kyugo_state::coin_counter_w)); } diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp index 29a7c3a4c24..f9ce1c52720 100644 --- a/src/mame/drivers/labyrunr.cpp +++ b/src/mame/drivers/labyrunr.cpp @@ -57,14 +57,14 @@ void labyrunr_state::labyrunr_map(address_map &map) map(0x0a00, 0x0a00).portr("P2"); map(0x0a01, 0x0a01).portr("P1"); map(0x0b00, 0x0b00).portr("SYSTEM"); - map(0x0c00, 0x0c00).w(this, FUNC(labyrunr_state::labyrunr_bankswitch_w)); + map(0x0c00, 0x0c00).w(FUNC(labyrunr_state::labyrunr_bankswitch_w)); map(0x0d00, 0x0d1f).rw("k051733", FUNC(k051733_device::read), FUNC(k051733_device::write)); map(0x0e00, 0x0e00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x1000, 0x10ff).ram().w(m_palette, FUNC(palette_device::write_indirect)).share("palette"); map(0x1800, 0x1fff).ram(); map(0x2000, 0x2fff).ram().share("spriteram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(labyrunr_state::labyrunr_vram1_w)).share("videoram1"); - map(0x3800, 0x3fff).ram().w(this, FUNC(labyrunr_state::labyrunr_vram2_w)).share("videoram2"); + map(0x3000, 0x37ff).ram().w(FUNC(labyrunr_state::labyrunr_vram1_w)).share("videoram1"); + map(0x3800, 0x3fff).ram().w(FUNC(labyrunr_state::labyrunr_vram2_w)).share("videoram2"); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp index a4165f13ec0..f3ed463f03c 100644 --- a/src/mame/drivers/ladybug.cpp +++ b/src/mame/drivers/ladybug.cpp @@ -122,8 +122,8 @@ void ladybug_state::ladybug_map(address_map &map) map(0x9002, 0x9002).portr("DSW0"); map(0x9003, 0x9003).portr("DSW1"); map(0xa000, 0xa007).w("videolatch", FUNC(ls259_device::write_d0)); - map(0xb000, 0xbfff).w("sn1", FUNC(sn76489_device::write)); - map(0xc000, 0xcfff).w("sn2", FUNC(sn76489_device::write)); + map(0xb000, 0xbfff).w("sn1", FUNC(sn76489_device::command_w)); + map(0xc000, 0xcfff).w("sn2", FUNC(sn76489_device::command_w)); map(0xd000, 0xd7ff).rw(m_video, FUNC(ladybug_video_device::bg_r), FUNC(ladybug_video_device::bg_w)); map(0xe000, 0xe000).portr("IN2"); } @@ -140,7 +140,7 @@ void sraider_state::sraider_cpu1_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); map(0x7000, 0x73ff).w("video", FUNC(ladybug_video_device::spr_w)); - map(0x8005, 0x8005).r(this, FUNC(sraider_state::sraider_8005_r)); // protection check? + map(0x8005, 0x8005).r(FUNC(sraider_state::sraider_8005_r)); // protection check? map(0x8006, 0x8006).writeonly().share("sound_low"); map(0x8007, 0x8007).writeonly().share("sound_high"); map(0x9000, 0x9000).portr("IN0"); @@ -159,18 +159,18 @@ void sraider_state::sraider_cpu2_map(address_map &map) map(0xa000, 0xa000).readonly().share("sound_high"); map(0xc000, 0xc000).nopr(); //some kind of sync map(0xe000, 0xe0ff).writeonly().share("grid_data"); - map(0xe800, 0xe800).w(this, FUNC(sraider_state::sraider_io_w)); + map(0xe800, 0xe800).w(FUNC(sraider_state::sraider_io_w)); } void sraider_state::sraider_cpu2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("sn1", FUNC(sn76489_device::write)); - map(0x08, 0x08).w("sn2", FUNC(sn76489_device::write)); - map(0x10, 0x10).w("sn3", FUNC(sn76489_device::write)); - map(0x18, 0x18).w("sn4", FUNC(sn76489_device::write)); - map(0x20, 0x20).w("sn5", FUNC(sn76489_device::write)); - map(0x28, 0x3f).w(this, FUNC(sraider_state::sraider_misc_w)); // lots unknown + map(0x00, 0x00).w("sn1", FUNC(sn76489_device::command_w)); + map(0x08, 0x08).w("sn2", FUNC(sn76489_device::command_w)); + map(0x10, 0x10).w("sn3", FUNC(sn76489_device::command_w)); + map(0x18, 0x18).w("sn4", FUNC(sn76489_device::command_w)); + map(0x20, 0x20).w("sn5", FUNC(sn76489_device::command_w)); + map(0x28, 0x3f).w(FUNC(sraider_state::sraider_misc_w)); // lots unknown } diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp index eba1d1b127a..2f18b09dc98 100644 --- a/src/mame/drivers/ladyfrog.cpp +++ b/src/mame/drivers/ladyfrog.cpp @@ -121,21 +121,21 @@ void ladyfrog_state::ladyfrog_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc07f).ram(); - map(0xc080, 0xc87f).rw(this, FUNC(ladyfrog_state::ladyfrog_videoram_r), FUNC(ladyfrog_state::ladyfrog_videoram_w)).share("videoram"); - map(0xd000, 0xd000).w(this, FUNC(ladyfrog_state::ladyfrog_gfxctrl2_w)); - map(0xd400, 0xd400).rw(this, FUNC(ladyfrog_state::from_snd_r), FUNC(ladyfrog_state::sound_command_w)); - map(0xd401, 0xd401).r(this, FUNC(ladyfrog_state::snd_flag_r)); - map(0xd403, 0xd403).w(this, FUNC(ladyfrog_state::sound_cpu_reset_w)); + map(0xc080, 0xc87f).rw(FUNC(ladyfrog_state::ladyfrog_videoram_r), FUNC(ladyfrog_state::ladyfrog_videoram_w)).share("videoram"); + map(0xd000, 0xd000).w(FUNC(ladyfrog_state::ladyfrog_gfxctrl2_w)); + map(0xd400, 0xd400).rw(FUNC(ladyfrog_state::from_snd_r), FUNC(ladyfrog_state::sound_command_w)); + map(0xd401, 0xd401).r(FUNC(ladyfrog_state::snd_flag_r)); + map(0xd403, 0xd403).w(FUNC(ladyfrog_state::sound_cpu_reset_w)); map(0xd800, 0xd800).portr("DSW1"); map(0xd801, 0xd801).portr("DSW2"); map(0xd804, 0xd804).portr("INPUTS"); map(0xd806, 0xd806).portr("SYSTEM"); - map(0xdc00, 0xdc9f).rw(this, FUNC(ladyfrog_state::ladyfrog_spriteram_r), FUNC(ladyfrog_state::ladyfrog_spriteram_w)); - map(0xdca0, 0xdcbf).rw(this, FUNC(ladyfrog_state::ladyfrog_scrlram_r), FUNC(ladyfrog_state::ladyfrog_scrlram_w)).share("scrlram"); + map(0xdc00, 0xdc9f).rw(FUNC(ladyfrog_state::ladyfrog_spriteram_r), FUNC(ladyfrog_state::ladyfrog_spriteram_w)); + map(0xdca0, 0xdcbf).rw(FUNC(ladyfrog_state::ladyfrog_scrlram_r), FUNC(ladyfrog_state::ladyfrog_scrlram_w)).share("scrlram"); map(0xdcc0, 0xdcff).ram(); - map(0xdd00, 0xdeff).rw(this, FUNC(ladyfrog_state::ladyfrog_palette_r), FUNC(ladyfrog_state::ladyfrog_palette_w)); + map(0xdd00, 0xdeff).rw(FUNC(ladyfrog_state::ladyfrog_palette_r), FUNC(ladyfrog_state::ladyfrog_palette_w)); map(0xd0d0, 0xd0d0).nopr(); /* code jumps to ASCII text "Alfa tecnology" @ $b7 */ - map(0xdf03, 0xdf03).w(this, FUNC(ladyfrog_state::ladyfrog_gfxctrl_w)); + map(0xdf03, 0xdf03).w(FUNC(ladyfrog_state::ladyfrog_gfxctrl_w)); map(0xe000, 0xffff).ram(); } @@ -149,10 +149,10 @@ void ladyfrog_state::ladyfrog_sound_map(address_map &map) map(0xca00, 0xca00).nopw(); map(0xcb00, 0xcb00).nopw(); map(0xcc00, 0xcc00).nopw(); - map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(ladyfrog_state::to_main_w)); - map(0xd200, 0xd200).nopr().w(this, FUNC(ladyfrog_state::nmi_enable_w)); - map(0xd400, 0xd400).w(this, FUNC(ladyfrog_state::nmi_disable_w)); - map(0xd600, 0xd600).nopr().w("dac", FUNC(dac_byte_interface::write)); /* signed 8-bit DAC - unknown read */ + map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(ladyfrog_state::to_main_w)); + map(0xd200, 0xd200).nopr().w(FUNC(ladyfrog_state::nmi_enable_w)); + map(0xd400, 0xd400).w(FUNC(ladyfrog_state::nmi_disable_w)); + map(0xd600, 0xd600).nopr().w("dac", FUNC(dac_byte_interface::data_w)); /* signed 8-bit DAC - unknown read */ map(0xe000, 0xefff).noprw(); } diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp index 80ea8829179..9e780e4d452 100644 --- a/src/mame/drivers/laser3k.cpp +++ b/src/mame/drivers/laser3k.cpp @@ -148,10 +148,10 @@ void laser3k_state::laser3k_map(address_map &map) void laser3k_state::banks_map(address_map &map) { - map(0x00000, 0x2ffff).rw(this, FUNC(laser3k_state::ram_r), FUNC(laser3k_state::ram_w)); + map(0x00000, 0x2ffff).rw(FUNC(laser3k_state::ram_r), FUNC(laser3k_state::ram_w)); map(0x38000, 0x3bfff).rom().region("maincpu", 0); - map(0x3c000, 0x3c0ff).rw(this, FUNC(laser3k_state::io_r), FUNC(laser3k_state::io_w)); - map(0x3c100, 0x3c1ff).r(this, FUNC(laser3k_state::io2_r)); + map(0x3c000, 0x3c0ff).rw(FUNC(laser3k_state::io_r), FUNC(laser3k_state::io_w)); + map(0x3c100, 0x3c1ff).r(FUNC(laser3k_state::io2_r)); map(0x3c200, 0x3ffff).rom().region("maincpu", 0x4200); } @@ -435,7 +435,7 @@ WRITE8_MEMBER( laser3k_state::io_w ) break; case 0x68: // SN76489 sound - m_sn->write(space, 0, data); + m_sn->write(data); break; case 0x78: // called "SYSTEM" in the boot ROM listing, but unsure what it does diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp index 02a49cd1479..562630cffc4 100644 --- a/src/mame/drivers/laserbas.cpp +++ b/src/mame/drivers/laserbas.cpp @@ -333,9 +333,9 @@ WRITE_LINE_MEMBER(laserbas_state::pit_out_5_w) void laserbas_state::laserbas_memory(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0xbfff).rw(this, FUNC(laserbas_state::vram_r), FUNC(laserbas_state::vram_w)); + map(0x4000, 0xbfff).rw(FUNC(laserbas_state::vram_r), FUNC(laserbas_state::vram_w)); map(0xc000, 0xf7ff).rom().nopw(); - map(0xf800, 0xfbff).r(this, FUNC(laserbas_state::z1_r)).nopw(); /* protection device */ + map(0xf800, 0xfbff).r(FUNC(laserbas_state::z1_r)).nopw(); /* protection device */ map(0xfc00, 0xffff).ram(); } @@ -344,12 +344,12 @@ void laserbas_state::laserbas_io(address_map &map) map.global_mask(0xff); map(0x00, 0x00).w("crtc", FUNC(mc6845_device::address_w)); map(0x01, 0x01).w("crtc", FUNC(mc6845_device::register_w)); - map(0x10, 0x11).w(this, FUNC(laserbas_state::videoctrl_w)); + map(0x10, 0x11).w(FUNC(laserbas_state::videoctrl_w)); map(0x20, 0x20).portr("DSW"); map(0x21, 0x21).portr("INPUTS"); - map(0x22, 0x22).r(this, FUNC(laserbas_state::track_hi_r)); - map(0x23, 0x23).r(this, FUNC(laserbas_state::track_lo_r)); - map(0x20, 0x23).w(this, FUNC(laserbas_state::out_w)); + map(0x22, 0x22).r(FUNC(laserbas_state::track_hi_r)); + map(0x23, 0x23).r(FUNC(laserbas_state::track_lo_r)); + map(0x20, 0x23).w(FUNC(laserbas_state::out_w)); map(0x40, 0x43).rw("pit0", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x44, 0x47).rw("pit1", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x80, 0x9f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp index a292c98a586..b8f11736612 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -180,20 +180,20 @@ void laserbat_state_base::laserbat_map(address_map &map) map(0x1500, 0x15ff).mirror(0x6000).rw(m_pvi1, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); map(0x1600, 0x16ff).mirror(0x6000).rw(m_pvi2, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); map(0x1700, 0x17ff).mirror(0x6000).rw(m_pvi3, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); - map(0x1800, 0x1bff).mirror(0x6000).w(this, FUNC(laserbat_state_base::videoram_w)); + map(0x1800, 0x1bff).mirror(0x6000).w(FUNC(laserbat_state_base::videoram_w)); map(0x1c00, 0x1fff).mirror(0x6000).ram(); } void laserbat_state_base::laserbat_io_map(address_map &map) { - map(0x00, 0x00).r(this, FUNC(laserbat_state_base::rhsc_r)).w(this, FUNC(laserbat_state_base::cnt_eff_w)); - map(0x01, 0x01) /* RBALL */ .w(this, FUNC(laserbat_state_base::cnt_nav_w)); - map(0x02, 0x02).r(this, FUNC(laserbat_state_base::rrowx_r)).w(this, FUNC(laserbat_state_base::csound1_w)); - map(0x03, 0x03).w(this, FUNC(laserbat_state_base::whsc_w)); - map(0x04, 0x04).w(this, FUNC(laserbat_state_base::wcoh_w)); - map(0x05, 0x05).w(this, FUNC(laserbat_state_base::wcov_w)); - map(0x06, 0x06).w(this, FUNC(laserbat_state_base::ct_io_w)); - map(0x07, 0x07).w(this, FUNC(laserbat_state_base::csound2_w)); + map(0x00, 0x00).r(FUNC(laserbat_state_base::rhsc_r)).w(FUNC(laserbat_state_base::cnt_eff_w)); + map(0x01, 0x01) /* RBALL */ .w(FUNC(laserbat_state_base::cnt_nav_w)); + map(0x02, 0x02).r(FUNC(laserbat_state_base::rrowx_r)).w(FUNC(laserbat_state_base::csound1_w)); + map(0x03, 0x03).w(FUNC(laserbat_state_base::whsc_w)); + map(0x04, 0x04).w(FUNC(laserbat_state_base::wcoh_w)); + map(0x05, 0x05).w(FUNC(laserbat_state_base::wcov_w)); + map(0x06, 0x06).w(FUNC(laserbat_state_base::ct_io_w)); + map(0x07, 0x07).w(FUNC(laserbat_state_base::csound2_w)); } diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index 25d9ed59b19..cd973f5adc6 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -67,23 +67,23 @@ WRITE8_MEMBER(lasso_state::sound_select_w) uint8_t to_write = bitswap<8>(*m_chip_data, 0, 1, 2, 3, 4, 5, 6, 7); if (~data & 0x01) /* chip #0 */ - m_sn_1->write(space, 0, to_write); + m_sn_1->write(to_write); if (~data & 0x02) /* chip #1 */ - m_sn_2->write(space, 0, to_write); + m_sn_2->write(to_write); } void lasso_state::lasso_main_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(lasso_state::lasso_videoram_w)).share("videoram"); - map(0x0800, 0x0bff).ram().w(this, FUNC(lasso_state::lasso_colorram_w)).share("colorram"); + map(0x0400, 0x07ff).ram().w(FUNC(lasso_state::lasso_videoram_w)).share("videoram"); + map(0x0800, 0x0bff).ram().w(FUNC(lasso_state::lasso_colorram_w)).share("colorram"); map(0x0c00, 0x0c7f).ram().share("spriteram"); map(0x1000, 0x17ff).ram().share("share1"); - map(0x1800, 0x1800).w(this, FUNC(lasso_state::sound_command_w)); + map(0x1800, 0x1800).w(FUNC(lasso_state::sound_command_w)); map(0x1801, 0x1801).writeonly().share("back_color"); - map(0x1802, 0x1802).w(this, FUNC(lasso_state::lasso_video_control_w)); + map(0x1802, 0x1802).w(FUNC(lasso_state::lasso_video_control_w)); map(0x1804, 0x1804).portr("1804"); map(0x1805, 0x1805).portr("1805"); map(0x1806, 0x1806).portr("1806").nopw(); /* game uses 'lsr' to read port */ @@ -97,8 +97,8 @@ void lasso_state::lasso_audio_map(address_map &map) map(0x0000, 0x01ff).ram(); map(0x5000, 0x7fff).rom(); map(0xb000, 0xb000).writeonly().share("chip_data"); - map(0xb001, 0xb001).w(this, FUNC(lasso_state::sound_select_w)); - map(0xb004, 0xb004).r(this, FUNC(lasso_state::sound_status_r)); + map(0xb001, 0xb001).w(FUNC(lasso_state::sound_select_w)); + map(0xb004, 0xb004).r(FUNC(lasso_state::sound_status_r)); map(0xb005, 0xb005).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xf000, 0xffff).rom().region("audiocpu", 0x7000); } @@ -115,14 +115,14 @@ void lasso_state::lasso_coprocessor_map(address_map &map) void lasso_state::chameleo_main_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(lasso_state::lasso_videoram_w)).share("videoram"); - map(0x0800, 0x0bff).ram().w(this, FUNC(lasso_state::lasso_colorram_w)).share("colorram"); + map(0x0400, 0x07ff).ram().w(FUNC(lasso_state::lasso_videoram_w)).share("videoram"); + map(0x0800, 0x0bff).ram().w(FUNC(lasso_state::lasso_colorram_w)).share("colorram"); map(0x0c00, 0x0fff).ram(); map(0x1000, 0x107f).ram().share("spriteram"); map(0x1080, 0x10ff).ram(); - map(0x1800, 0x1800).w(this, FUNC(lasso_state::sound_command_w)); + map(0x1800, 0x1800).w(FUNC(lasso_state::sound_command_w)); map(0x1801, 0x1801).writeonly().share("back_color"); - map(0x1802, 0x1802).w(this, FUNC(lasso_state::lasso_video_control_w)); + map(0x1802, 0x1802).w(FUNC(lasso_state::lasso_video_control_w)); map(0x1804, 0x1804).portr("1804"); map(0x1805, 0x1805).portr("1805"); map(0x1806, 0x1806).portr("1806"); @@ -138,8 +138,8 @@ void lasso_state::chameleo_audio_map(address_map &map) map(0x1000, 0x1fff).rom(); map(0x6000, 0x7fff).rom(); map(0xb000, 0xb000).writeonly().share("chip_data"); - map(0xb001, 0xb001).w(this, FUNC(lasso_state::sound_select_w)); - map(0xb004, 0xb004).r(this, FUNC(lasso_state::sound_status_r)); + map(0xb001, 0xb001).w(FUNC(lasso_state::sound_select_w)); + map(0xb004, 0xb004).r(FUNC(lasso_state::sound_status_r)); map(0xb005, 0xb005).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xf000, 0xffff).rom().region("audiocpu", 0x7000); } @@ -148,12 +148,12 @@ void lasso_state::chameleo_audio_map(address_map &map) void lasso_state::wwjgtin_main_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x0800, 0x0bff).ram().w(this, FUNC(lasso_state::lasso_videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(lasso_state::lasso_colorram_w)).share("colorram"); + map(0x0800, 0x0bff).ram().w(FUNC(lasso_state::lasso_videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(lasso_state::lasso_colorram_w)).share("colorram"); map(0x1000, 0x10ff).ram().share("spriteram"); - map(0x1800, 0x1800).w(this, FUNC(lasso_state::sound_command_w)); + map(0x1800, 0x1800).w(FUNC(lasso_state::sound_command_w)); map(0x1801, 0x1801).writeonly().share("back_color"); - map(0x1802, 0x1802).w(this, FUNC(lasso_state::wwjgtin_video_control_w)); + map(0x1802, 0x1802).w(FUNC(lasso_state::wwjgtin_video_control_w)); map(0x1804, 0x1804).portr("1804"); map(0x1805, 0x1805).portr("1805"); map(0x1806, 0x1806).portr("1806"); @@ -170,9 +170,9 @@ void lasso_state::wwjgtin_audio_map(address_map &map) map(0x0000, 0x01ff).ram(); map(0x4000, 0x7fff).mirror(0x8000).rom(); map(0xb000, 0xb000).writeonly().share("chip_data"); - map(0xb001, 0xb001).w(this, FUNC(lasso_state::sound_select_w)); - map(0xb003, 0xb003).w("dac", FUNC(dac_byte_interface::write)); - map(0xb004, 0xb004).r(this, FUNC(lasso_state::sound_status_r)); + map(0xb001, 0xb001).w(FUNC(lasso_state::sound_select_w)); + map(0xb003, 0xb003).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xb004, 0xb004).r(FUNC(lasso_state::sound_status_r)); map(0xb005, 0xb005).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -180,12 +180,12 @@ void lasso_state::wwjgtin_audio_map(address_map &map) void lasso_state::pinbo_main_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(lasso_state::lasso_videoram_w)).share("videoram"); - map(0x0800, 0x0bff).ram().w(this, FUNC(lasso_state::lasso_colorram_w)).share("colorram"); + map(0x0400, 0x07ff).ram().w(FUNC(lasso_state::lasso_videoram_w)).share("videoram"); + map(0x0800, 0x0bff).ram().w(FUNC(lasso_state::lasso_colorram_w)).share("colorram"); map(0x1000, 0x10ff).ram().share("spriteram"); - map(0x1800, 0x1800).w(this, FUNC(lasso_state::sound_command_w)); + map(0x1800, 0x1800).w(FUNC(lasso_state::sound_command_w)); map(0x1801, 0x1801).writeonly().share("back_color"); - map(0x1802, 0x1802).w(this, FUNC(lasso_state::pinbo_video_control_w)); + map(0x1802, 0x1802).w(FUNC(lasso_state::pinbo_video_control_w)); map(0x1804, 0x1804).portr("1804"); map(0x1805, 0x1805).portr("1805"); map(0x1806, 0x1806).portr("1806"); diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp index 2a62c11077e..530990e05f0 100644 --- a/src/mame/drivers/lastbank.cpp +++ b/src/mame/drivers/lastbank.cpp @@ -231,16 +231,16 @@ void lastbank_state::tc0091lvc_map(address_map &map) map(0x8000, 0x9fff).ram().share("nvram"); - map(0xc000, 0xcfff).rw(this, FUNC(lastbank_state::ram_r<0>), FUNC(lastbank_state::ram_w<0>)); - map(0xd000, 0xdfff).rw(this, FUNC(lastbank_state::ram_r<1>), FUNC(lastbank_state::ram_w<1>)); - map(0xe000, 0xefff).rw(this, FUNC(lastbank_state::ram_r<2>), FUNC(lastbank_state::ram_w<2>)); - map(0xf000, 0xfdff).rw(this, FUNC(lastbank_state::ram_r<3>), FUNC(lastbank_state::ram_w<3>)); + map(0xc000, 0xcfff).rw(FUNC(lastbank_state::ram_r<0>), FUNC(lastbank_state::ram_w<0>)); + map(0xd000, 0xdfff).rw(FUNC(lastbank_state::ram_r<1>), FUNC(lastbank_state::ram_w<1>)); + map(0xe000, 0xefff).rw(FUNC(lastbank_state::ram_r<2>), FUNC(lastbank_state::ram_w<2>)); + map(0xf000, 0xfdff).rw(FUNC(lastbank_state::ram_r<3>), FUNC(lastbank_state::ram_w<3>)); map(0xfe00, 0xfeff).rw(m_vdp, FUNC(tc0091lvc_device::vregs_r), FUNC(tc0091lvc_device::vregs_w)); - map(0xff00, 0xff02).rw(this, FUNC(lastbank_state::irq_vector_r), FUNC(lastbank_state::irq_vector_w)); - map(0xff03, 0xff03).rw(this, FUNC(lastbank_state::irq_enable_r), FUNC(lastbank_state::irq_enable_w)); - map(0xff04, 0xff07).rw(this, FUNC(lastbank_state::ram_bank_r), FUNC(lastbank_state::ram_bank_w)); - map(0xff08, 0xff08).rw(this, FUNC(lastbank_state::rom_bank_r), FUNC(lastbank_state::rom_bank_w)); + map(0xff00, 0xff02).rw(FUNC(lastbank_state::irq_vector_r), FUNC(lastbank_state::irq_vector_w)); + map(0xff03, 0xff03).rw(FUNC(lastbank_state::irq_enable_r), FUNC(lastbank_state::irq_enable_w)); + map(0xff04, 0xff07).rw(FUNC(lastbank_state::ram_bank_r), FUNC(lastbank_state::ram_bank_w)); + map(0xff08, 0xff08).rw(FUNC(lastbank_state::rom_bank_r), FUNC(lastbank_state::rom_bank_w)); } void lastbank_state::lastbank_map(address_map &map) @@ -248,14 +248,14 @@ void lastbank_state::lastbank_map(address_map &map) tc0091lvc_map(map); map(0xa000, 0xa00d).noprw(); // MSM62X42B or equivalent probably read from here map(0xa800, 0xa800).portr("COINS"); - map(0xa800, 0xa802).w(this, FUNC(lastbank_state::output_w)); - map(0xa803, 0xa803).w(this, FUNC(lastbank_state::mux_w)); // mux for $a808 / $a80c + map(0xa800, 0xa802).w(FUNC(lastbank_state::output_w)); + map(0xa803, 0xa803).w(FUNC(lastbank_state::mux_w)); // mux for $a808 / $a80c map(0xa804, 0xa804).portr("SPECIAL"); map(0xa805, 0xa805).w("soundlatch1", FUNC(generic_latch_8_device::write)); map(0xa806, 0xa806).w("soundlatch2", FUNC(generic_latch_8_device::write)); map(0xa807, 0xa807).nopw(); // hopper? - map(0xa808, 0xa808).r(this, FUNC(lastbank_state::mux_0_r)); - map(0xa80c, 0xa80c).r(this, FUNC(lastbank_state::mux_0_r)); + map(0xa808, 0xa808).r(FUNC(lastbank_state::mux_0_r)); + map(0xa80c, 0xa80c).r(FUNC(lastbank_state::mux_0_r)); map(0xa81c, 0xa81c).portr("DSW0"); map(0xa81d, 0xa81d).portr("DSW1"); map(0xa81e, 0xa81e).portr("DSW2"); @@ -274,7 +274,7 @@ void lastbank_state::lastbank_audio_io(address_map &map) map.global_mask(0xff); map(0x00, 0x06).rw(m_essnd, FUNC(es8712_device::read), FUNC(es8712_device::write)); map(0x40, 0x40).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x80, 0x80).w(this, FUNC(lastbank_state::sound_flags_w)); + map(0x80, 0x80).w(FUNC(lastbank_state::sound_flags_w)); map(0x80, 0x80).r("soundlatch1", FUNC(generic_latch_8_device::read)); map(0xc0, 0xc0).r("soundlatch2", FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp index 85373eee22a..27dbf5dc92f 100644 --- a/src/mame/drivers/lastduel.cpp +++ b/src/mame/drivers/lastduel.cpp @@ -146,15 +146,15 @@ void lastduel_state::lastduel_map(address_map &map) map(0x000000, 0x05ffff).rom(); map(0xfc0000, 0xfc0003).nopw(); /* Written rarely */ map(0xfc0800, 0xfc0fff).ram().share("spriteram"); - map(0xfc4000, 0xfc4001).portr("P1_P2").w(this, FUNC(lastduel_state::lastduel_flip_w)); - map(0xfc4002, 0xfc4003).portr("SYSTEM").w(this, FUNC(lastduel_state::lastduel_sound_w)); + map(0xfc4000, 0xfc4001).portr("P1_P2").w(FUNC(lastduel_state::lastduel_flip_w)); + map(0xfc4002, 0xfc4003).portr("SYSTEM").w(FUNC(lastduel_state::lastduel_sound_w)); map(0xfc4004, 0xfc4005).portr("DSW1"); map(0xfc4006, 0xfc4007).portr("DSW2"); - map(0xfc8000, 0xfc800f).w(this, FUNC(lastduel_state::lastduel_scroll_w)); - map(0xfcc000, 0xfcdfff).ram().w(this, FUNC(lastduel_state::lastduel_vram_w)).share("vram"); - map(0xfd0000, 0xfd3fff).ram().w(this, FUNC(lastduel_state::lastduel_scroll1_w)).share("scroll1"); - map(0xfd4000, 0xfd7fff).ram().w(this, FUNC(lastduel_state::lastduel_scroll2_w)).share("scroll2"); - map(0xfd8000, 0xfd87ff).ram().w(this, FUNC(lastduel_state::lastduel_palette_word_w)).share("paletteram"); + map(0xfc8000, 0xfc800f).w(FUNC(lastduel_state::lastduel_scroll_w)); + map(0xfcc000, 0xfcdfff).ram().w(FUNC(lastduel_state::lastduel_vram_w)).share("vram"); + map(0xfd0000, 0xfd3fff).ram().w(FUNC(lastduel_state::lastduel_scroll1_w)).share("scroll1"); + map(0xfd4000, 0xfd7fff).ram().w(FUNC(lastduel_state::lastduel_scroll2_w)).share("scroll2"); + map(0xfd8000, 0xfd87ff).ram().w(FUNC(lastduel_state::lastduel_palette_word_w)).share("paletteram"); map(0xfe0000, 0xffffff).ram(); } @@ -162,15 +162,15 @@ void lastduel_state::madgear_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0xfc1800, 0xfc1fff).ram().share("spriteram"); - map(0xfc4000, 0xfc4001).portr("DSW1").w(this, FUNC(lastduel_state::lastduel_flip_w)); - map(0xfc4002, 0xfc4003).portr("DSW2").w(this, FUNC(lastduel_state::lastduel_sound_w)); + map(0xfc4000, 0xfc4001).portr("DSW1").w(FUNC(lastduel_state::lastduel_flip_w)); + map(0xfc4002, 0xfc4003).portr("DSW2").w(FUNC(lastduel_state::lastduel_sound_w)); map(0xfc4004, 0xfc4005).portr("P1_P2"); map(0xfc4006, 0xfc4007).portr("SYSTEM"); - map(0xfc8000, 0xfc9fff).ram().w(this, FUNC(lastduel_state::lastduel_vram_w)).share("vram"); - map(0xfcc000, 0xfcc7ff).ram().w(this, FUNC(lastduel_state::lastduel_palette_word_w)).share("paletteram"); - map(0xfd0000, 0xfd000f).w(this, FUNC(lastduel_state::lastduel_scroll_w)); - map(0xfd4000, 0xfd7fff).ram().w(this, FUNC(lastduel_state::madgear_scroll1_w)).share("scroll1"); - map(0xfd8000, 0xfdffff).ram().w(this, FUNC(lastduel_state::madgear_scroll2_w)).share("scroll2"); + map(0xfc8000, 0xfc9fff).ram().w(FUNC(lastduel_state::lastduel_vram_w)).share("vram"); + map(0xfcc000, 0xfcc7ff).ram().w(FUNC(lastduel_state::lastduel_palette_word_w)).share("paletteram"); + map(0xfd0000, 0xfd000f).w(FUNC(lastduel_state::lastduel_scroll_w)); + map(0xfd4000, 0xfd7fff).ram().w(FUNC(lastduel_state::madgear_scroll1_w)).share("scroll1"); + map(0xfd8000, 0xfdffff).ram().w(FUNC(lastduel_state::madgear_scroll2_w)).share("scroll2"); map(0xff0000, 0xffffff).ram(); } @@ -199,7 +199,7 @@ void lastduel_state::madgear_sound_map(address_map &map) map(0xf002, 0xf003).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf004, 0xf004).w("oki", FUNC(okim6295_device::write)); map(0xf006, 0xf006).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xf00a, 0xf00a).w(this, FUNC(lastduel_state::mg_bankswitch_w)); + map(0xf00a, 0xf00a).w(FUNC(lastduel_state::mg_bankswitch_w)); } /******************************************************************************/ diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp index c616cec79c4..72fd4b72bf6 100644 --- a/src/mame/drivers/lastfght.cpp +++ b/src/mame/drivers/lastfght.cpp @@ -416,27 +416,27 @@ void lastfght_state::lastfght_map(address_map &map) map(0x200000, 0x20ffff).ram().share("nvram"); // battery - map(0x600000, 0x600001).w(this, FUNC(lastfght_state::hi_w)); - map(0x600002, 0x600003).rw(this, FUNC(lastfght_state::sound_r), FUNC(lastfght_state::sound_w)); - map(0x600006, 0x600007).w(this, FUNC(lastfght_state::blit_w)); + map(0x600000, 0x600001).w(FUNC(lastfght_state::hi_w)); + map(0x600002, 0x600003).rw(FUNC(lastfght_state::sound_r), FUNC(lastfght_state::sound_w)); + map(0x600006, 0x600007).w(FUNC(lastfght_state::blit_w)); map(0x600009, 0x600009).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x600008, 0x600008).w("ramdac", FUNC(ramdac_device::index_w)); map(0x60000a, 0x60000a).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x800000, 0x800001).w(this, FUNC(lastfght_state::sx_w)); - map(0x800002, 0x800003).w(this, FUNC(lastfght_state::sd_w)); - map(0x800004, 0x800005).w(this, FUNC(lastfght_state::sy_w)); - map(0x800006, 0x800007).w(this, FUNC(lastfght_state::sr_w)); - map(0x800008, 0x800009).w(this, FUNC(lastfght_state::x_w)); - map(0x80000a, 0x80000b).w(this, FUNC(lastfght_state::yw_w)); - map(0x80000c, 0x80000d).w(this, FUNC(lastfght_state::h_w)); + map(0x800000, 0x800001).w(FUNC(lastfght_state::sx_w)); + map(0x800002, 0x800003).w(FUNC(lastfght_state::sd_w)); + map(0x800004, 0x800005).w(FUNC(lastfght_state::sy_w)); + map(0x800006, 0x800007).w(FUNC(lastfght_state::sr_w)); + map(0x800008, 0x800009).w(FUNC(lastfght_state::x_w)); + map(0x80000a, 0x80000b).w(FUNC(lastfght_state::yw_w)); + map(0x80000c, 0x80000d).w(FUNC(lastfght_state::h_w)); - map(0x800014, 0x800015).w(this, FUNC(lastfght_state::dest_w)); + map(0x800014, 0x800015).w(FUNC(lastfght_state::dest_w)); - map(0xc00000, 0xc00001).r(this, FUNC(lastfght_state::c00000_r)); - map(0xc00002, 0xc00003).r(this, FUNC(lastfght_state::c00002_r)); - map(0xc00004, 0xc00005).r(this, FUNC(lastfght_state::c00004_r)); - map(0xc00006, 0xc00007).rw(this, FUNC(lastfght_state::c00006_r), FUNC(lastfght_state::c00006_w)); + map(0xc00000, 0xc00001).r(FUNC(lastfght_state::c00000_r)); + map(0xc00002, 0xc00003).r(FUNC(lastfght_state::c00002_r)); + map(0xc00004, 0xc00005).r(FUNC(lastfght_state::c00004_r)); + map(0xc00006, 0xc00007).rw(FUNC(lastfght_state::c00006_r), FUNC(lastfght_state::c00006_w)); } void lastfght_state::ramdac_map(address_map &map) diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp index 40ccd93652b..0eae3a0df13 100644 --- a/src/mame/drivers/lazercmd.cpp +++ b/src/mame/drivers/lazercmd.cpp @@ -415,8 +415,8 @@ void lazercmd_state::lazercmd_map(address_map &map) map(0x0000, 0x0bff).rom(); map(0x1c00, 0x1c1f).ram(); map(0x1c20, 0x1eff).ram().share("videoram"); - map(0x1f00, 0x1f03).w(this, FUNC(lazercmd_state::lazercmd_hardware_w)); - map(0x1f00, 0x1f07).r(this, FUNC(lazercmd_state::lazercmd_hardware_r)); + map(0x1f00, 0x1f03).w(FUNC(lazercmd_state::lazercmd_hardware_w)); + map(0x1f00, 0x1f07).r(FUNC(lazercmd_state::lazercmd_hardware_r)); } @@ -426,8 +426,8 @@ void lazercmd_state::medlanes_map(address_map &map) map(0x1000, 0x17ff).rom(); map(0x1c00, 0x1c1f).ram(); map(0x1c20, 0x1eff).ram().share("videoram"); - map(0x1f00, 0x1f03).w(this, FUNC(lazercmd_state::medlanes_hardware_w)); - map(0x1f00, 0x1f07).r(this, FUNC(lazercmd_state::lazercmd_hardware_r)); + map(0x1f00, 0x1f03).w(FUNC(lazercmd_state::medlanes_hardware_w)); + map(0x1f00, 0x1f07).r(FUNC(lazercmd_state::lazercmd_hardware_r)); } @@ -436,15 +436,15 @@ void lazercmd_state::bbonk_map(address_map &map) map(0x0000, 0x0bff).rom(); map(0x1c00, 0x1c1f).ram(); map(0x1c20, 0x1eff).ram().share("videoram"); - map(0x1f00, 0x1f03).w(this, FUNC(lazercmd_state::bbonk_hardware_w)); - map(0x1f00, 0x1f07).r(this, FUNC(lazercmd_state::lazercmd_hardware_r)); + map(0x1f00, 0x1f03).w(FUNC(lazercmd_state::bbonk_hardware_w)); + map(0x1f00, 0x1f07).r(FUNC(lazercmd_state::lazercmd_hardware_r)); } void lazercmd_state::lazercmd_portmap(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(lazercmd_state::lazercmd_ctrl_port_r), FUNC(lazercmd_state::lazercmd_ctrl_port_w)); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(lazercmd_state::lazercmd_data_port_r), FUNC(lazercmd_state::lazercmd_data_port_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(lazercmd_state::lazercmd_ctrl_port_r), FUNC(lazercmd_state::lazercmd_ctrl_port_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(lazercmd_state::lazercmd_data_port_r), FUNC(lazercmd_state::lazercmd_data_port_w)); } diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp index da94d37d489..53a0ff9ffae 100644 --- a/src/mame/drivers/lb186.cpp +++ b/src/mame/drivers/lb186.cpp @@ -104,8 +104,8 @@ void lb186_state::lb186_io(address_map &map) map(0x1000, 0x101f).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write)).umask16(0x00ff); map(0x1080, 0x108f).rw(m_scsi, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)).umask16(0x00ff); map(0x1100, 0x1107).rw(m_fdc, FUNC(wd1772_device::read), FUNC(wd1772_device::write)).umask16(0x00ff); - map(0x1180, 0x1180).rw(this, FUNC(lb186_state::scsi_dack_r), FUNC(lb186_state::scsi_dack_w)); - map(0x1200, 0x1200).w(this, FUNC(lb186_state::drive_sel_w)); + map(0x1180, 0x1180).rw(FUNC(lb186_state::scsi_dack_r), FUNC(lb186_state::scsi_dack_w)); + map(0x1200, 0x1200).w(FUNC(lb186_state::drive_sel_w)); } static void lb186_floppies(device_slot_interface &device) diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp index 769bf0ddf5d..69a50cc7bc2 100644 --- a/src/mame/drivers/lbeach.cpp +++ b/src/mame/drivers/lbeach.cpp @@ -219,11 +219,11 @@ READ8_MEMBER(lbeach_state::lbeach_in2_r) void lbeach_state::lbeach_map(address_map &map) { map(0x0000, 0x00ff).ram().share("nvram"); - map(0x4000, 0x41ff).ram().w(this, FUNC(lbeach_state::lbeach_bg_vram_w)).share("bg_vram"); - map(0x4000, 0x4000).r(this, FUNC(lbeach_state::lbeach_in1_r)); + map(0x4000, 0x41ff).ram().w(FUNC(lbeach_state::lbeach_bg_vram_w)).share("bg_vram"); + map(0x4000, 0x4000).r(FUNC(lbeach_state::lbeach_in1_r)); map(0x4200, 0x43ff).ram(); - map(0x4400, 0x47ff).ram().w(this, FUNC(lbeach_state::lbeach_fg_vram_w)).share("fg_vram"); - map(0x8000, 0x8000).r(this, FUNC(lbeach_state::lbeach_in2_r)); + map(0x4400, 0x47ff).ram().w(FUNC(lbeach_state::lbeach_fg_vram_w)).share("fg_vram"); + map(0x8000, 0x8000).r(FUNC(lbeach_state::lbeach_in2_r)); map(0x8000, 0x8000).writeonly().share("scroll_y"); map(0x8001, 0x8001).writeonly().share("sprite_x"); map(0x8002, 0x8002).writeonly().share("sprite_code"); diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp index ccec345cf69..f873c095da1 100644 --- a/src/mame/drivers/lcmate2.cpp +++ b/src/mame/drivers/lcmate2.cpp @@ -107,15 +107,15 @@ void lcmate2_state::lcmate2_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x000f).rw(m_rtc, FUNC(rp5c15_device::read), FUNC(rp5c15_device::write)); - map(0x1000, 0x1000).w(this, FUNC(lcmate2_state::speaker_w)); - map(0x1fff, 0x1fff).w(this, FUNC(lcmate2_state::bankswitch_w)); + map(0x1000, 0x1000).w(FUNC(lcmate2_state::speaker_w)); + map(0x1fff, 0x1fff).w(FUNC(lcmate2_state::bankswitch_w)); map(0x3000, 0x3000).w(m_lcdc, FUNC(hd44780_device::control_write)); map(0x3001, 0x3001).w(m_lcdc, FUNC(hd44780_device::data_write)); map(0x3002, 0x3002).r(m_lcdc, FUNC(hd44780_device::control_read)); map(0x3003, 0x3003).r(m_lcdc, FUNC(hd44780_device::data_read)); - map(0x5000, 0x50ff).r(this, FUNC(lcmate2_state::key_r)); + map(0x5000, 0x50ff).r(FUNC(lcmate2_state::key_r)); } /* Input ports */ diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp index dd5a178ad62..eec600d1495 100644 --- a/src/mame/drivers/leapster.cpp +++ b/src/mame/drivers/leapster.cpp @@ -295,7 +295,7 @@ void leapster_state::machine_reset() void leapster_state::leapster_map(address_map &map) { map(0x00000000, 0x007fffff).rom().mirror(0x40000000); // pointers in the bios region seem to be to the 40xxxxxx region, either we mirror there or something (real bios?) is acutally missing - map(0x0180D800, 0x0180D803).r(this, FUNC(leapster_state::leapster_random_r)); + map(0x0180D800, 0x0180D803).r(FUNC(leapster_state::leapster_random_r)); map(0x03000000, 0x030007ff).ram(); // puts stack here, writes a pointer @ 0x03000000 on startup map(0x3c000000, 0x3c1fffff).ram(); // really ram, or has our code execution gone wrong? // AM_RANGE(0x80000000, 0x807fffff) AM_ROMBANK("cartrom") // game ROM pointers are all to the 80xxxxxx region, so I assume it maps here - installed if a cart is present @@ -303,7 +303,7 @@ void leapster_state::leapster_map(address_map &map) void leapster_state::leapster_aux(address_map &map) { - map(0x00000004b, 0x00000004b).w(this, FUNC(leapster_state::leapster_aux004b_w)); // this address isn't used by ARC internal stuff afaik, so probably leapster specific + map(0x00000004b, 0x00000004b).w(FUNC(leapster_state::leapster_aux004b_w)); // this address isn't used by ARC internal stuff afaik, so probably leapster specific } MACHINE_CONFIG_START(leapster_state::leapster) diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 35982c419ee..e4db8f136b8 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -145,7 +145,7 @@ void legionna_state::legionna_cop_map(address_map &map) map(0x10045a, 0x10045b).w(m_raiden2cop, FUNC(raiden2cop_device::cop_pal_brightness_val_w)); //palette DMA brightness val, used by X Se Dae / Zero Team map(0x10045c, 0x10045d).w(m_raiden2cop, FUNC(raiden2cop_device::cop_pal_brightness_mode_w)); //palette DMA brightness mode, used by X Se Dae / Zero Team (sets to 5) -// map(0x100470, 0x100471).rw(this, FUNC(legionna_state::cop_tile_bank_2_r), FUNC(legionna_state::cop_tile_bank_2_w)); +// map(0x100470, 0x100471).rw(FUNC(legionna_state::cop_tile_bank_2_r), FUNC(legionna_state::cop_tile_bank_2_w)); // map(0x100474, 0x100475).w(m_raiden2cop, FUNC(raiden2cop_device::...)); // this gets set to a pointer to spriteram (relative to start of ram) on all games excecpt raiden 2, where it isn't set map(0x100476, 0x100477).w(m_raiden2cop, FUNC(raiden2cop_device::cop_dma_adr_rel_w)); map(0x100478, 0x100479).w(m_raiden2cop, FUNC(raiden2cop_device::cop_dma_src_w)); @@ -159,7 +159,7 @@ void legionna_state::legionna_cop_map(address_map &map) map(0x1004a0, 0x1004ad).rw(m_raiden2cop, FUNC(raiden2cop_device::cop_reg_high_r), FUNC(raiden2cop_device::cop_reg_high_w)); map(0x1004c0, 0x1004cd).rw(m_raiden2cop, FUNC(raiden2cop_device::cop_reg_low_r), FUNC(raiden2cop_device::cop_reg_low_w)); -// map(0x100500, 0x100505).w(this, FUNC(legionna_state::cop_cmd_w)); // ADD ME +// map(0x100500, 0x100505).w(FUNC(legionna_state::cop_cmd_w)); // ADD ME map(0x100500, 0x100505).w(m_raiden2cop, FUNC(raiden2cop_device::LEGACY_cop_cmd_w)); // REMOVE ME map(0x100580, 0x100581).r(m_raiden2cop, FUNC(raiden2cop_device::cop_collision_status_r)); @@ -199,10 +199,10 @@ void legionna_state::legionna_map(address_map &map) map(0x100744, 0x100745).portr("PLAYERS12"); map(0x100748, 0x100749).portr("PLAYERS34"); map(0x10074c, 0x10074d).portr("SYSTEM"); - map(0x101000, 0x1017ff).ram(); // .w(this, FUNC(legionna_state::legionna_background_w)).share("back_data"); - map(0x101800, 0x101fff).ram(); // .w(this, FUNC(legionna_state::legionna_foreground_w).share("fore_data"); - map(0x102000, 0x1027ff).ram(); // .w(this, FUNC(legionna_state::legionna_midground_w).share("mid_data"); - map(0x102800, 0x103fff).ram(); // .w(this, FUNC(legionna_state::legionna_text_w).share("textram"); + map(0x101000, 0x1017ff).ram(); // .w(FUNC(legionna_state::legionna_background_w)).share("back_data"); + map(0x101800, 0x101fff).ram(); // .w(FUNC(legionna_state::legionna_foreground_w).share("fore_data"); + map(0x102000, 0x1027ff).ram(); // .w(FUNC(legionna_state::legionna_midground_w).share("mid_data"); + map(0x102800, 0x103fff).ram(); // .w(FUNC(legionna_state::legionna_text_w).share("textram"); map(0x104000, 0x104fff).ram(); // .w("palette", FUNC(palette_device::write)).share("palette"); /* palette xRRRRxGGGGxBBBBx ? */ map(0x105000, 0x105fff).ram().share("spriteram"); map(0x106000, 0x107fff).ram(); @@ -215,7 +215,7 @@ void legionna_state::heatbrl_map(address_map &map) legionna_cop_map(map); map(0x000000, 0x07ffff).rom(); map(0x100000, 0x1003ff).ram(); - map(0x100470, 0x100471).w(this, FUNC(legionna_state::heatbrl_setgfxbank)); + map(0x100470, 0x100471).w(FUNC(legionna_state::heatbrl_setgfxbank)); map(0x100600, 0x100601).nopw(); // irq ack? map(0x100640, 0x10068f).rw(m_crtc, FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); map(0x100740, 0x100741).portr("DSW1"); @@ -229,10 +229,10 @@ void legionna_state::heatbrl_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_seibu_sound->main_w(space, offset >> 1, data, mem_mask); }).umask16(0x00ff); - map(0x100800, 0x100fff).ram(); // .w(this, FUNC(legionna_state::legionna_background_w)).share("back_data"); - map(0x101000, 0x1017ff).ram(); // .w(this, FUNC(legionna_state::legionna_foreground_w).share("fore_data"); - map(0x101800, 0x101fff).ram(); // .w(this, FUNC(legionna_state::legionna_midground_w).share("mid_data"); - map(0x102000, 0x102fff).ram(); // .w(this, FUNC(legionna_state::legionna_text_w).share("textram"); + map(0x100800, 0x100fff).ram(); // .w(FUNC(legionna_state::legionna_background_w)).share("back_data"); + map(0x101000, 0x1017ff).ram(); // .w(FUNC(legionna_state::legionna_foreground_w).share("fore_data"); + map(0x101800, 0x101fff).ram(); // .w(FUNC(legionna_state::legionna_midground_w).share("mid_data"); + map(0x102000, 0x102fff).ram(); // .w(FUNC(legionna_state::legionna_text_w).share("textram"); map(0x103000, 0x103fff).ram().share("spriteram"); map(0x104000, 0x104fff).ram(); // .w("palette", FUNC(palette_device::write)).share("palette"); map(0x108000, 0x11ffff).ram(); @@ -243,7 +243,7 @@ void legionna_state::godzilla_map(address_map &map) legionna_cop_map(map); map(0x000000, 0x07ffff).rom(); map(0x100000, 0x1003ff).ram(); - map(0x100470, 0x100471).w(this, FUNC(legionna_state::denjinmk_setgfxbank)); + map(0x100470, 0x100471).w(FUNC(legionna_state::denjinmk_setgfxbank)); map(0x100600, 0x10064f).rw(m_crtc, FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); map(0x100680, 0x100681).nopw(); // irq ack? map(0x100700, 0x10071f).lrw8("seibu_sound_rw", @@ -258,10 +258,10 @@ void legionna_state::godzilla_map(address_map &map) map(0x100748, 0x100749).portr("PLAYERS34"); map(0x10074c, 0x10074d).portr("SYSTEM"); map(0x100800, 0x100fff).ram(); - map(0x101000, 0x1017ff).ram(); // .w(this, FUNC(legionna_state::legionna_background_w)).share("back_data"); - map(0x101800, 0x101fff).ram(); // .w(this, FUNC(legionna_state::legionna_foreground_w).share("fore_data"); - map(0x102000, 0x1027ff).ram(); // .w(this, FUNC(legionna_state::legionna_midground_w).share("mid_data"); - map(0x102800, 0x103fff).ram(); // .w(this, FUNC(legionna_state::legionna_text_w).share("textram"); + map(0x101000, 0x1017ff).ram(); // .w(FUNC(legionna_state::legionna_background_w)).share("back_data"); + map(0x101800, 0x101fff).ram(); // .w(FUNC(legionna_state::legionna_foreground_w).share("fore_data"); + map(0x102000, 0x1027ff).ram(); // .w(FUNC(legionna_state::legionna_midground_w).share("mid_data"); + map(0x102800, 0x103fff).ram(); // .w(FUNC(legionna_state::legionna_text_w).share("textram"); map(0x103800, 0x103fff).ram(); // check? map(0x104000, 0x104fff).ram(); // .w("palette", FUNC(palette_device::write)).share("palette"); map(0x105000, 0x105fff).ram().share("spriteram"); @@ -286,7 +286,7 @@ WRITE8_MEMBER(legionna_state::godzilla_oki_bank_w) void legionna_state::godzilla_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(legionna_state::godzilla_oki_bank_w)); + map(0x00, 0x00).w(FUNC(legionna_state::godzilla_oki_bank_w)); } // Denjin Makai: Looks like they specifically swapped address line A1 in this range? @@ -302,10 +302,10 @@ void legionna_state::denjinmk_map(address_map &map) legionna_cop_map(map); map(0x000000, 0x0fffff).rom(); map(0x100000, 0x1003ff).ram(); - map(0x100470, 0x100471).w(this, FUNC(legionna_state::denjinmk_setgfxbank)); + map(0x100470, 0x100471).w(FUNC(legionna_state::denjinmk_setgfxbank)); map(0x100600, 0x10064f).rw(m_crtc, FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); map(0x100680, 0x100681).nopw(); // irq ack? - map(0x100700, 0x10071f).r(this, FUNC(legionna_state::denjinmk_sound_comms_r)) + map(0x100700, 0x10071f).r(FUNC(legionna_state::denjinmk_sound_comms_r)) .lw8("seibu_sound_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_seibu_sound->main_w(space, offset >> 1, data, mem_mask); @@ -316,11 +316,11 @@ void legionna_state::denjinmk_map(address_map &map) map(0x10074c, 0x10074d).portr("SYSTEM"); map(0x10075c, 0x10075d).portr("DSW2"); map(0x100800, 0x100fff).ram(); - map(0x101000, 0x1017ff).ram(); // .w(this, FUNC(legionna_state::legionna_background_w)).share("back_data"); - map(0x101800, 0x101fff).ram(); // .w(this, FUNC(legionna_state::legionna_foreground_w).share("fore_data"); - map(0x102000, 0x1027ff).ram(); // .w(this, FUNC(legionna_state::legionna_midground_w).share("mid_data"); - map(0x102800, 0x103fff).ram(); // .w(this, FUNC(legionna_state::legionna_text_w).share("textram"); - map(0x104000, 0x104fff).ram().w(this, FUNC(legionna_state::palette_swap_w)).share("swappal"); + map(0x101000, 0x1017ff).ram(); // .w(FUNC(legionna_state::legionna_background_w)).share("back_data"); + map(0x101800, 0x101fff).ram(); // .w(FUNC(legionna_state::legionna_foreground_w).share("fore_data"); + map(0x102000, 0x1027ff).ram(); // .w(FUNC(legionna_state::legionna_midground_w).share("mid_data"); + map(0x102800, 0x103fff).ram(); // .w(FUNC(legionna_state::legionna_text_w).share("textram"); + map(0x104000, 0x104fff).ram().w(FUNC(legionna_state::palette_swap_w)).share("swappal"); map(0x105000, 0x105fff).ram().share("spriteram"); map(0x106000, 0x107fff).ram(); map(0x108000, 0x11dfff).ram(); @@ -333,7 +333,7 @@ void legionna_state::grainbow_map(address_map &map) legionna_cop_map(map); map(0x000000, 0x0fffff).rom(); map(0x100000, 0x1003ff).ram(); - map(0x100480, 0x100487).w(this, FUNC(legionna_state::grainbow_layer_config_w)); // probably a COP feature + map(0x100480, 0x100487).w(FUNC(legionna_state::grainbow_layer_config_w)); // probably a COP feature map(0x100600, 0x10064f).rw(m_crtc, FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); map(0x100680, 0x100681).nopw(); // irq ack? map(0x100700, 0x10071f).lrw8("seibu_sound_rw", @@ -348,12 +348,12 @@ void legionna_state::grainbow_map(address_map &map) map(0x100748, 0x100749).portr("PLAYERS34"); map(0x10074c, 0x10074d).portr("SYSTEM"); map(0x10075c, 0x10075d).portr("DSW2"); - map(0x100800, 0x100fff).ram(); // .w(this, FUNC(legionna_state::legionna_background_w)).share("back_data"); - map(0x101000, 0x1017ff).ram(); // .w(this, FUNC(legionna_state::legionna_foreground_w).share("fore_data"); - map(0x101800, 0x101fff).ram(); // .w(this, FUNC(legionna_state::legionna_midground_w).share("mid_data"); - map(0x102000, 0x102fff).ram(); // .w(this, FUNC(legionna_state::legionna_text_w).share("textram"); + map(0x100800, 0x100fff).ram(); // .w(FUNC(legionna_state::legionna_background_w)).share("back_data"); + map(0x101000, 0x1017ff).ram(); // .w(FUNC(legionna_state::legionna_foreground_w).share("fore_data"); + map(0x101800, 0x101fff).ram(); // .w(FUNC(legionna_state::legionna_midground_w).share("mid_data"); + map(0x102000, 0x102fff).ram(); // .w(FUNC(legionna_state::legionna_text_w).share("textram"); map(0x103000, 0x103fff).ram(); // .w("palette", FUNC(palette_device::write)).share("palette"); - map(0x104000, 0x104fff).ram(); // .w(this, FUNC(legionna_state::paletteram_xBBBBBGGGGGRRRRR_word_w)).share("paletteram"); + map(0x104000, 0x104fff).ram(); // .w(FUNC(legionna_state::paletteram_xBBBBBGGGGGRRRRR_word_w)).share("paletteram"); map(0x105000, 0x105fff).ram(); map(0x106000, 0x106fff).ram(); map(0x107000, 0x107fff).ram().share("spriteram"); @@ -379,10 +379,10 @@ void legionna_state::cupsoc_map(address_map &map) map(0x100748, 0x100749).portr("PLAYERS34"); map(0x10074c, 0x10074d).portr("SYSTEM"); map(0x10075c, 0x10075d).portr("DSW2"); - map(0x100800, 0x100fff).ram(); // .w(this, FUNC(legionna_state::legionna_background_w)).share("back_data"); - map(0x101000, 0x1017ff).ram(); // .w(this, FUNC(legionna_state::legionna_foreground_w).share("fore_data"); - map(0x101800, 0x101fff).ram(); // .w(this, FUNC(legionna_state::legionna_midground_w).share("mid_data"); - map(0x102000, 0x102fff).ram(); // .w(this, FUNC(legionna_state::legionna_text_w).share("textram"); + map(0x100800, 0x100fff).ram(); // .w(FUNC(legionna_state::legionna_background_w)).share("back_data"); + map(0x101000, 0x1017ff).ram(); // .w(FUNC(legionna_state::legionna_foreground_w).share("fore_data"); + map(0x101800, 0x101fff).ram(); // .w(FUNC(legionna_state::legionna_midground_w).share("mid_data"); + map(0x102000, 0x102fff).ram(); // .w(FUNC(legionna_state::legionna_text_w).share("textram"); map(0x103000, 0x103fff).ram(); // .w("palette", FUNC(palette_device::write)).share("palette"); map(0x104000, 0x104fff).ram(); map(0x105000, 0x106fff).ram(); @@ -419,10 +419,10 @@ void legionna_state::cupsocs_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_seibu_sound->main_w(space, offset >> 1, data, mem_mask); }).umask16(0x00ff); - map(0x100800, 0x100fff).ram(); // .w(this, FUNC(legionna_state::legionna_background_w)).share("back_data"); - map(0x101000, 0x1017ff).ram(); // .w(this, FUNC(legionna_state::legionna_foreground_w).share("fore_data"); - map(0x101800, 0x101fff).ram(); // .w(this, FUNC(legionna_state::legionna_midground_w).share("mid_data"); - map(0x102000, 0x102fff).ram(); // .w(this, FUNC(legionna_state::legionna_text_w).share("textram"); + map(0x100800, 0x100fff).ram(); // .w(FUNC(legionna_state::legionna_background_w)).share("back_data"); + map(0x101000, 0x1017ff).ram(); // .w(FUNC(legionna_state::legionna_foreground_w).share("fore_data"); + map(0x101800, 0x101fff).ram(); // .w(FUNC(legionna_state::legionna_midground_w).share("mid_data"); + map(0x102000, 0x102fff).ram(); // .w(FUNC(legionna_state::legionna_text_w).share("textram"); map(0x103000, 0x103fff).ram(); // .w("palette", FUNC(palette_device::write)).share("palette"); map(0x104000, 0x104fff).ram(); map(0x105000, 0x106fff).ram(); diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp index ae456010a65..98361e33364 100644 --- a/src/mame/drivers/leland.cpp +++ b/src/mame/drivers/leland.cpp @@ -84,26 +84,26 @@ void leland_state::master_map_program(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x9fff).bankr(m_master_bankslot[0]); - map(0xa000, 0xdfff).bankr(m_master_bankslot[1]).w(this, FUNC(leland_state::leland_battery_ram_w)).share("battery"); + map(0xa000, 0xdfff).bankr(m_master_bankslot[1]).w(FUNC(leland_state::leland_battery_ram_w)).share("battery"); map(0xe000, 0xefff).ram().share(m_mainram); - map(0xf000, 0xf3ff).rw(this, FUNC(leland_state::leland_gated_paletteram_r), FUNC(leland_state::leland_gated_paletteram_w)).share("palette"); - map(0xf800, 0xf801).w(this, FUNC(leland_state::leland_master_video_addr_w)); + map(0xf000, 0xf3ff).rw(FUNC(leland_state::leland_gated_paletteram_r), FUNC(leland_state::leland_gated_paletteram_w)).share("palette"); + map(0xf800, 0xf801).w(FUNC(leland_state::leland_master_video_addr_w)); } void leland_state::master_map_io(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).w(this, FUNC(leland_state::leland_master_alt_bankswitch_w)); - map(0xfd, 0xff).rw(this, FUNC(leland_state::leland_master_analog_key_r), FUNC(leland_state::leland_master_analog_key_w)); + map(0xf0, 0xf0).w(FUNC(leland_state::leland_master_alt_bankswitch_w)); + map(0xfd, 0xff).rw(FUNC(leland_state::leland_master_analog_key_r), FUNC(leland_state::leland_master_analog_key_w)); } void redline_state::master_redline_map_io(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).w(this, FUNC(redline_state::redline_master_alt_bankswitch_w)); + map(0xf0, 0xf0).w(FUNC(redline_state::redline_master_alt_bankswitch_w)); map(0xf2, 0xf2).rw(m_sound, FUNC(leland_80186_sound_device::leland_80186_response_r), FUNC(leland_80186_sound_device::leland_80186_command_lo_w)); map(0xf4, 0xf4).w(m_sound, FUNC(leland_80186_sound_device::leland_80186_command_hi_w)); - map(0xfd, 0xff).rw(this, FUNC(redline_state::leland_master_analog_key_r), FUNC(redline_state::leland_master_analog_key_w)); + map(0xfd, 0xff).rw(FUNC(redline_state::leland_master_analog_key_r), FUNC(redline_state::leland_master_analog_key_w)); } @@ -111,9 +111,9 @@ void ataxx_state::master_map_program_2(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x9fff).bankr(m_master_bankslot[0]); - map(0xa000, 0xdfff).bankr(m_master_bankslot[1]).w(this, FUNC(ataxx_state::ataxx_battery_ram_w)).share("battery"); + map(0xa000, 0xdfff).bankr(m_master_bankslot[1]).w(FUNC(ataxx_state::ataxx_battery_ram_w)).share("battery"); map(0xe000, 0xf7ff).ram().share(m_mainram); - map(0xf800, 0xffff).rw(this, FUNC(ataxx_state::ataxx_paletteram_and_misc_r), FUNC(ataxx_state::ataxx_paletteram_and_misc_w)).share("palette"); + map(0xf800, 0xffff).rw(FUNC(ataxx_state::ataxx_paletteram_and_misc_r), FUNC(ataxx_state::ataxx_paletteram_and_misc_w)).share("palette"); } @@ -124,9 +124,9 @@ void ataxx_state::master_map_io_2(address_map &map) map(0x05, 0x05).w(m_sound, FUNC(leland_80186_sound_device::leland_80186_command_hi_w)); map(0x06, 0x06).w(m_sound, FUNC(leland_80186_sound_device::leland_80186_command_lo_w)); map(0x0c, 0x0c).w(m_sound, FUNC(leland_80186_sound_device::ataxx_80186_control_w)); - map(0x20, 0x20).rw(this, FUNC(ataxx_state::ataxx_eeprom_r), FUNC(ataxx_state::ataxx_eeprom_w)); - map(0xd0, 0xef).rw(this, FUNC(ataxx_state::ataxx_mvram_port_r), FUNC(ataxx_state::ataxx_mvram_port_w)); - map(0xf0, 0xff).rw(this, FUNC(ataxx_state::ataxx_master_input_r), FUNC(ataxx_state::ataxx_master_output_w)); + map(0x20, 0x20).rw(FUNC(ataxx_state::ataxx_eeprom_r), FUNC(ataxx_state::ataxx_eeprom_w)); + map(0xd0, 0xef).rw(FUNC(ataxx_state::ataxx_mvram_port_r), FUNC(ataxx_state::ataxx_mvram_port_w)); + map(0xf0, 0xff).rw(FUNC(ataxx_state::ataxx_master_input_r), FUNC(ataxx_state::ataxx_master_output_w)); } @@ -142,9 +142,9 @@ void leland_state::slave_small_map_program(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0xdfff).bankr(m_slave_bankslot); map(0xe000, 0xefff).ram(); - map(0xf800, 0xf801).w(this, FUNC(leland_state::leland_slave_video_addr_w)); - map(0xf802, 0xf802).r(this, FUNC(leland_state::leland_raster_r)); - map(0xf803, 0xf803).w(this, FUNC(leland_state::leland_slave_small_banksw_w)); + map(0xf800, 0xf801).w(FUNC(leland_state::leland_slave_video_addr_w)); + map(0xf802, 0xf802).r(FUNC(leland_state::leland_raster_r)); + map(0xf803, 0xf803).w(FUNC(leland_state::leland_slave_small_banksw_w)); } @@ -152,18 +152,18 @@ void redline_state::slave_large_map_program(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0xbfff).bankr(m_slave_bankslot); - map(0xc000, 0xc000).w(this, FUNC(leland_state::leland_slave_large_banksw_w)); + map(0xc000, 0xc000).w(FUNC(leland_state::leland_slave_large_banksw_w)); map(0xe000, 0xefff).ram(); - map(0xf800, 0xf801).w(this, FUNC(leland_state::leland_slave_video_addr_w)); - map(0xf802, 0xf802).r(this, FUNC(leland_state::leland_raster_r)); + map(0xf800, 0xf801).w(FUNC(leland_state::leland_slave_video_addr_w)); + map(0xf802, 0xf802).r(FUNC(leland_state::leland_raster_r)); } void leland_state::slave_map_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x1f).rw(this, FUNC(leland_state::leland_svram_port_r), FUNC(leland_state::leland_svram_port_w)); - map(0x40, 0x5f).rw(this, FUNC(leland_state::leland_svram_port_r), FUNC(leland_state::leland_svram_port_w)); + map(0x00, 0x1f).rw(FUNC(leland_state::leland_svram_port_r), FUNC(leland_state::leland_svram_port_w)); + map(0x40, 0x5f).rw(FUNC(leland_state::leland_svram_port_r), FUNC(leland_state::leland_svram_port_w)); } @@ -173,16 +173,16 @@ void leland_state::slave_map_program(address_map &map) map(0x2000, 0x9fff).bankr(m_slave_bankslot); map(0xa000, 0xdfff).rom(); map(0xe000, 0xefff).ram(); - map(0xfffc, 0xfffd).w(this, FUNC(leland_state::leland_slave_video_addr_w)); - map(0xfffe, 0xfffe).r(this, FUNC(leland_state::leland_raster_r)); - map(0xffff, 0xffff).w(this, FUNC(leland_state::ataxx_slave_banksw_w)); + map(0xfffc, 0xfffd).w(FUNC(leland_state::leland_slave_video_addr_w)); + map(0xfffe, 0xfffe).r(FUNC(leland_state::leland_raster_r)); + map(0xffff, 0xffff).w(FUNC(leland_state::ataxx_slave_banksw_w)); } void ataxx_state::slave_map_io_2(address_map &map) { map.global_mask(0xff); - map(0x60, 0x7f).rw(this, FUNC(ataxx_state::ataxx_svram_port_r), FUNC(ataxx_state::ataxx_svram_port_w)); + map(0x60, 0x7f).rw(FUNC(ataxx_state::ataxx_svram_port_r), FUNC(ataxx_state::ataxx_svram_port_w)); } /************************************* diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp index f94a8c731de..bce2f4b85ed 100644 --- a/src/mame/drivers/lemmings.cpp +++ b/src/mame/drivers/lemmings.cpp @@ -70,15 +70,15 @@ void lemmings_state::lemmings_map(address_map &map) map(0x120000, 0x1207ff).ram().share("spriteram1"); map(0x140000, 0x1407ff).ram().share("spriteram2"); map(0x160000, 0x160fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x170000, 0x17000f).ram().w(this, FUNC(lemmings_state::lemmings_control_w)).share("control_data"); - map(0x190000, 0x19000f).r(this, FUNC(lemmings_state::lemmings_trackball_r)); - map(0x1a0000, 0x1a3fff).rw(this, FUNC(lemmings_state::lem_protection_region_0_146_r), FUNC(lemmings_state::lem_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ + map(0x170000, 0x17000f).ram().w(FUNC(lemmings_state::lemmings_control_w)).share("control_data"); + map(0x190000, 0x19000f).r(FUNC(lemmings_state::lemmings_trackball_r)); + map(0x1a0000, 0x1a3fff).rw(FUNC(lemmings_state::lem_protection_region_0_146_r), FUNC(lemmings_state::lem_protection_region_0_146_w)).share("prot16ram"); /* Protection device */ map(0x1c0000, 0x1c0001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* 1 written once a frame */ map(0x1e0000, 0x1e0001).w(m_spriteram[1], FUNC(buffered_spriteram16_device::write)); /* 1 written once a frame */ - map(0x200000, 0x201fff).ram().w(this, FUNC(lemmings_state::lemmings_vram_w)).share("vram_data"); + map(0x200000, 0x201fff).ram().w(FUNC(lemmings_state::lemmings_vram_w)).share("vram_data"); map(0x202000, 0x202fff).ram(); - map(0x300000, 0x37ffff).ram().w(this, FUNC(lemmings_state::lemmings_pixel_0_w)).share("pixel_0_data"); - map(0x380000, 0x39ffff).ram().w(this, FUNC(lemmings_state::lemmings_pixel_1_w)).share("pixel_1_data"); + map(0x300000, 0x37ffff).ram().w(FUNC(lemmings_state::lemmings_pixel_0_w)).share("pixel_0_data"); + map(0x380000, 0x39ffff).ram().w(FUNC(lemmings_state::lemmings_pixel_1_w)).share("pixel_1_data"); } /******************************************************************************/ diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp index 0d1b03ae885..fc6bb3b2341 100644 --- a/src/mame/drivers/lethal.cpp +++ b/src/mame/drivers/lethal.cpp @@ -349,15 +349,15 @@ void lethal_state::le_main(address_map &map) map(0x4000, 0x403f).w(m_k056832, FUNC(k056832_device::write)); map(0x4040, 0x404f).w(m_k056832, FUNC(k056832_device::b_w)); map(0x4080, 0x4080).nopr(); // watchdog - map(0x4090, 0x4090).rw(this, FUNC(lethal_state::sound_irq_r), FUNC(lethal_state::sound_irq_w)); + map(0x4090, 0x4090).rw(FUNC(lethal_state::sound_irq_r), FUNC(lethal_state::sound_irq_w)); map(0x40a0, 0x40a0).nopr(); - map(0x40c4, 0x40c4).w(this, FUNC(lethal_state::control2_w)); - map(0x40c8, 0x40d0).w(this, FUNC(lethal_state::lethalen_palette_control)); // PCU1-PCU3 on the schematics - map(0x40d4, 0x40d7).r(this, FUNC(lethal_state::guns_r)); + map(0x40c4, 0x40c4).w(FUNC(lethal_state::control2_w)); + map(0x40c8, 0x40d0).w(FUNC(lethal_state::lethalen_palette_control)); // PCU1-PCU3 on the schematics + map(0x40d4, 0x40d7).r(FUNC(lethal_state::guns_r)); map(0x40d8, 0x40d8).portr("DSW"); map(0x40d9, 0x40d9).portr("INPUTS"); - map(0x40db, 0x40db).r(this, FUNC(lethal_state::gunsaux_r)); // top X bit of guns - map(0x40dc, 0x40dc).w(this, FUNC(lethal_state::le_bankswitch_w)); + map(0x40db, 0x40db).r(FUNC(lethal_state::gunsaux_r)); // top X bit of guns + map(0x40dc, 0x40dc).w(FUNC(lethal_state::le_bankswitch_w)); map(0x8000, 0xffff).rom().region("maincpu", 0x38000); } diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp index 6b767637031..3c17073ef7d 100644 --- a/src/mame/drivers/lethalj.cpp +++ b/src/mame/drivers/lethalj.cpp @@ -217,11 +217,11 @@ void lethalj_state::lethalj_map(address_map &map) map(0x04100000, 0x0410000f).rw("oki3", FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); // AM_RANGE(0x04100010, 0x0410001f) AM_READNOP /* read but never examined */ map(0x04200000, 0x0420001f).nopw(); /* clocks bits through here */ - map(0x04300000, 0x0430007f).r(this, FUNC(lethalj_state::lethalj_gun_r)); + map(0x04300000, 0x0430007f).r(FUNC(lethalj_state::lethalj_gun_r)); map(0x04400000, 0x0440000f).nopw(); /* clocks bits through here */ map(0x04500010, 0x0450001f).portr("IN0"); map(0x04600000, 0x0460000f).portr("IN1"); - map(0x04700000, 0x0470007f).w(this, FUNC(lethalj_state::lethalj_blitter_w)); + map(0x04700000, 0x0470007f).w(FUNC(lethalj_state::lethalj_blitter_w)); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xc0000240, 0xc000025f).nopw(); /* seems to be a bug in their code, one of many. */ map(0xff800000, 0xffffffff).rom().region("user1", 0); diff --git a/src/mame/drivers/lft.cpp b/src/mame/drivers/lft.cpp index 854119e63dd..511c1fcd2c7 100644 --- a/src/mame/drivers/lft.cpp +++ b/src/mame/drivers/lft.cpp @@ -50,7 +50,7 @@ void lft_state::lft_io(address_map &map) map.global_mask(0xff); // screen 1 map(0x00, 0x01).nopr(); - map(0x04, 0x05).rw(this, FUNC(lft_state::keyin_r), FUNC(lft_state::term_w)); + map(0x04, 0x05).rw(FUNC(lft_state::keyin_r), FUNC(lft_state::term_w)); // screen 2 map(0x02, 0x03).nopr(); map(0x06, 0x07).nopw(); diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp index e847846911a..ec456ee2a52 100644 --- a/src/mame/drivers/lgp.cpp +++ b/src/mame/drivers/lgp.cpp @@ -166,7 +166,7 @@ void lgp_state::main_program_map(address_map &map) map(0xe400, 0xe7ff).ram().share("tile_ctrl_ram"); // AM_RANGE(0xef00,0xef00) AM_READ_PORT("IN_TEST") - map(0xef80, 0xef80).rw(this, FUNC(lgp_state::ldp_read), FUNC(lgp_state::ldp_write)); + map(0xef80, 0xef80).rw(FUNC(lgp_state::ldp_read), FUNC(lgp_state::ldp_write)); map(0xefb8, 0xefb8).nopr(); // watchdog map(0xefc0, 0xefc0).portr("DSWA"); /* Not tested */ map(0xefc8, 0xefc8).portr("DSWB"); diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp index dca2cb79432..cc5f5fb8a9b 100644 --- a/src/mame/drivers/liberate.cpp +++ b/src/mame/drivers/liberate.cpp @@ -244,14 +244,14 @@ void liberate_state::prosport_map(address_map &map) { map(0x0000, 0x03ff).mirror(0x2000).ram(); map(0x0200, 0x021f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0x0400, 0x07ff).ram().w(this, FUNC(liberate_state::prosport_bg_vram_w)).share("bg_vram"); - map(0x0800, 0x1fff).rw(this, FUNC(liberate_state::prosport_charram_r), FUNC(liberate_state::prosport_charram_w)); //0x1e00-0x1fff isn't charram! + map(0x0400, 0x07ff).ram().w(FUNC(liberate_state::prosport_bg_vram_w)).share("bg_vram"); + map(0x0800, 0x1fff).rw(FUNC(liberate_state::prosport_charram_r), FUNC(liberate_state::prosport_charram_w)); //0x1e00-0x1fff isn't charram! map(0x2400, 0x2fff).ram(); - map(0x3000, 0x33ff).ram().w(this, FUNC(liberate_state::liberate_colorram_w)).share("colorram"); - map(0x3400, 0x37ff).ram().w(this, FUNC(liberate_state::liberate_videoram_w)).share("videoram"); + map(0x3000, 0x33ff).ram().w(FUNC(liberate_state::liberate_colorram_w)).share("colorram"); + map(0x3400, 0x37ff).ram().w(FUNC(liberate_state::liberate_videoram_w)).share("videoram"); map(0x3800, 0x3fff).ram().share("spriteram"); map(0x4000, 0xffff).rom(); - map(0x8000, 0x800f).w(this, FUNC(liberate_state::prosport_io_w)); + map(0x8000, 0x800f).w(FUNC(liberate_state::prosport_io_w)); map(0x8000, 0x800f).bankr("bank1"); } @@ -259,13 +259,13 @@ void liberate_state::liberate_map(address_map &map) { map(0x0000, 0x0fff).ram(); map(0x1000, 0x3fff).rom(); /* Mirror of main rom */ - map(0x4000, 0x7fff).r(this, FUNC(liberate_state::deco16_bank_r)); - map(0x4000, 0x43ff).w(this, FUNC(liberate_state::liberate_colorram_w)).share("colorram"); - map(0x4400, 0x47ff).w(this, FUNC(liberate_state::liberate_videoram_w)).share("videoram"); + map(0x4000, 0x7fff).r(FUNC(liberate_state::deco16_bank_r)); + map(0x4000, 0x43ff).w(FUNC(liberate_state::liberate_colorram_w)).share("colorram"); + map(0x4400, 0x47ff).w(FUNC(liberate_state::liberate_videoram_w)).share("videoram"); map(0x4800, 0x4fff).writeonly().share("spriteram"); map(0x6200, 0x67ff).writeonly().share("scratchram"); map(0x8000, 0xffff).rom(); - map(0x8000, 0x800f).w(this, FUNC(liberate_state::deco16_io_w)); + map(0x8000, 0x800f).w(FUNC(liberate_state::deco16_io_w)); map(0x8000, 0x800f).bankr("bank1"); } @@ -278,25 +278,25 @@ void liberate_state::prosoccr_map(address_map &map) { map(0x0000, 0x0fff).ram(); map(0x1000, 0x3fff).rom(); /* Mirror of main rom */ - map(0x4000, 0x7fff).r(this, FUNC(liberate_state::prosoccr_bank_r)); - map(0x4000, 0x43ff).mirror(0x800).w(this, FUNC(liberate_state::liberate_colorram_w)).share("colorram"); - map(0x4400, 0x47ff).w(this, FUNC(liberate_state::liberate_videoram_w)).share("videoram"); + map(0x4000, 0x7fff).r(FUNC(liberate_state::prosoccr_bank_r)); + map(0x4000, 0x43ff).mirror(0x800).w(FUNC(liberate_state::liberate_colorram_w)).share("colorram"); + map(0x4400, 0x47ff).w(FUNC(liberate_state::liberate_videoram_w)).share("videoram"); map(0x4c00, 0x4fff).writeonly().share("spriteram"); map(0x6200, 0x67ff).writeonly().share("scratchram"); - map(0x8000, 0x97ff).rw(this, FUNC(liberate_state::prosoccr_charram_r), FUNC(liberate_state::prosoccr_charram_w)); - map(0x9800, 0x9800).w(this, FUNC(liberate_state::prosoccr_char_bank_w)); + map(0x8000, 0x97ff).rw(FUNC(liberate_state::prosoccr_charram_r), FUNC(liberate_state::prosoccr_charram_w)); + map(0x9800, 0x9800).w(FUNC(liberate_state::prosoccr_char_bank_w)); map(0xa000, 0xffff).rom(); } void liberate_state::deco16_io_map(address_map &map) { - map(0x00, 0x00).portr("IN0").w(this, FUNC(liberate_state::deco16_bank_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(liberate_state::deco16_bank_w)); map(0x01, 0x01).portr("TILT"); } void liberate_state::prosoccr_io_map(address_map &map) { - map(0x00, 0x00).portr("IN0").w(this, FUNC(liberate_state::prosoccr_io_bank_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(liberate_state::prosoccr_io_bank_w)); //AM_RANGE(0x01, 0x01) AM_READ_PORT("TILT") } @@ -305,13 +305,13 @@ void liberate_state::liberatb_map(address_map &map) map(0x0000, 0x0fff).ram(); map(0x00fe, 0x00fe).portr("IN0"); map(0x1000, 0x3fff).rom(); /* Mirror of main rom */ - map(0x4000, 0x7fff).r(this, FUNC(liberate_state::deco16_bank_r)); - map(0x4000, 0x43ff).w(this, FUNC(liberate_state::liberate_colorram_w)).share("colorram"); - map(0x4400, 0x47ff).w(this, FUNC(liberate_state::liberate_videoram_w)).share("videoram"); + map(0x4000, 0x7fff).r(FUNC(liberate_state::deco16_bank_r)); + map(0x4000, 0x43ff).w(FUNC(liberate_state::liberate_colorram_w)).share("colorram"); + map(0x4400, 0x47ff).w(FUNC(liberate_state::liberate_videoram_w)).share("videoram"); map(0x4800, 0x4fff).writeonly().share("spriteram"); map(0x6200, 0x67ff).writeonly().share("scratchram"); map(0x8000, 0xffff).rom(); - map(0xf000, 0xf00f).w(this, FUNC(liberate_state::deco16_io_w)); + map(0xf000, 0xf00f).w(FUNC(liberate_state::deco16_io_w)); map(0xf000, 0xf000).portr("IN1"); map(0xf001, 0xf001).portr("IN2"); map(0xf002, 0xf002).portr("IN3"); diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp index 55090aae60d..9cff2742c9e 100644 --- a/src/mame/drivers/liberatr.cpp +++ b/src/mame/drivers/liberatr.cpp @@ -275,21 +275,21 @@ WRITE8_MEMBER( liberatr_state::earom_control_w ) void liberatr_state::liberatr_map(address_map &map) { - map(0x0000, 0x3fff).ram().w(this, FUNC(liberatr_state::bitmap_w)).share("bitmapram"); /* overlapping for my convenience */ + map(0x0000, 0x3fff).ram().w(FUNC(liberatr_state::bitmap_w)).share("bitmapram"); /* overlapping for my convenience */ map(0x0000, 0x0000).ram().share("xcoord"); map(0x0001, 0x0001).ram().share("ycoord"); - map(0x0002, 0x0002).rw(this, FUNC(liberatr_state::bitmap_xy_r), FUNC(liberatr_state::bitmap_xy_w)); - map(0x4000, 0x403f).r(this, FUNC(liberatr_state::earom_r)); - map(0x5000, 0x5000).r(this, FUNC(liberatr_state::port0_r)); + map(0x0002, 0x0002).rw(FUNC(liberatr_state::bitmap_xy_r), FUNC(liberatr_state::bitmap_xy_w)); + map(0x4000, 0x403f).r(FUNC(liberatr_state::earom_r)); + map(0x5000, 0x5000).r(FUNC(liberatr_state::port0_r)); map(0x5001, 0x5001).portr("IN1"); map(0x6000, 0x600f).nopr().writeonly().share("base_ram"); map(0x6200, 0x621f).nopr().writeonly().share("colorram"); map(0x6400, 0x6400).nopw(); - map(0x6600, 0x6600).w(this, FUNC(liberatr_state::earom_control_w)); + map(0x6600, 0x6600).w(FUNC(liberatr_state::earom_control_w)); map(0x6800, 0x6800).writeonly().share("planet_frame"); map(0x6a00, 0x6a00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x6c00, 0x6c07).w(this, FUNC(liberatr_state::output_latch_w)); - map(0x6e00, 0x6e3f).nopr().w(this, FUNC(liberatr_state::earom_w)); + map(0x6c00, 0x6c07).w(FUNC(liberatr_state::output_latch_w)); + map(0x6e00, 0x6e3f).nopr().w(FUNC(liberatr_state::earom_w)); map(0x7000, 0x701f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x7800, 0x781f).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x8000, 0xefff).rom(); @@ -306,22 +306,22 @@ void liberatr_state::liberatr_map(address_map &map) void liberatr_state::liberat2_map(address_map &map) { - map(0x0000, 0x3fff).ram().w(this, FUNC(liberatr_state::bitmap_w)).share("bitmapram"); /* overlapping for my convenience */ + map(0x0000, 0x3fff).ram().w(FUNC(liberatr_state::bitmap_w)).share("bitmapram"); /* overlapping for my convenience */ map(0x0000, 0x0000).ram().share("xcoord"); map(0x0001, 0x0001).ram().share("ycoord"); - map(0x0002, 0x0002).rw(this, FUNC(liberatr_state::bitmap_xy_r), FUNC(liberatr_state::bitmap_xy_w)); - map(0x4000, 0x4000).r(this, FUNC(liberatr_state::port0_r)); + map(0x0002, 0x0002).rw(FUNC(liberatr_state::bitmap_xy_r), FUNC(liberatr_state::bitmap_xy_w)); + map(0x4000, 0x4000).r(FUNC(liberatr_state::port0_r)); map(0x4001, 0x4001).portr("IN1"); map(0x4002, 0x400f).nopr(); map(0x4000, 0x400f).writeonly().share("base_ram"); map(0x4200, 0x421f).nopr().writeonly().share("colorram"); map(0x4400, 0x4400).nopw(); - map(0x4600, 0x4600).w(this, FUNC(liberatr_state::earom_control_w)); - map(0x4800, 0x483f).r(this, FUNC(liberatr_state::earom_r)); + map(0x4600, 0x4600).w(FUNC(liberatr_state::earom_control_w)); + map(0x4800, 0x483f).r(FUNC(liberatr_state::earom_r)); map(0x4800, 0x4800).writeonly().share("planet_frame"); map(0x4a00, 0x4a00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x4c00, 0x4c07).w(this, FUNC(liberatr_state::output_latch_w)); - map(0x4e00, 0x4e3f).nopr().w(this, FUNC(liberatr_state::earom_w)); + map(0x4c00, 0x4c07).w(FUNC(liberatr_state::output_latch_w)); + map(0x4e00, 0x4e3f).nopr().w(FUNC(liberatr_state::earom_w)); map(0x5000, 0x501f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x5800, 0x581f).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); //AM_RANGE(0x6000, 0x601f) AM_WRITE(pokey1_w) /* bug ??? */ diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp index 8fcfe9f12c8..864900ddc80 100644 --- a/src/mame/drivers/limenko.cpp +++ b/src/mame/drivers/limenko.cpp @@ -202,14 +202,14 @@ void limenko_state::limenko_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("mainram"); map(0x40000000, 0x403fffff).rom().region("maindata", 0); - map(0x80000000, 0x80007fff).ram().w(this, FUNC(limenko_state::fg_videoram_w)).share("fg_videoram"); - map(0x80008000, 0x8000ffff).ram().w(this, FUNC(limenko_state::md_videoram_w)).share("md_videoram"); - map(0x80010000, 0x80017fff).ram().w(this, FUNC(limenko_state::bg_videoram_w)).share("bg_videoram"); + map(0x80000000, 0x80007fff).ram().w(FUNC(limenko_state::fg_videoram_w)).share("fg_videoram"); + map(0x80008000, 0x8000ffff).ram().w(FUNC(limenko_state::md_videoram_w)).share("md_videoram"); + map(0x80010000, 0x80017fff).ram().w(FUNC(limenko_state::bg_videoram_w)).share("bg_videoram"); map(0x80018000, 0x80019fff).ram().share("spriteram"); map(0x8001c000, 0x8001dfff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x8001e000, 0x8001ebff).ram(); // ? not used map(0x8001ffec, 0x8001ffff).ram().share("videoreg"); - map(0x8003e000, 0x8003e003).w(this, FUNC(limenko_state::spriteram_buffer_w)); + map(0x8003e000, 0x8003e003).w(FUNC(limenko_state::spriteram_buffer_w)); map(0xffe00000, 0xffffffff).rom().region("maincpu", 0); } @@ -218,7 +218,7 @@ void limenko_state::limenko_io_map(address_map &map) map(0x0000, 0x0003).portr("IN0"); map(0x0800, 0x0803).portr("IN1"); map(0x1000, 0x1003).portr("IN2"); - map(0x4000, 0x4003).w(this, FUNC(limenko_state::limenko_coincounter_w)); + map(0x4000, 0x4003).w(FUNC(limenko_state::limenko_coincounter_w)); map(0x4800, 0x4803).portw("EEPROMOUT"); map(0x5000, 0x5003).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask32(0x00ff0000).cswidth(32); } @@ -230,14 +230,14 @@ void limenko_state::spotty_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("mainram"); map(0x40002000, 0x400024d3).ram(); //? - map(0x80000000, 0x80007fff).ram().w(this, FUNC(limenko_state::fg_videoram_w)).share("fg_videoram"); - map(0x80008000, 0x8000ffff).ram().w(this, FUNC(limenko_state::md_videoram_w)).share("md_videoram"); - map(0x80010000, 0x80017fff).ram().w(this, FUNC(limenko_state::bg_videoram_w)).share("bg_videoram"); + map(0x80000000, 0x80007fff).ram().w(FUNC(limenko_state::fg_videoram_w)).share("fg_videoram"); + map(0x80008000, 0x8000ffff).ram().w(FUNC(limenko_state::md_videoram_w)).share("md_videoram"); + map(0x80010000, 0x80017fff).ram().w(FUNC(limenko_state::bg_videoram_w)).share("bg_videoram"); map(0x80018000, 0x80019fff).ram().share("spriteram"); map(0x8001c000, 0x8001dfff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x8001e000, 0x8001ebff).ram(); // ? not used map(0x8001ffec, 0x8001ffff).ram().share("videoreg"); - map(0x8003e000, 0x8003e003).w(this, FUNC(limenko_state::spriteram_buffer_w)); + map(0x8003e000, 0x8003e003).w(FUNC(limenko_state::spriteram_buffer_w)); map(0xfff00000, 0xffffffff).rom().region("maincpu", 0); } diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp index 430b7f5c579..8130793584c 100644 --- a/src/mame/drivers/lisa.cpp +++ b/src/mame/drivers/lisa.cpp @@ -25,14 +25,14 @@ void lisa_state::lisa_map(address_map &map) { - map(0x000000, 0xffffff).rw(this, FUNC(lisa_state::lisa_r), FUNC(lisa_state::lisa_w)); /* no fixed map, we use an MMU */ + map(0x000000, 0xffffff).rw(FUNC(lisa_state::lisa_r), FUNC(lisa_state::lisa_w)); /* no fixed map, we use an MMU */ } void lisa_state::lisa_fdc_map(address_map &map) { map.global_mask(0x1fff); // only 8k of address space map(0x0000, 0x03ff).ram().share("fdc_ram"); /* RAM (shared with 68000) */ - map(0x0400, 0x07ff).rw(this, FUNC(lisa_state::lisa_fdc_io_r), FUNC(lisa_state::lisa_fdc_io_w)); /* disk controller (IWM and TTL logic) */ + map(0x0400, 0x07ff).rw(FUNC(lisa_state::lisa_fdc_io_r), FUNC(lisa_state::lisa_fdc_io_w)); /* disk controller (IWM and TTL logic) */ map(0x0800, 0x0fff).noprw(); map(0x1000, 0x1fff).rom().region("fdccpu", 0x1000).share("fdc_rom"); /* ROM */ } @@ -42,7 +42,7 @@ void lisa_state::lisa210_fdc_map(address_map &map) map.global_mask(0x1fff); // only 8k of address space map(0x0000, 0x03ff).ram().share("fdc_ram"); /* RAM (shared with 68000) */ map(0x0400, 0x07ff).noprw(); /* nothing, or RAM wrap-around ??? */ - map(0x0800, 0x0bff).rw(this, FUNC(lisa_state::lisa_fdc_io_r), FUNC(lisa_state::lisa_fdc_io_w)); /* disk controller (IWM and TTL logic) */ + map(0x0800, 0x0bff).rw(FUNC(lisa_state::lisa_fdc_io_r), FUNC(lisa_state::lisa_fdc_io_w)); /* disk controller (IWM and TTL logic) */ map(0x0c00, 0x0fff).noprw(); /* nothing, or IO port wrap-around ??? */ map(0x1000, 0x1fff).rom().region("fdccpu", 0x1000).share("fdc_rom"); /* ROM */ } diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp index 527b2aa61c0..78c1345f531 100644 --- a/src/mame/drivers/littlerb.cpp +++ b/src/mame/drivers/littlerb.cpp @@ -172,8 +172,8 @@ void littlerb_state::littlerb_main(address_map &map) map(0x700000, 0x700007).rw("inder_vid:tms", FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w)); - map(0x740000, 0x740001).w(this, FUNC(littlerb_state::littlerb_l_sound_w)); - map(0x760000, 0x760001).w(this, FUNC(littlerb_state::littlerb_r_sound_w)); + map(0x740000, 0x740001).w(FUNC(littlerb_state::littlerb_l_sound_w)); + map(0x760000, 0x760001).w(FUNC(littlerb_state::littlerb_r_sound_w)); map(0x780000, 0x780001).nopw(); // generic outputs map(0x7c0000, 0x7c0001).portr("DSW"); map(0x7e0000, 0x7e0001).portr("P1"); diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp index 9833fb2d3be..30c3d3b53c1 100644 --- a/src/mame/drivers/lkage.cpp +++ b/src/mame/drivers/lkage.cpp @@ -123,7 +123,7 @@ void lkage_state::lkage_map(address_map &map) map(0xe800, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf000, 0xf003).ram().share("vreg"); /* video registers */ map(0xf060, 0xf060).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xf061, 0xf061).nopw().r(this, FUNC(lkage_state::sound_status_r)); + map(0xf061, 0xf061).nopw().r(FUNC(lkage_state::sound_status_r)); map(0xf063, 0xf063).nopw(); /* pulsed; nmi on sound cpu? */ map(0xf080, 0xf080).portr("DSW1"); map(0xf081, 0xf081).portr("DSW2"); @@ -136,21 +136,21 @@ void lkage_state::lkage_map(address_map &map) map(0xf0e1, 0xf0e1).nopw(); /* pulsed */ map(0xf100, 0xf15f).ram().share("spriteram"); map(0xf160, 0xf1ff).ram(); /* unknown - no valid sprite data */ - map(0xf400, 0xffff).ram().w(this, FUNC(lkage_state::lkage_videoram_w)).share("videoram"); + map(0xf400, 0xffff).ram().w(FUNC(lkage_state::lkage_videoram_w)).share("videoram"); } void lkage_state::lkage_map_mcu(address_map &map) { lkage_map(map); map(0xf062, 0xf062).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0xf087, 0xf087).r(this, FUNC(lkage_state::mcu_status_r)); + map(0xf087, 0xf087).r(FUNC(lkage_state::mcu_status_r)); } void lkage_state::lkage_map_boot(address_map &map) { lkage_map(map); - map(0xf062, 0xf062).rw(this, FUNC(lkage_state::fake_mcu_r), FUNC(lkage_state::fake_mcu_w)); - map(0xf087, 0xf087).r(this, FUNC(lkage_state::fake_status_r)); + map(0xf062, 0xf062).rw(FUNC(lkage_state::fake_mcu_r), FUNC(lkage_state::fake_mcu_w)); + map(0xf087, 0xf087).r(FUNC(lkage_state::fake_status_r)); } @@ -161,7 +161,7 @@ READ8_MEMBER(lkage_state::port_fetch_r) void lkage_state::lkage_io_map(address_map &map) { - map(0x4000, 0x7fff).r(this, FUNC(lkage_state::port_fetch_r)); + map(0x4000, 0x7fff).r(FUNC(lkage_state::port_fetch_r)); } @@ -176,8 +176,8 @@ void lkage_state::lkage_sound_map(address_map &map) map(0x9000, 0x9001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xa000, 0xa001).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xb000, 0xb000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).nopw(); /* ??? */ - map(0xb001, 0xb001).nopr() /* ??? */ .w(this, FUNC(lkage_state::lkage_sh_nmi_enable_w)); - map(0xb002, 0xb002).w(this, FUNC(lkage_state::lkage_sh_nmi_disable_w)); + map(0xb001, 0xb001).nopr() /* ??? */ .w(FUNC(lkage_state::lkage_sh_nmi_enable_w)); + map(0xb002, 0xb002).w(FUNC(lkage_state::lkage_sh_nmi_disable_w)); map(0xb003, 0xb003).nopw(); map(0xe000, 0xefff).rom(); /* space for diagnostic ROM? */ } diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index 78a3d41b02a..a64113ad4a5 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -87,10 +87,10 @@ void llc_state::llc2_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xE0, 0xE3).w(this, FUNC(llc_state::llc2_rom_disable_w)); + map(0xE0, 0xE3).w(FUNC(llc_state::llc2_rom_disable_w)); map(0xE4, 0xE7).rw("z80pio2", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0xE8, 0xEB).rw("z80pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0xEC, 0xEC).w(this, FUNC(llc_state::llc2_basic_enable_w)); + map(0xEC, 0xEC).w(FUNC(llc_state::llc2_basic_enable_w)); map(0xF8, 0xFB).rw("z80ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); } diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp index 78aa4d2ee78..9e2f356d159 100644 --- a/src/mame/drivers/lockon.cpp +++ b/src/mame/drivers/lockon.cpp @@ -152,19 +152,19 @@ void lockon_state::main_v30(address_map &map) { map.unmap_value_high(); map(0x00000, 0x03fff).ram(); - map(0x04000, 0x04003).rw(this, FUNC(lockon_state::lockon_crtc_r), FUNC(lockon_state::lockon_crtc_w)); + map(0x04000, 0x04003).rw(FUNC(lockon_state::lockon_crtc_r), FUNC(lockon_state::lockon_crtc_w)); map(0x06000, 0x06001).portr("DSW"); map(0x08000, 0x081ff).ram().share("hud_ram"); - map(0x09000, 0x09fff).ram().w(this, FUNC(lockon_state::lockon_char_w)).share("char_ram"); - map(0x0a000, 0x0a001).w(this, FUNC(lockon_state::adrst_w)); - map(0x0b000, 0x0bfff).w(this, FUNC(lockon_state::lockon_rotate_w)); - map(0x0c000, 0x0cfff).w(this, FUNC(lockon_state::lockon_fb_clut_w)); - map(0x0e000, 0x0e001).w(this, FUNC(lockon_state::inten_w)); - map(0x0f000, 0x0f001).w(this, FUNC(lockon_state::emres_w)); - map(0x10000, 0x1ffff).nopr().w(this, FUNC(lockon_state::tst_w)); - map(0x20000, 0x2ffff).rw(this, FUNC(lockon_state::main_z80_r), FUNC(lockon_state::main_z80_w)); - map(0x30000, 0x3ffff).rw(this, FUNC(lockon_state::main_gnd_r), FUNC(lockon_state::main_gnd_w)); - map(0x40000, 0x4ffff).rw(this, FUNC(lockon_state::main_obj_r), FUNC(lockon_state::main_obj_w)); + map(0x09000, 0x09fff).ram().w(FUNC(lockon_state::lockon_char_w)).share("char_ram"); + map(0x0a000, 0x0a001).w(FUNC(lockon_state::adrst_w)); + map(0x0b000, 0x0bfff).w(FUNC(lockon_state::lockon_rotate_w)); + map(0x0c000, 0x0cfff).w(FUNC(lockon_state::lockon_fb_clut_w)); + map(0x0e000, 0x0e001).w(FUNC(lockon_state::inten_w)); + map(0x0f000, 0x0f001).w(FUNC(lockon_state::emres_w)); + map(0x10000, 0x1ffff).nopr().w(FUNC(lockon_state::tst_w)); + map(0x20000, 0x2ffff).rw(FUNC(lockon_state::main_z80_r), FUNC(lockon_state::main_z80_w)); + map(0x30000, 0x3ffff).rw(FUNC(lockon_state::main_gnd_r), FUNC(lockon_state::main_gnd_w)); + map(0x40000, 0x4ffff).rw(FUNC(lockon_state::main_obj_r), FUNC(lockon_state::main_obj_w)); map(0x50000, 0x5ffff).mirror(0x80000).rom(); map(0x60000, 0x6ffff).mirror(0x80000).rom(); map(0x70000, 0x7ffff).mirror(0x80000).rom(); @@ -177,9 +177,9 @@ void lockon_state::ground_v30(address_map &map) map(0x00000, 0x03fff).ram(); map(0x04000, 0x04fff).ram().share("scene_ram"); map(0x08000, 0x08fff).ram().share("ground_ram"); - map(0x0C000, 0x0C001).w(this, FUNC(lockon_state::lockon_scene_h_scr_w)); - map(0x0C002, 0x0C003).w(this, FUNC(lockon_state::lockon_scene_v_scr_w)); - map(0x0C004, 0x0C005).w(this, FUNC(lockon_state::lockon_ground_ctrl_w)); + map(0x0C000, 0x0C001).w(FUNC(lockon_state::lockon_scene_h_scr_w)); + map(0x0C002, 0x0C003).w(FUNC(lockon_state::lockon_scene_v_scr_w)); + map(0x0C004, 0x0C005).w(FUNC(lockon_state::lockon_ground_ctrl_w)); map(0x20000, 0x2ffff).mirror(0xc0000).rom(); map(0x30000, 0x3ffff).mirror(0xc0000).rom(); } @@ -189,8 +189,8 @@ void lockon_state::object_v30(address_map &map) { map.unmap_value_high(); map(0x00000, 0x03fff).ram(); - map(0x04000, 0x04001).rw(this, FUNC(lockon_state::lockon_obj_4000_r), FUNC(lockon_state::lockon_obj_4000_w)); - map(0x08000, 0x08fff).w(this, FUNC(lockon_state::lockon_tza112_w)); + map(0x04000, 0x04001).rw(FUNC(lockon_state::lockon_obj_4000_r), FUNC(lockon_state::lockon_obj_4000_w)); + map(0x08000, 0x08fff).w(FUNC(lockon_state::lockon_tza112_w)); map(0x0c000, 0x0c1ff).ram().share("object_ram"); map(0x30000, 0x3ffff).mirror(0xc0000).rom(); } @@ -200,7 +200,7 @@ void lockon_state::sound_prg(address_map &map) { map.unmap_value_high(); map(0x0000, 0x6fff).rom(); - map(0x7000, 0x7000).w(this, FUNC(lockon_state::sound_vol)); + map(0x7000, 0x7000).w(FUNC(lockon_state::sound_vol)); map(0x7400, 0x7407).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)); map(0x7800, 0x7fff).mirror(0x8000).ram(); } diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp index 9ac644748dc..5202647f6fa 100644 --- a/src/mame/drivers/lola8a.cpp +++ b/src/mame/drivers/lola8a.cpp @@ -86,7 +86,7 @@ void lola8a_state::lola8a_io(address_map &map) map.unmap_value_high(); map(0x80, 0x80).w(AY8910_TAG, FUNC(ay8910_device::address_w)); map(0x84, 0x84).rw(AY8910_TAG, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0x88, 0x88).r(this, FUNC(lola8a_state::keyboard_r)); + map(0x88, 0x88).r(FUNC(lola8a_state::keyboard_r)); map(0x90, 0x90).rw(HD46505SP_TAG, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x92, 0x92).rw(HD46505SP_TAG, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp index e274ca7e066..9bafb5ed70e 100644 --- a/src/mame/drivers/looping.cpp +++ b/src/mame/drivers/looping.cpp @@ -548,19 +548,19 @@ void looping_state::looping_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x9000, 0x93ff).ram().w(this, FUNC(looping_state::looping_videoram_w)).share("videoram"); + map(0x9000, 0x93ff).ram().w(FUNC(looping_state::looping_videoram_w)).share("videoram"); - map(0x9800, 0x983f).mirror(0x0700).ram().w(this, FUNC(looping_state::looping_colorram_w)).share("colorram"); + map(0x9800, 0x983f).mirror(0x0700).ram().w(FUNC(looping_state::looping_colorram_w)).share("colorram"); map(0x9840, 0x987f).mirror(0x0700).ram().share("spriteram"); map(0x9880, 0x98ff).mirror(0x0700).ram(); map(0xb000, 0xb007).mirror(0x07f8).w("videolatch", FUNC(ls259_device::write_d0)); map(0xe000, 0xefff).ram(); - map(0xf800, 0xf800).mirror(0x03fc).portr("P1").w(this, FUNC(looping_state::out_0_w)); /* /OUT0 */ - map(0xf801, 0xf801).mirror(0x03fc).portr("P2").w(this, FUNC(looping_state::looping_soundlatch_w)); /* /OUT1 */ - map(0xf802, 0xf802).mirror(0x03fc).portr("DSW").w(this, FUNC(looping_state::out_2_w)); /* /OUT2 */ - map(0xf803, 0xf803).mirror(0x03fc).rw(this, FUNC(looping_state::adc_r), FUNC(looping_state::adc_w)); + map(0xf800, 0xf800).mirror(0x03fc).portr("P1").w(FUNC(looping_state::out_0_w)); /* /OUT0 */ + map(0xf801, 0xf801).mirror(0x03fc).portr("P2").w(FUNC(looping_state::looping_soundlatch_w)); /* /OUT1 */ + map(0xf802, 0xf802).mirror(0x03fc).portr("DSW").w(FUNC(looping_state::out_2_w)); /* /OUT2 */ + map(0xf803, 0xf803).mirror(0x03fc).rw(FUNC(looping_state::adc_r), FUNC(looping_state::adc_w)); } void looping_state::looping_io_map(address_map &map) diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp index 3bac30ec828..43b7776ef1b 100644 --- a/src/mame/drivers/lordgun.cpp +++ b/src/mame/drivers/lordgun.cpp @@ -283,14 +283,14 @@ void lordgun_state::lordgun_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x20ffff).ram(); map(0x210000, 0x21ffff).ram().share("priority_ram"); // PRIORITY - map(0x300000, 0x30ffff).ram().w(this, FUNC(lordgun_state::lordgun_vram_0_w)).share("vram.0"); // DISPLAY - map(0x310000, 0x313fff).ram().w(this, FUNC(lordgun_state::lordgun_vram_1_w)).share("vram.1"); // DISPLAY - map(0x314000, 0x314fff).ram().w(this, FUNC(lordgun_state::lordgun_vram_2_w)).share("vram.2"); // DISPLAY + map(0x300000, 0x30ffff).ram().w(FUNC(lordgun_state::lordgun_vram_0_w)).share("vram.0"); // DISPLAY + map(0x310000, 0x313fff).ram().w(FUNC(lordgun_state::lordgun_vram_1_w)).share("vram.1"); // DISPLAY + map(0x314000, 0x314fff).ram().w(FUNC(lordgun_state::lordgun_vram_2_w)).share("vram.2"); // DISPLAY map(0x315000, 0x317fff).ram(); // - map(0x318000, 0x319fff).ram().w(this, FUNC(lordgun_state::lordgun_vram_3_w)).share("vram.3"); // DISPLAY + map(0x318000, 0x319fff).ram().w(FUNC(lordgun_state::lordgun_vram_3_w)).share("vram.3"); // DISPLAY map(0x31c000, 0x31c7ff).ram().share("scrollram"); // LINE map(0x400000, 0x4007ff).ram().share("spriteram"); // ANIMATOR - map(0x500000, 0x500fff).ram().w(this, FUNC(lordgun_state::lordgun_paletteram_w)).share("paletteram"); + map(0x500000, 0x500fff).ram().w(FUNC(lordgun_state::lordgun_paletteram_w)).share("paletteram"); map(0x502000, 0x502001).writeonly().share("scroll_x.0"); map(0x502200, 0x502201).writeonly().share("scroll_x.1"); map(0x502400, 0x502401).writeonly().share("scroll_x.2"); @@ -299,15 +299,15 @@ void lordgun_state::lordgun_map(address_map &map) map(0x502a00, 0x502a01).writeonly().share("scroll_y.1"); map(0x502c00, 0x502c01).writeonly().share("scroll_y.2"); map(0x502e00, 0x502e01).writeonly().share("scroll_y.3"); - map(0x503000, 0x503001).w(this, FUNC(lordgun_state::lordgun_priority_w)); - map(0x503800, 0x503801).r(this, FUNC(lordgun_state::lordgun_gun_0_x_r)); - map(0x503a00, 0x503a01).r(this, FUNC(lordgun_state::lordgun_gun_1_x_r)); - map(0x503c00, 0x503c01).r(this, FUNC(lordgun_state::lordgun_gun_0_y_r)); - map(0x503e00, 0x503e01).r(this, FUNC(lordgun_state::lordgun_gun_1_y_r)); - map(0x504000, 0x504001).w(this, FUNC(lordgun_state::lordgun_soundlatch_w)); + map(0x503000, 0x503001).w(FUNC(lordgun_state::lordgun_priority_w)); + map(0x503800, 0x503801).r(FUNC(lordgun_state::lordgun_gun_0_x_r)); + map(0x503a00, 0x503a01).r(FUNC(lordgun_state::lordgun_gun_1_x_r)); + map(0x503c00, 0x503c01).r(FUNC(lordgun_state::lordgun_gun_0_y_r)); + map(0x503e00, 0x503e01).r(FUNC(lordgun_state::lordgun_gun_1_y_r)); + map(0x504000, 0x504001).w(FUNC(lordgun_state::lordgun_soundlatch_w)); map(0x506000, 0x506007).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); map(0x508000, 0x508007).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x50a900, 0x50a9ff).rw(this, FUNC(lordgun_state::lordgun_protection_r), FUNC(lordgun_state::lordgun_protection_w)); + map(0x50a900, 0x50a9ff).rw(FUNC(lordgun_state::lordgun_protection_r), FUNC(lordgun_state::lordgun_protection_w)); } @@ -316,14 +316,14 @@ void lordgun_state::aliencha_map(address_map &map) map(0x000000, 0x1fffff).rom(); map(0x200000, 0x20ffff).ram(); map(0x210000, 0x21ffff).ram().share("priority_ram"); // PRIORITY - map(0x300000, 0x30ffff).ram().w(this, FUNC(lordgun_state::lordgun_vram_0_w)).share("vram.0"); // BACKGROUND 1 - map(0x310000, 0x313fff).ram().w(this, FUNC(lordgun_state::lordgun_vram_1_w)).share("vram.1"); // BACKGROUND 2 - map(0x314000, 0x314fff).ram().w(this, FUNC(lordgun_state::lordgun_vram_2_w)).share("vram.2"); // BACKGROUND 3 + map(0x300000, 0x30ffff).ram().w(FUNC(lordgun_state::lordgun_vram_0_w)).share("vram.0"); // BACKGROUND 1 + map(0x310000, 0x313fff).ram().w(FUNC(lordgun_state::lordgun_vram_1_w)).share("vram.1"); // BACKGROUND 2 + map(0x314000, 0x314fff).ram().w(FUNC(lordgun_state::lordgun_vram_2_w)).share("vram.2"); // BACKGROUND 3 map(0x315000, 0x317fff).ram(); // - map(0x318000, 0x319fff).ram().w(this, FUNC(lordgun_state::lordgun_vram_3_w)).share("vram.3"); // TEXT + map(0x318000, 0x319fff).ram().w(FUNC(lordgun_state::lordgun_vram_3_w)).share("vram.3"); // TEXT map(0x31c000, 0x31c7ff).ram().share("scrollram"); // LINE OFFSET map(0x400000, 0x4007ff).ram().share("spriteram"); // ANIMATE - map(0x500000, 0x500fff).ram().w(this, FUNC(lordgun_state::lordgun_paletteram_w)).share("paletteram"); + map(0x500000, 0x500fff).ram().w(FUNC(lordgun_state::lordgun_paletteram_w)).share("paletteram"); map(0x502000, 0x502001).writeonly().share("scroll_x.0"); map(0x502200, 0x502201).writeonly().share("scroll_x.1"); map(0x502400, 0x502401).writeonly().share("scroll_x.2"); @@ -332,11 +332,11 @@ void lordgun_state::aliencha_map(address_map &map) map(0x502a00, 0x502a01).writeonly().share("scroll_y.1"); map(0x502c00, 0x502c01).writeonly().share("scroll_y.2"); map(0x502e00, 0x502e01).writeonly().share("scroll_y.3"); - map(0x503000, 0x503001).w(this, FUNC(lordgun_state::lordgun_priority_w)); - map(0x504000, 0x504001).w(this, FUNC(lordgun_state::lordgun_soundlatch_w)); + map(0x503000, 0x503001).w(FUNC(lordgun_state::lordgun_priority_w)); + map(0x504000, 0x504001).w(FUNC(lordgun_state::lordgun_soundlatch_w)); map(0x506000, 0x506007).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); map(0x508000, 0x508007).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x50b900, 0x50b9ff).rw(this, FUNC(lordgun_state::aliencha_protection_r), FUNC(lordgun_state::aliencha_protection_w)); + map(0x50b900, 0x50b9ff).rw(FUNC(lordgun_state::aliencha_protection_r), FUNC(lordgun_state::aliencha_protection_w)); } void lordgun_state::ymf278_map(address_map &map) @@ -370,7 +370,7 @@ void lordgun_state::lordgun_soundio_map(address_map &map) map(0x3000, 0x3000).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0x4000, 0x4000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x5000, 0x5000).nopr(); - map(0x6000, 0x6000).w(this, FUNC(lordgun_state::lordgun_okibank_w)); + map(0x6000, 0x6000).w(FUNC(lordgun_state::lordgun_okibank_w)); } diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index efd8f870659..3dabe8bc4bf 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -181,15 +181,15 @@ void lsasquad_state::lsasquad_map(address_map &map) map(0xe800, 0xe800).portr("DSWA"); map(0xe801, 0xe801).portr("DSWB"); map(0xe802, 0xe802).portr("DSWC"); - map(0xe803, 0xe803).r(this, FUNC(lsasquad_state::lsasquad_mcu_status_r)); /* COIN + 68705 status */ + map(0xe803, 0xe803).r(FUNC(lsasquad_state::lsasquad_mcu_status_r)); /* COIN + 68705 status */ map(0xe804, 0xe804).portr("P1"); map(0xe805, 0xe805).portr("P2"); map(0xe806, 0xe806).portr("START"); map(0xe807, 0xe807).portr("SERVICE"); - map(0xea00, 0xea00).w(this, FUNC(lsasquad_state::lsasquad_bankswitch_w)); + map(0xea00, 0xea00).w(FUNC(lsasquad_state::lsasquad_bankswitch_w)); map(0xec00, 0xec00).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0xec00, 0xec00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xec01, 0xec01).r(this, FUNC(lsasquad_state::lsasquad_sound_status_r)); + map(0xec01, 0xec01).r(FUNC(lsasquad_state::lsasquad_sound_status_r)); map(0xee00, 0xee00).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); } @@ -201,9 +201,9 @@ void lsasquad_state::lsasquad_sound_map(address_map &map) map(0xc000, 0xc001).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xd000, 0xd000).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); - map(0xd400, 0xd400).w(this, FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); - map(0xd800, 0xd800).w(this, FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); - map(0xd800, 0xd800).r(this, FUNC(lsasquad_state::lsasquad_sound_status_r)); + map(0xd400, 0xd400).w(FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); + map(0xd800, 0xd800).w(FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); + map(0xd800, 0xd800).r(FUNC(lsasquad_state::lsasquad_sound_status_r)); map(0xe000, 0xefff).rom(); /* space for diagnostic ROM? */ } @@ -225,10 +225,10 @@ void lsasquad_state::storming_map(address_map &map) map(0xe805, 0xe805).portr("P2"); map(0xe806, 0xe806).portr("START"); map(0xe807, 0xe807).portr("SERVICE"); - map(0xea00, 0xea00).w(this, FUNC(lsasquad_state::lsasquad_bankswitch_w)); + map(0xea00, 0xea00).w(FUNC(lsasquad_state::lsasquad_bankswitch_w)); map(0xec00, 0xec00).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0xec00, 0xec00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xec01, 0xec01).r(this, FUNC(lsasquad_state::lsasquad_sound_status_r)); + map(0xec01, 0xec01).r(FUNC(lsasquad_state::lsasquad_sound_status_r)); } @@ -384,12 +384,12 @@ void lsasquad_state::daikaiju_map(address_map &map) map(0xe400, 0xe7ff).ram().share("spriteram"); /* OBJECT RAM */ map(0xe800, 0xe800).portr("DSWA"); map(0xe801, 0xe801).portr("DSWB"); - map(0xe803, 0xe803).r(this, FUNC(lsasquad_state::daikaiju_mcu_status_r)); /* COIN + 68705 status */ + map(0xe803, 0xe803).r(FUNC(lsasquad_state::daikaiju_mcu_status_r)); /* COIN + 68705 status */ map(0xe804, 0xe804).portr("P1"); map(0xe805, 0xe805).portr("P2"); map(0xe806, 0xe806).portr("START"); map(0xe807, 0xe807).portr("SERVICE"); - map(0xea00, 0xea00).w(this, FUNC(lsasquad_state::lsasquad_bankswitch_w)); + map(0xea00, 0xea00).w(FUNC(lsasquad_state::lsasquad_bankswitch_w)); map(0xec00, 0xec00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xee00, 0xee00).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); } @@ -401,8 +401,8 @@ void lsasquad_state::daikaiju_sound_map(address_map &map) map(0xa000, 0xa001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xc000, 0xc001).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xd400, 0xd400).w(this, FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); - map(0xd800, 0xd800).rw(this, FUNC(lsasquad_state::daikaiju_sound_status_r), FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); + map(0xd400, 0xd400).w(FUNC(lsasquad_state::lsasquad_sh_nmi_disable_w)); + map(0xd800, 0xd800).rw(FUNC(lsasquad_state::daikaiju_sound_status_r), FUNC(lsasquad_state::lsasquad_sh_nmi_enable_w)); map(0xdc00, 0xdc00).nopw(); map(0xe000, 0xefff).rom(); /* space for diagnostic ROM? */ } diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp index f6eedc0384c..7b34ddaa64b 100644 --- a/src/mame/drivers/ltcasino.cpp +++ b/src/mame/drivers/ltcasino.cpp @@ -146,9 +146,9 @@ void ltcasino_state::ltcasino_map(address_map &map) { map(0x0000, 0x7fff).ram(); map(0x8000, 0xcfff).rom(); - map(0xd000, 0xd7ff).ram().w(this, FUNC(ltcasino_state::ltcasino_tile_num_w)).share("tile_nuram"); + map(0xd000, 0xd7ff).ram().w(FUNC(ltcasino_state::ltcasino_tile_num_w)).share("tile_nuram"); map(0xd800, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(ltcasino_state::ltcasino_tile_atr_w)).share("tile_atr_ram"); + map(0xe000, 0xe7ff).ram().w(FUNC(ltcasino_state::ltcasino_tile_atr_w)).share("tile_atr_ram"); map(0xe800, 0xebff).ram(); map(0xec00, 0xec00).portr("IN0"); diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp index cf9cbe80696..0ac0cd7b132 100644 --- a/src/mame/drivers/ltd.cpp +++ b/src/mame/drivers/ltd.cpp @@ -98,8 +98,8 @@ private: void ltd_state::ltd3_map(address_map &map) { map(0x0000, 0x007f).ram().share("nvram"); // internal to the cpu - map(0x0080, 0x0087).mirror(0x78).r(this, FUNC(ltd_state::io_r)); - map(0x0800, 0x2fff).w(this, FUNC(ltd_state::io_w)); + map(0x0080, 0x0087).mirror(0x78).r(FUNC(ltd_state::io_r)); + map(0x0800, 0x2fff).w(FUNC(ltd_state::io_w)); map(0xc000, 0xcfff).rom().mirror(0x3000).region("roms", 0); } @@ -108,7 +108,7 @@ void ltd_state::ltd4_map(address_map &map) map(0x0000, 0x001f).ram(); // internal to the cpu map(0x0080, 0x00ff).ram(); map(0x0100, 0x01ff).ram().share("nvram"); - map(0x0800, 0x0800).w(this, FUNC(ltd_state::count_reset_w)); + map(0x0800, 0x0800).w(FUNC(ltd_state::count_reset_w)); map(0x0c00, 0x0c00).w("aysnd_1", FUNC(ay8910_device::reset_w)); map(0x1000, 0x1000).w("aysnd_0", FUNC(ay8910_device::address_w)); map(0x1400, 0x1400).w("aysnd_0", FUNC(ay8910_device::reset_w)); @@ -121,8 +121,8 @@ void ltd_state::ltd4_map(address_map &map) void ltd_state::ltd4_io(address_map &map) { - map(0x0100, 0x0100).rw(this, FUNC(ltd_state::port1_r), FUNC(ltd_state::port1_w)); - map(0x0101, 0x0101).rw(this, FUNC(ltd_state::port2_r), FUNC(ltd_state::port2_w)); + map(0x0100, 0x0100).rw(FUNC(ltd_state::port1_r), FUNC(ltd_state::port1_w)); + map(0x0101, 0x0101).rw(FUNC(ltd_state::port2_r), FUNC(ltd_state::port2_w)); } // bits 6,7 not connected to data bus diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp index df6bf521113..1dcaaf57dcf 100644 --- a/src/mame/drivers/luckgrln.cpp +++ b/src/mame/drivers/luckgrln.cpp @@ -301,20 +301,20 @@ void luckgrln_state::mainmap(address_map &map) map(0x10000, 0x1ffff).rom().region("rom_data", 0x10000); map(0x20000, 0x2ffff).rom().region("rom_data", 0x00000); - map(0x0c000, 0x0c1ff).ram().w(this, FUNC(luckgrln_state::reel_ram_w<0>)).share("reel_ram.0"); // only written to half way - map(0x0c800, 0x0c9ff).ram().w(this, FUNC(luckgrln_state::reel_attr_w<0>)).share("reel_attr.0"); + map(0x0c000, 0x0c1ff).ram().w(FUNC(luckgrln_state::reel_ram_w<0>)).share("reel_ram.0"); // only written to half way + map(0x0c800, 0x0c9ff).ram().w(FUNC(luckgrln_state::reel_attr_w<0>)).share("reel_attr.0"); map(0x0d000, 0x0d03f).ram().share("reel_scroll.0").mirror(0x000c0); - map(0x0c200, 0x0c3ff).ram().w(this, FUNC(luckgrln_state::reel_ram_w<1>)).share("reel_ram.1"); - map(0x0ca00, 0x0cbff).ram().w(this, FUNC(luckgrln_state::reel_attr_w<1>)).share("reel_attr.1"); + map(0x0c200, 0x0c3ff).ram().w(FUNC(luckgrln_state::reel_ram_w<1>)).share("reel_ram.1"); + map(0x0ca00, 0x0cbff).ram().w(FUNC(luckgrln_state::reel_attr_w<1>)).share("reel_attr.1"); map(0x0d200, 0x0d23f).ram().share("reel_scroll.1").mirror(0x000c0); - map(0x0c400, 0x0c5ff).ram().w(this, FUNC(luckgrln_state::reel_ram_w<2>)).share("reel_ram.2"); - map(0x0cc00, 0x0cdff).ram().w(this, FUNC(luckgrln_state::reel_attr_w<2>)).share("reel_attr.2"); + map(0x0c400, 0x0c5ff).ram().w(FUNC(luckgrln_state::reel_ram_w<2>)).share("reel_ram.2"); + map(0x0cc00, 0x0cdff).ram().w(FUNC(luckgrln_state::reel_attr_w<2>)).share("reel_attr.2"); map(0x0d400, 0x0d43f).ram().share("reel_scroll.2").mirror(0x000c0); - map(0x0c600, 0x0c7ff).ram().w(this, FUNC(luckgrln_state::reel_ram_w<3>)).share("reel_ram.3"); - map(0x0ce00, 0x0cfff).ram().w(this, FUNC(luckgrln_state::reel_attr_w<3>)).share("reel_attr.3"); + map(0x0c600, 0x0c7ff).ram().w(FUNC(luckgrln_state::reel_ram_w<3>)).share("reel_ram.3"); + map(0x0ce00, 0x0cfff).ram().w(FUNC(luckgrln_state::reel_attr_w<3>)).share("reel_attr.3"); map(0x0d600, 0x0d63f).ram().share("reel_scroll.3"); // AM_RANGE(0x0d200, 0x0d2ff) AM_RAM @@ -445,19 +445,19 @@ void luckgrln_state::common_portmap(address_map &map) { map.global_mask(0xff); map(0x0000, 0x003f).ram(); // Z180 internal regs - map(0x0060, 0x0060).w(this, FUNC(luckgrln_state::output_w)); + map(0x0060, 0x0060).w(FUNC(luckgrln_state::output_w)); - map(0x00a0, 0x00a0).w(this, FUNC(luckgrln_state::palette_offset_low_w)); - map(0x00a1, 0x00a1).w(this, FUNC(luckgrln_state::palette_offset_high_w)); - map(0x00a2, 0x00a2).w(this, FUNC(luckgrln_state::palette_w)); + map(0x00a0, 0x00a0).w(FUNC(luckgrln_state::palette_offset_low_w)); + map(0x00a1, 0x00a1).w(FUNC(luckgrln_state::palette_offset_high_w)); + map(0x00a2, 0x00a2).w(FUNC(luckgrln_state::palette_w)); map(0x00b0, 0x00b0).w("crtc", FUNC(mc6845_device::address_w)); map(0x00b1, 0x00b1).w("crtc", FUNC(mc6845_device::register_w)); map(0x00b8, 0x00b8).portr("IN0"); - map(0x00b9, 0x00b9).portr("IN1").w(this, FUNC(luckgrln_state::counters_w)); - map(0x00ba, 0x00ba).portr("IN2").w(this, FUNC(luckgrln_state::lamps_a_w)); - map(0x00bb, 0x00bb).portr("IN3").w(this, FUNC(luckgrln_state::lamps_b_w)); + map(0x00b9, 0x00b9).portr("IN1").w(FUNC(luckgrln_state::counters_w)); + map(0x00ba, 0x00ba).portr("IN2").w(FUNC(luckgrln_state::lamps_a_w)); + map(0x00bb, 0x00bb).portr("IN3").w(FUNC(luckgrln_state::lamps_b_w)); map(0x00bc, 0x00bc).portr("DSW1"); map(0x00c0, 0x00c3).nopw(); @@ -509,7 +509,7 @@ READ8_MEMBER(luckgrln_state::test_r) void luckgrln_state::_7smash_io(address_map &map) { common_portmap(map); - map(0x66, 0x66).r(this, FUNC(luckgrln_state::test_r)); + map(0x66, 0x66).r(FUNC(luckgrln_state::test_r)); } static INPUT_PORTS_START( luckgrln ) diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp index 3800078655a..714c8524aee 100644 --- a/src/mame/drivers/lucky74.cpp +++ b/src/mame/drivers/lucky74.cpp @@ -930,27 +930,27 @@ void lucky74_state::lucky74_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram().share("nvram"); /* NVRAM */ - map(0xd000, 0xd7ff).ram().w(this, FUNC(lucky74_state::lucky74_fg_videoram_w)).share("fg_videoram"); /* VRAM1-1 */ - map(0xd800, 0xdfff).ram().w(this, FUNC(lucky74_state::lucky74_fg_colorram_w)).share("fg_colorram"); /* VRAM1-2 */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(lucky74_state::lucky74_bg_videoram_w)).share("bg_videoram"); /* VRAM2-1 */ - map(0xe800, 0xefff).ram().w(this, FUNC(lucky74_state::lucky74_bg_colorram_w)).share("bg_colorram"); /* VRAM2-2 */ - map(0xf000, 0xf003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports 0 & 1 */ - map(0xf080, 0xf083).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* DSW 1, 2 & 3 */ - map(0xf0c0, 0xf0c3).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* DSW 4 */ - map(0xf100, 0xf100).w("sn1", FUNC(sn76489_device::write)); /* SN76489 #1 */ - map(0xf200, 0xf203).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports 2 & 4 */ - map(0xf300, 0xf300).w("sn2", FUNC(sn76489_device::write)); /* SN76489 #2 */ - map(0xf400, 0xf400).w("aysnd", FUNC(ay8910_device::address_w)); /* YM2149 control */ - map(0xf500, 0xf500).w("sn3", FUNC(sn76489_device::write)); /* SN76489 #3 */ - map(0xf600, 0xf600).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); /* YM2149 (Input Port 1) */ - map(0xf700, 0xf701).rw(this, FUNC(lucky74_state::usart_8251_r), FUNC(lucky74_state::usart_8251_w)); /* USART 8251 port */ - map(0xf800, 0xf803).rw(this, FUNC(lucky74_state::copro_sm7831_r), FUNC(lucky74_state::copro_sm7831_w)); /* SM7831 Co-Processor */ + map(0xd000, 0xd7ff).ram().w(FUNC(lucky74_state::lucky74_fg_videoram_w)).share("fg_videoram"); // VRAM1-1 + map(0xd800, 0xdfff).ram().w(FUNC(lucky74_state::lucky74_fg_colorram_w)).share("fg_colorram"); // VRAM1-2 + map(0xe000, 0xe7ff).ram().w(FUNC(lucky74_state::lucky74_bg_videoram_w)).share("bg_videoram"); // VRAM2-1 + map(0xe800, 0xefff).ram().w(FUNC(lucky74_state::lucky74_bg_colorram_w)).share("bg_colorram"); // VRAM2-2 + map(0xf000, 0xf003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); // Input Ports 0 & 1 + map(0xf080, 0xf083).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); // DSW 1, 2 & 3 + map(0xf0c0, 0xf0c3).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write)); // DSW 4 + map(0xf100, 0xf100).w("sn1", FUNC(sn76489_device::command_w)); // SN76489 #1 + map(0xf200, 0xf203).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); // Input Ports 2 & 4 + map(0xf300, 0xf300).w("sn2", FUNC(sn76489_device::command_w)); // SN76489 #2 + map(0xf400, 0xf400).w("aysnd", FUNC(ay8910_device::address_w)); // YM2149 control + map(0xf500, 0xf500).w("sn3", FUNC(sn76489_device::command_w)); // SN76489 #3 + map(0xf600, 0xf600).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); // YM2149 (Input Port 1) + map(0xf700, 0xf701).rw(FUNC(lucky74_state::usart_8251_r), FUNC(lucky74_state::usart_8251_w)); // USART 8251 port + map(0xf800, 0xf803).rw(FUNC(lucky74_state::copro_sm7831_r), FUNC(lucky74_state::copro_sm7831_w)); // SM7831 Co-Processor } void lucky74_state::lucky74_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x05).rw(this, FUNC(lucky74_state::custom_09R81P_port_r), FUNC(lucky74_state::custom_09R81P_port_w)); /* custom 09R81P (samples system) */ + map(0x00, 0x05).rw(FUNC(lucky74_state::custom_09R81P_port_r), FUNC(lucky74_state::custom_09R81P_port_w)); /* custom 09R81P (samples system) */ map(0xff, 0xff).ram(); // presumably HS satellite control port (check patched in Lucky 74) } diff --git a/src/mame/drivers/luckybal.cpp b/src/mame/drivers/luckybal.cpp index 2869a4c45bb..3afcb1b6898 100644 --- a/src/mame/drivers/luckybal.cpp +++ b/src/mame/drivers/luckybal.cpp @@ -331,8 +331,8 @@ void luckybal_state::main_map(address_map &map) void luckybal_state::main_io(address_map &map) { map.global_mask(0xff); - map(0x90, 0x90).w(this, FUNC(luckybal_state::port90_bitswap_w)); - map(0xc0, 0xc3).rw(this, FUNC(luckybal_state::ppi_bitswap_r), FUNC(luckybal_state::ppi_bitswap_w)); + map(0x90, 0x90).w(FUNC(luckybal_state::port90_bitswap_w)); + map(0xc0, 0xc3).rw(FUNC(luckybal_state::ppi_bitswap_r), FUNC(luckybal_state::ppi_bitswap_w)); map(0xe0, 0xe3).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); } /* diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp index 907e1b08f57..1d9a8f1fe5a 100644 --- a/src/mame/drivers/lvcards.cpp +++ b/src/mame/drivers/lvcards.cpp @@ -152,19 +152,19 @@ void lvcards_state::ponttehk_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x67ff).ram().share("nvram"); - map(0x8000, 0x83ff).ram().w(this, FUNC(lvcards_state::lvcards_videoram_w)).share("videoram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(lvcards_state::lvcards_colorram_w)).share("colorram"); + map(0x8000, 0x83ff).ram().w(FUNC(lvcards_state::lvcards_videoram_w)).share("videoram"); + map(0x8400, 0x87ff).ram().w(FUNC(lvcards_state::lvcards_colorram_w)).share("colorram"); map(0xa000, 0xa000).portr("IN0"); map(0xa001, 0xa001).portr("IN1").nopw(); // lamps - map(0xa002, 0xa002).r(this, FUNC(lvcards_state::payout_r)).w(this, FUNC(lvcards_state::control_port_2a_w));//AM_WRITENOP // ??? + map(0xa002, 0xa002).r(FUNC(lvcards_state::payout_r)).w(FUNC(lvcards_state::control_port_2a_w));//AM_WRITENOP // ??? } void lvcards_state::lvcards_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x67ff).ram().share("nvram"); - map(0x9000, 0x93ff).ram().w(this, FUNC(lvcards_state::lvcards_videoram_w)).share("videoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(lvcards_state::lvcards_colorram_w)).share("colorram"); + map(0x9000, 0x93ff).ram().w(FUNC(lvcards_state::lvcards_videoram_w)).share("videoram"); + map(0x9400, 0x97ff).ram().w(FUNC(lvcards_state::lvcards_colorram_w)).share("colorram"); map(0xa000, 0xa000).portr("IN0"); map(0xa001, 0xa001).portr("IN1").nopw(); map(0xa002, 0xa002).portr("IN2").nopw(); @@ -182,11 +182,11 @@ void lvcards_state::lvpoker_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x67ff).ram().share("nvram"); - map(0x9000, 0x93ff).ram().w(this, FUNC(lvcards_state::lvcards_videoram_w)).share("videoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(lvcards_state::lvcards_colorram_w)).share("colorram"); + map(0x9000, 0x93ff).ram().w(FUNC(lvcards_state::lvcards_videoram_w)).share("videoram"); + map(0x9400, 0x97ff).ram().w(FUNC(lvcards_state::lvcards_colorram_w)).share("colorram"); map(0xa000, 0xa000).portr("IN0"); map(0xa001, 0xa001).portr("IN1").nopw(); // lamps - map(0xa002, 0xa002).r(this, FUNC(lvcards_state::payout_r)).w(this, FUNC(lvcards_state::control_port_2_w)); + map(0xa002, 0xa002).r(FUNC(lvcards_state::payout_r)).w(FUNC(lvcards_state::control_port_2_w)); map(0xc000, 0xdfff).rom(); } diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp index eb646223c70..ea997320cc9 100644 --- a/src/mame/drivers/lviv.cpp +++ b/src/mame/drivers/lviv.cpp @@ -299,7 +299,7 @@ Timings: void lviv_state::io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(lviv_state::lviv_io_r), FUNC(lviv_state::lviv_io_w)); + map(0x00, 0xff).rw(FUNC(lviv_state::lviv_io_r), FUNC(lviv_state::lviv_io_w)); } /* memory w/r functions */ diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 5f78a914cc0..794381d0667 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -292,22 +292,22 @@ void lwings_state::avengers_map(address_map &map) map(0xc000, 0xddff).ram(); map(0xde00, 0xdf7f).ram().share("spriteram"); map(0xdf80, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); + map(0xe800, 0xefff).ram().w(FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); map(0xf000, 0xf3ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xf400, 0xf7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xf800, 0xf801).w(this, FUNC(lwings_state::lwings_bg1_scrollx_w)); - map(0xf802, 0xf803).w(this, FUNC(lwings_state::lwings_bg1_scrolly_w)); - map(0xf804, 0xf804).w(this, FUNC(lwings_state::trojan_bg2_scrollx_w)); - map(0xf805, 0xf805).w(this, FUNC(lwings_state::trojan_bg2_image_w)); + map(0xf800, 0xf801).w(FUNC(lwings_state::lwings_bg1_scrollx_w)); + map(0xf802, 0xf803).w(FUNC(lwings_state::lwings_bg1_scrolly_w)); + map(0xf804, 0xf804).w(FUNC(lwings_state::trojan_bg2_scrollx_w)); + map(0xf805, 0xf805).w(FUNC(lwings_state::trojan_bg2_image_w)); map(0xf808, 0xf808).portr("SERVICE").nopw(); /* ? */ - map(0xf809, 0xf809).portr("P1").w(this, FUNC(lwings_state::avengers_protection_w)); + map(0xf809, 0xf809).portr("P1").w(FUNC(lwings_state::avengers_protection_w)); map(0xf80a, 0xf80a).portr("P2"); map(0xf80b, 0xf80b).portr("DSWB"); - map(0xf80c, 0xf80c).portr("DSWA").w(this, FUNC(lwings_state::avengers_prot_bank_w)); - map(0xf80d, 0xf80d).rw(this, FUNC(lwings_state::avengers_protection_r), FUNC(lwings_state::avengers_adpcm_w)); - map(0xf80e, 0xf80e).w(this, FUNC(lwings_state::lwings_bankswitch_w)); + map(0xf80c, 0xf80c).portr("DSWA").w(FUNC(lwings_state::avengers_prot_bank_w)); + map(0xf80d, 0xf80d).rw(FUNC(lwings_state::avengers_protection_r), FUNC(lwings_state::avengers_adpcm_w)); + map(0xf80e, 0xf80e).w(FUNC(lwings_state::lwings_bankswitch_w)); } void lwings_state::lwings_map(address_map &map) @@ -316,20 +316,20 @@ void lwings_state::lwings_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xddff).ram(); map(0xde00, 0xdfff).ram().share("spriteram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); + map(0xe800, 0xefff).ram().w(FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); map(0xf000, 0xf3ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xf400, 0xf7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf808, 0xf808).portr("SERVICE"); map(0xf809, 0xf809).portr("P1"); - map(0xf808, 0xf809).w(this, FUNC(lwings_state::lwings_bg1_scrollx_w)); + map(0xf808, 0xf809).w(FUNC(lwings_state::lwings_bg1_scrollx_w)); map(0xf80a, 0xf80a).portr("P2"); map(0xf80b, 0xf80b).portr("DSWA"); - map(0xf80a, 0xf80b).w(this, FUNC(lwings_state::lwings_bg1_scrolly_w)); + map(0xf80a, 0xf80b).w(FUNC(lwings_state::lwings_bg1_scrolly_w)); map(0xf80c, 0xf80c).portr("DSWB").w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf80d, 0xf80d).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xf80e, 0xf80e).w(this, FUNC(lwings_state::lwings_bankswitch_w)); + map(0xf80e, 0xf80e).w(FUNC(lwings_state::lwings_bankswitch_w)); } void lwings_state::trojan_map(address_map &map) @@ -339,22 +339,22 @@ void lwings_state::trojan_map(address_map &map) map(0xc000, 0xddff).ram(); map(0xde00, 0xdf7f).ram().share("spriteram"); map(0xdf80, 0xdfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); + map(0xe800, 0xefff).ram().w(FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); map(0xf000, 0xf3ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xf400, 0xf7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xf800, 0xf801).w(this, FUNC(lwings_state::lwings_bg1_scrollx_w)); - map(0xf802, 0xf803).w(this, FUNC(lwings_state::lwings_bg1_scrolly_w)); - map(0xf804, 0xf804).w(this, FUNC(lwings_state::trojan_bg2_scrollx_w)); - map(0xf805, 0xf805).w(this, FUNC(lwings_state::trojan_bg2_image_w)); + map(0xf800, 0xf801).w(FUNC(lwings_state::lwings_bg1_scrollx_w)); + map(0xf802, 0xf803).w(FUNC(lwings_state::lwings_bg1_scrolly_w)); + map(0xf804, 0xf804).w(FUNC(lwings_state::trojan_bg2_scrollx_w)); + map(0xf805, 0xf805).w(FUNC(lwings_state::trojan_bg2_image_w)); map(0xf808, 0xf808).portr("SERVICE").nopw(); //watchdog map(0xf809, 0xf809).portr("P1"); map(0xf80a, 0xf80a).portr("P2"); map(0xf80b, 0xf80b).portr("DSWA"); map(0xf80c, 0xf80c).portr("DSWB").w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf80d, 0xf80d).w("soundlatch2", FUNC(generic_latch_8_device::write)); - map(0xf80e, 0xf80e).w(this, FUNC(lwings_state::lwings_bankswitch_w)); + map(0xf80e, 0xf80e).w(FUNC(lwings_state::lwings_bankswitch_w)); } void lwings_state::lwings_sound_map(address_map &map) @@ -364,7 +364,7 @@ void lwings_state::lwings_sound_map(address_map &map) map(0xc800, 0xc800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xe000, 0xe001).w("2203a", FUNC(ym2203_device::write)); map(0xe002, 0xe003).w("2203b", FUNC(ym2203_device::write)); - map(0xe006, 0xe006).r(this, FUNC(lwings_state::avengers_soundlatch2_r)); //AT: (avengers061gre) + map(0xe006, 0xe006).r(FUNC(lwings_state::avengers_soundlatch2_r)); //AT: (avengers061gre) map(0xe006, 0xe006).writeonly().share("soundlatch_2"); } @@ -376,22 +376,22 @@ void lwings_state::fball_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xddff).ram(); map(0xde00, 0xdfff).ram().share("spriteram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(lwings_state::lwings_fgvideoram_w)).share("fgvideoram"); + map(0xe800, 0xefff).ram().w(FUNC(lwings_state::lwings_bg1videoram_w)).share("bg1videoram"); map(0xf000, 0xf3ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xf400, 0xf7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf808, 0xf808).portr("SERVICE"); map(0xf809, 0xf809).portr("P1"); - map(0xf808, 0xf809).w(this, FUNC(lwings_state::lwings_bg1_scrollx_w)); + map(0xf808, 0xf809).w(FUNC(lwings_state::lwings_bg1_scrollx_w)); map(0xf80a, 0xf80a).portr("P2"); map(0xf80b, 0xf80b).portr("DSWA"); - map(0xf80a, 0xf80b).w(this, FUNC(lwings_state::lwings_bg1_scrolly_w)); + map(0xf80a, 0xf80b).w(FUNC(lwings_state::lwings_bg1_scrolly_w)); map(0xf80c, 0xf80c).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf80d, 0xf80d).portr("P3").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xf80e, 0xf80e).portr("P4"); - map(0xf80e, 0xf80e).w(this, FUNC(lwings_state::lwings_bankswitch_w)); + map(0xf80e, 0xf80e).w(FUNC(lwings_state::lwings_bankswitch_w)); } @@ -416,7 +416,7 @@ void lwings_state::fball_sound_map(address_map &map) map(0x8000, 0x8000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xA000, 0xA000).w(this, FUNC(lwings_state::fball_oki_bank_w)); + map(0xA000, 0xA000).w(FUNC(lwings_state::fball_oki_bank_w)); map(0xc000, 0xc7ff).ram(); @@ -432,15 +432,15 @@ void lwings_state::trojan_adpcm_map(address_map &map) void lwings_state::avengers_adpcm_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(lwings_state::avengers_adpcm_r)); - map(0x01, 0x01).w(this, FUNC(lwings_state::msm5205_w)); + map(0x00, 0x00).r(FUNC(lwings_state::avengers_adpcm_r)); + map(0x01, 0x01).w(FUNC(lwings_state::msm5205_w)); } void lwings_state::trojan_adpcm_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch2", FUNC(generic_latch_8_device::read)); - map(0x01, 0x01).w(this, FUNC(lwings_state::msm5205_w)); + map(0x01, 0x01).w(FUNC(lwings_state::msm5205_w)); } /************************************* diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp index b8b83300c83..fec58d24a76 100644 --- a/src/mame/drivers/lwriter.cpp +++ b/src/mame/drivers/lwriter.cpp @@ -204,12 +204,12 @@ as well as PA0 (ST1), PA2 (ST2) and PA3 (ADB /INT) void lwriter_state::maincpu_map(address_map &map) { map.unmap_value_high(); - map(0x000000, 0x1fffff).rw(this, FUNC(lwriter_state::bankedarea_r), FUNC(lwriter_state::bankedarea_w)); + map(0x000000, 0x1fffff).rw(FUNC(lwriter_state::bankedarea_r), FUNC(lwriter_state::bankedarea_w)); map(0x200000, 0x2fffff).rom().region("rom", 0); // 1MB ROM //AM_RANGE(0x300000, 0x3fffff) // open bus? map(0x400000, 0x5fffff).ram().region("dram", 0).mirror(0x200000); // 2MB DRAM - map(0x800000, 0x800000).w(this, FUNC(lwriter_state::led_out_w)).mirror(0x1ffffe); // mirror is a guess given that the pals can only decode A18-A23 - map(0x800001, 0x800001).w(this, FUNC(lwriter_state::fifo_out_w)).mirror(0x1ffffe); // mirror is a guess given that the pals can only decode A18-A23 + map(0x800000, 0x800000).w(FUNC(lwriter_state::led_out_w)).mirror(0x1ffffe); // mirror is a guess given that the pals can only decode A18-A23 + map(0x800001, 0x800001).w(FUNC(lwriter_state::fifo_out_w)).mirror(0x1ffffe); // mirror is a guess given that the pals can only decode A18-A23 map(0xc00001, 0xc00001).w(m_scc, FUNC(scc8530_device::ca_w)).mirror(0x1ffff8); map(0xc00005, 0xc00005).w(m_scc, FUNC(scc8530_device::da_w)).mirror(0x1ffff8); map(0xa00000, 0xa00000).r(m_scc, FUNC(scc8530_device::ca_r)).mirror(0x1ffff8); diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp index 7daf9ee4253..592b3b50e3f 100644 --- a/src/mame/drivers/lynx.cpp +++ b/src/mame/drivers/lynx.cpp @@ -25,7 +25,7 @@ void lynx_state::lynx_mem(address_map &map) map(0xfd00, 0xfdff).ram().share("mem_fd00"); map(0xfe00, 0xfff7).bankr("bank3").writeonly().share("mem_fe00"); map(0xfff8, 0xfff8).ram(); - map(0xfff9, 0xfff9).rw(this, FUNC(lynx_state::lynx_memory_config_r), FUNC(lynx_state::lynx_memory_config_w)); + map(0xfff9, 0xfff9).rw(FUNC(lynx_state::lynx_memory_config_r), FUNC(lynx_state::lynx_memory_config_w)); map(0xfffa, 0xffff).bankr("bank4").writeonly().share("mem_fffa"); } diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp index 933c2599b65..73c0d6c38a9 100644 --- a/src/mame/drivers/m10.cpp +++ b/src/mame/drivers/m10.cpp @@ -530,13 +530,13 @@ void m10_state::m10_main(address_map &map) map(0x0000, 0x02ff).ram().share("memory"); /* scratch ram */ map(0x1000, 0x2fff).rom().share("rom"); map(0x4000, 0x43ff).ram().share("videoram"); - map(0x4800, 0x4bff).ram().w(this, FUNC(m10_state::m10_colorram_w)).share("colorram"); /* foreground colour */ - map(0x5000, 0x53ff).ram().w(this, FUNC(m10_state::m10_chargen_w)).share("chargen"); /* background ????? */ + map(0x4800, 0x4bff).ram().w(FUNC(m10_state::m10_colorram_w)).share("colorram"); /* foreground colour */ + map(0x5000, 0x53ff).ram().w(FUNC(m10_state::m10_chargen_w)).share("chargen"); /* background ????? */ map(0xa200, 0xa200).portr("DSW"); map(0xa300, 0xa300).portr("INPUTS"); - map(0xa400, 0xa400).w(this, FUNC(m10_state::m10_ctrl_w)); /* line at bottom of screen?, sound, flip screen */ - map(0xa500, 0xa500).w(this, FUNC(m10_state::m10_a500_w)); /* ??? */ - map(0xa700, 0xa700).r(this, FUNC(m10_state::m10_a700_r)); + map(0xa400, 0xa400).w(FUNC(m10_state::m10_ctrl_w)); /* line at bottom of screen?, sound, flip screen */ + map(0xa500, 0xa500).w(FUNC(m10_state::m10_a500_w)); /* ??? */ + map(0xa700, 0xa700).r(FUNC(m10_state::m10_a700_r)); map(0xfc00, 0xffff).rom(); /* for the reset / interrupt vectors */ } @@ -545,13 +545,13 @@ void m10_state::m11_main(address_map &map) map(0x0000, 0x02ff).ram().share("memory"); /* scratch ram */ map(0x1000, 0x2fff).rom().share("rom"); map(0x4000, 0x43ff).ram().share("videoram"); - map(0x4800, 0x4bff).ram().w(this, FUNC(m10_state::m10_colorram_w)).share("colorram"); /* foreground colour */ + map(0x4800, 0x4bff).ram().w(FUNC(m10_state::m10_colorram_w)).share("colorram"); /* foreground colour */ map(0x5000, 0x53ff).ram().share("chargen"); /* background ????? */ - map(0xa100, 0xa100).w(this, FUNC(m10_state::m11_a100_w)); /* sound writes ???? */ + map(0xa100, 0xa100).w(FUNC(m10_state::m11_a100_w)); /* sound writes ???? */ map(0xa200, 0xa200).portr("DSW"); map(0xa300, 0xa300).portr("INPUTS"); - map(0xa400, 0xa400).w(this, FUNC(m10_state::m11_ctrl_w)); /* line at bottom of screen?, sound, flip screen */ - map(0xa700, 0xa700).r(this, FUNC(m10_state::m11_a700_r)); + map(0xa400, 0xa400).w(FUNC(m10_state::m11_ctrl_w)); /* line at bottom of screen?, sound, flip screen */ + map(0xa700, 0xa700).r(FUNC(m10_state::m11_a700_r)); map(0xfc00, 0xffff).rom(); /* for the reset / interrupt vectors */ } @@ -560,13 +560,13 @@ void m10_state::m15_main(address_map &map) map(0x0000, 0x02ff).ram().share("memory"); /* scratch ram */ map(0x1000, 0x33ff).rom().share("rom"); map(0x4000, 0x43ff).ram().share("videoram"); - map(0x4800, 0x4bff).ram().w(this, FUNC(m10_state::m10_colorram_w)).share("colorram"); /* foreground colour */ - map(0x5000, 0x57ff).ram().w(this, FUNC(m10_state::m15_chargen_w)).share("chargen"); /* background ????? */ + map(0x4800, 0x4bff).ram().w(FUNC(m10_state::m10_colorram_w)).share("colorram"); /* foreground colour */ + map(0x5000, 0x57ff).ram().w(FUNC(m10_state::m15_chargen_w)).share("chargen"); /* background ????? */ map(0xa000, 0xa000).portr("P2"); - map(0xa100, 0xa100).w(this, FUNC(m10_state::m15_a100_w)); /* sound writes ???? */ + map(0xa100, 0xa100).w(FUNC(m10_state::m15_a100_w)); /* sound writes ???? */ map(0xa200, 0xa200).portr("DSW"); map(0xa300, 0xa300).portr("P1"); - map(0xa400, 0xa400).w(this, FUNC(m10_state::m15_ctrl_w)); /* sound, flip screen */ + map(0xa400, 0xa400).w(FUNC(m10_state::m15_ctrl_w)); /* sound, flip screen */ map(0xfc00, 0xffff).rom(); /* for the reset / interrupt vectors */ } diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp index 81d64447175..f525567a51b 100644 --- a/src/mame/drivers/m107.cpp +++ b/src/mame/drivers/m107.cpp @@ -100,7 +100,7 @@ void m107_state::main_map(address_map &map) { map(0x00000, 0x9ffff).rom(); map(0xa0000, 0xbffff).bankr("bank1"); - map(0xd0000, 0xdffff).ram().w(this, FUNC(m107_state::vram_w)).share("vram_data"); + map(0xd0000, 0xdffff).ram().w(FUNC(m107_state::vram_w)).share("vram_data"); map(0xe0000, 0xeffff).ram(); /* System ram */ map(0xf8000, 0xf8fff).ram().share("spriteram"); map(0xf9000, 0xf9fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -115,20 +115,20 @@ void m107_state::main_portmap(address_map &map) map(0x06, 0x07).portr("P3_P4"); map(0x08, 0x08).r("soundlatch2", FUNC(generic_latch_8_device::read)); // answer from sound CPU map(0x00, 0x00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(m107_state::coincounter_w)); + map(0x02, 0x02).w(FUNC(m107_state::coincounter_w)); map(0x04, 0x05).nopw(); /* ??? 0008 */ map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x9f).w(this, FUNC(m107_state::control_w)); + map(0x80, 0x9f).w(FUNC(m107_state::control_w)); map(0xa0, 0xaf).nopw(); /* Written with 0's in interrupt */ - map(0xb0, 0xb1).w(this, FUNC(m107_state::spritebuffer_w)); + map(0xb0, 0xb1).w(FUNC(m107_state::spritebuffer_w)); map(0xc0, 0xc3).nopr(); /* Only wpksoc: ticket related? */ - map(0xc0, 0xc1).w(this, FUNC(m107_state::sound_reset_w)); + map(0xc0, 0xc1).w(FUNC(m107_state::sound_reset_w)); } void m107_state::dsoccr94_io_map(address_map &map) { main_portmap(map); - map(0x06, 0x06).w(this, FUNC(m107_state::bankswitch_w)); + map(0x06, 0x06).w(FUNC(m107_state::bankswitch_w)); } /* same as M107 but with an extra i/o board */ @@ -153,7 +153,7 @@ void m107_state::wpksoc_map(address_map &map) void m107_state::wpksoc_io_map(address_map &map) { main_portmap(map); - map(0x22, 0x23).w(this, FUNC(m107_state::wpksoc_output_w)); + map(0x22, 0x23).w(FUNC(m107_state::wpksoc_output_w)); map(0xc0, 0xc1).portr("WPK_IN0"); map(0xc2, 0xc3).portr("WPK_IN1"); } diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp index 28f17866fd6..b793822ed77 100644 --- a/src/mame/drivers/m14.cpp +++ b/src/mame/drivers/m14.cpp @@ -304,18 +304,18 @@ void m14_state::m14_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0xe000, 0xe3ff).ram().w(this, FUNC(m14_state::m14_vram_w)).share("video_ram"); - map(0xe400, 0xe7ff).ram().w(this, FUNC(m14_state::m14_cram_w)).share("color_ram"); + map(0xe000, 0xe3ff).ram().w(FUNC(m14_state::m14_vram_w)).share("video_ram"); + map(0xe400, 0xe7ff).ram().w(FUNC(m14_state::m14_cram_w)).share("color_ram"); } void m14_state::m14_io_map(address_map &map) { map.global_mask(0xff); - map(0xf8, 0xf8).portr("AN_PADDLE").w(this, FUNC(m14_state::ball_x_w)); - map(0xf9, 0xf9).portr("IN0").w(this, FUNC(m14_state::ball_y_w)); - map(0xfa, 0xfa).r(this, FUNC(m14_state::m14_rng_r)).w(this, FUNC(m14_state::paddle_x_w)); - map(0xfb, 0xfb).portr("DSW").w(this, FUNC(m14_state::output_w)); - map(0xfc, 0xfc).w(this, FUNC(m14_state::sound_w)); + map(0xf8, 0xf8).portr("AN_PADDLE").w(FUNC(m14_state::ball_x_w)); + map(0xf9, 0xf9).portr("IN0").w(FUNC(m14_state::ball_y_w)); + map(0xfa, 0xfa).r(FUNC(m14_state::m14_rng_r)).w(FUNC(m14_state::paddle_x_w)); + map(0xfb, 0xfb).portr("DSW").w(FUNC(m14_state::output_w)); + map(0xfc, 0xfc).w(FUNC(m14_state::sound_w)); } /************************************* diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp index 479496c63dc..bfaca683566 100644 --- a/src/mame/drivers/m20.cpp +++ b/src/mame/drivers/m20.cpp @@ -707,7 +707,7 @@ void m20_state::m20_io(address_map &map) map(0x00, 0x07).rw(m_fd1797, FUNC(fd1797_device::read), FUNC(fd1797_device::write)).umask16(0x00ff); - map(0x20, 0x21).rw(this, FUNC(m20_state::port21_r), FUNC(m20_state::port21_w)); + map(0x20, 0x21).rw(FUNC(m20_state::port21_r), FUNC(m20_state::port21_w)); map(0x61, 0x61).w("crtc", FUNC(mc6845_device::address_w)); map(0x62, 0x62).w("crtc", FUNC(mc6845_device::address_w)); // FIXME @@ -724,7 +724,7 @@ void m20_state::m20_io(address_map &map) map(0x120, 0x127).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); - map(0x140, 0x143).rw(this, FUNC(m20_state::m20_i8259_r), FUNC(m20_state::m20_i8259_w)); + map(0x140, 0x143).rw(FUNC(m20_state::m20_i8259_r), FUNC(m20_state::m20_i8259_w)); map(0x3ffa, 0x3ffd).w(m_apb, FUNC(m20_8086_device::handshake_w)); } diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp index 20e5dae146f..2eb1e9659f1 100644 --- a/src/mame/drivers/m24.cpp +++ b/src/mame/drivers/m24.cpp @@ -185,7 +185,7 @@ void m24_state::m24_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); - map(0x0060, 0x0065).rw(this, FUNC(m24_state::keyboard_r), FUNC(m24_state::keyboard_w)); + map(0x0060, 0x0065).rw(FUNC(m24_state::keyboard_r), FUNC(m24_state::keyboard_w)); map(0x0066, 0x0067).portr("DSW0"); map(0x0070, 0x007f).rw("mm58174an", FUNC(mm58274c_device::read), FUNC(mm58274c_device::write)); map(0x80c1, 0x80c1).rw(m_z8000_apb, FUNC(m24_z8000_device::handshake_r), FUNC(m24_z8000_device::handshake_w)); @@ -193,8 +193,8 @@ void m24_state::m24_io(address_map &map) void m24_state::kbc_map(address_map &map) { - map(0x8000, 0x8fff).r(this, FUNC(m24_state::kbcdata_r)); - map(0xa000, 0xafff).w(this, FUNC(m24_state::kbcdata_w)); + map(0x8000, 0x8fff).r(FUNC(m24_state::kbcdata_r)); + map(0xa000, 0xafff).w(FUNC(m24_state::kbcdata_w)); map(0xf800, 0xffff).rom().region("kbc", 0); } diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 2d17ebc680d..92ad055d7c1 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -719,10 +719,10 @@ void m5_state::m5_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x03).mirror(0x0c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x10, 0x10).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x11, 0x11).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); - map(0x30, 0x30).mirror(0x08).portr("Y0").w(this, FUNC(m5_state::mem64KBF_w)); // 64KBF paging + map(0x10, 0x10).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x11, 0x11).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x30, 0x30).mirror(0x08).portr("Y0").w(FUNC(m5_state::mem64KBF_w)); // 64KBF paging map(0x31, 0x31).mirror(0x08).portr("Y1"); map(0x32, 0x32).mirror(0x08).portr("Y2"); map(0x33, 0x33).mirror(0x08).portr("Y3"); @@ -730,12 +730,12 @@ void m5_state::m5_io(address_map &map) map(0x35, 0x35).mirror(0x08).portr("Y5"); map(0x36, 0x36).mirror(0x08).portr("Y6"); map(0x37, 0x37).mirror(0x08).portr("JOY"); - map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x50, 0x50).mirror(0x0f).rw(this, FUNC(m5_state::sts_r), FUNC(m5_state::com_w)); + map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x50, 0x50).mirror(0x0f).rw(FUNC(m5_state::sts_r), FUNC(m5_state::com_w)); // AM_RANGE(0x60, 0x63) SIO - map(0x6c, 0x6c).rw(this, FUNC(m5_state::mem64KBI_r), FUNC(m5_state::mem64KBI_w)); //EM-64/64KBI paging + map(0x6c, 0x6c).rw(FUNC(m5_state::mem64KBI_r), FUNC(m5_state::mem64KBI_w)); //EM-64/64KBI paging map(0x70, 0x73) /*.mirror(0x0c) don't know if necessary mirror this*/ .rw(I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x7f, 0x7f).w(this, FUNC(m5_state::mem64KRX_w)); //64KRD/64KRX paging + map(0x7f, 0x7f).w(FUNC(m5_state::mem64KRX_w)); //64KRD/64KRX paging } @@ -758,11 +758,11 @@ void m5_state::fd5_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).m(m_fdc, FUNC(upd765a_device::map)); - map(0x10, 0x10).rw(this, FUNC(m5_state::fd5_data_r), FUNC(m5_state::fd5_data_w)); - map(0x20, 0x20).w(this, FUNC(m5_state::fd5_com_w)); - map(0x30, 0x30).r(this, FUNC(m5_state::fd5_com_r)); - map(0x40, 0x40).w(this, FUNC(m5_state::fd5_ctrl_w)); - map(0x50, 0x50).w(this, FUNC(m5_state::fd5_tc_w)); + map(0x10, 0x10).rw(FUNC(m5_state::fd5_data_r), FUNC(m5_state::fd5_data_w)); + map(0x20, 0x20).w(FUNC(m5_state::fd5_com_w)); + map(0x30, 0x30).r(FUNC(m5_state::fd5_com_r)); + map(0x40, 0x40).w(FUNC(m5_state::fd5_ctrl_w)); + map(0x50, 0x50).w(FUNC(m5_state::fd5_tc_w)); } @@ -1041,9 +1041,9 @@ void brno_state::brno_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x03).mirror(0x0c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x10, 0x10).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x11, 0x11).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); + map(0x10, 0x10).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x11, 0x11).mirror(0x0e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0x20, 0x20).mirror(0x0f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); map(0x30, 0x30).portr("Y0"); map(0x31, 0x31).portr("Y1"); map(0x32, 0x32).portr("Y2"); @@ -1052,15 +1052,15 @@ void brno_state::brno_io(address_map &map) map(0x35, 0x35).portr("Y5"); map(0x36, 0x36).portr("Y6"); map(0x37, 0x37).portr("JOY"); - map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x50, 0x50).mirror(0x0f).rw(this, FUNC(brno_state::sts_r), FUNC(brno_state::com_w)); + map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x50, 0x50).mirror(0x0f).rw(FUNC(brno_state::sts_r), FUNC(brno_state::com_w)); // AM_RANGE(0x60, 0x63) // SIO - map(0x64, 0x67).rw(this, FUNC(brno_state::mmu_r), FUNC(brno_state::mmu_w)); // MMU - page select (ramdisk memory paging) - map(0x68, 0x6b).rw(this, FUNC(brno_state::ramsel_r), FUNC(brno_state::ramsel_w)); // CASEN 0=access to ramdisk enabled, 0xff=ramdisk access disabled(data protection), &80=ROM2+48k RAM, &81=ROM2+4k RAM - map(0x6c, 0x6f).rw(this, FUNC(brno_state::romsel_r), FUNC(brno_state::romsel_w)); // RAMEN 0=rom enable; 0xff=rom+sord ram disabled (ramdisk visible) + map(0x64, 0x67).rw(FUNC(brno_state::mmu_r), FUNC(brno_state::mmu_w)); // MMU - page select (ramdisk memory paging) + map(0x68, 0x6b).rw(FUNC(brno_state::ramsel_r), FUNC(brno_state::ramsel_w)); // CASEN 0=access to ramdisk enabled, 0xff=ramdisk access disabled(data protection), &80=ROM2+48k RAM, &81=ROM2+4k RAM + map(0x6c, 0x6f).rw(FUNC(brno_state::romsel_r), FUNC(brno_state::romsel_w)); // RAMEN 0=rom enable; 0xff=rom+sord ram disabled (ramdisk visible) // AM_RANGE(0x70, 0x73) AM_MIRROR(0x04) AM_DEVREADWRITE(I8255A_TAG, i8255_device, read, write) // PIO - map(0x78, 0x7b).rw(m_fdc, FUNC(wd_fdc_device_base::read), FUNC(wd_fdc_device_base::write)); // WD2797 registers -> 78 - status/cmd, 79 - track #, 7a - sector #, 7b - data - map(0x7c, 0x7c).rw(this, FUNC(brno_state::fd_r), FUNC(brno_state::fd_w)); // drive select + map(0x78, 0x7b).rw(m_fdc, FUNC(wd_fdc_device_base::read), FUNC(wd_fdc_device_base::write)); // WD2797 registers -> 78 - status/cmd, 79 - track #, 7a - sector #, 7b - data + map(0x7c, 0x7c).rw(FUNC(brno_state::fd_r), FUNC(brno_state::fd_w)); // drive select } diff --git a/src/mame/drivers/m52.cpp b/src/mame/drivers/m52.cpp index d52ff7a61f1..d48079b913b 100644 --- a/src/mame/drivers/m52.cpp +++ b/src/mame/drivers/m52.cpp @@ -63,12 +63,12 @@ void m52_state::main_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(m52_state::m52_videoram_w)).share("videoram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(m52_state::m52_colorram_w)).share("colorram"); - map(0x8800, 0x8800).mirror(0x07ff).r(this, FUNC(m52_state::m52_protection_r)); + map(0x8000, 0x83ff).ram().w(FUNC(m52_state::m52_videoram_w)).share("videoram"); + map(0x8400, 0x87ff).ram().w(FUNC(m52_state::m52_colorram_w)).share("colorram"); + map(0x8800, 0x8800).mirror(0x07ff).r(FUNC(m52_state::m52_protection_r)); map(0xc800, 0xcbff).mirror(0x0400).writeonly().share("spriteram"); map(0xd000, 0xd000).mirror(0x07fc).w("irem_audio", FUNC(irem_audio_device::cmd_w)); - map(0xd001, 0xd001).mirror(0x07fc).w(this, FUNC(m52_state::m52_flipscreen_w)); /* + coin counters */ + map(0xd001, 0xd001).mirror(0x07fc).w(FUNC(m52_state::m52_flipscreen_w)); /* + coin counters */ map(0xd000, 0xd000).mirror(0x07f8).portr("IN0"); map(0xd001, 0xd001).mirror(0x07f8).portr("IN1"); map(0xd002, 0xd002).mirror(0x07f8).portr("IN2"); @@ -81,12 +81,12 @@ void m52_state::main_map(address_map &map) void m52_state::alpha1v_map(address_map &map) { map(0x0000, 0x6fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(m52_state::m52_videoram_w)).share("videoram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(m52_state::m52_colorram_w)).share("colorram"); - map(0x8800, 0x8800).mirror(0x07ff).r(this, FUNC(m52_state::m52_protection_r)); // result is ignored + map(0x8000, 0x83ff).ram().w(FUNC(m52_state::m52_videoram_w)).share("videoram"); + map(0x8400, 0x87ff).ram().w(FUNC(m52_state::m52_colorram_w)).share("colorram"); + map(0x8800, 0x8800).mirror(0x07ff).r(FUNC(m52_state::m52_protection_r)); // result is ignored map(0xc800, 0xc9ff).writeonly().share("spriteram"); // bigger or mirrored? map(0xd000, 0xd000).portr("IN0").w("irem_audio", FUNC(irem_audio_device::cmd_w)); - map(0xd001, 0xd001).portr("IN1").w(this, FUNC(m52_state::alpha1v_flipscreen_w)); + map(0xd001, 0xd001).portr("IN1").w(FUNC(m52_state::alpha1v_flipscreen_w)); map(0xd002, 0xd002).portr("IN2"); map(0xd003, 0xd003).portr("DSW1"); map(0xd004, 0xd004).portr("DSW2"); @@ -97,12 +97,12 @@ void m52_state::alpha1v_map(address_map &map) void m52_state::main_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).mirror(0x1f).w(this, FUNC(m52_state::m52_scroll_w)); - map(0x40, 0x40).mirror(0x1f).w(this, FUNC(m52_state::m52_bg1xpos_w)); - map(0x60, 0x60).mirror(0x1f).w(this, FUNC(m52_state::m52_bg1ypos_w)); - map(0x80, 0x80).mirror(0x1f).w(this, FUNC(m52_state::m52_bg2xpos_w)); - map(0xa0, 0xa0).mirror(0x1f).w(this, FUNC(m52_state::m52_bg2ypos_w)); - map(0xc0, 0xc0).mirror(0x1f).w(this, FUNC(m52_state::m52_bgcontrol_w)); + map(0x00, 0x00).mirror(0x1f).w(FUNC(m52_state::m52_scroll_w)); + map(0x40, 0x40).mirror(0x1f).w(FUNC(m52_state::m52_bg1xpos_w)); + map(0x60, 0x60).mirror(0x1f).w(FUNC(m52_state::m52_bg1ypos_w)); + map(0x80, 0x80).mirror(0x1f).w(FUNC(m52_state::m52_bg2xpos_w)); + map(0xa0, 0xa0).mirror(0x1f).w(FUNC(m52_state::m52_bg2ypos_w)); + map(0xc0, 0xc0).mirror(0x1f).w(FUNC(m52_state::m52_bgcontrol_w)); } diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp index 8bf296803b9..c841efe11bd 100644 --- a/src/mame/drivers/m57.cpp +++ b/src/mame/drivers/m57.cpp @@ -72,11 +72,11 @@ void m57_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(this, FUNC(m57_state::m57_videoram_w)).share("videoram"); + map(0x8000, 0x87ff).ram().w(FUNC(m57_state::m57_videoram_w)).share("videoram"); map(0x9000, 0x91ff).ram().share("scrollram"); map(0xc820, 0xc8ff).writeonly().share("spriteram"); map(0xd000, 0xd000).w("irem_audio", FUNC(irem_audio_device::cmd_w)); - map(0xd001, 0xd001).w(this, FUNC(m57_state::m57_flipscreen_w)); /* + coin counters */ + map(0xd001, 0xd001).w(FUNC(m57_state::m57_flipscreen_w)); /* + coin counters */ map(0xd000, 0xd000).portr("IN0"); map(0xd001, 0xd001).portr("IN1"); map(0xd002, 0xd002).portr("IN2"); diff --git a/src/mame/drivers/m58.cpp b/src/mame/drivers/m58.cpp index c02a78ac596..9fbe9d9df3a 100644 --- a/src/mame/drivers/m58.cpp +++ b/src/mame/drivers/m58.cpp @@ -30,15 +30,15 @@ void m58_state::yard_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0x8000, 0x8fff).ram().w(this, FUNC(m58_state::videoram_w)).share("videoram"); - map(0x9000, 0x9fff).w(this, FUNC(m58_state::scroll_panel_w)); + map(0x8000, 0x8fff).ram().w(FUNC(m58_state::videoram_w)).share("videoram"); + map(0x9000, 0x9fff).w(FUNC(m58_state::scroll_panel_w)); map(0xc820, 0xc87f).ram().share("spriteram"); map(0xa000, 0xa000).ram().share("scroll_x_low"); map(0xa200, 0xa200).ram().share("scroll_x_high"); map(0xa400, 0xa400).ram().share("scroll_y_low"); map(0xa800, 0xa800).ram().share("score_disable"); map(0xd000, 0xd000).w("irem_audio", FUNC(irem_audio_device::cmd_w)); - map(0xd001, 0xd001).w(this, FUNC(m58_state::flipscreen_w)); /* + coin counters */ + map(0xd001, 0xd001).w(FUNC(m58_state::flipscreen_w)); /* + coin counters */ map(0xd000, 0xd000).portr("IN0"); map(0xd001, 0xd001).portr("IN1"); map(0xd002, 0xd002).portr("IN2"); diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp index 0c207e09c98..c941a272088 100644 --- a/src/mame/drivers/m62.cpp +++ b/src/mame/drivers/m62.cpp @@ -176,12 +176,12 @@ WRITE8_MEMBER(m62_state::youjyudn_bankswitch_w) void m62_state::kungfum_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xa000, 0xa000).w(this, FUNC(m62_state::m62_hscroll_low_w)); - map(0xb000, 0xb000).w(this, FUNC(m62_state::m62_hscroll_high_w)); + map(0xa000, 0xa000).w(FUNC(m62_state::m62_hscroll_low_w)); + map(0xb000, 0xb000).w(FUNC(m62_state::m62_hscroll_high_w)); map(0xc000, 0xc0ff).writeonly().share("spriteram"); /* 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. */ - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::kungfum_tileram_w)).share("m62_tileram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::kungfum_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } @@ -189,7 +189,7 @@ void m62_state::kungfum_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(this, FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); @@ -200,8 +200,8 @@ void m62_state::battroad_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0xa000, 0xbfff).bankr("bank1"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(m62_state::m62_textram_w)).share("m62_textram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xc800, 0xcfff).ram().w(FUNC(m62_state::m62_textram_w)).share("m62_textram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } @@ -209,21 +209,21 @@ void m62_state::battroad_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(this, FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x80, 0x80).w(this, FUNC(m62_state::m62_vscroll_low_w)); - map(0x81, 0x81).w(this, FUNC(m62_state::m62_hscroll_high_w)); - map(0x82, 0x82).w(this, FUNC(m62_state::m62_hscroll_low_w)); - map(0x83, 0x83).w(this, FUNC(m62_state::battroad_bankswitch_w)); + map(0x80, 0x80).w(FUNC(m62_state::m62_vscroll_low_w)); + map(0x81, 0x81).w(FUNC(m62_state::m62_hscroll_high_w)); + map(0x82, 0x82).w(FUNC(m62_state::m62_hscroll_low_w)); + map(0x83, 0x83).w(FUNC(m62_state::battroad_bankswitch_w)); } void m62_state::ldrun_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } @@ -232,7 +232,7 @@ void m62_state::ldrun2_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } @@ -240,35 +240,35 @@ void m62_state::ldrun2_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(this, FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x80, 0x80).r(this, FUNC(m62_state::ldrun2_bankswitch_r)); - map(0x80, 0x81).w(this, FUNC(m62_state::ldrun2_bankswitch_w)); + map(0x80, 0x80).r(FUNC(m62_state::ldrun2_bankswitch_r)); + map(0x80, 0x81).w(FUNC(m62_state::ldrun2_bankswitch_w)); } void m62_state::ldrun3_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc800, 0xc800).r(this, FUNC(m62_state::ldrun3_prot_5_r)); - map(0xcc00, 0xcc00).r(this, FUNC(m62_state::ldrun3_prot_7_r)); - map(0xcfff, 0xcfff).r(this, FUNC(m62_state::ldrun3_prot_7_r)); + map(0xc800, 0xc800).r(FUNC(m62_state::ldrun3_prot_5_r)); + map(0xcc00, 0xcc00).r(FUNC(m62_state::ldrun3_prot_7_r)); + map(0xcfff, 0xcfff).r(FUNC(m62_state::ldrun3_prot_7_r)); map(0xc000, 0xc0ff).writeonly().share("spriteram"); map(0xd000, 0xefff).ram(); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); } void m62_state::ldrun3_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(this, FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x80, 0x80).w(this, FUNC(m62_state::m62_vscroll_low_w)); - map(0x81, 0x81).w(this, FUNC(m62_state::ldrun3_topbottom_mask_w)); + map(0x80, 0x80).w(FUNC(m62_state::m62_vscroll_low_w)); + map(0x81, 0x81).w(FUNC(m62_state::ldrun3_topbottom_mask_w)); } void m62_state::ldrun4_map(address_map &map) @@ -276,8 +276,8 @@ void m62_state::ldrun4_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xc800, 0xc800).w(this, FUNC(m62_state::ldrun4_bankswitch_w)); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xc800, 0xc800).w(FUNC(m62_state::ldrun4_bankswitch_w)); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } @@ -285,20 +285,20 @@ void m62_state::ldrun4_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(this, FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x82, 0x82).w(this, FUNC(m62_state::m62_hscroll_high_w)); - map(0x83, 0x83).w(this, FUNC(m62_state::m62_hscroll_low_w)); + map(0x82, 0x82).w(FUNC(m62_state::m62_hscroll_high_w)); + map(0x83, 0x83).w(FUNC(m62_state::m62_hscroll_low_w)); } void m62_state::lotlot_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xa000, 0xafff).ram().w(this, FUNC(m62_state::m62_textram_w)).share("m62_textram"); + map(0xa000, 0xafff).ram().w(FUNC(m62_state::m62_textram_w)).share("m62_textram"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } @@ -306,9 +306,9 @@ void m62_state::kidniki_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); - map(0xa000, 0xafff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xa000, 0xafff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_textram_w)).share("m62_textram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_textram_w)).share("m62_textram"); map(0xe000, 0xefff).ram(); } @@ -316,31 +316,31 @@ void m62_state::kidniki_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(this, FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x80, 0x80).w(this, FUNC(m62_state::m62_hscroll_low_w)); - map(0x81, 0x81).w(this, FUNC(m62_state::m62_hscroll_high_w)); - map(0x82, 0x82).w(this, FUNC(m62_state::kidniki_text_vscroll_low_w)); - map(0x83, 0x83).w(this, FUNC(m62_state::kidniki_text_vscroll_high_w)); - map(0x84, 0x84).w(this, FUNC(m62_state::kidniki_background_bank_w)); - map(0x85, 0x85).w(this, FUNC(m62_state::kidniki_bankswitch_w)); + map(0x80, 0x80).w(FUNC(m62_state::m62_hscroll_low_w)); + map(0x81, 0x81).w(FUNC(m62_state::m62_hscroll_high_w)); + map(0x82, 0x82).w(FUNC(m62_state::kidniki_text_vscroll_low_w)); + map(0x83, 0x83).w(FUNC(m62_state::kidniki_text_vscroll_high_w)); + map(0x84, 0x84).w(FUNC(m62_state::kidniki_background_bank_w)); + map(0x85, 0x85).w(FUNC(m62_state::kidniki_bankswitch_w)); } void m62_state::spelunkr_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); - map(0xa000, 0xbfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xa000, 0xbfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(m62_state::m62_textram_w)).share("m62_textram"); - map(0xd000, 0xd000).w(this, FUNC(m62_state::m62_vscroll_low_w)); - map(0xd001, 0xd001).w(this, FUNC(m62_state::m62_vscroll_high_w)); - map(0xd002, 0xd002).w(this, FUNC(m62_state::m62_hscroll_low_w)); - map(0xd003, 0xd003).w(this, FUNC(m62_state::m62_hscroll_high_w)); - map(0xd004, 0xd004).w(this, FUNC(m62_state::spelunkr_bankswitch_w)); - map(0xd005, 0xd005).w(this, FUNC(m62_state::spelunkr_palbank_w)); + map(0xc800, 0xcfff).ram().w(FUNC(m62_state::m62_textram_w)).share("m62_textram"); + map(0xd000, 0xd000).w(FUNC(m62_state::m62_vscroll_low_w)); + map(0xd001, 0xd001).w(FUNC(m62_state::m62_vscroll_high_w)); + map(0xd002, 0xd002).w(FUNC(m62_state::m62_hscroll_low_w)); + map(0xd003, 0xd003).w(FUNC(m62_state::m62_hscroll_high_w)); + map(0xd004, 0xd004).w(FUNC(m62_state::spelunkr_bankswitch_w)); + map(0xd005, 0xd005).w(FUNC(m62_state::spelunkr_palbank_w)); map(0xe000, 0xefff).ram(); } @@ -349,13 +349,13 @@ void m62_state::spelunk2_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).bankr("bank1"); map(0x9000, 0x9fff).bankr("bank2"); - map(0xa000, 0xbfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xa000, 0xbfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(m62_state::m62_textram_w)).share("m62_textram"); - map(0xd000, 0xd000).w(this, FUNC(m62_state::m62_vscroll_low_w)); - map(0xd001, 0xd001).w(this, FUNC(m62_state::m62_hscroll_low_w)); - map(0xd002, 0xd002).w(this, FUNC(m62_state::spelunk2_gfxport_w)); - map(0xd003, 0xd003).w(this, FUNC(m62_state::spelunk2_bankswitch_w)); + map(0xc800, 0xcfff).ram().w(FUNC(m62_state::m62_textram_w)).share("m62_textram"); + map(0xd000, 0xd000).w(FUNC(m62_state::m62_vscroll_low_w)); + map(0xd001, 0xd001).w(FUNC(m62_state::m62_hscroll_low_w)); + map(0xd002, 0xd002).w(FUNC(m62_state::spelunk2_gfxport_w)); + map(0xd003, 0xd003).w(FUNC(m62_state::spelunk2_bankswitch_w)); map(0xe000, 0xefff).ram(); } @@ -364,8 +364,8 @@ void m62_state::youjyudn_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc0ff).writeonly().share("spriteram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(m62_state::m62_textram_w)).share("m62_textram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xc800, 0xcfff).ram().w(FUNC(m62_state::m62_textram_w)).share("m62_textram"); + map(0xd000, 0xd7ff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } @@ -373,21 +373,21 @@ void m62_state::youjyudn_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(this, FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x80, 0x80).w(this, FUNC(m62_state::m62_hscroll_high_w)); - map(0x81, 0x81).w(this, FUNC(m62_state::m62_hscroll_low_w)); - map(0x83, 0x83).w(this, FUNC(m62_state::youjyudn_bankswitch_w)); + map(0x80, 0x80).w(FUNC(m62_state::m62_hscroll_high_w)); + map(0x81, 0x81).w(FUNC(m62_state::m62_hscroll_low_w)); + map(0x83, 0x83).w(FUNC(m62_state::youjyudn_bankswitch_w)); } void m62_state::horizon_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc1ff).ram().share("spriteram"); - map(0xc800, 0xc83f).ram().w(this, FUNC(m62_state::horizon_scrollram_w)).share("scrollram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); + map(0xc800, 0xc83f).ram().w(FUNC(m62_state::horizon_scrollram_w)).share("scrollram"); + map(0xd000, 0xdfff).ram().w(FUNC(m62_state::m62_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); } diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index 09aa631b405..f77a3427b0d 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -479,14 +479,14 @@ void m63_state::m63_map(address_map &map) map(0xe000, 0xe1ff).ram(); map(0xe200, 0xe2ff).ram().share("spriteram"); map(0xe300, 0xe3ff).ram().share("scrollram"); - map(0xe400, 0xe7ff).ram().w(this, FUNC(m63_state::m63_videoram2_w)).share("videoram2"); - map(0xe800, 0xebff).ram().w(this, FUNC(m63_state::m63_videoram_w)).share("videoram"); - map(0xec00, 0xefff).ram().w(this, FUNC(m63_state::m63_colorram_w)).share("colorram"); + map(0xe400, 0xe7ff).ram().w(FUNC(m63_state::m63_videoram2_w)).share("videoram2"); + map(0xe800, 0xebff).ram().w(FUNC(m63_state::m63_videoram_w)).share("videoram"); + map(0xec00, 0xefff).ram().w(FUNC(m63_state::m63_colorram_w)).share("colorram"); map(0xf000, 0xf007).w("outlatch", FUNC(ls259_device::write_d0)); map(0xf800, 0xf800).portr("P1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf801, 0xf801).portr("P2").nopw(); /* continues game when in stop mode (cleared by NMI handler) */ map(0xf802, 0xf802).portr("DSW1"); - map(0xf803, 0xf803).w(this, FUNC(m63_state::snd_irq_w)); + map(0xf803, 0xf803).w(FUNC(m63_state::snd_irq_w)); map(0xf806, 0xf806).portr("DSW2"); } @@ -498,18 +498,18 @@ void m63_state::fghtbskt_map(address_map &map) map(0xd000, 0xd1ff).ram(); map(0xd200, 0xd2ff).ram().share("spriteram"); map(0xd300, 0xd3ff).ram().share("scrollram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(m63_state::m63_videoram2_w)).share("videoram2"); - map(0xd800, 0xdbff).ram().w(this, FUNC(m63_state::m63_videoram_w)).share("videoram"); - map(0xdc00, 0xdfff).ram().w(this, FUNC(m63_state::m63_colorram_w)).share("colorram"); - map(0xf000, 0xf000).r(this, FUNC(m63_state::snd_status_r)); + map(0xd400, 0xd7ff).ram().w(FUNC(m63_state::m63_videoram2_w)).share("videoram2"); + map(0xd800, 0xdbff).ram().w(FUNC(m63_state::m63_videoram_w)).share("videoram"); + map(0xdc00, 0xdfff).ram().w(FUNC(m63_state::m63_colorram_w)).share("colorram"); + map(0xf000, 0xf000).r(FUNC(m63_state::snd_status_r)); map(0xf001, 0xf001).portr("P1"); map(0xf002, 0xf002).portr("P2"); map(0xf003, 0xf003).portr("DSW"); - map(0xf000, 0xf000).w(this, FUNC(m63_state::snd_irq_w)); + map(0xf000, 0xf000).w(FUNC(m63_state::snd_irq_w)); map(0xf001, 0xf001).nopw(); map(0xf002, 0xf002).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf800, 0xf807).w("outlatch", FUNC(ls259_device::write_d0)); - map(0xf807, 0xf807).w(this, FUNC(m63_state::fghtbskt_samples_w)); // FIXME + map(0xf807, 0xf807).w(FUNC(m63_state::fghtbskt_samples_w)); // FIXME } void m63_state::i8039_map(address_map &map) @@ -520,7 +520,7 @@ void m63_state::i8039_map(address_map &map) void m63_state::i8039_port_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(m63_state::snddata_r), FUNC(m63_state::snddata_w)); + map(0x00, 0xff).rw(FUNC(m63_state::snddata_r), FUNC(m63_state::snddata_w)); } diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index 5a60b4766d8..43e389ce46d 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -445,7 +445,7 @@ void m72_state::init_m72_8751() io.install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::main_mcu_sound_w),this)); /* sound cpu */ - sndio.install_write_handler(0x82, 0x82, write8_delegate(FUNC(dac_byte_interface::write),(dac_byte_interface *)m_dac)); + sndio.install_write_handler(0x82, 0x82, write8_delegate(FUNC(dac_byte_interface::data_w),(dac_byte_interface *)m_dac)); sndio.install_read_handler (0x84, 0x84, read8_delegate(FUNC(m72_state::snd_cpu_sample_r),this)); /* lohtb2 */ @@ -861,11 +861,11 @@ WRITE16_MEMBER(m72_state::soundram_w) void m72_state::m72_cpu1_common_map(address_map &map) { map(0xc0000, 0xc03ff).ram().share("spriteram"); - map(0xc8000, 0xc8bff).rw(this, FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); - map(0xcc000, 0xccbff).rw(this, FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); - map(0xd0000, 0xd3fff).ram().w(this, FUNC(m72_state::videoram1_w)).share("videoram1"); - map(0xd8000, 0xdbfff).ram().w(this, FUNC(m72_state::videoram2_w)).share("videoram2"); - map(0xe0000, 0xeffff).rw(this, FUNC(m72_state::soundram_r), FUNC(m72_state::soundram_w)); + map(0xc8000, 0xc8bff).rw(FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); + map(0xcc000, 0xccbff).rw(FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); + map(0xd0000, 0xd3fff).ram().w(FUNC(m72_state::videoram1_w)).share("videoram1"); + map(0xd8000, 0xdbfff).ram().w(FUNC(m72_state::videoram2_w)).share("videoram2"); + map(0xe0000, 0xeffff).rw(FUNC(m72_state::soundram_r), FUNC(m72_state::soundram_w)); map(0xffff0, 0xfffff).rom(); } @@ -902,10 +902,10 @@ void m72_state::m81_cpu1_common_map(address_map &map) map(0x00000, 0x7ffff).rom(); map(0xb0ffe, 0xb0fff).writeonly(); /* leftover from protection?? */ map(0xc0000, 0xc03ff).ram().share("spriteram"); - map(0xc8000, 0xc8bff).rw(this, FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); - map(0xcc000, 0xccbff).rw(this, FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); - map(0xd0000, 0xd3fff).ram().w(this, FUNC(m72_state::videoram1_w)).share("videoram1"); - map(0xd8000, 0xdbfff).ram().w(this, FUNC(m72_state::videoram2_w)).share("videoram2"); + map(0xc8000, 0xc8bff).rw(FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); + map(0xcc000, 0xccbff).rw(FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); + map(0xd0000, 0xd3fff).ram().w(FUNC(m72_state::videoram1_w)).share("videoram1"); + map(0xd8000, 0xdbfff).ram().w(FUNC(m72_state::videoram2_w)).share("videoram2"); map(0xffff0, 0xfffff).rom(); } @@ -930,9 +930,9 @@ void m72_state::hharry_map(address_map &map) void m72_state::m84_cpu1_common_map(address_map &map) { map(0x00000, 0x7ffff).rom(); - map(0xb0000, 0xb0001).w(this, FUNC(m72_state::irq_line_w)); + map(0xb0000, 0xb0001).w(FUNC(m72_state::irq_line_w)); map(0xb4000, 0xb4001).nopw(); /* ??? */ - map(0xbc000, 0xbc001).w(this, FUNC(m72_state::dmaon_w)); + map(0xbc000, 0xbc001).w(FUNC(m72_state::dmaon_w)); map(0xb0ffe, 0xb0fff).writeonly(); /* leftover from protection?? */ map(0xc0000, 0xc03ff).ram().share("spriteram"); map(0xe0000, 0xe3fff).ram(); /* work RAM */ @@ -942,28 +942,28 @@ void m72_state::m84_cpu1_common_map(address_map &map) void m72_state::rtype2_map(address_map &map) { m84_cpu1_common_map(map); - map(0xd0000, 0xd3fff).ram().w(this, FUNC(m72_state::videoram1_w)).share("videoram1"); - map(0xd4000, 0xd7fff).ram().w(this, FUNC(m72_state::videoram2_w)).share("videoram2"); - map(0xc8000, 0xc8bff).rw(this, FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); - map(0xd8000, 0xd8bff).rw(this, FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); + map(0xd0000, 0xd3fff).ram().w(FUNC(m72_state::videoram1_w)).share("videoram1"); + map(0xd4000, 0xd7fff).ram().w(FUNC(m72_state::videoram2_w)).share("videoram2"); + map(0xc8000, 0xc8bff).rw(FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); + map(0xd8000, 0xd8bff).rw(FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); } void m72_state::hharryu_map(address_map &map) { m84_cpu1_common_map(map); - map(0xd0000, 0xd3fff).ram().w(this, FUNC(m72_state::videoram1_w)).share("videoram1"); - map(0xd4000, 0xd7fff).ram().w(this, FUNC(m72_state::videoram2_w)).share("videoram2"); - map(0xa0000, 0xa0bff).rw(this, FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); - map(0xa8000, 0xa8bff).rw(this, FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); + map(0xd0000, 0xd3fff).ram().w(FUNC(m72_state::videoram1_w)).share("videoram1"); + map(0xd4000, 0xd7fff).ram().w(FUNC(m72_state::videoram2_w)).share("videoram2"); + map(0xa0000, 0xa0bff).rw(FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); + map(0xa8000, 0xa8bff).rw(FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); } void m72_state::kengo_map(address_map &map) { m84_cpu1_common_map(map); - map(0x80000, 0x83fff).ram().w(this, FUNC(m72_state::videoram1_w)).share("videoram1"); - map(0x84000, 0x87fff).ram().w(this, FUNC(m72_state::videoram2_w)).share("videoram2"); - map(0xa0000, 0xa0bff).rw(this, FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); - map(0xa8000, 0xa8bff).rw(this, FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); + map(0x80000, 0x83fff).ram().w(FUNC(m72_state::videoram1_w)).share("videoram1"); + map(0x84000, 0x87fff).ram().w(FUNC(m72_state::videoram2_w)).share("videoram2"); + map(0xa0000, 0xa0bff).rw(FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); + map(0xa8000, 0xa8bff).rw(FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); } @@ -971,16 +971,16 @@ void m72_state::m82_map(address_map &map) { map(0x00000, 0x7ffff).rom(); map(0xa0000, 0xa03ff).ram().share("majtitle_rowscr"); - map(0xa4000, 0xa4bff).rw(this, FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); - map(0xac000, 0xaffff).ram().w(this, FUNC(m72_state::videoram1_w)).share("videoram1"); - map(0xb0000, 0xbffff).ram().w(this, FUNC(m72_state::videoram2_w)).share("videoram2"); /* larger than the other games */ + map(0xa4000, 0xa4bff).rw(FUNC(m72_state::palette2_r), FUNC(m72_state::palette2_w)).share("paletteram2"); + map(0xac000, 0xaffff).ram().w(FUNC(m72_state::videoram1_w)).share("videoram1"); + map(0xb0000, 0xbffff).ram().w(FUNC(m72_state::videoram2_w)).share("videoram2"); /* larger than the other games */ map(0xc0000, 0xc03ff).ram().share("spriteram"); map(0xc8000, 0xc83ff).ram().share("spriteram2"); - map(0xcc000, 0xccbff).rw(this, FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); + map(0xcc000, 0xccbff).rw(FUNC(m72_state::palette1_r), FUNC(m72_state::palette1_w)).share("paletteram"); map(0xd0000, 0xd3fff).ram(); /* work RAM */ - map(0xe0000, 0xe0001).w(this, FUNC(m72_state::irq_line_w)); + map(0xe0000, 0xe0001).w(FUNC(m72_state::irq_line_w)); map(0xe4000, 0xe4001).writeonly(); /* playfield enable? 1 during screen transitions, 0 otherwise */ - map(0xec000, 0xec001).w(this, FUNC(m72_state::dmaon_w)); + map(0xec000, 0xec001).w(FUNC(m72_state::dmaon_w)); map(0xffff0, 0xfffff).rom(); } @@ -993,14 +993,14 @@ void m72_state::m72_portmap(address_map &map) map(0x02, 0x03).portr("IN1"); map(0x04, 0x05).portr("DSW"); map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(m72_state::port02_w)); /* coin counters, reset sound cpu, other stuff? */ - map(0x04, 0x05).w(this, FUNC(m72_state::dmaon_w)); - map(0x06, 0x07).w(this, FUNC(m72_state::irq_line_w)); + map(0x02, 0x02).w(FUNC(m72_state::port02_w)); /* coin counters, reset sound cpu, other stuff? */ + map(0x04, 0x05).w(FUNC(m72_state::dmaon_w)); + map(0x06, 0x07).w(FUNC(m72_state::irq_line_w)); map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x81).w(this, FUNC(m72_state::scrolly1_w)); - map(0x82, 0x83).w(this, FUNC(m72_state::scrollx1_w)); - map(0x84, 0x85).w(this, FUNC(m72_state::scrolly2_w)); - map(0x86, 0x87).w(this, FUNC(m72_state::scrollx2_w)); + map(0x80, 0x81).w(FUNC(m72_state::scrolly1_w)); + map(0x82, 0x83).w(FUNC(m72_state::scrollx1_w)); + map(0x84, 0x85).w(FUNC(m72_state::scrolly2_w)); + map(0x86, 0x87).w(FUNC(m72_state::scrollx2_w)); /* { 0xc0, 0xc0 trigger sample, filled by init_ function */ } @@ -1010,12 +1010,12 @@ void m72_state::m84_portmap(address_map &map) map(0x02, 0x03).portr("IN1"); map(0x04, 0x05).portr("DSW"); map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(m72_state::rtype2_port02_w)); + map(0x02, 0x02).w(FUNC(m72_state::rtype2_port02_w)); map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x81).w(this, FUNC(m72_state::scrolly1_w)); - map(0x82, 0x83).w(this, FUNC(m72_state::scrollx1_w)); - map(0x84, 0x85).w(this, FUNC(m72_state::scrolly2_w)); - map(0x86, 0x87).w(this, FUNC(m72_state::scrollx2_w)); + map(0x80, 0x81).w(FUNC(m72_state::scrolly1_w)); + map(0x82, 0x83).w(FUNC(m72_state::scrollx1_w)); + map(0x84, 0x85).w(FUNC(m72_state::scrolly2_w)); + map(0x86, 0x87).w(FUNC(m72_state::scrollx2_w)); } void m72_state::m84_v33_portmap(address_map &map) @@ -1024,11 +1024,11 @@ void m72_state::m84_v33_portmap(address_map &map) map(0x02, 0x03).portr("IN1"); map(0x04, 0x05).portr("DSW"); map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(m72_state::rtype2_port02_w)); - map(0x80, 0x81).w(this, FUNC(m72_state::scrolly1_w)); - map(0x82, 0x83).w(this, FUNC(m72_state::scrollx1_w)); - map(0x84, 0x85).w(this, FUNC(m72_state::scrolly2_w)); - map(0x86, 0x87).w(this, FUNC(m72_state::scrollx2_w)); + map(0x02, 0x02).w(FUNC(m72_state::rtype2_port02_w)); + map(0x80, 0x81).w(FUNC(m72_state::scrolly1_w)); + map(0x82, 0x83).w(FUNC(m72_state::scrollx1_w)); + map(0x84, 0x85).w(FUNC(m72_state::scrolly2_w)); + map(0x86, 0x87).w(FUNC(m72_state::scrollx2_w)); // AM_RANGE(0x8c, 0x8f) AM_WRITENOP /* ??? */ } @@ -1040,12 +1040,12 @@ void m72_state::poundfor_portmap(address_map &map) map(0x08, 0x0f).r("upd4701l", FUNC(upd4701_device::read_xy)).umask16(0x00ff); map(0x08, 0x0f).r("upd4701h", FUNC(upd4701_device::read_xy)).umask16(0xff00); map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(m72_state::poundfor_port02_w)); + map(0x02, 0x02).w(FUNC(m72_state::poundfor_port02_w)); map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x81).w(this, FUNC(m72_state::scrolly1_w)); - map(0x82, 0x83).w(this, FUNC(m72_state::scrollx1_w)); - map(0x84, 0x85).w(this, FUNC(m72_state::scrolly2_w)); - map(0x86, 0x87).w(this, FUNC(m72_state::scrollx2_w)); + map(0x80, 0x81).w(FUNC(m72_state::scrolly1_w)); + map(0x82, 0x83).w(FUNC(m72_state::scrollx1_w)); + map(0x84, 0x85).w(FUNC(m72_state::scrolly2_w)); + map(0x86, 0x87).w(FUNC(m72_state::scrollx2_w)); } void m72_state::m82_portmap(address_map &map) @@ -1054,16 +1054,16 @@ void m72_state::m82_portmap(address_map &map) map(0x02, 0x03).portr("IN1"); map(0x04, 0x05).portr("DSW"); map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(m72_state::rtype2_port02_w)); + map(0x02, 0x02).w(FUNC(m72_state::rtype2_port02_w)); map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x81).w(this, FUNC(m72_state::scrolly1_w)); - map(0x82, 0x83).w(this, FUNC(m72_state::scrollx1_w)); - map(0x84, 0x85).w(this, FUNC(m72_state::scrolly2_w)); - map(0x86, 0x87).w(this, FUNC(m72_state::scrollx2_w)); + map(0x80, 0x81).w(FUNC(m72_state::scrolly1_w)); + map(0x82, 0x83).w(FUNC(m72_state::scrollx1_w)); + map(0x84, 0x85).w(FUNC(m72_state::scrolly2_w)); + map(0x86, 0x87).w(FUNC(m72_state::scrollx2_w)); // these ports control the tilemap sizes, rowscroll etc. that m82 has, exact bit usage not known (maybe one for each layer?) - map(0x8c, 0x8d).w(this, FUNC(m72_state::m82_tm_ctrl_w)); - map(0x8e, 0x8f).w(this, FUNC(m72_state::m82_gfx_ctrl_w)); + map(0x8c, 0x8d).w(FUNC(m72_state::m82_tm_ctrl_w)); + map(0x8e, 0x8f).w(FUNC(m72_state::m82_gfx_ctrl_w)); } void m72_state::m81_portmap(address_map &map) @@ -1072,14 +1072,14 @@ void m72_state::m81_portmap(address_map &map) map(0x02, 0x03).portr("IN1"); map(0x04, 0x05).portr("DSW"); map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).w(this, FUNC(m72_state::rtype2_port02_w)); /* coin counters, reset sound cpu, other stuff? */ - map(0x04, 0x05).w(this, FUNC(m72_state::dmaon_w)); - map(0x06, 0x07).w(this, FUNC(m72_state::irq_line_w)); + map(0x02, 0x02).w(FUNC(m72_state::rtype2_port02_w)); /* coin counters, reset sound cpu, other stuff? */ + map(0x04, 0x05).w(FUNC(m72_state::dmaon_w)); + map(0x06, 0x07).w(FUNC(m72_state::irq_line_w)); map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x81).w(this, FUNC(m72_state::scrolly1_w)); - map(0x82, 0x83).w(this, FUNC(m72_state::scrollx1_w)); - map(0x84, 0x85).w(this, FUNC(m72_state::scrolly2_w)); - map(0x86, 0x87).w(this, FUNC(m72_state::scrollx2_w)); + map(0x80, 0x81).w(FUNC(m72_state::scrolly1_w)); + map(0x82, 0x83).w(FUNC(m72_state::scrollx1_w)); + map(0x84, 0x85).w(FUNC(m72_state::scrolly2_w)); + map(0x86, 0x87).w(FUNC(m72_state::scrollx2_w)); } @@ -1136,11 +1136,11 @@ void m72_state::poundfor_sound_portmap(address_map &map) void m72_state::mcu_io_map(address_map &map) { /* External access */ - map(0x0000, 0x0000).rw(this, FUNC(m72_state::mcu_sample_r), FUNC(m72_state::mcu_low_w)); - map(0x0001, 0x0001).w(this, FUNC(m72_state::mcu_high_w)); - map(0x0002, 0x0002).rw(this, FUNC(m72_state::mcu_snd_r), FUNC(m72_state::mcu_ack_w)); + map(0x0000, 0x0000).rw(FUNC(m72_state::mcu_sample_r), FUNC(m72_state::mcu_low_w)); + map(0x0001, 0x0001).w(FUNC(m72_state::mcu_high_w)); + map(0x0002, 0x0002).rw(FUNC(m72_state::mcu_snd_r), FUNC(m72_state::mcu_ack_w)); /* shared at b0000 - b0fff on the main cpu */ - map(0xc000, 0xcfff).rw(this, FUNC(m72_state::mcu_data_r), FUNC(m72_state::mcu_data_w)); + map(0xc000, 0xcfff).rw(FUNC(m72_state::mcu_data_r), FUNC(m72_state::mcu_data_w)); } #define COIN_MODE_1 \ diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp index f8527014f38..f06097e01ab 100644 --- a/src/mame/drivers/m79amb.cpp +++ b/src/mame/drivers/m79amb.cpp @@ -125,14 +125,14 @@ WRITE8_MEMBER(m79amb_state::m79amb_8002_w) void m79amb_state::main_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x4000, 0x5fff).ram().w(this, FUNC(m79amb_state::ramtek_videoram_w)).share("videoram"); + map(0x4000, 0x5fff).ram().w(FUNC(m79amb_state::ramtek_videoram_w)).share("videoram"); map(0x6000, 0x63ff).ram(); /* ?? */ - map(0x8000, 0x8000).portr("8000").w(this, FUNC(m79amb_state::m79amb_8000_w)); + map(0x8000, 0x8000).portr("8000").w(FUNC(m79amb_state::m79amb_8000_w)); map(0x8001, 0x8001).writeonly().share("mask"); - map(0x8002, 0x8002).portr("8002").w(this, FUNC(m79amb_state::m79amb_8002_w)); - map(0x8003, 0x8003).w(this, FUNC(m79amb_state::m79amb_8003_w)); - map(0x8004, 0x8004).r(this, FUNC(m79amb_state::gray5bit_controller0_r)); - map(0x8005, 0x8005).r(this, FUNC(m79amb_state::gray5bit_controller1_r)); + map(0x8002, 0x8002).portr("8002").w(FUNC(m79amb_state::m79amb_8002_w)); + map(0x8003, 0x8003).w(FUNC(m79amb_state::m79amb_8003_w)); + map(0x8004, 0x8004).r(FUNC(m79amb_state::gray5bit_controller0_r)); + map(0x8005, 0x8005).r(FUNC(m79amb_state::gray5bit_controller1_r)); map(0xc000, 0xc07f).ram(); /* ?? */ map(0xc200, 0xc27f).ram(); /* ?? */ } diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 570cc02e6ec..5477854bc96 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -73,7 +73,7 @@ void m90_state::m90_main_cpu_map(address_map &map) { map(0x00000, 0x7ffff).rom(); map(0xa0000, 0xa3fff).ram(); - map(0xd0000, 0xdffff).ram().w(this, FUNC(m90_state::m90_video_w)).share("video_data"); + map(0xd0000, 0xdffff).ram().w(FUNC(m90_state::m90_video_w)).share("video_data"); map(0xe0000, 0xe03ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xffff0, 0xfffff).rom(); } @@ -89,7 +89,7 @@ void m90_state::dynablsb_main_cpu_map(address_map &map) map(0x00000, 0x3ffff).rom(); map(0x6000e, 0x60fff).ram().share("spriteram"); map(0xa0000, 0xa3fff).ram(); - map(0xd0000, 0xdffff).ram().w(this, FUNC(m90_state::bootleg_video_w)).share("video_data"); + map(0xd0000, 0xdffff).ram().w(FUNC(m90_state::bootleg_video_w)).share("video_data"); map(0xe0000, 0xe03ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xffff0, 0xfffff).rom(); } @@ -99,7 +99,7 @@ void m90_state::bomblord_main_cpu_map(address_map &map) map(0x00000, 0x7ffff).rom(); map(0xa0000, 0xa3fff).ram(); map(0xc000e, 0xc0fff).ram().share("spriteram"); - map(0xd0000, 0xdffff).ram().w(this, FUNC(m90_state::bootleg_video_w)).share("video_data"); + map(0xd0000, 0xdffff).ram().w(FUNC(m90_state::bootleg_video_w)).share("video_data"); map(0xe0000, 0xe03ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xffff0, 0xfffff).rom(); } @@ -108,7 +108,7 @@ void m90_state::m90_main_cpu_io_map(address_map &map) { map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x00, 0x01).portr("P1_P2"); - map(0x02, 0x03).w(this, FUNC(m90_state::coincounter_w)); + map(0x02, 0x03).w(FUNC(m90_state::coincounter_w)); map(0x02, 0x03).portr("SYSTEM"); map(0x04, 0x05).portr("DSW"); map(0x06, 0x07).portr("P3_P4"); @@ -118,14 +118,14 @@ void m90_state::m90_main_cpu_io_map(address_map &map) void m90_state::quizf1_main_cpu_io_map(address_map &map) { m90_main_cpu_io_map(map); - map(0x04, 0x05).w(this, FUNC(m90_state::quizf1_bankswitch_w)); + map(0x04, 0x05).w(FUNC(m90_state::quizf1_bankswitch_w)); } void m90_state::dynablsb_main_cpu_io_map(address_map &map) { map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x00, 0x01).portr("P1_P2"); - map(0x02, 0x03).w(this, FUNC(m90_state::coincounter_w)); + map(0x02, 0x03).w(FUNC(m90_state::coincounter_w)); map(0x02, 0x03).portr("SYSTEM"); // AM_RANGE(0x04, 0x05) AM_WRITE(unknown_w) /* dynablsb: write continuously 0x6000 */ map(0x04, 0x05).portr("DSW"); @@ -158,7 +158,7 @@ void m90_state::dynablsb_sound_cpu_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x80, 0x80).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x82, 0x82).w("dac", FUNC(dac_byte_interface::write)); + map(0x82, 0x82).w("dac", FUNC(dac_byte_interface::data_w)); } void m90_state::m99_sound_cpu_io_map(address_map &map) diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index 0af2c443394..2dc6652a2d9 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -309,12 +309,12 @@ WRITE16_MEMBER(m92_state::m92_sound_reset_w) void m92_state::lethalth_map(address_map &map) { map(0x00000, 0x7ffff).rom(); - map(0x80000, 0x8ffff).ram().w(this, FUNC(m92_state::m92_vram_w)).share("vram_data"); + map(0x80000, 0x8ffff).ram().w(FUNC(m92_state::m92_vram_w)).share("vram_data"); map(0xe0000, 0xeffff).ram(); /* System ram */ map(0xf8000, 0xf87ff).ram().share("spriteram"); - map(0xf8800, 0xf8fff).rw(this, FUNC(m92_state::m92_paletteram_r), FUNC(m92_state::m92_paletteram_w)); - map(0xf9000, 0xf900f).w(this, FUNC(m92_state::m92_spritecontrol_w)).share("spritecontrol"); - map(0xf9800, 0xf9801).w(this, FUNC(m92_state::m92_videocontrol_w)); + map(0xf8800, 0xf8fff).rw(FUNC(m92_state::m92_paletteram_r), FUNC(m92_state::m92_paletteram_w)); + map(0xf9000, 0xf900f).w(FUNC(m92_state::m92_spritecontrol_w)).share("spritecontrol"); + map(0xf9800, 0xf9801).w(FUNC(m92_state::m92_videocontrol_w)); map(0xffff0, 0xfffff).rom().region("maincpu", 0x7fff0); } @@ -323,12 +323,12 @@ void m92_state::m92_map(address_map &map) map(0x00000, 0x9ffff).rom(); map(0xa0000, 0xbffff).bankr("bank1"); map(0xc0000, 0xcffff).rom().region("maincpu", 0x00000); /* Mirror used by In The Hunt as protection */ - map(0xd0000, 0xdffff).ram().w(this, FUNC(m92_state::m92_vram_w)).share("vram_data"); + map(0xd0000, 0xdffff).ram().w(FUNC(m92_state::m92_vram_w)).share("vram_data"); map(0xe0000, 0xeffff).ram(); /* System ram */ map(0xf8000, 0xf87ff).ram().share("spriteram"); - map(0xf8800, 0xf8fff).rw(this, FUNC(m92_state::m92_paletteram_r), FUNC(m92_state::m92_paletteram_w)); - map(0xf9000, 0xf900f).w(this, FUNC(m92_state::m92_spritecontrol_w)).share("spritecontrol"); - map(0xf9800, 0xf9801).w(this, FUNC(m92_state::m92_videocontrol_w)); + map(0xf8800, 0xf8fff).rw(FUNC(m92_state::m92_paletteram_r), FUNC(m92_state::m92_paletteram_w)); + map(0xf9000, 0xf900f).w(FUNC(m92_state::m92_spritecontrol_w)).share("spritecontrol"); + map(0xf9800, 0xf9801).w(FUNC(m92_state::m92_videocontrol_w)); map(0xffff0, 0xfffff).rom().region("maincpu", 0x7fff0); } @@ -340,13 +340,13 @@ void m92_state::m92_portmap(address_map &map) map(0x06, 0x07).portr("P3_P4"); map(0x08, 0x08).r("soundlatch2", FUNC(generic_latch_8_device::read)); // answer from sound CPU map(0x00, 0x00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x03).w(this, FUNC(m92_state::m92_coincounter_w)); + map(0x02, 0x03).w(FUNC(m92_state::m92_coincounter_w)); map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x87).w(this, FUNC(m92_state::m92_pf1_control_w)); - map(0x88, 0x8f).w(this, FUNC(m92_state::m92_pf2_control_w)); - map(0x90, 0x97).w(this, FUNC(m92_state::m92_pf3_control_w)); - map(0x98, 0x9f).w(this, FUNC(m92_state::m92_master_control_w)); - map(0xc0, 0xc1).w(this, FUNC(m92_state::m92_sound_reset_w)); + map(0x80, 0x87).w(FUNC(m92_state::m92_pf1_control_w)); + map(0x88, 0x8f).w(FUNC(m92_state::m92_pf2_control_w)); + map(0x90, 0x97).w(FUNC(m92_state::m92_pf3_control_w)); + map(0x98, 0x9f).w(FUNC(m92_state::m92_master_control_w)); + map(0xc0, 0xc1).w(FUNC(m92_state::m92_sound_reset_w)); } WRITE16_MEMBER(m92_state::oki_bank_w) @@ -360,14 +360,14 @@ void m92_state::ppan_portmap(address_map &map) map(0x02, 0x03).portr("COINS_DSW3"); map(0x04, 0x05).portr("DSW"); map(0x06, 0x07).portr("P3_P4"); - map(0x10, 0x11).w(this, FUNC(m92_state::oki_bank_w)); + map(0x10, 0x11).w(FUNC(m92_state::oki_bank_w)); map(0x18, 0x18).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x02, 0x03).w(this, FUNC(m92_state::m92_coincounter_w)); + map(0x02, 0x03).w(FUNC(m92_state::m92_coincounter_w)); map(0x40, 0x43).rw(m_upd71059c, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x80, 0x87).w(this, FUNC(m92_state::m92_pf1_control_w)); - map(0x88, 0x8f).w(this, FUNC(m92_state::m92_pf2_control_w)); - map(0x90, 0x97).w(this, FUNC(m92_state::m92_pf3_control_w)); - map(0x98, 0x9f).w(this, FUNC(m92_state::m92_master_control_w)); + map(0x80, 0x87).w(FUNC(m92_state::m92_pf1_control_w)); + map(0x88, 0x8f).w(FUNC(m92_state::m92_pf2_control_w)); + map(0x90, 0x97).w(FUNC(m92_state::m92_pf3_control_w)); + map(0x98, 0x9f).w(FUNC(m92_state::m92_master_control_w)); } diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index a5b0ff84499..e1433fc6894 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -596,44 +596,44 @@ TIMER_DEVICE_CALLBACK_MEMBER(mac_state::mac_scanline) void mac_state::mac512ke_map(address_map &map) { - map(0x800000, 0x9fffff).r(this, FUNC(mac_state::mac_scc_r)); - map(0xa00000, 0xbfffff).w(this, FUNC(mac_state::mac_scc_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0xe80000, 0xefffff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0xfffff0, 0xffffff).rw(this, FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); + map(0x800000, 0x9fffff).r(FUNC(mac_state::mac_scc_r)); + map(0xa00000, 0xbfffff).w(FUNC(mac_state::mac_scc_w)); + map(0xc00000, 0xdfffff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0xe80000, 0xefffff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0xfffff0, 0xffffff).rw(FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); } void mac_state::macplus_map(address_map &map) { - map(0x580000, 0x5fffff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macplus_scsi_w)); - map(0x800000, 0x9fffff).r(this, FUNC(mac_state::mac_scc_r)); - map(0xa00000, 0xbfffff).w(this, FUNC(mac_state::mac_scc_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0xe80000, 0xefffff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0xfffff0, 0xffffff).rw(this, FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); + map(0x580000, 0x5fffff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macplus_scsi_w)); + map(0x800000, 0x9fffff).r(FUNC(mac_state::mac_scc_r)); + map(0xa00000, 0xbfffff).w(FUNC(mac_state::mac_scc_w)); + map(0xc00000, 0xdfffff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0xe80000, 0xefffff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0xfffff0, 0xffffff).rw(FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); } void mac_state::macse_map(address_map &map) { - map(0x580000, 0x5fffff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macplus_scsi_w)); - map(0x900000, 0x9fffff).r(this, FUNC(mac_state::mac_scc_r)); - map(0xb00000, 0xbfffff).w(this, FUNC(mac_state::mac_scc_w)); - map(0xd00000, 0xdfffff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0xe80000, 0xefffff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0xfffff0, 0xffffff).rw(this, FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); + map(0x580000, 0x5fffff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macplus_scsi_w)); + map(0x900000, 0x9fffff).r(FUNC(mac_state::mac_scc_r)); + map(0xb00000, 0xbfffff).w(FUNC(mac_state::mac_scc_w)); + map(0xd00000, 0xdfffff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0xe80000, 0xefffff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0xfffff0, 0xffffff).rw(FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); } void mac_state::macprtb_map(address_map &map) { map(0x900000, 0x93ffff).rom().region("bootrom", 0).mirror(0x0c0000); - map(0xf60000, 0xf6ffff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0xf70000, 0xf7ffff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0xf90000, 0xf9ffff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macplus_scsi_w)); + map(0xf60000, 0xf6ffff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0xf70000, 0xf7ffff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0xf90000, 0xf9ffff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macplus_scsi_w)); map(0xfa8000, 0xfaffff).ram().share("vram16"); // VRAM map(0xfb0000, 0xfbffff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)); - map(0xfc0000, 0xfcffff).r(this, FUNC(mac_state::mac_config_r)); - map(0xfd0000, 0xfdffff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); - map(0xfffff0, 0xffffff).rw(this, FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); + map(0xfc0000, 0xfcffff).r(FUNC(mac_state::mac_config_r)); + map(0xfd0000, 0xfdffff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); + map(0xfffff0, 0xffffff).rw(FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w)); } void mac_state::maclc_map(address_map &map) @@ -642,15 +642,15 @@ void mac_state::maclc_map(address_map &map) map(0xa00000, 0xafffff).rom().region("bootrom", 0); // ROM (in 32-bit mode) - map(0xf00000, 0xf01fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0xf04000, 0xf05fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); - map(0xf06000, 0xf07fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); - map(0xf10000, 0xf11fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); - map(0xf12000, 0xf13fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); + map(0xf00000, 0xf01fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0xf04000, 0xf05fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); + map(0xf06000, 0xf07fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); + map(0xf10000, 0xf11fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); + map(0xf12000, 0xf13fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); map(0xf14000, 0xf15fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)); - map(0xf16000, 0xf17fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0xf24000, 0xf24003).rw(this, FUNC(mac_state::rbv_ramdac_r), FUNC(mac_state::ariel_ramdac_w)); - map(0xf26000, 0xf27fff).rw(this, FUNC(mac_state::mac_rbv_r), FUNC(mac_state::mac_rbv_w)); // VIA2 (V8) + map(0xf16000, 0xf17fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0xf24000, 0xf24003).rw(FUNC(mac_state::rbv_ramdac_r), FUNC(mac_state::ariel_ramdac_w)); + map(0xf26000, 0xf27fff).rw(FUNC(mac_state::mac_rbv_r), FUNC(mac_state::mac_rbv_w)); // VIA2 (V8) map(0xf40000, 0xfbffff).ram().share("vram"); } @@ -658,18 +658,18 @@ void mac_state::maclc3_map(address_map &map) { map(0x40000000, 0x400fffff).rom().region("bootrom", 0).mirror(0x0ff00000); - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); - map(0x50004000, 0x50005fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); - map(0x50006000, 0x50007fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); - map(0x50010000, 0x50011fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); - map(0x50012000, 0x50013fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50004000, 0x50005fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); + map(0x50006000, 0x50007fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); + map(0x50010000, 0x50011fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); + map(0x50012000, 0x50013fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); map(0x50014000, 0x50015fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)).mirror(0x00f00000); - map(0x50016000, 0x50017fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); - map(0x50024000, 0x50025fff).w(this, FUNC(mac_state::ariel_ramdac_w)).mirror(0x00f00000); - map(0x50026000, 0x50027fff).rw(this, FUNC(mac_state::mac_rbv_r), FUNC(mac_state::mac_rbv_w)).mirror(0x00f00000); - map(0x50028000, 0x50028003).rw(this, FUNC(mac_state::mac_sonora_vctl_r), FUNC(mac_state::mac_sonora_vctl_w)).mirror(0x00f00000); + map(0x50016000, 0x50017fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); + map(0x50024000, 0x50025fff).w(FUNC(mac_state::ariel_ramdac_w)).mirror(0x00f00000); + map(0x50026000, 0x50027fff).rw(FUNC(mac_state::mac_rbv_r), FUNC(mac_state::mac_rbv_w)).mirror(0x00f00000); + map(0x50028000, 0x50028003).rw(FUNC(mac_state::mac_sonora_vctl_r), FUNC(mac_state::mac_sonora_vctl_w)).mirror(0x00f00000); - map(0x5ffffffc, 0x5fffffff).r(this, FUNC(mac_state::mac_read_id)); + map(0x5ffffffc, 0x5fffffff).r(FUNC(mac_state::mac_read_id)); map(0x60000000, 0x600fffff).ram().mirror(0x0ff00000).share("vram"); } @@ -679,47 +679,47 @@ void mac_state::macii_map(address_map &map) map(0x40000000, 0x4003ffff).rom().region("bootrom", 0).mirror(0x0ffc0000); // MMU remaps I/O without the F - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); - map(0x50002000, 0x50003fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00f00000); - map(0x50004000, 0x50005fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); - map(0x50006000, 0x50006003).w(this, FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); - map(0x50006060, 0x50006063).r(this, FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); - map(0x50010000, 0x50011fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); - map(0x50012060, 0x50012063).r(this, FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50002000, 0x50003fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00f00000); + map(0x50004000, 0x50005fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); + map(0x50006000, 0x50006003).w(FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); + map(0x50006060, 0x50006063).r(FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); + map(0x50010000, 0x50011fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); + map(0x50012060, 0x50012063).r(FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); map(0x50014000, 0x50015fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)).mirror(0x00f00000); - map(0x50016000, 0x50017fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); - map(0x50040000, 0x50041fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50016000, 0x50017fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); + map(0x50040000, 0x50041fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); } void mac_state::maciici_map(address_map &map) { map(0x40000000, 0x4007ffff).rom().region("bootrom", 0).mirror(0x0ff80000); - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); - map(0x50004000, 0x50005fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); - map(0x50006000, 0x50007fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); - map(0x50010000, 0x50011fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); - map(0x50012060, 0x50012063).r(this, FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50004000, 0x50005fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); + map(0x50006000, 0x50007fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); + map(0x50010000, 0x50011fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); + map(0x50012060, 0x50012063).r(FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); map(0x50014000, 0x50015fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)).mirror(0x00f00000); - map(0x50016000, 0x50017fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); - map(0x50024000, 0x50024007).w(this, FUNC(mac_state::rbv_ramdac_w)).mirror(0x00f00000); - map(0x50026000, 0x50027fff).rw(this, FUNC(mac_state::mac_rbv_r), FUNC(mac_state::mac_rbv_w)).mirror(0x00f00000); - map(0x50040000, 0x50041fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50016000, 0x50017fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); + map(0x50024000, 0x50024007).w(FUNC(mac_state::rbv_ramdac_w)).mirror(0x00f00000); + map(0x50026000, 0x50027fff).rw(FUNC(mac_state::mac_rbv_r), FUNC(mac_state::mac_rbv_w)).mirror(0x00f00000); + map(0x50040000, 0x50041fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); } void mac_state::macse30_map(address_map &map) { map(0x40000000, 0x4003ffff).rom().region("bootrom", 0).mirror(0x0ffc0000); - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); - map(0x50002000, 0x50003fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00f00000); - map(0x50004000, 0x50005fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); - map(0x50006000, 0x50007fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); - map(0x50010000, 0x50011fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); - map(0x50012060, 0x50012063).r(this, FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50002000, 0x50003fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00f00000); + map(0x50004000, 0x50005fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); + map(0x50006000, 0x50007fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); + map(0x50010000, 0x50011fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); + map(0x50012060, 0x50012063).r(FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); map(0x50014000, 0x50015fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)).mirror(0x00f00000); - map(0x50016000, 0x50017fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); - map(0x50040000, 0x50041fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); // mirror + map(0x50016000, 0x50017fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); + map(0x50040000, 0x50041fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); // mirror map(0xfe000000, 0xfe00ffff).ram().share("vram"); map(0xfee00000, 0xfee0ffff).ram().share("vram").mirror(0x000f0000); @@ -730,18 +730,18 @@ void mac_state::maciifx_map(address_map &map) { map(0x40000000, 0x4007ffff).rom().region("bootrom", 0).mirror(0x0ff80000); - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); - map(0x50004000, 0x50005fff).rw(this, FUNC(mac_state::scciop_r), FUNC(mac_state::scciop_w)).mirror(0x00f00000); - map(0x5000a000, 0x5000bfff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); - map(0x5000c060, 0x5000c063).r(this, FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); - map(0x5000d000, 0x5000d003).w(this, FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); - map(0x5000d060, 0x5000d063).r(this, FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50004000, 0x50005fff).rw(FUNC(mac_state::scciop_r), FUNC(mac_state::scciop_w)).mirror(0x00f00000); + map(0x5000a000, 0x5000bfff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); + map(0x5000c060, 0x5000c063).r(FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); + map(0x5000d000, 0x5000d003).w(FUNC(mac_state::macii_scsi_drq_w)).mirror(0x00f00000); + map(0x5000d060, 0x5000d063).r(FUNC(mac_state::macii_scsi_drq_r)).mirror(0x00f00000); map(0x50010000, 0x50011fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)).mirror(0x00f00000); - map(0x50012000, 0x50013fff).rw(this, FUNC(mac_state::swimiop_r), FUNC(mac_state::swimiop_w)).mirror(0x00f00000); - map(0x50018000, 0x50019fff).rw(this, FUNC(mac_state::biu_r), FUNC(mac_state::biu_w)).mirror(0x00f00000); - map(0x5001a000, 0x5001bfff).rw(this, FUNC(mac_state::oss_r), FUNC(mac_state::oss_w)).mirror(0x00f00000); - map(0x50024000, 0x50027fff).r(this, FUNC(mac_state::buserror_r)).mirror(0x00f00000); // must bus error on access here so ROM can determine we're an FMC - map(0x50040000, 0x50041fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50012000, 0x50013fff).rw(FUNC(mac_state::swimiop_r), FUNC(mac_state::swimiop_w)).mirror(0x00f00000); + map(0x50018000, 0x50019fff).rw(FUNC(mac_state::biu_r), FUNC(mac_state::biu_w)).mirror(0x00f00000); + map(0x5001a000, 0x5001bfff).rw(FUNC(mac_state::oss_r), FUNC(mac_state::oss_w)).mirror(0x00f00000); + map(0x50024000, 0x50027fff).r(FUNC(mac_state::buserror_r)).mirror(0x00f00000); // must bus error on access here so ROM can determine we're an FMC + map(0x50040000, 0x50041fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); } // ROM detects the "Jaws" ASIC by checking for I/O space mirrored at 0x01000000 boundries @@ -749,15 +749,15 @@ void mac_state::macpb140_map(address_map &map) { map(0x40000000, 0x400fffff).rom().region("bootrom", 0).mirror(0x0ff00000); - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x01f00000); - map(0x50002000, 0x50003fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x01f00000); - map(0x50004000, 0x50005fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x01f00000); - map(0x50006000, 0x50007fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x01f00000); - map(0x50010000, 0x50011fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x01f00000); - map(0x50012060, 0x50012063).r(this, FUNC(mac_state::macii_scsi_drq_r)).mirror(0x01f00000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x01f00000); + map(0x50002000, 0x50003fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x01f00000); + map(0x50004000, 0x50005fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x01f00000); + map(0x50006000, 0x50007fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)).mirror(0x01f00000); + map(0x50010000, 0x50011fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x01f00000); + map(0x50012060, 0x50012063).r(FUNC(mac_state::macii_scsi_drq_r)).mirror(0x01f00000); map(0x50014000, 0x50015fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)).mirror(0x01f00000); - map(0x50016000, 0x50017fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x01f00000); - map(0x50024000, 0x50027fff).r(this, FUNC(mac_state::buserror_r)).mirror(0x01f00000); // bus error here to make sure we aren't mistaken for another decoder + map(0x50016000, 0x50017fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x01f00000); + map(0x50024000, 0x50027fff).r(FUNC(mac_state::buserror_r)).mirror(0x01f00000); // bus error here to make sure we aren't mistaken for another decoder map(0xfee08000, 0xfeffffff).ram().share("vram"); } @@ -766,16 +766,16 @@ void mac_state::macpb160_map(address_map &map) { map(0x40000000, 0x400fffff).rom().region("bootrom", 0).mirror(0x0ff00000); - map(0x50f00000, 0x50f01fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0x50f02000, 0x50f03fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)); - map(0x50f04000, 0x50f05fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); - map(0x50f06000, 0x50f07fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); - map(0x50f10000, 0x50f11fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); - map(0x50f12060, 0x50f12063).r(this, FUNC(mac_state::macii_scsi_drq_r)); + map(0x50f00000, 0x50f01fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0x50f02000, 0x50f03fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)); + map(0x50f04000, 0x50f05fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); + map(0x50f06000, 0x50f07fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); + map(0x50f10000, 0x50f11fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); + map(0x50f12060, 0x50f12063).r(FUNC(mac_state::macii_scsi_drq_r)); map(0x50f14000, 0x50f15fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)); - map(0x50f16000, 0x50f17fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0x50f20000, 0x50f21fff).rw(this, FUNC(mac_state::mac_gsc_r), FUNC(mac_state::mac_gsc_w)); - map(0x50f24000, 0x50f27fff).r(this, FUNC(mac_state::buserror_r)); // bus error here to make sure we aren't mistaken for another decoder + map(0x50f16000, 0x50f17fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0x50f20000, 0x50f21fff).rw(FUNC(mac_state::mac_gsc_r), FUNC(mac_state::mac_gsc_w)); + map(0x50f24000, 0x50f27fff).r(FUNC(mac_state::buserror_r)); // bus error here to make sure we aren't mistaken for another decoder map(0x60000000, 0x6001ffff).ram().share("vram").mirror(0x0ffe0000); } @@ -784,20 +784,20 @@ void mac_state::macpb165c_map(address_map &map) { map(0x40000000, 0x400fffff).rom().region("bootrom", 0).mirror(0x0ff00000); - map(0x50f00000, 0x50f01fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0x50f02000, 0x50f03fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)); - map(0x50f04000, 0x50f05fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); - map(0x50f06000, 0x50f07fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); - map(0x50f10000, 0x50f11fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); - map(0x50f12060, 0x50f12063).r(this, FUNC(mac_state::macii_scsi_drq_r)); + map(0x50f00000, 0x50f01fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0x50f02000, 0x50f03fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)); + map(0x50f04000, 0x50f05fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); + map(0x50f06000, 0x50f07fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); + map(0x50f10000, 0x50f11fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); + map(0x50f12060, 0x50f12063).r(FUNC(mac_state::macii_scsi_drq_r)); map(0x50f14000, 0x50f15fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)); - map(0x50f16000, 0x50f17fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0x50f20000, 0x50f21fff).r(this, FUNC(mac_state::buserror_r)); // bus error here to detect we're not the grayscale 160/165/180 - map(0x50f24000, 0x50f27fff).r(this, FUNC(mac_state::buserror_r)); // bus error here to make sure we aren't mistaken for another decoder + map(0x50f16000, 0x50f17fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0x50f20000, 0x50f21fff).r(FUNC(mac_state::buserror_r)); // bus error here to detect we're not the grayscale 160/165/180 + map(0x50f24000, 0x50f27fff).r(FUNC(mac_state::buserror_r)); // bus error here to make sure we aren't mistaken for another decoder // on-board color video on 165c/180c map(0xfc000000, 0xfc07ffff).ram().share("vram").mirror(0x00380000); // 512k of VRAM - map(0xfc400000, 0xfcefffff).rw(this, FUNC(mac_state::macwd_r), FUNC(mac_state::macwd_w)); + map(0xfc400000, 0xfcefffff).rw(FUNC(mac_state::macwd_r), FUNC(mac_state::macwd_w)); // fc4003c8 = DAC control, fc4003c9 = DAC data // fc4003da bit 3 is VBL map(0xfcff8000, 0xfcffffff).rom().region("vrom", 0x0000); @@ -807,18 +807,18 @@ void mac_state::macpd210_map(address_map &map) { map(0x40000000, 0x400fffff).rom().region("bootrom", 0).mirror(0x0ff00000); - map(0x50f00000, 0x50f01fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); - map(0x50f02000, 0x50f03fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)); - map(0x50f04000, 0x50f05fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); - map(0x50f06000, 0x50f07fff).rw(this, FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); - map(0x50f10000, 0x50f11fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); - map(0x50f12060, 0x50f12063).r(this, FUNC(mac_state::macii_scsi_drq_r)); + map(0x50f00000, 0x50f01fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)); + map(0x50f02000, 0x50f03fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)); + map(0x50f04000, 0x50f05fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)); + map(0x50f06000, 0x50f07fff).rw(FUNC(mac_state::macii_scsi_drq_r), FUNC(mac_state::macii_scsi_drq_w)); + map(0x50f10000, 0x50f11fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)); + map(0x50f12060, 0x50f12063).r(FUNC(mac_state::macii_scsi_drq_r)); map(0x50f14000, 0x50f15fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)); - map(0x50f16000, 0x50f17fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); - map(0x50f20000, 0x50f21fff).rw(this, FUNC(mac_state::mac_gsc_r), FUNC(mac_state::mac_gsc_w)); - map(0x50f24000, 0x50f27fff).r(this, FUNC(mac_state::buserror_r)); // bus error here to make sure we aren't mistaken for another decoder + map(0x50f16000, 0x50f17fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)); + map(0x50f20000, 0x50f21fff).rw(FUNC(mac_state::mac_gsc_r), FUNC(mac_state::mac_gsc_w)); + map(0x50f24000, 0x50f27fff).r(FUNC(mac_state::buserror_r)); // bus error here to make sure we aren't mistaken for another decoder - map(0x5ffffffc, 0x5fffffff).r(this, FUNC(mac_state::mac_read_id)); + map(0x5ffffffc, 0x5fffffff).r(FUNC(mac_state::mac_read_id)); map(0x60000000, 0x6001ffff).ram().share("vram").mirror(0x0ffe0000); } @@ -827,20 +827,20 @@ void mac_state::quadra700_map(address_map &map) { map(0x40000000, 0x400fffff).rom().region("bootrom", 0).mirror(0x0ff00000); - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00fc0000); - map(0x50002000, 0x50003fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00fc0000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00fc0000); + map(0x50002000, 0x50003fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00fc0000); // 50008000 = Ethernet MAC ID PROM // 5000a000 = Sonic (DP83932) ethernet // 5000f000 = SCSI cf96, 5000f402 = SCSI #2 cf96 - map(0x5000f000, 0x5000f3ff).rw(this, FUNC(mac_state::mac_5396_r), FUNC(mac_state::mac_5396_w)).mirror(0x00fc0000); - map(0x5000c000, 0x5000dfff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00fc0000); + map(0x5000f000, 0x5000f3ff).rw(FUNC(mac_state::mac_5396_r), FUNC(mac_state::mac_5396_w)).mirror(0x00fc0000); + map(0x5000c000, 0x5000dfff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00fc0000); map(0x50014000, 0x50015fff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write)).mirror(0x00fc0000); - map(0x5001e000, 0x5001ffff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00fc0000); + map(0x5001e000, 0x5001ffff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00fc0000); // f9800000 = VDAC / DAFB map(0xf9000000, 0xf91fffff).ram().share("vram"); - map(0xf9800000, 0xf98001ff).rw(this, FUNC(mac_state::dafb_r), FUNC(mac_state::dafb_w)); - map(0xf9800200, 0xf980023f).rw(this, FUNC(mac_state::dafb_dac_r), FUNC(mac_state::dafb_dac_w)); + map(0xf9800000, 0xf98001ff).rw(FUNC(mac_state::dafb_r), FUNC(mac_state::dafb_w)); + map(0xf9800200, 0xf980023f).rw(FUNC(mac_state::dafb_dac_r), FUNC(mac_state::dafb_dac_w)); } void mac_state::pwrmac_map(address_map &map) @@ -849,23 +849,23 @@ void mac_state::pwrmac_map(address_map &map) map(0x40000000, 0x403fffff).rom().region("bootrom", 0).mirror(0x0fc00000); - map(0x50000000, 0x50001fff).rw(this, FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); - map(0x50004000, 0x50005fff).rw(this, FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); + map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); + map(0x50004000, 0x50005fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); // 50008000 = ethernet ID PROM // 5000a000 = MACE ethernet controller - map(0x50010000, 0x50011fff).rw(this, FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); + map(0x50010000, 0x50011fff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macii_scsi_w)).mirror(0x00f00000); // 50014000 = sound registers (AWACS) map(0x50014000, 0x50015fff).rw(m_awacs, FUNC(awacs_device::read), FUNC(awacs_device::write)).mirror(0x01f00000); - map(0x50016000, 0x50017fff).rw(this, FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); - map(0x50024000, 0x50025fff).w(this, FUNC(mac_state::ariel_ramdac_w)).mirror(0x00f00000); - map(0x50026000, 0x50027fff).rw(this, FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00f00000); - map(0x50028000, 0x50028007).rw(this, FUNC(mac_state::mac_sonora_vctl_r), FUNC(mac_state::mac_sonora_vctl_w)).mirror(0x00f00000); + map(0x50016000, 0x50017fff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w)).mirror(0x00f00000); + map(0x50024000, 0x50025fff).w(FUNC(mac_state::ariel_ramdac_w)).mirror(0x00f00000); + map(0x50026000, 0x50027fff).rw(FUNC(mac_state::mac_via2_r), FUNC(mac_state::mac_via2_w)).mirror(0x00f00000); + map(0x50028000, 0x50028007).rw(FUNC(mac_state::mac_sonora_vctl_r), FUNC(mac_state::mac_sonora_vctl_w)).mirror(0x00f00000); // 5002a000 = interrupt controller // 5002c000 = diagnostic registers - map(0x5002c000, 0x5002dfff).r(this, FUNC(mac_state::pmac_diag_r)).mirror(0x00f00000); - map(0x50031000, 0x50032fff).rw(this, FUNC(mac_state::amic_dma_r), FUNC(mac_state::amic_dma_w)).mirror(0x00f00000); - map(0x50040000, 0x5004000f).rw(this, FUNC(mac_state::hmc_r), FUNC(mac_state::hmc_w)).mirror(0x00f00000); - map(0x5ffffff8, 0x5fffffff).r(this, FUNC(mac_state::mac_read_id)); + map(0x5002c000, 0x5002dfff).r(FUNC(mac_state::pmac_diag_r)).mirror(0x00f00000); + map(0x50031000, 0x50032fff).rw(FUNC(mac_state::amic_dma_r), FUNC(mac_state::amic_dma_w)).mirror(0x00f00000); + map(0x50040000, 0x5004000f).rw(FUNC(mac_state::hmc_r), FUNC(mac_state::hmc_w)).mirror(0x00f00000); + map(0x5ffffff8, 0x5fffffff).r(FUNC(mac_state::mac_read_id)); map(0xffc00000, 0xffffffff).rom().region("bootrom", 0); } diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index f32d1658bf3..37405b3b652 100644 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -1275,26 +1275,26 @@ MAC_DRIVER_INIT(macplus, MODEL_MAC_PLUS) void mac128_state::mac512ke_map(address_map &map) { - map(0x000000, 0x3fffff).rw(this, FUNC(mac128_state::ram_r), FUNC(mac128_state::ram_w)); + map(0x000000, 0x3fffff).rw(FUNC(mac128_state::ram_r), FUNC(mac128_state::ram_w)); map(0x400000, 0x4fffff).rom().region("bootrom", 0).mirror(0x100000); - map(0x600000, 0x6fffff).rw(this, FUNC(mac128_state::ram_600000_r), FUNC(mac128_state::ram_600000_w)); + map(0x600000, 0x6fffff).rw(FUNC(mac128_state::ram_600000_r), FUNC(mac128_state::ram_600000_w)); map(0x800000, 0x9fffff).r(m_scc, FUNC(z80scc_device::cd_ab_r)).umask16(0xff00); map(0xa00000, 0xbfffff).w(m_scc, FUNC(z80scc_device::cd_ab_w)).umask16(0x00ff); - map(0xc00000, 0xdfffff).rw(this, FUNC(mac128_state::mac_iwm_r), FUNC(mac128_state::mac_iwm_w)); - map(0xe80000, 0xefffff).rw(this, FUNC(mac128_state::mac_via_r), FUNC(mac128_state::mac_via_w)); - map(0xfffff0, 0xffffff).rw(this, FUNC(mac128_state::mac_autovector_r), FUNC(mac128_state::mac_autovector_w)); + map(0xc00000, 0xdfffff).rw(FUNC(mac128_state::mac_iwm_r), FUNC(mac128_state::mac_iwm_w)); + map(0xe80000, 0xefffff).rw(FUNC(mac128_state::mac_via_r), FUNC(mac128_state::mac_via_w)); + map(0xfffff0, 0xffffff).rw(FUNC(mac128_state::mac_autovector_r), FUNC(mac128_state::mac_autovector_w)); } void mac128_state::macplus_map(address_map &map) { - map(0x000000, 0x3fffff).rw(this, FUNC(mac128_state::ram_r), FUNC(mac128_state::ram_w)); + map(0x000000, 0x3fffff).rw(FUNC(mac128_state::ram_r), FUNC(mac128_state::ram_w)); map(0x400000, 0x4fffff).rom().region("bootrom", 0); - map(0x580000, 0x5fffff).rw(this, FUNC(mac128_state::macplus_scsi_r), FUNC(mac128_state::macplus_scsi_w)); + map(0x580000, 0x5fffff).rw(FUNC(mac128_state::macplus_scsi_r), FUNC(mac128_state::macplus_scsi_w)); map(0x800000, 0x9fffff).r(m_scc, FUNC(z80scc_device::cd_ab_r)).umask16(0xff00); map(0xa00000, 0xbfffff).w(m_scc, FUNC(z80scc_device::cd_ab_w)).umask16(0x00ff); - map(0xc00000, 0xdfffff).rw(this, FUNC(mac128_state::mac_iwm_r), FUNC(mac128_state::mac_iwm_w)); - map(0xe80000, 0xefffff).rw(this, FUNC(mac128_state::mac_via_r), FUNC(mac128_state::mac_via_w)); - map(0xfffff0, 0xffffff).rw(this, FUNC(mac128_state::mac_autovector_r), FUNC(mac128_state::mac_autovector_w)); + map(0xc00000, 0xdfffff).rw(FUNC(mac128_state::mac_iwm_r), FUNC(mac128_state::mac_iwm_w)); + map(0xe80000, 0xefffff).rw(FUNC(mac128_state::mac_via_r), FUNC(mac128_state::mac_via_w)); + map(0xfffff0, 0xffffff).rw(FUNC(mac128_state::mac_autovector_r), FUNC(mac128_state::mac_autovector_w)); } /*************************************************************************** diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp index da3f2b0503f..01ab8d27ee9 100644 --- a/src/mame/drivers/macpci.cpp +++ b/src/mame/drivers/macpci.cpp @@ -72,10 +72,10 @@ void macpci_state::pippin_mem(address_map &map) map(0x40000000, 0x403fffff).rom().region("bootrom", 0).mirror(0x0fc00000); // mirror of ROM for 680x0 emulation - map(0xf00dfff8, 0xf00dffff).r(this, FUNC(macpci_state::unk2_r)); - map(0xf3008800, 0xf3008807).r(this, FUNC(macpci_state::unk1_r)); + map(0xf00dfff8, 0xf00dffff).r(FUNC(macpci_state::unk2_r)); + map(0xf3008800, 0xf3008807).r(FUNC(macpci_state::unk1_r)); - map(0xf3016000, 0xf3017fff).rw(this, FUNC(macpci_state::mac_via_r), FUNC(macpci_state::mac_via_w)); + map(0xf3016000, 0xf3017fff).rw(FUNC(macpci_state::mac_via_r), FUNC(macpci_state::mac_via_w)); map(0xffc00000, 0xffffffff).rom().region("bootrom", 0); } diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp index 42f66522208..4232d3ed722 100644 --- a/src/mame/drivers/macrossp.cpp +++ b/src/mame/drivers/macrossp.cpp @@ -343,32 +343,32 @@ void macrossp_state::macrossp_map(address_map &map) map(0x000000, 0x3fffff).rom(); map(0x800000, 0x802fff).ram().share("spriteram"); /* SCR A Layer */ - map(0x900000, 0x903fff).ram().w(this, FUNC(macrossp_state::macrossp_scra_videoram_w)).share("scra_videoram"); + map(0x900000, 0x903fff).ram().w(FUNC(macrossp_state::macrossp_scra_videoram_w)).share("scra_videoram"); map(0x904200, 0x9043ff).ram().share("scra_linezoom"); /* W/O? */ map(0x905000, 0x90500b).ram().share("scra_videoregs"); /* W/O? */ /* SCR B Layer */ - map(0x908000, 0x90bfff).ram().w(this, FUNC(macrossp_state::macrossp_scrb_videoram_w)).share("scrb_videoram"); + map(0x908000, 0x90bfff).ram().w(FUNC(macrossp_state::macrossp_scrb_videoram_w)).share("scrb_videoram"); map(0x90c200, 0x90c3ff).ram().share("scrb_linezoom"); /* W/O? */ map(0x90d000, 0x90d00b).ram().share("scrb_videoregs"); /* W/O? */ /* SCR C Layer */ - map(0x910000, 0x913fff).ram().w(this, FUNC(macrossp_state::macrossp_scrc_videoram_w)).share("scrc_videoram"); + map(0x910000, 0x913fff).ram().w(FUNC(macrossp_state::macrossp_scrc_videoram_w)).share("scrc_videoram"); map(0x914200, 0x9143ff).ram().share("scrc_linezoom");/* W/O? */ map(0x915000, 0x91500b).ram().share("scrc_videoregs"); /* W/O? */ /* Text Layer */ - map(0x918000, 0x91bfff).ram().w(this, FUNC(macrossp_state::macrossp_text_videoram_w)).share("text_videoram"); + map(0x918000, 0x91bfff).ram().w(FUNC(macrossp_state::macrossp_text_videoram_w)).share("text_videoram"); map(0x91c200, 0x91c3ff).ram().share("text_linezoom"); /* W/O? */ map(0x91d000, 0x91d00b).ram().share("text_videoregs"); /* W/O? */ map(0xa00000, 0xa03fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0xb00000, 0xb00003).portr("INPUTS"); - map(0xb00004, 0xb00007).r(this, FUNC(macrossp_state::macrossp_soundstatus_r)).nopw(); // irq related? + map(0xb00004, 0xb00007).r(FUNC(macrossp_state::macrossp_soundstatus_r)).nopw(); // irq related? map(0xb00008, 0xb0000b).nopw(); // irq related? map(0xb0000c, 0xb0000f).portr("DSW").nopw(); - map(0xb00012, 0xb00013).w(this, FUNC(macrossp_state::palette_fade_w)); + map(0xb00012, 0xb00013).w(FUNC(macrossp_state::palette_fade_w)); map(0xb00020, 0xb00023).nopw(); - map(0xc00000, 0xc00003).w(this, FUNC(macrossp_state::macrossp_soundcmd_w)); + map(0xc00000, 0xc00003).w(FUNC(macrossp_state::macrossp_soundcmd_w)); map(0xf00000, 0xf1ffff).ram().share("mainram"); /* Main Ram */ // map(0xfe0000, 0xfe0003).noprw(); @@ -379,7 +379,7 @@ void macrossp_state::macrossp_sound_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x207fff).ram(); map(0x400000, 0x40007f).rw("ensoniq", FUNC(es5506_device::read), FUNC(es5506_device::write)).umask16(0x00ff); - map(0x600000, 0x600001).r(this, FUNC(macrossp_state::macrossp_soundcmd_r)); + map(0x600000, 0x600001).r(FUNC(macrossp_state::macrossp_soundcmd_r)); } /*** INPUT PORTS *************************************************************/ diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp index b81b8700705..98586d10a09 100644 --- a/src/mame/drivers/macs.cpp +++ b/src/mame/drivers/macs.cpp @@ -201,13 +201,13 @@ void macs_state::macs_io(address_map &map) { map.global_mask(0xff); //AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) /* video/crt regs ? */ - map(0xc0, 0xc7).rw(this, FUNC(macs_state::macs_input_r), FUNC(macs_state::macs_output_w)); + map(0xc0, 0xc7).rw(FUNC(macs_state::macs_input_r), FUNC(macs_state::macs_output_w)); map(0xe0, 0xe0).nopw(); /* renju = $40, neratte = 0 */ - map(0xe1, 0xe1).w(this, FUNC(macs_state::macs_rom_bank_w)); + map(0xe1, 0xe1).w(FUNC(macs_state::macs_rom_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) - map(0xe6, 0xe6).w(this, FUNC(macs_state::rambank_w)); /* banking ? ram bank ? shared rambank ? */ + map(0xe6, 0xe6).w(FUNC(macs_state::rambank_w)); /* banking ? ram bank ? shared rambank ? */ map(0xe7, 0xe7).nopw(); /* watchdog */ //AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r) } diff --git a/src/mame/drivers/madalien.cpp b/src/mame/drivers/madalien.cpp index 95d15597736..deee6927a85 100644 --- a/src/mame/drivers/madalien.cpp +++ b/src/mame/drivers/madalien.cpp @@ -71,17 +71,17 @@ void madalien_state::main_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x6000, 0x63ff).ram().w(this, FUNC(madalien_state::madalien_videoram_w)).share("videoram"); + map(0x6000, 0x63ff).ram().w(FUNC(madalien_state::madalien_videoram_w)).share("videoram"); map(0x6400, 0x67ff).ram(); - map(0x6800, 0x7fff).ram().w(this, FUNC(madalien_state::madalien_charram_w)).share("charram"); + map(0x6800, 0x7fff).ram().w(FUNC(madalien_state::madalien_charram_w)).share("charram"); map(0x8000, 0x8000).mirror(0x0ff0).w("crtc", FUNC(mc6845_device::address_w)); map(0x8001, 0x8001).mirror(0x0ff0).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x8004, 0x8004).mirror(0x0ff0).writeonly().share("video_control"); - map(0x8005, 0x8005).mirror(0x0ff0).w(this, FUNC(madalien_state::madalien_output_w)); + map(0x8005, 0x8005).mirror(0x0ff0).w(FUNC(madalien_state::madalien_output_w)); map(0x8006, 0x8006).mirror(0x0ff0).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x8008, 0x8008).mirror(0x07f0).ram().r(this, FUNC(madalien_state::shift_r)).share("shift_hi"); - map(0x8009, 0x8009).mirror(0x07f0).ram().r(this, FUNC(madalien_state::shift_rev_r)).share("shift_lo"); + map(0x8008, 0x8008).mirror(0x07f0).ram().r(FUNC(madalien_state::shift_r)).share("shift_hi"); + map(0x8009, 0x8009).mirror(0x07f0).ram().r(FUNC(madalien_state::shift_rev_r)).share("shift_lo"); map(0x800b, 0x800b).mirror(0x07f0).writeonly().share("video_flags"); map(0x800c, 0x800c).mirror(0x07f0).writeonly().share("headlight_pos"); map(0x800d, 0x800d).mirror(0x07f0).writeonly().share("edge1_pos"); diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp index 551e03bb055..825f68fcbea 100644 --- a/src/mame/drivers/magic10.cpp +++ b/src/mame/drivers/magic10.cpp @@ -326,14 +326,14 @@ WRITE16_MEMBER(magic10_state::magic10_out_w) void magic10_state::magic10_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); - map(0x101000, 0x101fff).ram().w(this, FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); - map(0x102000, 0x103fff).ram().w(this, FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); + map(0x100000, 0x100fff).ram().w(FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); + map(0x101000, 0x101fff).ram().w(FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); + map(0x102000, 0x103fff).ram().w(FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); map(0x200000, 0x2007ff).ram().share("nvram"); map(0x300000, 0x3001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x400000, 0x400001).portr("INPUTS"); map(0x400002, 0x400003).portr("DSW"); - map(0x400008, 0x400009).w(this, FUNC(magic10_state::magic10_out_w)); + map(0x400008, 0x400009).w(FUNC(magic10_state::magic10_out_w)); map(0x40000b, 0x40000b).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x40000e, 0x40000f).nopw(); map(0x400080, 0x400087).ram().share("vregs"); @@ -343,14 +343,14 @@ void magic10_state::magic10_map(address_map &map) void magic10_state::magic10a_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); - map(0x101000, 0x101fff).ram().w(this, FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); - map(0x102000, 0x103fff).ram().w(this, FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); + map(0x100000, 0x100fff).ram().w(FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); + map(0x101000, 0x101fff).ram().w(FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); + map(0x102000, 0x103fff).ram().w(FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); map(0x200000, 0x2007ff).ram().share("nvram"); map(0x300000, 0x3001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x500001).portr("INPUTS"); map(0x500002, 0x500003).portr("DSW"); - map(0x500008, 0x500009).w(this, FUNC(magic10_state::magic10_out_w)); + map(0x500008, 0x500009).w(FUNC(magic10_state::magic10_out_w)); map(0x50000b, 0x50000b).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x50000e, 0x50000f).nopw(); map(0x500080, 0x500087).ram().share("vregs"); // video registers? @@ -360,12 +360,12 @@ void magic10_state::magic10a_map(address_map &map) void magic10_state::magic102_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); - map(0x101000, 0x101fff).ram().w(this, FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); - map(0x102000, 0x103fff).ram().w(this, FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); + map(0x100000, 0x100fff).ram().w(FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); + map(0x101000, 0x101fff).ram().w(FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); + map(0x102000, 0x103fff).ram().w(FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); map(0x200000, 0x2007ff).ram().share("nvram"); map(0x400000, 0x4001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x500000, 0x500001).r(this, FUNC(magic10_state::magic102_r)); + map(0x500000, 0x500001).r(FUNC(magic10_state::magic102_r)); map(0x500004, 0x500005).nopr(); // gives credits map(0x500006, 0x500007).nopr(); // gives credits map(0x50001a, 0x50001b).portr("IN0"); @@ -380,12 +380,12 @@ void magic10_state::magic102_map(address_map &map) void magic10_state::hotslot_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); - map(0x101000, 0x101fff).ram().w(this, FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); - map(0x102000, 0x103fff).ram().w(this, FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); + map(0x100000, 0x100fff).ram().w(FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); + map(0x101000, 0x101fff).ram().w(FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); + map(0x102000, 0x103fff).ram().w(FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); map(0x200000, 0x2007ff).ram().share("nvram"); map(0x400000, 0x4001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x500004, 0x500005).rw(this, FUNC(magic10_state::hotslot_copro_r), FUNC(magic10_state::hotslot_copro_w)); // copro comm + map(0x500004, 0x500005).rw(FUNC(magic10_state::hotslot_copro_r), FUNC(magic10_state::hotslot_copro_w)); // copro comm map(0x500006, 0x500011).ram(); map(0x500012, 0x500013).portr("IN0"); map(0x500014, 0x500015).portr("IN1"); @@ -400,13 +400,13 @@ void magic10_state::hotslot_map(address_map &map) void magic10_state::sgsafari_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); - map(0x101000, 0x101fff).ram().w(this, FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); - map(0x102000, 0x103fff).ram().w(this, FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); + map(0x100000, 0x100fff).ram().w(FUNC(magic10_state::layer1_videoram_w)).share("layer1_videoram"); + map(0x101000, 0x101fff).ram().w(FUNC(magic10_state::layer0_videoram_w)).share("layer0_videoram"); + map(0x102000, 0x103fff).ram().w(FUNC(magic10_state::layer2_videoram_w)).share("layer2_videoram"); map(0x200000, 0x203fff).ram().share("nvram"); map(0x300000, 0x3001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500002, 0x500003).portr("DSW1"); - map(0x500008, 0x500009).w(this, FUNC(magic10_state::magic10_out_w)); + map(0x500008, 0x500009).w(FUNC(magic10_state::magic10_out_w)); map(0x50000b, 0x50000b).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x50000e, 0x50000f).portr("IN0"); map(0x500080, 0x500087).ram().share("vregs"); // video registers? diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index c5006fdc894..e1acecbf8f3 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -903,14 +903,14 @@ WRITE16_MEMBER(magicard_state::scc68070_mmu_w) void magicard_state::scc68070_mem(address_map &map) { - map(0x80001000, 0x8000100f).rw(this, FUNC(magicard_state::scc68070_ext_irqc_r), FUNC(magicard_state::scc68070_ext_irqc_w)).share("scc_xirqc_regs"); //lir - map(0x80002000, 0x8000200f).rw(this, FUNC(magicard_state::scc68070_iic_r), FUNC(magicard_state::scc68070_iic_w)).share("scc_iic_regs"); //i2c - map(0x80002010, 0x8000201f).rw(this, FUNC(magicard_state::scc68070_uart_r), FUNC(magicard_state::scc68070_uart_w)).share("scc_uart_regs"); - map(0x80002020, 0x8000202f).rw(this, FUNC(magicard_state::scc68070_timer_r), FUNC(magicard_state::scc68070_timer_w)).share("scc_timer_regs"); - map(0x80002040, 0x8000204f).rw(this, FUNC(magicard_state::scc68070_int_irqc_r), FUNC(magicard_state::scc68070_int_irqc_w)).share("scc_iirqc_regs"); - map(0x80004000, 0x8000403f).rw(this, FUNC(magicard_state::scc68070_dma_ch1_r), FUNC(magicard_state::scc68070_dma_ch1_w)).share("scc_dma1_regs"); - map(0x80004040, 0x8000407f).rw(this, FUNC(magicard_state::scc68070_dma_ch2_r), FUNC(magicard_state::scc68070_dma_ch2_w)).share("scc_dma2_regs"); - map(0x80008000, 0x8000807f).rw(this, FUNC(magicard_state::scc68070_mmu_r), FUNC(magicard_state::scc68070_mmu_w)).share("scc_mmu_regs"); + map(0x80001000, 0x8000100f).rw(FUNC(magicard_state::scc68070_ext_irqc_r), FUNC(magicard_state::scc68070_ext_irqc_w)).share("scc_xirqc_regs"); //lir + map(0x80002000, 0x8000200f).rw(FUNC(magicard_state::scc68070_iic_r), FUNC(magicard_state::scc68070_iic_w)).share("scc_iic_regs"); //i2c + map(0x80002010, 0x8000201f).rw(FUNC(magicard_state::scc68070_uart_r), FUNC(magicard_state::scc68070_uart_w)).share("scc_uart_regs"); + map(0x80002020, 0x8000202f).rw(FUNC(magicard_state::scc68070_timer_r), FUNC(magicard_state::scc68070_timer_w)).share("scc_timer_regs"); + map(0x80002040, 0x8000204f).rw(FUNC(magicard_state::scc68070_int_irqc_r), FUNC(magicard_state::scc68070_int_irqc_w)).share("scc_iirqc_regs"); + map(0x80004000, 0x8000403f).rw(FUNC(magicard_state::scc68070_dma_ch1_r), FUNC(magicard_state::scc68070_dma_ch1_w)).share("scc_dma1_regs"); + map(0x80004040, 0x8000407f).rw(FUNC(magicard_state::scc68070_dma_ch2_r), FUNC(magicard_state::scc68070_dma_ch2_w)).share("scc_dma2_regs"); + map(0x80008000, 0x8000807f).rw(FUNC(magicard_state::scc68070_mmu_r), FUNC(magicard_state::scc68070_mmu_w)).share("scc_mmu_regs"); } void magicard_state::magicard_mem(address_map &map) @@ -920,16 +920,16 @@ void magicard_state::magicard_mem(address_map &map) map(0x00000000, 0x001ffbff).mirror(0x00200000).ram().share("magicram"); map(0x00600000, 0x007ffbff).ram().share("magicramb"); /* 001ffc00-001ffdff System I/O */ - map(0x001ffc00, 0x001ffc01).mirror(0x7fe00000).r(this, FUNC(magicard_state::test_r)); - map(0x001ffc40, 0x001ffc41).mirror(0x7fe00000).r(this, FUNC(magicard_state::test_r)); + map(0x001ffc00, 0x001ffc01).mirror(0x7fe00000).r(FUNC(magicard_state::test_r)); + map(0x001ffc40, 0x001ffc41).mirror(0x7fe00000).r(FUNC(magicard_state::test_r)); map(0x001ffd01, 0x001ffd01).mirror(0x7fe00000).w("ramdac", FUNC(ramdac_device::index_w)); map(0x001ffd03, 0x001ffd03).mirror(0x7fe00000).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x001ffd05, 0x001ffd05).mirror(0x7fe00000).w("ramdac", FUNC(ramdac_device::mask_w)); map(0x001ffd40, 0x001ffd43).mirror(0x7fe00000).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff); - map(0x001ffd80, 0x001ffd81).mirror(0x7fe00000).r(this, FUNC(magicard_state::test_r)); + map(0x001ffd80, 0x001ffd81).mirror(0x7fe00000).r(FUNC(magicard_state::test_r)); map(0x001ffd80, 0x001ffd81).mirror(0x7fe00000).nopw(); //? map(0x001fff80, 0x001fffbf).mirror(0x7fe00000).ram(); //DRAM I/O, not accessed by this game, CD buffer? - map(0x001fffe0, 0x001fffff).mirror(0x7fe00000).rw(this, FUNC(magicard_state::philips_66470_r), FUNC(magicard_state::philips_66470_w)).share("pcab_vregs"); //video registers + map(0x001fffe0, 0x001fffff).mirror(0x7fe00000).rw(FUNC(magicard_state::philips_66470_r), FUNC(magicard_state::philips_66470_w)).share("pcab_vregs"); //video registers } void magicard_state::hotslots_mem(address_map &map) @@ -939,7 +939,7 @@ void magicard_state::hotslots_mem(address_map &map) map(0x00000000, 0x001ffbff).mirror(0x00200000).ram().share("magicram"); map(0x00600000, 0x007ffbff).ram().share("magicramb"); map(0x001fff80, 0x001fffbf).mirror(0x7fe00000).ram(); //DRAM I/O, not accessed by this game, CD buffer? - map(0x001fffe0, 0x001fffff).mirror(0x7fe00000).rw(this, FUNC(magicard_state::philips_66470_r), FUNC(magicard_state::philips_66470_w)).share("pcab_vregs"); //video registers + map(0x001fffe0, 0x001fffff).mirror(0x7fe00000).rw(FUNC(magicard_state::philips_66470_r), FUNC(magicard_state::philips_66470_w)).share("pcab_vregs"); //video registers map(0x00414001, 0x00414001).w("ramdac", FUNC(ramdac_device::index_w)); map(0x00414003, 0x00414003).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x00414005, 0x00414005).w("ramdac", FUNC(ramdac_device::mask_w)); diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index 8aad5870620..f99a0603475 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -682,10 +682,10 @@ void magicfly_state::magicfly_map(address_map &map) map(0x0000, 0x07ff).ram().share("nvram"); /* MK48Z02B NVRAM */ map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w)); map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x1000, 0x13ff).ram().w(this, FUNC(magicfly_state::magicfly_videoram_w)).share("videoram"); /* HM6116LP #1 (2K x 8) RAM (only 1st half used) */ - map(0x1800, 0x1bff).ram().w(this, FUNC(magicfly_state::magicfly_colorram_w)).share("colorram"); /* HM6116LP #2 (2K x 8) RAM (only 1st half used) */ - map(0x2800, 0x2800).r(this, FUNC(magicfly_state::mux_port_r)); /* multiplexed input port */ - map(0x3000, 0x3000).w(this, FUNC(magicfly_state::mux_port_w)); /* output port */ + map(0x1000, 0x13ff).ram().w(FUNC(magicfly_state::magicfly_videoram_w)).share("videoram"); /* HM6116LP #1 (2K x 8) RAM (only 1st half used) */ + map(0x1800, 0x1bff).ram().w(FUNC(magicfly_state::magicfly_colorram_w)).share("colorram"); /* HM6116LP #2 (2K x 8) RAM (only 1st half used) */ + map(0x2800, 0x2800).r(FUNC(magicfly_state::mux_port_r)); /* multiplexed input port */ + map(0x3000, 0x3000).w(FUNC(magicfly_state::mux_port_w)); /* output port */ map(0xc000, 0xffff).rom(); /* ROM space */ } diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp index b6c97ab2dcf..8d0c879cc22 100644 --- a/src/mame/drivers/magictg.cpp +++ b/src/mame/drivers/magictg.cpp @@ -852,17 +852,17 @@ void magictg_state::magictg_map(address_map &map) map(0x0a000000, 0x0affffff).rw("voodoo_0", FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); #if defined(USE_TWO_3DFX) map(0x0b000000, 0x0bffffff).rw("voodoo_1", FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); - map(0x0c000000, 0x0c000fff).rw(this, FUNC(magictg_state::zr36120_r), FUNC(magictg_state::zr36120_w)); + map(0x0c000000, 0x0c000fff).rw(FUNC(magictg_state::zr36120_r), FUNC(magictg_state::zr36120_w)); #else - map(0x0b000000, 0x0b000fff).rw(this, FUNC(magictg_state::zr36120_r), FUNC(magictg_state::zr36120_w)); + map(0x0b000000, 0x0b000fff).rw(FUNC(magictg_state::zr36120_r), FUNC(magictg_state::zr36120_w)); #endif - map(0x0f000000, 0x0f000fff).rw(this, FUNC(magictg_state::f0_r), FUNC(magictg_state::f0_w)); // Split this up? - map(0x14000100, 0x14000103).rw(this, FUNC(magictg_state::adsp_idma_data_r), FUNC(magictg_state::adsp_idma_data_w)); - map(0x14000104, 0x14000107).w(this, FUNC(magictg_state::adsp_idma_addr_w)); - map(0x1b001024, 0x1b001027).r(this, FUNC(magictg_state::adsp_status_r)); - map(0x1b001108, 0x1b00110b).r(this, FUNC(magictg_state::unk_r)); + map(0x0f000000, 0x0f000fff).rw(FUNC(magictg_state::f0_r), FUNC(magictg_state::f0_w)); // Split this up? + map(0x14000100, 0x14000103).rw(FUNC(magictg_state::adsp_idma_data_r), FUNC(magictg_state::adsp_idma_data_w)); + map(0x14000104, 0x14000107).w(FUNC(magictg_state::adsp_idma_addr_w)); + map(0x1b001024, 0x1b001027).r(FUNC(magictg_state::adsp_status_r)); + map(0x1b001108, 0x1b00110b).r(FUNC(magictg_state::unk_r)); map(0x1e000000, 0x1e002fff).ram(); // NVRAM? - map(0x1e800000, 0x1e800007).rw(this, FUNC(magictg_state::unk2_r), FUNC(magictg_state::serial_w)); + map(0x1e800000, 0x1e800007).rw(FUNC(magictg_state::unk2_r), FUNC(magictg_state::serial_w)); map(0x1fc00000, 0x1fffffff).rom().region("mips", 0); } @@ -884,7 +884,7 @@ void magictg_state::adsp_data_map(address_map &map) map.unmap_value_high(); // AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("databank") map(0x0400, 0x3fdf).ram(); - map(0x3fe0, 0x3fff).rw(this, FUNC(magictg_state::adsp_control_r), FUNC(magictg_state::adsp_control_w)); + map(0x3fe0, 0x3fff).rw(FUNC(magictg_state::adsp_control_r), FUNC(magictg_state::adsp_control_w)); } void magictg_state::adsp_io_map(address_map &map) diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp index 033dfca8eb4..44af74b5432 100644 --- a/src/mame/drivers/magmax.cpp +++ b/src/mame/drivers/magmax.cpp @@ -200,11 +200,11 @@ void magmax_state::magmax_map(address_map &map) map(0x030002, 0x030003).portr("P2"); map(0x030004, 0x030005).portr("SYSTEM"); map(0x030006, 0x030007).portr("DSW"); - map(0x030010, 0x030011).w(this, FUNC(magmax_state::magmax_vreg_w)).share("vreg"); + map(0x030010, 0x030011).w(FUNC(magmax_state::magmax_vreg_w)).share("vreg"); map(0x030012, 0x030013).writeonly().share("scroll_x"); map(0x030014, 0x030015).writeonly().share("scroll_y"); map(0x03001d, 0x03001d).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x03001e, 0x03001f).w(this, FUNC(magmax_state::cpu_irq_ack_w)); + map(0x03001e, 0x03001f).w(FUNC(magmax_state::cpu_irq_ack_w)); } void magmax_state::magmax_sound_map(address_map &map) @@ -221,7 +221,7 @@ void magmax_state::magmax_sound_io_map(address_map &map) map(0x00, 0x01).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x02, 0x03).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x04, 0x05).w("ay3", FUNC(ay8910_device::address_data_w)); - map(0x06, 0x06).r(this, FUNC(magmax_state::magmax_sound_r)); + map(0x06, 0x06).r(FUNC(magmax_state::magmax_sound_r)); } diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp index c85055dd0b3..7cde1c84793 100644 --- a/src/mame/drivers/magnum.cpp +++ b/src/mame/drivers/magnum.cpp @@ -266,9 +266,9 @@ void magnum_state::magnum_io(address_map &map) map(0x001a, 0x001b).rw("lcdc2", FUNC(hd61830_device::status_r), FUNC(hd61830_device::control_w)).umask16(0x00ff); map(0x001c, 0x001d).rw("lcdc1", FUNC(hd61830_device::data_r), FUNC(hd61830_device::data_w)).umask16(0x00ff); map(0x001e, 0x001f).rw("lcdc1", FUNC(hd61830_device::status_r), FUNC(hd61830_device::control_w)).umask16(0x00ff); - map(0x0040, 0x004f).rw(this, FUNC(magnum_state::sysctl_r), FUNC(magnum_state::sysctl_w)); - map(0x0050, 0x0051).rw(this, FUNC(magnum_state::irqstat_r), FUNC(magnum_state::port50_w)); - map(0x0056, 0x0056).w(this, FUNC(magnum_state::beep_w)); + map(0x0040, 0x004f).rw(FUNC(magnum_state::sysctl_r), FUNC(magnum_state::sysctl_w)); + map(0x0050, 0x0051).rw(FUNC(magnum_state::irqstat_r), FUNC(magnum_state::port50_w)); + map(0x0056, 0x0056).w(FUNC(magnum_state::beep_w)); map(0x0080, 0x008f).rw("rtc", FUNC(cdp1879_device::read), FUNC(cdp1879_device::write)).umask16(0x00ff); //map(0x0100, 0x0107).rw("fdc", FUNC(wd1793_device::read), FUNC(wd1793_device::write)).umask16(0x00ff); } diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp index 03cc39863aa..a8f02b2a61e 100644 --- a/src/mame/drivers/magtouch.cpp +++ b/src/mame/drivers/magtouch.cpp @@ -149,7 +149,7 @@ void magtouch_state::magtouch_map(address_map &map) void magtouch_state::magtouch_io(address_map &map) { pcat32_io_common(map); - map(0x02e0, 0x02e7).rw(this, FUNC(magtouch_state::magtouch_io_r), FUNC(magtouch_state::magtouch_io_w)); + map(0x02e0, 0x02e7).rw(FUNC(magtouch_state::magtouch_io_r), FUNC(magtouch_state::magtouch_io_w)); map(0x03b0, 0x03bf).rw("vga", FUNC(trident_vga_device::port_03b0_r), FUNC(trident_vga_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(trident_vga_device::port_03c0_r), FUNC(trident_vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(trident_vga_device::port_03d0_r), FUNC(trident_vga_device::port_03d0_w)); diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp index ff0077c049b..bd2033fbd68 100644 --- a/src/mame/drivers/mainevt.cpp +++ b/src/mame/drivers/mainevt.cpp @@ -156,13 +156,13 @@ WRITE8_MEMBER(mainevt_state::k052109_051960_w) void mainevt_state::mainevt_map(address_map &map) { - map(0x0000, 0x3fff).rw(this, FUNC(mainevt_state::k052109_051960_r), FUNC(mainevt_state::k052109_051960_w)); + map(0x0000, 0x3fff).rw(FUNC(mainevt_state::k052109_051960_r), FUNC(mainevt_state::k052109_051960_w)); - map(0x1f80, 0x1f80).w(this, FUNC(mainevt_state::mainevt_bankswitch_w)); + map(0x1f80, 0x1f80).w(FUNC(mainevt_state::mainevt_bankswitch_w)); map(0x1f84, 0x1f84).w("soundlatch", FUNC(generic_latch_8_device::write)); /* probably */ - map(0x1f88, 0x1f88).w(this, FUNC(mainevt_state::mainevt_sh_irqtrigger_w)); /* probably */ + map(0x1f88, 0x1f88).w(FUNC(mainevt_state::mainevt_sh_irqtrigger_w)); /* probably */ map(0x1f8c, 0x1f8d).nopw(); /* ??? */ - map(0x1f90, 0x1f90).w(this, FUNC(mainevt_state::mainevt_coin_w)); /* coin counters + lamps */ + map(0x1f90, 0x1f90).w(FUNC(mainevt_state::mainevt_coin_w)); /* coin counters + lamps */ map(0x1f94, 0x1f94).portr("SYSTEM"); map(0x1f95, 0x1f95).portr("P1"); @@ -182,12 +182,12 @@ void mainevt_state::mainevt_map(address_map &map) void mainevt_state::devstors_map(address_map &map) { - map(0x0000, 0x3fff).rw(this, FUNC(mainevt_state::k052109_051960_r), FUNC(mainevt_state::k052109_051960_w)); + map(0x0000, 0x3fff).rw(FUNC(mainevt_state::k052109_051960_r), FUNC(mainevt_state::k052109_051960_w)); - map(0x1f80, 0x1f80).w(this, FUNC(mainevt_state::mainevt_bankswitch_w)); + map(0x1f80, 0x1f80).w(FUNC(mainevt_state::mainevt_bankswitch_w)); map(0x1f84, 0x1f84).w("soundlatch", FUNC(generic_latch_8_device::write)); /* probably */ - map(0x1f88, 0x1f88).w(this, FUNC(mainevt_state::mainevt_sh_irqtrigger_w)); /* probably */ - map(0x1f90, 0x1f90).w(this, FUNC(mainevt_state::mainevt_coin_w)); /* coin counters + lamps */ + map(0x1f88, 0x1f88).w(FUNC(mainevt_state::mainevt_sh_irqtrigger_w)); /* probably */ + map(0x1f90, 0x1f90).w(FUNC(mainevt_state::mainevt_coin_w)); /* coin counters + lamps */ map(0x1f94, 0x1f94).portr("SYSTEM"); map(0x1f95, 0x1f95).portr("P1"); @@ -196,7 +196,7 @@ void mainevt_state::devstors_map(address_map &map) map(0x1f98, 0x1f98).portr("DSW3"); map(0x1f9b, 0x1f9b).portr("DSW2"); map(0x1fa0, 0x1fbf).rw("k051733", FUNC(k051733_device::read), FUNC(k051733_device::write)); - map(0x1fb2, 0x1fb2).w(this, FUNC(mainevt_state::dv_nmienable_w)); + map(0x1fb2, 0x1fb2).w(FUNC(mainevt_state::dv_nmienable_w)); map(0x4000, 0x5dff).ram(); map(0x5e00, 0x5fff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); @@ -212,9 +212,9 @@ void mainevt_state::mainevt_sound_map(address_map &map) map(0x9000, 0x9000).w(m_upd7759, FUNC(upd7759_device::port_w)); map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); - map(0xd000, 0xd000).r(this, FUNC(mainevt_state::mainevt_sh_busy_r)); - map(0xe000, 0xe000).w(this, FUNC(mainevt_state::mainevt_sh_irqcontrol_w)); - map(0xf000, 0xf000).w(this, FUNC(mainevt_state::mainevt_sh_bankswitch_w)); + map(0xd000, 0xd000).r(FUNC(mainevt_state::mainevt_sh_busy_r)); + map(0xe000, 0xe000).w(FUNC(mainevt_state::mainevt_sh_irqcontrol_w)); + map(0xf000, 0xf000).w(FUNC(mainevt_state::mainevt_sh_bankswitch_w)); } void mainevt_state::devstors_sound_map(address_map &map) @@ -224,8 +224,8 @@ void mainevt_state::devstors_sound_map(address_map &map) map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xe000, 0xe000).w(this, FUNC(mainevt_state::devstor_sh_irqcontrol_w)); - map(0xf000, 0xf000).w(this, FUNC(mainevt_state::dv_sh_bankswitch_w)); + map(0xe000, 0xe000).w(FUNC(mainevt_state::devstor_sh_irqcontrol_w)); + map(0xf000, 0xf000).w(FUNC(mainevt_state::dv_sh_bankswitch_w)); } diff --git a/src/mame/drivers/mainsnk.cpp b/src/mame/drivers/mainsnk.cpp index 3afe337182b..cd2b7d5371b 100644 --- a/src/mame/drivers/mainsnk.cpp +++ b/src/mame/drivers/mainsnk.cpp @@ -135,12 +135,12 @@ void mainsnk_state::main_map(address_map &map) map(0xc300, 0xc300).portr("IN3"); map(0xc400, 0xc400).portr("DSW1"); map(0xc500, 0xc500).portr("DSW2"); - map(0xc600, 0xc600).w(this, FUNC(mainsnk_state::c600_w)); + map(0xc600, 0xc600).w(FUNC(mainsnk_state::c600_w)); map(0xc700, 0xc700).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xd800, 0xdbff).ram().w(this, FUNC(mainsnk_state::bgram_w)).share("bgram"); + map(0xd800, 0xdbff).ram().w(FUNC(mainsnk_state::bgram_w)).share("bgram"); map(0xdc00, 0xe7ff).ram(); map(0xe800, 0xefff).ram().share("spriteram"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(mainsnk_state::fgram_w)).share("fgram"); // + work RAM + map(0xf000, 0xf7ff).ram().w(FUNC(mainsnk_state::fgram_w)).share("fgram"); // + work RAM } void mainsnk_state::sound_map(address_map &map) @@ -157,7 +157,7 @@ void mainsnk_state::sound_map(address_map &map) void mainsnk_state::sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(mainsnk_state::sound_ack_r)); + map(0x00, 0x00).r(FUNC(mainsnk_state::sound_ack_r)); } diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp index 7feac629715..3260040bb01 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -764,8 +764,8 @@ void majorpkr_state::palettebanks(address_map &map) void majorpkr_state::vrambanks(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(majorpkr_state::fg_vram_w)).share("fg_vram"); - map(0x0800, 0x0fff).ram().w(this, FUNC(majorpkr_state::bg_vram_w)).share("bg_vram"); + map(0x0000, 0x07ff).ram().w(FUNC(majorpkr_state::fg_vram_w)).share("fg_vram"); + map(0x0800, 0x0fff).ram().w(FUNC(majorpkr_state::bg_vram_w)).share("bg_vram"); map(0x1000, 0x1fff).ram(); // spare vram? cleared during boot along with fg and bg } @@ -793,20 +793,20 @@ void majorpkr_state::vrambanks(address_map &map) void majorpkr_state::portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(majorpkr_state::rom_bank_w)); - map(0x01, 0x01).w(this, FUNC(majorpkr_state::palette_bank_w)); - map(0x02, 0x02).w(this, FUNC(majorpkr_state::vram_bank_w)); + map(0x00, 0x00).w(FUNC(majorpkr_state::rom_bank_w)); + map(0x01, 0x01).w(FUNC(majorpkr_state::palette_bank_w)); + map(0x02, 0x02).w(FUNC(majorpkr_state::vram_bank_w)); - map(0x10, 0x10).r(this, FUNC(majorpkr_state::mux_port2_r)); // muxed set of controls. - map(0x10, 0x10).w(this, FUNC(majorpkr_state::pulses_w)); // kind of watchdog on bit4... mech counters on bits 0-1-2-3. + map(0x10, 0x10).r(FUNC(majorpkr_state::mux_port2_r)); // muxed set of controls. + map(0x10, 0x10).w(FUNC(majorpkr_state::pulses_w)); // kind of watchdog on bit4... mech counters on bits 0-1-2-3. map(0x11, 0x11).portr("IN1"); - map(0x11, 0x11).w(this, FUNC(majorpkr_state::mux_sel_w)); // multiplexer selector. + map(0x11, 0x11).w(FUNC(majorpkr_state::mux_sel_w)); // multiplexer selector. map(0x12, 0x12).portr("IN2"); - map(0x12, 0x12).w(this, FUNC(majorpkr_state::vidreg_w)); // video registers: normal or up down screen. - map(0x13, 0x13).r(this, FUNC(majorpkr_state::mux_port_r)); // all 4 DIP switches banks multiplexed. - map(0x13, 0x13).w(this, FUNC(majorpkr_state::lamps_a_w)); // lamps a out. + map(0x12, 0x12).w(FUNC(majorpkr_state::vidreg_w)); // video registers: normal or up down screen. + map(0x13, 0x13).r(FUNC(majorpkr_state::mux_port_r)); // all 4 DIP switches banks multiplexed. + map(0x13, 0x13).w(FUNC(majorpkr_state::lamps_a_w)); // lamps a out. map(0x14, 0x14).portr("TEST"); // "freeze" switch. - map(0x14, 0x14).w(this, FUNC(majorpkr_state::lamps_b_w)); // lamps b out. + map(0x14, 0x14).w(FUNC(majorpkr_state::lamps_b_w)); // lamps b out. map(0x30, 0x30).w("crtc", FUNC(mc6845_device::address_w)); map(0x31, 0x31).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp index a9994e627a5..a981da9da1c 100644 --- a/src/mame/drivers/malzak.cpp +++ b/src/mame/drivers/malzak.cpp @@ -108,9 +108,9 @@ void malzak_state::malzak_map(address_map &map) map(0x1200, 0x12ff).mirror(0x6000).ram(); map(0x1300, 0x13ff).mirror(0x6000).ram(); map(0x1400, 0x14ff).mirror(0x6000).rw(m_s2636[0], FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); - map(0x14cb, 0x14cb).mirror(0x6000).r(this, FUNC(malzak_state::fake_VRLE_r)); + map(0x14cb, 0x14cb).mirror(0x6000).r(FUNC(malzak_state::fake_VRLE_r)); map(0x1500, 0x15ff).mirror(0x6000).rw(m_s2636[1], FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); - map(0x1600, 0x16ff).mirror(0x6000).ram().w(this, FUNC(malzak_state::malzak_playfield_w)); + map(0x1600, 0x16ff).mirror(0x6000).ram().w(FUNC(malzak_state::malzak_playfield_w)); map(0x1700, 0x17ff).mirror(0x6000).ram(); map(0x1800, 0x1fff).mirror(0x6000).ram().share("videoram"); map(0x2000, 0x2fff).rom(); @@ -129,10 +129,10 @@ void malzak_state::malzak2_map(address_map &map) map(0x1200, 0x12ff).mirror(0x6000).ram(); map(0x1300, 0x13ff).mirror(0x6000).ram(); map(0x1400, 0x14ff).mirror(0x6000).rw(m_s2636[0], FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); - map(0x14cb, 0x14cb).mirror(0x6000).r(this, FUNC(malzak_state::fake_VRLE_r)); - map(0x14cc, 0x14cc).mirror(0x6000).r(this, FUNC(malzak_state::s2636_portA_r)); + map(0x14cb, 0x14cb).mirror(0x6000).r(FUNC(malzak_state::fake_VRLE_r)); + map(0x14cc, 0x14cc).mirror(0x6000).r(FUNC(malzak_state::s2636_portA_r)); map(0x1500, 0x15ff).mirror(0x6000).rw(m_s2636[1], FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); - map(0x1600, 0x16ff).mirror(0x6000).ram().w(this, FUNC(malzak_state::malzak_playfield_w)); + map(0x1600, 0x16ff).mirror(0x6000).ram().w(FUNC(malzak_state::malzak_playfield_w)); map(0x1700, 0x17ff).mirror(0x6000).ram().share("nvram"); map(0x1800, 0x1fff).mirror(0x6000).ram().share("videoram"); map(0x2000, 0x2fff).rom(); @@ -183,17 +183,17 @@ READ8_MEMBER(malzak_state::collision_r) void malzak_state::malzak_io_map(address_map &map) { - map(0x00, 0x00).r(this, FUNC(malzak_state::collision_r)); // returns where a collision can occur. - map(0x40, 0x40).w(this, FUNC(malzak_state::port40_w)); // possibly sound codes for dual SN76477s - map(0x60, 0x60).w(this, FUNC(malzak_state::port60_w)); // possibly playfield scroll X offset + map(0x00, 0x00).r(FUNC(malzak_state::collision_r)); // returns where a collision can occur. + map(0x40, 0x40).w(FUNC(malzak_state::port40_w)); // possibly sound codes for dual SN76477s + map(0x60, 0x60).w(FUNC(malzak_state::port60_w)); // possibly playfield scroll X offset map(0x80, 0x80).portr("IN0"); //controls map(0xa0, 0xa0).nopw(); // echoes I/O port read from port 0x80 - map(0xc0, 0xc0).w(this, FUNC(malzak_state::portc0_w)); // possibly playfield row selection for writing and/or collisions + map(0xc0, 0xc0).w(FUNC(malzak_state::portc0_w)); // possibly playfield row selection for writing and/or collisions } void malzak_state::malzak_data_map(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).r(this, FUNC(malzak_state::s2650_data_r)); // read upon death + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(malzak_state::s2650_data_r)); // read upon death } diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index f7b4395541e..fcdf376657f 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -644,9 +644,9 @@ WRITE_LINE_MEMBER(mappy_state::vblank_irq) void mappy_state::superpac_cpu1_map(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(mappy_state::superpac_videoram_w)).share("videoram"); /* video RAM */ + map(0x0000, 0x07ff).ram().w(FUNC(mappy_state::superpac_videoram_w)).share("videoram"); /* video RAM */ map(0x0800, 0x1fff).ram().share("spriteram"); /* work RAM with embedded sprite RAM */ - map(0x2000, 0x2000).rw(this, FUNC(mappy_state::superpac_flipscreen_r), FUNC(mappy_state::superpac_flipscreen_w)); + map(0x2000, 0x2000).rw(FUNC(mappy_state::superpac_flipscreen_r), FUNC(mappy_state::superpac_flipscreen_w)); map(0x4000, 0x43ff).rw(m_namco_15xx, FUNC(namco_15xx_device::sharedram_r), FUNC(namco_15xx_device::sharedram_w)); /* shared RAM with the sound CPU */ map(0x4800, 0x480f).rw("namcoio_1", FUNC(namcoio_device::read), FUNC(namcoio_device::write)); /* custom I/O chips interface */ map(0x4810, 0x481f).rw("namcoio_2", FUNC(namcoio_device::read), FUNC(namcoio_device::write)); /* custom I/O chips interface */ @@ -657,7 +657,7 @@ void mappy_state::superpac_cpu1_map(address_map &map) void mappy_state::phozon_cpu1_map(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(mappy_state::superpac_videoram_w)).share("videoram"); /* video RAM */ + map(0x0000, 0x07ff).ram().w(FUNC(mappy_state::superpac_videoram_w)).share("videoram"); /* video RAM */ map(0x0800, 0x1fff).ram().share("spriteram"); /* shared RAM with CPU #2/sprite RAM*/ map(0x4000, 0x43ff).rw(m_namco_15xx, FUNC(namco_15xx_device::sharedram_r), FUNC(namco_15xx_device::sharedram_w)); /* shared RAM with the sound CPU */ map(0x4800, 0x480f).rw("namcoio_1", FUNC(namcoio_device::read), FUNC(namcoio_device::write)); /* custom I/O chips interface */ @@ -669,9 +669,9 @@ void mappy_state::phozon_cpu1_map(address_map &map) void mappy_state::mappy_cpu1_map(address_map &map) { - map(0x0000, 0x0fff).ram().w(this, FUNC(mappy_state::mappy_videoram_w)).share("videoram"); /* video RAM */ + map(0x0000, 0x0fff).ram().w(FUNC(mappy_state::mappy_videoram_w)).share("videoram"); /* video RAM */ map(0x1000, 0x27ff).ram().share("spriteram"); /* work RAM with embedded sprite RAM */ - map(0x3800, 0x3fff).w(this, FUNC(mappy_state::mappy_scroll_w)); /* scroll */ + map(0x3800, 0x3fff).w(FUNC(mappy_state::mappy_scroll_w)); /* scroll */ map(0x4000, 0x43ff).rw(m_namco_15xx, FUNC(namco_15xx_device::sharedram_r), FUNC(namco_15xx_device::sharedram_w)); /* shared RAM with the sound CPU */ map(0x4800, 0x480f).rw("namcoio_1", FUNC(namcoio_device::read), FUNC(namcoio_device::write)); /* custom I/O chips interface */ map(0x4810, 0x481f).rw("namcoio_2", FUNC(namcoio_device::read), FUNC(namcoio_device::write)); /* custom I/O chips interface */ @@ -704,7 +704,7 @@ void mappy_state::mappy_cpu2_map(address_map &map) /* extra CPU only present in Phozon */ void mappy_state::phozon_cpu3_map(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(mappy_state::superpac_videoram_w)).share("videoram"); /* video RAM */ + map(0x0000, 0x07ff).ram().w(FUNC(mappy_state::superpac_videoram_w)).share("videoram"); /* video RAM */ map(0x0800, 0x1fff).ram().share("spriteram"); /* shared RAM with CPU #2/sprite RAM*/ map(0x4000, 0x43ff).rw(m_namco_15xx, FUNC(namco_15xx_device::sharedram_r), FUNC(namco_15xx_device::sharedram_w)); /* shared RAM with CPU #2 */ map(0xa000, 0xa7ff).ram(); /* RAM */ @@ -2079,7 +2079,7 @@ void mappy_state::init_grobda() However, removing the 15XX from the board causes sound to disappear completely, so the 15XX may still play some part in conveying speech to the DAC. */ - m_subcpu->space(AS_PROGRAM).install_write_handler(0x0002, 0x0002, write8_delegate(FUNC(dac_byte_interface::write), (dac_byte_interface *)m_dac)); + m_subcpu->space(AS_PROGRAM).install_write_handler(0x0002, 0x0002, write8_delegate(FUNC(dac_byte_interface::data_w), (dac_byte_interface *)m_dac)); } diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp index d547539313b..2daba71e7d0 100644 --- a/src/mame/drivers/marineb.cpp +++ b/src/mame/drivers/marineb.cpp @@ -79,12 +79,12 @@ void marineb_state::marineb_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(marineb_state::marineb_videoram_w)).share("videoram"); + map(0x8800, 0x8bff).ram().w(FUNC(marineb_state::marineb_videoram_w)).share("videoram"); map(0x8c00, 0x8c3f).ram().share("spriteram"); /* Hoccer only */ - map(0x9000, 0x93ff).ram().w(this, FUNC(marineb_state::marineb_colorram_w)).share("colorram"); - map(0x9800, 0x9800).w(this, FUNC(marineb_state::marineb_column_scroll_w)); - map(0x9a00, 0x9a00).w(this, FUNC(marineb_state::marineb_palette_bank_0_w)); - map(0x9c00, 0x9c00).w(this, FUNC(marineb_state::marineb_palette_bank_1_w)); + map(0x9000, 0x93ff).ram().w(FUNC(marineb_state::marineb_colorram_w)).share("colorram"); + map(0x9800, 0x9800).w(FUNC(marineb_state::marineb_column_scroll_w)); + map(0x9a00, 0x9a00).w(FUNC(marineb_state::marineb_palette_bank_0_w)); + map(0x9c00, 0x9c00).w(FUNC(marineb_state::marineb_palette_bank_1_w)); map(0xa000, 0xa007).w("outlatch", FUNC(ls259_device::write_d0)); map(0xa000, 0xa000).portr("P2"); map(0xa800, 0xa800).portr("P1"); diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp index b9935ecf1fa..c1aa14137f3 100644 --- a/src/mame/drivers/marinedt.cpp +++ b/src/mame/drivers/marinedt.cpp @@ -442,24 +442,24 @@ void marinedt_state::marinedt_map(address_map &map) map.global_mask(0x7fff); /* A15 is not decoded */ map(0x0000, 0x3fff).rom().region("ipl", 0); map(0x4000, 0x43ff).mirror(0x0400).ram(); - map(0x4800, 0x4bff).mirror(0x0400).ram().w(this, FUNC(marinedt_state::vram_w)).share("vram"); + map(0x4800, 0x4bff).mirror(0x0400).ram().w(FUNC(marinedt_state::vram_w)).share("vram"); } void marinedt_state::marinedt_io(address_map &map) { map.global_mask(0x0f); map(0x00, 0x00).portr("DSW1"); - map(0x01, 0x01).r(this, FUNC(marinedt_state::trackball_r)); - map(0x02, 0x02).select(0xc).r(this, FUNC(marinedt_state::pc3259_r)); - map(0x02, 0x04).w(this, FUNC(marinedt_state::obj_0_w)); + map(0x01, 0x01).r(FUNC(marinedt_state::trackball_r)); + map(0x02, 0x02).select(0xc).r(FUNC(marinedt_state::pc3259_r)); + map(0x02, 0x04).w(FUNC(marinedt_state::obj_0_w)); map(0x03, 0x03).portr("SYSTEM"); map(0x04, 0x04).portr("DSW2"); - map(0x05, 0x05).w(this, FUNC(marinedt_state::bgm_w)); - map(0x06, 0x06).w(this, FUNC(marinedt_state::sfx_w)); - map(0x08, 0x0b).w(this, FUNC(marinedt_state::obj_1_w)); - map(0x0d, 0x0d).w(this, FUNC(marinedt_state::layer_enable_w)); + map(0x05, 0x05).w(FUNC(marinedt_state::bgm_w)); + map(0x06, 0x06).w(FUNC(marinedt_state::sfx_w)); + map(0x08, 0x0b).w(FUNC(marinedt_state::obj_1_w)); + map(0x0d, 0x0d).w(FUNC(marinedt_state::layer_enable_w)); map(0x0e, 0x0e).nopw(); // watchdog - map(0x0f, 0x0f).w(this, FUNC(marinedt_state::output_w)); + map(0x0f, 0x0f).w(FUNC(marinedt_state::output_w)); } static INPUT_PORTS_START( marinedt ) diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp index e1c2a574357..4b78e4305ba 100644 --- a/src/mame/drivers/mario.cpp +++ b/src/mame/drivers/mario.cpp @@ -146,13 +146,13 @@ void mario_state::mario_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); map(0x7000, 0x73ff).ram().share("spriteram"); /* physical sprite ram */ - map(0x7400, 0x77ff).ram().w(this, FUNC(mario_state::mario_videoram_w)).share("videoram"); - map(0x7c00, 0x7c00).portr("IN0").w(this, FUNC(mario_state::mario_sh1_w)); /* Mario run sample */ - map(0x7c80, 0x7c80).portr("IN1").w(this, FUNC(mario_state::mario_sh2_w)); /* Luigi run sample */ - map(0x7d00, 0x7d00).w(this, FUNC(mario_state::mario_scroll_w)); - map(0x7e00, 0x7e00).w(this, FUNC(mario_state::mario_sh_tuneselect_w)); + map(0x7400, 0x77ff).ram().w(FUNC(mario_state::mario_videoram_w)).share("videoram"); + map(0x7c00, 0x7c00).portr("IN0").w(FUNC(mario_state::mario_sh1_w)); /* Mario run sample */ + map(0x7c80, 0x7c80).portr("IN1").w(FUNC(mario_state::mario_sh2_w)); /* Luigi run sample */ + map(0x7d00, 0x7d00).w(FUNC(mario_state::mario_scroll_w)); + map(0x7e00, 0x7e00).w(FUNC(mario_state::mario_sh_tuneselect_w)); map(0x7e80, 0x7e87).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x7f00, 0x7f07).w(this, FUNC(mario_state::mario_sh3_w)); /* Sound port */ + map(0x7f00, 0x7f07).w(FUNC(mario_state::mario_sh3_w)); /* Sound port */ map(0x7f80, 0x7f80).portr("DSW"); /* DSW */ map(0xf000, 0xffff).rom(); } @@ -162,13 +162,13 @@ void mario_state::masao_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); map(0x7000, 0x73ff).ram().share("spriteram"); /* physical sprite ram */ - map(0x7400, 0x77ff).ram().w(this, FUNC(mario_state::mario_videoram_w)).share("videoram"); + map(0x7400, 0x77ff).ram().w(FUNC(mario_state::mario_videoram_w)).share("videoram"); map(0x7c00, 0x7c00).portr("IN0"); map(0x7c80, 0x7c80).portr("IN1"); - map(0x7d00, 0x7d00).w(this, FUNC(mario_state::mario_scroll_w)); + map(0x7d00, 0x7d00).w(FUNC(mario_state::mario_scroll_w)); map(0x7e00, 0x7e00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x7e80, 0x7e87).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x7f00, 0x7f00).w(this, FUNC(mario_state::masao_sh_irqtrigger_w)); + map(0x7f00, 0x7f00).w(FUNC(mario_state::masao_sh_irqtrigger_w)); map(0x7f80, 0x7f80).portr("DSW"); /* DSW */ map(0xf000, 0xffff).rom(); } @@ -176,7 +176,7 @@ void mario_state::masao_map(address_map &map) void mario_state::mario_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); /* dma controller */ + map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); /* dma controller */ } diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp index 54f6bb95445..2e67bd862ac 100644 --- a/src/mame/drivers/markham.cpp +++ b/src/mame/drivers/markham.cpp @@ -182,7 +182,7 @@ void markham_state::base_master_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xd000, 0xd7ff).ram().w(this, FUNC(markham_state::videoram_w)).share("videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(markham_state::videoram_w)).share("videoram"); } void markham_state::markham_master_map(address_map &map) @@ -197,15 +197,15 @@ void markham_state::markham_master_map(address_map &map) map(0xe002, 0xe002).portr("P1"); map(0xe003, 0xe003).portr("P2"); - map(0xe004, 0xe004).r(this, FUNC(markham_state::markham_e004_r)); /* from CPU2 busack */ + map(0xe004, 0xe004).r(FUNC(markham_state::markham_e004_r)); /* from CPU2 busack */ map(0xe005, 0xe005).portr("SYSTEM"); - map(0xe008, 0xe008).w(this, FUNC(markham_state::coin_output_w)); + map(0xe008, 0xe008).w(FUNC(markham_state::coin_output_w)); map(0xe009, 0xe009).nopw(); /* to CPU2 busreq */ map(0xe00c, 0xe00d).writeonly().share("xscroll"); - map(0xe00e, 0xe00e).w(this, FUNC(markham_state::flipscreen_w<0>)); + map(0xe00e, 0xe00e).w(FUNC(markham_state::flipscreen_w<0>)); } void markham_state::strnskil_master_map(address_map &map) @@ -216,7 +216,7 @@ void markham_state::strnskil_master_map(address_map &map) map(0xc800, 0xcfff).ram().share("share1"); - map(0xd800, 0xd800).r(this, FUNC(markham_state::strnskil_d800_r)); + map(0xd800, 0xd800).r(FUNC(markham_state::strnskil_d800_r)); map(0xd801, 0xd801).portr("DSW1"); map(0xd802, 0xd802).portr("DSW2"); map(0xd803, 0xd803).portr("SYSTEM"); @@ -224,17 +224,17 @@ void markham_state::strnskil_master_map(address_map &map) map(0xd805, 0xd805).portr("P2"); /* same write used here is used for scrolling */ - map(0xd808, 0xd808).w(this, FUNC(markham_state::flipscreen_w<3>)); - map(0xd809, 0xd809).w(this, FUNC(markham_state::coin_output_w)); + map(0xd808, 0xd808).w(FUNC(markham_state::flipscreen_w<3>)); + map(0xd809, 0xd809).w(FUNC(markham_state::coin_output_w)); map(0xd80a, 0xd80b).writeonly().share("xscroll"); } void markham_state::banbam_master_map(address_map &map) { strnskil_master_map(map); - map(0xd806, 0xd806).r(this, FUNC(markham_state::banbam_protection_r)); /* mcu data read */ - map(0xd80d, 0xd80d).w(this, FUNC(markham_state::banbam_protection_w)); /* mcu data write */ - map(0xd80c, 0xd80c).w(this, FUNC(markham_state::mcu_reset_w)); /* mcu reset? */ + map(0xd806, 0xd806).r(FUNC(markham_state::banbam_protection_r)); /* mcu data read */ + map(0xd80d, 0xd80d).w(FUNC(markham_state::banbam_protection_w)); /* mcu data write */ + map(0xd80c, 0xd80c).w(FUNC(markham_state::mcu_reset_w)); /* mcu reset? */ } void markham_state::markham_slave_map(address_map &map) @@ -242,8 +242,8 @@ void markham_state::markham_slave_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x8000, 0x87ff).ram().share("share1"); - map(0xc000, 0xc000).w("sn1", FUNC(sn76496_device::write)); - map(0xc001, 0xc001).w("sn2", FUNC(sn76496_device::write)); + map(0xc000, 0xc000).w("sn1", FUNC(sn76496_device::command_w)); + map(0xc001, 0xc001).w("sn2", FUNC(sn76496_device::command_w)); map(0xc002, 0xc002).nopw(); /* unknown */ map(0xc003, 0xc003).nopw(); /* unknown */ @@ -255,8 +255,8 @@ void markham_state::strnskil_slave_map(address_map &map) map(0xc000, 0xc7ff).ram().share("spriteram"); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::write)); - map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::write)); + map(0xd801, 0xd801).w("sn1", FUNC(sn76496_device::command_w)); + map(0xd802, 0xd802).w("sn2", FUNC(sn76496_device::command_w)); } /****************************************************************************/ diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp index e69eaa5d0b9..f390b622f28 100644 --- a/src/mame/drivers/mastboy.cpp +++ b/src/mame/drivers/mastboy.cpp @@ -637,9 +637,9 @@ void mastboy_state::mastboy_map(address_map &map) map(0xff810, 0xff817).portr("DSW1"); map(0xff818, 0xff81f).portr("DSW2"); - map(0xff820, 0xff827).w(this, FUNC(mastboy_state::bank_w)); + map(0xff820, 0xff827).w(FUNC(mastboy_state::bank_w)); map(0xff828, 0xff829).w("saa", FUNC(saa1099_device::write)); - map(0xff830, 0xff830).w(this, FUNC(mastboy_state::msm5205_data_w)); + map(0xff830, 0xff830).w(FUNC(mastboy_state::msm5205_data_w)); map(0xff838, 0xff83f).w(m_outlatch, FUNC(ls259_device::write_d0)); map(0xffc00, 0xfffff).ram(); // Internal RAM @@ -648,7 +648,7 @@ void mastboy_state::mastboy_map(address_map &map) // TODO : banked map is mirrored? void mastboy_state::bank_c000_map(address_map &map) { - map(0x000000, 0x00ffff).mirror(0x1e0000).rw(this, FUNC(mastboy_state::vram_r), FUNC(mastboy_state::vram_w)).share("vram"); + map(0x000000, 0x00ffff).mirror(0x1e0000).rw(FUNC(mastboy_state::vram_r), FUNC(mastboy_state::vram_w)).share("vram"); map(0x010000, 0x01ffff).mirror(0x1e0000).rom().region("vrom", 0); map(0x200000, 0x3fffff).rom().region("bankedrom", 0); } @@ -668,8 +668,8 @@ READ8_MEMBER(mastboy_state::nmi_read) void mastboy_state::mastboy_io_map(address_map &map) { - map(0x38, 0x38).r(this, FUNC(mastboy_state::port_38_read)); - map(0x39, 0x39).r(this, FUNC(mastboy_state::nmi_read)); + map(0x38, 0x38).r(FUNC(mastboy_state::port_38_read)); + map(0x39, 0x39).r(FUNC(mastboy_state::nmi_read)); } /* Input Ports */ diff --git a/src/mame/drivers/mastboyo.cpp b/src/mame/drivers/mastboyo.cpp index d5af2d4f4c2..9384dfa3d7f 100644 --- a/src/mame/drivers/mastboyo.cpp +++ b/src/mame/drivers/mastboyo.cpp @@ -107,9 +107,9 @@ void mastboyo_state::mastboyo_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram().share("nvram"); - map(0x5000, 0x53ff).ram().w(this, FUNC(mastboyo_state::fgram_w)).share("fgram"); - map(0x5400, 0x57ff).ram().w(this, FUNC(mastboyo_state::fgram2_w)).share("fgram2"); - map(0x6000, 0x6000).w(this, FUNC(mastboyo_state::rombank_w)); + map(0x5000, 0x53ff).ram().w(FUNC(mastboyo_state::fgram_w)).share("fgram"); + map(0x5400, 0x57ff).ram().w(FUNC(mastboyo_state::fgram2_w)).share("fgram2"); + map(0x6000, 0x6000).w(FUNC(mastboyo_state::rombank_w)); // map(0x7000, 0x7000).portr("UNK"); // possible watchdog? or IRQ ack? map(0x8000, 0xffff).bankr("bank1"); } diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp index 441841e92bd..e06f1a6e894 100644 --- a/src/mame/drivers/matmania.cpp +++ b/src/mame/drivers/matmania.cpp @@ -86,10 +86,10 @@ void matmania_state::matmania_map(address_map &map) map(0x2400, 0x25ff).ram().share("videoram3"); map(0x2600, 0x27ff).ram().share("colorram3"); map(0x3000, 0x3000).portr("IN0").writeonly().share("pageselect"); - map(0x3010, 0x3010).portr("IN1").w(this, FUNC(matmania_state::matmania_sh_command_w)); + map(0x3010, 0x3010).portr("IN1").w(FUNC(matmania_state::matmania_sh_command_w)); map(0x3020, 0x3020).portr("DSW2").writeonly().share("scroll"); map(0x3030, 0x3030).portr("DSW1").nopw(); /* ?? */ - map(0x3050, 0x307f).w(this, FUNC(matmania_state::matmania_paletteram_w)).share("paletteram"); + map(0x3050, 0x307f).w(FUNC(matmania_state::matmania_paletteram_w)).share("paletteram"); map(0x4000, 0xffff).rom(); } @@ -104,12 +104,12 @@ void matmania_state::maniach_map(address_map &map) map(0x2400, 0x25ff).ram().share("videoram3"); map(0x2600, 0x27ff).ram().share("colorram3"); map(0x3000, 0x3000).portr("IN0").writeonly().share("pageselect"); - map(0x3010, 0x3010).portr("IN1").w(this, FUNC(matmania_state::maniach_sh_command_w)); + map(0x3010, 0x3010).portr("IN1").w(FUNC(matmania_state::maniach_sh_command_w)); map(0x3020, 0x3020).portr("DSW2").writeonly().share("scroll"); map(0x3030, 0x3030).portr("DSW1").nopw(); /* ?? */ map(0x3040, 0x3040).rw(m_mcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0x3041, 0x3041).r(this, FUNC(matmania_state::maniach_mcu_status_r)); - map(0x3050, 0x307f).w(this, FUNC(matmania_state::matmania_paletteram_w)).share("paletteram"); + map(0x3041, 0x3041).r(FUNC(matmania_state::maniach_mcu_status_r)); + map(0x3050, 0x307f).w(FUNC(matmania_state::matmania_paletteram_w)).share("paletteram"); map(0x4000, 0xffff).rom(); } @@ -119,7 +119,7 @@ void matmania_state::matmania_sound_map(address_map &map) map(0x0000, 0x01ff).ram(); map(0x2000, 0x2001).w("ay1", FUNC(ay8910_device::data_address_w)); map(0x2002, 0x2003).w("ay2", FUNC(ay8910_device::data_address_w)); - map(0x2004, 0x2004).w("dac", FUNC(dac_byte_interface::write)); + map(0x2004, 0x2004).w("dac", FUNC(dac_byte_interface::data_w)); map(0x2007, 0x2007).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x8000, 0xffff).rom(); } @@ -128,7 +128,7 @@ void matmania_state::maniach_sound_map(address_map &map) { map(0x0000, 0x0fff).ram(); map(0x2000, 0x2001).w("ymsnd", FUNC(ym3526_device::write)); - map(0x2002, 0x2002).w("dac", FUNC(dac_byte_interface::write)); + map(0x2002, 0x2002).w("dac", FUNC(dac_byte_interface::data_w)); map(0x2004, 0x2004).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp index 5c00f009639..54cdbd68b3a 100644 --- a/src/mame/drivers/maxaflex.cpp +++ b/src/mame/drivers/maxaflex.cpp @@ -306,8 +306,7 @@ void maxaflex_state::machine_reset() { atari_common_state::machine_reset(); - pokey_device *pokey = machine().device("pokey"); - pokey->write(15,0); + subdevice("pokey")->write(machine().dummy_space(), 15, 0); // Supervisor board reset m_portB_out = 0xff; diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index 9ed8bfa08d8..ec2b3bae66c 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -480,17 +480,17 @@ void maygay1b_state::m1_memmap(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); - map(0x2000, 0x2000).w(this, FUNC(maygay1b_state::reel12_w)); - map(0x2010, 0x2010).w(this, FUNC(maygay1b_state::reel34_w)); - map(0x2020, 0x2020).w(this, FUNC(maygay1b_state::reel56_w)); + map(0x2000, 0x2000).w(FUNC(maygay1b_state::reel12_w)); + map(0x2010, 0x2010).w(FUNC(maygay1b_state::reel34_w)); + map(0x2020, 0x2020).w(FUNC(maygay1b_state::reel56_w)); // there is actually an 8279 and an 8051 (which I guess is the MCU?). map(0x2030, 0x2031).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write)); #ifdef USE_MCU //8051 - map(0x2040, 0x2040).w(this, FUNC(maygay1b_state::main_to_mcu_0_w)); - map(0x2041, 0x2041).w(this, FUNC(maygay1b_state::main_to_mcu_1_w)); + map(0x2040, 0x2040).w(FUNC(maygay1b_state::main_to_mcu_0_w)); + map(0x2041, 0x2041).w(FUNC(maygay1b_state::main_to_mcu_1_w)); #else //8051 map(0x2040, 0x2041).rw("i8279_2", FUNC(i8279_device::read), FUNC(i8279_device::write)); @@ -500,7 +500,7 @@ void maygay1b_state::m1_memmap(address_map &map) map(0x2070, 0x207f).rw(m_duart68681, FUNC(mc68681_device::read), FUNC(mc68681_device::write)); map(0x2090, 0x2091).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x20B0, 0x20B0).r(this, FUNC(maygay1b_state::m1_meter_r)); + map(0x20B0, 0x20B0).r(FUNC(maygay1b_state::m1_meter_r)); map(0x20A0, 0x20A3).w("pia", FUNC(pia6821_device::write)); map(0x20A0, 0x20A3).r("pia", FUNC(pia6821_device::read)); @@ -508,14 +508,14 @@ void maygay1b_state::m1_memmap(address_map &map) map(0x20C0, 0x20C7).w("mainlatch", FUNC(hc259_device::write_d0)); map(0x2400, 0x2401).w("ymsnd", FUNC(ym2413_device::write)); - map(0x2404, 0x2405).r(this, FUNC(maygay1b_state::latch_st_lo)); - map(0x2406, 0x2407).r(this, FUNC(maygay1b_state::latch_st_hi)); + map(0x2404, 0x2405).r(FUNC(maygay1b_state::latch_st_lo)); + map(0x2406, 0x2407).r(FUNC(maygay1b_state::latch_st_hi)); - map(0x2410, 0x2410).r(this, FUNC(maygay1b_state::m1_firq_clr_r)); + map(0x2410, 0x2410).r(FUNC(maygay1b_state::m1_firq_clr_r)); - map(0x2412, 0x2412).r(this, FUNC(maygay1b_state::m1_firq_trg_r)); // firq, sample playback? + map(0x2412, 0x2412).r(FUNC(maygay1b_state::m1_firq_trg_r)); // firq, sample playback? - map(0x2420, 0x2421).w(this, FUNC(maygay1b_state::latch_ch2_w)); // oki + map(0x2420, 0x2421).w(FUNC(maygay1b_state::latch_ch2_w)); // oki map(0x2800, 0xdfff).rom(); map(0xe000, 0xffff).bankr("bank1"); /* 64k paged ROM (4 pages) */ @@ -566,17 +566,17 @@ void maygay1b_state::m1_nec_memmap(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); - map(0x2000, 0x2000).w(this, FUNC(maygay1b_state::reel12_w)); - map(0x2010, 0x2010).w(this, FUNC(maygay1b_state::reel34_w)); - map(0x2020, 0x2020).w(this, FUNC(maygay1b_state::reel56_w)); + map(0x2000, 0x2000).w(FUNC(maygay1b_state::reel12_w)); + map(0x2010, 0x2010).w(FUNC(maygay1b_state::reel34_w)); + map(0x2020, 0x2020).w(FUNC(maygay1b_state::reel56_w)); // there is actually an 8279 and an 8051 (which I guess is the MCU?). map(0x2030, 0x2031).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write)); #ifdef USE_MCU //8051 - map(0x2040, 0x2040).w(this, FUNC(maygay1b_state::main_to_mcu_0_w)); - map(0x2041, 0x2041).w(this, FUNC(maygay1b_state::main_to_mcu_1_w)); + map(0x2040, 0x2040).w(FUNC(maygay1b_state::main_to_mcu_0_w)); + map(0x2041, 0x2041).w(FUNC(maygay1b_state::main_to_mcu_1_w)); #else //8051 map(0x2040, 0x2041).rw("i8279_2", FUNC(i8279_device::read), FUNC(i8279_device::write)); @@ -586,7 +586,7 @@ void maygay1b_state::m1_nec_memmap(address_map &map) map(0x2070, 0x207f).rw(m_duart68681, FUNC(mc68681_device::read), FUNC(mc68681_device::write)); map(0x2090, 0x2091).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x20B0, 0x20B0).r(this, FUNC(maygay1b_state::m1_meter_r)); + map(0x20B0, 0x20B0).r(FUNC(maygay1b_state::m1_meter_r)); map(0x20A0, 0x20A3).w("pia", FUNC(pia6821_device::write)); map(0x20A0, 0x20A3).r("pia", FUNC(pia6821_device::read)); @@ -594,14 +594,14 @@ void maygay1b_state::m1_nec_memmap(address_map &map) map(0x20C0, 0x20C7).w("mainlatch", FUNC(hc259_device::write_d0)); map(0x2400, 0x2401).w("ymsnd", FUNC(ym2413_device::write)); - map(0x2404, 0x2405).w(this, FUNC(maygay1b_state::nec_bank0_w)); - map(0x2406, 0x2407).w(this, FUNC(maygay1b_state::nec_bank1_w)); + map(0x2404, 0x2405).w(FUNC(maygay1b_state::nec_bank0_w)); + map(0x2406, 0x2407).w(FUNC(maygay1b_state::nec_bank1_w)); - map(0x2408, 0x2409).r(this, FUNC(maygay1b_state::nec_reset_r)); + map(0x2408, 0x2409).r(FUNC(maygay1b_state::nec_reset_r)); - map(0x240c, 0x240d).r(this, FUNC(maygay1b_state::m1_firq_clr_r)); + map(0x240c, 0x240d).r(FUNC(maygay1b_state::m1_firq_clr_r)); - map(0x240e, 0x240f).r(this, FUNC(maygay1b_state::m1_firq_nec_r)); + map(0x240e, 0x240f).r(FUNC(maygay1b_state::m1_firq_nec_r)); map(0x2800, 0xdfff).rom(); map(0xe000, 0xffff).bankr("bank1"); /* 64k paged ROM (4 pages) */ diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp index cbe8b4a55ed..3c2720f46a5 100644 --- a/src/mame/drivers/maygayv1.cpp +++ b/src/mame/drivers/maygayv1.cpp @@ -572,9 +572,9 @@ void maygayv1_state::main_map(address_map &map) map(0x820001, 0x820001).rw("i8279", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w)); map(0x820003, 0x820003).rw("i8279", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w)); map(0x800000, 0x800003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0xff00); - map(0x860000, 0x86000d).rw(this, FUNC(maygayv1_state::read_odd), FUNC(maygayv1_state::write_odd)); - map(0x86000e, 0x86000f).w(this, FUNC(maygayv1_state::vsync_int_ctrl)); - map(0x880000, 0x89ffff).rw(this, FUNC(maygayv1_state::i82716_r), FUNC(maygayv1_state::i82716_w)); + map(0x860000, 0x86000d).rw(FUNC(maygayv1_state::read_odd), FUNC(maygayv1_state::write_odd)); + map(0x86000e, 0x86000f).w(FUNC(maygayv1_state::vsync_int_ctrl)); + map(0x880000, 0x89ffff).rw(FUNC(maygayv1_state::i82716_r), FUNC(maygayv1_state::i82716_w)); map(0x8a0000, 0x8a001f).rw(m_duart68681, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0x8c0000, 0x8c000f).r("pia", FUNC(pia6821_device::read)).umask16(0x00ff); map(0x8c0000, 0x8c000f).w("pia", FUNC(pia6821_device::write)).umask16(0xff00); @@ -669,7 +669,7 @@ void maygayv1_state::sound_data(address_map &map) void maygayv1_state::sound_io(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(maygayv1_state::mcu_r), FUNC(maygayv1_state::mcu_w)); + map(0x00, 0xff).rw(FUNC(maygayv1_state::mcu_r), FUNC(maygayv1_state::mcu_w)); } diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index 74d12369ecb..f2c59f75822 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -463,22 +463,22 @@ void mazerbla_state::mazerbla_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xc000, 0xc7ff).ram().share("share1"); - map(0xd800, 0xd800).r(this, FUNC(mazerbla_state::cfb_zpu_int_req_clr)); + map(0xd800, 0xd800).r(FUNC(mazerbla_state::cfb_zpu_int_req_clr)); map(0xe000, 0xefff).ram().share("nvram"); } void mazerbla_state::mazerbla_io_map(address_map &map) { map.global_mask(0xff); - map(0x4c, 0x4f).rw(this, FUNC(mazerbla_state::ls670_1_r), FUNC(mazerbla_state::ls670_0_w)); - map(0x60, 0x60).w(this, FUNC(mazerbla_state::zpu_bcd_decoder_w)); // AM_READ from protection pal, if populated - map(0x62, 0x62).r(this, FUNC(mazerbla_state::zpu_inputs_r)); + map(0x4c, 0x4f).rw(FUNC(mazerbla_state::ls670_1_r), FUNC(mazerbla_state::ls670_0_w)); + map(0x60, 0x60).w(FUNC(mazerbla_state::zpu_bcd_decoder_w)); // AM_READ from protection pal, if populated + map(0x62, 0x62).r(FUNC(mazerbla_state::zpu_inputs_r)); // 64 is some sort of output latch, unpopulated? // 66 is some sort of output latch, unpopulated? - map(0x68, 0x68).w(this, FUNC(mazerbla_state::zpu_coin_counter_w)); - map(0x6a, 0x6a).w(this, FUNC(mazerbla_state::zpu_lamps_w)); + map(0x68, 0x68).w(FUNC(mazerbla_state::zpu_coin_counter_w)); + map(0x6a, 0x6a).w(FUNC(mazerbla_state::zpu_lamps_w)); // 6c RW is a 6850 acia for communication with another cabinet or debug console? unpopulated? - map(0x6e, 0x6f).w(this, FUNC(mazerbla_state::zpu_led_w)); + map(0x6e, 0x6f).w(FUNC(mazerbla_state::zpu_led_w)); } void mazerbla_state::mazerbla_cpu2_map(address_map &map) @@ -492,9 +492,9 @@ void mazerbla_state::mazerbla_cpu2_map(address_map &map) void mazerbla_state::mazerbla_cpu2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(mazerbla_state::vsb_ls273_audio_control_w)); + map(0x00, 0x00).w(FUNC(mazerbla_state::vsb_ls273_audio_control_w)); map(0x40, 0x41).nopw(); - map(0x80, 0x83).rw(this, FUNC(mazerbla_state::ls670_0_r), FUNC(mazerbla_state::ls670_1_w)); + map(0x80, 0x83).rw(FUNC(mazerbla_state::ls670_0_r), FUNC(mazerbla_state::ls670_1_w)); } void mazerbla_state::mazerbla_cpu3_map(address_map &map) @@ -513,9 +513,9 @@ void mazerbla_state::mazerbla_cpu3_io_map(address_map &map) { map.global_mask(0xff); map(0x01, 0x01).w(m_vcu, FUNC(mb_vcu_device::background_color_w)); - map(0x02, 0x02).r(m_vcu, FUNC(mb_vcu_device::status_r)).w(this, FUNC(mazerbla_state::cfb_led_w)); - map(0x03, 0x03).w(this, FUNC(mazerbla_state::cfb_zpu_int_req_set_w)); - map(0x04, 0x04).w(this, FUNC(mazerbla_state::cfb_rom_bank_sel_w)); + map(0x02, 0x02).r(m_vcu, FUNC(mb_vcu_device::status_r)).w(FUNC(mazerbla_state::cfb_led_w)); + map(0x03, 0x03).w(FUNC(mazerbla_state::cfb_zpu_int_req_set_w)); + map(0x04, 0x04).w(FUNC(mazerbla_state::cfb_rom_bank_sel_w)); map(0x05, 0x05).w(m_vcu, FUNC(mb_vcu_device::vbank_w)); } @@ -530,11 +530,11 @@ void mazerbla_state::greatgun_io_map(address_map &map) { map.global_mask(0xff); map(0x4c, 0x4c).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x60, 0x60).w(this, FUNC(mazerbla_state::zpu_bcd_decoder_w)); - map(0x62, 0x62).r(this, FUNC(mazerbla_state::zpu_inputs_r)); + map(0x60, 0x60).w(FUNC(mazerbla_state::zpu_bcd_decoder_w)); + map(0x62, 0x62).r(FUNC(mazerbla_state::zpu_inputs_r)); map(0x66, 0x66).nopw(); map(0x68, 0x68).nopw(); - map(0x6e, 0x6f).w(this, FUNC(mazerbla_state::zpu_led_w)); + map(0x6e, 0x6f).w(FUNC(mazerbla_state::zpu_led_w)); } void mazerbla_state::greatgun_sound_map(address_map &map) @@ -544,7 +544,7 @@ void mazerbla_state::greatgun_sound_map(address_map &map) map(0x4000, 0x4000).r("ay1", FUNC(ay8910_device::data_r)); map(0x4000, 0x4001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x6000, 0x6001).w("ay2", FUNC(ay8910_device::address_data_w)); - map(0x8000, 0x8000).w(this, FUNC(mazerbla_state::sound_int_clear_w)); + map(0x8000, 0x8000).w(FUNC(mazerbla_state::sound_int_clear_w)); map(0xa000, 0xa000).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); } diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index c9b855c4041..27070a58697 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -150,7 +150,7 @@ void mbc200_state::mbc200_io(address_map &map) map.global_mask(0xff); //AM_RANGE(0xe0, 0xe0) AM_DEVREADWRITE("uart1", i8251_device, data_r, data_w) //AM_RANGE(0xe1, 0xe1) AM_DEVREADWRITE("uart1", i8251_device, status_r, control_w) - map(0xe0, 0xe1).r(this, FUNC(mbc200_state::keyboard_r)).nopw(); + map(0xe0, 0xe1).r(FUNC(mbc200_state::keyboard_r)).nopw(); map(0xe4, 0xe7).rw(m_fdc, FUNC(mb8876_device::read), FUNC(mb8876_device::write)); map(0xe8, 0xeb).rw(m_ppi_m, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xec, 0xec).rw("uart2", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp index cab3ddeffcb..c2dc0d16a28 100644 --- a/src/mame/drivers/mbc55x.cpp +++ b/src/mame/drivers/mbc55x.cpp @@ -62,15 +62,15 @@ void mbc55x_state::mbc55x_mem(address_map &map) void mbc55x_state::mbc55x_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0003).rw(this, FUNC(mbc55x_state::mbcpic8259_r), FUNC(mbc55x_state::mbcpic8259_w)); - map(0x0008, 0x000F).rw(this, FUNC(mbc55x_state::mbc55x_disk_r), FUNC(mbc55x_state::mbc55x_disk_w)); - map(0x0010, 0x0010).rw(this, FUNC(mbc55x_state::vram_page_r), FUNC(mbc55x_state::vram_page_w)); - map(0x0018, 0x001F).rw(this, FUNC(mbc55x_state::ppi8255_r), FUNC(mbc55x_state::ppi8255_w)); - map(0x0020, 0x0027).rw(this, FUNC(mbc55x_state::mbcpit8253_r), FUNC(mbc55x_state::mbcpit8253_w)); - map(0x0028, 0x002B).rw(this, FUNC(mbc55x_state::mbc55x_usart_r), FUNC(mbc55x_state::mbc55x_usart_w)); + map(0x0000, 0x0003).rw(FUNC(mbc55x_state::mbcpic8259_r), FUNC(mbc55x_state::mbcpic8259_w)); + map(0x0008, 0x000F).rw(FUNC(mbc55x_state::mbc55x_disk_r), FUNC(mbc55x_state::mbc55x_disk_w)); + map(0x0010, 0x0010).rw(FUNC(mbc55x_state::vram_page_r), FUNC(mbc55x_state::vram_page_w)); + map(0x0018, 0x001F).rw(FUNC(mbc55x_state::ppi8255_r), FUNC(mbc55x_state::ppi8255_w)); + map(0x0020, 0x0027).rw(FUNC(mbc55x_state::mbcpit8253_r), FUNC(mbc55x_state::mbcpit8253_w)); + map(0x0028, 0x002B).rw(FUNC(mbc55x_state::mbc55x_usart_r), FUNC(mbc55x_state::mbc55x_usart_w)); map(0x0030, 0x0031).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x0032, 0x0033).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x0038, 0x003B).rw(this, FUNC(mbc55x_state::mbc55x_kb_usart_r), FUNC(mbc55x_state::mbc55x_kb_usart_w)); + map(0x0038, 0x003B).rw(FUNC(mbc55x_state::mbc55x_kb_usart_r), FUNC(mbc55x_state::mbc55x_kb_usart_w)); } static INPUT_PORTS_START( mbc55x ) diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index 36f7dab17cf..ecda260b4e2 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -141,8 +141,8 @@ void mbee_state::mbee_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x7fff).ram(); map(0x8000, 0xefff).rom(); - map(0xf000, 0xf7ff).rw(this, FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); - map(0xf800, 0xffff).rw(this, FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); + map(0xf000, 0xf7ff).rw(FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); + map(0xf800, 0xffff).rw(FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); } void mbee_state::mbeeic_mem(address_map &map) @@ -151,8 +151,8 @@ void mbee_state::mbeeic_mem(address_map &map) map(0x8000, 0xbfff).rom(); map(0xc000, 0xdfff).bankr("pak"); map(0xe000, 0xefff).rom(); - map(0xf000, 0xf7ff).rw(this, FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); - map(0xf800, 0xffff).rw(this, FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); + map(0xf000, 0xf7ff).rw(FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); + map(0xf800, 0xffff).rw(FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); } void mbee_state::mbeepc_mem(address_map &map) @@ -161,8 +161,8 @@ void mbee_state::mbeepc_mem(address_map &map) map(0x8000, 0xbfff).rom(); map(0xc000, 0xdfff).bankr("pak"); map(0xe000, 0xefff).bankr("telcom"); - map(0xf000, 0xf7ff).rw(this, FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); - map(0xf800, 0xffff).rw(this, FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); + map(0xf000, 0xf7ff).rw(FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); + map(0xf800, 0xffff).rw(FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); } void mbee_state::mbeeppc_mem(address_map &map) @@ -172,16 +172,16 @@ void mbee_state::mbeeppc_mem(address_map &map) map(0xa000, 0xbfff).rom(); map(0xc000, 0xdfff).bankr("pak"); map(0xe000, 0xefff).bankr("telcom"); - map(0xf000, 0xf7ff).rw(this, FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); - map(0xf800, 0xffff).rw(this, FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); + map(0xf000, 0xf7ff).rw(FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); + map(0xf800, 0xffff).rw(FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); } void mbee_state::mbee56_mem(address_map &map) { map(0x0000, 0xdfff).ram(); map(0xe000, 0xefff).rom(); - map(0xf000, 0xf7ff).rw(this, FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); - map(0xf800, 0xffff).rw(this, FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); + map(0xf000, 0xf7ff).rw(FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); + map(0xf800, 0xffff).rw(FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); } void mbee_state::mbee256_mem(address_map &map) @@ -211,8 +211,8 @@ void mbee_state::mbeett_mem(address_map &map) map(0xa000, 0xbfff).ram(); map(0xc000, 0xdfff).bankr("pak"); map(0xe000, 0xefff).bankr("telcom"); - map(0xf000, 0xf7ff).rw(this, FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); - map(0xf800, 0xffff).rw(this, FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); + map(0xf000, 0xf7ff).rw(FUNC(mbee_state::video_low_r), FUNC(mbee_state::video_low_w)); + map(0xf800, 0xffff).rw(FUNC(mbee_state::video_high_r), FUNC(mbee_state::video_high_w)); } void mbee_state::mbee_io(address_map &map) @@ -220,9 +220,9 @@ void mbee_state::mbee_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0x00, 0x03).mirror(0x10).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x0b, 0x0b).mirror(0x10).w(this, FUNC(mbee_state::port0b_w)); - map(0x0c, 0x0c).mirror(0x10).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x0d, 0x0d).mirror(0x10).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); + map(0x0b, 0x0b).mirror(0x10).w(FUNC(mbee_state::port0b_w)); + map(0x0c, 0x0c).mirror(0x10).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x0d, 0x0d).mirror(0x10).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); } void mbee_state::mbeeic_io(address_map &map) @@ -230,58 +230,58 @@ void mbee_state::mbeeic_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0x00, 0x03).mirror(0x10).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x08, 0x08).mirror(0x10).rw(this, FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); + map(0x08, 0x08).mirror(0x10).rw(FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); map(0x09, 0x09).nopw(); /* Listed as "Colour Wait Off" or "USART 2651" but doesn't appear in the schematics */ - map(0x0a, 0x0a).mirror(0x10).w(this, FUNC(mbee_state::port0a_w)); - map(0x0b, 0x0b).mirror(0x10).w(this, FUNC(mbee_state::port0b_w)); - map(0x0c, 0x0c).mirror(0x10).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x0d, 0x0d).mirror(0x10).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); + map(0x0a, 0x0a).mirror(0x10).w(FUNC(mbee_state::port0a_w)); + map(0x0b, 0x0b).mirror(0x10).w(FUNC(mbee_state::port0b_w)); + map(0x0c, 0x0c).mirror(0x10).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x0d, 0x0d).mirror(0x10).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); } void mbee_state::mbeepc_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0003).mirror(0xff10).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x0008, 0x0008).mirror(0xff10).rw(this, FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); + map(0x0008, 0x0008).mirror(0xff10).rw(FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); map(0x0009, 0x0009).mirror(0xff00).nopw(); - map(0x000b, 0x000b).mirror(0xff10).w(this, FUNC(mbee_state::port0b_w)); - map(0x000c, 0x000c).mirror(0xff10).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x000d, 0x000d).mirror(0xff10).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); - map(0x000a, 0x000a).mirror(0xfe10).rw(this, FUNC(mbee_state::telcom_low_r), FUNC(mbee_state::port0a_w)); - map(0x010a, 0x010a).mirror(0xfe10).rw(this, FUNC(mbee_state::telcom_high_r), FUNC(mbee_state::port0a_w)); + map(0x000b, 0x000b).mirror(0xff10).w(FUNC(mbee_state::port0b_w)); + map(0x000c, 0x000c).mirror(0xff10).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x000d, 0x000d).mirror(0xff10).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); + map(0x000a, 0x000a).mirror(0xfe10).rw(FUNC(mbee_state::telcom_low_r), FUNC(mbee_state::port0a_w)); + map(0x010a, 0x010a).mirror(0xfe10).rw(FUNC(mbee_state::telcom_high_r), FUNC(mbee_state::port0a_w)); } void mbee_state::mbeeppc_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0003).mirror(0xff10).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x0008, 0x0008).mirror(0xff10).rw(this, FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); + map(0x0008, 0x0008).mirror(0xff10).rw(FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); map(0x0009, 0x0009).mirror(0xff00).nopw(); - map(0x000b, 0x000b).mirror(0xff10).w(this, FUNC(mbee_state::port0b_w)); - map(0x000c, 0x000c).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x000d, 0x000d).mirror(0xff10).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); - map(0x001c, 0x001c).mirror(0xff00).rw(this, FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); - map(0x000a, 0x000a).mirror(0xfe10).rw(this, FUNC(mbee_state::telcom_low_r), FUNC(mbee_state::port0a_w)); - map(0x010a, 0x010a).mirror(0xfe10).rw(this, FUNC(mbee_state::telcom_high_r), FUNC(mbee_state::port0a_w)); + map(0x000b, 0x000b).mirror(0xff10).w(FUNC(mbee_state::port0b_w)); + map(0x000c, 0x000c).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x000d, 0x000d).mirror(0xff10).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); + map(0x001c, 0x001c).mirror(0xff00).rw(FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); + map(0x000a, 0x000a).mirror(0xfe10).rw(FUNC(mbee_state::telcom_low_r), FUNC(mbee_state::port0a_w)); + map(0x010a, 0x010a).mirror(0xfe10).rw(FUNC(mbee_state::telcom_high_r), FUNC(mbee_state::port0a_w)); } void mbee_state::mbeett_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0003).mirror(0xff00).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x0004, 0x0004).mirror(0xff00).w(this, FUNC(mbee_state::port04_w)); - map(0x0006, 0x0006).mirror(0xff00).w(this, FUNC(mbee_state::port06_w)); - map(0x0007, 0x0007).mirror(0xff00).r(this, FUNC(mbee_state::port07_r)); - map(0x0008, 0x0008).mirror(0xff00).rw(this, FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); - map(0x000b, 0x000b).mirror(0xff00).w(this, FUNC(mbee_state::port0b_w)); - map(0x000c, 0x000c).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x000d, 0x000d).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); - map(0x0018, 0x001b).mirror(0xff00).r(this, FUNC(mbee_state::port18_r)); - map(0x001c, 0x001f).mirror(0xff00).rw(this, FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); - map(0x0009, 0x0009).mirror(0xfe00).r(this, FUNC(mbee_state::speed_low_r)); - map(0x0109, 0x0109).mirror(0xfe00).r(this, FUNC(mbee_state::speed_high_r)); - map(0x000a, 0x000a).mirror(0xfe00).rw(this, FUNC(mbee_state::telcom_low_r), FUNC(mbee_state::port0a_w)); - map(0x010a, 0x010a).mirror(0xfe00).rw(this, FUNC(mbee_state::telcom_high_r), FUNC(mbee_state::port0a_w)); + map(0x0004, 0x0004).mirror(0xff00).w(FUNC(mbee_state::port04_w)); + map(0x0006, 0x0006).mirror(0xff00).w(FUNC(mbee_state::port06_w)); + map(0x0007, 0x0007).mirror(0xff00).r(FUNC(mbee_state::port07_r)); + map(0x0008, 0x0008).mirror(0xff00).rw(FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); + map(0x000b, 0x000b).mirror(0xff00).w(FUNC(mbee_state::port0b_w)); + map(0x000c, 0x000c).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x000d, 0x000d).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); + map(0x0018, 0x001b).mirror(0xff00).r(FUNC(mbee_state::port18_r)); + map(0x001c, 0x001f).mirror(0xff00).rw(FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); + map(0x0009, 0x0009).mirror(0xfe00).r(FUNC(mbee_state::speed_low_r)); + map(0x0109, 0x0109).mirror(0xfe00).r(FUNC(mbee_state::speed_high_r)); + map(0x000a, 0x000a).mirror(0xfe00).rw(FUNC(mbee_state::telcom_low_r), FUNC(mbee_state::port0a_w)); + map(0x010a, 0x010a).mirror(0xfe00).rw(FUNC(mbee_state::telcom_high_r), FUNC(mbee_state::port0a_w)); map(0x0068, 0x006f).mirror(0xff00).rw("scc", FUNC(scc8530_t::reg_r), FUNC(scc8530_t::reg_w)); } @@ -290,13 +290,13 @@ void mbee_state::mbee56_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0x00, 0x03).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x08, 0x08).rw(this, FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); + map(0x08, 0x08).rw(FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); map(0x09, 0x09).nopw(); - map(0x0b, 0x0b).w(this, FUNC(mbee_state::port0b_w)); - map(0x0c, 0x0c).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x0d, 0x0d).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); + map(0x0b, 0x0b).w(FUNC(mbee_state::port0b_w)); + map(0x0c, 0x0c).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x0d, 0x0d).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); map(0x44, 0x47).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); - map(0x48, 0x4f).rw(this, FUNC(mbee_state::fdc_status_r), FUNC(mbee_state::fdc_motor_w)); + map(0x48, 0x4f).rw(FUNC(mbee_state::fdc_status_r), FUNC(mbee_state::fdc_motor_w)); } void mbee_state::mbee128_io(address_map &map) @@ -304,40 +304,40 @@ void mbee_state::mbee128_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0x00, 0x03).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x04, 0x04).w(this, FUNC(mbee_state::port04_w)); - map(0x06, 0x06).w(this, FUNC(mbee_state::port06_w)); - map(0x07, 0x07).r(this, FUNC(mbee_state::port07_r)); - map(0x08, 0x08).rw(this, FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); + map(0x04, 0x04).w(FUNC(mbee_state::port04_w)); + map(0x06, 0x06).w(FUNC(mbee_state::port06_w)); + map(0x07, 0x07).r(FUNC(mbee_state::port07_r)); + map(0x08, 0x08).rw(FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); map(0x09, 0x09).nopw(); - map(0x0b, 0x0b).w(this, FUNC(mbee_state::port0b_w)); - map(0x0c, 0x0c).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x0d, 0x0d).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); - map(0x1c, 0x1f).rw(this, FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); + map(0x0b, 0x0b).w(FUNC(mbee_state::port0b_w)); + map(0x0c, 0x0c).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x0d, 0x0d).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); + map(0x1c, 0x1f).rw(FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); map(0x44, 0x47).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); - map(0x48, 0x4f).rw(this, FUNC(mbee_state::fdc_status_r), FUNC(mbee_state::fdc_motor_w)); - map(0x50, 0x57).w(this, FUNC(mbee_state::mbee128_50_w)); + map(0x48, 0x4f).rw(FUNC(mbee_state::fdc_status_r), FUNC(mbee_state::fdc_motor_w)); + map(0x50, 0x57).w(FUNC(mbee_state::mbee128_50_w)); } void mbee_state::mbee256_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0003).mirror(0xff00).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x0004, 0x0004).mirror(0xff00).w(this, FUNC(mbee_state::port04_w)); - map(0x0006, 0x0006).mirror(0xff00).w(this, FUNC(mbee_state::port06_w)); - map(0x0007, 0x0007).mirror(0xff00).r(this, FUNC(mbee_state::port07_r)); - map(0x0008, 0x0008).mirror(0xff00).rw(this, FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); - map(0x0009, 0x0009).mirror(0xfd00).r(this, FUNC(mbee_state::speed_low_r)); - map(0x0209, 0x0209).mirror(0xfd00).r(this, FUNC(mbee_state::speed_high_r)); + map(0x0004, 0x0004).mirror(0xff00).w(FUNC(mbee_state::port04_w)); + map(0x0006, 0x0006).mirror(0xff00).w(FUNC(mbee_state::port06_w)); + map(0x0007, 0x0007).mirror(0xff00).r(FUNC(mbee_state::port07_r)); + map(0x0008, 0x0008).mirror(0xff00).rw(FUNC(mbee_state::port08_r), FUNC(mbee_state::port08_w)); + map(0x0009, 0x0009).mirror(0xfd00).r(FUNC(mbee_state::speed_low_r)); + map(0x0209, 0x0209).mirror(0xfd00).r(FUNC(mbee_state::speed_high_r)); map(0x0009, 0x0009).mirror(0xff00).nopw(); - map(0x000b, 0x000b).mirror(0xff00).w(this, FUNC(mbee_state::port0b_w)); - map(0x000c, 0x000c).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(mbee_state::m6545_index_w)); - map(0x000d, 0x000d).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(mbee_state::m6545_data_w)); + map(0x000b, 0x000b).mirror(0xff00).w(FUNC(mbee_state::port0b_w)); + map(0x000c, 0x000c).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(mbee_state::m6545_index_w)); + map(0x000d, 0x000d).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(mbee_state::m6545_data_w)); // AM_RANGE(0x0010, 0x0013) AM_MIRROR(0xff00) Optional SN76489AN audio chip - map(0x0018, 0x001b).mirror(0xff00).r(this, FUNC(mbee_state::port18_r)); - map(0x001c, 0x001f).mirror(0xff00).rw(this, FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); + map(0x0018, 0x001b).mirror(0xff00).r(FUNC(mbee_state::port18_r)); + map(0x001c, 0x001f).mirror(0xff00).rw(FUNC(mbee_state::port1c_r), FUNC(mbee_state::port1c_w)); map(0x0044, 0x0047).mirror(0xff00).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); - map(0x0048, 0x004f).mirror(0xff00).rw(this, FUNC(mbee_state::fdc_status_r), FUNC(mbee_state::fdc_motor_w)); - map(0x0050, 0x0057).mirror(0xff00).w(this, FUNC(mbee_state::mbee256_50_w)); + map(0x0048, 0x004f).mirror(0xff00).rw(FUNC(mbee_state::fdc_status_r), FUNC(mbee_state::fdc_motor_w)); + map(0x0050, 0x0057).mirror(0xff00).w(FUNC(mbee_state::mbee256_50_w)); // AM_RANGE(0x0058, 0x005f) AM_MIRROR(0xff00) External options: floppy drive, hard drive and keyboard // AM_RANGE(0x0060, 0x0067) AM_MIRROR(0xff00) Reserved for file server selection (unused) // AM_RANGE(0x0068, 0x006f) AM_MIRROR(0xff00) Reserved for 8530 SCC (unused) @@ -656,7 +656,7 @@ MACHINE_CONFIG_START(mbee_state::mbee) MCFG_DEVICE_ADD("z80pio", Z80PIO, 12_MHz_XTAL / 6) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, mbee_state, pio_ardy)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, mbee_state, pio_port_b_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, mbee_state, pio_port_b_w)) @@ -713,7 +713,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeic) MCFG_DEVICE_ADD("z80pio", Z80PIO, 3375000) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, mbee_state, pio_ardy)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, mbee_state, pio_port_b_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, mbee_state, pio_port_b_w)) diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp index 2e961983b27..0e08a9777ed 100644 --- a/src/mame/drivers/mc10.cpp +++ b/src/mame/drivers/mc10.cpp @@ -301,14 +301,14 @@ void mc10_state::mc10_mem(address_map &map) map(0x4000, 0x4fff).bankrw("bank1"); /* 4k internal ram */ map(0x5000, 0x8fff).bankrw("bank2"); /* 16k memory expansion */ map(0x9000, 0xbffe).noprw(); /* unused */ - map(0xbfff, 0xbfff).rw(this, FUNC(mc10_state::mc10_bfff_r), FUNC(mc10_state::mc10_bfff_w)); + map(0xbfff, 0xbfff).rw(FUNC(mc10_state::mc10_bfff_r), FUNC(mc10_state::mc10_bfff_w)); map(0xe000, 0xffff).rom().region("maincpu", 0x0000); /* ROM */ } void mc10_state::mc10_io(address_map &map) { - map(M6801_PORT1, M6801_PORT1).rw(this, FUNC(mc10_state::mc10_port1_r), FUNC(mc10_state::mc10_port1_w)); - map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(mc10_state::mc10_port2_r), FUNC(mc10_state::mc10_port2_w)); + map(M6801_PORT1, M6801_PORT1).rw(FUNC(mc10_state::mc10_port1_r), FUNC(mc10_state::mc10_port1_w)); + map(M6801_PORT2, M6801_PORT2).rw(FUNC(mc10_state::mc10_port2_r), FUNC(mc10_state::mc10_port2_w)); } void mc10_state::alice32_mem(address_map &map) @@ -318,7 +318,7 @@ void mc10_state::alice32_mem(address_map &map) map(0x5000, 0x8fff).bankrw("bank2"); /* 16k memory expansion */ map(0x9000, 0xafff).noprw(); /* unused */ map(0xbf20, 0xbf29).rw(m_ef9345, FUNC(ef9345_device::data_r), FUNC(ef9345_device::data_w)); - map(0xbfff, 0xbfff).rw(this, FUNC(mc10_state::mc10_bfff_r), FUNC(mc10_state::alice32_bfff_w)); + map(0xbfff, 0xbfff).rw(FUNC(mc10_state::mc10_bfff_r), FUNC(mc10_state::alice32_bfff_w)); map(0xc000, 0xffff).rom().region("maincpu", 0x0000); /* ROM */ } @@ -327,7 +327,7 @@ void mc10_state::alice90_mem(address_map &map) map(0x0100, 0x2fff).noprw(); /* unused */ map(0x3000, 0xafff).bankrw("bank1"); /* 32k internal ram */ map(0xbf20, 0xbf29).rw(m_ef9345, FUNC(ef9345_device::data_r), FUNC(ef9345_device::data_w)); - map(0xbfff, 0xbfff).rw(this, FUNC(mc10_state::alice90_bfff_r), FUNC(mc10_state::alice32_bfff_w)); + map(0xbfff, 0xbfff).rw(FUNC(mc10_state::alice90_bfff_r), FUNC(mc10_state::alice32_bfff_w)); map(0xc000, 0xffff).rom().region("maincpu", 0x0000); /* ROM */ } diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp index 18165b8cbff..637b77a9554 100644 --- a/src/mame/drivers/mc1000.cpp +++ b/src/mame/drivers/mc1000.cpp @@ -251,21 +251,21 @@ void mc1000_state::mc1000_banking_mem(address_map &map) map(0x4000, 0x7fff).bankrw("bank3"); map(0x8000, 0x97ff).bankrw("bank4").share("mc6847_vram"); map(0x9800, 0xbfff).bankrw("bank5"); - map(0xc000, 0xffff).r(this, FUNC(mc1000_state::rom_banking_r)); + map(0xc000, 0xffff).r(FUNC(mc1000_state::rom_banking_r)); } void mc1000_state::mc1000_io(address_map &map) { map.global_mask(0xff); - map(0x04, 0x04).rw(this, FUNC(mc1000_state::printer_r), FUNC(mc1000_state::printer_w)); - map(0x05, 0x05).w("cent_data_out", FUNC(output_latch_device::write)); + map(0x04, 0x04).rw(FUNC(mc1000_state::printer_r), FUNC(mc1000_state::printer_w)); + map(0x05, 0x05).w("cent_data_out", FUNC(output_latch_device::bus_w)); // AM_RANGE(0x10, 0x10) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w) // AM_RANGE(0x11, 0x11) AM_DEVREADWRITE(MC6845_TAG, mc6845_device, register_r, register_w) - map(0x12, 0x12).w(this, FUNC(mc1000_state::mc6845_ctrl_w)); + map(0x12, 0x12).w(FUNC(mc1000_state::mc6845_ctrl_w)); map(0x20, 0x20).w(AY8910_TAG, FUNC(ay8910_device::address_w)); map(0x40, 0x40).r(AY8910_TAG, FUNC(ay8910_device::data_r)); map(0x60, 0x60).w(AY8910_TAG, FUNC(ay8910_device::data_w)); - map(0x80, 0x80).w(this, FUNC(mc1000_state::mc6847_attr_w)); + map(0x80, 0x80).w(FUNC(mc1000_state::mc6847_attr_w)); } /* Input Ports */ diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp index dd29b61f6bf..e3fa9e984fd 100644 --- a/src/mame/drivers/mc1502.cpp +++ b/src/mame/drivers/mc1502.cpp @@ -251,7 +251,7 @@ MACHINE_CONFIG_START(mc1502_state::mc1502) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) MCFG_DEVICE_ADD("ppi8255n1", I8255, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mc1502_state, mc1502_ppi_portb_w)) MCFG_I8255_IN_PORTC_CB(READ8(*this, mc1502_state, mc1502_ppi_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mc1502_state, mc1502_ppi_portc_w)) @@ -259,7 +259,7 @@ MACHINE_CONFIG_START(mc1502_state::mc1502) MCFG_DEVICE_ADD("ppi8255n2", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, mc1502_state, mc1502_kppi_porta_r)) MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mc1502_state, mc1502_kppi_portb_w)) - MCFG_I8255_IN_PORTC_CB(READ8("cent_status_in", input_buffer_device, read)) + MCFG_I8255_IN_PORTC_CB(READ8("cent_status_in", input_buffer_device, bus_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mc1502_state, mc1502_kppi_portc_w)) MCFG_DEVICE_ADD("upd8251", I8251, 0) diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp index 2b65c6ead82..d4f27c3834b 100644 --- a/src/mame/drivers/mc8030.cpp +++ b/src/mame/drivers/mc8030.cpp @@ -76,12 +76,12 @@ void mc8030_state::io_map(address_map &map) map(0x30, 0x3f).mirror(0xff00).noprw(); //"mass storage" map(0x80, 0x83).mirror(0xff00).rw("zve_ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // user CTC map(0x84, 0x87).mirror(0xff00).rw("zve_pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); // PIO unknown usage - map(0x88, 0x8f).mirror(0xff00).w(this, FUNC(mc8030_state::zve_write_protect_w)); - map(0xc0, 0xcf).select(0xff00).w(this, FUNC(mc8030_state::vis_w)); + map(0x88, 0x8f).mirror(0xff00).w(FUNC(mc8030_state::zve_write_protect_w)); + map(0xc0, 0xcf).select(0xff00).w(FUNC(mc8030_state::vis_w)); map(0xd0, 0xd3).mirror(0xff00).rw("asp_sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // keyboard & IFSS? map(0xd4, 0xd7).mirror(0xff00).rw("asp_ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // sio bauds, KMBG? and kbd map(0xd8, 0xdb).mirror(0xff00).rw("asp_pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); // external bus - map(0xe0, 0xef).mirror(0xff00).w(this, FUNC(mc8030_state::eprom_prog_w)); + map(0xe0, 0xef).mirror(0xff00).w(FUNC(mc8030_state::eprom_prog_w)); } /* Input ports */ diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp index 972b657f216..91cf0fece12 100644 --- a/src/mame/drivers/mcatadv.cpp +++ b/src/mame/drivers/mcatadv.cpp @@ -187,8 +187,8 @@ void mcatadv_state::mcatadv_map(address_map &map) map(0x200000, 0x200005).ram().share("scroll1"); map(0x300000, 0x300005).ram().share("scroll2"); - map(0x400000, 0x401fff).ram().w(this, FUNC(mcatadv_state::vram_w<0>)).share("vram_1"); // Tilemap 0 - map(0x500000, 0x501fff).ram().w(this, FUNC(mcatadv_state::vram_w<1>)).share("vram_2"); // Tilemap 1 + map(0x400000, 0x401fff).ram().w(FUNC(mcatadv_state::vram_w<0>)).share("vram_1"); // Tilemap 0 + map(0x500000, 0x501fff).ram().w(FUNC(mcatadv_state::vram_w<1>)).share("vram_2"); // Tilemap 1 map(0x600000, 0x601fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x602000, 0x602fff).ram(); // Bigger than needs to be? @@ -205,7 +205,7 @@ void mcatadv_state::mcatadv_map(address_map &map) map(0xb00000, 0xb0000f).ram().share("vidregs"); map(0xb00018, 0xb00019).w(m_watchdog, FUNC(watchdog_timer_device::reset16_w)); // NOST Only - map(0xb0001e, 0xb0001f).r(this, FUNC(mcatadv_state::mcat_wd_r)); // MCAT Only + map(0xb0001e, 0xb0001f).r(FUNC(mcatadv_state::mcat_wd_r)); // MCAT Only map(0xc00001, 0xc00001).r("soundlatch2", FUNC(generic_latch_8_device::read)); map(0xc00000, 0xc00001).w("soundlatch", FUNC(generic_latch_8_device::write)).umask16(0x00ff).cswidth(16); } @@ -224,7 +224,7 @@ void mcatadv_state::mcatadv_sound_map(address_map &map) map(0x4000, 0xbfff).bankr("soundbank"); // ROM map(0xc000, 0xdfff).ram(); // RAM map(0xe000, 0xe003).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0xf000, 0xf000).w(this, FUNC(mcatadv_state::mcatadv_sound_bw_w)); + map(0xf000, 0xf000).w(FUNC(mcatadv_state::mcatadv_sound_bw_w)); } void mcatadv_state::mcatadv_sound_io_map(address_map &map) @@ -246,7 +246,7 @@ void mcatadv_state::nost_sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x03).w("ymsnd", FUNC(ym2610_device::write)); map(0x04, 0x07).r("ymsnd", FUNC(ym2610_device::read)); - map(0x40, 0x40).w(this, FUNC(mcatadv_state::mcatadv_sound_bw_w)); + map(0x40, 0x40).w(FUNC(mcatadv_state::mcatadv_sound_bw_w)); map(0x80, 0x80).r("soundlatch", FUNC(generic_latch_8_device::read)).w("soundlatch2", FUNC(generic_latch_8_device::write)); } diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp index 4a76c429e9f..200e6c121fd 100644 --- a/src/mame/drivers/mcb216.cpp +++ b/src/mame/drivers/mcb216.cpp @@ -82,7 +82,7 @@ void mcb216_state::mcb216_io(address_map &map) { map.global_mask(0xff); // 74904 PROM provides custom remapping for TMS5501 registers - map(0x00, 0x00).r(this, FUNC(mcb216_state::tms5501_status_r)).w(m_tms5501, FUNC(tms5501_device::rr_w)); + map(0x00, 0x00).r(FUNC(mcb216_state::tms5501_status_r)).w(m_tms5501, FUNC(tms5501_device::rr_w)); map(0x01, 0x01).rw(m_tms5501, FUNC(tms5501_device::rb_r), FUNC(tms5501_device::tb_w)); map(0x02, 0x02).w(m_tms5501, FUNC(tms5501_device::cmd_w)); map(0x03, 0x03).rw(m_tms5501, FUNC(tms5501_device::rst_r), FUNC(tms5501_device::mr_w)); diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp index f78a0409632..5a3d0f5181a 100644 --- a/src/mame/drivers/mcr.cpp +++ b/src/mame/drivers/mcr.cpp @@ -699,7 +699,7 @@ void mcr_state::cpu_90009_map(address_map &map) map(0xf000, 0xf1ff).mirror(0x0200).ram().share("spriteram"); map(0xf400, 0xf41f).mirror(0x03e0).w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf800, 0xf81f).mirror(0x03e0).w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0xfc00, 0xffff).ram().w(this, FUNC(mcr_state::mcr_90009_videoram_w)).share("videoram"); + map(0xfc00, 0xffff).ram().w(FUNC(mcr_state::mcr_90009_videoram_w)).share("videoram"); } /* upper I/O map determined by PAL; only SSIO ports are verified from schematics */ @@ -728,7 +728,7 @@ void mcr_state::cpu_90010_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).mirror(0x1800).ram().share("nvram"); map(0xe000, 0xe1ff).mirror(0x1600).ram().share("spriteram"); - map(0xe800, 0xefff).mirror(0x1000).ram().w(this, FUNC(mcr_state::mcr_90010_videoram_w)).share("videoram"); + map(0xe800, 0xefff).mirror(0x1000).ram().w(FUNC(mcr_state::mcr_90010_videoram_w)).share("videoram"); } /* upper I/O map determined by PAL; only SSIO ports are verified from schematics */ @@ -757,8 +757,8 @@ void mcr_state::cpu_91490_map(address_map &map) map(0x0000, 0xdfff).rom(); map(0xe000, 0xe7ff).ram().share("nvram"); map(0xe800, 0xe9ff).mirror(0x0200).ram().share("spriteram"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(mcr_state::mcr_91490_videoram_w)).share("videoram"); - map(0xf800, 0xf87f).mirror(0x0780).w(this, FUNC(mcr_state::mcr_paletteram9_w)).share("paletteram"); + map(0xf000, 0xf7ff).ram().w(FUNC(mcr_state::mcr_91490_videoram_w)).share("videoram"); + map(0xf800, 0xf87f).mirror(0x0780).w(FUNC(mcr_state::mcr_paletteram9_w)).share("paletteram"); } /* upper I/O map determined by PAL; only SSIO ports are verified from schematics */ @@ -797,8 +797,8 @@ void mcr_nflfoot_state::ipu_91695_portmap(address_map &map) map(0x04, 0x07).mirror(0xe0).rw(m_ipu_sio, FUNC(z80dart_device::cd_ba_r), FUNC(z80dart_device::cd_ba_w)); map(0x08, 0x0b).mirror(0xe0).rw(m_ipu_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0c, 0x0f).mirror(0xe0).rw(m_ipu_pio1, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0x10, 0x13).mirror(0xe0).w(this, FUNC(mcr_nflfoot_state::ipu_laserdisk_w)); - map(0x1c, 0x1f).mirror(0xe0).rw(this, FUNC(mcr_nflfoot_state::ipu_watchdog_r), FUNC(mcr_nflfoot_state::ipu_watchdog_w)); + map(0x10, 0x13).mirror(0xe0).w(FUNC(mcr_nflfoot_state::ipu_laserdisk_w)); + map(0x1c, 0x1f).mirror(0xe0).rw(FUNC(mcr_nflfoot_state::ipu_watchdog_r), FUNC(mcr_nflfoot_state::ipu_watchdog_w)); } diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 28a958439f5..d8383bb0e3f 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -481,8 +481,8 @@ void mcr3_state::mcrmono_map(address_map &map) map(0xe000, 0xe7ff).ram().share("nvram"); map(0xe800, 0xe9ff).ram().share("spriteram"); map(0xea00, 0xebff).ram(); - map(0xec00, 0xec7f).mirror(0x0380).w(this, FUNC(mcr3_state::mcr_paletteram9_w)).share("paletteram"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(mcr3_state::mcr3_videoram_w)).share("videoram"); + map(0xec00, 0xec7f).mirror(0x0380).w(FUNC(mcr3_state::mcr_paletteram9_w)).share("paletteram"); + map(0xf000, 0xf7ff).ram().w(FUNC(mcr3_state::mcr3_videoram_w)).share("videoram"); map(0xf800, 0xffff).rom(); /* schematics show a 2716 @ 2B here, but nobody used it */ } @@ -496,7 +496,7 @@ void mcr3_state::mcrmono_portmap(address_map &map) map(0x02, 0x02).mirror(0x78).portr("MONO.IP2"); map(0x03, 0x03).mirror(0x78).portr("MONO.IP3"); map(0x04, 0x04).mirror(0x78).portr("MONO.IP4"); - map(0x05, 0x05).mirror(0x78).w(this, FUNC(mcr3_state::mcrmono_control_port_w)); + map(0x05, 0x05).mirror(0x78).w(FUNC(mcr3_state::mcrmono_control_port_w)); map(0x07, 0x07).mirror(0x78).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xf0, 0xf3).mirror(0x0c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); } @@ -514,11 +514,11 @@ void mcr3_state::spyhunt_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0xdfff).rom(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(mcr3_state::spyhunt_videoram_w)).share("videoram"); - map(0xe800, 0xebff).mirror(0x0400).ram().w(this, FUNC(mcr3_state::spyhunt_alpharam_w)).share("spyhunt_alpha"); + map(0xe000, 0xe7ff).ram().w(FUNC(mcr3_state::spyhunt_videoram_w)).share("videoram"); + map(0xe800, 0xebff).mirror(0x0400).ram().w(FUNC(mcr3_state::spyhunt_alpharam_w)).share("spyhunt_alpha"); map(0xf000, 0xf7ff).ram().share("nvram"); map(0xf800, 0xf9ff).ram().share("spriteram"); - map(0xfa00, 0xfa7f).mirror(0x0180).w(this, FUNC(mcr3_state::mcr_paletteram9_w)).share("paletteram"); + map(0xfa00, 0xfa7f).mirror(0x0180).w(FUNC(mcr3_state::mcr_paletteram9_w)).share("paletteram"); } /* upper I/O map determined by PAL; only SSIO ports and scroll registers are verified from schematics */ @@ -527,7 +527,7 @@ void mcr3_state::spyhunt_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); m_ssio->ssio_input_ports(map, "ssio"); - map(0x84, 0x86).w(this, FUNC(mcr3_state::spyhunt_scroll_value_w)); + map(0x84, 0x86).w(FUNC(mcr3_state::spyhunt_scroll_value_w)); map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xe8, 0xe8).nopw(); map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp index 362d4cec05a..20f80066a7f 100644 --- a/src/mame/drivers/mcr68.cpp +++ b/src/mame/drivers/mcr68.cpp @@ -279,7 +279,7 @@ void mcr68_state::mcr68_map(address_map &map) map.global_mask(0x1fffff); map(0x000000, 0x03ffff).rom(); map(0x060000, 0x063fff).ram(); - map(0x070000, 0x070fff).ram().w(this, FUNC(mcr68_state::mcr68_videoram_w)).share("videoram"); + map(0x070000, 0x070fff).ram().w(FUNC(mcr68_state::mcr68_videoram_w)).share("videoram"); map(0x071000, 0x071fff).ram(); map(0x080000, 0x080fff).ram().share("spriteram"); map(0x090000, 0x09007f).w("palette", FUNC(palette_device::write16)).share("palette"); @@ -303,16 +303,16 @@ void mcr68_state::pigskin_map(address_map &map) map.unmap_value_high(); map.global_mask(0x1fffff); map(0x000000, 0x03ffff).rom(); - map(0x080000, 0x08ffff).r(this, FUNC(mcr68_state::pigskin_port_1_r)); - map(0x0a0000, 0x0affff).r(this, FUNC(mcr68_state::pigskin_port_2_r)); + map(0x080000, 0x08ffff).r(FUNC(mcr68_state::pigskin_port_1_r)); + map(0x0a0000, 0x0affff).r(FUNC(mcr68_state::pigskin_port_2_r)); map(0x0c0000, 0x0c007f).w("palette", FUNC(palette_device::write16)).share("palette"); map(0x0e0000, 0x0effff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x100000, 0x100fff).ram().w(this, FUNC(mcr68_state::mcr68_videoram_w)).share("videoram"); - map(0x120000, 0x120001).rw(this, FUNC(mcr68_state::pigskin_protection_r), FUNC(mcr68_state::pigskin_protection_w)); + map(0x100000, 0x100fff).ram().w(FUNC(mcr68_state::mcr68_videoram_w)).share("videoram"); + map(0x120000, 0x120001).rw(FUNC(mcr68_state::pigskin_protection_r), FUNC(mcr68_state::pigskin_protection_w)); map(0x140000, 0x143fff).ram(); map(0x160000, 0x1607ff).ram().share("spriteram"); map(0x180000, 0x18000f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0xff00); - map(0x1a0000, 0x1affff).w(this, FUNC(mcr68_state::archrivl_control_w)); + map(0x1a0000, 0x1affff).w(FUNC(mcr68_state::archrivl_control_w)); map(0x1e0000, 0x1effff).portr("IN0"); } @@ -329,14 +329,14 @@ void mcr68_state::trisport_map(address_map &map) map.unmap_value_high(); map.global_mask(0x1fffff); map(0x000000, 0x03ffff).rom(); - map(0x080000, 0x08ffff).r(this, FUNC(mcr68_state::trisport_port_1_r)); + map(0x080000, 0x08ffff).r(FUNC(mcr68_state::trisport_port_1_r)); map(0x0a0000, 0x0affff).portr("DSW"); map(0x100000, 0x103fff).ram().share("nvram"); map(0x120000, 0x12007f).w("palette", FUNC(palette_device::write16)).share("palette"); map(0x140000, 0x1407ff).ram().share("spriteram"); - map(0x160000, 0x160fff).ram().w(this, FUNC(mcr68_state::mcr68_videoram_w)).share("videoram"); + map(0x160000, 0x160fff).ram().w(FUNC(mcr68_state::mcr68_videoram_w)).share("videoram"); map(0x180000, 0x18000f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0xff00); - map(0x1a0000, 0x1affff).w(this, FUNC(mcr68_state::archrivl_control_w)); + map(0x1a0000, 0x1affff).w(FUNC(mcr68_state::archrivl_control_w)); map(0x1c0000, 0x1cffff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x1e0000, 0x1effff).portr("IN0"); } diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp index a28d966de48..ca3c9ef57de 100644 --- a/src/mame/drivers/meadows.cpp +++ b/src/mame/drivers/meadows.cpp @@ -334,13 +334,13 @@ void meadows_state::meadows_main_map(address_map &map) map(0x0000, 0x0bff).rom(); map(0x0c00, 0x0c00).portr("INPUTS"); map(0x0c01, 0x0c01).portr("STICK"); - map(0x0c02, 0x0c02).r(this, FUNC(meadows_state::hsync_chain_r)); + map(0x0c02, 0x0c02).r(FUNC(meadows_state::hsync_chain_r)); map(0x0c03, 0x0c03).portr("DSW"); - map(0x0c00, 0x0c03).w(this, FUNC(meadows_state::meadows_audio_w)); - map(0x0d00, 0x0d0f).w(this, FUNC(meadows_state::meadows_spriteram_w)).share("spriteram"); + map(0x0c00, 0x0c03).w(FUNC(meadows_state::meadows_audio_w)); + map(0x0d00, 0x0d0f).w(FUNC(meadows_state::meadows_spriteram_w)).share("spriteram"); map(0x0e00, 0x0eff).ram(); map(0x1000, 0x1bff).rom(); - map(0x1c00, 0x1fff).ram().w(this, FUNC(meadows_state::meadows_videoram_w)).share("videoram"); + map(0x1c00, 0x1fff).ram().w(FUNC(meadows_state::meadows_videoram_w)).share("videoram"); } void meadows_state::bowl3d_main_map(address_map &map) @@ -348,26 +348,26 @@ void meadows_state::bowl3d_main_map(address_map &map) map(0x0000, 0x0bff).rom(); map(0x0c00, 0x0c00).portr("INPUTS1"); map(0x0c01, 0x0c01).portr("INPUTS2"); - map(0x0c02, 0x0c02).r(this, FUNC(meadows_state::hsync_chain_r)); + map(0x0c02, 0x0c02).r(FUNC(meadows_state::hsync_chain_r)); map(0x0c03, 0x0c03).portr("DSW"); - map(0x0c00, 0x0c03).w(this, FUNC(meadows_state::meadows_audio_w)); - map(0x0d00, 0x0d0f).w(this, FUNC(meadows_state::meadows_spriteram_w)).share("spriteram"); + map(0x0c00, 0x0c03).w(FUNC(meadows_state::meadows_audio_w)); + map(0x0d00, 0x0d0f).w(FUNC(meadows_state::meadows_spriteram_w)).share("spriteram"); map(0x0e00, 0x0eff).ram(); map(0x1000, 0x1bff).rom(); - map(0x1c00, 0x1fff).ram().w(this, FUNC(meadows_state::meadows_videoram_w)).share("videoram"); + map(0x1c00, 0x1fff).ram().w(FUNC(meadows_state::meadows_videoram_w)).share("videoram"); } void meadows_state::minferno_main_map(address_map &map) { map(0x0000, 0x0bff).rom(); - map(0x1c00, 0x1eff).ram().w(this, FUNC(meadows_state::meadows_videoram_w)).share("videoram"); + map(0x1c00, 0x1eff).ram().w(FUNC(meadows_state::meadows_videoram_w)).share("videoram"); map(0x1f00, 0x1f00).portr("JOY1"); map(0x1f01, 0x1f01).portr("JOY2"); map(0x1f02, 0x1f02).portr("BUTTONS"); map(0x1f03, 0x1f03).portr("DSW1"); - map(0x1f00, 0x1f03).w(this, FUNC(meadows_state::meadows_audio_w)); - map(0x1f04, 0x1f04).r(this, FUNC(meadows_state::vsync_chain_hi_r)); - map(0x1f05, 0x1f05).r(this, FUNC(meadows_state::vsync_chain_lo_r)); + map(0x1f00, 0x1f03).w(FUNC(meadows_state::meadows_audio_w)); + map(0x1f04, 0x1f04).r(FUNC(meadows_state::vsync_chain_hi_r)); + map(0x1f05, 0x1f05).r(FUNC(meadows_state::vsync_chain_lo_r)); } @@ -387,7 +387,7 @@ void meadows_state::minferno_data_map(address_map &map) void meadows_state::audio_map(address_map &map) { map(0x0000, 0x0bff).rom(); - map(0x0c00, 0x0c03).rw(this, FUNC(meadows_state::audio_hardware_r), FUNC(meadows_state::audio_hardware_w)); + map(0x0c00, 0x0c03).rw(FUNC(meadows_state::audio_hardware_r), FUNC(meadows_state::audio_hardware_w)); map(0x0e00, 0x0eff).ram(); } diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp index 97dd309f321..bbc34609e21 100644 --- a/src/mame/drivers/mediagx.cpp +++ b/src/mame/drivers/mediagx.cpp @@ -756,9 +756,9 @@ void mediagx_state::mediagx_map(address_map &map) map(0x000b0000, 0x000b7fff).ram().share("cga_ram"); map(0x000c0000, 0x000fffff).ram().share("bios_ram"); map(0x00100000, 0x00ffffff).ram(); - map(0x40008000, 0x400080ff).rw(this, FUNC(mediagx_state::biu_ctrl_r), FUNC(mediagx_state::biu_ctrl_w)); - map(0x40008300, 0x400083ff).rw(this, FUNC(mediagx_state::disp_ctrl_r), FUNC(mediagx_state::disp_ctrl_w)); - map(0x40008400, 0x400084ff).rw(this, FUNC(mediagx_state::memory_ctrl_r), FUNC(mediagx_state::memory_ctrl_w)); + map(0x40008000, 0x400080ff).rw(FUNC(mediagx_state::biu_ctrl_r), FUNC(mediagx_state::biu_ctrl_w)); + map(0x40008300, 0x400083ff).rw(FUNC(mediagx_state::disp_ctrl_r), FUNC(mediagx_state::disp_ctrl_w)); + map(0x40008400, 0x400084ff).rw(FUNC(mediagx_state::memory_ctrl_r), FUNC(mediagx_state::memory_ctrl_w)); map(0x40800000, 0x40bfffff).ram().share("vram"); map(0xfffc0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ } @@ -766,12 +766,12 @@ void mediagx_state::mediagx_map(address_map &map) void mediagx_state::mediagx_io(address_map &map) { pcat32_io_common(map); - map(0x0022, 0x0023).rw(this, FUNC(mediagx_state::io20_r), FUNC(mediagx_state::io20_w)); + map(0x0022, 0x0023).rw(FUNC(mediagx_state::io20_r), FUNC(mediagx_state::io20_w)); map(0x00e8, 0x00eb).noprw(); // I/O delay port - map(0x01f0, 0x01f7).rw(m_ide, FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x0378, 0x037b).rw(this, FUNC(mediagx_state::parallel_port_r), FUNC(mediagx_state::parallel_port_w)); - map(0x03f0, 0x03f7).rw(m_ide, FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); - map(0x0400, 0x04ff).rw(this, FUNC(mediagx_state::ad1847_r), FUNC(mediagx_state::ad1847_w)); + map(0x01f0, 0x01f7).rw(m_ide, FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x0378, 0x037b).rw(FUNC(mediagx_state::parallel_port_r), FUNC(mediagx_state::parallel_port_w)); + map(0x03f0, 0x03f7).rw(m_ide, FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); + map(0x0400, 0x04ff).rw(FUNC(mediagx_state::ad1847_r), FUNC(mediagx_state::ad1847_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); } diff --git a/src/mame/drivers/megadriv_acbl.cpp b/src/mame/drivers/megadriv_acbl.cpp index 06bbf213b27..a94c5909518 100644 --- a/src/mame/drivers/megadriv_acbl.cpp +++ b/src/mame/drivers/megadriv_acbl.cpp @@ -269,14 +269,14 @@ void md_boot_state::md_bootleg_map(address_map &map) map(0x000000, 0x0fffff).rom(); /* Cartridge Program Rom */ map(0x200000, 0x2023ff).ram(); // tested - map(0xa00000, 0xa01fff).rw(this, FUNC(md_boot_state::megadriv_68k_read_z80_ram), FUNC(md_boot_state::megadriv_68k_write_z80_ram)); - map(0xa02000, 0xa03fff).w(this, FUNC(md_boot_state::megadriv_68k_write_z80_ram)); - map(0xa04000, 0xa04003).rw(this, FUNC(md_boot_state::megadriv_68k_YM2612_read), FUNC(md_boot_state::megadriv_68k_YM2612_write)); - map(0xa06000, 0xa06001).w(this, FUNC(md_boot_state::megadriv_68k_z80_bank_write)); - - map(0xa10000, 0xa1001f).rw(this, FUNC(md_boot_state::megadriv_68k_io_read), FUNC(md_boot_state::megadriv_68k_io_write)); - map(0xa11100, 0xa11101).rw(this, FUNC(md_boot_state::megadriv_68k_check_z80_bus), FUNC(md_boot_state::megadriv_68k_req_z80_bus)); - map(0xa11200, 0xa11201).w(this, FUNC(md_boot_state::megadriv_68k_req_z80_reset)); + map(0xa00000, 0xa01fff).rw(FUNC(md_boot_state::megadriv_68k_read_z80_ram), FUNC(md_boot_state::megadriv_68k_write_z80_ram)); + map(0xa02000, 0xa03fff).w(FUNC(md_boot_state::megadriv_68k_write_z80_ram)); + map(0xa04000, 0xa04003).rw(FUNC(md_boot_state::megadriv_68k_YM2612_read), FUNC(md_boot_state::megadriv_68k_YM2612_write)); + map(0xa06000, 0xa06001).w(FUNC(md_boot_state::megadriv_68k_z80_bank_write)); + + map(0xa10000, 0xa1001f).rw(FUNC(md_boot_state::megadriv_68k_io_read), FUNC(md_boot_state::megadriv_68k_io_write)); + map(0xa11100, 0xa11101).rw(FUNC(md_boot_state::megadriv_68k_check_z80_bus), FUNC(md_boot_state::megadriv_68k_req_z80_bus)); + map(0xa11200, 0xa11201).w(FUNC(md_boot_state::megadriv_68k_req_z80_reset)); map(0xc00000, 0xc0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); map(0xd00000, 0xd0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); diff --git a/src/mame/drivers/megadriv_rad.cpp b/src/mame/drivers/megadriv_rad.cpp index af62d046a7f..60597e07a53 100644 --- a/src/mame/drivers/megadriv_rad.cpp +++ b/src/mame/drivers/megadriv_rad.cpp @@ -26,15 +26,15 @@ // todo, use actual MD map, easier once maps are part of base class. void megadriv_radica_state::megadriv_radica_map(address_map &map) { - map(0x000000, 0x3fffff).r(this, FUNC(megadriv_radica_state::read)); /* Cartridge Program Rom */ - map(0xa00000, 0xa01fff).rw(this, FUNC(megadriv_radica_state::megadriv_68k_read_z80_ram), FUNC(megadriv_radica_state::megadriv_68k_write_z80_ram)); - map(0xa02000, 0xa03fff).w(this, FUNC(megadriv_radica_state::megadriv_68k_write_z80_ram)); - map(0xa04000, 0xa04003).rw(this, FUNC(megadriv_radica_state::megadriv_68k_YM2612_read), FUNC(megadriv_radica_state::megadriv_68k_YM2612_write)); - map(0xa06000, 0xa06001).w(this, FUNC(megadriv_radica_state::megadriv_68k_z80_bank_write)); - map(0xa10000, 0xa1001f).rw(this, FUNC(megadriv_radica_state::megadriv_68k_io_read), FUNC(megadriv_radica_state::megadriv_68k_io_write)); - map(0xa11100, 0xa11101).rw(this, FUNC(megadriv_radica_state::megadriv_68k_check_z80_bus), FUNC(megadriv_radica_state::megadriv_68k_req_z80_bus)); - map(0xa11200, 0xa11201).w(this, FUNC(megadriv_radica_state::megadriv_68k_req_z80_reset)); - map(0xa13000, 0xa130ff).r(this, FUNC(megadriv_radica_state::read_a13)); + map(0x000000, 0x3fffff).r(FUNC(megadriv_radica_state::read)); /* Cartridge Program Rom */ + map(0xa00000, 0xa01fff).rw(FUNC(megadriv_radica_state::megadriv_68k_read_z80_ram), FUNC(megadriv_radica_state::megadriv_68k_write_z80_ram)); + map(0xa02000, 0xa03fff).w(FUNC(megadriv_radica_state::megadriv_68k_write_z80_ram)); + map(0xa04000, 0xa04003).rw(FUNC(megadriv_radica_state::megadriv_68k_YM2612_read), FUNC(megadriv_radica_state::megadriv_68k_YM2612_write)); + map(0xa06000, 0xa06001).w(FUNC(megadriv_radica_state::megadriv_68k_z80_bank_write)); + map(0xa10000, 0xa1001f).rw(FUNC(megadriv_radica_state::megadriv_68k_io_read), FUNC(megadriv_radica_state::megadriv_68k_io_write)); + map(0xa11100, 0xa11101).rw(FUNC(megadriv_radica_state::megadriv_68k_check_z80_bus), FUNC(megadriv_radica_state::megadriv_68k_req_z80_bus)); + map(0xa11200, 0xa11201).w(FUNC(megadriv_radica_state::megadriv_68k_req_z80_reset)); + map(0xa13000, 0xa130ff).r(FUNC(megadriv_radica_state::read_a13)); map(0xc00000, 0xc0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); map(0xe00000, 0xe0ffff).ram().mirror(0x1f0000).share("megadrive_ram"); } diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp index c706c0dc418..22c1b102c2a 100644 --- a/src/mame/drivers/megaplay.cpp +++ b/src/mame/drivers/megaplay.cpp @@ -592,12 +592,12 @@ void mplay_state::megaplay_bios_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x4fff).ram(); map(0x5000, 0x5fff).ram(); - map(0x6000, 0x6000).w(this, FUNC(mplay_state::game_w)); + map(0x6000, 0x6000).w(FUNC(mplay_state::game_w)); map(0x6200, 0x6207).rw("io1", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)); map(0x6400, 0x6407).rw("io2", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)); - map(0x6600, 0x6600).rw(this, FUNC(mplay_state::bios_6600_r), FUNC(mplay_state::bios_6600_w)); + map(0x6600, 0x6600).rw(FUNC(mplay_state::bios_6600_r), FUNC(mplay_state::bios_6600_w)); map(0x6800, 0x77ff).ram().share("ic3_ram"); - map(0x8000, 0xffff).rw(this, FUNC(mplay_state::bank_r), FUNC(mplay_state::bank_w)); + map(0x8000, 0xffff).rw(FUNC(mplay_state::bank_r), FUNC(mplay_state::bank_w)); } @@ -614,9 +614,9 @@ READ8_MEMBER(mplay_state::vdp1_count_r) void mplay_state::megaplay_bios_io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w("sn2", FUNC(sn76496_device::write)); + map(0x7f, 0x7f).w("sn2", FUNC(sn76496_device::command_w)); - map(0x40, 0x41).mirror(0x3e).r(this, FUNC(mplay_state::vdp1_count_r)); + map(0x40, 0x41).mirror(0x3e).r(FUNC(mplay_state::vdp1_count_r)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp1, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp1, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); } diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index b341c618d01..511cacd6981 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -211,13 +211,13 @@ void megasys1_state::megasys1Z_map(address_map &map) map(0x080006, 0x080007).portr("DSW"); map(0x084200, 0x084205).w("scroll0", FUNC(megasys1_tilemap_device::scroll_w)); map(0x084208, 0x08420d).w("scroll1", FUNC(megasys1_tilemap_device::scroll_w)); - map(0x084300, 0x084301).w(this, FUNC(megasys1_state::screen_flag_w)); - map(0x084308, 0x084309).w(this, FUNC(megasys1_state::soundlatch_z_w)); + map(0x084300, 0x084301).w(FUNC(megasys1_state::screen_flag_w)); + map(0x084308, 0x084309).w(FUNC(megasys1_state::soundlatch_z_w)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08e000, 0x08ffff).ram().share("objectram"); map(0x090000, 0x093fff).ram().w("scroll0", FUNC(megasys1_tilemap_device::write)).share("scroll0"); map(0x094000, 0x097fff).ram().w("scroll1", FUNC(megasys1_tilemap_device::write)).share("scroll1"); - map(0x0f0000, 0x0fffff).ram().w(this, FUNC(megasys1_state::ram_w)).share("ram"); + map(0x0f0000, 0x0fffff).ram().w(FUNC(megasys1_state::ram_w)).share("ram"); } void megasys1_state::megasys1A_map(address_map &map) @@ -225,10 +225,10 @@ void megasys1_state::megasys1A_map(address_map &map) map.global_mask(0xfffff); megasys1Z_map(map); map(0x080008, 0x080009).r(m_soundlatch2, FUNC(generic_latch_16_device::read)); /* from sound cpu */ - map(0x084000, 0x084001).w(this, FUNC(megasys1_state::active_layers_w)); + map(0x084000, 0x084001).w(FUNC(megasys1_state::active_layers_w)); map(0x084008, 0x08400d).w("scroll2", FUNC(megasys1_tilemap_device::scroll_w)); - map(0x084100, 0x084101).rw(this, FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); - map(0x084308, 0x084309).w(this, FUNC(megasys1_state::soundlatch_w)); + map(0x084100, 0x084101).rw(FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); + map(0x084308, 0x084309).w(FUNC(megasys1_state::soundlatch_w)); map(0x098000, 0x09bfff).ram().w("scroll2", FUNC(megasys1_tilemap_device::write)).share("scroll2"); } @@ -305,21 +305,21 @@ void megasys1_state::megasys1B_map(address_map &map) { map.global_mask(0xfffff); map(0x000000, 0x03ffff).rom(); - map(0x044000, 0x044001).w(this, FUNC(megasys1_state::active_layers_w)); + map(0x044000, 0x044001).w(FUNC(megasys1_state::active_layers_w)); map(0x044008, 0x04400d).w("scroll2", FUNC(megasys1_tilemap_device::scroll_w)); - map(0x044100, 0x044101).rw(this, FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); + map(0x044100, 0x044101).rw(FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); map(0x044200, 0x044205).w("scroll0", FUNC(megasys1_tilemap_device::scroll_w)); map(0x044208, 0x04420d).w("scroll1", FUNC(megasys1_tilemap_device::scroll_w)); - map(0x044300, 0x044301).w(this, FUNC(megasys1_state::screen_flag_w)); - map(0x044308, 0x044309).w(this, FUNC(megasys1_state::soundlatch_w)); + map(0x044300, 0x044301).w(FUNC(megasys1_state::screen_flag_w)); + map(0x044308, 0x044309).w(FUNC(megasys1_state::soundlatch_w)); map(0x048000, 0x0487ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x04e000, 0x04ffff).ram().share("objectram"); map(0x050000, 0x053fff).ram().w("scroll0", FUNC(megasys1_tilemap_device::write)).share("scroll0"); map(0x054000, 0x057fff).ram().w("scroll1", FUNC(megasys1_tilemap_device::write)).share("scroll1"); map(0x058000, 0x05bfff).ram().w("scroll2", FUNC(megasys1_tilemap_device::write)).share("scroll2"); - map(0x060000, 0x07ffff).ram().w(this, FUNC(megasys1_state::ram_w)).share("ram"); + map(0x060000, 0x07ffff).ram().w(FUNC(megasys1_state::ram_w)).share("ram"); map(0x080000, 0x0bffff).rom(); - map(0x0e0000, 0x0e0001).rw(this, FUNC(megasys1_state::ip_select_r), FUNC(megasys1_state::ip_select_w)); + map(0x0e0000, 0x0e0001).rw(FUNC(megasys1_state::ip_select_r), FUNC(megasys1_state::ip_select_w)); } void megasys1_state::megasys1B_edfbl_map(address_map &map) @@ -338,8 +338,8 @@ void megasys1_state::megasys1B_monkelf_map(address_map &map) { map.global_mask(0xfffff); megasys1B_map(map); - map(0x044200, 0x044205).w(this, FUNC(megasys1_state::monkelf_scroll0_w)); - map(0x044208, 0x04420d).w(this, FUNC(megasys1_state::monkelf_scroll1_w)); + map(0x044200, 0x044205).w(FUNC(megasys1_state::monkelf_scroll0_w)); + map(0x044208, 0x04420d).w(FUNC(megasys1_state::monkelf_scroll1_w)); map(0x0e0002, 0x0e0003).portr("P1"); map(0x0e0004, 0x0e0005).portr("P2"); map(0x0e0006, 0x0e0007).portr("DSW1"); @@ -376,19 +376,19 @@ void megasys1_state::megasys1C_map(address_map &map) map(0x0c2000, 0x0c2005).w("scroll0", FUNC(megasys1_tilemap_device::scroll_w)); map(0x0c2008, 0x0c200d).w("scroll1", FUNC(megasys1_tilemap_device::scroll_w)); map(0x0c2100, 0x0c2105).w("scroll2", FUNC(megasys1_tilemap_device::scroll_w)); - map(0x0c2108, 0x0c2109).w(this, FUNC(megasys1_state::sprite_bank_w)); - map(0x0c2200, 0x0c2201).rw(this, FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); - map(0x0c2208, 0x0c2209).w(this, FUNC(megasys1_state::active_layers_w)); - map(0x0c2308, 0x0c2309).w(this, FUNC(megasys1_state::screen_flag_w)); - map(0x0c8000, 0x0c8001).r(m_soundlatch2, FUNC(generic_latch_16_device::read)).w(this, FUNC(megasys1_state::soundlatch_c_w)); + map(0x0c2108, 0x0c2109).w(FUNC(megasys1_state::sprite_bank_w)); + map(0x0c2200, 0x0c2201).rw(FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); + map(0x0c2208, 0x0c2209).w(FUNC(megasys1_state::active_layers_w)); + map(0x0c2308, 0x0c2309).w(FUNC(megasys1_state::screen_flag_w)); + map(0x0c8000, 0x0c8001).r(m_soundlatch2, FUNC(generic_latch_16_device::read)).w(FUNC(megasys1_state::soundlatch_c_w)); map(0x0d2000, 0x0d3fff).ram().share("objectram"); - map(0x0d8000, 0x0d8001).rw(this, FUNC(megasys1_state::ip_select_r), FUNC(megasys1_state::ip_select_w)); + map(0x0d8000, 0x0d8001).rw(FUNC(megasys1_state::ip_select_r), FUNC(megasys1_state::ip_select_w)); // 64th Street actively uses 0xe4*** for breakable objects. map(0x0e0000, 0x0e3fff).mirror(0x4000).ram().w("scroll0", FUNC(megasys1_tilemap_device::write)).share("scroll0"); map(0x0e8000, 0x0ebfff).mirror(0x4000).ram().w("scroll1", FUNC(megasys1_tilemap_device::write)).share("scroll1"); map(0x0f0000, 0x0f3fff).mirror(0x4000).ram().w("scroll2", FUNC(megasys1_tilemap_device::write)).share("scroll2"); map(0x0f8000, 0x0f87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x1c0000, 0x1cffff).mirror(0x30000).ram().w(this, FUNC(megasys1_state::ram_w)).share("ram"); //0x1f****, Cybattler reads attract mode inputs at 0x1d**** + map(0x1c0000, 0x1cffff).mirror(0x30000).ram().w(FUNC(megasys1_state::ram_w)).share("ram"); //0x1f****, Cybattler reads attract mode inputs at 0x1d**** } @@ -407,9 +407,9 @@ void megasys1_state::megasys1D_map(address_map &map) map(0x0c2000, 0x0c2005).w("scroll0", FUNC(megasys1_tilemap_device::scroll_w)); map(0x0c2008, 0x0c200d).w("scroll1", FUNC(megasys1_tilemap_device::scroll_w)); map(0x0c2108, 0x0c2109).nopw(); //AM_WRITE(sprite_bank_w) - map(0x0c2200, 0x0c2201).rw(this, FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); - map(0x0c2208, 0x0c2209).w(this, FUNC(megasys1_state::active_layers_w)); - map(0x0c2308, 0x0c2309).w(this, FUNC(megasys1_state::screen_flag_w)); + map(0x0c2200, 0x0c2201).rw(FUNC(megasys1_state::sprite_flag_r), FUNC(megasys1_state::sprite_flag_w)); + map(0x0c2208, 0x0c2209).w(FUNC(megasys1_state::active_layers_w)); + map(0x0c2308, 0x0c2309).w(FUNC(megasys1_state::screen_flag_w)); map(0x0ca000, 0x0cbfff).ram().share("objectram"); map(0x0d0000, 0x0d3fff).ram().w("scroll1", FUNC(megasys1_tilemap_device::write)).share("scroll1"); map(0x0d8000, 0x0d87ff).mirror(0x3000).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -418,7 +418,7 @@ void megasys1_state::megasys1D_map(address_map &map) map(0x0f0000, 0x0f0001).portr("SYSTEM"); map(0x0f8001, 0x0f8001).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // map(0x100000, 0x100001); // protection - map(0x1f0000, 0x1fffff).ram() /*.w(this, FUNC(megasys1_state::ram_w))*/ .share("ram"); + map(0x1f0000, 0x1fffff).ram() /*.w(FUNC(megasys1_state::ram_w))*/ .share("ram"); } void megasys1_state::megasys1D_oki_map(address_map &map) @@ -517,9 +517,9 @@ void megasys1_state::megasys1A_sound_map(address_map &map) map(0x040000, 0x040001).r(m_soundlatch, FUNC(generic_latch_16_device::read)); map(0x060000, 0x060001).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); // to main cpu map(0x080000, 0x080003).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); - map(0x0a0001, 0x0a0001).r(this, FUNC(megasys1_state::oki_status_1_r)); + map(0x0a0001, 0x0a0001).r(FUNC(megasys1_state::oki_status_1_r)); map(0x0a0000, 0x0a0003).w(m_oki1, FUNC(okim6295_device::write)).umask16(0x00ff); - map(0x0c0001, 0x0c0001).r(this, FUNC(megasys1_state::oki_status_2_r)); + map(0x0c0001, 0x0c0001).r(FUNC(megasys1_state::oki_status_2_r)); map(0x0c0000, 0x0c0003).w(m_oki2, FUNC(okim6295_device::write)).umask16(0x00ff); map(0x0e0000, 0x0fffff).ram(); } @@ -530,7 +530,7 @@ void megasys1_state::kickoffb_sound_map(address_map &map) map(0x040000, 0x040001).r(m_soundlatch, FUNC(generic_latch_16_device::read)); map(0x060000, 0x060001).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); // to main cpu map(0x080000, 0x080003).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)).umask16(0x00ff); - map(0x0a0001, 0x0a0001).r(this, FUNC(megasys1_state::oki_status_1_r)); + map(0x0a0001, 0x0a0001).r(FUNC(megasys1_state::oki_status_1_r)); map(0x0a0000, 0x0a0003).w(m_oki1, FUNC(okim6295_device::write)).umask16(0x00ff); map(0x0e0000, 0x0fffff).ram(); } @@ -547,9 +547,9 @@ void megasys1_state::megasys1B_sound_map(address_map &map) map(0x040000, 0x040001).r(m_soundlatch, FUNC(generic_latch_16_device::read)).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); /* from/to main cpu */ map(0x060000, 0x060001).r(m_soundlatch, FUNC(generic_latch_16_device::read)).w(m_soundlatch2, FUNC(generic_latch_16_device::write)); /* from/to main cpu */ map(0x080000, 0x080003).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); - map(0x0a0001, 0x0a0001).r(this, FUNC(megasys1_state::oki_status_1_r)); + map(0x0a0001, 0x0a0001).r(FUNC(megasys1_state::oki_status_1_r)); map(0x0a0000, 0x0a0003).w(m_oki1, FUNC(okim6295_device::write)).umask16(0x00ff); - map(0x0c0001, 0x0c0001).r(this, FUNC(megasys1_state::oki_status_2_r)); + map(0x0c0001, 0x0c0001).r(FUNC(megasys1_state::oki_status_2_r)); map(0x0c0000, 0x0c0003).w(m_oki2, FUNC(okim6295_device::write)).umask16(0x00ff); map(0x0e0000, 0x0effff).ram(); } diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp index 0078f6acff5..eea2c85f0f2 100644 --- a/src/mame/drivers/megatech.cpp +++ b/src/mame/drivers/megatech.cpp @@ -383,7 +383,7 @@ void mtech_state::set_genz80_as_sms() // ports io.install_read_handler (0x40, 0x41, 0, 0x3e, 0, read8_delegate(FUNC(mtech_state::sms_count_r),this)); - io.install_write_handler (0x40, 0x41, 0, 0x3e, 0, write8_delegate(FUNC(sn76496_device::write),(sn76496_base_device *)m_snsnd)); + io.install_write_handler (0x40, 0x41, 0, 0x3e, 0, write8_delegate(FUNC(sn76496_device::command_w),(sn76496_base_device *)m_snsnd)); io.install_readwrite_handler (0x80, 0x80, 0, 0x3e, 0, read8_delegate(FUNC(sega315_5124_device::vram_read),(sega315_5124_device *)m_vdp), write8_delegate(FUNC(sega315_5124_device::vram_write),(sega315_5124_device *)m_vdp)); io.install_readwrite_handler (0x81, 0x81, 0, 0x3e, 0, read8_delegate(FUNC(sega315_5124_device::register_read),(sega315_5124_device *)m_vdp), write8_delegate(FUNC(sega315_5124_device::register_write),(sega315_5124_device *)m_vdp)); @@ -525,14 +525,14 @@ WRITE8_MEMBER(mtech_state::banked_ram_w ) void mtech_state::megatech_bios_map(address_map &map) { map(0x0000, 0x2fff).rom(); // from bios rom (0x0000-0x2fff populated in ROM) - map(0x3000, 0x3fff).rw(this, FUNC(mtech_state::banked_ram_r), FUNC(mtech_state::banked_ram_w)); // copies instruction data here at startup, must be banked + map(0x3000, 0x3fff).rw(FUNC(mtech_state::banked_ram_r), FUNC(mtech_state::banked_ram_w)); // copies instruction data here at startup, must be banked map(0x4000, 0x5fff).ram(); // plain ram? - map(0x6000, 0x6000).w(this, FUNC(mtech_state::mt_z80_bank_w)); + map(0x6000, 0x6000).w(FUNC(mtech_state::mt_z80_bank_w)); map(0x6400, 0x6407).rw("io1", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)); map(0x6800, 0x6807).rw("io2", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)); map(0x7000, 0x77ff).rom(); // from bios rom (0x7000-0x77ff populated in ROM) //AM_RANGE(0x7800, 0x7fff) AM_RAM // ? - map(0x8000, 0x9fff).rw(this, FUNC(mtech_state::read_68k_banked_data), FUNC(mtech_state::write_68k_banked_data)); // window into 68k address space, reads instr rom and writes to reset banks on z80 carts? + map(0x8000, 0x9fff).rw(FUNC(mtech_state::read_68k_banked_data), FUNC(mtech_state::write_68k_banked_data)); // window into 68k address space, reads instr rom and writes to reset banks on z80 carts? } @@ -580,14 +580,14 @@ READ8_MEMBER(mtech_state::vdp1_count_r) void mtech_state::megatech_bios_portmap(address_map &map) { map.global_mask(0xff); - map(0x3f, 0x3f).w(this, FUNC(mtech_state::bios_port_ctrl_w)); - map(0x7f, 0x7f).w(this, FUNC(mtech_state::bios_port_7f_w)); + map(0x3f, 0x3f).w(FUNC(mtech_state::bios_port_ctrl_w)); + map(0x7f, 0x7f).w(FUNC(mtech_state::bios_port_7f_w)); - map(0x40, 0x41).mirror(0x3e).r(this, FUNC(mtech_state::vdp1_count_r)); + map(0x40, 0x41).mirror(0x3e).r(FUNC(mtech_state::vdp1_count_r)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp1, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp1, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); - map(0xdc, 0xdd).r(this, FUNC(mtech_state::bios_joypad_r)); // player inputs + map(0xdc, 0xdd).r(FUNC(mtech_state::bios_joypad_r)); // player inputs } diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp index df23564e5d1..5ae97473740 100644 --- a/src/mame/drivers/megazone.cpp +++ b/src/mame/drivers/megazone.cpp @@ -161,7 +161,7 @@ void megazone_state::megazone_map(address_map &map) void megazone_state::megazone_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x2000).w(this, FUNC(megazone_state::megazone_i8039_irq_w)); /* START line. Interrupts 8039 */ + map(0x2000, 0x2000).w(FUNC(megazone_state::megazone_i8039_irq_w)); /* START line. Interrupts 8039 */ map(0x4000, 0x4000).w("soundlatch", FUNC(generic_latch_8_device::write)); /* CODE line. Command Interrupts 8039 */ map(0x6000, 0x6000).portr("IN0"); /* IO Coin */ map(0x6001, 0x6001).portr("IN1"); /* P1 IO */ @@ -311,7 +311,7 @@ MACHINE_CONFIG_START(megazone_state::megazone) MCFG_DEVICE_ADD("daccpu", I8039, XTAL(14'318'181)/2) /* 7.15909MHz */ MCFG_DEVICE_PROGRAM_MAP(megazone_i8039_map) MCFG_DEVICE_IO_MAP(megazone_i8039_io_map) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, megazone_state, i8039_irqen_and_status_w)) MCFG_QUANTUM_TIME(attotime::from_hz(900)) diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp index e8589c1de78..50da4c514c2 100644 --- a/src/mame/drivers/meijinsn.cpp +++ b/src/mame/drivers/meijinsn.cpp @@ -192,13 +192,13 @@ READ16_MEMBER(meijinsn_state::alpha_mcu_r) void meijinsn_state::meijinsn_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x080e00, 0x080fff).r(this, FUNC(meijinsn_state::alpha_mcu_r)).nopw(); + map(0x080e00, 0x080fff).r(FUNC(meijinsn_state::alpha_mcu_r)).nopw(); map(0x100000, 0x107fff).ram().share("videoram"); map(0x180000, 0x180dff).ram(); map(0x180e00, 0x180fff).ram().share("shared_ram"); map(0x181000, 0x181fff).ram(); map(0x1c0000, 0x1c0001).portr("P2"); - map(0x1a0000, 0x1a0001).portr("P1").w(this, FUNC(meijinsn_state::sound_w)); + map(0x1a0000, 0x1a0001).portr("P1").w(FUNC(meijinsn_state::sound_w)); } void meijinsn_state::meijinsn_sound_map(address_map &map) diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp index 62253e8ef55..82d26e6297b 100644 --- a/src/mame/drivers/mephisto.cpp +++ b/src/mame/drivers/mephisto.cpp @@ -159,8 +159,8 @@ void mephisto_state::rebel5_mem(address_map &map) map(0x0000, 0x1fff).ram(); // AM_BASE(m_p_ram) map(0x2000, 0x2007).w("outlatch", FUNC(hc259_device::write_d7)); // Status LEDs+ buzzer map(0x3000, 0x4000).r("board", FUNC(mephisto_board_device::input_r)); - map(0x3000, 0x3007).r(this, FUNC(mephisto_state::read_keys)); // Rebel 5.0 - map(0x5000, 0x5000).w(this, FUNC(mephisto_state::write_lcd)); + map(0x3000, 0x3007).r(FUNC(mephisto_state::read_keys)); // Rebel 5.0 + map(0x5000, 0x5000).w(FUNC(mephisto_state::write_lcd)); map(0x6000, 0x6000).w("board", FUNC(mephisto_board_device::led_w)); map(0x7000, 0x7000).w("board", FUNC(mephisto_board_device::mux_w)); map(0x8000, 0xffff).rom(); @@ -170,13 +170,13 @@ void mephisto_state::rebel5_mem(address_map &map) void mephisto_state::mephisto_mem(address_map &map) { map(0x0000, 0x1fff).ram(); //AM_BASE(m_p_ram) - map(0x2000, 0x2000).w(this, FUNC(mephisto_state::write_lcd)); + map(0x2000, 0x2000).w(FUNC(mephisto_state::write_lcd)); map(0x2400, 0x2407).w("board", FUNC(mephisto_board_device::led_w)); map(0x2800, 0x2800).w("board", FUNC(mephisto_board_device::mux_w)); - map(0x2c00, 0x2c07).r(this, FUNC(mephisto_state::read_keys)); + map(0x2c00, 0x2c07).r(FUNC(mephisto_state::read_keys)); map(0x3000, 0x3000).r("board", FUNC(mephisto_board_device::input_r)); map(0x3400, 0x3407).w("outlatch", FUNC(hc259_device::write_d7)); // Status LEDs+ buzzer - map(0x3800, 0x3800).w(this, FUNC(mephisto_state::mephisto_NMI)); // NMI enable + map(0x3800, 0x3800).w(FUNC(mephisto_state::mephisto_NMI)); // NMI enable map(0x4000, 0x7fff).rom(); // Opening Library map(0x8000, 0xffff).rom(); } @@ -185,9 +185,9 @@ void mephisto_state::mm2_mem(address_map &map) { map(0x0000, 0x0fff).ram(); //AM_BASE(m_p_ram) map(0x1000, 0x1007).w("outlatch", FUNC(hc259_device::write_d7)); //Status LEDs - map(0x1800, 0x1807).r(this, FUNC(mephisto_state::read_keys)); + map(0x1800, 0x1807).r(FUNC(mephisto_state::read_keys)); map(0x2000, 0x2000).r("board", FUNC(mephisto_board_device::input_r)); - map(0x2800, 0x2800).w(this, FUNC(mephisto_state::write_lcd)); + map(0x2800, 0x2800).w(FUNC(mephisto_state::write_lcd)); map(0x3000, 0x3000).w("board", FUNC(mephisto_board_device::led_w)); map(0x3800, 0x3800).w("board", FUNC(mephisto_board_device::mux_w)); map(0x4000, 0x7fff).rom(); // Opening Library ? diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp index 581bce5fd50..14a0f4988f9 100644 --- a/src/mame/drivers/mephisto_montec.cpp +++ b/src/mame/drivers/mephisto_montec.cpp @@ -257,31 +257,31 @@ READ8_MEMBER(mephisto_montec_state::megaiv_input_r) void mephisto_montec_state::montec_mem(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); - map(0x2400, 0x2400).r(this, FUNC(mephisto_montec_state::montec_input_r)); + map(0x2400, 0x2400).r(FUNC(mephisto_montec_state::montec_input_r)); map(0x2800, 0x2800).w(m_board, FUNC(mephisto_board_device::mux_w)); map(0x2c00, 0x2c00).w(m_board, FUNC(mephisto_board_device::led_w)); - map(0x3400, 0x3400).w(this, FUNC(mephisto_montec_state::montec_led_w)); - map(0x3000, 0x3001).w(this, FUNC(mephisto_montec_state::montec_mux_w)); - map(0x3002, 0x3002).w(this, FUNC(mephisto_montec_state::montec_beeper_w)); - map(0x3004, 0x3004).w(this, FUNC(mephisto_montec_state::montec_lcd_data_w)); - map(0x3005, 0x3005).w(this, FUNC(mephisto_montec_state::montec_ldc_cs1_w)); - map(0x3006, 0x3006).w(this, FUNC(mephisto_montec_state::montec_lcd_clk_w)); - map(0x3007, 0x3007).w(this, FUNC(mephisto_montec_state::montec_ldc_cs0_w)); - map(0x2000, 0x2000).rw(this, FUNC(mephisto_montec_state::montec_nmi_ack_r), FUNC(mephisto_montec_state::montec_nmi_ack_w)); + map(0x3400, 0x3400).w(FUNC(mephisto_montec_state::montec_led_w)); + map(0x3000, 0x3001).w(FUNC(mephisto_montec_state::montec_mux_w)); + map(0x3002, 0x3002).w(FUNC(mephisto_montec_state::montec_beeper_w)); + map(0x3004, 0x3004).w(FUNC(mephisto_montec_state::montec_lcd_data_w)); + map(0x3005, 0x3005).w(FUNC(mephisto_montec_state::montec_ldc_cs1_w)); + map(0x3006, 0x3006).w(FUNC(mephisto_montec_state::montec_lcd_clk_w)); + map(0x3007, 0x3007).w(FUNC(mephisto_montec_state::montec_ldc_cs0_w)); + map(0x2000, 0x2000).rw(FUNC(mephisto_montec_state::montec_nmi_ack_r), FUNC(mephisto_montec_state::montec_nmi_ack_w)); map(0x8000, 0xffff).rom(); } void mephisto_montec_state::megaiv_mem(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); - map(0x2400, 0x2400).w(this, FUNC(mephisto_montec_state::megaiv_led_w)); + map(0x2400, 0x2400).w(FUNC(mephisto_montec_state::megaiv_led_w)); map(0x2800, 0x2800).w(m_board, FUNC(mephisto_board_device::mux_w)); - map(0x2c00, 0x2c03).w(this, FUNC(mephisto_montec_state::montec_mux_w)).nopr(); - map(0x2c04, 0x2c04).w(this, FUNC(mephisto_montec_state::montec_lcd_data_w)); - map(0x2c05, 0x2c05).w(this, FUNC(mephisto_montec_state::montec_ldc_cs1_w)); - map(0x2c06, 0x2c06).w(this, FUNC(mephisto_montec_state::montec_lcd_clk_w)); - map(0x2c07, 0x2c07).w(this, FUNC(mephisto_montec_state::montec_ldc_cs0_w)); - map(0x3000, 0x3007).r(this, FUNC(mephisto_montec_state::megaiv_input_r)); + map(0x2c00, 0x2c03).w(FUNC(mephisto_montec_state::montec_mux_w)).nopr(); + map(0x2c04, 0x2c04).w(FUNC(mephisto_montec_state::montec_lcd_data_w)); + map(0x2c05, 0x2c05).w(FUNC(mephisto_montec_state::montec_ldc_cs1_w)); + map(0x2c06, 0x2c06).w(FUNC(mephisto_montec_state::montec_lcd_clk_w)); + map(0x2c07, 0x2c07).w(FUNC(mephisto_montec_state::montec_ldc_cs0_w)); + map(0x3000, 0x3007).r(FUNC(mephisto_montec_state::megaiv_input_r)); map(0x8000, 0xffff).rom(); } @@ -323,14 +323,14 @@ WRITE8_MEMBER(mephisto_montec_state::smondial_led_data_w) void mephisto_montec_state::smondial_mem(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); - map(0x4000, 0x4007).r(this, FUNC(mephisto_montec_state::megaiv_input_r)); - map(0x6400, 0x6407).w(this, FUNC(mephisto_montec_state::smondial_led_data_w)); - map(0x6800, 0x6807).w(this, FUNC(mephisto_montec_state::smondial_board_mux_w)); - map(0x6c00, 0x6c03).w(this, FUNC(mephisto_montec_state::montec_mux_w)); - map(0x6c04, 0x6c04).w(this, FUNC(mephisto_montec_state::montec_lcd_data_w)); - map(0x6c05, 0x6c05).w(this, FUNC(mephisto_montec_state::montec_ldc_cs1_w)); - map(0x6c06, 0x6c06).w(this, FUNC(mephisto_montec_state::montec_lcd_clk_w)); - map(0x6c07, 0x6c07).w(this, FUNC(mephisto_montec_state::montec_ldc_cs0_w)); + map(0x4000, 0x4007).r(FUNC(mephisto_montec_state::megaiv_input_r)); + map(0x6400, 0x6407).w(FUNC(mephisto_montec_state::smondial_led_data_w)); + map(0x6800, 0x6807).w(FUNC(mephisto_montec_state::smondial_board_mux_w)); + map(0x6c00, 0x6c03).w(FUNC(mephisto_montec_state::montec_mux_w)); + map(0x6c04, 0x6c04).w(FUNC(mephisto_montec_state::montec_lcd_data_w)); + map(0x6c05, 0x6c05).w(FUNC(mephisto_montec_state::montec_ldc_cs1_w)); + map(0x6c06, 0x6c06).w(FUNC(mephisto_montec_state::montec_lcd_clk_w)); + map(0x6c07, 0x6c07).w(FUNC(mephisto_montec_state::montec_ldc_cs0_w)); map(0x8000, 0xffff).rom(); } @@ -355,9 +355,9 @@ WRITE8_MEMBER(mephisto_montec_state::mondial2_input_mux_w) void mephisto_montec_state::mondial2_mem(address_map &map) { map(0x0000, 0x07ff).ram().share("nvram"); - map(0x2000, 0x2000).w(this, FUNC(mephisto_montec_state::mondial2_input_mux_w)); + map(0x2000, 0x2000).w(FUNC(mephisto_montec_state::mondial2_input_mux_w)); map(0x2800, 0x2800).w(m_board, FUNC(mephisto_board_device::mux_w)); - map(0x3000, 0x3007).r(this, FUNC(mephisto_montec_state::megaiv_input_r)); + map(0x3000, 0x3007).r(FUNC(mephisto_montec_state::megaiv_input_r)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp index 5b64eaa7a5f..53033b319ea 100644 --- a/src/mame/drivers/mephistp.cpp +++ b/src/mame/drivers/mephistp.cpp @@ -112,7 +112,7 @@ void mephisto_pinball_state::mephisto_map(address_map &map) map(0x13800, 0x13807).rw("ic20", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); map(0x14000, 0x140ff).rw("ic9", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); map(0x14800, 0x14807).rw("ic9", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); - map(0x16000, 0x16000).w(this, FUNC(mephisto_pinball_state::shift_load_w)); + map(0x16000, 0x16000).w(FUNC(mephisto_pinball_state::shift_load_w)); map(0x17000, 0x17001).nopw(); //??? map(0xf8000, 0xfffff).rom().region("maincpu", 0); } @@ -126,8 +126,8 @@ void mephisto_pinball_state::mephisto_8051_map(address_map &map) void mephisto_pinball_state::mephisto_8051_io(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x0800, 0x0800).w(this, FUNC(mephisto_pinball_state::sound_rombank_w)); - map(0x1000, 0x1000).w("dac", FUNC(dac08_device::write)); + map(0x0800, 0x0800).w(FUNC(mephisto_pinball_state::sound_rombank_w)); + map(0x1000, 0x1000).w("dac", FUNC(dac08_device::data_w)); } #ifdef UNUSED_DEFINITION diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index 1d65c4f8668..f3aab85ca2c 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -420,7 +420,7 @@ void merit_state::pitboss_map(address_map &map) map(0xe001, 0xe001).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::casino5_map(address_map &map) @@ -429,7 +429,7 @@ void merit_state::casino5_map(address_map &map) map(0x2000, 0x3fff).bankr("bank1"); map(0x4000, 0x5fff).bankr("bank2"); map(0x6000, 0x6fff).ram().share("nvram"); - map(0x7000, 0x7000).w(this, FUNC(merit_state::casino5_bank_w)); + map(0x7000, 0x7000).w(FUNC(merit_state::casino5_bank_w)); map(0x7001, 0x7fff).ram(); map(0xa000, 0xa003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc000, 0xc003).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -437,7 +437,7 @@ void merit_state::casino5_map(address_map &map) map(0xe001, 0xe001).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::bigappg_map(address_map &map) @@ -450,7 +450,7 @@ void merit_state::bigappg_map(address_map &map) map(0xe001, 0xe001).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::misdraw_map(address_map &map) @@ -464,7 +464,7 @@ void merit_state::misdraw_map(address_map &map) map(0xe001, 0xe001).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::dodge_map(address_map &map) @@ -477,7 +477,7 @@ void merit_state::dodge_map(address_map &map) map(0xe001, 0xe001).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } /* Address decoding is done by prom u13 on crt200a hardware. It decodes @@ -488,9 +488,9 @@ void merit_state::dodge_map(address_map &map) void merit_state::trvwhiz_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4c00, 0x4cff).rw(this, FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); - map(0x5400, 0x54ff).w(this, FUNC(merit_state::low_offset_w)); - map(0x5800, 0x58ff).w(this, FUNC(merit_state::med_offset_w)); + map(0x4c00, 0x4cff).rw(FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); + map(0x5400, 0x54ff).w(FUNC(merit_state::low_offset_w)); + map(0x5800, 0x58ff).w(FUNC(merit_state::med_offset_w)); map(0x6000, 0x67ff).ram(); map(0xa000, 0xa003).mirror(0x1df0).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc000, 0xc003).mirror(0x1df0).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -498,7 +498,7 @@ void merit_state::trvwhiz_map(address_map &map) map(0xe001, 0xe001).mirror(0x05f0).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::trvwhiz_io_map(address_map &map) @@ -514,14 +514,14 @@ void merit_state::phrcraze_map(address_map &map) map(0xa000, 0xbfff).ram(); map(0xc008, 0xc00b).mirror(0x1df0).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc00c, 0xc00f).mirror(0x1df0).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xce00, 0xceff).rw(this, FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); - map(0xd600, 0xd6ff).w(this, FUNC(merit_state::low_offset_w)); - map(0xda00, 0xdaff).w(this, FUNC(merit_state::med_offset_w)); + map(0xce00, 0xceff).rw(FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); + map(0xd600, 0xd6ff).w(FUNC(merit_state::low_offset_w)); + map(0xda00, 0xdaff).w(FUNC(merit_state::med_offset_w)); map(0xe000, 0xe000).mirror(0x05f0).w("crtc", FUNC(mc6845_device::address_w)); map(0xe001, 0xe001).mirror(0x05f0).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::phrcraze_io_map(address_map &map) @@ -537,14 +537,14 @@ void merit_state::tictac_map(address_map &map) map(0x8000, 0x9fff).ram(); map(0xc004, 0xc007).mirror(0x1df0).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc008, 0xc00b).mirror(0x1df0).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xce00, 0xceff).rw(this, FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); - map(0xd600, 0xd6ff).w(this, FUNC(merit_state::low_offset_w)); - map(0xda00, 0xdaff).w(this, FUNC(merit_state::med_offset_w)); + map(0xce00, 0xceff).rw(FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); + map(0xd600, 0xd6ff).w(FUNC(merit_state::low_offset_w)); + map(0xda00, 0xdaff).w(FUNC(merit_state::med_offset_w)); map(0xe000, 0xe000).mirror(0x05f0).w("crtc", FUNC(mc6845_device::address_w)); map(0xe001, 0xe001).mirror(0x05f0).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::tictac_io_map(address_map &map) @@ -560,14 +560,14 @@ void merit_state::trvwhziv_map(address_map &map) map(0xa000, 0xbfff).ram(); map(0xc004, 0xc007).mirror(0x1df0).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc008, 0xc00b).mirror(0x1df0).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xce00, 0xceff).rw(this, FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); - map(0xd600, 0xd6ff).w(this, FUNC(merit_state::low_offset_w)); - map(0xda00, 0xdaff).w(this, FUNC(merit_state::med_offset_w)); + map(0xce00, 0xceff).rw(FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); + map(0xd600, 0xd6ff).w(FUNC(merit_state::low_offset_w)); + map(0xda00, 0xdaff).w(FUNC(merit_state::med_offset_w)); map(0xe000, 0xe000).mirror(0x05f0).w("crtc", FUNC(mc6845_device::address_w)); map(0xe001, 0xe001).mirror(0x05f0).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::dtrvwz5_map(address_map &map) @@ -577,14 +577,14 @@ void merit_state::dtrvwz5_map(address_map &map) map(0xb000, 0xb0ff).rom(); /* protection? code jumps here */ map(0xc004, 0xc007).mirror(0x1df0).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc008, 0xc00b).mirror(0x1df0).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xce00, 0xceff).rw(this, FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); - map(0xd600, 0xd6ff).w(this, FUNC(merit_state::low_offset_w)); - map(0xda00, 0xdaff).w(this, FUNC(merit_state::med_offset_w)); + map(0xce00, 0xceff).rw(FUNC(merit_state::questions_r), FUNC(merit_state::high_offset_w)); + map(0xd600, 0xd6ff).w(FUNC(merit_state::low_offset_w)); + map(0xda00, 0xdaff).w(FUNC(merit_state::med_offset_w)); map(0xe000, 0xe000).mirror(0x05f0).w("crtc", FUNC(mc6845_device::address_w)); map(0xe001, 0xe001).mirror(0x05f0).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } void merit_state::couple_map(address_map &map) @@ -598,7 +598,7 @@ void merit_state::couple_map(address_map &map) map(0xe001, 0xe001).w("crtc", FUNC(mc6845_device::register_w)); map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(merit_state::palette_r), FUNC(merit_state::palette_w)); } diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 3e188a3c7c9..5575da200c5 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -546,9 +546,9 @@ void meritm_state::meritm_crt250_map(address_map &map) void meritm_state::meritm_crt250_questions_map(address_map &map) { map(0x0000, 0xdfff).bankr("bank1"); - map(0x0000, 0x0000).w(this, FUNC(meritm_state::meritm_crt250_questions_lo_w)); - map(0x0001, 0x0001).w(this, FUNC(meritm_state::meritm_crt250_questions_hi_w)); - map(0x0002, 0x0002).w(this, FUNC(meritm_state::meritm_crt250_questions_bank_w)); + map(0x0000, 0x0000).w(FUNC(meritm_state::meritm_crt250_questions_lo_w)); + map(0x0001, 0x0001).w(FUNC(meritm_state::meritm_crt250_questions_hi_w)); + map(0x0002, 0x0002).w(FUNC(meritm_state::meritm_crt250_questions_bank_w)); map(0xe000, 0xffff).ram().share("nvram"); } @@ -562,7 +562,7 @@ void meritm_state::meritm_crt250_io_map(address_map &map) map(0x50, 0x53).rw(m_z80pio_1, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x80, 0x80).r("aysnd", FUNC(ay8930_device::data_r)); map(0x80, 0x81).w("aysnd", FUNC(ay8930_device::address_data_w)); - map(0xff, 0xff).w(this, FUNC(meritm_state::meritm_crt250_bank_w)); + map(0xff, 0xff).w(FUNC(meritm_state::meritm_crt250_bank_w)); } void meritm_state::meritm_crt250_crt258_io_map(address_map &map) @@ -576,7 +576,7 @@ void meritm_state::meritm_crt250_crt258_io_map(address_map &map) map(0x60, 0x67).rw(m_uart, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); map(0x80, 0x80).r("aysnd", FUNC(ay8930_device::data_r)); map(0x80, 0x81).w("aysnd", FUNC(ay8930_device::address_data_w)); - map(0xff, 0xff).w(this, FUNC(meritm_state::meritm_crt250_bank_w)); + map(0xff, 0xff).w(FUNC(meritm_state::meritm_crt250_bank_w)); } void meritm_state::meritm_map(address_map &map) @@ -589,7 +589,7 @@ void meritm_state::meritm_map(address_map &map) void meritm_state::meritm_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(meritm_state::meritm_psd_a15_w)); + map(0x00, 0x00).w(FUNC(meritm_state::meritm_psd_a15_w)); map(0x01, 0x01).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x10, 0x13).rw(m_v9938_0, FUNC(v9938_device::read), FUNC(v9938_device::write)); map(0x20, 0x23).rw(m_v9938_1, FUNC(v9938_device::read), FUNC(v9938_device::write)); @@ -599,7 +599,7 @@ void meritm_state::meritm_io_map(address_map &map) map(0x60, 0x67).rw(m_uart, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); map(0x80, 0x80).r("aysnd", FUNC(ay8930_device::data_r)); map(0x80, 0x81).w("aysnd", FUNC(ay8930_device::address_data_w)); - map(0xff, 0xff).w(this, FUNC(meritm_state::meritm_bank_w)); + map(0xff, 0xff).w(FUNC(meritm_state::meritm_bank_w)); } /************************************* diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp index 2eb1fbfb680..22e251a14c3 100644 --- a/src/mame/drivers/mermaid.cpp +++ b/src/mame/drivers/mermaid.cpp @@ -163,21 +163,21 @@ void mermaid_state::mermaid_map(address_map &map) { map(0x0000, 0x9fff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xc800, 0xcbff).ram().w(this, FUNC(mermaid_state::mermaid_videoram2_w)).share("videoram2"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(mermaid_state::mermaid_videoram_w)).share("videoram"); - map(0xd800, 0xd81f).ram().w(this, FUNC(mermaid_state::mermaid_bg_scroll_w)).share("bg_scrollram"); - map(0xd840, 0xd85f).ram().w(this, FUNC(mermaid_state::mermaid_fg_scroll_w)).share("fg_scrollram"); + map(0xc800, 0xcbff).ram().w(FUNC(mermaid_state::mermaid_videoram2_w)).share("videoram2"); + map(0xd000, 0xd3ff).ram().w(FUNC(mermaid_state::mermaid_videoram_w)).share("videoram"); + map(0xd800, 0xd81f).ram().w(FUNC(mermaid_state::mermaid_bg_scroll_w)).share("bg_scrollram"); + map(0xd840, 0xd85f).ram().w(FUNC(mermaid_state::mermaid_fg_scroll_w)).share("fg_scrollram"); map(0xd880, 0xd8bf).ram().share("spriteram"); - map(0xdc00, 0xdfff).ram().w(this, FUNC(mermaid_state::mermaid_colorram_w)).share("colorram"); + map(0xdc00, 0xdfff).ram().w(FUNC(mermaid_state::mermaid_colorram_w)).share("colorram"); map(0xe000, 0xe000).portr("DSW"); map(0xe000, 0xe007).w("latch1", FUNC(ls259_device::write_d0)); map(0xe800, 0xe800).portr("P1"); map(0xe800, 0xe807).w("latch2", FUNC(ls259_device::write_d0)); map(0xf000, 0xf000).portr("P2"); - map(0xf800, 0xf800).r(this, FUNC(mermaid_state::mermaid_collision_r)); + map(0xf800, 0xf800).r(FUNC(mermaid_state::mermaid_collision_r)); map(0xf802, 0xf802).nopw(); // ??? - map(0xf806, 0xf806).w(this, FUNC(mermaid_state::mermaid_ay8910_write_port_w)); - map(0xf807, 0xf807).w(this, FUNC(mermaid_state::mermaid_ay8910_control_port_w)); + map(0xf806, 0xf806).w(FUNC(mermaid_state::mermaid_ay8910_write_port_w)); + map(0xf807, 0xf807).w(FUNC(mermaid_state::mermaid_ay8910_control_port_w)); } WRITE_LINE_MEMBER(mermaid_state::rougien_sample_rom_lo_w) diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp index 38234f5df84..fadbb8f230d 100644 --- a/src/mame/drivers/mes.cpp +++ b/src/mame/drivers/mes.cpp @@ -68,8 +68,8 @@ void mes_state::mem_map(address_map &map) void mes_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(mes_state::port00_r)); - map(0x08, 0x08).r(this, FUNC(mes_state::port08_r)); + map(0x00, 0x00).r(FUNC(mes_state::port00_r)); + map(0x08, 0x08).r(FUNC(mes_state::port08_r)); map(0x0c, 0x0f).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x10, 0x13).rw("sio", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); map(0x18, 0x1b).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp index e382a6d0c23..e936b12f7eb 100644 --- a/src/mame/drivers/metalmx.cpp +++ b/src/mame/drivers/metalmx.cpp @@ -509,24 +509,24 @@ void metalmx_state::main_map(address_map &map) { map(0x000000, 0x1fffff).rom(); map(0x200000, 0x3fffff).rom(); - map(0x400000, 0x4000ff).rw(this, FUNC(metalmx_state::host_gsp_r), FUNC(metalmx_state::host_gsp_w)); - map(0x600000, 0x6fffff).rw(this, FUNC(metalmx_state::host_dram_r), FUNC(metalmx_state::host_dram_w)); - map(0x700000, 0x7fffff).rw(this, FUNC(metalmx_state::host_vram_r), FUNC(metalmx_state::host_vram_w)); - map(0x800000, 0x80001f).rw(this, FUNC(metalmx_state::dsp32c_2_r), FUNC(metalmx_state::dsp32c_2_w)); + map(0x400000, 0x4000ff).rw(FUNC(metalmx_state::host_gsp_r), FUNC(metalmx_state::host_gsp_w)); + map(0x600000, 0x6fffff).rw(FUNC(metalmx_state::host_dram_r), FUNC(metalmx_state::host_dram_w)); + map(0x700000, 0x7fffff).rw(FUNC(metalmx_state::host_vram_r), FUNC(metalmx_state::host_vram_w)); + map(0x800000, 0x80001f).rw(FUNC(metalmx_state::dsp32c_2_r), FUNC(metalmx_state::dsp32c_2_w)); map(0x800020, 0x85ffff).noprw(); /* Unknown */ - map(0x880000, 0x88001f).rw(this, FUNC(metalmx_state::dsp32c_1_r), FUNC(metalmx_state::dsp32c_1_w)); - map(0x980000, 0x9800ff).w(this, FUNC(metalmx_state::reset_w)); - map(0xb40000, 0xb40003).rw(this, FUNC(metalmx_state::sound_data_r), FUNC(metalmx_state::sound_data_w)); + map(0x880000, 0x88001f).rw(FUNC(metalmx_state::dsp32c_1_r), FUNC(metalmx_state::dsp32c_1_w)); + map(0x980000, 0x9800ff).w(FUNC(metalmx_state::reset_w)); + map(0xb40000, 0xb40003).rw(FUNC(metalmx_state::sound_data_r), FUNC(metalmx_state::sound_data_w)); map(0xf00000, 0xf00003).ram(); /* Network message port */ - map(0xf02000, 0xf02003).rw(this, FUNC(metalmx_state::watchdog_r), FUNC(metalmx_state::shifter_w)); - map(0xf03000, 0xf03003).portr("P1").w(this, FUNC(metalmx_state::motor_w)); + map(0xf02000, 0xf02003).rw(FUNC(metalmx_state::watchdog_r), FUNC(metalmx_state::shifter_w)); + map(0xf03000, 0xf03003).portr("P1").w(FUNC(metalmx_state::motor_w)); map(0xf04000, 0xf04003).portr("P2"); map(0xf05000, 0xf05fff).nopw(); /* Lamps */ // f06000 = ADC // f01xxx = ADC map(0xf19000, 0xf19003).nopw(); /* Network */ map(0xf1a000, 0xf1a003).nopw(); map(0xf1b000, 0xf1b003).nopw(); map(0xf1e000, 0xf1e003).ram(); /* Network status flags : 1000 = LIRQ 4000 = SFLAG 8000 = 68FLAG */ - map(0xf20000, 0xf2ffff).w(this, FUNC(metalmx_state::timer_w)); + map(0xf20000, 0xf2ffff).w(FUNC(metalmx_state::timer_w)); map(0xfc0000, 0xfc1fff).ram(); /* Zero power RAM */ map(0xfd0000, 0xffffff).ram(); /* Scratch RAM */ } @@ -579,8 +579,8 @@ void metalmx_state::dsp32c_1_map(address_map &map) map(0x000000, 0x03ffff).ram(); map(0x600000, 0x67ffff).ram(); map(0x700000, 0x700003).nopw(); /* LEDs? */ - map(0xa00000, 0xa00003).r(this, FUNC(metalmx_state::unk_r)); - map(0xb00000, 0xb00003).r(this, FUNC(metalmx_state::unk_r)); + map(0xa00000, 0xa00003).r(FUNC(metalmx_state::unk_r)); + map(0xb00000, 0xb00003).r(FUNC(metalmx_state::unk_r)); map(0xc00000, 0xc00003).ram(); /* FIFO? */ map(0xf00000, 0xffffff).ram(); /* 3D registers */ } @@ -597,8 +597,8 @@ void metalmx_state::dsp32c_2_map(address_map &map) map(0x000000, 0x03ffff).ram(); map(0x600000, 0x67ffff).ram(); map(0x700000, 0x700003).nopw(); /* LEDs? */ - map(0xa00000, 0xa00003).r(this, FUNC(metalmx_state::unk_r)); - map(0xb00000, 0xb00003).r(this, FUNC(metalmx_state::unk_r)); + map(0xa00000, 0xa00003).r(FUNC(metalmx_state::unk_r)); + map(0xb00000, 0xb00003).r(FUNC(metalmx_state::unk_r)); map(0xc00000, 0xc00003).ram(); /* FIFO? */ map(0xf00000, 0xffffff).ram(); /* 3D registers */ } diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp index 94e8b35a328..43b70004d47 100644 --- a/src/mame/drivers/metlclsh.cpp +++ b/src/mame/drivers/metlclsh.cpp @@ -69,12 +69,12 @@ void metlclsh_state::metlclsh_master_map(address_map &map) map(0xc002, 0xc002).portr("IN2"); map(0xc003, 0xc003).portr("DSW"); map(0xc080, 0xc080).nopw(); // ? 0 - map(0xc0c2, 0xc0c2).w(this, FUNC(metlclsh_state::metlclsh_cause_irq)); // cause irq on cpu #2 - map(0xc0c3, 0xc0c3).w(this, FUNC(metlclsh_state::metlclsh_ack_nmi)); // nmi ack + map(0xc0c2, 0xc0c2).w(FUNC(metlclsh_state::metlclsh_cause_irq)); // cause irq on cpu #2 + map(0xc0c3, 0xc0c3).w(FUNC(metlclsh_state::metlclsh_ack_nmi)); // nmi ack /**/map(0xc800, 0xc82f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); /**/map(0xcc00, 0xcc2f).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xd000, 0xd001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); -/**/map(0xd800, 0xdfff).ram().w(this, FUNC(metlclsh_state::metlclsh_fgram_w)).share("fgram"); +/**/map(0xd800, 0xdfff).ram().w(FUNC(metlclsh_state::metlclsh_fgram_w)).share("fgram"); map(0xe000, 0xe001).w("ym2", FUNC(ym3526_device::write)); map(0xe800, 0xe9ff).ram().share("spriteram"); map(0xfff0, 0xffff).rom(); // Reset/IRQ vectors @@ -111,19 +111,19 @@ void metlclsh_state::metlclsh_slave_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).ram().share("share1"); - map(0xc000, 0xc000).portr("IN0").w(this, FUNC(metlclsh_state::metlclsh_gfxbank_w)); // bg tiles bank + map(0xc000, 0xc000).portr("IN0").w(FUNC(metlclsh_state::metlclsh_gfxbank_w)); // bg tiles bank map(0xc001, 0xc001).portr("IN1"); map(0xc002, 0xc002).portr("IN2"); map(0xc003, 0xc003).portr("DSW"); - map(0xc0c0, 0xc0c0).w(this, FUNC(metlclsh_state::metlclsh_cause_nmi2)); // cause nmi on cpu #1 - map(0xc0c1, 0xc0c1).w(this, FUNC(metlclsh_state::metlclsh_ack_irq2)); // irq ack - map(0xd000, 0xd7ff).bankr("bank1").w(this, FUNC(metlclsh_state::metlclsh_bgram_w)).share("bgram"); // this is banked - map(0xe301, 0xe301).w(this, FUNC(metlclsh_state::metlclsh_flipscreen_w)); // 0/1 - map(0xe401, 0xe401).w(this, FUNC(metlclsh_state::metlclsh_rambank_w)); + map(0xc0c0, 0xc0c0).w(FUNC(metlclsh_state::metlclsh_cause_nmi2)); // cause nmi on cpu #1 + map(0xc0c1, 0xc0c1).w(FUNC(metlclsh_state::metlclsh_ack_irq2)); // irq ack + map(0xd000, 0xd7ff).bankr("bank1").w(FUNC(metlclsh_state::metlclsh_bgram_w)).share("bgram"); // this is banked + map(0xe301, 0xe301).w(FUNC(metlclsh_state::metlclsh_flipscreen_w)); // 0/1 + map(0xe401, 0xe401).w(FUNC(metlclsh_state::metlclsh_rambank_w)); map(0xe402, 0xe403).writeonly().share("scrollx"); // AM_RANGE(0xe404, 0xe404) AM_WRITENOP // ? 0 // AM_RANGE(0xe410, 0xe410) AM_WRITENOP // ? 0 on startup only - map(0xe417, 0xe417).w(this, FUNC(metlclsh_state::metlclsh_ack_nmi2)); // nmi ack + map(0xe417, 0xe417).w(FUNC(metlclsh_state::metlclsh_ack_nmi2)); // nmi ack map(0xfff0, 0xffff).rom(); // Reset/IRQ vectors } diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp index 55f2a2a0227..f444d4274d3 100644 --- a/src/mame/drivers/metlfrzr.cpp +++ b/src/mame/drivers/metlfrzr.cpp @@ -195,7 +195,7 @@ void metlfrzr_state::metlfrzr_map(address_map &map) map(0xd604, 0xd604).portr("DSW2"); map(0xd600, 0xd61f).writeonly().share("vregs"); - map(0xd700, 0xd700).w(this, FUNC(metlfrzr_state::output_w)); + map(0xd700, 0xd700).w(FUNC(metlfrzr_state::output_w)); map(0xd710, 0xd710).w("t5182", FUNC(t5182_device::sound_irq_w)); map(0xd711, 0xd711).r("t5182", FUNC(t5182_device::sharedram_semaphore_snd_r)); // following two do swapped access compared to darkmist diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 7edb300b20f..ba8104cc46c 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -549,13 +549,13 @@ void metro_state::balcube_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x300001, 0x300001).r("ymf", FUNC(ymf278b_device::read)); // Sound map(0x300000, 0x30000b).w("ymf", FUNC(ymf278b_device::write)).umask16(0x00ff); // Sound - map(0x400000, 0x41ffff).r(this, FUNC(metro_state::balcube_dsw_r)); // DSW x 3 + map(0x400000, 0x41ffff).r(FUNC(metro_state::balcube_dsw_r)); // DSW x 3 map(0x500000, 0x500001).portr("IN0"); // Inputs map(0x500002, 0x500003).portr("IN1"); // map(0x500006, 0x500007).nopr(); // - map(0x500002, 0x500009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0x500002, 0x500009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout map(0x600000, 0x67ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x6788a2, 0x6788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x6788a2, 0x6788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x6788a4, 0x6788a5).writeonly().share("irq_enable"); // IRQ Enable map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -570,13 +570,13 @@ void metro_state::daitoa_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x17ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x1788a2, 0x1788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x1788a2, 0x1788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x1788a4, 0x1788a5).writeonly().share("irq_enable"); // IRQ Enable map(0x200000, 0x200001).portr("IN0"); // Inputs map(0x200002, 0x200003).portr("IN1"); // map(0x200006, 0x200007).nopr(); // - map(0x200002, 0x200009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout - map(0x300000, 0x31ffff).r(this, FUNC(metro_state::balcube_dsw_r)); // DSW x 3 + map(0x200002, 0x200009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0x300000, 0x31ffff).r(FUNC(metro_state::balcube_dsw_r)); // DSW x 3 map(0x400001, 0x400001).r("ymf", FUNC(ymf278b_device::read)); // Sound map(0x400000, 0x40000b).w("ymf", FUNC(ymf278b_device::write)).umask16(0x00ff); // Sound map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) @@ -592,13 +592,13 @@ void metro_state::bangball_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0xb00001, 0xb00001).r("ymf", FUNC(ymf278b_device::read)); // Sound map(0xb00000, 0xb0000b).w("ymf", FUNC(ymf278b_device::write)).umask16(0x00ff); // Sound - map(0xc00000, 0xc1ffff).r(this, FUNC(metro_state::balcube_dsw_r)); // DSW x 3 + map(0xc00000, 0xc1ffff).r(FUNC(metro_state::balcube_dsw_r)); // DSW x 3 map(0xd00000, 0xd00001).portr("IN0"); // Inputs map(0xd00002, 0xd00003).portr("IN1"); // map(0xd00006, 0xd00007).nopr(); // - map(0xd00002, 0xd00009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0xd00002, 0xd00009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout map(0xe00000, 0xe7ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0xe788a2, 0xe788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0xe788a2, 0xe788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0xe788a4, 0xe788a5).writeonly().share("irq_enable"); // IRQ Enable map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -612,14 +612,14 @@ void metro_state::batlbubl_map(address_map &map) { map(0x000000, 0x0fffff).rom(); // ROM map(0x100000, 0x17ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x1788a2, 0x1788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x1788a2, 0x1788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x1788a4, 0x1788a5).writeonly().share("irq_enable"); // IRQ Enable map(0x200000, 0x200001).portr("IN1"); // Inputs map(0x200002, 0x200003).portr("DSW0"); // map(0x200004, 0x200005).portr("IN0"); // map(0x200006, 0x200007).portr("IN2"); // - map(0x200002, 0x200009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout - map(0x300000, 0x31ffff).r(this, FUNC(metro_state::balcube_dsw_r)); // read but ignored? + map(0x200002, 0x200009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0x300000, 0x31ffff).r(FUNC(metro_state::balcube_dsw_r)); // read but ignored? map(0x400001, 0x400001).r("ymf", FUNC(ymf278b_device::read)); // Sound map(0x400000, 0x40000b).w("ymf", FUNC(ymf278b_device::write)).umask16(0x00ff); // map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) @@ -634,13 +634,13 @@ void metro_state::msgogo_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x17ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x1788a2, 0x1788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x1788a2, 0x1788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x1788a4, 0x1788a5).writeonly().share("irq_enable"); // IRQ Enable map(0x200000, 0x200001).portr("COINS"); // Inputs map(0x200002, 0x200003).portr("JOYS"); // map(0x200006, 0x200007).nopr(); // - map(0x200002, 0x200009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout - map(0x300000, 0x31ffff).r(this, FUNC(metro_state::balcube_dsw_r)); // 3 x DSW + map(0x200002, 0x200009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0x300000, 0x31ffff).r(FUNC(metro_state::balcube_dsw_r)); // 3 x DSW map(0x400001, 0x400001).r("ymf", FUNC(ymf278b_device::read)); // Sound map(0x400000, 0x40000b).w("ymf", FUNC(ymf278b_device::write)).umask16(0x00ff); // map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) @@ -654,15 +654,15 @@ void metro_state::daitorid_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM map(0x400000, 0x47ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x4788a2, 0x4788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x4788a2, 0x4788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x4788a4, 0x4788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x4788a8, 0x4788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0x4788a8, 0x4788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU map(0x800000, 0x80ffff).ram().mirror(0x0f0000); // RAM (mirrored) - map(0xc00000, 0xc00001).portr("IN0").w(this, FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU + map(0xc00000, 0xc00001).portr("IN0").w(FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU map(0xc00002, 0xc00003).portr("IN1"); // map(0xc00004, 0xc00005).portr("DSW0"); // map(0xc00006, 0xc00007).portr("IN2"); // - map(0xc00002, 0xc00009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0xc00002, 0xc00009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout } @@ -675,14 +675,14 @@ void metro_state::dharma_map(address_map &map) map(0x000000, 0x03ffff).rom(); // ROM map(0x400000, 0x40ffff).ram().mirror(0x0f0000); // RAM (mirrored) map(0x800000, 0x87ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x8788a2, 0x8788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x8788a2, 0x8788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x8788a4, 0x8788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x8788a8, 0x8788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU - map(0xc00000, 0xc00001).portr("IN0").w(this, FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU + map(0x8788a8, 0x8788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0xc00000, 0xc00001).portr("IN0").w(FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU map(0xc00002, 0xc00003).portr("IN1"); // map(0xc00004, 0xc00005).portr("DSW0"); // map(0xc00006, 0xc00007).portr("IN2"); // - map(0xc00002, 0xc00009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0xc00002, 0xc00009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout } @@ -693,17 +693,17 @@ void metro_state::dharma_map(address_map &map) void metro_state::karatour_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x400000, 0x400001).rw(this, FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From Sound CPU + map(0x400000, 0x400001).rw(FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From Sound CPU map(0x400002, 0x400003).portr("IN0"); // Inputs - map(0x400002, 0x400003).w(this, FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout + map(0x400002, 0x400003).w(FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout map(0x400004, 0x400005).portr("IN1"); // map(0x400006, 0x400007).portr("DSW0"); // map(0x40000a, 0x40000b).portr("DSW1"); // map(0x40000c, 0x40000d).portr("IN2"); // map(0x800000, 0x87ffff).m(m_vdp, FUNC(imagetek_i4100_device::map)); - map(0x8788a2, 0x8788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x8788a2, 0x8788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x8788a4, 0x8788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x8788a8, 0x8788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0x8788a8, 0x8788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -719,13 +719,13 @@ void metro_state::kokushi_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x700000, 0x70ffff).ram().mirror(0x0f0000); // RAM (mirrored) map(0x800000, 0x87ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x8788a2, 0x8788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x8788a2, 0x8788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x8788a4, 0x8788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x8788a8, 0x8788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU - map(0xc00000, 0xc00001).portr("IN0").w(this, FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU + map(0x8788a8, 0x8788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0xc00000, 0xc00001).portr("IN0").w(FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU map(0xc00002, 0xc00003).portr("IN1"); // Inputs map(0xc00004, 0xc00005).portr("DSW0"); // - map(0xc00002, 0xc00009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0xc00002, 0xc00009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout } @@ -738,11 +738,11 @@ void metro_state::lastfort_map(address_map &map) map(0x000000, 0x03ffff).rom(); // ROM map(0x400000, 0x40ffff).ram().mirror(0x0f0000); // RAM (mirrored) map(0x800000, 0x87ffff).m(m_vdp, FUNC(imagetek_i4100_device::map)); - map(0x8788a2, 0x8788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x8788a2, 0x8788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x8788a4, 0x8788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x8788a8, 0x8788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU - map(0xc00000, 0xc00001).rw(this, FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU - map(0xc00002, 0xc00003).w(this, FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout + map(0x8788a8, 0x8788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0xc00000, 0xc00001).rw(FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU + map(0xc00002, 0xc00003).w(FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout map(0xc00004, 0xc00005).portr("IN0"); // Inputs map(0xc00006, 0xc00007).portr("IN1"); // map(0xc00008, 0xc00009).portr("IN2"); // @@ -757,17 +757,17 @@ void metro_state::lastfort_map(address_map &map) void metro_state::lastforg_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM - map(0x400000, 0x400001).rw(this, FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU + map(0x400000, 0x400001).rw(FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU map(0x400002, 0x400003).portr("IN0"); // Inputs - map(0x400002, 0x400003).w(this, FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout + map(0x400002, 0x400003).w(FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout map(0x400004, 0x400005).portr("IN1"); // map(0x400006, 0x400007).portr("DSW0"); // map(0x40000a, 0x40000b).portr("DSW1"); // map(0x40000c, 0x40000d).portr("IN2"); // map(0x880000, 0x8fffff).m(m_vdp, FUNC(imagetek_i4100_device::map)); - map(0x8f88a2, 0x8f88a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x8f88a2, 0x8f88a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x8f88a4, 0x8f88a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x8f88a8, 0x8f88a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0x8f88a8, 0x8f88a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU map(0xc00000, 0xc0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -831,17 +831,17 @@ void metro_state::gakusai_map(address_map &map) map(0x278810, 0x27881f).writeonly().share("irq_levels"); // IRQ Levels map(0x278820, 0x27882f).writeonly().share("irq_vectors"); // IRQ Vectors map(0x278830, 0x278831).writeonly().share("irq_enable"); // IRQ Enable - map(0x278832, 0x278833).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x278832, 0x278833).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x278836, 0x278837).nopr().w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x278880, 0x278881).r(this, FUNC(metro_state::gakusai_input_r)); // Inputs + map(0x278880, 0x278881).r(FUNC(metro_state::gakusai_input_r)); // Inputs map(0x278882, 0x278883).portr("IN0"); // map(0x278888, 0x278889).writeonly().share("input_sel"); // Inputs map(0x400000, 0x400001).nopw(); // ? 5 - map(0x500001, 0x500001).w(this, FUNC(metro_state::gakusai_oki_bank_lo_w)); // Sound + map(0x500001, 0x500001).w(FUNC(metro_state::gakusai_oki_bank_lo_w)); // Sound map(0x600000, 0x600003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x700001, 0x700001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound - map(0xc00001, 0xc00001).rw(this, FUNC(metro_state::gakusai_eeprom_r), FUNC(metro_state::gakusai_eeprom_w)); // EEPROM - map(0xd00001, 0xd00001).w(this, FUNC(metro_state::gakusai_oki_bank_hi_w)); + map(0xc00001, 0xc00001).rw(FUNC(metro_state::gakusai_eeprom_r), FUNC(metro_state::gakusai_eeprom_w)); // EEPROM + map(0xd00001, 0xd00001).w(FUNC(metro_state::gakusai_oki_bank_hi_w)); map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -857,17 +857,17 @@ void metro_state::gakusai2_map(address_map &map) map(0x678810, 0x67881f).writeonly().share("irq_levels"); // IRQ Levels map(0x678820, 0x67882f).writeonly().share("irq_vectors"); // IRQ Vectors map(0x678830, 0x678831).writeonly().share("irq_enable"); // IRQ Enable - map(0x678832, 0x678833).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x678832, 0x678833).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x678836, 0x678837).nopr().w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x678880, 0x678881).r(this, FUNC(metro_state::gakusai_input_r)); // Inputs + map(0x678880, 0x678881).r(FUNC(metro_state::gakusai_input_r)); // Inputs map(0x678882, 0x678883).portr("IN0"); // map(0x678888, 0x678889).writeonly().share("input_sel"); // Inputs map(0x800000, 0x800001).nopw(); // ? 5 - map(0x900001, 0x900001).w(this, FUNC(metro_state::gakusai_oki_bank_lo_w)); // Sound bank - map(0xa00001, 0xa00001).w(this, FUNC(metro_state::gakusai_oki_bank_hi_w)); // + map(0x900001, 0x900001).w(FUNC(metro_state::gakusai_oki_bank_lo_w)); // Sound bank + map(0xa00001, 0xa00001).w(FUNC(metro_state::gakusai_oki_bank_hi_w)); // map(0xb00001, 0xb00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0xc00000, 0xc00003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); - map(0xe00001, 0xe00001).rw(this, FUNC(metro_state::gakusai_eeprom_r), FUNC(metro_state::gakusai_eeprom_w)); // EEPROM + map(0xe00001, 0xe00001).rw(FUNC(metro_state::gakusai_eeprom_r), FUNC(metro_state::gakusai_eeprom_w)); // EEPROM map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -908,17 +908,17 @@ void metro_state::dokyusp_map(address_map &map) map(0x278810, 0x27881f).writeonly().share("irq_levels"); // IRQ Levels map(0x278820, 0x27882f).writeonly().share("irq_vectors"); // IRQ Vectors map(0x278830, 0x278831).writeonly().share("irq_enable"); // IRQ Enable - map(0x278832, 0x278833).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x278832, 0x278833).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x278836, 0x278837).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x278880, 0x278881).r(this, FUNC(metro_state::gakusai_input_r)); // Inputs + map(0x278880, 0x278881).r(FUNC(metro_state::gakusai_input_r)); // Inputs map(0x278882, 0x278883).portr("IN0"); // map(0x278888, 0x278889).writeonly().share("input_sel"); // map(0x400000, 0x400001).nopw(); // ? 5 - map(0x500001, 0x500001).w(this, FUNC(metro_state::gakusai_oki_bank_lo_w)); // Sound + map(0x500001, 0x500001).w(FUNC(metro_state::gakusai_oki_bank_lo_w)); // Sound map(0x600000, 0x600003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x700001, 0x700001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound - map(0xc00001, 0xc00001).w(this, FUNC(metro_state::dokyusp_eeprom_reset_w)); // EEPROM - map(0xd00001, 0xd00001).rw(this, FUNC(metro_state::dokyusp_eeprom_r), FUNC(metro_state::dokyusp_eeprom_bit_w)); // EEPROM + map(0xc00001, 0xc00001).w(FUNC(metro_state::dokyusp_eeprom_reset_w)); // EEPROM + map(0xd00001, 0xd00001).rw(FUNC(metro_state::dokyusp_eeprom_r), FUNC(metro_state::dokyusp_eeprom_bit_w)); // EEPROM map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -935,16 +935,16 @@ void metro_state::dokyusei_map(address_map &map) map(0x478820, 0x47882f).writeonly().share("irq_vectors"); // IRQ Vectors map(0x478830, 0x478831).writeonly().share("irq_enable"); // IRQ Enable // AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r) // IRQ Cause - map(0x478832, 0x478833).w(this, FUNC(metro_state::metro_irq_cause_w)); // IRQ Acknowledge + map(0x478832, 0x478833).w(FUNC(metro_state::metro_irq_cause_w)); // IRQ Acknowledge map(0x478836, 0x478837).nopw(); // ? watchdog ? - map(0x478880, 0x478881).r(this, FUNC(metro_state::gakusai_input_r)); // Inputs + map(0x478880, 0x478881).r(FUNC(metro_state::gakusai_input_r)); // Inputs map(0x478882, 0x478883).portr("IN0"); // map(0x478884, 0x478885).portr("DSW0"); // 2 x DSW map(0x478886, 0x478887).portr("DSW1"); // map(0x478888, 0x478889).writeonly().share("input_sel"); // Inputs - map(0x800001, 0x800001).w(this, FUNC(metro_state::gakusai_oki_bank_hi_w)); // Samples Bank? + map(0x800001, 0x800001).w(FUNC(metro_state::gakusai_oki_bank_hi_w)); // Samples Bank? map(0x900000, 0x900001).nopw(); // ? 4 - map(0xa00001, 0xa00001).w(this, FUNC(metro_state::gakusai_oki_bank_lo_w)); // Samples Bank + map(0xa00001, 0xa00001).w(FUNC(metro_state::gakusai_oki_bank_lo_w)); // Samples Bank map(0xc00000, 0xc00003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); // map(0xd00001, 0xd00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) @@ -959,11 +959,11 @@ void metro_state::pangpoms_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM map(0x400000, 0x47ffff).m(m_vdp, FUNC(imagetek_i4100_device::map)); - map(0x4788a2, 0x4788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x4788a2, 0x4788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x4788a4, 0x4788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x4788a8, 0x4788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU - map(0x800000, 0x800001).rw(this, FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU - map(0x800002, 0x800003).nopr().w(this, FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout + map(0x4788a8, 0x4788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0x800000, 0x800001).rw(FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU + map(0x800002, 0x800003).nopr().w(FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout map(0x800004, 0x800005).portr("IN0"); // Inputs map(0x800006, 0x800007).portr("IN1"); // map(0x800008, 0x800009).portr("IN2"); // @@ -982,15 +982,15 @@ void metro_state::poitto_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM map(0x400000, 0x40ffff).ram().mirror(0x0f0000); // RAM (mirrored) - map(0x800000, 0x800001).portr("IN0").w(this, FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU + map(0x800000, 0x800001).portr("IN0").w(FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU map(0x800002, 0x800003).portr("IN1"); // map(0x800004, 0x800005).portr("DSW0"); // map(0x800006, 0x800007).portr("IN2"); // - map(0x800002, 0x800009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0x800002, 0x800009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout map(0xc00000, 0xc7ffff).m(m_vdp, FUNC(imagetek_i4100_device::map)); - map(0xc788a2, 0xc788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0xc788a2, 0xc788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0xc788a4, 0xc788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0xc788a8, 0xc788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0xc788a8, 0xc788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU } @@ -1001,8 +1001,8 @@ void metro_state::poitto_map(address_map &map) void metro_state::skyalert_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM - map(0x400000, 0x400001).rw(this, FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU - map(0x400002, 0x400003).nopr().w(this, FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout + map(0x400000, 0x400001).rw(FUNC(metro_state::metro_soundstatus_r), FUNC(metro_state::metro_soundstatus_w)); // From / To Sound CPU + map(0x400002, 0x400003).nopr().w(FUNC(metro_state::metro_coin_lockout_1word_w)); // Coin Lockout map(0x400004, 0x400005).portr("IN0"); // Inputs map(0x400006, 0x400007).portr("IN1"); // map(0x400008, 0x400009).portr("IN2"); // @@ -1010,9 +1010,9 @@ void metro_state::skyalert_map(address_map &map) map(0x40000c, 0x40000d).portr("DSW1"); // map(0x40000e, 0x40000f).portr("IN3"); // map(0x800000, 0x87ffff).m(m_vdp, FUNC(imagetek_i4100_device::map)); - map(0x8788a2, 0x8788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x8788a2, 0x8788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x8788a4, 0x8788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x8788a8, 0x8788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0x8788a8, 0x8788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU map(0xc00000, 0xc0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } @@ -1024,16 +1024,16 @@ void metro_state::skyalert_map(address_map &map) void metro_state::pururun_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x400000, 0x400001).portr("IN0").w(this, FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU + map(0x400000, 0x400001).portr("IN0").w(FUNC(metro_state::metro_soundstatus_w)); // To Sound CPU map(0x400002, 0x400003).portr("IN1"); // map(0x400004, 0x400005).portr("DSW0"); // map(0x400006, 0x400007).portr("IN2"); // - map(0x400002, 0x400009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0x400002, 0x400009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout map(0x800000, 0x80ffff).ram().mirror(0x0f0000); // RAM (mirrored) map(0xc00000, 0xc7ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0xc788a2, 0xc788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0xc788a2, 0xc788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0xc788a4, 0xc788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0xc788a8, 0xc788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0xc788a8, 0xc788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU } @@ -1045,15 +1045,15 @@ void metro_state::toride2g_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0x400000, 0x40ffff).ram().mirror(0x0f0000); // RAM (mirrored) - map(0x800000, 0x800001).portr("IN0").w(this, FUNC(metro_state::metro_soundstatus_w)); // Watchdog (R)? / To Sound CPU (W) + map(0x800000, 0x800001).portr("IN0").w(FUNC(metro_state::metro_soundstatus_w)); // Watchdog (R)? / To Sound CPU (W) map(0x800002, 0x800003).portr("IN1"); // map(0x800004, 0x800005).portr("DSW0"); // map(0x800006, 0x800007).portr("IN2"); // - map(0x800002, 0x800009).w(this, FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout + map(0x800002, 0x800009).w(FUNC(metro_state::metro_coin_lockout_4words_w)); // Coin Lockout map(0xc00000, 0xc7ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0xc788a2, 0xc788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0xc788a2, 0xc788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0xc788a4, 0xc788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0xc788a8, 0xc788a9).w(this, FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU + map(0xc788a8, 0xc788a9).w(FUNC(metro_state::metro_soundlatch_w)); // To Sound CPU } @@ -1076,7 +1076,7 @@ void metro_state::blzntrnd_sound_map(address_map &map) void metro_state::blzntrnd_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(metro_state::blzntrnd_sh_bankswitch_w)); + map(0x00, 0x00).w(FUNC(metro_state::blzntrnd_sh_bankswitch_w)); map(0x40, 0x40).r(m_soundlatch, FUNC(generic_latch_8_device::read)).nopw(); map(0x80, 0x83).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } @@ -1085,10 +1085,10 @@ void metro_state::blzntrnd_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // ROM map(0x200000, 0x27ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x2788a2, 0x2788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x2788a2, 0x2788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x2788a4, 0x2788a5).writeonly().share("irq_enable"); // IRQ Enable - map(0x400000, 0x43ffff).ram().w(this, FUNC(metro_state::metro_k053936_w)).share("k053936_ram"); // 053936 + map(0x400000, 0x43ffff).ram().w(FUNC(metro_state::metro_k053936_w)).share("k053936_ram"); // 053936 map(0x500000, 0x500fff).w(m_k053936, FUNC(k053936_device::linectrl_w)); // 053936 line control map(0x600000, 0x60001f).w(m_k053936, FUNC(k053936_device::ctrl_w)); // 053936 control @@ -1118,14 +1118,14 @@ void metro_state::mouja_map(address_map &map) map(0x478810, 0x47881f).writeonly().share("irq_levels"); // IRQ Levels map(0x478820, 0x47882f).writeonly().share("irq_vectors"); // IRQ Vectors map(0x478830, 0x478831).writeonly().share("irq_enable"); // IRQ Enable - map(0x478832, 0x478833).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge - map(0x478834, 0x478835).w(this, FUNC(metro_state::mouja_irq_timer_ctrl_w)); // IRQ set timer count + map(0x478832, 0x478833).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x478834, 0x478835).w(FUNC(metro_state::mouja_irq_timer_ctrl_w)); // IRQ set timer count map(0x478836, 0x478837).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x478880, 0x478881).portr("IN0"); // Inputs map(0x478882, 0x478883).portr("IN1"); // map(0x478884, 0x478885).portr("DSW0"); // map(0x478886, 0x478887).portr("IN2"); // - map(0x800001, 0x800001).w(this, FUNC(metro_state::mouja_sound_rombank_w)); + map(0x800001, 0x800001).w(FUNC(metro_state::mouja_sound_rombank_w)); map(0xc00000, 0xc00003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); map(0xd00000, 0xd00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) @@ -1240,8 +1240,8 @@ void metro_state::puzzlet_map(address_map &map) // TODO: !!! i4300 !!! map(0x700000, 0x77ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x7788a2, 0x7788a3).w(this, FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause - map(0x7788a4, 0x7788a5).w(this, FUNC(metro_state::puzzlet_irq_enable_w)).share("irq_enable"); // IRQ Enable + map(0x7788a2, 0x7788a3).w(FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause + map(0x7788a4, 0x7788a5).w(FUNC(metro_state::puzzlet_irq_enable_w)).share("irq_enable"); // IRQ Enable map(0x7f2000, 0x7f3fff).ram(); @@ -1249,7 +1249,7 @@ void metro_state::puzzlet_map(address_map &map) map(0x7f8884, 0x7f8885).portr("DSW0"); map(0x7f8886, 0x7f8887).portr("DSW0"); - map(0x7f88a2, 0x7f88a3).r(this, FUNC(metro_state::metro_irq_cause_r)); // IRQ Cause + map(0x7f88a2, 0x7f88a3).r(FUNC(metro_state::metro_irq_cause_r)); // IRQ Cause } @@ -1261,7 +1261,7 @@ WRITE16_MEMBER(metro_state::puzzlet_portb_w) void metro_state::puzzlet_io_map(address_map &map) { map(h8_device::PORT_7, h8_device::PORT_7).portr("IN2"); - map(h8_device::PORT_B, h8_device::PORT_B).portr("DSW0").w(this, FUNC(metro_state::puzzlet_portb_w)); + map(h8_device::PORT_B, h8_device::PORT_B).portr("DSW0").w(FUNC(metro_state::puzzlet_portb_w)); } @@ -1308,15 +1308,15 @@ void metro_state::vmetal_map(address_map &map) { map(0x000000, 0x0fffff).rom(); // ROM map(0x100000, 0x17ffff).m(m_vdp2, FUNC(imagetek_i4220_device::v2_map)); - map(0x1788a2, 0x1788a3).rw(this, FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge + map(0x1788a2, 0x1788a3).rw(FUNC(metro_state::metro_irq_cause_r), FUNC(metro_state::metro_irq_cause_w)); // IRQ Cause / IRQ Acknowledge map(0x1788a4, 0x1788a5).writeonly().share("irq_enable"); // IRQ Enable map(0x200000, 0x200001).portr("P1_P2"); - map(0x200001, 0x200001).w(this, FUNC(metro_state::vmetal_control_w)); + map(0x200001, 0x200001).w(FUNC(metro_state::vmetal_control_w)); map(0x200002, 0x200003).portr("SYSTEM"); - map(0x300000, 0x31ffff).r(this, FUNC(metro_state::balcube_dsw_r)); // DSW x 3 + map(0x300000, 0x31ffff).r(FUNC(metro_state::balcube_dsw_r)); // DSW x 3 map(0x400001, 0x400001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x400003, 0x400003).w(m_oki, FUNC(okim6295_device::write)); - map(0x500000, 0x500000).w(this, FUNC(metro_state::es8712_reset_w)); + map(0x500000, 0x500000).w(FUNC(metro_state::es8712_reset_w)); map(0x500000, 0x50000d).w(m_essnd, FUNC(es8712_device::write)).umask16(0x00ff); map(0xf00000, 0xf0ffff).ram().mirror(0x0f0000); // RAM (mirrored) } diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp index ebdfca246c2..1da170fa375 100644 --- a/src/mame/drivers/mexico86.cpp +++ b/src/mame/drivers/mexico86.cpp @@ -87,8 +87,8 @@ void mexico86_state::mexico86_map(address_map &map) map(0xc000, 0xe7ff).ram().share("mainram"); /* shared with sound cpu */ map(0xe800, 0xe8ff).ram().share("protection_ram"); /* shared with mcu */ map(0xe900, 0xefff).ram(); - map(0xf000, 0xf000).w(this, FUNC(mexico86_state::mexico86_bankswitch_w)); /* program and gfx ROM banks */ - map(0xf008, 0xf008).w(this, FUNC(mexico86_state::mexico86_f008_w)); /* cpu reset lines + other unknown stuff */ + map(0xf000, 0xf000).w(FUNC(mexico86_state::mexico86_bankswitch_w)); /* program and gfx ROM banks */ + map(0xf008, 0xf008).w(FUNC(mexico86_state::mexico86_f008_w)); /* cpu reset lines + other unknown stuff */ map(0xf010, 0xf010).portr("IN3"); map(0xf018, 0xf018).nopw(); /* watchdog? */ map(0xf800, 0xffff).ram().share("subram"); /* communication ram - to connect 4 players's subboard */ @@ -99,7 +99,7 @@ void mexico86_state::mexico86_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xa7ff).ram().share("mainram"); /* shared with main */ map(0xa800, 0xbfff).ram(); - map(0xc000, 0xc001).r(this, FUNC(mexico86_state::kiki_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); + map(0xc000, 0xc001).r(FUNC(mexico86_state::kiki_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); } WRITE8_MEMBER(mexico86_state::mexico86_sub_output_w) @@ -119,7 +119,7 @@ void mexico86_state::mexico86_sub_cpu_map(address_map &map) map(0xc001, 0xc001).portr("IN5"); map(0xc002, 0xc002).portr("IN6"); map(0xc003, 0xc003).portr("IN7"); - map(0xc004, 0xc004).w(this, FUNC(mexico86_state::mexico86_sub_output_w)); + map(0xc004, 0xc004).w(FUNC(mexico86_state::mexico86_sub_output_w)); } /************************************* diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp index fd0239b685d..c7476c5b2b7 100644 --- a/src/mame/drivers/meyc8080.cpp +++ b/src/mame/drivers/meyc8080.cpp @@ -325,13 +325,13 @@ void meyc8080_state::meyc8080_map(address_map &map) map(0x8000, 0x9fff).ram().share("vram2"); // AM_RANGE(0xa000, 0xa0ff) AM_RAM // unknown... filled with 00's at boot time or when entering the service mode. map(0xcd00, 0xcdff).ram().share("nvram"); - map(0xf000, 0xf000).portr("BSW").w(this, FUNC(meyc8080_state::meyc8080_dac_1_w)); - map(0xf004, 0xf004).portr("IN1").w(this, FUNC(meyc8080_state::lights_1_w)); - map(0xf006, 0xf006).portr("IN2").w(this, FUNC(meyc8080_state::lights_2_w)); - map(0xf008, 0xf008).w(this, FUNC(meyc8080_state::counters_w)); - map(0xf00f, 0xf00f).w(this, FUNC(meyc8080_state::meyc8080_dac_2_w)); - map(0xf0f0, 0xf0f0).w(this, FUNC(meyc8080_state::meyc8080_dac_3_w)); - map(0xf0ff, 0xf0ff).w(this, FUNC(meyc8080_state::meyc8080_dac_4_w)); + map(0xf000, 0xf000).portr("BSW").w(FUNC(meyc8080_state::meyc8080_dac_1_w)); + map(0xf004, 0xf004).portr("IN1").w(FUNC(meyc8080_state::lights_1_w)); + map(0xf006, 0xf006).portr("IN2").w(FUNC(meyc8080_state::lights_2_w)); + map(0xf008, 0xf008).w(FUNC(meyc8080_state::counters_w)); + map(0xf00f, 0xf00f).w(FUNC(meyc8080_state::meyc8080_dac_2_w)); + map(0xf0f0, 0xf0f0).w(FUNC(meyc8080_state::meyc8080_dac_3_w)); + map(0xf0ff, 0xf0ff).w(FUNC(meyc8080_state::meyc8080_dac_4_w)); } diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp index 94f388d533b..392c149380b 100644 --- a/src/mame/drivers/meyc8088.cpp +++ b/src/mame/drivers/meyc8088.cpp @@ -230,11 +230,11 @@ void meyc8088_state::meyc8088_map(address_map &map) map(0xb0800, 0xb0807).rw("i8155_2", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); map(0xb1000, 0xb10ff).rw("i8155_1", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); map(0xb1800, 0xb1807).rw("i8155_1", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); - map(0xb2000, 0xb2000).w(this, FUNC(meyc8088_state::drive_w)); + map(0xb2000, 0xb2000).w(FUNC(meyc8088_state::drive_w)); map(0xb3000, 0xb3000).noprw(); // i8251A data (debug related, unpopulated on sold boards) map(0xb3800, 0xb3800).noprw(); // " - map(0xb4000, 0xb4000).rw(this, FUNC(meyc8088_state::screen_flip_r), FUNC(meyc8088_state::screen_flip_w)); - map(0xb5000, 0xb5000).rw(this, FUNC(meyc8088_state::video5_flip_r), FUNC(meyc8088_state::video5_flip_w)); + map(0xb4000, 0xb4000).rw(FUNC(meyc8088_state::screen_flip_r), FUNC(meyc8088_state::screen_flip_w)); + map(0xb5000, 0xb5000).rw(FUNC(meyc8088_state::video5_flip_r), FUNC(meyc8088_state::video5_flip_w)); map(0xf8000, 0xfffff).rom(); } diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp index 35ccb98bb14..01261f6c4a2 100644 --- a/src/mame/drivers/mgames.cpp +++ b/src/mame/drivers/mgames.cpp @@ -538,17 +538,17 @@ void mgames_state::main_map(address_map &map) map(0x3800, 0x38ff).ram().share("nvram"); /* NVRAM = 2x SCM5101E */ map(0x4000, 0x47ff).ram().share("video"); /* 4x MM2114N-3 */ map(0x8000, 0x8000).portr("SW1"); - map(0x8001, 0x8001).r(this, FUNC(mgames_state::mixport_r)); /* DIP switch bank 2 + a sort of watchdog */ + map(0x8001, 0x8001).r(FUNC(mgames_state::mixport_r)); /* DIP switch bank 2 + a sort of watchdog */ map(0x8002, 0x8002).portr("IN1"); map(0x8003, 0x8003).portr("IN2"); - map(0x8000, 0x8000).w(this, FUNC(mgames_state::outport0_w)); - map(0x8001, 0x8001).w(this, FUNC(mgames_state::outport1_w)); - map(0x8002, 0x8002).w(this, FUNC(mgames_state::outport2_w)); - map(0x8003, 0x8003).w(this, FUNC(mgames_state::outport3_w)); - map(0x8004, 0x8004).w(this, FUNC(mgames_state::outport4_w)); - map(0x8005, 0x8005).w(this, FUNC(mgames_state::outport5_w)); - map(0x8006, 0x8006).w(this, FUNC(mgames_state::outport6_w)); - map(0x8007, 0x8007).w(this, FUNC(mgames_state::outport7_w)); + map(0x8000, 0x8000).w(FUNC(mgames_state::outport0_w)); + map(0x8001, 0x8001).w(FUNC(mgames_state::outport1_w)); + map(0x8002, 0x8002).w(FUNC(mgames_state::outport2_w)); + map(0x8003, 0x8003).w(FUNC(mgames_state::outport3_w)); + map(0x8004, 0x8004).w(FUNC(mgames_state::outport4_w)); + map(0x8005, 0x8005).w(FUNC(mgames_state::outport5_w)); + map(0x8006, 0x8006).w(FUNC(mgames_state::outport6_w)); + map(0x8007, 0x8007).w(FUNC(mgames_state::outport7_w)); } diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index 6dd8030bb32..04f1aeac376 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -426,10 +426,10 @@ void mgavegas_state::mgavegas_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).ram().share("nvram"); - map(0xa000, 0xa003).rw(this, FUNC(mgavegas_state::r_a0), FUNC(mgavegas_state::w_a0)); // AY-3-8910 - map(0xc000, 0xc001).w(this, FUNC(mgavegas_state::cso1_w)); // /CSout1 - map(0xc400, 0xc401).w(this, FUNC(mgavegas_state::cso2_w)); // /CSout2 - map(0xc800, 0xc801).rw(this, FUNC(mgavegas_state::csoki_r), FUNC(mgavegas_state::csoki_w)); // /CSoki + map(0xa000, 0xa003).rw(FUNC(mgavegas_state::r_a0), FUNC(mgavegas_state::w_a0)); // AY-3-8910 + map(0xc000, 0xc001).w(FUNC(mgavegas_state::cso1_w)); // /CSout1 + map(0xc400, 0xc401).w(FUNC(mgavegas_state::cso2_w)); // /CSout2 + map(0xc800, 0xc801).rw(FUNC(mgavegas_state::csoki_r), FUNC(mgavegas_state::csoki_w)); // /CSoki //AM_RANGE(0xcc00, 0xcc01) AM_READWRITE(cso3_r,cso3_w) // /CSout3 unused //AM_RANGE(0xe000, 0xe003) AM_READWRITE(r_e0,w_e0) // /CSaux unused } diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp index 9c7abf433b7..5453cd0f8f2 100644 --- a/src/mame/drivers/mgolf.cpp +++ b/src/mame/drivers/mgolf.cpp @@ -235,11 +235,11 @@ void mgolf_state::cpu_map(address_map &map) map.global_mask(0x3fff); map(0x0040, 0x0040).portr("40"); - map(0x0041, 0x0041).r(this, FUNC(mgolf_state::dial_r)); + map(0x0041, 0x0041).r(FUNC(mgolf_state::dial_r)); map(0x0060, 0x0060).portr("60"); - map(0x0061, 0x0061).r(this, FUNC(mgolf_state::misc_r)); - map(0x0080, 0x00ff).r(this, FUNC(mgolf_state::wram_r)); - map(0x0180, 0x01ff).r(this, FUNC(mgolf_state::wram_r)); + map(0x0061, 0x0061).r(FUNC(mgolf_state::misc_r)); + map(0x0080, 0x00ff).r(FUNC(mgolf_state::wram_r)); + map(0x0180, 0x01ff).r(FUNC(mgolf_state::wram_r)); map(0x0800, 0x0bff).readonly(); map(0x0000, 0x0009).nopw(); @@ -253,9 +253,9 @@ void mgolf_state::cpu_map(address_map &map) map(0x006a, 0x006a).nopw(); map(0x006c, 0x006c).nopw(); map(0x006d, 0x006d).nopw(); - map(0x0080, 0x00ff).w(this, FUNC(mgolf_state::wram_w)); - map(0x0180, 0x01ff).w(this, FUNC(mgolf_state::wram_w)); - map(0x0800, 0x0bff).w(this, FUNC(mgolf_state::vram_w)).share("video_ram"); + map(0x0080, 0x00ff).w(FUNC(mgolf_state::wram_w)); + map(0x0180, 0x01ff).w(FUNC(mgolf_state::wram_w)); + map(0x0800, 0x0bff).w(FUNC(mgolf_state::vram_w)).share("video_ram"); map(0x2000, 0x3fff).rom(); } diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp index 58bed48ca67..41d736f17ac 100644 --- a/src/mame/drivers/mhavoc.cpp +++ b/src/mame/drivers/mhavoc.cpp @@ -213,7 +213,7 @@ READ8_MEMBER(mhavoc_state::quad_pokeyn_r) int control = (offset & 0x20) >> 2; int pokey_reg = (offset & 0x7) | control; - return m_pokey[pokey_num]->read(pokey_reg); + return m_pokey[pokey_num]->read(space, pokey_reg); } WRITE8_MEMBER(mhavoc_state::quad_pokeyn_w) @@ -222,7 +222,7 @@ WRITE8_MEMBER(mhavoc_state::quad_pokeyn_w) int control = (offset & 0x20) >> 2; int pokey_reg = (offset & 0x7) | control; - m_pokey[pokey_num]->write(pokey_reg, data); + m_pokey[pokey_num]->write(space, pokey_reg, data); } @@ -245,7 +245,7 @@ READ8_MEMBER(mhavoc_state::dual_pokey_r) int control = (offset & 0x10) >> 1; int pokey_reg = (offset & 0x7) | control; - return m_pokey[pokey_num]->read(pokey_reg); + return m_pokey[pokey_num]->read(space, pokey_reg); } @@ -255,7 +255,7 @@ WRITE8_MEMBER(mhavoc_state::dual_pokey_w) int control = (offset & 0x10) >> 1; int pokey_reg = (offset & 0x7) | control; - m_pokey[pokey_num]->write(pokey_reg, data); + m_pokey[pokey_num]->write(space, pokey_reg, data); } @@ -271,17 +271,17 @@ void mhavoc_state::alpha_map(address_map &map) map(0x0200, 0x07ff).bankrw("bank1").share("zram0"); map(0x0800, 0x09ff).ram(); map(0x0a00, 0x0fff).bankrw("bank1").share("zram1"); - map(0x1000, 0x1000).r(this, FUNC(mhavoc_state::mhavoc_gamma_r)); /* Gamma Read Port */ + map(0x1000, 0x1000).r(FUNC(mhavoc_state::mhavoc_gamma_r)); /* Gamma Read Port */ map(0x1200, 0x1200).portr("IN0").nopw(); /* Alpha Input Port 0 */ map(0x1400, 0x141f).ram().share("colorram"); /* ColorRAM */ - map(0x1600, 0x1600).w(this, FUNC(mhavoc_state::mhavoc_out_0_w)); /* Control Signals */ + map(0x1600, 0x1600).w(FUNC(mhavoc_state::mhavoc_out_0_w)); /* Control Signals */ map(0x1640, 0x1640).w("avg", FUNC(avg_mhavoc_device::go_w)); /* Vector Generator GO */ map(0x1680, 0x1680).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* Watchdog Clear */ map(0x16c0, 0x16c0).w("avg", FUNC(avg_mhavoc_device::reset_w)); /* Vector Generator Reset */ - map(0x1700, 0x1700).w(this, FUNC(mhavoc_state::mhavoc_alpha_irq_ack_w)); /* IRQ ack */ - map(0x1740, 0x1740).w(this, FUNC(mhavoc_state::mhavoc_rom_banksel_w)); /* Program ROM Page Select */ - map(0x1780, 0x1780).w(this, FUNC(mhavoc_state::mhavoc_ram_banksel_w)); /* Program RAM Page Select */ - map(0x17c0, 0x17c0).w(this, FUNC(mhavoc_state::mhavoc_gamma_w)); /* Gamma Communication Write Port */ + map(0x1700, 0x1700).w(FUNC(mhavoc_state::mhavoc_alpha_irq_ack_w)); /* IRQ ack */ + map(0x1740, 0x1740).w(FUNC(mhavoc_state::mhavoc_rom_banksel_w)); /* Program ROM Page Select */ + map(0x1780, 0x1780).w(FUNC(mhavoc_state::mhavoc_ram_banksel_w)); /* Program RAM Page Select */ + map(0x17c0, 0x17c0).w(FUNC(mhavoc_state::mhavoc_gamma_w)); /* Gamma Communication Write Port */ map(0x1800, 0x1fff).ram(); /* Shared Beta Ram */ map(0x2000, 0x3fff).bankr("bank2"); /* Paged Program ROM (32K) */ map(0x4000, 0x4fff).ram().share("vectorram").region("alpha", 0x4000); /* Vector Generator RAM */ @@ -321,13 +321,13 @@ a15 a14 a13 a12 a11 a10 a09 a08 a07 a06 a05 a04 a03 a02 a01 a00 void mhavoc_state::gamma_map(address_map &map) { map(0x0000, 0x07ff).ram().mirror(0x1800); /* Program RAM (2K) */ - map(0x2000, 0x203f).rw(this, FUNC(mhavoc_state::quad_pokeyn_r), FUNC(mhavoc_state::quad_pokeyn_w)).mirror(0x07C0); /* Quad Pokey read/write */ + map(0x2000, 0x203f).rw(FUNC(mhavoc_state::quad_pokeyn_r), FUNC(mhavoc_state::quad_pokeyn_w)).mirror(0x07C0); /* Quad Pokey read/write */ map(0x2800, 0x2800).portr("IN1").mirror(0x07ff); /* Gamma Input Port */ - map(0x3000, 0x3000).r(this, FUNC(mhavoc_state::mhavoc_alpha_r)).mirror(0x07ff); /* Alpha Comm. Read Port */ + map(0x3000, 0x3000).r(FUNC(mhavoc_state::mhavoc_alpha_r)).mirror(0x07ff); /* Alpha Comm. Read Port */ map(0x3800, 0x3803).portr("DIAL").mirror(0x07fc); /* Roller Controller Input */ - map(0x4000, 0x4000).portr("DSW2").w(this, FUNC(mhavoc_state::mhavoc_gamma_irq_ack_w)).mirror(0x07ff); /* DSW at 8S, IRQ Acknowledge */ - map(0x4800, 0x4800).w(this, FUNC(mhavoc_state::mhavoc_out_1_w)).mirror(0x07ff); /* Coin Counters */ - map(0x5000, 0x5000).w(this, FUNC(mhavoc_state::mhavoc_alpha_w)).mirror(0x07ff); /* Alpha Comm. Write Port */ + map(0x4000, 0x4000).portr("DSW2").w(FUNC(mhavoc_state::mhavoc_gamma_irq_ack_w)).mirror(0x07ff); /* DSW at 8S, IRQ Acknowledge */ + map(0x4800, 0x4800).w(FUNC(mhavoc_state::mhavoc_out_1_w)).mirror(0x07ff); /* Coin Counters */ + map(0x5000, 0x5000).w(FUNC(mhavoc_state::mhavoc_alpha_w)).mirror(0x07ff); /* Alpha Comm. Write Port */ //AM_RANGE(0x5800, 0x5800) AM_WRITE(mhavocrv_speech_data_w) AM_MIRROR(0x06ff) /* TMS5220 data write */ //AM_RANGE(0x5900, 0x5900) AM_WRITE(mhavocrv_speech_strobe_w) AM_MIRROR(0x06ff) /* TMS5220 /WS strobe write */ map(0x6000, 0x61ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).mirror(0x1e00); /* EEROM */ @@ -349,17 +349,17 @@ void mhavoc_state::alphaone_map(address_map &map) map(0x0200, 0x07ff).bankrw("bank1").share("zram0"); map(0x0800, 0x09ff).ram(); map(0x0a00, 0x0fff).bankrw("bank1").share("zram1"); - map(0x1020, 0x103f).rw(this, FUNC(mhavoc_state::dual_pokey_r), FUNC(mhavoc_state::dual_pokey_w)); + map(0x1020, 0x103f).rw(FUNC(mhavoc_state::dual_pokey_r), FUNC(mhavoc_state::dual_pokey_w)); map(0x1040, 0x1040).portr("IN0").nopw(); /* Alpha Input Port 0 */ map(0x1060, 0x1060).portr("IN1"); /* Gamma Input Port */ map(0x1080, 0x1080).portr("DIAL"); /* Roller Controller Input*/ - map(0x10a0, 0x10a0).w(this, FUNC(mhavoc_state::alphaone_out_0_w)); /* Control Signals */ + map(0x10a0, 0x10a0).w(FUNC(mhavoc_state::alphaone_out_0_w)); /* Control Signals */ map(0x10a4, 0x10a4).w("avg", FUNC(avg_mhavoc_device::go_w)); /* Vector Generator GO */ map(0x10a8, 0x10a8).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* Watchdog Clear */ map(0x10ac, 0x10ac).w("avg", FUNC(avg_mhavoc_device::reset_w)); /* Vector Generator Reset */ - map(0x10b0, 0x10b0).w(this, FUNC(mhavoc_state::mhavoc_alpha_irq_ack_w)); /* IRQ ack */ - map(0x10b4, 0x10b4).w(this, FUNC(mhavoc_state::mhavoc_rom_banksel_w)); - map(0x10b8, 0x10b8).w(this, FUNC(mhavoc_state::mhavoc_ram_banksel_w)); + map(0x10b0, 0x10b0).w(FUNC(mhavoc_state::mhavoc_alpha_irq_ack_w)); /* IRQ ack */ + map(0x10b4, 0x10b4).w(FUNC(mhavoc_state::mhavoc_rom_banksel_w)); + map(0x10b8, 0x10b8).w(FUNC(mhavoc_state::mhavoc_ram_banksel_w)); map(0x10e0, 0x10ff).nopr().writeonly().share("colorram"); /* ColorRAM */ map(0x1800, 0x18ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); /* EEROM */ map(0x2000, 0x3fff).bankr("bank2"); /* Paged Program ROM (32K) */ diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 227c3ed9d2a..e05d72daa22 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -154,10 +154,10 @@ void micral_state::mem_map(address_map &map) map(0xf800, 0xfeff).rom(); map(0xff00, 0xffef).ram(); map(0xfff6, 0xfff7); // AM_WRITENOP // unknown ports - map(0xfff8, 0xfff9).rw(this, FUNC(micral_state::video_r), FUNC(micral_state::video_w)); - map(0xfffa, 0xfffa).r(this, FUNC(micral_state::keyin_r)); - map(0xfffb, 0xfffb).r(this, FUNC(micral_state::unk_r)); - map(0xfffc, 0xfffc).r(this, FUNC(micral_state::status_r)); + map(0xfff8, 0xfff9).rw(FUNC(micral_state::video_r), FUNC(micral_state::video_w)); + map(0xfffa, 0xfffa).r(FUNC(micral_state::keyin_r)); + map(0xfffb, 0xfffb).r(FUNC(micral_state::unk_r)); + map(0xfffc, 0xfffc).r(FUNC(micral_state::status_r)); map(0xfffd, 0xffff); // more unknown ports } diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp index 673ae4bd37c..920d59a3faf 100644 --- a/src/mame/drivers/micro20.cpp +++ b/src/mame/drivers/micro20.cpp @@ -143,7 +143,7 @@ READ32_MEMBER(micro20_state::buserror_r) void micro20_state::micro20_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("mainram"); - map(0x00200000, 0x002fffff).r(this, FUNC(micro20_state::buserror_r)); + map(0x00200000, 0x002fffff).r(FUNC(micro20_state::buserror_r)); map(0x00800000, 0x0083ffff).rom().region("bootrom", 0); map(0xffff8000, 0xffff8000).rw(FDC_TAG, FUNC(wd1772_device::status_r), FUNC(wd1772_device::cmd_w)); map(0xffff8001, 0xffff8001).rw(FDC_TAG, FUNC(wd1772_device::track_r), FUNC(wd1772_device::track_w)); diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp index 991ce847e35..eb511e3874b 100644 --- a/src/mame/drivers/micro3d.cpp +++ b/src/mame/drivers/micro3d.cpp @@ -209,17 +209,17 @@ void micro3d_state::hostmem(address_map &map) map(0x000000, 0x143fff).rom(); map(0x200000, 0x20ffff).ram().share("nvram"); map(0x800000, 0x83ffff).ram().share("shared_ram"); - map(0x900000, 0x900001).w(this, FUNC(micro3d_state::host_drmath_int_w)); + map(0x900000, 0x900001).w(FUNC(micro3d_state::host_drmath_int_w)); map(0x920000, 0x920001).portr("INPUTS_C_D"); map(0x940000, 0x940001).portr("INPUTS_A_B"); - map(0x960000, 0x960001).w(this, FUNC(micro3d_state::micro3d_reset_w)); + map(0x960000, 0x960001).w(FUNC(micro3d_state::micro3d_reset_w)); map(0x980001, 0x980001).rw("adc", FUNC(adc0844_device::read), FUNC(adc0844_device::write)); map(0x9a0000, 0x9a0007).rw(m_vgb, FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w)); map(0x9c0000, 0x9c0001).noprw(); /* Lamps */ map(0x9e0000, 0x9e002f).rw("mfp", FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0xff00); map(0xa00000, 0xa0003f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0xff00); - map(0xa20000, 0xa20001).r(this, FUNC(micro3d_state::micro3d_encoder_h_r)); - map(0xa40002, 0xa40003).r(this, FUNC(micro3d_state::micro3d_encoder_l_r)); + map(0xa20000, 0xa20001).r(FUNC(micro3d_state::micro3d_encoder_h_r)); + map(0xa40002, 0xa40003).r(FUNC(micro3d_state::micro3d_encoder_l_r)); } @@ -234,11 +234,11 @@ void micro3d_state::vgbmem(address_map &map) map(0x00000000, 0x007fffff).ram().share("sprite_vram"); map(0x00800000, 0x00bfffff).ram(); map(0x00c00000, 0x00c0000f).portr("VGB_SW"); - map(0x00e00000, 0x00e0000f).w(this, FUNC(micro3d_state::micro3d_xfer3dk_w)); + map(0x00e00000, 0x00e0000f).w(FUNC(micro3d_state::micro3d_xfer3dk_w)); map(0x02000000, 0x0200ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // clut - map(0x02600000, 0x0260000f).w(this, FUNC(micro3d_state::micro3d_creg_w)); - map(0x02c00000, 0x02c0003f).r(this, FUNC(micro3d_state::vgb_uart_r)).umask16(0x00ff); - map(0x02e00000, 0x02e0003f).w(this, FUNC(micro3d_state::vgb_uart_w)).umask16(0x00ff); + map(0x02600000, 0x0260000f).w(FUNC(micro3d_state::micro3d_creg_w)); + map(0x02c00000, 0x02c0003f).r(FUNC(micro3d_state::vgb_uart_r)).umask16(0x00ff); + map(0x02e00000, 0x02e0003f).w(FUNC(micro3d_state::vgb_uart_w)).umask16(0x00ff); map(0x03800000, 0x03dfffff).rom().region("tms_gfx", 0); map(0x03e00000, 0x03ffffff).rom().region("tms34010", 0); map(0xc0000000, 0xc00001ff).rw(m_vgb, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); @@ -260,16 +260,16 @@ void micro3d_state::drmath_prg(address_map &map) void micro3d_state::drmath_data(address_map &map) { map(0x00000000, 0x000fffff).rom().region("drmath", 0); - map(0x00800000, 0x0083ffff).rw(this, FUNC(micro3d_state::micro3d_shared_r), FUNC(micro3d_state::micro3d_shared_w)); + map(0x00800000, 0x0083ffff).rw(FUNC(micro3d_state::micro3d_shared_r), FUNC(micro3d_state::micro3d_shared_w)); map(0x00400000, 0x004fffff).ram(); map(0x00500000, 0x005fffff).ram(); - map(0x00a00000, 0x00a00003).w(this, FUNC(micro3d_state::drmath_int_w)); - map(0x01000000, 0x01000003).w(this, FUNC(micro3d_state::micro3d_mac1_w)); - map(0x01000004, 0x01000007).rw(this, FUNC(micro3d_state::micro3d_mac2_r), FUNC(micro3d_state::micro3d_mac2_w)); + map(0x00a00000, 0x00a00003).w(FUNC(micro3d_state::drmath_int_w)); + map(0x01000000, 0x01000003).w(FUNC(micro3d_state::micro3d_mac1_w)); + map(0x01000004, 0x01000007).rw(FUNC(micro3d_state::micro3d_mac2_r), FUNC(micro3d_state::micro3d_mac2_w)); map(0x01200000, 0x01203fff).ram().share("mac_sram"); - map(0x01400000, 0x01400003).rw(this, FUNC(micro3d_state::micro3d_pipe_r), FUNC(micro3d_state::micro3d_fifo_w)); - map(0x01600000, 0x01600003).w(this, FUNC(micro3d_state::drmath_intr2_ack)); - map(0x01800000, 0x01800003).w(this, FUNC(micro3d_state::micro3d_alt_fifo_w)); + map(0x01400000, 0x01400003).rw(FUNC(micro3d_state::micro3d_pipe_r), FUNC(micro3d_state::micro3d_fifo_w)); + map(0x01600000, 0x01600003).w(FUNC(micro3d_state::drmath_intr2_ack)); + map(0x01800000, 0x01800003).w(FUNC(micro3d_state::micro3d_alt_fifo_w)); map(0x03fffff0, 0x03fffff7).rw("scc", FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0x000000ff); } @@ -288,9 +288,9 @@ void micro3d_state::soundmem_io(address_map &map) { map(0x0000, 0x07ff).ram(); map(0xfd00, 0xfd01).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xfe00, 0xfe00).w(this, FUNC(micro3d_state::micro3d_upd7759_w)); - map(0xff00, 0xff00).w(this, FUNC(micro3d_state::micro3d_snd_dac_a)); - map(0xff01, 0xff01).w(this, FUNC(micro3d_state::micro3d_snd_dac_b)); + map(0xfe00, 0xfe00).w(FUNC(micro3d_state::micro3d_upd7759_w)); + map(0xff00, 0xff00).w(FUNC(micro3d_state::micro3d_snd_dac_a)); + map(0xff01, 0xff01).w(FUNC(micro3d_state::micro3d_snd_dac_b)); } diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp index 168c5fcbdbb..2e20548a3c3 100644 --- a/src/mame/drivers/microdec.cpp +++ b/src/mame/drivers/microdec.cpp @@ -133,10 +133,10 @@ void microdec_state::microdec_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0xf5, 0xf5).r(this, FUNC(microdec_state::portf5_r)); - map(0xf6, 0xf6).rw(this, FUNC(microdec_state::portf6_r), FUNC(microdec_state::portf6_w)); - map(0xf7, 0xf7).rw(this, FUNC(microdec_state::portf7_r), FUNC(microdec_state::portf7_w)); - map(0xf8, 0xf8).w(this, FUNC(microdec_state::portf8_w)); + map(0xf5, 0xf5).r(FUNC(microdec_state::portf5_r)); + map(0xf6, 0xf6).rw(FUNC(microdec_state::portf6_r), FUNC(microdec_state::portf6_w)); + map(0xf7, 0xf7).rw(FUNC(microdec_state::portf7_r), FUNC(microdec_state::portf7_w)); + map(0xf8, 0xf8).w(FUNC(microdec_state::portf8_w)); map(0xfa, 0xfb).m(m_fdc, FUNC(upd765a_device::map)); map(0xfc, 0xfc).rw("uart1", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xfd, 0xfd).rw("uart1", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); diff --git a/src/mame/drivers/microkit.cpp b/src/mame/drivers/microkit.cpp index 4acbe1c4200..03188716df2 100644 --- a/src/mame/drivers/microkit.cpp +++ b/src/mame/drivers/microkit.cpp @@ -67,7 +67,7 @@ private: void microkit_state::microkit_mem(address_map &map) { - map(0x0000, 0x0000).rw(this, FUNC(microkit_state::ram_r), FUNC(microkit_state::ram_w)); + map(0x0000, 0x0000).rw(FUNC(microkit_state::ram_r), FUNC(microkit_state::ram_w)); map(0x8000, 0x81ff).rom().region("maincpu", 0); map(0x8200, 0x83ff).ram(); } diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp index bcff98e14af..ec31706b233 100644 --- a/src/mame/drivers/micronic.cpp +++ b/src/mame/drivers/micronic.cpp @@ -229,27 +229,27 @@ void micronic_state::micronic_io(address_map &map) map.global_mask(0xff); /* keypad */ - map(0x00, 0x00).r(this, FUNC(micronic_state::keypad_r)); - map(0x02, 0x02).w(this, FUNC(micronic_state::kp_matrix_w)); + map(0x00, 0x00).r(FUNC(micronic_state::keypad_r)); + map(0x02, 0x02).w(FUNC(micronic_state::kp_matrix_w)); /* hd61830 */ map(0x03, 0x03).rw(m_lcdc, FUNC(hd61830_device::data_r), FUNC(hd61830_device::data_w)); map(0x23, 0x23).rw(m_lcdc, FUNC(hd61830_device::status_r), FUNC(hd61830_device::control_w)); /* rtc-146818 */ - map(0x08, 0x08).w(this, FUNC(micronic_state::rtc_address_w)); - map(0x28, 0x28).rw(this, FUNC(micronic_state::rtc_data_r), FUNC(micronic_state::rtc_data_w)); + map(0x08, 0x08).w(FUNC(micronic_state::rtc_address_w)); + map(0x28, 0x28).rw(FUNC(micronic_state::rtc_data_r), FUNC(micronic_state::rtc_data_w)); /* sound */ - map(0x2b, 0x2b).w(this, FUNC(micronic_state::beep_w)); + map(0x2b, 0x2b).w(FUNC(micronic_state::beep_w)); /* basic machine */ - map(0x05, 0x05).r(this, FUNC(micronic_state::irq_flag_r)); - map(0x2c, 0x2c).w(this, FUNC(micronic_state::port_2c_w)); - map(0x47, 0x47).w(this, FUNC(micronic_state::bank_select_w)); - map(0x46, 0x46).w(this, FUNC(micronic_state::lcd_contrast_w)); - map(0x48, 0x48).w(this, FUNC(micronic_state::status_flag_w)); - map(0x49, 0x49).r(this, FUNC(micronic_state::status_flag_r)); + map(0x05, 0x05).r(FUNC(micronic_state::irq_flag_r)); + map(0x2c, 0x2c).w(FUNC(micronic_state::port_2c_w)); + map(0x47, 0x47).w(FUNC(micronic_state::bank_select_w)); + map(0x46, 0x46).w(FUNC(micronic_state::lcd_contrast_w)); + map(0x48, 0x48).w(FUNC(micronic_state::status_flag_w)); + map(0x49, 0x49).r(FUNC(micronic_state::status_flag_r)); } /* Input ports */ diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp index d755201ca21..61411226ebf 100644 --- a/src/mame/drivers/micropin.cpp +++ b/src/mame/drivers/micropin.cpp @@ -82,16 +82,16 @@ void micropin_state::micropin_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x01ff).ram().share("nvram"); // 4x 6561 RAM - map(0x4000, 0x4005).w(this, FUNC(micropin_state::sw_w)); + map(0x4000, 0x4005).w(FUNC(micropin_state::sw_w)); map(0x4000, 0x4000).portr("X1"); map(0x4001, 0x4001).portr("X2"); map(0x4002, 0x4002).portr("X3"); map(0x4003, 0x4003).portr("X4"); map(0x4004, 0x4004).portr("X5"); map(0x5000, 0x5003).rw("pia50", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x5100, 0x5103).rw(this, FUNC(micropin_state::pia51_r), FUNC(micropin_state::pia51_w)); - map(0x5200, 0x5200).w(this, FUNC(micropin_state::sol_w)); - map(0x5202, 0x5202).w(this, FUNC(micropin_state::lamp_w)); + map(0x5100, 0x5103).rw(FUNC(micropin_state::pia51_r), FUNC(micropin_state::pia51_w)); + map(0x5200, 0x5200).w(FUNC(micropin_state::sol_w)); + map(0x5202, 0x5202).w(FUNC(micropin_state::lamp_w)); map(0x5203, 0x5203).nopw(); map(0x6400, 0x7fff).rom().region("v1cpu", 0); } @@ -105,8 +105,8 @@ void micropin_state::pentacup2_map(address_map &map) void micropin_state::pentacup2_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0e).w(this, FUNC(micropin_state::sw_w)); - map(0x0f, 0x0f).w(this, FUNC(micropin_state::lamp_w)); + map(0x00, 0x0e).w(FUNC(micropin_state::sw_w)); + map(0x0f, 0x0f).w(FUNC(micropin_state::lamp_w)); map(0x00, 0x00).portr("X0"); map(0x01, 0x01).portr("X1"); map(0x02, 0x02).portr("X2"); diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp index 1281c1bfa83..7e95d44a535 100644 --- a/src/mame/drivers/microtan.cpp +++ b/src/mame/drivers/microtan.cpp @@ -58,7 +58,7 @@ void microtan_state::microtan_map(address_map &map) { map(0x0000, 0x01ff).ram(); - map(0x0200, 0x03ff).ram().w(this, FUNC(microtan_state::microtan_videoram_w)).share("videoram"); + map(0x0200, 0x03ff).ram().w(FUNC(microtan_state::microtan_videoram_w)).share("videoram"); map(0xbc00, 0xbc00).w("ay8910.1", FUNC(ay8910_device::address_w)); map(0xbc01, 0xbc01).rw("ay8910.1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xbc02, 0xbc02).w("ay8910.2", FUNC(ay8910_device::address_w)); @@ -66,7 +66,7 @@ void microtan_state::microtan_map(address_map &map) map(0xbfc0, 0xbfcf).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0xbfd0, 0xbfd3).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0xbfe0, 0xbfef).rw(m_via6522_1, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0xbff0, 0xbfff).rw(this, FUNC(microtan_state::microtan_bffx_r), FUNC(microtan_state::microtan_bffx_w)); + map(0xbff0, 0xbfff).rw(FUNC(microtan_state::microtan_bffx_r), FUNC(microtan_state::microtan_bffx_w)); map(0xc000, 0xe7ff).rom(); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/microterm.cpp b/src/mame/drivers/microterm.cpp index 8cd1e8db309..0082bd78aba 100644 --- a/src/mame/drivers/microterm.cpp +++ b/src/mame/drivers/microterm.cpp @@ -54,7 +54,7 @@ void microterm_state::mt420_mem_map(address_map &map) { map(0x0000, 0x7fff).rom().region("maincpu", 0); map(0x9000, 0x9000).nopw(); - map(0xc000, 0xc000).r(this, FUNC(microterm_state::c000_r)).nopw(); + map(0xc000, 0xc000).r(FUNC(microterm_state::c000_r)).nopw(); map(0xe000, 0xefff).ram(); map(0xeff8, 0xefff).rw("avdc", FUNC(scn2674_device::read), FUNC(scn2674_device::write)); map(0xf000, 0xf7ff).ram(); diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp index a9175b6a004..e0624bbc24d 100644 --- a/src/mame/drivers/midas.cpp +++ b/src/mame/drivers/midas.cpp @@ -205,27 +205,27 @@ void midas_state::livequiz_map(address_map &map) map(0x940000, 0x940001).portr("PLAYER2"); map(0x980000, 0x980001).portr("START"); - map(0x980000, 0x980001).w(this, FUNC(midas_state::livequiz_coin_w)); + map(0x980000, 0x980001).w(FUNC(midas_state::livequiz_coin_w)); - map(0x9a0000, 0x9a0001).w(this, FUNC(midas_state::midas_eeprom_w)); + map(0x9a0000, 0x9a0001).w(FUNC(midas_state::midas_eeprom_w)); - map(0x9c0000, 0x9c0005).w(this, FUNC(midas_state::midas_gfxregs_w)); + map(0x9c0000, 0x9c0005).w(FUNC(midas_state::midas_gfxregs_w)); map(0x9c000c, 0x9c000d).nopw(); // IRQ Ack, temporary map(0xa00000, 0xa3ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xa40000, 0xa7ffff).ram(); - map(0xb00000, 0xb00001).r(this, FUNC(midas_state::ret_ffff)); - map(0xb20000, 0xb20001).r(this, FUNC(midas_state::ret_ffff)); - map(0xb40000, 0xb40001).r(this, FUNC(midas_state::ret_ffff)); - map(0xb60000, 0xb60001).r(this, FUNC(midas_state::ret_ffff)); + map(0xb00000, 0xb00001).r(FUNC(midas_state::ret_ffff)); + map(0xb20000, 0xb20001).r(FUNC(midas_state::ret_ffff)); + map(0xb40000, 0xb40001).r(FUNC(midas_state::ret_ffff)); + map(0xb60000, 0xb60001).r(FUNC(midas_state::ret_ffff)); map(0xb80008, 0xb8000b).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); map(0xba0000, 0xba0001).portr("START3"); map(0xbc0000, 0xbc0001).portr("PLAYER3"); - map(0xd00000, 0xd1ffff).ram().w(this, FUNC(midas_state::midas_zoomtable_w)).share("zoomtable"); // zoom table? + map(0xd00000, 0xd1ffff).ram().w(FUNC(midas_state::midas_zoomtable_w)).share("zoomtable"); // zoom table? map(0xe00000, 0xe3ffff).ram(); } @@ -277,31 +277,31 @@ void midas_state::hammer_map(address_map &map) map(0x940000, 0x940001).portr("IN0"); map(0x980000, 0x980001).portr("TILT"); - map(0x980000, 0x980001).w(this, FUNC(midas_state::hammer_coin_w)); + map(0x980000, 0x980001).w(FUNC(midas_state::hammer_coin_w)); - map(0x9a0000, 0x9a0001).w(this, FUNC(midas_state::midas_eeprom_w)); + map(0x9a0000, 0x9a0001).w(FUNC(midas_state::midas_eeprom_w)); - map(0x9c0000, 0x9c0005).w(this, FUNC(midas_state::midas_gfxregs_w)); + map(0x9c0000, 0x9c0005).w(FUNC(midas_state::midas_gfxregs_w)); map(0x9c000c, 0x9c000d).nopw(); // IRQ Ack, temporary map(0xa00000, 0xa3ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xa40000, 0xa7ffff).ram(); - map(0xb00000, 0xb00001).r(this, FUNC(midas_state::ret_ffff)); - map(0xb20000, 0xb20001).r(this, FUNC(midas_state::ret_ffff)); - map(0xb40000, 0xb40001).r(this, FUNC(midas_state::ret_ffff)); - map(0xb60000, 0xb60001).r(this, FUNC(midas_state::ret_ffff)); + map(0xb00000, 0xb00001).r(FUNC(midas_state::ret_ffff)); + map(0xb20000, 0xb20001).r(FUNC(midas_state::ret_ffff)); + map(0xb40000, 0xb40001).r(FUNC(midas_state::ret_ffff)); + map(0xb60000, 0xb60001).r(FUNC(midas_state::ret_ffff)); map(0xb80008, 0xb8000b).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); map(0xba0000, 0xba0001).portr("IN1"); map(0xbc0000, 0xbc0001).portr("HAMMER"); - map(0xbc0002, 0xbc0003).w(this, FUNC(midas_state::hammer_motor_w)); + map(0xbc0002, 0xbc0003).w(FUNC(midas_state::hammer_motor_w)); - map(0xbc0004, 0xbc0005).r(this, FUNC(midas_state::hammer_sensor_r)); + map(0xbc0004, 0xbc0005).r(FUNC(midas_state::hammer_sensor_r)); - map(0xd00000, 0xd1ffff).ram().w(this, FUNC(midas_state::midas_zoomtable_w)).share("zoomtable"); // zoom table? + map(0xd00000, 0xd1ffff).ram().w(FUNC(midas_state::midas_zoomtable_w)).share("zoomtable"); // zoom table? map(0xe00000, 0xe3ffff).ram(); } diff --git a/src/mame/drivers/midqslvr.cpp b/src/mame/drivers/midqslvr.cpp index 19acbca7489..a9c1445e43b 100644 --- a/src/mame/drivers/midqslvr.cpp +++ b/src/mame/drivers/midqslvr.cpp @@ -366,13 +366,13 @@ void midqslvr_state::midqslvr_map(address_map &map) { map(0x00000000, 0x0009ffff).ram(); map(0x000a0000, 0x000bffff).rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w)); - map(0x000c0000, 0x000c3fff).bankr("video_bank1").w(this, FUNC(midqslvr_state::isa_ram1_w)); - map(0x000c4000, 0x000c7fff).bankr("video_bank2").w(this, FUNC(midqslvr_state::isa_ram2_w)); - map(0x000e0000, 0x000e3fff).bankr("bios_ext1").w(this, FUNC(midqslvr_state::bios_ext1_ram_w)); - map(0x000e4000, 0x000e7fff).bankr("bios_ext2").w(this, FUNC(midqslvr_state::bios_ext2_ram_w)); - map(0x000e8000, 0x000ebfff).bankr("bios_ext3").w(this, FUNC(midqslvr_state::bios_ext3_ram_w)); - map(0x000ec000, 0x000effff).bankr("bios_ext4").w(this, FUNC(midqslvr_state::bios_ext4_ram_w)); - map(0x000f0000, 0x000fffff).bankr("bios_bank").w(this, FUNC(midqslvr_state::bios_ram_w)); + map(0x000c0000, 0x000c3fff).bankr("video_bank1").w(FUNC(midqslvr_state::isa_ram1_w)); + map(0x000c4000, 0x000c7fff).bankr("video_bank2").w(FUNC(midqslvr_state::isa_ram2_w)); + map(0x000e0000, 0x000e3fff).bankr("bios_ext1").w(FUNC(midqslvr_state::bios_ext1_ram_w)); + map(0x000e4000, 0x000e7fff).bankr("bios_ext2").w(FUNC(midqslvr_state::bios_ext2_ram_w)); + map(0x000e8000, 0x000ebfff).bankr("bios_ext3").w(FUNC(midqslvr_state::bios_ext3_ram_w)); + map(0x000ec000, 0x000effff).bankr("bios_ext4").w(FUNC(midqslvr_state::bios_ext4_ram_w)); + map(0x000f0000, 0x000fffff).bankr("bios_bank").w(FUNC(midqslvr_state::bios_ram_w)); map(0x00100000, 0x01ffffff).ram(); map(0xfff80000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ } @@ -382,11 +382,11 @@ void midqslvr_state::midqslvr_io(address_map &map) pcat32_io_common(map); map(0x00e8, 0x00ef).noprw(); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); map(0x03b0, 0x03bf).rw("vga", FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::read_cs1), FUNC(ide_controller_device::write_cs1)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); } diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp index a53da696c83..05278fc7d0d 100644 --- a/src/mame/drivers/midtunit.cpp +++ b/src/mame/drivers/midtunit.cpp @@ -47,23 +47,23 @@ void midtunit_state::main_map(address_map &map) { map.unmap_value_high(); - map(0x00000000, 0x003fffff).rw(this, FUNC(midtunit_state::midtunit_vram_r), FUNC(midtunit_state::midtunit_vram_w)); + map(0x00000000, 0x003fffff).rw(FUNC(midtunit_state::midtunit_vram_r), FUNC(midtunit_state::midtunit_vram_w)); map(0x01000000, 0x013fffff).ram(); - map(0x01400000, 0x0141ffff).rw(this, FUNC(midtunit_state::midtunit_cmos_r), FUNC(midtunit_state::midtunit_cmos_w)).share("nvram"); - map(0x01480000, 0x014fffff).w(this, FUNC(midtunit_state::midtunit_cmos_enable_w)); + map(0x01400000, 0x0141ffff).rw(FUNC(midtunit_state::midtunit_cmos_r), FUNC(midtunit_state::midtunit_cmos_w)).share("nvram"); + map(0x01480000, 0x014fffff).w(FUNC(midtunit_state::midtunit_cmos_enable_w)); map(0x01600000, 0x0160000f).portr("IN0"); map(0x01600010, 0x0160001f).portr("IN1"); map(0x01600020, 0x0160002f).portr("IN2"); map(0x01600030, 0x0160003f).portr("DSW"); map(0x01800000, 0x0187ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x01a80000, 0x01a800ff).rw(this, FUNC(midtunit_state::midtunit_dma_r), FUNC(midtunit_state::midtunit_dma_w)); - map(0x01b00000, 0x01b0001f).w(this, FUNC(midtunit_state::midtunit_control_w)); + map(0x01a80000, 0x01a800ff).rw(FUNC(midtunit_state::midtunit_dma_r), FUNC(midtunit_state::midtunit_dma_w)); + map(0x01b00000, 0x01b0001f).w(FUNC(midtunit_state::midtunit_control_w)); /* AM_RANGE(0x01c00060, 0x01c0007f) AM_WRITE(midtunit_cmos_enable_w) */ - map(0x01d00000, 0x01d0001f).r(this, FUNC(midtunit_state::midtunit_sound_state_r)); - map(0x01d01020, 0x01d0103f).rw(this, FUNC(midtunit_state::midtunit_sound_r), FUNC(midtunit_state::midtunit_sound_w)); + map(0x01d00000, 0x01d0001f).r(FUNC(midtunit_state::midtunit_sound_state_r)); + map(0x01d01020, 0x01d0103f).rw(FUNC(midtunit_state::midtunit_sound_r), FUNC(midtunit_state::midtunit_sound_w)); map(0x01d81060, 0x01d8107f).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x01f00000, 0x01f0001f).w(this, FUNC(midtunit_state::midtunit_control_w)); - map(0x02000000, 0x07ffffff).r(this, FUNC(midtunit_state::midtunit_gfxrom_r)).share("gfxrom"); + map(0x01f00000, 0x01f0001f).w(FUNC(midtunit_state::midtunit_control_w)); + map(0x02000000, 0x07ffffff).r(FUNC(midtunit_state::midtunit_gfxrom_r)).share("gfxrom"); map(0x1f800000, 0x1fffffff).rom().region("maincpu", 0); /* mirror used by MK */ map(0xc0000000, 0xc00001ff).rw("maincpu", FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xff800000, 0xffffffff).rom().region("maincpu", 0); diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp index 160aaf06d17..2aebf968ee6 100644 --- a/src/mame/drivers/midvunit.cpp +++ b/src/mame/drivers/midvunit.cpp @@ -588,30 +588,30 @@ void midvunit_state::midvunit_map(address_map &map) { map(0x000000, 0x01ffff).ram().share("ram_base"); map(0x400000, 0x41ffff).ram(); - map(0x600000, 0x600000).w(this, FUNC(midvunit_state::midvunit_dma_queue_w)); - map(0x808000, 0x80807f).rw(this, FUNC(midvunit_state::tms32031_control_r), FUNC(midvunit_state::tms32031_control_w)).share("32031_control"); + map(0x600000, 0x600000).w(FUNC(midvunit_state::midvunit_dma_queue_w)); + map(0x808000, 0x80807f).rw(FUNC(midvunit_state::tms32031_control_r), FUNC(midvunit_state::tms32031_control_w)).share("32031_control"); map(0x809800, 0x809fff).ram(); - map(0x900000, 0x97ffff).rw(this, FUNC(midvunit_state::midvunit_videoram_r), FUNC(midvunit_state::midvunit_videoram_w)).share("videoram"); - map(0x980000, 0x980000).r(this, FUNC(midvunit_state::midvunit_dma_queue_entries_r)); - map(0x980020, 0x980020).r(this, FUNC(midvunit_state::midvunit_scanline_r)); - map(0x980020, 0x98002b).w(this, FUNC(midvunit_state::midvunit_video_control_w)); - map(0x980040, 0x980040).rw(this, FUNC(midvunit_state::midvunit_page_control_r), FUNC(midvunit_state::midvunit_page_control_w)); + map(0x900000, 0x97ffff).rw(FUNC(midvunit_state::midvunit_videoram_r), FUNC(midvunit_state::midvunit_videoram_w)).share("videoram"); + map(0x980000, 0x980000).r(FUNC(midvunit_state::midvunit_dma_queue_entries_r)); + map(0x980020, 0x980020).r(FUNC(midvunit_state::midvunit_scanline_r)); + map(0x980020, 0x98002b).w(FUNC(midvunit_state::midvunit_video_control_w)); + map(0x980040, 0x980040).rw(FUNC(midvunit_state::midvunit_page_control_r), FUNC(midvunit_state::midvunit_page_control_w)); map(0x980080, 0x980080).noprw(); - map(0x980082, 0x980083).r(this, FUNC(midvunit_state::midvunit_dma_trigger_r)); + map(0x980082, 0x980083).r(FUNC(midvunit_state::midvunit_dma_trigger_r)); map(0x990000, 0x990000).nopr(); // link PAL (low 4 bits must == 4) map(0x991030, 0x991030).portr("991030"); // AM_RANGE(0x991050, 0x991050) AM_READONLY // seems to be another port - map(0x991060, 0x991060).r(this, FUNC(midvunit_state::port0_r)); + map(0x991060, 0x991060).r(FUNC(midvunit_state::port0_r)); map(0x992000, 0x992000).portr("992000"); - map(0x993000, 0x993000).rw(this, FUNC(midvunit_state::adc_r), FUNC(midvunit_state::adc_w)); - map(0x994000, 0x994000).w(this, FUNC(midvunit_state::midvunit_control_w)); - map(0x995000, 0x995000).rw(this, FUNC(midvunit_state::midvunit_wheel_board_r), FUNC(midvunit_state::midvunit_wheel_board_w)); - map(0x995020, 0x995020).w(this, FUNC(midvunit_state::midvunit_cmos_protect_w)); + map(0x993000, 0x993000).rw(FUNC(midvunit_state::adc_r), FUNC(midvunit_state::adc_w)); + map(0x994000, 0x994000).w(FUNC(midvunit_state::midvunit_control_w)); + map(0x995000, 0x995000).rw(FUNC(midvunit_state::midvunit_wheel_board_r), FUNC(midvunit_state::midvunit_wheel_board_w)); + map(0x995020, 0x995020).w(FUNC(midvunit_state::midvunit_cmos_protect_w)); map(0x997000, 0x997000).noprw(); // communications - map(0x9a0000, 0x9a0000).w(this, FUNC(midvunit_state::midvunit_sound_w)); - map(0x9c0000, 0x9c1fff).rw(this, FUNC(midvunit_state::midvunit_cmos_r), FUNC(midvunit_state::midvunit_cmos_w)).share("nvram"); - map(0x9e0000, 0x9e7fff).ram().w(this, FUNC(midvunit_state::midvunit_paletteram_w)).share("paletteram"); - map(0xa00000, 0xbfffff).rw(this, FUNC(midvunit_state::midvunit_textureram_r), FUNC(midvunit_state::midvunit_textureram_w)).share("textureram"); + map(0x9a0000, 0x9a0000).w(FUNC(midvunit_state::midvunit_sound_w)); + map(0x9c0000, 0x9c1fff).rw(FUNC(midvunit_state::midvunit_cmos_r), FUNC(midvunit_state::midvunit_cmos_w)).share("nvram"); + map(0x9e0000, 0x9e7fff).ram().w(FUNC(midvunit_state::midvunit_paletteram_w)).share("paletteram"); + map(0xa00000, 0xbfffff).rw(FUNC(midvunit_state::midvunit_textureram_r), FUNC(midvunit_state::midvunit_textureram_w)).share("textureram"); map(0xc00000, 0xffffff).rom().region("user1", 0); } @@ -620,23 +620,23 @@ void midvunit_state::midvplus_map(address_map &map) { map(0x000000, 0x01ffff).ram().share("ram_base"); map(0x400000, 0x41ffff).ram().share("fastram_base"); - map(0x600000, 0x600000).w(this, FUNC(midvunit_state::midvunit_dma_queue_w)); - map(0x808000, 0x80807f).rw(this, FUNC(midvunit_state::tms32031_control_r), FUNC(midvunit_state::tms32031_control_w)).share("32031_control"); + map(0x600000, 0x600000).w(FUNC(midvunit_state::midvunit_dma_queue_w)); + map(0x808000, 0x80807f).rw(FUNC(midvunit_state::tms32031_control_r), FUNC(midvunit_state::tms32031_control_w)).share("32031_control"); map(0x809800, 0x809fff).ram(); - map(0x900000, 0x97ffff).rw(this, FUNC(midvunit_state::midvunit_videoram_r), FUNC(midvunit_state::midvunit_videoram_w)).share("videoram"); - map(0x980000, 0x980000).r(this, FUNC(midvunit_state::midvunit_dma_queue_entries_r)); - map(0x980020, 0x980020).r(this, FUNC(midvunit_state::midvunit_scanline_r)); - map(0x980020, 0x98002b).w(this, FUNC(midvunit_state::midvunit_video_control_w)); - map(0x980040, 0x980040).rw(this, FUNC(midvunit_state::midvunit_page_control_r), FUNC(midvunit_state::midvunit_page_control_w)); + map(0x900000, 0x97ffff).rw(FUNC(midvunit_state::midvunit_videoram_r), FUNC(midvunit_state::midvunit_videoram_w)).share("videoram"); + map(0x980000, 0x980000).r(FUNC(midvunit_state::midvunit_dma_queue_entries_r)); + map(0x980020, 0x980020).r(FUNC(midvunit_state::midvunit_scanline_r)); + map(0x980020, 0x98002b).w(FUNC(midvunit_state::midvunit_video_control_w)); + map(0x980040, 0x980040).rw(FUNC(midvunit_state::midvunit_page_control_r), FUNC(midvunit_state::midvunit_page_control_w)); map(0x980080, 0x980080).noprw(); - map(0x980082, 0x980083).r(this, FUNC(midvunit_state::midvunit_dma_trigger_r)); + map(0x980082, 0x980083).r(FUNC(midvunit_state::midvunit_dma_trigger_r)); map(0x990000, 0x99000f).rw(m_midway_ioasic, FUNC(midway_ioasic_device::read), FUNC(midway_ioasic_device::write)); - map(0x994000, 0x994000).w(this, FUNC(midvunit_state::midvunit_control_w)); - map(0x995020, 0x995020).w(this, FUNC(midvunit_state::midvunit_cmos_protect_w)); - map(0x9a0000, 0x9a0007).rw("ata", FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)).umask32(0x0000ffff); - map(0x9c0000, 0x9c7fff).ram().w(this, FUNC(midvunit_state::midvunit_paletteram_w)).share("paletteram"); - map(0x9d0000, 0x9d000f).rw(this, FUNC(midvunit_state::midvplus_misc_r), FUNC(midvunit_state::midvplus_misc_w)).share("midvplus_misc"); - map(0xa00000, 0xbfffff).rw(this, FUNC(midvunit_state::midvunit_textureram_r), FUNC(midvunit_state::midvunit_textureram_w)).share("textureram"); + map(0x994000, 0x994000).w(FUNC(midvunit_state::midvunit_control_w)); + map(0x995020, 0x995020).w(FUNC(midvunit_state::midvunit_cmos_protect_w)); + map(0x9a0000, 0x9a0007).rw("ata", FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)).umask32(0x0000ffff); + map(0x9c0000, 0x9c7fff).ram().w(FUNC(midvunit_state::midvunit_paletteram_w)).share("paletteram"); + map(0x9d0000, 0x9d000f).rw(FUNC(midvunit_state::midvplus_misc_r), FUNC(midvunit_state::midvplus_misc_w)).share("midvplus_misc"); + map(0xa00000, 0xbfffff).rw(FUNC(midvunit_state::midvunit_textureram_r), FUNC(midvunit_state::midvunit_textureram_w)).share("textureram"); map(0xc00000, 0xcfffff).ram(); } diff --git a/src/mame/drivers/midwunit.cpp b/src/mame/drivers/midwunit.cpp index f126bb88247..d4e9a611049 100644 --- a/src/mame/drivers/midwunit.cpp +++ b/src/mame/drivers/midwunit.cpp @@ -112,17 +112,17 @@ Notes: void midwunit_state::main_map(address_map &map) { - map(0x00000000, 0x003fffff).rw(this, FUNC(midwunit_state::midtunit_vram_r), FUNC(midwunit_state::midtunit_vram_w)); + map(0x00000000, 0x003fffff).rw(FUNC(midwunit_state::midtunit_vram_r), FUNC(midwunit_state::midtunit_vram_w)); map(0x01000000, 0x013fffff).ram().share("mainram"); - map(0x01400000, 0x0145ffff).rw(this, FUNC(midwunit_state::midwunit_cmos_r), FUNC(midwunit_state::midwunit_cmos_w)).share("nvram"); - map(0x01480000, 0x014fffff).w(this, FUNC(midwunit_state::midwunit_cmos_enable_w)); - map(0x01600000, 0x0160001f).rw(this, FUNC(midwunit_state::midwunit_security_r), FUNC(midwunit_state::midwunit_security_w)); - map(0x01680000, 0x0168001f).rw(this, FUNC(midwunit_state::midwunit_sound_r), FUNC(midwunit_state::midwunit_sound_w)); - map(0x01800000, 0x0187ffff).rw(this, FUNC(midwunit_state::midwunit_io_r), FUNC(midwunit_state::midwunit_io_w)); + map(0x01400000, 0x0145ffff).rw(FUNC(midwunit_state::midwunit_cmos_r), FUNC(midwunit_state::midwunit_cmos_w)).share("nvram"); + map(0x01480000, 0x014fffff).w(FUNC(midwunit_state::midwunit_cmos_enable_w)); + map(0x01600000, 0x0160001f).rw(FUNC(midwunit_state::midwunit_security_r), FUNC(midwunit_state::midwunit_security_w)); + map(0x01680000, 0x0168001f).rw(FUNC(midwunit_state::midwunit_sound_r), FUNC(midwunit_state::midwunit_sound_w)); + map(0x01800000, 0x0187ffff).rw(FUNC(midwunit_state::midwunit_io_r), FUNC(midwunit_state::midwunit_io_w)); map(0x01880000, 0x018fffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x01a00000, 0x01a000ff).mirror(0x00080000).rw(this, FUNC(midwunit_state::midtunit_dma_r), FUNC(midwunit_state::midtunit_dma_w)); - map(0x01b00000, 0x01b0001f).rw(this, FUNC(midwunit_state::midwunit_control_r), FUNC(midwunit_state::midwunit_control_w)); - map(0x02000000, 0x06ffffff).r(this, FUNC(midwunit_state::midwunit_gfxrom_r)); + map(0x01a00000, 0x01a000ff).mirror(0x00080000).rw(FUNC(midwunit_state::midtunit_dma_r), FUNC(midwunit_state::midtunit_dma_w)); + map(0x01b00000, 0x01b0001f).rw(FUNC(midwunit_state::midwunit_control_r), FUNC(midwunit_state::midwunit_control_w)); + map(0x02000000, 0x06ffffff).r(FUNC(midwunit_state::midwunit_gfxrom_r)); map(0xc0000000, 0xc00001ff).rw("maincpu", FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xff800000, 0xffffffff).rom().region("maincpu", 0); } diff --git a/src/mame/drivers/midxunit.cpp b/src/mame/drivers/midxunit.cpp index 3e4d10c09f8..0974873eb75 100644 --- a/src/mame/drivers/midxunit.cpp +++ b/src/mame/drivers/midxunit.cpp @@ -106,25 +106,25 @@ There's a separate sound board also, but it wasn't available so is not documente void midxunit_state::main_map(address_map &map) { - map(0x00000000, 0x003fffff).rw(this, FUNC(midxunit_state::midtunit_vram_data_r), FUNC(midxunit_state::midtunit_vram_data_w)); - map(0x00800000, 0x00bfffff).rw(this, FUNC(midxunit_state::midtunit_vram_color_r), FUNC(midxunit_state::midtunit_vram_color_w)); + map(0x00000000, 0x003fffff).rw(FUNC(midxunit_state::midtunit_vram_data_r), FUNC(midxunit_state::midtunit_vram_data_w)); + map(0x00800000, 0x00bfffff).rw(FUNC(midxunit_state::midtunit_vram_color_r), FUNC(midxunit_state::midtunit_vram_color_w)); map(0x20000000, 0x20ffffff).ram(); - map(0x40800000, 0x4fffffff).w(this, FUNC(midxunit_state::midxunit_unknown_w)); - map(0x60400000, 0x6040001f).rw(this, FUNC(midxunit_state::midxunit_status_r), FUNC(midxunit_state::midxunit_security_clock_w)); + map(0x40800000, 0x4fffffff).w(FUNC(midxunit_state::midxunit_unknown_w)); + map(0x60400000, 0x6040001f).rw(FUNC(midxunit_state::midxunit_status_r), FUNC(midxunit_state::midxunit_security_clock_w)); map(0x60c00000, 0x60c0001f).portr("IN0"); map(0x60c00020, 0x60c0003f).portr("IN1"); map(0x60c00040, 0x60c0005f).portr("IN2"); map(0x60c00060, 0x60c0007f).portr("DSW"); - map(0x60c00080, 0x60c000df).w(this, FUNC(midxunit_state::midxunit_io_w)); - map(0x60c000e0, 0x60c000ff).rw(this, FUNC(midxunit_state::midxunit_security_r), FUNC(midxunit_state::midxunit_security_w)); + map(0x60c00080, 0x60c000df).w(FUNC(midxunit_state::midxunit_io_w)); + map(0x60c000e0, 0x60c000ff).rw(FUNC(midxunit_state::midxunit_security_r), FUNC(midxunit_state::midxunit_security_w)); map(0x80800000, 0x8080000f).r("adc", FUNC(adc0848_device::read)).umask16(0x00ff).w("adc", FUNC(adc0848_device::write)).umask16(0x00ff); map(0x80800010, 0x8080001f).noprw(); - map(0x80c00000, 0x80c000ff).rw(this, FUNC(midxunit_state::midxunit_uart_r), FUNC(midxunit_state::midxunit_uart_w)); - map(0xa0440000, 0xa047ffff).rw(this, FUNC(midxunit_state::midxunit_cmos_r), FUNC(midxunit_state::midxunit_cmos_w)).share("nvram"); - map(0xa0800000, 0xa08fffff).rw(this, FUNC(midxunit_state::midxunit_paletteram_r), FUNC(midxunit_state::midxunit_paletteram_w)).share("palette"); + map(0x80c00000, 0x80c000ff).rw(FUNC(midxunit_state::midxunit_uart_r), FUNC(midxunit_state::midxunit_uart_w)); + map(0xa0440000, 0xa047ffff).rw(FUNC(midxunit_state::midxunit_cmos_r), FUNC(midxunit_state::midxunit_cmos_w)).share("nvram"); + map(0xa0800000, 0xa08fffff).rw(FUNC(midxunit_state::midxunit_paletteram_r), FUNC(midxunit_state::midxunit_paletteram_w)).share("palette"); map(0xc0000000, 0xc00003ff).rw("maincpu", FUNC(tms34020_device::io_register_r), FUNC(tms34020_device::io_register_w)); - map(0xc0800000, 0xc08000ff).mirror(0x00400000).rw(this, FUNC(midxunit_state::midtunit_dma_r), FUNC(midxunit_state::midtunit_dma_w)); - map(0xf8000000, 0xfeffffff).r(this, FUNC(midxunit_state::midwunit_gfxrom_r)); + map(0xc0800000, 0xc08000ff).mirror(0x00400000).rw(FUNC(midxunit_state::midtunit_dma_r), FUNC(midxunit_state::midtunit_dma_w)); + map(0xf8000000, 0xfeffffff).r(FUNC(midxunit_state::midwunit_gfxrom_r)); map(0xff000000, 0xffffffff).rom().region("maincpu", 0); } diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp index 9eb0f56f5d0..895dba0889a 100644 --- a/src/mame/drivers/midyunit.cpp +++ b/src/mame/drivers/midyunit.cpp @@ -180,16 +180,16 @@ CUSTOM_INPUT_MEMBER(midyunit_state::adpcm_irq_state_r) void midyunit_state::main_map(address_map &map) { - map(0x00000000, 0x001fffff).rw(this, FUNC(midyunit_state::midyunit_vram_r), FUNC(midyunit_state::midyunit_vram_w)); + map(0x00000000, 0x001fffff).rw(FUNC(midyunit_state::midyunit_vram_r), FUNC(midyunit_state::midyunit_vram_w)); map(0x01000000, 0x010fffff).ram().share("mainram"); - map(0x01400000, 0x0140ffff).rw(this, FUNC(midyunit_state::midyunit_cmos_r), FUNC(midyunit_state::midyunit_cmos_w)); - map(0x01800000, 0x0181ffff).ram().w(this, FUNC(midyunit_state::midyunit_paletteram_w)).share("paletteram"); - map(0x01a00000, 0x01a0009f).mirror(0x00080000).rw(this, FUNC(midyunit_state::midyunit_dma_r), FUNC(midyunit_state::midyunit_dma_w)); - map(0x01c00000, 0x01c0005f).r(this, FUNC(midyunit_state::midyunit_input_r)); - map(0x01c00060, 0x01c0007f).rw(this, FUNC(midyunit_state::midyunit_protection_r), FUNC(midyunit_state::midyunit_cmos_enable_w)); - map(0x01e00000, 0x01e0001f).w(this, FUNC(midyunit_state::midyunit_sound_w)); - map(0x01f00000, 0x01f0001f).w(this, FUNC(midyunit_state::midyunit_control_w)); - map(0x02000000, 0x05ffffff).r(this, FUNC(midyunit_state::midyunit_gfxrom_r)).share("gfx_rom"); + map(0x01400000, 0x0140ffff).rw(FUNC(midyunit_state::midyunit_cmos_r), FUNC(midyunit_state::midyunit_cmos_w)); + map(0x01800000, 0x0181ffff).ram().w(FUNC(midyunit_state::midyunit_paletteram_w)).share("paletteram"); + map(0x01a00000, 0x01a0009f).mirror(0x00080000).rw(FUNC(midyunit_state::midyunit_dma_r), FUNC(midyunit_state::midyunit_dma_w)); + map(0x01c00000, 0x01c0005f).r(FUNC(midyunit_state::midyunit_input_r)); + map(0x01c00060, 0x01c0007f).rw(FUNC(midyunit_state::midyunit_protection_r), FUNC(midyunit_state::midyunit_cmos_enable_w)); + map(0x01e00000, 0x01e0001f).w(FUNC(midyunit_state::midyunit_sound_w)); + map(0x01f00000, 0x01f0001f).w(FUNC(midyunit_state::midyunit_control_w)); + map(0x02000000, 0x05ffffff).r(FUNC(midyunit_state::midyunit_gfxrom_r)).share("gfx_rom"); map(0xc0000000, 0xc00001ff).rw("maincpu", FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xff800000, 0xffffffff).rom().region("user1", 0); } @@ -199,7 +199,7 @@ void midyunit_state::yawdim_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x97ff).w(this, FUNC(midyunit_state::yawdim_oki_bank_w)); + map(0x9000, 0x97ff).w(FUNC(midyunit_state::yawdim_oki_bank_w)); map(0x9800, 0x9fff).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa7ff).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp index 4f6f8b2f8c9..b636c930d92 100644 --- a/src/mame/drivers/midzeus.cpp +++ b/src/mame/drivers/midzeus.cpp @@ -758,13 +758,13 @@ void midzeus_state::zeus_map(address_map &map) map.unmap_value_high(); map(0x000000, 0x03ffff).ram().share("ram_base"); map(0x400000, 0x41ffff).ram(); - map(0x808000, 0x80807f).rw(this, FUNC(midzeus_state::tms32031_control_r), FUNC(midzeus_state::tms32031_control_w)).share("tms32031_ctl"); - map(0x880000, 0x8803ff).rw(this, FUNC(midzeus_state::zeus_r), FUNC(midzeus_state::zeus_w)).share("zeusbase"); - map(0x8d0000, 0x8d0009).rw(this, FUNC(midzeus_state::disk_asic_jr_r), FUNC(midzeus_state::disk_asic_jr_w)); + map(0x808000, 0x80807f).rw(FUNC(midzeus_state::tms32031_control_r), FUNC(midzeus_state::tms32031_control_w)).share("tms32031_ctl"); + map(0x880000, 0x8803ff).rw(FUNC(midzeus_state::zeus_r), FUNC(midzeus_state::zeus_w)).share("zeusbase"); + map(0x8d0000, 0x8d0009).rw(FUNC(midzeus_state::disk_asic_jr_r), FUNC(midzeus_state::disk_asic_jr_w)); map(0x990000, 0x99000f).rw("ioasic", FUNC(midway_ioasic_device::read), FUNC(midway_ioasic_device::write)); map(0x9e0000, 0x9e0000).nopw(); // watchdog? - map(0x9f0000, 0x9f7fff).rw(this, FUNC(midzeus_state::cmos_r), FUNC(midzeus_state::cmos_w)).share("nvram"); - map(0x9f8000, 0x9f8000).w(this, FUNC(midzeus_state::cmos_protect_w)); + map(0x9f0000, 0x9f7fff).rw(FUNC(midzeus_state::cmos_r), FUNC(midzeus_state::cmos_w)).share("nvram"); + map(0x9f8000, 0x9f8000).w(FUNC(midzeus_state::cmos_protect_w)); map(0xa00000, 0xffffff).rom().region("user1", 0); } @@ -774,17 +774,17 @@ void midzeus2_state::zeus2_map(address_map &map) map.unmap_value_high(); map(0x000000, 0x03ffff).ram().share("ram_base"); map(0x400000, 0x43ffff).ram(); - map(0x808000, 0x80807f).rw(this, FUNC(midzeus2_state::tms32031_control_r), FUNC(midzeus2_state::tms32031_control_w)).share("tms32031_ctl"); + map(0x808000, 0x80807f).rw(FUNC(midzeus2_state::tms32031_control_r), FUNC(midzeus2_state::tms32031_control_w)).share("tms32031_ctl"); map(0x880000, 0x88007f).rw(m_zeus, FUNC(zeus2_device::zeus2_r), FUNC(zeus2_device::zeus2_w)); - map(0x8a0000, 0x8a00cf).rw(this, FUNC(midzeus2_state::firewire_r), FUNC(midzeus2_state::firewire_w)).share("firewire"); - map(0x8d0000, 0x8d0009).rw(this, FUNC(midzeus2_state::disk_asic_jr_r), FUNC(midzeus2_state::disk_asic_jr_w)); - map(0x900000, 0x91ffff).rw(this, FUNC(midzeus2_state::zpram_r), FUNC(midzeus2_state::zpram_w)).share("nvram").mirror(0x020000); + map(0x8a0000, 0x8a00cf).rw(FUNC(midzeus2_state::firewire_r), FUNC(midzeus2_state::firewire_w)).share("firewire"); + map(0x8d0000, 0x8d0009).rw(FUNC(midzeus2_state::disk_asic_jr_r), FUNC(midzeus2_state::disk_asic_jr_w)); + map(0x900000, 0x91ffff).rw(FUNC(midzeus2_state::zpram_r), FUNC(midzeus2_state::zpram_w)).share("nvram").mirror(0x020000); map(0x990000, 0x99000f).rw("ioasic", FUNC(midway_ioasic_device::read), FUNC(midway_ioasic_device::write)); - map(0x9c0000, 0x9c000f).rw(this, FUNC(midzeus2_state::analog_r), FUNC(midzeus2_state::analog_w)); - map(0x9d0000, 0x9d000f).rw(this, FUNC(midzeus2_state::disk_asic_r), FUNC(midzeus2_state::disk_asic_w)); + map(0x9c0000, 0x9c000f).rw(FUNC(midzeus2_state::analog_r), FUNC(midzeus2_state::analog_w)); + map(0x9d0000, 0x9d000f).rw(FUNC(midzeus2_state::disk_asic_r), FUNC(midzeus2_state::disk_asic_w)); map(0x9e0000, 0x9e0000).nopw(); // watchdog? - map(0x9f0000, 0x9f7fff).rw(this, FUNC(midzeus2_state::zeus2_timekeeper_r), FUNC(midzeus2_state::zeus2_timekeeper_w)); - map(0x9f8000, 0x9f8000).w(this, FUNC(midzeus2_state::cmos_protect_w)); + map(0x9f0000, 0x9f7fff).rw(FUNC(midzeus2_state::zeus2_timekeeper_r), FUNC(midzeus2_state::zeus2_timekeeper_w)); + map(0x9f8000, 0x9f8000).w(FUNC(midzeus2_state::cmos_protect_w)); map(0xa00000, 0xbfffff).rom().region("user1", 0); map(0xc00000, 0xffffff).bankr("bank1").region("user2", 0); } diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp index 1a88b0acbef..511d79b4890 100644 --- a/src/mame/drivers/mikie.cpp +++ b/src/mame/drivers/mikie.cpp @@ -110,7 +110,7 @@ void mikie_state::mikie_map(address_map &map) map(0x0000, 0x00ff).ram(); map(0x2000, 0x2007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x2100, 0x2100).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x2200, 0x2200).w(this, FUNC(mikie_state::mikie_palettebank_w)); + map(0x2200, 0x2200).w(FUNC(mikie_state::mikie_palettebank_w)); map(0x2300, 0x2300).nopw(); // ??? map(0x2400, 0x2400).portr("SYSTEM").w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x2401, 0x2401).portr("P1"); @@ -120,8 +120,8 @@ void mikie_state::mikie_map(address_map &map) map(0x2501, 0x2501).portr("DSW2"); map(0x2800, 0x288f).ram().share("spriteram"); map(0x2890, 0x37ff).ram(); - map(0x3800, 0x3bff).ram().w(this, FUNC(mikie_state::mikie_colorram_w)).share("colorram"); - map(0x3c00, 0x3fff).ram().w(this, FUNC(mikie_state::mikie_videoram_w)).share("videoram"); + map(0x3800, 0x3bff).ram().w(FUNC(mikie_state::mikie_colorram_w)).share("colorram"); + map(0x3c00, 0x3fff).ram().w(FUNC(mikie_state::mikie_videoram_w)).share("videoram"); map(0x4000, 0x5fff).rom(); // Machine checks for extra rom map(0x6000, 0xffff).rom(); } @@ -132,10 +132,10 @@ void mikie_state::sound_map(address_map &map) map(0x4000, 0x43ff).ram(); map(0x8000, 0x8000).nopw(); // sound command latch map(0x8001, 0x8001).nopw(); // ??? - map(0x8002, 0x8002).w("sn1", FUNC(sn76489a_device::write)); // trigger read of latch + map(0x8002, 0x8002).w("sn1", FUNC(sn76489a_device::command_w)); // trigger read of latch map(0x8003, 0x8003).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x8004, 0x8004).w("sn2", FUNC(sn76489a_device::write)); // trigger read of latch - map(0x8005, 0x8005).r(this, FUNC(mikie_state::mikie_sh_timer_r)); + map(0x8004, 0x8004).w("sn2", FUNC(sn76489a_device::command_w)); // trigger read of latch + map(0x8005, 0x8005).r(FUNC(mikie_state::mikie_sh_timer_r)); map(0x8079, 0x8079).nopw(); // ??? map(0xa003, 0xa003).nopw(); // ??? } diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp index e0df45768fd..d0a93354d32 100644 --- a/src/mame/drivers/mikro80.cpp +++ b/src/mame/drivers/mikro80.cpp @@ -33,8 +33,8 @@ void mikro80_state::mikro80_mem(address_map &map) void mikro80_state::mikro80_io(address_map &map) { map.unmap_value_high(); - map(0x01, 0x01).rw(this, FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w)); - map(0x04, 0x07).rw(this, FUNC(mikro80_state::mikro80_keyboard_r), FUNC(mikro80_state::mikro80_keyboard_w)); + map(0x01, 0x01).rw(FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w)); + map(0x04, 0x07).rw(FUNC(mikro80_state::mikro80_keyboard_r), FUNC(mikro80_state::mikro80_keyboard_w)); } void mikro80_state::kristall_io(address_map &map) @@ -46,11 +46,11 @@ void mikro80_state::kristall_io(address_map &map) void mikro80_state::radio99_io(address_map &map) { map.unmap_value_high(); - map(0x01, 0x01).rw(this, FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w)); - map(0x04, 0x04).w(this, FUNC(mikro80_state::radio99_sound_w)); - map(0x05, 0x05).rw(this, FUNC(mikro80_state::mikro80_8255_portc_r), FUNC(mikro80_state::mikro80_8255_portc_w)); - map(0x06, 0x06).r(this, FUNC(mikro80_state::mikro80_8255_portb_r)); - map(0x07, 0x07).w(this, FUNC(mikro80_state::mikro80_8255_porta_w)); + map(0x01, 0x01).rw(FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w)); + map(0x04, 0x04).w(FUNC(mikro80_state::radio99_sound_w)); + map(0x05, 0x05).rw(FUNC(mikro80_state::mikro80_8255_portc_r), FUNC(mikro80_state::mikro80_8255_portc_w)); + map(0x06, 0x06).r(FUNC(mikro80_state::mikro80_8255_portb_r)); + map(0x07, 0x07).w(FUNC(mikro80_state::mikro80_8255_porta_w)); } /* Input ports */ diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp index 85440b594b2..1d838688d88 100644 --- a/src/mame/drivers/mikromik.cpp +++ b/src/mame/drivers/mikromik.cpp @@ -266,7 +266,7 @@ WRITE8_MEMBER( mm1_state::ls259_w ) void mm1_state::mm1_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(mm1_state::read), FUNC(mm1_state::write)); + map(0x0000, 0xffff).rw(FUNC(mm1_state::read), FUNC(mm1_state::write)); } diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index a8ffef44475..ee793635da5 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -57,7 +57,7 @@ void mikrosha_state::mikrosha_mem(address_map &map) map(0xc800, 0xc803).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x07fc); map(0xd000, 0xd001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x07fe); // video map(0xd800, 0xd803).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).mirror(0x07fc); // Timer - map(0xe000, 0xf7ff).r(this, FUNC(mikrosha_state::radio_cpu_state_r)); // Not connected + map(0xe000, 0xf7ff).r(FUNC(mikrosha_state::radio_cpu_state_r)); // Not connected map(0xf800, 0xffff).w(m_dma8257, FUNC(i8257_device::write)); // DMA map(0xf800, 0xffff).rom(); // System ROM } @@ -65,7 +65,7 @@ void mikrosha_state::mikrosha_mem(address_map &map) void mikrosha_state::mikrosha_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0xff).rw(this, FUNC(mikrosha_state::radio_io_r), FUNC(mikrosha_state::radio_io_w)); + map(0x00, 0xff).rw(FUNC(mikrosha_state::radio_io_r), FUNC(mikrosha_state::radio_io_w)); } /* Input ports */ diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp index 98d5f789448..67832356114 100644 --- a/src/mame/drivers/mil4000.cpp +++ b/src/mame/drivers/mil4000.cpp @@ -444,15 +444,15 @@ WRITE16_MEMBER(mil4000_state::unk_w) void mil4000_state::mil4000_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x500000, 0x503fff).ram().w(this, FUNC(mil4000_state::sc0_vram_w)).share("sc0_vram"); // CY62256L-70, U77 - map(0x504000, 0x507fff).ram().w(this, FUNC(mil4000_state::sc1_vram_w)).share("sc1_vram"); // CY62256L-70, U77 - map(0x508000, 0x50bfff).ram().w(this, FUNC(mil4000_state::sc2_vram_w)).share("sc2_vram"); // CY62256L-70, U78 - map(0x50c000, 0x50ffff).ram().w(this, FUNC(mil4000_state::sc3_vram_w)).share("sc3_vram"); // CY62256L-70, U78 + map(0x500000, 0x503fff).ram().w(FUNC(mil4000_state::sc0_vram_w)).share("sc0_vram"); // CY62256L-70, U77 + map(0x504000, 0x507fff).ram().w(FUNC(mil4000_state::sc1_vram_w)).share("sc1_vram"); // CY62256L-70, U77 + map(0x508000, 0x50bfff).ram().w(FUNC(mil4000_state::sc2_vram_w)).share("sc2_vram"); // CY62256L-70, U78 + map(0x50c000, 0x50ffff).ram().w(FUNC(mil4000_state::sc3_vram_w)).share("sc3_vram"); // CY62256L-70, U78 map(0x708000, 0x708001).portr("IN0"); map(0x708002, 0x708003).portr("IN1"); - map(0x708004, 0x708005).r(this, FUNC(mil4000_state::hvretrace_r)); + map(0x708004, 0x708005).r(FUNC(mil4000_state::hvretrace_r)); map(0x708006, 0x708007).portr("IN2"); - map(0x708008, 0x708009).w(this, FUNC(mil4000_state::output_w)); + map(0x708008, 0x708009).w(FUNC(mil4000_state::output_w)); map(0x708010, 0x708011).noprw(); //touch screen map(0x70801f, 0x70801f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -464,20 +464,20 @@ void mil4000_state::mil4000_map(address_map &map) void mil4000_state::chewheel_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x500000, 0x503fff).ram().w(this, FUNC(mil4000_state::sc0_vram_w)).share("sc0_vram"); // V62C518256L-35P (U7). - map(0x504000, 0x507fff).ram().w(this, FUNC(mil4000_state::sc1_vram_w)).share("sc1_vram"); // V62C518256L-35P (U7). - map(0x508000, 0x50bfff).ram().w(this, FUNC(mil4000_state::sc2_vram_w)).share("sc2_vram"); // V62C518256L-35P (U8). - map(0x50c000, 0x50ffff).ram().w(this, FUNC(mil4000_state::sc3_vram_w)).share("sc3_vram"); // V62C518256L-35P (U8). + map(0x500000, 0x503fff).ram().w(FUNC(mil4000_state::sc0_vram_w)).share("sc0_vram"); // V62C518256L-35P (U7). + map(0x504000, 0x507fff).ram().w(FUNC(mil4000_state::sc1_vram_w)).share("sc1_vram"); // V62C518256L-35P (U7). + map(0x508000, 0x50bfff).ram().w(FUNC(mil4000_state::sc2_vram_w)).share("sc2_vram"); // V62C518256L-35P (U8). + map(0x50c000, 0x50ffff).ram().w(FUNC(mil4000_state::sc3_vram_w)).share("sc3_vram"); // V62C518256L-35P (U8). - map(0x51000c, 0x51000f).r(this, FUNC(mil4000_state::unk_r)); // no idea what's mapped here. - map(0x510000, 0x51000f).w(this, FUNC(mil4000_state::unk_w)); // no idea what's mapped here. + map(0x51000c, 0x51000f).r(FUNC(mil4000_state::unk_r)); // no idea what's mapped here. + map(0x510000, 0x51000f).w(FUNC(mil4000_state::unk_w)); // no idea what's mapped here. map(0x708000, 0x708001).portr("IN0"); map(0x708002, 0x708003).portr("IN1"); - map(0x708004, 0x708005).r(this, FUNC(mil4000_state::hvretrace_r)); + map(0x708004, 0x708005).r(FUNC(mil4000_state::hvretrace_r)); map(0x708006, 0x708007).portr("IN2"); - map(0x708008, 0x708009).w(this, FUNC(mil4000_state::output_w)); - map(0x708010, 0x708011).rw(this, FUNC(mil4000_state::chewheel_mcu_r), FUNC(mil4000_state::chewheel_mcu_w)); + map(0x708008, 0x708009).w(FUNC(mil4000_state::output_w)); + map(0x708010, 0x708011).rw(FUNC(mil4000_state::chewheel_mcu_r), FUNC(mil4000_state::chewheel_mcu_w)); map(0x70801f, 0x70801f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x780000, 0x780fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/miniframe.cpp b/src/mame/drivers/miniframe.cpp index 8d17dfb444e..163179ccf92 100644 --- a/src/mame/drivers/miniframe.cpp +++ b/src/mame/drivers/miniframe.cpp @@ -192,7 +192,7 @@ void miniframe_state::miniframe_mem(address_map &map) { map(0x000000, 0x3fffff).m(m_ramrombank, FUNC(address_map_bank_device::amap16)); map(0x400000, 0x4007ff).ram().share("mapram"); - map(0x450000, 0x450001).w(this, FUNC(miniframe_state::general_ctrl_w)); + map(0x450000, 0x450001).w(FUNC(miniframe_state::general_ctrl_w)); map(0x800000, 0x81ffff).rom().region("bootrom", 0); map(0xc00000, 0xc00007).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0xc40000, 0xc40007).rw("baudgen", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); @@ -202,7 +202,7 @@ void miniframe_state::miniframe_mem(address_map &map) void miniframe_state::ramrombank_map(address_map &map) { map(0x000000, 0x3fffff).rom().region("bootrom", 0); - map(0x400000, 0x7fffff).rw(this, FUNC(miniframe_state::ram_mmu_r), FUNC(miniframe_state::ram_mmu_w)); + map(0x400000, 0x7fffff).rw(FUNC(miniframe_state::ram_mmu_r), FUNC(miniframe_state::ram_mmu_w)); } /*************************************************************************** diff --git a/src/mame/drivers/minitel_2_rpic.cpp b/src/mame/drivers/minitel_2_rpic.cpp index 0ef60aca734..b0a2a814287 100644 --- a/src/mame/drivers/minitel_2_rpic.cpp +++ b/src/mame/drivers/minitel_2_rpic.cpp @@ -284,9 +284,9 @@ void minitel_state::mem_prg(address_map &map) void minitel_state::mem_io(address_map &map) { - map(0x2000, 0x3fff).rw(this, FUNC(minitel_state::dev_keyb_ser_r), FUNC(minitel_state::dev_crtl_reg_w)); + map(0x2000, 0x3fff).rw(FUNC(minitel_state::dev_keyb_ser_r), FUNC(minitel_state::dev_crtl_reg_w)); /* ts9347 */ - map(0x4000, 0x5ffF).rw(this, FUNC(minitel_state::ts9347_io_r), FUNC(minitel_state::ts9347_io_w)); + map(0x4000, 0x5ffF).rw(FUNC(minitel_state::ts9347_io_r), FUNC(minitel_state::ts9347_io_w)); } /* Input ports */ diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index 96b11738e82..54363339608 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -174,10 +174,10 @@ void miragemj_state::mirage_map(address_map &map) map(0x160000, 0x160001).nopw(); map(0x168000, 0x16800f).w(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_w)); map(0x16a000, 0x16a001).nopw(); - map(0x16c000, 0x16c001).w(this, FUNC(miragemj_state::okim1_rombank_w)); - map(0x16c002, 0x16c003).w(this, FUNC(miragemj_state::okim0_rombank_w)); - map(0x16c004, 0x16c005).w(this, FUNC(miragemj_state::mjmux_w)); - map(0x16c006, 0x16c007).r(this, FUNC(miragemj_state::mjmux_r)); + map(0x16c000, 0x16c001).w(FUNC(miragemj_state::okim1_rombank_w)); + map(0x16c002, 0x16c003).w(FUNC(miragemj_state::okim0_rombank_w)); + map(0x16c004, 0x16c005).w(FUNC(miragemj_state::mjmux_w)); + map(0x16c006, 0x16c007).r(FUNC(miragemj_state::mjmux_r)); map(0x16e000, 0x16e001).nopw(); map(0x16e002, 0x16e003).portr("SYSTEM_IN"); map(0x170000, 0x173fff).ram(); diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp index e61bea4ec94..9d7faf0cc4e 100644 --- a/src/mame/drivers/mirax.cpp +++ b/src/mame/drivers/mirax.cpp @@ -330,7 +330,7 @@ void mirax_state::mirax_main_map(address_map &map) map(0xf300, 0xf300).nopr(); //watchdog? value is always read then discarded map(0xf400, 0xf400).portr("DSW2"); map(0xf500, 0xf507).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xf800, 0xf800).w(this, FUNC(mirax_state::sound_cmd_w)); + map(0xf800, 0xf800).w(FUNC(mirax_state::sound_cmd_w)); // AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack? } @@ -342,13 +342,13 @@ void mirax_state::mirax_sound_map(address_map &map) map(0xe000, 0xe000).nopw(); map(0xe001, 0xe001).nopw(); - map(0xe003, 0xe003).w(this, FUNC(mirax_state::ay1_sel)); //1st ay ? + map(0xe003, 0xe003).w(FUNC(mirax_state::ay1_sel)); //1st ay ? map(0xe400, 0xe400).nopw(); map(0xe401, 0xe401).nopw(); - map(0xe403, 0xe403).w(this, FUNC(mirax_state::ay2_sel)); //2nd ay ? + map(0xe403, 0xe403).w(FUNC(mirax_state::ay2_sel)); //2nd ay ? - map(0xf900, 0xf9ff).w(this, FUNC(mirax_state::audio_w)); + map(0xf900, 0xf9ff).w(FUNC(mirax_state::audio_w)); } diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp index 3d6b1a6ed22..9b5a76615d5 100644 --- a/src/mame/drivers/missb2.cpp +++ b/src/mame/drivers/missb2.cpp @@ -188,10 +188,10 @@ void missb2_state::maincpu_map(address_map &map) map(0xe000, 0xf7ff).ram().share("share1"); map(0xf800, 0xf9ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xfa00, 0xfa00).mirror(0x007c).r(m_sound_to_main, FUNC(generic_latch_8_device::read)).w(m_main_to_sound, FUNC(generic_latch_8_device::write)); - map(0xfa01, 0xfa01).mirror(0x007c).r(this, FUNC(missb2_state::common_sound_semaphores_r)); - map(0xfa03, 0xfa03).mirror(0x007c).w(this, FUNC(missb2_state::bublbobl_soundcpu_reset_w)); + map(0xfa01, 0xfa01).mirror(0x007c).r(FUNC(missb2_state::common_sound_semaphores_r)); + map(0xfa03, 0xfa03).mirror(0x007c).w(FUNC(missb2_state::bublbobl_soundcpu_reset_w)); map(0xfa80, 0xfa80).mirror(0x007f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xfb40, 0xfb40).w(this, FUNC(missb2_state::bublbobl_bankswitch_w)); + map(0xfb40, 0xfb40).w(FUNC(missb2_state::bublbobl_bankswitch_w)); map(0xfc00, 0xfcff).ram(); map(0xfd00, 0xfdff).ram(); // ??? map(0xfe00, 0xfe03).ram(); // ??? @@ -212,7 +212,7 @@ void missb2_state::subcpu_map(address_map &map) map(0xb000, 0xb1ff).rom(); // banked ??? map(0xc000, 0xc1ff).ram().w(m_bgpalette, FUNC(palette_device::write8)).share("bgpalette"); map(0xc800, 0xcfff).ram(); // main ??? - map(0xd000, 0xd000).w(this, FUNC(missb2_state::missb2_bg_bank_w)); + map(0xd000, 0xd000).w(FUNC(missb2_state::missb2_bg_bank_w)); map(0xd002, 0xd002).nopw(); map(0xd003, 0xd003).ram().share("bgvram"); map(0xe000, 0xf7ff).ram().share("share1"); @@ -225,10 +225,10 @@ void missb2_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0x9000, 0x9000).rw(this, FUNC(missb2_state::missb2_oki_r), FUNC(missb2_state::missb2_oki_w)); //AM_MIRROR(0x0fff) ??? + map(0x9000, 0x9000).rw(FUNC(missb2_state::missb2_oki_r), FUNC(missb2_state::missb2_oki_w)); //AM_MIRROR(0x0fff) ??? map(0xa000, 0xa001).mirror(0x0ffe).rw("ymsnd", FUNC(ym3526_device::read), FUNC(ym3526_device::write)); map(0xb000, 0xb000).mirror(0x0ffc).r(m_main_to_sound, FUNC(generic_latch_8_device::read)).w(m_sound_to_main, FUNC(generic_latch_8_device::write)); - map(0xb001, 0xb001).mirror(0x0ffc).r(this, FUNC(missb2_state::common_sound_semaphores_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); + map(0xb001, 0xb001).mirror(0x0ffc).r(FUNC(missb2_state::common_sound_semaphores_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); map(0xb002, 0xb002).mirror(0x0ffc).w(m_soundnmi, FUNC(input_merger_device::in_clear<0>)); map(0xe000, 0xefff).rom(); // space for diagnostic ROM? } diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp index 0ff7a0f01d0..f1547cfe573 100644 --- a/src/mame/drivers/missile.cpp +++ b/src/mame/drivers/missile.cpp @@ -954,13 +954,13 @@ READ8_MEMBER(missile_state::bootleg_r) /* complete memory map derived from schematics (implemented above) */ void missile_state::main_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(missile_state::missile_r), FUNC(missile_state::missile_w)).share("videoram"); + map(0x0000, 0xffff).rw(FUNC(missile_state::missile_r), FUNC(missile_state::missile_w)).share("videoram"); } /* adjusted from the above to get the bootlegs to boot */ void missile_state::bootleg_main_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(missile_state::bootleg_r), FUNC(missile_state::bootleg_w)).share("videoram"); + map(0x0000, 0xffff).rw(FUNC(missile_state::bootleg_r), FUNC(missile_state::bootleg_w)).share("videoram"); } /************************************* diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 05dd1a796e3..fc10f1b7566 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -320,19 +320,19 @@ void mitchell_state::mgakuen_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8)); /* palette RAM */ - map(0xc800, 0xcfff).rw(this, FUNC(mitchell_state::pang_colorram_r), FUNC(mitchell_state::pang_colorram_w)).share("colorram"); /* Attribute RAM */ - map(0xd000, 0xdfff).rw(this, FUNC(mitchell_state::mgakuen_videoram_r), FUNC(mitchell_state::mgakuen_videoram_w)).share("videoram"); /* char RAM */ + map(0xc800, 0xcfff).rw(FUNC(mitchell_state::pang_colorram_r), FUNC(mitchell_state::pang_colorram_w)).share("colorram"); /* Attribute RAM */ + map(0xd000, 0xdfff).rw(FUNC(mitchell_state::mgakuen_videoram_r), FUNC(mitchell_state::mgakuen_videoram_w)).share("videoram"); /* char RAM */ map(0xe000, 0xefff).ram(); /* Work RAM */ - map(0xf000, 0xffff).rw(this, FUNC(mitchell_state::mgakuen_objram_r), FUNC(mitchell_state::mgakuen_objram_w)); /* OBJ RAM */ + map(0xf000, 0xffff).rw(FUNC(mitchell_state::mgakuen_objram_r), FUNC(mitchell_state::mgakuen_objram_w)); /* OBJ RAM */ } void mitchell_state::mitchell_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xc7ff).rw(this, FUNC(mitchell_state::pang_paletteram_r), FUNC(mitchell_state::pang_paletteram_w)); /* Banked palette RAM */ - map(0xc800, 0xcfff).rw(this, FUNC(mitchell_state::pang_colorram_r), FUNC(mitchell_state::pang_colorram_w)).share("colorram"); /* Attribute RAM */ - map(0xd000, 0xdfff).rw(this, FUNC(mitchell_state::pang_videoram_r), FUNC(mitchell_state::pang_videoram_w)).share("videoram");/* Banked char / OBJ RAM */ + map(0xc000, 0xc7ff).rw(FUNC(mitchell_state::pang_paletteram_r), FUNC(mitchell_state::pang_paletteram_w)); /* Banked palette RAM */ + map(0xc800, 0xcfff).rw(FUNC(mitchell_state::pang_colorram_r), FUNC(mitchell_state::pang_colorram_w)).share("colorram"); /* Attribute RAM */ + map(0xd000, 0xdfff).rw(FUNC(mitchell_state::pang_videoram_r), FUNC(mitchell_state::pang_videoram_w)).share("videoram");/* Banked char / OBJ RAM */ map(0xe000, 0xffff).ram().share("nvram"); /* Work RAM */ } @@ -346,18 +346,18 @@ void mitchell_state::decrypted_opcodes_map(address_map &map) void mitchell_state::mitchell_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(mitchell_state::pang_gfxctrl_w)); /* Palette bank, layer enable, coin counters, more */ - map(0x00, 0x02).r(this, FUNC(mitchell_state::input_r)); /* The Mahjong games and Block Block need special input treatment */ - map(0x01, 0x01).w(this, FUNC(mitchell_state::input_w)); - map(0x02, 0x02).w(this, FUNC(mitchell_state::pang_bankswitch_w)); /* Code bank register */ + map(0x00, 0x00).w(FUNC(mitchell_state::pang_gfxctrl_w)); /* Palette bank, layer enable, coin counters, more */ + map(0x00, 0x02).r(FUNC(mitchell_state::input_r)); /* The Mahjong games and Block Block need special input treatment */ + map(0x01, 0x01).w(FUNC(mitchell_state::input_w)); + map(0x02, 0x02).w(FUNC(mitchell_state::pang_bankswitch_w)); /* Code bank register */ map(0x03, 0x03).w("ymsnd", FUNC(ym2413_device::data_port_w)); map(0x04, 0x04).w("ymsnd", FUNC(ym2413_device::register_port_w)); - map(0x05, 0x05).r(this, FUNC(mitchell_state::pang_port5_r)).w(m_oki, FUNC(okim6295_device::write)); + map(0x05, 0x05).r(FUNC(mitchell_state::pang_port5_r)).w(m_oki, FUNC(okim6295_device::write)); map(0x06, 0x06).noprw(); /* watchdog? IRQ ack? video buffering? */ - map(0x07, 0x07).w(this, FUNC(mitchell_state::pang_video_bank_w)); /* Video RAM bank register */ - map(0x08, 0x08).w(this, FUNC(mitchell_state::eeprom_cs_w)); - map(0x10, 0x10).w(this, FUNC(mitchell_state::eeprom_clock_w)); - map(0x18, 0x18).w(this, FUNC(mitchell_state::eeprom_serial_w)); + map(0x07, 0x07).w(FUNC(mitchell_state::pang_video_bank_w)); /* Video RAM bank register */ + map(0x08, 0x08).w(FUNC(mitchell_state::eeprom_cs_w)); + map(0x10, 0x10).w(FUNC(mitchell_state::eeprom_clock_w)); + map(0x18, 0x18).w(FUNC(mitchell_state::eeprom_serial_w)); } /* spangbl */ @@ -365,25 +365,25 @@ void mitchell_state::spangbl_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1").nopw(); - map(0xc000, 0xc7ff).rw(this, FUNC(mitchell_state::pang_paletteram_r), FUNC(mitchell_state::pang_paletteram_w)); /* Banked palette RAM */ - map(0xc800, 0xcfff).rw(this, FUNC(mitchell_state::pang_colorram_r), FUNC(mitchell_state::pang_colorram_w)).share("colorram");/* Attribute RAM */ - map(0xd000, 0xdfff).rw(this, FUNC(mitchell_state::pang_videoram_r), FUNC(mitchell_state::pang_videoram_w)).share("videoram"); /* Banked char / OBJ RAM */ + map(0xc000, 0xc7ff).rw(FUNC(mitchell_state::pang_paletteram_r), FUNC(mitchell_state::pang_paletteram_w)); /* Banked palette RAM */ + map(0xc800, 0xcfff).rw(FUNC(mitchell_state::pang_colorram_r), FUNC(mitchell_state::pang_colorram_w)).share("colorram");/* Attribute RAM */ + map(0xd000, 0xdfff).rw(FUNC(mitchell_state::pang_videoram_r), FUNC(mitchell_state::pang_videoram_w)).share("videoram"); /* Banked char / OBJ RAM */ map(0xe000, 0xffff).ram().share("nvram"); /* Work RAM */ } void mitchell_state::spangbl_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x02).r(this, FUNC(mitchell_state::input_r)); - map(0x00, 0x00).w(this, FUNC(mitchell_state::pangbl_gfxctrl_w)); /* Palette bank, layer enable, coin counters, more */ - map(0x02, 0x02).w(this, FUNC(mitchell_state::pang_bankswitch_w)); /* Code bank register */ + map(0x00, 0x02).r(FUNC(mitchell_state::input_r)); + map(0x00, 0x00).w(FUNC(mitchell_state::pangbl_gfxctrl_w)); /* Palette bank, layer enable, coin counters, more */ + map(0x02, 0x02).w(FUNC(mitchell_state::pang_bankswitch_w)); /* Code bank register */ map(0x03, 0x03).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x05, 0x05).portr("SYS0"); map(0x06, 0x06).nopw(); /* watchdog? irq ack? */ - map(0x07, 0x07).w(this, FUNC(mitchell_state::pang_video_bank_w)); /* Video RAM bank register */ - map(0x08, 0x08).w(this, FUNC(mitchell_state::eeprom_cs_w)); - map(0x10, 0x10).w(this, FUNC(mitchell_state::eeprom_clock_w)); - map(0x18, 0x18).w(this, FUNC(mitchell_state::eeprom_serial_w)); + map(0x07, 0x07).w(FUNC(mitchell_state::pang_video_bank_w)); /* Video RAM bank register */ + map(0x08, 0x08).w(FUNC(mitchell_state::eeprom_cs_w)); + map(0x10, 0x10).w(FUNC(mitchell_state::eeprom_clock_w)); + map(0x18, 0x18).w(FUNC(mitchell_state::eeprom_serial_w)); } WRITE8_MEMBER(mitchell_state::sound_bankswitch_w) @@ -397,7 +397,7 @@ void mitchell_state::spangbl_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("soundbank"); - map(0xe000, 0xe000).w(this, FUNC(mitchell_state::sound_bankswitch_w)); + map(0xe000, 0xe000).w(FUNC(mitchell_state::sound_bankswitch_w)); map(0xe400, 0xe400).w(m_adpcm_select, FUNC(ls157_device::ba_w)); map(0xec00, 0xec01).w("ymsnd", FUNC(ym2413_device::write)); map(0xf000, 0xf4ff).ram(); @@ -408,7 +408,7 @@ void mitchell_state::pangba_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("soundbank"); - map(0xe000, 0xe000).w(this, FUNC(mitchell_state::sound_bankswitch_w)); + map(0xe000, 0xe000).w(FUNC(mitchell_state::sound_bankswitch_w)); map(0xe400, 0xe400).w(m_adpcm_select, FUNC(ls157_device::ba_w)); map(0xec00, 0xec01).w("ymsnd", FUNC(ym3812_device::write)); map(0xf000, 0xf4ff).ram(); @@ -426,7 +426,7 @@ void mitchell_state::mstworld_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(mitchell_state::oki_banking_w)); + map(0x9000, 0x9000).w(FUNC(mitchell_state::oki_banking_w)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -440,15 +440,15 @@ WRITE8_MEMBER(mitchell_state::mstworld_sound_w) void mitchell_state::mstworld_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w(this, FUNC(mitchell_state::mstworld_gfxctrl_w)); /* Palette bank, layer enable, coin counters, more */ + map(0x00, 0x00).portr("IN0").w(FUNC(mitchell_state::mstworld_gfxctrl_w)); /* Palette bank, layer enable, coin counters, more */ map(0x01, 0x01).portr("IN1"); - map(0x02, 0x02).portr("IN2").w(this, FUNC(mitchell_state::pang_bankswitch_w)); /* Code bank register */ - map(0x03, 0x03).portr("DSW0").w(this, FUNC(mitchell_state::mstworld_sound_w)); /* write to sound cpu */ + map(0x02, 0x02).portr("IN2").w(FUNC(mitchell_state::pang_bankswitch_w)); /* Code bank register */ + map(0x03, 0x03).portr("DSW0").w(FUNC(mitchell_state::mstworld_sound_w)); /* write to sound cpu */ map(0x04, 0x04).portr("DSW1"); /* dips? */ map(0x05, 0x05).portr("SYS0"); /* special? */ map(0x06, 0x06).portr("DSW2"); /* dips? */ map(0x06, 0x06).nopw(); /* watchdog? irq ack? */ - map(0x07, 0x07).w(this, FUNC(mitchell_state::mstworld_video_bank_w)); /* Video RAM bank register */ + map(0x07, 0x07).w(FUNC(mitchell_state::mstworld_video_bank_w)); /* Video RAM bank register */ } diff --git a/src/mame/drivers/mits680b.cpp b/src/mame/drivers/mits680b.cpp index 2e3fe33b7b5..4603000bd54 100644 --- a/src/mame/drivers/mits680b.cpp +++ b/src/mame/drivers/mits680b.cpp @@ -54,7 +54,7 @@ void mits680b_state::mem_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x03ff).ram(); // 1024 bytes RAM map(0xf000, 0xf001).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write)); - map(0xf002, 0xf002).r(this, FUNC(mits680b_state::status_check_r)); + map(0xf002, 0xf002).r(FUNC(mits680b_state::status_check_r)); map(0xff00, 0xffff).rom().region("roms", 0); } diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index fde45199a2f..85db83060b9 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -86,7 +86,7 @@ void mjkjidai_state::mjkjidai_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram(); map(0xd000, 0xdfff).ram().share("nvram"); // cleared and initialized on startup if bit 6 of port 00 is 0 - map(0xe000, 0xf7ff).ram().w(this, FUNC(mjkjidai_state::mjkjidai_videoram_w)).share("videoram"); + map(0xe000, 0xf7ff).ram().w(FUNC(mjkjidai_state::mjkjidai_videoram_w)).share("videoram"); } void mjkjidai_state::mjkjidai_io_map(address_map &map) @@ -94,9 +94,9 @@ void mjkjidai_state::mjkjidai_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x10, 0x13).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x20, 0x20).w("sn1", FUNC(sn76489_device::write)); - map(0x30, 0x30).w("sn2", FUNC(sn76489_device::write)); - map(0x40, 0x40).w(this, FUNC(mjkjidai_state::adpcm_w)); + map(0x20, 0x20).w("sn1", FUNC(sn76489_device::command_w)); + map(0x30, 0x30).w("sn2", FUNC(sn76489_device::command_w)); + map(0x40, 0x40).w(FUNC(mjkjidai_state::adpcm_w)); } diff --git a/src/mame/drivers/mjsenpu.cpp b/src/mame/drivers/mjsenpu.cpp index f1f22570a4c..9aac3d88309 100644 --- a/src/mame/drivers/mjsenpu.cpp +++ b/src/mame/drivers/mjsenpu.cpp @@ -219,10 +219,10 @@ void mjsenpu_state::mjsenpu_32bit_map(address_map &map) map(0x00000000, 0x001fffff).ram().share("mainram"); map(0x40000000, 0x401fffff).rom().region("user2", 0); // main game rom - map(0x80000000, 0x8001ffff).rw(this, FUNC(mjsenpu_state::vram_r), FUNC(mjsenpu_state::vram_w)); + map(0x80000000, 0x8001ffff).rw(FUNC(mjsenpu_state::vram_r), FUNC(mjsenpu_state::vram_w)); - map(0xffc00000, 0xffc000ff).rw(this, FUNC(mjsenpu_state::palette_low_r), FUNC(mjsenpu_state::palette_low_w)); - map(0xffd00000, 0xffd000ff).rw(this, FUNC(mjsenpu_state::palette_high_r), FUNC(mjsenpu_state::palette_high_w)); + map(0xffc00000, 0xffc000ff).rw(FUNC(mjsenpu_state::palette_low_r), FUNC(mjsenpu_state::palette_low_w)); + map(0xffd00000, 0xffd000ff).rw(FUNC(mjsenpu_state::palette_high_r), FUNC(mjsenpu_state::palette_high_w)); map(0xffe00000, 0xffe007ff).ram().share("nvram"); @@ -232,16 +232,16 @@ void mjsenpu_state::mjsenpu_32bit_map(address_map &map) void mjsenpu_state::mjsenpu_io(address_map &map) { - map(0x4000, 0x4003).r(this, FUNC(mjsenpu_state::muxed_inputs_r)); + map(0x4000, 0x4003).r(FUNC(mjsenpu_state::muxed_inputs_r)); map(0x4010, 0x4013).portr("IN1"); - map(0x4023, 0x4023).w(this, FUNC(mjsenpu_state::control_w)); + map(0x4023, 0x4023).w(FUNC(mjsenpu_state::control_w)); map(0x4030, 0x4033).portr("DSW1"); map(0x4040, 0x4043).portr("DSW2"); map(0x4050, 0x4053).portr("DSW3"); - map(0x4063, 0x4063).w(this, FUNC(mjsenpu_state::mux_w)); + map(0x4063, 0x4063).w(FUNC(mjsenpu_state::mux_w)); map(0x4073, 0x4073).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp index 1a4e5978b10..79662130629 100644 --- a/src/mame/drivers/mjsister.cpp +++ b/src/mame/drivers/mjsister.cpp @@ -320,7 +320,7 @@ void mjsister_state::mjsister_map(address_map &map) { map(0x0000, 0x77ff).rom(); map(0x7800, 0x7fff).ram(); - map(0x8000, 0xffff).bankr("bank1").w(this, FUNC(mjsister_state::videoram_w)); + map(0x8000, 0xffff).bankr("bank1").w(FUNC(mjsister_state::videoram_w)); } void mjsister_state::mjsister_io_map(address_map &map) @@ -330,14 +330,14 @@ void mjsister_state::mjsister_io_map(address_map &map) map(0x10, 0x10).w("aysnd", FUNC(ay8910_device::address_w)); map(0x11, 0x11).r("aysnd", FUNC(ay8910_device::data_r)); map(0x12, 0x12).w("aysnd", FUNC(ay8910_device::data_w)); - map(0x20, 0x20).r(this, FUNC(mjsister_state::keys_r)); + map(0x20, 0x20).r(FUNC(mjsister_state::keys_r)); map(0x21, 0x21).portr("IN0"); map(0x30, 0x30).w("mainlatch1", FUNC(ls259_device::write_nibble_d0)); map(0x31, 0x31).w("mainlatch2", FUNC(ls259_device::write_nibble_d0)); - map(0x32, 0x32).w(this, FUNC(mjsister_state::input_sel1_w)); - map(0x33, 0x33).w(this, FUNC(mjsister_state::input_sel2_w)); - map(0x34, 0x34).w(this, FUNC(mjsister_state::dac_adr_s_w)); - map(0x35, 0x35).w(this, FUNC(mjsister_state::dac_adr_e_w)); + map(0x32, 0x32).w(FUNC(mjsister_state::input_sel1_w)); + map(0x33, 0x33).w(FUNC(mjsister_state::input_sel2_w)); + map(0x34, 0x34).w(FUNC(mjsister_state::dac_adr_s_w)); + map(0x35, 0x35).w(FUNC(mjsister_state::dac_adr_e_w)); } diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp index bf4b0d3b264..343717931a9 100644 --- a/src/mame/drivers/mk1.cpp +++ b/src/mame/drivers/mk1.cpp @@ -126,7 +126,7 @@ void mk1_state::mk1_mem(address_map &map) void mk1_state::mk1_io(address_map &map) { - map(0x0, 0x1).rw(this, FUNC(mk1_state::mk1_f8_r), FUNC(mk1_state::mk1_f8_w)); + map(0x0, 0x1).rw(FUNC(mk1_state::mk1_f8_r), FUNC(mk1_state::mk1_f8_w)); map(0xc, 0xf).rw("f3853", FUNC(f3853_device::read), FUNC(f3853_device::write)); } diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp index 0de79bd1fd8..bfdc58b31e1 100644 --- a/src/mame/drivers/mk14.cpp +++ b/src/mame/drivers/mk14.cpp @@ -117,7 +117,7 @@ void mk14_state::mem_map(address_map &map) map(0x000, 0x1ff).mirror(0x600).rom(); // ROM map(0x800, 0x87f).mirror(0x600).rw("ic8", FUNC(ins8154_device::ins8154_r), FUNC(ins8154_device::ins8154_w)); // I/O map(0x880, 0x8ff).mirror(0x600).ram(); // 128 I/O chip RAM - map(0x900, 0x9ff).mirror(0x400).rw(this, FUNC(mk14_state::keyboard_r), FUNC(mk14_state::display_w)); + map(0x900, 0x9ff).mirror(0x400).rw(FUNC(mk14_state::keyboard_r), FUNC(mk14_state::display_w)); map(0xb00, 0xbff).ram(); // VDU RAM map(0xf00, 0xfff).ram(); // Standard RAM } @@ -221,7 +221,7 @@ MACHINE_CONFIG_START(mk14_state::mk14) /* devices */ MCFG_DEVICE_ADD("ic8", INS8154, 0) MCFG_INS8154_OUT_A_CB(WRITE8(*this, mk14_state, port_a_w)) - MCFG_INS8154_OUT_B_CB(WRITE8("dac8", dac_byte_interface, write)) + MCFG_INS8154_OUT_B_CB(WRITE8("dac8", dac_byte_interface, data_w)) MCFG_CASSETTE_ADD( "cassette" ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index e0beebac57e..ce82ac4617b 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -724,21 +724,21 @@ void mlanding_state::main_map(address_map &map) map(0x180000, 0x1bffff).ram().share("cha_ram"); map(0x1c0000, 0x1c3fff).bankrw("dma_ram"); map(0x1c4000, 0x1cffff).ram().share("sub_com_ram"); - map(0x1d0000, 0x1d0001).w(this, FUNC(mlanding_state::dma_start_w)); - map(0x1d0002, 0x1d0003).w(this, FUNC(mlanding_state::dma_stop_w)); + map(0x1d0000, 0x1d0001).w(FUNC(mlanding_state::dma_start_w)); + map(0x1d0002, 0x1d0003).w(FUNC(mlanding_state::dma_stop_w)); map(0x200000, 0x20ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x240004, 0x240005).nopr(); // Watchdog - map(0x240006, 0x240007).r(this, FUNC(mlanding_state::input_r)); - map(0x280000, 0x280fff).rw(this, FUNC(mlanding_state::power_ram_r), FUNC(mlanding_state::power_ram_w)); + map(0x240006, 0x240007).r(FUNC(mlanding_state::input_r)); + map(0x280000, 0x280fff).rw(FUNC(mlanding_state::power_ram_r), FUNC(mlanding_state::power_ram_w)); map(0x290000, 0x290001).portr("IN1"); map(0x290002, 0x290003).portr("IN0"); - map(0x2a0000, 0x2a0001).w(this, FUNC(mlanding_state::output_w)); - map(0x2b0000, 0x2b0001).r(this, FUNC(mlanding_state::analog1_msb_r)); - map(0x2b0002, 0x2b0003).r(this, FUNC(mlanding_state::analog1_lsb_r)); - map(0x2b0004, 0x2b0005).r(this, FUNC(mlanding_state::analog2_msb_r)); - map(0x2b0006, 0x2b0007).r(this, FUNC(mlanding_state::analog2_lsb_r)); - map(0x2c0000, 0x2c0001).r(this, FUNC(mlanding_state::analog3_msb_r)); - map(0x2c0002, 0x2c0003).r(this, FUNC(mlanding_state::analog3_lsb_r)); + map(0x2a0000, 0x2a0001).w(FUNC(mlanding_state::output_w)); + map(0x2b0000, 0x2b0001).r(FUNC(mlanding_state::analog1_msb_r)); + map(0x2b0002, 0x2b0003).r(FUNC(mlanding_state::analog1_lsb_r)); + map(0x2b0004, 0x2b0005).r(FUNC(mlanding_state::analog2_msb_r)); + map(0x2b0006, 0x2b0007).r(FUNC(mlanding_state::analog2_lsb_r)); + map(0x2c0000, 0x2c0001).r(FUNC(mlanding_state::analog3_msb_r)); + map(0x2c0002, 0x2c0003).r(FUNC(mlanding_state::analog3_lsb_r)); map(0x2d0000, 0x2d0001).nopr(); map(0x2d0001, 0x2d0001).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0x2d0003, 0x2d0003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); @@ -757,7 +757,7 @@ void mlanding_state::sub_map(address_map &map) map(0x000000, 0x01ffff).rom(); map(0x040000, 0x043fff).ram(); map(0x050000, 0x0503ff).ram().share("dsp_prog"); - map(0x060000, 0x060001).w(this, FUNC(mlanding_state::dsp_control_w)); + map(0x060000, 0x060001).w(FUNC(mlanding_state::dsp_control_w)); map(0x1c0000, 0x1c3fff).bankrw("dma_ram"); map(0x1c4000, 0x1cffff).ram().share("sub_com_ram"); map(0x200000, 0x2007ff).ram(); @@ -795,12 +795,12 @@ void mlanding_state::audio_map_prog(address_map &map) map(0x9000, 0x9001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xa000, 0xa000).w("ciu", FUNC(pc060ha_device::slave_port_w)); map(0xa001, 0xa001).rw("ciu", FUNC(pc060ha_device::slave_comm_r), FUNC(pc060ha_device::slave_comm_w)); - map(0xb000, 0xb000).w(this, FUNC(mlanding_state::msm5205_2_start_w)); - map(0xc000, 0xc000).w(this, FUNC(mlanding_state::msm5205_2_stop_w)); - map(0xd000, 0xd000).w(this, FUNC(mlanding_state::msm5205_1_start_w)); - map(0xe000, 0xe000).w(this, FUNC(mlanding_state::msm5205_1_stop_w)); - map(0xf000, 0xf000).w(this, FUNC(mlanding_state::msm5205_1_addr_lo_w)); - map(0xf200, 0xf200).w(this, FUNC(mlanding_state::msm5205_1_addr_hi_w)); + map(0xb000, 0xb000).w(FUNC(mlanding_state::msm5205_2_start_w)); + map(0xc000, 0xc000).w(FUNC(mlanding_state::msm5205_2_stop_w)); + map(0xd000, 0xd000).w(FUNC(mlanding_state::msm5205_1_start_w)); + map(0xe000, 0xe000).w(FUNC(mlanding_state::msm5205_1_stop_w)); + map(0xf000, 0xf000).w(FUNC(mlanding_state::msm5205_1_addr_lo_w)); + map(0xf200, 0xf200).w(FUNC(mlanding_state::msm5205_1_addr_hi_w)); map(0xf400, 0xf400).nopw(); map(0xf600, 0xf600).nopw(); // MSM5205 2 volume? map(0xf800, 0xf800).nopw(); @@ -827,7 +827,7 @@ void mlanding_state::mecha_map_prog(address_map &map) map(0x8000, 0x87ff).ram(); map(0x8800, 0x8fff).ram().share("power_ram"); map(0x9000, 0x9003).nopw(); - map(0x9800, 0x9805).r(this, FUNC(mlanding_state::motor_r)); + map(0x9800, 0x9805).r(FUNC(mlanding_state::motor_r)); } diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp index 493b36e2d25..33f17effbb8 100644 --- a/src/mame/drivers/mmagic.cpp +++ b/src/mame/drivers/mmagic.cpp @@ -123,16 +123,16 @@ void mmagic_state::mmagic_mem(address_map &map) map(0x0000, 0x17ff).rom(); map(0x2000, 0x21ff).ram(); map(0x3000, 0x31ff).ram().share("vram"); - map(0x8002, 0x8002).w(this, FUNC(mmagic_state::ball_x_w)); - map(0x8003, 0x8003).w(this, FUNC(mmagic_state::ball_y_w)); - map(0x8004, 0x8004).r(this, FUNC(mmagic_state::vblank_r)); + map(0x8002, 0x8002).w(FUNC(mmagic_state::ball_x_w)); + map(0x8003, 0x8003).w(FUNC(mmagic_state::ball_y_w)); + map(0x8004, 0x8004).r(FUNC(mmagic_state::vblank_r)); } void mmagic_state::mmagic_io(address_map &map) { map.global_mask(0xff); - map(0x80, 0x80).w(this, FUNC(mmagic_state::color_w)); - map(0x81, 0x81).w(this, FUNC(mmagic_state::audio_w)); + map(0x80, 0x80).w(FUNC(mmagic_state::color_w)); + map(0x81, 0x81).w(FUNC(mmagic_state::audio_w)); map(0x85, 0x85).portr("paddle"); map(0x86, 0x86).portr("buttons"); map(0x87, 0x87).portr("dipswitch"); diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp index 772a2835f87..50eb5e3427b 100644 --- a/src/mame/drivers/mmd1.cpp +++ b/src/mame/drivers/mmd1.cpp @@ -268,9 +268,9 @@ void mmd1_state::mmd1_io(address_map &map) { map.unmap_value_high(); map.global_mask(0x07); - map(0x00, 0x00).rw(this, FUNC(mmd1_state::mmd1_keyboard_r), FUNC(mmd1_state::mmd1_port0_w)); - map(0x01, 0x01).w(this, FUNC(mmd1_state::mmd1_port1_w)); - map(0x02, 0x02).w(this, FUNC(mmd1_state::mmd1_port2_w)); + map(0x00, 0x00).rw(FUNC(mmd1_state::mmd1_keyboard_r), FUNC(mmd1_state::mmd1_port0_w)); + map(0x01, 0x01).w(FUNC(mmd1_state::mmd1_port1_w)); + map(0x02, 0x02).w(FUNC(mmd1_state::mmd1_port2_w)); } void mmd1_state::mmd2_mem(address_map &map) @@ -286,12 +286,12 @@ void mmd1_state::mmd2_mem(address_map &map) void mmd1_state::mmd2_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x00).w(this, FUNC(mmd1_state::mmd1_port0_w)); - map(0x01, 0x01).rw(this, FUNC(mmd1_state::mmd2_01_r), FUNC(mmd1_state::mmd1_port1_w)); - map(0x02, 0x02).w(this, FUNC(mmd1_state::mmd1_port2_w)); + map(0x00, 0x00).w(FUNC(mmd1_state::mmd1_port0_w)); + map(0x01, 0x01).rw(FUNC(mmd1_state::mmd2_01_r), FUNC(mmd1_state::mmd1_port1_w)); + map(0x02, 0x02).w(FUNC(mmd1_state::mmd1_port2_w)); map(0x03, 0x03).rw("i8279", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w)); map(0x04, 0x04).rw("i8279", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w)); - map(0x05, 0x07).r(this, FUNC(mmd1_state::mmd2_bank_r)); + map(0x05, 0x07).r(FUNC(mmd1_state::mmd2_bank_r)); } diff --git a/src/mame/drivers/mmm.cpp b/src/mame/drivers/mmm.cpp index f7a53ee7099..d25e08d0672 100644 --- a/src/mame/drivers/mmm.cpp +++ b/src/mame/drivers/mmm.cpp @@ -66,7 +66,7 @@ void mmm_state::mem_map(address_map &map) void mmm_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(mmm_state::strobe_w)); + map(0x00, 0x00).w(FUNC(mmm_state::strobe_w)); map(0x03, 0x03).w("aysnd", FUNC(ay8910_device::address_w)); map(0x04, 0x04).w("aysnd", FUNC(ay8910_device::data_w)); map(0x05, 0x05).r("aysnd", FUNC(ay8910_device::data_r)); @@ -77,7 +77,7 @@ void mmm_state::io_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_ctc->write(space, offset >> 4, data, mem_mask); }); - map(0x07, 0x07).r(this, FUNC(mmm_state::inputs_r)); + map(0x07, 0x07).r(FUNC(mmm_state::inputs_r)); } diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp index 7a5e7225755..ecdf3952988 100644 --- a/src/mame/drivers/mmodular.cpp +++ b/src/mame/drivers/mmodular.cpp @@ -176,7 +176,7 @@ void berlinp_state::berlinp_mem(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x800000, 0x800000).r(this, FUNC(berlinp_state::berlinp_input_r)); + map(0x800000, 0x800000).r(FUNC(berlinp_state::berlinp_input_r)); map(0x900000, 0x900000).w(m_board, FUNC(mephisto_board_device::mux_w)); map(0xa00000, 0xa00000).w(m_board, FUNC(mephisto_board_device::led_w)); map(0xb00000, 0xb00000).w("display", FUNC(mephisto_display_modul_device::io_w)); diff --git a/src/mame/drivers/mod8.cpp b/src/mame/drivers/mod8.cpp index 66c1293ad94..eca0786b664 100644 --- a/src/mame/drivers/mod8.cpp +++ b/src/mame/drivers/mod8.cpp @@ -121,9 +121,9 @@ void mod8_state::mod8_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(mod8_state::tty_r)); - map(0x0a, 0x0a).w(this, FUNC(mod8_state::out_w)); - map(0x0b, 0x0b).w(this, FUNC(mod8_state::tty_w)); + map(0x00, 0x00).r(FUNC(mod8_state::tty_r)); + map(0x0a, 0x0a).w(FUNC(mod8_state::out_w)); + map(0x0b, 0x0b).w(FUNC(mod8_state::tty_w)); } /* Input ports */ diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp index fe88e425d4a..576811ad7d4 100644 --- a/src/mame/drivers/model1.cpp +++ b/src/mame/drivers/model1.cpp @@ -919,12 +919,12 @@ void model1_state::model1_mem(address_map &map) map(0x100000, 0x1fffff).bankr("bank1"); map(0x200000, 0x2fffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(model1_state::mr2_w)).share("mr2"); - map(0x500000, 0x53ffff).ram().w(this, FUNC(model1_state::mr_w)).share("mr"); + map(0x400000, 0x40ffff).ram().w(FUNC(model1_state::mr2_w)).share("mr2"); + map(0x500000, 0x53ffff).ram().w(FUNC(model1_state::mr_w)).share("mr"); - map(0x600000, 0x60ffff).ram().w(this, FUNC(model1_state::md0_w)).share("display_list0"); - map(0x610000, 0x61ffff).ram().w(this, FUNC(model1_state::md1_w)).share("display_list1"); - map(0x680000, 0x680003).rw(this, FUNC(model1_state::model1_listctl_r), FUNC(model1_state::model1_listctl_w)); + map(0x600000, 0x60ffff).ram().w(FUNC(model1_state::md0_w)).share("display_list0"); + map(0x610000, 0x61ffff).ram().w(FUNC(model1_state::md1_w)).share("display_list1"); + map(0x680000, 0x680003).rw(FUNC(model1_state::model1_listctl_r), FUNC(model1_state::model1_listctl_w)); map(0x700000, 0x70ffff).rw(m_tiles, FUNC(segas24_tile_device::tile_r), FUNC(segas24_tile_device::tile_w)); map(0x720000, 0x720001).nopw(); // Unknown, always 0 @@ -933,21 +933,21 @@ void model1_state::model1_mem(address_map &map) map(0x770000, 0x770001).nopw(); // Video synchronization switch map(0x780000, 0x7fffff).rw(m_tiles, FUNC(segas24_tile_device::char_r), FUNC(segas24_tile_device::char_w)); - map(0x900000, 0x903fff).ram().w(this, FUNC(model1_state::p_w)).share("palette"); + map(0x900000, 0x903fff).ram().w(FUNC(model1_state::p_w)).share("palette"); map(0x910000, 0x91bfff).ram().share("color_xlat"); - map(0xc00000, 0xc00fff).r(this, FUNC(model1_state::dpram_r)).w(m_dpram, FUNC(mb8421_device::right_w)).umask16(0x00ff); // 2k*8-bit dual port ram + map(0xc00000, 0xc00fff).r(FUNC(model1_state::dpram_r)).w(m_dpram, FUNC(mb8421_device::right_w)).umask16(0x00ff); // 2k*8-bit dual port ram map(0xc40000, 0xc40000).rw(m_m1uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xc40002, 0xc40002).rw(m_m1uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0xd00000, 0xd00001).rw(this, FUNC(model1_state::v60_copro_ram_adr_r), FUNC(model1_state::v60_copro_ram_adr_w)); - map(0xd20000, 0xd20003).w(this, FUNC(model1_state::v60_copro_ram_w)); - map(0xd80000, 0xd80003).w(this, FUNC(model1_state::v60_copro_fifo_w)).mirror(0x10); - map(0xdc0000, 0xdc0003).r(this, FUNC(model1_state::fifoin_status_r)); + map(0xd00000, 0xd00001).rw(FUNC(model1_state::v60_copro_ram_adr_r), FUNC(model1_state::v60_copro_ram_adr_w)); + map(0xd20000, 0xd20003).w(FUNC(model1_state::v60_copro_ram_w)); + map(0xd80000, 0xd80003).w(FUNC(model1_state::v60_copro_fifo_w)).mirror(0x10); + map(0xdc0000, 0xdc0003).r(FUNC(model1_state::fifoin_status_r)); - map(0xe00000, 0xe00000).w(this, FUNC(model1_state::irq_control_w)); - map(0xe00004, 0xe00005).w(this, FUNC(model1_state::bank_w)); + map(0xe00000, 0xe00000).w(FUNC(model1_state::irq_control_w)); + map(0xe00004, 0xe00005).w(FUNC(model1_state::bank_w)); map(0xe0000c, 0xe0000f).nopw(); map(0xf80000, 0xffffff).rom(); @@ -955,8 +955,8 @@ void model1_state::model1_mem(address_map &map) void model1_state::model1_io(address_map &map) { - map(0xd20000, 0xd20003).r(this, FUNC(model1_state::v60_copro_ram_r)); - map(0xd80000, 0xd80003).r(this, FUNC(model1_state::v60_copro_fifo_r)); + map(0xd20000, 0xd20003).r(FUNC(model1_state::v60_copro_ram_r)); + map(0xd80000, 0xd80003).r(FUNC(model1_state::v60_copro_fifo_r)); } void model1_state::model1_comm_mem(address_map &map) diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index ac63d020273..990fb90579b 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -444,12 +444,12 @@ void model2_tgp_state::copro_tgp_data_map(address_map &map) void model2_tgp_state::copro_tgp_bank_map(address_map &map) { - map(0x00020, 0x00023).rw(this, FUNC(model2_tgp_state::copro_sincos_r), FUNC(model2_tgp_state::copro_sincos_w)); - map(0x00024, 0x00027).rw(this, FUNC(model2_tgp_state::copro_atan_r), FUNC(model2_tgp_state::copro_atan_w)); - map(0x00028, 0x00029).rw(this, FUNC(model2_tgp_state::copro_inv_r), FUNC(model2_tgp_state::copro_inv_w)); - map(0x0002a, 0x0002b).rw(this, FUNC(model2_tgp_state::copro_isqrt_r), FUNC(model2_tgp_state::copro_isqrt_w)); + map(0x00020, 0x00023).rw(FUNC(model2_tgp_state::copro_sincos_r), FUNC(model2_tgp_state::copro_sincos_w)); + map(0x00024, 0x00027).rw(FUNC(model2_tgp_state::copro_atan_r), FUNC(model2_tgp_state::copro_atan_w)); + map(0x00028, 0x00029).rw(FUNC(model2_tgp_state::copro_inv_r), FUNC(model2_tgp_state::copro_inv_w)); + map(0x0002a, 0x0002b).rw(FUNC(model2_tgp_state::copro_isqrt_r), FUNC(model2_tgp_state::copro_isqrt_w)); - map(0x10000, 0x1ffff).rw(this, FUNC(model2_tgp_state::copro_tgp_memory_r), FUNC(model2_tgp_state::copro_tgp_memory_w)); + map(0x10000, 0x1ffff).rw(FUNC(model2_tgp_state::copro_tgp_memory_r), FUNC(model2_tgp_state::copro_tgp_memory_w)); } void model2_tgp_state::copro_tgp_io_map(address_map &map) @@ -462,7 +462,7 @@ void model2_tgp_state::copro_tgp_rf_map(address_map &map) map(0x0, 0x0).nopw(); // leds? busy flag? map(0x1, 0x1).r(m_copro_fifo_in, FUNC(generic_fifo_u32_device::read)); map(0x2, 0x2).w(m_copro_fifo_out, FUNC(generic_fifo_u32_device::write)); - map(0x3, 0x3).w(this, FUNC(model2_tgp_state::copro_tgp_bank_w)); + map(0x3, 0x3).w(FUNC(model2_tgp_state::copro_tgp_bank_w)); } READ32_MEMBER(model2_tgp_state::copro_tgp_memory_r) @@ -635,7 +635,7 @@ void model2b_state::copro_sharc_map(address_map &map) { map(0x0400000, 0x0bfffff).r(m_copro_fifo_in, FUNC(generic_fifo_u32_device::read)); map(0x0c00000, 0x13fffff).w(m_copro_fifo_out, FUNC(generic_fifo_u32_device::write)); - map(0x1400000, 0x1bfffff).rw(this, FUNC(model2b_state::copro_sharc_buffer_r), FUNC(model2b_state::copro_sharc_buffer_w)); + map(0x1400000, 0x1bfffff).rw(FUNC(model2b_state::copro_sharc_buffer_r), FUNC(model2b_state::copro_sharc_buffer_w)); map(0x1c00000, 0x1dfffff).rom().region("copro_data", 0); } @@ -1121,7 +1121,7 @@ void model2_state::model2_base_mem(address_map &map) map(0x00500000, 0x005fffff).ram().share("workram"); - map(0x00800000, 0x00803fff).rw(this, FUNC(model2_state::geo_r), FUNC(model2_state::geo_w)); + map(0x00800000, 0x00803fff).rw(FUNC(model2_state::geo_r), FUNC(model2_state::geo_w)); //AM_RANGE(0x00800010, 0x00800013) AM_WRITENOP //AM_RANGE(0x008000b0, 0x008000b3) AM_WRITENOP //AM_RANGE(0x00804004, 0x0080400f) AM_WRITENOP // quiet psikyo games @@ -1130,15 +1130,15 @@ void model2_state::model2_base_mem(address_map &map) map(0x00900000, 0x0091ffff).mirror(0x60000).ram().share("bufferram"); - map(0x00980004, 0x00980007).r(this, FUNC(model2_state::fifo_control_2a_r)); - map(0x0098000c, 0x0098000f).rw(this, FUNC(model2_state::videoctl_r), FUNC(model2_state::videoctl_w)); - map(0x00980030, 0x0098003f).r(this, FUNC(model2_state::tgpid_r)); + map(0x00980004, 0x00980007).r(FUNC(model2_state::fifo_control_2a_r)); + map(0x0098000c, 0x0098000f).rw(FUNC(model2_state::videoctl_r), FUNC(model2_state::videoctl_w)); + map(0x00980030, 0x0098003f).r(FUNC(model2_state::tgpid_r)); map(0x00e00000, 0x00e00037).ram(); // CPU control (wait-states) - map(0x00e80000, 0x00e80003).rw(this, FUNC(model2_state::irq_request_r), FUNC(model2_state::irq_ack_w)); - map(0x00e80004, 0x00e80007).rw(this, FUNC(model2_state::irq_enable_r), FUNC(model2_state::irq_enable_w)); + map(0x00e80000, 0x00e80003).rw(FUNC(model2_state::irq_request_r), FUNC(model2_state::irq_ack_w)); + map(0x00e80004, 0x00e80007).rw(FUNC(model2_state::irq_enable_r), FUNC(model2_state::irq_enable_w)); - map(0x00f00000, 0x00f0000f).rw(this, FUNC(model2_state::timers_r), FUNC(model2_state::timers_w)); + map(0x00f00000, 0x00f0000f).rw(FUNC(model2_state::timers_r), FUNC(model2_state::timers_w)); map(0x01000000, 0x0100ffff).rw("tile", FUNC(segas24_tile_device::tile_r), FUNC(segas24_tile_device::tile_w)).mirror(0x110000); map(0x01020000, 0x01020003).nopw().mirror(0x100000); // ABSEL, always 0 @@ -1147,9 +1147,9 @@ void model2_state::model2_base_mem(address_map &map) map(0x01070000, 0x01070003).nopw().mirror(0x100000); // Video synchronization switch map(0x01080000, 0x010fffff).rw("tile", FUNC(segas24_tile_device::char_r), FUNC(segas24_tile_device::char_w)).mirror(0x100000); - map(0x01800000, 0x01803fff).rw(this, FUNC(model2_state::palette_r), FUNC(model2_state::palette_w)); - map(0x01810000, 0x0181bfff).rw(this, FUNC(model2_state::colorxlat_r), FUNC(model2_state::colorxlat_w)); - map(0x0181c000, 0x0181c003).w(this, FUNC(model2_state::model2_3d_zclip_w)); + map(0x01800000, 0x01803fff).rw(FUNC(model2_state::palette_r), FUNC(model2_state::palette_w)); + map(0x01810000, 0x0181bfff).rw(FUNC(model2_state::colorxlat_r), FUNC(model2_state::colorxlat_w)); + map(0x0181c000, 0x0181c003).w(FUNC(model2_state::model2_3d_zclip_w)); map(0x01a10000, 0x01a13fff).rw(m_m2comm, FUNC(m2comm_device::share_r), FUNC(m2comm_device::share_w)); map(0x01a14000, 0x01a14000).rw(m_m2comm, FUNC(m2comm_device::cn_r), FUNC(m2comm_device::cn_w)); map(0x01a14002, 0x01a14002).rw(m_m2comm, FUNC(m2comm_device::fg_r), FUNC(m2comm_device::fg_w)); @@ -1159,19 +1159,19 @@ void model2_state::model2_base_mem(address_map &map) // "extra" data map(0x06000000, 0x06ffffff).rom().region("main_data", 0x1000000); - map(0x10000000, 0x101fffff).rw(this, FUNC(model2_state::render_mode_r), FUNC(model2_state::render_mode_w)); + map(0x10000000, 0x101fffff).rw(FUNC(model2_state::render_mode_r), FUNC(model2_state::render_mode_w)); // AM_RANGE(0x10200000, 0x103fffff) renderer status register - map(0x10400000, 0x105fffff).r(this, FUNC(model2_state::polygon_count_r)); + map(0x10400000, 0x105fffff).r(FUNC(model2_state::polygon_count_r)); // AM_RANGE(0x10600000, 0x107fffff) polygon data ping // AM_RANGE(0x10800000, 0x109fffff) polygon data pong // AM_RANGE(0x10a00000, 0x10bfffff) fill memory ping // AM_RANGE(0x10c00000, 0x10dfffff) fill memory pong // format is xGGGGGRRRRRBBBBB (512x400) - map(0x11600000, 0x1167ffff).rw(this, FUNC(model2_state::fbvram_bankA_r), FUNC(model2_state::fbvram_bankA_w)); // framebuffer A (last bronx title screen) - map(0x11680000, 0x116fffff).rw(this, FUNC(model2_state::fbvram_bankB_r), FUNC(model2_state::fbvram_bankB_w)); // framebuffer B + map(0x11600000, 0x1167ffff).rw(FUNC(model2_state::fbvram_bankA_r), FUNC(model2_state::fbvram_bankA_w)); // framebuffer A (last bronx title screen) + map(0x11680000, 0x116fffff).rw(FUNC(model2_state::fbvram_bankB_r), FUNC(model2_state::fbvram_bankB_w)); // framebuffer B - map(0x12800000, 0x1281ffff).rw(this, FUNC(model2_state::lumaram_r), FUNC(model2_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM + map(0x12800000, 0x1281ffff).rw(FUNC(model2_state::lumaram_r), FUNC(model2_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM } /* common map for 5881 protection */ @@ -1300,16 +1300,16 @@ void model2_tgp_state::model2_tgp_mem(address_map &map) { model2_base_mem(map); - map(0x00804000, 0x00807fff).rw(this, FUNC(model2_tgp_state::geo_prg_r), FUNC(model2_tgp_state::geo_prg_w)); - map(0x00880000, 0x00883fff).w(this, FUNC(model2_tgp_state::copro_function_port_w)); - map(0x00884000, 0x00887fff).rw(this, FUNC(model2_tgp_state::copro_fifo_r), FUNC(model2_tgp_state::copro_fifo_w)); + map(0x00804000, 0x00807fff).rw(FUNC(model2_tgp_state::geo_prg_r), FUNC(model2_tgp_state::geo_prg_w)); + map(0x00880000, 0x00883fff).w(FUNC(model2_tgp_state::copro_function_port_w)); + map(0x00884000, 0x00887fff).rw(FUNC(model2_tgp_state::copro_fifo_r), FUNC(model2_tgp_state::copro_fifo_w)); - map(0x00980000, 0x00980003).rw(this, FUNC(model2_tgp_state::copro_ctl1_r), FUNC(model2_tgp_state::copro_ctl1_w)); - map(0x00980008, 0x0098000b).w(this, FUNC(model2_tgp_state::geo_ctl1_w)); - map(0x009c0000, 0x009cffff).rw(this, FUNC(model2_tgp_state::model2_serial_r), FUNC(model2_tgp_state::model2_serial_w)); + map(0x00980000, 0x00980003).rw(FUNC(model2_tgp_state::copro_ctl1_r), FUNC(model2_tgp_state::copro_ctl1_w)); + map(0x00980008, 0x0098000b).w(FUNC(model2_tgp_state::geo_ctl1_w)); + map(0x009c0000, 0x009cffff).rw(FUNC(model2_tgp_state::model2_serial_r), FUNC(model2_tgp_state::model2_serial_w)); - map(0x12000000, 0x121fffff).ram().w(this, FUNC(model2o_state::tex0_w)).mirror(0x200000).share("textureram0"); // texture RAM 0 - map(0x12400000, 0x125fffff).ram().w(this, FUNC(model2o_state::tex1_w)).mirror(0x200000).share("textureram1"); // texture RAM 1 + map(0x12000000, 0x121fffff).ram().w(FUNC(model2o_state::tex0_w)).mirror(0x200000).share("textureram0"); // texture RAM 0 + map(0x12400000, 0x125fffff).ram().w(FUNC(model2o_state::tex1_w)).mirror(0x200000).share("textureram1"); // texture RAM 1 } /* original Model 2 overrides */ @@ -1319,9 +1319,9 @@ void model2o_state::model2o_mem(address_map &map) map(0x00200000, 0x0021ffff).ram(); map(0x00220000, 0x0023ffff).rom().region("maincpu", 0x20000); - map(0x00980004, 0x00980007).r(this, FUNC(model2o_state::fifo_control_2o_r)); + map(0x00980004, 0x00980007).r(FUNC(model2o_state::fifo_control_2o_r)); map(0x01c00000, 0x01c00fff).rw("dpram", FUNC(mb8421_device::right_r), FUNC(mb8421_device::right_w)).umask32(0x00ff00ff); // 2k*8-bit dual port ram - map(0x01c80000, 0x01c80003).rw(this, FUNC(model2o_state::model2_serial_r), FUNC(model2o_state::model2_serial_w)); + map(0x01c80000, 0x01c80003).rw(FUNC(model2o_state::model2_serial_r), FUNC(model2o_state::model2_serial_w)); } /* Daytona "To The MAXX" PIC protection simulation */ @@ -1369,7 +1369,7 @@ READ32_MEMBER(model2o_maxx_state::maxx_r) void model2o_maxx_state::model2o_maxx_mem(address_map &map) { model2o_mem(map); - map(0x00240000, 0x0024ffff).r(this, FUNC(model2o_maxx_state::maxx_r)); + map(0x00240000, 0x0024ffff).r(FUNC(model2o_maxx_state::maxx_r)); } READ8_MEMBER(model2o_gtx_state::gtx_r) @@ -1389,7 +1389,7 @@ READ8_MEMBER(model2o_gtx_state::gtx_r) void model2o_gtx_state::model2o_gtx_mem(address_map &map) { model2o_mem(map); - map(0x02c00000,0x02cfffff).r(this, FUNC(model2o_gtx_state::gtx_r)); + map(0x02c00000,0x02cfffff).r(FUNC(model2o_gtx_state::gtx_r)); } /* TODO: read by Sonic the Fighters (bit 1), unknown purpose */ @@ -1409,7 +1409,7 @@ void model2a_state::model2a_crx_mem(address_map &map) map(0x00200000, 0x0023ffff).ram(); map(0x01c00000, 0x01c0001f).rw("io", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write)).umask32(0x00ff00ff); map(0x01c00040, 0x01c00043).nopw(); - map(0x01c80000, 0x01c80003).rw(this, FUNC(model2a_state::model2_serial_r), FUNC(model2a_state::model2_serial_w)); + map(0x01c80000, 0x01c80003).rw(FUNC(model2a_state::model2_serial_r), FUNC(model2a_state::model2_serial_w)); } void model2a_state::model2a_5881_mem(address_map &map) @@ -1425,31 +1425,31 @@ void model2b_state::model2b_crx_mem(address_map &map) map(0x00200000, 0x0023ffff).ram(); - map(0x00804000, 0x00807fff).rw(this, FUNC(model2b_state::geo_prg_r), FUNC(model2b_state::geo_prg_w)); + map(0x00804000, 0x00807fff).rw(FUNC(model2b_state::geo_prg_r), FUNC(model2b_state::geo_prg_w)); //AM_RANGE(0x00804000, 0x00807fff) AM_READWRITE(geo_sharc_fifo_r, geo_sharc_fifo_w) //AM_RANGE(0x00840000, 0x00840fff) AM_WRITE(geo_sharc_iop_w) - map(0x00880000, 0x00883fff).w(this, FUNC(model2b_state::copro_function_port_w)); - map(0x00884000, 0x00887fff).rw(this, FUNC(model2b_state::copro_fifo_r), FUNC(model2b_state::copro_fifo_w)); - map(0x008c0000, 0x008c0fff).w(this, FUNC(model2b_state::copro_sharc_iop_w)); + map(0x00880000, 0x00883fff).w(FUNC(model2b_state::copro_function_port_w)); + map(0x00884000, 0x00887fff).rw(FUNC(model2b_state::copro_fifo_r), FUNC(model2b_state::copro_fifo_w)); + map(0x008c0000, 0x008c0fff).w(FUNC(model2b_state::copro_sharc_iop_w)); - map(0x00980000, 0x00980003).rw(this, FUNC(model2b_state::copro_ctl1_r), FUNC(model2b_state::copro_ctl1_w)); - map(0x00980008, 0x0098000b).w(this, FUNC(model2b_state::geo_ctl1_w)); - map(0x00980014, 0x00980017).r(this, FUNC(model2b_state::copro_status_r)); + map(0x00980000, 0x00980003).rw(FUNC(model2b_state::copro_ctl1_r), FUNC(model2b_state::copro_ctl1_w)); + map(0x00980008, 0x0098000b).w(FUNC(model2b_state::geo_ctl1_w)); + map(0x00980014, 0x00980017).r(FUNC(model2b_state::copro_status_r)); //AM_RANGE(0x00980008, 0x0098000b) AM_WRITE(geo_sharc_ctl1_w ) - map(0x009c0000, 0x009cffff).rw(this, FUNC(model2b_state::model2_serial_r), FUNC(model2b_state::model2_serial_w)); + map(0x009c0000, 0x009cffff).rw(FUNC(model2b_state::model2_serial_r), FUNC(model2b_state::model2_serial_w)); map(0x11000000, 0x110fffff).ram().share("textureram0"); // texture RAM 0 (2b/2c) map(0x11100000, 0x111fffff).ram().share("textureram0"); // texture RAM 0 (2b/2c) map(0x11200000, 0x112fffff).ram().share("textureram1"); // texture RAM 1 (2b/2c) map(0x11300000, 0x113fffff).ram().share("textureram1"); // texture RAM 1 (2b/2c) - map(0x11400000, 0x1140ffff).rw(this, FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)); // polygon "luma" RAM (2b/2c) - map(0x12800000, 0x1281ffff).rw(this, FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM + map(0x11400000, 0x1140ffff).rw(FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)); // polygon "luma" RAM (2b/2c) + map(0x12800000, 0x1281ffff).rw(FUNC(model2b_state::lumaram_r), FUNC(model2b_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM map(0x01c00000, 0x01c0001f).rw("io", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write)).umask32(0x00ff00ff); map(0x01c00040, 0x01c00043).nopw(); - map(0x01c80000, 0x01c80003).rw(this, FUNC(model2b_state::model2_serial_r), FUNC(model2b_state::model2_serial_w)); + map(0x01c80000, 0x01c80003).rw(FUNC(model2b_state::model2_serial_r), FUNC(model2b_state::model2_serial_w)); } void model2b_state::model2b_5881_mem(address_map &map) @@ -1465,22 +1465,22 @@ void model2c_state::model2c_crx_mem(address_map &map) map(0x00200000, 0x0023ffff).ram(); - map(0x00804000, 0x00807fff).rw(this, FUNC(model2c_state::geo_prg_r), FUNC(model2c_state::geo_prg_w)); - map(0x00880000, 0x00883fff).w(this, FUNC(model2c_state::copro_function_port_w)); - map(0x00884000, 0x00887fff).rw(this, FUNC(model2c_state::copro_fifo_r), FUNC(model2c_state::copro_fifo_w)); + map(0x00804000, 0x00807fff).rw(FUNC(model2c_state::geo_prg_r), FUNC(model2c_state::geo_prg_w)); + map(0x00880000, 0x00883fff).w(FUNC(model2c_state::copro_function_port_w)); + map(0x00884000, 0x00887fff).rw(FUNC(model2c_state::copro_fifo_r), FUNC(model2c_state::copro_fifo_w)); - map(0x00980000, 0x00980003).rw(this, FUNC(model2c_state::copro_ctl1_r), FUNC(model2c_state::copro_ctl1_w)); - map(0x00980008, 0x0098000b).w(this, FUNC(model2c_state::geo_ctl1_w)); - map(0x00980014, 0x00980017).r(this, FUNC(model2c_state::copro_status_r)); - map(0x009c0000, 0x009cffff).rw(this, FUNC(model2c_state::model2_serial_r), FUNC(model2c_state::model2_serial_w)); + map(0x00980000, 0x00980003).rw(FUNC(model2c_state::copro_ctl1_r), FUNC(model2c_state::copro_ctl1_w)); + map(0x00980008, 0x0098000b).w(FUNC(model2c_state::geo_ctl1_w)); + map(0x00980014, 0x00980017).r(FUNC(model2c_state::copro_status_r)); + map(0x009c0000, 0x009cffff).rw(FUNC(model2c_state::model2_serial_r), FUNC(model2c_state::model2_serial_w)); map(0x11000000, 0x111fffff).ram().share("textureram0"); // texture RAM 0 (2b/2c) map(0x11200000, 0x113fffff).ram().share("textureram1"); // texture RAM 1 (2b/2c) - map(0x11400000, 0x1140ffff).rw(this, FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)); // polygon "luma" RAM (2b/2c) - map(0x12800000, 0x1281ffff).rw(this, FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM + map(0x11400000, 0x1140ffff).rw(FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)); // polygon "luma" RAM (2b/2c) + map(0x12800000, 0x1281ffff).rw(FUNC(model2c_state::lumaram_r), FUNC(model2c_state::lumaram_w)).umask32(0x0000ffff); // polygon "luma" RAM map(0x01c00000, 0x01c0001f).rw("io", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write)).umask32(0x00ff00ff); - map(0x01c80000, 0x01c80003).rw(this, FUNC(model2c_state::model2_serial_r), FUNC(model2c_state::model2_serial_w)); + map(0x01c80000, 0x01c80003).rw(FUNC(model2c_state::model2_serial_r), FUNC(model2c_state::model2_serial_w)); } void model2c_state::model2c_5881_mem(address_map &map) @@ -2390,7 +2390,7 @@ void model2_state::model2_snd(address_map &map) { map(0x000000, 0x07ffff).ram().region("audiocpu", 0).share("soundram"); map(0x100000, 0x100fff).rw(m_scsp, FUNC(scsp_device::read), FUNC(scsp_device::write)); - map(0x400000, 0x400001).w(this, FUNC(model2_state::model2snd_ctrl)); + map(0x400000, 0x400001).w(FUNC(model2_state::model2snd_ctrl)); map(0x600000, 0x67ffff).rom().region("audiocpu", 0x80000); map(0x800000, 0x9fffff).rom().region("scsp", 0); map(0xa00000, 0xdfffff).bankr("bank4"); diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index 9b2e6202b40..2bc82096694 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -1764,21 +1764,21 @@ void model3_state::model3_10_mem(address_map &map) { map(0x00000000, 0x007fffff).ram().share("work_ram"); /* work RAM */ - map(0x84000000, 0x8400003f).r(this, FUNC(model3_state::real3d_status_r)); - map(0x88000000, 0x88000007).w(this, FUNC(model3_state::real3d_cmd_w)); - map(0x8e000000, 0x8e0fffff).w(this, FUNC(model3_state::real3d_display_list_w)); - map(0x98000000, 0x980fffff).w(this, FUNC(model3_state::real3d_polygon_ram_w)); + map(0x84000000, 0x8400003f).r(FUNC(model3_state::real3d_status_r)); + map(0x88000000, 0x88000007).w(FUNC(model3_state::real3d_cmd_w)); + map(0x8e000000, 0x8e0fffff).w(FUNC(model3_state::real3d_display_list_w)); + map(0x98000000, 0x980fffff).w(FUNC(model3_state::real3d_polygon_ram_w)); - map(0xf0040000, 0xf004003f).mirror(0x0e000000).rw(this, FUNC(model3_state::model3_ctrl_r), FUNC(model3_state::model3_ctrl_w)); - map(0xf0080000, 0xf008ffff).mirror(0x0e000000).rw(this, FUNC(model3_state::model3_sound_r), FUNC(model3_state::model3_sound_w)); + map(0xf0040000, 0xf004003f).mirror(0x0e000000).rw(FUNC(model3_state::model3_ctrl_r), FUNC(model3_state::model3_ctrl_w)); + map(0xf0080000, 0xf008ffff).mirror(0x0e000000).rw(FUNC(model3_state::model3_sound_r), FUNC(model3_state::model3_sound_w)); map(0xf00c0000, 0xf00dffff).mirror(0x0e000000).ram().share("backup"); /* backup SRAM */ - map(0xf0100000, 0xf010003f).mirror(0x0e000000).rw(this, FUNC(model3_state::model3_sys_r), FUNC(model3_state::model3_sys_w)); - map(0xf0140000, 0xf014003f).mirror(0x0e000000).rw(this, FUNC(model3_state::model3_rtc_r), FUNC(model3_state::model3_rtc_w)); + map(0xf0100000, 0xf010003f).mirror(0x0e000000).rw(FUNC(model3_state::model3_sys_r), FUNC(model3_state::model3_sys_w)); + map(0xf0140000, 0xf014003f).mirror(0x0e000000).rw(FUNC(model3_state::model3_rtc_r), FUNC(model3_state::model3_rtc_w)); - map(0xf1000000, 0xf10f7fff).rw(this, FUNC(model3_state::model3_char_r), FUNC(model3_state::model3_char_w)); /* character RAM */ - map(0xf10f8000, 0xf10fffff).rw(this, FUNC(model3_state::model3_tile_r), FUNC(model3_state::model3_tile_w)); /* tilemaps */ - map(0xf1100000, 0xf111ffff).rw(this, FUNC(model3_state::model3_palette_r), FUNC(model3_state::model3_palette_w)).share("paletteram64"); /* palette */ - map(0xf1180000, 0xf11800ff).rw(this, FUNC(model3_state::model3_vid_reg_r), FUNC(model3_state::model3_vid_reg_w)); + map(0xf1000000, 0xf10f7fff).rw(FUNC(model3_state::model3_char_r), FUNC(model3_state::model3_char_w)); /* character RAM */ + map(0xf10f8000, 0xf10fffff).rw(FUNC(model3_state::model3_tile_r), FUNC(model3_state::model3_tile_w)); /* tilemaps */ + map(0xf1100000, 0xf111ffff).rw(FUNC(model3_state::model3_palette_r), FUNC(model3_state::model3_palette_w)).share("paletteram64"); /* palette */ + map(0xf1180000, 0xf11800ff).rw(FUNC(model3_state::model3_vid_reg_r), FUNC(model3_state::model3_vid_reg_w)); map(0xff800000, 0xffffffff).rom().region("user1", 0); } @@ -5703,7 +5703,7 @@ void model3_state::model3_snd(address_map &map) map(0x100000, 0x100fff).rw(m_scsp1, FUNC(scsp_device::read), FUNC(scsp_device::write)); map(0x200000, 0x27ffff).ram().region("scsp2", 0); map(0x300000, 0x300fff).rw("scsp2", FUNC(scsp_device::read), FUNC(scsp_device::write)); - map(0x400000, 0x400001).w(this, FUNC(model3_state::model3snd_ctrl)); + map(0x400000, 0x400001).w(FUNC(model3_state::model3snd_ctrl)); map(0x600000, 0x67ffff).rom().region("audiocpu", 0x80000); map(0x800000, 0x9fffff).rom().region("samples", 0); map(0xa00000, 0xdfffff).bankr("bank4"); diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index a1f7a9b5a93..bc2faabcdcf 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -82,8 +82,8 @@ void modellot_state::io_map(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x77, 0x77).r(this, FUNC(modellot_state::port77_r)); - map(0xff, 0xff).r(this, FUNC(modellot_state::portff_r)); + map(0x77, 0x77).r(FUNC(modellot_state::port77_r)); + map(0xff, 0xff).r(FUNC(modellot_state::portff_r)); } diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp index 959f23dd91a..1432a530b61 100644 --- a/src/mame/drivers/mogura.cpp +++ b/src/mame/drivers/mogura.cpp @@ -141,8 +141,8 @@ void mogura_state::mogura_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xc000, 0xdfff).ram(); // main ram - map(0xe000, 0xefff).ram().w(this, FUNC(mogura_state::mogura_gfxram_w)).share("gfxram"); // ram based characters - map(0xf000, 0xffff).ram().w(this, FUNC(mogura_state::mogura_tileram_w)).share("tileram"); // tilemap + map(0xe000, 0xefff).ram().w(FUNC(mogura_state::mogura_gfxram_w)).share("gfxram"); // ram based characters + map(0xf000, 0xffff).ram().w(FUNC(mogura_state::mogura_tileram_w)).share("tileram"); // tilemap } void mogura_state::mogura_io_map(address_map &map) @@ -155,7 +155,7 @@ void mogura_state::mogura_io_map(address_map &map) map(0x0e, 0x0e).portr("P3"); map(0x0f, 0x0f).portr("P4"); map(0x10, 0x10).portr("SERVICE"); - map(0x14, 0x14).w(this, FUNC(mogura_state::mogura_dac_w)); /* 4 bit DAC x 2. MSB = left, LSB = right */ + map(0x14, 0x14).w(FUNC(mogura_state::mogura_dac_w)); /* 4 bit DAC x 2. MSB = left, LSB = right */ } static INPUT_PORTS_START( mogura ) diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp index aec16782820..562b75e3b5b 100644 --- a/src/mame/drivers/mole.cpp +++ b/src/mame/drivers/mole.cpp @@ -204,20 +204,20 @@ READ8_MEMBER(mole_state::mole_protection_r) void mole_state::mole_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0800, 0x08ff).r(this, FUNC(mole_state::mole_protection_r)); + map(0x0800, 0x08ff).r(FUNC(mole_state::mole_protection_r)); map(0x0800, 0x0800).nopw(); // ??? map(0x0820, 0x0820).nopw(); // ??? map(0x5000, 0x7fff).mirror(0x8000).rom(); - map(0x8000, 0x83ff).w(this, FUNC(mole_state::mole_tileram_w)).nopr(); - map(0x8400, 0x8400).w(this, FUNC(mole_state::mole_tilebank_w)); + map(0x8000, 0x83ff).w(FUNC(mole_state::mole_tileram_w)).nopr(); + map(0x8400, 0x8400).w(FUNC(mole_state::mole_tilebank_w)); map(0x8c00, 0x8c01).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x8c40, 0x8c40).nopw(); // ??? map(0x8c80, 0x8c80).nopw(); // ??? map(0x8c81, 0x8c81).nopw(); // ??? - map(0x8d00, 0x8d00).portr("DSW").w(this, FUNC(mole_state::mole_irqack_w)); + map(0x8d00, 0x8d00).portr("DSW").w(FUNC(mole_state::mole_irqack_w)); map(0x8d40, 0x8d40).portr("IN0"); map(0x8d80, 0x8d80).portr("IN1"); - map(0x8dc0, 0x8dc0).portr("IN2").w(this, FUNC(mole_state::mole_flipscreen_w)); + map(0x8dc0, 0x8dc0).portr("IN2").w(FUNC(mole_state::mole_flipscreen_w)); } diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp index 50f24b6d8aa..a19ba4a0ebe 100644 --- a/src/mame/drivers/molecular.cpp +++ b/src/mame/drivers/molecular.cpp @@ -177,26 +177,26 @@ WRITE8_MEMBER( molecula_state::sio_w) void molecula_state::molecula_file_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(molecula_state::file_r), FUNC(molecula_state::file_w)); + map(0x0000, 0xffff).rw(FUNC(molecula_state::file_r), FUNC(molecula_state::file_w)); } void molecula_state::molecula_file_io(address_map &map) { map.global_mask(0xff); // AM_RANGE(0x40, 0x43) AM_READWRITE(sio_r,sio_w) - map(0x72, 0x73).w(this, FUNC(molecula_state::file_output_w)); // unknown + map(0x72, 0x73).w(FUNC(molecula_state::file_output_w)); // unknown } void molecula_state::molecula_app_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(molecula_state::app_r), FUNC(molecula_state::app_w)); + map(0x0000, 0xffff).rw(FUNC(molecula_state::app_r), FUNC(molecula_state::app_w)); } void molecula_state::molecula_app_io(address_map &map) { map.global_mask(0xff); - map(0x10, 0x10).w(this, FUNC(molecula_state::app_output_w)); - map(0x60, 0x63).rw(this, FUNC(molecula_state::sio_r), FUNC(molecula_state::sio_w)); + map(0x10, 0x10).w(FUNC(molecula_state::app_output_w)); + map(0x60, 0x63).rw(FUNC(molecula_state::sio_r), FUNC(molecula_state::sio_w)); } static INPUT_PORTS_START( molecula ) diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp index c7fac8657be..075dbc517a4 100644 --- a/src/mame/drivers/momoko.cpp +++ b/src/mame/drivers/momoko.cpp @@ -69,23 +69,23 @@ void momoko_state::momoko_map(address_map &map) map(0xc000, 0xcfff).ram(); map(0xd064, 0xd0ff).ram().share("spriteram"); map(0xd400, 0xd400).portr("IN0").nopw(); /* interrupt ack? */ - map(0xd402, 0xd402).portr("IN1").w(this, FUNC(momoko_state::momoko_flipscreen_w)); + map(0xd402, 0xd402).portr("IN1").w(FUNC(momoko_state::momoko_flipscreen_w)); map(0xd404, 0xd404).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xd406, 0xd406).portr("DSW0").w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xd407, 0xd407).portr("DSW1"); map(0xd800, 0xdbff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xdc00, 0xdc00).w(this, FUNC(momoko_state::momoko_fg_scrolly_w)); - map(0xdc01, 0xdc01).w(this, FUNC(momoko_state::momoko_fg_scrollx_w)); - map(0xdc02, 0xdc02).w(this, FUNC(momoko_state::momoko_fg_select_w)); + map(0xdc00, 0xdc00).w(FUNC(momoko_state::momoko_fg_scrolly_w)); + map(0xdc01, 0xdc01).w(FUNC(momoko_state::momoko_fg_scrollx_w)); + map(0xdc02, 0xdc02).w(FUNC(momoko_state::momoko_fg_select_w)); map(0xe000, 0xe3ff).ram().share("videoram"); - map(0xe800, 0xe800).w(this, FUNC(momoko_state::momoko_text_scrolly_w)); - map(0xe801, 0xe801).w(this, FUNC(momoko_state::momoko_text_mode_w)); + map(0xe800, 0xe800).w(FUNC(momoko_state::momoko_text_scrolly_w)); + map(0xe801, 0xe801).w(FUNC(momoko_state::momoko_text_mode_w)); map(0xf000, 0xffff).bankr("bank1"); - map(0xf000, 0xf001).w(this, FUNC(momoko_state::momoko_bg_scrolly_w)).share("bg_scrolly"); - map(0xf002, 0xf003).w(this, FUNC(momoko_state::momoko_bg_scrollx_w)).share("bg_scrollx"); - map(0xf004, 0xf004).w(this, FUNC(momoko_state::momoko_bg_read_bank_w)); - map(0xf006, 0xf006).w(this, FUNC(momoko_state::momoko_bg_select_w)); - map(0xf007, 0xf007).w(this, FUNC(momoko_state::momoko_bg_priority_w)); + map(0xf000, 0xf001).w(FUNC(momoko_state::momoko_bg_scrolly_w)).share("bg_scrolly"); + map(0xf002, 0xf003).w(FUNC(momoko_state::momoko_bg_scrollx_w)).share("bg_scrollx"); + map(0xf004, 0xf004).w(FUNC(momoko_state::momoko_bg_read_bank_w)); + map(0xf006, 0xf006).w(FUNC(momoko_state::momoko_bg_select_w)); + map(0xf007, 0xf007).w(FUNC(momoko_state::momoko_bg_priority_w)); } void momoko_state::momoko_sound_map(address_map &map) diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp index 53f614a0363..352ceb13594 100644 --- a/src/mame/drivers/monty.cpp +++ b/src/mame/drivers/monty.cpp @@ -103,10 +103,10 @@ void monty_state::mmonty_mem(address_map &map) void monty_state::monty_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(monty_state::ioCommandWrite0_w)); - map(0x01, 0x01).w(this, FUNC(monty_state::sound_w)); - map(0x02, 0x02).w(this, FUNC(monty_state::ioCommandWrite1_w)); - map(0x80, 0xff).w(this, FUNC(monty_state::ioDisplayWrite_w)); + map(0x00, 0x00).w(FUNC(monty_state::ioCommandWrite0_w)); + map(0x01, 0x01).w(FUNC(monty_state::sound_w)); + map(0x02, 0x02).w(FUNC(monty_state::ioCommandWrite1_w)); + map(0x80, 0xff).w(FUNC(monty_state::ioDisplayWrite_w)); // 7 reads from a bit shifted IO port map(0x01, 0x01).portr("X1"); diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp index 295e72991cc..28fe7d8362c 100644 --- a/src/mame/drivers/monzagp.cpp +++ b/src/mame/drivers/monzagp.cpp @@ -412,7 +412,7 @@ WRITE8_MEMBER(monzagp_state::port2_w) void monzagp_state::monzagp_io(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(monzagp_state::port_r), FUNC(monzagp_state::port_w)); + map(0x00, 0xff).rw(FUNC(monzagp_state::port_r), FUNC(monzagp_state::port_w)); } static INPUT_PORTS_START( monzagp ) diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp index 86a3a9ae445..c7e36e9abba 100644 --- a/src/mame/drivers/moo.cpp +++ b/src/mame/drivers/moo.cpp @@ -308,16 +308,16 @@ void moo_state::moo_map(address_map &map) map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_word_r)); map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); /* K054338 alpha blending engine */ map(0x0cc000, 0x0cc01f).w(m_k053251, FUNC(k053251_device::lsb_w)); - map(0x0ce000, 0x0ce01f).w(this, FUNC(moo_state::moo_prot_w)); + map(0x0ce000, 0x0ce01f).w(FUNC(moo_state::moo_prot_w)); map(0x0d0000, 0x0d001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); /* CCU regs (ignored) */ - map(0x0d4000, 0x0d4001).w(this, FUNC(moo_state::sound_irq_w)); + map(0x0d4000, 0x0d4001).w(FUNC(moo_state::sound_irq_w)); map(0x0d6000, 0x0d601f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x0d8000, 0x0d8007).w(m_k056832, FUNC(k056832_device::b_word_w)); /* VSCCS regs */ map(0x0da000, 0x0da001).portr("P1_P3"); map(0x0da002, 0x0da003).portr("P2_P4"); map(0x0dc000, 0x0dc001).portr("IN0"); map(0x0dc002, 0x0dc003).portr("IN1"); - map(0x0de000, 0x0de001).rw(this, FUNC(moo_state::control2_r), FUNC(moo_state::control2_w)); + map(0x0de000, 0x0de001).rw(FUNC(moo_state::control2_r), FUNC(moo_state::control2_w)); map(0x100000, 0x17ffff).rom(); map(0x180000, 0x18ffff).ram().share("workram"); /* Work RAM */ map(0x190000, 0x19ffff).ram().share("spriteram"); /* Sprite RAM */ @@ -344,14 +344,14 @@ void moo_state::moobl_map(address_map &map) map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); /* K054338 alpha blending engine */ map(0x0cc000, 0x0cc01f).w(m_k053251, FUNC(k053251_device::lsb_w)); map(0x0d0000, 0x0d001f).writeonly(); /* CCU regs (ignored) */ - map(0x0d6ffc, 0x0d6ffd).w(this, FUNC(moo_state::moobl_oki_bank_w)); + map(0x0d6ffc, 0x0d6ffd).w(FUNC(moo_state::moobl_oki_bank_w)); map(0x0d6fff, 0x0d6fff).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0d8000, 0x0d8007).w(m_k056832, FUNC(k056832_device::b_word_w)); /* VSCCS regs */ map(0x0da000, 0x0da001).portr("P1_P3"); map(0x0da002, 0x0da003).portr("P2_P4"); map(0x0dc000, 0x0dc001).portr("IN0"); map(0x0dc002, 0x0dc003).portr("IN1"); - map(0x0de000, 0x0de001).rw(this, FUNC(moo_state::control2_r), FUNC(moo_state::control2_w)); + map(0x0de000, 0x0de001).rw(FUNC(moo_state::control2_r), FUNC(moo_state::control2_w)); map(0x100000, 0x17ffff).rom(); map(0x180000, 0x18ffff).ram().share("workram"); /* Work RAM */ map(0x190000, 0x19ffff).ram().share("spriteram"); /* Sprite RAM */ @@ -372,17 +372,17 @@ void moo_state::bucky_map(address_map &map) map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_word_r)); map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); /* K054338 alpha blending engine */ map(0x0cc000, 0x0cc01f).w(m_k053251, FUNC(k053251_device::lsb_w)); - map(0x0ce000, 0x0ce01f).w(this, FUNC(moo_state::moo_prot_w)); + map(0x0ce000, 0x0ce01f).w(FUNC(moo_state::moo_prot_w)); map(0x0d0000, 0x0d001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); /* CCU regs (ignored) */ map(0x0d2000, 0x0d20ff).rw("k054000", FUNC(k054000_device::lsb_r), FUNC(k054000_device::lsb_w)); - map(0x0d4000, 0x0d4001).w(this, FUNC(moo_state::sound_irq_w)); + map(0x0d4000, 0x0d4001).w(FUNC(moo_state::sound_irq_w)); map(0x0d6000, 0x0d601f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x0d8000, 0x0d8007).w(m_k056832, FUNC(k056832_device::b_word_w)); /* VSCCS regs */ map(0x0da000, 0x0da001).portr("P1_P3"); map(0x0da002, 0x0da003).portr("P2_P4"); map(0x0dc000, 0x0dc001).portr("IN0"); map(0x0dc002, 0x0dc003).portr("IN1"); - map(0x0de000, 0x0de001).rw(this, FUNC(moo_state::control2_r), FUNC(moo_state::control2_w)); + map(0x0de000, 0x0de001).rw(FUNC(moo_state::control2_r), FUNC(moo_state::control2_w)); map(0x180000, 0x181fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); /* Graphic planes */ map(0x182000, 0x183fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); /* Graphic planes mirror */ map(0x184000, 0x187fff).ram(); /* extra tile RAM? */ @@ -406,7 +406,7 @@ void moo_state::sound_map(address_map &map) map(0xe000, 0xe22f).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)); map(0xec00, 0xec01).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map)); - map(0xf800, 0xf800).w(this, FUNC(moo_state::sound_bankswitch_w)); + map(0xf800, 0xf800).w(FUNC(moo_state::sound_bankswitch_w)); } static INPUT_PORTS_START( moo ) diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp index ea08be7f338..68beb36945e 100644 --- a/src/mame/drivers/mosaic.cpp +++ b/src/mame/drivers/mosaic.cpp @@ -121,8 +121,8 @@ void mosaic_state::mosaic_map(address_map &map) { map(0x00000, 0x0ffff).rom(); map(0x20000, 0x21fff).ram(); - map(0x22000, 0x22fff).ram().w(this, FUNC(mosaic_state::bgvideoram_w)).share("bgvideoram"); - map(0x23000, 0x23fff).ram().w(this, FUNC(mosaic_state::fgvideoram_w)).share("fgvideoram"); + map(0x22000, 0x22fff).ram().w(FUNC(mosaic_state::bgvideoram_w)).share("bgvideoram"); + map(0x23000, 0x23fff).ram().w(FUNC(mosaic_state::fgvideoram_w)).share("fgvideoram"); map(0x24000, 0x241ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); } @@ -130,8 +130,8 @@ void mosaic_state::gfire2_map(address_map &map) { map(0x00000, 0x0ffff).rom(); map(0x10000, 0x17fff).ram(); - map(0x22000, 0x22fff).ram().w(this, FUNC(mosaic_state::bgvideoram_w)).share("bgvideoram"); - map(0x23000, 0x23fff).ram().w(this, FUNC(mosaic_state::fgvideoram_w)).share("fgvideoram"); + map(0x22000, 0x22fff).ram().w(FUNC(mosaic_state::bgvideoram_w)).share("bgvideoram"); + map(0x23000, 0x23fff).ram().w(FUNC(mosaic_state::fgvideoram_w)).share("fgvideoram"); map(0x24000, 0x241ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); } @@ -141,7 +141,7 @@ void mosaic_state::mosaic_io_map(address_map &map) map(0x00, 0x3f).nopw(); /* Z180 internal registers */ map(0x30, 0x30).nopr(); /* Z180 internal registers */ map(0x70, 0x71).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x72, 0x72).rw(this, FUNC(mosaic_state::protection_r), FUNC(mosaic_state::protection_w)); + map(0x72, 0x72).rw(FUNC(mosaic_state::protection_r), FUNC(mosaic_state::protection_w)); map(0x74, 0x74).portr("P1"); map(0x76, 0x76).portr("P2"); } @@ -152,7 +152,7 @@ void mosaic_state::gfire2_io_map(address_map &map) map(0x00, 0x3f).nopw(); /* Z180 internal registers */ map(0x30, 0x30).nopr(); /* Z180 internal registers */ map(0x70, 0x71).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x72, 0x72).rw(this, FUNC(mosaic_state::gfire2_protection_r), FUNC(mosaic_state::gfire2_protection_w)); + map(0x72, 0x72).rw(FUNC(mosaic_state::gfire2_protection_r), FUNC(mosaic_state::gfire2_protection_w)); map(0x74, 0x74).portr("P1"); map(0x76, 0x76).portr("P2"); } diff --git a/src/mame/drivers/mouser.cpp b/src/mame/drivers/mouser.cpp index b205fe4a15c..e7e96fedd8c 100644 --- a/src/mame/drivers/mouser.cpp +++ b/src/mame/drivers/mouser.cpp @@ -78,7 +78,7 @@ void mouser_state::mouser_sound_map(address_map &map) map(0x0000, 0x0fff).rom(); map(0x2000, 0x23ff).ram(); map(0x3000, 0x3000).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x4000, 0x4000).w(this, FUNC(mouser_state::mouser_sound_nmi_clear_w)); + map(0x4000, 0x4000).w(FUNC(mouser_state::mouser_sound_nmi_clear_w)); } void mouser_state::mouser_sound_io_map(address_map &map) diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index e570c4ec346..aa4a7caeb57 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -67,7 +67,7 @@ void mpf1_state::mpf1_map(address_map &map) void mpf1_state::mpf1_step(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(mpf1_state::step_r)); + map(0x0000, 0xffff).r(FUNC(mpf1_state::step_r)); } void mpf1_state::mpf1b_map(address_map &map) diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp index c168253dce2..118c2e1e042 100644 --- a/src/mame/drivers/mpu12wbk.cpp +++ b/src/mame/drivers/mpu12wbk.cpp @@ -316,8 +316,8 @@ void mpu12wbk_state::mpu12wbk_map(address_map &map) map(0x1400, 0x1400).w("crtc", FUNC(mc6845_device::address_w)); // OK map(0x1401, 0x1401).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); // OK map(0x1e00, 0x1e01).rw("ay8910", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); // hmmmmm.... - map(0x2000, 0x23ff).ram().w(this, FUNC(mpu12wbk_state::mpu12wbk_videoram_w)).share("videoram"); // FIXME - map(0x2400, 0x27ff).ram().w(this, FUNC(mpu12wbk_state::mpu12wbk_colorram_w)).share("colorram"); // FIXME + map(0x2000, 0x23ff).ram().w(FUNC(mpu12wbk_state::mpu12wbk_videoram_w)).share("videoram"); // FIXME + map(0x2400, 0x27ff).ram().w(FUNC(mpu12wbk_state::mpu12wbk_colorram_w)).share("colorram"); // FIXME map(0x2800, 0x3fff).ram(); // RAM (from 2000-3fff) map(0x6000, 0x6000).portr("SW1"); // dummy, placeholder map(0x6001, 0x6001).portr("SW2"); // dummy, placeholder diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp index 46f4b56d0c0..a7b9dc68d75 100644 --- a/src/mame/drivers/mpu3.cpp +++ b/src/mame/drivers/mpu3.cpp @@ -814,21 +814,21 @@ WRITE8_MEMBER(mpu3_state::mpu3ptm_w) { ptm6840_device *ptm2 = machine().device("ptm_ic2"); - ptm2->write(offset >>2,data);//((offset & 0x1f) >>2),data); + ptm2->write(space, offset >>2,data);//((offset & 0x1f) >>2),data); } READ8_MEMBER(mpu3_state::mpu3ptm_r) { ptm6840_device *ptm2 = machine().device("ptm_ic2"); - return ptm2->read(offset >>2); + return ptm2->read(space, offset >>2); } void mpu3_state::mpu3_basemap(address_map &map) { map(0x0000, 0x07ff).ram().share("nvram"); map(0x1000, 0xffff).rom(); - map(0x8800, 0x881f).rw(this, FUNC(mpu3_state::mpu3ptm_r), FUNC(mpu3_state::mpu3ptm_w));/* PTM6840 IC2 */ + map(0x8800, 0x881f).rw(FUNC(mpu3_state::mpu3ptm_r), FUNC(mpu3_state::mpu3ptm_w));/* PTM6840 IC2 */ map(0x9000, 0x9003).rw("pia_ic3", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* PIA6821 IC3 */ map(0x9800, 0x9803).rw("pia_ic4", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* PIA6821 IC4 */ map(0xa000, 0xa003).rw("pia_ic5", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* PIA6821 IC5 */ diff --git a/src/mame/drivers/mpu4plasma.cpp b/src/mame/drivers/mpu4plasma.cpp index e37b2af21d2..52370a07095 100644 --- a/src/mame/drivers/mpu4plasma.cpp +++ b/src/mame/drivers/mpu4plasma.cpp @@ -47,8 +47,8 @@ void mpu4plasma_state::mpu4plasma_map(address_map &map) // why does it test this much ram, just sloppy code expecting mirroring? map(0x400000, 0x4fffff).ram().share("plasmaram"); // comms? - map(0xffff00, 0xffff01).r(this, FUNC(mpu4plasma_state::mpu4plasma_unk_r)); - map(0xffff04, 0xffff05).w(this, FUNC(mpu4plasma_state::mpu4plasma_unk_w)); + map(0xffff00, 0xffff01).r(FUNC(mpu4plasma_state::mpu4plasma_unk_r)); + map(0xffff04, 0xffff05).w(FUNC(mpu4plasma_state::mpu4plasma_unk_w)); } uint32_t mpu4plasma_state::screen_update_mpu4plasma(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index 808dca09b2c..b7c29aa974e 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -405,7 +405,7 @@ READ8_MEMBER(mpu4vid_state::vram_r) void mpu4vid_state::mpu4_vram(address_map &map) { - map(0x0000, 0x7fff).rw(this, FUNC(mpu4vid_state::vram_r), FUNC(mpu4vid_state::vram_w)); + map(0x0000, 0x7fff).rw(FUNC(mpu4vid_state::vram_r), FUNC(mpu4vid_state::vram_w)); } SCN2674_DRAW_CHARACTER_MEMBER(mpu4vid_state::display_pixels) @@ -1191,10 +1191,10 @@ void mpu4vid_state::mpu4_68k_map(address_map &map) map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w)); /* map(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff); - map(0xc00000, 0xc1ffff).rw(this, FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); + map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); map(0xff8000, 0xff8003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0xff9000, 0xff900f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); - map(0xffd000, 0xffd00f).rw(this, FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff); + map(0xffd000, 0xffd00f).rw(FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff); } void mpu4vid_state::mpu4oki_68k_map(address_map &map) @@ -1207,13 +1207,13 @@ void mpu4vid_state::mpu4oki_68k_map(address_map &map) map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)); map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w)); map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff); - map(0xc00000, 0xc1ffff).rw(this, FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); + map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); map(0xff8000, 0xff8003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0xff9000, 0xff900f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); map(0xffa040, 0xffa04f).r("ptm_ic3ss", FUNC(ptm6840_device::read)).umask16(0x00ff); // 6840PTM on sampled sound board - map(0xffa040, 0xffa04f).w(this, FUNC(mpu4vid_state::ic3ss_w)).umask16(0x00ff); // 6840PTM on sampled sound board + map(0xffa040, 0xffa04f).w(FUNC(mpu4vid_state::ic3ss_w)).umask16(0x00ff); // 6840PTM on sampled sound board map(0xffa060, 0xffa067).rw("pia_ic4ss", FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0x00ff); // PIA6821 on sampled sound board - map(0xffd000, 0xffd00f).rw(this, FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff); + map(0xffd000, 0xffd00f).rw(FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff); // map(0xfff000, 0xffffff) AM_NOP /* Possible bug, reads and writes here */ } @@ -1228,7 +1228,7 @@ void mpu4vid_state::bwbvid_68k_map(address_map &map) // map(0xa00000, 0xa0000f) AM_READWRITE(bt471_r,bt471_w) //Some games use this /* map(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff); - map(0xc00000, 0xc1ffff).rw(this, FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); + map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); map(0xe00000, 0xe00003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0xe01000, 0xe0100f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); //map(0xa00004, 0xa0000f) AM_READWRITE(bwb_characteriser16_r, bwb_characteriser16_w)//AM_READWRITE(adpcm_r, adpcm_w) CHR ? @@ -1245,13 +1245,13 @@ void mpu4vid_state::bwbvid5_68k_map(address_map &map) //map(0xa00000, 0xa00003) AM_READWRITE8(bt471_r,bt471_w,0x00ff) Some games use this /* map(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff); - map(0xc00000, 0xc1ffff).rw(this, FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); + map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); map(0xe00000, 0xe00003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0xe01000, 0xe0100f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); map(0xe02000, 0xe02007).rw("pia_ic4ss", FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0xff00); //Seems odd... map(0xe03000, 0xe0300f).r("ptm_ic3ss", FUNC(ptm6840_device::read)).umask16(0xff00); // 6840PTM on sampled sound board - map(0xe03000, 0xe0300f).w(this, FUNC(mpu4vid_state::ic3ss_w)).umask16(0xff00); // 6840PTM on sampled sound board - map(0xe04000, 0xe0400f).rw(this, FUNC(mpu4vid_state::bwb_characteriser_r), FUNC(mpu4vid_state::bwb_characteriser_w)).umask16(0x00ff);//AM_READWRITE(adpcm_r, adpcm_w) CHR ? + map(0xe03000, 0xe0300f).w(FUNC(mpu4vid_state::ic3ss_w)).umask16(0xff00); // 6840PTM on sampled sound board + map(0xe04000, 0xe0400f).rw(FUNC(mpu4vid_state::bwb_characteriser_r), FUNC(mpu4vid_state::bwb_characteriser_w)).umask16(0x00ff);//AM_READWRITE(adpcm_r, adpcm_w) CHR ? } /* TODO: Fix up MPU4 map*/ diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp index ce2bd383616..1f2a2c72d27 100644 --- a/src/mame/drivers/mpu5.cpp +++ b/src/mame/drivers/mpu5.cpp @@ -532,7 +532,7 @@ WRITE32_MEMBER(mpu5_state::mpu5_mem_w) void mpu5_state::mpu5_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(mpu5_state::mpu5_mem_r), FUNC(mpu5_state::mpu5_mem_w)); + map(0x00000000, 0xffffffff).rw(FUNC(mpu5_state::mpu5_mem_r), FUNC(mpu5_state::mpu5_mem_w)); } INPUT_PORTS_START( mpu5 ) diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp index c5edf2b51c2..c475198309d 100644 --- a/src/mame/drivers/mpz80.cpp +++ b/src/mame/drivers/mpz80.cpp @@ -534,15 +534,15 @@ WRITE8_MEMBER( mpz80_state::disp_col_w ) void mpz80_state::mpz80_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(mpz80_state::mmu_r), FUNC(mpz80_state::mmu_w)); + map(0x0000, 0xffff).rw(FUNC(mpz80_state::mmu_r), FUNC(mpz80_state::mmu_w)); /* Task 0 Segment 0 map: map(0x0000, 0x03ff).ram(); - map(0x0400, 0x0400).rw(this, FUNC(mpz80_state::trap_addr_r), FUNC(mpz80_state::disp_seg_w)); - map(0x0401, 0x0401).rw(this, FUNC(mpz80_state::keyboard_r), FUNC(mpz80_state::disp_col_w)); - map(0x0402, 0x0402).rw(this, FUNC(mpz80_state::switch_r), FUNC(mpz80_state::task_w)); - map(0x0403, 0x0403).rw(this, FUNC(mpz80_state::status_r), FUNC(mpz80_state::mask_w)); + map(0x0400, 0x0400).rw(FUNC(mpz80_state::trap_addr_r), FUNC(mpz80_state::disp_seg_w)); + map(0x0401, 0x0401).rw(FUNC(mpz80_state::keyboard_r), FUNC(mpz80_state::disp_col_w)); + map(0x0402, 0x0402).rw(FUNC(mpz80_state::switch_r), FUNC(mpz80_state::task_w)); + map(0x0403, 0x0403).rw(FUNC(mpz80_state::status_r), FUNC(mpz80_state::mask_w)); map(0x0600, 0x07ff).ram().share("map_ram"); map(0x0800, 0x0bff).rom().region(Z80_TAG, 0); map(0x0c00, 0x0c00).rw(AM9512_TAG, FUNC(am9512_device::read), FUNC(am9512_device::write)); @@ -555,7 +555,7 @@ void mpz80_state::mpz80_mem(address_map &map) void mpz80_state::mpz80_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(mpz80_state::mmu_io_r), FUNC(mpz80_state::mmu_io_w)); + map(0x0000, 0xffff).rw(FUNC(mpz80_state::mmu_io_r), FUNC(mpz80_state::mmu_io_w)); } diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp index 02b121514f2..9e395980c14 100644 --- a/src/mame/drivers/mquake.cpp +++ b/src/mame/drivers/mquake.cpp @@ -86,7 +86,7 @@ READ8_MEMBER( mquake_state::es5503_sample_r ) void mquake_state::mquake_es5503_map(address_map &map) { - map(0x000000, 0x1ffff).r(this, FUNC(mquake_state::es5503_sample_r)); + map(0x000000, 0x1ffff).r(FUNC(mquake_state::es5503_sample_r)); } WRITE16_MEMBER( mquake_state::output_w ) @@ -134,12 +134,12 @@ void mquake_state::a500_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(mquake_state::cia_r), FUNC(mquake_state::cia_w)); - map(0xc00000, 0xd7ffff).rw(this, FUNC(mquake_state::custom_chip_r), FUNC(mquake_state::custom_chip_w)); + map(0xa00000, 0xbfffff).rw(FUNC(mquake_state::cia_r), FUNC(mquake_state::cia_w)); + map(0xc00000, 0xd7ffff).rw(FUNC(mquake_state::custom_chip_r), FUNC(mquake_state::custom_chip_w)); map(0xd80000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(mquake_state::custom_chip_r), FUNC(mquake_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(mquake_state::custom_chip_r), FUNC(mquake_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(mquake_state::rom_mirror_r)); + map(0xde0000, 0xdeffff).rw(FUNC(mquake_state::custom_chip_r), FUNC(mquake_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(mquake_state::custom_chip_r), FUNC(mquake_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(mquake_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf80000, 0xffffff).rom().region("kickstart", 0); } @@ -151,8 +151,8 @@ void mquake_state::main_map(address_map &map) map(0x204000, 0x2041ff).rw(m_es5503, FUNC(es5503_device::read), FUNC(es5503_device::write)).umask16(0x00ff); map(0x282000, 0x282001).portr("SW.LO"); map(0x282002, 0x282003).portr("SW.HI"); - map(0x284000, 0x28400f).w(this, FUNC(mquake_state::output_w)); - map(0x286000, 0x28600f).rw(this, FUNC(mquake_state::coin_chip_r), FUNC(mquake_state::coin_chip_w)); + map(0x284000, 0x28400f).w(FUNC(mquake_state::output_w)); + map(0x286000, 0x28600f).rw(FUNC(mquake_state::coin_chip_r), FUNC(mquake_state::coin_chip_w)); map(0x300000, 0x3bffff).rom().region("user2", 0); map(0xf00000, 0xfbffff).rom().region("user2", 0); /* Custom ROM */ } diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp index 6da5d3ca08b..6f579ffc6db 100644 --- a/src/mame/drivers/mrdo.cpp +++ b/src/mame/drivers/mrdo.cpp @@ -49,20 +49,20 @@ READ8_MEMBER(mrdo_state::mrdo_SECRE_r) void mrdo_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(this, FUNC(mrdo_state::mrdo_bgvideoram_w)).share("bgvideoram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(mrdo_state::mrdo_fgvideoram_w)).share("fgvideoram"); + map(0x8000, 0x87ff).ram().w(FUNC(mrdo_state::mrdo_bgvideoram_w)).share("bgvideoram"); + map(0x8800, 0x8fff).ram().w(FUNC(mrdo_state::mrdo_fgvideoram_w)).share("fgvideoram"); map(0x9000, 0x90ff).writeonly().share("spriteram"); - map(0x9800, 0x9800).w(this, FUNC(mrdo_state::mrdo_flipscreen_w)); /* screen flip + playfield priority */ - map(0x9801, 0x9801).w("u8106_1", FUNC(u8106_device::write)); - map(0x9802, 0x9802).w("u8106_2", FUNC(u8106_device::write)); - map(0x9803, 0x9803).r(this, FUNC(mrdo_state::mrdo_SECRE_r)); + map(0x9800, 0x9800).w(FUNC(mrdo_state::mrdo_flipscreen_w)); /* screen flip + playfield priority */ + map(0x9801, 0x9801).w("u8106_1", FUNC(u8106_device::command_w)); + map(0x9802, 0x9802).w("u8106_2", FUNC(u8106_device::command_w)); + map(0x9803, 0x9803).r(FUNC(mrdo_state::mrdo_SECRE_r)); map(0xa000, 0xa000).portr("P1"); map(0xa001, 0xa001).portr("P2"); map(0xa002, 0xa002).portr("DSW1"); map(0xa003, 0xa003).portr("DSW2"); map(0xe000, 0xefff).ram(); - map(0xf000, 0xf7ff).w(this, FUNC(mrdo_state::mrdo_scrollx_w)); - map(0xf800, 0xffff).w(this, FUNC(mrdo_state::mrdo_scrolly_w)); + map(0xf000, 0xf7ff).w(FUNC(mrdo_state::mrdo_scrollx_w)); + map(0xf800, 0xffff).w(FUNC(mrdo_state::mrdo_scrolly_w)); } diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp index 0676f37085d..1b25d88777c 100644 --- a/src/mame/drivers/mrflea.cpp +++ b/src/mame/drivers/mrflea.cpp @@ -101,9 +101,9 @@ void mrflea_state::mrflea_master_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(mrflea_state::mrflea_videoram_w)).share("videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(mrflea_state::mrflea_videoram_w)).share("videoram"); map(0xe800, 0xe83f).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xec00, 0xecff).ram().w(this, FUNC(mrflea_state::mrflea_spriteram_w)).share("spriteram"); + map(0xec00, 0xecff).ram().w(FUNC(mrflea_state::mrflea_spriteram_w)).share("spriteram"); } void mrflea_state::mrflea_master_io_map(address_map &map) @@ -111,7 +111,7 @@ void mrflea_state::mrflea_master_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x00).nopw(); /* watchdog? */ map(0x40, 0x43).rw("mainppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x60, 0x60).w(this, FUNC(mrflea_state::mrflea_gfx_bank_w)); + map(0x60, 0x60).w(FUNC(mrflea_state::mrflea_gfx_bank_w)); } diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp index 0872b32efc3..77900618fad 100644 --- a/src/mame/drivers/mrgame.cpp +++ b/src/mame/drivers/mrgame.cpp @@ -120,13 +120,13 @@ void mrgame_state::main_map(address_map &map) { map(0x000000, 0x00ffff).rom().region("roms", 0); map(0x020000, 0x02ffff).ram().share("nvram"); - map(0x030001, 0x030001).r(this, FUNC(mrgame_state::rsw_r)); //RSW ACK - map(0x030003, 0x030003).w(this, FUNC(mrgame_state::sound_w)); //W SOUND - map(0x030004, 0x030004).w(this, FUNC(mrgame_state::video_w)); //W VID - map(0x030007, 0x030007).w(this, FUNC(mrgame_state::triple_w)); //W CS + map(0x030001, 0x030001).r(FUNC(mrgame_state::rsw_r)); //RSW ACK + map(0x030003, 0x030003).w(FUNC(mrgame_state::sound_w)); //W SOUND + map(0x030004, 0x030004).w(FUNC(mrgame_state::video_w)); //W VID + map(0x030007, 0x030007).w(FUNC(mrgame_state::triple_w)); //W CS map(0x030008, 0x030009).nopw(); //W DATA - lamp/sol data - map(0x03000b, 0x03000b).w(this, FUNC(mrgame_state::row_w)); //W ROW - map(0x03000d, 0x03000d).r(this, FUNC(mrgame_state::col_r)); //R COL + map(0x03000b, 0x03000b).w(FUNC(mrgame_state::row_w)); //W ROW + map(0x03000d, 0x03000d).r(FUNC(mrgame_state::col_r)); //R COL map(0x03000e, 0x03000f).nopw(); //EXT ADD - lamp/sol data } @@ -136,7 +136,7 @@ void mrgame_state::video_map(address_map &map) map(0x4000, 0x47ff).ram(); map(0x4800, 0x4bff).mirror(0x0400).ram().share("videoram"); map(0x5000, 0x50ff).mirror(0x0700).ram().share("objectram"); - map(0x6800, 0x6807).mirror(0x07f8).w(this, FUNC(mrgame_state::video_ctrl_w)); + map(0x6800, 0x6807).mirror(0x07f8).w(FUNC(mrgame_state::video_ctrl_w)); map(0x7000, 0x77ff).nopr(); //AFR - looks like a watchdog map(0x8100, 0x8103).mirror(0x7efc).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); } @@ -150,9 +150,9 @@ void mrgame_state::audio1_map(address_map &map) void mrgame_state::audio1_io(address_map &map) { map.global_mask(3); - map(0x0000, 0x0000).w("dacvol", FUNC(dac_byte_interface::write)); //DA1 - map(0x0001, 0x0001).r(this, FUNC(mrgame_state::sound_r)); //IN1 - map(0x0002, 0x0002).w(this, FUNC(mrgame_state::ack1_w)); //AKL1 + map(0x0000, 0x0000).w("dacvol", FUNC(dac_byte_interface::data_w)); //DA1 + map(0x0001, 0x0001).r(FUNC(mrgame_state::sound_r)); //IN1 + map(0x0002, 0x0002).w(FUNC(mrgame_state::ack1_w)); //AKL1 map(0x0003, 0x0003).nopw(); //SGS pass data to M114 } @@ -165,11 +165,11 @@ void mrgame_state::audio2_map(address_map &map) void mrgame_state::audio2_io(address_map &map) { map.global_mask(7); - map(0x0000, 0x0000).w("ldac", FUNC(dac_byte_interface::write)); //DA2 - map(0x0001, 0x0001).r(this, FUNC(mrgame_state::sound_r)); //IN2 - map(0x0002, 0x0002).w(this, FUNC(mrgame_state::ack2_w)); //AKL2 + map(0x0000, 0x0000).w("ldac", FUNC(dac_byte_interface::data_w)); //DA2 + map(0x0001, 0x0001).r(FUNC(mrgame_state::sound_r)); //IN2 + map(0x0002, 0x0002).w(FUNC(mrgame_state::ack2_w)); //AKL2 map(0x0003, 0x0003).rw("tms", FUNC(tms5220_device::status_r), FUNC(tms5220_device::data_w)); //Speech - map(0x0004, 0x0004).w("rdac", FUNC(dac_byte_interface::write)); //DA3 + map(0x0004, 0x0004).w("rdac", FUNC(dac_byte_interface::data_w)); //DA3 } static INPUT_PORTS_START( mrgame ) diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp index 4fe53a3542f..1342c1c9d49 100644 --- a/src/mame/drivers/mrjong.cpp +++ b/src/mame/drivers/mrjong.cpp @@ -77,17 +77,17 @@ void mrjong_state::mrjong_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0xa000, 0xa7ff).ram(); - map(0xe000, 0xe3ff).ram().w(this, FUNC(mrjong_state::mrjong_videoram_w)).share("videoram"); - map(0xe400, 0xe7ff).ram().w(this, FUNC(mrjong_state::mrjong_colorram_w)).share("colorram"); + map(0xe000, 0xe3ff).ram().w(FUNC(mrjong_state::mrjong_videoram_w)).share("videoram"); + map(0xe400, 0xe7ff).ram().w(FUNC(mrjong_state::mrjong_colorram_w)).share("colorram"); } void mrjong_state::mrjong_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("P2").w(this, FUNC(mrjong_state::mrjong_flipscreen_w)); - map(0x01, 0x01).portr("P1").w("sn1", FUNC(sn76489_device::write)); - map(0x02, 0x02).portr("DSW").w("sn2", FUNC(sn76489_device::write)); - map(0x03, 0x03).r(this, FUNC(mrjong_state::io_0x03_r)); // Unknown + map(0x00, 0x00).portr("P2").w(FUNC(mrjong_state::mrjong_flipscreen_w)); + map(0x01, 0x01).portr("P1").w("sn1", FUNC(sn76489_device::command_w)); + map(0x02, 0x02).portr("DSW").w("sn2", FUNC(sn76489_device::command_w)); + map(0x03, 0x03).r(FUNC(mrjong_state::io_0x03_r)); // Unknown } /************************************* diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp index 6d7bbb5e540..fc11c18559e 100644 --- a/src/mame/drivers/ms0515.cpp +++ b/src/mame/drivers/ms0515.cpp @@ -143,7 +143,7 @@ void ms0515_state::ms0515_mem(address_map &map) map(0160000, 0177377).rom().nopw(); - map(0177400, 0177437).w(this, FUNC(ms0515_state::ms0515_bank_w)); // Register for RAM expansion + map(0177400, 0177437).w(FUNC(ms0515_state::ms0515_bank_w)); // Register for RAM expansion map(0177440, 0177440).r(m_i8251kbd, FUNC(i8251_device::data_r)); map(0177442, 0177442).rw(m_i8251kbd, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); @@ -171,7 +171,7 @@ void ms0515_state::ms0515_mem(address_map &map) map(0177720, 0177720).w(m_i8251line, FUNC(i8251_device::data_w)); map(0177722, 0177722).w(m_i8251line, FUNC(i8251_device::control_w)); - map(0177770, 0177771).rw(this, FUNC(ms0515_state::ms0515_halt_r), FUNC(ms0515_state::ms0515_halt_w)); // read/write -- halt and system timer + map(0177770, 0177771).rw(FUNC(ms0515_state::ms0515_halt_r), FUNC(ms0515_state::ms0515_halt_w)); // read/write -- halt and system timer } /* diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index 8b9994714a5..fd491583bc1 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -647,41 +647,41 @@ WRITE32_MEMBER(ms32_state::coin_counter_w) void ms32_state::ms32_map(address_map &map) { /* RAM areas verified by testing on real hw - usually accessed at the 0xfc000000 + mirror */ - map(0xc0000000, 0xc0007fff).rw(this, FUNC(ms32_state::ms32_nvram_r8), FUNC(ms32_state::ms32_nvram_w8)).umask32(0x000000ff).mirror(0x3c1f8000); // nvram is 8-bit wide, 0x2000 in size */ + map(0xc0000000, 0xc0007fff).rw(FUNC(ms32_state::ms32_nvram_r8), FUNC(ms32_state::ms32_nvram_w8)).umask32(0x000000ff).mirror(0x3c1f8000); // nvram is 8-bit wide, 0x2000 in size */ /* AM_RANGE(0xc0008000, 0xc01fffff) // mirrors of nvramram, handled above */ - map(0xc1180000, 0xc1187fff).rw(this, FUNC(ms32_state::ms32_priram_r8), FUNC(ms32_state::ms32_priram_w8)).umask32(0x000000ff).mirror(0x3c038000).share("priram"); /* priram is 8-bit wide, 0x2000 in size */ + map(0xc1180000, 0xc1187fff).rw(FUNC(ms32_state::ms32_priram_r8), FUNC(ms32_state::ms32_priram_w8)).umask32(0x000000ff).mirror(0x3c038000).share("priram"); /* priram is 8-bit wide, 0x2000 in size */ /* AM_RANGE(0xc1188000, 0xc11bffff) // mirrors of priram, handled above */ - map(0xc1400000, 0xc143ffff).rw(this, FUNC(ms32_state::ms32_palram_r16), FUNC(ms32_state::ms32_palram_w16)).umask32(0x0000ffff).mirror(0x3c1c0000).share("palram"); /* palram is 16-bit wide, 0x20000 in size */ + map(0xc1400000, 0xc143ffff).rw(FUNC(ms32_state::ms32_palram_r16), FUNC(ms32_state::ms32_palram_w16)).umask32(0x0000ffff).mirror(0x3c1c0000).share("palram"); /* palram is 16-bit wide, 0x20000 in size */ /* AM_RANGE(0xc1440000, 0xc145ffff) // mirrors of palram, handled above */ - map(0xc2000000, 0xc201ffff).rw(this, FUNC(ms32_state::ms32_rozram_r16), FUNC(ms32_state::ms32_rozram_w16)).umask32(0x0000ffff).mirror(0x3c1e0000).share("rozram"); /* rozram is 16-bit wide, 0x10000 in size */ + map(0xc2000000, 0xc201ffff).rw(FUNC(ms32_state::ms32_rozram_r16), FUNC(ms32_state::ms32_rozram_w16)).umask32(0x0000ffff).mirror(0x3c1e0000).share("rozram"); /* rozram is 16-bit wide, 0x10000 in size */ /* AM_RANGE(0xc2020000, 0xc21fffff) // mirrors of rozram, handled above */ - map(0xc2200000, 0xc2201fff).rw(this, FUNC(ms32_state::ms32_lineram_r16), FUNC(ms32_state::ms32_lineram_w16)).umask32(0x0000ffff).mirror(0x3c1fe000).share("lineram"); /* lineram is 16-bit wide, 0x1000 in size */ + map(0xc2200000, 0xc2201fff).rw(FUNC(ms32_state::ms32_lineram_r16), FUNC(ms32_state::ms32_lineram_w16)).umask32(0x0000ffff).mirror(0x3c1fe000).share("lineram"); /* lineram is 16-bit wide, 0x1000 in size */ /* AM_RANGE(0xc2202000, 0xc23fffff) // mirrors of lineram, handled above */ - map(0xc2800000, 0xc283ffff).rw(this, FUNC(ms32_state::ms32_sprram_r16), FUNC(ms32_state::ms32_sprram_w16)).umask32(0x0000ffff).mirror(0x3c1c0000).share("sprram"); /* spriteram is 16-bit wide, 0x20000 in size */ + map(0xc2800000, 0xc283ffff).rw(FUNC(ms32_state::ms32_sprram_r16), FUNC(ms32_state::ms32_sprram_w16)).umask32(0x0000ffff).mirror(0x3c1c0000).share("sprram"); /* spriteram is 16-bit wide, 0x20000 in size */ /* AM_RANGE(0xc2840000, 0xc29fffff) // mirrors of sprram, handled above */ - map(0xc2c00000, 0xc2c07fff).rw(this, FUNC(ms32_state::ms32_txram_r16), FUNC(ms32_state::ms32_txram_w16)).umask32(0x0000ffff).mirror(0x3c1f0000).share("txram"); /* txram is 16-bit wide, 0x4000 in size */ - map(0xc2c08000, 0xc2c0ffff).rw(this, FUNC(ms32_state::ms32_bgram_r16), FUNC(ms32_state::ms32_bgram_w16)).umask32(0x0000ffff).mirror(0x3c1f0000).share("bgram"); /* bgram is 16-bit wide, 0x4000 in size */ + map(0xc2c00000, 0xc2c07fff).rw(FUNC(ms32_state::ms32_txram_r16), FUNC(ms32_state::ms32_txram_w16)).umask32(0x0000ffff).mirror(0x3c1f0000).share("txram"); /* txram is 16-bit wide, 0x4000 in size */ + map(0xc2c08000, 0xc2c0ffff).rw(FUNC(ms32_state::ms32_bgram_r16), FUNC(ms32_state::ms32_bgram_w16)).umask32(0x0000ffff).mirror(0x3c1f0000).share("bgram"); /* bgram is 16-bit wide, 0x4000 in size */ /* AM_RANGE(0xc2c10000, 0xc2dfffff) // mirrors of txram / bg, handled above */ map(0xc2e00000, 0xc2e1ffff).ram().share("mainram").mirror(0x3c0e0000); /* mainram is 32-bit wide, 0x20000 in size */ map(0xc3e00000, 0xc3ffffff).rom().region("maincpu", 0).mirror(0x3c000000); // ROM is 32-bit wide, 0x200000 in size */ /* todo: clean up the mapping of these */ map(0xfc800000, 0xfc800003).nopr(); /* sound? */ - map(0xfc800000, 0xfc800003).w(this, FUNC(ms32_state::ms32_sound_w)); /* sound? */ + map(0xfc800000, 0xfc800003).w(FUNC(ms32_state::ms32_sound_w)); /* sound? */ map(0xfcc00004, 0xfcc00007).portr("INPUTS"); map(0xfcc00010, 0xfcc00013).portr("DSW"); map(0xfce00034, 0xfce00037).nopw(); // irq ack? - map(0xfce00038, 0xfce0003b).w(this, FUNC(ms32_state::reset_sub_w)); + map(0xfce00038, 0xfce0003b).w(FUNC(ms32_state::reset_sub_w)); map(0xfce00050, 0xfce0005f).nopw(); // watchdog? I haven't investigated // AM_RANGE(0xfce00000, 0xfce0007f) AM_WRITEONLY AM_SHARE("ms32_fce00000") /* registers not ram? */ - map(0xfce00000, 0xfce00003).w(this, FUNC(ms32_state::ms32_gfxctrl_w)); /* flip screen + other unknown bits */ - map(0xfce00280, 0xfce0028f).w(this, FUNC(ms32_state::ms32_brightness_w)); // global brightness control + map(0xfce00000, 0xfce00003).w(FUNC(ms32_state::ms32_gfxctrl_w)); /* flip screen + other unknown bits */ + map(0xfce00280, 0xfce0028f).w(FUNC(ms32_state::ms32_brightness_w)); // global brightness control /**/map(0xfce00600, 0xfce0065f).ram().share("roz_ctrl"); /* roz control registers */ /**/map(0xfce00a00, 0xfce00a17).ram().share("tx_scroll"); /* tx layer scroll */ /**/map(0xfce00a20, 0xfce00a37).ram().share("bg_scroll"); /* bg layer scroll */ - map(0xfce00a7c, 0xfce00a7f).w(this, FUNC(ms32_state::pip_w)); // ??? layer related? seems to be always 0 - map(0xfce00e00, 0xfce00e03).w(this, FUNC(ms32_state::coin_counter_w)); // coin counters + something else - map(0xfd000000, 0xfd000003).r(this, FUNC(ms32_state::ms32_sound_r)); + map(0xfce00a7c, 0xfce00a7f).w(FUNC(ms32_state::pip_w)); // ??? layer related? seems to be always 0 + map(0xfce00e00, 0xfce00e03).w(FUNC(ms32_state::coin_counter_w)); // coin counters + something else + map(0xfd000000, 0xfd000003).r(FUNC(ms32_state::ms32_sound_r)); map(0xfd1c0000, 0xfd1c0003).writeonly().share("mahjong_select"); } @@ -715,7 +715,7 @@ void ms32_state::f1superb_map(address_map &map) ms32_map(map); map(0xfd0d0000, 0xfd0d0003).portr("DSW2"); // MB-93159 - map(0xfd0e0000, 0xfd0e0003).r(this, FUNC(ms32_state::ms32_read_inputs3)).nopw(); // writes 7-led seg at very least + map(0xfd0e0000, 0xfd0e0003).r(FUNC(ms32_state::ms32_read_inputs3)).nopw(); // writes 7-led seg at very least map(0xfce00004, 0xfce00023).ram(); // regs? map(0xfce00200, 0xfce0021f).ram(); // regs? @@ -723,8 +723,8 @@ void ms32_state::f1superb_map(address_map &map) /* these two are almost certainly wrong, they just let you see what happens if you generate the FPU ints without breaking other games */ - map(0xfce00e00, 0xfce00e03).w(this, FUNC(ms32_state::ms32_irq5_guess_w)); - map(0xfd0f0000, 0xfd0f0003).w(this, FUNC(ms32_state::ms32_irq2_guess_w)); + map(0xfce00e00, 0xfce00e03).w(FUNC(ms32_state::ms32_irq5_guess_w)); + map(0xfd0f0000, 0xfd0f0003).w(FUNC(ms32_state::ms32_irq2_guess_w)); map(0xfd100000, 0xfd103fff).ram(); // used when you start enabling fpu ints map(0xfd104000, 0xfd105fff).ram(); // uploads data here @@ -732,7 +732,7 @@ void ms32_state::f1superb_map(address_map &map) map(0xfd140000, 0xfd143fff).ram(); // used when you start enabling fpu ints map(0xfd144000, 0xfd145fff).ram(); // same data here - map(0xfdc00000, 0xfdc1ffff).rw(this, FUNC(ms32_state::ms32_extra_r16), FUNC(ms32_state::ms32_extra_w16)).umask32(0x0000ffff).share("f1sb_extraram"); // definitely line ram + map(0xfdc00000, 0xfdc1ffff).rw(FUNC(ms32_state::ms32_extra_r16), FUNC(ms32_state::ms32_extra_w16)).umask32(0x0000ffff).share("f1sb_extraram"); // definitely line ram map(0xfde00000, 0xfde1ffff).ram(); // scroll info for lineram? } @@ -1676,12 +1676,12 @@ void ms32_state::ms32_sound_map(address_map &map) { map(0x0000, 0x3eff).rom(); map(0x3f00, 0x3f0f).rw("ymf", FUNC(ymf271_device::read), FUNC(ymf271_device::write)); - map(0x3f10, 0x3f10).rw(this, FUNC(ms32_state::latch_r), FUNC(ms32_state::to_main_w)); + map(0x3f10, 0x3f10).rw(FUNC(ms32_state::latch_r), FUNC(ms32_state::to_main_w)); map(0x3f20, 0x3f20).nopr(); /* 2nd latch ? */ map(0x3f20, 0x3f20).nopw(); /* to_main2_w ? */ map(0x3f40, 0x3f40).nopw(); /* YMF271 pin 4 (bit 1) , YMF271 pin 39 (bit 4) */ map(0x3f70, 0x3f70).nopw(); // watchdog? banking? very noisy - map(0x3f80, 0x3f80).w(this, FUNC(ms32_state::ms32_snd_bank_w)); + map(0x3f80, 0x3f80).w(FUNC(ms32_state::ms32_snd_bank_w)); map(0x4000, 0x7fff).ram(); map(0x8000, 0xbfff).bankr("z80bank1"); map(0xc000, 0xffff).bankr("z80bank2"); diff --git a/src/mame/drivers/ms6102.cpp b/src/mame/drivers/ms6102.cpp index 2b1183db73e..e9f3d909fb0 100644 --- a/src/mame/drivers/ms6102.cpp +++ b/src/mame/drivers/ms6102.cpp @@ -139,10 +139,10 @@ void ms6102_state::ms6102_io(address_map &map) map(0x10, 0x18).rw(m_dma8257, FUNC(i8257_device::read), FUNC(i8257_device::write)); map(0x20, 0x23).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x30, 0x30).mirror(0x0f).rw("589wa1", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0x40, 0x41).rw(this, FUNC(ms6102_state::crtc_r), FUNC(ms6102_state::crtc_w)); + map(0x40, 0x41).rw(FUNC(ms6102_state::crtc_r), FUNC(ms6102_state::crtc_w)); map(0x50, 0x5f).noprw(); // video disable? - map(0x60, 0x6f).w(this, FUNC(ms6102_state::pic_w)); - map(0x70, 0x7f).r(this, FUNC(ms6102_state::misc_status_r)); + map(0x60, 0x6f).w(FUNC(ms6102_state::pic_w)); + map(0x70, 0x7f).r(FUNC(ms6102_state::misc_status_r)); } static const gfx_layout ms6102_charlayout = diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index bc0892aadd6..846ec40e471 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -179,24 +179,24 @@ void msisaac_state::msisaac_map(address_map &map) map(0x0000, 0xdfff).rom(); map(0xe000, 0xe7ff).ram(); map(0xe800, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xf000, 0xf000).w(this, FUNC(msisaac_state::msisaac_bg2_textbank_w)); + map(0xf000, 0xf000).w(FUNC(msisaac_state::msisaac_bg2_textbank_w)); map(0xf001, 0xf001).nopw(); //??? map(0xf002, 0xf002).nopw(); //??? - map(0xf060, 0xf060).w(this, FUNC(msisaac_state::sound_command_w)); //sound command + map(0xf060, 0xf060).w(FUNC(msisaac_state::sound_command_w)); //sound command map(0xf061, 0xf061).nopw(); /*sound_reset*/ //???? - map(0xf0a3, 0xf0a3).w(this, FUNC(msisaac_state::ms_unknown_w)); //???? written in interrupt routine + map(0xf0a3, 0xf0a3).w(FUNC(msisaac_state::ms_unknown_w)); //???? written in interrupt routine - map(0xf0c0, 0xf0c0).w(this, FUNC(msisaac_state::msisaac_fg_scrollx_w)); - map(0xf0c1, 0xf0c1).w(this, FUNC(msisaac_state::msisaac_fg_scrolly_w)); - map(0xf0c2, 0xf0c2).w(this, FUNC(msisaac_state::msisaac_bg2_scrollx_w)); - map(0xf0c3, 0xf0c3).w(this, FUNC(msisaac_state::msisaac_bg2_scrolly_w)); - map(0xf0c4, 0xf0c4).w(this, FUNC(msisaac_state::msisaac_bg_scrollx_w)); - map(0xf0c5, 0xf0c5).w(this, FUNC(msisaac_state::msisaac_bg_scrolly_w)); + map(0xf0c0, 0xf0c0).w(FUNC(msisaac_state::msisaac_fg_scrollx_w)); + map(0xf0c1, 0xf0c1).w(FUNC(msisaac_state::msisaac_fg_scrolly_w)); + map(0xf0c2, 0xf0c2).w(FUNC(msisaac_state::msisaac_bg2_scrollx_w)); + map(0xf0c3, 0xf0c3).w(FUNC(msisaac_state::msisaac_bg2_scrolly_w)); + map(0xf0c4, 0xf0c4).w(FUNC(msisaac_state::msisaac_bg_scrollx_w)); + map(0xf0c5, 0xf0c5).w(FUNC(msisaac_state::msisaac_bg_scrolly_w)); - map(0xf0e0, 0xf0e0).rw(this, FUNC(msisaac_state::msisaac_mcu_r), FUNC(msisaac_state::msisaac_mcu_w)); - map(0xf0e1, 0xf0e1).r(this, FUNC(msisaac_state::msisaac_mcu_status_r)); + map(0xf0e0, 0xf0e0).rw(FUNC(msisaac_state::msisaac_mcu_r), FUNC(msisaac_state::msisaac_mcu_w)); + map(0xf0e1, 0xf0e1).r(FUNC(msisaac_state::msisaac_mcu_status_r)); map(0xf080, 0xf080).portr("DSW1"); map(0xf081, 0xf081).portr("DSW2"); @@ -206,9 +206,9 @@ void msisaac_state::msisaac_map(address_map &map) // AM_RANGE(0xf086, 0xf086) AM_READ_PORT("IN2") map(0xf100, 0xf17f).ram().share("spriteram"); //sprites - map(0xf400, 0xf7ff).ram().w(this, FUNC(msisaac_state::msisaac_fg_videoram_w)).share("videoram"); - map(0xf800, 0xfbff).ram().w(this, FUNC(msisaac_state::msisaac_bg2_videoram_w)).share("videoram3"); - map(0xfc00, 0xffff).ram().w(this, FUNC(msisaac_state::msisaac_bg_videoram_w)).share("videoram2"); + map(0xf400, 0xf7ff).ram().w(FUNC(msisaac_state::msisaac_fg_videoram_w)).share("videoram"); + map(0xf800, 0xfbff).ram().w(FUNC(msisaac_state::msisaac_bg2_videoram_w)).share("videoram3"); + map(0xfc00, 0xffff).ram().w(FUNC(msisaac_state::msisaac_bg_videoram_w)).share("videoram2"); // AM_RANGE(0xf801, 0xf801) AM_WRITE(msisaac_bgcolor_w) // AM_RANGE(0xfc00, 0xfc00) AM_WRITE(flip_screen_w) // AM_RANGE(0xfc03, 0xfc04) AM_WRITE(msisaac_coin_counter_w) @@ -248,11 +248,11 @@ void msisaac_state::msisaac_sound_map(address_map &map) map(0x8000, 0x8001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x8002, 0x8003).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x8010, 0x801d).w(m_msm, FUNC(msm5232_device::write)); - map(0x8020, 0x8020).w(this, FUNC(msisaac_state::sound_control_0_w)); - map(0x8030, 0x8030).w(this, FUNC(msisaac_state::sound_control_1_w)); + map(0x8020, 0x8020).w(FUNC(msisaac_state::sound_control_0_w)); + map(0x8030, 0x8030).w(FUNC(msisaac_state::sound_control_1_w)); map(0xc000, 0xc000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xc001, 0xc001).w(this, FUNC(msisaac_state::nmi_enable_w)); - map(0xc002, 0xc002).w(this, FUNC(msisaac_state::nmi_disable_w)); + map(0xc001, 0xc001).w(FUNC(msisaac_state::nmi_enable_w)); + map(0xc002, 0xc002).w(FUNC(msisaac_state::nmi_disable_w)); map(0xc003, 0xc003).nopw(); /*???*/ /* this is NOT mixer_enable */ map(0xe000, 0xffff).nopr(); /*space for diagnostic ROM (not dumped, not reachable) */ } diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp index a1a30b0f13e..2f62c2b3ee8 100644 --- a/src/mame/drivers/mstation.cpp +++ b/src/mame/drivers/mstation.cpp @@ -261,9 +261,9 @@ void mstation_state::mstation_banked_map(address_map &map) map(0x0000000, 0x00fffff).mirror(0x0300000).rw("flash0", FUNC(intelfsh8_device::read), FUNC(intelfsh8_device::write)); map(0x0400000, 0x041ffff).mirror(0x03e0000).ram().share("nvram"); map(0x0c00000, 0x0c7ffff).mirror(0x0380000).rw("flash1", FUNC(intelfsh8_device::read), FUNC(intelfsh8_device::write)); - map(0x0800000, 0x0803fff).mirror(0x03fc000).rw(this, FUNC(mstation_state::lcd_left_r), FUNC(mstation_state::lcd_left_w)); - map(0x1000000, 0x1003fff).mirror(0x03fc000).rw(this, FUNC(mstation_state::lcd_right_r), FUNC(mstation_state::lcd_right_w)); - map(0x1400000, 0x1403fff).mirror(0x03fc000).rw(this, FUNC(mstation_state::modem_r), FUNC(mstation_state::modem_w)); + map(0x0800000, 0x0803fff).mirror(0x03fc000).rw(FUNC(mstation_state::lcd_left_r), FUNC(mstation_state::lcd_left_w)); + map(0x1000000, 0x1003fff).mirror(0x03fc000).rw(FUNC(mstation_state::lcd_right_r), FUNC(mstation_state::lcd_right_w)); + map(0x1400000, 0x1403fff).mirror(0x03fc000).rw(FUNC(mstation_state::modem_r), FUNC(mstation_state::modem_w)); } void mstation_state::mstation_mem(address_map &map) @@ -277,12 +277,12 @@ void mstation_state::mstation_mem(address_map &map) void mstation_state::mstation_io(address_map &map) { map.global_mask(0xff); - map(0x01, 0x01).rw(this, FUNC(mstation_state::kb_r), FUNC(mstation_state::kb_w)); - map(0x02, 0x02).w(this, FUNC(mstation_state::port2_w)); - map(0x03, 0x03).rw(this, FUNC(mstation_state::irq_r), FUNC(mstation_state::irq_w)); - map(0x05, 0x06).rw(this, FUNC(mstation_state::bank1_r), FUNC(mstation_state::bank1_w)); - map(0x07, 0x08).rw(this, FUNC(mstation_state::bank2_r), FUNC(mstation_state::bank2_w)); - map(0x09, 0x09).r(this, FUNC(mstation_state::battery_status_r)); + map(0x01, 0x01).rw(FUNC(mstation_state::kb_r), FUNC(mstation_state::kb_w)); + map(0x02, 0x02).w(FUNC(mstation_state::port2_w)); + map(0x03, 0x03).rw(FUNC(mstation_state::irq_r), FUNC(mstation_state::irq_w)); + map(0x05, 0x06).rw(FUNC(mstation_state::bank1_r), FUNC(mstation_state::bank1_w)); + map(0x07, 0x08).rw(FUNC(mstation_state::bank2_r), FUNC(mstation_state::bank2_w)); + map(0x09, 0x09).r(FUNC(mstation_state::battery_status_r)); map(0x10, 0x1f).rw("rtc", FUNC(rp5c01_device::read), FUNC(rp5c01_device::write)); //AM_RANGE( 0x2c, 0x2c ) printer } diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index 223f9f45f3b..cf6427f2232 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -541,8 +541,8 @@ PCB Layouts missing void msx_state::msx_memory_map(address_map &map) { - map(0x0000, 0xfffe).rw(this, FUNC(msx_state::msx_mem_read), FUNC(msx_state::msx_mem_write)); - map(0xffff, 0xffff).rw(this, FUNC(msx_state::msx_sec_slot_r), FUNC(msx_state::msx_sec_slot_w)); + map(0x0000, 0xfffe).rw(FUNC(msx_state::msx_mem_read), FUNC(msx_state::msx_mem_write)); + map(0xffff, 0xffff).rw(FUNC(msx_state::msx_sec_slot_r), FUNC(msx_state::msx_sec_slot_w)); } @@ -560,14 +560,14 @@ void msx_state::msx_io_map(address_map &map) map.unmap_value_high(); map.global_mask(0xff); // 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system - map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write)); - map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write)); - map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(this, FUNC(msx_state::msx_ay8910_w)); + map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w)); + map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(FUNC(msx_state::msx_ay8910_w)); map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x98, 0x98).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x99, 0x99).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0xd8, 0xd9).rw(this, FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w)); + map(0x98, 0x98).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x99, 0x99).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0xd8, 0xd9).rw(FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w)); // 0xfc - 0xff : Memory mapper I/O ports. I/O handlers will be installed if a memory mapper is present in a system } @@ -576,17 +576,17 @@ void msx_state::msx2_io_map(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x40, 0x4f).rw(this, FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w)); + map(0x40, 0x4f).rw(FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w)); // 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system - map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write)); - map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write)); - map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(this, FUNC(msx_state::msx_ay8910_w)); + map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w)); + map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(FUNC(msx_state::msx_ay8910_w)); map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x98, 0x9b).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); - map(0xb4, 0xb4).w(this, FUNC(msx_state::msx_rtc_latch_w)); - map(0xb5, 0xb5).rw(this, FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w)); - map(0xd8, 0xd9).rw(this, FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w)); + map(0xb4, 0xb4).w(FUNC(msx_state::msx_rtc_latch_w)); + map(0xb5, 0xb5).rw(FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w)); + map(0xd8, 0xd9).rw(FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w)); // 0xfc - 0xff : Memory mapper I/O ports. I/O handlers will be installed if a memory mapper is present in a system } @@ -595,17 +595,17 @@ void msx_state::msx2p_io_map(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x40, 0x4f).rw(this, FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w)); + map(0x40, 0x4f).rw(FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w)); // 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system - map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write)); - map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write)); - map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(this, FUNC(msx_state::msx_ay8910_w)); + map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w)); + map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(FUNC(msx_state::msx_ay8910_w)); map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x98, 0x9b).rw(m_v9958, FUNC(v9958_device::read), FUNC(v9958_device::write)); - map(0xb4, 0xb4).w(this, FUNC(msx_state::msx_rtc_latch_w)); - map(0xb5, 0xb5).rw(this, FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w)); - map(0xd8, 0xd9).rw(this, FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w)); + map(0xb4, 0xb4).w(FUNC(msx_state::msx_rtc_latch_w)); + map(0xb5, 0xb5).rw(FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w)); + map(0xd8, 0xd9).rw(FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w)); // 0xfc - 0xff : Memory mapper I/O ports. I/O handlers will be installed if a memory mapper is present in a system } diff --git a/src/mame/drivers/mt735.cpp b/src/mame/drivers/mt735.cpp index 8e6b07885f9..0589f3231ef 100644 --- a/src/mame/drivers/mt735.cpp +++ b/src/mame/drivers/mt735.cpp @@ -55,8 +55,8 @@ void mt735_state::mt735_map(address_map &map) map(0x000000, 0x03ffff).rom().region("maincpu", 0); map(0x278000, 0x287fff).ram(); map(0x400000, 0x4fffff).ram(); - map(0xff8004, 0xff8004).r(this, FUNC(mt735_state::p4_r)); - map(0xff8005, 0xff8005).r(this, FUNC(mt735_state::p5_r)); + map(0xff8004, 0xff8004).r(FUNC(mt735_state::p4_r)); + map(0xff8005, 0xff8005).r(FUNC(mt735_state::p5_r)); } static INPUT_PORTS_START( mt735 ) diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp index 23b73beb76d..d697cbd796e 100644 --- a/src/mame/drivers/mtouchxl.cpp +++ b/src/mame/drivers/mtouchxl.cpp @@ -132,9 +132,9 @@ void mtxl_state::at32_io(address_map &map) map(0x0224, 0x0227).rw("cs4231", FUNC(ad1848_device::read), FUNC(ad1848_device::write)); #endif map(0x0228, 0x022b).portr("Unknown"); - map(0x022f, 0x022f).w(this, FUNC(mtxl_state::bank_w)); - map(0x022d, 0x022d).rw(this, FUNC(mtxl_state::key_r), FUNC(mtxl_state::key_w)); - map(0x022c, 0x022c).r(this, FUNC(mtxl_state::coin_r)); + map(0x022f, 0x022f).w(FUNC(mtxl_state::bank_w)); + map(0x022d, 0x022d).rw(FUNC(mtxl_state::key_r), FUNC(mtxl_state::key_w)); + map(0x022c, 0x022c).r(FUNC(mtxl_state::coin_r)); #ifndef REAL_PCI_CHIPSET map(0x03f8, 0x03ff).rw("ns16550", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); #endif diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index 99fc7c035c7..b999d55f6d5 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -57,26 +57,26 @@ void mtx_state::mtx_mem(address_map &map) void mtx_state::mtx_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(mtx_state::mtx_strobe_r), FUNC(mtx_state::mtx_bankswitch_w)); - map(0x01, 0x01).rw("tms9929a", FUNC(tms9929a_device::vram_read), FUNC(tms9929a_device::vram_write)); - map(0x02, 0x02).rw("tms9929a", FUNC(tms9929a_device::register_read), FUNC(tms9929a_device::register_write)); - map(0x03, 0x03).rw(this, FUNC(mtx_state::mtx_sound_strobe_r), FUNC(mtx_state::mtx_cst_w)); - map(0x04, 0x04).r(this, FUNC(mtx_state::mtx_prt_r)).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x05, 0x05).rw(this, FUNC(mtx_state::mtx_key_lo_r), FUNC(mtx_state::mtx_sense_w)); - map(0x06, 0x06).rw(this, FUNC(mtx_state::mtx_key_hi_r), FUNC(mtx_state::mtx_sound_latch_w)); + map(0x00, 0x00).rw(FUNC(mtx_state::mtx_strobe_r), FUNC(mtx_state::mtx_bankswitch_w)); + map(0x01, 0x01).rw("tms9929a", FUNC(tms9929a_device::vram_r), FUNC(tms9929a_device::vram_w)); + map(0x02, 0x02).rw("tms9929a", FUNC(tms9929a_device::register_r), FUNC(tms9929a_device::register_w)); + map(0x03, 0x03).rw(FUNC(mtx_state::mtx_sound_strobe_r), FUNC(mtx_state::mtx_cst_w)); + map(0x04, 0x04).r(FUNC(mtx_state::mtx_prt_r)).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x05, 0x05).rw(FUNC(mtx_state::mtx_key_lo_r), FUNC(mtx_state::mtx_sense_w)); + map(0x06, 0x06).rw(FUNC(mtx_state::mtx_key_hi_r), FUNC(mtx_state::mtx_sound_latch_w)); // map(0x07, 0x07) PIO map(0x08, 0x0b).rw(m_z80ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x1f, 0x1f).w(this, FUNC(mtx_state::mtx_cst_motor_w)); - map(0x30, 0x31).w(this, FUNC(mtx_state::hrx_address_w)); - map(0x32, 0x32).rw(this, FUNC(mtx_state::hrx_data_r), FUNC(mtx_state::hrx_data_w)); - map(0x33, 0x33).rw(this, FUNC(mtx_state::hrx_attr_r), FUNC(mtx_state::hrx_attr_w)); + map(0x1f, 0x1f).w(FUNC(mtx_state::mtx_cst_motor_w)); + map(0x30, 0x31).w(FUNC(mtx_state::hrx_address_w)); + map(0x32, 0x32).rw(FUNC(mtx_state::hrx_data_r), FUNC(mtx_state::hrx_data_w)); + map(0x33, 0x33).rw(FUNC(mtx_state::hrx_attr_r), FUNC(mtx_state::hrx_attr_w)); // map(0x38, 0x38).w(MC6845_TAG, FUNC(mc6845_device::address_w)); // map(0x39, 0x39).rw(MC6845_TAG, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); /* map(0x40, 0x43).rw(FD1791_TAG, FUNC(fd1791_device::read), FUNC(fd1791_device::write)); - map(0x44, 0x44).rw(this, FUNC(mtx_state::fdx_status_r), FUNC(mtx_state::fdx_control_w)); - map(0x45, 0x45).w(this, FUNC(mtx_state::fdx_drv_sel_w)); - map(0x46, 0x46).w(this, FUNC(mtx_state::fdx_dma_lo_w)); - map(0x47, 0x47).w(this, FUNC(mtx_state::fdx_dma_hi_w);*/ + map(0x44, 0x44).rw(FUNC(mtx_state::fdx_status_r), FUNC(mtx_state::fdx_control_w)); + map(0x45, 0x45).w(FUNC(mtx_state::fdx_drv_sel_w)); + map(0x46, 0x46).w(FUNC(mtx_state::fdx_dma_lo_w)); + map(0x47, 0x47).w(FUNC(mtx_state::fdx_dma_hi_w);*/ } /*------------------------------------------------- diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp index 7ed0c770fd3..43cb683d017 100644 --- a/src/mame/drivers/mugsmash.cpp +++ b/src/mame/drivers/mugsmash.cpp @@ -178,16 +178,16 @@ READ16_MEMBER(mugsmash_state::mugsmash_input_ports_r) void mugsmash_state::mugsmash_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x080fff).ram().w(this, FUNC(mugsmash_state::mugsmash_videoram1_w)).share("videoram1"); - map(0x082000, 0x082fff).ram().w(this, FUNC(mugsmash_state::mugsmash_videoram2_w)).share("videoram2"); - map(0x0c0000, 0x0c0007).w(this, FUNC(mugsmash_state::mugsmash_reg_w)).share("regs1"); /* video registers*/ + map(0x080000, 0x080fff).ram().w(FUNC(mugsmash_state::mugsmash_videoram1_w)).share("videoram1"); + map(0x082000, 0x082fff).ram().w(FUNC(mugsmash_state::mugsmash_videoram2_w)).share("videoram2"); + map(0x0c0000, 0x0c0007).w(FUNC(mugsmash_state::mugsmash_reg_w)).share("regs1"); /* video registers*/ map(0x100000, 0x1005ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x140000, 0x140007).w(this, FUNC(mugsmash_state::mugsmash_reg2_w)).share("regs2"); /* sound + ? */ + map(0x140000, 0x140007).w(FUNC(mugsmash_state::mugsmash_reg2_w)).share("regs2"); /* sound + ? */ map(0x1c0000, 0x1c3fff).ram(); /* main ram? */ map(0x1c4000, 0x1cffff).ram(); map(0x200000, 0x203fff).ram().share("spriteram"); /* sprite ram */ #if USE_FAKE_INPUT_PORTS - map(0x180000, 0x180007).r(this, FUNC(mugsmash_state::mugsmash_input_ports_r)); + map(0x180000, 0x180007).r(FUNC(mugsmash_state::mugsmash_input_ports_r)); #else map(0x180000, 0x180001).portr("IN0"); map(0x180002, 0x180003).portr("IN1"); diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp index 3dd3c850059..f9f91b212a1 100644 --- a/src/mame/drivers/multfish.cpp +++ b/src/mame/drivers/multfish.cpp @@ -681,10 +681,10 @@ void igrosoft_gamble_state::init_crzmon2ent() void igrosoft_gamble_state::igrosoft_gamble_map(address_map &map) { - map(0x0000, 0x7fff).rom().w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_vid_w)); + map(0x0000, 0x7fff).rom().w(FUNC(igrosoft_gamble_state::igrosoft_gamble_vid_w)); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xdfff).rw(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_timekeeper_r), FUNC(igrosoft_gamble_state::igrosoft_gamble_timekeeper_w)); - map(0xe000, 0xffff).rw(this, FUNC(igrosoft_gamble_state::bankedram_r), FUNC(igrosoft_gamble_state::bankedram_w)); + map(0xc000, 0xdfff).rw(FUNC(igrosoft_gamble_state::igrosoft_gamble_timekeeper_r), FUNC(igrosoft_gamble_state::igrosoft_gamble_timekeeper_w)); + map(0xe000, 0xffff).rw(FUNC(igrosoft_gamble_state::bankedram_r), FUNC(igrosoft_gamble_state::bankedram_w)); } // According to control panel the user buttons are arranged as @@ -926,63 +926,63 @@ void igrosoft_gamble_state::igrosoft_gamble_portmap(address_map &map) map(0x17, 0x17).portr("IN7"); /* Write ports not hooked up yet */ - map(0x30, 0x30).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_lamps1_w)); - map(0x31, 0x31).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_counters_w)); + map(0x30, 0x30).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_lamps1_w)); + map(0x31, 0x31).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_counters_w)); // AM_RANGE(0x32, 0x32) AM_WRITE(igrosoft_gamble_port32_w) - map(0x33, 0x33).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_hopper_w)); - map(0x34, 0x34).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_lamps2_w)); - map(0x35, 0x35).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_lamps3_w)); + map(0x33, 0x33).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_hopper_w)); + map(0x34, 0x34).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_lamps2_w)); + map(0x35, 0x35).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_lamps3_w)); // AM_RANGE(0x36, 0x36) AM_WRITE(igrosoft_gamble_port36_w) map(0x37, 0x37).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x38, 0x38).w("aysnd", FUNC(ay8910_device::address_w)); map(0x39, 0x39).w("aysnd", FUNC(ay8910_device::data_w)); map(0x3a, 0x3a).r("aysnd", FUNC(ay8910_device::data_r)); - map(0x60, 0x60).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_dispenable_w)); // display enable mirror for lottery sets - - map(0x90, 0x90).r(this, FUNC(igrosoft_gamble_state::ray_r)); - - map(0xa0, 0xa0).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey 2 banking - map(0xa5, 0xa5).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey 2 Ent banking - map(0xb0, 0xb0).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail 2 lottery banking - map(0xb1, 0xb1).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey Ent banking - map(0xb2, 0xb2).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Lacky Haunter Ent banking - map(0xb3, 0xb3).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail Ent banking - map(0xb4, 0xb4).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail 2 Ent banking - map(0xb5, 0xb5).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Garage Ent banking - map(0xb6, 0xb6).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Resident Ent banking - map(0xb7, 0xb7).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Rock Climber Ent banking - map(0xb9, 0xb9).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Sweet Life 2 Ent banking - map(0xbb, 0xbb).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Island 2 Ent banking - map(0xbd, 0xbd).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Pirate 2 Ent banking - map(0xbe, 0xbe).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Keks Ent banking - map(0xbf, 0xbf).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gnome Ent banking - map(0xc7, 0xc7).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Resident lottery banking - map(0xca, 0xca).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gnome lottery banking - map(0xcb, 0xcb).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Keks lottery banking - map(0xcc, 0xcc).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Sweet Life 2 lottery banking - map(0xcd, 0xcd).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Island 2 lottery banking - map(0xce, 0xce).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Pirate 2 lottery banking - map(0xd0, 0xd0).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // rollfr_4 banking - map(0xe1, 0xe1).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Island 2 banking - map(0xe5, 0xe5).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gnome banking - map(0xe8, 0xe8).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Sweet Life 2 banking - map(0xea, 0xea).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail 2 banking - map(0xec, 0xec).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey lottery banking - - map(0xf0, 0xf0).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gold Fish banking - map(0xf1, 0xf1).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_rambank_w)); - map(0xf3, 0xf3).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_f3_w)); // from 00->01 at startup, irq enable maybe? - map(0xf4, 0xf4).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_dispenable_w)); // display enable + map(0x60, 0x60).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_dispenable_w)); // display enable mirror for lottery sets + + map(0x90, 0x90).r(FUNC(igrosoft_gamble_state::ray_r)); + + map(0xa0, 0xa0).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey 2 banking + map(0xa5, 0xa5).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey 2 Ent banking + map(0xb0, 0xb0).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail 2 lottery banking + map(0xb1, 0xb1).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey Ent banking + map(0xb2, 0xb2).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Lacky Haunter Ent banking + map(0xb3, 0xb3).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail Ent banking + map(0xb4, 0xb4).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail 2 Ent banking + map(0xb5, 0xb5).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Garage Ent banking + map(0xb6, 0xb6).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Resident Ent banking + map(0xb7, 0xb7).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Rock Climber Ent banking + map(0xb9, 0xb9).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Sweet Life 2 Ent banking + map(0xbb, 0xbb).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Island 2 Ent banking + map(0xbd, 0xbd).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Pirate 2 Ent banking + map(0xbe, 0xbe).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Keks Ent banking + map(0xbf, 0xbf).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gnome Ent banking + map(0xc7, 0xc7).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Resident lottery banking + map(0xca, 0xca).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gnome lottery banking + map(0xcb, 0xcb).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Keks lottery banking + map(0xcc, 0xcc).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Sweet Life 2 lottery banking + map(0xcd, 0xcd).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Island 2 lottery banking + map(0xce, 0xce).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Pirate 2 lottery banking + map(0xd0, 0xd0).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // rollfr_4 banking + map(0xe1, 0xe1).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Island 2 banking + map(0xe5, 0xe5).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gnome banking + map(0xe8, 0xe8).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Sweet Life 2 banking + map(0xea, 0xea).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Fruit Cocktail 2 banking + map(0xec, 0xec).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Crazy Monkey lottery banking + + map(0xf0, 0xf0).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); // Gold Fish banking + map(0xf1, 0xf1).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_rambank_w)); + map(0xf3, 0xf3).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_f3_w)); // from 00->01 at startup, irq enable maybe? + map(0xf4, 0xf4).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_dispenable_w)); // display enable /* mirrors of the rom banking */ - map(0xf8, 0xfd).w(this, FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); + map(0xf8, 0xfd).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_bank_w)); } void igrosoft_gamble_state::rollfr_portmap(address_map &map) { igrosoft_gamble_portmap(map); - map(0x33, 0x33).w(this, FUNC(igrosoft_gamble_state::rollfr_hopper_w)); + map(0x33, 0x33).w(FUNC(igrosoft_gamble_state::rollfr_hopper_w)); } static const gfx_layout tiles16x16_layout = diff --git a/src/mame/drivers/multi16.cpp b/src/mame/drivers/multi16.cpp index 14bd98445eb..35d34c38ec9 100644 --- a/src/mame/drivers/multi16.cpp +++ b/src/mame/drivers/multi16.cpp @@ -117,8 +117,8 @@ void multi16_state::multi16_io(address_map &map) { map.unmap_value_high(); map(0x02, 0x03).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); // i8259 - map(0x40, 0x40).w(this, FUNC(multi16_state::multi16_6845_address_w)); - map(0x41, 0x41).w(this, FUNC(multi16_state::multi16_6845_data_w)); + map(0x40, 0x40).w(FUNC(multi16_state::multi16_6845_address_w)); + map(0x41, 0x41).w(FUNC(multi16_state::multi16_6845_data_w)); } /* Input ports */ diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp index 00e70768f0b..c5d3452b958 100644 --- a/src/mame/drivers/multi8.cpp +++ b/src/mame/drivers/multi8.cpp @@ -292,7 +292,7 @@ void multi8_state::multi8_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x7fff).rom(); - map(0x8000, 0xbfff).rw(this, FUNC(multi8_state::vram_r), FUNC(multi8_state::vram_w)); + map(0x8000, 0xbfff).rw(FUNC(multi8_state::vram_r), FUNC(multi8_state::vram_w)); map(0xc000, 0xffff).ram(); } @@ -300,11 +300,11 @@ void multi8_state::multi8_io(address_map &map) { // ADDRESS_MAP_UNMAP_HIGH map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(multi8_state::key_input_r)); //keyboard - map(0x01, 0x01).r(this, FUNC(multi8_state::key_status_r)); //keyboard + map(0x00, 0x00).r(FUNC(multi8_state::key_input_r)); //keyboard + map(0x01, 0x01).r(FUNC(multi8_state::key_status_r)); //keyboard map(0x18, 0x19).w(m_aysnd, FUNC(ay8910_device::address_data_w)); - map(0x18, 0x18).r(this, FUNC(multi8_state::ay8912_0_r)); - map(0x1a, 0x1a).r(this, FUNC(multi8_state::ay8912_1_r)); + map(0x18, 0x18).r(FUNC(multi8_state::ay8912_0_r)); + map(0x1a, 0x1a).r(FUNC(multi8_state::ay8912_1_r)); map(0x1c, 0x1c).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x1d, 0x1d).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x20, 0x20).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); @@ -312,8 +312,8 @@ void multi8_state::multi8_io(address_map &map) map(0x24, 0x27).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); //pit map(0x28, 0x2b).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x2c, 0x2d).rw("pic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); //i8259 - map(0x30, 0x37).rw(this, FUNC(multi8_state::pal_r), FUNC(multi8_state::pal_w)); - map(0x40, 0x41).rw(this, FUNC(multi8_state::kanji_r), FUNC(multi8_state::kanji_w)); //kanji regs + map(0x30, 0x37).rw(FUNC(multi8_state::pal_r), FUNC(multi8_state::pal_w)); + map(0x40, 0x41).rw(FUNC(multi8_state::kanji_r), FUNC(multi8_state::kanji_w)); //kanji regs // AM_RANGE(0x70, 0x74) //upd765a fdc // AM_RANGE(0x78, 0x78) //memory banking } diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp index 103c5dd446f..77ab411083b 100644 --- a/src/mame/drivers/multigam.cpp +++ b/src/mame/drivers/multigam.cpp @@ -405,16 +405,16 @@ void multigam_state::multigam_map(address_map &map) map(0x0000, 0x07ff).ram(); /* NES RAM */ map(0x0800, 0x0fff).ram(); /* additional RAM */ map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(multigam_state::sprite_dma_w)); - map(0x4016, 0x4016).rw(this, FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(this, FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x4014, 0x4014).w(FUNC(multigam_state::sprite_dma_w)); + map(0x4016, 0x4016).rw(FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ + map(0x4017, 0x4017).r(FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ map(0x5000, 0x5ffe).rom(); map(0x5002, 0x5002).nopw(); map(0x5fff, 0x5fff).portr("IN0"); map(0x6000, 0x7fff).rom(); - map(0x6fff, 0x6fff).w(this, FUNC(multigam_state::multigam_switch_prg_rom)); - map(0x7fff, 0x7fff).w(this, FUNC(multigam_state::multigam_switch_gfx_rom)); - map(0x8000, 0xffff).rom().w(this, FUNC(multigam_state::multigam_mapper2_w)); + map(0x6fff, 0x6fff).w(FUNC(multigam_state::multigam_switch_prg_rom)); + map(0x7fff, 0x7fff).w(FUNC(multigam_state::multigam_switch_gfx_rom)); + map(0x8000, 0xffff).rom().w(FUNC(multigam_state::multigam_mapper2_w)); } void multigam_state::multigmt_map(address_map &map) @@ -422,16 +422,16 @@ void multigam_state::multigmt_map(address_map &map) map(0x0000, 0x07ff).ram(); /* NES RAM */ map(0x0800, 0x0fff).ram(); /* additional RAM */ map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x3000, 0x3000).w(this, FUNC(multigam_state::multigam_switch_prg_rom)); - map(0x3fff, 0x3fff).w(this, FUNC(multigam_state::multigam_switch_gfx_rom)); - map(0x4014, 0x4014).w(this, FUNC(multigam_state::sprite_dma_w)); - map(0x4016, 0x4016).rw(this, FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(this, FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x3000, 0x3000).w(FUNC(multigam_state::multigam_switch_prg_rom)); + map(0x3fff, 0x3fff).w(FUNC(multigam_state::multigam_switch_gfx_rom)); + map(0x4014, 0x4014).w(FUNC(multigam_state::sprite_dma_w)); + map(0x4016, 0x4016).rw(FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ + map(0x4017, 0x4017).r(FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ map(0x5000, 0x5ffe).rom(); map(0x5002, 0x5002).nopw(); map(0x5fff, 0x5fff).portr("IN0"); map(0x6000, 0x7fff).rom(); - map(0x8000, 0xffff).rom().w(this, FUNC(multigam_state::multigam_mapper2_w)); + map(0x8000, 0xffff).rom().w(FUNC(multigam_state::multigam_mapper2_w)); } /****************************************************** @@ -686,17 +686,17 @@ void multigam_state::multigm3_map(address_map &map) map(0x0000, 0x07ff).ram(); /* NES RAM */ map(0x0800, 0x0fff).ram(); /* additional RAM */ map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(multigam_state::sprite_dma_w)); - map(0x4016, 0x4016).rw(this, FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(this, FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ - map(0x5001, 0x5001).w(this, FUNC(multigam_state::multigm3_switch_prg_rom)); + map(0x4014, 0x4014).w(FUNC(multigam_state::sprite_dma_w)); + map(0x4016, 0x4016).rw(FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ + map(0x4017, 0x4017).r(FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x5001, 0x5001).w(FUNC(multigam_state::multigm3_switch_prg_rom)); map(0x5002, 0x5002).nopw(); - map(0x5003, 0x5003).w(this, FUNC(multigam_state::multigm3_switch_gfx_rom)); + map(0x5003, 0x5003).w(FUNC(multigam_state::multigm3_switch_gfx_rom)); map(0x5000, 0x5ffe).rom(); map(0x5fff, 0x5fff).portr("IN0"); map(0x6000, 0x7fff).bankrw("bank10"); map(0x6fff, 0x6fff).nopw(); /* 0x00 in attract mode, 0xff during play */ - map(0x8000, 0xffff).rom().w(this, FUNC(multigam_state::multigm3_mapper2_w)); + map(0x8000, 0xffff).rom().w(FUNC(multigam_state::multigm3_mapper2_w)); } /****************************************************** @@ -987,14 +987,14 @@ void multigam_state::supergm3_map(address_map &map) map(0x0000, 0x07ff).ram(); /* NES RAM */ map(0x0800, 0x0fff).ram(); /* additional RAM */ map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(multigam_state::sprite_dma_w)); - map(0x4016, 0x4016).rw(this, FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(this, FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x4014, 0x4014).w(FUNC(multigam_state::sprite_dma_w)); + map(0x4016, 0x4016).rw(FUNC(multigam_state::multigam_IN0_r), FUNC(multigam_state::multigam_IN0_w)); /* IN0 - input port 1 */ + map(0x4017, 0x4017).r(FUNC(multigam_state::multigam_IN1_r)); /* IN1 - input port 2 / PSG second control register */ map(0x4fff, 0x4fff).portr("IN0"); map(0x5000, 0x5fff).rom(); map(0x5000, 0x5000).nopw(); - map(0x5001, 0x5001).w(this, FUNC(multigam_state::supergm3_prg_bank_w)); - map(0x5002, 0x5002).w(this, FUNC(multigam_state::supergm3_chr_bank_w)); + map(0x5001, 0x5001).w(FUNC(multigam_state::supergm3_prg_bank_w)); + map(0x5002, 0x5002).w(FUNC(multigam_state::supergm3_chr_bank_w)); map(0x5fff, 0x5fff).nopw(); map(0x6000, 0x7fff).bankrw("bank10"); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp index f015fa453cd..161fe5a81a5 100644 --- a/src/mame/drivers/munchmo.cpp +++ b/src/mame/drivers/munchmo.cpp @@ -110,7 +110,7 @@ void munchmo_state::mnchmobl_map(address_map &map) }); map(0xbe02, 0xbe02).portr("DSW1"); map(0xbe03, 0xbe03).portr("DSW2"); - map(0xbf00, 0xbf00).w(this, FUNC(munchmo_state::nmi_ack_w)); // CNI 1-8C + map(0xbf00, 0xbf00).w(FUNC(munchmo_state::nmi_ack_w)); // CNI 1-8C map(0xbf01, 0xbf01).portr("SYSTEM"); map(0xbf02, 0xbf02).portr("P1"); map(0xbf03, 0xbf03).portr("P2"); @@ -126,9 +126,9 @@ void munchmo_state::sound_map(address_map &map) map(0x5000, 0x5fff).w("ay1", FUNC(ay8910_device::address_w)); map(0x6000, 0x6fff).w("ay2", FUNC(ay8910_device::data_w)); map(0x7000, 0x7fff).w("ay2", FUNC(ay8910_device::address_w)); - map(0x8000, 0x9fff).r(this, FUNC(munchmo_state::ay1reset_r)).w("ay1", FUNC(ay8910_device::reset_w)); - map(0xa000, 0xbfff).r(this, FUNC(munchmo_state::ay2reset_r)).w("ay2", FUNC(ay8910_device::reset_w)); - map(0xc000, 0xdfff).w(this, FUNC(munchmo_state::sound_nmi_ack_w)); // NCL 1-8H + map(0x8000, 0x9fff).r(FUNC(munchmo_state::ay1reset_r)).w("ay1", FUNC(ay8910_device::reset_w)); + map(0xa000, 0xbfff).r(FUNC(munchmo_state::ay2reset_r)).w("ay2", FUNC(ay8910_device::reset_w)); + map(0xc000, 0xdfff).w(FUNC(munchmo_state::sound_nmi_ack_w)); // NCL 1-8H map(0xe000, 0xe7ff).mirror(0x1800).ram(); // is mirror ok? } diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp index 1f8a66c43e0..16a8e1b17da 100644 --- a/src/mame/drivers/murogem.cpp +++ b/src/mame/drivers/murogem.cpp @@ -162,7 +162,7 @@ void murogem_state::murogem_map(address_map &map) map(0x4001, 0x4001).w("crtc", FUNC(mc6845_device::register_w)); map(0x5000, 0x5000).portr("IN0"); map(0x5800, 0x5800).portr("IN1"); - map(0x7000, 0x7000).w(this, FUNC(murogem_state::outport_w)); /* output port */ + map(0x7000, 0x7000).w(FUNC(murogem_state::outport_w)); /* output port */ map(0x8000, 0x87ff).ram().share("videoram"); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp index 3f53a474d97..8f78b7ca098 100644 --- a/src/mame/drivers/murogmbl.cpp +++ b/src/mame/drivers/murogmbl.cpp @@ -154,7 +154,7 @@ void murogmbl_state::murogmbl_map(address_map &map) map(0x6000, 0x6000).portr("IN0"); map(0x6800, 0x6800).portr("DSW"); map(0x7000, 0x7000).portr("IN1"); - map(0x7800, 0x7800).nopr().w("dac", FUNC(dac_byte_interface::write)); /* read is always discarded */ + map(0x7800, 0x7800).nopr().w("dac", FUNC(dac_byte_interface::data_w)); /* read is always discarded */ } void slotunbl_state::slotunbl_map(address_map &map) @@ -167,7 +167,7 @@ void slotunbl_state::slotunbl_map(address_map &map) map(0x6000, 0x6000).portr("IN0"); map(0x6800, 0x6800).portr("DSW"); map(0x7000, 0x7000).portr("IN1"); - map(0x7800, 0x7800).nopr().w("dac", FUNC(dac_byte_interface::write)); /* read is always discarded */ + map(0x7800, 0x7800).nopr().w("dac", FUNC(dac_byte_interface::data_w)); /* read is always discarded */ } void murogmbl_state::video_start() diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp index 40017afcf62..8c3bce539b7 100644 --- a/src/mame/drivers/mustache.cpp +++ b/src/mame/drivers/mustache.cpp @@ -49,7 +49,7 @@ void mustache_state::memmap(address_map &map) { map(0x0000, 0x7fff).r("sei80bu", FUNC(sei80bu_device::data_r)); map(0x8000, 0xbfff).rom(); - map(0xc000, 0xcfff).ram().w(this, FUNC(mustache_state::videoram_w)).share("videoram"); + map(0xc000, 0xcfff).ram().w(FUNC(mustache_state::videoram_w)).share("videoram"); map(0xd000, 0xd000).w("t5182", FUNC(t5182_device::sound_irq_w)); map(0xd001, 0xd001).r("t5182", FUNC(t5182_device::sharedram_semaphore_snd_r)); map(0xd002, 0xd002).w("t5182", FUNC(t5182_device::sharedram_semaphore_main_acquire_w)); @@ -60,8 +60,8 @@ void mustache_state::memmap(address_map &map) map(0xd802, 0xd802).portr("START"); map(0xd803, 0xd803).portr("DSWA"); map(0xd804, 0xd804).portr("DSWB"); - map(0xd806, 0xd806).w(this, FUNC(mustache_state::scroll_w)); - map(0xd807, 0xd807).w(this, FUNC(mustache_state::video_control_w)); + map(0xd806, 0xd806).w(FUNC(mustache_state::scroll_w)); + map(0xd807, 0xd807).w(FUNC(mustache_state::video_control_w)); map(0xe800, 0xefff).writeonly().share("spriteram"); map(0xf000, 0xffff).ram(); } diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp index b54cb518430..97ec968a95b 100644 --- a/src/mame/drivers/mvme147.cpp +++ b/src/mame/drivers/mvme147.cpp @@ -238,8 +238,8 @@ private: void mvme147_state::mvme147_mem(address_map &map) { map.unmap_value_high(); - map(0x00000000, 0x00000007).ram().w(this, FUNC(mvme147_state::bootvect_w)); /* After first write we act as RAM */ - map(0x00000000, 0x00000007).rom().r(this, FUNC(mvme147_state::bootvect_r)); /* ROM mirror just during reset */ + map(0x00000000, 0x00000007).ram().w(FUNC(mvme147_state::bootvect_w)); /* After first write we act as RAM */ + map(0x00000000, 0x00000007).rom().r(FUNC(mvme147_state::bootvect_r)); /* ROM mirror just during reset */ map(0x00000008, 0x003fffff).ram(); /* 4 Mb RAM */ map(0xff800000, 0xff9fffff).rom().region("roms", 0x800000); //AM_MIRROR(0x00780000) /* ROM/EEPROM bank 1 - 147bug */ map(0xffa00000, 0xffbfffff).rom().region("roms", 0xa00000); //AM_MIRROR(0x00780000) /* ROM/EEPROM bank 2 - unpopulated */ @@ -248,9 +248,9 @@ void mvme147_state::mvme147_mem(address_map &map) map(0xfffe0000, 0xfffe0fff).rw("m48t18", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); //AM_RANGE (0xfffe1000, 0xfffe100f) AM_READWRITE32(pcc32_r, pcc32_w, 0xffffffff) /* PCC 32 bits registers - needs U64 cast defined to work */ - map(0xfffe1010, 0xfffe1017).rw(this, FUNC(mvme147_state::pcc16_r), FUNC(mvme147_state::pcc16_w)); /* PCC 16 bits registers */ - map(0xfffe1018, 0xfffe102f).rw(this, FUNC(mvme147_state::pcc8_r), FUNC(mvme147_state::pcc8_w)); /* PCC 8 bits registers */ - map(0xfffe2000, 0xfffe201b).rw(this, FUNC(mvme147_state::vmechip_r), FUNC(mvme147_state::vmechip_w)).umask32(0x00ff00ff); /* VMEchip 8 bits registers on odd adresses */ + map(0xfffe1010, 0xfffe1017).rw(FUNC(mvme147_state::pcc16_r), FUNC(mvme147_state::pcc16_w)); /* PCC 16 bits registers */ + map(0xfffe1018, 0xfffe102f).rw(FUNC(mvme147_state::pcc8_r), FUNC(mvme147_state::pcc8_w)); /* PCC 8 bits registers */ + map(0xfffe2000, 0xfffe201b).rw(FUNC(mvme147_state::vmechip_r), FUNC(mvme147_state::vmechip_w)).umask32(0x00ff00ff); /* VMEchip 8 bits registers on odd adresses */ map(0xfffe3000, 0xfffe3003).rw(m_sccterm, FUNC(scc85c30_device::ba_cd_inv_r), FUNC(scc85c30_device::ba_cd_inv_w)); /* Port 1&2 - Dual serial port Z80-SCC */ map(0xfffe3800, 0xfffe3803).rw(m_sccterm2, FUNC(scc85c30_device::ba_cd_inv_r), FUNC(scc85c30_device::ba_cd_inv_w)); /* Port 3&4 - Dual serial port Z80-SCC */ diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp index 48e4f3157a2..34ea290955f 100644 --- a/src/mame/drivers/mw18w.cpp +++ b/src/mame/drivers/mw18w.cpp @@ -178,13 +178,13 @@ void mw18w_state::mw18w_portmap(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w(this, FUNC(mw18w_state::mw18w_sound0_w)); - map(0x01, 0x01).portr("IN1").w(this, FUNC(mw18w_state::mw18w_sound1_w)); - map(0x02, 0x02).portr("IN2").w(this, FUNC(mw18w_state::mw18w_lamps_w)); - map(0x03, 0x03).portr("DSW").w(this, FUNC(mw18w_state::mw18w_led_display_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(mw18w_state::mw18w_sound0_w)); + map(0x01, 0x01).portr("IN1").w(FUNC(mw18w_state::mw18w_sound1_w)); + map(0x02, 0x02).portr("IN2").w(FUNC(mw18w_state::mw18w_lamps_w)); + map(0x03, 0x03).portr("DSW").w(FUNC(mw18w_state::mw18w_led_display_w)); map(0x04, 0x04).portr("IN4"); map(0x06, 0x06).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x07, 0x07).w(this, FUNC(mw18w_state::mw18w_irq0_clear_w)); + map(0x07, 0x07).w(FUNC(mw18w_state::mw18w_irq0_clear_w)); } diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp index f42417d37ff..d49f3643ff8 100644 --- a/src/mame/drivers/mw8080bw.cpp +++ b/src/mame/drivers/mw8080bw.cpp @@ -334,16 +334,16 @@ CUSTOM_INPUT_MEMBER(mw8080bw_state::seawolf_erase_input_r) void mw8080bw_state::seawolf_io_map(address_map &map) { map.global_mask(0x7); - map(0x00, 0x00).mirror(0x04).r(this, FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); + map(0x00, 0x00).mirror(0x04).r(FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); map(0x01, 0x01).mirror(0x04).portr("IN0"); map(0x02, 0x02).mirror(0x04).portr("IN1"); map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); - map(0x01, 0x01).w(this, FUNC(mw8080bw_state::seawolf_explosion_lamp_w)); - map(0x02, 0x02).w(this, FUNC(mw8080bw_state::seawolf_periscope_lamp_w)); + map(0x01, 0x01).w(FUNC(mw8080bw_state::seawolf_explosion_lamp_w)); + map(0x02, 0x02).w(FUNC(mw8080bw_state::seawolf_periscope_lamp_w)); map(0x03, 0x03).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::seawolf_audio_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::seawolf_audio_w)); } @@ -454,7 +454,7 @@ void mw8080bw_state::gunfight_io_map(address_map &map) map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); /* no decoder, just 3 AND gates */ - map(0x00, 0x07).w(this, FUNC(mw8080bw_state::gunfight_io_w)); + map(0x00, 0x07).w(FUNC(mw8080bw_state::gunfight_io_w)); } @@ -650,7 +650,7 @@ void mw8080bw_state::tornbase_io_map(address_map &map) map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); /* no decoder, just 3 AND gates */ - map(0x00, 0x07).w(this, FUNC(mw8080bw_state::tornbase_io_w)); + map(0x00, 0x07).w(FUNC(mw8080bw_state::tornbase_io_w)); } @@ -771,10 +771,10 @@ void mw8080bw_state::zzzap_io_map(address_map &map) map(0x02, 0x02).mirror(0x04).portr("IN2"); map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); - map(0x02, 0x02).w(this, FUNC(mw8080bw_state::zzzap_audio_1_w)); + map(0x02, 0x02).w(FUNC(mw8080bw_state::zzzap_audio_1_w)); map(0x03, 0x03).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::zzzap_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::zzzap_audio_2_w)); map(0x07, 0x07).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -930,7 +930,7 @@ void mw8080bw_state::maze_io_map(address_map &map) map(0x01, 0x01).portr("IN1"); /* no decoder, just a couple of AND gates */ - map(0x00, 0x03).w(this, FUNC(mw8080bw_state::maze_io_w)); + map(0x00, 0x03).w(FUNC(mw8080bw_state::maze_io_w)); } @@ -1001,14 +1001,14 @@ void mw8080bw_state::boothill_io_map(address_map &map) map(0x00, 0x00).mirror(0x04).portr("IN0"); map(0x01, 0x01).mirror(0x04).portr("IN1"); map(0x02, 0x02).mirror(0x04).portr("IN2"); - map(0x03, 0x03).mirror(0x04).r(this, FUNC(mw8080bw_state::mw8080bw_reversable_shift_result_r)); + map(0x03, 0x03).mirror(0x04).r(FUNC(mw8080bw_state::mw8080bw_reversable_shift_result_r)); - map(0x01, 0x01).w(this, FUNC(mw8080bw_state::mw8080bw_reversable_shift_count_w)); + map(0x01, 0x01).w(FUNC(mw8080bw_state::mw8080bw_reversable_shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::boothill_audio_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::boothill_audio_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::midway_tone_generator_lo_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::midway_tone_generator_hi_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::midway_tone_generator_lo_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::midway_tone_generator_hi_w)); } @@ -1100,7 +1100,7 @@ void mw8080bw_state::checkmat_io_map(address_map &map) map(0x03, 0x03).portr("IN3"); /* no decoder, just a couple of AND gates */ - map(0x00, 0x03).w(this, FUNC(mw8080bw_state::checkmat_io_w)); + map(0x00, 0x03).w(FUNC(mw8080bw_state::checkmat_io_w)); } @@ -1230,18 +1230,18 @@ CUSTOM_INPUT_MEMBER(mw8080bw_state::desertgu_dip_sw_0_1_r) void mw8080bw_state::desertgu_io_map(address_map &map) { map.global_mask(0x7); - map(0x00, 0x00).mirror(0x04).r(this, FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); + map(0x00, 0x00).mirror(0x04).r(FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); map(0x01, 0x01).mirror(0x04).portr("IN0"); map(0x02, 0x02).mirror(0x04).portr("IN1"); map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::desertgu_audio_1_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::desertgu_audio_1_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::midway_tone_generator_lo_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::midway_tone_generator_hi_w)); - map(0x07, 0x07).w(this, FUNC(mw8080bw_state::desertgu_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::midway_tone_generator_lo_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::midway_tone_generator_hi_w)); + map(0x07, 0x07).w(FUNC(mw8080bw_state::desertgu_audio_2_w)); } @@ -1363,10 +1363,10 @@ void mw8080bw_state::dplay_io_map(address_map &map) map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::dplay_audio_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::dplay_audio_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::midway_tone_generator_lo_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::midway_tone_generator_hi_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::midway_tone_generator_lo_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::midway_tone_generator_hi_w)); } @@ -1539,15 +1539,15 @@ void mw8080bw_state::gmissile_io_map(address_map &map) map(0x00, 0x00).mirror(0x04).portr("IN0"); map(0x01, 0x01).mirror(0x04).portr("IN1"); map(0x02, 0x02).mirror(0x04).portr("IN2"); - map(0x03, 0x03).mirror(0x04).r(this, FUNC(mw8080bw_state::mw8080bw_reversable_shift_result_r)); + map(0x03, 0x03).mirror(0x04).r(FUNC(mw8080bw_state::mw8080bw_reversable_shift_result_r)); - map(0x01, 0x01).w(this, FUNC(mw8080bw_state::mw8080bw_reversable_shift_count_w)); + map(0x01, 0x01).w(FUNC(mw8080bw_state::mw8080bw_reversable_shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::gmissile_audio_1_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::gmissile_audio_1_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::gmissile_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::gmissile_audio_2_w)); /* also writes 0x00 to 0x06, but it is not connected */ - map(0x07, 0x07).w(this, FUNC(mw8080bw_state::gmissile_audio_3_w)); + map(0x07, 0x07).w(FUNC(mw8080bw_state::gmissile_audio_3_w)); } @@ -1637,13 +1637,13 @@ void mw8080bw_state::m4_io_map(address_map &map) map(0x00, 0x00).mirror(0x04).portr("IN0"); map(0x01, 0x01).mirror(0x04).portr("IN1"); map(0x02, 0x02).mirror(0x04).portr("IN2"); - map(0x03, 0x03).mirror(0x04).r(this, FUNC(mw8080bw_state::mw8080bw_reversable_shift_result_r)); + map(0x03, 0x03).mirror(0x04).r(FUNC(mw8080bw_state::mw8080bw_reversable_shift_result_r)); - map(0x01, 0x01).w(this, FUNC(mw8080bw_state::mw8080bw_reversable_shift_count_w)); + map(0x01, 0x01).w(FUNC(mw8080bw_state::mw8080bw_reversable_shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::m4_audio_1_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::m4_audio_1_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::m4_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::m4_audio_2_w)); } @@ -1758,11 +1758,11 @@ void mw8080bw_state::clowns_io_map(address_map &map) map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::clowns_audio_1_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::clowns_audio_1_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::midway_tone_generator_lo_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::midway_tone_generator_hi_w)); - map(0x07, 0x07).w(this, FUNC(mw8080bw_state::clowns_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::midway_tone_generator_lo_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::midway_tone_generator_hi_w)); + map(0x07, 0x07).w(FUNC(mw8080bw_state::clowns_audio_2_w)); } @@ -1900,11 +1900,11 @@ void mw8080bw_state::spacwalk_io_map(address_map &map) map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::spacwalk_audio_1_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::spacwalk_audio_1_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::midway_tone_generator_lo_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::midway_tone_generator_hi_w)); - map(0x07, 0x07).w(this, FUNC(mw8080bw_state::spacwalk_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::midway_tone_generator_lo_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::midway_tone_generator_hi_w)); + map(0x07, 0x07).w(FUNC(mw8080bw_state::spacwalk_audio_2_w)); } static INPUT_PORTS_START( spacwalk ) @@ -1992,7 +1992,7 @@ void mw8080bw_state::shuffle_io_map(address_map &map) map.global_mask(0xf); /* yes, 4, and no mirroring on the read handlers */ map(0x01, 0x01).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); map(0x02, 0x02).portr("IN0"); - map(0x03, 0x03).r(this, FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); + map(0x03, 0x03).r(FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); map(0x04, 0x04).portr("IN1"); map(0x05, 0x05).portr("IN2"); map(0x06, 0x06).portr("IN3"); @@ -2000,8 +2000,8 @@ void mw8080bw_state::shuffle_io_map(address_map &map) map(0x01, 0x01).mirror(0x08).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).mirror(0x08).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); map(0x04, 0x04).mirror(0x08).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).mirror(0x08).w(this, FUNC(mw8080bw_state::shuffle_audio_1_w)); - map(0x06, 0x06).mirror(0x08).w(this, FUNC(mw8080bw_state::shuffle_audio_2_w)); + map(0x05, 0x05).mirror(0x08).w(FUNC(mw8080bw_state::shuffle_audio_1_w)); + map(0x06, 0x06).mirror(0x08).w(FUNC(mw8080bw_state::shuffle_audio_2_w)); } @@ -2081,10 +2081,10 @@ void mw8080bw_state::dogpatch_io_map(address_map &map) map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::dogpatch_audio_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::dogpatch_audio_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::midway_tone_generator_lo_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::midway_tone_generator_hi_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::midway_tone_generator_lo_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::midway_tone_generator_hi_w)); } @@ -2232,7 +2232,7 @@ void mw8080bw_state::spcenctr_io_map(address_map &map) map(0x03, 0x03).mirror(0xfc).nopr(); /* complicated addressing logic */ - map(0x00, 0xff).w(this, FUNC(mw8080bw_state::spcenctr_io_w)); + map(0x00, 0xff).w(FUNC(mw8080bw_state::spcenctr_io_w)); } @@ -2335,7 +2335,7 @@ MACHINE_START_MEMBER(mw8080bw_state,phantom2) void mw8080bw_state::phantom2_io_map(address_map &map) { map.global_mask(0x7); - map(0x00, 0x00).mirror(0x04).r(this, FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); + map(0x00, 0x00).mirror(0x04).r(FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); map(0x01, 0x01).mirror(0x04).portr("IN0"); map(0x02, 0x02).mirror(0x04).portr("IN1"); map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); @@ -2343,8 +2343,8 @@ void mw8080bw_state::phantom2_io_map(address_map &map) map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::phantom2_audio_1_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::phantom2_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::phantom2_audio_1_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::phantom2_audio_2_w)); } @@ -2464,9 +2464,9 @@ WRITE8_MEMBER(mw8080bw_state::bowler_lights_2_w) void mw8080bw_state::bowler_io_map(address_map &map) { map.global_mask(0xf); /* no masking on the reads, all 4 bits are decoded */ - map(0x01, 0x01).r(this, FUNC(mw8080bw_state::bowler_shift_result_r)); + map(0x01, 0x01).r(FUNC(mw8080bw_state::bowler_shift_result_r)); map(0x02, 0x02).portr("IN0"); - map(0x03, 0x03).r(this, FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); + map(0x03, 0x03).r(FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); map(0x04, 0x04).portr("IN1"); map(0x05, 0x05).portr("IN2"); map(0x06, 0x06).portr("IN3"); @@ -2474,14 +2474,14 @@ void mw8080bw_state::bowler_io_map(address_map &map) map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::bowler_audio_1_w)); - map(0x06, 0x06).w(this, FUNC(mw8080bw_state::bowler_audio_2_w)); - map(0x07, 0x07).w(this, FUNC(mw8080bw_state::bowler_lights_1_w)); - map(0x08, 0x08).w(this, FUNC(mw8080bw_state::bowler_audio_3_w)); - map(0x09, 0x09).w(this, FUNC(mw8080bw_state::bowler_audio_4_w)); - map(0x0a, 0x0a).w(this, FUNC(mw8080bw_state::bowler_audio_5_w)); - map(0x0e, 0x0e).w(this, FUNC(mw8080bw_state::bowler_lights_2_w)); - map(0x0f, 0x0f).w(this, FUNC(mw8080bw_state::bowler_audio_6_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::bowler_audio_1_w)); + map(0x06, 0x06).w(FUNC(mw8080bw_state::bowler_audio_2_w)); + map(0x07, 0x07).w(FUNC(mw8080bw_state::bowler_lights_1_w)); + map(0x08, 0x08).w(FUNC(mw8080bw_state::bowler_audio_3_w)); + map(0x09, 0x09).w(FUNC(mw8080bw_state::bowler_audio_4_w)); + map(0x0a, 0x0a).w(FUNC(mw8080bw_state::bowler_audio_5_w)); + map(0x0e, 0x0e).w(FUNC(mw8080bw_state::bowler_lights_2_w)); + map(0x0f, 0x0f).w(FUNC(mw8080bw_state::bowler_audio_6_w)); } @@ -2658,9 +2658,9 @@ void mw8080bw_state::invaders_io_map(address_map &map) map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::invaders_audio_1_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::invaders_audio_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::invaders_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::invaders_audio_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -2787,14 +2787,14 @@ CUSTOM_INPUT_MEMBER(mw8080bw_state::blueshrk_coin_input_r) void mw8080bw_state::blueshrk_io_map(address_map &map) { map.global_mask(0x7); - map(0x00, 0x00).mirror(0x04).r(this, FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); + map(0x00, 0x00).mirror(0x04).r(FUNC(mw8080bw_state::mw8080bw_shift_result_rev_r)); map(0x01, 0x01).mirror(0x04).portr("IN0"); map(0x02, 0x02).mirror(0x04).portr("IN1"); map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); map(0x01, 0x01).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::blueshrk_audio_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::blueshrk_audio_w)); map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); } @@ -2876,13 +2876,13 @@ void mw8080bw_state::invad2ct_io_map(address_map &map) map(0x02, 0x02).mirror(0x04).portr("IN2"); map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); - map(0x01, 0x01).w(this, FUNC(mw8080bw_state::invad2ct_audio_3_w)); + map(0x01, 0x01).w(FUNC(mw8080bw_state::invad2ct_audio_3_w)); map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_count_w)); - map(0x03, 0x03).w(this, FUNC(mw8080bw_state::invad2ct_audio_1_w)); + map(0x03, 0x03).w(FUNC(mw8080bw_state::invad2ct_audio_1_w)); map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w)); - map(0x05, 0x05).w(this, FUNC(mw8080bw_state::invad2ct_audio_2_w)); + map(0x05, 0x05).w(FUNC(mw8080bw_state::invad2ct_audio_2_w)); map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x07, 0x07).w(this, FUNC(mw8080bw_state::invad2ct_audio_4_w)); + map(0x07, 0x07).w(FUNC(mw8080bw_state::invad2ct_audio_4_w)); } diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp index 0f377e90c82..5acd59d4e4f 100644 --- a/src/mame/drivers/mwarr.cpp +++ b/src/mame/drivers/mwarr.cpp @@ -215,10 +215,10 @@ WRITE16_MEMBER(mwarr_state::mwarr_brightness_w) void mwarr_state::mwarr_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x1007ff).ram().w(this, FUNC(mwarr_state::bg_videoram_w)).share("bg_videoram"); - map(0x100800, 0x100fff).ram().w(this, FUNC(mwarr_state::mlow_videoram_w)).share("mlow_videoram"); - map(0x101000, 0x1017ff).ram().w(this, FUNC(mwarr_state::mhigh_videoram_w)).share("mhigh_videoram"); - map(0x101800, 0x1027ff).ram().w(this, FUNC(mwarr_state::tx_videoram_w)).share("tx_videoram"); + map(0x100000, 0x1007ff).ram().w(FUNC(mwarr_state::bg_videoram_w)).share("bg_videoram"); + map(0x100800, 0x100fff).ram().w(FUNC(mwarr_state::mlow_videoram_w)).share("mlow_videoram"); + map(0x101000, 0x1017ff).ram().w(FUNC(mwarr_state::mhigh_videoram_w)).share("mhigh_videoram"); + map(0x101800, 0x1027ff).ram().w(FUNC(mwarr_state::tx_videoram_w)).share("tx_videoram"); map(0x103000, 0x1033ff).ram().share("bg_scrollram"); map(0x103400, 0x1037ff).ram().share("mlow_scrollram"); map(0x103800, 0x103bff).ram().share("mhigh_scrollram"); @@ -229,9 +229,9 @@ void mwarr_state::mwarr_map(address_map &map) map(0x110000, 0x110001).portr("P1_P2"); map(0x110002, 0x110003).portr("SYSTEM"); map(0x110004, 0x110005).portr("DSW"); - map(0x110010, 0x110011).w(this, FUNC(mwarr_state::oki1_bank_w)); - map(0x110014, 0x110015).w(this, FUNC(mwarr_state::mwarr_brightness_w)); - map(0x110016, 0x110017).w(this, FUNC(mwarr_state::sprites_commands_w)); + map(0x110010, 0x110011).w(FUNC(mwarr_state::oki1_bank_w)); + map(0x110014, 0x110015).w(FUNC(mwarr_state::mwarr_brightness_w)); + map(0x110016, 0x110017).w(FUNC(mwarr_state::sprites_commands_w)); map(0x180001, 0x180001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x190001, 0x190001).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp index 17ec3299ed7..2b7aa64905f 100644 --- a/src/mame/drivers/mwsub.cpp +++ b/src/mame/drivers/mwsub.cpp @@ -156,13 +156,13 @@ void submar_state::submar_map(address_map &map) void submar_state::submar_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(submar_state::submar_sensor0_r), FUNC(submar_state::submar_motor_w)); - map(0x01, 0x01).rw(this, FUNC(submar_state::submar_sensor1_r), FUNC(submar_state::submar_lamp_w)); - map(0x02, 0x02).w(this, FUNC(submar_state::submar_solenoid_w)); - map(0x03, 0x03).portr("DSW").w(this, FUNC(submar_state::submar_sound_w)); - map(0x04, 0x05).w(this, FUNC(submar_state::submar_led_w)); + map(0x00, 0x00).rw(FUNC(submar_state::submar_sensor0_r), FUNC(submar_state::submar_motor_w)); + map(0x01, 0x01).rw(FUNC(submar_state::submar_sensor1_r), FUNC(submar_state::submar_lamp_w)); + map(0x02, 0x02).w(FUNC(submar_state::submar_solenoid_w)); + map(0x03, 0x03).portr("DSW").w(FUNC(submar_state::submar_sound_w)); + map(0x04, 0x05).w(FUNC(submar_state::submar_led_w)); map(0x06, 0x06).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x07, 0x07).w(this, FUNC(submar_state::submar_irq_clear_w)); + map(0x07, 0x07).w(FUNC(submar_state::submar_irq_clear_w)); } diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp index 6781a64289a..7b2aecba634 100644 --- a/src/mame/drivers/myb3k.cpp +++ b/src/mame/drivers/myb3k.cpp @@ -581,10 +581,10 @@ void myb3k_state::myb3k_io(address_map &map) map(0x00, 0x03).rw(m_ppi8255, FUNC(i8255_device::read), FUNC(i8255_device::write)); // Discrete latches - map(0x04, 0x04).r(this, FUNC(myb3k_state::myb3k_kbd_r)); - map(0x04, 0x04).w(this, FUNC(myb3k_state::myb3k_video_mode_w)); // b0=40CH, b1=80CH, b2=16 raster - map(0x05, 0x05).r(this, FUNC(myb3k_state::myb3k_io_status_r)); // printer connector bits: b3=fault b2=paper out b1 or b0=busy - map(0x05, 0x05).w(this, FUNC(myb3k_state::dma_segment_w)); // b0-b3=addr, b6=A b7=B + map(0x04, 0x04).r(FUNC(myb3k_state::myb3k_kbd_r)); + map(0x04, 0x04).w(FUNC(myb3k_state::myb3k_video_mode_w)); // b0=40CH, b1=80CH, b2=16 raster + map(0x05, 0x05).r(FUNC(myb3k_state::myb3k_io_status_r)); // printer connector bits: b3=fault b2=paper out b1 or b0=busy + map(0x05, 0x05).w(FUNC(myb3k_state::dma_segment_w)); // b0-b3=addr, b6=A b7=B map(0x06, 0x06).portr("DSW2"); // 8-9 8259A interrupt controller @@ -948,7 +948,7 @@ MACHINE_CONFIG_START(myb3k_state::myb3k) /* Parallel port */ MCFG_DEVICE_ADD("ppi", I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTB_CB(READ8(*this, myb3k_state, ppi_portb_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, myb3k_state, ppi_portc_w)) diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp index a04f20b6e7d..24497d21a04 100644 --- a/src/mame/drivers/mycom.cpp +++ b/src/mame/drivers/mycom.cpp @@ -221,14 +221,14 @@ void mycom_state::mycom_map(address_map &map) map.unmap_value_high(); map(0x0000, 0x0fff).bankrw("boot"); map(0x1000, 0xbfff).ram(); - map(0xc000, 0xffff).rw(this, FUNC(mycom_state::mycom_upper_r), FUNC(mycom_state::mycom_upper_w)); + map(0xc000, 0xffff).rw(FUNC(mycom_state::mycom_upper_r), FUNC(mycom_state::mycom_upper_w)); } void mycom_state::mycom_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(mycom_state::mycom_00_w)); - map(0x01, 0x01).rw(this, FUNC(mycom_state::vram_data_r), FUNC(mycom_state::vram_data_w)); + map(0x00, 0x00).w(FUNC(mycom_state::mycom_00_w)); + map(0x01, 0x01).rw(FUNC(mycom_state::vram_data_r), FUNC(mycom_state::vram_data_w)); map(0x02, 0x02).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x03, 0x03).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x04, 0x07).rw(m_ppi0, FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -412,7 +412,7 @@ WRITE8_MEMBER( mycom_state::mycom_0a_w ) // if WE & CE are low, pass sound command to audio chip if ((data & 0x30)==0) - m_audio->write(space, 0, m_sn_we); + m_audio->write(m_sn_we); } WRITE8_MEMBER(mycom_state::mycom_rtc_w) diff --git a/src/mame/drivers/mystston.cpp b/src/mame/drivers/mystston.cpp index 346e7b3fc0e..aa64298b2f0 100644 --- a/src/mame/drivers/mystston.cpp +++ b/src/mame/drivers/mystston.cpp @@ -108,11 +108,11 @@ void mystston_state::main_map(address_map &map) map(0x07e0, 0x0fff).ram(); map(0x1000, 0x17ff).ram().share("fg_videoram"); map(0x1800, 0x1fff).ram().share("bg_videoram"); - map(0x2000, 0x2000).mirror(0x1f8f).portr("IN0").w(this, FUNC(mystston_state::mystston_video_control_w)).share("video_control"); - map(0x2010, 0x2010).mirror(0x1f8f).portr("IN1").w(this, FUNC(mystston_state::irq_clear_w)); + map(0x2000, 0x2000).mirror(0x1f8f).portr("IN0").w(FUNC(mystston_state::mystston_video_control_w)).share("video_control"); + map(0x2010, 0x2010).mirror(0x1f8f).portr("IN1").w(FUNC(mystston_state::irq_clear_w)); map(0x2020, 0x2020).mirror(0x1f8f).portr("DSW0").writeonly().share("scroll"); map(0x2030, 0x2030).mirror(0x1f8f).portr("DSW1").writeonly().share("ay8910_data"); - map(0x2040, 0x2040).mirror(0x1f8f).nopr().w(this, FUNC(mystston_state::mystston_ay8910_select_w)).share("ay8910_select"); + map(0x2040, 0x2040).mirror(0x1f8f).nopr().w(FUNC(mystston_state::mystston_ay8910_select_w)).share("ay8910_select"); map(0x2050, 0x2050).mirror(0x1f8f).noprw(); map(0x2060, 0x207f).mirror(0x1f80).ram().share("paletteram"); map(0x4000, 0xffff).rom(); diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp index d68df389012..6e13c8c48ca 100644 --- a/src/mame/drivers/mystwarr.cpp +++ b/src/mame/drivers/mystwarr.cpp @@ -296,23 +296,23 @@ void mystwarr_state::mystwarr_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // main program map(0x200000, 0x20ffff).ram().share("gx_workram"); - map(0x400000, 0x40ffff).rw(this, FUNC(mystwarr_state::k053247_scattered_word_r), FUNC(mystwarr_state::k053247_scattered_word_w)).share("spriteram"); + map(0x400000, 0x40ffff).rw(FUNC(mystwarr_state::k053247_scattered_word_r), FUNC(mystwarr_state::k053247_scattered_word_w)).share("spriteram"); map(0x480000, 0x4800ff).w(m_k055555, FUNC(k055555_device::K055555_word_w)); map(0x482000, 0x48200f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); map(0x482010, 0x48201f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w)); map(0x484000, 0x484007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); map(0x48a000, 0x48a01f).w(m_k054338, FUNC(k054338_device::word_w)); map(0x48c000, 0x48c03f).w(m_k056832, FUNC(k056832_device::word_w)); - map(0x490000, 0x490001).w(this, FUNC(mystwarr_state::mweeprom_w)); + map(0x490000, 0x490001).w(FUNC(mystwarr_state::mweeprom_w)); map(0x492000, 0x492001).noprw(); // watchdog map(0x494000, 0x494001).portr("P1_P2"); map(0x494002, 0x494003).portr("P3_P4"); map(0x496000, 0x496001).portr("IN0"); - map(0x496002, 0x496003).r(this, FUNC(mystwarr_state::eeprom_r)); + map(0x496002, 0x496003).r(FUNC(mystwarr_state::eeprom_r)); map(0x498000, 0x49801f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); - map(0x49a000, 0x49a001).w(this, FUNC(mystwarr_state::sound_irq_w)); + map(0x49a000, 0x49a001).w(FUNC(mystwarr_state::sound_irq_w)); map(0x49c000, 0x49c01f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); - map(0x49e000, 0x49e007).w(this, FUNC(mystwarr_state::irq_ack_w)); // VSCCS (custom) + map(0x49e000, 0x49e007).w(FUNC(mystwarr_state::irq_ack_w)); // VSCCS (custom) map(0x600000, 0x601fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); map(0x602000, 0x603fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read(essential) map(0x680000, 0x683fff).r(m_k056832, FUNC(k056832_device::mw_rom_word_r)); @@ -334,16 +334,16 @@ void mystwarr_state::metamrph_map(address_map &map) map(0x254000, 0x25401f).w(m_k054338, FUNC(k054338_device::word_w)); map(0x258000, 0x2580ff).w(m_k055555, FUNC(k055555_device::K055555_word_w)); map(0x260000, 0x26001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); - map(0x264000, 0x264001).w(this, FUNC(mystwarr_state::sound_irq_w)); + map(0x264000, 0x264001).w(FUNC(mystwarr_state::sound_irq_w)); map(0x268000, 0x26801f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x26c000, 0x26c007).w(m_k056832, FUNC(k056832_device::b_word_w)); map(0x270000, 0x27003f).w(m_k056832, FUNC(k056832_device::word_w)); map(0x274000, 0x274001).portr("P1_P3"); map(0x274002, 0x274003).portr("P2_P4"); map(0x278000, 0x278001).portr("IN0"); - map(0x278002, 0x278003).r(this, FUNC(mystwarr_state::eeprom_r)); + map(0x278002, 0x278003).r(FUNC(mystwarr_state::eeprom_r)); map(0x27c000, 0x27c001).nopr(); // watchdog lives here - map(0x27c000, 0x27c001).w(this, FUNC(mystwarr_state::mmeeprom_w)); + map(0x27c000, 0x27c001).w(FUNC(mystwarr_state::mmeeprom_w)); map(0x300000, 0x301fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); map(0x302000, 0x303fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read/write (essential) map(0x310000, 0x311fff).r(m_k056832, FUNC(k056832_device::mw_rom_word_r)); @@ -365,18 +365,18 @@ void mystwarr_state::viostorm_map(address_map &map) map(0x250000, 0x25000f).ram(); // K053250 reg map(0x254000, 0x25401f).w(m_k054338, FUNC(k054338_device::word_w)); map(0x258000, 0x2580ff).w(m_k055555, FUNC(k055555_device::K055555_word_w)); - map(0x25c000, 0x25c03f).rw(this, FUNC(mystwarr_state::K055550_word_r), FUNC(mystwarr_state::K055550_word_w)); + map(0x25c000, 0x25c03f).rw(FUNC(mystwarr_state::K055550_word_r), FUNC(mystwarr_state::K055550_word_w)); map(0x260000, 0x26001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); - map(0x264000, 0x264001).w(this, FUNC(mystwarr_state::sound_irq_w)); + map(0x264000, 0x264001).w(FUNC(mystwarr_state::sound_irq_w)); map(0x268000, 0x26801f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x26c000, 0x26c007).w(m_k056832, FUNC(k056832_device::b_word_w)); map(0x270000, 0x27003f).w(m_k056832, FUNC(k056832_device::word_w)); map(0x274000, 0x274001).portr("P1_P3"); map(0x274002, 0x274003).portr("P2_P4"); map(0x278000, 0x278001).portr("IN0"); - map(0x278002, 0x278003).r(this, FUNC(mystwarr_state::eeprom_r)); + map(0x278002, 0x278003).r(FUNC(mystwarr_state::eeprom_r)); map(0x27c000, 0x27c001).nopr(); // watchdog lives here - map(0x27c000, 0x27c001).w(this, FUNC(mystwarr_state::mmeeprom_w)); + map(0x27c000, 0x27c001).w(FUNC(mystwarr_state::mmeeprom_w)); map(0x300000, 0x301fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); map(0x302000, 0x303fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read(essential) map(0x304000, 0x3041ff).ram(); @@ -458,18 +458,18 @@ void mystwarr_state::martchmp_map(address_map &map) map(0x404000, 0x404007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); // OBJSET1 map(0x40a000, 0x40a01f).w(m_k054338, FUNC(k054338_device::word_w)); // CLTC map(0x40c000, 0x40c03f).w(m_k056832, FUNC(k056832_device::word_w)); // VACSET - map(0x40e000, 0x40e03f).w(this, FUNC(mystwarr_state::K053990_martchmp_word_w)); // protection - map(0x410000, 0x410001).w(this, FUNC(mystwarr_state::mceeprom_w)); - map(0x412000, 0x412001).rw(this, FUNC(mystwarr_state::mccontrol_r), FUNC(mystwarr_state::mccontrol_w)); + map(0x40e000, 0x40e03f).w(FUNC(mystwarr_state::K053990_martchmp_word_w)); // protection + map(0x410000, 0x410001).w(FUNC(mystwarr_state::mceeprom_w)); + map(0x412000, 0x412001).rw(FUNC(mystwarr_state::mccontrol_r), FUNC(mystwarr_state::mccontrol_w)); map(0x414000, 0x414001).portr("P1_P2"); map(0x414002, 0x414003).portr("P3_P4"); map(0x416000, 0x416001).portr("IN0"); - map(0x416002, 0x416003).r(this, FUNC(mystwarr_state::eeprom_r)); // eeprom read + map(0x416002, 0x416003).r(FUNC(mystwarr_state::eeprom_r)); // eeprom read map(0x418000, 0x41801f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); - map(0x41a000, 0x41a001).w(this, FUNC(mystwarr_state::sound_irq_w)); + map(0x41a000, 0x41a001).w(FUNC(mystwarr_state::sound_irq_w)); map(0x41c000, 0x41c01f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); // CCU map(0x41e000, 0x41e007).w(m_k056832, FUNC(k056832_device::b_word_w)); // VSCCS - map(0x480000, 0x483fff).rw(this, FUNC(mystwarr_state::k053247_martchmp_word_r), FUNC(mystwarr_state::k053247_martchmp_word_w)).share("spriteram"); // sprite RAM + map(0x480000, 0x483fff).rw(FUNC(mystwarr_state::k053247_martchmp_word_r), FUNC(mystwarr_state::k053247_martchmp_word_w)).share("spriteram"); // sprite RAM map(0x600000, 0x601fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // palette RAM map(0x680000, 0x681fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM map(0x682000, 0x683fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read/write (essential) @@ -480,7 +480,7 @@ void mystwarr_state::martchmp_map(address_map &map) void mystwarr_state::dadandrn_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // main program and data ROM - map(0x400000, 0x40ffff).rw(this, FUNC(mystwarr_state::k053247_scattered_word_r), FUNC(mystwarr_state::k053247_scattered_word_w)).share("spriteram"); + map(0x400000, 0x40ffff).rw(FUNC(mystwarr_state::k053247_scattered_word_r), FUNC(mystwarr_state::k053247_scattered_word_w)).share("spriteram"); map(0x410000, 0x411fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM map(0x412000, 0x413fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read/write (essential) map(0x420000, 0x421fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -492,21 +492,21 @@ void mystwarr_state::dadandrn_map(address_map &map) map(0x470000, 0x470fff).ram().share("k053936_0_li16"); map(0x480000, 0x48003f).w(m_k056832, FUNC(k056832_device::word_w)); // VACSET map(0x482000, 0x482007).w(m_k056832, FUNC(k056832_device::b_word_w)); // VSCCS - map(0x484000, 0x484003).w(this, FUNC(mystwarr_state::ddd_053936_clip_w)); + map(0x484000, 0x484003).w(FUNC(mystwarr_state::ddd_053936_clip_w)); map(0x486000, 0x48601f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); map(0x488000, 0x4880ff).w(m_k055555, FUNC(k055555_device::K055555_word_w)); map(0x48a000, 0x48a01f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0xff00); map(0x48c000, 0x48c01f).w(m_k054338, FUNC(k054338_device::word_w)); map(0x48e000, 0x48e001).portr("IN0_P1"); // bit 3 (0x8) is test switch - map(0x48e020, 0x48e021).r(this, FUNC(mystwarr_state::dddeeprom_r)); + map(0x48e020, 0x48e021).r(FUNC(mystwarr_state::dddeeprom_r)); map(0x600000, 0x60ffff).ram().share("gx_workram"); - map(0x680000, 0x68003f).rw(this, FUNC(mystwarr_state::K055550_word_r), FUNC(mystwarr_state::K055550_word_w)); - map(0x6a0000, 0x6a0001).w(this, FUNC(mystwarr_state::mmeeprom_w)); - map(0x6c0000, 0x6c0001).w(this, FUNC(mystwarr_state::ddd_053936_enable_w)); - map(0x6e0000, 0x6e0001).w(this, FUNC(mystwarr_state::sound_irq_w)); - map(0x800000, 0x87ffff).r(this, FUNC(mystwarr_state::ddd_053936_tilerom_0_r)); // 256k tilemap readback - map(0xa00000, 0xa7ffff).r(this, FUNC(mystwarr_state::ddd_053936_tilerom_1_r)); // 128k tilemap readback - map(0xc00000, 0xdfffff).r(this, FUNC(mystwarr_state::ddd_053936_tilerom_2_r)); // tile character readback + map(0x680000, 0x68003f).rw(FUNC(mystwarr_state::K055550_word_r), FUNC(mystwarr_state::K055550_word_w)); + map(0x6a0000, 0x6a0001).w(FUNC(mystwarr_state::mmeeprom_w)); + map(0x6c0000, 0x6c0001).w(FUNC(mystwarr_state::ddd_053936_enable_w)); + map(0x6e0000, 0x6e0001).w(FUNC(mystwarr_state::sound_irq_w)); + map(0x800000, 0x87ffff).r(FUNC(mystwarr_state::ddd_053936_tilerom_0_r)); // 256k tilemap readback + map(0xa00000, 0xa7ffff).r(FUNC(mystwarr_state::ddd_053936_tilerom_1_r)); // 128k tilemap readback + map(0xc00000, 0xdfffff).r(FUNC(mystwarr_state::ddd_053936_tilerom_2_r)); // tile character readback map(0xe00000, 0xe00001).nopw(); // watchdog } @@ -517,7 +517,7 @@ void mystwarr_state::dadandrn_map(address_map &map) void mystwarr_state::gaiapols_map(address_map &map) { map(0x000000, 0x2fffff).rom(); // main program - map(0x400000, 0x40ffff).rw(this, FUNC(mystwarr_state::k053247_scattered_word_r), FUNC(mystwarr_state::k053247_scattered_word_w)).share("spriteram"); + map(0x400000, 0x40ffff).rw(FUNC(mystwarr_state::k053247_scattered_word_r), FUNC(mystwarr_state::k053247_scattered_word_w)).share("spriteram"); map(0x410000, 0x411fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM map(0x412000, 0x413fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read / write (essential) map(0x420000, 0x421fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -529,21 +529,21 @@ void mystwarr_state::gaiapols_map(address_map &map) map(0x470000, 0x470fff).ram().share("k053936_0_li16"); map(0x480000, 0x48003f).w(m_k056832, FUNC(k056832_device::word_w)); // VACSET map(0x482000, 0x482007).w(m_k056832, FUNC(k056832_device::b_word_w)); // VSCCS - map(0x484000, 0x484003).w(this, FUNC(mystwarr_state::ddd_053936_clip_w)); + map(0x484000, 0x484003).w(FUNC(mystwarr_state::ddd_053936_clip_w)); map(0x486000, 0x48601f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); map(0x488000, 0x4880ff).w(m_k055555, FUNC(k055555_device::K055555_word_w)); map(0x48a000, 0x48a01f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0xff00); map(0x48c000, 0x48c01f).w(m_k054338, FUNC(k054338_device::word_w)); map(0x48e000, 0x48e001).portr("IN0_P1"); // bit 3 (0x8) is test switch - map(0x48e020, 0x48e021).r(this, FUNC(mystwarr_state::dddeeprom_r)); + map(0x48e020, 0x48e021).r(FUNC(mystwarr_state::dddeeprom_r)); map(0x600000, 0x60ffff).ram().share("gx_workram"); map(0x660000, 0x6600ff).rw("k054000", FUNC(k054000_device::lsb_r), FUNC(k054000_device::lsb_w)); - map(0x6a0000, 0x6a0001).w(this, FUNC(mystwarr_state::mmeeprom_w)); - map(0x6c0000, 0x6c0001).w(this, FUNC(mystwarr_state::ddd_053936_enable_w)); - map(0x6e0000, 0x6e0001).w(this, FUNC(mystwarr_state::sound_irq_w)); - map(0x800000, 0x87ffff).r(this, FUNC(mystwarr_state::gai_053936_tilerom_0_r)); // 256k tilemap readback - map(0xa00000, 0xa7ffff).r(this, FUNC(mystwarr_state::ddd_053936_tilerom_1_r)); // 128k tilemap readback - map(0xc00000, 0xdfffff).r(this, FUNC(mystwarr_state::gai_053936_tilerom_2_r)); // tile character readback + map(0x6a0000, 0x6a0001).w(FUNC(mystwarr_state::mmeeprom_w)); + map(0x6c0000, 0x6c0001).w(FUNC(mystwarr_state::ddd_053936_enable_w)); + map(0x6e0000, 0x6e0001).w(FUNC(mystwarr_state::sound_irq_w)); + map(0x800000, 0x87ffff).r(FUNC(mystwarr_state::gai_053936_tilerom_0_r)); // 256k tilemap readback + map(0xa00000, 0xa7ffff).r(FUNC(mystwarr_state::ddd_053936_tilerom_1_r)); // 128k tilemap readback + map(0xc00000, 0xdfffff).r(FUNC(mystwarr_state::gai_053936_tilerom_2_r)); // tile character readback map(0xe00000, 0xe00001).nopw(); // watchdog } @@ -577,7 +577,7 @@ void mystwarr_state::mystwarr_sound_map(address_map &map) map(0xe400, 0xe62f).rw(m_k054539_2, FUNC(k054539_device::read), FUNC(k054539_device::write)); map(0xe630, 0xe7ff).ram(); map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map)); - map(0xf800, 0xf800).w(this, FUNC(mystwarr_state::sound_ctrl_w)); + map(0xf800, 0xf800).w(FUNC(mystwarr_state::sound_ctrl_w)); map(0xfff0, 0xfff3).nopw(); // unknown write } @@ -593,7 +593,7 @@ void mystwarr_state::martchmp_sound_map(address_map &map) map(0xe400, 0xe62f).noprw(); map(0xe630, 0xe7ff).ram(); map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map)); - map(0xf800, 0xf800).w(this, FUNC(mystwarr_state::sound_ctrl_w)); + map(0xf800, 0xf800).w(FUNC(mystwarr_state::sound_ctrl_w)); map(0xfff0, 0xfff3).nopw(); // unknown write } diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp index 346293ee78e..767dd515650 100644 --- a/src/mame/drivers/myvision.cpp +++ b/src/mame/drivers/myvision.cpp @@ -76,8 +76,8 @@ void myvision_state::myvision_mem(address_map &map) map.unmap_value_high(); //AM_RANGE(0x0000, 0x5fff) // mapped by the cartslot map(0xa000, 0xa7ff).ram(); - map(0xe000, 0xe000).rw("tms9918", FUNC(tms9918a_device::vram_read), FUNC(tms9918a_device::vram_write)); - map(0xe002, 0xe002).rw("tms9918", FUNC(tms9918a_device::register_read), FUNC(tms9918a_device::register_write)); + map(0xe000, 0xe000).rw("tms9918", FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); + map(0xe002, 0xe002).rw("tms9918", FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); } diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index 0d5a4c6e020..79b7c8cc022 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -407,20 +407,20 @@ WRITE8_MEMBER(mz2000_state::mz2000_gvram_mask_w) void mz2000_state::mz2000_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(mz2000_state::mz2000_mem_r), FUNC(mz2000_state::mz2000_mem_w)); + map(0x0000, 0xffff).rw(FUNC(mz2000_state::mz2000_mem_r), FUNC(mz2000_state::mz2000_mem_w)); } void mz2000_state::mz80b_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0xd8, 0xdb).rw(this, FUNC(mz2000_state::fdc_r), FUNC(mz2000_state::fdc_w)); - map(0xdc, 0xdc).w(this, FUNC(mz2000_state::floppy_select_w)); - map(0xdd, 0xdd).w(this, FUNC(mz2000_state::floppy_side_w)); + map(0xd8, 0xdb).rw(FUNC(mz2000_state::fdc_r), FUNC(mz2000_state::fdc_w)); + map(0xdc, 0xdc).w(FUNC(mz2000_state::floppy_select_w)); + map(0xdd, 0xdd).w(FUNC(mz2000_state::floppy_side_w)); map(0xe0, 0xe3).rw("i8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xe4, 0xe7).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0xe8, 0xeb).rw("z80pio_1", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0xf0, 0xf3).w(this, FUNC(mz2000_state::timer_w)); + map(0xf0, 0xf3).w(FUNC(mz2000_state::timer_w)); // AM_RANGE(0xf4, 0xf4) AM_WRITE(vram_bank_w) } @@ -429,9 +429,9 @@ void mz2000_state::mz2000_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); mz80b_io(map); - map(0xf5, 0xf5).w(this, FUNC(mz2000_state::mz2000_tvram_attr_w)); - map(0xf6, 0xf6).w(this, FUNC(mz2000_state::mz2000_gvram_mask_w)); - map(0xf7, 0xf7).w(this, FUNC(mz2000_state::mz2000_gvram_bank_w)); + map(0xf5, 0xf5).w(FUNC(mz2000_state::mz2000_tvram_attr_w)); + map(0xf6, 0xf6).w(FUNC(mz2000_state::mz2000_gvram_mask_w)); + map(0xf7, 0xf7).w(FUNC(mz2000_state::mz2000_gvram_bank_w)); } diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index 0fa36c3cad6..902c6943282 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -1229,14 +1229,14 @@ WRITE8_MEMBER(mz2500_state::floppy_side_w) void mz2500_state::mz2500_map(address_map &map) { - map(0x0000, 0x1fff).rw(this, FUNC(mz2500_state::bank0_r), FUNC(mz2500_state::bank0_w)); - map(0x2000, 0x3fff).rw(this, FUNC(mz2500_state::bank1_r), FUNC(mz2500_state::bank1_w)); - map(0x4000, 0x5fff).rw(this, FUNC(mz2500_state::bank2_r), FUNC(mz2500_state::bank2_w)); - map(0x6000, 0x7fff).rw(this, FUNC(mz2500_state::bank3_r), FUNC(mz2500_state::bank3_w)); - map(0x8000, 0x9fff).rw(this, FUNC(mz2500_state::bank4_r), FUNC(mz2500_state::bank4_w)); - map(0xa000, 0xbfff).rw(this, FUNC(mz2500_state::bank5_r), FUNC(mz2500_state::bank5_w)); - map(0xc000, 0xdfff).rw(this, FUNC(mz2500_state::bank6_r), FUNC(mz2500_state::bank6_w)); - map(0xe000, 0xffff).rw(this, FUNC(mz2500_state::bank7_r), FUNC(mz2500_state::bank7_w)); + map(0x0000, 0x1fff).rw(FUNC(mz2500_state::bank0_r), FUNC(mz2500_state::bank0_w)); + map(0x2000, 0x3fff).rw(FUNC(mz2500_state::bank1_r), FUNC(mz2500_state::bank1_w)); + map(0x4000, 0x5fff).rw(FUNC(mz2500_state::bank2_r), FUNC(mz2500_state::bank2_w)); + map(0x6000, 0x7fff).rw(FUNC(mz2500_state::bank3_r), FUNC(mz2500_state::bank3_w)); + map(0x8000, 0x9fff).rw(FUNC(mz2500_state::bank4_r), FUNC(mz2500_state::bank4_w)); + map(0xa000, 0xbfff).rw(FUNC(mz2500_state::bank5_r), FUNC(mz2500_state::bank5_w)); + map(0xc000, 0xdfff).rw(FUNC(mz2500_state::bank6_r), FUNC(mz2500_state::bank6_w)); + map(0xe000, 0xffff).rw(FUNC(mz2500_state::bank7_r), FUNC(mz2500_state::bank7_w)); } @@ -1520,37 +1520,37 @@ void mz2500_state::mz2500_io(address_map &map) // AM_RANGE(0x98, 0x99) ADPCM, unknown type, custom? map(0xa0, 0xa3).rw("z80sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // AM_RANGE(0xa4, 0xa5) AM_READWRITE(sasi_r, sasi_w) - map(0xa8, 0xa8).w(this, FUNC(mz2500_state::mz2500_rom_w)); - map(0xa9, 0xa9).r(this, FUNC(mz2500_state::mz2500_rom_r)); - map(0xac, 0xac).w(this, FUNC(mz2500_state::mz2500_emm_addr_w)); - map(0xad, 0xad).r(this, FUNC(mz2500_state::mz2500_emm_data_r)).w(this, FUNC(mz2500_state::mz2500_emm_data_w)); - map(0xae, 0xae).w(this, FUNC(mz2500_state::palette4096_io_w)); + map(0xa8, 0xa8).w(FUNC(mz2500_state::mz2500_rom_w)); + map(0xa9, 0xa9).r(FUNC(mz2500_state::mz2500_rom_r)); + map(0xac, 0xac).w(FUNC(mz2500_state::mz2500_emm_addr_w)); + map(0xad, 0xad).r(FUNC(mz2500_state::mz2500_emm_data_r)).w(FUNC(mz2500_state::mz2500_emm_data_w)); + map(0xae, 0xae).w(FUNC(mz2500_state::palette4096_io_w)); // AM_RANGE(0xb0, 0xb3) AM_READWRITE(sio_r,sio_w) - map(0xb4, 0xb4).rw(this, FUNC(mz2500_state::mz2500_bank_addr_r), FUNC(mz2500_state::mz2500_bank_addr_w)); - map(0xb5, 0xb5).rw(this, FUNC(mz2500_state::mz2500_bank_data_r), FUNC(mz2500_state::mz2500_bank_data_w)); + map(0xb4, 0xb4).rw(FUNC(mz2500_state::mz2500_bank_addr_r), FUNC(mz2500_state::mz2500_bank_addr_w)); + map(0xb5, 0xb5).rw(FUNC(mz2500_state::mz2500_bank_data_r), FUNC(mz2500_state::mz2500_bank_data_w)); map(0xb7, 0xb7).nopw(); - map(0xb8, 0xb9).rw(this, FUNC(mz2500_state::mz2500_kanji_r), FUNC(mz2500_state::mz2500_kanji_w)); - map(0xbc, 0xbc).r(this, FUNC(mz2500_state::mz2500_bplane_latch_r)).w(this, FUNC(mz2500_state::mz2500_cg_addr_w)); - map(0xbd, 0xbd).r(this, FUNC(mz2500_state::mz2500_rplane_latch_r)).w(this, FUNC(mz2500_state::mz2500_cg_data_w)); - map(0xbe, 0xbe).r(this, FUNC(mz2500_state::mz2500_gplane_latch_r)); - map(0xbf, 0xbf).r(this, FUNC(mz2500_state::mz2500_iplane_latch_r)); - map(0xc6, 0xc6).w(this, FUNC(mz2500_state::mz2500_irq_sel_w)); - map(0xc7, 0xc7).w(this, FUNC(mz2500_state::mz2500_irq_data_w)); + map(0xb8, 0xb9).rw(FUNC(mz2500_state::mz2500_kanji_r), FUNC(mz2500_state::mz2500_kanji_w)); + map(0xbc, 0xbc).r(FUNC(mz2500_state::mz2500_bplane_latch_r)).w(FUNC(mz2500_state::mz2500_cg_addr_w)); + map(0xbd, 0xbd).r(FUNC(mz2500_state::mz2500_rplane_latch_r)).w(FUNC(mz2500_state::mz2500_cg_data_w)); + map(0xbe, 0xbe).r(FUNC(mz2500_state::mz2500_gplane_latch_r)); + map(0xbf, 0xbf).r(FUNC(mz2500_state::mz2500_iplane_latch_r)); + map(0xc6, 0xc6).w(FUNC(mz2500_state::mz2500_irq_sel_w)); + map(0xc7, 0xc7).w(FUNC(mz2500_state::mz2500_irq_data_w)); map(0xc8, 0xc9).rw("ym", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // AM_RANGE(0xca, 0xca) AM_READWRITE(voice_r,voice_w) - map(0xcc, 0xcc).rw(this, FUNC(mz2500_state::rp5c15_8_r), FUNC(mz2500_state::rp5c15_8_w)); - map(0xce, 0xce).w(this, FUNC(mz2500_state::mz2500_dictionary_bank_w)); - map(0xcf, 0xcf).w(this, FUNC(mz2500_state::mz2500_kanji_bank_w)); - map(0xd8, 0xdb).rw(this, FUNC(mz2500_state::fdc_r), FUNC(mz2500_state::fdc_w)); - map(0xdc, 0xdc).w(this, FUNC(mz2500_state::floppy_select_w)); - map(0xdd, 0xdd).w(this, FUNC(mz2500_state::floppy_side_w)); + map(0xcc, 0xcc).rw(FUNC(mz2500_state::rp5c15_8_r), FUNC(mz2500_state::rp5c15_8_w)); + map(0xce, 0xce).w(FUNC(mz2500_state::mz2500_dictionary_bank_w)); + map(0xcf, 0xcf).w(FUNC(mz2500_state::mz2500_kanji_bank_w)); + map(0xd8, 0xdb).rw(FUNC(mz2500_state::fdc_r), FUNC(mz2500_state::fdc_w)); + map(0xdc, 0xdc).w(FUNC(mz2500_state::floppy_select_w)); + map(0xdd, 0xdd).w(FUNC(mz2500_state::floppy_side_w)); map(0xde, 0xde).nopw(); map(0xe0, 0xe3).rw("i8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xe4, 0xe7).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0xe8, 0xeb).rw("z80pio_1", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0xef, 0xef).rw(this, FUNC(mz2500_state::mz2500_joystick_r), FUNC(mz2500_state::mz2500_joystick_w)); - map(0xf0, 0xf3).w(this, FUNC(mz2500_state::timer_w)); - map(0xf4, 0xf7).r(this, FUNC(mz2500_state::mz2500_crtc_hvblank_r)).w(this, FUNC(mz2500_state::mz2500_tv_crtc_w)); + map(0xef, 0xef).rw(FUNC(mz2500_state::mz2500_joystick_r), FUNC(mz2500_state::mz2500_joystick_w)); + map(0xf0, 0xf3).w(FUNC(mz2500_state::timer_w)); + map(0xf4, 0xf7).r(FUNC(mz2500_state::mz2500_crtc_hvblank_r)).w(FUNC(mz2500_state::mz2500_tv_crtc_w)); // AM_RANGE(0xf8, 0xf9) AM_READWRITE(extrom_r,extrom_w) } diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp index 75b484c6dbb..f0790d8b1a3 100644 --- a/src/mame/drivers/mz3500.cpp +++ b/src/mame/drivers/mz3500.cpp @@ -593,7 +593,7 @@ READ8_MEMBER(mz3500_state::mz3500_fdc_dma_r) void mz3500_state::mz3500_master_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(mz3500_state::mz3500_master_mem_r), FUNC(mz3500_state::mz3500_master_mem_w)); + map(0x0000, 0xffff).rw(FUNC(mz3500_state::mz3500_master_mem_r), FUNC(mz3500_state::mz3500_master_mem_w)); } void mz3500_state::mz3500_master_io(address_map &map) @@ -605,15 +605,15 @@ void mz3500_state::mz3500_master_io(address_map &map) // AM_RANGE(0xec, 0xef) irq signal from slave to master CPU map(0xf4, 0xf5).m(m_fdc, FUNC(upd765a_device::map)); // MFD upd765 // AM_RANGE(0xf8, 0xfb) MFD I/O port - map(0xf8, 0xf8).rw(this, FUNC(mz3500_state::mz3500_fdc_r), FUNC(mz3500_state::mz3500_fdc_w)); - map(0xf9, 0xf9).r(this, FUNC(mz3500_state::mz3500_fdc_dma_r)); - map(0xfc, 0xff).rw(this, FUNC(mz3500_state::mz3500_io_r), FUNC(mz3500_state::mz3500_io_w)); // memory mapper + map(0xf8, 0xf8).rw(FUNC(mz3500_state::mz3500_fdc_r), FUNC(mz3500_state::mz3500_fdc_w)); + map(0xf9, 0xf9).r(FUNC(mz3500_state::mz3500_fdc_dma_r)); + map(0xfc, 0xff).rw(FUNC(mz3500_state::mz3500_io_r), FUNC(mz3500_state::mz3500_io_w)); // memory mapper } void mz3500_state::mz3500_slave_map(address_map &map) { map(0x0000, 0x1fff).rom().region("ipl", 0); - map(0x2000, 0x27ff).rw(this, FUNC(mz3500_state::mz3500_shared_ram_r), FUNC(mz3500_state::mz3500_shared_ram_w)); + map(0x2000, 0x27ff).rw(FUNC(mz3500_state::mz3500_shared_ram_r), FUNC(mz3500_state::mz3500_shared_ram_w)); map(0x4000, 0x5fff).ram(); } @@ -626,7 +626,7 @@ void mz3500_state::mz3500_slave_io(address_map &map) // AM_RANGE(0x20, 0x2f) pit8253 map(0x30, 0x33).rw("i8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x40, 0x40).portr("DSW"); - map(0x50, 0x5f).ram().w(this, FUNC(mz3500_state::mz3500_crtc_w)); + map(0x50, 0x5f).ram().w(FUNC(mz3500_state::mz3500_crtc_w)); map(0x60, 0x61).rw(m_hgdc2, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); map(0x70, 0x71).rw(m_hgdc1, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); } diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp index 3422884d0db..82c3f48257c 100644 --- a/src/mame/drivers/mz6500.cpp +++ b/src/mame/drivers/mz6500.cpp @@ -85,7 +85,7 @@ void mz6500_state::mz6500_map(address_map &map) map.unmap_value_high(); map(0x00000, 0x9ffff).ram(); // AM_RANGE(0xa0000,0xbffff) kanji/dictionary ROM - map(0xc0000, 0xeffff).rw(this, FUNC(mz6500_state::mz6500_vram_r), FUNC(mz6500_state::mz6500_vram_w)); + map(0xc0000, 0xeffff).rw(FUNC(mz6500_state::mz6500_vram_r), FUNC(mz6500_state::mz6500_vram_w)); map(0xfc000, 0xfffff).rom().region("ipl", 0); } diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 55ccf7ffe34..0ddfe7e42eb 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -126,7 +126,7 @@ void mz_state::mz700_banke(address_map &map) // bank 1: devices (mz700_bank3) map(0x2000, 0x2003).mirror(0x1ff0).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x2004, 0x2007).mirror(0x1ff0).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0x2008, 0x200b).mirror(0x1ff0).rw(this, FUNC(mz_state::mz700_e008_r), FUNC(mz_state::mz700_e008_w)); + map(0x2008, 0x200b).mirror(0x1ff0).rw(FUNC(mz_state::mz700_e008_r), FUNC(mz_state::mz700_e008_w)); map(0x200c, 0x200f).mirror(0x1ff0).noprw(); // bank 2: switched out (mz700_bank5) map(0x4000, 0x5fff).noprw(); @@ -135,13 +135,13 @@ void mz_state::mz700_banke(address_map &map) void mz_state::mz700_io(address_map &map) { map.global_mask(0xff); - map(0xe0, 0xe0).w(this, FUNC(mz_state::mz700_bank_0_w)); - map(0xe1, 0xe1).w(this, FUNC(mz_state::mz700_bank_1_w)); - map(0xe2, 0xe2).w(this, FUNC(mz_state::mz700_bank_2_w)); - map(0xe3, 0xe3).w(this, FUNC(mz_state::mz700_bank_3_w)); - map(0xe4, 0xe4).w(this, FUNC(mz_state::mz700_bank_4_w)); - map(0xe5, 0xe5).w(this, FUNC(mz_state::mz700_bank_5_w)); - map(0xe6, 0xe6).w(this, FUNC(mz_state::mz700_bank_6_w)); + map(0xe0, 0xe0).w(FUNC(mz_state::mz700_bank_0_w)); + map(0xe1, 0xe1).w(FUNC(mz_state::mz700_bank_1_w)); + map(0xe2, 0xe2).w(FUNC(mz_state::mz700_bank_2_w)); + map(0xe3, 0xe3).w(FUNC(mz_state::mz700_bank_3_w)); + map(0xe4, 0xe4).w(FUNC(mz_state::mz700_bank_4_w)); + map(0xe5, 0xe5).w(FUNC(mz_state::mz700_bank_5_w)); + map(0xe6, 0xe6).w(FUNC(mz_state::mz700_bank_6_w)); } void mz_state::mz800_mem(address_map &map) @@ -162,7 +162,7 @@ void mz_state::mz800_bankf(address_map &map) // bank 1: devices (mz700_bank3) map(0x2000, 0x2003).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x2004, 0x2007).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0x2008, 0x200b).rw(this, FUNC(mz_state::mz700_e008_r), FUNC(mz_state::mz700_e008_w)); + map(0x2008, 0x200b).rw(FUNC(mz_state::mz700_e008_r), FUNC(mz_state::mz700_e008_w)); map(0x200c, 0x200f).noprw(); map(0x2010, 0x3fff).rom().region("monitor", 0x2010); // bank 2: switched out (mz700_bank5) @@ -172,24 +172,24 @@ void mz_state::mz800_bankf(address_map &map) void mz_state::mz800_io(address_map &map) { map.global_mask(0xff); - map(0xcc, 0xcc).w(this, FUNC(mz_state::mz800_write_format_w)); - map(0xcd, 0xcd).w(this, FUNC(mz_state::mz800_read_format_w)); - map(0xce, 0xce).rw(this, FUNC(mz_state::mz800_crtc_r), FUNC(mz_state::mz800_display_mode_w)); - map(0xcf, 0xcf).w(this, FUNC(mz_state::mz800_scroll_border_w)); + map(0xcc, 0xcc).w(FUNC(mz_state::mz800_write_format_w)); + map(0xcd, 0xcd).w(FUNC(mz_state::mz800_read_format_w)); + map(0xce, 0xce).rw(FUNC(mz_state::mz800_crtc_r), FUNC(mz_state::mz800_display_mode_w)); + map(0xcf, 0xcf).w(FUNC(mz_state::mz800_scroll_border_w)); map(0xd0, 0xd3).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xd4, 0xd7).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0xe0, 0xe0).rw(this, FUNC(mz_state::mz800_bank_0_r), FUNC(mz_state::mz800_bank_0_w)); - map(0xe1, 0xe1).rw(this, FUNC(mz_state::mz800_bank_1_r), FUNC(mz_state::mz700_bank_1_w)); - map(0xe2, 0xe2).w(this, FUNC(mz_state::mz700_bank_2_w)); - map(0xe3, 0xe3).w(this, FUNC(mz_state::mz700_bank_3_w)); - map(0xe4, 0xe4).w(this, FUNC(mz_state::mz700_bank_4_w)); - map(0xe5, 0xe5).w(this, FUNC(mz_state::mz700_bank_5_w)); - map(0xe6, 0xe6).w(this, FUNC(mz_state::mz700_bank_6_w)); - map(0xea, 0xea).rw(this, FUNC(mz_state::mz800_ramdisk_r), FUNC(mz_state::mz800_ramdisk_w)); - map(0xeb, 0xeb).w(this, FUNC(mz_state::mz800_ramaddr_w)); - map(0xf0, 0xf0).portr("atari_joy1").w(this, FUNC(mz_state::mz800_palette_w)); + map(0xe0, 0xe0).rw(FUNC(mz_state::mz800_bank_0_r), FUNC(mz_state::mz800_bank_0_w)); + map(0xe1, 0xe1).rw(FUNC(mz_state::mz800_bank_1_r), FUNC(mz_state::mz700_bank_1_w)); + map(0xe2, 0xe2).w(FUNC(mz_state::mz700_bank_2_w)); + map(0xe3, 0xe3).w(FUNC(mz_state::mz700_bank_3_w)); + map(0xe4, 0xe4).w(FUNC(mz_state::mz700_bank_4_w)); + map(0xe5, 0xe5).w(FUNC(mz_state::mz700_bank_5_w)); + map(0xe6, 0xe6).w(FUNC(mz_state::mz700_bank_6_w)); + map(0xea, 0xea).rw(FUNC(mz_state::mz800_ramdisk_r), FUNC(mz_state::mz800_ramdisk_w)); + map(0xeb, 0xeb).w(FUNC(mz_state::mz800_ramaddr_w)); + map(0xf0, 0xf0).portr("atari_joy1").w(FUNC(mz_state::mz800_palette_w)); map(0xf1, 0xf1).portr("atari_joy2"); - map(0xf2, 0xf2).w("sn76489n", FUNC(sn76489_device::write)); + map(0xf2, 0xf2).w("sn76489n", FUNC(sn76489_device::command_w)); map(0xfc, 0xff).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); } @@ -469,7 +469,7 @@ MACHINE_CONFIG_START(mz_state::mz800) MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, mz_state, mz800_z80pio_irq)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, mz_state, mz800_z80pio_port_a_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mz_state, mz800_z80pio_port_a_w)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp index 9bea9eb25ee..d5b1ea9048b 100644 --- a/src/mame/drivers/mz80.cpp +++ b/src/mame/drivers/mz80.cpp @@ -253,7 +253,7 @@ void mz80_state::mz80k_mem(address_map &map) map(0xd000, 0xd7ff).ram().share("videoram"); // Video RAM map(0xe000, 0xe003).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); /* PPIA 8255 */ map(0xe004, 0xe007).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); /* PIT 8253 */ - map(0xe008, 0xe00b).rw(this, FUNC(mz80_state::mz80k_strobe_r), FUNC(mz80_state::mz80k_strobe_w)); + map(0xe008, 0xe00b).rw(FUNC(mz80_state::mz80k_strobe_r), FUNC(mz80_state::mz80k_strobe_w)); map(0xf000, 0xf3ff).rom(); } diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index 36a0b3dc2bf..648ceef51da 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -64,7 +64,7 @@ void n64_mess_state::n64_map(address_map &map) map(0x04600000, 0x046fffff).rw("rcp", FUNC(n64_periphs::pi_reg_r), FUNC(n64_periphs::pi_reg_w)); // Peripheral Interface map(0x04700000, 0x047fffff).rw("rcp", FUNC(n64_periphs::ri_reg_r), FUNC(n64_periphs::ri_reg_w)); // RDRAM Interface map(0x04800000, 0x048fffff).rw("rcp", FUNC(n64_periphs::si_reg_r), FUNC(n64_periphs::si_reg_w)); // Serial Interface - map(0x05000508, 0x0500050b).r(this, FUNC(n64_mess_state::dd_null_r)); + map(0x05000508, 0x0500050b).r(FUNC(n64_mess_state::dd_null_r)); map(0x08000000, 0x0801ffff).ram().share("sram"); // Cartridge SRAM map(0x10000000, 0x13ffffff).rom().region("user2", 0); // Cartridge map(0x1fc00000, 0x1fc007bf).rom().region("user1", 0); // PIF ROM diff --git a/src/mame/drivers/n8080.cpp b/src/mame/drivers/n8080.cpp index 0fb413ba939..6c4cabcbddf 100644 --- a/src/mame/drivers/n8080.cpp +++ b/src/mame/drivers/n8080.cpp @@ -55,14 +55,14 @@ void n8080_state::main_io_map(address_map &map) map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("IN2"); - map(0x03, 0x03).r(this, FUNC(n8080_state::n8080_shift_r)); + map(0x03, 0x03).r(FUNC(n8080_state::n8080_shift_r)); map(0x04, 0x04).portr("IN3"); - map(0x02, 0x02).w(this, FUNC(n8080_state::n8080_shift_bits_w)); - map(0x03, 0x03).w(this, FUNC(n8080_state::n8080_shift_data_w)); - map(0x04, 0x04).w(this, FUNC(n8080_state::n8080_sound_1_w)); - map(0x05, 0x05).w(this, FUNC(n8080_state::n8080_sound_2_w)); - map(0x06, 0x06).w(this, FUNC(n8080_state::n8080_video_control_w)); + map(0x02, 0x02).w(FUNC(n8080_state::n8080_shift_bits_w)); + map(0x03, 0x03).w(FUNC(n8080_state::n8080_shift_data_w)); + map(0x04, 0x04).w(FUNC(n8080_state::n8080_sound_1_w)); + map(0x05, 0x05).w(FUNC(n8080_state::n8080_sound_2_w)); + map(0x06, 0x06).w(FUNC(n8080_state::n8080_video_control_w)); } diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp index 71ebe1ab370..cc6afa3299d 100644 --- a/src/mame/drivers/nakajies.cpp +++ b/src/mame/drivers/nakajies.cpp @@ -400,14 +400,14 @@ WRITE8_MEMBER( nakajies_state::bank7_w ) { bank_w( 7, offset, data ); } void nakajies_state::nakajies_map(address_map &map) { - map(0x00000, 0x1ffff).bankr("bank0").w(this, FUNC(nakajies_state::bank0_w)); - map(0x20000, 0x3ffff).bankr("bank1").w(this, FUNC(nakajies_state::bank1_w)); - map(0x40000, 0x5ffff).bankr("bank2").w(this, FUNC(nakajies_state::bank2_w)); - map(0x60000, 0x7ffff).bankr("bank3").w(this, FUNC(nakajies_state::bank3_w)); - map(0x80000, 0x9ffff).bankr("bank4").w(this, FUNC(nakajies_state::bank4_w)); - map(0xa0000, 0xbffff).bankr("bank5").w(this, FUNC(nakajies_state::bank5_w)); - map(0xc0000, 0xdffff).bankr("bank6").w(this, FUNC(nakajies_state::bank6_w)); - map(0xe0000, 0xfffff).bankr("bank7").w(this, FUNC(nakajies_state::bank7_w)); + map(0x00000, 0x1ffff).bankr("bank0").w(FUNC(nakajies_state::bank0_w)); + map(0x20000, 0x3ffff).bankr("bank1").w(FUNC(nakajies_state::bank1_w)); + map(0x40000, 0x5ffff).bankr("bank2").w(FUNC(nakajies_state::bank2_w)); + map(0x60000, 0x7ffff).bankr("bank3").w(FUNC(nakajies_state::bank3_w)); + map(0x80000, 0x9ffff).bankr("bank4").w(FUNC(nakajies_state::bank4_w)); + map(0xa0000, 0xbffff).bankr("bank5").w(FUNC(nakajies_state::bank5_w)); + map(0xc0000, 0xdffff).bankr("bank6").w(FUNC(nakajies_state::bank6_w)); + map(0xe0000, 0xfffff).bankr("bank7").w(FUNC(nakajies_state::bank7_w)); } @@ -504,12 +504,12 @@ READ8_MEMBER( nakajies_state::keyboard_r ) void nakajies_state::nakajies_io_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(nakajies_state::lcd_memory_start_w)); - map(0x0010, 0x0017).w(this, FUNC(nakajies_state::banking_w)); - map(0x0060, 0x0060).rw(this, FUNC(nakajies_state::irq_enable_r), FUNC(nakajies_state::irq_enable_w)); - map(0x0090, 0x0090).rw(this, FUNC(nakajies_state::irq_clear_r), FUNC(nakajies_state::irq_clear_w)); - map(0x00a0, 0x00a0).r(this, FUNC(nakajies_state::unk_a0_r)); - map(0x00b0, 0x00b0).r(this, FUNC(nakajies_state::keyboard_r)); + map(0x0000, 0x0000).w(FUNC(nakajies_state::lcd_memory_start_w)); + map(0x0010, 0x0017).w(FUNC(nakajies_state::banking_w)); + map(0x0060, 0x0060).rw(FUNC(nakajies_state::irq_enable_r), FUNC(nakajies_state::irq_enable_w)); + map(0x0090, 0x0090).rw(FUNC(nakajies_state::irq_clear_r), FUNC(nakajies_state::irq_clear_w)); + map(0x00a0, 0x00a0).r(FUNC(nakajies_state::unk_a0_r)); + map(0x00b0, 0x00b0).r(FUNC(nakajies_state::keyboard_r)); map(0x00d0, 0x00df).rw("rtc", FUNC(rp5c01_device::read), FUNC(rp5c01_device::write)); } diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index c89860b4d69..c3804e9cfaf 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -220,19 +220,19 @@ void namcofl_state::namcofl_mem(address_map &map) map(0x10000000, 0x100fffff).bankrw("bank2"); map(0x20000000, 0x201fffff).rom().region("data", 0); map(0x30000000, 0x30001fff).ram().share("nvram"); /* nvram */ - map(0x30100000, 0x30100003).w(this, FUNC(namcofl_state::namcofl_spritebank_w)); + map(0x30100000, 0x30100003).w(FUNC(namcofl_state::namcofl_spritebank_w)); map(0x30284000, 0x3028bfff).ram().share("shareram"); map(0x30300000, 0x30303fff).ram(); /* COMRAM */ - map(0x30380000, 0x303800ff).r(this, FUNC(namcofl_state::fl_network_r)); /* network registers */ - map(0x30400000, 0x30407fff).r(m_c116, FUNC(namco_c116_device::read)).w(this, FUNC(namcofl_state::namcofl_c116_w)); - map(0x30800000, 0x3080ffff).rw(this, FUNC(namcofl_state::c123_tilemap_videoram_r), FUNC(namcofl_state::c123_tilemap_videoram_w)); - map(0x30a00000, 0x30a0003f).rw(this, FUNC(namcofl_state::c123_tilemap_control_r), FUNC(namcofl_state::c123_tilemap_control_w)); - map(0x30c00000, 0x30c1ffff).rw(this, FUNC(namcofl_state::c169_roz_videoram_r), FUNC(namcofl_state::c169_roz_videoram_w)).share("rozvideoram"); - map(0x30d00000, 0x30d0001f).rw(this, FUNC(namcofl_state::c169_roz_control_r), FUNC(namcofl_state::c169_roz_control_w)); - map(0x30e00000, 0x30e1ffff).rw(this, FUNC(namcofl_state::c355_obj_ram_r), FUNC(namcofl_state::c355_obj_ram_w)).share("objram"); + map(0x30380000, 0x303800ff).r(FUNC(namcofl_state::fl_network_r)); /* network registers */ + map(0x30400000, 0x30407fff).r(m_c116, FUNC(namco_c116_device::read)).w(FUNC(namcofl_state::namcofl_c116_w)); + map(0x30800000, 0x3080ffff).rw(FUNC(namcofl_state::c123_tilemap_videoram_r), FUNC(namcofl_state::c123_tilemap_videoram_w)); + map(0x30a00000, 0x30a0003f).rw(FUNC(namcofl_state::c123_tilemap_control_r), FUNC(namcofl_state::c123_tilemap_control_w)); + map(0x30c00000, 0x30c1ffff).rw(FUNC(namcofl_state::c169_roz_videoram_r), FUNC(namcofl_state::c169_roz_videoram_w)).share("rozvideoram"); + map(0x30d00000, 0x30d0001f).rw(FUNC(namcofl_state::c169_roz_control_r), FUNC(namcofl_state::c169_roz_control_w)); + map(0x30e00000, 0x30e1ffff).rw(FUNC(namcofl_state::c355_obj_ram_r), FUNC(namcofl_state::c355_obj_ram_w)).share("objram"); map(0x30f00000, 0x30f0000f).ram(); /* NebulaM2 code says this is int enable at 0000, int request at 0004, but doesn't do much about it */ - map(0x40000000, 0x4000005f).rw(this, FUNC(namcofl_state::namcofl_sysreg_r), FUNC(namcofl_state::namcofl_sysreg_w)); - map(0xfffffffc, 0xffffffff).r(this, FUNC(namcofl_state::fl_unk1_r)); + map(0x40000000, 0x4000005f).rw(FUNC(namcofl_state::namcofl_sysreg_r), FUNC(namcofl_state::namcofl_sysreg_w)); + map(0xfffffffc, 0xffffffff).r(FUNC(namcofl_state::fl_unk1_r)); } @@ -315,22 +315,22 @@ READ8_MEMBER(namcofl_state::dac0_r){ return 0xff; } void namcofl_state::namcoc75_am(address_map &map) { map(0x002000, 0x002fff).rw("c352", FUNC(c352_device::read), FUNC(c352_device::write)); - map(0x004000, 0x00bfff).ram().w(this, FUNC(namcofl_state::mcu_shared_w)).share("shareram"); + map(0x004000, 0x00bfff).ram().w(FUNC(namcofl_state::mcu_shared_w)).share("shareram"); map(0x200000, 0x27ffff).rom().region("c75data", 0); } void namcofl_state::namcoc75_io(address_map &map) { - map(M37710_PORT6, M37710_PORT6).rw(this, FUNC(namcofl_state::port6_r), FUNC(namcofl_state::port6_w)); - map(M37710_PORT7, M37710_PORT7).r(this, FUNC(namcofl_state::port7_r)); - map(M37710_ADC7_L, M37710_ADC7_L).r(this, FUNC(namcofl_state::dac7_r)); - map(M37710_ADC6_L, M37710_ADC6_L).r(this, FUNC(namcofl_state::dac6_r)); - map(M37710_ADC5_L, M37710_ADC5_L).r(this, FUNC(namcofl_state::dac5_r)); - map(M37710_ADC4_L, M37710_ADC4_L).r(this, FUNC(namcofl_state::dac4_r)); - map(M37710_ADC3_L, M37710_ADC3_L).r(this, FUNC(namcofl_state::dac3_r)); - map(M37710_ADC2_L, M37710_ADC2_L).r(this, FUNC(namcofl_state::dac2_r)); - map(M37710_ADC1_L, M37710_ADC1_L).r(this, FUNC(namcofl_state::dac1_r)); - map(M37710_ADC0_L, M37710_ADC0_L).r(this, FUNC(namcofl_state::dac0_r)); + map(M37710_PORT6, M37710_PORT6).rw(FUNC(namcofl_state::port6_r), FUNC(namcofl_state::port6_w)); + map(M37710_PORT7, M37710_PORT7).r(FUNC(namcofl_state::port7_r)); + map(M37710_ADC7_L, M37710_ADC7_L).r(FUNC(namcofl_state::dac7_r)); + map(M37710_ADC6_L, M37710_ADC6_L).r(FUNC(namcofl_state::dac6_r)); + map(M37710_ADC5_L, M37710_ADC5_L).r(FUNC(namcofl_state::dac5_r)); + map(M37710_ADC4_L, M37710_ADC4_L).r(FUNC(namcofl_state::dac4_r)); + map(M37710_ADC3_L, M37710_ADC3_L).r(FUNC(namcofl_state::dac3_r)); + map(M37710_ADC2_L, M37710_ADC2_L).r(FUNC(namcofl_state::dac2_r)); + map(M37710_ADC1_L, M37710_ADC1_L).r(FUNC(namcofl_state::dac1_r)); + map(M37710_ADC0_L, M37710_ADC0_L).r(FUNC(namcofl_state::dac0_r)); } diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp index d57cd1cb22a..c94fa04dc74 100644 --- a/src/mame/drivers/namcona1.cpp +++ b/src/mame/drivers/namcona1.cpp @@ -554,15 +554,15 @@ WRITE16_MEMBER(namcona1_state::mcu_mailbox_w_mcu) void namcona1_state::namcona1_main_map(address_map &map) { map(0x000000, 0x07ffff).ram().share("workram"); - map(0x3f8000, 0x3fffff).rw(this, FUNC(namcona1_state::mcu_mailbox_r), FUNC(namcona1_state::mcu_mailbox_w_68k)); + map(0x3f8000, 0x3fffff).rw(FUNC(namcona1_state::mcu_mailbox_r), FUNC(namcona1_state::mcu_mailbox_w_68k)); map(0x400000, 0xbfffff).rom().region("maskrom", 0); // data map(0xc00000, 0xdfffff).rom().region("maincpu", 0); // code map(0xe00000, 0xe00fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); - map(0xe40000, 0xe4000f).rw(this, FUNC(namcona1_state::custom_key_r), FUNC(namcona1_state::custom_key_w)); - map(0xefff00, 0xefffff).ram().w(this, FUNC(namcona1_state::vreg_w)).share("vreg"); - map(0xf00000, 0xf01fff).ram().w(this, FUNC(namcona1_state::paletteram_w)).share("paletteram"); - map(0xf40000, 0xf7ffff).rw(this, FUNC(namcona1_state::gfxram_r), FUNC(namcona1_state::gfxram_w)).share("cgram"); - map(0xff0000, 0xffbfff).ram().w(this, FUNC(namcona1_state::videoram_w)).share("videoram"); + map(0xe40000, 0xe4000f).rw(FUNC(namcona1_state::custom_key_r), FUNC(namcona1_state::custom_key_w)); + map(0xefff00, 0xefffff).ram().w(FUNC(namcona1_state::vreg_w)).share("vreg"); + map(0xf00000, 0xf01fff).ram().w(FUNC(namcona1_state::paletteram_w)).share("paletteram"); + map(0xf40000, 0xf7ffff).rw(FUNC(namcona1_state::gfxram_r), FUNC(namcona1_state::gfxram_w)).share("cgram"); + map(0xff0000, 0xffbfff).ram().w(FUNC(namcona1_state::videoram_w)).share("videoram"); map(0xffd000, 0xffdfff).ram(); /* unknown */ map(0xffe000, 0xffefff).ram().share("scroll"); /* scroll registers */ map(0xfff000, 0xffffff).ram().share("spriteram"); /* spriteram */ @@ -586,7 +586,7 @@ void xday2_namcona2_state::xday2_main_map(address_map &map) // these two seems lamps and flash related (mux too?) map(0xd00000, 0xd00001).nopw(); map(0xd40000, 0xd40001).nopw(); - map(0xd80001, 0xd80001).rw(this, FUNC(xday2_namcona2_state::printer_r), FUNC(xday2_namcona2_state::printer_w)); /* xday: serial out? */ + map(0xd80001, 0xd80001).rw(FUNC(xday2_namcona2_state::printer_r), FUNC(xday2_namcona2_state::printer_w)); /* xday: serial out? */ map(0xdc0000, 0xdc001f).rw(m_rtc, FUNC(msm6242_device::read), FUNC(msm6242_device::write)).umask16(0x00ff); /* RTC device */ // seems bigger than standard na1 (otherwise you won't get proper ranking defaults) @@ -639,11 +639,11 @@ WRITE16_MEMBER(namcona1_state::snd_w) void namcona1_state::namcona1_mcu_map(address_map &map) { - map(0x000800, 0x000fff).rw(this, FUNC(namcona1_state::mcu_mailbox_r), FUNC(namcona1_state::mcu_mailbox_w_mcu)); // "Mailslot" communications ports - map(0x001000, 0x001fff).rw(this, FUNC(namcona1_state::snd_r), FUNC(namcona1_state::snd_w)); // C140-alike sound chip - map(0x002000, 0x002fff).rw(this, FUNC(namcona1_state::na1mcu_shared_r), FUNC(namcona1_state::na1mcu_shared_w)); // mirror of first page of shared work RAM + map(0x000800, 0x000fff).rw(FUNC(namcona1_state::mcu_mailbox_r), FUNC(namcona1_state::mcu_mailbox_w_mcu)); // "Mailslot" communications ports + map(0x001000, 0x001fff).rw(FUNC(namcona1_state::snd_r), FUNC(namcona1_state::snd_w)); // C140-alike sound chip + map(0x002000, 0x002fff).rw(FUNC(namcona1_state::na1mcu_shared_r), FUNC(namcona1_state::na1mcu_shared_w)); // mirror of first page of shared work RAM map(0x003000, 0x00afff).ram(); // there is a 32k RAM chip according to CGFM - map(0x200000, 0x27ffff).rw(this, FUNC(namcona1_state::na1mcu_shared_r), FUNC(namcona1_state::na1mcu_shared_w)); // shared work RAM + map(0x200000, 0x27ffff).rw(FUNC(namcona1_state::na1mcu_shared_r), FUNC(namcona1_state::na1mcu_shared_w)); // shared work RAM } @@ -757,12 +757,12 @@ READ8_MEMBER(namcona1_state::portana_r) void namcona1_state::namcona1_mcu_io_map(address_map &map) { - map(M37710_PORT4, M37710_PORT4).rw(this, FUNC(namcona1_state::port4_r), FUNC(namcona1_state::port4_w)); - map(M37710_PORT5, M37710_PORT5).rw(this, FUNC(namcona1_state::port5_r), FUNC(namcona1_state::port5_w)); - map(M37710_PORT6, M37710_PORT6).rw(this, FUNC(namcona1_state::port6_r), FUNC(namcona1_state::port6_w)); - map(M37710_PORT7, M37710_PORT7).rw(this, FUNC(namcona1_state::port7_r), FUNC(namcona1_state::port7_w)); - map(M37710_PORT8, M37710_PORT8).rw(this, FUNC(namcona1_state::port8_r), FUNC(namcona1_state::port8_w)); - map(0x10, 0x1f).r(this, FUNC(namcona1_state::portana_r)); + map(M37710_PORT4, M37710_PORT4).rw(FUNC(namcona1_state::port4_r), FUNC(namcona1_state::port4_w)); + map(M37710_PORT5, M37710_PORT5).rw(FUNC(namcona1_state::port5_r), FUNC(namcona1_state::port5_w)); + map(M37710_PORT6, M37710_PORT6).rw(FUNC(namcona1_state::port6_r), FUNC(namcona1_state::port6_w)); + map(M37710_PORT7, M37710_PORT7).rw(FUNC(namcona1_state::port7_r), FUNC(namcona1_state::port7_w)); + map(M37710_PORT8, M37710_PORT8).rw(FUNC(namcona1_state::port8_r), FUNC(namcona1_state::port8_w)); + map(0x10, 0x1f).r(FUNC(namcona1_state::portana_r)); } diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp index a6b9ebaf1e2..c8d4c08cf1a 100644 --- a/src/mame/drivers/namconb1.cpp +++ b/src/mame/drivers/namconb1.cpp @@ -693,19 +693,19 @@ WRITE32_MEMBER(namconb1_state::share_w) void namconb1_state::namconb1_am(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x10001f).r(this, FUNC(namconb1_state::gunbulet_gun_r)); + map(0x100000, 0x10001f).r(FUNC(namconb1_state::gunbulet_gun_r)); map(0x1c0000, 0x1cffff).ram(); - map(0x1e4000, 0x1e4003).rw(this, FUNC(namconb1_state::randgen_r), FUNC(namconb1_state::srand_w)); - map(0x200000, 0x207fff).rw(this, FUNC(namconb1_state::share_r), FUNC(namconb1_state::share_w)); + map(0x1e4000, 0x1e4003).rw(FUNC(namconb1_state::randgen_r), FUNC(namconb1_state::srand_w)); + map(0x200000, 0x207fff).rw(FUNC(namconb1_state::share_r), FUNC(namconb1_state::share_w)); map(0x208000, 0x2fffff).ram(); - map(0x400000, 0x40001f).rw(this, FUNC(namconb1_state::namconb1_cpureg_r), FUNC(namconb1_state::namconb1_cpureg_w)); + map(0x400000, 0x40001f).rw(FUNC(namconb1_state::namconb1_cpureg_r), FUNC(namconb1_state::namconb1_cpureg_w)); map(0x580000, 0x5807ff).rw(m_eeprom, FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); - map(0x600000, 0x61ffff).rw(this, FUNC(namconb1_state::c355_obj_ram_r), FUNC(namconb1_state::c355_obj_ram_w)).share("objram"); - map(0x620000, 0x620007).rw(this, FUNC(namconb1_state::c355_obj_position_r), FUNC(namconb1_state::c355_obj_position_w)); - map(0x640000, 0x64ffff).rw(this, FUNC(namconb1_state::c123_tilemap_videoram_r), FUNC(namconb1_state::c123_tilemap_videoram_w)); - map(0x660000, 0x66003f).rw(this, FUNC(namconb1_state::c123_tilemap_control_r), FUNC(namconb1_state::c123_tilemap_control_w)); + map(0x600000, 0x61ffff).rw(FUNC(namconb1_state::c355_obj_ram_r), FUNC(namconb1_state::c355_obj_ram_w)).share("objram"); + map(0x620000, 0x620007).rw(FUNC(namconb1_state::c355_obj_position_r), FUNC(namconb1_state::c355_obj_position_w)); + map(0x640000, 0x64ffff).rw(FUNC(namconb1_state::c123_tilemap_videoram_r), FUNC(namconb1_state::c123_tilemap_videoram_w)); + map(0x660000, 0x66003f).rw(FUNC(namconb1_state::c123_tilemap_control_r), FUNC(namconb1_state::c123_tilemap_control_w)); map(0x680000, 0x68000f).ram().share("spritebank32"); - map(0x6e0000, 0x6e001f).r(this, FUNC(namconb1_state::custom_key_r)).nopw(); + map(0x6e0000, 0x6e001f).r(FUNC(namconb1_state::custom_key_r)).nopw(); map(0x700000, 0x707fff).rw(m_c116, FUNC(namco_c116_device::read), FUNC(namco_c116_device::write)); } @@ -713,24 +713,24 @@ void namconb1_state::namconb2_am(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x1c0000, 0x1cffff).ram(); - map(0x1e4000, 0x1e4003).rw(this, FUNC(namconb1_state::randgen_r), FUNC(namconb1_state::srand_w)); - map(0x200000, 0x207fff).rw(this, FUNC(namconb1_state::share_r), FUNC(namconb1_state::share_w)); + map(0x1e4000, 0x1e4003).rw(FUNC(namconb1_state::randgen_r), FUNC(namconb1_state::srand_w)); + map(0x200000, 0x207fff).rw(FUNC(namconb1_state::share_r), FUNC(namconb1_state::share_w)); map(0x208000, 0x2fffff).ram(); map(0x400000, 0x4fffff).rom().region("data", 0); - map(0x600000, 0x61ffff).rw(this, FUNC(namconb1_state::c355_obj_ram_r), FUNC(namconb1_state::c355_obj_ram_w)).share("objram"); - map(0x620000, 0x620007).rw(this, FUNC(namconb1_state::c355_obj_position_r), FUNC(namconb1_state::c355_obj_position_w)); + map(0x600000, 0x61ffff).rw(FUNC(namconb1_state::c355_obj_ram_r), FUNC(namconb1_state::c355_obj_ram_w)).share("objram"); + map(0x620000, 0x620007).rw(FUNC(namconb1_state::c355_obj_position_r), FUNC(namconb1_state::c355_obj_position_w)); map(0x640000, 0x64000f).ram(); /* unknown xy offset */ - map(0x680000, 0x68ffff).rw(this, FUNC(namconb1_state::c123_tilemap_videoram_r), FUNC(namconb1_state::c123_tilemap_videoram_w)); - map(0x6c0000, 0x6c003f).rw(this, FUNC(namconb1_state::c123_tilemap_control_r), FUNC(namconb1_state::c123_tilemap_control_w)); - map(0x700000, 0x71ffff).rw(this, FUNC(namconb1_state::c169_roz_videoram_r), FUNC(namconb1_state::c169_roz_videoram_w)).share("rozvideoram"); - map(0x740000, 0x74001f).rw(this, FUNC(namconb1_state::c169_roz_control_r), FUNC(namconb1_state::c169_roz_control_w)); + map(0x680000, 0x68ffff).rw(FUNC(namconb1_state::c123_tilemap_videoram_r), FUNC(namconb1_state::c123_tilemap_videoram_w)); + map(0x6c0000, 0x6c003f).rw(FUNC(namconb1_state::c123_tilemap_control_r), FUNC(namconb1_state::c123_tilemap_control_w)); + map(0x700000, 0x71ffff).rw(FUNC(namconb1_state::c169_roz_videoram_r), FUNC(namconb1_state::c169_roz_videoram_w)).share("rozvideoram"); + map(0x740000, 0x74001f).rw(FUNC(namconb1_state::c169_roz_control_r), FUNC(namconb1_state::c169_roz_control_w)); map(0x800000, 0x807fff).rw(m_c116, FUNC(namco_c116_device::read), FUNC(namco_c116_device::write)); map(0x900008, 0x90000f).ram().share("spritebank32"); map(0x940000, 0x94000f).ram().share("tilebank32"); - map(0x980000, 0x98000f).rw(this, FUNC(namconb1_state::c169_roz_bank_r), FUNC(namconb1_state::c169_roz_bank_w)); + map(0x980000, 0x98000f).rw(FUNC(namconb1_state::c169_roz_bank_r), FUNC(namconb1_state::c169_roz_bank_w)); map(0xa00000, 0xa007ff).rw(m_eeprom, FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)); - map(0xc00000, 0xc0001f).r(this, FUNC(namconb1_state::custom_key_r)).nopw(); - map(0xf00000, 0xf0001f).rw(this, FUNC(namconb1_state::namconb2_cpureg_r), FUNC(namconb1_state::namconb2_cpureg_w)); + map(0xc00000, 0xc0001f).r(FUNC(namconb1_state::custom_key_r)).nopw(); + map(0xf00000, 0xf0001f).rw(FUNC(namconb1_state::namconb2_cpureg_r), FUNC(namconb1_state::namconb2_cpureg_w)); } WRITE16_MEMBER(namconb1_state::mcu_shared_w) @@ -757,7 +757,7 @@ WRITE16_MEMBER(namconb1_state::mcu_shared_w) void namconb1_state::namcoc75_am(address_map &map) { map(0x002000, 0x002fff).rw("c352", FUNC(c352_device::read), FUNC(c352_device::write)); - map(0x004000, 0x00bfff).ram().w(this, FUNC(namconb1_state::mcu_shared_w)).share("namconb_share"); + map(0x004000, 0x00bfff).ram().w(FUNC(namconb1_state::mcu_shared_w)).share("namconb_share"); map(0x200000, 0x27ffff).rom().region("c75data", 0); } @@ -840,16 +840,16 @@ READ8_MEMBER(namconb1_state::dac0_r)// bit 6 void namconb1_state::namcoc75_io(address_map &map) { - map(M37710_PORT6, M37710_PORT6).rw(this, FUNC(namconb1_state::port6_r), FUNC(namconb1_state::port6_w)); - map(M37710_PORT7, M37710_PORT7).r(this, FUNC(namconb1_state::port7_r)); - map(M37710_ADC7_L, M37710_ADC7_L).r(this, FUNC(namconb1_state::dac7_r)); - map(M37710_ADC6_L, M37710_ADC6_L).r(this, FUNC(namconb1_state::dac6_r)); - map(M37710_ADC5_L, M37710_ADC5_L).r(this, FUNC(namconb1_state::dac5_r)); - map(M37710_ADC4_L, M37710_ADC4_L).r(this, FUNC(namconb1_state::dac4_r)); - map(M37710_ADC3_L, M37710_ADC3_L).r(this, FUNC(namconb1_state::dac3_r)); - map(M37710_ADC2_L, M37710_ADC2_L).r(this, FUNC(namconb1_state::dac2_r)); - map(M37710_ADC1_L, M37710_ADC1_L).r(this, FUNC(namconb1_state::dac1_r)); - map(M37710_ADC0_L, M37710_ADC0_L).r(this, FUNC(namconb1_state::dac0_r)); + map(M37710_PORT6, M37710_PORT6).rw(FUNC(namconb1_state::port6_r), FUNC(namconb1_state::port6_w)); + map(M37710_PORT7, M37710_PORT7).r(FUNC(namconb1_state::port7_r)); + map(M37710_ADC7_L, M37710_ADC7_L).r(FUNC(namconb1_state::dac7_r)); + map(M37710_ADC6_L, M37710_ADC6_L).r(FUNC(namconb1_state::dac6_r)); + map(M37710_ADC5_L, M37710_ADC5_L).r(FUNC(namconb1_state::dac5_r)); + map(M37710_ADC4_L, M37710_ADC4_L).r(FUNC(namconb1_state::dac4_r)); + map(M37710_ADC3_L, M37710_ADC3_L).r(FUNC(namconb1_state::dac3_r)); + map(M37710_ADC2_L, M37710_ADC2_L).r(FUNC(namconb1_state::dac2_r)); + map(M37710_ADC1_L, M37710_ADC1_L).r(FUNC(namconb1_state::dac1_r)); + map(M37710_ADC0_L, M37710_ADC0_L).r(FUNC(namconb1_state::dac0_r)); } diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp index 971338d633b..f2b30a10217 100644 --- a/src/mame/drivers/namcond1.cpp +++ b/src/mame/drivers/namcond1.cpp @@ -202,7 +202,7 @@ void namcond1_state::namcond1_map(address_map &map) map(0x400000, 0x40ffff).ram().share("shared_ram"); map(0x800000, 0x80000f).m(m_ygv608, FUNC(ygv608_device::port_map)).umask16(0xff00); map(0xa00000, 0xa00fff).rw("at28c16", FUNC(at28c16_device::read), FUNC(at28c16_device::write)).umask16(0xff00); - map(0xc3ff00, 0xc3ffff).rw(this, FUNC(namcond1_state::cuskey_r), FUNC(namcond1_state::cuskey_w)); + map(0xc3ff00, 0xc3ffff).rw(FUNC(namcond1_state::cuskey_r), FUNC(namcond1_state::cuskey_w)); } void namcond1_state::abcheck_map(address_map &map) @@ -213,10 +213,10 @@ void namcond1_state::abcheck_map(address_map &map) map(0x608000, 0x60ffff).ram().share("zpr2"); map(0x700000, 0x700001).nopw(); map(0x740000, 0x740001).nopw(); - map(0x780000, 0x780001).r(this, FUNC(namcond1_state::printer_r)); + map(0x780000, 0x780001).r(FUNC(namcond1_state::printer_r)); map(0x800000, 0x80000f).m(m_ygv608, FUNC(ygv608_device::port_map)).umask16(0xff00); map(0xa00000, 0xa00fff).rw("at28c16", FUNC(at28c16_device::read), FUNC(at28c16_device::write)).umask16(0xff00); - map(0xc3ff00, 0xc3ffff).rw(this, FUNC(namcond1_state::cuskey_r), FUNC(namcond1_state::cuskey_w)); + map(0xc3ff00, 0xc3ffff).rw(FUNC(namcond1_state::cuskey_r), FUNC(namcond1_state::cuskey_w)); } READ16_MEMBER(namcond1_state::printer_r) @@ -316,8 +316,8 @@ void namcond1_state::nd1h8rwmap(address_map &map) void namcond1_state::nd1h8iomap(address_map &map) { - map(h8_device::PORT_7, h8_device::PORT_7).r(this, FUNC(namcond1_state::mcu_p7_read)); - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(namcond1_state::mcu_pa_read), FUNC(namcond1_state::mcu_pa_write)); + map(h8_device::PORT_7, h8_device::PORT_7).r(FUNC(namcond1_state::mcu_p7_read)); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(namcond1_state::mcu_pa_read), FUNC(namcond1_state::mcu_pa_write)); map(h8_device::ADC_0, h8_device::ADC_3).noprw(); // MCU reads these, but the games have no analog controls map(0x14, 0x17).nopr(); // abcheck } diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index c1f73178718..1ae5ce2239f 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -367,7 +367,7 @@ READ8_MEMBER(namcos1_state::dsw_r) // ------1- ls257 dsw selector 3y // -------0 ls257 dsw selector 4y - m_dsw_sel->ba_w(m_io_dipsw->read()); + m_dsw_sel->write_ba(m_io_dipsw->read()); m_dsw_sel->select_w(BIT(offset, 1)); return 0xf0 | bitswap<4>(m_dsw_sel->output_r(space, 0), 0, 1, 2, 3); @@ -405,11 +405,11 @@ void namcos1_state::sub_map(address_map &map) void namcos1_state::virtual_map(address_map &map) { - map(0x2c0000, 0x2c1fff).w(this, FUNC(namcos1_state::_3dcs_w)); + map(0x2c0000, 0x2c1fff).w(FUNC(namcos1_state::_3dcs_w)); map(0x2e0000, 0x2e7fff).rw(m_c116, FUNC(namco_c116_device::read), FUNC(namco_c116_device::write)); - map(0x2f0000, 0x2f7fff).ram().w(this, FUNC(namcos1_state::videoram_w)).share("videoram"); - map(0x2f8000, 0x2f9fff).rw(this, FUNC(namcos1_state::no_key_r), FUNC(namcos1_state::no_key_w)); - map(0x2fc000, 0x2fcfff).ram().w(this, FUNC(namcos1_state::spriteram_w)).share("spriteram"); + map(0x2f0000, 0x2f7fff).ram().w(FUNC(namcos1_state::videoram_w)).share("videoram"); + map(0x2f8000, 0x2f9fff).rw(FUNC(namcos1_state::no_key_r), FUNC(namcos1_state::no_key_w)); + map(0x2fc000, 0x2fcfff).ram().w(FUNC(namcos1_state::spriteram_w)).share("spriteram"); map(0x2fd000, 0x2fd01f).ram().share("pfcontrol").mirror(0xfe0); map(0x2fe000, 0x2fe3ff).rw("namco", FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)).mirror(0xc00); /* PSG ( Shared ) */ map(0x2ff000, 0x2ff7ff).ram().share("triram").mirror(0x800); @@ -425,9 +425,9 @@ void namcos1_state::sound_map(address_map &map) map(0x5000, 0x53ff).rw("namco", FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)).mirror(0x400); /* PSG ( Shared ) */ map(0x7000, 0x77ff).ram().share("triram"); map(0x8000, 0x9fff).ram(); /* Sound RAM 3 */ - map(0xc000, 0xc001).w(this, FUNC(namcos1_state::sound_bankswitch_w)); /* ROM bank selector */ + map(0xc000, 0xc001).w(FUNC(namcos1_state::sound_bankswitch_w)); /* ROM bank selector */ map(0xd001, 0xd001).w(m_c117, FUNC(namco_c117_device::sound_watchdog_w)); - map(0xe000, 0xe000).w(this, FUNC(namcos1_state::audiocpu_irq_ack_w)); + map(0xe000, 0xe000).w(FUNC(namcos1_state::audiocpu_irq_ack_w)); map(0xc000, 0xffff).rom().region("audiocpu", 0); } @@ -436,23 +436,23 @@ void namcos1_state::mcu_map(address_map &map) { map(0x0000, 0x001f).rw(m_mcu, FUNC(hd63701_cpu_device::m6801_io_r), FUNC(hd63701_cpu_device::m6801_io_w)); map(0x0080, 0x00ff).ram(); /* built in RAM */ - map(0x1000, 0x1003).r(this, FUNC(namcos1_state::dsw_r)); + map(0x1000, 0x1003).r(FUNC(namcos1_state::dsw_r)); map(0x1400, 0x1400).portr("CONTROL0"); map(0x1401, 0x1401).portr("CONTROL1"); map(0x4000, 0xbfff).bankr("mcubank"); /* banked external ROM */ map(0xc000, 0xc7ff).ram().share("triram"); map(0xc800, 0xcfff).ram().share("nvram"); /* EEPROM */ - map(0xd000, 0xd000).w(m_dac0, FUNC(dac_byte_interface::write)); - map(0xd400, 0xd400).w(m_dac1, FUNC(dac_byte_interface::write)); - map(0xd800, 0xd800).w(this, FUNC(namcos1_state::mcu_bankswitch_w)); /* ROM bank selector */ - map(0xf000, 0xf000).w(this, FUNC(namcos1_state::mcu_irq_ack_w)); + map(0xd000, 0xd000).w(m_dac0, FUNC(dac_byte_interface::data_w)); + map(0xd400, 0xd400).w(m_dac1, FUNC(dac_byte_interface::data_w)); + map(0xd800, 0xd800).w(FUNC(namcos1_state::mcu_bankswitch_w)); /* ROM bank selector */ + map(0xf000, 0xf000).w(FUNC(namcos1_state::mcu_irq_ack_w)); map(0xf000, 0xffff).rom().region("mcu", 0); /* internal ROM */ } void namcos1_state::mcu_port_map(address_map &map) { - map(M6801_PORT1, M6801_PORT1).portr("COIN").w(this, FUNC(namcos1_state::coin_w)); - map(M6801_PORT2, M6801_PORT2).nopr().w(this, FUNC(namcos1_state::dac_gain_w)); + map(M6801_PORT1, M6801_PORT1).portr("COIN").w(FUNC(namcos1_state::coin_w)); + map(M6801_PORT2, M6801_PORT2).nopr().w(FUNC(namcos1_state::dac_gain_w)); } diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp index 8d582106834..f239e359bd3 100644 --- a/src/mame/drivers/namcos10.cpp +++ b/src/mame/drivers/namcos10.cpp @@ -496,10 +496,10 @@ void namcos10_state::namcos10_map(address_map &map) map(0x9f500000, 0x9f501fff).ram().share("share3"); /* ram? stores block numbers */ map(0xbf500000, 0xbf501fff).ram().share("share3"); /* ram? stores block numbers */ - map(0x1fba0000, 0x1fba000f).rw(this, FUNC(namcos10_state::control_r), FUNC(namcos10_state::control_w)); - map(0x1fba0002, 0x1fba0003).rw(this, FUNC(namcos10_state::sprot_r), FUNC(namcos10_state::sprot_w)); - map(0x1fba0008, 0x1fba0009).rw(this, FUNC(namcos10_state::i2c_clock_r), FUNC(namcos10_state::i2c_clock_w)); - map(0x1fba000a, 0x1fba000b).rw(this, FUNC(namcos10_state::i2c_data_r), FUNC(namcos10_state::i2c_data_w)); + map(0x1fba0000, 0x1fba000f).rw(FUNC(namcos10_state::control_r), FUNC(namcos10_state::control_w)); + map(0x1fba0002, 0x1fba0003).rw(FUNC(namcos10_state::sprot_r), FUNC(namcos10_state::sprot_w)); + map(0x1fba0008, 0x1fba0009).rw(FUNC(namcos10_state::i2c_clock_r), FUNC(namcos10_state::i2c_clock_w)); + map(0x1fba000a, 0x1fba000b).rw(FUNC(namcos10_state::i2c_data_r), FUNC(namcos10_state::i2c_data_w)); } @@ -681,9 +681,9 @@ void namcos10_state::namcos10_memm_map(address_map &map) { namcos10_map(map); - map(0x1f300000, 0x1f300001).w(this, FUNC(namcos10_state::crypto_switch_w)); - map(0x1f400000, 0x1f5fffff).r(this, FUNC(namcos10_state::range_r)); - map(0x1fb40000, 0x1fb4000f).w(this, FUNC(namcos10_state::bank_w)); + map(0x1f300000, 0x1f300001).w(FUNC(namcos10_state::crypto_switch_w)); + map(0x1f400000, 0x1f5fffff).r(FUNC(namcos10_state::range_r)); + map(0x1fb40000, 0x1fb4000f).w(FUNC(namcos10_state::bank_w)); } @@ -777,15 +777,15 @@ void namcos10_state::namcos10_memn_map(address_map &map) { namcos10_map(map); - map(0x1f300000, 0x1f300001).w(this, FUNC(namcos10_state::crypto_switch_w)); - map(0x1f380000, 0x1f380001).w(this, FUNC(namcos10_state::crypto_switch_w)); - map(0x1f400000, 0x1f400001).r(this, FUNC(namcos10_state::nand_status_r)); - map(0x1f410000, 0x1f410000).w(this, FUNC(namcos10_state::nand_address1_w)); - map(0x1f420000, 0x1f420000).w(this, FUNC(namcos10_state::nand_address2_w)); - map(0x1f430000, 0x1f430000).w(this, FUNC(namcos10_state::nand_address3_w)); - map(0x1f440000, 0x1f440000).w(this, FUNC(namcos10_state::nand_address4_w)); - map(0x1f450000, 0x1f450001).r(this, FUNC(namcos10_state::nand_data_r)); - map(0x1fb60000, 0x1fb60001).rw(this, FUNC(namcos10_state::nand_block_r), FUNC(namcos10_state::nand_block_w)); + map(0x1f300000, 0x1f300001).w(FUNC(namcos10_state::crypto_switch_w)); + map(0x1f380000, 0x1f380001).w(FUNC(namcos10_state::crypto_switch_w)); + map(0x1f400000, 0x1f400001).r(FUNC(namcos10_state::nand_status_r)); + map(0x1f410000, 0x1f410000).w(FUNC(namcos10_state::nand_address1_w)); + map(0x1f420000, 0x1f420000).w(FUNC(namcos10_state::nand_address2_w)); + map(0x1f430000, 0x1f430000).w(FUNC(namcos10_state::nand_address3_w)); + map(0x1f440000, 0x1f440000).w(FUNC(namcos10_state::nand_address4_w)); + map(0x1f450000, 0x1f450001).r(FUNC(namcos10_state::nand_data_r)); + map(0x1fb60000, 0x1fb60001).rw(FUNC(namcos10_state::nand_block_r), FUNC(namcos10_state::nand_block_w)); } void namcos10_state::memn_driver_init( ) diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp index 811e034aaf8..7b61ea751c6 100644 --- a/src/mame/drivers/namcos11.cpp +++ b/src/mame/drivers/namcos11.cpp @@ -472,7 +472,7 @@ WRITE16_MEMBER( namcos11_state::c76_shared_w ) void namcos11_state::namcos11_map(address_map &map) { - map(0x1fa04000, 0x1fa0ffff).rw(this, FUNC(namcos11_state::c76_shared_r), FUNC(namcos11_state::c76_shared_w)); /* shared ram with C76 */ + map(0x1fa04000, 0x1fa0ffff).rw(FUNC(namcos11_state::c76_shared_r), FUNC(namcos11_state::c76_shared_w)); /* shared ram with C76 */ map(0x1fa20000, 0x1fa2001f).rw("keycus", FUNC(ns11_keycus_device::read), FUNC(ns11_keycus_device::write)); map(0x1fa30000, 0x1fa30fff).rw("at28c16", FUNC(at28c16_device::read), FUNC(at28c16_device::write)).umask32(0x00ff00ff); /* eeprom */ map(0x1fb00000, 0x1fb00003).nopw(); /* ?? */ @@ -491,7 +491,7 @@ void namcos11_state::rom8_map(address_map &map) map(0x1f500000, 0x1f5fffff).bankr("bank6"); map(0x1f600000, 0x1f6fffff).bankr("bank7"); map(0x1f700000, 0x1f7fffff).bankr("bank8"); - map(0x1fa10020, 0x1fa1002f).w(this, FUNC(namcos11_state::rom8_w)); + map(0x1fa10020, 0x1fa1002f).w(FUNC(namcos11_state::rom8_w)); } void namcos11_state::rom8_64_map(address_map &map) @@ -506,16 +506,16 @@ void namcos11_state::rom8_64_map(address_map &map) map(0x1f500000, 0x1f5fffff).bankr("bank6"); map(0x1f600000, 0x1f6fffff).bankr("bank7"); map(0x1f700000, 0x1f7fffff).bankr("bank8"); - map(0x1f080000, 0x1f080003).w(this, FUNC(namcos11_state::rom8_64_upper_w)); - map(0x1fa10020, 0x1fa1002f).nopr().w(this, FUNC(namcos11_state::rom8_64_w)); + map(0x1f080000, 0x1f080003).w(FUNC(namcos11_state::rom8_64_upper_w)); + map(0x1fa10020, 0x1fa1002f).nopr().w(FUNC(namcos11_state::rom8_64_w)); } void namcos11_state::ptblank2ua_map(address_map &map) { rom8_64_map(map); - map(0x1f780000, 0x1f78000f).r(this, FUNC(namcos11_state::lightgun_r)); - map(0x1f788000, 0x1f788003).w(this, FUNC(namcos11_state::lightgun_w)); + map(0x1f780000, 0x1f78000f).r(FUNC(namcos11_state::lightgun_r)); + map(0x1f788000, 0x1f788003).w(FUNC(namcos11_state::lightgun_w)); } void namcos11_state::c76_map(address_map &map) diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp index 666f3ee5f5c..abf1f2d7025 100644 --- a/src/mame/drivers/namcos12.cpp +++ b/src/mame/drivers/namcos12.cpp @@ -1352,15 +1352,15 @@ void namcos12_state::namcos12_sub_irq( screen_device &screen, bool vblank_state void namcos12_state::namcos12_map(address_map &map) { map(0x1f000000, 0x1f000003).nopr(); - map(0x1f000000, 0x1f000001).w(this, FUNC(namcos12_state::bankoffset_w)); /* banking */ - map(0x1f080000, 0x1f083fff).rw(this, FUNC(namcos12_state::sharedram_r), FUNC(namcos12_state::sharedram_w)); /* shared ram?? */ + map(0x1f000000, 0x1f000001).w(FUNC(namcos12_state::bankoffset_w)); /* banking */ + map(0x1f080000, 0x1f083fff).rw(FUNC(namcos12_state::sharedram_r), FUNC(namcos12_state::sharedram_w)); /* shared ram?? */ map(0x1f140000, 0x1f140fff).rw("at28c16", FUNC(at28c16_device::read), FUNC(at28c16_device::write)).umask32(0x00ff00ff); /* eeprom */ map(0x1f1bff08, 0x1f1bff0f).nopw(); /* ?? */ - map(0x1f700000, 0x1f70ffff).w(this, FUNC(namcos12_state::dmaoffset_w)); /* dma */ + map(0x1f700000, 0x1f70ffff).w(FUNC(namcos12_state::dmaoffset_w)); /* dma */ /* Network area */ -// map(0x1f780000, 0x1f78ffff).rw(this, FUNC(namcos12_state::link_sharedram_r), FUNC(namcos12_state::link_sharedram_w)); /* H8 link CPU code */ -// map(0x1f796002, 0x1f796003).w(this, FUNC(namcos12_state::linkcpu_enable_w)); -// map(0x1f796022, 0x1f796023).w(this, FUNC(namcos12_state::linkcpu_disable_w)); +// map(0x1f780000, 0x1f78ffff).rw(FUNC(namcos12_state::link_sharedram_r), FUNC(namcos12_state::link_sharedram_w)); /* H8 link CPU code */ +// map(0x1f796002, 0x1f796003).w(FUNC(namcos12_state::linkcpu_enable_w)); +// map(0x1f796022, 0x1f796023).w(FUNC(namcos12_state::linkcpu_disable_w)); map(0x1fa00000, 0x1fbfffff).bankr("mainbank"); /* banked roms */ } @@ -1369,17 +1369,17 @@ void namcos12_state::ptblank2_map(address_map &map) { namcos12_map(map); - map(0x1f780000, 0x1f78000f).r(this, FUNC(namcos12_state::system11gun_r)); - map(0x1f788000, 0x1f788003).w(this, FUNC(namcos12_state::system11gun_w)); + map(0x1f780000, 0x1f78000f).r(FUNC(namcos12_state::system11gun_r)); + map(0x1f788000, 0x1f788003).w(FUNC(namcos12_state::system11gun_w)); } void namcos12_state::tektagt_map(address_map &map) { namcos12_map(map); - map(0x1fb00000, 0x1fb00003).rw(this, FUNC(namcos12_state::tektagt_protection_1_r), FUNC(namcos12_state::tektagt_protection_1_w)); - map(0x1fb80000, 0x1fb80003).rw(this, FUNC(namcos12_state::tektagt_protection_2_r), FUNC(namcos12_state::tektagt_protection_2_w)); - map(0x1f700000, 0x1f700003).r(this, FUNC(namcos12_state::tektagt_protection_3_r)); + map(0x1fb00000, 0x1fb00003).rw(FUNC(namcos12_state::tektagt_protection_1_r), FUNC(namcos12_state::tektagt_protection_1_w)); + map(0x1fb80000, 0x1fb80003).rw(FUNC(namcos12_state::tektagt_protection_2_r), FUNC(namcos12_state::tektagt_protection_2_w)); + map(0x1f700000, 0x1f700003).r(FUNC(namcos12_state::tektagt_protection_3_r)); } WRITE16_MEMBER(namcos12_state::system11gun_w) @@ -1622,11 +1622,11 @@ READ16_MEMBER(namcos12_state::s12_mcu_jvs_p8_r) void namcos12_state::s12h8iomap(address_map &map) { - map(h8_device::PORT_6, h8_device::PORT_6).r(this, FUNC(namcos12_state::s12_mcu_p6_r)); + map(h8_device::PORT_6, h8_device::PORT_6).r(FUNC(namcos12_state::s12_mcu_p6_r)); map(h8_device::PORT_7, h8_device::PORT_7).portr("DSW"); - map(h8_device::PORT_8, h8_device::PORT_8).r(this, FUNC(namcos12_state::s12_mcu_p8_r)).nopw(); - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(namcos12_state::s12_mcu_pa_r), FUNC(namcos12_state::s12_mcu_pa_w)); - map(h8_device::PORT_B, h8_device::PORT_B).rw(this, FUNC(namcos12_state::s12_mcu_portB_r), FUNC(namcos12_state::s12_mcu_portB_w)); + map(h8_device::PORT_8, h8_device::PORT_8).r(FUNC(namcos12_state::s12_mcu_p8_r)).nopw(); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(namcos12_state::s12_mcu_pa_r), FUNC(namcos12_state::s12_mcu_pa_w)); + map(h8_device::PORT_B, h8_device::PORT_B).rw(FUNC(namcos12_state::s12_mcu_portB_r), FUNC(namcos12_state::s12_mcu_portB_w)); map(h8_device::ADC_0, h8_device::ADC_0).noprw(); map(h8_device::ADC_1, h8_device::ADC_1).noprw(); map(h8_device::ADC_2, h8_device::ADC_2).noprw(); @@ -1635,11 +1635,11 @@ void namcos12_state::s12h8iomap(address_map &map) void namcos12_state::s12h8jvsiomap(address_map &map) { - map(h8_device::PORT_6, h8_device::PORT_6).r(this, FUNC(namcos12_state::s12_mcu_p6_r)); + map(h8_device::PORT_6, h8_device::PORT_6).r(FUNC(namcos12_state::s12_mcu_p6_r)); map(h8_device::PORT_7, h8_device::PORT_7).portr("DSW"); - map(h8_device::PORT_8, h8_device::PORT_8).r(this, FUNC(namcos12_state::s12_mcu_jvs_p8_r)).nopw(); - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(namcos12_state::s12_mcu_pa_r), FUNC(namcos12_state::s12_mcu_pa_w)); - map(h8_device::PORT_B, h8_device::PORT_B).rw(this, FUNC(namcos12_state::s12_mcu_portB_r), FUNC(namcos12_state::s12_mcu_portB_w)); + map(h8_device::PORT_8, h8_device::PORT_8).r(FUNC(namcos12_state::s12_mcu_jvs_p8_r)).nopw(); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(namcos12_state::s12_mcu_pa_r), FUNC(namcos12_state::s12_mcu_pa_w)); + map(h8_device::PORT_B, h8_device::PORT_B).rw(FUNC(namcos12_state::s12_mcu_portB_r), FUNC(namcos12_state::s12_mcu_portB_w)); map(h8_device::ADC_0, h8_device::ADC_0).noprw(); map(h8_device::ADC_1, h8_device::ADC_1).noprw(); map(h8_device::ADC_2, h8_device::ADC_2).noprw(); @@ -1648,11 +1648,11 @@ void namcos12_state::s12h8jvsiomap(address_map &map) void namcos12_state::s12h8railiomap(address_map &map) { - map(h8_device::PORT_6, h8_device::PORT_6).r(this, FUNC(namcos12_state::s12_mcu_p6_r)); + map(h8_device::PORT_6, h8_device::PORT_6).r(FUNC(namcos12_state::s12_mcu_p6_r)); map(h8_device::PORT_7, h8_device::PORT_7).portr("DSW"); - map(h8_device::PORT_8, h8_device::PORT_8).r(this, FUNC(namcos12_state::s12_mcu_jvs_p8_r)).nopw(); - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(namcos12_state::s12_mcu_pa_r), FUNC(namcos12_state::s12_mcu_pa_w)); - map(h8_device::PORT_B, h8_device::PORT_B).rw(this, FUNC(namcos12_state::s12_mcu_portB_r), FUNC(namcos12_state::s12_mcu_portB_w)); + map(h8_device::PORT_8, h8_device::PORT_8).r(FUNC(namcos12_state::s12_mcu_jvs_p8_r)).nopw(); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(namcos12_state::s12_mcu_pa_r), FUNC(namcos12_state::s12_mcu_pa_w)); + map(h8_device::PORT_B, h8_device::PORT_B).rw(FUNC(namcos12_state::s12_mcu_portB_r), FUNC(namcos12_state::s12_mcu_portB_w)); map(h8_device::ADC_0, h8_device::ADC_0).portr("LEVER"); map(h8_device::ADC_1, h8_device::ADC_1).noprw(); map(h8_device::ADC_2, h8_device::ADC_2).noprw(); @@ -1675,8 +1675,8 @@ void namcos12_state::golgo13_h8iomap(address_map &map) { s12h8iomap(map); - map(h8_device::ADC_1, h8_device::ADC_1).r(this, FUNC(namcos12_state::s12_mcu_gun_h_r)); - map(h8_device::ADC_2, h8_device::ADC_2).r(this, FUNC(namcos12_state::s12_mcu_gun_v_r)); + map(h8_device::ADC_1, h8_device::ADC_1).r(FUNC(namcos12_state::s12_mcu_gun_h_r)); + map(h8_device::ADC_2, h8_device::ADC_2).r(FUNC(namcos12_state::s12_mcu_gun_v_r)); } void namcos12_state::init_namcos12() @@ -1869,8 +1869,8 @@ void namcos12_state::tdjvsmap(address_map &map) void namcos12_state::tdjvsiomap(address_map &map) { - map(h8_device::PORT_4, h8_device::PORT_4).rw(this, FUNC(namcos12_state::iob_p4_r), FUNC(namcos12_state::iob_p4_w)); - map(h8_device::PORT_6, h8_device::PORT_6).r(this, FUNC(namcos12_state::iob_p6_r)); + map(h8_device::PORT_4, h8_device::PORT_4).rw(FUNC(namcos12_state::iob_p4_r), FUNC(namcos12_state::iob_p4_w)); + map(h8_device::PORT_6, h8_device::PORT_6).r(FUNC(namcos12_state::iob_p6_r)); map(h8_device::ADC_0, h8_device::ADC_0).portr("STEER"); map(h8_device::ADC_1, h8_device::ADC_1).portr("BRAKE"); map(h8_device::ADC_2, h8_device::ADC_2).portr("GAS"); @@ -1886,7 +1886,7 @@ void namcos12_state::plarailjvsmap(address_map &map) void namcos12_state::plarailjvsiomap(address_map &map) { - map(h8_device::PORT_4, h8_device::PORT_4).rw(this, FUNC(namcos12_state::iob_p4_r), FUNC(namcos12_state::iob_p4_w)); + map(h8_device::PORT_4, h8_device::PORT_4).rw(FUNC(namcos12_state::iob_p4_r), FUNC(namcos12_state::iob_p4_w)); map(h8_device::PORT_6, h8_device::PORT_6).portr("SERVICE"); map(h8_device::ADC_0, h8_device::ADC_0).noprw(); map(h8_device::ADC_1, h8_device::ADC_1).noprw(); diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 7c78344c051..394b2d8989d 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -597,10 +597,10 @@ READ8_MEMBER(namcos2_state::ack_mcu_vbl_r) void namcos2_state::namcos2_68k_default_cpu_board_am(address_map &map) { map(0x200000, 0x3fffff).rom().region("data_rom", 0); - map(0x400000, 0x41ffff).rw(this, FUNC(namcos2_state::c123_tilemap_videoram_r), FUNC(namcos2_state::c123_tilemap_videoram_w)); - map(0x420000, 0x42003f).rw(this, FUNC(namcos2_state::c123_tilemap_control_r), FUNC(namcos2_state::c123_tilemap_control_w)); - map(0x440000, 0x44ffff).rw(this, FUNC(namcos2_state::paletteram_word_r), FUNC(namcos2_state::paletteram_word_w)).share("paletteram"); - map(0x460000, 0x460fff).mirror(0xf000).rw(this, FUNC(namcos2_state::dpram_word_r), FUNC(namcos2_state::dpram_word_w)); + map(0x400000, 0x41ffff).rw(FUNC(namcos2_state::c123_tilemap_videoram_r), FUNC(namcos2_state::c123_tilemap_videoram_w)); + map(0x420000, 0x42003f).rw(FUNC(namcos2_state::c123_tilemap_control_r), FUNC(namcos2_state::c123_tilemap_control_w)); + map(0x440000, 0x44ffff).rw(FUNC(namcos2_state::paletteram_word_r), FUNC(namcos2_state::paletteram_word_w)).share("paletteram"); + map(0x460000, 0x460fff).mirror(0xf000).rw(FUNC(namcos2_state::dpram_word_r), FUNC(namcos2_state::dpram_word_w)); map(0x480000, 0x483fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w)); map(0x4a0000, 0x4a000f).m(m_sci, FUNC(namco_c139_device::regs_map)); } @@ -611,10 +611,10 @@ void namcos2_state::common_default_am(address_map &map) { namcos2_68k_default_cpu_board_am(map); map(0xc00000, 0xc03fff).ram().share("spriteram"); - map(0xc40000, 0xc40001).rw(this, FUNC(namcos2_state::gfx_ctrl_r), FUNC(namcos2_state::gfx_ctrl_w)); - map(0xc80000, 0xc9ffff).ram().w(this, FUNC(namcos2_state::rozram_word_w)).share("rozram"); + map(0xc40000, 0xc40001).rw(FUNC(namcos2_state::gfx_ctrl_r), FUNC(namcos2_state::gfx_ctrl_w)); + map(0xc80000, 0xc9ffff).ram().w(FUNC(namcos2_state::rozram_word_w)).share("rozram"); map(0xcc0000, 0xcc000f).ram().share("rozctrl"); - map(0xd00000, 0xd0000f).rw(this, FUNC(namcos2_state::namcos2_68k_key_r), FUNC(namcos2_state::namcos2_68k_key_w)); + map(0xd00000, 0xd0000f).rw(FUNC(namcos2_state::namcos2_68k_key_r), FUNC(namcos2_state::namcos2_68k_key_w)); } void namcos2_state::master_default_am(address_map &map) @@ -622,7 +622,7 @@ void namcos2_state::master_default_am(address_map &map) common_default_am(map); map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM); - map(0x180000, 0x183fff).rw(this, FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); } @@ -640,9 +640,9 @@ void namcos2_state::slave_default_am(address_map &map) void namcos2_state::common_finallap_am(address_map &map) { namcos2_68k_default_cpu_board_am(map); - map(0x300000, 0x33ffff).r(this, FUNC(namcos2_state::namcos2_finallap_prot_r)); + map(0x300000, 0x33ffff).r(FUNC(namcos2_state::namcos2_finallap_prot_r)); map(0x800000, 0x80ffff).ram().share("spriteram"); - map(0x840000, 0x840001).rw(this, FUNC(namcos2_state::gfx_ctrl_r), FUNC(namcos2_state::gfx_ctrl_w)); + map(0x840000, 0x840001).rw(FUNC(namcos2_state::gfx_ctrl_r), FUNC(namcos2_state::gfx_ctrl_w)); map(0x880000, 0x89ffff).rw(m_c45_road, FUNC(namco_c45_road_device::read), FUNC(namco_c45_road_device::write)); map(0x8c0000, 0x8c0001).nopw(); } @@ -652,7 +652,7 @@ void namcos2_state::master_finallap_am(address_map &map) common_finallap_am(map); map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM); - map(0x180000, 0x183fff).rw(this, FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); } @@ -669,9 +669,9 @@ void namcos2_state::slave_finallap_am(address_map &map) void namcos2_state::common_sgunner_am(address_map &map) { namcos2_68k_default_cpu_board_am(map); - map(0x800000, 0x8141ff).rw(this, FUNC(namcos2_state::c355_obj_ram_r), FUNC(namcos2_state::c355_obj_ram_w)); + map(0x800000, 0x8141ff).rw(FUNC(namcos2_state::c355_obj_ram_r), FUNC(namcos2_state::c355_obj_ram_w)); map(0x818000, 0x818001).nopw(); - map(0xa00000, 0xa0000f).rw(this, FUNC(namcos2_state::namcos2_68k_key_r), FUNC(namcos2_state::namcos2_68k_key_w)); + map(0xa00000, 0xa0000f).rw(FUNC(namcos2_state::namcos2_68k_key_r), FUNC(namcos2_state::namcos2_68k_key_w)); } void namcos2_state::master_sgunner_am(address_map &map) @@ -679,7 +679,7 @@ void namcos2_state::master_sgunner_am(address_map &map) common_sgunner_am(map); map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM); - map(0x180000, 0x183fff).rw(this, FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); } @@ -697,9 +697,9 @@ void namcos2_state::common_metlhawk_am(address_map &map) { namcos2_68k_default_cpu_board_am(map); map(0xc00000, 0xc03fff).ram().share("spriteram"); - map(0xc40000, 0xc4ffff).rw(this, FUNC(namcos2_state::c169_roz_videoram_r), FUNC(namcos2_state::c169_roz_videoram_w)).share("rozvideoram"); - map(0xd00000, 0xd0001f).rw(this, FUNC(namcos2_state::c169_roz_control_r), FUNC(namcos2_state::c169_roz_control_w)); - map(0xe00000, 0xe00001).rw(this, FUNC(namcos2_state::gfx_ctrl_r), FUNC(namcos2_state::gfx_ctrl_w)); /* ??? */ + map(0xc40000, 0xc4ffff).rw(FUNC(namcos2_state::c169_roz_videoram_r), FUNC(namcos2_state::c169_roz_videoram_w)).share("rozvideoram"); + map(0xd00000, 0xd0001f).rw(FUNC(namcos2_state::c169_roz_control_r), FUNC(namcos2_state::c169_roz_control_w)); + map(0xe00000, 0xe00001).rw(FUNC(namcos2_state::gfx_ctrl_r), FUNC(namcos2_state::gfx_ctrl_w)); /* ??? */ } void namcos2_state::master_metlhawk_am(address_map &map) @@ -707,7 +707,7 @@ void namcos2_state::master_metlhawk_am(address_map &map) common_metlhawk_am(map); map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM); - map(0x180000, 0x183fff).rw(this, FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); } @@ -724,15 +724,15 @@ void namcos2_state::slave_metlhawk_am(address_map &map) void namcos2_state::common_luckywld_am(address_map &map) { namcos2_68k_default_cpu_board_am(map); - map(0x800000, 0x8141ff).rw(this, FUNC(namcos2_state::c355_obj_ram_r), FUNC(namcos2_state::c355_obj_ram_w)); + map(0x800000, 0x8141ff).rw(FUNC(namcos2_state::c355_obj_ram_r), FUNC(namcos2_state::c355_obj_ram_w)); map(0x818000, 0x818001).noprw(); /* enable? */ map(0x81a000, 0x81a001).nopw(); /* enable? */ map(0x840000, 0x840001).nopr(); - map(0x900000, 0x900007).rw(this, FUNC(namcos2_state::c355_obj_position_r), FUNC(namcos2_state::c355_obj_position_w)); + map(0x900000, 0x900007).rw(FUNC(namcos2_state::c355_obj_position_r), FUNC(namcos2_state::c355_obj_position_w)); map(0xa00000, 0xa1ffff).rw(m_c45_road, FUNC(namco_c45_road_device::read), FUNC(namco_c45_road_device::write)); - map(0xc00000, 0xc0ffff).rw(this, FUNC(namcos2_state::c169_roz_videoram_r), FUNC(namcos2_state::c169_roz_videoram_w)).share("rozvideoram"); - map(0xd00000, 0xd0001f).rw(this, FUNC(namcos2_state::c169_roz_control_r), FUNC(namcos2_state::c169_roz_control_w)); - map(0xf00000, 0xf00007).rw(this, FUNC(namcos2_state::namcos2_68k_key_r), FUNC(namcos2_state::namcos2_68k_key_w)); + map(0xc00000, 0xc0ffff).rw(FUNC(namcos2_state::c169_roz_videoram_r), FUNC(namcos2_state::c169_roz_videoram_w)).share("rozvideoram"); + map(0xd00000, 0xd0001f).rw(FUNC(namcos2_state::c169_roz_control_r), FUNC(namcos2_state::c169_roz_control_w)); + map(0xf00000, 0xf00007).rw(FUNC(namcos2_state::namcos2_68k_key_r), FUNC(namcos2_state::namcos2_68k_key_w)); } void namcos2_state::master_luckywld_am(address_map &map) @@ -740,7 +740,7 @@ void namcos2_state::master_luckywld_am(address_map &map) common_luckywld_am(map); map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM); - map(0x180000, 0x183fff).rw(this, FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); } @@ -761,11 +761,11 @@ void namcos2_state::sound_default_am(address_map &map) map(0x0000, 0x3fff).bankr("bank6"); /* banked */ map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x5000, 0x6fff).rw("c140", FUNC(c140_device::c140_r), FUNC(c140_device::c140_w)); - map(0x7000, 0x77ff).rw(this, FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)).share("dpram"); - map(0x7800, 0x7fff).rw(this, FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)); /* mirror */ + map(0x7000, 0x77ff).rw(FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)).share("dpram"); + map(0x7800, 0x7fff).rw(FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)); /* mirror */ map(0x8000, 0x9fff).ram(); map(0xa000, 0xbfff).nopw(); /* Amplifier enable on 1st write */ - map(0xc000, 0xc001).w(this, FUNC(namcos2_state::namcos2_sound_bankselect_w)); + map(0xc000, 0xc001).w(FUNC(namcos2_state::namcos2_sound_bankselect_w)); map(0xd001, 0xd001).nopw(); /* Watchdog */ map(0xe000, 0xe000).nopw(); map(0xd000, 0xffff).rom(); @@ -783,10 +783,10 @@ void namcos2_state::mcu_default_am(address_map &map) map(0x0000, 0x0000).nopr(); /* Keep logging quiet */ map(0x0001, 0x0001).portr("MCUB"); map(0x0002, 0x0002).portr("MCUC"); - map(0x0003, 0x0003).rw(this, FUNC(namcos2_state::namcos2_mcu_port_d_r), FUNC(namcos2_state::namcos2_mcu_port_d_w)); + map(0x0003, 0x0003).rw(FUNC(namcos2_state::namcos2_mcu_port_d_r), FUNC(namcos2_state::namcos2_mcu_port_d_w)); map(0x0007, 0x0007).portr("MCUH"); - map(0x0010, 0x0010).rw(this, FUNC(namcos2_state::namcos2_mcu_analog_ctrl_r), FUNC(namcos2_state::namcos2_mcu_analog_ctrl_w)); - map(0x0011, 0x0011).rw(this, FUNC(namcos2_state::namcos2_mcu_analog_port_r), FUNC(namcos2_state::namcos2_mcu_analog_port_w)); + map(0x0010, 0x0010).rw(FUNC(namcos2_state::namcos2_mcu_analog_ctrl_r), FUNC(namcos2_state::namcos2_mcu_analog_ctrl_w)); + map(0x0011, 0x0011).rw(FUNC(namcos2_state::namcos2_mcu_analog_port_r), FUNC(namcos2_state::namcos2_mcu_analog_port_w)); map(0x0040, 0x01bf).ram(); map(0x01c0, 0x1fff).rom(); map(0x2000, 0x2000).portr("DSW"); @@ -794,7 +794,7 @@ void namcos2_state::mcu_default_am(address_map &map) map(0x3001, 0x3001).portr("MCUDI1"); map(0x3002, 0x3002).portr("MCUDI2"); map(0x3003, 0x3003).portr("MCUDI3"); - map(0x5000, 0x57ff).rw(this, FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)).share("dpram"); + map(0x5000, 0x57ff).rw(FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)).share("dpram"); map(0x6000, 0x6fff).nopr(); /* watchdog */ map(0x8000, 0xffff).rom(); } @@ -821,8 +821,8 @@ void namcos2_state::c68_default_am(address_map &map) map(0x3001, 0x3001).portr("MCUDI1"); map(0x3002, 0x3002).portr("MCUDI2"); map(0x3003, 0x3003).portr("MCUDI3"); - map(0x5000, 0x57ff).rw(this, FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)).share("dpram"); - map(0x6000, 0x6fff).r(this, FUNC(namcos2_state::ack_mcu_vbl_r)); // VBL ack + map(0x5000, 0x57ff).rw(FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)).share("dpram"); + map(0x6000, 0x6fff).r(FUNC(namcos2_state::ack_mcu_vbl_r)); // VBL ack map(0x8000, 0xffff).rom().region("c68", 0); } diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index 2df4b1835a2..bd1e73b4012 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -989,23 +989,23 @@ void namcos21_state::master_dsp_program(address_map &map) void namcos21_state::master_dsp_data(address_map &map) { - map(0x2000, 0x200f).rw(this, FUNC(namcos21_state::dspcuskey_r), FUNC(namcos21_state::dspcuskey_w)); - map(0x8000, 0xffff).rw(this, FUNC(namcos21_state::dspram16_r), FUNC(namcos21_state::dspram16_w)); /* 0x8000 words */ + map(0x2000, 0x200f).rw(FUNC(namcos21_state::dspcuskey_r), FUNC(namcos21_state::dspcuskey_w)); + map(0x8000, 0xffff).rw(FUNC(namcos21_state::dspram16_r), FUNC(namcos21_state::dspram16_w)); /* 0x8000 words */ } void namcos21_state::master_dsp_io(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(namcos21_state::dsp_port0_r), FUNC(namcos21_state::dsp_port0_w)); - map(0x01, 0x01).rw(this, FUNC(namcos21_state::dsp_port1_r), FUNC(namcos21_state::dsp_port1_w)); - map(0x02, 0x02).rw(this, FUNC(namcos21_state::dsp_port2_r), FUNC(namcos21_state::dsp_port2_w)); - map(0x03, 0x03).rw(this, FUNC(namcos21_state::dsp_port3_idc_rcv_enable_r), FUNC(namcos21_state::dsp_port3_w)); - map(0x04, 0x04).w(this, FUNC(namcos21_state::dsp_port4_w)); - map(0x08, 0x08).rw(this, FUNC(namcos21_state::dsp_port8_r), FUNC(namcos21_state::dsp_port8_w)); - map(0x09, 0x09).r(this, FUNC(namcos21_state::dsp_port9_r)); - map(0x0a, 0x0a).rw(this, FUNC(namcos21_state::dsp_porta_r), FUNC(namcos21_state::dsp_porta_w)); - map(0x0b, 0x0b).rw(this, FUNC(namcos21_state::dsp_portb_r), FUNC(namcos21_state::dsp_portb_w)); - map(0x0c, 0x0c).w(this, FUNC(namcos21_state::dsp_portc_w)); - map(0x0f, 0x0f).r(this, FUNC(namcos21_state::dsp_portf_r)); + map(0x00, 0x00).rw(FUNC(namcos21_state::dsp_port0_r), FUNC(namcos21_state::dsp_port0_w)); + map(0x01, 0x01).rw(FUNC(namcos21_state::dsp_port1_r), FUNC(namcos21_state::dsp_port1_w)); + map(0x02, 0x02).rw(FUNC(namcos21_state::dsp_port2_r), FUNC(namcos21_state::dsp_port2_w)); + map(0x03, 0x03).rw(FUNC(namcos21_state::dsp_port3_idc_rcv_enable_r), FUNC(namcos21_state::dsp_port3_w)); + map(0x04, 0x04).w(FUNC(namcos21_state::dsp_port4_w)); + map(0x08, 0x08).rw(FUNC(namcos21_state::dsp_port8_r), FUNC(namcos21_state::dsp_port8_w)); + map(0x09, 0x09).r(FUNC(namcos21_state::dsp_port9_r)); + map(0x0a, 0x0a).rw(FUNC(namcos21_state::dsp_porta_r), FUNC(namcos21_state::dsp_porta_w)); + map(0x0b, 0x0b).rw(FUNC(namcos21_state::dsp_portb_r), FUNC(namcos21_state::dsp_portb_w)); + map(0x0c, 0x0c).w(FUNC(namcos21_state::dsp_portc_w)); + map(0x0f, 0x0f).r(FUNC(namcos21_state::dsp_portf_r)); } /************************************************************************************/ @@ -1119,10 +1119,10 @@ void namcos21_state::slave_dsp_data(address_map &map) void namcos21_state::slave_dsp_io(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(namcos21_state::slave_port0_r), FUNC(namcos21_state::slave_port0_w)); - map(0x02, 0x02).r(this, FUNC(namcos21_state::slave_port2_r)); - map(0x03, 0x03).rw(this, FUNC(namcos21_state::slave_port3_r), FUNC(namcos21_state::slave_port3_w)); - map(0x0f, 0x0f).r(this, FUNC(namcos21_state::slave_portf_r)); + map(0x00, 0x00).rw(FUNC(namcos21_state::slave_port0_r), FUNC(namcos21_state::slave_port0_w)); + map(0x02, 0x02).r(FUNC(namcos21_state::slave_port2_r)); + map(0x03, 0x03).rw(FUNC(namcos21_state::slave_port3_r), FUNC(namcos21_state::slave_port3_w)); + map(0x0f, 0x0f).r(FUNC(namcos21_state::slave_portf_r)); } /************************************************************************************/ @@ -1245,18 +1245,18 @@ WRITE8_MEMBER(namcos21_state::namcos2_dualportram_byte_w) void namcos21_state::common_map(address_map &map) { map(0x280000, 0x280001).nopw(); /* written once on startup */ - map(0x400000, 0x400001).w(this, FUNC(namcos21_state::pointram_control_w)); - map(0x440000, 0x440001).rw(this, FUNC(namcos21_state::pointram_data_r), FUNC(namcos21_state::pointram_data_w)); + map(0x400000, 0x400001).w(FUNC(namcos21_state::pointram_control_w)); + map(0x440000, 0x440001).rw(FUNC(namcos21_state::pointram_data_r), FUNC(namcos21_state::pointram_data_w)); map(0x440002, 0x47ffff).nopw(); /* (?) Air Combat */ - map(0x480000, 0x4807ff).rw(this, FUNC(namcos21_state::namcos21_depthcue_r), FUNC(namcos21_state::namcos21_depthcue_w)); /* Air Combat */ - map(0x700000, 0x71ffff).rw(this, FUNC(namcos21_state::c355_obj_ram_r), FUNC(namcos21_state::c355_obj_ram_w)); - map(0x720000, 0x720007).rw(this, FUNC(namcos21_state::c355_obj_position_r), FUNC(namcos21_state::c355_obj_position_w)); + map(0x480000, 0x4807ff).rw(FUNC(namcos21_state::namcos21_depthcue_r), FUNC(namcos21_state::namcos21_depthcue_w)); /* Air Combat */ + map(0x700000, 0x71ffff).rw(FUNC(namcos21_state::c355_obj_ram_r), FUNC(namcos21_state::c355_obj_ram_w)); + map(0x720000, 0x720007).rw(FUNC(namcos21_state::c355_obj_position_r), FUNC(namcos21_state::c355_obj_position_w)); map(0x740000, 0x74ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x750000, 0x75ffff).ram().w(m_palette, FUNC(palette_device::write16_ext)).share("palette_ext"); - map(0x760000, 0x760001).rw(this, FUNC(namcos21_state::namcos21_video_enable_r), FUNC(namcos21_state::namcos21_video_enable_w)); + map(0x760000, 0x760001).rw(FUNC(namcos21_state::namcos21_video_enable_r), FUNC(namcos21_state::namcos21_video_enable_w)); map(0x800000, 0x8fffff).rom().region("data", 0); map(0x900000, 0x90ffff).ram().share("sharedram"); - map(0xa00000, 0xa00fff).rw(this, FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); + map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w)); map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map)); map(0xc00000, 0xcfffff).rom().mirror(0x100000).region("edata", 0); @@ -1267,9 +1267,9 @@ void namcos21_state::master_map(address_map &map) common_map(map); map(0x000000, 0x0fffff).rom(); map(0x100000, 0x10ffff).ram(); /* private work RAM */ - map(0x180000, 0x183fff).rw(this, FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); - map(0x200000, 0x20ffff).rw(this, FUNC(namcos21_state::dspram16_r), FUNC(namcos21_state::dspram16_w)).share("dspram16"); + map(0x200000, 0x20ffff).rw(FUNC(namcos21_state::dspram16_r), FUNC(namcos21_state::dspram16_w)).share("dspram16"); } void namcos21_state::slave_map(address_map &map) @@ -1278,7 +1278,7 @@ void namcos21_state::slave_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x13ffff).ram(); /* private work RAM */ map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map)); - map(0x200000, 0x20ffff).rw(this, FUNC(namcos21_state::dspram16_r), FUNC(namcos21_state::dspram16_w)).share("dspram16"); + map(0x200000, 0x20ffff).rw(FUNC(namcos21_state::dspram16_r), FUNC(namcos21_state::dspram16_w)).share("dspram16"); } @@ -1424,17 +1424,17 @@ void namcos21_state::winrun_dsp_program(address_map &map) void namcos21_state::winrun_dsp_data(address_map &map) { - map(0x2000, 0x200f).rw(this, FUNC(namcos21_state::winrun_cuskey_r), FUNC(namcos21_state::winrun_cuskey_w)); - map(0x4000, 0x4fff).rw(this, FUNC(namcos21_state::winrun_dspcomram_r), FUNC(namcos21_state::winrun_dspcomram_w)); - map(0x8000, 0xffff).r(this, FUNC(namcos21_state::winrun_table_r)); + map(0x2000, 0x200f).rw(FUNC(namcos21_state::winrun_cuskey_r), FUNC(namcos21_state::winrun_cuskey_w)); + map(0x4000, 0x4fff).rw(FUNC(namcos21_state::winrun_dspcomram_r), FUNC(namcos21_state::winrun_dspcomram_w)); + map(0x8000, 0xffff).r(FUNC(namcos21_state::winrun_table_r)); } void namcos21_state::winrun_dsp_io(address_map &map) { - map(0x08, 0x09).rw(this, FUNC(namcos21_state::winrun_dsp_pointrom_data_r), FUNC(namcos21_state::winrun_dsp_pointrom_addr_w)); - map(0x0a, 0x0a).w(this, FUNC(namcos21_state::winrun_dsp_render_w)); + map(0x08, 0x09).rw(FUNC(namcos21_state::winrun_dsp_pointrom_data_r), FUNC(namcos21_state::winrun_dsp_pointrom_addr_w)); + map(0x0a, 0x0a).w(FUNC(namcos21_state::winrun_dsp_render_w)); map(0x0b, 0x0b).nopw(); - map(0x0c, 0x0c).w(this, FUNC(namcos21_state::winrun_dsp_complete_w)); + map(0x0c, 0x0c).w(FUNC(namcos21_state::winrun_dsp_complete_w)); } WRITE16_MEMBER(namcos21_state::winrun_dspbios_w) @@ -1481,19 +1481,19 @@ void namcos21_state::winrun_master_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).ram(); /* work RAM */ - map(0x180000, 0x183fff).rw(this, FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); map(0x250000, 0x25ffff).ram().share("winrun_polydata"); map(0x260000, 0x26ffff).ram(); /* unused? */ - map(0x280000, 0x281fff).w(this, FUNC(namcos21_state::winrun_dspbios_w)).share("winrun_dspbios"); - map(0x380000, 0x38000f).rw(this, FUNC(namcos21_state::winrun_dspcomram_control_r), FUNC(namcos21_state::winrun_dspcomram_control_w)); - map(0x3c0000, 0x3c1fff).rw(this, FUNC(namcos21_state::winrun_68k_dspcomram_r), FUNC(namcos21_state::winrun_68k_dspcomram_w)); - map(0x400000, 0x400001).w(this, FUNC(namcos21_state::pointram_control_w)); - map(0x440000, 0x440001).rw(this, FUNC(namcos21_state::pointram_data_r), FUNC(namcos21_state::pointram_data_w)); + map(0x280000, 0x281fff).w(FUNC(namcos21_state::winrun_dspbios_w)).share("winrun_dspbios"); + map(0x380000, 0x38000f).rw(FUNC(namcos21_state::winrun_dspcomram_control_r), FUNC(namcos21_state::winrun_dspcomram_control_w)); + map(0x3c0000, 0x3c1fff).rw(FUNC(namcos21_state::winrun_68k_dspcomram_r), FUNC(namcos21_state::winrun_68k_dspcomram_w)); + map(0x400000, 0x400001).w(FUNC(namcos21_state::pointram_control_w)); + map(0x440000, 0x440001).rw(FUNC(namcos21_state::pointram_data_r), FUNC(namcos21_state::pointram_data_w)); map(0x600000, 0x60ffff).ram().share("gpu_comram"); map(0x800000, 0x87ffff).rom().region("data", 0); map(0x900000, 0x90ffff).ram().share("sharedram"); - map(0xa00000, 0xa00fff).rw(this, FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); + map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w)); map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map)); } @@ -1506,7 +1506,7 @@ void namcos21_state::winrun_slave_map(address_map &map) map(0x600000, 0x60ffff).ram().share("gpu_comram"); map(0x800000, 0x87ffff).rom().region("data", 0); map(0x900000, 0x90ffff).ram().share("sharedram"); - map(0xa00000, 0xa00fff).rw(this, FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); + map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w)); map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map)); } @@ -1515,15 +1515,15 @@ void namcos21_state::winrun_slave_map(address_map &map) void namcos21_state::winrun_gpu_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100001).rw(this, FUNC(namcos21_state::winrun_gpu_color_r), FUNC(namcos21_state::winrun_gpu_color_w)); /* ? */ + map(0x100000, 0x100001).rw(FUNC(namcos21_state::winrun_gpu_color_r), FUNC(namcos21_state::winrun_gpu_color_w)); /* ? */ map(0x180000, 0x19ffff).ram(); /* work RAM */ map(0x1c0000, 0x1fffff).m(m_gpu_intc, FUNC(namco_c148_device::map)); map(0x200000, 0x20ffff).ram().share("gpu_comram"); map(0x400000, 0x40ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x410000, 0x41ffff).ram().w(m_palette, FUNC(palette_device::write16_ext)).share("palette_ext"); map(0x600000, 0x6fffff).rom().region("gdata", 0); - map(0xc00000, 0xcfffff).rw(this, FUNC(namcos21_state::winrun_gpu_videoram_r), FUNC(namcos21_state::winrun_gpu_videoram_w)); - map(0xd00000, 0xd0000f).rw(this, FUNC(namcos21_state::winrun_gpu_register_r), FUNC(namcos21_state::winrun_gpu_register_w)); + map(0xc00000, 0xcfffff).rw(FUNC(namcos21_state::winrun_gpu_videoram_r), FUNC(namcos21_state::winrun_gpu_videoram_w)); + map(0xd00000, 0xd0000f).rw(FUNC(namcos21_state::winrun_gpu_register_r), FUNC(namcos21_state::winrun_gpu_register_w)); map(0xe0000d, 0xe0000d).rw(m_gpu_intc, FUNC(namco_c148_device::ext_posirq_line_r), FUNC(namco_c148_device::ext_posirq_line_w)); } @@ -1538,12 +1538,12 @@ void namcos21_state::sound_map(address_map &map) map(0x3000, 0x3003).nopw(); /* ? */ map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x5000, 0x6fff).rw("c140", FUNC(c140_device::c140_r), FUNC(c140_device::c140_w)); - map(0x7000, 0x77ff).rw(this, FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)).share("mpdualportram"); - map(0x7800, 0x7fff).rw(this, FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)); /* mirror */ + map(0x7000, 0x77ff).rw(FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)).share("mpdualportram"); + map(0x7800, 0x7fff).rw(FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)); /* mirror */ map(0x8000, 0x9fff).ram(); map(0xa000, 0xbfff).nopw(); /* amplifier enable on 1st write */ map(0xc000, 0xffff).nopw(); /* avoid debug log noise; games write frequently to 0xe000 */ - map(0xc000, 0xc001).w(this, FUNC(namcos21_state::namcos2_sound_bankselect_w)); + map(0xc000, 0xc001).w(FUNC(namcos21_state::namcos2_sound_bankselect_w)); map(0xd001, 0xd001).nopw(); /* watchdog */ map(0xd000, 0xffff).rom(); } @@ -1559,10 +1559,10 @@ void namcos21_state::mcu_map(address_map &map) map(0x0000, 0x0000).nopr(); map(0x0001, 0x0001).portr("PORTB"); /* p1,p2 start */ map(0x0002, 0x0002).portr("PORTC"); /* coins */ - map(0x0003, 0x0003).rw(this, FUNC(namcos21_state::namcos2_mcu_port_d_r), FUNC(namcos21_state::namcos2_mcu_port_d_w)); + map(0x0003, 0x0003).rw(FUNC(namcos21_state::namcos2_mcu_port_d_r), FUNC(namcos21_state::namcos2_mcu_port_d_w)); map(0x0007, 0x0007).portr("PORTH"); /* fire buttons */ - map(0x0010, 0x0010).rw(this, FUNC(namcos21_state::namcos2_mcu_analog_ctrl_r), FUNC(namcos21_state::namcos2_mcu_analog_ctrl_w)); - map(0x0011, 0x0011).rw(this, FUNC(namcos21_state::namcos2_mcu_analog_port_r), FUNC(namcos21_state::namcos2_mcu_analog_port_w)); + map(0x0010, 0x0010).rw(FUNC(namcos21_state::namcos2_mcu_analog_ctrl_r), FUNC(namcos21_state::namcos2_mcu_analog_ctrl_w)); + map(0x0011, 0x0011).rw(FUNC(namcos21_state::namcos2_mcu_analog_port_r), FUNC(namcos21_state::namcos2_mcu_analog_port_w)); map(0x0040, 0x01bf).ram(); map(0x01c0, 0x1fff).rom(); map(0x2000, 0x2000).portr("DSW"); @@ -1570,7 +1570,7 @@ void namcos21_state::mcu_map(address_map &map) map(0x3001, 0x3001).portr("DIAL1"); map(0x3002, 0x3002).portr("DIAL2"); map(0x3003, 0x3003).portr("DIAL3"); - map(0x5000, 0x57ff).rw(this, FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)).share("mpdualportram"); + map(0x5000, 0x57ff).rw(FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)).share("mpdualportram"); map(0x6000, 0x6fff).nopr(); /* watchdog */ map(0x8000, 0xffff).rom(); } @@ -1583,14 +1583,14 @@ void namcos21_state::mcu_map(address_map &map) void namcos21_state::driveyes_common_map(address_map &map) { - map(0x700000, 0x71ffff).rw(this, FUNC(namcos21_state::c355_obj_ram_r), FUNC(namcos21_state::c355_obj_ram_w)); - map(0x720000, 0x720007).rw(this, FUNC(namcos21_state::c355_obj_position_r), FUNC(namcos21_state::c355_obj_position_w)); + map(0x700000, 0x71ffff).rw(FUNC(namcos21_state::c355_obj_ram_r), FUNC(namcos21_state::c355_obj_ram_w)); + map(0x720000, 0x720007).rw(FUNC(namcos21_state::c355_obj_position_r), FUNC(namcos21_state::c355_obj_position_w)); map(0x740000, 0x74ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x750000, 0x75ffff).ram().w(m_palette, FUNC(palette_device::write16_ext)).share("palette_ext"); - map(0x760000, 0x760001).rw(this, FUNC(namcos21_state::namcos21_video_enable_r), FUNC(namcos21_state::namcos21_video_enable_w)); + map(0x760000, 0x760001).rw(FUNC(namcos21_state::namcos21_video_enable_r), FUNC(namcos21_state::namcos21_video_enable_w)); map(0x800000, 0x8fffff).rom().region("data", 0); map(0x900000, 0x90ffff).ram().share("sharedram"); - map(0xa00000, 0xa00fff).rw(this, FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); + map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w)); map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w)); map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map)); } @@ -1600,14 +1600,14 @@ void namcos21_state::driveyes_master_map(address_map &map) driveyes_common_map(map); map(0x000000, 0x03ffff).rom(); map(0x100000, 0x10ffff).ram(); /* private work RAM */ - map(0x180000, 0x183fff).rw(this, FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff); + map(0x180000, 0x183fff).rw(FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff); map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map)); map(0x250000, 0x25ffff).ram().share("winrun_polydata"); - map(0x280000, 0x281fff).w(this, FUNC(namcos21_state::winrun_dspbios_w)).share("winrun_dspbios"); - map(0x380000, 0x38000f).rw(this, FUNC(namcos21_state::winrun_dspcomram_control_r), FUNC(namcos21_state::winrun_dspcomram_control_w)); - map(0x3c0000, 0x3c1fff).rw(this, FUNC(namcos21_state::winrun_68k_dspcomram_r), FUNC(namcos21_state::winrun_68k_dspcomram_w)); - map(0x400000, 0x400001).w(this, FUNC(namcos21_state::pointram_control_w)); - map(0x440000, 0x440001).rw(this, FUNC(namcos21_state::pointram_data_r), FUNC(namcos21_state::pointram_data_w)); + map(0x280000, 0x281fff).w(FUNC(namcos21_state::winrun_dspbios_w)).share("winrun_dspbios"); + map(0x380000, 0x38000f).rw(FUNC(namcos21_state::winrun_dspcomram_control_r), FUNC(namcos21_state::winrun_dspcomram_control_w)); + map(0x3c0000, 0x3c1fff).rw(FUNC(namcos21_state::winrun_68k_dspcomram_r), FUNC(namcos21_state::winrun_68k_dspcomram_w)); + map(0x400000, 0x400001).w(FUNC(namcos21_state::pointram_control_w)); + map(0x440000, 0x440001).rw(FUNC(namcos21_state::pointram_data_r), FUNC(namcos21_state::pointram_data_w)); } void namcos21_state::driveyes_slave_map(address_map &map) diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 2730969dec2..e1da5b35f88 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -1749,7 +1749,7 @@ void namcos22_state::namcos22_am(address_map &map) * C389? (Cyber Cycles) * C392? (Ace Driver Victory Lap) */ - map(0x20000000, 0x2000000f).rw(this, FUNC(namcos22_state::namcos22_keycus_r), FUNC(namcos22_state::namcos22_keycus_w)); + map(0x20000000, 0x2000000f).rw(FUNC(namcos22_state::namcos22_keycus_r), FUNC(namcos22_state::namcos22_keycus_w)); /** * C139 SCI Buffer @@ -1792,13 +1792,13 @@ void namcos22_state::namcos22_am(address_map &map) * 2002000c 2 R/W RX FIFO Pointer (0x0000 - 0x0fff) * 2002000e 2 W TX FIFO Pointer (0x0000 - 0x1fff) */ - map(0x20020000, 0x2002000f).r(this, FUNC(namcos22_state::namcos22_sci_r)).writeonly(); + map(0x20020000, 0x2002000f).r(FUNC(namcos22_state::namcos22_sci_r)).writeonly(); /** * System Controller: Interrupt Control, Peripheral Control * */ - map(0x40000000, 0x4000001f).rw(this, FUNC(namcos22_state::namcos22_system_controller_r), FUNC(namcos22_state::namcos22_system_controller_w)); + map(0x40000000, 0x4000001f).rw(FUNC(namcos22_state::namcos22_system_controller_r), FUNC(namcos22_state::namcos22_system_controller_w)); /** * Unknown Device (optional for diagnostics?) @@ -1813,8 +1813,8 @@ void namcos22_state::namcos22_am(address_map &map) * 0x50000000 - DIPSW3 * 0x50000001 - DIPSW2 */ - map(0x50000000, 0x50000003).rw(this, FUNC(namcos22_state::namcos22_dipswitch_r), FUNC(namcos22_state::namcos22_cpuleds_w)); - map(0x50000008, 0x5000000b).rw(this, FUNC(namcos22_state::namcos22_portbit_r), FUNC(namcos22_state::namcos22_portbit_w)); + map(0x50000000, 0x50000003).rw(FUNC(namcos22_state::namcos22_dipswitch_r), FUNC(namcos22_state::namcos22_cpuleds_w)); + map(0x50000008, 0x5000000b).rw(FUNC(namcos22_state::namcos22_portbit_r), FUNC(namcos22_state::namcos22_portbit_w)); /** * EEPROM @@ -1873,7 +1873,7 @@ void namcos22_state::namcos22_am(address_map &map) * Known chip type: TC55328P-25, N341256P-15 * Notes: connected bits = 0x00ffffff (24bit) */ - map(0x70000000, 0x7001ffff).rw(this, FUNC(namcos22_state::namcos22_dspram_r), FUNC(namcos22_state::namcos22_dspram_w)).share("polygonram"); + map(0x70000000, 0x7001ffff).rw(FUNC(namcos22_state::namcos22_dspram_r), FUNC(namcos22_state::namcos22_dspram_w)).share("polygonram"); /** * LED on PCB(?) @@ -1898,7 +1898,7 @@ void namcos22_state::namcos22_am(address_map &map) * Mounted position: VIDEO 6B, 7B, 8B (near C305) * Note: 0xff00-0xffff are for Tilemap (16 x 16) */ - map(0x90028000, 0x9003ffff).ram().w(this, FUNC(namcos22_state::namcos22_paletteram_w)).share("paletteram"); + map(0x90028000, 0x9003ffff).ram().w(FUNC(namcos22_state::namcos22_paletteram_w)).share("paletteram"); /** * unknown (option) @@ -1909,7 +1909,7 @@ void namcos22_state::namcos22_am(address_map &map) /** * Tilemap PCG Memory */ - map(0x90080000, 0x9009dfff).ram().w(this, FUNC(namcos22_state::namcos22_cgram_w)).share("cgram"); + map(0x90080000, 0x9009dfff).ram().w(FUNC(namcos22_state::namcos22_cgram_w)).share("cgram"); /** * Tilemap Memory (64 x 64) @@ -1917,13 +1917,13 @@ void namcos22_state::namcos22_am(address_map &map) * Known chip type: HM511664 (64k x 16bit SRAM) * Note: Self test: 90084000 - 9009ffff */ - map(0x9009e000, 0x9009ffff).ram().w(this, FUNC(namcos22_state::namcos22_textram_w)).share("textram"); + map(0x9009e000, 0x9009ffff).ram().w(FUNC(namcos22_state::namcos22_textram_w)).share("textram"); /** * Tilemap Register * Mounted position: unknown */ - map(0x900a0000, 0x900a000f).rw(this, FUNC(namcos22_state::namcos22_tilemapattr_r), FUNC(namcos22_state::namcos22_tilemapattr_w)).share("tilemapattr"); + map(0x900a0000, 0x900a000f).rw(FUNC(namcos22_state::namcos22_tilemapattr_r), FUNC(namcos22_state::namcos22_tilemapattr_w)).share("tilemapattr"); } @@ -1931,28 +1931,28 @@ void namcos22_state::namcos22_am(address_map &map) void namcos22_state::namcos22s_am(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x400000, 0x40001f).rw(this, FUNC(namcos22_state::namcos22_keycus_r), FUNC(namcos22_state::namcos22_keycus_w)); + map(0x400000, 0x40001f).rw(FUNC(namcos22_state::namcos22_keycus_r), FUNC(namcos22_state::namcos22_keycus_w)); map(0x410000, 0x413fff).ram(); /* C139 SCI buffer */ - map(0x420000, 0x42000f).r(this, FUNC(namcos22_state::namcos22_sci_r)).writeonly(); /* C139 SCI registers */ - map(0x440000, 0x440003).rw(this, FUNC(namcos22_state::namcos22_dipswitch_r), FUNC(namcos22_state::namcos22_cpuleds_w)); - map(0x450008, 0x45000b).rw(this, FUNC(namcos22_state::namcos22_portbit_r), FUNC(namcos22_state::namcos22_portbit_w)); + map(0x420000, 0x42000f).r(FUNC(namcos22_state::namcos22_sci_r)).writeonly(); /* C139 SCI registers */ + map(0x440000, 0x440003).rw(FUNC(namcos22_state::namcos22_dipswitch_r), FUNC(namcos22_state::namcos22_cpuleds_w)); + map(0x450008, 0x45000b).rw(FUNC(namcos22_state::namcos22_portbit_r), FUNC(namcos22_state::namcos22_portbit_w)); map(0x460000, 0x463fff).rw(m_eeprom, FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask32(0xff00ff00); - map(0x700000, 0x70001f).rw(this, FUNC(namcos22_state::namcos22_system_controller_r), FUNC(namcos22_state::namcos22s_system_controller_w)); - map(0x800000, 0x800003).w(this, FUNC(namcos22_state::namcos22s_chipselect_w)); + map(0x700000, 0x70001f).rw(FUNC(namcos22_state::namcos22_system_controller_r), FUNC(namcos22_state::namcos22s_system_controller_w)); + map(0x800000, 0x800003).w(FUNC(namcos22_state::namcos22s_chipselect_w)); map(0x810000, 0x81000f).ram().share("czattr"); - map(0x810200, 0x8103ff).rw(this, FUNC(namcos22_state::namcos22s_czram_r), FUNC(namcos22_state::namcos22s_czram_w)); + map(0x810200, 0x8103ff).rw(FUNC(namcos22_state::namcos22s_czram_r), FUNC(namcos22_state::namcos22s_czram_w)); map(0x820000, 0x8202ff).nopw(); /* leftover of old (non-super) video mixer device */ map(0x824000, 0x8243ff).ram().share("video_mixer"); - map(0x828000, 0x83ffff).ram().w(this, FUNC(namcos22_state::namcos22_paletteram_w)).share("paletteram"); - map(0x860000, 0x860007).rw(this, FUNC(namcos22_state::namcos22s_spotram_r), FUNC(namcos22_state::namcos22s_spotram_w)); - map(0x880000, 0x89dfff).ram().w(this, FUNC(namcos22_state::namcos22_cgram_w)).share("cgram"); - map(0x89e000, 0x89ffff).ram().w(this, FUNC(namcos22_state::namcos22_textram_w)).share("textram"); - map(0x8a0000, 0x8a000f).rw(this, FUNC(namcos22_state::namcos22_tilemapattr_r), FUNC(namcos22_state::namcos22_tilemapattr_w)).share("tilemapattr"); + map(0x828000, 0x83ffff).ram().w(FUNC(namcos22_state::namcos22_paletteram_w)).share("paletteram"); + map(0x860000, 0x860007).rw(FUNC(namcos22_state::namcos22s_spotram_r), FUNC(namcos22_state::namcos22s_spotram_w)); + map(0x880000, 0x89dfff).ram().w(FUNC(namcos22_state::namcos22_cgram_w)).share("cgram"); + map(0x89e000, 0x89ffff).ram().w(FUNC(namcos22_state::namcos22_textram_w)).share("textram"); + map(0x8a0000, 0x8a000f).rw(FUNC(namcos22_state::namcos22_tilemapattr_r), FUNC(namcos22_state::namcos22_tilemapattr_w)).share("tilemapattr"); map(0x900000, 0x90ffff).ram().share("vics_data"); - map(0x940000, 0x94007f).rw(this, FUNC(namcos22_state::namcos22s_vics_control_r), FUNC(namcos22_state::namcos22s_vics_control_w)).share("vics_control"); + map(0x940000, 0x94007f).rw(FUNC(namcos22_state::namcos22s_vics_control_r), FUNC(namcos22_state::namcos22s_vics_control_w)).share("vics_control"); map(0x980000, 0x9affff).ram().share("spriteram"); /* C374 */ map(0xa04000, 0xa0bfff).ram().share("shareram"); /* COM RAM */ - map(0xc00000, 0xc1ffff).rw(this, FUNC(namcos22_state::namcos22_dspram_r), FUNC(namcos22_state::namcos22_dspram_w)).share("polygonram"); + map(0xc00000, 0xc1ffff).rw(FUNC(namcos22_state::namcos22_dspram_r), FUNC(namcos22_state::namcos22_dspram_w)).share("polygonram"); map(0xe00000, 0xe3ffff).ram(); /* workram */ } @@ -1981,7 +1981,7 @@ READ32_MEMBER(namcos22_state::namcos22_gun_r) void namcos22_state::timecris_am(address_map &map) { namcos22s_am(map); - map(0x430000, 0x43000f).r(this, FUNC(namcos22_state::namcos22_gun_r)); + map(0x430000, 0x43000f).r(FUNC(namcos22_state::namcos22_gun_r)); } @@ -2015,8 +2015,8 @@ WRITE32_MEMBER(namcos22_state::alpinesa_prot_w) void namcos22_state::alpinesa_am(address_map &map) { namcos22s_am(map); - map(0x200000, 0x200003).r(this, FUNC(namcos22_state::alpinesa_prot_r)); - map(0x300000, 0x300003).w(this, FUNC(namcos22_state::alpinesa_prot_w)); + map(0x200000, 0x200003).r(FUNC(namcos22_state::alpinesa_prot_r)); + map(0x300000, 0x300003).w(FUNC(namcos22_state::alpinesa_prot_w)); } @@ -2552,26 +2552,26 @@ void namcos22_state::master_dsp_program(address_map &map) void namcos22_state::master_dsp_data(address_map &map) { map(0x1000, 0x3fff).ram(); - map(0x4000, 0x7fff).r(this, FUNC(namcos22_state::master_external_ram_r)).w(this, FUNC(namcos22_state::master_external_ram_w)); - map(0x8000, 0xffff).r(this, FUNC(namcos22_state::namcos22_dspram16_r)).w(this, FUNC(namcos22_state::namcos22_dspram16_w)); + map(0x4000, 0x7fff).r(FUNC(namcos22_state::master_external_ram_r)).w(FUNC(namcos22_state::master_external_ram_w)); + map(0x8000, 0xffff).r(FUNC(namcos22_state::namcos22_dspram16_r)).w(FUNC(namcos22_state::namcos22_dspram16_w)); } void namcos22_state::master_dsp_io(address_map &map) { - map(0x0, 0x0).rw(this, FUNC(namcos22_state::point_loword_r), FUNC(namcos22_state::point_loword_iw)); - map(0x1, 0x1).rw(this, FUNC(namcos22_state::point_hiword_ir), FUNC(namcos22_state::point_hiword_w)); - map(0x2, 0x2).rw(this, FUNC(namcos22_state::pdp_begin_r), FUNC(namcos22_state::dsp_unk2_w)); - map(0x3, 0x3).rw(this, FUNC(namcos22_state::dsp_unk_port3_r), FUNC(namcos22_state::point_address_w)); + map(0x0, 0x0).rw(FUNC(namcos22_state::point_loword_r), FUNC(namcos22_state::point_loword_iw)); + map(0x1, 0x1).rw(FUNC(namcos22_state::point_hiword_ir), FUNC(namcos22_state::point_hiword_w)); + map(0x2, 0x2).rw(FUNC(namcos22_state::pdp_begin_r), FUNC(namcos22_state::dsp_unk2_w)); + map(0x3, 0x3).rw(FUNC(namcos22_state::dsp_unk_port3_r), FUNC(namcos22_state::point_address_w)); map(0x4, 0x4).nopw(); /* unknown */ - map(0x7, 0x7).w(this, FUNC(namcos22_state::upload_code_to_slave_dsp_w)); - map(0x8, 0x8).rw(this, FUNC(namcos22_state::dsp_unk8_r), FUNC(namcos22_state::dsp_unk8_w)); /* trigger irq? */ - map(0x9, 0x9).r(this, FUNC(namcos22_state::custom_ic_status_r)).nopw(); /* trigger irq? */ - map(0xa, 0xa).w(this, FUNC(namcos22_state::dsp_unk_porta_w)); + map(0x7, 0x7).w(FUNC(namcos22_state::upload_code_to_slave_dsp_w)); + map(0x8, 0x8).rw(FUNC(namcos22_state::dsp_unk8_r), FUNC(namcos22_state::dsp_unk8_w)); /* trigger irq? */ + map(0x9, 0x9).r(FUNC(namcos22_state::custom_ic_status_r)).nopw(); /* trigger irq? */ + map(0xa, 0xa).w(FUNC(namcos22_state::dsp_unk_porta_w)); map(0xb, 0xb).nopw(); /* RINT-related? */ - map(0xc, 0xc).w(this, FUNC(namcos22_state::master_render_device_w)); - map(0xd, 0xd).w(this, FUNC(namcos22_state::namcos22_dspram16_bank_w)); - map(0xe, 0xe).w(this, FUNC(namcos22_state::dsp_led_w)); - map(0xf, 0xf).r(this, FUNC(namcos22_state::dsp_upload_status_r)).nopw(); + map(0xc, 0xc).w(FUNC(namcos22_state::master_render_device_w)); + map(0xd, 0xd).w(FUNC(namcos22_state::namcos22_dspram16_bank_w)); + map(0xe, 0xe).w(FUNC(namcos22_state::dsp_led_w)); + map(0xf, 0xf).r(FUNC(namcos22_state::dsp_upload_status_r)).nopw(); } @@ -2640,25 +2640,25 @@ void namcos22_state::slave_dsp_program(address_map &map) void namcos22_state::slave_dsp_data(address_map &map) { - map(0x8000, 0x9fff).rw(this, FUNC(namcos22_state::slave_external_ram_r), FUNC(namcos22_state::slave_external_ram_w)); + map(0x8000, 0x9fff).rw(FUNC(namcos22_state::slave_external_ram_r), FUNC(namcos22_state::slave_external_ram_w)); } void namcos22_state::slave_dsp_io(address_map &map) { /* unknown signal */ - map(0x3, 0x3).r(this, FUNC(namcos22_state::dsp_slave_port3_r)); + map(0x3, 0x3).r(FUNC(namcos22_state::dsp_slave_port3_r)); - map(0x4, 0x4).r(this, FUNC(namcos22_state::dsp_slave_port4_r)); - map(0x5, 0x5).r(this, FUNC(namcos22_state::dsp_slave_port5_r)); - map(0x6, 0x6).r(this, FUNC(namcos22_state::dsp_slave_port6_r)).nopw(); + map(0x4, 0x4).r(FUNC(namcos22_state::dsp_slave_port4_r)); + map(0x5, 0x5).r(FUNC(namcos22_state::dsp_slave_port5_r)); + map(0x6, 0x6).r(FUNC(namcos22_state::dsp_slave_port6_r)).nopw(); /* render device state */ - map(0x8, 0x8).r(this, FUNC(namcos22_state::dsp_slave_port8_r)).nopw(); + map(0x8, 0x8).r(FUNC(namcos22_state::dsp_slave_port8_r)).nopw(); /* render device */ - map(0xb, 0xb).rw(this, FUNC(namcos22_state::dsp_slave_portb_r), FUNC(namcos22_state::dsp_slave_portb_w)); + map(0xb, 0xb).rw(FUNC(namcos22_state::dsp_slave_portb_r), FUNC(namcos22_state::dsp_slave_portb_w)); - map(0xc, 0xc).w(this, FUNC(namcos22_state::dsp_slave_portc_w)); + map(0xc, 0xc).w(FUNC(namcos22_state::dsp_slave_portc_w)); } @@ -2718,7 +2718,7 @@ READ8_MEMBER(namcos22_state::iomcu_port4_s22_r) void namcos22_state::mcu_s22_program(address_map &map) { map(0x002000, 0x002fff).rw("c352", FUNC(c352_device::read), FUNC(c352_device::write)); - map(0x004000, 0x00bfff).rw(this, FUNC(namcos22_state::s22mcu_shared_r), FUNC(namcos22_state::s22mcu_shared_w)); + map(0x004000, 0x00bfff).rw(FUNC(namcos22_state::s22mcu_shared_r), FUNC(namcos22_state::s22mcu_shared_w)); map(0x080000, 0x0fffff).rom().region("mcu", 0); map(0x200000, 0x27ffff).rom().region("mcu", 0); map(0x280000, 0x2fffff).rom().region("mcu", 0); @@ -2733,12 +2733,12 @@ void namcos22_state::iomcu_s22_program(address_map &map) void namcos22_state::mcu_s22_io(address_map &map) { - map(M37710_PORT4, M37710_PORT4).r(this, FUNC(namcos22_state::mcu_port4_s22_r)); + map(M37710_PORT4, M37710_PORT4).r(FUNC(namcos22_state::mcu_port4_s22_r)); } void namcos22_state::iomcu_s22_io(address_map &map) { - map(M37710_PORT4, M37710_PORT4).r(this, FUNC(namcos22_state::iomcu_port4_s22_r)); + map(M37710_PORT4, M37710_PORT4).r(FUNC(namcos22_state::iomcu_port4_s22_r)); map(0x00, 0xff).noprw(); } @@ -2811,7 +2811,7 @@ READ8_MEMBER(namcos22_state::namcos22s_mcu_adc_r) void namcos22_state::mcu_program(address_map &map) { map(0x002000, 0x002fff).rw("c352", FUNC(c352_device::read), FUNC(c352_device::write)); - map(0x004000, 0x00bfff).rw(this, FUNC(namcos22_state::s22mcu_shared_r), FUNC(namcos22_state::s22mcu_shared_w)); + map(0x004000, 0x00bfff).rw(FUNC(namcos22_state::s22mcu_shared_r), FUNC(namcos22_state::s22mcu_shared_w)); map(0x00c000, 0x00ffff).rom().region("mcu", 0xc000); map(0x080000, 0x0fffff).rom().region("mcu", 0); map(0x200000, 0x27ffff).rom().region("mcu", 0); @@ -2822,11 +2822,11 @@ void namcos22_state::mcu_program(address_map &map) void namcos22_state::mcu_io(address_map &map) { - map(M37710_PORT4, M37710_PORT4).rw(this, FUNC(namcos22_state::mcu_port4_r), FUNC(namcos22_state::mcu_port4_w)); - map(M37710_PORT5, M37710_PORT5).rw(this, FUNC(namcos22_state::mcu_port5_r), FUNC(namcos22_state::mcu_port5_w)); - map(M37710_PORT6, M37710_PORT6).rw(this, FUNC(namcos22_state::mcu_port6_r), FUNC(namcos22_state::mcu_port6_w)); - map(M37710_PORT7, M37710_PORT7).rw(this, FUNC(namcos22_state::mcu_port7_r), FUNC(namcos22_state::mcu_port7_w)); - map(M37710_ADC0_L, M37710_ADC7_H).r(this, FUNC(namcos22_state::namcos22s_mcu_adc_r)); + map(M37710_PORT4, M37710_PORT4).rw(FUNC(namcos22_state::mcu_port4_r), FUNC(namcos22_state::mcu_port4_w)); + map(M37710_PORT5, M37710_PORT5).rw(FUNC(namcos22_state::mcu_port5_r), FUNC(namcos22_state::mcu_port5_w)); + map(M37710_PORT6, M37710_PORT6).rw(FUNC(namcos22_state::mcu_port6_r), FUNC(namcos22_state::mcu_port6_w)); + map(M37710_PORT7, M37710_PORT7).rw(FUNC(namcos22_state::mcu_port7_r), FUNC(namcos22_state::mcu_port7_w)); + map(M37710_ADC0_L, M37710_ADC7_H).r(FUNC(namcos22_state::namcos22s_mcu_adc_r)); } /*********************************************************************************************/ @@ -2973,7 +2973,7 @@ WRITE8_MEMBER(namcos22_state::alpine_mcu_port5_w) void namcos22_state::alpine_io_map(address_map &map) { mcu_io(map); - map(M37710_PORT5, M37710_PORT5).w(this, FUNC(namcos22_state::alpine_mcu_port5_w)); + map(M37710_PORT5, M37710_PORT5).w(FUNC(namcos22_state::alpine_mcu_port5_w)); } @@ -2991,7 +2991,7 @@ WRITE8_MEMBER(namcos22_state::propcycle_mcu_port5_w) void namcos22_state::propcycl_io_map(address_map &map) { mcu_io(map); - map(M37710_PORT5, M37710_PORT5).w(this, FUNC(namcos22_state::propcycle_mcu_port5_w)); + map(M37710_PORT5, M37710_PORT5).w(FUNC(namcos22_state::propcycle_mcu_port5_w)); } TIMER_DEVICE_CALLBACK_MEMBER(namcos22_state::propcycl_pedal_interrupt) diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index f93c3972f9d..f48dd80e3be 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -2899,24 +2899,24 @@ void namcos23_state::gorgon_map(address_map &map) { map.global_mask(0xfffffff); map(0x00000000, 0x003fffff).ram().share("mainram"); - map(0x01000000, 0x010000ff).rw(this, FUNC(namcos23_state::c435_r), FUNC(namcos23_state::c435_w)); - map(0x02000000, 0x0200000f).rw(this, FUNC(namcos23_state::c417_r), FUNC(namcos23_state::c417_w)); + map(0x01000000, 0x010000ff).rw(FUNC(namcos23_state::c435_r), FUNC(namcos23_state::c435_w)); + map(0x02000000, 0x0200000f).rw(FUNC(namcos23_state::c417_r), FUNC(namcos23_state::c417_w)); map(0x04400000, 0x0440ffff).ram().share("shared_ram"); // Communication RAM (C416) - map(0x04c3ff00, 0x04c3ff0f).w(this, FUNC(namcos23_state::mcuen_w)); + map(0x04c3ff00, 0x04c3ff0f).w(FUNC(namcos23_state::mcuen_w)); map(0x06080000, 0x0608000f).ram().share("czattr"); map(0x06080200, 0x060803ff).ram(); // PCZ Convert RAM (C406) (should be banked) map(0x06108000, 0x061087ff).ram().share("gammaram"); // Gamma RAM (C404) - map(0x06110000, 0x0613ffff).ram().w(this, FUNC(namcos23_state::paletteram_w)).share("paletteram"); // Palette RAM (C404) - map(0x06400000, 0x0641dfff).ram().w(this, FUNC(namcos23_state::textchar_w)).share("charram"); // Text CGRAM (C361) - map(0x0641e000, 0x0641ffff).ram().w(this, FUNC(namcos23_state::textram_w)).share("textram"); // Text VRAM (C361) - map(0x06420000, 0x0642000f).rw(this, FUNC(namcos23_state::c361_r), FUNC(namcos23_state::c361_w)); // C361 + map(0x06110000, 0x0613ffff).ram().w(FUNC(namcos23_state::paletteram_w)).share("paletteram"); // Palette RAM (C404) + map(0x06400000, 0x0641dfff).ram().w(FUNC(namcos23_state::textchar_w)).share("charram"); // Text CGRAM (C361) + map(0x0641e000, 0x0641ffff).ram().w(FUNC(namcos23_state::textram_w)).share("textram"); // Text VRAM (C361) + map(0x06420000, 0x0642000f).rw(FUNC(namcos23_state::c361_r), FUNC(namcos23_state::c361_w)); // C361 map(0x08000000, 0x087fffff).rom().region("data", 0); // data ROMs map(0x0c000000, 0x0c00ffff).ram().share("nvram"); // Backup RAM - map(0x0d000000, 0x0d00000f).rw(this, FUNC(namcos23_state::ctl_r), FUNC(namcos23_state::ctl_w)); // write for LEDs at d000000, watchdog at d000004 + map(0x0d000000, 0x0d00000f).rw(FUNC(namcos23_state::ctl_r), FUNC(namcos23_state::ctl_w)); // write for LEDs at d000000, watchdog at d000004 map(0x0e000000, 0x0e007fff).ram(); // C405 RAM - what is this? - map(0x0f000000, 0x0f000003).rw(this, FUNC(namcos23_state::sub_comm_r), FUNC(namcos23_state::sub_comm_w)); // not sure + map(0x0f000000, 0x0f000003).rw(FUNC(namcos23_state::sub_comm_r), FUNC(namcos23_state::sub_comm_w)); // not sure map(0x0f200000, 0x0f203fff).ram(); // C422 RAM - map(0x0f300000, 0x0f30000f).rw(this, FUNC(namcos23_state::c422_r), FUNC(namcos23_state::c422_w)); // C422 registers + map(0x0f300000, 0x0f30000f).rw(FUNC(namcos23_state::c422_r), FUNC(namcos23_state::c422_w)); // C422 registers map(0x0fc00000, 0x0fffffff).nopw().rom().region("user1", 0); } @@ -2925,26 +2925,26 @@ void namcos23_state::s23_map(address_map &map) { map.global_mask(0xfffffff); map(0x00000000, 0x00ffffff).ram().share("mainram"); - map(0x01000000, 0x010000ff).rw(this, FUNC(namcos23_state::c435_r), FUNC(namcos23_state::c435_w)); - map(0x02000000, 0x0200000f).rw(this, FUNC(namcos23_state::c417_r), FUNC(namcos23_state::c417_w)); + map(0x01000000, 0x010000ff).rw(FUNC(namcos23_state::c435_r), FUNC(namcos23_state::c435_w)); + map(0x02000000, 0x0200000f).rw(FUNC(namcos23_state::c417_r), FUNC(namcos23_state::c417_w)); map(0x04400000, 0x0440ffff).ram().share("shared_ram"); // Communication RAM (C416) - map(0x04c3ff00, 0x04c3ff0f).w(this, FUNC(namcos23_state::mcuen_w)); + map(0x04c3ff00, 0x04c3ff0f).w(FUNC(namcos23_state::mcuen_w)); map(0x06000000, 0x0600ffff).ram().share("nvram"); // Backup RAM map(0x06200000, 0x06203fff).ram(); // C422 RAM - map(0x06400000, 0x0640000f).rw(this, FUNC(namcos23_state::c422_r), FUNC(namcos23_state::c422_w)); // C422 registers - map(0x06800000, 0x0681dfff).ram().w(this, FUNC(namcos23_state::textchar_w)).share("charram"); // Text CGRAM (C361) - map(0x0681e000, 0x0681ffff).ram().w(this, FUNC(namcos23_state::textram_w)).share("textram"); // Text VRAM (C361) - map(0x06820000, 0x0682000f).rw(this, FUNC(namcos23_state::c361_r), FUNC(namcos23_state::c361_w)); // C361 + map(0x06400000, 0x0640000f).rw(FUNC(namcos23_state::c422_r), FUNC(namcos23_state::c422_w)); // C422 registers + map(0x06800000, 0x0681dfff).ram().w(FUNC(namcos23_state::textchar_w)).share("charram"); // Text CGRAM (C361) + map(0x0681e000, 0x0681ffff).ram().w(FUNC(namcos23_state::textram_w)).share("textram"); // Text VRAM (C361) + map(0x06820000, 0x0682000f).rw(FUNC(namcos23_state::c361_r), FUNC(namcos23_state::c361_w)); // C361 map(0x06a08000, 0x06a087ff).ram().share("gammaram"); // Gamma RAM (C404) - map(0x06a10000, 0x06a3ffff).ram().w(this, FUNC(namcos23_state::paletteram_w)).share("paletteram"); // Palette RAM (C404) + map(0x06a10000, 0x06a3ffff).ram().w(FUNC(namcos23_state::paletteram_w)).share("paletteram"); // Palette RAM (C404) map(0x08000000, 0x08ffffff).rom().region("data", 0x0000000).mirror(0x1000000); // data ROMs map(0x0a000000, 0x0affffff).rom().region("data", 0x1000000).mirror(0x1000000); - map(0x0c000000, 0x0c00001f).rw(this, FUNC(namcos23_state::c412_r), FUNC(namcos23_state::c412_w)); - map(0x0c400000, 0x0c400007).rw(this, FUNC(namcos23_state::c421_r), FUNC(namcos23_state::c421_w)); - map(0x0c800010, 0x0c800011).w(this, FUNC(namcos23_state::c435_state_reset_w)); - map(0x0c800016, 0x0c800017).w(this, FUNC(namcos23_state::c435_state_pio_w)); - map(0x0d000000, 0x0d00000f).rw(this, FUNC(namcos23_state::ctl_r), FUNC(namcos23_state::ctl_w)); - map(0x0e800000, 0x0e800003).rw(this, FUNC(namcos23_state::sub_comm_r), FUNC(namcos23_state::sub_comm_w)); // not sure + map(0x0c000000, 0x0c00001f).rw(FUNC(namcos23_state::c412_r), FUNC(namcos23_state::c412_w)); + map(0x0c400000, 0x0c400007).rw(FUNC(namcos23_state::c421_r), FUNC(namcos23_state::c421_w)); + map(0x0c800010, 0x0c800011).w(FUNC(namcos23_state::c435_state_reset_w)); + map(0x0c800016, 0x0c800017).w(FUNC(namcos23_state::c435_state_pio_w)); + map(0x0d000000, 0x0d00000f).rw(FUNC(namcos23_state::ctl_r), FUNC(namcos23_state::ctl_w)); + map(0x0e800000, 0x0e800003).rw(FUNC(namcos23_state::sub_comm_r), FUNC(namcos23_state::sub_comm_w)); // not sure map(0x0fc00000, 0x0fffffff).nopw().rom().region("user1", 0); } @@ -2973,8 +2973,8 @@ WRITE32_MEMBER(namcos23_state::sh2_shared_w) void namcos23_state::gmen_mips_map(address_map &map) { s23_map(map); - map(0x0e400000, 0x0e400003).r(this, FUNC(namcos23_state::gmen_trigger_sh2)); - map(0x0e700000, 0x0e70ffff).rw(this, FUNC(namcos23_state::sh2_shared_r), FUNC(namcos23_state::sh2_shared_w)); + map(0x0e400000, 0x0e400003).r(FUNC(namcos23_state::gmen_trigger_sh2)); + map(0x0e700000, 0x0e70ffff).rw(FUNC(namcos23_state::sh2_shared_r), FUNC(namcos23_state::sh2_shared_w)); } @@ -3097,21 +3097,21 @@ WRITE16_MEMBER(namcos23_state::mcu_pb_w) void namcos23_state::s23h8rwmap(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x08ffff).rw(this, FUNC(namcos23_state::sharedram_sub_r), FUNC(namcos23_state::sharedram_sub_w)); + map(0x080000, 0x08ffff).rw(FUNC(namcos23_state::sharedram_sub_r), FUNC(namcos23_state::sharedram_sub_w)); map(0x280000, 0x287fff).rw("c352", FUNC(c352_device::read), FUNC(c352_device::write)); map(0x300000, 0x300003).noprw(); // seems to be more inputs, maybe false leftover code from System 12? map(0x300010, 0x300011).noprw(); - map(0x300020, 0x300021).w(this, FUNC(namcos23_state::sub_interrupt_main_w)); + map(0x300020, 0x300021).w(FUNC(namcos23_state::sub_interrupt_main_w)); map(0x300030, 0x300031).nopw(); // timecrs2 writes this when writing to the sync shared ram location, motoxgo doesn't } void namcos23_state::s23h8iomap(address_map &map) { - map(h8_device::PORT_6, h8_device::PORT_6).rw(this, FUNC(namcos23_state::mcu_p6_r), FUNC(namcos23_state::mcu_p6_w)); - map(h8_device::PORT_8, h8_device::PORT_8).rw(this, FUNC(namcos23_state::mcu_p8_r), FUNC(namcos23_state::mcu_p8_w)); - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(namcos23_state::mcu_pa_r), FUNC(namcos23_state::mcu_pa_w)); - map(h8_device::PORT_B, h8_device::PORT_B).rw(this, FUNC(namcos23_state::mcu_pb_r), FUNC(namcos23_state::mcu_pb_w)); + map(h8_device::PORT_6, h8_device::PORT_6).rw(FUNC(namcos23_state::mcu_p6_r), FUNC(namcos23_state::mcu_p6_w)); + map(h8_device::PORT_8, h8_device::PORT_8).rw(FUNC(namcos23_state::mcu_p8_r), FUNC(namcos23_state::mcu_p8_w)); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(namcos23_state::mcu_pa_r), FUNC(namcos23_state::mcu_pa_w)); + map(h8_device::PORT_B, h8_device::PORT_B).rw(FUNC(namcos23_state::mcu_pb_r), FUNC(namcos23_state::mcu_pb_w)); map(h8_device::ADC_0, h8_device::ADC_0).noprw(); map(h8_device::ADC_1, h8_device::ADC_1).noprw(); map(h8_device::ADC_2, h8_device::ADC_2).noprw(); @@ -3182,12 +3182,12 @@ void namcos23_state::s23iobrdmap(address_map &map) void namcos23_state::s23iobrdiomap(address_map &map) { - map(h8_device::PORT_4, h8_device::PORT_4).rw(this, FUNC(namcos23_state::iob_p4_r), FUNC(namcos23_state::iob_p4_w)); + map(h8_device::PORT_4, h8_device::PORT_4).rw(FUNC(namcos23_state::iob_p4_r), FUNC(namcos23_state::iob_p4_w)); map(h8_device::PORT_5, h8_device::PORT_5).noprw(); // bit 2 = status LED to indicate transmitting packet to main - map(h8_device::PORT_6, h8_device::PORT_6).rw(this, FUNC(namcos23_state::iob_p6_r), FUNC(namcos23_state::iob_p6_w)); + map(h8_device::PORT_6, h8_device::PORT_6).rw(FUNC(namcos23_state::iob_p6_r), FUNC(namcos23_state::iob_p6_w)); map(h8_device::PORT_8, h8_device::PORT_8).noprw(); // unknown - used on ASCA-5 only map(h8_device::PORT_9, h8_device::PORT_9).noprw(); // unknown - used on ASCA-5 only - map(h8_device::ADC_0, h8_device::ADC_3).r(this, FUNC(namcos23_state::iob_analog_r)); + map(h8_device::ADC_0, h8_device::ADC_3).r(FUNC(namcos23_state::iob_analog_r)); } @@ -3214,7 +3214,7 @@ READ8_MEMBER(namcos23_state::iob_gun_r) void namcos23_state::timecrs2iobrdmap(address_map &map) { s23iobrdmap(map); - map(0x7000, 0x700f).r(this, FUNC(namcos23_state::iob_gun_r)); + map(0x7000, 0x700f).r(FUNC(namcos23_state::iob_gun_r)); } diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index 8f011141478..173eba135ea 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -337,10 +337,10 @@ void namcos86_state::machine_start() void namcos86_state::cpu1_map(address_map &map) { - map(0x0000, 0x1fff).ram().w(this, FUNC(namcos86_state::videoram1_w)).share("videoram1"); - map(0x2000, 0x3fff).ram().w(this, FUNC(namcos86_state::videoram2_w)).share("videoram2"); + map(0x0000, 0x1fff).ram().w(FUNC(namcos86_state::videoram1_w)).share("videoram1"); + map(0x2000, 0x3fff).ram().w(FUNC(namcos86_state::videoram2_w)).share("videoram2"); - map(0x4000, 0x5fff).ram().w(this, FUNC(namcos86_state::spriteram_w)).share("spriteram"); + map(0x4000, 0x5fff).ram().w(FUNC(namcos86_state::spriteram_w)).share("spriteram"); map(0x4000, 0x43ff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); /* PSG device, shared RAM */ @@ -348,21 +348,21 @@ void namcos86_state::cpu1_map(address_map &map) map(0x8000, 0xffff).rom(); /* ROM & Voice expansion board - only some games have it */ - map(0x6000, 0x7fff).w(this, FUNC(namcos86_state::cus115_w)); /* ROM bank select and 63701X sample player control */ + map(0x6000, 0x7fff).w(FUNC(namcos86_state::cus115_w)); /* ROM bank select and 63701X sample player control */ - map(0x8000, 0x8000).w(this, FUNC(namcos86_state::watchdog1_w)); - map(0x8400, 0x8400).w(this, FUNC(namcos86_state::int_ack1_w)); /* IRQ acknowledge */ - map(0x8800, 0x8fff).w(this, FUNC(namcos86_state::tilebank_select_w)); + map(0x8000, 0x8000).w(FUNC(namcos86_state::watchdog1_w)); + map(0x8400, 0x8400).w(FUNC(namcos86_state::int_ack1_w)); /* IRQ acknowledge */ + map(0x8800, 0x8fff).w(FUNC(namcos86_state::tilebank_select_w)); - map(0x9000, 0x9002).w(this, FUNC(namcos86_state::scroll0_w)); /* scroll + priority */ - map(0x9003, 0x9003).w(this, FUNC(namcos86_state::bankswitch1_w)); - map(0x9004, 0x9006).w(this, FUNC(namcos86_state::scroll1_w)); /* scroll + priority */ + map(0x9000, 0x9002).w(FUNC(namcos86_state::scroll0_w)); /* scroll + priority */ + map(0x9003, 0x9003).w(FUNC(namcos86_state::bankswitch1_w)); + map(0x9004, 0x9006).w(FUNC(namcos86_state::scroll1_w)); /* scroll + priority */ - map(0x9400, 0x9402).w(this, FUNC(namcos86_state::scroll2_w)); /* scroll + priority */ + map(0x9400, 0x9402).w(FUNC(namcos86_state::scroll2_w)); /* scroll + priority */ // { 0x9403, 0x9403 } sub CPU rom bank select would be here - map(0x9404, 0x9406).w(this, FUNC(namcos86_state::scroll3_w)); /* scroll + priority */ + map(0x9404, 0x9406).w(FUNC(namcos86_state::scroll3_w)); /* scroll + priority */ - map(0xa000, 0xa000).w(this, FUNC(namcos86_state::backcolor_w)); + map(0xa000, 0xa000).w(FUNC(namcos86_state::backcolor_w)); } @@ -371,52 +371,52 @@ void namcos86_state::cpu1_map(address_map &map) void namcos86_state::hopmappy_cpu2_map(address_map &map) { map(0x8000, 0xffff).rom(); - map(0x9000, 0x9000).w(this, FUNC(namcos86_state::watchdog2_w)); - map(0x9400, 0x9400).w(this, FUNC(namcos86_state::int_ack2_w)); + map(0x9000, 0x9000).w(FUNC(namcos86_state::watchdog2_w)); + map(0x9400, 0x9400).w(FUNC(namcos86_state::int_ack2_w)); } void namcos86_state::roishtar_cpu2_map(address_map &map) { - map(0x0000, 0x1fff).ram().w(this, FUNC(namcos86_state::spriteram_w)).share("spriteram"); - map(0x4000, 0x5fff).ram().w(this, FUNC(namcos86_state::videoram2_w)).share("videoram2"); - map(0x6000, 0x7fff).ram().w(this, FUNC(namcos86_state::videoram1_w)).share("videoram1"); + map(0x0000, 0x1fff).ram().w(FUNC(namcos86_state::spriteram_w)).share("spriteram"); + map(0x4000, 0x5fff).ram().w(FUNC(namcos86_state::videoram2_w)).share("videoram2"); + map(0x6000, 0x7fff).ram().w(FUNC(namcos86_state::videoram1_w)).share("videoram1"); map(0x8000, 0xffff).rom(); - map(0xa000, 0xa000).w(this, FUNC(namcos86_state::watchdog2_w)); - map(0xb000, 0xb000).w(this, FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge + map(0xa000, 0xa000).w(FUNC(namcos86_state::watchdog2_w)); + map(0xb000, 0xb000).w(FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge } void namcos86_state::genpeitd_cpu2_map(address_map &map) { - map(0x0000, 0x1fff).ram().w(this, FUNC(namcos86_state::videoram1_w)).share("videoram1"); - map(0x2000, 0x3fff).ram().w(this, FUNC(namcos86_state::videoram2_w)).share("videoram2"); - map(0x4000, 0x5fff).ram().w(this, FUNC(namcos86_state::spriteram_w)).share("spriteram"); + map(0x0000, 0x1fff).ram().w(FUNC(namcos86_state::videoram1_w)).share("videoram1"); + map(0x2000, 0x3fff).ram().w(FUNC(namcos86_state::videoram2_w)).share("videoram2"); + map(0x4000, 0x5fff).ram().w(FUNC(namcos86_state::spriteram_w)).share("spriteram"); map(0x8000, 0xffff).rom(); - map(0xb000, 0xb000).w(this, FUNC(namcos86_state::watchdog2_w)); - map(0x8800, 0x8800).w(this, FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge + map(0xb000, 0xb000).w(FUNC(namcos86_state::watchdog2_w)); + map(0x8800, 0x8800).w(FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge } void namcos86_state::rthunder_cpu2_map(address_map &map) { - map(0x0000, 0x1fff).ram().w(this, FUNC(namcos86_state::spriteram_w)).share("spriteram"); - map(0x2000, 0x3fff).ram().w(this, FUNC(namcos86_state::videoram1_w)).share("videoram1"); - map(0x4000, 0x5fff).ram().w(this, FUNC(namcos86_state::videoram2_w)).share("videoram2"); + map(0x0000, 0x1fff).ram().w(FUNC(namcos86_state::spriteram_w)).share("spriteram"); + map(0x2000, 0x3fff).ram().w(FUNC(namcos86_state::videoram1_w)).share("videoram1"); + map(0x4000, 0x5fff).ram().w(FUNC(namcos86_state::videoram2_w)).share("videoram2"); map(0x6000, 0x7fff).bankr("bank2"); map(0x8000, 0xffff).rom(); - map(0x8000, 0x8000).w(this, FUNC(namcos86_state::watchdog2_w)); - map(0x8800, 0x8800).w(this, FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge + map(0x8000, 0x8000).w(FUNC(namcos86_state::watchdog2_w)); + map(0x8800, 0x8800).w(FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge // { 0xd800, 0xd802 } layer 2 scroll registers would be here - map(0xd803, 0xd803).w(this, FUNC(namcos86_state::bankswitch2_w)); + map(0xd803, 0xd803).w(FUNC(namcos86_state::bankswitch2_w)); // { 0xd804, 0xd806 } layer 3 scroll registers would be here } void namcos86_state::wndrmomo_cpu2_map(address_map &map) { - map(0x2000, 0x3fff).ram().w(this, FUNC(namcos86_state::spriteram_w)).share("spriteram"); - map(0x4000, 0x5fff).ram().w(this, FUNC(namcos86_state::videoram1_w)).share("videoram1"); - map(0x6000, 0x7fff).ram().w(this, FUNC(namcos86_state::videoram2_w)).share("videoram2"); + map(0x2000, 0x3fff).ram().w(FUNC(namcos86_state::spriteram_w)).share("spriteram"); + map(0x4000, 0x5fff).ram().w(FUNC(namcos86_state::videoram1_w)).share("videoram1"); + map(0x6000, 0x7fff).ram().w(FUNC(namcos86_state::videoram2_w)).share("videoram2"); map(0x8000, 0xffff).rom(); - map(0xc000, 0xc000).w(this, FUNC(namcos86_state::watchdog2_w)); - map(0xc800, 0xc800).w(this, FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge + map(0xc000, 0xc000).w(FUNC(namcos86_state::watchdog2_w)); + map(0xc800, 0xc800).w(FUNC(namcos86_state::int_ack2_w)); // IRQ acknowledge } @@ -436,8 +436,8 @@ void namcos86_state::hopmappy_mcu_map(address_map &map) map(0x2000, 0x2001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x2020, 0x2020).portr("IN0"); map(0x2021, 0x2021).portr("IN1"); - map(0x2030, 0x2030).r(this, FUNC(namcos86_state::dsw0_r)); - map(0x2031, 0x2031).r(this, FUNC(namcos86_state::dsw1_r)); + map(0x2030, 0x2030).r(FUNC(namcos86_state::dsw0_r)); + map(0x2031, 0x2031).r(FUNC(namcos86_state::dsw1_r)); map(0x8000, 0x8000).nopw(); // ??? written (not always) at end of interrupt map(0x8800, 0x8800).nopw(); // ??? written (not always) at end of interrupt } @@ -449,8 +449,8 @@ void namcos86_state::roishtar_mcu_map(address_map &map) map(0x6000, 0x6001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x6020, 0x6020).portr("IN0"); map(0x6021, 0x6021).portr("IN1"); - map(0x6030, 0x6030).r(this, FUNC(namcos86_state::dsw0_r)); - map(0x6031, 0x6031).r(this, FUNC(namcos86_state::dsw1_r)); + map(0x6030, 0x6030).r(FUNC(namcos86_state::dsw0_r)); + map(0x6031, 0x6031).r(FUNC(namcos86_state::dsw1_r)); map(0x8000, 0x8000).nopw(); // ??? written (not always) at end of interrupt map(0x9800, 0x9800).nopw(); // ??? written (not always) at end of interrupt } @@ -462,8 +462,8 @@ void namcos86_state::genpeitd_mcu_map(address_map &map) map(0x2800, 0x2801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x2820, 0x2820).portr("IN0"); map(0x2821, 0x2821).portr("IN1"); - map(0x2830, 0x2830).r(this, FUNC(namcos86_state::dsw0_r)); - map(0x2831, 0x2831).r(this, FUNC(namcos86_state::dsw1_r)); + map(0x2830, 0x2830).r(FUNC(namcos86_state::dsw0_r)); + map(0x2831, 0x2831).r(FUNC(namcos86_state::dsw1_r)); map(0x4000, 0x7fff).rom(); map(0xa000, 0xa000).nopw(); // ??? written (not always) at end of interrupt map(0xa800, 0xa800).nopw(); // ??? written (not always) at end of interrupt @@ -475,8 +475,8 @@ void namcos86_state::rthunder_mcu_map(address_map &map) map(0x2000, 0x2001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x2020, 0x2020).portr("IN0"); map(0x2021, 0x2021).portr("IN1"); - map(0x2030, 0x2030).r(this, FUNC(namcos86_state::dsw0_r)); - map(0x2031, 0x2031).r(this, FUNC(namcos86_state::dsw1_r)); + map(0x2030, 0x2030).r(FUNC(namcos86_state::dsw0_r)); + map(0x2031, 0x2031).r(FUNC(namcos86_state::dsw1_r)); map(0x4000, 0x7fff).rom(); map(0xb000, 0xb000).nopw(); // ??? written (not always) at end of interrupt map(0xb800, 0xb800).nopw(); // ??? written (not always) at end of interrupt @@ -488,8 +488,8 @@ void namcos86_state::wndrmomo_mcu_map(address_map &map) map(0x3800, 0x3801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x3820, 0x3820).portr("IN0"); map(0x3821, 0x3821).portr("IN1"); - map(0x3830, 0x3830).r(this, FUNC(namcos86_state::dsw0_r)); - map(0x3831, 0x3831).r(this, FUNC(namcos86_state::dsw1_r)); + map(0x3830, 0x3830).r(FUNC(namcos86_state::dsw0_r)); + map(0x3831, 0x3831).r(FUNC(namcos86_state::dsw1_r)); map(0x4000, 0x7fff).rom(); map(0xc000, 0xc000).nopw(); // ??? written (not always) at end of interrupt map(0xc800, 0xc800).nopw(); // ??? written (not always) at end of interrupt @@ -504,9 +504,9 @@ READ8_MEMBER(namcos86_state::readFF) void namcos86_state::mcu_port_map(address_map &map) { map(M6801_PORT1, M6801_PORT1).portr("IN2"); - map(M6801_PORT2, M6801_PORT2).r(this, FUNC(namcos86_state::readFF)); /* leds won't work otherwise */ - map(M6801_PORT1, M6801_PORT1).w(this, FUNC(namcos86_state::coin_w)); - map(M6801_PORT2, M6801_PORT2).w(this, FUNC(namcos86_state::led_w)); + map(M6801_PORT2, M6801_PORT2).r(FUNC(namcos86_state::readFF)); /* leds won't work otherwise */ + map(M6801_PORT1, M6801_PORT1).w(FUNC(namcos86_state::coin_w)); + map(M6801_PORT2, M6801_PORT2).w(FUNC(namcos86_state::led_w)); } diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index 02ba9f8dfb6..e72b1be4315 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -154,7 +154,7 @@ void nanos_state::nanos_io(address_map &map) map(0x8C, 0x8F).rw(m_ctc_0, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); /* FDC card */ - map(0x92, 0x92).w(this, FUNC(nanos_state::nanos_tc_w)); + map(0x92, 0x92).w(FUNC(nanos_state::nanos_tc_w)); map(0x94, 0x95).m(m_fdc, FUNC(upd765a_device::map)); /* V24+IFSS card */ map(0xA0, 0xA3).rw(m_sio_0, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index 820627665c7..0eb7c5a80b0 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -1692,21 +1692,21 @@ void naomi_state::naomi_map(address_map &map) map(0x00000000, 0x001fffff).rom().region("maincpu", 0).share("rombase"); // BIOS map(0x00200000, 0x00207fff).ram().share("sram"); - map(0x005f6800, 0x005f69ff).mirror(0x02000000).rw(this, FUNC(naomi_state::dc_sysctrl_r), FUNC(naomi_state::dc_sysctrl_w)); + map(0x005f6800, 0x005f69ff).mirror(0x02000000).rw(FUNC(naomi_state::dc_sysctrl_r), FUNC(naomi_state::dc_sysctrl_w)); map(0x005f6c00, 0x005f6cff).mirror(0x02000000).m(m_maple, FUNC(maple_dc_device::amap)); map(0x005f7000, 0x005f70ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::submap)).umask64(0x0000ffff0000ffff); map(0x005f7018, 0x005f702f).mirror(0x02000000).rw("comm_board", FUNC(m3comm_device::naomi_r), FUNC(m3comm_device::naomi_w)).umask64(0x0000ffff0000ffff); map(0x005f7400, 0x005f74ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::amap)); - map(0x005f7800, 0x005f78ff).mirror(0x02000000).rw(this, FUNC(naomi_state::dc_g2_ctrl_r), FUNC(naomi_state::dc_g2_ctrl_w)); + map(0x005f7800, 0x005f78ff).mirror(0x02000000).rw(FUNC(naomi_state::dc_g2_ctrl_r), FUNC(naomi_state::dc_g2_ctrl_w)); map(0x005f7c00, 0x005f7cff).mirror(0x02000000).m(m_powervr2, FUNC(powervr2_device::pd_dma_map)); map(0x005f8000, 0x005f9fff).mirror(0x02000000).m(m_powervr2, FUNC(powervr2_device::ta_map)); - map(0x00600000, 0x006007ff).mirror(0x02000000).rw(this, FUNC(naomi_state::dc_modem_r), FUNC(naomi_state::dc_modem_w)); - map(0x00700000, 0x00707fff).mirror(0x02000000).rw(this, FUNC(naomi_state::dc_aica_reg_r), FUNC(naomi_state::dc_aica_reg_w)); + map(0x00600000, 0x006007ff).mirror(0x02000000).rw(FUNC(naomi_state::dc_modem_r), FUNC(naomi_state::dc_modem_w)); + map(0x00700000, 0x00707fff).mirror(0x02000000).rw(FUNC(naomi_state::dc_aica_reg_r), FUNC(naomi_state::dc_aica_reg_w)); map(0x00710000, 0x0071000f).mirror(0x02000000).rw("aicartc", FUNC(aicartc_device::read), FUNC(aicartc_device::write)).umask64(0x0000ffff0000ffff); - map(0x00800000, 0x00ffffff).mirror(0x02000000).rw(this, FUNC(naomi_state::sh4_soundram_r), FUNC(naomi_state::sh4_soundram_w)); // sound RAM (8 MB) + map(0x00800000, 0x00ffffff).mirror(0x02000000).rw(FUNC(naomi_state::sh4_soundram_r), FUNC(naomi_state::sh4_soundram_w)); // sound RAM (8 MB) /* External Device */ - map(0x01000000, 0x01ffffff).mirror(0x02000000).r(this, FUNC(naomi_state::naomi_g2bus_r)); + map(0x01000000, 0x01ffffff).mirror(0x02000000).r(FUNC(naomi_state::naomi_g2bus_r)); /* Area 1 */ map(0x04000000, 0x04ffffff).mirror(0x02000000).ram().share("dc_texture_ram"); // texture memory 64 bit access @@ -1752,20 +1752,20 @@ void naomi2_state::naomi2_map(address_map &map) map(0x00000000, 0x001fffff).rom().region("maincpu", 0).share("rombase"); // BIOS map(0x00200000, 0x00207fff).ram().share("sram"); - map(0x005f6800, 0x005f69ff).mirror(0x02000000).rw(this, FUNC(naomi2_state::dc_sysctrl_r), FUNC(naomi2_state::dc_sysctrl_w)); + map(0x005f6800, 0x005f69ff).mirror(0x02000000).rw(FUNC(naomi2_state::dc_sysctrl_r), FUNC(naomi2_state::dc_sysctrl_w)); map(0x005f6c00, 0x005f6cff).mirror(0x02000000).m(m_maple, FUNC(maple_dc_device::amap)); map(0x005f7000, 0x005f70ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::submap)).umask64(0x0000ffff0000ffff); map(0x005f7400, 0x005f74ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::amap)); - map(0x005f7800, 0x005f78ff).mirror(0x02000000).rw(this, FUNC(naomi2_state::dc_g2_ctrl_r), FUNC(naomi2_state::dc_g2_ctrl_w)); + map(0x005f7800, 0x005f78ff).mirror(0x02000000).rw(FUNC(naomi2_state::dc_g2_ctrl_r), FUNC(naomi2_state::dc_g2_ctrl_w)); map(0x005f7c00, 0x005f7cff).m(m_powervr2, FUNC(powervr2_device::pd_dma_map)); map(0x005f8000, 0x005f9fff).m(m_powervr2, FUNC(powervr2_device::ta_map)); - map(0x00600000, 0x006007ff).mirror(0x02000000).rw(this, FUNC(naomi2_state::dc_modem_r), FUNC(naomi2_state::dc_modem_w)); - map(0x00700000, 0x00707fff).mirror(0x02000000).rw(this, FUNC(naomi2_state::dc_aica_reg_r), FUNC(naomi2_state::dc_aica_reg_w)); + map(0x00600000, 0x006007ff).mirror(0x02000000).rw(FUNC(naomi2_state::dc_modem_r), FUNC(naomi2_state::dc_modem_w)); + map(0x00700000, 0x00707fff).mirror(0x02000000).rw(FUNC(naomi2_state::dc_aica_reg_r), FUNC(naomi2_state::dc_aica_reg_w)); map(0x00710000, 0x0071000f).mirror(0x02000000).rw("aicartc", FUNC(aicartc_device::read), FUNC(aicartc_device::write)).umask64(0x0000ffff0000ffff); - map(0x00800000, 0x00ffffff).mirror(0x02000000).rw(this, FUNC(naomi2_state::sh4_soundram_r), FUNC(naomi2_state::sh4_soundram_w)); // sound RAM (8 MB) + map(0x00800000, 0x00ffffff).mirror(0x02000000).rw(FUNC(naomi2_state::sh4_soundram_r), FUNC(naomi2_state::sh4_soundram_w)); // sound RAM (8 MB) /* External Device */ - map(0x01000000, 0x01ffffff).mirror(0x02000000).r(this, FUNC(naomi2_state::naomi_g2bus_r)); + map(0x01000000, 0x01ffffff).mirror(0x02000000).r(FUNC(naomi2_state::naomi_g2bus_r)); map(0x025f7c00, 0x025f7cff).m(m_powervr2_slave, FUNC(powervr2_device::pd_dma_map)); map(0x025f8000, 0x025f9fff).m(m_powervr2_slave, FUNC(powervr2_device::ta_map)); @@ -1780,8 +1780,8 @@ void naomi2_state::naomi2_map(address_map &map) map(0x07000000, 0x07ffffff).ram().share("frameram2");// 32 bit access 2nd PVR RAM /* Area 2*/ - map(0x085f6800, 0x085f69ff).w(this, FUNC(naomi2_state::dc_sysctrl_w)); // TODO: writes to BOTH PVRs - map(0x085f8000, 0x085f9fff).w(this, FUNC(naomi2_state::both_pvr2_ta_w)); + map(0x085f6800, 0x085f69ff).w(FUNC(naomi2_state::dc_sysctrl_w)); // TODO: writes to BOTH PVRs + map(0x085f8000, 0x085f9fff).w(FUNC(naomi2_state::both_pvr2_ta_w)); map(0x08800000, 0x088000ff).rw(m_powervr2, FUNC(powervr2_device::elan_regs_r), FUNC(powervr2_device::elan_regs_w)); // T&L chip registers // AM_RANGE(0x09000000, 0x09??????) T&L command processing map(0x0a000000, 0x0bffffff).ram().share("elan_ram"); // T&L chip RAM @@ -1809,20 +1809,20 @@ void naomi2_state::naomi2_map(address_map &map) void naomi_state::naomi_port(address_map &map) { - map(0x00, 0x0f).rw(this, FUNC(naomi_state::eeprom_93c46a_r), FUNC(naomi_state::eeprom_93c46a_w)); + map(0x00, 0x0f).rw(FUNC(naomi_state::eeprom_93c46a_r), FUNC(naomi_state::eeprom_93c46a_w)); } /* * Atomiswave address map, almost identical to Dreamcast */ -READ64_MEMBER(atomiswave_state::aw_flash_r ) +READ64_MEMBER(atomiswave_state::aw_flash_r) { - return (uint64_t)m_awflash->read(offset*8) | (uint64_t)m_awflash->read((offset*8)+1)<<8 | (uint64_t)m_awflash->read((offset*8)+2)<<16 | (uint64_t)m_awflash->read((offset*8)+3)<<24 | - (uint64_t)m_awflash->read((offset*8)+4)<<32 | (uint64_t)m_awflash->read((offset*8)+5)<<40 | (uint64_t)m_awflash->read((offset*8)+6)<<48 | (uint64_t)m_awflash->read((offset*8)+7)<<56; + return (uint64_t)m_awflash->read(space, offset*8) | (uint64_t)m_awflash->read(space, (offset*8)+1)<<8 | (uint64_t)m_awflash->read(space, (offset*8)+2)<<16 | (uint64_t)m_awflash->read(space, (offset*8)+3)<<24 | + (uint64_t)m_awflash->read(space, (offset*8)+4)<<32 | (uint64_t)m_awflash->read(space, (offset*8)+5)<<40 | (uint64_t)m_awflash->read(space, (offset*8)+6)<<48 | (uint64_t)m_awflash->read(space, (offset*8)+7)<<56; } -WRITE64_MEMBER(atomiswave_state::aw_flash_w ) +WRITE64_MEMBER(atomiswave_state::aw_flash_w) { int i; uint32_t addr = offset * 8; @@ -1838,7 +1838,7 @@ WRITE64_MEMBER(atomiswave_state::aw_flash_w ) data >>= (i*8); - m_awflash->write(addr, data); + m_awflash->write(space, addr, data); } // TODO: don't we have a common function for this? @@ -1925,21 +1925,21 @@ WRITE64_MEMBER(atomiswave_state::aw_modem_w ) void atomiswave_state::aw_map(address_map &map) { /* Area 0 */ - map(0x00000000, 0x0001ffff).rw(this, FUNC(atomiswave_state::aw_flash_r), FUNC(atomiswave_state::aw_flash_w)).region("awflash", 0); - map(0xa0000000, 0xa001ffff).rw(this, FUNC(atomiswave_state::aw_flash_r), FUNC(atomiswave_state::aw_flash_w)).region("awflash", 0); + map(0x00000000, 0x0001ffff).rw(FUNC(atomiswave_state::aw_flash_r), FUNC(atomiswave_state::aw_flash_w)).region("awflash", 0); + map(0xa0000000, 0xa001ffff).rw(FUNC(atomiswave_state::aw_flash_r), FUNC(atomiswave_state::aw_flash_w)).region("awflash", 0); map(0x00200000, 0x0021ffff).ram().share("sram"); // battery backed up RAM - map(0x005f6800, 0x005f69ff).rw(this, FUNC(atomiswave_state::dc_sysctrl_r), FUNC(atomiswave_state::dc_sysctrl_w)); + map(0x005f6800, 0x005f69ff).rw(FUNC(atomiswave_state::dc_sysctrl_r), FUNC(atomiswave_state::dc_sysctrl_w)); map(0x005f6c00, 0x005f6cff).mirror(0x02000000).m(m_maple, FUNC(maple_dc_device::amap)); map(0x005f7000, 0x005f70ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::submap)).umask64(0x0000ffff0000ffff); map(0x005f7400, 0x005f74ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::amap)); - map(0x005f7800, 0x005f78ff).rw(this, FUNC(atomiswave_state::dc_g2_ctrl_r), FUNC(atomiswave_state::dc_g2_ctrl_w)); + map(0x005f7800, 0x005f78ff).rw(FUNC(atomiswave_state::dc_g2_ctrl_r), FUNC(atomiswave_state::dc_g2_ctrl_w)); map(0x005f7c00, 0x005f7cff).mirror(0x02000000).m(m_powervr2, FUNC(powervr2_device::pd_dma_map)); map(0x005f8000, 0x005f9fff).mirror(0x02000000).m(m_powervr2, FUNC(powervr2_device::ta_map)); - map(0x00600000, 0x006007ff).rw(this, FUNC(atomiswave_state::aw_modem_r), FUNC(atomiswave_state::aw_modem_w)); - map(0x00700000, 0x00707fff).rw(this, FUNC(atomiswave_state::dc_aica_reg_r), FUNC(atomiswave_state::dc_aica_reg_w)); + map(0x00600000, 0x006007ff).rw(FUNC(atomiswave_state::aw_modem_r), FUNC(atomiswave_state::aw_modem_w)); + map(0x00700000, 0x00707fff).rw(FUNC(atomiswave_state::dc_aica_reg_r), FUNC(atomiswave_state::dc_aica_reg_w)); map(0x00710000, 0x0071000f).mirror(0x02000000).rw("aicartc", FUNC(aicartc_device::read), FUNC(aicartc_device::write)).umask64(0x0000ffff0000ffff); - map(0x00800000, 0x00ffffff).rw(this, FUNC(atomiswave_state::sh4_soundram_r), FUNC(atomiswave_state::sh4_soundram_w)); // sound RAM (8 MB) + map(0x00800000, 0x00ffffff).rw(FUNC(atomiswave_state::sh4_soundram_r), FUNC(atomiswave_state::sh4_soundram_w)); // sound RAM (8 MB) /* Area 1 - half the texture memory, like dreamcast, not naomi */ map(0x04000000, 0x047fffff).ram().mirror(0x00800000).share("dc_texture_ram"); // texture memory 64 bit access @@ -1984,7 +1984,7 @@ void dc_state::dc_audio_map(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x007fffff).ram().share("dc_sound_ram"); /* shared with SH-4 */ - map(0x00800000, 0x00807fff).rw(this, FUNC(dc_state::dc_arm_aica_r), FUNC(dc_state::dc_arm_aica_w)); + map(0x00800000, 0x00807fff).rw(FUNC(dc_state::dc_arm_aica_r), FUNC(dc_state::dc_arm_aica_w)); } /* diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index 632cb3a731b..f34219d0f2c 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -483,9 +483,9 @@ void nascom1_state::nascom1_mem(address_map &map) void nascom1_state::nascom1_io(address_map &map) { map.global_mask(0x0f); - map(0x00, 0x00).rw(this, FUNC(nascom1_state::nascom1_port_00_r), FUNC(nascom1_state::nascom1_port_00_w)); - map(0x01, 0x01).rw(this, FUNC(nascom1_state::nascom1_port_01_r), FUNC(nascom1_state::nascom1_port_01_w)); - map(0x02, 0x02).r(this, FUNC(nascom1_state::nascom1_port_02_r)); + map(0x00, 0x00).rw(FUNC(nascom1_state::nascom1_port_00_r), FUNC(nascom1_state::nascom1_port_00_w)); + map(0x01, 0x01).rw(FUNC(nascom1_state::nascom1_port_01_r), FUNC(nascom1_state::nascom1_port_01_w)); + map(0x02, 0x02).r(FUNC(nascom1_state::nascom1_port_02_r)); map(0x04, 0x07).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); } @@ -500,9 +500,9 @@ void nascom2_state::nascom2_mem(address_map &map) void nascom2_state::nascom2_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(nascom2_state::nascom1_port_00_r), FUNC(nascom2_state::nascom1_port_00_w)); - map(0x01, 0x01).rw(this, FUNC(nascom2_state::nascom1_port_01_r), FUNC(nascom2_state::nascom1_port_01_w)); - map(0x02, 0x02).r(this, FUNC(nascom2_state::nascom1_port_02_r)); + map(0x00, 0x00).rw(FUNC(nascom2_state::nascom1_port_00_r), FUNC(nascom2_state::nascom1_port_00_w)); + map(0x01, 0x01).rw(FUNC(nascom2_state::nascom1_port_01_r), FUNC(nascom2_state::nascom1_port_01_w)); + map(0x02, 0x02).r(FUNC(nascom2_state::nascom1_port_02_r)); map(0x04, 0x07).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); } diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp index ebcbc4083eb..801fb3a511c 100644 --- a/src/mame/drivers/naughtyb.cpp +++ b/src/mame/drivers/naughtyb.cpp @@ -252,12 +252,12 @@ void naughtyb_state::naughtyb_map(address_map &map) map(0x4000, 0x7fff).ram(); map(0x8000, 0x87ff).ram().share("videoram"); map(0x8800, 0x8fff).ram().share("videoram2"); - map(0x9000, 0x97ff).w(this, FUNC(naughtyb_state::naughtyb_videoreg_w)); + map(0x9000, 0x97ff).w(FUNC(naughtyb_state::naughtyb_videoreg_w)); map(0x9800, 0x9fff).ram().share("scrollreg"); map(0xa000, 0xa7ff).w(m_naughtyb_custom, FUNC(naughtyb_sound_device::control_a_w)); map(0xa800, 0xafff).w(m_naughtyb_custom, FUNC(naughtyb_sound_device::control_b_w)); - map(0xb000, 0xb7ff).r(this, FUNC(naughtyb_state::in0_port_r)); // IN0 - map(0xb800, 0xbfff).r(this, FUNC(naughtyb_state::dsw0_port_r)); // DSW0 + map(0xb000, 0xb7ff).r(FUNC(naughtyb_state::in0_port_r)); // IN0 + map(0xb800, 0xbfff).r(FUNC(naughtyb_state::dsw0_port_r)); // DSW0 } void naughtyb_state::popflame_map(address_map &map) @@ -266,12 +266,12 @@ void naughtyb_state::popflame_map(address_map &map) map(0x4000, 0x7fff).ram(); map(0x8000, 0x87ff).ram().share("videoram"); map(0x8800, 0x8fff).ram().share("videoram2"); - map(0x9000, 0x97ff).w(this, FUNC(naughtyb_state::popflame_videoreg_w)); + map(0x9000, 0x97ff).w(FUNC(naughtyb_state::popflame_videoreg_w)); map(0x9800, 0x9fff).ram().share("scrollreg"); map(0xa000, 0xa7ff).w(m_popflame_custom, FUNC(popflame_sound_device::control_a_w)); map(0xa800, 0xafff).w(m_popflame_custom, FUNC(popflame_sound_device::control_b_w)); - map(0xb000, 0xb7ff).r(this, FUNC(naughtyb_state::in0_port_r)); // IN0 - map(0xb800, 0xbfff).r(this, FUNC(naughtyb_state::dsw0_port_r)); // DSW0 + map(0xb000, 0xb7ff).r(FUNC(naughtyb_state::in0_port_r)); // IN0 + map(0xb800, 0xbfff).r(FUNC(naughtyb_state::dsw0_port_r)); // DSW0 } diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index db326f7fc7f..f9e135ae116 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -154,16 +154,16 @@ void nbmj8688_state::secolove_io_map(address_map &map) map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); - map(0x90, 0x97).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x90, 0x97).w(FUNC(nbmj8688_state::blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xc0, 0xcf).w(this, FUNC(nbmj8688_state::clut_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::secolove_romsel_w)); + map(0xc0, 0xcf).w(FUNC(nbmj8688_state::clut_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::secolove_romsel_w)); // AM_RANGE(0xf0, 0xf0) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw1_r) // AM_RANGE(0xf1, 0xf1) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw2_r) - map(0xf0, 0xf0).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w)); } WRITE8_MEMBER(nbmj8688_state::barline_output_w) @@ -180,14 +180,14 @@ void nbmj8688_state::barline_io_map(address_map &map) map(0x70, 0x70).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); map(0x80, 0x81).rw("psg", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); - map(0x90, 0x97).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x90, 0x97).w(FUNC(nbmj8688_state::blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); - map(0xb0, 0xb0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r)).w(this, FUNC(nbmj8688_state::barline_output_w)); - map(0xc0, 0xcf).w(this, FUNC(nbmj8688_state::clut_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? -// AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", dac_byte_interface, write) //not used - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::secolove_romsel_w)); - map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xb0, 0xb0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r)).w(FUNC(nbmj8688_state::barline_output_w)); + map(0xc0, 0xcf).w(FUNC(nbmj8688_state::clut_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? +// AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", dac_byte_interface, data_w) //not used + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::secolove_romsel_w)); + map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)).w(FUNC(nbmj8688_state::scrolly_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -199,13 +199,13 @@ void nbmj8688_state::crystalg_io_map(address_map &map) map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); - map(0x90, 0x97).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x90, 0x97).w(FUNC(nbmj8688_state::blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xc0, 0xcf).w(this, FUNC(nbmj8688_state::clut_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::crystalg_romsel_w)); + map(0xc0, 0xcf).w(FUNC(nbmj8688_state::clut_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::crystalg_romsel_w)); // AM_RANGE(0xf0, 0xf0) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw1_r) // AM_RANGE(0xf0, 0xf0) AM_WRITENOP // AM_RANGE(0xf1, 0xf1) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw2_r) @@ -217,17 +217,17 @@ void nbmj8688_state::otonano_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x20, 0x3f).w(this, FUNC(nbmj8688_state::clut_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8688_state::mjsikaku_romsel_w)); - map(0x70, 0x77).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x20, 0x3f).w(FUNC(nbmj8688_state::clut_w)); + map(0x50, 0x50).w(FUNC(nbmj8688_state::mjsikaku_romsel_w)); + map(0x70, 0x77).w(FUNC(nbmj8688_state::blitter_w)); map(0x80, 0x81).rw("psg", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); - map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); + map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)).w(FUNC(nbmj8688_state::scrolly_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -237,18 +237,18 @@ void nbmj8688_state::kaguya_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x20, 0x3f).w(this, FUNC(nbmj8688_state::clut_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8688_state::mjsikaku_romsel_w)); - map(0x70, 0x77).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x20, 0x3f).w(FUNC(nbmj8688_state::clut_w)); + map(0x50, 0x50).w(FUNC(nbmj8688_state::mjsikaku_romsel_w)); + map(0x70, 0x77).w(FUNC(nbmj8688_state::blitter_w)); map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); - map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); + map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)).w(FUNC(nbmj8688_state::scrolly_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -259,20 +259,20 @@ void nbmj8688_state::iemoto_io_map(address_map &map) map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); map(0x10, 0x10).w(m_nb1413m3, FUNC(nb1413m3_device::sndrombank2_w)); - map(0x20, 0x3f).w(this, FUNC(nbmj8688_state::clut_w)); - map(0x40, 0x47).w(this, FUNC(nbmj8688_state::blitter_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8688_state::seiha_romsel_w)); + map(0x20, 0x3f).w(FUNC(nbmj8688_state::clut_w)); + map(0x40, 0x47).w(FUNC(nbmj8688_state::blitter_w)); + map(0x50, 0x50).w(FUNC(nbmj8688_state::seiha_romsel_w)); map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); // AM_RANGE(0xf0, 0xf0) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw1_r) // AM_RANGE(0xf1, 0xf1) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw2_r) - map(0xf0, 0xf0).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w)); } @@ -282,20 +282,20 @@ void nbmj8688_state::seiha_io_map(address_map &map) map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); map(0x10, 0x10).w(m_nb1413m3, FUNC(nb1413m3_device::sndrombank2_w)); - map(0x20, 0x3f).w(this, FUNC(nbmj8688_state::clut_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8688_state::seiha_romsel_w)); + map(0x20, 0x3f).w(FUNC(nbmj8688_state::clut_w)); + map(0x50, 0x50).w(FUNC(nbmj8688_state::seiha_romsel_w)); map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); - map(0x90, 0x97).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x90, 0x97).w(FUNC(nbmj8688_state::blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); // AM_RANGE(0xf0, 0xf0) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw1_r) // AM_RANGE(0xf1, 0xf1) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw2_r) - map(0xf0, 0xf0).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w)); } void nbmj8688_state::mjgaiden_io_map(address_map &map) @@ -303,20 +303,20 @@ void nbmj8688_state::mjgaiden_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x20, 0x3f).w(this, FUNC(nbmj8688_state::clut_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8688_state::mjsikaku_romsel_w)); + map(0x20, 0x3f).w(FUNC(nbmj8688_state::clut_w)); + map(0x50, 0x50).w(FUNC(nbmj8688_state::mjsikaku_romsel_w)); map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); - map(0x90, 0x97).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x90, 0x97).w(FUNC(nbmj8688_state::blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); // AM_RANGE(0xf0, 0xf0) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw1_r) // AM_RANGE(0xf1, 0xf1) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw2_r) - map(0xf0, 0xf0).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w)); } void nbmj8688_state::p16bit_LCD_io_map(address_map &map) @@ -328,21 +328,21 @@ void nbmj8688_state::p16bit_LCD_io_map(address_map &map) map(0x43, 0x43).w(m_lcdc0, FUNC(hd61830_device::control_w)); map(0x44, 0x44).w(m_lcdc1, FUNC(hd61830_device::data_w)); map(0x45, 0x45).w(m_lcdc1, FUNC(hd61830_device::control_w)); - map(0x46, 0x46).w(this, FUNC(nbmj8688_state::HD61830B_both_data_w)); - map(0x47, 0x47).w(this, FUNC(nbmj8688_state::HD61830B_both_instr_w)); + map(0x46, 0x46).w(FUNC(nbmj8688_state::HD61830B_both_data_w)); + map(0x47, 0x47).w(FUNC(nbmj8688_state::HD61830B_both_instr_w)); map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); - map(0x90, 0x97).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x90, 0x97).w(FUNC(nbmj8688_state::blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xc0, 0xcf).w(this, FUNC(nbmj8688_state::clut_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::secolove_romsel_w)); + map(0xc0, 0xcf).w(FUNC(nbmj8688_state::clut_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::secolove_romsel_w)); // AM_RANGE(0xf0, 0xf0) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw1_r) // AM_RANGE(0xf1, 0xf1) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw2_r) - map(0xf0, 0xf0).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w)); } @@ -352,19 +352,19 @@ void nbmj8688_state::mjsikaku_io_map(address_map &map) map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); map(0x10, 0x10).w(m_nb1413m3, FUNC(nb1413m3_device::sndrombank2_w)); - map(0x20, 0x3f).w(this, FUNC(nbmj8688_state::clut_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8688_state::mjsikaku_romsel_w)); - map(0x60, 0x67).w(this, FUNC(nbmj8688_state::blitter_w)); + map(0x20, 0x3f).w(FUNC(nbmj8688_state::clut_w)); + map(0x50, 0x50).w(FUNC(nbmj8688_state::mjsikaku_romsel_w)); + map(0x60, 0x67).w(FUNC(nbmj8688_state::blitter_w)); map(0x80, 0x81).rw("psg", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); - map(0xf0, 0xf0).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w)); } @@ -374,20 +374,20 @@ void nbmj8688_state::mmsikaku_io_map(address_map &map) map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); map(0x10, 0x10).w(m_nb1413m3, FUNC(nb1413m3_device::sndrombank2_w)); - map(0x20, 0x3f).w(this, FUNC(nbmj8688_state::clut_w)); - map(0x40, 0x47).w(this, FUNC(nbmj8688_state::blitter_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8688_state::mjsikaku_romsel_w)); + map(0x20, 0x3f).w(FUNC(nbmj8688_state::clut_w)); + map(0x40, 0x47).w(FUNC(nbmj8688_state::blitter_w)); + map(0x50, 0x50).w(FUNC(nbmj8688_state::mjsikaku_romsel_w)); map(0x81, 0x81).r("psg", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("psg", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); - map(0xd0, 0xd0).r(this, FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); + map(0xd0, 0xd0).r(FUNC(nbmj8688_state::ff_r)); // irq ack? watchdog? + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8688_state::mjsikaku_gfxflag2_w)); // AM_RANGE(0xf0, 0xf0) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw1_r) // AM_RANGE(0xf1, 0xf1) AM_DEVREAD("nb1413m3", nb1413m3_device, dipsw2_r) - map(0xf0, 0xf0).w(this, FUNC(nbmj8688_state::scrolly_w)); + map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w)); } CUSTOM_INPUT_MEMBER( nbmj8688_state::nb1413m3_busyflag_r ) diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp index 37474214287..d67fd5da87c 100644 --- a/src/mame/drivers/nbmj8891.cpp +++ b/src/mame/drivers/nbmj8891.cpp @@ -219,38 +219,38 @@ void nbmj8891_state::init_pairsten() void nbmj8891_state::gionbana_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); + map(0xf000, 0xf00f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); map(0xf800, 0xffff).ram().share("nvram"); } void nbmj8891_state::mgion_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).rw(this, FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); - map(0xf400, 0xf40f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf000, 0xf1ff).rw(FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); + map(0xf400, 0xf40f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); map(0xf800, 0xffff).ram().share("nvram"); } void nbmj8891_state::omotesnd_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); map(0xf800, 0xffff).ram().share("nvram"); } void nbmj8891_state::hanamomo_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).rw(this, FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); - map(0xf400, 0xf40f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf000, 0xf1ff).rw(FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); + map(0xf400, 0xf40f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); map(0xf800, 0xffff).ram(); } void nbmj8891_state::scandalm_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); map(0xf800, 0xffff).ram().share("nvram"); } @@ -258,55 +258,55 @@ void nbmj8891_state::club90s_map(address_map &map) { map(0x0000, 0xefff).rom(); map(0xf000, 0xf7ff).ram(); - map(0xf800, 0xf80f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); - map(0xfc00, 0xfdff).rw(this, FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); + map(0xf800, 0xf80f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xfc00, 0xfdff).rw(FUNC(nbmj8891_state::palette_type1_r), FUNC(nbmj8891_state::palette_type1_w)); } void nbmj8891_state::lovehous_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); + map(0xf000, 0xf00f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); map(0xf800, 0xffff).ram().share("nvram"); } void nbmj8891_state::maiko_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).rw(this, FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); - map(0xf400, 0xf40f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf000, 0xf1ff).rw(FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); + map(0xf400, 0xf40f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); map(0xf800, 0xffff).ram(); } void nbmj8891_state::hnxmasev_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf200, 0xf3ff).rw(this, FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); - map(0xf700, 0xf70f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf200, 0xf3ff).rw(FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); + map(0xf700, 0xf70f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); map(0xf800, 0xffff).ram(); } void nbmj8891_state::hnageman_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); + map(0xf000, 0xf00f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); map(0xf800, 0xffff).ram(); } void nbmj8891_state::mmaiko_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).rw(this, FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); - map(0xf400, 0xf40f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf000, 0xf1ff).rw(FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); + map(0xf400, 0xf40f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); map(0xf800, 0xffff).ram().share("nvram"); } void nbmj8891_state::hanaoji_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf200, 0xf3ff).rw(this, FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); - map(0xf700, 0xf70f).rw(this, FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); + map(0xf200, 0xf3ff).rw(FUNC(nbmj8891_state::palette_type2_r), FUNC(nbmj8891_state::palette_type2_w)); + map(0xf700, 0xf70f).rw(FUNC(nbmj8891_state::clut_r), FUNC(nbmj8891_state::clut_w)); map(0xf800, 0xffff).ram().share("nvram"); } @@ -318,18 +318,18 @@ READ8_MEMBER(nbmj8891_state::taiwanmb_unk_r) void nbmj8891_state::taiwanmb_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xec00, 0xedff).rw(this, FUNC(nbmj8891_state::palette_type3_r), FUNC(nbmj8891_state::palette_type3_w)); + map(0xec00, 0xedff).rw(FUNC(nbmj8891_state::palette_type3_r), FUNC(nbmj8891_state::palette_type3_w)); map(0xf800, 0xfeff).ram().share("nvram"); map(0xff00, 0xff1f).noprw(); // ? - map(0xff20, 0xff20).r(this, FUNC(nbmj8891_state::taiwanmb_unk_r)); // MCU or 1413M3 STATUS? (return != 0x00 then loop) - map(0xff20, 0xff20).w(this, FUNC(nbmj8891_state::taiwanmb_mcu_w)); // MCU PARAMETER? + map(0xff20, 0xff20).r(FUNC(nbmj8891_state::taiwanmb_unk_r)); // MCU or 1413M3 STATUS? (return != 0x00 then loop) + map(0xff20, 0xff20).w(FUNC(nbmj8891_state::taiwanmb_mcu_w)); // MCU PARAMETER? map(0xff21, 0xff2f).nopr(); // ? map(0xff21, 0xff21).nopw(); // blitter parameter set end (write 0x01 only) - map(0xff22, 0xff27).w(this, FUNC(nbmj8891_state::taiwanmb_blitter_w)); // blitter parameter - map(0xff28, 0xff28).w(this, FUNC(nbmj8891_state::romsel_w)); // gfx rombank select - map(0xff29, 0xff29).w(this, FUNC(nbmj8891_state::taiwanmb_gfxflag_w)); // screen flip flag? + map(0xff22, 0xff27).w(FUNC(nbmj8891_state::taiwanmb_blitter_w)); // blitter parameter + map(0xff28, 0xff28).w(FUNC(nbmj8891_state::romsel_w)); // gfx rombank select + map(0xff29, 0xff29).w(FUNC(nbmj8891_state::taiwanmb_gfxflag_w)); // screen flip flag? map(0xff2a, 0xff2a).nopw(); // not used? - map(0xff2b, 0xff2b).w(this, FUNC(nbmj8891_state::clutsel_w)); // color look up table select + map(0xff2b, 0xff2b).w(FUNC(nbmj8891_state::clutsel_w)); // color look up table select map(0xff2c, 0xff2c).nopw(); // blitter parameter set start (write 0xff only) map(0xff2d, 0xff2d).nopw(); // not used? map(0xff2e, 0xff2e).nopw(); // not used? @@ -343,17 +343,17 @@ void nbmj8891_state::gionbana_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x20, 0x27).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x20, 0x27).w(FUNC(nbmj8891_state::blitter_w)); + map(0x40, 0x40).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x60, 0x60).w(FUNC(nbmj8891_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //AM_WRITENOP - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8891_state::vramsel_w)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8891_state::vramsel_w)); map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -363,17 +363,17 @@ void nbmj8891_state::mgion_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x30, 0x37).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x30, 0x37).w(FUNC(nbmj8891_state::blitter_w)); + map(0x40, 0x40).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x60, 0x60).w(FUNC(nbmj8891_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //AM_WRITENOP - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8891_state::vramsel_w)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8891_state::vramsel_w)); map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -382,21 +382,21 @@ void nbmj8891_state::omotesnd_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); - map(0x00, 0x07).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x30, 0x30).w(this, FUNC(nbmj8891_state::vramsel_w)); - map(0x10, 0x10).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x20, 0x20).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x40, 0x4f).w(this, FUNC(nbmj8891_state::clut_w)); + map(0x00, 0x07).w(FUNC(nbmj8891_state::blitter_w)); + map(0x30, 0x30).w(FUNC(nbmj8891_state::vramsel_w)); + map(0x10, 0x10).w(FUNC(nbmj8891_state::romsel_w)); + map(0x20, 0x20).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x40, 0x4f).w(FUNC(nbmj8891_state::clut_w)); // AM_RANGE(0x50, 0x50) AM_DEVWRITE("nb1413m3", nb1413m3_device, nmi_clock_w) - map(0x70, 0x70).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x70, 0x70).w(FUNC(nbmj8891_state::scrolly_w)); map(0x81, 0x81).r("fmsnd", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("fmsnd", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)).nopw(); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)).nopw(); - map(0xd0, 0xdf).r(this, FUNC(nbmj8891_state::clut_r)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xdf).r(FUNC(nbmj8891_state::clut_r)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -406,16 +406,16 @@ void nbmj8891_state::hanamomo_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x30, 0x37).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x30, 0x37).w(FUNC(nbmj8891_state::blitter_w)); + map(0x40, 0x40).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x60, 0x60).w(FUNC(nbmj8891_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //AM_WRITENOP - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); // AM_RANGE(0xe0, 0xe0) AM_WRITENOP map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); //AM_WRITENOP map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); @@ -426,16 +426,16 @@ void nbmj8891_state::msjiken_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x50, 0x57).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x40, 0x40).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x50, 0x57).w(FUNC(nbmj8891_state::blitter_w)); + map(0x60, 0x60).w(FUNC(nbmj8891_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //AM_WRITENOP - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); // AM_RANGE(0xe0, 0xe0) AM_WRITENOP map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); //AM_WRITENOP map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); @@ -445,17 +445,17 @@ void nbmj8891_state::scandal_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); - map(0x40, 0x4f).w(this, FUNC(nbmj8891_state::clut_w)); - map(0x00, 0x07).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x10, 0x10).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x20, 0x20).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x40, 0x4f).w(FUNC(nbmj8891_state::clut_w)); + map(0x00, 0x07).w(FUNC(nbmj8891_state::blitter_w)); + map(0x10, 0x10).w(FUNC(nbmj8891_state::romsel_w)); + map(0x20, 0x20).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x50, 0x50).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r), FUNC(nb1413m3_device::nmi_clock_w)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); // AM_RANGE(0xe0, 0xe0) AM_WRITENOP map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); //AM_WRITENOP map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); @@ -465,18 +465,18 @@ void nbmj8891_state::scandalm_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); - map(0x00, 0x07).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x10, 0x10).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x20, 0x20).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x40, 0x4f).w(this, FUNC(nbmj8891_state::clut_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x00, 0x07).w(FUNC(nbmj8891_state::blitter_w)); + map(0x10, 0x10).w(FUNC(nbmj8891_state::romsel_w)); + map(0x20, 0x20).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x40, 0x4f).w(FUNC(nbmj8891_state::clut_w)); + map(0x50, 0x50).w(FUNC(nbmj8891_state::scrolly_w)); map(0x81, 0x81).r("fmsnd", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("fmsnd", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r), FUNC(nb1413m3_device::nmi_clock_w)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); // AM_RANGE(0xe0, 0xe0) AM_WRITENOP map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); @@ -486,18 +486,18 @@ void nbmj8891_state::bananadr_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); - map(0x00, 0x07).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x10, 0x10).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x20, 0x20).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x30, 0x30).w(this, FUNC(nbmj8891_state::vramsel_w)); - map(0x40, 0x4f).w(this, FUNC(nbmj8891_state::clut_w)); - map(0x50, 0x50).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x00, 0x07).w(FUNC(nbmj8891_state::blitter_w)); + map(0x10, 0x10).w(FUNC(nbmj8891_state::romsel_w)); + map(0x20, 0x20).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x30, 0x30).w(FUNC(nbmj8891_state::vramsel_w)); + map(0x40, 0x4f).w(FUNC(nbmj8891_state::clut_w)); + map(0x50, 0x50).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r), FUNC(nb1413m3_device::nmi_clock_w)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); // AM_RANGE(0xe0, 0xe0) AM_WRITENOP map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); @@ -508,17 +508,17 @@ void nbmj8891_state::lovehous_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x50, 0x57).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x40, 0x40).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x50, 0x57).w(FUNC(nbmj8891_state::blitter_w)); + map(0x60, 0x60).w(FUNC(nbmj8891_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); //AM_WRITENOP map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).portr("PORT0-2"); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8891_state::vramsel_w)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8891_state::vramsel_w)); map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -528,17 +528,17 @@ void nbmj8891_state::maiko_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8891_state::clutsel_w)); - map(0x50, 0x57).w(this, FUNC(nbmj8891_state::blitter_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8891_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8891_state::scrolly_w)); + map(0x40, 0x40).w(FUNC(nbmj8891_state::clutsel_w)); + map(0x50, 0x57).w(FUNC(nbmj8891_state::blitter_w)); + map(0x60, 0x60).w(FUNC(nbmj8891_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8891_state::scrolly_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).portr("PORT0-2"); //AM_WRITENOP - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8891_state::vramsel_w)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8891_state::vramsel_w)); map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); } @@ -554,8 +554,8 @@ void nbmj8891_state::taiwanmb_io_map(address_map &map) map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); // AM_RANGE(0xc0, 0xc0) AM_WRITENOP // ? // AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog? - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw3_h_r)).w(this, FUNC(nbmj8891_state::taiwanmb_gfxdraw_w)); // blitter draw start + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw3_h_r)).w(FUNC(nbmj8891_state::taiwanmb_gfxdraw_w)); // blitter draw start map(0xe1, 0xe1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw3_l_r)); map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); diff --git a/src/mame/drivers/nbmj8900.cpp b/src/mame/drivers/nbmj8900.cpp index 4c64c885f1b..16cecc8a9ff 100644 --- a/src/mame/drivers/nbmj8900.cpp +++ b/src/mame/drivers/nbmj8900.cpp @@ -96,16 +96,16 @@ void nbmj8900_state::init_togenkyo() void nbmj8900_state::ohpaipee_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); + map(0xf000, 0xf00f).rw(FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); map(0xf800, 0xffff).ram(); } void nbmj8900_state::togenkyo_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); + map(0xf000, 0xf00f).rw(FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); map(0xf800, 0xffff).ram(); } @@ -114,11 +114,11 @@ void nbmj8900_state::ohpaipee_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x20, 0x27).w(this, FUNC(nbmj8900_state::blitter_w)); + map(0x20, 0x27).w(FUNC(nbmj8900_state::blitter_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8900_state::clutsel_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8900_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8900_state::scrolly_w)); + map(0x40, 0x40).w(FUNC(nbmj8900_state::clutsel_w)); + map(0x60, 0x60).w(FUNC(nbmj8900_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8900_state::scrolly_w)); map(0x80, 0x81).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); @@ -127,8 +127,8 @@ void nbmj8900_state::ohpaipee_io_map(address_map &map) map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8900_state::vramsel_w)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8900_state::vramsel_w)); map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); map(0xf1, 0xf1).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r), FUNC(nb1413m3_device::outcoin_w)); } diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp index 2e584ae4d94..a32b79da870 100644 --- a/src/mame/drivers/nbmj8991.cpp +++ b/src/mame/drivers/nbmj8991.cpp @@ -97,85 +97,85 @@ void nbmj8991_state::init_tokimbsj() void nbmj8991_state::pstadium_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); - map(0xf200, 0xf3ff).ram().w(this, FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); + map(0xf000, 0xf00f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf200, 0xf3ff).ram().w(FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); map(0xf800, 0xffff).ram().share("nvram"); // finalbny } void nbmj8991_state::triplew1_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).ram().w(this, FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); - map(0xf200, 0xf20f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf000, 0xf1ff).ram().w(FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); + map(0xf200, 0xf20f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); map(0xf800, 0xffff).ram().share("nvram"); // mjgottub } void nbmj8991_state::triplew2_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).ram().w(this, FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); - map(0xf400, 0xf40f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf000, 0xf1ff).ram().w(FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); + map(0xf400, 0xf40f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); map(0xf800, 0xffff).ram(); } void nbmj8991_state::mjlstory_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf200, 0xf3ff).ram().w(this, FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); - map(0xf700, 0xf70f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf200, 0xf3ff).ram().w(FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); + map(0xf700, 0xf70f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); map(0xf800, 0xffff).ram(); } void nbmj8991_state::galkoku_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); - map(0xf400, 0xf5ff).ram().w(this, FUNC(nbmj8991_state::palette_type1_w)).share("paletteram"); + map(0xf000, 0xf00f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf400, 0xf5ff).ram().w(FUNC(nbmj8991_state::palette_type1_w)).share("paletteram"); map(0xf800, 0xffff).ram().share("nvram"); // hyouban } void nbmj8991_state::galkaika_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); - map(0xf400, 0xf5ff).ram().w(this, FUNC(nbmj8991_state::palette_type2_w)).share("paletteram"); + map(0xf000, 0xf00f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf400, 0xf5ff).ram().w(FUNC(nbmj8991_state::palette_type2_w)).share("paletteram"); map(0xf800, 0xffff).ram().share("nvram"); // tokimbsj } void nbmj8991_state::tokyogal_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).ram().w(this, FUNC(nbmj8991_state::palette_type2_w)).share("paletteram"); - map(0xf400, 0xf40f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf000, 0xf1ff).ram().w(FUNC(nbmj8991_state::palette_type2_w)).share("paletteram"); + map(0xf400, 0xf40f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); map(0xf800, 0xffff).ram(); } void nbmj8991_state::av2mj1bb_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).ram().w(this, FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); - map(0xf500, 0xf50f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf000, 0xf1ff).ram().w(FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); + map(0xf500, 0xf50f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); map(0xf800, 0xffff).ram(); } void nbmj8991_state::av2mj2rg_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); - map(0xf200, 0xf3ff).ram().w(this, FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); + map(0xf000, 0xf00f).rw(FUNC(nbmj8991_state::clut_r), FUNC(nbmj8991_state::clut_w)); + map(0xf200, 0xf3ff).ram().w(FUNC(nbmj8991_state::palette_type3_w)).share("paletteram"); map(0xf800, 0xffff).ram(); } void nbmj8991_state::galkoku_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)).w(this, FUNC(nbmj8991_state::blitter_w)); + map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)).w(FUNC(nbmj8991_state::blitter_w)); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r), FUNC(nb1413m3_device::nmi_clock_w)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); // AM_RANGE(0xe0, 0xe0) AM_WRITENOP map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); @@ -184,14 +184,14 @@ void nbmj8991_state::galkoku_io_map(address_map &map) void nbmj8991_state::hyouban_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)).w(this, FUNC(nbmj8991_state::blitter_w)); + map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)).w(FUNC(nbmj8991_state::blitter_w)); map(0x81, 0x81).r("fmsnd", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("fmsnd", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r), FUNC(nb1413m3_device::nmi_clock_w)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); // AM_RANGE(0xe0, 0xe0) AM_WRITENOP map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w)); map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r)); @@ -200,7 +200,7 @@ void nbmj8991_state::hyouban_io_map(address_map &map) void nbmj8991_state::pstadium_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x7f).w(this, FUNC(nbmj8991_state::blitter_w)); + map(0x00, 0x7f).w(FUNC(nbmj8991_state::blitter_w)); map(0x80, 0x80).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); @@ -214,7 +214,7 @@ void nbmj8991_state::pstadium_io_map(address_map &map) void nbmj8991_state::av2mj1bb_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x7f).w(this, FUNC(nbmj8991_state::blitter_w)); + map(0x00, 0x7f).w(FUNC(nbmj8991_state::blitter_w)); map(0x80, 0x80).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x90, 0x90).r(m_nb1413m3, FUNC(nb1413m3_device::inputport0_r)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); @@ -237,9 +237,9 @@ void nbmj8991_state::nbmj8991_sound_map(address_map &map) void nbmj8991_state::nbmj8991_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("dac1", FUNC(dac_byte_interface::write)); - map(0x02, 0x02).w("dac2", FUNC(dac_byte_interface::write)); - map(0x04, 0x04).w(this, FUNC(nbmj8991_state::soundbank_w)); + map(0x00, 0x00).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x02, 0x02).w("dac2", FUNC(dac_byte_interface::data_w)); + map(0x04, 0x04).w(FUNC(nbmj8991_state::soundbank_w)); map(0x06, 0x06).nopw(); map(0x80, 0x81).w("fmsnd", FUNC(ym3812_device::write)); } diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp index 21e65184d65..4de85c22893 100644 --- a/src/mame/drivers/nbmj9195.cpp +++ b/src/mame/drivers/nbmj9195.cpp @@ -227,28 +227,28 @@ void nbmj9195_state::init_nbmj9195() void nbmj9195_state::sailorws_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf1ff).ram().w(this, FUNC(nbmj9195_state::palette_w)).share("paletteram"); + map(0xf000, 0xf1ff).ram().w(FUNC(nbmj9195_state::palette_w)).share("paletteram"); map(0xf800, 0xffff).ram().share("nvram"); } void nbmj9195_state::mjuraden_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf200, 0xf3ff).ram().w(this, FUNC(nbmj9195_state::palette_w)).share("paletteram"); + map(0xf200, 0xf3ff).ram().w(FUNC(nbmj9195_state::palette_w)).share("paletteram"); map(0xf800, 0xffff).ram(); } void nbmj9195_state::koinomp_map(address_map &map) { map(0x0000, 0xdfff).rom(); - map(0xe000, 0xe1ff).ram().w(this, FUNC(nbmj9195_state::palette_w)).share("paletteram"); + map(0xe000, 0xe1ff).ram().w(FUNC(nbmj9195_state::palette_w)).share("paletteram"); map(0xe800, 0xefff).ram().share("nvram"); } void nbmj9195_state::ngpgal_map(address_map &map) { map(0x0000, 0xcfff).rom(); - map(0xd000, 0xd1ff).ram().w(this, FUNC(nbmj9195_state::palette_w)).share("paletteram"); + map(0xd000, 0xd1ff).ram().w(FUNC(nbmj9195_state::palette_w)).share("paletteram"); map(0xd800, 0xdfff).ram(); } @@ -256,7 +256,7 @@ void nbmj9195_state::mscoutm_map(address_map &map) { map(0x0000, 0xdfff).rom(); map(0xe000, 0xe5ff).ram(); - map(0xe600, 0xebff).ram().w(this, FUNC(nbmj9195_state::nb22090_palette_w)).share("paletteram"); + map(0xe600, 0xebff).ram().w(FUNC(nbmj9195_state::nb22090_palette_w)).share("paletteram"); map(0xec00, 0xf1ff).ram(); map(0xf200, 0xffff).ram(); } @@ -264,7 +264,7 @@ void nbmj9195_state::mscoutm_map(address_map &map) void nbmj9195_state::mjegolf_map(address_map &map) { map(0x0000, 0xdfff).rom(); - map(0xe000, 0xe5ff).ram().w(this, FUNC(nbmj9195_state::nb22090_palette_w)).share("paletteram"); + map(0xe000, 0xe5ff).ram().w(FUNC(nbmj9195_state::nb22090_palette_w)).share("paletteram"); map(0xe600, 0xebff).ram(); map(0xec00, 0xf1ff).ram(); map(0xf200, 0xffff).ram(); @@ -272,75 +272,75 @@ void nbmj9195_state::mjegolf_map(address_map &map) void nbmj9195_state::mjuraden_io_map(address_map &map) { - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); map(0xb0, 0xb0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xb2, 0xb2).mirror(0xff00).nopw(); map(0xb4, 0xb4).mirror(0xff00).nopw(); - map(0xb6, 0xb6).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb6, 0xb6).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::koinomp_io_map(address_map &map) { - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xa0, 0xa1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xa0, 0xaf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xb0, 0xbf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xa0, 0xa1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xa0, 0xaf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xb0, 0xbf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xc0, 0xc0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xc2, 0xc2).mirror(0xff00).nopw(); map(0xc4, 0xc4).mirror(0xff00).nopw(); - map(0xc6, 0xc6).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xc6, 0xc6).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); map(0xcf, 0xcf).mirror(0xff00).nopw(); } void nbmj9195_state::patimono_io_map(address_map &map) { - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa4, 0xa4).mirror(0xff00).nopw(); map(0xa8, 0xa8).mirror(0xff00).nopw(); - map(0xb0, 0xb8).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb0, 0xb8).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); } void nbmj9195_state::mmehyou_io_map(address_map &map) { - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa4, 0xa4).mirror(0xff00).nopw(); map(0xa8, 0xa8).mirror(0xff00).nopw(); - map(0xb0, 0xb0).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb0, 0xb0).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::gal10ren_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xa0, 0xa1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xa0, 0xaf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xb0, 0xbf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xa0, 0xa1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xa0, 0xaf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xb0, 0xbf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xc0, 0xc0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xc8, 0xc8).mirror(0xff00).nopw(); map(0xd0, 0xd0).mirror(0xff00).nopw(); - map(0xd8, 0xd8).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xd8, 0xd8).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::renaiclb_io_map(address_map &map) @@ -348,15 +348,15 @@ void nbmj9195_state::renaiclb_io_map(address_map &map) map(0x20, 0x20).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x24, 0x24).mirror(0xff00).nopw(); map(0x28, 0x28).mirror(0xff00).nopw(); - map(0x2c, 0x2c).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0x2c, 0x2c).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); - map(0xe0, 0xe1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xe0, 0xef).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0xf0, 0xff).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0xe0, 0xe1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xe0, 0xef).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0xf0, 0xff).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); } void nbmj9195_state::mjlaman_io_map(address_map &map) @@ -364,156 +364,156 @@ void nbmj9195_state::mjlaman_io_map(address_map &map) map(0x20, 0x20).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x22, 0x22).mirror(0xff00).nopw(); map(0x24, 0x24).mirror(0xff00).nopw(); - map(0x26, 0x26).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0x26, 0x26).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xe0, 0xe1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xe0, 0xef).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xf0, 0xff).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xe0, 0xe1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xe0, 0xef).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xf0, 0xff).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); } void nbmj9195_state::mkeibaou_io_map(address_map &map) { - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xa0, 0xa1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xa0, 0xaf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xb0, 0xbf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xa0, 0xa1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xa0, 0xaf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xb0, 0xbf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xd8, 0xd8).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xda, 0xda).mirror(0xff00).nopw(); map(0xdc, 0xdc).mirror(0xff00).nopw(); - map(0xde, 0xde).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xde, 0xde).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::pachiten_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xa0, 0xa1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xa0, 0xaf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xb0, 0xbf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xa0, 0xa1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xa0, 0xaf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xb0, 0xbf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xe0, 0xe0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xe2, 0xe2).mirror(0xff00).nopw(); map(0xe4, 0xe4).mirror(0xff00).nopw(); - map(0xe6, 0xe6).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xe6, 0xe6).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::sailorws_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xf0, 0xf0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf2, 0xf2).mirror(0xff00).nopw(); map(0xf4, 0xf4).mirror(0xff00).nopw(); - map(0xf6, 0xf6).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xf6, 0xf6).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::sailorwr_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xf8, 0xf8).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xfa, 0xfa).mirror(0xff00).nopw(); map(0xfc, 0xfc).mirror(0xff00).nopw(); - map(0xfe, 0xfe).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xfe, 0xfe).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::psailor1_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xf0, 0xf0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf2, 0xf2).mirror(0xff00).nopw(); map(0xf4, 0xf4).mirror(0xff00).nopw(); - map(0xf6, 0xf6).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xf6, 0xf6).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::psailor2_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xa0, 0xa1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xa0, 0xaf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xb0, 0xbf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xa0, 0xa1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xa0, 0xaf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xb0, 0xbf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xe0, 0xe0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xe2, 0xe2).mirror(0xff00).nopw(); map(0xe4, 0xe4).mirror(0xff00).nopw(); - map(0xf6, 0xf6).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xf6, 0xf6).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::otatidai_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa8, 0xa8).mirror(0xff00).nopw(); map(0xb0, 0xb0).mirror(0xff00).nopw(); - map(0xb8, 0xb8).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb8, 0xb8).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::yosimoto_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); map(0x90, 0x90).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x94, 0x94).mirror(0xff00).nopw(); map(0x98, 0x98).mirror(0xff00).nopw(); - map(0x9c, 0x9c).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0x9c, 0x9c).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); } void nbmj9195_state::yosimotm_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); - map(0xf0, 0xf0).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xf0, 0xf0).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); map(0xfc, 0xfc).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf4, 0xf4).mirror(0xff00).noprw(); map(0xf8, 0xf8).mirror(0xff00).noprw(); @@ -521,18 +521,18 @@ void nbmj9195_state::yosimotm_io_map(address_map &map) void nbmj9195_state::jituroku_io_map(address_map &map) { - map(0x60, 0x61).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x60, 0x6f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x70, 0x7f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x60, 0x61).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x60, 0x6f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x70, 0x7f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); map(0xe0, 0xe0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xe8, 0xe8).mirror(0xff00).nopw(); map(0xf0, 0xf0).mirror(0xff00).nopw(); - map(0xf8, 0xf8).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xf8, 0xf8).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::ngpgal_io_map(address_map &map) @@ -540,47 +540,47 @@ void nbmj9195_state::ngpgal_io_map(address_map &map) map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa4, 0xa4).mirror(0xff00).nopw(); map(0xa8, 0xa8).mirror(0xff00).nopw(); - map(0xb0, 0xb0).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb0, 0xb0).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); } void nbmj9195_state::mjgottsu_io_map(address_map &map) { - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa4, 0xa4).mirror(0xff00).nopw(); map(0xa8, 0xa8).mirror(0xff00).nopw(); - map(0xb0, 0xb0).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb0, 0xb0).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::cmehyou_io_map(address_map &map) { map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa8, 0xa8).mirror(0xff00).nopw(); - map(0xb0, 0xb0).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb0, 0xb0).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); map(0xb4, 0xb4).mirror(0xff00).nopw(); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); } void nbmj9195_state::mjkoiura_io_map(address_map &map) { - map(0x80, 0x81).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0x80, 0x8f).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0x90, 0x9f).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0x80, 0x81).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0x80, 0x8f).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0x90, 0x9f).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa4, 0xa4).mirror(0xff00).nopw(); map(0xa8, 0xa8).mirror(0xff00).nopw(); - map(0xb0, 0xb0).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb0, 0xb0).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); } void nbmj9195_state::mkoiuraa_io_map(address_map &map) @@ -588,64 +588,64 @@ void nbmj9195_state::mkoiuraa_io_map(address_map &map) map(0xa0, 0xa0).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa4, 0xa4).mirror(0xff00).nopw(); map(0xa8, 0xa8).mirror(0xff00).nopw(); - map(0xb0, 0xb0).mirror(0xff00).w(this, FUNC(nbmj9195_state::inputportsel_w)); + map(0xb0, 0xb0).mirror(0xff00).w(FUNC(nbmj9195_state::inputportsel_w)); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); } void nbmj9195_state::mscoutm_io_map(address_map &map) { - map(0x80, 0x80).mirror(0xff00).r(this, FUNC(nbmj9195_state::mscoutm_dipsw_1_r)); - map(0x82, 0x82).mirror(0xff00).r(this, FUNC(nbmj9195_state::mscoutm_dipsw_0_r)); + map(0x80, 0x80).mirror(0xff00).r(FUNC(nbmj9195_state::mscoutm_dipsw_1_r)); + map(0x82, 0x82).mirror(0xff00).r(FUNC(nbmj9195_state::mscoutm_dipsw_0_r)); map(0x84, 0x84).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xa0, 0xa6).mirror(0xff00).nopw(); // nb22090 param ? - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); - map(0xe0, 0xe1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xe0, 0xef).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); + map(0xe0, 0xe1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xe0, 0xef).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); - map(0xf0, 0xff).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xf0, 0xff).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); } void nbmj9195_state::imekura_io_map(address_map &map) { - map(0x80, 0x80).mirror(0xff00).r(this, FUNC(nbmj9195_state::mscoutm_dipsw_1_r)); - map(0x82, 0x82).mirror(0xff00).r(this, FUNC(nbmj9195_state::mscoutm_dipsw_0_r)); + map(0x80, 0x80).mirror(0xff00).r(FUNC(nbmj9195_state::mscoutm_dipsw_1_r)); + map(0x82, 0x82).mirror(0xff00).r(FUNC(nbmj9195_state::mscoutm_dipsw_0_r)); map(0x84, 0x84).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xb0, 0xb6).mirror(0xff00).nopw(); // nb22090 param ? - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xe0, 0xe1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xe0, 0xef).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); - map(0xf0, 0xff).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xe0, 0xe1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xe0, 0xef).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); + map(0xf0, 0xff).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); } void nbmj9195_state::mjegolf_io_map(address_map &map) { map(0x80, 0x86).mirror(0xff00).nopw(); // nb22090 param ? - map(0xa0, 0xa1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_0_r)); - map(0xa0, 0xaf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_0_w)); - map(0xb0, 0xbf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_0_w)); + map(0xa0, 0xa1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_0_r)); + map(0xa0, 0xaf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_0_w)); + map(0xb0, 0xbf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_0_w)); - map(0xc0, 0xc1).mirror(0xff00).r(this, FUNC(nbmj9195_state::blitter_1_r)); - map(0xc0, 0xcf).mirror(0xff00).w(this, FUNC(nbmj9195_state::blitter_1_w)); + map(0xc0, 0xc1).mirror(0xff00).r(FUNC(nbmj9195_state::blitter_1_r)); + map(0xc0, 0xcf).mirror(0xff00).w(FUNC(nbmj9195_state::blitter_1_w)); - map(0xd0, 0xdf).mirror(0xff00).w(this, FUNC(nbmj9195_state::clut_1_w)); + map(0xd0, 0xdf).mirror(0xff00).w(FUNC(nbmj9195_state::clut_1_w)); - map(0xe0, 0xe0).mirror(0xff00).r(this, FUNC(nbmj9195_state::mscoutm_dipsw_1_r)); - map(0xe2, 0xe2).mirror(0xff00).r(this, FUNC(nbmj9195_state::mscoutm_dipsw_0_r)); + map(0xe0, 0xe0).mirror(0xff00).r(FUNC(nbmj9195_state::mscoutm_dipsw_1_r)); + map(0xe2, 0xe2).mirror(0xff00).r(FUNC(nbmj9195_state::mscoutm_dipsw_0_r)); map(0xe4, 0xe4).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -2544,8 +2544,8 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV1_base) MCFG_DEVICE_IO_MAP(sailorws_sound_io_map) MCFG_TMPZ84C011_ZC0_CB(WRITELINE("audiocpu", tmpz84c011_device, trg3)) MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(*this, nbmj9195_state, soundbank_w)) \ - MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8("dac1", dac_byte_interface, write)) \ - MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8("dac2", dac_byte_interface, write)) \ + MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8("dac1", dac_byte_interface, data_w)) \ + MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8("dac2", dac_byte_interface, data_w)) \ MCFG_TMPZ84C011_PORTD_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) \ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, nbmj9195_state, soundcpu_porte_w)) diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp index 552af82ef3c..226e425510a 100644 --- a/src/mame/drivers/nc.cpp +++ b/src/mame/drivers/nc.cpp @@ -845,18 +845,18 @@ void nc100_state::nc100_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x00, 0x0f).w(this, FUNC(nc100_state::nc100_display_memory_start_w)); - map(0x10, 0x13).rw(this, FUNC(nc100_state::nc_memory_management_r), FUNC(nc100_state::nc_memory_management_w)); - map(0x20, 0x20).w(this, FUNC(nc100_state::nc100_memory_card_wait_state_w)); - map(0x30, 0x30).w(this, FUNC(nc100_state::nc100_uart_control_w)); - map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x50, 0x53).w(this, FUNC(nc100_state::nc_sound_w)); - map(0x60, 0x60).w(this, FUNC(nc100_state::nc_irq_mask_w)); - map(0x70, 0x70).w(this, FUNC(nc100_state::nc100_poweroff_control_w)); - map(0x90, 0x90).rw(this, FUNC(nc100_state::nc_irq_status_r), FUNC(nc100_state::nc_irq_status_w)); - map(0x91, 0x9f).r(this, FUNC(nc100_state::nc_irq_status_r)); - map(0xa0, 0xaf).r(this, FUNC(nc100_state::nc100_card_battery_status_r)); - map(0xb0, 0xb9).r(this, FUNC(nc100_state::nc_key_data_in_r)); + map(0x00, 0x0f).w(FUNC(nc100_state::nc100_display_memory_start_w)); + map(0x10, 0x13).rw(FUNC(nc100_state::nc_memory_management_r), FUNC(nc100_state::nc_memory_management_w)); + map(0x20, 0x20).w(FUNC(nc100_state::nc100_memory_card_wait_state_w)); + map(0x30, 0x30).w(FUNC(nc100_state::nc100_uart_control_w)); + map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x50, 0x53).w(FUNC(nc100_state::nc_sound_w)); + map(0x60, 0x60).w(FUNC(nc100_state::nc_irq_mask_w)); + map(0x70, 0x70).w(FUNC(nc100_state::nc100_poweroff_control_w)); + map(0x90, 0x90).rw(FUNC(nc100_state::nc_irq_status_r), FUNC(nc100_state::nc_irq_status_w)); + map(0x91, 0x9f).r(FUNC(nc100_state::nc_irq_status_r)); + map(0xa0, 0xaf).r(FUNC(nc100_state::nc100_card_battery_status_r)); + map(0xb0, 0xb9).r(FUNC(nc100_state::nc_key_data_in_r)); map(0xc0, 0xc0).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xc1, 0xc1).rw(m_uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xd0, 0xdf).rw("rtc", FUNC(tc8521_device::read), FUNC(tc8521_device::write)); @@ -1250,18 +1250,18 @@ WRITE8_MEMBER(nc200_state::nc200_poweroff_control_w) void nc200_state::nc200_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0f).w(this, FUNC(nc200_state::nc100_display_memory_start_w)); - map(0x10, 0x13).rw(this, FUNC(nc200_state::nc_memory_management_r), FUNC(nc200_state::nc_memory_management_w)); - map(0x20, 0x20).w(this, FUNC(nc200_state::nc200_memory_card_wait_state_w)); - map(0x30, 0x30).w(this, FUNC(nc200_state::nc200_uart_control_w)); - map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x50, 0x53).w(this, FUNC(nc200_state::nc_sound_w)); - map(0x60, 0x60).w(this, FUNC(nc200_state::nc_irq_mask_w)); - map(0x70, 0x70).w(this, FUNC(nc200_state::nc200_poweroff_control_w)); - map(0x80, 0x80).r(this, FUNC(nc200_state::nc200_printer_status_r)); - map(0x90, 0x90).rw(this, FUNC(nc200_state::nc_irq_status_r), FUNC(nc200_state::nc200_irq_status_w)); - map(0xa0, 0xa0).r(this, FUNC(nc200_state::nc200_card_battery_status_r)); - map(0xb0, 0xb9).r(this, FUNC(nc200_state::nc_key_data_in_r)); + map(0x00, 0x0f).w(FUNC(nc200_state::nc100_display_memory_start_w)); + map(0x10, 0x13).rw(FUNC(nc200_state::nc_memory_management_r), FUNC(nc200_state::nc_memory_management_w)); + map(0x20, 0x20).w(FUNC(nc200_state::nc200_memory_card_wait_state_w)); + map(0x30, 0x30).w(FUNC(nc200_state::nc200_uart_control_w)); + map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x50, 0x53).w(FUNC(nc200_state::nc_sound_w)); + map(0x60, 0x60).w(FUNC(nc200_state::nc_irq_mask_w)); + map(0x70, 0x70).w(FUNC(nc200_state::nc200_poweroff_control_w)); + map(0x80, 0x80).r(FUNC(nc200_state::nc200_printer_status_r)); + map(0x90, 0x90).rw(FUNC(nc200_state::nc_irq_status_r), FUNC(nc200_state::nc200_irq_status_w)); + map(0xa0, 0xa0).r(FUNC(nc200_state::nc200_card_battery_status_r)); + map(0xb0, 0xb9).r(FUNC(nc200_state::nc_key_data_in_r)); map(0xc0, 0xc0).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xc1, 0xc1).rw(m_uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xd0, 0xd1).rw("mc", FUNC(mc146818_device::read), FUNC(mc146818_device::write)); diff --git a/src/mame/drivers/nds.cpp b/src/mame/drivers/nds.cpp index 2266e970b44..7928c4e7214 100644 --- a/src/mame/drivers/nds.cpp +++ b/src/mame/drivers/nds.cpp @@ -588,36 +588,36 @@ void nds_state::nds_arm7_map(address_map &map) map(0x02000000, 0x023fffff).ram().mirror(0x00400000).share("mainram"); map(0x03000000, 0x03007fff).mirror(0x007f8000).m(m_arm7wrambnk, FUNC(address_map_bank_device::amap32)); map(0x03800000, 0x0380ffff).ram().mirror(0x007f0000).share("arm7ram"); - map(0x04000000, 0x0410ffff).rw(this, FUNC(nds_state::arm7_io_r), FUNC(nds_state::arm7_io_w)); + map(0x04000000, 0x0410ffff).rw(FUNC(nds_state::arm7_io_r), FUNC(nds_state::arm7_io_w)); } void nds_state::nds_arm9_map(address_map &map) { map(0x02000000, 0x023fffff).ram().mirror(0x00400000).share("mainram"); map(0x03000000, 0x03007fff).mirror(0x00ff8000).m("nds9wram", FUNC(address_map_bank_device::amap32)); - map(0x04000000, 0x0410ffff).rw(this, FUNC(nds_state::arm9_io_r), FUNC(nds_state::arm9_io_w)); + map(0x04000000, 0x0410ffff).rw(FUNC(nds_state::arm9_io_r), FUNC(nds_state::arm9_io_w)); map(0xffff0000, 0xffff0fff).rom().mirror(0x1000).region("arm9", 0); } // ARM7 views of WRAM void nds_state::nds7_wram_map(address_map &map) { - map(0x00000, 0x07fff).rw(this, FUNC(nds_state::wram_arm7mirror_r), FUNC(nds_state::wram_arm7mirror_w)); - map(0x08000, 0x0bfff).rw(this, FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); - map(0x0c000, 0x0ffff).rw(this, FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); - map(0x10000, 0x13fff).rw(this, FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); - map(0x14000, 0x17fff).rw(this, FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); - map(0x18000, 0x1ffff).rw(this, FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); + map(0x00000, 0x07fff).rw(FUNC(nds_state::wram_arm7mirror_r), FUNC(nds_state::wram_arm7mirror_w)); + map(0x08000, 0x0bfff).rw(FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); + map(0x0c000, 0x0ffff).rw(FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); + map(0x10000, 0x13fff).rw(FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); + map(0x14000, 0x17fff).rw(FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); + map(0x18000, 0x1ffff).rw(FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); } // ARM9 views of WRAM void nds_state::nds9_wram_map(address_map &map) { - map(0x00000, 0x07fff).rw(this, FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); - map(0x08000, 0x0bfff).rw(this, FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); - map(0x0c000, 0x0ffff).rw(this, FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); - map(0x10000, 0x13fff).rw(this, FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); - map(0x14000, 0x17fff).rw(this, FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); + map(0x00000, 0x07fff).rw(FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); + map(0x08000, 0x0bfff).rw(FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); + map(0x0c000, 0x0ffff).rw(FUNC(nds_state::wram_second_half_r), FUNC(nds_state::wram_second_half_w)); + map(0x10000, 0x13fff).rw(FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); + map(0x14000, 0x17fff).rw(FUNC(nds_state::wram_first_half_r), FUNC(nds_state::wram_first_half_w)); map(0x18000, 0x1ffff).noprw().nopw(); // probably actually open bus? GBATEK describes as "random" } diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index b6ca6849937..c3d9c9a7de5 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -254,18 +254,18 @@ WRITE8_MEMBER(nemesis_state::city_sound_bank_w) void nemesis_state::nemesis_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x040000, 0x04ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x040000, 0x04ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x050000, 0x051fff).ram(); map(0x050000, 0x0503ff).share("xscroll1"); map(0x050400, 0x0507ff).share("xscroll2"); map(0x050f00, 0x050f7f).share("yscroll2"); map(0x050f80, 0x050fff).share("yscroll1"); - map(0x052000, 0x052fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ - map(0x053000, 0x053fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); - map(0x054000, 0x054fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x055000, 0x055fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x052000, 0x052fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ + map(0x053000, 0x053fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); + map(0x054000, 0x054fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x055000, 0x055fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); map(0x056000, 0x056fff).ram().share("spriteram"); - map(0x05a000, 0x05afff).ram().w(this, FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); + map(0x05a000, 0x05afff).ram().w(FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); map(0x05c001, 0x05c001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x05c400, 0x05c401).portr("DSW0"); map(0x05c402, 0x05c403).portr("DSW1"); @@ -283,20 +283,20 @@ void nemesis_state::gx400_map(address_map &map) { map(0x000000, 0x00ffff).rom(); /* ROM BIOS */ map(0x010000, 0x01ffff).ram(); - map(0x020000, 0x027fff).rw(this, FUNC(nemesis_state::gx400_sharedram_word_r), FUNC(nemesis_state::gx400_sharedram_word_w)); - map(0x030000, 0x03ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x020000, 0x027fff).rw(FUNC(nemesis_state::gx400_sharedram_word_r), FUNC(nemesis_state::gx400_sharedram_word_w)); + map(0x030000, 0x03ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x050000, 0x051fff).ram(); map(0x050000, 0x0503ff).share("xscroll1"); map(0x050400, 0x0507ff).share("xscroll2"); map(0x050f00, 0x050f7f).share("yscroll2"); map(0x050f80, 0x050fff).share("yscroll1"); - map(0x052000, 0x052fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ - map(0x053000, 0x053fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); - map(0x054000, 0x054fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x055000, 0x055fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x052000, 0x052fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ + map(0x053000, 0x053fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); + map(0x054000, 0x054fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x055000, 0x055fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); map(0x056000, 0x056fff).ram().share("spriteram"); map(0x057000, 0x057fff).ram(); /* needed for twinbee */ - map(0x05a000, 0x05afff).ram().w(this, FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); + map(0x05a000, 0x05afff).ram().w(FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); map(0x05c001, 0x05c001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x05c402, 0x05c403).portr("DSW0"); map(0x05c404, 0x05c405).portr("DSW1"); @@ -314,18 +314,18 @@ void nemesis_state::gx400_map(address_map &map) void nemesis_state::konamigt_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x040000, 0x04ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x040000, 0x04ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x050000, 0x051fff).ram(); map(0x050000, 0x0503ff).share("xscroll1"); map(0x050400, 0x0507ff).share("xscroll2"); map(0x050f00, 0x050f7f).share("yscroll2"); map(0x050f80, 0x050fff).share("yscroll1"); - map(0x052000, 0x052fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ - map(0x053000, 0x053fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); - map(0x054000, 0x054fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x055000, 0x055fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x052000, 0x052fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ + map(0x053000, 0x053fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); + map(0x054000, 0x054fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x055000, 0x055fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); map(0x056000, 0x056fff).ram().share("spriteram"); - map(0x05a000, 0x05afff).ram().w(this, FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); + map(0x05a000, 0x05afff).ram().w(FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); map(0x05c001, 0x05c001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x05c400, 0x05c401).portr("DSW0"); map(0x05c402, 0x05c403).portr("DSW1"); @@ -337,26 +337,26 @@ void nemesis_state::konamigt_map(address_map &map) map(0x05e000, 0x05e00f).w("outlatch", FUNC(ls259_device::write_d0)).umask16(0xff00); map(0x05e000, 0x05e00f).w("intlatch", FUNC(ls259_device::write_d0)).umask16(0x00ff); map(0x060000, 0x067fff).ram(); /* WORK RAM */ - map(0x070000, 0x070001).r(this, FUNC(nemesis_state::konamigt_input_word_r)); + map(0x070000, 0x070001).r(FUNC(nemesis_state::konamigt_input_word_r)); } void nemesis_state::rf2_gx400_map(address_map &map) { map(0x000000, 0x00ffff).rom(); /* ROM BIOS */ map(0x010000, 0x01ffff).ram(); - map(0x020000, 0x027fff).rw(this, FUNC(nemesis_state::gx400_sharedram_word_r), FUNC(nemesis_state::gx400_sharedram_word_w)); - map(0x030000, 0x03ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x020000, 0x027fff).rw(FUNC(nemesis_state::gx400_sharedram_word_r), FUNC(nemesis_state::gx400_sharedram_word_w)); + map(0x030000, 0x03ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x050000, 0x051fff).ram(); map(0x050000, 0x0503ff).share("xscroll1"); map(0x050400, 0x0507ff).share("xscroll2"); map(0x050f00, 0x050f7f).share("yscroll2"); map(0x050f80, 0x050fff).share("yscroll1"); - map(0x052000, 0x052fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ - map(0x053000, 0x053fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); - map(0x054000, 0x054fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x055000, 0x055fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x052000, 0x052fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ + map(0x053000, 0x053fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); + map(0x054000, 0x054fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x055000, 0x055fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); map(0x056000, 0x056fff).ram().share("spriteram"); - map(0x05a000, 0x05afff).ram().w(this, FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); + map(0x05a000, 0x05afff).ram().w(FUNC(nemesis_state::nemesis_palette_word_w)).share("paletteram"); map(0x05c001, 0x05c001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x05c402, 0x05c403).portr("DSW0"); map(0x05c404, 0x05c405).portr("DSW1"); @@ -368,7 +368,7 @@ void nemesis_state::rf2_gx400_map(address_map &map) map(0x05e000, 0x05e00f).w("outlatch", FUNC(ls259_device::write_d0)).umask16(0xff00); map(0x05e000, 0x05e00f).w("intlatch", FUNC(ls259_device::write_d0)).umask16(0x00ff); map(0x060000, 0x067fff).ram(); /* WORK RAM */ - map(0x070000, 0x070001).r(this, FUNC(nemesis_state::konamigt_input_word_r)); + map(0x070000, 0x070001).r(FUNC(nemesis_state::konamigt_input_word_r)); map(0x080000, 0x0bffff).rom(); } @@ -384,7 +384,7 @@ void nemesis_state::sound_map(address_map &map) map(0xe004, 0xe004).w(m_k005289, FUNC(k005289_device::tg2_w)); map(0xe005, 0xe005).w("ay2", FUNC(ay8910_device::address_w)); map(0xe006, 0xe006).w("ay1", FUNC(ay8910_device::address_w)); - map(0xe007, 0xe007).select(0x1ff8).w(this, FUNC(nemesis_state::nemesis_filter_w)); + map(0xe007, 0xe007).select(0x1ff8).w(FUNC(nemesis_state::nemesis_filter_w)); map(0xe086, 0xe086).r("ay1", FUNC(ay8910_device::data_r)); map(0xe106, 0xe106).w("ay1", FUNC(ay8910_device::data_w)); map(0xe205, 0xe205).r("ay2", FUNC(ay8910_device::data_r)); @@ -404,8 +404,8 @@ void nemesis_state::gx400_sound_map(address_map &map) map(0xe004, 0xe004).w(m_k005289, FUNC(k005289_device::tg2_w)); map(0xe005, 0xe005).w("ay2", FUNC(ay8910_device::address_w)); map(0xe006, 0xe006).w("ay1", FUNC(ay8910_device::address_w)); - map(0xe007, 0xe007).select(0x1ff8).w(this, FUNC(nemesis_state::nemesis_filter_w)); - map(0xe030, 0xe030).w(this, FUNC(nemesis_state::gx400_speech_start_w)); + map(0xe007, 0xe007).select(0x1ff8).w(FUNC(nemesis_state::nemesis_filter_w)); + map(0xe030, 0xe030).w(FUNC(nemesis_state::gx400_speech_start_w)); map(0xe086, 0xe086).r("ay1", FUNC(ay8910_device::data_r)); map(0xe106, 0xe106).w("ay1", FUNC(ay8910_device::data_w)); map(0xe205, 0xe205).r("ay2", FUNC(ay8910_device::data_r)); @@ -426,7 +426,7 @@ void nemesis_state::salamand_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x080000, 0x087fff).ram(); map(0x090000, 0x091fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); - map(0x0a0000, 0x0a0001).w(this, FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ + map(0x0a0000, 0x0a0001).w(FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ map(0x0c0001, 0x0c0001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x0c0002, 0x0c0003).portr("DSW0"); map(0x0c0004, 0x0c0005).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* probably */ @@ -434,11 +434,11 @@ void nemesis_state::salamand_map(address_map &map) map(0x0c2002, 0x0c2003).portr("IN1"); map(0x0c2004, 0x0c2005).portr("IN2"); map(0x0c2006, 0x0c2007).portr("DSW1"); - map(0x100000, 0x100fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); /* VRAM */ - map(0x101000, 0x101fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); - map(0x102000, 0x102fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); - map(0x103000, 0x103fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x120000, 0x12ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x100000, 0x100fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); /* VRAM */ + map(0x101000, 0x101fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); + map(0x102000, 0x102fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x103000, 0x103fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x120000, 0x12ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x180000, 0x180fff).ram().share("spriteram"); /* more sprite ram ??? */ map(0x190000, 0x191fff).ram(); map(0x190000, 0x1903ff).share("xscroll2"); @@ -452,7 +452,7 @@ void nemesis_state::blkpnthr_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x080000, 0x081fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); map(0x090000, 0x097fff).ram(); - map(0x0a0000, 0x0a0001).ram().w(this, FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ + map(0x0a0000, 0x0a0001).ram().w(FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ map(0x0c0001, 0x0c0001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x0c0002, 0x0c0003).portr("DSW0"); map(0x0c0004, 0x0c0005).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* probably */ @@ -460,11 +460,11 @@ void nemesis_state::blkpnthr_map(address_map &map) map(0x0c2002, 0x0c2003).portr("IN1"); map(0x0c2004, 0x0c2005).portr("IN2"); map(0x0c2006, 0x0c2007).portr("DSW1"); - map(0x100000, 0x100fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1").mirror(0x4000); /* VRAM */ - map(0x101000, 0x101fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2").mirror(0x4000); - map(0x102000, 0x102fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); - map(0x103000, 0x103fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); - map(0x120000, 0x12ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x100000, 0x100fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1").mirror(0x4000); /* VRAM */ + map(0x101000, 0x101fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2").mirror(0x4000); + map(0x102000, 0x102fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); + map(0x103000, 0x103fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); + map(0x120000, 0x12ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x180000, 0x181fff).ram(); map(0x180000, 0x1803ff).share("xscroll1"); map(0x180400, 0x1807ff).share("xscroll2"); @@ -485,14 +485,14 @@ void nemesis_state::citybomb_map(address_map &map) map(0x0f0008, 0x0f0009).portr("DSW0"); map(0x0f0011, 0x0f0011).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x0f0018, 0x0f0019).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* probably */ - map(0x0f0020, 0x0f0021).r(this, FUNC(nemesis_state::selected_ip_word_r)).nopw(); /* WEC Le Mans 24 control? */ - map(0x0f8000, 0x0f8001).w(this, FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ + map(0x0f0020, 0x0f0021).r(FUNC(nemesis_state::selected_ip_word_r)).nopw(); /* WEC Le Mans 24 control? */ + map(0x0f8000, 0x0f8001).w(FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ map(0x100000, 0x1bffff).rom(); - map(0x200000, 0x20ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); - map(0x210000, 0x210fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ - map(0x211000, 0x211fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); - map(0x212000, 0x212fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x213000, 0x213fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x200000, 0x20ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x210000, 0x210fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ + map(0x211000, 0x211fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); + map(0x212000, 0x212fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x213000, 0x213fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); map(0x300000, 0x301fff).ram(); map(0x300000, 0x3003ff).share("xscroll1"); map(0x300400, 0x3007ff).share("xscroll2"); @@ -513,13 +513,13 @@ void nemesis_state::nyanpani_map(address_map &map) map(0x070008, 0x070009).portr("DSW0"); map(0x070011, 0x070011).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x070018, 0x070019).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* probably */ - map(0x078000, 0x078001).w(this, FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ + map(0x078000, 0x078001).w(FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ map(0x100000, 0x13ffff).rom(); - map(0x200000, 0x200fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ - map(0x201000, 0x201fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); - map(0x202000, 0x202fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x203000, 0x203fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); - map(0x210000, 0x21ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x200000, 0x200fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); /* VRAM */ + map(0x201000, 0x201fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); + map(0x202000, 0x202fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x203000, 0x203fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x210000, 0x21ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x300000, 0x300fff).ram().share("spriteram"); /* more sprite ram ??? */ map(0x310000, 0x311fff).ram(); map(0x310000, 0x3103ff).share("xscroll1"); @@ -542,8 +542,8 @@ void nemesis_state::sal_sound_map(address_map &map) map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xd000, 0xd000).w(m_vlm, FUNC(vlm5030_device::data_w)); - map(0xe000, 0xe000).r(this, FUNC(nemesis_state::wd_r)); /* watchdog?? */ - map(0xf000, 0xf000).w(this, FUNC(nemesis_state::salamand_speech_start_w)); + map(0xe000, 0xe000).r(FUNC(nemesis_state::wd_r)); /* watchdog?? */ + map(0xf000, 0xf000).w(FUNC(nemesis_state::salamand_speech_start_w)); } void nemesis_state::salamand_vlm_map(address_map &map) @@ -559,7 +559,7 @@ void nemesis_state::blkpnthr_sound_map(address_map &map) map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xe000, 0xe000).r(this, FUNC(nemesis_state::wd_r)); /* watchdog?? */ + map(0xe000, 0xe000).r(FUNC(nemesis_state::wd_r)); /* watchdog?? */ } void nemesis_state::city_sound_map(address_map &map) @@ -569,7 +569,7 @@ void nemesis_state::city_sound_map(address_map &map) map(0x9800, 0x98ff).m("k051649", FUNC(k051649_device::scc_map)); map(0xa000, 0xa001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); - map(0xc000, 0xc000).w(this, FUNC(nemesis_state::city_sound_bank_w)); /* 7232 bankswitch */ + map(0xc000, 0xc000).w(FUNC(nemesis_state::city_sound_bank_w)); /* 7232 bankswitch */ map(0xd000, 0xd000).r("soundlatch", FUNC(generic_latch_8_device::read)); } @@ -581,22 +581,22 @@ void nemesis_state::hcrash_map(address_map &map) map(0x040000, 0x05ffff).rom(); map(0x080000, 0x083fff).ram(); map(0x090000, 0x091fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); - map(0x0a0000, 0x0a0001).w(this, FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ + map(0x0a0000, 0x0a0001).w(FUNC(nemesis_state::salamand_control_port_word_w)); /* irq enable, flipscreen, etc. */ map(0x0c0001, 0x0c0001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x0c0002, 0x0c0003).portr("DSW0"); map(0x0c0004, 0x0c0005).portr("DSW1"); map(0x0c0006, 0x0c0007).portr("TEST"); map(0x0c0008, 0x0c0009).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* watchdog probably */ map(0x0c000a, 0x0c000b).portr("IN0"); - map(0x0c2000, 0x0c2001).r(this, FUNC(nemesis_state::konamigt_input_word_r)); /* Konami GT control */ + map(0x0c2000, 0x0c2001).r(FUNC(nemesis_state::konamigt_input_word_r)); /* Konami GT control */ map(0x0c2800, 0x0c280f).w("intlatch", FUNC(ls259_device::write_d0)).umask16(0x00ff); // ??? - map(0x0c4000, 0x0c4001).portr("IN1").w(this, FUNC(nemesis_state::selected_ip_word_w)); - map(0x0c4002, 0x0c4003).r(this, FUNC(nemesis_state::selected_ip_word_r)).nopw(); /* WEC Le Mans 24 control. latches the value read previously */ - map(0x100000, 0x100fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); /* VRAM */ - map(0x101000, 0x101fff).ram().w(this, FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); - map(0x102000, 0x102fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); - map(0x103000, 0x103fff).ram().w(this, FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); - map(0x120000, 0x12ffff).ram().w(this, FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); + map(0x0c4000, 0x0c4001).portr("IN1").w(FUNC(nemesis_state::selected_ip_word_w)); + map(0x0c4002, 0x0c4003).r(FUNC(nemesis_state::selected_ip_word_r)).nopw(); /* WEC Le Mans 24 control. latches the value read previously */ + map(0x100000, 0x100fff).ram().w(FUNC(nemesis_state::nemesis_videoram2_word_w)).share("videoram2"); /* VRAM */ + map(0x101000, 0x101fff).ram().w(FUNC(nemesis_state::nemesis_videoram1_word_w)).share("videoram1"); + map(0x102000, 0x102fff).ram().w(FUNC(nemesis_state::nemesis_colorram2_word_w)).share("colorram2"); + map(0x103000, 0x103fff).ram().w(FUNC(nemesis_state::nemesis_colorram1_word_w)).share("colorram1"); + map(0x120000, 0x12ffff).ram().w(FUNC(nemesis_state::nemesis_charram_word_w)).share("charram"); map(0x180000, 0x180fff).ram().share("spriteram"); map(0x190000, 0x191fff).ram(); map(0x190000, 0x1903ff).share("xscroll2"); diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index 682e7392d90..bf6e295dcac 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -1680,32 +1680,32 @@ READ16_MEMBER(neogeo_base_state::banked_vectors_r) void neogeo_base_state::base_main_map(address_map &map) { - map(0x320000, 0x320000).mirror(0x01fffe).w(this, FUNC(neogeo_base_state::audio_command_w)); - map(0x360000, 0x37ffff).r(this, FUNC(neogeo_base_state::unmapped_r)); - map(0x380000, 0x3800ff).mirror(0x01ff00).w(this, FUNC(neogeo_base_state::io_control_w)).umask16(0x00ff); - map(0x3a0000, 0x3a001f).mirror(0x01ffe0).r(this, FUNC(neogeo_base_state::unmapped_r)); + map(0x320000, 0x320000).mirror(0x01fffe).w(FUNC(neogeo_base_state::audio_command_w)); + map(0x360000, 0x37ffff).r(FUNC(neogeo_base_state::unmapped_r)); + map(0x380000, 0x3800ff).mirror(0x01ff00).w(FUNC(neogeo_base_state::io_control_w)).umask16(0x00ff); + map(0x3a0000, 0x3a001f).mirror(0x01ffe0).r(FUNC(neogeo_base_state::unmapped_r)); map(0x3a0000, 0x3a001f).mirror(0x01ffe0).w("systemlatch", FUNC(hc259_device::write_a3)).umask16(0x00ff); // BITW1 (system control registers) - map(0x3c0000, 0x3c0007).mirror(0x01fff8).r(this, FUNC(neogeo_base_state::video_register_r)); - map(0x3c0000, 0x3c000f).mirror(0x01fff0).w(this, FUNC(neogeo_base_state::video_register_w)); - map(0x3e0000, 0x3fffff).r(this, FUNC(neogeo_base_state::unmapped_r)); - map(0x400000, 0x401fff).mirror(0x3fe000).rw(this, FUNC(neogeo_base_state::paletteram_r), FUNC(neogeo_base_state::paletteram_w)); + map(0x3c0000, 0x3c0007).mirror(0x01fff8).r(FUNC(neogeo_base_state::video_register_r)); + map(0x3c0000, 0x3c000f).mirror(0x01fff0).w(FUNC(neogeo_base_state::video_register_w)); + map(0x3e0000, 0x3fffff).r(FUNC(neogeo_base_state::unmapped_r)); + map(0x400000, 0x401fff).mirror(0x3fe000).rw(FUNC(neogeo_base_state::paletteram_r), FUNC(neogeo_base_state::paletteram_w)); } void ngarcade_base_state::neogeo_main_map(address_map &map) { base_main_map(map); - map(0x000000, 0x00007f).r(this, FUNC(ngarcade_base_state::banked_vectors_r)); + map(0x000000, 0x00007f).r(FUNC(ngarcade_base_state::banked_vectors_r)); map(0x100000, 0x10ffff).mirror(0x0f0000).ram(); // some games have protection devices in the 0x200000 region, it appears to map to cart space, not surprising, the ROM is read here too map(0x300080, 0x300081).mirror(0x01ff7e).portr("TEST"); map(0x300001, 0x300001).mirror(0x01fffe).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x320000, 0x320001).mirror(0x01fffe).portr("AUDIO/COIN"); map(0x380000, 0x380001).mirror(0x01fffe).portr("SYSTEM"); - map(0x800000, 0x800fff).r(this, FUNC(ngarcade_base_state::unmapped_r)); // memory card mapped here if present + map(0x800000, 0x800fff).r(FUNC(ngarcade_base_state::unmapped_r)); // memory card mapped here if present map(0xc00000, 0xc1ffff).mirror(0x0e0000).rom().region("mainbios", 0); - map(0xd00000, 0xd0ffff).mirror(0x0f0000).ram().w(this, FUNC(ngarcade_base_state::save_ram_w)).share("saveram"); - map(0xe00000, 0xffffff).r(this, FUNC(ngarcade_base_state::unmapped_r)); + map(0xd00000, 0xd0ffff).mirror(0x0f0000).ram().w(FUNC(ngarcade_base_state::save_ram_w)).share("saveram"); + map(0xe00000, 0xffffff).r(FUNC(ngarcade_base_state::unmapped_r)); } @@ -1725,19 +1725,19 @@ void aes_base_state::aes_base_main_map(address_map &map) map(0x300000, 0x300000).mirror(0x01fffe).r(m_ctrl1, FUNC(neogeo_control_port_device::ctrl_r)); map(0x320000, 0x320001).mirror(0x01fffe).portr("AUDIO"); map(0x340000, 0x340000).mirror(0x01fffe).r(m_ctrl2, FUNC(neogeo_control_port_device::ctrl_r)); - map(0x380000, 0x380001).mirror(0x01fffe).r(this, FUNC(aes_base_state::aes_in2_r)); + map(0x380000, 0x380001).mirror(0x01fffe).r(FUNC(aes_base_state::aes_in2_r)); } void aes_state::aes_main_map(address_map &map) { aes_base_main_map(map); - map(0x000000, 0x00007f).r(this, FUNC(aes_state::banked_vectors_r)); + map(0x000000, 0x00007f).r(FUNC(aes_state::banked_vectors_r)); map(0x100000, 0x10ffff).mirror(0x0f0000).ram(); // some games have protection devices in the 0x200000 region, it appears to map to cart space, not surprising, the ROM is read here too - map(0x800000, 0x800fff).rw(this, FUNC(aes_state::memcard_r), FUNC(aes_state::memcard_w)); + map(0x800000, 0x800fff).rw(FUNC(aes_state::memcard_r), FUNC(aes_state::memcard_w)); map(0xc00000, 0xc1ffff).mirror(0x0e0000).rom().region("mainbios", 0); - map(0xd00000, 0xffffff).r(this, FUNC(aes_state::unmapped_r)); + map(0xd00000, 0xffffff).r(FUNC(aes_state::unmapped_r)); } @@ -1769,8 +1769,8 @@ void neogeo_base_state::audio_io_map(address_map &map) { map(0x00, 0x00).mirror(0xff00).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::clear_w)); map(0x04, 0x07).mirror(0xff00).rw(m_ym, FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x08, 0x08).mirror(0xff00).select(0x0010).w(this, FUNC(neogeo_base_state::audio_cpu_enable_nmi_w)); - map(0x08, 0x0b).mirror(0x00f0).select(0xff00).r(this, FUNC(neogeo_base_state::audio_cpu_bank_select_r)); + map(0x08, 0x08).mirror(0xff00).select(0x0010).w(FUNC(neogeo_base_state::audio_cpu_enable_nmi_w)); + map(0x08, 0x0b).mirror(0x00f0).select(0xff00).r(FUNC(neogeo_base_state::audio_cpu_bank_select_r)); map(0x0c, 0x0c).mirror(0xff00).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); } diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp index 4875c111af2..cb1de917b6d 100644 --- a/src/mame/drivers/neogeocd.cpp +++ b/src/mame/drivers/neogeocd.cpp @@ -889,15 +889,15 @@ void ngcd_state::neocd_main_map(address_map &map) aes_base_main_map(map); map(0x000000, 0x1fffff).ram().region("maincpu", 0x00000); - map(0x000000, 0x00007f).r(this, FUNC(ngcd_state::banked_vectors_r)); // writes will fall through to area above + map(0x000000, 0x00007f).r(FUNC(ngcd_state::banked_vectors_r)); // writes will fall through to area above - map(0x800000, 0x803fff).rw(this, FUNC(ngcd_state::neocd_memcard_r), FUNC(ngcd_state::neocd_memcard_w)); + map(0x800000, 0x803fff).rw(FUNC(ngcd_state::neocd_memcard_r), FUNC(ngcd_state::neocd_memcard_w)); map(0xc00000, 0xc7ffff).mirror(0x080000).rom().region("mainbios", 0); - map(0xd00000, 0xdfffff).r(this, FUNC(ngcd_state::unmapped_r)); - map(0xe00000, 0xefffff).rw(this, FUNC(ngcd_state::neocd_transfer_r), FUNC(ngcd_state::neocd_transfer_w)); - map(0xf00000, 0xfeffff).r(this, FUNC(ngcd_state::unmapped_r)); - map(0xff0000, 0xff01ff).rw(this, FUNC(ngcd_state::neocd_control_r), FUNC(ngcd_state::neocd_control_w)); // CDROM / DMA - map(0xff0200, 0xffffff).r(this, FUNC(ngcd_state::unmapped_r)); + map(0xd00000, 0xdfffff).r(FUNC(ngcd_state::unmapped_r)); + map(0xe00000, 0xefffff).rw(FUNC(ngcd_state::neocd_transfer_r), FUNC(ngcd_state::neocd_transfer_w)); + map(0xf00000, 0xfeffff).r(FUNC(ngcd_state::unmapped_r)); + map(0xff0000, 0xff01ff).rw(FUNC(ngcd_state::neocd_control_r), FUNC(ngcd_state::neocd_control_w)); // CDROM / DMA + map(0xff0200, 0xffffff).r(FUNC(ngcd_state::unmapped_r)); } @@ -918,7 +918,7 @@ void ngcd_state::neocd_audio_io_map(address_map &map) { map(0x00, 0x00).mirror(0xff00).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::clear_w)); map(0x04, 0x07).mirror(0xff00).rw(m_ym, FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x08, 0x08).mirror(0xff00).select(0x0010).w(this, FUNC(ngcd_state::audio_cpu_enable_nmi_w)); + map(0x08, 0x08).mirror(0xff00).select(0x0010).w(FUNC(ngcd_state::audio_cpu_enable_nmi_w)); // banking reads are actually NOP on NeoCD? but some games still access them // AM_RANGE(0x08, 0x0b) AM_MIRROR(0x00f0) AM_SELECT(0xff00) AM_READ(audio_cpu_bank_select_r) map(0x0c, 0x0c).mirror(0xff00).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index 4a9affd20f4..d072c6af365 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -255,12 +255,12 @@ void neoprint_state::neoprint_map(address_map &map) map(0x300000, 0x30ffff).ram().share("nvram"); map(0x400000, 0x43ffff).ram().share("npvidram"); map(0x500000, 0x51ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x600000, 0x600000).rw(this, FUNC(neoprint_state::neoprint_audio_result_r), FUNC(neoprint_state::audio_command_w)); - map(0x600002, 0x600002).rw(this, FUNC(neoprint_state::neoprint_calendar_r), FUNC(neoprint_state::neoprint_calendar_w)); + map(0x600000, 0x600000).rw(FUNC(neoprint_state::neoprint_audio_result_r), FUNC(neoprint_state::audio_command_w)); + map(0x600002, 0x600002).rw(FUNC(neoprint_state::neoprint_calendar_r), FUNC(neoprint_state::neoprint_calendar_w)); map(0x600004, 0x600005).portr("SYSTEM").nopw(); map(0x600006, 0x600007).portr("IN").nopw(); map(0x600008, 0x600009).portr("DSW1"); - map(0x60000a, 0x60000a).r(this, FUNC(neoprint_state::neoprint_unk_r)); + map(0x60000a, 0x60000a).r(FUNC(neoprint_state::neoprint_unk_r)); map(0x60000c, 0x60000d).portr("DSW2"); map(0x60000e, 0x60000f).nopw(); @@ -319,14 +319,14 @@ READ16_MEMBER(neoprint_state::rom_window_r) void neoprint_state::nprsp_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x0fffff).r(this, FUNC(neoprint_state::rom_window_r)); - map(0x200000, 0x200000).rw(this, FUNC(neoprint_state::neoprint_audio_result_r), FUNC(neoprint_state::audio_command_w)); - map(0x200002, 0x200002).rw(this, FUNC(neoprint_state::neoprint_calendar_r), FUNC(neoprint_state::neoprint_calendar_w)); + map(0x080000, 0x0fffff).r(FUNC(neoprint_state::rom_window_r)); + map(0x200000, 0x200000).rw(FUNC(neoprint_state::neoprint_audio_result_r), FUNC(neoprint_state::audio_command_w)); + map(0x200002, 0x200002).rw(FUNC(neoprint_state::neoprint_calendar_r), FUNC(neoprint_state::neoprint_calendar_w)); map(0x200004, 0x200005).portr("SYSTEM").nopw(); map(0x200006, 0x200007).portr("IN").nopw(); map(0x200008, 0x200009).portr("DSW1"); - map(0x200008, 0x200008).w(this, FUNC(neoprint_state::nprsp_bank_w)); - map(0x20000a, 0x20000a).r(this, FUNC(neoprint_state::neoprint_unk_r)); + map(0x200008, 0x200008).w(FUNC(neoprint_state::nprsp_bank_w)); + map(0x20000a, 0x20000a).r(FUNC(neoprint_state::neoprint_unk_r)); map(0x20000c, 0x20000d).portr("DSW2"); map(0x20000e, 0x20000f).nopw(); @@ -336,7 +336,7 @@ void neoprint_state::nprsp_map(address_map &map) map(0x300000, 0x33ffff).ram().share("nvram"); map(0x380000, 0x38ffff).ram(); map(0x400000, 0x43ffff).ram().share("npvidram"); - map(0x500000, 0x57ffff).ram().w(this, FUNC(neoprint_state::nprsp_palette_w)).share("paletteram"); + map(0x500000, 0x57ffff).ram().w(FUNC(neoprint_state::nprsp_palette_w)).share("paletteram"); } /************************************* @@ -366,14 +366,14 @@ void neoprint_state::neoprint_audio_map(address_map &map) void neoprint_state::neoprint_audio_io_map(address_map &map) { /*AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, audio_cpu_clear_nmi_w);*/ /* may not and NMI clear */ - map(0x00, 0x00).mirror(0xff00).r(this, FUNC(neoprint_state::audio_command_r)).nopw(); + map(0x00, 0x00).mirror(0xff00).r(FUNC(neoprint_state::audio_command_r)).nopw(); map(0x04, 0x07).mirror(0xff00).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); // AM_RANGE(0x08, 0x08) AM_MIRROR(0xff00) /* write - NMI enable / acknowledge? (the data written doesn't matter) */ // AM_RANGE(0x08, 0x08) AM_SELECT(0xfff0) AM_READ(audio_cpu_bank_select_f000_f7ff_r) // AM_RANGE(0x09, 0x09) AM_SELECT(0xfff0) AM_READ(audio_cpu_bank_select_e000_efff_r) // AM_RANGE(0x0a, 0x0a) AM_SELECT(0xfff0) AM_READ(audio_cpu_bank_select_c000_dfff_r) // AM_RANGE(0x0b, 0x0b) AM_SELECT(0xfff0) AM_READ(audio_cpu_bank_select_8000_bfff_r) - map(0x0c, 0x0c).mirror(0xff00).w(this, FUNC(neoprint_state::audio_result_w)); + map(0x0c, 0x0c).mirror(0xff00).w(FUNC(neoprint_state::audio_result_w)); // AM_RANGE(0x18, 0x18) AM_MIRROR(0xff00) /* write - NMI disable? (the data written doesn't matter) */ } diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp index 3bedc3dc613..6e922aec5ef 100644 --- a/src/mame/drivers/neptunp2.cpp +++ b/src/mame/drivers/neptunp2.cpp @@ -63,9 +63,9 @@ void neptunp2_state::neptunp2_map(address_map &map) map(0xdb004, 0xdb007).ram(); map(0xdb00c, 0xdb00f).ram(); - map(0xff806, 0xff806).r(this, FUNC(neptunp2_state::test_r)); - map(0xff810, 0xff810).r(this, FUNC(neptunp2_state::test_r)); - map(0xff812, 0xff812).r(this, FUNC(neptunp2_state::test_r)); + map(0xff806, 0xff806).r(FUNC(neptunp2_state::test_r)); + map(0xff810, 0xff810).r(FUNC(neptunp2_state::test_r)); + map(0xff812, 0xff812).r(FUNC(neptunp2_state::test_r)); map(0xff980, 0xff980).nopw(); diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp index 0583a6b1ea1..14625188a34 100644 --- a/src/mame/drivers/nes.cpp +++ b/src/mame/drivers/nes.cpp @@ -30,9 +30,9 @@ void nes_state::nes_map(address_map &map) { map(0x0000, 0x07ff).ram().mirror(0x1800); /* RAM */ map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* PPU registers */ - map(0x4014, 0x4014).w(this, FUNC(nes_state::nes_vh_sprite_dma_w)); /* stupid address space hole */ - map(0x4016, 0x4016).rw(this, FUNC(nes_state::nes_in0_r), FUNC(nes_state::nes_in0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(this, FUNC(nes_state::nes_in1_r)); /* IN1 - input port 2 */ + map(0x4014, 0x4014).w(FUNC(nes_state::nes_vh_sprite_dma_w)); /* stupid address space hole */ + map(0x4016, 0x4016).rw(FUNC(nes_state::nes_in0_r), FUNC(nes_state::nes_in0_w)); /* IN0 - input port 1 */ + map(0x4017, 0x4017).r(FUNC(nes_state::nes_in1_r)); /* IN1 - input port 2 */ // 0x4100-0x5fff -> LOW HANDLER defined on a pcb base // 0x6000-0x7fff -> MID HANDLER defined on a pcb base // 0x8000-0xffff -> HIGH HANDLER defined on a pcb base diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index 32f343592db..fe6a7a5b000 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -1162,17 +1162,17 @@ void nes_vt_state::nes_vt_map(address_map &map) map(0x2000, 0x3fff).mask(0x001F).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* PPU registers */ map(0x4000, 0x4013).rw(m_apu, FUNC(nesapu_device::read), FUNC(nesapu_device::write)); - map(0x4014, 0x4014).r(this, FUNC(nes_vt_state::psg1_4014_r)).w(this, FUNC(nes_vt_state::nes_vh_sprite_dma_w)); - map(0x4015, 0x4015).rw(this, FUNC(nes_vt_state::psg1_4015_r), FUNC(nes_vt_state::psg1_4015_w)); /* PSG status / first control register */ - map(0x4016, 0x4016).rw(this, FUNC(nes_vt_state::nes_in0_r), FUNC(nes_vt_state::nes_in0_w)); - map(0x4017, 0x4017).r(this, FUNC(nes_vt_state::nes_in1_r)).w(this, FUNC(nes_vt_state::psg1_4017_w)); + map(0x4014, 0x4014).r(FUNC(nes_vt_state::psg1_4014_r)).w(FUNC(nes_vt_state::nes_vh_sprite_dma_w)); + map(0x4015, 0x4015).rw(FUNC(nes_vt_state::psg1_4015_r), FUNC(nes_vt_state::psg1_4015_w)); /* PSG status / first control register */ + map(0x4016, 0x4016).rw(FUNC(nes_vt_state::nes_in0_r), FUNC(nes_vt_state::nes_in0_w)); + map(0x4017, 0x4017).r(FUNC(nes_vt_state::nes_in1_r)).w(FUNC(nes_vt_state::psg1_4017_w)); - map(0x4034, 0x4034).w(this, FUNC(nes_vt_state::vt03_4034_w)); + map(0x4034, 0x4034).w(FUNC(nes_vt_state::vt03_4034_w)); - map(0x4100, 0x410b).r(this, FUNC(nes_vt_state::vt03_410x_r)).w(this, FUNC(nes_vt_state::vt03_410x_w)); + map(0x4100, 0x410b).r(FUNC(nes_vt_state::vt03_410x_r)).w(FUNC(nes_vt_state::vt03_410x_w)); map(0x8000, 0xffff).m(m_prg, FUNC(address_map_bank_device::amap8)); - map(0x8000, 0xffff).w(this, FUNC(nes_vt_state::vt03_8000_w)); + map(0x8000, 0xffff).w(FUNC(nes_vt_state::vt03_8000_w)); map(0x6000, 0x7fff).ram(); } @@ -1187,40 +1187,40 @@ void nes_vt_state::nes_vt_xx_map(address_map &map) void nes_vt_state::nes_vt_hum_map(address_map &map) { nes_vt_map(map); - map(0x4100, 0x410b).w(this, FUNC(nes_vt_state::vt03_410x_hum_w)); - map(0x8000, 0xffff).w(this, FUNC(nes_vt_state::vt03_8000_hum_w)); + map(0x4100, 0x410b).w(FUNC(nes_vt_state::vt03_410x_hum_w)); + map(0x8000, 0xffff).w(FUNC(nes_vt_state::vt03_8000_hum_w)); } void nes_vt_state::nes_vt_pjoy_map(address_map &map) { nes_vt_map(map); - map(0x4100, 0x410b).w(this, FUNC(nes_vt_state::vt03_410x_pjoy_w)); - map(0x8000, 0xffff).w(this, FUNC(nes_vt_state::vt03_8000_pjoy_w)); + map(0x4100, 0x410b).w(FUNC(nes_vt_state::vt03_410x_pjoy_w)); + map(0x8000, 0xffff).w(FUNC(nes_vt_state::vt03_8000_pjoy_w)); } void nes_vt_state::nes_vt_sp69_map(address_map &map) { nes_vt_map(map); - map(0x4100, 0x410b).w(this, FUNC(nes_vt_state::vt03_410x_sp69_w)); - map(0x8000, 0xffff).w(this, FUNC(nes_vt_state::vt03_8000_sp69_w)); + map(0x4100, 0x410b).w(FUNC(nes_vt_state::vt03_410x_sp69_w)); + map(0x8000, 0xffff).w(FUNC(nes_vt_state::vt03_8000_sp69_w)); } void nes_vt_state::nes_vt_cy_map(address_map &map) { nes_vt_xx_map(map); - map(0x41b0, 0x41bf).r(this, FUNC(nes_vt_state::vt03_41bx_r)).w(this, FUNC(nes_vt_state::vt03_41bx_w)); - map(0x48a0, 0x48af).r(this, FUNC(nes_vt_state::vt03_48ax_r)).w(this, FUNC(nes_vt_state::vt03_48ax_w)); - map(0x4130, 0x4136).r(this, FUNC(nes_vt_state::vt03_413x_r)).w(this, FUNC(nes_vt_state::vt03_413x_w)); - map(0x414F, 0x414F).r(this, FUNC(nes_vt_state::vt03_414f_r)); - map(0x415C, 0x415C).r(this, FUNC(nes_vt_state::vt03_415c_r)); + map(0x41b0, 0x41bf).r(FUNC(nes_vt_state::vt03_41bx_r)).w(FUNC(nes_vt_state::vt03_41bx_w)); + map(0x48a0, 0x48af).r(FUNC(nes_vt_state::vt03_48ax_r)).w(FUNC(nes_vt_state::vt03_48ax_w)); + map(0x4130, 0x4136).r(FUNC(nes_vt_state::vt03_413x_r)).w(FUNC(nes_vt_state::vt03_413x_w)); + map(0x414F, 0x414F).r(FUNC(nes_vt_state::vt03_414f_r)); + map(0x415C, 0x415C).r(FUNC(nes_vt_state::vt03_415c_r)); } void nes_vt_state::nes_vt_bt_map(address_map &map) { nes_vt_xx_map(map); - map(0x412c, 0x412c).w(this, FUNC(nes_vt_state::vt03_412c_w)); + map(0x412c, 0x412c).w(FUNC(nes_vt_state::vt03_412c_w)); } @@ -1230,20 +1230,20 @@ void nes_vt_state::nes_vt_hh_map(address_map &map) map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* PPU registers */ map(0x4000, 0x4013).rw(m_apu, FUNC(nesapu_device::read), FUNC(nesapu_device::write)); - map(0x4015, 0x4015).rw(this, FUNC(nes_vt_state::psg1_4015_r), FUNC(nes_vt_state::psg1_4015_w)); /* PSG status / first control register */ - map(0x4016, 0x4016).rw(this, FUNC(nes_vt_state::nes_in0_r), FUNC(nes_vt_state::nes_in0_w)); - map(0x4017, 0x4017).r(this, FUNC(nes_vt_state::nes_in1_r)).w(this, FUNC(nes_vt_state::psg1_4017_w)); + map(0x4015, 0x4015).rw(FUNC(nes_vt_state::psg1_4015_r), FUNC(nes_vt_state::psg1_4015_w)); /* PSG status / first control register */ + map(0x4016, 0x4016).rw(FUNC(nes_vt_state::nes_in0_r), FUNC(nes_vt_state::nes_in0_w)); + map(0x4017, 0x4017).r(FUNC(nes_vt_state::nes_in1_r)).w(FUNC(nes_vt_state::psg1_4017_w)); - map(0x4100, 0x410b).r(this, FUNC(nes_vt_state::vt03_410x_r)).w(this, FUNC(nes_vt_state::vt03_410x_w)); + map(0x4100, 0x410b).r(FUNC(nes_vt_state::vt03_410x_r)).w(FUNC(nes_vt_state::vt03_410x_w)); map(0x8000, 0xffff).m(m_prg, FUNC(address_map_bank_device::amap8)); - map(0x8000, 0xffff).w(this, FUNC(nes_vt_state::vt03_8000_w)); + map(0x8000, 0xffff).w(FUNC(nes_vt_state::vt03_8000_w)); - map(0x4034, 0x4034).w(this, FUNC(nes_vt_state::vt03_4034_w)); - map(0x4014, 0x4014).r(this, FUNC(nes_vt_state::psg1_4014_r)).w(this, FUNC(nes_vt_state::vt_hh_sprite_dma_w)); + map(0x4034, 0x4034).w(FUNC(nes_vt_state::vt03_4034_w)); + map(0x4014, 0x4014).r(FUNC(nes_vt_state::psg1_4014_r)).w(FUNC(nes_vt_state::vt_hh_sprite_dma_w)); - map(0x414A, 0x414A).r(this, FUNC(nes_vt_state::vthh_414a_r)); - map(0x411d, 0x411d).w(this, FUNC(nes_vt_state::vtfp_411d_w)); + map(0x414A, 0x414A).r(FUNC(nes_vt_state::vthh_414a_r)); + map(0x411d, 0x411d).w(FUNC(nes_vt_state::vtfp_411d_w)); map(0x6000, 0x7fff).ram(); } @@ -1254,31 +1254,31 @@ void nes_vt_state::nes_vt_dg_map(address_map &map) map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* PPU registers */ map(0x4000, 0x4013).rw(m_apu, FUNC(nesapu_device::read), FUNC(nesapu_device::write)); - map(0x4015, 0x4015).rw(this, FUNC(nes_vt_state::psg1_4015_r), FUNC(nes_vt_state::psg1_4015_w)); /* PSG status / first control register */ - map(0x4016, 0x4016).rw(this, FUNC(nes_vt_state::nes_in0_r), FUNC(nes_vt_state::nes_in0_w)); - map(0x4017, 0x4017).r(this, FUNC(nes_vt_state::nes_in1_r)).w(this, FUNC(nes_vt_state::psg1_4017_w)); + map(0x4015, 0x4015).rw(FUNC(nes_vt_state::psg1_4015_r), FUNC(nes_vt_state::psg1_4015_w)); /* PSG status / first control register */ + map(0x4016, 0x4016).rw(FUNC(nes_vt_state::nes_in0_r), FUNC(nes_vt_state::nes_in0_w)); + map(0x4017, 0x4017).r(FUNC(nes_vt_state::nes_in1_r)).w(FUNC(nes_vt_state::psg1_4017_w)); - map(0x4100, 0x410b).r(this, FUNC(nes_vt_state::vt03_410x_r)).w(this, FUNC(nes_vt_state::vt03_410x_w)); + map(0x4100, 0x410b).r(FUNC(nes_vt_state::vt03_410x_r)).w(FUNC(nes_vt_state::vt03_410x_w)); - map(0x411c, 0x411c).w(this, FUNC(nes_vt_state::vt03_411c_w)); + map(0x411c, 0x411c).w(FUNC(nes_vt_state::vt03_411c_w)); map(0x8000, 0xffff).m(m_prg, FUNC(address_map_bank_device::amap8)); - map(0x8000, 0xffff).w(this, FUNC(nes_vt_state::vt03_8000_w)); + map(0x8000, 0xffff).w(FUNC(nes_vt_state::vt03_8000_w)); - map(0x4034, 0x4034).w(this, FUNC(nes_vt_state::vt03_4034_w)); - map(0x4014, 0x4014).r(this, FUNC(nes_vt_state::psg1_4014_r)).w(this, FUNC(nes_vt_state::nes_vh_sprite_dma_w)); + map(0x4034, 0x4034).w(FUNC(nes_vt_state::vt03_4034_w)); + map(0x4014, 0x4014).r(FUNC(nes_vt_state::psg1_4014_r)).w(FUNC(nes_vt_state::nes_vh_sprite_dma_w)); map(0x6000, 0x7fff).ram(); } void nes_vt_state::nes_vt_fp_map(address_map &map) { nes_vt_hh_map(map); - map(0x411e, 0x411e).w(this, FUNC(nes_vt_state::vtfp_411e_w)); - map(0x4a00, 0x4a00).w(this, FUNC(nes_vt_state::vtfp_4a00_w)); - map(0x412c, 0x412c).w(this, FUNC(nes_vt_state::vtfp_412c_w)); - map(0x412d, 0x412d).r(this, FUNC(nes_vt_state::vtfp_412d_r)); - map(0x4242, 0x4242).w(this, FUNC(nes_vt_state::vtfp_4242_w)); - map(0x4119, 0x4119).r(this, FUNC(nes_vt_state::vtfp_4119_r)); + map(0x411e, 0x411e).w(FUNC(nes_vt_state::vtfp_411e_w)); + map(0x4a00, 0x4a00).w(FUNC(nes_vt_state::vtfp_4a00_w)); + map(0x412c, 0x412c).w(FUNC(nes_vt_state::vtfp_412c_w)); + map(0x412d, 0x412d).r(FUNC(nes_vt_state::vtfp_412d_r)); + map(0x4242, 0x4242).w(FUNC(nes_vt_state::vtfp_4242_w)); + map(0x4119, 0x4119).r(FUNC(nes_vt_state::vtfp_4119_r)); } @@ -1287,8 +1287,8 @@ void nes_vt_state::nes_vt_fa_map(address_map &map) nes_vt_dg_map(map); - map(0x412c, 0x412c).r(this, FUNC(nes_vt_state::vtfa_412c_r)).w(this, FUNC(nes_vt_state::vtfa_412c_w)); - map(0x4242, 0x4242).w(this, FUNC(nes_vt_state::vtfp_4242_w)); + map(0x412c, 0x412c).r(FUNC(nes_vt_state::vtfa_412c_r)).w(FUNC(nes_vt_state::vtfa_412c_w)); + map(0x4242, 0x4242).w(FUNC(nes_vt_state::vtfp_4242_w)); } diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index d09b7088169..16e31d06c8d 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -580,7 +580,7 @@ READ_LINE_MEMBER( newbrain_state::tdi_r ) void newbrain_state::newbrain_mreq(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(newbrain_state::mreq_r), FUNC(newbrain_state::mreq_w)); + map(0x0000, 0xffff).rw(FUNC(newbrain_state::mreq_r), FUNC(newbrain_state::mreq_w)); } @@ -591,7 +591,7 @@ void newbrain_state::newbrain_mreq(address_map &map) void newbrain_state::newbrain_iorq(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(newbrain_state::iorq_r), FUNC(newbrain_state::iorq_w)); + map(0x0000, 0xffff).rw(FUNC(newbrain_state::iorq_r), FUNC(newbrain_state::iorq_w)); } diff --git a/src/mame/drivers/news.cpp b/src/mame/drivers/news.cpp index cb5afd3a2ad..577b30ae10e 100644 --- a/src/mame/drivers/news.cpp +++ b/src/mame/drivers/news.cpp @@ -27,13 +27,13 @@ driver by David Haywood void news_state::news_map(address_map &map) { map(0x0000, 0x7fff).rom(); /* 4000-7fff is written to during startup, probably leftover code */ - map(0x8000, 0x87ff).ram().w(this, FUNC(news_state::news_fgram_w)).share("fgram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(news_state::news_bgram_w)).share("bgram"); + map(0x8000, 0x87ff).ram().w(FUNC(news_state::news_fgram_w)).share("fgram"); + map(0x8800, 0x8fff).ram().w(FUNC(news_state::news_bgram_w)).share("bgram"); map(0x9000, 0x91ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0xc000, 0xc000).portr("DSW"); map(0xc001, 0xc001).portr("INPUTS"); map(0xc002, 0xc002).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xc003, 0xc003).w(this, FUNC(news_state::news_bgpic_w)); + map(0xc003, 0xc003).w(FUNC(news_state::news_bgpic_w)); map(0xe000, 0xffff).ram(); } diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index 572ad0a055c..cb511a505a9 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -896,32 +896,32 @@ void next_state::next_mem(address_map &map) { map(0x00000000, 0x0001ffff).rom().region("user1", 0); map(0x01000000, 0x0101ffff).rom().region("user1", 0); - map(0x02000000, 0x020001ff).mirror(0x300200).rw(this, FUNC(next_state::dma_ctrl_r), FUNC(next_state::dma_ctrl_w)); - map(0x02004000, 0x020041ff).mirror(0x300200).rw(this, FUNC(next_state::dma_regs_r), FUNC(next_state::dma_regs_w)); + map(0x02000000, 0x020001ff).mirror(0x300200).rw(FUNC(next_state::dma_ctrl_r), FUNC(next_state::dma_ctrl_w)); + map(0x02004000, 0x020041ff).mirror(0x300200).rw(FUNC(next_state::dma_regs_r), FUNC(next_state::dma_regs_w)); map(0x02006000, 0x0200600f).mirror(0x300000).m(net, FUNC(mb8795_device::map)); // AM_RANGE(0x02006010, 0x02006013) AM_MIRROR(0x300000) memory timing - map(0x02007000, 0x02007003).mirror(0x300000).r(this, FUNC(next_state::irq_status_r)); - map(0x02007800, 0x02007803).mirror(0x300000).rw(this, FUNC(next_state::irq_mask_r), FUNC(next_state::irq_mask_w)); - map(0x02008000, 0x02008003).mirror(0x300000).r(this, FUNC(next_state::dsp_r)); - map(0x0200c000, 0x0200c003).mirror(0x300000).r(this, FUNC(next_state::scr1_r)); - map(0x0200c800, 0x0200c803).mirror(0x300000).r(this, FUNC(next_state::rom_map_r)); - map(0x0200d000, 0x0200d003).mirror(0x300000).rw(this, FUNC(next_state::scr2_r), FUNC(next_state::scr2_w)); + map(0x02007000, 0x02007003).mirror(0x300000).r(FUNC(next_state::irq_status_r)); + map(0x02007800, 0x02007803).mirror(0x300000).rw(FUNC(next_state::irq_mask_r), FUNC(next_state::irq_mask_w)); + map(0x02008000, 0x02008003).mirror(0x300000).r(FUNC(next_state::dsp_r)); + map(0x0200c000, 0x0200c003).mirror(0x300000).r(FUNC(next_state::scr1_r)); + map(0x0200c800, 0x0200c803).mirror(0x300000).r(FUNC(next_state::rom_map_r)); + map(0x0200d000, 0x0200d003).mirror(0x300000).rw(FUNC(next_state::scr2_r), FUNC(next_state::scr2_w)); // AM_RANGE(0x0200d800, 0x0200d803) AM_MIRROR(0x300000) RMTINT map(0x0200e000, 0x0200e00b).mirror(0x300000).m(keyboard, FUNC(nextkbd_device::amap)); // AM_RANGE(0x0200f000, 0x0200f003) AM_MIRROR(0x300000) printer // AM_RANGE(0x02010000, 0x02010003) AM_MIRROR(0x300000) brightness map(0x02012000, 0x0201201f).mirror(0x300000).m(mo, FUNC(nextmo_device::map)); map(0x02014000, 0x0201400f).mirror(0x300000).m(scsi, FUNC(ncr5390_device::map)); - map(0x02014020, 0x02014023).mirror(0x300000).rw(this, FUNC(next_state::scsictrl_r), FUNC(next_state::scsictrl_w)); - map(0x02016000, 0x02016003).mirror(0x300000).rw(this, FUNC(next_state::timer_data_r), FUNC(next_state::timer_data_w)); - map(0x02016004, 0x02016007).mirror(0x300000).rw(this, FUNC(next_state::timer_ctrl_r), FUNC(next_state::timer_ctrl_w)); + map(0x02014020, 0x02014023).mirror(0x300000).rw(FUNC(next_state::scsictrl_r), FUNC(next_state::scsictrl_w)); + map(0x02016000, 0x02016003).mirror(0x300000).rw(FUNC(next_state::timer_data_r), FUNC(next_state::timer_data_w)); + map(0x02016004, 0x02016007).mirror(0x300000).rw(FUNC(next_state::timer_ctrl_r), FUNC(next_state::timer_ctrl_w)); map(0x02018000, 0x02018003).mirror(0x300000).rw(scc, FUNC(scc8530_t::reg_r), FUNC(scc8530_t::reg_w)); // AM_RANGE(0x02018004, 0x02018007) AM_MIRROR(0x300000) SCC CLK // AM_RANGE(0x02018190, 0x02018197) AM_MIRROR(0x300000) warp 9c DRAM timing // AM_RANGE(0x02018198, 0x0201819f) AM_MIRROR(0x300000) warp 9c VRAM timing - map(0x0201a000, 0x0201a003).mirror(0x300000).r(this, FUNC(next_state::event_counter_r)); // EVENTC + map(0x0201a000, 0x0201a003).mirror(0x300000).r(FUNC(next_state::event_counter_r)); // EVENTC // AM_RANGE(0x020c0000, 0x020c0004) AM_MIRROR(0x300000) BMAP - map(0x020c0030, 0x020c0037).mirror(0x300000).rw(this, FUNC(next_state::phy_r), FUNC(next_state::phy_w)); + map(0x020c0030, 0x020c0037).mirror(0x300000).rw(FUNC(next_state::phy_r), FUNC(next_state::phy_w)); map(0x04000000, 0x07ffffff).ram(); //work ram // AM_RANGE(0x0c000000, 0x0c03ffff) video RAM w A+B-AB function // AM_RANGE(0x0d000000, 0x0d03ffff) video RAM w (1-A)B function @@ -943,7 +943,7 @@ void next_state::next_fdc_mem(address_map &map) { next_mem(map); map(0x02014100, 0x02014107).mirror(0x300000).m(fdc, FUNC(n82077aa_device::map)); - map(0x02014108, 0x0201410b).mirror(0x300000).rw(this, FUNC(next_state::fdc_control_r), FUNC(next_state::fdc_control_w)); + map(0x02014108, 0x0201410b).mirror(0x300000).rw(FUNC(next_state::fdc_control_r), FUNC(next_state::fdc_control_w)); } void next_state::next_0b_m_mem(address_map &map) @@ -962,14 +962,14 @@ void next_state::next_0c_c_mem(address_map &map) { next_fdc_mem(map); map(0x0c000000, 0x0c1fffff).ram().share("vram"); - map(0x02018180, 0x02018183).mirror(0x300000).w(this, FUNC(next_state::ramdac_w)); + map(0x02018180, 0x02018183).mirror(0x300000).w(FUNC(next_state::ramdac_w)); } void next_state::next_2c_c_mem(address_map &map) { next_fdc_mem(map); map(0x2c000000, 0x2c1fffff).ram().share("vram"); - map(0x02018180, 0x02018183).mirror(0x300000).w(this, FUNC(next_state::ramdac_w)); + map(0x02018180, 0x02018183).mirror(0x300000).w(FUNC(next_state::ramdac_w)); } diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp index ad44c587e80..3563a289ccb 100644 --- a/src/mame/drivers/nexus3d.cpp +++ b/src/mame/drivers/nexus3d.cpp @@ -95,7 +95,7 @@ void nexus3d_state::nexus3d_map(address_map &map) // AM_RANGE(0xC0000F44, 0xC0000F47) AM_READWRITE(nexus3d_unk2_r, nexus3d_unk2_w ) // often, status for something. // AM_RANGE(0xC0000F4C, 0xC0000F4f) AM_READWRITE(nexus3d_unk3_r, nexus3d_unk3_w ) // often - map(0xE0000014, 0xE0000017).r(this, FUNC(nexus3d_state::nexus3d_unk_r)); // sits waiting for this + map(0xE0000014, 0xE0000017).r(FUNC(nexus3d_state::nexus3d_unk_r)); // sits waiting for this } diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index 8393833ada6..55ce6499043 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -871,7 +871,7 @@ void ngen_state::ngen_mem(address_map &map) void ngen_state::ngen_io(address_map &map) { - map(0x0000, 0x0001).rw(this, FUNC(ngen_state::xbus_r), FUNC(ngen_state::xbus_w)); + map(0x0000, 0x0001).rw(FUNC(ngen_state::xbus_r), FUNC(ngen_state::xbus_w)); // Floppy/Hard disk module // AM_RANGE(0x0100, 0x0107) AM_DEVREADWRITE8("fdc",wd2797_t,read,write,0x00ff) // a guess for now @@ -907,10 +907,10 @@ void ngen_state::ngen386i_mem(address_map &map) void ngen_state::ngen386_io(address_map &map) { - map(0x0000, 0x0001).rw(this, FUNC(ngen_state::xbus_r), FUNC(ngen_state::xbus_w)); + map(0x0000, 0x0001).rw(FUNC(ngen_state::xbus_r), FUNC(ngen_state::xbus_w)); // AM_RANGE(0xf800, 0xfeff) AM_READWRITE16(peripheral_r, peripheral_w,0xffffffff) - map(0xfd08, 0xfd0b).rw(this, FUNC(ngen_state::b38_crtc_r), FUNC(ngen_state::b38_crtc_w)); - map(0xfd0c, 0xfd0f).rw(this, FUNC(ngen_state::b38_keyboard_r), FUNC(ngen_state::b38_keyboard_w)); + map(0xfd08, 0xfd0b).rw(FUNC(ngen_state::b38_crtc_r), FUNC(ngen_state::b38_crtc_w)); + map(0xfd0c, 0xfd0f).rw(FUNC(ngen_state::b38_keyboard_r), FUNC(ngen_state::b38_keyboard_w)); } static INPUT_PORTS_START( ngen ) diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp index f777414384e..38b73203f7c 100644 --- a/src/mame/drivers/ngp.cpp +++ b/src/mame/drivers/ngp.cpp @@ -553,12 +553,12 @@ WRITE8_MEMBER( ngp_state::flash1_w ) void ngp_state::ngp_mem(address_map &map) { - map(0x000080, 0x0000bf).rw(this, FUNC(ngp_state::ngp_io_r), FUNC(ngp_state::ngp_io_w)); /* ngp/c specific i/o */ + map(0x000080, 0x0000bf).rw(FUNC(ngp_state::ngp_io_r), FUNC(ngp_state::ngp_io_w)); /* ngp/c specific i/o */ map(0x004000, 0x006fff).ram().share("mainram"); /* work ram */ map(0x007000, 0x007fff).ram().share("share1"); /* shared with sound cpu */ map(0x008000, 0x00bfff).rw(m_k1ge, FUNC(k1ge_device::read), FUNC(k1ge_device::write)); /* video chip */ - map(0x200000, 0x3fffff).w(this, FUNC(ngp_state::flash0_w)); /* cart area #1 */ - map(0x800000, 0x9fffff).w(this, FUNC(ngp_state::flash1_w)); /* cart area #2 */ + map(0x200000, 0x3fffff).w(FUNC(ngp_state::flash0_w)); /* cart area #1 */ + map(0x800000, 0x9fffff).w(FUNC(ngp_state::flash1_w)); /* cart area #2 */ map(0xff0000, 0xffffff).rom().region("maincpu", 0); /* system rom */ } @@ -585,8 +585,8 @@ void ngp_state::z80_mem(address_map &map) { map(0x0000, 0x0fff).ram().share("share1"); /* shared with tlcs900 */ map(0x4000, 0x4001).w(m_t6w28, FUNC(t6w28_device::write)); /* sound chip (right, left) */ - map(0x8000, 0x8000).rw(this, FUNC(ngp_state::ngp_z80_comm_r), FUNC(ngp_state::ngp_z80_comm_w)); /* main-sound communication */ - map(0xc000, 0xc000).w(this, FUNC(ngp_state::ngp_z80_signal_main_w)); /* signal irq to main cpu */ + map(0x8000, 0x8000).rw(FUNC(ngp_state::ngp_z80_comm_r), FUNC(ngp_state::ngp_z80_comm_w)); /* main-sound communication */ + map(0xc000, 0xc000).w(FUNC(ngp_state::ngp_z80_signal_main_w)); /* signal irq to main cpu */ } @@ -601,7 +601,7 @@ WRITE8_MEMBER( ngp_state::ngp_z80_clear_irq ) void ngp_state::z80_io(address_map &map) { - map(0x0000, 0xffff).w(this, FUNC(ngp_state::ngp_z80_clear_irq)); + map(0x0000, 0xffff).w(FUNC(ngp_state::ngp_z80_clear_irq)); } diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp index 2119ef6ca95..102bd504fab 100644 --- a/src/mame/drivers/nibble.cpp +++ b/src/mame/drivers/nibble.cpp @@ -156,7 +156,7 @@ void nibble_state::nibble_map(address_map &map) { // ADDRESS_MAP_GLOBAL_MASK(0x3fff) map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc3ff).w(this, FUNC(nibble_state::nibble_videoram_w)).share("videoram"); // placeholder + map(0xc000, 0xc3ff).w(FUNC(nibble_state::nibble_videoram_w)).share("videoram"); // placeholder // AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("crtc", mc6845_device, address_w) // AM_RANGE(0xff02, 0xff03) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) } diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp index cd75d0f996a..64344191698 100644 --- a/src/mame/drivers/nightgal.cpp +++ b/src/mame/drivers/nightgal.cpp @@ -375,7 +375,7 @@ void nightgal_state::common_nsc_map(address_map &map) { map(0x0000, 0x007f).ram(); map(0x0080, 0x0080).portr("BLIT_PORT"); - map(0x0081, 0x0083).r(this, FUNC(nightgal_state::royalqn_nsc_blit_r)); + map(0x0081, 0x0083).r(FUNC(nightgal_state::royalqn_nsc_blit_r)); map(0x00a0, 0x00af).w(m_blitter, FUNC(jangou_blitter_device::vregs_w)); map(0x00b0, 0x00b0).w(m_blitter, FUNC(jangou_blitter_device::bltflip_w)); } @@ -421,25 +421,25 @@ void nightgal_state::sweetgal_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x807f).ram().share("sound_ram"); - map(0xe000, 0xefff).rw(this, FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); + map(0xe000, 0xefff).rw(FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); map(0xf000, 0xffff).ram(); } void nightgal_state::sexygal_map(address_map &map) { sweetgal_map(map); - map(0x8000, 0x807f).r(this, FUNC(nightgal_state::sexygal_soundram_r)); - map(0xa000, 0xa000).w(this, FUNC(nightgal_state::sexygal_audioff_w)); + map(0x8000, 0x807f).r(FUNC(nightgal_state::sexygal_soundram_r)); + map(0xa000, 0xa000).w(FUNC(nightgal_state::sexygal_audioff_w)); } void nightgal_state::common_sexygal_io(address_map &map) { map.global_mask(0xff); - map(0x10, 0x10).portr("DSWA").w(this, FUNC(nightgal_state::output_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(nightgal_state::mux_w)); - map(0x12, 0x12).mirror(0xe8).portr("DSWB").w(this, FUNC(nightgal_state::royalqn_blitter_0_w)); - map(0x13, 0x13).mirror(0xe8).portr("DSWC").w(this, FUNC(nightgal_state::royalqn_blitter_1_w)); - map(0x14, 0x14).mirror(0xe8).nopr().w(this, FUNC(nightgal_state::royalqn_blitter_2_w)); + map(0x10, 0x10).portr("DSWA").w(FUNC(nightgal_state::output_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(nightgal_state::mux_w)); + map(0x12, 0x12).mirror(0xe8).portr("DSWB").w(FUNC(nightgal_state::royalqn_blitter_0_w)); + map(0x13, 0x13).mirror(0xe8).portr("DSWC").w(FUNC(nightgal_state::royalqn_blitter_1_w)); + map(0x14, 0x14).mirror(0xe8).nopr().w(FUNC(nightgal_state::royalqn_blitter_2_w)); } void nightgal_state::sexygal_io(address_map &map) @@ -463,7 +463,7 @@ void nightgal_state::sexygal_nsc_map(address_map &map) { common_nsc_map(map); map(0x0080, 0x0086).m(m_blitter, FUNC(jangou_blitter_device::blit_v2_regs)); - map(0x1000, 0x13ff).mirror(0x2c00).rw(this, FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); + map(0x1000, 0x13ff).mirror(0x2c00).rw(FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); map(0xc000, 0xdfff).mirror(0x2000).rom().region("subrom", 0); } @@ -472,7 +472,7 @@ void nightgal_state::sgaltrop_nsc_map(address_map &map) common_nsc_map(map); map(0x0080, 0x0086).m(m_blitter, FUNC(jangou_blitter_device::blit_v2_regs)); - map(0x1000, 0x13ff).mirror(0x2c00).rw(this, FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); + map(0x1000, 0x13ff).mirror(0x2c00).rw(FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); map(0xc000, 0xffff).rom().region("subrom", 0); } @@ -481,10 +481,10 @@ void nightgal_state::sgaltrop_nsc_map(address_map &map) void nightgal_state::sexygal_audio_map(address_map &map) { map(0x0000, 0x007f).ram(); - map(0x0080, 0x0080).r(this, FUNC(nightgal_state::sexygal_unknown_sound_r)); - map(0x1000, 0x1000).w("dac", FUNC(dac_byte_interface::write)); + map(0x0080, 0x0080).r(FUNC(nightgal_state::sexygal_unknown_sound_r)); + map(0x1000, 0x1000).w("dac", FUNC(dac_byte_interface::data_w)); map(0x2000, 0x207f).ram().share("sound_ram"); - map(0x3000, 0x3000).w(this, FUNC(nightgal_state::sexygal_audionmi_w)); + map(0x3000, 0x3000).w(FUNC(nightgal_state::sexygal_audionmi_w)); map(0x4000, 0xbfff).rom().region("samples", 0); map(0xc000, 0xffff).rom().region("audiorom", 0); } @@ -498,7 +498,7 @@ void nightgal_state::royalqn_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).noprw(); - map(0xc000, 0xdfff).rw(this, FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); + map(0xc000, 0xdfff).rw(FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)).share("comms_ram"); map(0xe000, 0xffff).ram(); } @@ -507,11 +507,11 @@ void nightgal_state::royalqn_io(address_map &map) map.global_mask(0xff); map(0x01, 0x01).mirror(0xec).r("aysnd", FUNC(ay8910_device::data_r)); map(0x02, 0x03).mirror(0xec).w("aysnd", FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).mirror(0xe8).portr("DSWA").w(this, FUNC(nightgal_state::output_w)); - map(0x11, 0x11).mirror(0xe8).portr("SYSTEM").w(this, FUNC(nightgal_state::mux_w)); - map(0x12, 0x12).mirror(0xe8).portr("DSWB").w(this, FUNC(nightgal_state::royalqn_blitter_0_w)); - map(0x13, 0x13).mirror(0xe8).portr("DSWC").w(this, FUNC(nightgal_state::royalqn_blitter_1_w)); - map(0x14, 0x14).mirror(0xe8).nopr().w(this, FUNC(nightgal_state::royalqn_blitter_2_w)); + map(0x10, 0x10).mirror(0xe8).portr("DSWA").w(FUNC(nightgal_state::output_w)); + map(0x11, 0x11).mirror(0xe8).portr("SYSTEM").w(FUNC(nightgal_state::mux_w)); + map(0x12, 0x12).mirror(0xe8).portr("DSWB").w(FUNC(nightgal_state::royalqn_blitter_0_w)); + map(0x13, 0x13).mirror(0xe8).portr("DSWC").w(FUNC(nightgal_state::royalqn_blitter_1_w)); + map(0x14, 0x14).mirror(0xe8).nopr().w(FUNC(nightgal_state::royalqn_blitter_2_w)); map(0x15, 0x15).mirror(0xe8).noprw(); map(0x16, 0x16).mirror(0xe8).noprw(); map(0x17, 0x17).mirror(0xe8).noprw(); @@ -522,7 +522,7 @@ void nightgal_state::royalqn_nsc_map(address_map &map) common_nsc_map(map); map(0x0080, 0x0086).m(m_blitter, FUNC(jangou_blitter_device::blit_v1_regs)); - map(0x1000, 0x13ff).mirror(0x2c00).rw(this, FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)); + map(0x1000, 0x13ff).mirror(0x2c00).rw(FUNC(nightgal_state::royalqn_comm_r), FUNC(nightgal_state::royalqn_comm_w)); map(0x4000, 0x4000).noprw(); map(0x8000, 0x8000).noprw(); //open bus or protection check map(0xc000, 0xdfff).mirror(0x2000).rom().region("subrom", 0); diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp index c6d3302ba6d..9e2c5148791 100644 --- a/src/mame/drivers/ninjakd2.cpp +++ b/src/mame/drivers/ninjakd2.cpp @@ -382,13 +382,13 @@ void ninjakd2_state::ninjakd2_main_cpu(address_map &map) map(0xc003, 0xc003).portr("DIPSW1"); map(0xc004, 0xc004).portr("DIPSW2"); map(0xc200, 0xc200).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc201, 0xc201).w(this, FUNC(ninjakd2_state::ninjakd2_soundreset_w)); - map(0xc202, 0xc202).w(this, FUNC(ninjakd2_state::ninjakd2_bankselect_w)); - map(0xc203, 0xc203).w(this, FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); - map(0xc208, 0xc20c).w(this, FUNC(ninjakd2_state::ninjakd2_bg_ctrl_w)); + map(0xc201, 0xc201).w(FUNC(ninjakd2_state::ninjakd2_soundreset_w)); + map(0xc202, 0xc202).w(FUNC(ninjakd2_state::ninjakd2_bankselect_w)); + map(0xc203, 0xc203).w(FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); + map(0xc208, 0xc20c).w(FUNC(ninjakd2_state::ninjakd2_bg_ctrl_w)); map(0xc800, 0xcdff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(ninjakd2_state::ninjakd2_bgvideoram_w)).share("bg_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(ninjakd2_state::ninjakd2_bgvideoram_w)).share("bg_videoram"); map(0xe000, 0xf9ff).ram(); map(0xfa00, 0xffff).ram().share("spriteram"); } @@ -399,8 +399,8 @@ void ninjakd2_state::mnight_main_cpu(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xd9ff).ram(); map(0xda00, 0xdfff).ram().share("spriteram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(ninjakd2_state::ninjakd2_bgvideoram_w)).share("bg_videoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(ninjakd2_state::ninjakd2_bgvideoram_w)).share("bg_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); map(0xf000, 0xf5ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf800, 0xf800).portr("KEYCOIN"); map(0xf801, 0xf801).portr("PAD1"); @@ -408,10 +408,10 @@ void ninjakd2_state::mnight_main_cpu(address_map &map) map(0xf803, 0xf803).portr("DIPSW1"); map(0xf804, 0xf804).portr("DIPSW2"); map(0xfa00, 0xfa00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xfa01, 0xfa01).w(this, FUNC(ninjakd2_state::ninjakd2_soundreset_w)); - map(0xfa02, 0xfa02).w(this, FUNC(ninjakd2_state::ninjakd2_bankselect_w)); - map(0xfa03, 0xfa03).w(this, FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); - map(0xfa08, 0xfa0c).w(this, FUNC(ninjakd2_state::ninjakd2_bg_ctrl_w)); + map(0xfa01, 0xfa01).w(FUNC(ninjakd2_state::ninjakd2_soundreset_w)); + map(0xfa02, 0xfa02).w(FUNC(ninjakd2_state::ninjakd2_bankselect_w)); + map(0xfa03, 0xfa03).w(FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); + map(0xfa08, 0xfa0c).w(FUNC(ninjakd2_state::ninjakd2_bg_ctrl_w)); } @@ -420,21 +420,21 @@ void ninjakd2_state::robokid_main_cpu(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xc800, 0xcfff).ram().w(this, FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); - map(0xd000, 0xd3ff).rw(this, FUNC(ninjakd2_state::robokid_bg2_videoram_r), FUNC(ninjakd2_state::robokid_bg2_videoram_w)); // banked - map(0xd400, 0xd7ff).rw(this, FUNC(ninjakd2_state::robokid_bg1_videoram_r), FUNC(ninjakd2_state::robokid_bg1_videoram_w)); // banked - map(0xd800, 0xdbff).rw(this, FUNC(ninjakd2_state::robokid_bg0_videoram_r), FUNC(ninjakd2_state::robokid_bg0_videoram_w)); // banked + map(0xc800, 0xcfff).ram().w(FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); + map(0xd000, 0xd3ff).rw(FUNC(ninjakd2_state::robokid_bg2_videoram_r), FUNC(ninjakd2_state::robokid_bg2_videoram_w)); // banked + map(0xd400, 0xd7ff).rw(FUNC(ninjakd2_state::robokid_bg1_videoram_r), FUNC(ninjakd2_state::robokid_bg1_videoram_w)); // banked + map(0xd800, 0xdbff).rw(FUNC(ninjakd2_state::robokid_bg0_videoram_r), FUNC(ninjakd2_state::robokid_bg0_videoram_w)); // banked map(0xdc00, 0xdc00).portr("KEYCOIN").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xdc01, 0xdc01).portr("PAD1").w(this, FUNC(ninjakd2_state::ninjakd2_soundreset_w)); - map(0xdc02, 0xdc02).portr("PAD2").w(this, FUNC(ninjakd2_state::ninjakd2_bankselect_w)); - map(0xdc03, 0xdc03).portr("DIPSW1").w(this, FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); + map(0xdc01, 0xdc01).portr("PAD1").w(FUNC(ninjakd2_state::ninjakd2_soundreset_w)); + map(0xdc02, 0xdc02).portr("PAD2").w(FUNC(ninjakd2_state::ninjakd2_bankselect_w)); + map(0xdc03, 0xdc03).portr("DIPSW1").w(FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); map(0xdc04, 0xdc04).portr("DIPSW2"); - map(0xdd00, 0xdd04).w(this, FUNC(ninjakd2_state::robokid_bg0_ctrl_w)); - map(0xdd05, 0xdd05).w(this, FUNC(ninjakd2_state::robokid_bg0_bank_w)); - map(0xde00, 0xde04).w(this, FUNC(ninjakd2_state::robokid_bg1_ctrl_w)); - map(0xde05, 0xde05).w(this, FUNC(ninjakd2_state::robokid_bg1_bank_w)); - map(0xdf00, 0xdf04).w(this, FUNC(ninjakd2_state::robokid_bg2_ctrl_w)); - map(0xdf05, 0xdf05).w(this, FUNC(ninjakd2_state::robokid_bg2_bank_w)); + map(0xdd00, 0xdd04).w(FUNC(ninjakd2_state::robokid_bg0_ctrl_w)); + map(0xdd05, 0xdd05).w(FUNC(ninjakd2_state::robokid_bg0_bank_w)); + map(0xde00, 0xde04).w(FUNC(ninjakd2_state::robokid_bg1_ctrl_w)); + map(0xde05, 0xde05).w(FUNC(ninjakd2_state::robokid_bg1_bank_w)); + map(0xdf00, 0xdf04).w(FUNC(ninjakd2_state::robokid_bg2_ctrl_w)); + map(0xdf05, 0xdf05).w(FUNC(ninjakd2_state::robokid_bg2_bank_w)); map(0xe000, 0xf9ff).ram(); map(0xfa00, 0xffff).ram().share("spriteram"); } @@ -445,22 +445,22 @@ void ninjakd2_state::omegaf_main_cpu(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc000).portr("KEYCOIN").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc001, 0xc003).r(this, FUNC(ninjakd2_state::omegaf_io_protection_r)); - map(0xc001, 0xc001).w(this, FUNC(ninjakd2_state::ninjakd2_soundreset_w)); - map(0xc002, 0xc002).w(this, FUNC(ninjakd2_state::ninjakd2_bankselect_w)); - map(0xc003, 0xc003).w(this, FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); - map(0xc004, 0xc006).w(this, FUNC(ninjakd2_state::omegaf_io_protection_w)); - map(0xc100, 0xc104).w(this, FUNC(ninjakd2_state::robokid_bg0_ctrl_w)); - map(0xc105, 0xc105).w(this, FUNC(ninjakd2_state::robokid_bg0_bank_w)); + map(0xc001, 0xc003).r(FUNC(ninjakd2_state::omegaf_io_protection_r)); + map(0xc001, 0xc001).w(FUNC(ninjakd2_state::ninjakd2_soundreset_w)); + map(0xc002, 0xc002).w(FUNC(ninjakd2_state::ninjakd2_bankselect_w)); + map(0xc003, 0xc003).w(FUNC(ninjakd2_state::ninjakd2_sprite_overdraw_w)); + map(0xc004, 0xc006).w(FUNC(ninjakd2_state::omegaf_io_protection_w)); + map(0xc100, 0xc104).w(FUNC(ninjakd2_state::robokid_bg0_ctrl_w)); + map(0xc105, 0xc105).w(FUNC(ninjakd2_state::robokid_bg0_bank_w)); map(0xc1e7, 0xc1e7).nopr(); // see notes - map(0xc200, 0xc204).w(this, FUNC(ninjakd2_state::robokid_bg1_ctrl_w)); - map(0xc205, 0xc205).w(this, FUNC(ninjakd2_state::robokid_bg1_bank_w)); - map(0xc300, 0xc304).w(this, FUNC(ninjakd2_state::robokid_bg2_ctrl_w)); - map(0xc305, 0xc305).w(this, FUNC(ninjakd2_state::robokid_bg2_bank_w)); - map(0xc400, 0xc7ff).rw(this, FUNC(ninjakd2_state::robokid_bg0_videoram_r), FUNC(ninjakd2_state::robokid_bg0_videoram_w)); // banked - map(0xc800, 0xcbff).rw(this, FUNC(ninjakd2_state::robokid_bg1_videoram_r), FUNC(ninjakd2_state::robokid_bg1_videoram_w)); // banked - map(0xcc00, 0xcfff).rw(this, FUNC(ninjakd2_state::robokid_bg2_videoram_r), FUNC(ninjakd2_state::robokid_bg2_videoram_w)); // banked - map(0xd000, 0xd7ff).ram().w(this, FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); + map(0xc200, 0xc204).w(FUNC(ninjakd2_state::robokid_bg1_ctrl_w)); + map(0xc205, 0xc205).w(FUNC(ninjakd2_state::robokid_bg1_bank_w)); + map(0xc300, 0xc304).w(FUNC(ninjakd2_state::robokid_bg2_ctrl_w)); + map(0xc305, 0xc305).w(FUNC(ninjakd2_state::robokid_bg2_bank_w)); + map(0xc400, 0xc7ff).rw(FUNC(ninjakd2_state::robokid_bg0_videoram_r), FUNC(ninjakd2_state::robokid_bg0_videoram_w)); // banked + map(0xc800, 0xcbff).rw(FUNC(ninjakd2_state::robokid_bg1_videoram_r), FUNC(ninjakd2_state::robokid_bg1_videoram_w)); // banked + map(0xcc00, 0xcfff).rw(FUNC(ninjakd2_state::robokid_bg2_videoram_r), FUNC(ninjakd2_state::robokid_bg2_videoram_w)); // banked + map(0xd000, 0xd7ff).ram().w(FUNC(ninjakd2_state::ninjakd2_fgvideoram_w)).share("fg_videoram"); map(0xd800, 0xdfff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xe000, 0xf9ff).ram(); map(0xfa00, 0xffff).ram().share("spriteram"); @@ -473,7 +473,7 @@ void ninjakd2_state::ninjakd2_sound_cpu(address_map &map) map(0x8000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); map(0xe000, 0xe000).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0xf000, 0xf000).w(this, FUNC(ninjakd2_state::ninjakd2_pcm_play_w)); + map(0xf000, 0xf000).w(FUNC(ninjakd2_state::ninjakd2_pcm_play_w)); } void ninjakd2_state::ninjakid_nopcm_sound_cpu(address_map &map) diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp index 1930770d1ab..ae1853c5685 100644 --- a/src/mame/drivers/ninjaw.cpp +++ b/src/mame/drivers/ninjaw.cpp @@ -425,11 +425,11 @@ void ninjaw_state::ninjaw_master_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* main ram */ map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); - map(0x210000, 0x210001).w(this, FUNC(ninjaw_state::cpua_ctrl_w)); - map(0x220000, 0x220003).rw(this, FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); + map(0x210000, 0x210001).w(FUNC(ninjaw_state::cpua_ctrl_w)); + map(0x220000, 0x220003).rw(FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ map(0x2a0000, 0x2a000f).rw("tc0100scn_1", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x2c0000, 0x2d3fff).rw("tc0100scn_2", FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps (2nd screen) */ map(0x2e0000, 0x2e000f).rw("tc0100scn_2", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -450,7 +450,7 @@ void ninjaw_state::ninjaw_slave_map(address_map &map) map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ map(0x340000, 0x340007).rw("tc0110pcr_1", FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette (1st screen) */ map(0x350000, 0x350007).rw("tc0110pcr_2", FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette (2nd screen) */ map(0x360000, 0x360007).rw("tc0110pcr_3", FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette (3rd screen) */ @@ -461,11 +461,11 @@ void ninjaw_state::darius2_master_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* main ram */ map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); - map(0x210000, 0x210001).w(this, FUNC(ninjaw_state::cpua_ctrl_w)); - map(0x220000, 0x220003).rw(this, FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); + map(0x210000, 0x210001).w(FUNC(ninjaw_state::cpua_ctrl_w)); + map(0x220000, 0x220003).rw(FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ map(0x2a0000, 0x2a000f).rw("tc0100scn_1", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x2c0000, 0x2d3fff).rw("tc0100scn_2", FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps (2nd screen) */ map(0x2e0000, 0x2e000f).rw("tc0100scn_2", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -483,7 +483,7 @@ void ninjaw_state::darius2_slave_map(address_map &map) map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ } @@ -497,11 +497,11 @@ void ninjaw_state::sound_map(address_map &map) map(0xe000, 0xe003).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); map(0xe200, 0xe200).nopr().w(m_tc0140syt, FUNC(tc0140syt_device::slave_port_w)); map(0xe201, 0xe201).rw(m_tc0140syt, FUNC(tc0140syt_device::slave_comm_r), FUNC(tc0140syt_device::slave_comm_w)); - map(0xe400, 0xe403).w(this, FUNC(ninjaw_state::pancontrol_w)); /* pan */ + map(0xe400, 0xe403).w(FUNC(ninjaw_state::pancontrol_w)); /* pan */ map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(ninjaw_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(ninjaw_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp index 8c462419ba2..dfb1c4e747e 100644 --- a/src/mame/drivers/nitedrvr.cpp +++ b/src/mame/drivers/nitedrvr.cpp @@ -51,15 +51,15 @@ void nitedrvr_state::nitedrvr_map(address_map &map) { map(0x0000, 0x00ff).ram().mirror(0x100); // SCRAM - map(0x0200, 0x027f).nopr().w(this, FUNC(nitedrvr_state::nitedrvr_videoram_w)).mirror(0x180).share("videoram"); // PFW + map(0x0200, 0x027f).nopr().w(FUNC(nitedrvr_state::nitedrvr_videoram_w)).mirror(0x180).share("videoram"); // PFW map(0x0400, 0x042f).nopr().writeonly().mirror(0x1c0).share("hvc"); // POSH, POSV, CHAR map(0x0430, 0x043f).w("watchdog", FUNC(watchdog_timer_device::reset_w)).mirror(0x1c0); - map(0x0600, 0x07ff).r(this, FUNC(nitedrvr_state::nitedrvr_in0_r)); - map(0x0800, 0x09ff).r(this, FUNC(nitedrvr_state::nitedrvr_in1_r)); - map(0x0a00, 0x0bff).w(this, FUNC(nitedrvr_state::nitedrvr_out0_w)); - map(0x0c00, 0x0dff).w(this, FUNC(nitedrvr_state::nitedrvr_out1_w)); + map(0x0600, 0x07ff).r(FUNC(nitedrvr_state::nitedrvr_in0_r)); + map(0x0800, 0x09ff).r(FUNC(nitedrvr_state::nitedrvr_in1_r)); + map(0x0a00, 0x0bff).w(FUNC(nitedrvr_state::nitedrvr_out0_w)); + map(0x0c00, 0x0dff).w(FUNC(nitedrvr_state::nitedrvr_out1_w)); map(0x8000, 0x807f).readonly().mirror(0x380).share("videoram"); // PFR - map(0x8400, 0x87ff).rw(this, FUNC(nitedrvr_state::nitedrvr_steering_reset_r), FUNC(nitedrvr_state::nitedrvr_steering_reset_w)); + map(0x8400, 0x87ff).rw(FUNC(nitedrvr_state::nitedrvr_steering_reset_r), FUNC(nitedrvr_state::nitedrvr_steering_reset_w)); map(0x9000, 0x9fff).rom(); // ROM1-ROM2 map(0xfff0, 0xffff).rom(); // ROM2 for 6502 vectors } diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp index 6e3d8d8608d..39ac7871cad 100644 --- a/src/mame/drivers/niyanpai.cpp +++ b/src/mame/drivers/niyanpai.cpp @@ -127,7 +127,7 @@ void niyanpai_state::niyanpai_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x040000, 0x040fff).ram().share("nvram"); - map(0x0a0000, 0x0a08ff).rw(this, FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); + map(0x0a0000, 0x0a08ff).rw(FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); map(0x0a0900, 0x0a11ff).ram(); // palette work ram? map(0x0bf800, 0x0bffff).ram(); @@ -138,22 +138,22 @@ void niyanpai_state::niyanpai_map(address_map &map) map(0x240000, 0x240009).nopw(); // unknown map(0x240200, 0x2403ff).nopw(); // unknown - map(0x240400, 0x240403).r(this, FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); - map(0x240400, 0x24041f).w(this, FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); - map(0x240420, 0x24043f).w(this, FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); - map(0x240600, 0x240603).r(this, FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); - map(0x240600, 0x24061f).w(this, FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); - map(0x240620, 0x24063f).w(this, FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); - map(0x240800, 0x240803).r(this, FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); - map(0x240800, 0x24081f).w(this, FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); - map(0x240820, 0x24083f).w(this, FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); - map(0x280000, 0x280001).r(this, FUNC(niyanpai_state::dipsw_r)); + map(0x240400, 0x240403).r(FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); + map(0x240400, 0x24041f).w(FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); + map(0x240420, 0x24043f).w(FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); + map(0x240600, 0x240603).r(FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); + map(0x240600, 0x24061f).w(FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); + map(0x240620, 0x24063f).w(FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); + map(0x240800, 0x240803).r(FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); + map(0x240800, 0x24081f).w(FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); + map(0x240820, 0x24083f).w(FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); + map(0x280000, 0x280001).r(FUNC(niyanpai_state::dipsw_r)); map(0x280200, 0x280201).portr("P1_P2"); map(0x280400, 0x280401).portr("SYSTEM"); - map(0x240a01, 0x240a01).w(this, FUNC(niyanpai_state::clutsel_0_w)); - map(0x240c01, 0x240c01).w(this, FUNC(niyanpai_state::clutsel_1_w)); - map(0x240e01, 0x240e01).w(this, FUNC(niyanpai_state::clutsel_2_w)); + map(0x240a01, 0x240a01).w(FUNC(niyanpai_state::clutsel_0_w)); + map(0x240c01, 0x240c01).w(FUNC(niyanpai_state::clutsel_1_w)); + map(0x240e01, 0x240e01).w(FUNC(niyanpai_state::clutsel_2_w)); map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -163,7 +163,7 @@ void niyanpai_state::musobana_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x040000, 0x040fff).ram(); - map(0x0a0000, 0x0a08ff).rw(this, FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); + map(0x0a0000, 0x0a08ff).rw(FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); map(0x0a0900, 0x0a11ff).ram(); // palette work ram? map(0x0a8000, 0x0a87ff).ram().share("nvram"); @@ -171,27 +171,27 @@ void niyanpai_state::musobana_map(address_map &map) map(0x200000, 0x200000).w("nichisnd", FUNC(nichisnd_device::sound_host_command_w)); - map(0x200200, 0x200201).w(this, FUNC(niyanpai_state::musobana_inputport_w)); // inputport select + map(0x200200, 0x200201).w(FUNC(niyanpai_state::musobana_inputport_w)); // inputport select map(0x240000, 0x240009).nopw(); // unknown map(0x240200, 0x2403ff).nopw(); // unknown - map(0x240400, 0x240403).r(this, FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); - map(0x240400, 0x24041f).w(this, FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); - map(0x240420, 0x24043f).w(this, FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); + map(0x240400, 0x240403).r(FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); + map(0x240400, 0x24041f).w(FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); + map(0x240420, 0x24043f).w(FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); - map(0x240600, 0x240603).r(this, FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); - map(0x240600, 0x24061f).w(this, FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); - map(0x240620, 0x24063f).w(this, FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); + map(0x240600, 0x240603).r(FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); + map(0x240600, 0x24061f).w(FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); + map(0x240620, 0x24063f).w(FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); - map(0x240800, 0x240803).r(this, FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); - map(0x240800, 0x24081f).w(this, FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); - map(0x240820, 0x24083f).w(this, FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); - map(0x240a01, 0x240a01).w(this, FUNC(niyanpai_state::clutsel_0_w)); - map(0x240c01, 0x240c01).w(this, FUNC(niyanpai_state::clutsel_1_w)); - map(0x240e01, 0x240e01).w(this, FUNC(niyanpai_state::clutsel_2_w)); + map(0x240800, 0x240803).r(FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); + map(0x240800, 0x24081f).w(FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); + map(0x240820, 0x24083f).w(FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); + map(0x240a01, 0x240a01).w(FUNC(niyanpai_state::clutsel_0_w)); + map(0x240c01, 0x240c01).w(FUNC(niyanpai_state::clutsel_1_w)); + map(0x240e01, 0x240e01).w(FUNC(niyanpai_state::clutsel_2_w)); - map(0x280000, 0x280001).r(this, FUNC(niyanpai_state::dipsw_r)); - map(0x280200, 0x280201).r(this, FUNC(niyanpai_state::musobana_inputport_0_r)); + map(0x280000, 0x280001).r(FUNC(niyanpai_state::dipsw_r)); + map(0x280200, 0x280201).r(FUNC(niyanpai_state::musobana_inputport_0_r)); map(0x280400, 0x280401).portr("SYSTEM"); map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers @@ -202,7 +202,7 @@ void niyanpai_state::mhhonban_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x040000, 0x040fff).ram(); - map(0x060000, 0x0608ff).rw(this, FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); + map(0x060000, 0x0608ff).rw(FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); map(0x060900, 0x0611ff).ram(); // palette work ram? map(0x07f800, 0x07ffff).ram(); @@ -211,28 +211,28 @@ void niyanpai_state::mhhonban_map(address_map &map) map(0x200000, 0x200000).w("nichisnd", FUNC(nichisnd_device::sound_host_command_w)); - map(0x200200, 0x200201).w(this, FUNC(niyanpai_state::musobana_inputport_w)); // inputport select + map(0x200200, 0x200201).w(FUNC(niyanpai_state::musobana_inputport_w)); // inputport select map(0x240000, 0x240009).nopw(); // unknown map(0x240200, 0x2403ff).nopw(); // unknown - map(0x240400, 0x240403).r(this, FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); - map(0x240400, 0x24041f).w(this, FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); - map(0x240420, 0x24043f).w(this, FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); + map(0x240400, 0x240403).r(FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); + map(0x240400, 0x24041f).w(FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); + map(0x240420, 0x24043f).w(FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); - map(0x240600, 0x240603).r(this, FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); - map(0x240600, 0x24061f).w(this, FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); - map(0x240620, 0x24063f).w(this, FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); + map(0x240600, 0x240603).r(FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); + map(0x240600, 0x24061f).w(FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); + map(0x240620, 0x24063f).w(FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); - map(0x240800, 0x240803).r(this, FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); - map(0x240800, 0x24081f).w(this, FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); - map(0x240820, 0x24083f).w(this, FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); + map(0x240800, 0x240803).r(FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); + map(0x240800, 0x24081f).w(FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); + map(0x240820, 0x24083f).w(FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); - map(0x240a01, 0x240a01).w(this, FUNC(niyanpai_state::clutsel_0_w)); - map(0x240c01, 0x240c01).w(this, FUNC(niyanpai_state::clutsel_1_w)); - map(0x240e01, 0x240e01).w(this, FUNC(niyanpai_state::clutsel_2_w)); + map(0x240a01, 0x240a01).w(FUNC(niyanpai_state::clutsel_0_w)); + map(0x240c01, 0x240c01).w(FUNC(niyanpai_state::clutsel_1_w)); + map(0x240e01, 0x240e01).w(FUNC(niyanpai_state::clutsel_2_w)); - map(0x280000, 0x280001).r(this, FUNC(niyanpai_state::dipsw_r)); - map(0x280200, 0x280201).r(this, FUNC(niyanpai_state::musobana_inputport_0_r)); + map(0x280000, 0x280001).r(FUNC(niyanpai_state::dipsw_r)); + map(0x280200, 0x280201).r(FUNC(niyanpai_state::musobana_inputport_0_r)); map(0x280400, 0x280401).portr("SYSTEM"); map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers @@ -243,7 +243,7 @@ void niyanpai_state::zokumahj_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x0ff000, 0x0fffff).ram(); - map(0x0e0000, 0x0e08ff).rw(this, FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); + map(0x0e0000, 0x0e08ff).rw(FUNC(niyanpai_state::palette_r), FUNC(niyanpai_state::palette_w)); map(0x0e0900, 0x0e11ff).ram(); // palette work ram? map(0x0a8000, 0x0a87ff).ram().share("nvram"); @@ -251,28 +251,28 @@ void niyanpai_state::zokumahj_map(address_map &map) map(0x200000, 0x200000).w("nichisnd", FUNC(nichisnd_device::sound_host_command_w)); - map(0x200200, 0x200201).w(this, FUNC(niyanpai_state::musobana_inputport_w)); // inputport select + map(0x200200, 0x200201).w(FUNC(niyanpai_state::musobana_inputport_w)); // inputport select map(0x240000, 0x240009).nopw(); // unknown map(0x240200, 0x2403ff).nopw(); // unknown - map(0x240400, 0x240403).r(this, FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); - map(0x240400, 0x24041f).w(this, FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); - map(0x240420, 0x24043f).w(this, FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); + map(0x240400, 0x240403).r(FUNC(niyanpai_state::blitter_0_r)).umask16(0x00ff); + map(0x240400, 0x24041f).w(FUNC(niyanpai_state::blitter_0_w)).umask16(0x00ff); + map(0x240420, 0x24043f).w(FUNC(niyanpai_state::clut_0_w)).umask16(0x00ff); - map(0x240600, 0x240603).r(this, FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); - map(0x240600, 0x24061f).w(this, FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); - map(0x240620, 0x24063f).w(this, FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); + map(0x240600, 0x240603).r(FUNC(niyanpai_state::blitter_1_r)).umask16(0x00ff); + map(0x240600, 0x24061f).w(FUNC(niyanpai_state::blitter_1_w)).umask16(0x00ff); + map(0x240620, 0x24063f).w(FUNC(niyanpai_state::clut_1_w)).umask16(0x00ff); - map(0x240800, 0x240803).r(this, FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); - map(0x240800, 0x24081f).w(this, FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); - map(0x240820, 0x24083f).w(this, FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); + map(0x240800, 0x240803).r(FUNC(niyanpai_state::blitter_2_r)).umask16(0x00ff); + map(0x240800, 0x24081f).w(FUNC(niyanpai_state::blitter_2_w)).umask16(0x00ff); + map(0x240820, 0x24083f).w(FUNC(niyanpai_state::clut_2_w)).umask16(0x00ff); - map(0x240a01, 0x240a01).w(this, FUNC(niyanpai_state::clutsel_0_w)); - map(0x240c01, 0x240c01).w(this, FUNC(niyanpai_state::clutsel_1_w)); - map(0x240e01, 0x240e01).w(this, FUNC(niyanpai_state::clutsel_2_w)); + map(0x240a01, 0x240a01).w(FUNC(niyanpai_state::clutsel_0_w)); + map(0x240c01, 0x240c01).w(FUNC(niyanpai_state::clutsel_1_w)); + map(0x240e01, 0x240e01).w(FUNC(niyanpai_state::clutsel_2_w)); - map(0x280000, 0x280001).r(this, FUNC(niyanpai_state::dipsw_r)); - map(0x280200, 0x280201).r(this, FUNC(niyanpai_state::musobana_inputport_0_r)); + map(0x280000, 0x280001).r(FUNC(niyanpai_state::dipsw_r)); + map(0x280200, 0x280201).r(FUNC(niyanpai_state::musobana_inputport_0_r)); map(0x280400, 0x280401).portr("SYSTEM"); map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp index 5b53c299e5e..7da1dc56f97 100644 --- a/src/mame/drivers/nmg5.cpp +++ b/src/mame/drivers/nmg5.cpp @@ -373,18 +373,18 @@ void nmg5_state::nmg5_map(address_map &map) map(0x120000, 0x12ffff).ram(); map(0x140000, 0x1407ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x160000, 0x1607ff).ram().share("spriteram"); - map(0x180000, 0x180001).w(this, FUNC(nmg5_state::nmg5_soundlatch_w)); + map(0x180000, 0x180001).w(FUNC(nmg5_state::nmg5_soundlatch_w)); map(0x180002, 0x180003).nopw(); - map(0x180004, 0x180005).rw(this, FUNC(nmg5_state::prot_r), FUNC(nmg5_state::prot_w)); - map(0x180006, 0x180007).w(this, FUNC(nmg5_state::gfx_bank_w)); + map(0x180004, 0x180005).rw(FUNC(nmg5_state::prot_r), FUNC(nmg5_state::prot_w)); + map(0x180006, 0x180007).w(FUNC(nmg5_state::gfx_bank_w)); map(0x180008, 0x180009).portr("DSW"); map(0x18000a, 0x18000b).portr("SYSTEM"); map(0x18000c, 0x18000d).portr("INPUTS"); - map(0x18000e, 0x18000f).w(this, FUNC(nmg5_state::priority_reg_w)); + map(0x18000e, 0x18000f).w(FUNC(nmg5_state::priority_reg_w)); map(0x300002, 0x300009).writeonly().share("scroll_ram"); map(0x30000a, 0x30000f).nopw(); - map(0x320000, 0x321fff).ram().w(this, FUNC(nmg5_state::bg_videoram_w)).share("bg_videoram"); - map(0x322000, 0x323fff).ram().w(this, FUNC(nmg5_state::fg_videoram_w)).share("fg_videoram"); + map(0x320000, 0x321fff).ram().w(FUNC(nmg5_state::bg_videoram_w)).share("bg_videoram"); + map(0x322000, 0x323fff).ram().w(FUNC(nmg5_state::fg_videoram_w)).share("fg_videoram"); map(0x800000, 0x80ffff).ram().share("bitmap"); } @@ -394,17 +394,17 @@ void nmg5_state::pclubys_map(address_map &map) map(0x200000, 0x20ffff).ram(); map(0x440000, 0x4407ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x460000, 0x4607ff).ram().share("spriteram"); - map(0x480000, 0x480001).w(this, FUNC(nmg5_state::nmg5_soundlatch_w)); + map(0x480000, 0x480001).w(FUNC(nmg5_state::nmg5_soundlatch_w)); map(0x480002, 0x480003).nopw(); - map(0x480004, 0x480005).rw(this, FUNC(nmg5_state::prot_r), FUNC(nmg5_state::prot_w)); - map(0x480006, 0x480007).w(this, FUNC(nmg5_state::gfx_bank_w)); + map(0x480004, 0x480005).rw(FUNC(nmg5_state::prot_r), FUNC(nmg5_state::prot_w)); + map(0x480006, 0x480007).w(FUNC(nmg5_state::gfx_bank_w)); map(0x480008, 0x480009).portr("DSW"); map(0x48000a, 0x48000b).portr("SYSTEM"); map(0x48000c, 0x48000d).portr("INPUTS"); - map(0x48000e, 0x48000f).w(this, FUNC(nmg5_state::priority_reg_w)); + map(0x48000e, 0x48000f).w(FUNC(nmg5_state::priority_reg_w)); map(0x500002, 0x500009).writeonly().share("scroll_ram"); - map(0x520000, 0x521fff).ram().w(this, FUNC(nmg5_state::bg_videoram_w)).share("bg_videoram"); - map(0x522000, 0x523fff).ram().w(this, FUNC(nmg5_state::fg_videoram_w)).share("fg_videoram"); + map(0x520000, 0x521fff).ram().w(FUNC(nmg5_state::bg_videoram_w)).share("bg_videoram"); + map(0x522000, 0x523fff).ram().w(FUNC(nmg5_state::fg_videoram_w)).share("fg_videoram"); map(0x800000, 0x80ffff).ram().share("bitmap"); } @@ -429,7 +429,7 @@ void nmg5_state::pclubys_sound_map(address_map &map) void nmg5_state::sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(nmg5_state::oki_banking_w)); + map(0x00, 0x00).w(FUNC(nmg5_state::oki_banking_w)); map(0x10, 0x11).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x18, 0x18).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x1c, 0x1c).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 384f9fb6b36..4c1c285afdd 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -328,14 +328,14 @@ void nmk16_state::vandyke_map(address_map &map) map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0x080016, 0x080017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); - map(0x080018, 0x080019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk16_x0016_w)); + map(0x080018, 0x080019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x08c000, 0x08c007).w(this, FUNC(nmk16_state::vandyke_scroll_w)); - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x08c000, 0x08c007).w(FUNC(nmk16_state::vandyke_scroll_w)); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); map(0x094000, 0x097fff).ram(); /* what is this? */ - map(0x09d000, 0x09d7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x09d000, 0x09d7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x0f0000, 0x0fffff).ram().share("mainram"); } @@ -347,15 +347,15 @@ void nmk16_state::vandykeb_map(address_map &map) map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); // map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0x080010, 0x08001d).w(this, FUNC(nmk16_state::vandykeb_scroll_w)); /* 10, 12, 1a, 1c */ + map(0x080010, 0x08001d).w(FUNC(nmk16_state::vandykeb_scroll_w)); /* 10, 12, 1a, 1c */ map(0x080016, 0x080017).nopw(); /* IRQ enable? */ - map(0x080018, 0x080019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x080018, 0x080019).w(FUNC(nmk16_state::nmk_tilebank_w)); // map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08c000, 0x08c007).nopw(); /* just in case... */ - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); map(0x094000, 0x097fff).ram(); /* what is this? */ - map(0x09d000, 0x09d7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x09d000, 0x09d7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x0f0000, 0x0fffff).ram().share("mainram"); } @@ -367,13 +367,13 @@ void nmk16_state::manybloc_map(address_map &map) map(0x080004, 0x080005).portr("DSW1"); map(0x080010, 0x080011).nopw(); /* See notes at the top of the driver */ map(0x080012, 0x080013).nopw(); /* See notes at the top of the driver */ - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); map(0x08001c, 0x08001d).nopw(); /* See notes at the top of the driver */ map(0x08001f, 0x08001f).r("soundlatch2", FUNC(generic_latch_8_device::read)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0x088000, 0x0883ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09cfff).ram().w(this, FUNC(nmk16_state::manybloc_scroll_w)).share("scrollram"); - map(0x09d000, 0x09d7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09cfff).ram().w(FUNC(nmk16_state::manybloc_scroll_w)).share("scrollram"); + map(0x09d000, 0x09d7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x0f0000, 0x0fffff).ram().share("mainram"); } @@ -384,16 +384,16 @@ void nmk16_tomagic_state::tomagic_map(address_map &map) map(0x080002, 0x080003).portr("IN1"); map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x080018, 0x080019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080018, 0x080019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x08001f, 0x08001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08c000, 0x08c1ff).writeonly().share("scrollram"); map(0x08c200, 0x08c3ff).writeonly().share("scrollramy"); - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); map(0x094001, 0x094001).w("oki1", FUNC(okim6295_device::write)); map(0x094003, 0x094003).r("oki1", FUNC(okim6295_device::read)); - map(0x09c000, 0x09cfff).mirror(0x001000).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x09c000, 0x09cfff).mirror(0x001000).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x0f0000, 0x0fffff).ram().share("mainram"); } @@ -407,7 +407,7 @@ void nmk16_tomagic_state::tomagic_sound_map(address_map &map) void nmk16_tomagic_state::tomagic_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(nmk16_state::macross2_sound_bank_w)); + map(0x00, 0x00).w(FUNC(nmk16_state::macross2_sound_bank_w)); map(0x02, 0x03).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x06, 0x06).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -416,21 +416,21 @@ void nmk16_state::tharrier_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x080000, 0x080001).portr("IN0"); - map(0x080002, 0x080003).r(this, FUNC(nmk16_state::tharrier_mcu_r)); // AM_READ_PORT("IN1") + map(0x080002, 0x080003).r(FUNC(nmk16_state::tharrier_mcu_r)); // AM_READ_PORT("IN1") map(0x080004, 0x080005).portr("DSW1"); map(0x08000f, 0x08000f).r("soundlatch2", FUNC(generic_latch_8_device::read)); /* from Z80 */ - map(0x080010, 0x080011).w(this, FUNC(nmk16_state::tharrier_mcu_control_w)); + map(0x080010, 0x080011).w(FUNC(nmk16_state::tharrier_mcu_control_w)); map(0x080012, 0x080013).nopw(); -// map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); -// map(0x080018, 0x080019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); +// map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); +// map(0x080018, 0x080019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x08001f, 0x08001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x080202, 0x080203).portr("IN2"); map(0x088000, 0x0883ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); -// map(0x08c000, 0x08c007).w(this, FUNC(nmk16_state::nmk_scroll_w)); - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); +// map(0x08c000, 0x08c007).w(FUNC(nmk16_state::nmk_scroll_w)); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); map(0x09c000, 0x09c7ff).ram(); /* Unused txvideoram area? */ - map(0x09d000, 0x09d7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); - map(0x0f0000, 0x0fffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x09d000, 0x09d7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x0f0000, 0x0fffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); } void nmk16_state::tharrier_sound_map(address_map &map) @@ -440,8 +440,8 @@ void nmk16_state::tharrier_sound_map(address_map &map) map(0xf000, 0xf000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("soundlatch2", FUNC(generic_latch_8_device::write)); map(0xf400, 0xf400).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xf500, 0xf500).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xf600, 0xf600).w(this, FUNC(nmk16_state::tharrier_oki6295_bankswitch_w<0>)); - map(0xf700, 0xf700).w(this, FUNC(nmk16_state::tharrier_oki6295_bankswitch_w<1>)); + map(0xf600, 0xf600).w(FUNC(nmk16_state::tharrier_oki6295_bankswitch_w<0>)); + map(0xf700, 0xf700).w(FUNC(nmk16_state::tharrier_oki6295_bankswitch_w<1>)); } void nmk16_state::tharrier_sound_io_map(address_map &map) @@ -461,15 +461,15 @@ void nmk16_state::mustang_map(address_map &map) map(0x080004, 0x080005).portr("DSW1"); map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read)); map(0x08000e, 0x08000f).nopw(); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x080016, 0x080017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); // frame number? + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk16_x0016_w)); // frame number? map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x08c000, 0x08c001).w(this, FUNC(nmk16_state::mustang_scroll_w)); + map(0x08c000, 0x08c001).w(FUNC(nmk16_state::mustang_scroll_w)); map(0x08c002, 0x08c087).nopw(); // ?? - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); - map(0x0f0000, 0x0fffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x0f0000, 0x0fffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); } void nmk16_state::mustangb_map(address_map &map) @@ -479,15 +479,15 @@ void nmk16_state::mustangb_map(address_map &map) map(0x080002, 0x080003).portr("IN1"); map(0x080004, 0x080005).portr("DSW1"); map(0x08000e, 0x08000f).noprw(); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); map(0x080016, 0x080017).nopw(); // frame number? map(0x08001e, 0x08001f).w("seibu_sound", FUNC(seibu_sound_device::main_mustb_w)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x08c000, 0x08c001).w(this, FUNC(nmk16_state::mustang_scroll_w)); + map(0x08c000, 0x08c001).w(FUNC(nmk16_state::mustang_scroll_w)); map(0x08c002, 0x08c087).nopw(); // ?? - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); - map(0x0f0000, 0x0fffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x0f0000, 0x0fffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); } @@ -498,15 +498,15 @@ void nmk16_state::twinactn_map(address_map &map) map(0x080002, 0x080003).portr("IN1"); map(0x080004, 0x080005).portr("DSW1"); map(0x08000e, 0x08000f).noprw(); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); map(0x080016, 0x080017).nopw(); // frame number? map(0x08001f, 0x08001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x08c000, 0x08c001).w(this, FUNC(nmk16_state::mustang_scroll_w)); + map(0x08c000, 0x08c001).w(FUNC(nmk16_state::mustang_scroll_w)); map(0x08c002, 0x08c087).nopw(); // ?? - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); - map(0x0f0000, 0x0fffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x0f0000, 0x0fffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); } @@ -519,14 +519,14 @@ void nmk16_state::acrobatm_map(address_map &map) map(0xc0008, 0xc0009).portr("DSW1"); map(0xc000a, 0xc000b).portr("DSW2"); map(0xc000f, 0xc000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0xc0014, 0xc0015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0xc0016, 0xc0017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); - map(0xc0018, 0xc0019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0xc0014, 0xc0015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0xc0016, 0xc0017).w(FUNC(nmk16_state::nmk16_x0016_w)); + map(0xc0018, 0xc0019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0xc001f, 0xc001f).w(m_nmk004, FUNC(nmk004_device::write)); map(0xc4000, 0xc45ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xc8000, 0xc8007).ram().w(this, FUNC(nmk16_state::nmk_scroll_w)); - map(0xcc000, 0xcffff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0xd4000, 0xd47ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0xc8000, 0xc8007).ram().w(FUNC(nmk16_state::nmk_scroll_w)); + map(0xcc000, 0xcffff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0xd4000, 0xd47ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); } void nmk16_state::bioship_map(address_map &map) @@ -537,15 +537,15 @@ void nmk16_state::bioship_map(address_map &map) map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read)); -// map(0xc0014, 0xc0015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x080016, 0x080017).w(this, FUNC(nmk16_state::nmk16_bioship_x0016_w)); +// map(0xc0014, 0xc0015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk16_bioship_x0016_w)); map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write)); - map(0x084000, 0x084001).w(this, FUNC(nmk16_state::bioship_bank_w)); + map(0x084000, 0x084001).w(FUNC(nmk16_state::bioship_bank_w)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x08c000, 0x08c007).ram().w(this, FUNC(nmk16_state::bioshipbg_scroll_w)); - map(0x08c010, 0x08c017).ram().w(this, FUNC(nmk16_state::bioship_scroll_w)); - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x08c000, 0x08c007).ram().w(FUNC(nmk16_state::bioshipbg_scroll_w)); + map(0x08c010, 0x08c017).ram().w(FUNC(nmk16_state::bioship_scroll_w)); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x0f0000, 0x0fffff).ram().share("mainram"); } @@ -717,15 +717,15 @@ void nmk16_state::hachamf_map(address_map &map) map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x080016, 0x080017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); - map(0x080018, 0x080019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk16_x0016_w)); + map(0x080018, 0x080019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write)); /* Video Region */ map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x08c000, 0x08c007).w(this, FUNC(nmk16_state::nmk_scroll_w)); - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x08c000, 0x08c007).w(FUNC(nmk16_state::nmk_scroll_w)); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); /* Main RAM, inc sprites, shared with MCU */ map(0x0f0000, 0x0fffff).ram().share("mainram"); // ram is shared with MCU } @@ -951,14 +951,14 @@ void nmk16_state::tdragon_map(address_map &map) map(0x0c0008, 0x0c0009).portr("DSW1"); map(0x0c000a, 0x0c000b).portr("DSW2"); map(0x0c000f, 0x0c000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0x0c0014, 0x0c0015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); /* Maybe */ - map(0x0c0016, 0x0c0017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); - map(0x0c0018, 0x0c0019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); /* Tile Bank ? */ + map(0x0c0014, 0x0c0015).w(FUNC(nmk16_state::nmk_flipscreen_w)); /* Maybe */ + map(0x0c0016, 0x0c0017).w(FUNC(nmk16_state::nmk16_x0016_w)); + map(0x0c0018, 0x0c0019).w(FUNC(nmk16_state::nmk_tilebank_w)); /* Tile Bank ? */ map(0x0c001f, 0x0c001f).w(m_nmk004, FUNC(nmk004_device::write)); - map(0x0c4000, 0x0c4007).ram().w(this, FUNC(nmk16_state::nmk_scroll_w)); + map(0x0c4000, 0x0c4007).ram().w(FUNC(nmk16_state::nmk_scroll_w)); map(0x0c8000, 0x0c87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0cc000, 0x0cffff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x0d0000, 0x0d07ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x0cc000, 0x0cffff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x0d0000, 0x0d07ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); } // No sprites without this. Is it actually protection? @@ -970,19 +970,19 @@ READ16_MEMBER(nmk16_state::tdragonb_prot_r) void nmk16_state::tdragonb_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x044022, 0x044023).r(this, FUNC(nmk16_state::tdragonb_prot_r)); + map(0x044022, 0x044023).r(FUNC(nmk16_state::tdragonb_prot_r)); map(0x0b0000, 0x0bffff).ram().share("mainram"); map(0x0c0000, 0x0c0001).portr("IN0"); map(0x0c0002, 0x0c0003).portr("IN1"); map(0x0c0008, 0x0c0009).portr("DSW1"); map(0x0c000a, 0x0c000b).portr("DSW2"); - map(0x0c0014, 0x0c0015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); /* Maybe */ - map(0x0c0018, 0x0c0019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); /* Tile Bank ? */ + map(0x0c0014, 0x0c0015).w(FUNC(nmk16_state::nmk_flipscreen_w)); /* Maybe */ + map(0x0c0018, 0x0c0019).w(FUNC(nmk16_state::nmk_tilebank_w)); /* Tile Bank ? */ map(0x0c001e, 0x0c001f).w("seibu_sound", FUNC(seibu_sound_device::main_mustb_w)); - map(0x0c4000, 0x0c4007).ram().w(this, FUNC(nmk16_state::nmk_scroll_w)); + map(0x0c4000, 0x0c4007).ram().w(FUNC(nmk16_state::nmk_scroll_w)); map(0x0c8000, 0x0c87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0cc000, 0x0cffff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x0d0000, 0x0d07ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x0cc000, 0x0cffff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x0d0000, 0x0d07ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); } void nmk16_state::ssmissin_map(address_map &map) @@ -993,20 +993,20 @@ void nmk16_state::ssmissin_map(address_map &map) map(0x0c0004, 0x0c0005).portr("IN1"); map(0x0c0006, 0x0c0007).portr("DSW1"); // AM_RANGE(0x0c000e, 0x0c000f) AM_READ(??) - map(0x0c0014, 0x0c0015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); /* Maybe */ - map(0x0c0018, 0x0c0019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); /* Tile Bank ? */ + map(0x0c0014, 0x0c0015).w(FUNC(nmk16_state::nmk_flipscreen_w)); /* Maybe */ + map(0x0c0018, 0x0c0019).w(FUNC(nmk16_state::nmk_tilebank_w)); /* Tile Bank ? */ map(0x0c001f, 0x0c001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x0c4000, 0x0c4007).ram().w(this, FUNC(nmk16_state::nmk_scroll_w)); + map(0x0c4000, 0x0c4007).ram().w(FUNC(nmk16_state::nmk_scroll_w)); map(0x0c8000, 0x0c87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0cc000, 0x0cffff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x0d0000, 0x0d07ff).mirror(0x1800).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); //mirror for airattck + map(0x0cc000, 0x0cffff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x0d0000, 0x0d07ff).mirror(0x1800).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); //mirror for airattck } void nmk16_state::ssmissin_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(nmk16_state::ssmissin_soundbank_w)); + map(0x9000, 0x9000).w(FUNC(nmk16_state::ssmissin_soundbank_w)); map(0x9800, 0x9800).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -1031,15 +1031,15 @@ void nmk16_state::strahl_map(address_map &map) map(0x80008, 0x80009).portr("DSW1"); map(0x8000a, 0x8000b).portr("DSW2"); map(0x8000f, 0x8000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0x80014, 0x80015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x80016, 0x80017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); + map(0x80014, 0x80015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x80016, 0x80017).w(FUNC(nmk16_state::nmk16_x0016_w)); map(0x8001f, 0x8001f).w(m_nmk004, FUNC(nmk004_device::write)); - map(0x84000, 0x84007).ram().w(this, FUNC(nmk16_state::nmk_scroll_w)); - map(0x88000, 0x88007).ram().w(this, FUNC(nmk16_state::nmk_scroll_2_w)); + map(0x84000, 0x84007).ram().w(FUNC(nmk16_state::nmk_scroll_w)); + map(0x88000, 0x88007).ram().w(FUNC(nmk16_state::nmk_scroll_2_w)); map(0x8c000, 0x8c7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x90000, 0x93fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x94000, 0x97fff).ram().w(this, FUNC(nmk16_state::nmk_fgvideoram_w)).share("nmk_fgvideoram"); - map(0x9c000, 0x9c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x90000, 0x93fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x94000, 0x97fff).ram().w(FUNC(nmk16_state::nmk_fgvideoram_w)).share("nmk_fgvideoram"); + map(0x9c000, 0x9c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0xf0000, 0xfffff).ram().share("mainram"); } @@ -1051,15 +1051,15 @@ void nmk16_state::macross_map(address_map &map) map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x080016, 0x080017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); - map(0x080018, 0x080019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk16_x0016_w)); + map(0x080018, 0x080019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x08c000, 0x08c007).ram().w(this, FUNC(nmk16_state::nmk_scroll_w)); - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); - map(0x0f0000, 0x0fffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x08c000, 0x08c007).ram().w(FUNC(nmk16_state::nmk_scroll_w)); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x0f0000, 0x0fffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); } void nmk16_state::gunnail_map(address_map &map) @@ -1070,16 +1070,16 @@ void nmk16_state::gunnail_map(address_map &map) map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); map(0x08000f, 0x08000f).r(m_nmk004, FUNC(nmk004_device::read)); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x080016, 0x080017).w(this, FUNC(nmk16_state::nmk16_x0016_w)); - map(0x080018, 0x080019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080016, 0x080017).w(FUNC(nmk16_state::nmk16_x0016_w)); + map(0x080018, 0x080019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x08001f, 0x08001f).w(m_nmk004, FUNC(nmk004_device::write)); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08c000, 0x08c1ff).writeonly().share("scrollram"); map(0x08c200, 0x08c3ff).writeonly().share("scrollramy"); map(0x08c400, 0x08c7ff).writeonly(); // unknown - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x09c000, 0x09cfff).mirror(0x001000).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09cfff).mirror(0x001000).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x0f0000, 0x0fffff).ram().share("mainram"); } @@ -1091,9 +1091,9 @@ void nmk16_state::macross2_map(address_map &map) map(0x100008, 0x100009).portr("DSW1"); map(0x10000a, 0x10000b).portr("DSW2"); map(0x10000f, 0x10000f).r("soundlatch2", FUNC(generic_latch_8_device::read)); /* from Z80 */ - map(0x100014, 0x100015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); - map(0x100016, 0x100017).w(this, FUNC(nmk16_state::macross2_sound_reset_w)); /* Z80 reset */ - map(0x100018, 0x100019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x100014, 0x100015).w(FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x100016, 0x100017).w(FUNC(nmk16_state::macross2_sound_reset_w)); /* Z80 reset */ + map(0x100018, 0x100019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x10001f, 0x10001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); /* to Z80 */ map(0x120000, 0x1207ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -1101,12 +1101,12 @@ void nmk16_state::macross2_map(address_map &map) map(0x130200, 0x1303ff).ram().share("scrollramy"); map(0x130400, 0x1307ff).ram(); - map(0x140000, 0x143fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x144000, 0x147fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<1>)).share("nmk_bgvideoram1"); - map(0x148000, 0x14bfff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<2>)).share("nmk_bgvideoram2"); - map(0x14c000, 0x14ffff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<3>)).share("nmk_bgvideoram3"); + map(0x140000, 0x143fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x144000, 0x147fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<1>)).share("nmk_bgvideoram1"); + map(0x148000, 0x14bfff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<2>)).share("nmk_bgvideoram2"); + map(0x14c000, 0x14ffff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<3>)).share("nmk_bgvideoram3"); - map(0x170000, 0x170fff).mirror(0x1000).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x170000, 0x170fff).mirror(0x1000).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x1f0000, 0x1fffff).ram().share("mainram"); } @@ -1125,9 +1125,9 @@ void nmk16_state::raphero_map(address_map &map) map(0x100008, 0x100009).portr("DSW1"); map(0x10000a, 0x10000b).portr("DSW2"); map(0x10000f, 0x10000f).r("soundlatch2", FUNC(generic_latch_8_device::read)); /* from Z80 */ - map(0x100014, 0x100015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x100014, 0x100015).w(FUNC(nmk16_state::nmk_flipscreen_w)); map(0x100016, 0x100017).nopw(); /* IRQ enable or z80 sound reset like in Macross 2? */ - map(0x100018, 0x100019).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x100018, 0x100019).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x10001f, 0x10001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); /* to Z80 */ map(0x120000, 0x1207ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -1135,13 +1135,13 @@ void nmk16_state::raphero_map(address_map &map) map(0x130200, 0x1303ff).ram().share("scrollramy"); map(0x130400, 0x1307ff).ram(); - map(0x140000, 0x143fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); - map(0x144000, 0x147fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<1>)).share("nmk_bgvideoram1"); - map(0x148000, 0x14bfff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<2>)).share("nmk_bgvideoram2"); - map(0x14c000, 0x14ffff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<3>)).share("nmk_bgvideoram3"); + map(0x140000, 0x143fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x144000, 0x147fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<1>)).share("nmk_bgvideoram1"); + map(0x148000, 0x14bfff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<2>)).share("nmk_bgvideoram2"); + map(0x14c000, 0x14ffff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<3>)).share("nmk_bgvideoram3"); - map(0x170000, 0x170fff).mirror(0x1000).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); + map(0x170000, 0x170fff).mirror(0x1000).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); map(0x1f0000, 0x1fffff).ram().share("mainram"); } @@ -1153,7 +1153,7 @@ void nmk16_state::raphero_sound_mem_map(address_map &map) map(0xc800, 0xc800).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xc808, 0xc808).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xc810, 0xc817).w("nmk112", FUNC(nmk112_device::okibank_w)); - map(0xd000, 0xd000).w(this, FUNC(nmk16_state::macross2_sound_bank_w)); + map(0xd000, 0xd000).w(FUNC(nmk16_state::macross2_sound_bank_w)); map(0xd800, 0xd800).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("soundlatch2", FUNC(generic_latch_8_device::write)); // main cpu map(0xe000, 0xffff).ram(); } @@ -1164,7 +1164,7 @@ void nmk16_state::macross2_sound_map(address_map &map) map(0x8000, 0xbfff).bankr("audiobank"); /* banked ROM */ map(0xa000, 0xa000).nopr(); /* IRQ ack? watchdog? */ map(0xc000, 0xdfff).ram(); - map(0xe001, 0xe001).w(this, FUNC(nmk16_state::macross2_sound_bank_w)); + map(0xe001, 0xe001).w(FUNC(nmk16_state::macross2_sound_bank_w)); map(0xf000, 0xf000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("soundlatch2", FUNC(generic_latch_8_device::write)); /* from 68000 */ } @@ -1184,14 +1184,14 @@ void nmk16_state::bjtwin_map(address_map &map) map(0x080002, 0x080003).portr("IN1"); map(0x080008, 0x080009).portr("DSW1"); map(0x08000a, 0x08000b).portr("DSW2"); - map(0x080014, 0x080015).w(this, FUNC(nmk16_state::nmk_flipscreen_w)); + map(0x080014, 0x080015).w(FUNC(nmk16_state::nmk_flipscreen_w)); map(0x084001, 0x084001).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x084011, 0x084011).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x084020, 0x08402f).w("nmk112", FUNC(nmk112_device::okibank_w)).umask16(0x00ff); map(0x088000, 0x0887ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x094000, 0x094001).w(this, FUNC(nmk16_state::nmk_tilebank_w)); + map(0x094000, 0x094001).w(FUNC(nmk16_state::nmk_tilebank_w)); map(0x094002, 0x094003).nopw(); /* IRQ enable? */ - map(0x09c000, 0x09cfff).mirror(0x1000).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); + map(0x09c000, 0x09cfff).mirror(0x1000).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); map(0x0f0000, 0x0fffff).ram().share("mainram"); } @@ -5137,22 +5137,22 @@ void nmk16_state::afega_map(address_map &map) map(0x080000, 0x080001).portr("IN0"); // Buttons map(0x080002, 0x080003).portr("IN1"); // P1 + P2 map(0x080004, 0x080005).portr("DSW1"); // 2 x DSW - map(0x080012, 0x080013).r(this, FUNC(nmk16_state::afega_unknown_r)); + map(0x080012, 0x080013).r(FUNC(nmk16_state::afega_unknown_r)); map(0x080000, 0x08001d).writeonly(); // map(0x08001f, 0x08001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU map(0x080020, 0x087fff).writeonly(); // - map(0x084000, 0x084003).ram().w(this, FUNC(nmk16_state::afega_scroll_w<0>)); // Scroll on redhawkb (mirror or changed?..) - map(0x084004, 0x084007).ram().w(this, FUNC(nmk16_state::afega_scroll_w<1>)); // Scroll on redhawkb (mirror or changed?..) + map(0x084000, 0x084003).ram().w(FUNC(nmk16_state::afega_scroll_w<0>)); // Scroll on redhawkb (mirror or changed?..) + map(0x084004, 0x084007).ram().w(FUNC(nmk16_state::afega_scroll_w<1>)); // Scroll on redhawkb (mirror or changed?..) map(0x088000, 0x0885ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x088600, 0x08bfff).writeonly(); // - map(0x08c000, 0x08c003).ram().w(this, FUNC(nmk16_state::afega_scroll_w<0>)).share("afega_scroll_0"); // Scroll - map(0x08c004, 0x08c007).ram().w(this, FUNC(nmk16_state::afega_scroll_w<1>)).share("afega_scroll_1"); // + map(0x08c000, 0x08c003).ram().w(FUNC(nmk16_state::afega_scroll_w<0>)).share("afega_scroll_0"); // Scroll + map(0x08c004, 0x08c007).ram().w(FUNC(nmk16_state::afega_scroll_w<1>)).share("afega_scroll_1"); // map(0x08c008, 0x08ffff).writeonly(); // - map(0x090000, 0x093fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); // Layer 0 // ? - map(0x09c000, 0x09c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); // Layer 1 + map(0x090000, 0x093fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); // Layer 0 // ? + map(0x09c000, 0x09c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); // Layer 1 - map(0x0c0000, 0x0cffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); - map(0x0f0000, 0x0fffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x0c0000, 0x0cffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x0f0000, 0x0fffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); } // firehawk has 0x100000 bytes of program rom (at least the switchable version) so the above can't work. @@ -5163,22 +5163,22 @@ void nmk16_state::firehawk_map(address_map &map) map(0x280000, 0x280001).portr("IN0"); // Buttons map(0x280002, 0x280003).portr("IN1"); // P1 + P2 map(0x280004, 0x280005).portr("DSW1"); // 2 x DSW - map(0x280012, 0x280013).r(this, FUNC(nmk16_state::afega_unknown_r)); + map(0x280012, 0x280013).r(FUNC(nmk16_state::afega_unknown_r)); map(0x280000, 0x28001d).writeonly(); // map(0x28001f, 0x28001f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU map(0x280020, 0x287fff).writeonly(); // - map(0x284000, 0x284003).ram().w(this, FUNC(nmk16_state::afega_scroll_w<0>)); // Scroll on redhawkb (mirror or changed?..) - map(0x284004, 0x284007).ram().w(this, FUNC(nmk16_state::afega_scroll_w<1>)); // Scroll on redhawkb (mirror or changed?..) + map(0x284000, 0x284003).ram().w(FUNC(nmk16_state::afega_scroll_w<0>)); // Scroll on redhawkb (mirror or changed?..) + map(0x284004, 0x284007).ram().w(FUNC(nmk16_state::afega_scroll_w<1>)); // Scroll on redhawkb (mirror or changed?..) map(0x288000, 0x2885ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x288600, 0x28bfff).writeonly(); // - map(0x28c000, 0x28c003).ram().w(this, FUNC(nmk16_state::afega_scroll_w<0>)).share("afega_scroll_0"); // Scroll - map(0x28c004, 0x28c007).ram().w(this, FUNC(nmk16_state::afega_scroll_w<1>)).share("afega_scroll_1"); // + map(0x28c000, 0x28c003).ram().w(FUNC(nmk16_state::afega_scroll_w<0>)).share("afega_scroll_0"); // Scroll + map(0x28c004, 0x28c007).ram().w(FUNC(nmk16_state::afega_scroll_w<1>)).share("afega_scroll_1"); // map(0x28c008, 0x28ffff).writeonly(); // - map(0x290000, 0x293fff).ram().w(this, FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); // Layer 0 // ? - map(0x29c000, 0x29c7ff).ram().w(this, FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); // Layer 1 + map(0x290000, 0x293fff).ram().w(FUNC(nmk16_state::nmk_bgvideoram_w<0>)).share("nmk_bgvideoram0"); // Layer 0 // ? + map(0x29c000, 0x29c7ff).ram().w(FUNC(nmk16_state::nmk_txvideoram_w)).share("nmk_txvideoram"); // Layer 1 - map(0x3c0000, 0x3cffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); - map(0x3f0000, 0x3fffff).ram().w(this, FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x3c0000, 0x3cffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); + map(0x3f0000, 0x3fffff).ram().w(FUNC(nmk16_state::nmk16_mainram_strange_w)).share("mainram"); } @@ -5214,7 +5214,7 @@ void nmk16_state::firehawk_sound_cpu(address_map &map) map(0xf000, 0xf7ff).ram(); map(0xf800, 0xffff).ram(); // not used, only tested map(0xfff0, 0xfff0).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xfff2, 0xfff2).w(this, FUNC(nmk16_state::spec2k_oki1_banking_w)); + map(0xfff2, 0xfff2).w(FUNC(nmk16_state::spec2k_oki1_banking_w)); map(0xfff8, 0xfff8).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xfffa, 0xfffa).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -5234,7 +5234,7 @@ void nmk16_state::twinactn_sound_cpu(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(nmk16_state::twinactn_oki_bank_w)); + map(0x9000, 0x9000).w(FUNC(nmk16_state::twinactn_oki_bank_w)); map(0x9800, 0x9800).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); // From Main CPU } diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp index dfb7e4eb1a5..fd8f8afe428 100644 --- a/src/mame/drivers/nokia_3310.cpp +++ b/src/mame/drivers/nokia_3310.cpp @@ -639,12 +639,12 @@ WRITE8_MEMBER(noki3310_state::mad2_mcuif_w) void noki3310_state::noki3310_map(address_map &map) { map.global_mask(0x00ffffff); - map(0x00000000, 0x0000ffff).mirror(0x80000).rw(this, FUNC(noki3310_state::ram_r), FUNC(noki3310_state::ram_w)); // boot ROM / RAM - map(0x00010000, 0x00010fff).mirror(0x8f000).rw(this, FUNC(noki3310_state::dsp_ram_r), FUNC(noki3310_state::dsp_ram_w)); // DSP shared memory - map(0x00020000, 0x000200ff).mirror(0x8ff00).rw(this, FUNC(noki3310_state::mad2_io_r), FUNC(noki3310_state::mad2_io_w)); // IO (Primary I/O range, configures peripherals) - map(0x00030000, 0x00030003).mirror(0x8fffc).rw(this, FUNC(noki3310_state::mad2_dspif_r), FUNC(noki3310_state::mad2_dspif_w)); // DSPIF (API control register) - map(0x00040000, 0x00040003).mirror(0x8fffc).rw(this, FUNC(noki3310_state::mad2_mcuif_r), FUNC(noki3310_state::mad2_mcuif_w)); // MCUIF (Secondary I/O range, configures memory ranges) - map(0x00100000, 0x0017ffff).rw(this, FUNC(noki3310_state::ram_r), FUNC(noki3310_state::ram_w)); // RAMSelX + map(0x00000000, 0x0000ffff).mirror(0x80000).rw(FUNC(noki3310_state::ram_r), FUNC(noki3310_state::ram_w)); // boot ROM / RAM + map(0x00010000, 0x00010fff).mirror(0x8f000).rw(FUNC(noki3310_state::dsp_ram_r), FUNC(noki3310_state::dsp_ram_w)); // DSP shared memory + map(0x00020000, 0x000200ff).mirror(0x8ff00).rw(FUNC(noki3310_state::mad2_io_r), FUNC(noki3310_state::mad2_io_w)); // IO (Primary I/O range, configures peripherals) + map(0x00030000, 0x00030003).mirror(0x8fffc).rw(FUNC(noki3310_state::mad2_dspif_r), FUNC(noki3310_state::mad2_dspif_w)); // DSPIF (API control register) + map(0x00040000, 0x00040003).mirror(0x8fffc).rw(FUNC(noki3310_state::mad2_mcuif_r), FUNC(noki3310_state::mad2_mcuif_w)); // MCUIF (Secondary I/O range, configures memory ranges) + map(0x00100000, 0x0017ffff).rw(FUNC(noki3310_state::ram_r), FUNC(noki3310_state::ram_w)); // RAMSelX map(0x00200000, 0x005fffff).rw("flash", FUNC(intelfsh16_device::read), FUNC(intelfsh16_device::write)); // ROM1SelX map(0x00600000, 0x009fffff).unmaprw(); // ROM2SelX map(0x00a00000, 0x00dfffff).unmaprw(); // EEPROMSelX diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp index 0ff0827b9b2..549b70a00b6 100644 --- a/src/mame/drivers/norautp.cpp +++ b/src/mame/drivers/norautp.cpp @@ -845,7 +845,7 @@ void norautp_state::norautp_portmap(address_map &map) //AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3c) AM_READWRITE(vram_data_r, vram_data_w) //AM_RANGE(0xc1, 0xc1) AM_MIRROR(0x3c) AM_WRITE(vram_addr_w) //AM_RANGE(0xc2, 0xc2) AM_MIRROR(0x3c) AM_READ(test_r) - map(0xef, 0xef).r(this, FUNC(norautp_state::test2_r)); + map(0xef, 0xef).r(FUNC(norautp_state::test2_r)); } /* diff --git a/src/mame/drivers/notechan.cpp b/src/mame/drivers/notechan.cpp index f32351cff2e..11a3515d95b 100644 --- a/src/mame/drivers/notechan.cpp +++ b/src/mame/drivers/notechan.cpp @@ -341,11 +341,11 @@ void notechan_state::notechan_port_map(address_map &map) { map.global_mask(0xff); map(0xf0, 0xf0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xf8, 0xf8).portr("IN0").w(this, FUNC(notechan_state::out_f8_w)); - map(0xf9, 0xf9).portr("IN1").w(this, FUNC(notechan_state::out_f9_w)); - map(0xfa, 0xfa).portr("IN2").w(this, FUNC(notechan_state::out_fa_w)); + map(0xf8, 0xf8).portr("IN0").w(FUNC(notechan_state::out_f8_w)); + map(0xf9, 0xf9).portr("IN1").w(FUNC(notechan_state::out_f9_w)); + map(0xfa, 0xfa).portr("IN2").w(FUNC(notechan_state::out_fa_w)); map(0xfb, 0xfb).portr("IN3"); - map(0xff, 0xff).w(this, FUNC(notechan_state::out_ff_w)); // watchdog reset? (written immediately upon reset, INT and NMI) + map(0xff, 0xff).w(FUNC(notechan_state::out_ff_w)); // watchdog reset? (written immediately upon reset, INT and NMI) } diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 92e0a5d2586..b9a1a135846 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -545,12 +545,12 @@ void notetaker_state::iop_mem(address_map &map) map(0x01000, 0x3ffff).ram().region("mainram", 0); // 256k of ram (less 8k), shared between both processors. rom goes here if bootseqdone is 0 // note 4000-d5ff is the framebuffer for the screen, in two sets of fields for odd/even interlace? map(0xff000, 0xfffe7).rom().region("iop", 0xff000); // rom is only banked in here if bootseqdone is 0, so the reset vector is in the proper place. otherwise the memory control regs live at fffe8-fffef - //map(0xfffea, 0xfffeb).w(this, FUNC(notetaker_state::cpuCtl_w)); - //map(0xfffec, 0xfffed).r(this, FUNC(notetaker_state::parityErrHi_r)); + //map(0xfffea, 0xfffeb).w(FUNC(notetaker_state::cpuCtl_w)); + //map(0xfffec, 0xfffed).r(FUNC(notetaker_state::parityErrHi_r)); //map(0xfffee, 0xfffef).r(this. FUNC(notetaker_state::parityErrLo_r)); map(0xffff0, 0xfffff).rom().region("iop", 0xffff0); */ - map(0x00000, 0xfffff).rw(this, FUNC(notetaker_state::iop_r), FUNC(notetaker_state::iop_w)); // bypass MAME's memory map system as we need finer grained control + map(0x00000, 0xfffff).rw(FUNC(notetaker_state::iop_r), FUNC(notetaker_state::iop_w)); // bypass MAME's memory map system as we need finer grained control } /* iop memory map comes from http://bitsavers.informatik.uni-stuttgart.de/pdf/xerox/notetaker/memos/19790605_Definition_of_8086_Ports.pdf @@ -591,28 +591,28 @@ void notetaker_state::iop_io(address_map &map) { map.unmap_value_high(); map(0x00, 0x03).mirror(0x7e1c).rw(m_iop_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x20, 0x21).mirror(0x7e1e).w(this, FUNC(notetaker_state::IPConReg_w)); // I/O processor (rom mapping, etc) control register + map(0x20, 0x21).mirror(0x7e1e).w(FUNC(notetaker_state::IPConReg_w)); // I/O processor (rom mapping, etc) control register map(0x42, 0x42).mirror(0x7e10).r(m_kbduart, FUNC(ay31015_device::receive)); // read keyboard data - map(0x44, 0x45).mirror(0x7e10).r(this, FUNC(notetaker_state::ReadOPStatus_r)); // read keyboard fifo state - map(0x48, 0x49).mirror(0x7e10).w(this, FUNC(notetaker_state::LoadKeyCtlReg_w)); // kbd uart control register + map(0x44, 0x45).mirror(0x7e10).r(FUNC(notetaker_state::ReadOPStatus_r)); // read keyboard fifo state + map(0x48, 0x49).mirror(0x7e10).w(FUNC(notetaker_state::LoadKeyCtlReg_w)); // kbd uart control register map(0x4a, 0x4a).mirror(0x7e10).w(m_kbduart, FUNC(ay31015_device::transmit)); // kbd uart data register - map(0x4c, 0x4d).mirror(0x7e10).w(this, FUNC(notetaker_state::KeyDataReset_w)); // kbd uart ddr switch (data reset) - map(0x4e, 0x4f).mirror(0x7e10).w(this, FUNC(notetaker_state::KeyChipReset_w)); // kbd uart reset - map(0x60, 0x61).mirror(0x7e1e).w(this, FUNC(notetaker_state::FIFOReg_w)); // DAC sample and hold and frequency setup + map(0x4c, 0x4d).mirror(0x7e10).w(FUNC(notetaker_state::KeyDataReset_w)); // kbd uart ddr switch (data reset) + map(0x4e, 0x4f).mirror(0x7e10).w(FUNC(notetaker_state::KeyChipReset_w)); // kbd uart reset + map(0x60, 0x61).mirror(0x7e1e).w(FUNC(notetaker_state::FIFOReg_w)); // DAC sample and hold and frequency setup //map(0xa0, 0xa1).mirror(0x7e18).rw("debug8255", FUNC(8255_device::read), FUNC(8255_device::write)); // debugger board 8255 - map(0xc0, 0xc1).mirror(0x7e1e).w(this, FUNC(notetaker_state::FIFOBus_w)); // DAC data write to FIFO - map(0x100, 0x101).mirror(0x7e1e).w(this, FUNC(notetaker_state::DiskReg_w)); // I/O register (adc speed, crtc pixel clock and clock enable, +5 and +12v relays for floppy, etc) + map(0xc0, 0xc1).mirror(0x7e1e).w(FUNC(notetaker_state::FIFOBus_w)); // DAC data write to FIFO + map(0x100, 0x101).mirror(0x7e1e).w(FUNC(notetaker_state::DiskReg_w)); // I/O register (adc speed, crtc pixel clock and clock enable, +5 and +12v relays for floppy, etc) map(0x120, 0x127).mirror(0x7e18).rw(m_fdc, FUNC(fd1791_device::read), FUNC(fd1791_device::write)).umask16(0x00ff); // floppy controller map(0x140, 0x15f).mirror(0x7e00).rw(m_crtc, FUNC(crt5027_device::read), FUNC(crt5027_device::write)).umask16(0x00ff); // crt controller - map(0x160, 0x161).mirror(0x7e1e).w(this, FUNC(notetaker_state::LoadDispAddr_w)); // loads the start address for the display framebuffer - map(0x1a0, 0x1a1).mirror(0x7e10).r(this, FUNC(notetaker_state::ReadEIAStatus_r)); // read eia fifo state + map(0x160, 0x161).mirror(0x7e1e).w(FUNC(notetaker_state::LoadDispAddr_w)); // loads the start address for the display framebuffer + map(0x1a0, 0x1a1).mirror(0x7e10).r(FUNC(notetaker_state::ReadEIAStatus_r)); // read eia fifo state map(0x1a2, 0x1a2).mirror(0x7e10).r(m_eiauart, FUNC(ay31015_device::receive)); // read eia data - map(0x1a8, 0x1a9).mirror(0x7e10).w(this, FUNC(notetaker_state::LoadEIACtlReg_w)); // eia uart control register + map(0x1a8, 0x1a9).mirror(0x7e10).w(FUNC(notetaker_state::LoadEIACtlReg_w)); // eia uart control register map(0x1aa, 0x1aa).mirror(0x7e10).w(m_eiauart, FUNC(ay31015_device::transmit)); // eia uart data register - map(0x1ac, 0x1ad).mirror(0x7e10).w(this, FUNC(notetaker_state::EIADataReset_w)); // eia uart ddr switch (data reset) - map(0x1ae, 0x1af).mirror(0x7e10).w(this, FUNC(notetaker_state::EIAChipReset_w)); // eia uart reset - //map(0x1c0, 0x1c1).mirror(0x7e1e).r(this, FUNC(notetaker_state::SelADCHi_r)); // ADC read - //map(0x1e0, 0x1e1).mirror(0x7e1e).r(this, FUNC(notetaker_state::CRTSwitch_w)); // CRT power enable? + map(0x1ac, 0x1ad).mirror(0x7e10).w(FUNC(notetaker_state::EIADataReset_w)); // eia uart ddr switch (data reset) + map(0x1ae, 0x1af).mirror(0x7e10).w(FUNC(notetaker_state::EIAChipReset_w)); // eia uart reset + //map(0x1c0, 0x1c1).mirror(0x7e1e).r(FUNC(notetaker_state::SelADCHi_r)); // ADC read + //map(0x1e0, 0x1e1).mirror(0x7e1e).r(FUNC(notetaker_state::CRTSwitch_w)); // CRT power enable? } /* iop_pic8259 interrupts: @@ -703,8 +703,8 @@ void notetaker_state::ep_mem(address_map &map) { map(0x00000, 0x01fff).mirror(0xc0000).ram(); // actually a banked block of ram, 8kb (4kw) map(0x02000, 0x3ffff).mirror(0xc0000).ram().region("mainram", 0x2000); // 256k of ram (less 8k), shared between both processors, mirrored 4 times - //map(0xfffc0, 0xfffdf).mirror(0xc0000).rw(this, FUNC(notetaker_state::proc_illinst_r), FUNC(notetaker_state::proc_illinst_w)); - //map(0xfffe0, 0xfffef).mirror(0xc0000).rw(this, FUNC(notetaker_state::proc_control_r), FUNC(notetaker_state::proc_control_w)); + //map(0xfffc0, 0xfffdf).mirror(0xc0000).rw(FUNC(notetaker_state::proc_illinst_r), FUNC(notetaker_state::proc_illinst_w)); + //map(0xfffe0, 0xfffef).mirror(0xc0000).rw(FUNC(notetaker_state::proc_control_r), FUNC(notetaker_state::proc_control_w)); } /* note everything in the emulatorcpu's io range is incompletely decoded; so if @@ -725,7 +725,7 @@ void notetaker_state::ep_io(address_map &map) map.unmap_value_high(); map(0x800, 0x803).mirror(0x07fc).rw(m_ep_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); //map(0x1000, 0x1001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("debug8255", 8255_device, read, write) // debugger board 8255, is this the same one as the iop accesses? or are these two 8255s on separate cards? - map(0x2000, 0x2001).mirror(0x07fe).w(this, FUNC(notetaker_state::EPConReg_w)); // emu processor control reg & leds + map(0x2000, 0x2001).mirror(0x07fe).w(FUNC(notetaker_state::EPConReg_w)); // emu processor control reg & leds //map(0x4000, 0x4001) AM_MIRROR(0x07fe) AM_WRITE(EmuClearParity_w) // writes here clear the local 8k-ram parity error register } diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp index 3108cc31c94..3f7e6b269df 100644 --- a/src/mame/drivers/nova2001.cpp +++ b/src/mame/drivers/nova2001.cpp @@ -183,10 +183,10 @@ MACHINE_START_MEMBER(nova2001_state,ninjakun) void nova2001_state::nova2001_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xa000, 0xa7ff).ram().w(this, FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); - map(0xa800, 0xafff).ram().w(this, FUNC(nova2001_state::nova2001_bg_videoram_w)).share("bg_videoram"); + map(0xa000, 0xa7ff).ram().w(FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); + map(0xa800, 0xafff).ram().w(FUNC(nova2001_state::nova2001_bg_videoram_w)).share("bg_videoram"); map(0xb000, 0xb7ff).ram().share("spriteram"); - map(0xb800, 0xbfff).w(this, FUNC(nova2001_state::nova2001_flipscreen_w)); + map(0xb800, 0xbfff).w(FUNC(nova2001_state::nova2001_flipscreen_w)); map(0xc000, 0xc000).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xc001, 0xc001).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xc002, 0xc002).w("ay1", FUNC(ay8910_device::address_w)); @@ -209,12 +209,12 @@ void nova2001_state::ninjakun_cpu1_map(address_map &map) map(0x8003, 0x8003).r("ay2", FUNC(ay8910_device::data_r)); map(0xa000, 0xa000).portr("IN0"); map(0xa001, 0xa001).portr("IN1"); - map(0xa002, 0xa002).portr("IN2").w(this, FUNC(nova2001_state::ninjakun_cpu1_io_A002_w)); - map(0xa003, 0xa003).w(this, FUNC(nova2001_state::pkunwar_flipscreen_w)); - map(0xc000, 0xc7ff).ram().w(this, FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); - map(0xc800, 0xcfff).rw(this, FUNC(nova2001_state::ninjakun_bg_videoram_r), FUNC(nova2001_state::ninjakun_bg_videoram_w)).share("bg_videoram"); + map(0xa002, 0xa002).portr("IN2").w(FUNC(nova2001_state::ninjakun_cpu1_io_A002_w)); + map(0xa003, 0xa003).w(FUNC(nova2001_state::pkunwar_flipscreen_w)); + map(0xc000, 0xc7ff).ram().w(FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); + map(0xc800, 0xcfff).rw(FUNC(nova2001_state::ninjakun_bg_videoram_r), FUNC(nova2001_state::ninjakun_bg_videoram_w)).share("bg_videoram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xd9ff).ram().w(this, FUNC(nova2001_state::ninjakun_paletteram_w)).share("palette"); + map(0xd800, 0xd9ff).ram().w(FUNC(nova2001_state::ninjakun_paletteram_w)).share("palette"); map(0xe000, 0xe3ff).ram().share("share1"); map(0xe400, 0xe7ff).ram().share("share2"); } @@ -229,12 +229,12 @@ void nova2001_state::ninjakun_cpu2_map(address_map &map) map(0x8003, 0x8003).r("ay2", FUNC(ay8910_device::data_r)); map(0xa000, 0xa000).portr("IN0"); map(0xa001, 0xa001).portr("IN1"); - map(0xa002, 0xa002).portr("IN2").w(this, FUNC(nova2001_state::ninjakun_cpu2_io_A002_w)); - map(0xa003, 0xa003).w(this, FUNC(nova2001_state::nova2001_flipscreen_w)); - map(0xc000, 0xc7ff).ram().w(this, FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); - map(0xc800, 0xcfff).rw(this, FUNC(nova2001_state::ninjakun_bg_videoram_r), FUNC(nova2001_state::ninjakun_bg_videoram_w)).share("bg_videoram"); + map(0xa002, 0xa002).portr("IN2").w(FUNC(nova2001_state::ninjakun_cpu2_io_A002_w)); + map(0xa003, 0xa003).w(FUNC(nova2001_state::nova2001_flipscreen_w)); + map(0xc000, 0xc7ff).ram().w(FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); + map(0xc800, 0xcfff).rw(FUNC(nova2001_state::ninjakun_bg_videoram_r), FUNC(nova2001_state::ninjakun_bg_videoram_w)).share("bg_videoram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xd9ff).ram().w(this, FUNC(nova2001_state::ninjakun_paletteram_w)).share("palette"); + map(0xd800, 0xd9ff).ram().w(FUNC(nova2001_state::ninjakun_paletteram_w)).share("palette"); map(0xe000, 0xe3ff).ram().share("share2"); /* swapped wrt CPU1 */ map(0xe400, 0xe7ff).ram().share("share1"); /* swapped wrt CPU1 */ } @@ -244,7 +244,7 @@ void nova2001_state::pkunwar_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("spriteram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(nova2001_state::nova2001_bg_videoram_w)).share("bg_videoram"); + map(0x8800, 0x8fff).ram().w(FUNC(nova2001_state::nova2001_bg_videoram_w)).share("bg_videoram"); map(0xa000, 0xa001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0xa001, 0xa001).r("ay1", FUNC(ay8910_device::data_r)); map(0xa002, 0xa003).w("ay2", FUNC(ay8910_device::address_data_w)); @@ -256,7 +256,7 @@ void nova2001_state::pkunwar_map(address_map &map) void nova2001_state::pkunwar_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(nova2001_state::pkunwar_flipscreen_w)); + map(0x00, 0x00).w(FUNC(nova2001_state::pkunwar_flipscreen_w)); } @@ -264,16 +264,16 @@ void nova2001_state::raiders5_cpu1_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("spriteram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); - map(0x9000, 0x97ff).rw(this, FUNC(nova2001_state::ninjakun_bg_videoram_r), FUNC(nova2001_state::ninjakun_bg_videoram_w)).share("bg_videoram"); - map(0xa000, 0xa000).w(this, FUNC(nova2001_state::nova2001_scroll_x_w)); - map(0xa001, 0xa001).w(this, FUNC(nova2001_state::nova2001_scroll_y_w)); - map(0xa002, 0xa002).w(this, FUNC(nova2001_state::pkunwar_flipscreen_w)); + map(0x8800, 0x8fff).ram().w(FUNC(nova2001_state::nova2001_fg_videoram_w)).share("fg_videoram"); + map(0x9000, 0x97ff).rw(FUNC(nova2001_state::ninjakun_bg_videoram_r), FUNC(nova2001_state::ninjakun_bg_videoram_w)).share("bg_videoram"); + map(0xa000, 0xa000).w(FUNC(nova2001_state::nova2001_scroll_x_w)); + map(0xa001, 0xa001).w(FUNC(nova2001_state::nova2001_scroll_y_w)); + map(0xa002, 0xa002).w(FUNC(nova2001_state::pkunwar_flipscreen_w)); map(0xc000, 0xc001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0xc001, 0xc001).r("ay1", FUNC(ay8910_device::data_r)); map(0xc002, 0xc003).w("ay2", FUNC(ay8910_device::address_data_w)); map(0xc003, 0xc003).r("ay2", FUNC(ay8910_device::data_r)); - map(0xd000, 0xd1ff).ram().w(this, FUNC(nova2001_state::ninjakun_paletteram_w)).share("palette"); + map(0xd000, 0xd1ff).ram().w(FUNC(nova2001_state::ninjakun_paletteram_w)).share("palette"); map(0xe000, 0xe7ff).ram().share("share1"); } @@ -289,9 +289,9 @@ void nova2001_state::raiders5_cpu2_map(address_map &map) map(0xc000, 0xc000).nopr(); /* unknown */ map(0xc800, 0xc800).nopr(); /* unknown */ map(0xd000, 0xd000).nopr(); /* unknown */ - map(0xe000, 0xe000).w(this, FUNC(nova2001_state::nova2001_scroll_x_w)); - map(0xe001, 0xe001).w(this, FUNC(nova2001_state::nova2001_scroll_y_w)); - map(0xe002, 0xe002).w(this, FUNC(nova2001_state::pkunwar_flipscreen_w)); + map(0xe000, 0xe000).w(FUNC(nova2001_state::nova2001_scroll_x_w)); + map(0xe001, 0xe001).w(FUNC(nova2001_state::nova2001_scroll_y_w)); + map(0xe002, 0xe002).w(FUNC(nova2001_state::pkunwar_flipscreen_w)); } void nova2001_state::raiders5_io(address_map &map) diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index 56a0167a856..d515d4320e7 100644 --- a/src/mame/drivers/novag6502.cpp +++ b/src/mame/drivers/novag6502.cpp @@ -516,16 +516,16 @@ void novag6502_state::supercon_map(address_map &map) map(0x0000, 0x0fff).ram().share("nvram"); map(0x1c00, 0x1c00).nopw(); // printer/clock? map(0x1d00, 0x1d00).nopw(); // printer/clock? - map(0x1e00, 0x1e00).rw(this, FUNC(novag6502_state::supercon_input2_r), FUNC(novag6502_state::supercon_mux_w)); - map(0x1f00, 0x1f00).rw(this, FUNC(novag6502_state::supercon_input1_r), FUNC(novag6502_state::supercon_control_w)); + map(0x1e00, 0x1e00).rw(FUNC(novag6502_state::supercon_input2_r), FUNC(novag6502_state::supercon_mux_w)); + map(0x1f00, 0x1f00).rw(FUNC(novag6502_state::supercon_input1_r), FUNC(novag6502_state::supercon_control_w)); map(0x2000, 0xffff).rom(); } void novag6502_state::cforte_map(address_map &map) { supercon_map(map); - map(0x1e00, 0x1e00).rw(this, FUNC(novag6502_state::supercon_input2_r), FUNC(novag6502_state::cforte_mux_w)); - map(0x1f00, 0x1f00).rw(this, FUNC(novag6502_state::supercon_input1_r), FUNC(novag6502_state::cforte_control_w)); + map(0x1e00, 0x1e00).rw(FUNC(novag6502_state::supercon_input2_r), FUNC(novag6502_state::cforte_mux_w)); + map(0x1f00, 0x1f00).rw(FUNC(novag6502_state::supercon_input1_r), FUNC(novag6502_state::cforte_control_w)); } @@ -534,12 +534,12 @@ void novag6502_state::cforte_map(address_map &map) void novag6502_state::sforte_map(address_map &map) { map(0x0000, 0x1fef).ram().share("nvram"); // 8KB RAM, but RAM CE pin is deactivated on $1ff0-$1fff - map(0x1ff0, 0x1ff0).r(this, FUNC(novag6502_state::sexpert_input1_r)); - map(0x1ff1, 0x1ff1).r(this, FUNC(novag6502_state::sexpert_input2_r)); + map(0x1ff0, 0x1ff0).r(FUNC(novag6502_state::sexpert_input1_r)); + map(0x1ff1, 0x1ff1).r(FUNC(novag6502_state::sexpert_input2_r)); map(0x1ff2, 0x1ff2).nopw(); // printer map(0x1ff3, 0x1ff3).nopw(); // printer - map(0x1ff6, 0x1ff6).w(this, FUNC(novag6502_state::sforte_lcd_control_w)); - map(0x1ff7, 0x1ff7).w(this, FUNC(novag6502_state::sforte_lcd_data_w)); + map(0x1ff6, 0x1ff6).w(FUNC(novag6502_state::sforte_lcd_control_w)); + map(0x1ff7, 0x1ff7).w(FUNC(novag6502_state::sforte_lcd_data_w)); map(0x1ffc, 0x1fff).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x2000, 0x7fff).rom(); map(0x8000, 0xffff).bankr("rombank"); @@ -548,10 +548,10 @@ void novag6502_state::sforte_map(address_map &map) void novag6502_state::sexpert_map(address_map &map) { sforte_map(map); - map(0x1ff4, 0x1ff4).w(this, FUNC(novag6502_state::sexpert_leds_w)); - map(0x1ff5, 0x1ff5).w(this, FUNC(novag6502_state::sexpert_mux_w)); - map(0x1ff6, 0x1ff6).w(this, FUNC(novag6502_state::sexpert_lcd_control_w)); - map(0x1ff7, 0x1ff7).w(this, FUNC(novag6502_state::sexpert_lcd_data_w)); + map(0x1ff4, 0x1ff4).w(FUNC(novag6502_state::sexpert_leds_w)); + map(0x1ff5, 0x1ff5).w(FUNC(novag6502_state::sexpert_mux_w)); + map(0x1ff6, 0x1ff6).w(FUNC(novag6502_state::sexpert_lcd_control_w)); + map(0x1ff7, 0x1ff7).w(FUNC(novag6502_state::sexpert_lcd_data_w)); } diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp index ab767d36f93..1510cb69f5c 100644 --- a/src/mame/drivers/novag68k.cpp +++ b/src/mame/drivers/novag68k.cpp @@ -155,17 +155,17 @@ void novag68k_state::diablo68k_map(address_map &map) map(0x280000, 0x28ffff).ram(); map(0x300000, 0x300007).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)).umask16(0xff00); map(0x380000, 0x380001).nopr(); - map(0x380000, 0x380000).w(this, FUNC(novag68k_state::diablo68k_leds_w)); - map(0x3a0000, 0x3a0000).w(this, FUNC(novag68k_state::diablo68k_lcd_data_w)); - map(0x3c0000, 0x3c0000).rw(this, FUNC(novag68k_state::diablo68k_input2_r), FUNC(novag68k_state::diablo68k_control_w)); - map(0x3e0000, 0x3e0000).r(this, FUNC(novag68k_state::diablo68k_input1_r)); + map(0x380000, 0x380000).w(FUNC(novag68k_state::diablo68k_leds_w)); + map(0x3a0000, 0x3a0000).w(FUNC(novag68k_state::diablo68k_lcd_data_w)); + map(0x3c0000, 0x3c0000).rw(FUNC(novag68k_state::diablo68k_input2_r), FUNC(novag68k_state::diablo68k_control_w)); + map(0x3e0000, 0x3e0000).r(FUNC(novag68k_state::diablo68k_input1_r)); map(0xff8000, 0xffbfff).ram().share("nvram"); } void novag68k_state::scorpio68k_map(address_map &map) { diablo68k_map(map); - map(0x380000, 0x380000).w(this, FUNC(novag68k_state::scorpio68k_control_w)); + map(0x380000, 0x380000).w(FUNC(novag68k_state::scorpio68k_control_w)); map(0x3c0000, 0x3c0001).nopw(); } diff --git a/src/mame/drivers/novagf8.cpp b/src/mame/drivers/novagf8.cpp index 089703a890e..58c0581bd40 100644 --- a/src/mame/drivers/novagf8.cpp +++ b/src/mame/drivers/novagf8.cpp @@ -128,8 +128,8 @@ void novagf8_state::delta1_map(address_map &map) void novagf8_state::delta1_io(address_map &map) { - map(0x0, 0x0).rw(this, FUNC(novagf8_state::delta1_io0_r), FUNC(novagf8_state::delta1_io0_w)); - map(0x1, 0x1).rw(this, FUNC(novagf8_state::delta1_io1_r), FUNC(novagf8_state::delta1_io1_w)); + map(0x0, 0x0).rw(FUNC(novagf8_state::delta1_io0_r), FUNC(novagf8_state::delta1_io0_w)); + map(0x1, 0x1).rw(FUNC(novagf8_state::delta1_io1_r), FUNC(novagf8_state::delta1_io1_w)); map(0xc, 0xf).rw("f3853", FUNC(f3853_device::read), FUNC(f3853_device::write)); } diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp index aa55c4693da..52b680875e7 100644 --- a/src/mame/drivers/nsm.cpp +++ b/src/mame/drivers/nsm.cpp @@ -63,18 +63,18 @@ void nsm_state::nsm_map(address_map &map) void nsm_state::nsm_io_map(address_map &map) { // 00-71 selected by IC600 (74LS151) - map(0x0000, 0x0001).r(this, FUNC(nsm_state::ff_r)); // 5v supply + map(0x0000, 0x0001).r(FUNC(nsm_state::ff_r)); // 5v supply map(0x0010, 0x0011).nopr(); // antenna map(0x0020, 0x0021).nopr(); // reset circuit - map(0x0030, 0x0031).r(this, FUNC(nsm_state::ff_r)); // service plug - map(0x0040, 0x0041).r(this, FUNC(nsm_state::ff_r)); // service plug - map(0x0050, 0x0051).r(this, FUNC(nsm_state::ff_r)); // test of internal battery - map(0x0060, 0x0061).r(this, FUNC(nsm_state::ff_r)); // sum of analog outputs of ay2 + map(0x0030, 0x0031).r(FUNC(nsm_state::ff_r)); // service plug + map(0x0040, 0x0041).r(FUNC(nsm_state::ff_r)); // service plug + map(0x0050, 0x0051).r(FUNC(nsm_state::ff_r)); // test of internal battery + map(0x0060, 0x0061).r(FUNC(nsm_state::ff_r)); // sum of analog outputs of ay2 //AM_RANGE(0x0070, 0x0071) AM_READNOP // serial data in map(0x0f70, 0x0f7d).nopw(); map(0x0fe4, 0x0fff).nopr(); - map(0x7fb0, 0x7fbf).w(this, FUNC(nsm_state::cru_w)); - map(0x7fd0, 0x7fd1).w(this, FUNC(nsm_state::oe_w)); + map(0x7fb0, 0x7fbf).w(FUNC(nsm_state::cru_w)); + map(0x7fd0, 0x7fd1).w(FUNC(nsm_state::oe_w)); } static INPUT_PORTS_START( nsm ) diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp index d0d73e0a17b..6cab2b00c64 100644 --- a/src/mame/drivers/nsmpoker.cpp +++ b/src/mame/drivers/nsmpoker.cpp @@ -182,14 +182,14 @@ void nsmpoker_state::nsmpoker_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x9000, 0xafff).ram(); // OK... cleared at beginning. map(0xb000, 0xcfff).rom(); // WRONG... just to map the last rom somewhere. - map(0xe000, 0xefff).ram().w(this, FUNC(nsmpoker_state::nsmpoker_videoram_w)).share("videoram"); // WRONG... just a placeholder. - map(0xf000, 0xffff).ram().w(this, FUNC(nsmpoker_state::nsmpoker_colorram_w)).share("colorram"); // WRONG... just a placeholder. + map(0xe000, 0xefff).ram().w(FUNC(nsmpoker_state::nsmpoker_videoram_w)).share("videoram"); // WRONG... just a placeholder. + map(0xf000, 0xffff).ram().w(FUNC(nsmpoker_state::nsmpoker_colorram_w)).share("colorram"); // WRONG... just a placeholder. } void nsmpoker_state::nsmpoker_portmap(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).r(this, FUNC(nsmpoker_state::debug_r)); // kind of trap at beginning + map(0xf0, 0xf0).r(FUNC(nsmpoker_state::debug_r)); // kind of trap at beginning } /* I/O byte R/W diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp index 37e076104f7..c1a2845d482 100644 --- a/src/mame/drivers/nss.cpp +++ b/src/mame/drivers/nss.cpp @@ -369,9 +369,9 @@ uint32_t nss_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, void nss_state::snes_map(address_map &map) { - map(0x000000, 0x7dffff).rw(this, FUNC(nss_state::snes_r_bank1), FUNC(nss_state::snes_w_bank1)); + map(0x000000, 0x7dffff).rw(FUNC(nss_state::snes_r_bank1), FUNC(nss_state::snes_w_bank1)); map(0x7e0000, 0x7fffff).ram(); /* 8KB Low RAM, 24KB High RAM, 96KB Expanded RAM */ - map(0x800000, 0xffffff).rw(this, FUNC(nss_state::snes_r_bank2), FUNC(nss_state::snes_w_bank2)); /* Mirror and ROM */ + map(0x800000, 0xffffff).rw(FUNC(nss_state::snes_r_bank2), FUNC(nss_state::snes_w_bank2)); /* Mirror and ROM */ } READ8_MEMBER(nss_state::spc_ram_100_r) @@ -388,7 +388,7 @@ void nss_state::spc_mem(address_map &map) { map(0x0000, 0x00ef).rw(m_spc700, FUNC(snes_sound_device::spc_ram_r), FUNC(snes_sound_device::spc_ram_w)); /* lower 32k ram */ map(0x00f0, 0x00ff).rw(m_spc700, FUNC(snes_sound_device::spc_io_r), FUNC(snes_sound_device::spc_io_w)); /* spc io */ - map(0x0100, 0xffff).rw(this, FUNC(nss_state::spc_ram_100_r), FUNC(nss_state::spc_ram_100_w)); + map(0x0100, 0xffff).rw(FUNC(nss_state::spc_ram_100_r), FUNC(nss_state::spc_ram_100_w)); } /* NSS specific */ @@ -512,10 +512,10 @@ void nss_state::bios_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0x9000, 0x9fff).rw(this, FUNC(nss_state::ram_wp_r), FUNC(nss_state::ram_wp_w)); + map(0x9000, 0x9fff).rw(FUNC(nss_state::ram_wp_r), FUNC(nss_state::ram_wp_w)); map(0xa000, 0xa000).portr("EEPROMIN"); map(0xc000, 0xdfff).rom().region("ibios_rom", 0x6000); - map(0xe000, 0xffff).rw(this, FUNC(nss_state::nss_prot_r), FUNC(nss_state::nss_prot_w)); + map(0xe000, 0xffff).rw(FUNC(nss_state::nss_prot_r), FUNC(nss_state::nss_prot_w)); } READ8_MEMBER(nss_state::port_00_r) @@ -631,12 +631,12 @@ WRITE8_MEMBER(nss_state::port_07_w) void nss_state::bios_io_map(address_map &map) { map.global_mask(0x7); - map(0x00, 0x00).r(this, FUNC(nss_state::port_00_r)).w(this, FUNC(nss_state::port_00_w)); - map(0x01, 0x01).portr("FP").w(this, FUNC(nss_state::port_01_w)); - map(0x02, 0x02).portr("SYSTEM").w(this, FUNC(nss_state::port_02_w)); - map(0x03, 0x03).portr("RTC").w(this, FUNC(nss_state::port_03_w)); - map(0x04, 0x04).w(this, FUNC(nss_state::port_04_w)); - map(0x07, 0x07).w(this, FUNC(nss_state::port_07_w)); + map(0x00, 0x00).r(FUNC(nss_state::port_00_r)).w(FUNC(nss_state::port_00_w)); + map(0x01, 0x01).portr("FP").w(FUNC(nss_state::port_01_w)); + map(0x02, 0x02).portr("SYSTEM").w(FUNC(nss_state::port_02_w)); + map(0x03, 0x03).portr("RTC").w(FUNC(nss_state::port_03_w)); + map(0x04, 0x04).w(FUNC(nss_state::port_04_w)); + map(0x07, 0x07).w(FUNC(nss_state::port_07_w)); } void nss_state::machine_start() diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp index 4b95bd3ca98..2f33dbefebd 100644 --- a/src/mame/drivers/nwk-tr.cpp +++ b/src/mame/drivers/nwk-tr.cpp @@ -664,17 +664,17 @@ void nwktr_state::nwktr_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("work_ram"); /* Work RAM */ map(0x74000000, 0x740000ff).rw(m_k001604, FUNC(k001604_device::reg_r), FUNC(k001604_device::reg_w)); - map(0x74010000, 0x74017fff).ram().w(this, FUNC(nwktr_state::paletteram32_w)).share("paletteram"); + map(0x74010000, 0x74017fff).ram().w(FUNC(nwktr_state::paletteram32_w)).share("paletteram"); map(0x74020000, 0x7403ffff).rw(m_k001604, FUNC(k001604_device::tile_r), FUNC(k001604_device::tile_w)); map(0x74040000, 0x7407ffff).rw(m_k001604, FUNC(k001604_device::char_r), FUNC(k001604_device::char_w)); map(0x78000000, 0x7800ffff).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_r_ppc), FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); map(0x780c0000, 0x780c0003).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_comm_r_ppc), FUNC(konppc_device::cgboard_dsp_comm_w_ppc)); - map(0x7d000000, 0x7d00ffff).r(this, FUNC(nwktr_state::sysreg_r)); - map(0x7d010000, 0x7d01ffff).w(this, FUNC(nwktr_state::sysreg_w)); + map(0x7d000000, 0x7d00ffff).r(FUNC(nwktr_state::sysreg_r)); + map(0x7d010000, 0x7d01ffff).w(FUNC(nwktr_state::sysreg_w)); map(0x7d020000, 0x7d021fff).rw("m48t58", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); /* M48T58Y RTC/NVRAM */ map(0x7d030000, 0x7d03000f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)); - map(0x7d040000, 0x7d04ffff).rw(this, FUNC(nwktr_state::lanc1_r), FUNC(nwktr_state::lanc1_w)); - map(0x7d050000, 0x7d05ffff).rw(this, FUNC(nwktr_state::lanc2_r), FUNC(nwktr_state::lanc2_w)); + map(0x7d040000, 0x7d04ffff).rw(FUNC(nwktr_state::lanc1_r), FUNC(nwktr_state::lanc1_w)); + map(0x7d050000, 0x7d05ffff).rw(FUNC(nwktr_state::lanc2_r), FUNC(nwktr_state::lanc2_w)); map(0x7e000000, 0x7e7fffff).rom().region("user2", 0); /* Data ROM */ map(0x7f000000, 0x7f1fffff).rom().share("share2"); map(0x7fe00000, 0x7fffffff).rom().region("user1", 0).share("share2"); /* Program ROM */ @@ -688,8 +688,8 @@ void nwktr_state::sound_memmap(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x200000, 0x200fff).rw("rfsnd", FUNC(rf5c400_device::rf5c400_r), FUNC(rf5c400_device::rf5c400_w)); /* Ricoh RF5C400 */ map(0x300000, 0x30001f).rw(m_k056800, FUNC(k056800_device::sound_r), FUNC(k056800_device::sound_w)).umask16(0x00ff); - map(0x500000, 0x500001).w(this, FUNC(nwktr_state::soundtimer_en_w)).nopr(); - map(0x600000, 0x600001).w(this, FUNC(nwktr_state::soundtimer_count_w)).nopr(); + map(0x500000, 0x500001).w(FUNC(nwktr_state::soundtimer_en_w)).nopr(); + map(0x600000, 0x600001).w(FUNC(nwktr_state::soundtimer_count_w)).nopr(); } /*****************************************************************************/ @@ -718,7 +718,7 @@ WRITE32_MEMBER(nwktr_state::dsp_dataram1_w) void nwktr_state::sharc0_map(address_map &map) { map(0x0400000, 0x041ffff).rw(m_konppc, FUNC(konppc_device::cgboard_0_shared_sharc_r), FUNC(konppc_device::cgboard_0_shared_sharc_w)); - map(0x0500000, 0x05fffff).rw(this, FUNC(nwktr_state::dsp_dataram0_r), FUNC(nwktr_state::dsp_dataram0_w)); + map(0x0500000, 0x05fffff).rw(FUNC(nwktr_state::dsp_dataram0_r), FUNC(nwktr_state::dsp_dataram0_w)); map(0x1400000, 0x14fffff).ram(); map(0x2400000, 0x27fffff).rw(m_konppc, FUNC(konppc_device::nwk_voodoo_0_r), FUNC(konppc_device::nwk_voodoo_0_w)); map(0x3400000, 0x34000ff).rw(m_konppc, FUNC(konppc_device::cgboard_0_comm_sharc_r), FUNC(konppc_device::cgboard_0_comm_sharc_w)); @@ -729,7 +729,7 @@ void nwktr_state::sharc0_map(address_map &map) void nwktr_state::sharc1_map(address_map &map) { map(0x0400000, 0x041ffff).rw(m_konppc, FUNC(konppc_device::cgboard_1_shared_sharc_r), FUNC(konppc_device::cgboard_1_shared_sharc_w)); - map(0x0500000, 0x05fffff).rw(this, FUNC(nwktr_state::dsp_dataram1_r), FUNC(nwktr_state::dsp_dataram1_w)); + map(0x0500000, 0x05fffff).rw(FUNC(nwktr_state::dsp_dataram1_r), FUNC(nwktr_state::dsp_dataram1_w)); map(0x1400000, 0x14fffff).ram(); map(0x2400000, 0x27fffff).rw(m_konppc, FUNC(konppc_device::nwk_voodoo_0_r), FUNC(konppc_device::nwk_voodoo_0_w)); map(0x3400000, 0x34000ff).rw(m_konppc, FUNC(konppc_device::cgboard_1_comm_sharc_r), FUNC(konppc_device::cgboard_1_comm_sharc_w)); diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index bd6fc1d5de3..f9c34cee7f3 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -285,46 +285,46 @@ void nycaptor_state::nycaptor_master_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xc7ff).ram().w(this, FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); + map(0xc000, 0xc7ff).ram().w(FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); map(0xd000, 0xd000).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0xd001, 0xd001).w(this, FUNC(nycaptor_state::sub_cpu_halt_w)); - map(0xd002, 0xd002).rw(this, FUNC(nycaptor_state::nycaptor_generic_control_r), FUNC(nycaptor_state::nycaptor_generic_control_w)); /* bit 3 - memory bank at 0x8000-0xbfff */ + map(0xd001, 0xd001).w(FUNC(nycaptor_state::sub_cpu_halt_w)); + map(0xd002, 0xd002).rw(FUNC(nycaptor_state::nycaptor_generic_control_r), FUNC(nycaptor_state::nycaptor_generic_control_w)); /* bit 3 - memory bank at 0x8000-0xbfff */ map(0xd400, 0xd400).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xd401, 0xd401).nopr(); - map(0xd403, 0xd403).w(this, FUNC(nycaptor_state::sound_cpu_reset_w)); + map(0xd403, 0xd403).w(FUNC(nycaptor_state::sound_cpu_reset_w)); map(0xd800, 0xd800).portr("DSWA"); map(0xd801, 0xd801).portr("DSWB"); map(0xd802, 0xd802).portr("DSWC"); map(0xd803, 0xd803).portr("IN0"); map(0xd804, 0xd804).portr("IN1"); - map(0xd805, 0xd805).r(this, FUNC(nycaptor_state::nycaptor_mcu_status_r1)); - map(0xd806, 0xd806).r(this, FUNC(nycaptor_state::sound_status_r)); - map(0xd807, 0xd807).r(this, FUNC(nycaptor_state::nycaptor_mcu_status_r2)); + map(0xd805, 0xd805).r(FUNC(nycaptor_state::nycaptor_mcu_status_r1)); + map(0xd806, 0xd806).r(FUNC(nycaptor_state::sound_status_r)); + map(0xd807, 0xd807).r(FUNC(nycaptor_state::nycaptor_mcu_status_r2)); map(0xdc00, 0xdc9f).ram().share("spriteram"); - map(0xdca0, 0xdcbf).ram().w(this, FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); + map(0xdca0, 0xdcbf).ram().w(FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); map(0xdce1, 0xdce1).nopw(); - map(0xdd00, 0xdeff).rw(this, FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); - map(0xdf03, 0xdf03).rw(this, FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); + map(0xdd00, 0xdeff).rw(FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); + map(0xdf03, 0xdf03).rw(FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); map(0xe000, 0xffff).ram().share("sharedram"); } void nycaptor_state::nycaptor_slave_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xc000, 0xc7ff).ram().w(this, FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); + map(0xc000, 0xc7ff).ram().w(FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); map(0xd800, 0xd800).portr("DSWA"); map(0xd801, 0xd801).portr("DSWB"); map(0xd802, 0xd802).portr("DSWC"); map(0xd803, 0xd803).portr("IN0"); map(0xd804, 0xd804).portr("IN1"); map(0xdc00, 0xdc9f).ram().share("spriteram"); - map(0xdca0, 0xdcbf).w(this, FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); + map(0xdca0, 0xdcbf).w(FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); - map(0xdd00, 0xdeff).rw(this, FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); - map(0xdf00, 0xdf00).r(this, FUNC(nycaptor_state::nycaptor_bx_r)); - map(0xdf01, 0xdf01).r(this, FUNC(nycaptor_state::nycaptor_by_r)); - map(0xdf02, 0xdf02).r(this, FUNC(nycaptor_state::nycaptor_b_r)); - map(0xdf03, 0xdf03).r(this, FUNC(nycaptor_state::nycaptor_gfxctrl_r)).nopw();/* ? gfx control ? */ + map(0xdd00, 0xdeff).rw(FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); + map(0xdf00, 0xdf00).r(FUNC(nycaptor_state::nycaptor_bx_r)); + map(0xdf01, 0xdf01).r(FUNC(nycaptor_state::nycaptor_by_r)); + map(0xdf02, 0xdf02).r(FUNC(nycaptor_state::nycaptor_b_r)); + map(0xdf03, 0xdf03).r(FUNC(nycaptor_state::nycaptor_gfxctrl_r)).nopw();/* ? gfx control ? */ map(0xe000, 0xffff).ram().share("sharedram"); } @@ -339,9 +339,9 @@ void nycaptor_state::sound_map(address_map &map) map(0xcb00, 0xcb00).nopw(); map(0xcc00, 0xcc00).nopw(); map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); - map(0xd200, 0xd200).nopr().w(this, FUNC(nycaptor_state::nmi_enable_w)); - map(0xd400, 0xd400).w(this, FUNC(nycaptor_state::nmi_disable_w)); - map(0xd600, 0xd600).w("dac", FUNC(dac_byte_interface::write)); //otherwise no girl's scream in cycle shooting, see MT03975 + map(0xd200, 0xd200).nopr().w(FUNC(nycaptor_state::nmi_enable_w)); + map(0xd400, 0xd400).w(FUNC(nycaptor_state::nmi_disable_w)); + map(0xd600, 0xd600).w("dac", FUNC(dac_byte_interface::data_w)); //otherwise no girl's scream in cycle shooting, see MT03975 map(0xe000, 0xefff).noprw(); } @@ -383,44 +383,44 @@ void nycaptor_state::cyclshtg_master_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xcfff).ram().w(this, FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); - map(0xd000, 0xd000).rw(this, FUNC(nycaptor_state::cyclshtg_mcu_r), FUNC(nycaptor_state::cyclshtg_mcu_w)); - map(0xd001, 0xd001).w(this, FUNC(nycaptor_state::sub_cpu_halt_w)); - map(0xd002, 0xd002).rw(this, FUNC(nycaptor_state::nycaptor_generic_control_r), FUNC(nycaptor_state::cyclshtg_generic_control_w)); + map(0xc000, 0xcfff).ram().w(FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); + map(0xd000, 0xd000).rw(FUNC(nycaptor_state::cyclshtg_mcu_r), FUNC(nycaptor_state::cyclshtg_mcu_w)); + map(0xd001, 0xd001).w(FUNC(nycaptor_state::sub_cpu_halt_w)); + map(0xd002, 0xd002).rw(FUNC(nycaptor_state::nycaptor_generic_control_r), FUNC(nycaptor_state::cyclshtg_generic_control_w)); map(0xd400, 0xd400).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xd403, 0xd403).w(this, FUNC(nycaptor_state::sound_cpu_reset_w)); + map(0xd403, 0xd403).w(FUNC(nycaptor_state::sound_cpu_reset_w)); map(0xd800, 0xd800).portr("DSWA"); map(0xd801, 0xd801).portr("DSWB"); map(0xd802, 0xd802).portr("DSWC"); map(0xd803, 0xd803).portr("IN0"); map(0xd804, 0xd804).portr("IN1"); - map(0xd805, 0xd805).r(this, FUNC(nycaptor_state::cyclshtg_mcu_status_r)); - map(0xd806, 0xd806).r(this, FUNC(nycaptor_state::sound_status_r)); - map(0xd807, 0xd807).r(this, FUNC(nycaptor_state::cyclshtg_mcu_status_r)); + map(0xd805, 0xd805).r(FUNC(nycaptor_state::cyclshtg_mcu_status_r)); + map(0xd806, 0xd806).r(FUNC(nycaptor_state::sound_status_r)); + map(0xd807, 0xd807).r(FUNC(nycaptor_state::cyclshtg_mcu_status_r)); map(0xdc00, 0xdc9f).ram().share("spriteram"); - map(0xdca0, 0xdcbf).ram().w(this, FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); + map(0xdca0, 0xdcbf).ram().w(FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); map(0xdce1, 0xdce1).nopw(); - map(0xdd00, 0xdeff).rw(this, FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); - map(0xdf03, 0xdf03).rw(this, FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); + map(0xdd00, 0xdeff).rw(FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); + map(0xdf03, 0xdf03).rw(FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); map(0xe000, 0xffff).ram().share("sharedram"); } void nycaptor_state::cyclshtg_slave_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xcfff).ram().w(this, FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); + map(0xc000, 0xcfff).ram().w(FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); map(0xd800, 0xd800).portr("DSWA"); map(0xd801, 0xd801).portr("DSWB"); map(0xd802, 0xd802).portr("DSWC"); map(0xd803, 0xd803).portr("IN0"); map(0xd804, 0xd804).portr("IN1"); map(0xdc00, 0xdc9f).ram().share("spriteram"); - map(0xdca0, 0xdcbf).w(this, FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); - map(0xdd00, 0xdeff).rw(this, FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); - map(0xdf00, 0xdf00).r(this, FUNC(nycaptor_state::nycaptor_bx_r)); - map(0xdf01, 0xdf01).r(this, FUNC(nycaptor_state::nycaptor_by_r)); - map(0xdf02, 0xdf02).r(this, FUNC(nycaptor_state::nycaptor_b_r)); - map(0xdf03, 0xdf03).r(this, FUNC(nycaptor_state::nycaptor_gfxctrl_r)); + map(0xdca0, 0xdcbf).w(FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); + map(0xdd00, 0xdeff).rw(FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); + map(0xdf00, 0xdf00).r(FUNC(nycaptor_state::nycaptor_bx_r)); + map(0xdf01, 0xdf01).r(FUNC(nycaptor_state::nycaptor_by_r)); + map(0xdf02, 0xdf02).r(FUNC(nycaptor_state::nycaptor_b_r)); + map(0xdf03, 0xdf03).r(FUNC(nycaptor_state::nycaptor_gfxctrl_r)); map(0xdf03, 0xdf03).nopw(); map(0xe000, 0xffff).ram().share("sharedram"); } @@ -434,46 +434,46 @@ void nycaptor_state::bronx_master_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xcfff).ram().w(this, FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); - map(0xd000, 0xd000).r(this, FUNC(nycaptor_state::cyclshtg_mcu_r)).nopw(); - map(0xd001, 0xd001).w(this, FUNC(nycaptor_state::sub_cpu_halt_w)); - map(0xd002, 0xd002).rw(this, FUNC(nycaptor_state::nycaptor_generic_control_r), FUNC(nycaptor_state::cyclshtg_generic_control_w)); + map(0xc000, 0xcfff).ram().w(FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); + map(0xd000, 0xd000).r(FUNC(nycaptor_state::cyclshtg_mcu_r)).nopw(); + map(0xd001, 0xd001).w(FUNC(nycaptor_state::sub_cpu_halt_w)); + map(0xd002, 0xd002).rw(FUNC(nycaptor_state::nycaptor_generic_control_r), FUNC(nycaptor_state::cyclshtg_generic_control_w)); map(0xd400, 0xd400).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xd401, 0xd401).r(this, FUNC(nycaptor_state::unk_r)); - map(0xd403, 0xd403).w(this, FUNC(nycaptor_state::sound_cpu_reset_w)); + map(0xd401, 0xd401).r(FUNC(nycaptor_state::unk_r)); + map(0xd403, 0xd403).w(FUNC(nycaptor_state::sound_cpu_reset_w)); map(0xd800, 0xd800).portr("DSWA"); map(0xd801, 0xd801).portr("DSWB"); map(0xd802, 0xd802).portr("DSWC"); map(0xd803, 0xd803).portr("IN0"); map(0xd804, 0xd804).portr("IN1"); - map(0xd805, 0xd805).r(this, FUNC(nycaptor_state::cyclshtg_mcu_status_r)); - map(0xd806, 0xd806).r(this, FUNC(nycaptor_state::sound_status_r)); - map(0xd807, 0xd807).r(this, FUNC(nycaptor_state::cyclshtg_mcu_status_r)); + map(0xd805, 0xd805).r(FUNC(nycaptor_state::cyclshtg_mcu_status_r)); + map(0xd806, 0xd806).r(FUNC(nycaptor_state::sound_status_r)); + map(0xd807, 0xd807).r(FUNC(nycaptor_state::cyclshtg_mcu_status_r)); map(0xdc00, 0xdc9f).ram().share("spriteram"); - map(0xdca0, 0xdcbf).ram().w(this, FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); - map(0xdd00, 0xdeff).rw(this, FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); - map(0xdf03, 0xdf03).rw(this, FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); + map(0xdca0, 0xdcbf).ram().w(FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); + map(0xdd00, 0xdeff).rw(FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); + map(0xdf03, 0xdf03).rw(FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); map(0xe000, 0xffff).ram().share("sharedram"); } void nycaptor_state::bronx_slave_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xc000, 0xcfff).ram().w(this, FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); + map(0xc000, 0xcfff).ram().w(FUNC(nycaptor_state::nycaptor_videoram_w)).share("videoram"); map(0xd800, 0xd800).portr("DSWA"); map(0xd801, 0xd801).portr("DSWB"); map(0xd802, 0xd802).portr("DSWC"); map(0xd803, 0xd803).portr("IN0"); map(0xd804, 0xd804).portr("IN1"); - map(0xd805, 0xd805).r(this, FUNC(nycaptor_state::cyclshtg_mcu_status_r1)); - map(0xd807, 0xd807).r(this, FUNC(nycaptor_state::cyclshtg_mcu_status_r)); + map(0xd805, 0xd805).r(FUNC(nycaptor_state::cyclshtg_mcu_status_r1)); + map(0xd807, 0xd807).r(FUNC(nycaptor_state::cyclshtg_mcu_status_r)); map(0xdc00, 0xdc9f).ram().share("spriteram"); - map(0xdca0, 0xdcbf).w(this, FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); - map(0xdd00, 0xdeff).rw(this, FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); - map(0xdf00, 0xdf00).r(this, FUNC(nycaptor_state::nycaptor_bx_r)); - map(0xdf01, 0xdf01).r(this, FUNC(nycaptor_state::nycaptor_by_r)); - map(0xdf02, 0xdf02).r(this, FUNC(nycaptor_state::nycaptor_b_r)); - map(0xdf03, 0xdf03).rw(this, FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); + map(0xdca0, 0xdcbf).w(FUNC(nycaptor_state::nycaptor_scrlram_w)).share("scrlram"); + map(0xdd00, 0xdeff).rw(FUNC(nycaptor_state::nycaptor_palette_r), FUNC(nycaptor_state::nycaptor_palette_w)); + map(0xdf00, 0xdf00).r(FUNC(nycaptor_state::nycaptor_bx_r)); + map(0xdf01, 0xdf01).r(FUNC(nycaptor_state::nycaptor_by_r)); + map(0xdf02, 0xdf02).r(FUNC(nycaptor_state::nycaptor_b_r)); + map(0xdf03, 0xdf03).rw(FUNC(nycaptor_state::nycaptor_gfxctrl_r), FUNC(nycaptor_state::nycaptor_gfxctrl_w)); map(0xe000, 0xffff).ram().share("sharedram"); } diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp index e2600ba1f0b..c9301f2f6f9 100644 --- a/src/mame/drivers/nyny.cpp +++ b/src/mame/drivers/nyny.cpp @@ -436,8 +436,8 @@ void nyny_state::nyny_main_map(address_map &map) map(0xa000, 0xa0ff).ram().share("nvram"); /* SRAM (coin counter, shown when holding F2) */ map(0xa100, 0xa100).mirror(0x00fe).w(m_mc6845, FUNC(mc6845_device::address_w)); map(0xa101, 0xa101).mirror(0x00fe).w(m_mc6845, FUNC(mc6845_device::register_w)); - map(0xa200, 0xa20f).mirror(0x00f0).rw(this, FUNC(nyny_state::nyny_pia_1_2_r), FUNC(nyny_state::nyny_pia_1_2_w)); - map(0xa300, 0xa300).mirror(0x00ff).r(m_soundlatch3, FUNC(generic_latch_8_device::read)).w(this, FUNC(nyny_state::audio_1_command_w)); + map(0xa200, 0xa20f).mirror(0x00f0).rw(FUNC(nyny_state::nyny_pia_1_2_r), FUNC(nyny_state::nyny_pia_1_2_w)); + map(0xa300, 0xa300).mirror(0x00ff).r(m_soundlatch3, FUNC(generic_latch_8_device::read)).w(FUNC(nyny_state::audio_1_command_w)); map(0xa400, 0xa7ff).noprw(); map(0xa800, 0xbfff).rom(); map(0xc000, 0xdfff).ram(); @@ -450,7 +450,7 @@ void nyny_state::nyny_audio_1_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x007f).ram(); /* internal RAM */ map(0x0080, 0x0fff).noprw(); - map(0x1000, 0x1000).mirror(0x0fff).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(nyny_state::audio_1_answer_w)); + map(0x1000, 0x1000).mirror(0x0fff).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(nyny_state::audio_1_answer_w)); map(0x2000, 0x2000).mirror(0x0fff).portr("SW3"); map(0x3000, 0x3000).mirror(0x0ffc).r("ay1", FUNC(ay8910_device::data_r)); map(0x3000, 0x3001).mirror(0x0ffc).w("ay1", FUNC(ay8910_device::data_address_w)); @@ -653,7 +653,7 @@ MACHINE_CONFIG_START(nyny_state::nyny) MCFG_DEVICE_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nyny_state, nyny_ay8910_37_port_a_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MCFG_DEVICE_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK) diff --git a/src/mame/drivers/ob68k1a.cpp b/src/mame/drivers/ob68k1a.cpp index 901b6d373f1..481a208d42a 100644 --- a/src/mame/drivers/ob68k1a.cpp +++ b/src/mame/drivers/ob68k1a.cpp @@ -75,8 +75,8 @@ Notes: WRITE8_MEMBER( ob68k1a_state::com8116_w ) { - m_dbrg->stt_w(data & 0x0f); - m_dbrg->str_w(data >> 4); + m_dbrg->write_stt(data & 0x0f); + m_dbrg->write_str(data >> 4); } @@ -123,11 +123,11 @@ void ob68k1a_state::ob68k1a_mem(address_map &map) map(0x000000, 0x01ffff).ram(); map(0xfe0000, 0xfeffff).rom().region(MC68000L10_TAG, 0); map(0xffff00, 0xffff03).rw(m_acia0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); - map(0xffff10, 0xffff10).w(this, FUNC(ob68k1a_state::com8116_w)); + map(0xffff10, 0xffff10).w(FUNC(ob68k1a_state::com8116_w)); map(0xffff20, 0xffff23).rw(m_acia1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); // AM_RANGE(0xffff40, 0xffff47) AM_DEVREADWRITE8(MC6821_0_TAG, pia6821_device, read, write, 0x00ff) // AM_RANGE(0xffff40, 0xffff47) AM_DEVREADWRITE8(MC6821_1_TAG, pia6821_device, read, write, 0xff00) - map(0xffff40, 0xffff47).rw(this, FUNC(ob68k1a_state::pia_r), FUNC(ob68k1a_state::pia_w)); + map(0xffff40, 0xffff47).rw(FUNC(ob68k1a_state::pia_r), FUNC(ob68k1a_state::pia_w)); map(0xffff60, 0xffff6f).rw(MC6840_TAG, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); } @@ -171,8 +171,8 @@ void ob68k1a_state::machine_start() void ob68k1a_state::machine_reset() { // initialize COM8116 - m_dbrg->stt_w(0x0e); - m_dbrg->str_w(0x0e); + m_dbrg->write_stt(0x0e); + m_dbrg->write_str(0x0e); // set reset vector void *ram = m_maincpu->space(AS_PROGRAM).get_write_ptr(0); diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 9f74c06fded..7db03bb6a56 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -302,8 +302,8 @@ void octopus_state::octopus_io(address_map &map) map(0x00, 0x0f).rw(m_dma1, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x10, 0x1f).rw(m_dma2, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x20, 0x20).portr("DSWA"); - map(0x21, 0x2f).rw(this, FUNC(octopus_state::system_r), FUNC(octopus_state::system_w)); - map(0x31, 0x33).rw(this, FUNC(octopus_state::bank_sel_r), FUNC(octopus_state::bank_sel_w)); + map(0x21, 0x2f).rw(FUNC(octopus_state::system_r), FUNC(octopus_state::system_w)); + map(0x31, 0x33).rw(FUNC(octopus_state::bank_sel_r), FUNC(octopus_state::bank_sel_w)); map(0x50, 0x50).rw(m_kb_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x51, 0x51).rw(m_kb_uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); // 0x70-73: HD controller @@ -315,12 +315,12 @@ void octopus_state::octopus_io(address_map &map) map(0xb0, 0xb1).rw(m_pic1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xb4, 0xb5).rw(m_pic2, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xc0, 0xc7).rw(m_crtc, FUNC(scn2674_device::read), FUNC(scn2674_device::write)); - map(0xc8, 0xc8).rw(this, FUNC(octopus_state::vidcontrol_r), FUNC(octopus_state::vidcontrol_w)); - map(0xc9, 0xca).rw(this, FUNC(octopus_state::video_latch_r), FUNC(octopus_state::video_latch_w)); + map(0xc8, 0xc8).rw(FUNC(octopus_state::vidcontrol_r), FUNC(octopus_state::vidcontrol_w)); + map(0xc9, 0xca).rw(FUNC(octopus_state::video_latch_r), FUNC(octopus_state::video_latch_w)); // 0xcf: mode control map(0xd0, 0xd3).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0xe0, 0xe4).rw(this, FUNC(octopus_state::z80_vector_r), FUNC(octopus_state::z80_vector_w)); - map(0xf0, 0xf1).rw(this, FUNC(octopus_state::parallel_r), FUNC(octopus_state::parallel_w)); + map(0xe0, 0xe4).rw(FUNC(octopus_state::z80_vector_r), FUNC(octopus_state::z80_vector_w)); + map(0xf0, 0xf1).rw(FUNC(octopus_state::parallel_r), FUNC(octopus_state::parallel_w)); map(0xf8, 0xff).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); } @@ -333,12 +333,12 @@ void octopus_state::octopus_sub_mem(address_map &map) void octopus_state::octopus_sub_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(octopus_state::z80_io_r), FUNC(octopus_state::z80_io_w)); + map(0x0000, 0xffff).rw(FUNC(octopus_state::z80_io_r), FUNC(octopus_state::z80_io_w)); } void octopus_state::octopus_vram(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(octopus_state::vram_r), FUNC(octopus_state::vram_w)); + map(0x0000, 0xffff).rw(FUNC(octopus_state::vram_r), FUNC(octopus_state::vram_w)); } /* Input ports */ diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index 137514baefe..5401621cd5b 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -121,13 +121,13 @@ void odyssey2_state::odyssey2_mem(address_map &map) void odyssey2_state::odyssey2_io(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(odyssey2_state::io_read), FUNC(odyssey2_state::io_write)); + map(0x00, 0xff).rw(FUNC(odyssey2_state::io_read), FUNC(odyssey2_state::io_write)); } void g7400_state::g7400_io(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(g7400_state::io_read), FUNC(g7400_state::io_write)); + map(0x00, 0xff).rw(FUNC(g7400_state::io_read), FUNC(g7400_state::io_write)); } diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp index 2479e0bc624..a24796a8cfb 100644 --- a/src/mame/drivers/offtwall.cpp +++ b/src/mame/drivers/offtwall.cpp @@ -211,7 +211,7 @@ READ16_MEMBER(offtwall_state::unknown_verify_r) void offtwall_state::main_map(address_map &map) { map(0x000000, 0x037fff).rom(); - map(0x038000, 0x03ffff).r(this, FUNC(offtwall_state::bankrom_r)).region("maincpu", 0x38000).share("bankrom_base"); + map(0x038000, 0x03ffff).r(FUNC(offtwall_state::bankrom_r)).region("maincpu", 0x38000).share("bankrom_base"); map(0x120000, 0x120fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x260000, 0x260001).portr("260000"); map(0x260002, 0x260003).portr("260002"); @@ -222,7 +222,7 @@ void offtwall_state::main_map(address_map &map) map(0x260024, 0x260025).portr("260024"); map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_iii_device::main_response_r)); map(0x260041, 0x260041).w(m_jsa, FUNC(atari_jsa_iii_device::main_command_w)); - map(0x260050, 0x260051).w(this, FUNC(offtwall_state::io_latch_w)); + map(0x260050, 0x260051).w(FUNC(offtwall_state::io_latch_w)); map(0x260060, 0x260061).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x2a0000, 0x2a0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x3e0000, 0x3e0fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp index f10890a534d..f04509dd9d5 100644 --- a/src/mame/drivers/ohmygod.cpp +++ b/src/mame/drivers/ohmygod.cpp @@ -45,22 +45,22 @@ void ohmygod_state::ohmygod_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x300000, 0x303fff).ram(); - map(0x304000, 0x307fff).ram().w(this, FUNC(ohmygod_state::ohmygod_videoram_w)).share("videoram"); + map(0x304000, 0x307fff).ram().w(FUNC(ohmygod_state::ohmygod_videoram_w)).share("videoram"); map(0x308000, 0x30ffff).ram(); - map(0x400000, 0x400001).w(this, FUNC(ohmygod_state::ohmygod_scrollx_w)); - map(0x400002, 0x400003).w(this, FUNC(ohmygod_state::ohmygod_scrolly_w)); + map(0x400000, 0x400001).w(FUNC(ohmygod_state::ohmygod_scrollx_w)); + map(0x400002, 0x400003).w(FUNC(ohmygod_state::ohmygod_scrolly_w)); map(0x600000, 0x6007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x700000, 0x703fff).ram().share("spriteram"); map(0x704000, 0x707fff).ram(); map(0x708000, 0x70ffff).ram(); /* Work RAM */ map(0x800000, 0x800001).portr("P1"); map(0x800002, 0x800003).portr("P2"); - map(0x900000, 0x900001).w(this, FUNC(ohmygod_state::ohmygod_ctrl_w)); + map(0x900000, 0x900001).w(FUNC(ohmygod_state::ohmygod_ctrl_w)); map(0xa00000, 0xa00001).portr("DSW1"); map(0xa00002, 0xa00003).portr("DSW2"); map(0xb00001, 0xb00001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xc00000, 0xc00001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0xd00000, 0xd00001).w(this, FUNC(ohmygod_state::ohmygod_spritebank_w)); + map(0xd00000, 0xd00001).w(FUNC(ohmygod_state::ohmygod_spritebank_w)); } void ohmygod_state::oki_map(address_map &map) diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index d4bd26d9d8b..6a18700aee0 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -99,10 +99,10 @@ WRITE8_MEMBER(ojankohs_state::ojankoc_ctrl_w) void ojankohs_state::ojankohs_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8fff).ram().w(this, FUNC(ojankohs_state::ojankohs_videoram_w)).share("videoram"); - map(0x9000, 0x9fff).ram().w(this, FUNC(ojankohs_state::ojankohs_colorram_w)).share("colorram"); + map(0x8000, 0x8fff).ram().w(FUNC(ojankohs_state::ojankohs_videoram_w)).share("videoram"); + map(0x9000, 0x9fff).ram().w(FUNC(ojankohs_state::ojankohs_colorram_w)).share("colorram"); map(0xa000, 0xb7ff).ram().share("nvram"); - map(0xb800, 0xbfff).ram().w(this, FUNC(ojankohs_state::ojankohs_palette_w)).share("paletteram"); + map(0xb800, 0xbfff).ram().w(FUNC(ojankohs_state::ojankohs_palette_w)).share("paletteram"); map(0xc000, 0xffff).bankr("bank1"); } @@ -110,8 +110,8 @@ void ojankohs_state::ojankohs_map(address_map &map) void ojankohs_state::ojankoy_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x9fff).ram().w(this, FUNC(ojankohs_state::ojankohs_videoram_w)).share("videoram"); - map(0xa000, 0xafff).ram().w(this, FUNC(ojankohs_state::ojankohs_colorram_w)).share("colorram"); + map(0x8000, 0x9fff).ram().w(FUNC(ojankohs_state::ojankohs_videoram_w)).share("videoram"); + map(0xa000, 0xafff).ram().w(FUNC(ojankohs_state::ojankohs_colorram_w)).share("colorram"); map(0xb000, 0xbfff).ram().share("nvram"); map(0xc000, 0xffff).bankr("bank1"); } @@ -121,19 +121,19 @@ void ojankohs_state::ojankoc_map(address_map &map) { map(0x0000, 0x77ff).rom(); map(0x7800, 0x7fff).ram().share("nvram"); - map(0x8000, 0xffff).bankr("bank1").w(this, FUNC(ojankohs_state::ojankoc_videoram_w)); + map(0x8000, 0xffff).bankr("bank1").w(FUNC(ojankohs_state::ojankoc_videoram_w)); } void ojankohs_state::ojankohs_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("system").w(this, FUNC(ojankohs_state::port_select_w)); - map(0x01, 0x01).rw(this, FUNC(ojankohs_state::keymatrix_p1_r), FUNC(ojankohs_state::ojankohs_rombank_w)); - map(0x02, 0x02).rw(this, FUNC(ojankohs_state::keymatrix_p2_r), FUNC(ojankohs_state::ojankohs_gfxreg_w)); - map(0x03, 0x03).w(this, FUNC(ojankohs_state::ojankohs_adpcm_reset_w)); - map(0x04, 0x04).w(this, FUNC(ojankohs_state::ojankohs_flipscreen_w)); - map(0x05, 0x05).w(this, FUNC(ojankohs_state::ojankohs_msm5205_w)); + map(0x00, 0x00).portr("system").w(FUNC(ojankohs_state::port_select_w)); + map(0x01, 0x01).rw(FUNC(ojankohs_state::keymatrix_p1_r), FUNC(ojankohs_state::ojankohs_rombank_w)); + map(0x02, 0x02).rw(FUNC(ojankohs_state::keymatrix_p2_r), FUNC(ojankohs_state::ojankohs_gfxreg_w)); + map(0x03, 0x03).w(FUNC(ojankohs_state::ojankohs_adpcm_reset_w)); + map(0x04, 0x04).w(FUNC(ojankohs_state::ojankohs_flipscreen_w)); + map(0x05, 0x05).w(FUNC(ojankohs_state::ojankohs_msm5205_w)); map(0x06, 0x06).r("aysnd", FUNC(ym2149_device::data_r)); map(0x06, 0x07).w("aysnd", FUNC(ym2149_device::data_address_w)); map(0x10, 0x11).w("gga", FUNC(vsystem_gga_device::write)); @@ -142,38 +142,38 @@ void ojankohs_state::ojankohs_io_map(address_map &map) void ojankohs_state::ojankoy_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("system").w(this, FUNC(ojankohs_state::port_select_w)); - map(0x01, 0x01).rw(this, FUNC(ojankohs_state::keymatrix_p1_r), FUNC(ojankohs_state::ojankoy_rombank_w)); - map(0x02, 0x02).rw(this, FUNC(ojankohs_state::keymatrix_p2_r), FUNC(ojankohs_state::ojankoy_coinctr_w)); - map(0x04, 0x04).w(this, FUNC(ojankohs_state::ojankohs_flipscreen_w)); - map(0x05, 0x05).w(this, FUNC(ojankohs_state::ojankohs_msm5205_w)); + map(0x00, 0x00).portr("system").w(FUNC(ojankohs_state::port_select_w)); + map(0x01, 0x01).rw(FUNC(ojankohs_state::keymatrix_p1_r), FUNC(ojankohs_state::ojankoy_rombank_w)); + map(0x02, 0x02).rw(FUNC(ojankohs_state::keymatrix_p2_r), FUNC(ojankohs_state::ojankoy_coinctr_w)); + map(0x04, 0x04).w(FUNC(ojankohs_state::ojankohs_flipscreen_w)); + map(0x05, 0x05).w(FUNC(ojankohs_state::ojankohs_msm5205_w)); map(0x06, 0x06).r("aysnd", FUNC(ay8910_device::data_r)); map(0x06, 0x07).w("aysnd", FUNC(ay8910_device::data_address_w)); } void ojankohs_state::ccasino_io_map(address_map &map) { - map(0x00, 0x00).mirror(0xff00).portr("system").w(this, FUNC(ojankohs_state::port_select_w)); - map(0x01, 0x01).mirror(0xff00).rw(this, FUNC(ojankohs_state::keymatrix_p1_r), FUNC(ojankohs_state::ojankohs_rombank_w)); - map(0x02, 0x02).mirror(0xff00).rw(this, FUNC(ojankohs_state::keymatrix_p2_r), FUNC(ojankohs_state::ccasino_coinctr_w)); - map(0x03, 0x03).mirror(0xff00).r(this, FUNC(ojankohs_state::ccasino_dipsw3_r)).w(this, FUNC(ojankohs_state::ojankohs_adpcm_reset_w)); - map(0x04, 0x04).mirror(0xff00).r(this, FUNC(ojankohs_state::ccasino_dipsw4_r)).w(this, FUNC(ojankohs_state::ojankohs_flipscreen_w)); - map(0x05, 0x05).mirror(0xff00).w(this, FUNC(ojankohs_state::ojankohs_msm5205_w)); + map(0x00, 0x00).mirror(0xff00).portr("system").w(FUNC(ojankohs_state::port_select_w)); + map(0x01, 0x01).mirror(0xff00).rw(FUNC(ojankohs_state::keymatrix_p1_r), FUNC(ojankohs_state::ojankohs_rombank_w)); + map(0x02, 0x02).mirror(0xff00).rw(FUNC(ojankohs_state::keymatrix_p2_r), FUNC(ojankohs_state::ccasino_coinctr_w)); + map(0x03, 0x03).mirror(0xff00).r(FUNC(ojankohs_state::ccasino_dipsw3_r)).w(FUNC(ojankohs_state::ojankohs_adpcm_reset_w)); + map(0x04, 0x04).mirror(0xff00).r(FUNC(ojankohs_state::ccasino_dipsw4_r)).w(FUNC(ojankohs_state::ojankohs_flipscreen_w)); + map(0x05, 0x05).mirror(0xff00).w(FUNC(ojankohs_state::ojankohs_msm5205_w)); map(0x06, 0x06).mirror(0xff00).r("aysnd", FUNC(ay8910_device::data_r)); map(0x06, 0x07).mirror(0xff00).w("aysnd", FUNC(ay8910_device::data_address_w)); - map(0x08, 0x0f).select(0xff00).w(this, FUNC(ojankohs_state::ccasino_palette_w)); // 16bit address access + map(0x08, 0x0f).select(0xff00).w(FUNC(ojankohs_state::ccasino_palette_w)); // 16bit address access map(0x10, 0x11).mirror(0xff00).w("gga", FUNC(vsystem_gga_device::write)); } void ojankohs_state::ojankoc_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x1f).w(this, FUNC(ojankohs_state::ojankoc_palette_w)); - map(0xf9, 0xf9).w(this, FUNC(ojankohs_state::ojankohs_msm5205_w)); - map(0xfb, 0xfb).w(this, FUNC(ojankohs_state::ojankoc_ctrl_w)); - map(0xfc, 0xfc).r(this, FUNC(ojankohs_state::ojankoc_keymatrix_p1_r)); - map(0xfd, 0xfd).r(this, FUNC(ojankohs_state::ojankoc_keymatrix_p2_r)); - map(0xfd, 0xfd).w(this, FUNC(ojankohs_state::port_select_w)); + map(0x00, 0x1f).w(FUNC(ojankohs_state::ojankoc_palette_w)); + map(0xf9, 0xf9).w(FUNC(ojankohs_state::ojankohs_msm5205_w)); + map(0xfb, 0xfb).w(FUNC(ojankohs_state::ojankoc_ctrl_w)); + map(0xfc, 0xfc).r(FUNC(ojankohs_state::ojankoc_keymatrix_p1_r)); + map(0xfd, 0xfd).r(FUNC(ojankohs_state::ojankoc_keymatrix_p2_r)); + map(0xfd, 0xfd).w(FUNC(ojankohs_state::port_select_w)); map(0xfe, 0xff).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0xff, 0xff).r("aysnd", FUNC(ay8910_device::data_r)); } diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index 8ff0410f0c0..819c2ba58d6 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -235,9 +235,9 @@ void okean240_state::okean240_io(address_map &map) map(0x40, 0x43).rw("ppikbd", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x60, 0x63).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x80, 0x81).rw("pic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x80, 0x80).r(this, FUNC(okean240_state::okean240_kbd_status_r)); - map(0xa0, 0xa0).r(this, FUNC(okean240_state::term_r)); - map(0xa1, 0xa1).r(this, FUNC(okean240_state::term_status_r)); + map(0x80, 0x80).r(FUNC(okean240_state::okean240_kbd_status_r)); + map(0xa0, 0xa0).r(FUNC(okean240_state::term_r)); + map(0xa1, 0xa1).r(FUNC(okean240_state::term_status_r)); map(0xc0, 0xc3).rw("ppic", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xe0, 0xe3).rw("ppie", FUNC(i8255_device::read), FUNC(i8255_device::write)); } @@ -248,7 +248,7 @@ void okean240_state::okean240a_io(address_map &map) map(0x40, 0x43).rw("ppikbd", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x60, 0x63).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x80, 0x81).rw("pic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x80, 0x80).r(this, FUNC(okean240_state::okean240a_kbd_status_r)); + map(0x80, 0x80).r(FUNC(okean240_state::okean240a_kbd_status_r)); map(0xa0, 0xa0).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xa1, 0xa1).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xc0, 0xc3).rw("ppic", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -272,7 +272,7 @@ void okean240_state::okean240t_io(address_map &map) map(0x40, 0x43).rw("ppikbd", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x60, 0x63).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0x80, 0x81).rw("pic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x80, 0x80).r(this, FUNC(okean240_state::okean240_kbd_status_r)); + map(0x80, 0x80).r(FUNC(okean240_state::okean240_kbd_status_r)); map(0xa0, 0xa0).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xa1, 0xa1).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xc0, 0xc3).rw("ppic", FUNC(i8255_device::read), FUNC(i8255_device::write)); diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp index 6dc4d20da9f..a8c559ef330 100644 --- a/src/mame/drivers/olibochu.cpp +++ b/src/mame/drivers/olibochu.cpp @@ -273,8 +273,8 @@ WRITE8_MEMBER(olibochu_state::sound_command_w) void olibochu_state::olibochu_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(olibochu_state::olibochu_videoram_w)).share("videoram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(olibochu_state::olibochu_colorram_w)).share("colorram"); + map(0x8000, 0x83ff).ram().w(FUNC(olibochu_state::olibochu_videoram_w)).share("videoram"); + map(0x8400, 0x87ff).ram().w(FUNC(olibochu_state::olibochu_colorram_w)).share("colorram"); map(0x9000, 0x903f).ram(); //??? map(0x9800, 0x983f).ram(); //??? map(0xa000, 0xa000).portr("IN0"); @@ -283,8 +283,8 @@ void olibochu_state::olibochu_map(address_map &map) map(0xa003, 0xa003).portr("DSW0"); map(0xa004, 0xa004).portr("DSW1"); map(0xa005, 0xa005).portr("DSW2"); - map(0xa800, 0xa801).w(this, FUNC(olibochu_state::sound_command_w)); - map(0xa802, 0xa802).w(this, FUNC(olibochu_state::olibochu_flipscreen_w)); /* bit 6 = enable sound? */ + map(0xa800, 0xa801).w(FUNC(olibochu_state::sound_command_w)); + map(0xa802, 0xa802).w(FUNC(olibochu_state::olibochu_flipscreen_w)); /* bit 6 = enable sound? */ map(0xf000, 0xffff).ram(); map(0xf400, 0xf41f).ram().share("spriteram"); map(0xf440, 0xf47f).ram().share("spriteram2"); diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp index 9192f459b64..baab85334a6 100644 --- a/src/mame/drivers/olyboss.cpp +++ b/src/mame/drivers/olyboss.cpp @@ -164,7 +164,7 @@ void olyboss_state::device_timer(emu_timer &timer, device_timer_id id, int param void olyboss_state::olyboss_mem(address_map &map) { - map(0x0000, 0x7ff).rw(this, FUNC(olyboss_state::rom_r), FUNC(olyboss_state::rom_w)).share("lowram"); + map(0x0000, 0x7ff).rw(FUNC(olyboss_state::rom_r), FUNC(olyboss_state::rom_w)).share("lowram"); map(0x800, 0xffff).ram(); } @@ -179,10 +179,10 @@ void olyboss_state::olyboss_io(address_map &map) map(0x31, 0x31).rw(m_uic, FUNC(am9519_device::stat_r), FUNC(am9519_device::cmd_w)); map(0x40, 0x43).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); //AM_RANGE(0x50, 0x53) COM2651 - map(0x60, 0x60).rw(this, FUNC(olyboss_state::fdcctrl_r), FUNC(olyboss_state::fdcctrl_w)); + map(0x60, 0x60).rw(FUNC(olyboss_state::fdcctrl_r), FUNC(olyboss_state::fdcctrl_w)); map(0x80, 0x81).rw(m_crtc, FUNC(upd3301_device::read), FUNC(upd3301_device::write)); - map(0x82, 0x84).w(this, FUNC(olyboss_state::vchrmap_w)); - map(0x90, 0x9f).w(this, FUNC(olyboss_state::vchrram_w)); + map(0x82, 0x84).w(FUNC(olyboss_state::vchrmap_w)); + map(0x90, 0x9f).w(FUNC(olyboss_state::vchrram_w)); } void olyboss_state::olyboss85_io(address_map &map) @@ -193,9 +193,9 @@ void olyboss_state::olyboss85_io(address_map &map) map(0x10, 0x11).m(m_fdc, FUNC(upd765a_device::map)); map(0x20, 0x21).rw(m_crtc, FUNC(upd3301_device::read), FUNC(upd3301_device::write)); map(0x30, 0x31).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x42, 0x42).r(this, FUNC(olyboss_state::keyboard_read)); - map(0x42, 0x44).w(this, FUNC(olyboss_state::vchrram85_w)); - map(0x45, 0x45).w(this, FUNC(olyboss_state::fdcctrl85_w)); + map(0x42, 0x42).r(FUNC(olyboss_state::keyboard_read)); + map(0x42, 0x44).w(FUNC(olyboss_state::vchrram85_w)); + map(0x45, 0x45).w(FUNC(olyboss_state::fdcctrl85_w)); } static INPUT_PORTS_START( olyboss ) diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp index d44057b94b5..45a69d3cbd9 100644 --- a/src/mame/drivers/omegrace.cpp +++ b/src/mame/drivers/omegrace.cpp @@ -379,7 +379,7 @@ void omegrace_state::main_map(address_map &map) void omegrace_state::port_map(address_map &map) { map.global_mask(0xff); - map(0x08, 0x08).r(this, FUNC(omegrace_state::omegrace_vg_go_r)); + map(0x08, 0x08).r(FUNC(omegrace_state::omegrace_vg_go_r)); map(0x09, 0x09).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x0a, 0x0a).w(m_dvg, FUNC(dvg_device::reset_w)); map(0x0b, 0x0b).portr("AVGDVG"); /* vg_halt */ @@ -387,9 +387,9 @@ void omegrace_state::port_map(address_map &map) map(0x17, 0x17).portr("DSW2"); /* DIP SW C6 */ map(0x11, 0x11).portr("IN0"); /* Player 1 input */ map(0x12, 0x12).portr("IN1"); /* Player 2 input */ - map(0x13, 0x13).w(this, FUNC(omegrace_state::omegrace_leds_w)); /* coin counters, leds, flip screen */ - map(0x14, 0x14).w(this, FUNC(omegrace_state::omegrace_soundlatch_w)); /* Sound command */ - map(0x15, 0x15).r(this, FUNC(omegrace_state::omegrace_spinner1_r)); /* 1st controller */ + map(0x13, 0x13).w(FUNC(omegrace_state::omegrace_leds_w)); /* coin counters, leds, flip screen */ + map(0x14, 0x14).w(FUNC(omegrace_state::omegrace_soundlatch_w)); /* Sound command */ + map(0x15, 0x15).r(FUNC(omegrace_state::omegrace_spinner1_r)); /* 1st controller */ map(0x16, 0x16).portr("SPIN1"); /* 2nd controller (cocktail) */ } diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp index 2ac15a480f3..f6a58186c8c 100644 --- a/src/mame/drivers/ondra.cpp +++ b/src/mame/drivers/ondra.cpp @@ -33,7 +33,7 @@ void ondra_state::ondra_io(address_map &map) { map.global_mask(0x0b); map.unmap_value_high(); - map(0x03, 0x03).w(this, FUNC(ondra_state::ondra_port_03_w)); + map(0x03, 0x03).w(FUNC(ondra_state::ondra_port_03_w)); //AM_RANGE(0x09, 0x09) AM_WRITE(ondra_port_09_w) //AM_RANGE(0x0a, 0x0a) AM_WRITE(ondra_port_0a_w) } diff --git a/src/mame/drivers/oneshot.cpp b/src/mame/drivers/oneshot.cpp index 8b752b1f620..09f84346b04 100644 --- a/src/mame/drivers/oneshot.cpp +++ b/src/mame/drivers/oneshot.cpp @@ -115,18 +115,18 @@ void oneshot_state::oneshot_map(address_map &map) map(0x080000, 0x087fff).ram(); map(0x0c0000, 0x0c07ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x120000, 0x120fff).ram().share("sprites"); - map(0x180000, 0x180fff).ram().w(this, FUNC(oneshot_state::oneshot_mid_videoram_w)).share("mid_videoram"); // some people , girl etc. - map(0x181000, 0x181fff).ram().w(this, FUNC(oneshot_state::oneshot_fg_videoram_w)).share("fg_videoram"); // credits etc. - map(0x182000, 0x182fff).ram().w(this, FUNC(oneshot_state::oneshot_bg_videoram_w)).share("bg_videoram"); // credits etc. + map(0x180000, 0x180fff).ram().w(FUNC(oneshot_state::oneshot_mid_videoram_w)).share("mid_videoram"); // some people , girl etc. + map(0x181000, 0x181fff).ram().w(FUNC(oneshot_state::oneshot_fg_videoram_w)).share("fg_videoram"); // credits etc. + map(0x182000, 0x182fff).ram().w(FUNC(oneshot_state::oneshot_bg_videoram_w)).share("bg_videoram"); // credits etc. map(0x188000, 0x18800f).writeonly().share("scroll"); // scroll registers map(0x190003, 0x190003).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x190011, 0x190011).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x190018, 0x190019).w(this, FUNC(oneshot_state::soundbank_w)); - map(0x190026, 0x190027).r(this, FUNC(oneshot_state::oneshot_gun_x_p1_r)); - map(0x19002e, 0x19002f).r(this, FUNC(oneshot_state::oneshot_gun_x_p2_r)); - map(0x190036, 0x190037).r(this, FUNC(oneshot_state::oneshot_gun_y_p1_r)); - map(0x19003e, 0x19003f).r(this, FUNC(oneshot_state::oneshot_gun_y_p2_r)); - map(0x19c020, 0x19c021).r(this, FUNC(oneshot_state::oneshot_in0_word_r)); + map(0x190018, 0x190019).w(FUNC(oneshot_state::soundbank_w)); + map(0x190026, 0x190027).r(FUNC(oneshot_state::oneshot_gun_x_p1_r)); + map(0x19002e, 0x19002f).r(FUNC(oneshot_state::oneshot_gun_x_p2_r)); + map(0x190036, 0x190037).r(FUNC(oneshot_state::oneshot_gun_y_p1_r)); + map(0x19003e, 0x19003f).r(FUNC(oneshot_state::oneshot_gun_y_p2_r)); + map(0x19c020, 0x19c021).r(FUNC(oneshot_state::oneshot_in0_word_r)); map(0x19c024, 0x19c025).portr("DSW2"); map(0x19c02c, 0x19c02d).portr("CREDITS"); map(0x19c030, 0x19c031).portr("P1"); diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp index 8ab90715e53..f80d74f1287 100644 --- a/src/mame/drivers/onetwo.cpp +++ b/src/mame/drivers/onetwo.cpp @@ -185,18 +185,18 @@ void onetwo_state::main_cpu(address_map &map) { map(0x0000, 0x7fff).rom().region("maincpu", 0x10000); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc800, 0xc87f).ram().w(this, FUNC(onetwo_state::palette1_w)).share("paletteram"); - map(0xc900, 0xc97f).ram().w(this, FUNC(onetwo_state::palette2_w)).share("paletteram2"); - map(0xd000, 0xdfff).ram().w(this, FUNC(onetwo_state::onetwo_fgram_w)).share("fgram"); + map(0xc800, 0xc87f).ram().w(FUNC(onetwo_state::palette1_w)).share("paletteram"); + map(0xc900, 0xc97f).ram().w(FUNC(onetwo_state::palette2_w)).share("paletteram2"); + map(0xd000, 0xdfff).ram().w(FUNC(onetwo_state::onetwo_fgram_w)).share("fgram"); map(0xe000, 0xffff).ram(); } void onetwo_state::main_cpu_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("DSW1").w(this, FUNC(onetwo_state::onetwo_coin_counters_w)); + map(0x00, 0x00).portr("DSW1").w(FUNC(onetwo_state::onetwo_coin_counters_w)); map(0x01, 0x01).portr("DSW2").w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).portr("P1").w(this, FUNC(onetwo_state::onetwo_cpubank_w)); + map(0x02, 0x02).portr("P1").w(FUNC(onetwo_state::onetwo_cpubank_w)); map(0x03, 0x03).portr("P2"); map(0x04, 0x04).portr("SYSTEM"); } diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 7c4122f9529..2496ad6690a 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -349,16 +349,16 @@ WRITE8_MEMBER(opwolf_state::sound_bankswitch_w) void opwolf_state::opwolf_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x0f0000, 0x0f07ff).mirror(0xf000).r(this, FUNC(opwolf_state::opwolf_cchip_data_r)); - map(0x0f0802, 0x0f0803).mirror(0xf000).r(this, FUNC(opwolf_state::opwolf_cchip_status_r)); - map(0x0ff000, 0x0ff7ff).w(this, FUNC(opwolf_state::opwolf_cchip_data_w)); - map(0x0ff802, 0x0ff803).w(this, FUNC(opwolf_state::opwolf_cchip_status_w)); - map(0x0ffc00, 0x0ffc01).w(this, FUNC(opwolf_state::opwolf_cchip_bank_w)); + map(0x0f0000, 0x0f07ff).mirror(0xf000).r(FUNC(opwolf_state::opwolf_cchip_data_r)); + map(0x0f0802, 0x0f0803).mirror(0xf000).r(FUNC(opwolf_state::opwolf_cchip_status_r)); + map(0x0ff000, 0x0ff7ff).w(FUNC(opwolf_state::opwolf_cchip_data_w)); + map(0x0ff802, 0x0ff803).w(FUNC(opwolf_state::opwolf_cchip_status_w)); + map(0x0ffc00, 0x0ffc01).w(FUNC(opwolf_state::opwolf_cchip_bank_w)); map(0x100000, 0x107fff).ram(); map(0x200000, 0x200fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x380000, 0x380003).r(this, FUNC(opwolf_state::opwolf_dsw_r)); /* dip switches */ - map(0x380000, 0x380003).w(this, FUNC(opwolf_state::opwolf_spritectrl_w)); // usually 0x4, changes when you fire - map(0x3a0000, 0x3a0003).r(this, FUNC(opwolf_state::opwolf_lightgun_r)); /* lightgun, read at $11e0/6 */ + map(0x380000, 0x380003).r(FUNC(opwolf_state::opwolf_dsw_r)); /* dip switches */ + map(0x380000, 0x380003).w(FUNC(opwolf_state::opwolf_spritectrl_w)); // usually 0x4, changes when you fire + map(0x3a0000, 0x3a0003).r(FUNC(opwolf_state::opwolf_lightgun_r)); /* lightgun, read at $11e0/6 */ map(0x3c0000, 0x3c0001).nopw(); /* watchdog ?? */ map(0x3e0000, 0x3e0001).nopr(); map(0x3e0000, 0x3e0000).w("ciu", FUNC(pc060ha_device::master_port_w)); @@ -375,13 +375,13 @@ void opwolf_state::opwolf_map(address_map &map) void opwolf_state::opwolfb_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x0f0008, 0x0f000b).r(this, FUNC(opwolf_state::opwolf_in_r)); /* coins and buttons */ - map(0x0ff000, 0x0fffff).rw(this, FUNC(opwolf_state::cchip_r), FUNC(opwolf_state::cchip_w)); + map(0x0f0008, 0x0f000b).r(FUNC(opwolf_state::opwolf_in_r)); /* coins and buttons */ + map(0x0ff000, 0x0fffff).rw(FUNC(opwolf_state::cchip_r), FUNC(opwolf_state::cchip_w)); map(0x100000, 0x107fff).ram(); map(0x200000, 0x200fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x380000, 0x380003).r(this, FUNC(opwolf_state::opwolf_dsw_r)); /* dip switches */ - map(0x380000, 0x380003).w(this, FUNC(opwolf_state::opwolf_spritectrl_w)); // usually 0x4, changes when you fire - map(0x3a0000, 0x3a0003).r(this, FUNC(opwolf_state::opwolf_lightgun_r)); /* lightgun, read at $11e0/6 */ + map(0x380000, 0x380003).r(FUNC(opwolf_state::opwolf_dsw_r)); /* dip switches */ + map(0x380000, 0x380003).w(FUNC(opwolf_state::opwolf_spritectrl_w)); // usually 0x4, changes when you fire + map(0x3a0000, 0x3a0003).r(FUNC(opwolf_state::opwolf_lightgun_r)); /* lightgun, read at $11e0/6 */ map(0x3c0000, 0x3c0001).nopw(); /* watchdog ?? */ map(0x3e0000, 0x3e0001).nopr(); map(0x3e0000, 0x3e0000).w("ciu", FUNC(pc060ha_device::master_port_w)); @@ -400,9 +400,9 @@ void opwolf_state::opwolfp_map(address_map &map) map(0x100000, 0x107fff).ram(); map(0x200000, 0x200fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x380000, 0x380003).r(this, FUNC(opwolf_state::opwolf_dsw_r)); /* dip switches */ - map(0x380000, 0x380003).w(this, FUNC(opwolf_state::opwolf_spritectrl_w)); // usually 0x4, changes when you fire - map(0x3a0000, 0x3a0003).r(this, FUNC(opwolf_state::opwolf_lightgun_r)); /* lightgun, read at $11e0/6 (AND INPUTS) */ + map(0x380000, 0x380003).r(FUNC(opwolf_state::opwolf_dsw_r)); /* dip switches */ + map(0x380000, 0x380003).w(FUNC(opwolf_state::opwolf_spritectrl_w)); // usually 0x4, changes when you fire + map(0x3a0000, 0x3a0003).r(FUNC(opwolf_state::opwolf_lightgun_r)); /* lightgun, read at $11e0/6 (AND INPUTS) */ map(0x3c0000, 0x3c0001).nopw(); /* watchdog ?? */ map(0x3e0000, 0x3e0001).nopr(); map(0x3e0000, 0x3e0000).w("ciu", FUNC(pc060ha_device::master_port_w)); @@ -423,9 +423,9 @@ void opwolf_state::opwolfp_map(address_map &map) void opwolf_state::opwolfb_sub_z80_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8800, 0x8800).r(this, FUNC(opwolf_state::z80_input1_r)); /* read at PC=$637: poked to $c004 */ + map(0x8800, 0x8800).r(FUNC(opwolf_state::z80_input1_r)); /* read at PC=$637: poked to $c004 */ map(0x9000, 0x9000).nopw(); /* unknown write, 0 then 1 each interrupt */ - map(0x9800, 0x9800).r(this, FUNC(opwolf_state::z80_input2_r)); /* read at PC=$631: poked to $c005 */ + map(0x9800, 0x9800).r(FUNC(opwolf_state::z80_input2_r)); /* read at PC=$631: poked to $c005 */ map(0xa000, 0xa000).nopw(); /* IRQ acknowledge (unimplemented) */ map(0xc000, 0xc7ff).ram().share("cchip_ram"); } @@ -566,10 +566,10 @@ void opwolf_state::opwolf_sound_z80_map(address_map &map) map(0x9002, 0x9100).nopr(); map(0xa000, 0xa000).w("ciu", FUNC(pc060ha_device::slave_port_w)); map(0xa001, 0xa001).rw("ciu", FUNC(pc060ha_device::slave_comm_r), FUNC(pc060ha_device::slave_comm_w)); - map(0xb000, 0xb006).w(this, FUNC(opwolf_state::opwolf_adpcm_b_w)); - map(0xc000, 0xc006).w(this, FUNC(opwolf_state::opwolf_adpcm_c_w)); - map(0xd000, 0xd000).w(this, FUNC(opwolf_state::opwolf_adpcm_d_w)); - map(0xe000, 0xe000).w(this, FUNC(opwolf_state::opwolf_adpcm_e_w)); + map(0xb000, 0xb006).w(FUNC(opwolf_state::opwolf_adpcm_b_w)); + map(0xc000, 0xc006).w(FUNC(opwolf_state::opwolf_adpcm_c_w)); + map(0xd000, 0xd000).w(FUNC(opwolf_state::opwolf_adpcm_d_w)); + map(0xe000, 0xe000).w(FUNC(opwolf_state::opwolf_adpcm_e_w)); } /*********************************************************** diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp index ec6eb4cecb0..634e8c7dd35 100644 --- a/src/mame/drivers/orao.cpp +++ b/src/mame/drivers/orao.cpp @@ -30,7 +30,7 @@ void orao_state::orao_mem(address_map &map) { map(0x0000, 0x5fff).ram().share("memory"); map(0x6000, 0x7fff).ram().share("video_ram"); // video ram - map(0x8000, 0x9fff).rw(this, FUNC(orao_state::orao_io_r), FUNC(orao_state::orao_io_w)); + map(0x8000, 0x9fff).rw(FUNC(orao_state::orao_io_r), FUNC(orao_state::orao_io_w)); map(0xa000, 0xafff).ram(); // extension map(0xb000, 0xbfff).ram(); // DOS map(0xc000, 0xdfff).rom(); diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp index 0e27449024f..072c58717cb 100644 --- a/src/mame/drivers/orbit.cpp +++ b/src/mame/drivers/orbit.cpp @@ -88,13 +88,13 @@ void orbit_state::orbit_map(address_map &map) map(0x1800, 0x1800).mirror(0x07ff).portr("DSW1"); map(0x2000, 0x2000).mirror(0x07ff).portr("DSW2"); map(0x2800, 0x2800).mirror(0x07ff).portr("BUTTONS"); - map(0x3000, 0x33bf).mirror(0x0400).ram().w(this, FUNC(orbit_state::orbit_playfield_w)).share("playfield_ram"); + map(0x3000, 0x33bf).mirror(0x0400).ram().w(FUNC(orbit_state::orbit_playfield_w)).share("playfield_ram"); map(0x33c0, 0x33ff).mirror(0x0400).ram().share("sprite_ram"); - map(0x3800, 0x3800).mirror(0x00ff).w(this, FUNC(orbit_state::orbit_note_w)); - map(0x3900, 0x3900).mirror(0x00ff).w(this, FUNC(orbit_state::orbit_noise_amp_w)); - map(0x3a00, 0x3a00).mirror(0x00ff).w(this, FUNC(orbit_state::orbit_note_amp_w)); + map(0x3800, 0x3800).mirror(0x00ff).w(FUNC(orbit_state::orbit_note_w)); + map(0x3900, 0x3900).mirror(0x00ff).w(FUNC(orbit_state::orbit_noise_amp_w)); + map(0x3a00, 0x3a00).mirror(0x00ff).w(FUNC(orbit_state::orbit_note_amp_w)); map(0x3c00, 0x3c0f).mirror(0x00f0).w(m_latch, FUNC(f9334_device::write_a0)); - map(0x3e00, 0x3e00).mirror(0x00ff).w(this, FUNC(orbit_state::orbit_noise_rst_w)); + map(0x3e00, 0x3e00).mirror(0x00ff).w(FUNC(orbit_state::orbit_noise_rst_w)); map(0x3f00, 0x3f00).mirror(0x00ff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x6000, 0x7fff).rom(); } diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index 03810121747..97d3685435d 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -54,23 +54,24 @@ public: }; oric_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_palette(*this, "palette"), - m_psg(*this, "ay8912"), - m_centronics(*this, "centronics"), - m_cent_data_out(*this, "cent_data_out"), - m_cassette(*this, "cassette"), - m_via(*this, "via6522"), - m_ram(*this, "ram"), - m_rom(*this, "maincpu"), - m_bank_c000_r(*this, "bank_c000_r"), - m_bank_e000_r(*this, "bank_e000_r"), - m_bank_f800_r(*this, "bank_f800_r"), - m_bank_c000_w(*this, "bank_c000_w"), - m_bank_e000_w(*this, "bank_e000_w"), - m_bank_f800_w(*this, "bank_f800_w"), - m_config(*this, "CONFIG") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_palette(*this, "palette") + , m_psg(*this, "ay8912") + , m_centronics(*this, "centronics") + , m_cent_data_out(*this, "cent_data_out") + , m_cassette(*this, "cassette") + , m_via(*this, "via6522") + , m_ram(*this, "ram") + , m_rom(*this, "maincpu") + , m_bank_c000_r(*this, "bank_c000_r") + , m_bank_e000_r(*this, "bank_e000_r") + , m_bank_f800_r(*this, "bank_f800_r") + , m_bank_c000_w(*this, "bank_c000_w") + , m_bank_e000_w(*this, "bank_e000_w") + , m_bank_f800_w(*this, "bank_f800_w") + , m_config(*this, "CONFIG") + { } DECLARE_INPUT_CHANGED_MEMBER(nmi_pressed); DECLARE_WRITE8_MEMBER(via_a_w); @@ -207,8 +208,8 @@ void telestrat_state::telestrat_mem(address_map &map) map(0x0000, 0xffff).ram().share("ram"); map(0x0300, 0x030f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0x0310, 0x0313).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0x0314, 0x0314).rw(this, FUNC(telestrat_state::port_314_r), FUNC(telestrat_state::port_314_w)); - map(0x0318, 0x0318).r(this, FUNC(telestrat_state::port_318_r)); + map(0x0314, 0x0314).rw(FUNC(telestrat_state::port_314_r), FUNC(telestrat_state::port_314_w)); + map(0x0318, 0x0318).r(FUNC(telestrat_state::port_318_r)); map(0x031c, 0x031f).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x0320, 0x032f).rw(m_via2, FUNC(via6522_device::read), FUNC(via6522_device::write)); map(0xc000, 0xffff).bankr("bank_c000_r").bankw("bank_c000_w"); @@ -320,7 +321,7 @@ INPUT_CHANGED_MEMBER(oric_state::nmi_pressed) WRITE8_MEMBER(oric_state::via_a_w) { m_via_a = data; - m_cent_data_out->write(space, 0, m_via_a); + m_cent_data_out->write(m_via_a); update_psg(space); } diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp index 7f405e3278d..bc625c009ca 100644 --- a/src/mame/drivers/orion.cpp +++ b/src/mame/drivers/orion.cpp @@ -29,13 +29,13 @@ void orion_state::orion128_mem(address_map &map) { map(0x0000, 0xefff).bankrw("bank1"); map(0xf000, 0xf3ff).bankrw("bank2"); - map(0xf400, 0xf4ff).rw(this, FUNC(orion_state::orion128_system_r), FUNC(orion_state::orion128_system_w)); // Keyboard and cassette - map(0xf500, 0xf5ff).rw(this, FUNC(orion_state::orion128_romdisk_r), FUNC(orion_state::orion128_romdisk_w)); - map(0xf700, 0xf7ff).rw(this, FUNC(orion_state::orion128_floppy_r), FUNC(orion_state::orion128_floppy_w)); + map(0xf400, 0xf4ff).rw(FUNC(orion_state::orion128_system_r), FUNC(orion_state::orion128_system_w)); // Keyboard and cassette + map(0xf500, 0xf5ff).rw(FUNC(orion_state::orion128_romdisk_r), FUNC(orion_state::orion128_romdisk_w)); + map(0xf700, 0xf7ff).rw(FUNC(orion_state::orion128_floppy_r), FUNC(orion_state::orion128_floppy_w)); map(0xf800, 0xffff).rom(); - map(0xf800, 0xf8ff).w(this, FUNC(orion_state::orion128_video_mode_w)); - map(0xf900, 0xf9ff).w(this, FUNC(orion_state::orion128_memory_page_w)); - map(0xfa00, 0xfaff).w(this, FUNC(orion_state::orion128_video_page_w)); + map(0xf800, 0xf8ff).w(FUNC(orion_state::orion128_video_mode_w)); + map(0xf900, 0xf9ff).w(FUNC(orion_state::orion128_memory_page_w)); + map(0xfa00, 0xfaff).w(FUNC(orion_state::orion128_video_page_w)); } /* Orion Z80 Card II */ @@ -43,9 +43,9 @@ void orion_state::orion128_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xf8, 0xf8).w(this, FUNC(orion_state::orion128_video_mode_w)); - map(0xf9, 0xf9).w(this, FUNC(orion_state::orion128_memory_page_w)); - map(0xfa, 0xfa).w(this, FUNC(orion_state::orion128_video_page_w)); + map(0xf8, 0xf8).w(FUNC(orion_state::orion128_video_mode_w)); + map(0xf9, 0xf9).w(FUNC(orion_state::orion128_memory_page_w)); + map(0xfa, 0xfa).w(FUNC(orion_state::orion128_video_page_w)); } void orion_state::orionz80_mem(address_map &map) @@ -61,7 +61,7 @@ void orion_state::orionz80_mem(address_map &map) /* Orion Pro */ void orion_state::orionz80_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(orion_state::orionz80_io_r), FUNC(orion_state::orionz80_io_w)); + map(0x0000, 0xffff).rw(FUNC(orion_state::orionz80_io_r), FUNC(orion_state::orionz80_io_w)); } void orion_state::orionpro_mem(address_map &map) @@ -79,7 +79,7 @@ void orion_state::orionpro_mem(address_map &map) void orion_state::orionpro_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(orion_state::orionpro_io_r), FUNC(orion_state::orionpro_io_w)); + map(0x0000, 0xffff).rw(FUNC(orion_state::orionpro_io_r), FUNC(orion_state::orionpro_io_w)); } FLOPPY_FORMATS_MEMBER( orion_state::orion_floppy_formats ) diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index d31a8f2dec4..cd16a77c935 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -213,10 +213,10 @@ READ8_MEMBER(osbexec_state::osbexec_rtc_r) void osbexec_state::osbexec_mem(address_map &map) { - map(0x0000, 0x1FFF).bankr("0000").w(this, FUNC(osbexec_state::osbexec_0000_w)); /* ROM and maybe also banked ram */ + map(0x0000, 0x1FFF).bankr("0000").w(FUNC(osbexec_state::osbexec_0000_w)); /* ROM and maybe also banked ram */ map(0x2000, 0x3FFF).bankrw("2000"); /* Banked RAM */ map(0x4000, 0xBFFF).bankrw("4000"); /* Banked RAM */ - map(0xC000, 0xDFFF).rw(this, FUNC(osbexec_state::osbexec_c000_r), FUNC(osbexec_state::osbexec_c000_w)); /* Video ram / Banked RAM */ + map(0xC000, 0xDFFF).rw(FUNC(osbexec_state::osbexec_c000_r), FUNC(osbexec_state::osbexec_c000_w)); /* Video ram / Banked RAM */ map(0xE000, 0xEFFF).bankrw("e000"); /* Banked RAM */ map(0xF000, 0xFFFF).ram(); /* 4KB of non-banked RAM for system stack etc */ } @@ -230,8 +230,8 @@ void osbexec_state::osbexec_io(address_map &map) map(0x08, 0x0B).mirror(0xff00).rw(m_mb8877, FUNC(wd_fdc_device_base::read), FUNC(wd_fdc_device_base::write)); /* MB8877 @ UB17 input clock = 1MHz */ map(0x0C, 0x0F).mirror(0xff00).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); /* SIO @ UD4 */ map(0x10, 0x13).mirror(0xff00).rw(m_pia_1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* 6821 PIA @ UD8 */ - map(0x14, 0x17).select(0xff00).r(this, FUNC(osbexec_state::osbexec_kbd_r)); /* KBD */ - map(0x18, 0x1b).mirror(0xff00).r(this, FUNC(osbexec_state::osbexec_rtc_r)); /* "RTC" @ UE13/UF13 */ + map(0x14, 0x17).select(0xff00).r(FUNC(osbexec_state::osbexec_kbd_r)); /* KBD */ + map(0x18, 0x1b).mirror(0xff00).r(FUNC(osbexec_state::osbexec_rtc_r)); /* "RTC" @ UE13/UF13 */ /* ?? - vid ? */ } diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp index 9caa2d4bfe5..30f7e7941a2 100644 --- a/src/mame/drivers/osborne1.cpp +++ b/src/mame/drivers/osborne1.cpp @@ -102,17 +102,17 @@ static constexpr XTAL MAIN_CLOCK = 15.9744_MHz_XTAL; void osborne1_state::osborne1_mem(address_map &map) { - map(0x0000, 0x0FFF).bankr(m_bank_0xxx).w(this, FUNC(osborne1_state::bank_0xxx_w)); - map(0x1000, 0x1FFF).bankr(m_bank_1xxx).w(this, FUNC(osborne1_state::bank_1xxx_w)); - map(0x2000, 0x3FFF).rw(this, FUNC(osborne1_state::bank_2xxx_3xxx_r), FUNC(osborne1_state::bank_2xxx_3xxx_w)); + map(0x0000, 0x0FFF).bankr(m_bank_0xxx).w(FUNC(osborne1_state::bank_0xxx_w)); + map(0x1000, 0x1FFF).bankr(m_bank_1xxx).w(FUNC(osborne1_state::bank_1xxx_w)); + map(0x2000, 0x3FFF).rw(FUNC(osborne1_state::bank_2xxx_3xxx_r), FUNC(osborne1_state::bank_2xxx_3xxx_w)); map(0x4000, 0xEFFF).ram(); - map(0xF000, 0xFFFF).bankr(m_bank_fxxx).w(this, FUNC(osborne1_state::videoram_w)); + map(0xF000, 0xFFFF).bankr(m_bank_fxxx).w(FUNC(osborne1_state::videoram_w)); } void osborne1_state::osborne1_op(address_map &map) { - map(0x0000, 0xFFFF).r(this, FUNC(osborne1_state::opcode_r)); + map(0x0000, 0xFFFF).r(FUNC(osborne1_state::opcode_r)); } @@ -121,7 +121,7 @@ void osborne1_state::osborne1_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x03).mirror(0xfc).w(this, FUNC(osborne1_state::bankswitch_w)); + map(0x00, 0x03).mirror(0xfc).w(FUNC(osborne1_state::bankswitch_w)); } void osborne1_state::osborne1nv_io(address_map &map) @@ -129,7 +129,7 @@ void osborne1_state::osborne1nv_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); - map( 0x00, 0x03 ).w(this, FUNC(osborne1_state::bankswitch_w)); + map( 0x00, 0x03 ).w(FUNC(osborne1_state::bankswitch_w)); map( 0x04, 0x04 ).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map( 0x05, 0x05 ).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); // seems to be something at 0x06 as well, but no idea what - BIOS writes 0x07 on boot diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp index 0dd4e5d025f..5bb8af5602f 100644 --- a/src/mame/drivers/osi.cpp +++ b/src/mame/drivers/osi.cpp @@ -453,7 +453,7 @@ void sb2m600_state::osi600_mem(address_map &map) map(0x0000, 0x1fff).bankrw("bank1"); map(0xa000, 0xbfff).rom(); map(0xd000, 0xd3ff).ram().share("video_ram"); - map(0xdf00, 0xdf00).rw(this, FUNC(sb2m600_state::keyboard_r), FUNC(sb2m600_state::keyboard_w)); + map(0xdf00, 0xdf00).rw(FUNC(sb2m600_state::keyboard_r), FUNC(sb2m600_state::keyboard_w)); map(0xf000, 0xf001).rw(m_acia_0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); map(0xf800, 0xffff).rom(); } @@ -464,7 +464,7 @@ void uk101_state::uk101_mem(address_map &map) map(0xa000, 0xbfff).rom(); map(0xd000, 0xd3ff).ram().share("video_ram"); map(0xd400, 0xd7ff).noprw(); // bios sets this to spaces at boot - map(0xdc00, 0xdfff).r(this, FUNC(uk101_state::keyboard_r)).w(this, FUNC(uk101_state::keyboard_w)); + map(0xdc00, 0xdfff).r(FUNC(uk101_state::keyboard_r)).w(FUNC(uk101_state::keyboard_w)); map(0xf000, 0xf001).mirror(0x00fe).rw(m_acia_0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); map(0xf800, 0xffff).rom(); } @@ -478,11 +478,11 @@ void c1p_state::c1p_mem(address_map &map) map(0xc70c, 0xc70f).rw("pia_3", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xd000, 0xd3ff).ram().share("video_ram"); map(0xd400, 0xd7ff).ram().share("color_ram"); - map(0xd800, 0xd800).w(this, FUNC(c1p_state::ctrl_w)); - map(0xdf00, 0xdf00).rw(this, FUNC(c1p_state::keyboard_r), FUNC(c1p_state::keyboard_w)); + map(0xd800, 0xd800).w(FUNC(c1p_state::ctrl_w)); + map(0xdf00, 0xdf00).rw(FUNC(c1p_state::keyboard_r), FUNC(c1p_state::keyboard_w)); map(0xf000, 0xf001).rw(m_acia_0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); - map(0xf7c0, 0xf7c0).w(this, FUNC(c1p_state::osi630_sound_w)); - map(0xf7e0, 0xf7e0).w(this, FUNC(c1p_state::osi630_ctrl_w)); + map(0xf7c0, 0xf7c0).w(FUNC(c1p_state::osi630_sound_w)); + map(0xf7e0, 0xf7e0).w(FUNC(c1p_state::osi630_ctrl_w)); map(0xf800, 0xffff).rom(); } @@ -497,11 +497,11 @@ void c1pmf_state::c1pmf_mem(address_map &map) map(0xc70c, 0xc70f).rw("pia_3", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xd000, 0xd3ff).ram().share("video_ram"); map(0xd400, 0xd7ff).ram().share("color_ram"); - map(0xd800, 0xd800).w(this, FUNC(c1pmf_state::ctrl_w)); - map(0xdf00, 0xdf00).rw(this, FUNC(c1pmf_state::keyboard_r), FUNC(c1pmf_state::keyboard_w)); + map(0xd800, 0xd800).w(FUNC(c1pmf_state::ctrl_w)); + map(0xdf00, 0xdf00).rw(FUNC(c1pmf_state::keyboard_r), FUNC(c1pmf_state::keyboard_w)); map(0xf000, 0xf001).rw(m_acia_0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); - map(0xf7c0, 0xf7c0).w(this, FUNC(c1pmf_state::osi630_sound_w)); - map(0xf7e0, 0xf7e0).w(this, FUNC(c1pmf_state::osi630_ctrl_w)); + map(0xf7c0, 0xf7c0).w(FUNC(c1pmf_state::osi630_sound_w)); + map(0xf7e0, 0xf7e0).w(FUNC(c1pmf_state::osi630_ctrl_w)); map(0xf800, 0xffff).rom(); } diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp index e299779fecc..ea1d2452088 100644 --- a/src/mame/drivers/othello.cpp +++ b/src/mame/drivers/othello.cpp @@ -222,12 +222,12 @@ void othello_state::main_portmap(address_map &map) map(0x80, 0x80).portr("INP"); map(0x81, 0x81).portr("SYSTEM"); map(0x83, 0x83).portr("DSW"); - map(0x86, 0x86).w(this, FUNC(othello_state::tilebank_w)); - map(0x87, 0x87).r(this, FUNC(othello_state::unk_87_r)); - map(0x8a, 0x8a).w(this, FUNC(othello_state::unk_8a_w)); - map(0x8c, 0x8c).rw(this, FUNC(othello_state::unk_8c_r), FUNC(othello_state::unk_8c_w)); - map(0x8d, 0x8d).r(this, FUNC(othello_state::sound_ack_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x8f, 0x8f).w(this, FUNC(othello_state::unk_8f_w)); + map(0x86, 0x86).w(FUNC(othello_state::tilebank_w)); + map(0x87, 0x87).r(FUNC(othello_state::unk_87_r)); + map(0x8a, 0x8a).w(FUNC(othello_state::unk_8a_w)); + map(0x8c, 0x8c).rw(FUNC(othello_state::unk_8c_r), FUNC(othello_state::unk_8c_w)); + map(0x8d, 0x8d).r(FUNC(othello_state::sound_ack_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0x8f, 0x8f).w(FUNC(othello_state::unk_8f_w)); } READ8_MEMBER(othello_state::latch_r) @@ -268,11 +268,11 @@ void othello_state::audio_map(address_map &map) void othello_state::audio_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(othello_state::latch_r)); - map(0x01, 0x01).w(this, FUNC(othello_state::ay_data_w)); - map(0x03, 0x03).w(this, FUNC(othello_state::ay_address_w)); - map(0x04, 0x04).w(this, FUNC(othello_state::ack_w)); - map(0x08, 0x08).w(this, FUNC(othello_state::ay_select_w)); + map(0x00, 0x00).r(FUNC(othello_state::latch_r)); + map(0x01, 0x01).w(FUNC(othello_state::ay_data_w)); + map(0x03, 0x03).w(FUNC(othello_state::ay_address_w)); + map(0x04, 0x04).w(FUNC(othello_state::ack_w)); + map(0x08, 0x08).w(FUNC(othello_state::ay_select_w)); } WRITE8_MEMBER(othello_state::n7751_rom_control_w) @@ -414,7 +414,7 @@ MACHINE_CONFIG_START(othello_state::othello) MCFG_MCS48_PORT_T1_IN_CB(GND) // labelled as "TEST", connected to ground MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, othello_state, n7751_command_r)) MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, othello_state, n7751_rom_r)) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, othello_state, n7751_p2_w)) MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("n7751_8243", i8243_device, prog_w)) diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp index 0d366c9a824..631801041f1 100644 --- a/src/mame/drivers/othunder.cpp +++ b/src/mame/drivers/othunder.cpp @@ -429,10 +429,10 @@ void othunder_state::othunder_map(address_map &map) map(0x100000, 0x100007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_rbswap_word_w)); /* palette */ map(0x200000, 0x20ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x220000, 0x22000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); - map(0x300000, 0x300003).rw(this, FUNC(othunder_state::sound_r), FUNC(othunder_state::sound_w)); + map(0x300000, 0x300003).rw(FUNC(othunder_state::sound_r), FUNC(othunder_state::sound_w)); map(0x400000, 0x4005ff).ram().share("spriteram"); map(0x500000, 0x500007).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask16(0x00ff); - map(0x600000, 0x600003).w(this, FUNC(othunder_state::irq_ack_w)); + map(0x600000, 0x600003).w(FUNC(othunder_state::irq_ack_w)); } @@ -446,12 +446,12 @@ void othunder_state::z80_sound_map(address_map &map) map(0xe000, 0xe003).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); map(0xe200, 0xe200).nopr().w(m_tc0140syt, FUNC(tc0140syt_device::slave_port_w)); map(0xe201, 0xe201).rw(m_tc0140syt, FUNC(tc0140syt_device::slave_comm_r), FUNC(tc0140syt_device::slave_comm_w)); - map(0xe400, 0xe403).w(this, FUNC(othunder_state::tc0310fam_w)); /* pan */ + map(0xe400, 0xe403).w(FUNC(othunder_state::tc0310fam_w)); /* pan */ map(0xe600, 0xe600).nopw(); /* ? */ map(0xea00, 0xea00).portr("ROTARY"); /* rotary input */ map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(othunder_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(othunder_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp index 21c64078ef4..62da9f59dc6 100644 --- a/src/mame/drivers/overdriv.cpp +++ b/src/mame/drivers/overdriv.cpp @@ -172,16 +172,16 @@ void overdriv_state::overdriv_master_map(address_map &map) map(0x1d0000, 0x1d001f).w(m_k053251, FUNC(k053251_device::msb_w)); map(0x1d8000, 0x1d8003).rw("k053260_1", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); map(0x1e0000, 0x1e0003).rw("k053260_2", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); - map(0x1e8000, 0x1e8001).w(this, FUNC(overdriv_state::overdriv_soundirq_w)); - map(0x1f0000, 0x1f0001).w(this, FUNC(overdriv_state::cpuA_ctrl_w)); /* halt cpu B, coin counter, start lamp, other? */ - map(0x1f8000, 0x1f8001).w(this, FUNC(overdriv_state::eeprom_w)); + map(0x1e8000, 0x1e8001).w(FUNC(overdriv_state::overdriv_soundirq_w)); + map(0x1f0000, 0x1f0001).w(FUNC(overdriv_state::cpuA_ctrl_w)); /* halt cpu B, coin counter, start lamp, other? */ + map(0x1f8000, 0x1f8001).w(FUNC(overdriv_state::eeprom_w)); map(0x200000, 0x203fff).ram().share("share1"); map(0x210000, 0x210fff).rw(m_k051316_1, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0xff00); map(0x218000, 0x218fff).rw(m_k051316_2, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0xff00); map(0x220000, 0x220fff).r(m_k051316_1, FUNC(k051316_device::rom_r)).umask16(0xff00); map(0x228000, 0x228fff).r(m_k051316_2, FUNC(k051316_device::rom_r)).umask16(0xff00); - map(0x230000, 0x230001).w(this, FUNC(overdriv_state::slave_irq4_assert_w)); - map(0x238000, 0x238001).w(this, FUNC(overdriv_state::slave_irq5_assert_w)); + map(0x230000, 0x230001).w(FUNC(overdriv_state::slave_irq4_assert_w)); + map(0x238000, 0x238001).w(FUNC(overdriv_state::slave_irq5_assert_w)); } #ifdef UNUSED_FUNCTION @@ -231,9 +231,9 @@ void overdriv_state::overdriv_slave_map(address_map &map) map(0x108000, 0x10800f).rw("k053250_2", FUNC(k053250_device::reg_r), FUNC(k053250_device::reg_w)); map(0x118000, 0x118fff).rw(m_k053246, FUNC(k053247_device::k053247_word_r), FUNC(k053247_device::k053247_word_w)); // data gets copied to sprite chip with DMA.. map(0x120000, 0x120001).r(m_k053246, FUNC(k053247_device::k053246_word_r)); - map(0x128000, 0x128001).rw(this, FUNC(overdriv_state::cpuB_ctrl_r), FUNC(overdriv_state::cpuB_ctrl_w)); /* enable K053247 ROM reading, plus something else */ + map(0x128000, 0x128001).rw(FUNC(overdriv_state::cpuB_ctrl_r), FUNC(overdriv_state::cpuB_ctrl_w)); /* enable K053247 ROM reading, plus something else */ map(0x130000, 0x130007).rw(m_k053246, FUNC(k053247_device::k053246_r), FUNC(k053247_device::k053246_w)); - map(0x130004, 0x130005).w(this, FUNC(overdriv_state::objdma_w)); + map(0x130004, 0x130005).w(FUNC(overdriv_state::objdma_w)); //AM_RANGE(0x140000, 0x140001) used in later stages, set after writes at 0x208000-0x20bfff range map(0x200000, 0x203fff).ram().share("share1"); map(0x208000, 0x20bfff).ram(); // sprite indirect table? @@ -248,7 +248,7 @@ WRITE8_MEMBER(overdriv_state::sound_ack_w) void overdriv_state::overdriv_sound_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(overdriv_state::sound_ack_w)); + map(0x0000, 0x0000).w(FUNC(overdriv_state::sound_ack_w)); // 0x012 read during explosions // 0x180 map(0x0200, 0x0201).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp index 64dc9dbb213..be24e37b5ac 100644 --- a/src/mame/drivers/p2000t.cpp +++ b/src/mame/drivers/p2000t.cpp @@ -39,15 +39,15 @@ Philips P2000 1 Memory map void p2000t_state::p2000t_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0f).r(this, FUNC(p2000t_state::p2000t_port_000f_r)); - map(0x10, 0x1f).w(this, FUNC(p2000t_state::p2000t_port_101f_w)); - map(0x20, 0x2f).r(this, FUNC(p2000t_state::p2000t_port_202f_r)); - map(0x30, 0x3f).w(this, FUNC(p2000t_state::p2000t_port_303f_w)); - map(0x50, 0x5f).w(this, FUNC(p2000t_state::p2000t_port_505f_w)); - map(0x70, 0x7f).w(this, FUNC(p2000t_state::p2000t_port_707f_w)); - map(0x88, 0x8b).w(this, FUNC(p2000t_state::p2000t_port_888b_w)); - map(0x8c, 0x90).w(this, FUNC(p2000t_state::p2000t_port_8c90_w)); - map(0x94, 0x94).w(this, FUNC(p2000t_state::p2000t_port_9494_w)); + map(0x00, 0x0f).r(FUNC(p2000t_state::p2000t_port_000f_r)); + map(0x10, 0x1f).w(FUNC(p2000t_state::p2000t_port_101f_w)); + map(0x20, 0x2f).r(FUNC(p2000t_state::p2000t_port_202f_r)); + map(0x30, 0x3f).w(FUNC(p2000t_state::p2000t_port_303f_w)); + map(0x50, 0x5f).w(FUNC(p2000t_state::p2000t_port_505f_w)); + map(0x70, 0x7f).w(FUNC(p2000t_state::p2000t_port_707f_w)); + map(0x88, 0x8b).w(FUNC(p2000t_state::p2000t_port_888b_w)); + map(0x8c, 0x90).w(FUNC(p2000t_state::p2000t_port_8c90_w)); + map(0x94, 0x94).w(FUNC(p2000t_state::p2000t_port_9494_w)); } /* Memory w/r functions */ diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp index 79d0deef044..9c013c38a86 100644 --- a/src/mame/drivers/p8k.cpp +++ b/src/mame/drivers/p8k.cpp @@ -148,7 +148,7 @@ void p8k_state::p8k_memmap(address_map &map) void p8k_state::p8k_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x07).rw(this, FUNC(p8k_state::p8k_port0_r), FUNC(p8k_state::p8k_port0_w)); // MH7489 + map(0x00, 0x07).rw(FUNC(p8k_state::p8k_port0_r), FUNC(p8k_state::p8k_port0_w)); // MH7489 map(0x08, 0x0b).rw("ctc0", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0c, 0x0f).rw("pio0", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x18, 0x1b).rw("pio1", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); @@ -157,7 +157,7 @@ void p8k_state::p8k_iomap(address_map &map) map(0x24, 0x27).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); map(0x28, 0x2b).rw("sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); map(0x2c, 0x2f).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x3c, 0x3c).rw("dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); + map(0x3c, 0x3c).rw("dma", FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); } diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp index 83c81ef8186..7ca4614a2d5 100644 --- a/src/mame/drivers/pachifev.cpp +++ b/src/mame/drivers/pachifev.cpp @@ -151,11 +151,11 @@ void pachifev_state::pachifev_map(address_map &map) map(0xff04, 0xff04).portr("DSW1"); map(0xff06, 0xff06).portr("DSW2"); map(0xff08, 0xff08).portr("DSW3"); - map(0xff10, 0xff10).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0xff12, 0xff12).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0xff20, 0xff20).w("y2404_1", FUNC(y2404_device::write)); - map(0xff30, 0xff30).w("y2404_2", FUNC(y2404_device::write)); - map(0xff40, 0xff40).w(this, FUNC(pachifev_state::controls_w)); + map(0xff10, 0xff10).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0xff12, 0xff12).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0xff20, 0xff20).w("y2404_1", FUNC(y2404_device::command_w)); + map(0xff30, 0xff30).w("y2404_2", FUNC(y2404_device::command_w)); + map(0xff40, 0xff40).w(FUNC(pachifev_state::controls_w)); map(0xff50, 0xff50).nopw(); /* unknown */ map(0xfffa, 0xfffb).noprw(); /* decrementer */ map(0xfffc, 0xffff).noprw(); /* nmi */ @@ -163,7 +163,7 @@ void pachifev_state::pachifev_map(address_map &map) void pachifev_state::pachifev_cru(address_map &map) { - map(0x000, 0x000).r(this, FUNC(pachifev_state::controls_r)); + map(0x000, 0x000).r(FUNC(pachifev_state::controls_r)); } diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp index af4435daa6a..4f372e05388 100644 --- a/src/mame/drivers/pacland.cpp +++ b/src/mame/drivers/pacland.cpp @@ -263,19 +263,19 @@ WRITE8_MEMBER(pacland_state::irq_2_ctrl_w) void pacland_state::main_map(address_map &map) { - map(0x0000, 0x0fff).ram().w(this, FUNC(pacland_state::videoram_w)).share("videoram"); - map(0x1000, 0x1fff).ram().w(this, FUNC(pacland_state::videoram2_w)).share("videoram2"); + map(0x0000, 0x0fff).ram().w(FUNC(pacland_state::videoram_w)).share("videoram"); + map(0x1000, 0x1fff).ram().w(FUNC(pacland_state::videoram2_w)).share("videoram2"); map(0x2000, 0x37ff).ram().share("spriteram"); - map(0x3800, 0x3801).w(this, FUNC(pacland_state::scroll0_w)); - map(0x3a00, 0x3a01).w(this, FUNC(pacland_state::scroll1_w)); - map(0x3c00, 0x3c00).w(this, FUNC(pacland_state::bankswitch_w)); + map(0x3800, 0x3801).w(FUNC(pacland_state::scroll0_w)); + map(0x3a00, 0x3a01).w(FUNC(pacland_state::scroll1_w)); + map(0x3c00, 0x3c00).w(FUNC(pacland_state::bankswitch_w)); map(0x4000, 0x5fff).bankr("bank1"); map(0x6800, 0x6bff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); /* PSG device, shared RAM */ - map(0x7000, 0x7fff).w(this, FUNC(pacland_state::irq_1_ctrl_w)); + map(0x7000, 0x7fff).w(FUNC(pacland_state::irq_1_ctrl_w)); map(0x7800, 0x7fff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x8000, 0xffff).rom(); - map(0x8000, 0x8fff).w(this, FUNC(pacland_state::subreset_w)); - map(0x9000, 0x9fff).w(this, FUNC(pacland_state::flipscreen_w)); + map(0x8000, 0x8fff).w(FUNC(pacland_state::subreset_w)); + map(0x9000, 0x9fff).w(FUNC(pacland_state::flipscreen_w)); } void pacland_state::mcu_map(address_map &map) @@ -284,10 +284,10 @@ void pacland_state::mcu_map(address_map &map) map(0x0080, 0x00ff).ram(); map(0x1000, 0x13ff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); /* PSG device, shared RAM */ map(0x2000, 0x3fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog? */ - map(0x4000, 0x7fff).w(this, FUNC(pacland_state::irq_2_ctrl_w)); + map(0x4000, 0x7fff).w(FUNC(pacland_state::irq_2_ctrl_w)); map(0x8000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xd000, 0xd003).r(this, FUNC(pacland_state::input_r)); + map(0xd000, 0xd003).r(FUNC(pacland_state::input_r)); map(0xf000, 0xffff).rom(); } @@ -300,9 +300,9 @@ READ8_MEMBER(pacland_state::readFF) void pacland_state::mcu_port_map(address_map &map) { map(M6801_PORT1, M6801_PORT1).portr("IN2"); - map(M6801_PORT1, M6801_PORT1).w(this, FUNC(pacland_state::coin_w)); - map(M6801_PORT2, M6801_PORT2).r(this, FUNC(pacland_state::readFF)); /* leds won't work otherwise */ - map(M6801_PORT2, M6801_PORT2).w(this, FUNC(pacland_state::led_w)); + map(M6801_PORT1, M6801_PORT1).w(FUNC(pacland_state::coin_w)); + map(M6801_PORT2, M6801_PORT2).r(FUNC(pacland_state::readFF)); /* leds won't work otherwise */ + map(M6801_PORT2, M6801_PORT2).w(FUNC(pacland_state::led_w)); } diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index f37da78bd8a..3aaa1d925fe 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -1001,9 +1001,9 @@ void pacman_state::pacman_map(address_map &map) { //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. map(0x0000, 0x3fff).mirror(0x8000).rom(); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); - map(0x4800, 0x4bff).mirror(0xa000).r(this, FUNC(pacman_state::pacman_read_nop)).nopw(); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0xa000).r(FUNC(pacman_state::pacman_read_nop)).nopw(); map(0x4c00, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(addressable_latch_device::write_d0)); @@ -1022,8 +1022,8 @@ void pacman_state::pacman_map(address_map &map) void pacman_state::birdiy_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x8000).rom(); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); // AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP map(0x4c00, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); @@ -1046,9 +1046,9 @@ void pacman_state::mspacman_map(address_map &map) map(0x0000, 0xffff).bankr("bank1"); map(0x4000, 0x7fff).mirror(0x8000).unmaprw(); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); - map(0x4800, 0x4bff).mirror(0xa000).r(this, FUNC(pacman_state::pacman_read_nop)).nopw(); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0xa000).r(FUNC(pacman_state::pacman_read_nop)).nopw(); map(0x4c00, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -1063,23 +1063,23 @@ void pacman_state::mspacman_map(address_map &map) map(0x50c0, 0x50c0).mirror(0xaf3f).portr("DSW2"); /* overlay decode enable/disable on top */ - map(0x0038, 0x003f).rw(this, FUNC(pacman_state::mspacman_disable_decode_r_0x0038), FUNC(pacman_state::mspacman_disable_decode_w)); - map(0x03b0, 0x03b7).rw(this, FUNC(pacman_state::mspacman_disable_decode_r_0x03b0), FUNC(pacman_state::mspacman_disable_decode_w)); - map(0x1600, 0x1607).rw(this, FUNC(pacman_state::mspacman_disable_decode_r_0x1600), FUNC(pacman_state::mspacman_disable_decode_w)); - map(0x2120, 0x2127).rw(this, FUNC(pacman_state::mspacman_disable_decode_r_0x2120), FUNC(pacman_state::mspacman_disable_decode_w)); - map(0x3ff0, 0x3ff7).rw(this, FUNC(pacman_state::mspacman_disable_decode_r_0x3ff0), FUNC(pacman_state::mspacman_disable_decode_w)); - map(0x3ff8, 0x3fff).rw(this, FUNC(pacman_state::mspacman_enable_decode_r_0x3ff8), FUNC(pacman_state::mspacman_enable_decode_w)); - map(0x8000, 0x8007).rw(this, FUNC(pacman_state::mspacman_disable_decode_r_0x8000), FUNC(pacman_state::mspacman_disable_decode_w)); - map(0x97f0, 0x97f7).rw(this, FUNC(pacman_state::mspacman_disable_decode_r_0x97f0), FUNC(pacman_state::mspacman_disable_decode_w)); + map(0x0038, 0x003f).rw(FUNC(pacman_state::mspacman_disable_decode_r_0x0038), FUNC(pacman_state::mspacman_disable_decode_w)); + map(0x03b0, 0x03b7).rw(FUNC(pacman_state::mspacman_disable_decode_r_0x03b0), FUNC(pacman_state::mspacman_disable_decode_w)); + map(0x1600, 0x1607).rw(FUNC(pacman_state::mspacman_disable_decode_r_0x1600), FUNC(pacman_state::mspacman_disable_decode_w)); + map(0x2120, 0x2127).rw(FUNC(pacman_state::mspacman_disable_decode_r_0x2120), FUNC(pacman_state::mspacman_disable_decode_w)); + map(0x3ff0, 0x3ff7).rw(FUNC(pacman_state::mspacman_disable_decode_r_0x3ff0), FUNC(pacman_state::mspacman_disable_decode_w)); + map(0x3ff8, 0x3fff).rw(FUNC(pacman_state::mspacman_enable_decode_r_0x3ff8), FUNC(pacman_state::mspacman_enable_decode_w)); + map(0x8000, 0x8007).rw(FUNC(pacman_state::mspacman_disable_decode_r_0x8000), FUNC(pacman_state::mspacman_disable_decode_w)); + map(0x97f0, 0x97f7).rw(FUNC(pacman_state::mspacman_disable_decode_r_0x97f0), FUNC(pacman_state::mspacman_disable_decode_w)); } void pacman_state::woodpek_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); - map(0x4800, 0x4bff).mirror(0xa000).r(this, FUNC(pacman_state::pacman_read_nop)).nopw(); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0xa000).r(FUNC(pacman_state::pacman_read_nop)).nopw(); map(0x4c00, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -1105,8 +1105,8 @@ void pacman_state::numcrash_map(address_map &map) /* 0x3800 - 0x3fff unmapped? */ map(0x8000, 0x9fff).rom(); - map(0x4000, 0x43ff).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4000, 0x43ff).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); map(0x4c00, 0x4fef).ram(); map(0x4ff0, 0x4fff).ram().share("spriteram"); @@ -1126,15 +1126,15 @@ void pacman_state::numcrash_map(address_map &map) void pacman_state::alibaba_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); - map(0x4800, 0x4bff).mirror(0xa000).r(this, FUNC(pacman_state::pacman_read_nop)).nopw(); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0xa000).r(FUNC(pacman_state::pacman_read_nop)).nopw(); map(0x4c00, 0x4eef).mirror(0xa000).ram(); map(0x4ef0, 0x4eff).mirror(0xa000).ram().share("spriteram"); map(0x4f00, 0x4fff).mirror(0xa000).ram(); map(0x5000, 0x5007).mirror(0xaf38).w("latch1", FUNC(ls259_device::write_d0)); map(0x5000, 0x5000).mirror(0xaf38).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x5040, 0x506f).mirror(0xaf00).w(this, FUNC(pacman_state::alibaba_sound_w)); /* the sound region is not contiguous */ + map(0x5040, 0x506f).mirror(0xaf00).w(FUNC(pacman_state::alibaba_sound_w)); /* the sound region is not contiguous */ map(0x5050, 0x505f).mirror(0xaf00).writeonly().share("spriteram2"); map(0x5070, 0x507f).mirror(0xaf00).nopw(); map(0x5080, 0x5080).mirror(0xaf3f).nopw(); @@ -1142,9 +1142,9 @@ void pacman_state::alibaba_map(address_map &map) map(0x5000, 0x5000).mirror(0xaf3f).portr("IN0"); map(0x5040, 0x5040).mirror(0xaf3f).portr("IN1"); map(0x5080, 0x5080).mirror(0xaf3f).portr("DSW1"); - map(0x50c0, 0x50c0).mirror(0xaf00).r(this, FUNC(pacman_state::alibaba_mystery_1_r)); - map(0x50c1, 0x50c1).mirror(0xaf00).r(this, FUNC(pacman_state::alibaba_mystery_2_r)); - map(0x50c2, 0x50ff).mirror(0xaf00).r(this, FUNC(pacman_state::pacman_read_nop)); + map(0x50c0, 0x50c0).mirror(0xaf00).r(FUNC(pacman_state::alibaba_mystery_1_r)); + map(0x50c1, 0x50c1).mirror(0xaf00).r(FUNC(pacman_state::alibaba_mystery_2_r)); + map(0x50c2, 0x50ff).mirror(0xaf00).r(FUNC(pacman_state::pacman_read_nop)); map(0x8000, 0x8fff).rom(); map(0x9000, 0x93ff).mirror(0x0c00).ram(); map(0xa000, 0xa7ff).mirror(0x1800).rom(); @@ -1154,8 +1154,8 @@ void pacman_state::alibaba_map(address_map &map) void pacman_state::dremshpr_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); map(0x4800, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -1179,9 +1179,9 @@ void pacman_state::dremshpr_map(address_map &map) void pacman_state::epos_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x8000).bankr("bank1"); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); - map(0x4800, 0x4bff).mirror(0xa000).r(this, FUNC(pacman_state::pacman_read_nop)).nopw(); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0xa000).r(FUNC(pacman_state::pacman_read_nop)).nopw(); map(0x4c00, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -1200,11 +1200,11 @@ void pacman_state::epos_map(address_map &map) void pacman_state::s2650games_map(address_map &map) { map(0x0000, 0x0fff).bankr("bank1"); - map(0x1000, 0x13ff).mirror(0x6000).w(this, FUNC(pacman_state::s2650games_colorram_w)).share("colorram"); - map(0x1400, 0x141f).mirror(0x6000).w(this, FUNC(pacman_state::s2650games_scroll_w)); + map(0x1000, 0x13ff).mirror(0x6000).w(FUNC(pacman_state::s2650games_colorram_w)).share("colorram"); + map(0x1400, 0x141f).mirror(0x6000).w(FUNC(pacman_state::s2650games_scroll_w)); map(0x1420, 0x148f).mirror(0x6000).writeonly(); map(0x1490, 0x149f).mirror(0x6000).writeonly().share("s2650_spriteram"); - map(0x14a0, 0x14bf).mirror(0x6000).w(this, FUNC(pacman_state::s2650games_tilesbank_w)).share("s2650_tileram"); + map(0x14a0, 0x14bf).mirror(0x6000).w(FUNC(pacman_state::s2650games_tilesbank_w)).share("s2650_tileram"); map(0x14c0, 0x14ff).mirror(0x6000).writeonly(); map(0x1500, 0x1507).mirror(0x6000).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x1508, 0x155f).mirror(0x6000).writeonly(); @@ -1212,11 +1212,11 @@ void pacman_state::s2650games_map(address_map &map) map(0x1570, 0x157f).mirror(0x6000).writeonly(); map(0x1586, 0x1587).mirror(0x6000).nopw(); map(0x15c0, 0x15c0).mirror(0x6000).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x15c7, 0x15c7).mirror(0x6000).w(this, FUNC(pacman_state::porky_banking_w)); + map(0x15c7, 0x15c7).mirror(0x6000).w(FUNC(pacman_state::porky_banking_w)); map(0x1500, 0x1500).mirror(0x6000).portr("IN0"); map(0x1540, 0x1540).mirror(0x6000).portr("IN1"); map(0x1580, 0x1580).mirror(0x6000).portr("DSW0"); - map(0x1800, 0x1bff).mirror(0x6000).w(this, FUNC(pacman_state::s2650games_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).mirror(0x6000).w(FUNC(pacman_state::s2650games_videoram_w)).share("videoram"); map(0x1c00, 0x1fef).mirror(0x6000).ram(); map(0x1ff0, 0x1fff).mirror(0x6000).writeonly().share("spriteram"); map(0x2000, 0x2fff).bankr("bank2"); @@ -1228,33 +1228,33 @@ void pacman_state::s2650games_map(address_map &map) void pacman_state::rocktrv2_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4000, 0x43ff).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); map(0x4c00, 0x4fff).ram(); map(0x5000, 0x5007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x5040, 0x505f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); map(0x50c0, 0x50c0).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x5fe0, 0x5fe3).w(this, FUNC(pacman_state::rocktrv2_prot_data_w)).share("rocktrv2_prot"); - map(0x5ff0, 0x5ff0).w(this, FUNC(pacman_state::rocktrv2_question_bank_w)); + map(0x5fe0, 0x5fe3).w(FUNC(pacman_state::rocktrv2_prot_data_w)).share("rocktrv2_prot"); + map(0x5ff0, 0x5ff0).w(FUNC(pacman_state::rocktrv2_question_bank_w)); map(0x5000, 0x5000).portr("IN0"); map(0x5040, 0x507f).portr("IN1"); map(0x5080, 0x5080).portr("DSW1"); map(0x50c0, 0x50c0).portr("DSW2"); - map(0x5fe0, 0x5fe0).r(this, FUNC(pacman_state::rocktrv2_prot1_data_r)); - map(0x5fe4, 0x5fe4).r(this, FUNC(pacman_state::rocktrv2_prot2_data_r)); - map(0x5fe8, 0x5fe8).r(this, FUNC(pacman_state::rocktrv2_prot3_data_r)); - map(0x5fec, 0x5fec).r(this, FUNC(pacman_state::rocktrv2_prot4_data_r)); + map(0x5fe0, 0x5fe0).r(FUNC(pacman_state::rocktrv2_prot1_data_r)); + map(0x5fe4, 0x5fe4).r(FUNC(pacman_state::rocktrv2_prot2_data_r)); + map(0x5fe8, 0x5fe8).r(FUNC(pacman_state::rocktrv2_prot3_data_r)); + map(0x5fec, 0x5fec).r(FUNC(pacman_state::rocktrv2_prot4_data_r)); map(0x5fff, 0x5fff).portr("DSW2"); /* DSW2 mirrored */ map(0x6000, 0x7fff).rom(); - map(0x8000, 0xffff).r(this, FUNC(pacman_state::rocktrv2_question_r)); + map(0x8000, 0xffff).r(FUNC(pacman_state::rocktrv2_question_r)); } void pacman_state::bigbucks_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4000, 0x43ff).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); map(0x4c00, 0x4fff).ram(); map(0x5000, 0x5007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x5040, 0x505f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); @@ -1264,7 +1264,7 @@ void pacman_state::bigbucks_map(address_map &map) map(0x5080, 0x50bf).portr("DSW1"); map(0x50c0, 0x50ff).portr("DSW2"); map(0x5100, 0x5100).nopw(); /*?*/ - map(0x6000, 0x6000).w(this, FUNC(pacman_state::bigbucks_bank_w)); + map(0x6000, 0x6000).w(FUNC(pacman_state::bigbucks_bank_w)); map(0x8000, 0x9fff).rom(); } @@ -1272,9 +1272,9 @@ void pacman_state::bigbucks_map(address_map &map) void pacman_state::mschamp_map(address_map &map) { map(0x0000, 0x3fff).bankr("bank1"); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); - map(0x4800, 0x4bff).mirror(0xa000).r(this, FUNC(pacman_state::pacman_read_nop)).nopw(); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0xa000).r(FUNC(pacman_state::pacman_read_nop)).nopw(); map(0x4c00, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -1294,12 +1294,12 @@ void pacman_state::mschamp_map(address_map &map) void pacman_state::superabc_map(address_map &map) { map(0x0000, 0x3fff).bankr("bank1"); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); map(0x4800, 0x4fef).mirror(0xa000).ram().share("28c16.u17"); // nvram map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x5002, 0x5002).mirror(0xaf3c).w(this, FUNC(pacman_state::superabc_bank_w)); + map(0x5002, 0x5002).mirror(0xaf3c).w(FUNC(pacman_state::superabc_bank_w)); map(0x5040, 0x505f).mirror(0xaf00).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); map(0x5060, 0x506f).mirror(0xaf00).writeonly().share("spriteram2"); map(0x5070, 0x507f).mirror(0xaf00).nopw(); @@ -1317,9 +1317,9 @@ void pacman_state::superabc_map(address_map &map) void pacman_state::crushs_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x8000).rom(); - map(0x4000, 0x43ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).mirror(0xa000).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); - map(0x4800, 0x4bff).mirror(0xa000).r(this, FUNC(pacman_state::pacman_read_nop)).nopw(); + map(0x4000, 0x43ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).mirror(0xa000).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x4800, 0x4bff).mirror(0xa000).r(FUNC(pacman_state::pacman_read_nop)).nopw(); map(0x4c00, 0x4fef).mirror(0xa000).ram(); map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram"); map(0x5000, 0x5007).mirror(0xaf38).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -1340,8 +1340,8 @@ void pacman_state::pengojpm_map(address_map &map) // AM_RANGE(0x1000, 0x1fff) // header check for 0x55aa at POST, diagnostic ROM? map(0x4000, 0x7fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(pacman_state::pacman_videoram_w)).share("videoram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(pacman_state::pacman_colorram_w)).share("colorram"); + map(0x8000, 0x83ff).ram().w(FUNC(pacman_state::pacman_videoram_w)).share("videoram"); + map(0x8400, 0x87ff).ram().w(FUNC(pacman_state::pacman_colorram_w)).share("colorram"); map(0x8800, 0x8bff).ram(); // AM_RANGE(0x8800, 0x8bff) AM_READ(pacman_read_nop) AM_WRITENOP @@ -1371,14 +1371,14 @@ void pacman_state::pengojpm_map(address_map &map) void pacman_state::writeport(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(pacman_state::pacman_interrupt_vector_w)); /* Pac-Man only */ + map(0x00, 0x00).w(FUNC(pacman_state::pacman_interrupt_vector_w)); /* Pac-Man only */ } void pacman_state::vanvan_portmap(address_map &map) { map.global_mask(0xff); - map(0x01, 0x01).w("sn1", FUNC(sn76496_device::write)); - map(0x02, 0x02).w("sn2", FUNC(sn76496_device::write)); + map(0x01, 0x01).w("sn1", FUNC(sn76496_device::command_w)); + map(0x02, 0x02).w("sn2", FUNC(sn76496_device::command_w)); } void pacman_state::dremshpr_portmap(address_map &map) @@ -1390,53 +1390,53 @@ void pacman_state::dremshpr_portmap(address_map &map) void pacman_state::piranha_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(pacman_state::piranha_interrupt_vector_w)); + map(0x00, 0x00).w(FUNC(pacman_state::piranha_interrupt_vector_w)); } void pacman_state::nmouse_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(pacman_state::nmouse_interrupt_vector_w)); + map(0x00, 0x00).w(FUNC(pacman_state::nmouse_interrupt_vector_w)); } void pacman_state::epos_portmap(address_map &map) { writeport(map); - map(0x00, 0xff).r(this, FUNC(pacman_state::epos_decryption_w)); /* Switch protection logic */ + map(0x00, 0xff).r(FUNC(pacman_state::epos_decryption_w)); /* Switch protection logic */ } void pacman_state::mschamp_portmap(address_map &map) { writeport(map); - map(0x00, 0x00).r(this, FUNC(pacman_state::mschamp_kludge_r)); + map(0x00, 0x00).r(FUNC(pacman_state::mschamp_kludge_r)); } void pacman_state::bigbucks_portmap(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(pacman_state::bigbucks_question_r)); + map(0x0000, 0xffff).r(FUNC(pacman_state::bigbucks_question_r)); } void pacman_state::s2650games_dataport(address_map &map) { - map(S2650_DATA_PORT, S2650_DATA_PORT).w("sn1", FUNC(sn76496_device::write)); + map(S2650_DATA_PORT, S2650_DATA_PORT).w("sn1", FUNC(sn76496_device::command_w)); } void pacman_state::drivfrcp_portmap(address_map &map) { map(0x00, 0x00).nopr(); - map(0x01, 0x01).r(this, FUNC(pacman_state::drivfrcp_port1_r)); + map(0x01, 0x01).r(FUNC(pacman_state::drivfrcp_port1_r)); } void pacman_state::_8bpm_portmap(address_map &map) { map(0x00, 0x00).nopr(); - map(0x01, 0x01).r(this, FUNC(pacman_state::_8bpm_port1_r)); + map(0x01, 0x01).r(FUNC(pacman_state::_8bpm_port1_r)); map(0xe0, 0xe0).nopr(); } void pacman_state::porky_portmap(address_map &map) { - map(0x01, 0x01).r(this, FUNC(pacman_state::porky_port1_r)); + map(0x01, 0x01).r(FUNC(pacman_state::porky_port1_r)); } void pacman_state::crushs_portmap(address_map &map) diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp index 2fb6288419a..0a1d1884792 100644 --- a/src/mame/drivers/pandoras.cpp +++ b/src/mame/drivers/pandoras.cpp @@ -116,13 +116,13 @@ WRITE_LINE_MEMBER(pandoras_state::coin_counter_2_w) void pandoras_state::pandoras_master_map(address_map &map) { map(0x0000, 0x0fff).ram().share("spriteram"); /* Work RAM (Shared with CPU B) */ - map(0x1000, 0x13ff).ram().w(this, FUNC(pandoras_state::pandoras_cram_w)).share("colorram"); /* Color RAM (shared with CPU B) */ - map(0x1400, 0x17ff).ram().w(this, FUNC(pandoras_state::pandoras_vram_w)).share("videoram"); /* Video RAM (shared with CPU B) */ + map(0x1000, 0x13ff).ram().w(FUNC(pandoras_state::pandoras_cram_w)).share("colorram"); /* Color RAM (shared with CPU B) */ + map(0x1400, 0x17ff).ram().w(FUNC(pandoras_state::pandoras_vram_w)).share("videoram"); /* Video RAM (shared with CPU B) */ map(0x1800, 0x1807).w("mainlatch", FUNC(ls259_device::write_d0)); /* INT control */ - map(0x1a00, 0x1a00).w(this, FUNC(pandoras_state::pandoras_scrolly_w)); /* bg scroll */ - map(0x1c00, 0x1c00).w(this, FUNC(pandoras_state::pandoras_z80_irqtrigger_w)); /* cause INT on the Z80 */ + map(0x1a00, 0x1a00).w(FUNC(pandoras_state::pandoras_scrolly_w)); /* bg scroll */ + map(0x1c00, 0x1c00).w(FUNC(pandoras_state::pandoras_z80_irqtrigger_w)); /* cause INT on the Z80 */ map(0x1e00, 0x1e00).w("soundlatch", FUNC(generic_latch_8_device::write)); /* sound command to the Z80 */ - map(0x2000, 0x2000).w(this, FUNC(pandoras_state::pandoras_cpub_irqtrigger_w)); /* cause FIRQ on CPU B */ + map(0x2000, 0x2000).w(FUNC(pandoras_state::pandoras_cpub_irqtrigger_w)); /* cause FIRQ on CPU B */ map(0x2001, 0x2001).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog reset */ map(0x4000, 0x5fff).rom(); /* space for diagnostic ROM */ map(0x6000, 0x67ff).ram().share("share4"); /* Shared RAM with CPU B */ @@ -132,8 +132,8 @@ void pandoras_state::pandoras_master_map(address_map &map) void pandoras_state::pandoras_slave_map(address_map &map) { map(0x0000, 0x0fff).ram().share("spriteram"); /* Work RAM (Shared with CPU A) */ - map(0x1000, 0x13ff).ram().w(this, FUNC(pandoras_state::pandoras_cram_w)).share("colorram"); /* Color RAM (shared with CPU A) */ - map(0x1400, 0x17ff).ram().w(this, FUNC(pandoras_state::pandoras_vram_w)).share("videoram"); /* Video RAM (shared with CPU A) */ + map(0x1000, 0x13ff).ram().w(FUNC(pandoras_state::pandoras_cram_w)).share("colorram"); /* Color RAM (shared with CPU A) */ + map(0x1400, 0x17ff).ram().w(FUNC(pandoras_state::pandoras_vram_w)).share("videoram"); /* Video RAM (shared with CPU A) */ map(0x1800, 0x1800).portr("DSW1"); map(0x1800, 0x1807).w("mainlatch", FUNC(ls259_device::write_d0)); /* INT control */ map(0x1a00, 0x1a00).portr("SYSTEM"); @@ -143,7 +143,7 @@ void pandoras_state::pandoras_slave_map(address_map &map) map(0x1c00, 0x1c00).portr("DSW2"); // AM_RANGE(0x1e00, 0x1e00) AM_READNOP /* ??? seems to be important */ map(0x8000, 0x8000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog reset */ - map(0xa000, 0xa000).w(this, FUNC(pandoras_state::pandoras_cpua_irqtrigger_w)); /* cause FIRQ on CPU A */ + map(0xa000, 0xa000).w(FUNC(pandoras_state::pandoras_cpua_irqtrigger_w)); /* cause FIRQ on CPU A */ map(0xc000, 0xc7ff).ram().share("share4"); /* Shared RAM with the CPU A */ map(0xe000, 0xffff).rom(); /* ROM */ } @@ -156,7 +156,7 @@ void pandoras_state::pandoras_sound_map(address_map &map) map(0x6000, 0x6000).w("aysnd", FUNC(ay8910_device::address_w)); /* AY-8910 */ map(0x6001, 0x6001).r("aysnd", FUNC(ay8910_device::data_r)); /* AY-8910 */ map(0x6002, 0x6002).w("aysnd", FUNC(ay8910_device::data_w)); /* AY-8910 */ - map(0x8000, 0x8000).w(this, FUNC(pandoras_state::pandoras_i8039_irqtrigger_w)); /* cause INT on the 8039 */ + map(0x8000, 0x8000).w(FUNC(pandoras_state::pandoras_i8039_irqtrigger_w)); /* cause INT on the 8039 */ map(0xa000, 0xa000).w("soundlatch2", FUNC(generic_latch_8_device::write)); /* sound command to the 8039 */ } @@ -321,7 +321,7 @@ MACHINE_CONFIG_START(pandoras_state::pandoras) MCFG_DEVICE_ADD("mcu", I8039, SOUND_CLOCK/2) MCFG_DEVICE_PROGRAM_MAP(pandoras_i8039_map) MCFG_DEVICE_IO_MAP(pandoras_i8039_io_map) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, pandoras_state, i8039_irqen_and_status_w)) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - needed for correct synchronization of the sound CPUs */ diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index 0eaad7b155a..072c12534fb 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -433,21 +433,21 @@ void panicr_state::panicr_map(address_map &map) map(0x00000, 0x01fff).ram().share("mainram"); map(0x02000, 0x03cff).ram().share("spriteram"); // how big is sprite ram, some places definitely have sprites at 3000+ map(0x03d00, 0x03fff).ram(); - map(0x08000, 0x0bfff).r(this, FUNC(panicr_state::collision_r)); + map(0x08000, 0x0bfff).r(FUNC(panicr_state::collision_r)); map(0x0c000, 0x0cfff).ram().share("textram"); map(0x0d000, 0x0d000).w(m_t5182, FUNC(t5182_device::sound_irq_w)); map(0x0d002, 0x0d002).w(m_t5182, FUNC(t5182_device::sharedram_semaphore_main_acquire_w)); map(0x0d004, 0x0d004).r(m_t5182, FUNC(t5182_device::sharedram_semaphore_snd_r)); map(0x0d006, 0x0d006).w(m_t5182, FUNC(t5182_device::sharedram_semaphore_main_release_w)); - map(0x0d200, 0x0d2ff).rw(this, FUNC(panicr_state::t5182shared_r), FUNC(panicr_state::t5182shared_w)); + map(0x0d200, 0x0d2ff).rw(FUNC(panicr_state::t5182shared_r), FUNC(panicr_state::t5182shared_w)); map(0x0d400, 0x0d400).portr("P1"); map(0x0d402, 0x0d402).portr("P2"); map(0x0d404, 0x0d404).portr("START"); map(0x0d406, 0x0d406).portr("DSW1"); map(0x0d407, 0x0d407).portr("DSW2"); - map(0x0d802, 0x0d802).w(this, FUNC(panicr_state::scrollx_hi_w)); - map(0x0d804, 0x0d804).w(this, FUNC(panicr_state::scrollx_lo_w)); - map(0x0d80a, 0x0d80a).w(this, FUNC(panicr_state::output_w)); + map(0x0d802, 0x0d802).w(FUNC(panicr_state::scrollx_hi_w)); + map(0x0d804, 0x0d804).w(FUNC(panicr_state::scrollx_lo_w)); + map(0x0d80a, 0x0d80a).w(FUNC(panicr_state::output_w)); map(0x0d80c, 0x0d80c).writeonly().share("spritebank"); map(0x0d818, 0x0d818).nopw(); // watchdog? map(0xf0000, 0xfffff).rom(); diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp index 8392f49b05a..63d42960463 100644 --- a/src/mame/drivers/paradise.cpp +++ b/src/mame/drivers/paradise.cpp @@ -132,9 +132,9 @@ void paradise_state::base_map(address_map &map) { map(0x0000, 0x7fff).rom(); /* ROM */ map(0x8000, 0xbfff).bankr("prgbank"); /* ROM (banked) */ - map(0xc000, 0xc7ff).ram().w(this, FUNC(paradise_state::vram_2_w)).share("vram_2"); /* Background */ - map(0xc800, 0xcfff).ram().w(this, FUNC(paradise_state::vram_1_w)).share("vram_1"); /* Midground */ - map(0xd000, 0xd7ff).ram().w(this, FUNC(paradise_state::vram_0_w)).share("vram_0"); /* Foreground */ + map(0xc000, 0xc7ff).ram().w(FUNC(paradise_state::vram_2_w)).share("vram_2"); /* Background */ + map(0xc800, 0xcfff).ram().w(FUNC(paradise_state::vram_1_w)).share("vram_1"); /* Midground */ + map(0xd000, 0xd7ff).ram().w(FUNC(paradise_state::vram_0_w)).share("vram_0"); /* Foreground */ } void paradise_state::paradise_map(address_map &map) @@ -162,24 +162,24 @@ void paradise_state::torus_map(address_map &map) void paradise_state::torus_io_map(address_map &map) { - map(0x0000, 0x17ff).ram().w(this, FUNC(paradise_state::palette_w)).share("paletteram"); // Palette - map(0x1800, 0x1800).w(this, FUNC(paradise_state::priority_w)); // Layers priority - map(0x2001, 0x2001).w(this, FUNC(paradise_state::flipscreen_w)); // Flip Screen - map(0x2004, 0x2004).w(this, FUNC(paradise_state::palbank_w)); // Layers palette bank - map(0x2006, 0x2006).w(this, FUNC(paradise_state::rombank_w)); // ROM bank + map(0x0000, 0x17ff).ram().w(FUNC(paradise_state::palette_w)).share("paletteram"); // Palette + map(0x1800, 0x1800).w(FUNC(paradise_state::priority_w)); // Layers priority + map(0x2001, 0x2001).w(FUNC(paradise_state::flipscreen_w)); // Flip Screen + map(0x2004, 0x2004).w(FUNC(paradise_state::palbank_w)); // Layers palette bank + map(0x2006, 0x2006).w(FUNC(paradise_state::rombank_w)); // ROM bank map(0x2010, 0x2010).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // OKI 0 map(0x2020, 0x2020).portr("DSW1"); map(0x2021, 0x2021).portr("DSW2"); map(0x2022, 0x2022).portr("P1"); map(0x2023, 0x2023).portr("P2"); map(0x2024, 0x2024).portr("SYSTEM"); - map(0x8000, 0xffff).ram().w(this, FUNC(paradise_state::pixmap_w)).share("videoram"); // Pixmap + map(0x8000, 0xffff).ram().w(FUNC(paradise_state::pixmap_w)).share("videoram"); // Pixmap } void paradise_state::paradise_io_map(address_map &map) { torus_io_map(map); - map(0x2007, 0x2007).w(this, FUNC(paradise_state::paradise_okibank_w)); // OKI 1 samples bank + map(0x2007, 0x2007).w(FUNC(paradise_state::paradise_okibank_w)); // OKI 1 samples bank map(0x2030, 0x2030).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // OKI 1 } diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp index 8375e0ba661..0161205d551 100644 --- a/src/mame/drivers/paranoia.cpp +++ b/src/mame/drivers/paranoia.cpp @@ -86,7 +86,7 @@ void paranoia_state::pce_mem(address_map &map) map(0x1FE400, 0x1FE7FF).rw(m_huc6260, FUNC(huc6260_device::read), FUNC(huc6260_device::write)); map(0x1FE800, 0x1FEBFF).rw("c6280", FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w)); map(0x1FEC00, 0x1FEFFF).rw(m_maincpu, FUNC(h6280_device::timer_r), FUNC(h6280_device::timer_w)); - map(0x1FF000, 0x1FF3FF).rw(this, FUNC(paranoia_state::pce_joystick_r), FUNC(paranoia_state::pce_joystick_w)); + map(0x1FF000, 0x1FF3FF).rw(FUNC(paranoia_state::pce_joystick_r), FUNC(paranoia_state::pce_joystick_w)); map(0x1FF400, 0x1FF7FF).rw(m_maincpu, FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w)); } @@ -105,7 +105,7 @@ void paranoia_state::paranoia_8085_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x80ff).rw("i8155", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); map(0x8100, 0x8107).rw("i8155", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); - map(0xd000, 0xd000).w(this, FUNC(paranoia_state::i8085_d000_w)); + map(0xd000, 0xd000).w(FUNC(paranoia_state::i8085_d000_w)); map(0xe000, 0xe1ff).ram(); } @@ -141,10 +141,10 @@ WRITE8_MEMBER(paranoia_state::z80_io_37_w) void paranoia_state::paranoia_z80_io_map(address_map &map) { map.global_mask(0xff); - map(0x01, 0x01).r(this, FUNC(paranoia_state::z80_io_01_r)); - map(0x02, 0x02).r(this, FUNC(paranoia_state::z80_io_02_r)); - map(0x17, 0x17).w(this, FUNC(paranoia_state::z80_io_17_w)); - map(0x37, 0x37).w(this, FUNC(paranoia_state::z80_io_37_w)); + map(0x01, 0x01).r(FUNC(paranoia_state::z80_io_01_r)); + map(0x02, 0x02).r(FUNC(paranoia_state::z80_io_02_r)); + map(0x17, 0x17).w(FUNC(paranoia_state::z80_io_17_w)); + map(0x37, 0x37).w(FUNC(paranoia_state::z80_io_37_w)); } WRITE8_MEMBER(paranoia_state::i8155_a_w) diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index 69e0d23b528..c8661e91cac 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -105,9 +105,9 @@ void parodius_state::parodius_map(address_map &map) map(0x3f90, 0x3f90).portr("DSW2"); map(0x3fa0, 0x3faf).rw(m_k053245, FUNC(k05324x_device::k053244_r), FUNC(k05324x_device::k053244_w)); map(0x3fb0, 0x3fbf).w(m_k053251, FUNC(k053251_device::write)); - map(0x3fc0, 0x3fc0).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(parodius_state::parodius_3fc0_w)); - map(0x3fc4, 0x3fc4).w(this, FUNC(parodius_state::parodius_videobank_w)); - map(0x3fc8, 0x3fc8).w(this, FUNC(parodius_state::parodius_sh_irqtrigger_w)); + map(0x3fc0, 0x3fc0).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(parodius_state::parodius_3fc0_w)); + map(0x3fc4, 0x3fc4).w(FUNC(parodius_state::parodius_videobank_w)); + map(0x3fc8, 0x3fc8).w(FUNC(parodius_state::parodius_sh_irqtrigger_w)); map(0x3fcc, 0x3fcd).rw("k053260", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)); map(0x6000, 0x9fff).bankr("bank1"); /* banked ROM */ map(0xa000, 0xffff).rom().region("maincpu", 0x3a000); @@ -130,7 +130,7 @@ void parodius_state::parodius_sound_map(address_map &map) map(0x0000, 0xefff).rom(); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xfa00, 0xfa00).w(this, FUNC(parodius_state::sound_arm_nmi_w)); + map(0xfa00, 0xfa00).w(FUNC(parodius_state::sound_arm_nmi_w)); map(0xfc00, 0xfc2f).rw("k053260", FUNC(k053260_device::read), FUNC(k053260_device::write)); } diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp index b63f3075835..7b3cfcad80a 100644 --- a/src/mame/drivers/partner.cpp +++ b/src/mame/drivers/partner.cpp @@ -39,10 +39,10 @@ void partner_state::partner_mem(address_map &map) map(0xd000, 0xd7ff).bankrw("bank10"); map(0xd800, 0xd8ff).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)); // video map(0xd900, 0xd9ff).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xda00, 0xdaff).w(this, FUNC(partner_state::partner_mem_page_w)); + map(0xda00, 0xdaff).w(FUNC(partner_state::partner_mem_page_w)); map(0xdb00, 0xdbff).w(m_dma8257, FUNC(i8257_device::write)); // DMA map(0xdc00, 0xddff).bankrw("bank11"); - map(0xde00, 0xdeff).w(this, FUNC(partner_state::partner_win_memory_page_w)); + map(0xde00, 0xdeff).w(FUNC(partner_state::partner_win_memory_page_w)); map(0xe000, 0xe7ff).bankrw("bank12"); map(0xe800, 0xffff).bankrw("bank13"); } diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp index 7b1076024fa..5dc00b784b2 100644 --- a/src/mame/drivers/pasha2.cpp +++ b/src/mame/drivers/pasha2.cpp @@ -222,17 +222,17 @@ WRITE16_MEMBER(pasha2_state::pasha2_lamps_w) void pasha2_state::pasha2_map(address_map &map) { map(0x00000000, 0x001fffff).ram().share("wram"); - map(0x40000000, 0x4001ffff).ram().w(this, FUNC(pasha2_state::bitmap_0_w)); - map(0x40020000, 0x4003ffff).ram().w(this, FUNC(pasha2_state::bitmap_1_w)); + map(0x40000000, 0x4001ffff).ram().w(FUNC(pasha2_state::bitmap_0_w)); + map(0x40020000, 0x4003ffff).ram().w(FUNC(pasha2_state::bitmap_1_w)); map(0x40060000, 0x40060001).nopw(); map(0x40064000, 0x40064001).nopw(); map(0x40068000, 0x40068001).nopw(); map(0x4006c000, 0x4006c001).nopw(); - map(0x40070000, 0x40070001).w(this, FUNC(pasha2_state::vbuffer_clear_w)); - map(0x40074000, 0x40074001).w(this, FUNC(pasha2_state::vbuffer_set_w)); + map(0x40070000, 0x40070001).w(FUNC(pasha2_state::vbuffer_clear_w)); + map(0x40074000, 0x40074001).w(FUNC(pasha2_state::vbuffer_set_w)); map(0x40078000, 0x40078001).nopw(); //once at startup -> to disable the eeprom? map(0x80000000, 0x803fffff).bankr("mainbank"); - map(0xe0000000, 0xe00003ff).ram().w(this, FUNC(pasha2_state::pasha2_palette_w)).share("paletteram"); //tilemap? palette? + map(0xe0000000, 0xe00003ff).ram().w(FUNC(pasha2_state::pasha2_palette_w)).share("paletteram"); //tilemap? palette? map(0xfff80000, 0xffffffff).rom().region("maincpu", 0); } @@ -240,16 +240,16 @@ void pasha2_state::pasha2_io(address_map &map) { map(0x08, 0x0b).nopr(); //sound status? map(0x18, 0x1b).nopr(); //sound status? - map(0x20, 0x23).w(this, FUNC(pasha2_state::pasha2_lamps_w)); + map(0x20, 0x23).w(FUNC(pasha2_state::pasha2_lamps_w)); map(0x40, 0x43).portr("COINS"); map(0x60, 0x63).portr("DSW"); map(0x80, 0x83).portr("INPUTS"); map(0xa0, 0xa3).nopw(); //soundlatch? - map(0xc0, 0xc3).w(this, FUNC(pasha2_state::pasha2_misc_w)); + map(0xc0, 0xc3).w(FUNC(pasha2_state::pasha2_misc_w)); map(0xe3, 0xe3).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xe7, 0xe7).rw(m_oki[1], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xe8, 0xeb).w(this, FUNC(pasha2_state::oki_bank_w<0>)); - map(0xec, 0xef).w(this, FUNC(pasha2_state::oki_bank_w<1>)); + map(0xe8, 0xeb).w(FUNC(pasha2_state::oki_bank_w<0>)); + map(0xec, 0xef).w(FUNC(pasha2_state::oki_bank_w<1>)); } static INPUT_PORTS_START( pasha2 ) diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp index 06779ebbd74..bb56f4a5e4b 100644 --- a/src/mame/drivers/paso1600.cpp +++ b/src/mame/drivers/paso1600.cpp @@ -234,7 +234,7 @@ void paso1600_state::paso1600_map(address_map &map) map.unmap_value_high(); map(0x00000, 0x7ffff).ram(); map(0xb0000, 0xb0fff).ram().share("vram"); // tvram - map(0xbfff0, 0xbffff).rw(this, FUNC(paso1600_state::paso1600_pcg_r), FUNC(paso1600_state::paso1600_pcg_w)); + map(0xbfff0, 0xbffff).rw(FUNC(paso1600_state::paso1600_pcg_r), FUNC(paso1600_state::paso1600_pcg_w)); map(0xc0000, 0xdffff).ram().share("gvram");// gvram map(0xe0000, 0xeffff).rom().region("kanji", 0);// kanji rom, banked via port 0x93 map(0xfe000, 0xfffff).rom().region("ipl", 0); @@ -245,11 +245,11 @@ void paso1600_state::paso1600_io(address_map &map) map.unmap_value_low(); map(0x0000, 0x000f).rw(m_dma, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x0010, 0x0011).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); // i8259 - map(0x001a, 0x001b).r(this, FUNC(paso1600_state::test_hi_r)); // causes RAM error otherwise? - map(0x0030, 0x0033).rw(this, FUNC(paso1600_state::key_r), FUNC(paso1600_state::key_w)); //UART keyboard? - map(0x0048, 0x0049).r(this, FUNC(paso1600_state::test_hi_r)); - map(0x0090, 0x0090).rw(this, FUNC(paso1600_state::paso1600_6845_status_r), FUNC(paso1600_state::paso1600_6845_address_w)); - map(0x0091, 0x0091).rw(this, FUNC(paso1600_state::paso1600_6845_data_r), FUNC(paso1600_state::paso1600_6845_data_w)); + map(0x001a, 0x001b).r(FUNC(paso1600_state::test_hi_r)); // causes RAM error otherwise? + map(0x0030, 0x0033).rw(FUNC(paso1600_state::key_r), FUNC(paso1600_state::key_w)); //UART keyboard? + map(0x0048, 0x0049).r(FUNC(paso1600_state::test_hi_r)); + map(0x0090, 0x0090).rw(FUNC(paso1600_state::paso1600_6845_status_r), FUNC(paso1600_state::paso1600_6845_address_w)); + map(0x0091, 0x0091).rw(FUNC(paso1600_state::paso1600_6845_data_r), FUNC(paso1600_state::paso1600_6845_data_w)); // AM_RANGE(0x00d8,0x00df) //fdc, unknown type // other undefined ports: 18, 1C, 92 } diff --git a/src/mame/drivers/pasogo.cpp b/src/mame/drivers/pasogo.cpp index 3db925ca713..44e15645c69 100644 --- a/src/mame/drivers/pasogo.cpp +++ b/src/mame/drivers/pasogo.cpp @@ -451,7 +451,7 @@ void pasogo_state::emsbank_map(address_map &map) void pasogo_state::pasogo_mem(address_map &map) { - map(0x80000, 0xeffff).rw(this, FUNC(pasogo_state::emsram_r), FUNC(pasogo_state::emsram_w)); + map(0x80000, 0xeffff).rw(FUNC(pasogo_state::emsram_r), FUNC(pasogo_state::emsram_w)); map(0xb8000, 0xbffff).ram().share("vram"); map(0xf0000, 0xfffff).bankr("bank27"); } @@ -460,8 +460,8 @@ void pasogo_state::pasogo_mem(address_map &map) void pasogo_state::pasogo_io(address_map &map) { map(0x0000, 0x00ff).m("mb", FUNC(ibm5160_mb_device::map)); - map(0x0026, 0x0027).rw(this, FUNC(pasogo_state::vg230_io_r), FUNC(pasogo_state::vg230_io_w)); - map(0x006c, 0x006f).rw(this, FUNC(pasogo_state::ems_r), FUNC(pasogo_state::ems_w)); + map(0x0026, 0x0027).rw(FUNC(pasogo_state::vg230_io_r), FUNC(pasogo_state::vg230_io_w)); + map(0x006c, 0x006f).rw(FUNC(pasogo_state::ems_r), FUNC(pasogo_state::ems_w)); } diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp index 1031f4ddecb..42455670c79 100644 --- a/src/mame/drivers/pasopia.cpp +++ b/src/mame/drivers/pasopia.cpp @@ -143,7 +143,7 @@ void pasopia_state::pasopia_io(address_map &map) map(0x28, 0x2b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x30, 0x33).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); // 0x38 printer - map(0x3c, 0x3c).w(this, FUNC(pasopia_state::pasopia_ctrl_w)); + map(0x3c, 0x3c).w(FUNC(pasopia_state::pasopia_ctrl_w)); } /* Input ports */ diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index 085775a906a..0d0dea4fbd9 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -684,10 +684,10 @@ WRITE8_MEMBER( pasopia7_state::pasopia7_io_w ) m_pio->write(space, io_port & 3, data); else if(io_port == 0x3a) - m_sn1->write(space, 0, data); + m_sn1->write(data); else if(io_port == 0x3b) - m_sn2->write(space, 0, data); + m_sn2->write(data); else if(io_port == 0x3c) pasopia7_memory_ctrl_w(space,0, data); @@ -703,17 +703,17 @@ WRITE8_MEMBER( pasopia7_state::pasopia7_io_w ) void pasopia7_state::pasopia7_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x7fff).w(this, FUNC(pasopia7_state::ram_bank_w)); + map(0x0000, 0x7fff).w(FUNC(pasopia7_state::ram_bank_w)); map(0x0000, 0x3fff).bankr("bank1"); map(0x4000, 0x7fff).bankr("bank2"); - map(0x8000, 0xbfff).rw(this, FUNC(pasopia7_state::vram_r), FUNC(pasopia7_state::vram_w)); + map(0x8000, 0xbfff).rw(FUNC(pasopia7_state::vram_r), FUNC(pasopia7_state::vram_w)); map(0xc000, 0xffff).bankrw("bank4"); } void pasopia7_state::pasopia7_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(pasopia7_state::pasopia7_io_r), FUNC(pasopia7_state::pasopia7_io_w)); + map(0x0000, 0xffff).rw(FUNC(pasopia7_state::pasopia7_io_r), FUNC(pasopia7_state::pasopia7_io_w)); } /* TODO: where are SPACE and RETURN keys? */ diff --git a/src/mame/drivers/pass.cpp b/src/mame/drivers/pass.cpp index bce0f3c5ccc..b7b8e386d1c 100644 --- a/src/mame/drivers/pass.cpp +++ b/src/mame/drivers/pass.cpp @@ -118,8 +118,8 @@ void pass_state::pass_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x080000, 0x083fff).ram(); - map(0x200000, 0x200fff).ram().w(this, FUNC(pass_state::pass_bg_videoram_w)).share("bg_videoram"); // Background - map(0x210000, 0x213fff).ram().w(this, FUNC(pass_state::pass_fg_videoram_w)).share("fg_videoram"); // Foreground + map(0x200000, 0x200fff).ram().w(FUNC(pass_state::pass_bg_videoram_w)).share("bg_videoram"); // Background + map(0x210000, 0x213fff).ram().w(FUNC(pass_state::pass_fg_videoram_w)).share("fg_videoram"); // Foreground map(0x220000, 0x2203ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x230001, 0x230001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x230100, 0x230101).portr("DSW"); diff --git a/src/mame/drivers/pastelg.cpp b/src/mame/drivers/pastelg.cpp index 443b40c5ea2..58804561eff 100644 --- a/src/mame/drivers/pastelg.cpp +++ b/src/mame/drivers/pastelg.cpp @@ -65,12 +65,12 @@ void pastelg_state::pastelg_io_map(address_map &map) map(0x81, 0x81).r("aysnd", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x90, 0x90).portr("SYSTEM"); - map(0x90, 0x96).w(this, FUNC(pastelg_state::pastelg_blitter_w)); + map(0x90, 0x96).w(FUNC(pastelg_state::pastelg_blitter_w)); map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); - map(0xb0, 0xb0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r)).w(this, FUNC(pastelg_state::pastelg_romsel_w)); - map(0xc0, 0xc0).r(this, FUNC(pastelg_state::pastelg_sndrom_r)); + map(0xb0, 0xb0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r)).w(FUNC(pastelg_state::pastelg_romsel_w)); + map(0xc0, 0xc0).r(FUNC(pastelg_state::pastelg_sndrom_r)); map(0xc0, 0xcf).writeonly().share("clut"); - map(0xd0, 0xd0).r(this, FUNC(pastelg_state::pastelg_irq_ack_r)).w("dac", FUNC(dac_byte_interface::write)); + map(0xd0, 0xd0).r(FUNC(pastelg_state::pastelg_irq_ack_r)).w("dac", FUNC(dac_byte_interface::data_w)); map(0xe0, 0xe0).portr("DSWC"); } @@ -118,13 +118,13 @@ void pastelg_state::threeds_io_map(address_map &map) map.global_mask(0xff); map(0x81, 0x81).r("aysnd", FUNC(ay8910_device::data_r)); map(0x82, 0x83).w("aysnd", FUNC(ay8910_device::data_address_w)); - map(0x90, 0x90).portr("SYSTEM").w(this, FUNC(pastelg_state::threeds_romsel_w)); - map(0xf0, 0xf6).w(this, FUNC(pastelg_state::pastelg_blitter_w)); - map(0xa0, 0xa0).rw(this, FUNC(pastelg_state::threeds_inputport1_r), FUNC(pastelg_state::threeds_inputportsel_w)); - map(0xb0, 0xb0).r(this, FUNC(pastelg_state::threeds_inputport2_r)).w(this, FUNC(pastelg_state::threeds_output_w));//writes: bit 3 is coin lockout, bit 1 is coin counter + map(0x90, 0x90).portr("SYSTEM").w(FUNC(pastelg_state::threeds_romsel_w)); + map(0xf0, 0xf6).w(FUNC(pastelg_state::pastelg_blitter_w)); + map(0xa0, 0xa0).rw(FUNC(pastelg_state::threeds_inputport1_r), FUNC(pastelg_state::threeds_inputportsel_w)); + map(0xb0, 0xb0).r(FUNC(pastelg_state::threeds_inputport2_r)).w(FUNC(pastelg_state::threeds_output_w));//writes: bit 3 is coin lockout, bit 1 is coin counter map(0xc0, 0xcf).writeonly().share("clut"); - map(0xc0, 0xc0).r(this, FUNC(pastelg_state::threeds_rom_readback_r)); - map(0xd0, 0xd0).r(this, FUNC(pastelg_state::pastelg_irq_ack_r)).w("dac", FUNC(dac_byte_interface::write)); + map(0xc0, 0xc0).r(FUNC(pastelg_state::threeds_rom_readback_r)); + map(0xd0, 0xd0).r(FUNC(pastelg_state::pastelg_irq_ack_r)).w("dac", FUNC(dac_byte_interface::data_w)); } static INPUT_PORTS_START( pastelg ) diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp index 2614763c62d..248938a7f43 100644 --- a/src/mame/drivers/patapata.cpp +++ b/src/mame/drivers/patapata.cpp @@ -190,11 +190,11 @@ void patapata_state::main_map(address_map &map) map(0x100002, 0x100003).portr("IN1"); map(0x100008, 0x100009).portr("DSW1"); map(0x10000a, 0x10000b).portr("DSW2"); - map(0x100015, 0x100015).w(this, FUNC(patapata_state::flipscreen_w)); + map(0x100015, 0x100015).w(FUNC(patapata_state::flipscreen_w)); map(0x110000, 0x1103ff).ram().share("videoregs"); map(0x120000, 0x1205ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x130000, 0x13ffff).ram().w(this, FUNC(patapata_state::fg_videoram_w)).share("fg_videoram"); - map(0x140000, 0x14ffff).ram().w(this, FUNC(patapata_state::bg_videoram_w)).share("bg_videoram"); + map(0x130000, 0x13ffff).ram().w(FUNC(patapata_state::fg_videoram_w)).share("fg_videoram"); + map(0x140000, 0x14ffff).ram().w(FUNC(patapata_state::bg_videoram_w)).share("bg_videoram"); map(0x150001, 0x150001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x150011, 0x150011).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x150020, 0x15002f).w("nmk112", FUNC(nmk112_device::okibank_w)).umask16(0x00ff); diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp index 6a3773f1e22..2d3f8c1b887 100644 --- a/src/mame/drivers/pb1000.cpp +++ b/src/mame/drivers/pb1000.cpp @@ -96,7 +96,7 @@ void pb1000_state::pb2000c_mem(address_map &map) map(0x00000, 0x0ffff).bankr("bank1"); map(0x00000, 0x00bff).rom(); //AM_RANGE( 0x00c00, 0x00c0f ) AM_NOP //I/O - map(0x00c10, 0x00c11).w(this, FUNC(pb1000_state::gatearray_w)); + map(0x00c10, 0x00c11).w(FUNC(pb1000_state::gatearray_w)); map(0x10000, 0x1ffff).ram().share("nvram1"); map(0x20000, 0x27fff).r(m_card1, FUNC(generic_slot_device::read16_rom)); map(0x28000, 0x2ffff).ram().share("nvram2"); diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp index 82eb009b072..f5ad0127328 100644 --- a/src/mame/drivers/pbaction.cpp +++ b/src/mame/drivers/pbaction.cpp @@ -98,19 +98,19 @@ void pbaction_state::pbaction_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram().share("work_ram"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(pbaction_state::pbaction_videoram2_w)).share("videoram2"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(pbaction_state::pbaction_colorram2_w)).share("colorram2"); - map(0xd800, 0xdbff).ram().w(this, FUNC(pbaction_state::pbaction_videoram_w)).share("videoram"); - map(0xdc00, 0xdfff).ram().w(this, FUNC(pbaction_state::pbaction_colorram_w)).share("colorram"); + map(0xd000, 0xd3ff).ram().w(FUNC(pbaction_state::pbaction_videoram2_w)).share("videoram2"); + map(0xd400, 0xd7ff).ram().w(FUNC(pbaction_state::pbaction_colorram2_w)).share("colorram2"); + map(0xd800, 0xdbff).ram().w(FUNC(pbaction_state::pbaction_videoram_w)).share("videoram"); + map(0xdc00, 0xdfff).ram().w(FUNC(pbaction_state::pbaction_colorram_w)).share("colorram"); map(0xe000, 0xe07f).ram().share("spriteram"); map(0xe400, 0xe5ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xe600, 0xe600).portr("P1").w(this, FUNC(pbaction_state::nmi_mask_w)); + map(0xe600, 0xe600).portr("P1").w(FUNC(pbaction_state::nmi_mask_w)); map(0xe601, 0xe601).portr("P2"); map(0xe602, 0xe602).portr("SYSTEM"); - map(0xe604, 0xe604).portr("DSW1").w(this, FUNC(pbaction_state::pbaction_flipscreen_w)); + map(0xe604, 0xe604).portr("DSW1").w(FUNC(pbaction_state::pbaction_flipscreen_w)); map(0xe605, 0xe605).portr("DSW2"); - map(0xe606, 0xe606).nopr() /* ??? */ .w(this, FUNC(pbaction_state::pbaction_scroll_w)); - map(0xe800, 0xe800).w(this, FUNC(pbaction_state::pbaction_sh_command_w)); + map(0xe606, 0xe606).nopr() /* ??? */ .w(FUNC(pbaction_state::pbaction_scroll_w)); + map(0xe800, 0xe800).w(FUNC(pbaction_state::pbaction_sh_command_w)); } void pbaction_state::decrypted_opcodes_map(address_map &map) @@ -137,8 +137,8 @@ void pbaction_state::pbaction_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x8000, 0x8000).r(this, FUNC(pbaction_state::sound_data_r)); - map(0xffff, 0xffff).w(this, FUNC(pbaction_state::sound_irq_ack_w)); + map(0x8000, 0x8000).r(FUNC(pbaction_state::sound_data_r)); + map(0xffff, 0xffff).w(FUNC(pbaction_state::sound_irq_ack_w)); } void pbaction_state::pbaction2_sound_map(address_map &map) diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index 6a68b5eb512..5e407d1e7cf 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -445,7 +445,7 @@ void pc_state::ibm5550_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m("mb", FUNC(ibm5160_mb_device::map)); - map(0x00a0, 0x00a0).r(this, FUNC(pc_state::unk_r)); + map(0x00a0, 0x00a0).r(FUNC(pc_state::unk_r)); } void pc_state::epc_io(address_map &map) diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp index af0af1164a6..365357bc703 100644 --- a/src/mame/drivers/pc100.cpp +++ b/src/mame/drivers/pc100.cpp @@ -253,7 +253,7 @@ void pc100_state::pc100_map(address_map &map) { map.unmap_value_high(); map(0x00000, 0xbffff).ram(); // work ram - map(0xc0000, 0xdffff).rw(this, FUNC(pc100_state::pc100_vram_r), FUNC(pc100_state::pc100_vram_w)); // vram, blitter based! + map(0xc0000, 0xdffff).rw(FUNC(pc100_state::pc100_vram_r), FUNC(pc100_state::pc100_vram_w)); // vram, blitter based! map(0xf8000, 0xfffff).rom().region("ipl", 0); } @@ -343,19 +343,19 @@ void pc100_state::pc100_io(address_map &map) map(0x08, 0x0b).m(m_fdc, FUNC(upd765a_device::map)).umask16(0x00ff); // upd765 map(0x10, 0x17).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); // i8255 #1 map(0x18, 0x1f).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); // i8255 #2 - map(0x20, 0x23).r(this, FUNC(pc100_state::pc100_key_r)).umask16(0x00ff); //i/o, keyboard, mouse - map(0x22, 0x22).w(this, FUNC(pc100_state::pc100_output_w)); //i/o, keyboard, mouse - map(0x24, 0x24).w(this, FUNC(pc100_state::pc100_tc_w)); //i/o, keyboard, mouse + map(0x20, 0x23).r(FUNC(pc100_state::pc100_key_r)).umask16(0x00ff); //i/o, keyboard, mouse + map(0x22, 0x22).w(FUNC(pc100_state::pc100_output_w)); //i/o, keyboard, mouse + map(0x24, 0x24).w(FUNC(pc100_state::pc100_tc_w)); //i/o, keyboard, mouse map(0x28, 0x28).rw("uart8251", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x2a, 0x2a).rw("uart8251", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x30, 0x30).rw(this, FUNC(pc100_state::pc100_shift_r), FUNC(pc100_state::pc100_shift_w)); // crtc shift - map(0x38, 0x38).w(this, FUNC(pc100_state::pc100_crtc_addr_w)); //crtc address reg - map(0x3a, 0x3a).w(this, FUNC(pc100_state::pc100_crtc_data_w)); //crtc data reg - map(0x3c, 0x3f).rw(this, FUNC(pc100_state::pc100_vs_vreg_r), FUNC(pc100_state::pc100_vs_vreg_w)).umask16(0x00ff); //crtc vertical start position + map(0x30, 0x30).rw(FUNC(pc100_state::pc100_shift_r), FUNC(pc100_state::pc100_shift_w)); // crtc shift + map(0x38, 0x38).w(FUNC(pc100_state::pc100_crtc_addr_w)); //crtc address reg + map(0x3a, 0x3a).w(FUNC(pc100_state::pc100_crtc_data_w)); //crtc data reg + map(0x3c, 0x3f).rw(FUNC(pc100_state::pc100_vs_vreg_r), FUNC(pc100_state::pc100_vs_vreg_w)).umask16(0x00ff); //crtc vertical start position map(0x40, 0x5f).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x60, 0x61).r(read16_delegate([this](address_space &s, offs_t o, u8 mm) { return m_crtc.cmd; }, "pc100_crtc_cmd_r")). w(write16_delegate([this](address_space &s, offs_t o, u16 d, u8 mm) { m_crtc.cmd = d; }, "pc100_crtc_cmd_w")); - map(0x80, 0x81).rw(this, FUNC(pc100_state::pc100_kanji_r), FUNC(pc100_state::pc100_kanji_w)); + map(0x80, 0x81).rw(FUNC(pc100_state::pc100_kanji_r), FUNC(pc100_state::pc100_kanji_w)); map(0x82, 0x83).nopw(); //kanji-related? map(0x84, 0x87).nopw(); //kanji "strobe" signal 0/1 } diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp index 1cdf93ac295..10b033cee1d 100644 --- a/src/mame/drivers/pc1512.cpp +++ b/src/mame/drivers/pc1512.cpp @@ -512,7 +512,7 @@ WRITE8_MEMBER( pc1512_base_state::printer_w ) { case 0: m_printer_data = data; - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); break; case 2: @@ -610,7 +610,7 @@ READ8_MEMBER( pc1640_state::io_r ) void pc1512_state::pc1512_mem(address_map &map) { map(0x00000, 0x9ffff).ram(); - map(0xb8000, 0xbbfff).rw(this, FUNC(pc1512_state::video_ram_r), FUNC(pc1512_state::video_ram_w)); + map(0xb8000, 0xbbfff).rw(FUNC(pc1512_state::video_ram_r), FUNC(pc1512_state::video_ram_w)); map(0xfc000, 0xfffff).rom().region(I8086_TAG, 0); } @@ -629,13 +629,13 @@ void pc1512_state::pc1512_io(address_map &map) map(0x000, 0x00f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x020, 0x021).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x040, 0x043).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0x060, 0x06f).rw(this, FUNC(pc1512_state::system_r), FUNC(pc1512_state::system_w)); + map(0x060, 0x06f).rw(FUNC(pc1512_state::system_r), FUNC(pc1512_state::system_w)); map(0x070, 0x071).mirror(0x02).rw(m_rtc, FUNC(mc146818_device::read), FUNC(mc146818_device::write)); - map(0x078, 0x07f).rw(this, FUNC(pc1512_state::mouse_r), FUNC(pc1512_state::mouse_w)); - map(0x080, 0x083).w(this, FUNC(pc1512_state::dma_page_w)); - map(0x0a1, 0x0a1).w(this, FUNC(pc1512_state::nmi_mask_w)); - map(0x378, 0x37b).rw(this, FUNC(pc1512_state::printer_r), FUNC(pc1512_state::printer_w)); - map(0x3d0, 0x3df).rw(this, FUNC(pc1512_state::vdu_r), FUNC(pc1512_state::vdu_w)); + map(0x078, 0x07f).rw(FUNC(pc1512_state::mouse_r), FUNC(pc1512_state::mouse_w)); + map(0x080, 0x083).w(FUNC(pc1512_state::dma_page_w)); + map(0x0a1, 0x0a1).w(FUNC(pc1512_state::nmi_mask_w)); + map(0x378, 0x37b).rw(FUNC(pc1512_state::printer_r), FUNC(pc1512_state::printer_w)); + map(0x3d0, 0x3df).rw(FUNC(pc1512_state::vdu_r), FUNC(pc1512_state::vdu_w)); map(0x3f0, 0x3f7).m(m_fdc, FUNC(pc_fdc_xt_device::map)); map(0x3f8, 0x3ff).rw(m_uart, FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); } @@ -658,17 +658,17 @@ void pc1640_state::pc1640_mem(address_map &map) void pc1640_state::pc1640_io(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(pc1640_state::io_r)); + map(0x0000, 0xffff).r(FUNC(pc1640_state::io_r)); map(0x000, 0x00f).w(m_dmac, FUNC(am9517a_device::write)); map(0x020, 0x021).w(m_pic, FUNC(pic8259_device::write)); map(0x040, 0x043).w(m_pit, FUNC(pit8253_device::write)); - map(0x060, 0x06f).w(this, FUNC(pc1640_state::system_w)); + map(0x060, 0x06f).w(FUNC(pc1640_state::system_w)); map(0x070, 0x071).mirror(0x02).w(m_rtc, FUNC(mc146818_device::write)); - map(0x078, 0x07f).w(this, FUNC(pc1640_state::mouse_w)); - map(0x080, 0x083).w(this, FUNC(pc1640_state::dma_page_w)); - map(0x0a1, 0x0a1).w(this, FUNC(pc1640_state::nmi_mask_w)); - map(0x378, 0x37b).w(this, FUNC(pc1640_state::printer_w)); + map(0x078, 0x07f).w(FUNC(pc1640_state::mouse_w)); + map(0x080, 0x083).w(FUNC(pc1640_state::dma_page_w)); + map(0x0a1, 0x0a1).w(FUNC(pc1640_state::nmi_mask_w)); + map(0x378, 0x37b).w(FUNC(pc1640_state::printer_w)); map(0x3f2, 0x3f2).w(m_fdc, FUNC(pc_fdc_xt_device::dor_w)); map(0x3f5, 0x3f5).w(PC_FDC_XT_TAG ":upd765", FUNC(upd765_family_device::fifo_w)); map(0x3f8, 0x3ff).w(m_uart, FUNC(ins8250_device::ins8250_w)); diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp index f18b91172fe..ec382630110 100644 --- a/src/mame/drivers/pc2000.cpp +++ b/src/mame/drivers/pc2000.cpp @@ -215,12 +215,12 @@ void pc2000_state::pc2000_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(pc2000_state::rombank0_w)); - map(0x01, 0x01).w(this, FUNC(pc2000_state::rombank1_w)); - map(0x03, 0x03).w(this, FUNC(pc2000_state::rombank2_w)); + map(0x00, 0x00).w(FUNC(pc2000_state::rombank0_w)); + map(0x01, 0x01).w(FUNC(pc2000_state::rombank1_w)); + map(0x03, 0x03).w(FUNC(pc2000_state::rombank2_w)); map(0x0a, 0x0b).rw(m_lcdc, FUNC(hd44780_device::read), FUNC(hd44780_device::write)); - map(0x10, 0x11).rw(this, FUNC(pc2000_state::key_matrix_r), FUNC(pc2000_state::key_matrix_w)); - map(0x12, 0x12).rw(this, FUNC(pc2000_state::beep_r), FUNC(pc2000_state::beep_w)); + map(0x10, 0x11).rw(FUNC(pc2000_state::key_matrix_r), FUNC(pc2000_state::key_matrix_w)); + map(0x12, 0x12).rw(FUNC(pc2000_state::beep_r), FUNC(pc2000_state::beep_w)); } @@ -336,11 +336,11 @@ void gl3000s_state::gl3000s_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x01, 0x01).w(this, FUNC(gl3000s_state::rombank1_w)); - map(0x03, 0x03).w(this, FUNC(gl3000s_state::rombank2_w)); + map(0x01, 0x01).w(FUNC(gl3000s_state::rombank1_w)); + map(0x03, 0x03).w(FUNC(gl3000s_state::rombank2_w)); map(0x08, 0x09).rw(m_lcdc_r, FUNC(sed1520_device::read), FUNC(sed1520_device::write)); map(0x0a, 0x0b).rw(m_lcdc_l, FUNC(sed1520_device::read), FUNC(sed1520_device::write)); - map(0x10, 0x11).rw(this, FUNC(gl3000s_state::key_matrix_r), FUNC(gl3000s_state::key_matrix_w)); + map(0x10, 0x11).rw(FUNC(gl3000s_state::key_matrix_r), FUNC(gl3000s_state::key_matrix_w)); } READ8_MEMBER( pc1000_state::kb_r ) @@ -409,9 +409,9 @@ void pc1000_state::pc1000_mem(address_map &map) void pc1000_state::pc1000_io(address_map &map) { - map(0x0000, 0x01ff).r(this, FUNC(pc1000_state::kb_r)); - map(0x4000, 0x4000).mirror(0xfe).rw(this, FUNC(pc1000_state::lcdc_control_r), FUNC(pc1000_state::lcdc_control_w)); - map(0x4100, 0x4100).mirror(0xfe).rw(this, FUNC(pc1000_state::lcdc_data_r), FUNC(pc1000_state::lcdc_data_w)); + map(0x0000, 0x01ff).r(FUNC(pc1000_state::kb_r)); + map(0x4000, 0x4000).mirror(0xfe).rw(FUNC(pc1000_state::lcdc_control_r), FUNC(pc1000_state::lcdc_control_w)); + map(0x4100, 0x4100).mirror(0xfe).rw(FUNC(pc1000_state::lcdc_data_r), FUNC(pc1000_state::lcdc_data_w)); } /* Input ports */ diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp index 2861fd41fd5..5b2486625ce 100644 --- a/src/mame/drivers/pc4.cpp +++ b/src/mame/drivers/pc4.cpp @@ -72,17 +72,17 @@ void pc4_state::pc4_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x000f).rw("rtc", FUNC(rp5c01_device::read), FUNC(rp5c01_device::write)); - map(0x1000, 0x1000).w(this, FUNC(pc4_state::beep_w)); - map(0x1fff, 0x1fff).w(this, FUNC(pc4_state::bank_w)); + map(0x1000, 0x1000).w(FUNC(pc4_state::beep_w)); + map(0x1fff, 0x1fff).w(FUNC(pc4_state::bank_w)); - map(0x3000, 0x3000).w(this, FUNC(pc4_state::lcd_control_w)); - map(0x3001, 0x3001).w(this, FUNC(pc4_state::lcd_data_w)); - map(0x3002, 0x3002).r(this, FUNC(pc4_state::lcd_control_r)); - map(0x3003, 0x3003).r(this, FUNC(pc4_state::lcd_data_r)); - map(0x3005, 0x3005).w(this, FUNC(pc4_state::lcd_offset_w)); + map(0x3000, 0x3000).w(FUNC(pc4_state::lcd_control_w)); + map(0x3001, 0x3001).w(FUNC(pc4_state::lcd_data_w)); + map(0x3002, 0x3002).r(FUNC(pc4_state::lcd_control_r)); + map(0x3003, 0x3003).r(FUNC(pc4_state::lcd_data_r)); + map(0x3005, 0x3005).w(FUNC(pc4_state::lcd_offset_w)); //keyboard read, offset used as matrix - map(0x5000, 0x50ff).r(this, FUNC(pc4_state::kb_r)); + map(0x5000, 0x50ff).r(FUNC(pc4_state::kb_r)); } static INPUT_PORTS_START( pc4 ) diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index c0a993bc393..e9176252c6f 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -242,12 +242,12 @@ void pc6001_state::pc6001_io(address_map &map) map.global_mask(0xff); map(0x80, 0x80).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x81, 0x81).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x90, 0x93).mirror(0x0c).rw(this, FUNC(pc6001_state::nec_ppi8255_r), FUNC(pc6001_state::nec_ppi8255_w)); + map(0x90, 0x93).mirror(0x0c).rw(FUNC(pc6001_state::nec_ppi8255_r), FUNC(pc6001_state::nec_ppi8255_w)); map(0xa0, 0xa0).mirror(0x0c).w("ay8910", FUNC(ay8910_device::address_w)); map(0xa1, 0xa1).mirror(0x0c).w("ay8910", FUNC(ay8910_device::data_w)); map(0xa2, 0xa2).mirror(0x0c).r("ay8910", FUNC(ay8910_device::data_r)); map(0xa3, 0xa3).mirror(0x0c).nopw(); - map(0xb0, 0xb0).mirror(0x0f).w(this, FUNC(pc6001_state::system_latch_w)); + map(0xb0, 0xb0).mirror(0x0f).w(FUNC(pc6001_state::system_latch_w)); map(0xd0, 0xd3).mirror(0x0c).noprw(); // disk device } @@ -682,14 +682,14 @@ READ8_MEMBER(pc6001mk2_state::mk2_bank_w0_r) void pc6001mk2_state::pc6001mk2_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x1fff).bankr("bank1").w(this, FUNC(pc6001mk2_state::mk2_work_ram0_w)); - map(0x2000, 0x3fff).bankr("bank2").w(this, FUNC(pc6001mk2_state::mk2_work_ram1_w)); - map(0x4000, 0x5fff).bankr("bank3").w(this, FUNC(pc6001mk2_state::mk2_work_ram2_w)); - map(0x6000, 0x7fff).bankr("bank4").w(this, FUNC(pc6001mk2_state::mk2_work_ram3_w)); - map(0x8000, 0x9fff).bankr("bank5").w(this, FUNC(pc6001mk2_state::mk2_work_ram4_w)); - map(0xa000, 0xbfff).bankr("bank6").w(this, FUNC(pc6001mk2_state::mk2_work_ram5_w)); - map(0xc000, 0xdfff).bankr("bank7").w(this, FUNC(pc6001mk2_state::mk2_work_ram6_w)); - map(0xe000, 0xffff).bankr("bank8").w(this, FUNC(pc6001mk2_state::mk2_work_ram7_w)); + map(0x0000, 0x1fff).bankr("bank1").w(FUNC(pc6001mk2_state::mk2_work_ram0_w)); + map(0x2000, 0x3fff).bankr("bank2").w(FUNC(pc6001mk2_state::mk2_work_ram1_w)); + map(0x4000, 0x5fff).bankr("bank3").w(FUNC(pc6001mk2_state::mk2_work_ram2_w)); + map(0x6000, 0x7fff).bankr("bank4").w(FUNC(pc6001mk2_state::mk2_work_ram3_w)); + map(0x8000, 0x9fff).bankr("bank5").w(FUNC(pc6001mk2_state::mk2_work_ram4_w)); + map(0xa000, 0xbfff).bankr("bank6").w(FUNC(pc6001mk2_state::mk2_work_ram5_w)); + map(0xc000, 0xdfff).bankr("bank7").w(FUNC(pc6001mk2_state::mk2_work_ram6_w)); + map(0xe000, 0xffff).bankr("bank8").w(FUNC(pc6001mk2_state::mk2_work_ram7_w)); } void pc6001mk2_state::pc6001mk2_io(address_map &map) @@ -699,31 +699,31 @@ void pc6001mk2_state::pc6001mk2_io(address_map &map) map(0x80, 0x80).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x81, 0x81).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x90, 0x93).mirror(0x0c).rw(this, FUNC(pc6001mk2_state::nec_ppi8255_r), FUNC(pc6001mk2_state::necmk2_ppi8255_w)); + map(0x90, 0x93).mirror(0x0c).rw(FUNC(pc6001mk2_state::nec_ppi8255_r), FUNC(pc6001mk2_state::necmk2_ppi8255_w)); map(0xa0, 0xa0).mirror(0x0c).w("ay8910", FUNC(ay8910_device::address_w)); map(0xa1, 0xa1).mirror(0x0c).w("ay8910", FUNC(ay8910_device::data_w)); map(0xa2, 0xa2).mirror(0x0c).r("ay8910", FUNC(ay8910_device::data_r)); map(0xa3, 0xa3).mirror(0x0c).noprw(); - map(0xb0, 0xb0).mirror(0x0f).w(this, FUNC(pc6001mk2_state::mk2_system_latch_w)); + map(0xb0, 0xb0).mirror(0x0f).w(FUNC(pc6001mk2_state::mk2_system_latch_w)); - map(0xc0, 0xc0).w(this, FUNC(pc6001mk2_state::mk2_col_bank_w)); - map(0xc1, 0xc1).w(this, FUNC(pc6001mk2_state::mk2_vram_bank_w)); - map(0xc2, 0xc2).w(this, FUNC(pc6001mk2_state::mk2_opt_bank_w)); + map(0xc0, 0xc0).w(FUNC(pc6001mk2_state::mk2_col_bank_w)); + map(0xc1, 0xc1).w(FUNC(pc6001mk2_state::mk2_vram_bank_w)); + map(0xc2, 0xc2).w(FUNC(pc6001mk2_state::mk2_opt_bank_w)); map(0xd0, 0xd3).mirror(0x0c).noprw(); // disk device map(0xe0, 0xe3).mirror(0x0c).rw("upd7752", FUNC(upd7752_device::read), FUNC(upd7752_device::write)); - map(0xf0, 0xf0).rw(this, FUNC(pc6001mk2_state::mk2_bank_r0_r), FUNC(pc6001mk2_state::mk2_bank_r0_w)); - map(0xf1, 0xf1).rw(this, FUNC(pc6001mk2_state::mk2_bank_r1_r), FUNC(pc6001mk2_state::mk2_bank_r1_w)); - map(0xf2, 0xf2).rw(this, FUNC(pc6001mk2_state::mk2_bank_w0_r), FUNC(pc6001mk2_state::mk2_bank_w0_w)); - map(0xf3, 0xf3).w(this, FUNC(pc6001mk2_state::mk2_0xf3_w)); + map(0xf0, 0xf0).rw(FUNC(pc6001mk2_state::mk2_bank_r0_r), FUNC(pc6001mk2_state::mk2_bank_r0_w)); + map(0xf1, 0xf1).rw(FUNC(pc6001mk2_state::mk2_bank_r1_r), FUNC(pc6001mk2_state::mk2_bank_r1_w)); + map(0xf2, 0xf2).rw(FUNC(pc6001mk2_state::mk2_bank_w0_r), FUNC(pc6001mk2_state::mk2_bank_w0_w)); + map(0xf3, 0xf3).w(FUNC(pc6001mk2_state::mk2_0xf3_w)); // AM_RANGE(0xf4 // AM_RANGE(0xf5 - map(0xf6, 0xf6).w(this, FUNC(pc6001mk2_state::mk2_timer_adj_w)); - map(0xf7, 0xf7).w(this, FUNC(pc6001mk2_state::mk2_timer_irqv_w)); + map(0xf6, 0xf6).w(FUNC(pc6001mk2_state::mk2_timer_adj_w)); + map(0xf7, 0xf7).w(FUNC(pc6001mk2_state::mk2_timer_irqv_w)); } /***************************************** @@ -754,7 +754,7 @@ void pc6601_state::pc6601_io(address_map &map) // AM_RANGE(0xb2 // AM_RANGE(0xb3 - map(0xd0, 0xdf).rw(this, FUNC(pc6601_state::fdc_r), FUNC(pc6601_state::fdc_w)); + map(0xd0, 0xdf).rw(FUNC(pc6601_state::fdc_r), FUNC(pc6601_state::fdc_w)); } /***************************************** @@ -916,14 +916,14 @@ READ8_MEMBER(pc6001sr_state::hw_rev_r) void pc6001sr_state::pc6001sr_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x1fff).bankr("bank1").w(this, FUNC(pc6001sr_state::sr_work_ram0_w)); - map(0x2000, 0x3fff).bankr("bank2").w(this, FUNC(pc6001sr_state::sr_work_ram1_w)); - map(0x4000, 0x5fff).bankr("bank3").w(this, FUNC(pc6001sr_state::sr_work_ram2_w)); - map(0x6000, 0x7fff).bankr("bank4").w(this, FUNC(pc6001sr_state::sr_work_ram3_w)); - map(0x8000, 0x9fff).bankr("bank5").w(this, FUNC(pc6001sr_state::sr_work_ram4_w)); - map(0xa000, 0xbfff).bankr("bank6").w(this, FUNC(pc6001sr_state::sr_work_ram5_w)); - map(0xc000, 0xdfff).bankr("bank7").w(this, FUNC(pc6001sr_state::sr_work_ram6_w)); - map(0xe000, 0xffff).bankr("bank8").w(this, FUNC(pc6001sr_state::sr_work_ram7_w)); + map(0x0000, 0x1fff).bankr("bank1").w(FUNC(pc6001sr_state::sr_work_ram0_w)); + map(0x2000, 0x3fff).bankr("bank2").w(FUNC(pc6001sr_state::sr_work_ram1_w)); + map(0x4000, 0x5fff).bankr("bank3").w(FUNC(pc6001sr_state::sr_work_ram2_w)); + map(0x6000, 0x7fff).bankr("bank4").w(FUNC(pc6001sr_state::sr_work_ram3_w)); + map(0x8000, 0x9fff).bankr("bank5").w(FUNC(pc6001sr_state::sr_work_ram4_w)); + map(0xa000, 0xbfff).bankr("bank6").w(FUNC(pc6001sr_state::sr_work_ram5_w)); + map(0xc000, 0xdfff).bankr("bank7").w(FUNC(pc6001sr_state::sr_work_ram6_w)); + map(0xe000, 0xffff).bankr("bank8").w(FUNC(pc6001sr_state::sr_work_ram7_w)); } void pc6001sr_state::pc6001sr_io(address_map &map) @@ -931,22 +931,22 @@ void pc6001sr_state::pc6001sr_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); // 0x40-0x43 palette indexes - map(0x60, 0x67).rw(this, FUNC(pc6001sr_state::sr_bank_rn_r), FUNC(pc6001sr_state::sr_bank_rn_w)); - map(0x68, 0x6f).rw(this, FUNC(pc6001sr_state::sr_bank_wn_r), FUNC(pc6001sr_state::sr_bank_wn_w)); + map(0x60, 0x67).rw(FUNC(pc6001sr_state::sr_bank_rn_r), FUNC(pc6001sr_state::sr_bank_rn_w)); + map(0x68, 0x6f).rw(FUNC(pc6001sr_state::sr_bank_wn_r), FUNC(pc6001sr_state::sr_bank_wn_w)); map(0x80, 0x80).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x81, 0x81).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x90, 0x93).mirror(0x0c).rw(this, FUNC(pc6001sr_state::nec_ppi8255_r), FUNC(pc6001sr_state::necsr_ppi8255_w)); + map(0x90, 0x93).mirror(0x0c).rw(FUNC(pc6001sr_state::nec_ppi8255_r), FUNC(pc6001sr_state::necsr_ppi8255_w)); map(0xa0, 0xa0).mirror(0x0c).w("ay8910", FUNC(ay8910_device::address_w)); map(0xa1, 0xa1).mirror(0x0c).w("ay8910", FUNC(ay8910_device::data_w)); map(0xa2, 0xa2).mirror(0x0c).r("ay8910", FUNC(ay8910_device::data_r)); map(0xa3, 0xa3).mirror(0x0c).noprw(); - map(0xb0, 0xb0).w(this, FUNC(pc6001sr_state::sr_system_latch_w)); + map(0xb0, 0xb0).w(FUNC(pc6001sr_state::sr_system_latch_w)); /* these are disk related */ // AM_RANGE(0xb1 - map(0xb2, 0xb2).r(this, FUNC(pc6001sr_state::hw_rev_r)); + map(0xb2, 0xb2).r(FUNC(pc6001sr_state::hw_rev_r)); // AM_RANGE(0xb3 map(0xb8, 0xbf).ram().share("irq_vectors"); @@ -954,23 +954,23 @@ void pc6001sr_state::pc6001sr_io(address_map &map) // AM_RANGE(0xc1, 0xc1) AM_WRITE(mk2_vram_bank_w) // AM_RANGE(0xc2, 0xc2) AM_WRITE(opt_bank_w) - map(0xc8, 0xc8).w(this, FUNC(pc6001sr_state::sr_mode_w)); - map(0xc9, 0xc9).w(this, FUNC(pc6001sr_state::sr_vram_bank_w)); - map(0xce, 0xce).w(this, FUNC(pc6001sr_state::sr_bitmap_yoffs_w)); - map(0xcf, 0xcf).w(this, FUNC(pc6001sr_state::sr_bitmap_xoffs_w)); + map(0xc8, 0xc8).w(FUNC(pc6001sr_state::sr_mode_w)); + map(0xc9, 0xc9).w(FUNC(pc6001sr_state::sr_vram_bank_w)); + map(0xce, 0xce).w(FUNC(pc6001sr_state::sr_bitmap_yoffs_w)); + map(0xcf, 0xcf).w(FUNC(pc6001sr_state::sr_bitmap_xoffs_w)); - map(0xd0, 0xdf).rw(this, FUNC(pc6001sr_state::fdc_r), FUNC(pc6001sr_state::fdc_w)); // disk device + map(0xd0, 0xdf).rw(FUNC(pc6001sr_state::fdc_r), FUNC(pc6001sr_state::fdc_w)); // disk device map(0xe0, 0xe3).mirror(0x0c).rw("upd7752", FUNC(upd7752_device::read), FUNC(upd7752_device::write)); // AM_RANGE(0xf0, 0xf0) AM_READWRITE(mk2_bank_r0_r, mk2_bank_r0_w) // AM_RANGE(0xf1, 0xf1) AM_READWRITE(mk2_bank_r1_r, mk2_bank_r1_w) // AM_RANGE(0xf2, 0xf2) AM_READWRITE(mk2_bank_w0_r, mk2_bank_w0_w) - map(0xf3, 0xf3).w(this, FUNC(pc6001sr_state::mk2_0xf3_w)); + map(0xf3, 0xf3).w(FUNC(pc6001sr_state::mk2_0xf3_w)); // AM_RANGE(0xf4 // AM_RANGE(0xf5 - map(0xf6, 0xf6).w(this, FUNC(pc6001sr_state::mk2_timer_adj_w)); - map(0xf7, 0xf7).w(this, FUNC(pc6001sr_state::mk2_timer_irqv_w)); + map(0xf6, 0xf6).w(FUNC(pc6001sr_state::mk2_timer_adj_w)); + map(0xf7, 0xf7).w(FUNC(pc6001sr_state::mk2_timer_irqv_w)); } /* Input ports */ diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp index c633fce7e3b..8a4ffa0a570 100644 --- a/src/mame/drivers/pc8001.cpp +++ b/src/mame/drivers/pc8001.cpp @@ -54,7 +54,7 @@ WRITE8_MEMBER( pc8001_state::port10_w ) m_rtc->data_in_w(BIT(data, 3)); // centronics - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); } WRITE8_MEMBER( pc8001_state::port30_w ) @@ -187,11 +187,11 @@ void pc8001_state::pc8001_io(address_map &map) map(0x07, 0x07).portr("Y7"); map(0x08, 0x08).portr("Y8"); map(0x09, 0x09).portr("Y9"); - map(0x10, 0x10).mirror(0x0f).w(this, FUNC(pc8001_state::port10_w)); + map(0x10, 0x10).mirror(0x0f).w(FUNC(pc8001_state::port10_w)); map(0x20, 0x20).mirror(0x0e).rw(I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x21, 0x21).mirror(0x0e).rw(I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x30, 0x30).mirror(0x0f).w(this, FUNC(pc8001_state::port30_w)); - map(0x40, 0x40).mirror(0x0f).rw(this, FUNC(pc8001_state::port40_r), FUNC(pc8001_state::port40_w)); + map(0x30, 0x30).mirror(0x0f).w(FUNC(pc8001_state::port30_w)); + map(0x40, 0x40).mirror(0x0f).rw(FUNC(pc8001_state::port40_r), FUNC(pc8001_state::port40_w)); map(0x50, 0x51).rw(m_crtc, FUNC(upd3301_device::read), FUNC(upd3301_device::write)); map(0x60, 0x68).rw(m_dma, FUNC(i8257_device::read), FUNC(i8257_device::write)); // AM_RANGE(0x70, 0x7f) unused @@ -232,8 +232,8 @@ void pc8001mk2_state::pc8001mk2_mem(address_map &map) void pc8001mk2_state::pc8001mk2_io(address_map &map) { pc8001_io(map); - map(0x30, 0x30).w(this, FUNC(pc8001mk2_state::port30_w)); - map(0x31, 0x31).w(this, FUNC(pc8001mk2_state::port31_w)); + map(0x30, 0x30).w(FUNC(pc8001mk2_state::port30_w)); + map(0x31, 0x31).w(FUNC(pc8001mk2_state::port31_w)); // AM_RANGE(0x5c, 0x5c) AM_WRITE(gram_on_w) // AM_RANGE(0x5f, 0x5f) AM_WRITE(gram_off_w) // AM_RANGE(0xe8, 0xe8) kanji_address_lo_w, kanji_data_lo_r diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp index 1b5dde89a6d..cb747a78475 100644 --- a/src/mame/drivers/pc8401a.cpp +++ b/src/mame/drivers/pc8401a.cpp @@ -360,26 +360,26 @@ void pc8401a_state::pc8500_io(address_map &map) map(0x07, 0x07).portr("Y.7"); map(0x08, 0x08).portr("Y.8"); map(0x09, 0x09).portr("Y.9"); - map(0x10, 0x10).w(this, FUNC(pc8401a_state::rtc_cmd_w)); + map(0x10, 0x10).w(FUNC(pc8401a_state::rtc_cmd_w)); map(0x20, 0x20).rw(I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x21, 0x21).rw(I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x30, 0x30).rw(this, FUNC(pc8401a_state::mmr_r), FUNC(pc8401a_state::mmr_w)); + map(0x30, 0x30).rw(FUNC(pc8401a_state::mmr_r), FUNC(pc8401a_state::mmr_w)); // AM_RANGE(0x31, 0x31) - map(0x40, 0x40).rw(this, FUNC(pc8401a_state::rtc_r), FUNC(pc8401a_state::rtc_ctrl_w)); + map(0x40, 0x40).rw(FUNC(pc8401a_state::rtc_r), FUNC(pc8401a_state::rtc_ctrl_w)); // AM_RANGE(0x41, 0x41) // AM_RANGE(0x50, 0x51) map(0x60, 0x60).rw(m_lcdc, FUNC(sed1330_device::status_r), FUNC(sed1330_device::data_w)); map(0x61, 0x61).rw(m_lcdc, FUNC(sed1330_device::data_r), FUNC(sed1330_device::command_w)); - map(0x70, 0x70).rw(this, FUNC(pc8401a_state::port70_r), FUNC(pc8401a_state::port70_w)); - map(0x71, 0x71).rw(this, FUNC(pc8401a_state::port71_r), FUNC(pc8401a_state::port71_w)); + map(0x70, 0x70).rw(FUNC(pc8401a_state::port70_r), FUNC(pc8401a_state::port70_w)); + map(0x71, 0x71).rw(FUNC(pc8401a_state::port71_r), FUNC(pc8401a_state::port71_w)); // AM_RANGE(0x80, 0x80) modem status, set to 0xff to boot // AM_RANGE(0x8b, 0x8b) // AM_RANGE(0x90, 0x93) // AM_RANGE(0xa0, 0xa1) map(0x98, 0x98).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x99, 0x99).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0xb0, 0xb3).w(this, FUNC(pc8401a_state::io_rom_addr_w)); - map(0xb3, 0xb3).r(this, FUNC(pc8401a_state::io_rom_data_r)); + map(0xb0, 0xb3).w(FUNC(pc8401a_state::io_rom_addr_w)); + map(0xb3, 0xb3).r(FUNC(pc8401a_state::io_rom_data_r)); // AM_RANGE(0xc8, 0xc8) map(0xfc, 0xff).rw(I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); } diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index 66e40fde7c4..df01a5e8356 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -1172,7 +1172,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_mem_w) void pc8801_state::pc8801_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(pc8801_state::pc8801_mem_r), FUNC(pc8801_state::pc8801_mem_w)); + map(0x0000, 0xffff).rw(FUNC(pc8801_state::pc8801_mem_r), FUNC(pc8801_state::pc8801_mem_w)); } READ8_MEMBER(pc8801_state::pc8801_ctrl_r) @@ -1792,55 +1792,55 @@ void pc8801_state::pc8801_io(address_map &map) map(0x0d, 0x0d).portr("KEY13"); map(0x0e, 0x0e).portr("KEY14"); map(0x0f, 0x0f).portr("KEY15"); - map(0x00, 0x02).w(this, FUNC(pc8801_state::pc8801_pcg8100_w)); - map(0x10, 0x10).w(this, FUNC(pc8801_state::pc8801_rtc_w)); + map(0x00, 0x02).w(FUNC(pc8801_state::pc8801_pcg8100_w)); + map(0x10, 0x10).w(FUNC(pc8801_state::pc8801_rtc_w)); map(0x20, 0x20).mirror(0x0e).rw(I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); /* RS-232C and CMT */ map(0x21, 0x21).mirror(0x0e).rw(I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x30, 0x30).portr("DSW1").w(this, FUNC(pc8801_state::pc8801_txt_cmt_ctrl_w)); - map(0x31, 0x31).portr("DSW2").w(this, FUNC(pc8801_state::pc8801_gfx_ctrl_w)); - map(0x32, 0x32).rw(this, FUNC(pc8801_state::pc8801_misc_ctrl_r), FUNC(pc8801_state::pc8801_misc_ctrl_w)); - map(0x33, 0x33).rw(this, FUNC(pc8801_state::pc8801_unk_r), FUNC(pc8801_state::pc8801_unk_w)); - map(0x34, 0x34).w(this, FUNC(pc8801_state::pc8801_alu_ctrl1_w)); - map(0x35, 0x35).w(this, FUNC(pc8801_state::pc8801_alu_ctrl2_w)); - map(0x40, 0x40).rw(this, FUNC(pc8801_state::pc8801_ctrl_r), FUNC(pc8801_state::pc8801_ctrl_w)); - map(0x44, 0x47).rw(this, FUNC(pc8801_state::pc8801_sound_board_r), FUNC(pc8801_state::pc8801_sound_board_w)); /* OPN / OPNA ports */ - map(0x50, 0x50).rw(this, FUNC(pc8801_state::pc8801_crtc_param_r), FUNC(pc8801_state::pc88_crtc_param_w)); - map(0x51, 0x51).rw(this, FUNC(pc8801_state::pc8801_crtc_status_r), FUNC(pc8801_state::pc88_crtc_cmd_w)); - map(0x52, 0x52).w(this, FUNC(pc8801_state::pc8801_bgpal_w)); - map(0x53, 0x53).w(this, FUNC(pc8801_state::pc8801_layer_masking_w)); - map(0x54, 0x5b).w(this, FUNC(pc8801_state::pc8801_palram_w)); - map(0x5c, 0x5c).r(this, FUNC(pc8801_state::pc8801_vram_select_r)); - map(0x5c, 0x5f).w(this, FUNC(pc8801_state::pc8801_vram_select_w)); - map(0x60, 0x67).rw(this, FUNC(pc8801_state::pc8801_dmac_r), FUNC(pc8801_state::pc8801_dmac_w)); - map(0x68, 0x68).rw(this, FUNC(pc8801_state::pc8801_dmac_status_r), FUNC(pc8801_state::pc8801_dmac_mode_w)); - map(0x6e, 0x6e).r(this, FUNC(pc8801_state::pc8801_cpuclock_r)); - map(0x6f, 0x6f).rw(this, FUNC(pc8801_state::pc8801_baudrate_r), FUNC(pc8801_state::pc8801_baudrate_w)); - map(0x70, 0x70).rw(this, FUNC(pc8801_state::pc8801_window_bank_r), FUNC(pc8801_state::pc8801_window_bank_w)); - map(0x71, 0x71).rw(this, FUNC(pc8801_state::pc8801_ext_rom_bank_r), FUNC(pc8801_state::pc8801_ext_rom_bank_w)); - map(0x78, 0x78).w(this, FUNC(pc8801_state::pc8801_window_bank_inc_w)); - map(0x90, 0x9f).rw(this, FUNC(pc8801_state::pc8801_cdrom_r), FUNC(pc8801_state::pc8801_cdrom_w)); + map(0x30, 0x30).portr("DSW1").w(FUNC(pc8801_state::pc8801_txt_cmt_ctrl_w)); + map(0x31, 0x31).portr("DSW2").w(FUNC(pc8801_state::pc8801_gfx_ctrl_w)); + map(0x32, 0x32).rw(FUNC(pc8801_state::pc8801_misc_ctrl_r), FUNC(pc8801_state::pc8801_misc_ctrl_w)); + map(0x33, 0x33).rw(FUNC(pc8801_state::pc8801_unk_r), FUNC(pc8801_state::pc8801_unk_w)); + map(0x34, 0x34).w(FUNC(pc8801_state::pc8801_alu_ctrl1_w)); + map(0x35, 0x35).w(FUNC(pc8801_state::pc8801_alu_ctrl2_w)); + map(0x40, 0x40).rw(FUNC(pc8801_state::pc8801_ctrl_r), FUNC(pc8801_state::pc8801_ctrl_w)); + map(0x44, 0x47).rw(FUNC(pc8801_state::pc8801_sound_board_r), FUNC(pc8801_state::pc8801_sound_board_w)); /* OPN / OPNA ports */ + map(0x50, 0x50).rw(FUNC(pc8801_state::pc8801_crtc_param_r), FUNC(pc8801_state::pc88_crtc_param_w)); + map(0x51, 0x51).rw(FUNC(pc8801_state::pc8801_crtc_status_r), FUNC(pc8801_state::pc88_crtc_cmd_w)); + map(0x52, 0x52).w(FUNC(pc8801_state::pc8801_bgpal_w)); + map(0x53, 0x53).w(FUNC(pc8801_state::pc8801_layer_masking_w)); + map(0x54, 0x5b).w(FUNC(pc8801_state::pc8801_palram_w)); + map(0x5c, 0x5c).r(FUNC(pc8801_state::pc8801_vram_select_r)); + map(0x5c, 0x5f).w(FUNC(pc8801_state::pc8801_vram_select_w)); + map(0x60, 0x67).rw(FUNC(pc8801_state::pc8801_dmac_r), FUNC(pc8801_state::pc8801_dmac_w)); + map(0x68, 0x68).rw(FUNC(pc8801_state::pc8801_dmac_status_r), FUNC(pc8801_state::pc8801_dmac_mode_w)); + map(0x6e, 0x6e).r(FUNC(pc8801_state::pc8801_cpuclock_r)); + map(0x6f, 0x6f).rw(FUNC(pc8801_state::pc8801_baudrate_r), FUNC(pc8801_state::pc8801_baudrate_w)); + map(0x70, 0x70).rw(FUNC(pc8801_state::pc8801_window_bank_r), FUNC(pc8801_state::pc8801_window_bank_w)); + map(0x71, 0x71).rw(FUNC(pc8801_state::pc8801_ext_rom_bank_r), FUNC(pc8801_state::pc8801_ext_rom_bank_w)); + map(0x78, 0x78).w(FUNC(pc8801_state::pc8801_window_bank_inc_w)); + map(0x90, 0x9f).rw(FUNC(pc8801_state::pc8801_cdrom_r), FUNC(pc8801_state::pc8801_cdrom_w)); // AM_RANGE(0xa0, 0xa3) AM_NOP /* music & network */ - map(0xa8, 0xad).rw(this, FUNC(pc8801_state::pc8801_opna_r), FUNC(pc8801_state::pc8801_opna_w)); /* second sound board */ + map(0xa8, 0xad).rw(FUNC(pc8801_state::pc8801_opna_r), FUNC(pc8801_state::pc8801_opna_w)); /* second sound board */ // AM_RANGE(0xb4, 0xb5) AM_NOP /* Video art board */ // AM_RANGE(0xc1, 0xc1) AM_NOP /* (unknown) */ // AM_RANGE(0xc2, 0xcf) AM_NOP /* music */ // AM_RANGE(0xd0, 0xd7) AM_NOP /* music & GP-IB */ // AM_RANGE(0xd8, 0xd8) AM_NOP /* GP-IB */ // AM_RANGE(0xdc, 0xdf) AM_NOP /* MODEM */ - map(0xe2, 0xe2).rw(this, FUNC(pc8801_state::pc8801_extram_mode_r), FUNC(pc8801_state::pc8801_extram_mode_w)); /* expand RAM mode */ - map(0xe3, 0xe3).rw(this, FUNC(pc8801_state::pc8801_extram_bank_r), FUNC(pc8801_state::pc8801_extram_bank_w)); /* expand RAM bank */ + map(0xe2, 0xe2).rw(FUNC(pc8801_state::pc8801_extram_mode_r), FUNC(pc8801_state::pc8801_extram_mode_w)); /* expand RAM mode */ + map(0xe3, 0xe3).rw(FUNC(pc8801_state::pc8801_extram_bank_r), FUNC(pc8801_state::pc8801_extram_bank_w)); /* expand RAM bank */ #ifdef USE_PROPER_I8214 - map(0xe4, 0xe4).w(this, FUNC(pc8801_state::i8214_irq_level_w)); - map(0xe6, 0xe6).w(this, FUNC(pc8801_state::i8214_irq_mask_w)); + map(0xe4, 0xe4).w(FUNC(pc8801_state::i8214_irq_level_w)); + map(0xe6, 0xe6).w(FUNC(pc8801_state::i8214_irq_mask_w)); #else - map(0xe4, 0xe4).w(this, FUNC(pc8801_state::pc8801_irq_level_w)); - map(0xe6, 0xe6).w(this, FUNC(pc8801_state::pc8801_irq_mask_w)); + map(0xe4, 0xe4).w(FUNC(pc8801_state::pc8801_irq_level_w)); + map(0xe6, 0xe6).w(FUNC(pc8801_state::pc8801_irq_mask_w)); #endif // AM_RANGE(0xe7, 0xe7) AM_NOP /* Arcus writes here, almost likely to be a mirror of above */ - map(0xe8, 0xeb).rw(this, FUNC(pc8801_state::pc8801_kanji_r), FUNC(pc8801_state::pc8801_kanji_w)); - map(0xec, 0xef).rw(this, FUNC(pc8801_state::pc8801_kanji_lv2_r), FUNC(pc8801_state::pc8801_kanji_lv2_w)); - map(0xf0, 0xf0).w(this, FUNC(pc8801_state::pc8801_dic_bank_w)); - map(0xf1, 0xf1).w(this, FUNC(pc8801_state::pc8801_dic_ctrl_w)); + map(0xe8, 0xeb).rw(FUNC(pc8801_state::pc8801_kanji_r), FUNC(pc8801_state::pc8801_kanji_w)); + map(0xec, 0xef).rw(FUNC(pc8801_state::pc8801_kanji_lv2_r), FUNC(pc8801_state::pc8801_kanji_lv2_w)); + map(0xf0, 0xf0).w(FUNC(pc8801_state::pc8801_dic_bank_w)); + map(0xf1, 0xf1).w(FUNC(pc8801_state::pc8801_dic_ctrl_w)); // AM_RANGE(0xf3, 0xf3) AM_NOP /* DMA floppy (unknown) */ // AM_RANGE(0xf4, 0xf7) AM_NOP /* DMA 5'floppy (may be not released) */ // AM_RANGE(0xf8, 0xfb) AM_NOP /* DMA 8'floppy (unknown) */ @@ -1923,10 +1923,10 @@ WRITE8_MEMBER(pc8801_state::fdc_drive_mode_w) void pc8801_state::pc8801fdc_io(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).w(this, FUNC(pc8801_state::fdc_irq_vector_w)); // Interrupt Opcode Port - map(0xf4, 0xf4).w(this, FUNC(pc8801_state::fdc_drive_mode_w)); // Drive mode, 2d, 2dd, 2hd + map(0xf0, 0xf0).w(FUNC(pc8801_state::fdc_irq_vector_w)); // Interrupt Opcode Port + map(0xf4, 0xf4).w(FUNC(pc8801_state::fdc_drive_mode_w)); // Drive mode, 2d, 2dd, 2hd map(0xf7, 0xf7).nopw(); // printer port output - map(0xf8, 0xf8).rw(this, FUNC(pc8801_state::upd765_tc_r), FUNC(pc8801_state::upd765_mc_w)); // (R) Terminal Count Port (W) Motor Control Port + map(0xf8, 0xf8).rw(FUNC(pc8801_state::upd765_tc_r), FUNC(pc8801_state::upd765_mc_w)); // (R) Terminal Count Port (W) Motor Control Port map(0xfa, 0xfb).m("upd765", FUNC(upd765a_device::map)); map(0xfc, 0xff).rw("d8255_slave", FUNC(i8255_device::read), FUNC(i8255_device::write)); } diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index 28507766548..793db5682da 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -686,7 +686,7 @@ void pc88va_state::pc88va_map(address_map &map) { map(0x00000, 0x7ffff).ram(); // AM_RANGE(0x80000, 0x9ffff) AM_RAM // EMM - map(0xa0000, 0xdffff).rw(this, FUNC(pc88va_state::sys_mem_r), FUNC(pc88va_state::sys_mem_w)); + map(0xa0000, 0xdffff).rw(FUNC(pc88va_state::sys_mem_r), FUNC(pc88va_state::sys_mem_w)); map(0xe0000, 0xeffff).bankr("rom00_bank"); map(0xf0000, 0xfffff).bankr("rom10_bank"); } @@ -1260,14 +1260,14 @@ READ8_MEMBER(pc88va_state::no_subfdc_r) void pc88va_state::pc88va_io_map(address_map &map) { - map(0x0000, 0x000f).r(this, FUNC(pc88va_state::key_r)); // Keyboard ROW reading + map(0x0000, 0x000f).r(FUNC(pc88va_state::key_r)); // Keyboard ROW reading // AM_RANGE(0x0010, 0x0010) Printer / Calendar Clock Interface map(0x0020, 0x0021).noprw(); // RS-232C - map(0x0030, 0x0031).rw(this, FUNC(pc88va_state::backupram_dsw_r), FUNC(pc88va_state::sys_port1_w)); // 0x30 (R) DSW1 (W) Text Control Port 0 / 0x31 (R) DSW2 (W) System Port 1 + map(0x0030, 0x0031).rw(FUNC(pc88va_state::backupram_dsw_r), FUNC(pc88va_state::sys_port1_w)); // 0x30 (R) DSW1 (W) Text Control Port 0 / 0x31 (R) DSW2 (W) System Port 1 // AM_RANGE(0x0032, 0x0032) (R) ? (W) System Port 2 // AM_RANGE(0x0034, 0x0034) GVRAM Control Port 1 // AM_RANGE(0x0035, 0x0035) GVRAM Control Port 2 - map(0x0040, 0x0041).r(this, FUNC(pc88va_state::sys_port4_r)); // (R) System Port 4 (W) System port 3 (strobe port) + map(0x0040, 0x0041).r(FUNC(pc88va_state::sys_port4_r)); // (R) System Port 4 (W) System port 3 (strobe port) map(0x0044, 0x0045).mirror(0x0002).rw("ym", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // AM_RANGE(0x005c, 0x005c) (R) GVRAM status // AM_RANGE(0x005c, 0x005f) (W) GVRAM selection @@ -1275,7 +1275,7 @@ void pc88va_state::pc88va_io_map(address_map &map) // AM_RANGE(0x0071, 0x0071) Expansion ROM select (*) // AM_RANGE(0x0078, 0x0078) Memory offset increment (*) // AM_RANGE(0x0080, 0x0081) HDD related - map(0x0082, 0x0082).r(this, FUNC(pc88va_state::hdd_status_r));// HDD control, byte access 7-0 + map(0x0082, 0x0082).r(FUNC(pc88va_state::hdd_status_r));// HDD control, byte access 7-0 // AM_RANGE(0x00bc, 0x00bf) d8255 1 // AM_RANGE(0x00e2, 0x00e3) Expansion RAM selection (*) // AM_RANGE(0x00e4, 0x00e4) 8214 IRQ control (*) @@ -1285,12 +1285,12 @@ void pc88va_state::pc88va_io_map(address_map &map) #if TEST_SUBFDC map(0x00fc, 0x00ff).rw("d8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); // d8255 2, FDD #else - map(0x00fc, 0x00ff).r(this, FUNC(pc88va_state::no_subfdc_r)).nopw(); + map(0x00fc, 0x00ff).r(FUNC(pc88va_state::no_subfdc_r)).nopw(); #endif - map(0x0100, 0x0101).rw(this, FUNC(pc88va_state::screen_ctrl_r), FUNC(pc88va_state::screen_ctrl_w)); // Screen Control Register + map(0x0100, 0x0101).rw(FUNC(pc88va_state::screen_ctrl_r), FUNC(pc88va_state::screen_ctrl_w)); // Screen Control Register // AM_RANGE(0x0102, 0x0103) Graphic Screen Control Register - map(0x0106, 0x0109).w(this, FUNC(pc88va_state::video_pri_w)); // Palette Control Register (priority) / Direct Color Control Register (priority) + map(0x0106, 0x0109).w(FUNC(pc88va_state::video_pri_w)); // Palette Control Register (priority) / Direct Color Control Register (priority) // AM_RANGE(0x010a, 0x010b) Picture Mask Mode Register // AM_RANGE(0x010c, 0x010d) Color Palette Mode Register // AM_RANGE(0x010e, 0x010f) Backdrop Color Register @@ -1299,14 +1299,14 @@ void pc88va_state::pc88va_io_map(address_map &map) // AM_RANGE(0x0126, 0x0127) ? (related to Transparent Color of Graphic Screen 1) // AM_RANGE(0x012e, 0x012f) ? (related to Transparent Color of Text/Sprite) // AM_RANGE(0x0130, 0x0137) Picture Mask Parameter - map(0x0142, 0x0142).rw(this, FUNC(pc88va_state::idp_status_r), FUNC(pc88va_state::idp_command_w)); //Text Controller (IDP) - (R) Status (W) command - map(0x0146, 0x0146).w(this, FUNC(pc88va_state::idp_param_w)); //Text Controller (IDP) - (R/W) Parameter + map(0x0142, 0x0142).rw(FUNC(pc88va_state::idp_status_r), FUNC(pc88va_state::idp_command_w)); //Text Controller (IDP) - (R) Status (W) command + map(0x0146, 0x0146).w(FUNC(pc88va_state::idp_param_w)); //Text Controller (IDP) - (R/W) Parameter // AM_RANGE(0x0148, 0x0149) Text control port 1 // AM_RANGE(0x014c, 0x014f) ? CG Port - map(0x0150, 0x0151).r(this, FUNC(pc88va_state::sysop_r)); // System Operational Mode - map(0x0152, 0x0153).rw(this, FUNC(pc88va_state::bios_bank_r), FUNC(pc88va_state::bios_bank_w)); // Memory Map Register + map(0x0150, 0x0151).r(FUNC(pc88va_state::sysop_r)); // System Operational Mode + map(0x0152, 0x0153).rw(FUNC(pc88va_state::bios_bank_r), FUNC(pc88va_state::bios_bank_w)); // Memory Map Register // AM_RANGE(0x0154, 0x0155) Refresh Register (wait states) - map(0x0156, 0x0156).r(this, FUNC(pc88va_state::rom_bank_r)); // ROM bank status + map(0x0156, 0x0156).r(FUNC(pc88va_state::rom_bank_r)); // ROM bank status // AM_RANGE(0x0158, 0x0159) Interruption Mode Modification // AM_RANGE(0x015c, 0x015f) NMI mask port (strobe port) map(0x0160, 0x016f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); // DMA Controller @@ -1314,11 +1314,11 @@ void pc88va_state::pc88va_io_map(address_map &map) map(0x0188, 0x018b).rw("pic8259_master", FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); // ICU, also controls 8214 emulation // AM_RANGE(0x0190, 0x0191) System Port 5 // AM_RANGE(0x0196, 0x0197) Keyboard sub CPU command port - map(0x0198, 0x0199).w(this, FUNC(pc88va_state::backupram_wp_1_w)); //Backup RAM write inhibit - map(0x019a, 0x019b).w(this, FUNC(pc88va_state::backupram_wp_0_w)); //Backup RAM write permission + map(0x0198, 0x0199).w(FUNC(pc88va_state::backupram_wp_1_w)); //Backup RAM write inhibit + map(0x019a, 0x019b).w(FUNC(pc88va_state::backupram_wp_0_w)); //Backup RAM write permission map(0x01a0, 0x01a7).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff);// vTCU (timer counter unit) - map(0x01a8, 0x01a8).w(this, FUNC(pc88va_state::timer3_ctrl_reg_w)); // General-purpose timer 3 control port - map(0x01b0, 0x01b7).rw(this, FUNC(pc88va_state::pc88va_fdc_r), FUNC(pc88va_state::pc88va_fdc_w)).umask16(0x00ff);// FDC related (765) + map(0x01a8, 0x01a8).w(FUNC(pc88va_state::timer3_ctrl_reg_w)); // General-purpose timer 3 control port + map(0x01b0, 0x01b7).rw(FUNC(pc88va_state::pc88va_fdc_r), FUNC(pc88va_state::pc88va_fdc_w)).umask16(0x00ff);// FDC related (765) map(0x01b8, 0x01bb).m(m_fdc, FUNC(upd765a_device::map)).umask16(0x00ff); // AM_RANGE(0x01c0, 0x01c1) ? map(0x01c6, 0x01c7).nopw(); // ??? @@ -1328,7 +1328,7 @@ void pc88va_state::pc88va_io_map(address_map &map) map(0x0220, 0x023f).ram(); // Frame buffer 1 control parameter map(0x0240, 0x025f).ram(); // Frame buffer 2 control parameter map(0x0260, 0x027f).ram(); // Frame buffer 3 control parameter - map(0x0300, 0x033f).ram().w(this, FUNC(pc88va_state::palette_ram_w)).share("palram"); // Palette RAM (xBBBBxRRRRxGGGG format) + map(0x0300, 0x033f).ram().w(FUNC(pc88va_state::palette_ram_w)).share("palram"); // Palette RAM (xBBBBxRRRRxGGGG format) // AM_RANGE(0x0500, 0x05ff) GVRAM // AM_RANGE(0x1000, 0xfeff) user area (???) @@ -1370,9 +1370,9 @@ WRITE8_MEMBER(pc88va_state::upd765_mc_w) void pc88va_state::pc88va_z80_io_map(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf0).w(this, FUNC(pc88va_state::fdc_irq_vector_w)); // Interrupt Opcode Port + map(0xf0, 0xf0).w(FUNC(pc88va_state::fdc_irq_vector_w)); // Interrupt Opcode Port // AM_RANGE(0xf4, 0xf4) // Drive Control Port - map(0xf8, 0xf8).rw(this, FUNC(pc88va_state::upd765_tc_r), FUNC(pc88va_state::upd765_mc_w)); // (R) Terminal Count Port (W) Motor Control Port + map(0xf8, 0xf8).rw(FUNC(pc88va_state::upd765_tc_r), FUNC(pc88va_state::upd765_mc_w)); // (R) Terminal Count Port (W) Motor Control Port map(0xfa, 0xfb).m(m_fdc, FUNC(upd765a_device::map)); map(0xfc, 0xff).rw("d8255_2s", FUNC(i8255_device::read), FUNC(i8255_device::write)); } diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index df2e8c8c534..141c5425e1f 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -647,8 +647,8 @@ READ8_MEMBER(pc9801_state::f0_r) void pc9801_state::pc9801_map(address_map &map) { - map(0xa0000, 0xa3fff).rw(this, FUNC(pc9801_state::tvram_r), FUNC(pc9801_state::tvram_w)); //TVRAM - map(0xa8000, 0xbffff).rw(this, FUNC(pc9801_state::gvram_r), FUNC(pc9801_state::gvram_w)); //bitmap VRAM + map(0xa0000, 0xa3fff).rw(FUNC(pc9801_state::tvram_r), FUNC(pc9801_state::tvram_w)); //TVRAM + map(0xa8000, 0xbffff).rw(FUNC(pc9801_state::gvram_r), FUNC(pc9801_state::gvram_w)); //bitmap VRAM // map(0xcc000, 0xcffff).rom().region("sound_bios", 0); //sound BIOS map(0xd6000, 0xd6fff).rom().region("fdc_bios_2dd", 0); //floppy BIOS 2dd map(0xd7000, 0xd7fff).rom().region("fdc_bios_2hd", 0); //floppy BIOS 2hd @@ -660,23 +660,23 @@ void pc9801_state::pc9801_common_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x001f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask16(0xff00); - map(0x0000, 0x001f).rw(this, FUNC(pc9801_state::pic_r), FUNC(pc9801_state::pic_w)).umask16(0x00ff); // i8259 PIC (bit 3 ON slave / master) / i8237 DMA - map(0x0020, 0x002f).w(this, FUNC(pc9801_state::rtc_w)).umask16(0x00ff); + map(0x0000, 0x001f).rw(FUNC(pc9801_state::pic_r), FUNC(pc9801_state::pic_w)).umask16(0x00ff); // i8259 PIC (bit 3 ON slave / master) / i8237 DMA + map(0x0020, 0x002f).w(FUNC(pc9801_state::rtc_w)).umask16(0x00ff); map(0x0030, 0x0037).rw("ppi8255_sys", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00); //i8251 RS232c / i8255 system port map(0x0040, 0x0047).rw("ppi8255_prn", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); map(0x0040, 0x0047).rw(m_keyb, FUNC(pc9801_kbd_device::rx_r), FUNC(pc9801_kbd_device::tx_w)).umask16(0xff00); //i8255 printer port / i8251 keyboard map(0x0050, 0x0057).rw("ppi8255_fdd", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00); - map(0x0050, 0x0057).w(this, FUNC(pc9801_state::nmi_ctrl_w)).umask16(0x00ff); // NMI FF / i8255 floppy port (2d?) + map(0x0050, 0x0057).w(FUNC(pc9801_state::nmi_ctrl_w)).umask16(0x00ff); // NMI FF / i8255 floppy port (2d?) map(0x0060, 0x0063).rw(m_hgdc1, FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask16(0x00ff); //upd7220 character ports / - map(0x0064, 0x0064).w(this, FUNC(pc9801_state::vrtc_clear_w)); + map(0x0064, 0x0064).w(FUNC(pc9801_state::vrtc_clear_w)); // AM_RANGE(0x006c, 0x006f) border color / map(0x0070, 0x007f).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0xff00); - map(0x0070, 0x007f).rw(this, FUNC(pc9801_state::txt_scrl_r), FUNC(pc9801_state::txt_scrl_w)).umask16(0x00ff); //display registers / i8253 pit - map(0x0080, 0x0080).rw(this, FUNC(pc9801_state::sasi_data_r), FUNC(pc9801_state::sasi_data_w)); - map(0x0082, 0x0082).rw(this, FUNC(pc9801_state::sasi_status_r), FUNC(pc9801_state::sasi_ctrl_w)); + map(0x0070, 0x007f).rw(FUNC(pc9801_state::txt_scrl_r), FUNC(pc9801_state::txt_scrl_w)).umask16(0x00ff); //display registers / i8253 pit + map(0x0080, 0x0080).rw(FUNC(pc9801_state::sasi_data_r), FUNC(pc9801_state::sasi_data_w)); + map(0x0082, 0x0082).rw(FUNC(pc9801_state::sasi_status_r), FUNC(pc9801_state::sasi_ctrl_w)); map(0x0090, 0x0090).r(m_fdc_2hd, FUNC(upd765a_device::msr_r)); map(0x0092, 0x0092).rw(m_fdc_2hd, FUNC(upd765a_device::fifo_r), FUNC(upd765a_device::fifo_w)); - map(0x0094, 0x0094).rw(this, FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); + map(0x0094, 0x0094).rw(FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); map(0x0091, 0x0091).rw(m_sio, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x0093, 0x0093).rw(m_sio, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x7fd8, 0x7fdf).rw("ppi8255_mouse", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00); @@ -685,12 +685,12 @@ void pc9801_state::pc9801_common_io(address_map &map) void pc9801_state::pc9801_io(address_map &map) { pc9801_common_io(map); - map(0x0020, 0x002f).w(this, FUNC(pc9801_state::dmapg4_w)).umask16(0xff00); - map(0x0068, 0x0068).w(this, FUNC(pc9801_state::pc9801_video_ff_w)); //mode FF / - map(0x00a0, 0x00af).rw(this, FUNC(pc9801_state::pc9801_a0_r), FUNC(pc9801_state::pc9801_a0_w)); //upd7220 bitmap ports / display registers + map(0x0020, 0x002f).w(FUNC(pc9801_state::dmapg4_w)).umask16(0xff00); + map(0x0068, 0x0068).w(FUNC(pc9801_state::pc9801_video_ff_w)); //mode FF / + map(0x00a0, 0x00af).rw(FUNC(pc9801_state::pc9801_a0_r), FUNC(pc9801_state::pc9801_a0_w)); //upd7220 bitmap ports / display registers map(0x00c8, 0x00cb).m(m_fdc_2dd, FUNC(upd765a_device::map)).umask16(0x00ff); - map(0x00cc, 0x00cc).rw(this, FUNC(pc9801_state::fdc_2dd_ctrl_r), FUNC(pc9801_state::fdc_2dd_ctrl_w)); //upd765a 2dd / - map(0x00f0, 0x00ff).r(this, FUNC(pc9801_state::f0_r)).umask16(0x00ff); + map(0x00cc, 0x00cc).rw(FUNC(pc9801_state::fdc_2dd_ctrl_r), FUNC(pc9801_state::fdc_2dd_ctrl_w)); //upd765a 2dd / + map(0x00f0, 0x00ff).r(FUNC(pc9801_state::f0_r)).umask16(0x00ff); } /************************************* @@ -1066,10 +1066,10 @@ void pc9801_state::ipl_bank(address_map &map) void pc9801_state::pc9801ux_map(address_map &map) { - map(0x0a0000, 0x0a3fff).rw(this, FUNC(pc9801_state::tvram_r), FUNC(pc9801_state::tvram_w)); - map(0x0a4000, 0x0a4fff).rw(this, FUNC(pc9801_state::pc9801rs_knjram_r), FUNC(pc9801_state::pc9801rs_knjram_w)); - map(0x0a8000, 0x0bffff).rw(this, FUNC(pc9801_state::grcg_gvram_r), FUNC(pc9801_state::grcg_gvram_w)); - map(0x0e0000, 0x0e7fff).rw(this, FUNC(pc9801_state::grcg_gvram0_r), FUNC(pc9801_state::grcg_gvram0_w)); + map(0x0a0000, 0x0a3fff).rw(FUNC(pc9801_state::tvram_r), FUNC(pc9801_state::tvram_w)); + map(0x0a4000, 0x0a4fff).rw(FUNC(pc9801_state::pc9801rs_knjram_r), FUNC(pc9801_state::pc9801rs_knjram_w)); + map(0x0a8000, 0x0bffff).rw(FUNC(pc9801_state::grcg_gvram_r), FUNC(pc9801_state::grcg_gvram_w)); + map(0x0e0000, 0x0e7fff).rw(FUNC(pc9801_state::grcg_gvram0_r), FUNC(pc9801_state::grcg_gvram0_w)); map(0x0e8000, 0x0fffff).m(m_ipl, FUNC(address_map_bank_device::amap16)); } @@ -1077,19 +1077,19 @@ void pc9801_state::pc9801ux_io(address_map &map) { map.unmap_value_high(); pc9801_common_io(map); - map(0x0020, 0x002f).w(this, FUNC(pc9801_state::dmapg8_w)).umask16(0xff00); + map(0x0020, 0x002f).w(FUNC(pc9801_state::dmapg8_w)).umask16(0xff00); map(0x0050, 0x0057).noprw(); // 2dd ppi? - map(0x005c, 0x005f).r(this, FUNC(pc9801_state::timestamp_r)).nopw(); // artic - map(0x0068, 0x006b).w(this, FUNC(pc9801_state::pc9801rs_video_ff_w)).umask16(0x00ff); //mode FF / - map(0x0070, 0x007f).rw(this, FUNC(pc9801_state::grcg_r), FUNC(pc9801_state::grcg_w)).umask16(0x00ff); //display registers "GRCG" / i8253 pit - map(0x00a0, 0x00af).rw(this, FUNC(pc9801_state::pc9801_a0_r), FUNC(pc9801_state::pc9801rs_a0_w)); //upd7220 bitmap ports / display registers - map(0x00bc, 0x00bf).rw(this, FUNC(pc9801_state::fdc_mode_ctrl_r), FUNC(pc9801_state::fdc_mode_ctrl_w)); + map(0x005c, 0x005f).r(FUNC(pc9801_state::timestamp_r)).nopw(); // artic + map(0x0068, 0x006b).w(FUNC(pc9801_state::pc9801rs_video_ff_w)).umask16(0x00ff); //mode FF / + map(0x0070, 0x007f).rw(FUNC(pc9801_state::grcg_r), FUNC(pc9801_state::grcg_w)).umask16(0x00ff); //display registers "GRCG" / i8253 pit + map(0x00a0, 0x00af).rw(FUNC(pc9801_state::pc9801_a0_r), FUNC(pc9801_state::pc9801rs_a0_w)); //upd7220 bitmap ports / display registers + map(0x00bc, 0x00bf).rw(FUNC(pc9801_state::fdc_mode_ctrl_r), FUNC(pc9801_state::fdc_mode_ctrl_w)); map(0x00c8, 0x00cb).m(m_fdc_2hd, FUNC(upd765a_device::map)).umask16(0x00ff); - map(0x00cc, 0x00cc).rw(this, FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); - map(0x00f0, 0x00ff).rw(this, FUNC(pc9801_state::a20_ctrl_r), FUNC(pc9801_state::a20_ctrl_w)).umask16(0x00ff); - map(0x0438, 0x043b).rw(this, FUNC(pc9801_state::access_ctrl_r), FUNC(pc9801_state::access_ctrl_w)); - map(0x043c, 0x043f).w(this, FUNC(pc9801_state::pc9801rs_bank_w)); //ROM/RAM bank - map(0x04a0, 0x04af).w(this, FUNC(pc9801_state::egc_w)); + map(0x00cc, 0x00cc).rw(FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); + map(0x00f0, 0x00ff).rw(FUNC(pc9801_state::a20_ctrl_r), FUNC(pc9801_state::a20_ctrl_w)).umask16(0x00ff); + map(0x0438, 0x043b).rw(FUNC(pc9801_state::access_ctrl_r), FUNC(pc9801_state::access_ctrl_w)); + map(0x043c, 0x043f).w(FUNC(pc9801_state::pc9801rs_bank_w)); //ROM/RAM bank + map(0x04a0, 0x04af).w(FUNC(pc9801_state::egc_w)); map(0x3fd8, 0x3fdf).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0xff00); } @@ -1106,12 +1106,12 @@ void pc9801_state::pc9801rs_io(address_map &map) { map.unmap_value_high(); pc9801ux_io(map); - map(0x0430, 0x0433).rw(this, FUNC(pc9801_state::ide_ctrl_r), FUNC(pc9801_state::ide_ctrl_w)).umask16(0x00ff); - map(0x0640, 0x064f).rw(this, FUNC(pc9801_state::ide_cs0_r), FUNC(pc9801_state::ide_cs0_w)); - map(0x0740, 0x074f).rw(this, FUNC(pc9801_state::ide_cs1_r), FUNC(pc9801_state::ide_cs1_w)); + map(0x0430, 0x0433).rw(FUNC(pc9801_state::ide_ctrl_r), FUNC(pc9801_state::ide_ctrl_w)).umask16(0x00ff); + map(0x0640, 0x064f).rw(FUNC(pc9801_state::ide_cs0_r), FUNC(pc9801_state::ide_cs0_w)); + map(0x0740, 0x074f).rw(FUNC(pc9801_state::ide_cs1_r), FUNC(pc9801_state::ide_cs1_w)); map(0x1e8c, 0x1e8f).noprw(); // temp - map(0xbfd8, 0xbfdf).w(this, FUNC(pc9801_state::pc9801rs_mouse_freq_w)); - map(0xe0d0, 0xe0d3).r(this, FUNC(pc9801_state::midi_r)); + map(0xbfd8, 0xbfdf).w(FUNC(pc9801_state::pc9801rs_mouse_freq_w)); + map(0xe0d0, 0xe0d3).r(FUNC(pc9801_state::midi_r)); } /************************************* @@ -1401,14 +1401,14 @@ WRITE16_MEMBER(pc9801_state::pc9821_grcg_gvram0_w) void pc9801_state::pc9821_map(address_map &map) { - //map(0x00080000, 0x0009ffff).rw(this, FUNC(pc9801_state::winram_r), FUNC(pc9801_state::winram_w)) - map(0x000a0000, 0x000a3fff).rw(this, FUNC(pc9801_state::tvram_r), FUNC(pc9801_state::tvram_w)); - map(0x000a4000, 0x000a4fff).rw(this, FUNC(pc9801_state::pc9801rs_knjram_r), FUNC(pc9801_state::pc9801rs_knjram_w)); - map(0x000a8000, 0x000bffff).rw(this, FUNC(pc9801_state::pc9821_grcg_gvram_r), FUNC(pc9801_state::pc9821_grcg_gvram_w)); + //map(0x00080000, 0x0009ffff).rw(FUNC(pc9801_state::winram_r), FUNC(pc9801_state::winram_w)) + map(0x000a0000, 0x000a3fff).rw(FUNC(pc9801_state::tvram_r), FUNC(pc9801_state::tvram_w)); + map(0x000a4000, 0x000a4fff).rw(FUNC(pc9801_state::pc9801rs_knjram_r), FUNC(pc9801_state::pc9801rs_knjram_w)); + map(0x000a8000, 0x000bffff).rw(FUNC(pc9801_state::pc9821_grcg_gvram_r), FUNC(pc9801_state::pc9821_grcg_gvram_w)); // map(0x000cc000, 0x000cffff).rom().region("sound_bios", 0); //sound BIOS // map(0x000d8000, 0x000d9fff).rom().region("ide",0) map(0x000da000, 0x000dbfff).ram(); // ide ram - map(0x000e0000, 0x000e7fff).rw(this, FUNC(pc9801_state::pc9821_grcg_gvram0_r), FUNC(pc9801_state::pc9821_grcg_gvram0_w)); + map(0x000e0000, 0x000e7fff).rw(FUNC(pc9801_state::pc9821_grcg_gvram0_r), FUNC(pc9801_state::pc9821_grcg_gvram0_w)); map(0x000e8000, 0x000fffff).m(m_ipl, FUNC(address_map_bank_device::amap16)); map(0x00f00000, 0x00f9ffff).ram().share("ext_gvram"); map(0xffee8000, 0xffefffff).m(m_ipl, FUNC(address_map_bank_device::amap16)); @@ -1421,44 +1421,44 @@ void pc9801_state::pc9821_io(address_map &map) // ADDRESS_MAP_UNMAP_HIGH // TODO: a read to somewhere makes this to fail at POST map(0x0000, 0x001f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask32(0xff00ff00); map(0x0000, 0x001f).r(read8_delegate([this](address_space &s, offs_t o, u8 mm) { return BIT(o, 1) ? 0xff : pic_r(s, o, mm); }, "pc9821_pic")).umask32(0x00ff00ff); - map(0x0000, 0x001f).w(this, FUNC(pc9801_state::pic_w)).umask32(0x00ff00ff); // i8259 PIC (bit 3 ON slave / master) / i8237 DMA - map(0x0020, 0x002f).w(this, FUNC(pc9801_state::rtc_w)).umask32(0x000000ff); - map(0x0020, 0x002f).w(this, FUNC(pc9801_state::dmapg8_w)).umask32(0xff00ff00); + map(0x0000, 0x001f).w(FUNC(pc9801_state::pic_w)).umask32(0x00ff00ff); // i8259 PIC (bit 3 ON slave / master) / i8237 DMA + map(0x0020, 0x002f).w(FUNC(pc9801_state::rtc_w)).umask32(0x000000ff); + map(0x0020, 0x002f).w(FUNC(pc9801_state::dmapg8_w)).umask32(0xff00ff00); map(0x0030, 0x0037).rw("ppi8255_sys", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask32(0xff00ff00); //i8251 RS232c / i8255 system port map(0x0040, 0x0047).rw("ppi8255_prn", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask32(0x00ff00ff); map(0x0040, 0x0047).rw(m_keyb, FUNC(pc9801_kbd_device::rx_r), FUNC(pc9801_kbd_device::tx_w)).umask32(0xff00ff00); //i8255 printer port / i8251 keyboard - map(0x0050, 0x0053).w(this, FUNC(pc9801_state::nmi_ctrl_w)).umask32(0x00ff00ff); - map(0x005c, 0x005f).r(this, FUNC(pc9801_state::timestamp_r)).nopw(); // artic + map(0x0050, 0x0053).w(FUNC(pc9801_state::nmi_ctrl_w)).umask32(0x00ff00ff); + map(0x005c, 0x005f).r(FUNC(pc9801_state::timestamp_r)).nopw(); // artic map(0x0060, 0x0063).rw(m_hgdc1, FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask32(0x00ff00ff); //upd7220 character ports / - map(0x0060, 0x0063).r(this, FUNC(pc9801_state::unk_r)).umask32(0xff00ff00); // mouse related (unmapped checking for AT keyb controller\PS/2 mouse?) - map(0x0064, 0x0064).w(this, FUNC(pc9801_state::vrtc_clear_w)); - map(0x0068, 0x006b).w(this, FUNC(pc9801_state::pc9821_video_ff_w)).umask32(0x00ff00ff); //mode FF / + map(0x0060, 0x0063).r(FUNC(pc9801_state::unk_r)).umask32(0xff00ff00); // mouse related (unmapped checking for AT keyb controller\PS/2 mouse?) + map(0x0064, 0x0064).w(FUNC(pc9801_state::vrtc_clear_w)); + map(0x0068, 0x006b).w(FUNC(pc9801_state::pc9821_video_ff_w)).umask32(0x00ff00ff); //mode FF / map(0x0070, 0x007f).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask32(0xff00ff00); - map(0x0070, 0x007f).rw(this, FUNC(pc9801_state::grcg_r), FUNC(pc9801_state::grcg_w)).umask32(0x00ff00ff); //display registers "GRCG" / i8253 pit + map(0x0070, 0x007f).rw(FUNC(pc9801_state::grcg_r), FUNC(pc9801_state::grcg_w)).umask32(0x00ff00ff); //display registers "GRCG" / i8253 pit map(0x0090, 0x0093).m(m_fdc_2hd, FUNC(upd765a_device::map)).umask32(0x00ff00ff); - map(0x0094, 0x0094).rw(this, FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); - map(0x00a0, 0x00af).rw(this, FUNC(pc9801_state::pc9821_a0_r), FUNC(pc9801_state::pc9821_a0_w)); //upd7220 bitmap ports / display registers + map(0x0094, 0x0094).rw(FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); + map(0x00a0, 0x00af).rw(FUNC(pc9801_state::pc9821_a0_r), FUNC(pc9801_state::pc9821_a0_w)); //upd7220 bitmap ports / display registers // AM_RANGE(0x00b0, 0x00b3) PC9861k (serial port?) // AM_RANGE(0x00b9, 0x00b9) PC9861k // AM_RANGE(0x00bb, 0x00bb) PC9861k - map(0x00bc, 0x00bf).rw(this, FUNC(pc9801_state::fdc_mode_ctrl_r), FUNC(pc9801_state::fdc_mode_ctrl_w)); + map(0x00bc, 0x00bf).rw(FUNC(pc9801_state::fdc_mode_ctrl_r), FUNC(pc9801_state::fdc_mode_ctrl_w)); map(0x00c8, 0x00cb).m(m_fdc_2hd, FUNC(upd765a_device::map)).umask32(0x00ff00ff); - map(0x00cc, 0x00cc).rw(this, FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); + map(0x00cc, 0x00cc).rw(FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); // AM_RANGE(0x00d8, 0x00df) AMD98 (sound?) board - map(0x00f0, 0x00ff).rw(this, FUNC(pc9801_state::a20_ctrl_r), FUNC(pc9801_state::a20_ctrl_w)).umask32(0x00ff00ff); + map(0x00f0, 0x00ff).rw(FUNC(pc9801_state::a20_ctrl_r), FUNC(pc9801_state::a20_ctrl_w)).umask32(0x00ff00ff); // AM_RANGE(0x0188, 0x018f) AM_READWRITE8(pc9801_opn_r, pc9801_opn_w, 0xffffffff) //ym2203 opn / // AM_RANGE(0x018c, 0x018f) YM2203 OPN extended ports / - map(0x0430, 0x0433).rw(this, FUNC(pc9801_state::ide_ctrl_r), FUNC(pc9801_state::ide_ctrl_w)).umask32(0x00ff00ff); - map(0x0438, 0x043b).rw(this, FUNC(pc9801_state::access_ctrl_r), FUNC(pc9801_state::access_ctrl_w)); + map(0x0430, 0x0433).rw(FUNC(pc9801_state::ide_ctrl_r), FUNC(pc9801_state::ide_ctrl_w)).umask32(0x00ff00ff); + map(0x0438, 0x043b).rw(FUNC(pc9801_state::access_ctrl_r), FUNC(pc9801_state::access_ctrl_w)); // AM_RANGE(0x043d, 0x043d) ROM/RAM bank (NEC) - map(0x043c, 0x043f).w(this, FUNC(pc9801_state::pc9801rs_bank_w)); //ROM/RAM bank (EPSON) - map(0x0460, 0x0463).rw(this, FUNC(pc9801_state::window_bank_r), FUNC(pc9801_state::window_bank_w)); - map(0x04a0, 0x04af).w(this, FUNC(pc9801_state::egc_w)); + map(0x043c, 0x043f).w(FUNC(pc9801_state::pc9801rs_bank_w)); //ROM/RAM bank (EPSON) + map(0x0460, 0x0463).rw(FUNC(pc9801_state::window_bank_r), FUNC(pc9801_state::window_bank_w)); + map(0x04a0, 0x04af).w(FUNC(pc9801_state::egc_w)); // AM_RANGE(0x04be, 0x04be) FDC "RPM" register - map(0x0640, 0x064f).rw(this, FUNC(pc9801_state::ide_cs0_r), FUNC(pc9801_state::ide_cs0_w)); - map(0x0740, 0x074f).rw(this, FUNC(pc9801_state::ide_cs1_r), FUNC(pc9801_state::ide_cs1_w)); + map(0x0640, 0x064f).rw(FUNC(pc9801_state::ide_cs0_r), FUNC(pc9801_state::ide_cs0_w)); + map(0x0740, 0x074f).rw(FUNC(pc9801_state::ide_cs1_r), FUNC(pc9801_state::ide_cs1_w)); // AM_RANGE(0x08e0, 0x08ea) / EMM SIO registers - map(0x09a0, 0x09a0).rw(this, FUNC(pc9801_state::ext2_video_ff_r), FUNC(pc9801_state::ext2_video_ff_w)); // GDC extended register r/w + map(0x09a0, 0x09a0).rw(FUNC(pc9801_state::ext2_video_ff_r), FUNC(pc9801_state::ext2_video_ff_w)); // GDC extended register r/w // AM_RANGE(0x09a8, 0x09a8) GDC 31KHz register r/w // AM_RANGE(0x0c07, 0x0c07) EPSON register w // AM_RANGE(0x0c03, 0x0c03) EPSON register 0 r @@ -1472,18 +1472,18 @@ void pc9801_state::pc9821_io(address_map &map) map(0x2ed0, 0x2edf).r(read8_delegate([](address_space &s, offs_t o, u8 mm) { return 0xff; }, "pc9821_unkaudio")).umask32(0xffffffff); // unknown sound related map(0x3fd8, 0x3fdf).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask32(0xff00ff00); // / pit mirror ports map(0x7fd8, 0x7fdf).rw("ppi8255_mouse", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask32(0xff00ff00); - map(0x841c, 0x841f).rw(this, FUNC(pc9801_state::sdip_0_r), FUNC(pc9801_state::sdip_0_w)); - map(0x851c, 0x851f).rw(this, FUNC(pc9801_state::sdip_1_r), FUNC(pc9801_state::sdip_1_w)); - map(0x861c, 0x861f).rw(this, FUNC(pc9801_state::sdip_2_r), FUNC(pc9801_state::sdip_2_w)); - map(0x871c, 0x871f).rw(this, FUNC(pc9801_state::sdip_3_r), FUNC(pc9801_state::sdip_3_w)); - map(0x881c, 0x881f).rw(this, FUNC(pc9801_state::sdip_4_r), FUNC(pc9801_state::sdip_4_w)); - map(0x891c, 0x891f).rw(this, FUNC(pc9801_state::sdip_5_r), FUNC(pc9801_state::sdip_5_w)); - map(0x8a1c, 0x8a1f).rw(this, FUNC(pc9801_state::sdip_6_r), FUNC(pc9801_state::sdip_6_w)); - map(0x8b1c, 0x8b1f).rw(this, FUNC(pc9801_state::sdip_7_r), FUNC(pc9801_state::sdip_7_w)); - map(0x8c1c, 0x8c1f).rw(this, FUNC(pc9801_state::sdip_8_r), FUNC(pc9801_state::sdip_8_w)); - map(0x8d1c, 0x8d1f).rw(this, FUNC(pc9801_state::sdip_9_r), FUNC(pc9801_state::sdip_9_w)); - map(0x8e1c, 0x8e1f).rw(this, FUNC(pc9801_state::sdip_a_r), FUNC(pc9801_state::sdip_a_w)); - map(0x8f1c, 0x8f1f).rw(this, FUNC(pc9801_state::sdip_b_r), FUNC(pc9801_state::sdip_b_w)); + map(0x841c, 0x841f).rw(FUNC(pc9801_state::sdip_0_r), FUNC(pc9801_state::sdip_0_w)); + map(0x851c, 0x851f).rw(FUNC(pc9801_state::sdip_1_r), FUNC(pc9801_state::sdip_1_w)); + map(0x861c, 0x861f).rw(FUNC(pc9801_state::sdip_2_r), FUNC(pc9801_state::sdip_2_w)); + map(0x871c, 0x871f).rw(FUNC(pc9801_state::sdip_3_r), FUNC(pc9801_state::sdip_3_w)); + map(0x881c, 0x881f).rw(FUNC(pc9801_state::sdip_4_r), FUNC(pc9801_state::sdip_4_w)); + map(0x891c, 0x891f).rw(FUNC(pc9801_state::sdip_5_r), FUNC(pc9801_state::sdip_5_w)); + map(0x8a1c, 0x8a1f).rw(FUNC(pc9801_state::sdip_6_r), FUNC(pc9801_state::sdip_6_w)); + map(0x8b1c, 0x8b1f).rw(FUNC(pc9801_state::sdip_7_r), FUNC(pc9801_state::sdip_7_w)); + map(0x8c1c, 0x8c1f).rw(FUNC(pc9801_state::sdip_8_r), FUNC(pc9801_state::sdip_8_w)); + map(0x8d1c, 0x8d1f).rw(FUNC(pc9801_state::sdip_9_r), FUNC(pc9801_state::sdip_9_w)); + map(0x8e1c, 0x8e1f).rw(FUNC(pc9801_state::sdip_a_r), FUNC(pc9801_state::sdip_a_w)); + map(0x8f1c, 0x8f1f).rw(FUNC(pc9801_state::sdip_b_r), FUNC(pc9801_state::sdip_b_w)); // AM_RANGE(0xa460, 0xa46f) cs4231 PCM extended port / // AM_RANGE(0xbfdb, 0xbfdb) mouse timing port // AM_RANGE(0xc0d0, 0xc0d3) MIDI port, option 0 / @@ -1494,7 +1494,7 @@ void pc9801_state::pc9821_io(address_map &map) // AM_RANGE(0xd4d0, 0xd4d3) MIDI port, option 5 / // AM_RANGE(0xd8d0, 0xd8d3) MIDI port, option 6 / // AM_RANGE(0xdcd0, 0xdcd3) MIDI port, option 7 / - map(0xe0d0, 0xe0d3).r(this, FUNC(pc9801_state::midi_r)); // MIDI port, option 8 / + map(0xe0d0, 0xe0d3).r(FUNC(pc9801_state::midi_r)); // MIDI port, option 8 / // AM_RANGE(0xe4d0, 0xe4d3) MIDI port, option 9 / // AM_RANGE(0xe8d0, 0xe8d3) MIDI port, option A / // AM_RANGE(0xecd0, 0xecd3) MIDI port, option B / @@ -1516,7 +1516,7 @@ void pc9801_state::upd7220_2_map(address_map &map) void pc9801_state::upd7220_grcg_2_map(address_map &map) { - map(0x00000, 0x3ffff).rw(this, FUNC(pc9801_state::upd7220_grcg_r), FUNC(pc9801_state::upd7220_grcg_w)).share("video_ram_2"); + map(0x00000, 0x3ffff).rw(FUNC(pc9801_state::upd7220_grcg_r), FUNC(pc9801_state::upd7220_grcg_w)).share("video_ram_2"); } CUSTOM_INPUT_MEMBER(pc9801_state::system_type_r) diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index 9c974dd82fa..977ddbf93fc 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -102,8 +102,8 @@ void pcat_dyn_state::pcat_map(address_map &map) map(0x00000000, 0x0009ffff).ram(); map(0x000a0000, 0x000bffff).rw("vga", FUNC(trident_vga_device::mem_r), FUNC(trident_vga_device::mem_w)); map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0); - map(0x000d0000, 0x000d0fff).rom().region("game_prg", 0x0000).w(this, FUNC(pcat_dyn_state::bank1_w)); - map(0x000d1000, 0x000d1fff).rom().region("game_prg", 0x1000).w(this, FUNC(pcat_dyn_state::bank2_w)); + map(0x000d0000, 0x000d0fff).rom().region("game_prg", 0x0000).w(FUNC(pcat_dyn_state::bank1_w)); + map(0x000d1000, 0x000d1fff).rom().region("game_prg", 0x1000).w(FUNC(pcat_dyn_state::bank2_w)); map(0x000d2000, 0x000d2fff).bankr("prgbank"); map(0x000d3000, 0x000d3fff).bankrw("nvram_bank"); map(0x000df400, 0x000df8ff).ram(); //I/O board? @@ -119,7 +119,7 @@ void pcat_dyn_state::pcat_io(address_map &map) map(0x03c0, 0x03cf).rw("vga", FUNC(trident_vga_device::port_03c0_r), FUNC(trident_vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(trident_vga_device::port_03d0_r), FUNC(trident_vga_device::port_03d0_w)); map(0x03f8, 0x03ff).rw("ns16550", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); - map(0x0530, 0x0533).r(this, FUNC(pcat_dyn_state::audio_r)); + map(0x0530, 0x0533).r(FUNC(pcat_dyn_state::audio_r)); map(0x0534, 0x0537).rw("ad1848", FUNC(ad1848_device::read), FUNC(ad1848_device::write)); } diff --git a/src/mame/drivers/pcat_nit.cpp b/src/mame/drivers/pcat_nit.cpp index ecd5342e247..446856f5d93 100644 --- a/src/mame/drivers/pcat_nit.cpp +++ b/src/mame/drivers/pcat_nit.cpp @@ -158,7 +158,7 @@ void pcat_nit_state::pcat_map(address_map &map) map(0x000a0000, 0x000bffff).rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w)); map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0).nopw(); map(0x000d0000, 0x000d3fff).ram().region("disk_bios", 0); - map(0x000d7000, 0x000d7000).w(this, FUNC(pcat_nit_state::pcat_nit_rombank_w)); + map(0x000d7000, 0x000d7000).w(FUNC(pcat_nit_state::pcat_nit_rombank_w)); map(0x000d8000, 0x000dffff).bankr("rombank"); map(0x000f0000, 0x000fffff).ram().region("bios", 0); map(0xffff0000, 0xffffffff).rom().region("bios", 0); @@ -170,7 +170,7 @@ void pcat_nit_state::bonanza_map(address_map &map) map(0x000a0000, 0x000bffff).rw("vga", FUNC(cirrus_gd5428_device::mem_r), FUNC(cirrus_gd5428_device::mem_w)); map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0).nopw(); map(0x000d0000, 0x000d3fff).ram().region("disk_bios", 0); - map(0x000d7000, 0x000d7000).w(this, FUNC(pcat_nit_state::pcat_nit_rombank_w)); + map(0x000d7000, 0x000d7000).w(FUNC(pcat_nit_state::pcat_nit_rombank_w)); map(0x000d8000, 0x000dffff).bankr("rombank"); map(0x000f0000, 0x000fffff).ram().region("bios", 0); map(0xffff0000, 0xffffffff).rom().region("bios", 0); @@ -194,7 +194,7 @@ READ8_MEMBER(pcat_nit_state::pcat_nit_io_r) void pcat_nit_state::pcat_nit_io(address_map &map) { pcat32_io_common(map); - map(0x0278, 0x027f).r(this, FUNC(pcat_nit_state::pcat_nit_io_r)).nopw(); + map(0x0278, 0x027f).r(FUNC(pcat_nit_state::pcat_nit_io_r)).nopw(); map(0x0280, 0x0283).nopr(); map(0x03b0, 0x03bf).rw("vga", FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); @@ -205,7 +205,7 @@ void pcat_nit_state::pcat_nit_io(address_map &map) void pcat_nit_state::bonanza_io_map(address_map &map) { pcat32_io_common(map); - map(0x0278, 0x027f).r(this, FUNC(pcat_nit_state::pcat_nit_io_r)).nopw(); + map(0x0278, 0x027f).r(FUNC(pcat_nit_state::pcat_nit_io_r)).nopw(); map(0x0280, 0x0283).nopr(); map(0x03b0, 0x03bf).rw("vga", FUNC(cirrus_gd5428_device::port_03b0_r), FUNC(cirrus_gd5428_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(cirrus_gd5428_device::port_03c0_r), FUNC(cirrus_gd5428_device::port_03c0_w)); diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index 5efdd501dde..a39509c3107 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -439,39 +439,39 @@ READ16_MEMBER(pcd_state::mem_r) void pcd_state::pcd_map(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); - map(0x00000, 0x7ffff).rw(this, FUNC(pcd_state::mem_r), FUNC(pcd_state::mem_w)); + map(0x00000, 0xfffff).rw(FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); + map(0x00000, 0x7ffff).rw(FUNC(pcd_state::mem_r), FUNC(pcd_state::mem_w)); map(0xfc000, 0xfffff).rom().region("bios", 0); } void pcd_state::pcd_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xefff).rw(this, FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); + map(0x0000, 0xefff).rw(FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); map(0xf000, 0xf7ff).ram().share("nvram"); map(0xf800, 0xf801).rw(m_pic1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xf820, 0xf821).rw(m_pic2, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0xf840, 0xf840).rw(this, FUNC(pcd_state::stat_r), FUNC(pcd_state::stat_w)); - map(0xf841, 0xf841).rw(this, FUNC(pcd_state::led_r), FUNC(pcd_state::led_w)); - map(0xf880, 0xf8bf).rw(this, FUNC(pcd_state::rtc_r), FUNC(pcd_state::rtc_w)); + map(0xf840, 0xf840).rw(FUNC(pcd_state::stat_r), FUNC(pcd_state::stat_w)); + map(0xf841, 0xf841).rw(FUNC(pcd_state::led_r), FUNC(pcd_state::led_w)); + map(0xf880, 0xf8bf).rw(FUNC(pcd_state::rtc_r), FUNC(pcd_state::rtc_w)); map(0xf900, 0xf903).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); - map(0xf904, 0xf905).rw(this, FUNC(pcd_state::dskctl_r), FUNC(pcd_state::dskctl_w)); - map(0xf940, 0xf943).rw(this, FUNC(pcd_state::scsi_r), FUNC(pcd_state::scsi_w)); + map(0xf904, 0xf905).rw(FUNC(pcd_state::dskctl_r), FUNC(pcd_state::dskctl_w)); + map(0xf940, 0xf943).rw(FUNC(pcd_state::scsi_r), FUNC(pcd_state::scsi_w)); map(0xf980, 0xf9bf).m("video", FUNC(pcdx_video_device::map)); map(0xf9c0, 0xf9c3).rw("usart1", FUNC(mc2661_device::read), FUNC(mc2661_device::write)); // UARTs map(0xf9d0, 0xf9d3).rw("usart2", FUNC(mc2661_device::read), FUNC(mc2661_device::write)); map(0xf9e0, 0xf9e3).rw("usart3", FUNC(mc2661_device::read), FUNC(mc2661_device::write)); // AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select) - map(0xfb00, 0xfb00).rw(this, FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); - map(0xfb02, 0xffff).rw(this, FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); + map(0xfb00, 0xfb00).rw(FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); + map(0xfb02, 0xffff).rw(FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); } void pcd_state::pcx_io(address_map &map) { map.unmap_value_high(); pcd_io(map); - map(0x8000, 0x8fff).rw(this, FUNC(pcd_state::mmu_r), FUNC(pcd_state::mmu_w)); - map(0xfb01, 0xfb01).rw(this, FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); + map(0x8000, 0x8fff).rw(FUNC(pcd_state::mmu_r), FUNC(pcd_state::mmu_w)); + map(0xfb01, 0xfb01).rw(FUNC(pcd_state::nmi_io_r), FUNC(pcd_state::nmi_io_w)); } //************************************************************************** diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp index 38d5ec71e7c..81fa170ec2c 100644 --- a/src/mame/drivers/pce.cpp +++ b/src/mame/drivers/pce.cpp @@ -261,9 +261,9 @@ void pce_state::pce_mem(address_map &map) map(0x1FE400, 0x1FE7FF).rw(m_huc6260, FUNC(huc6260_device::read), FUNC(huc6260_device::write)); map(0x1FE800, 0x1FEBFF).rw(C6280_TAG, FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w)); map(0x1FEC00, 0x1FEFFF).rw(m_maincpu, FUNC(h6280_device::timer_r), FUNC(h6280_device::timer_w)); - map(0x1FF000, 0x1FF3FF).rw(this, FUNC(pce_state::mess_pce_joystick_r), FUNC(pce_state::mess_pce_joystick_w)); + map(0x1FF000, 0x1FF3FF).rw(FUNC(pce_state::mess_pce_joystick_r), FUNC(pce_state::mess_pce_joystick_w)); map(0x1FF400, 0x1FF7FF).rw(m_maincpu, FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w)); - map(0x1FF800, 0x1FFBFF).rw(this, FUNC(pce_state::pce_cd_intf_r), FUNC(pce_state::pce_cd_intf_w)); + map(0x1FF800, 0x1FFBFF).rw(FUNC(pce_state::pce_cd_intf_r), FUNC(pce_state::pce_cd_intf_w)); } void pce_state::pce_io(address_map &map) @@ -286,9 +286,9 @@ void pce_state::sgx_mem(address_map &map) map(0x1FE400, 0x1FE7FF).rw(m_huc6260, FUNC(huc6260_device::read), FUNC(huc6260_device::write)); map(0x1FE800, 0x1FEBFF).rw(C6280_TAG, FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w)); map(0x1FEC00, 0x1FEFFF).rw(m_maincpu, FUNC(h6280_device::timer_r), FUNC(h6280_device::timer_w)); - map(0x1FF000, 0x1FF3FF).rw(this, FUNC(pce_state::mess_pce_joystick_r), FUNC(pce_state::mess_pce_joystick_w)); + map(0x1FF000, 0x1FF3FF).rw(FUNC(pce_state::mess_pce_joystick_r), FUNC(pce_state::mess_pce_joystick_w)); map(0x1FF400, 0x1FF7FF).rw(m_maincpu, FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w)); - map(0x1FF800, 0x1FFBFF).rw(this, FUNC(pce_state::pce_cd_intf_r), FUNC(pce_state::pce_cd_intf_w)); + map(0x1FF800, 0x1FFBFF).rw(FUNC(pce_state::pce_cd_intf_r), FUNC(pce_state::pce_cd_intf_w)); } diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp index 9a2a0e19ed6..300feba7cf1 100644 --- a/src/mame/drivers/pce220.cpp +++ b/src/mame/drivers/pce220.cpp @@ -588,49 +588,49 @@ void pce220_state::pce220_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x10, 0x10).r(this, FUNC(pce220_state::kb_r)); - map(0x11, 0x12).w(this, FUNC(pce220_state::kb_matrix_w)); + map(0x10, 0x10).r(FUNC(pce220_state::kb_r)); + map(0x11, 0x12).w(FUNC(pce220_state::kb_matrix_w)); map(0x13, 0x13).portr("SHIFT"); - map(0x14, 0x14).rw(this, FUNC(pce220_state::timer_r), FUNC(pce220_state::timer_w)); - map(0x15, 0x15).rw(this, FUNC(pce220_state::port15_r), FUNC(pce220_state::port15_w)); - map(0x16, 0x16).rw(this, FUNC(pce220_state::irq_status_r), FUNC(pce220_state::irq_ack_w)); - map(0x17, 0x17).w(this, FUNC(pce220_state::irq_mask_w)); - map(0x18, 0x18).rw(this, FUNC(pce220_state::port18_r), FUNC(pce220_state::port18_w)); - map(0x19, 0x19).rw(this, FUNC(pce220_state::rom_bank_r), FUNC(pce220_state::rom_bank_w)); - map(0x1a, 0x1a).w(this, FUNC(pce220_state::boot_bank_w)); - map(0x1b, 0x1b).w(this, FUNC(pce220_state::ram_bank_w)); + map(0x14, 0x14).rw(FUNC(pce220_state::timer_r), FUNC(pce220_state::timer_w)); + map(0x15, 0x15).rw(FUNC(pce220_state::port15_r), FUNC(pce220_state::port15_w)); + map(0x16, 0x16).rw(FUNC(pce220_state::irq_status_r), FUNC(pce220_state::irq_ack_w)); + map(0x17, 0x17).w(FUNC(pce220_state::irq_mask_w)); + map(0x18, 0x18).rw(FUNC(pce220_state::port18_r), FUNC(pce220_state::port18_w)); + map(0x19, 0x19).rw(FUNC(pce220_state::rom_bank_r), FUNC(pce220_state::rom_bank_w)); + map(0x1a, 0x1a).w(FUNC(pce220_state::boot_bank_w)); + map(0x1b, 0x1b).w(FUNC(pce220_state::ram_bank_w)); map(0x1c, 0x1c).nopw(); //peripheral reset map(0x1d, 0x1d).portr("BATTERY"); map(0x1e, 0x1e).nopw(); //??? - map(0x1f, 0x1f).r(this, FUNC(pce220_state::port1f_r)); - map(0x58, 0x58).w(this, FUNC(pce220_state::lcd_control_w)); - map(0x59, 0x59).r(this, FUNC(pce220_state::lcd_status_r)); - map(0x5a, 0x5a).w(this, FUNC(pce220_state::lcd_data_w)); - map(0x5b, 0x5b).r(this, FUNC(pce220_state::lcd_data_r)); + map(0x1f, 0x1f).r(FUNC(pce220_state::port1f_r)); + map(0x58, 0x58).w(FUNC(pce220_state::lcd_control_w)); + map(0x59, 0x59).r(FUNC(pce220_state::lcd_status_r)); + map(0x5a, 0x5a).w(FUNC(pce220_state::lcd_data_w)); + map(0x5b, 0x5b).r(FUNC(pce220_state::lcd_data_r)); } void pcg850v_state::pcg850v_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x10, 0x10).r(this, FUNC(pcg850v_state::kb_r)); - map(0x11, 0x12).w(this, FUNC(pcg850v_state::kb_matrix_w)); + map(0x10, 0x10).r(FUNC(pcg850v_state::kb_r)); + map(0x11, 0x12).w(FUNC(pcg850v_state::kb_matrix_w)); map(0x13, 0x13).portr("SHIFT"); - map(0x14, 0x14).rw(this, FUNC(pcg850v_state::timer_r), FUNC(pcg850v_state::timer_w)); - map(0x15, 0x15).rw(this, FUNC(pcg850v_state::port15_r), FUNC(pcg850v_state::port15_w)); - map(0x16, 0x16).rw(this, FUNC(pcg850v_state::irq_status_r), FUNC(pcg850v_state::irq_ack_w)); - map(0x17, 0x17).w(this, FUNC(pcg850v_state::irq_mask_w)); - map(0x18, 0x18).rw(this, FUNC(pcg850v_state::port18_r), FUNC(pcg850v_state::port18_w)); - map(0x19, 0x19).rw(this, FUNC(pcg850v_state::rom_bank_r), FUNC(pcg850v_state::rom_bank_w)); - map(0x1a, 0x1a).w(this, FUNC(pcg850v_state::boot_bank_w)); - map(0x1b, 0x1b).w(this, FUNC(pcg850v_state::ram_bank_w)); + map(0x14, 0x14).rw(FUNC(pcg850v_state::timer_r), FUNC(pcg850v_state::timer_w)); + map(0x15, 0x15).rw(FUNC(pcg850v_state::port15_r), FUNC(pcg850v_state::port15_w)); + map(0x16, 0x16).rw(FUNC(pcg850v_state::irq_status_r), FUNC(pcg850v_state::irq_ack_w)); + map(0x17, 0x17).w(FUNC(pcg850v_state::irq_mask_w)); + map(0x18, 0x18).rw(FUNC(pcg850v_state::port18_r), FUNC(pcg850v_state::port18_w)); + map(0x19, 0x19).rw(FUNC(pcg850v_state::rom_bank_r), FUNC(pcg850v_state::rom_bank_w)); + map(0x1a, 0x1a).w(FUNC(pcg850v_state::boot_bank_w)); + map(0x1b, 0x1b).w(FUNC(pcg850v_state::ram_bank_w)); map(0x1c, 0x1c).nopw(); //peripheral reset map(0x1d, 0x1d).portr("BATTERY"); map(0x1e, 0x1e).nopw(); //??? - map(0x1f, 0x1f).r(this, FUNC(pcg850v_state::port1f_r)); - map(0x40, 0x40).rw(this, FUNC(pcg850v_state::g850v_lcd_status_r), FUNC(pcg850v_state::g850v_lcd_control_w)); - map(0x41, 0x41).rw(this, FUNC(pcg850v_state::g850v_lcd_data_r), FUNC(pcg850v_state::g850v_lcd_data_w)); - map(0x69, 0x69).rw(this, FUNC(pcg850v_state::g850v_bank_r), FUNC(pcg850v_state::g850v_bank_w)); + map(0x1f, 0x1f).r(FUNC(pcg850v_state::port1f_r)); + map(0x40, 0x40).rw(FUNC(pcg850v_state::g850v_lcd_status_r), FUNC(pcg850v_state::g850v_lcd_control_w)); + map(0x41, 0x41).rw(FUNC(pcg850v_state::g850v_lcd_data_r), FUNC(pcg850v_state::g850v_lcd_data_w)); + map(0x69, 0x69).rw(FUNC(pcg850v_state::g850v_bank_r), FUNC(pcg850v_state::g850v_bank_w)); } INPUT_CHANGED_MEMBER(pce220_state::kb_irq) diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp index 68026953704..72f9884bc66 100644 --- a/src/mame/drivers/pcfx.cpp +++ b/src/mame/drivers/pcfx.cpp @@ -188,7 +188,7 @@ WRITE16_MEMBER( pcfx_state::pad_w ) void pcfx_state::pcfx_io(address_map &map) { - map(0x00000000, 0x000000FF).rw(this, FUNC(pcfx_state::pad_r), FUNC(pcfx_state::pad_w)); /* PAD */ + map(0x00000000, 0x000000FF).rw(FUNC(pcfx_state::pad_r), FUNC(pcfx_state::pad_w)); /* PAD */ map(0x00000100, 0x000001FF).noprw(); /* HuC6230 */ map(0x00000200, 0x000002FF).m("huc6271", FUNC(huc6271_device::regs)).umask32(0x0000ffff); /* HuC6271 */ map(0x00000300, 0x000003FF).rw(m_huc6261, FUNC(huc6261_device::read), FUNC(huc6261_device::write)).umask32(0x0000ffff); /* HuC6261 */ @@ -196,7 +196,7 @@ void pcfx_state::pcfx_io(address_map &map) map(0x00000500, 0x000005FF).rw("huc6270_b", FUNC(huc6270_device::read), FUNC(huc6270_device::write)).umask32(0x0000ffff); /* HuC6270-B */ map(0x00000600, 0x000006FF).rw("huc6272", FUNC(huc6272_device::read), FUNC(huc6272_device::write)); /* HuC6272 */ map(0x00000C80, 0x00000C83).noprw(); - map(0x00000E00, 0x00000EFF).rw(this, FUNC(pcfx_state::irq_read), FUNC(pcfx_state::irq_write)).umask32(0x0000ffff); /* Interrupt controller */ + map(0x00000E00, 0x00000EFF).rw(FUNC(pcfx_state::irq_read), FUNC(pcfx_state::irq_write)).umask32(0x0000ffff); /* Interrupt controller */ map(0x00000F00, 0x00000FFF).noprw(); // AM_RANGE( 0x00600000, 0x006FFFFF ) AM_READ(scsi_ctrl_r) map(0x00780000, 0x007FFFFF).rom().region("scsi_rom", 0); diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp index 4fb105d5f6f..7271ebad306 100644 --- a/src/mame/drivers/pcktgal.cpp +++ b/src/mame/drivers/pcktgal.cpp @@ -80,8 +80,8 @@ void pcktgal_state::pcktgal_map(address_map &map) map(0x1800, 0x1807).w(m_tilegen1, FUNC(deco_bac06_device::pf_control0_8bit_w)); map(0x1810, 0x181f).rw(m_tilegen1, FUNC(deco_bac06_device::pf_control1_8bit_r), FUNC(deco_bac06_device::pf_control1_8bit_w)); - map(0x1a00, 0x1a00).portr("P2").w(this, FUNC(pcktgal_state::sound_w)); - map(0x1c00, 0x1c00).portr("DSW").w(this, FUNC(pcktgal_state::bank_w)); + map(0x1a00, 0x1a00).portr("P2").w(FUNC(pcktgal_state::sound_w)); + map(0x1c00, 0x1c00).portr("DSW").w(FUNC(pcktgal_state::bank_w)); map(0x4000, 0x5fff).bankr("bank1"); map(0x6000, 0x7fff).bankr("bank2"); map(0x8000, 0xffff).rom(); @@ -95,10 +95,10 @@ void pcktgal_state::pcktgal_sound_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x0800, 0x0801).w("ym1", FUNC(ym2203_device::write)); map(0x1000, 0x1001).w("ym2", FUNC(ym3812_device::write)); - map(0x1800, 0x1800).w(this, FUNC(pcktgal_state::adpcm_data_w)); /* ADPCM data for the MSM5205 chip */ - map(0x2000, 0x2000).w(this, FUNC(pcktgal_state::sound_bank_w)); + map(0x1800, 0x1800).w(FUNC(pcktgal_state::adpcm_data_w)); /* ADPCM data for the MSM5205 chip */ + map(0x2000, 0x2000).w(FUNC(pcktgal_state::sound_bank_w)); map(0x3000, 0x3000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x3400, 0x3400).r(this, FUNC(pcktgal_state::adpcm_reset_r)); /* ? not sure */ + map(0x3400, 0x3400).r(FUNC(pcktgal_state::adpcm_reset_r)); /* ? not sure */ map(0x4000, 0x7fff).bankr("bank3"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp index 656f5fbefae..189ca93eb88 100644 --- a/src/mame/drivers/pcw.cpp +++ b/src/mame/drivers/pcw.cpp @@ -930,13 +930,13 @@ void pcw_state::pcw_io(address_map &map) { map.global_mask(0xff); map(0x000, 0x001).mirror(0x7e).m(m_fdc, FUNC(upd765a_device::map)); - map(0x080, 0x0ef).rw(this, FUNC(pcw_state::pcw_expansion_r), FUNC(pcw_state::pcw_expansion_w)); - map(0x0f0, 0x0f3).w(this, FUNC(pcw_state::pcw_bank_select_w)); - map(0x0f4, 0x0f4).rw(this, FUNC(pcw_state::pcw_interrupt_counter_r), FUNC(pcw_state::pcw_bank_force_selection_w)); - map(0x0f5, 0x0f5).w(this, FUNC(pcw_state::pcw_roller_ram_addr_w)); - map(0x0f6, 0x0f6).w(this, FUNC(pcw_state::pcw_pointer_table_top_scan_w)); - map(0x0f7, 0x0f7).w(this, FUNC(pcw_state::pcw_vdu_video_control_register_w)); - map(0x0f8, 0x0f8).rw(this, FUNC(pcw_state::pcw_system_status_r), FUNC(pcw_state::pcw_system_control_w)); + map(0x080, 0x0ef).rw(FUNC(pcw_state::pcw_expansion_r), FUNC(pcw_state::pcw_expansion_w)); + map(0x0f0, 0x0f3).w(FUNC(pcw_state::pcw_bank_select_w)); + map(0x0f4, 0x0f4).rw(FUNC(pcw_state::pcw_interrupt_counter_r), FUNC(pcw_state::pcw_bank_force_selection_w)); + map(0x0f5, 0x0f5).w(FUNC(pcw_state::pcw_roller_ram_addr_w)); + map(0x0f6, 0x0f6).w(FUNC(pcw_state::pcw_pointer_table_top_scan_w)); + map(0x0f7, 0x0f7).w(FUNC(pcw_state::pcw_vdu_video_control_register_w)); + map(0x0f8, 0x0f8).rw(FUNC(pcw_state::pcw_system_status_r), FUNC(pcw_state::pcw_system_control_w)); map(0x0fc, 0x0fd).rw("printer_mcu", FUNC(i8041_device::upi41_master_r), FUNC(i8041_device::upi41_master_w)); } @@ -946,14 +946,14 @@ void pcw_state::pcw9512_io(address_map &map) { map.global_mask(0xff); map(0x000, 0x001).mirror(0x7e).m(m_fdc, FUNC(upd765a_device::map)); - map(0x080, 0x0ef).rw(this, FUNC(pcw_state::pcw_expansion_r), FUNC(pcw_state::pcw_expansion_w)); - map(0x0f0, 0x0f3).w(this, FUNC(pcw_state::pcw_bank_select_w)); - map(0x0f4, 0x0f4).rw(this, FUNC(pcw_state::pcw_interrupt_counter_r), FUNC(pcw_state::pcw_bank_force_selection_w)); - map(0x0f5, 0x0f5).w(this, FUNC(pcw_state::pcw_roller_ram_addr_w)); - map(0x0f6, 0x0f6).w(this, FUNC(pcw_state::pcw_pointer_table_top_scan_w)); - map(0x0f7, 0x0f7).w(this, FUNC(pcw_state::pcw_vdu_video_control_register_w)); - map(0x0f8, 0x0f8).rw(this, FUNC(pcw_state::pcw_system_status_r), FUNC(pcw_state::pcw_system_control_w)); - map(0x0fc, 0x0fd).rw(this, FUNC(pcw_state::pcw9512_parallel_r), FUNC(pcw_state::pcw9512_parallel_w)); + map(0x080, 0x0ef).rw(FUNC(pcw_state::pcw_expansion_r), FUNC(pcw_state::pcw_expansion_w)); + map(0x0f0, 0x0f3).w(FUNC(pcw_state::pcw_bank_select_w)); + map(0x0f4, 0x0f4).rw(FUNC(pcw_state::pcw_interrupt_counter_r), FUNC(pcw_state::pcw_bank_force_selection_w)); + map(0x0f5, 0x0f5).w(FUNC(pcw_state::pcw_roller_ram_addr_w)); + map(0x0f6, 0x0f6).w(FUNC(pcw_state::pcw_pointer_table_top_scan_w)); + map(0x0f7, 0x0f7).w(FUNC(pcw_state::pcw_vdu_video_control_register_w)); + map(0x0f8, 0x0f8).rw(FUNC(pcw_state::pcw_system_status_r), FUNC(pcw_state::pcw_system_control_w)); + map(0x0fc, 0x0fd).rw(FUNC(pcw_state::pcw9512_parallel_r), FUNC(pcw_state::pcw9512_parallel_w)); } diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp index 558d1742888..ab7daf79027 100644 --- a/src/mame/drivers/pcw16.cpp +++ b/src/mame/drivers/pcw16.cpp @@ -144,7 +144,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pcw16_state::pcw16_timer_callback) void pcw16_state::pcw16_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(pcw16_state::pcw16_mem_r), FUNC(pcw16_state::pcw16_mem_w)); + map(0x0000, 0xffff).rw(FUNC(pcw16_state::pcw16_mem_r), FUNC(pcw16_state::pcw16_mem_w)); } @@ -167,11 +167,11 @@ uint8_t pcw16_state::read_bank_data(uint8_t type, uint16_t offset) } if(type < 0x40) // first flash { - return m_flash0->read(((type & 0x3f)*0x4000)+offset); + return m_flash0->read(machine().dummy_space(), ((type & 0x3f)*0x4000)+offset); } else // second flash { - return m_flash1->read(((type & 0x3f)*0x4000)+offset); + return m_flash1->read(machine().dummy_space(), ((type & 0x3f)*0x4000)+offset); } } } @@ -188,11 +188,11 @@ void pcw16_state::write_bank_data(uint8_t type, uint16_t offset, uint8_t data) return; // first four sectors are write protected if(type < 0x40) // first flash { - m_flash0->write(((type & 0x3f)*0x4000)+offset,data); + m_flash0->write(machine().dummy_space(), ((type & 0x3f)*0x4000)+offset, data); } else // second flash { - m_flash1->write(((type & 0x3f)*0x4000)+offset,data); + m_flash1->write(machine().dummy_space(), ((type & 0x3f)*0x4000)+offset, data); } } } @@ -945,19 +945,19 @@ void pcw16_state::pcw16_io(address_map &map) map(0x028, 0x02f).rw(m_uart2, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); map(0x038, 0x03a).rw("lpt", FUNC(pc_lpt_device::read), FUNC(pc_lpt_device::write)); /* anne asic */ - map(0x0e0, 0x0ef).w(this, FUNC(pcw16_state::pcw16_palette_w)); - map(0x0f0, 0x0f3).rw(this, FUNC(pcw16_state::pcw16_bankhw_r), FUNC(pcw16_state::pcw16_bankhw_w)); - map(0x0f4, 0x0f4).rw(this, FUNC(pcw16_state::pcw16_keyboard_data_shift_r), FUNC(pcw16_state::pcw16_keyboard_data_shift_w)); - map(0x0f5, 0x0f5).rw(this, FUNC(pcw16_state::pcw16_keyboard_status_r), FUNC(pcw16_state::pcw16_keyboard_control_w)); - map(0x0f7, 0x0f7).rw(this, FUNC(pcw16_state::pcw16_timer_interrupt_counter_r), FUNC(pcw16_state::pcw16_video_control_w)); - map(0x0f8, 0x0f8).rw(this, FUNC(pcw16_state::pcw16_system_status_r), FUNC(pcw16_state::pcw16_system_control_w)); - map(0x0f9, 0x0f9).rw(this, FUNC(pcw16_state::rtc_256ths_seconds_r), FUNC(pcw16_state::rtc_control_w)); - map(0x0fa, 0x0fa).rw(this, FUNC(pcw16_state::rtc_seconds_r), FUNC(pcw16_state::rtc_seconds_w)); - map(0x0fb, 0x0fb).rw(this, FUNC(pcw16_state::rtc_minutes_r), FUNC(pcw16_state::rtc_minutes_w)); - map(0x0fc, 0x0fc).rw(this, FUNC(pcw16_state::rtc_hours_r), FUNC(pcw16_state::rtc_hours_w)); - map(0x0fd, 0x0fd).rw(this, FUNC(pcw16_state::rtc_days_r), FUNC(pcw16_state::rtc_days_w)); - map(0x0fe, 0x0fe).rw(this, FUNC(pcw16_state::rtc_month_r), FUNC(pcw16_state::rtc_month_w)); - map(0x0ff, 0x0ff).rw(this, FUNC(pcw16_state::rtc_year_invalid_r), FUNC(pcw16_state::rtc_year_w)); + map(0x0e0, 0x0ef).w(FUNC(pcw16_state::pcw16_palette_w)); + map(0x0f0, 0x0f3).rw(FUNC(pcw16_state::pcw16_bankhw_r), FUNC(pcw16_state::pcw16_bankhw_w)); + map(0x0f4, 0x0f4).rw(FUNC(pcw16_state::pcw16_keyboard_data_shift_r), FUNC(pcw16_state::pcw16_keyboard_data_shift_w)); + map(0x0f5, 0x0f5).rw(FUNC(pcw16_state::pcw16_keyboard_status_r), FUNC(pcw16_state::pcw16_keyboard_control_w)); + map(0x0f7, 0x0f7).rw(FUNC(pcw16_state::pcw16_timer_interrupt_counter_r), FUNC(pcw16_state::pcw16_video_control_w)); + map(0x0f8, 0x0f8).rw(FUNC(pcw16_state::pcw16_system_status_r), FUNC(pcw16_state::pcw16_system_control_w)); + map(0x0f9, 0x0f9).rw(FUNC(pcw16_state::rtc_256ths_seconds_r), FUNC(pcw16_state::rtc_control_w)); + map(0x0fa, 0x0fa).rw(FUNC(pcw16_state::rtc_seconds_r), FUNC(pcw16_state::rtc_seconds_w)); + map(0x0fb, 0x0fb).rw(FUNC(pcw16_state::rtc_minutes_r), FUNC(pcw16_state::rtc_minutes_w)); + map(0x0fc, 0x0fc).rw(FUNC(pcw16_state::rtc_hours_r), FUNC(pcw16_state::rtc_hours_w)); + map(0x0fd, 0x0fd).rw(FUNC(pcw16_state::rtc_days_r), FUNC(pcw16_state::rtc_days_w)); + map(0x0fe, 0x0fe).rw(FUNC(pcw16_state::rtc_month_r), FUNC(pcw16_state::rtc_month_w)); + map(0x0ff, 0x0ff).rw(FUNC(pcw16_state::rtc_year_invalid_r), FUNC(pcw16_state::rtc_year_w)); } diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp index abf47fef67a..0e6816742d0 100644 --- a/src/mame/drivers/pcxt.cpp +++ b/src/mame/drivers/pcxt.cpp @@ -373,15 +373,15 @@ void pcxt_state::filetto_io(address_map &map) { map.global_mask(0x3ff); map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); - map(0x0060, 0x0060).r(this, FUNC(pcxt_state::port_a_r)); //not a real 8255 - map(0x0061, 0x0061).rw(this, FUNC(pcxt_state::port_b_r), FUNC(pcxt_state::port_b_w)); - map(0x0062, 0x0062).r(this, FUNC(pcxt_state::port_c_r)); + map(0x0060, 0x0060).r(FUNC(pcxt_state::port_a_r)); //not a real 8255 + map(0x0061, 0x0061).rw(FUNC(pcxt_state::port_b_r), FUNC(pcxt_state::port_b_w)); + map(0x0062, 0x0062).r(FUNC(pcxt_state::port_c_r)); map(0x0201, 0x0201).portr("COIN"); //game port - map(0x0310, 0x0311).rw(this, FUNC(pcxt_state::disk_iobank_r), FUNC(pcxt_state::disk_iobank_w)); //Prototyping card + map(0x0310, 0x0311).rw(FUNC(pcxt_state::disk_iobank_r), FUNC(pcxt_state::disk_iobank_w)); //Prototyping card map(0x0312, 0x0312).portr("IN0"); //Prototyping card,read only - map(0x03f2, 0x03f2).w(this, FUNC(pcxt_state::fdc_dor_w)); - map(0x03f4, 0x03f4).r(this, FUNC(pcxt_state::fdc765_status_r)); //765 Floppy Disk Controller (FDC) Status - map(0x03f5, 0x03f5).rw(this, FUNC(pcxt_state::fdc765_data_r), FUNC(pcxt_state::fdc765_data_w));//FDC Data + map(0x03f2, 0x03f2).w(FUNC(pcxt_state::fdc_dor_w)); + map(0x03f4, 0x03f4).r(FUNC(pcxt_state::fdc765_status_r)); //765 Floppy Disk Controller (FDC) Status + map(0x03f5, 0x03f5).rw(FUNC(pcxt_state::fdc765_data_r), FUNC(pcxt_state::fdc765_data_w));//FDC Data } void pcxt_state::tetriskr_map(address_map &map) diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp index b28d09f1fff..8072c8a4d6f 100644 --- a/src/mame/drivers/pdp11.cpp +++ b/src/mame/drivers/pdp11.cpp @@ -166,7 +166,7 @@ void pdp11_state::pdp11_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0xdfff).ram(); // RAM map(0xea00, 0xfeff).rom(); - map(0xff70, 0xff77).rw(this, FUNC(pdp11_state::teletype_ctrl_r), FUNC(pdp11_state::teletype_ctrl_w)); + map(0xff70, 0xff77).rw(FUNC(pdp11_state::teletype_ctrl_r), FUNC(pdp11_state::teletype_ctrl_w)); map(0xfe78, 0xfe7b).w("rx01", FUNC(rx01_device::write)); } diff --git a/src/mame/drivers/pecom.cpp b/src/mame/drivers/pecom.cpp index 98e0a0e0e03..2e60b208dbf 100644 --- a/src/mame/drivers/pecom.cpp +++ b/src/mame/drivers/pecom.cpp @@ -29,9 +29,9 @@ void pecom_state::pecom64_mem(address_map &map) void pecom_state::pecom64_io(address_map &map) { - map(0x01, 0x01).w(this, FUNC(pecom_state::pecom_bank_w)); - map(0x03, 0x03).r(this, FUNC(pecom_state::pecom_keyboard_r)); - map(0x03, 0x07).w(this, FUNC(pecom_state::pecom_cdp1869_w)); + map(0x01, 0x01).w(FUNC(pecom_state::pecom_bank_w)); + map(0x03, 0x03).r(FUNC(pecom_state::pecom_keyboard_r)); + map(0x03, 0x07).w(FUNC(pecom_state::pecom_cdp1869_w)); } /* Input ports */ diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index 8cab7bed4da..cb32ab9436c 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -200,8 +200,8 @@ void pegasus_state::pegasus_mem(address_map &map) map(0xb000, 0xbdff).ram(); map(0xbe00, 0xbfff).ram().share("videoram"); //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslots 4-5 - map(0xe000, 0xe1ff).r(this, FUNC(pegasus_state::pegasus_protection_r)); - map(0xe200, 0xe3ff).rw(this, FUNC(pegasus_state::pegasus_pcg_r), FUNC(pegasus_state::pegasus_pcg_w)); + map(0xe000, 0xe1ff).r(FUNC(pegasus_state::pegasus_protection_r)); + map(0xe200, 0xe3ff).rw(FUNC(pegasus_state::pegasus_pcg_r), FUNC(pegasus_state::pegasus_pcg_w)); map(0xe400, 0xe403).mirror(0x1fc).rw(m_pia_u, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xe600, 0xe603).mirror(0x1fc).rw(m_pia_s, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xf000, 0xffff).rom(); diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp index ad616b35dce..bb94833eb96 100644 --- a/src/mame/drivers/pencil2.cpp +++ b/src/mame/drivers/pencil2.cpp @@ -142,17 +142,17 @@ void pencil2_state::io_map(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x0f).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x10, 0x1f).w(this, FUNC(pencil2_state::port10_w)); - map(0x30, 0x3f).w(this, FUNC(pencil2_state::port30_w)); - map(0x80, 0x9f).w(this, FUNC(pencil2_state::port80_w)); - map(0xa0, 0xa0).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0xa1, 0xa1).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); - map(0xc0, 0xdf).w(this, FUNC(pencil2_state::portc0_w)); - map(0xe0, 0xff).w("sn76489a", FUNC(sn76489a_device::write)); + map(0x00, 0x0f).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x10, 0x1f).w(FUNC(pencil2_state::port10_w)); + map(0x30, 0x3f).w(FUNC(pencil2_state::port30_w)); + map(0x80, 0x9f).w(FUNC(pencil2_state::port80_w)); + map(0xa0, 0xa0).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0xa1, 0xa1).mirror(0x1e).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); + map(0xc0, 0xdf).w(FUNC(pencil2_state::portc0_w)); + map(0xe0, 0xff).w("sn76489a", FUNC(sn76489a_device::command_w)); map(0xe0, 0xe0).portr("E0"); map(0xe1, 0xe1).portr("E1"); - map(0xe2, 0xe2).r(this, FUNC(pencil2_state::porte2_r)); + map(0xe2, 0xe2).r(FUNC(pencil2_state::porte2_r)); map(0xe3, 0xe3).portr("E3"); map(0xe4, 0xe4).portr("E4"); map(0xe6, 0xe6).portr("E6"); diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp index 8eb0300a1ba..aa674996361 100644 --- a/src/mame/drivers/pengadvb.cpp +++ b/src/mame/drivers/pengadvb.cpp @@ -103,7 +103,7 @@ WRITE8_MEMBER(pengadvb_state::megarom_bank_w) void pengadvb_state::program_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(pengadvb_state::mem_r), FUNC(pengadvb_state::mem_w)); // 4 pages of 16KB + map(0x0000, 0xffff).rw(FUNC(pengadvb_state::mem_r), FUNC(pengadvb_state::mem_w)); // 4 pages of 16KB } void pengadvb_state::bank_mem(address_map &map) @@ -116,7 +116,7 @@ void pengadvb_state::bank_mem(address_map &map) map(0x16000, 0x17fff).bankr("bank1"); map(0x18000, 0x19fff).bankr("bank2"); map(0x1a000, 0x1bfff).bankr("bank3"); - map(0x14000, 0x1bfff).w(this, FUNC(pengadvb_state::megarom_bank_w)); + map(0x14000, 0x1bfff).w(FUNC(pengadvb_state::megarom_bank_w)); // slot 3, 16KB RAM map(0x3c000, 0x3ffff).ram(); @@ -126,8 +126,8 @@ void pengadvb_state::io_mem(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x98, 0x98).rw("tms9128", FUNC(tms9128_device::vram_read), FUNC(tms9128_device::vram_write)); - map(0x99, 0x99).rw("tms9128", FUNC(tms9128_device::register_read), FUNC(tms9128_device::register_write)); + map(0x98, 0x98).rw("tms9128", FUNC(tms9128_device::vram_r), FUNC(tms9128_device::vram_w)); + map(0x99, 0x99).rw("tms9128", FUNC(tms9128_device::register_r), FUNC(tms9128_device::register_w)); map(0xa0, 0xa1).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xa2, 0xa2).r("aysnd", FUNC(ay8910_device::data_r)); map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp index a85dc5d6200..12c5cb9d6d9 100644 --- a/src/mame/drivers/pengo.cpp +++ b/src/mame/drivers/pengo.cpp @@ -142,8 +142,8 @@ WRITE_LINE_MEMBER(pengo_state::irq_mask_w) void pengo_state::pengo_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(pengo_state::pacman_videoram_w)).share("videoram"); /* video and color RAM, scratchpad RAM, sprite codes */ - map(0x8400, 0x87ff).ram().w(this, FUNC(pengo_state::pacman_colorram_w)).share("colorram"); + map(0x8000, 0x83ff).ram().w(FUNC(pengo_state::pacman_videoram_w)).share("videoram"); /* video and color RAM, scratchpad RAM, sprite codes */ + map(0x8400, 0x87ff).ram().w(FUNC(pengo_state::pacman_colorram_w)).share("colorram"); map(0x8800, 0x8fef).ram().share("mainram"); map(0x8ff0, 0x8fff).ram().share("spriteram"); map(0x9000, 0x901f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); @@ -168,12 +168,12 @@ void pengo_state::decrypted_opcodes_map(address_map &map) void pengo_state::jrpacmbl_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(this, FUNC(pengo_state::jrpacman_videoram_w)).share("videoram"); + map(0x8000, 0x87ff).ram().w(FUNC(pengo_state::jrpacman_videoram_w)).share("videoram"); map(0x8800, 0x8fef).ram(); map(0x8ff0, 0x8fff).ram().share("spriteram"); map(0x9000, 0x901f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); map(0x9020, 0x902f).writeonly().share("spriteram2"); - map(0x9030, 0x9030).w(this, FUNC(pengo_state::jrpacman_scroll_w)); + map(0x9030, 0x9030).w(FUNC(pengo_state::jrpacman_scroll_w)); map(0x9040, 0x904f).portr("DSW"); map(0x9040, 0x9047).w("latch", FUNC(ls259_device::write_d0)); map(0x9070, 0x9070).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp index 954aedf9d3c..91d16681e9a 100644 --- a/src/mame/drivers/pentagon.cpp +++ b/src/mame/drivers/pentagon.cpp @@ -192,12 +192,12 @@ void pentagon_state::pentagon_mem(address_map &map) void pentagon_state::pentagon_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x0000).w(this, FUNC(pentagon_state::pentagon_port_7ffd_w)).mirror(0x7ffd); // (A15 | A1) == 0 + map(0x0000, 0x0000).w(FUNC(pentagon_state::pentagon_port_7ffd_w)).mirror(0x7ffd); // (A15 | A1) == 0 map(0x001f, 0x001f).rw(m_beta, FUNC(beta_disk_device::status_r), FUNC(beta_disk_device::command_w)).mirror(0xff00); map(0x003f, 0x003f).rw(m_beta, FUNC(beta_disk_device::track_r), FUNC(beta_disk_device::track_w)).mirror(0xff00); map(0x005f, 0x005f).rw(m_beta, FUNC(beta_disk_device::sector_r), FUNC(beta_disk_device::sector_w)).mirror(0xff00); map(0x007f, 0x007f).rw(m_beta, FUNC(beta_disk_device::data_r), FUNC(beta_disk_device::data_w)).mirror(0xff00); - map(0x00fe, 0x00fe).rw(this, FUNC(pentagon_state::spectrum_port_fe_r), FUNC(pentagon_state::spectrum_port_fe_w)).select(0xff00); + map(0x00fe, 0x00fe).rw(FUNC(pentagon_state::spectrum_port_fe_r), FUNC(pentagon_state::spectrum_port_fe_w)).select(0xff00); map(0x00ff, 0x00ff).rw(m_beta, FUNC(beta_disk_device::state_r), FUNC(beta_disk_device::param_w)).mirror(0xff00); map(0x8000, 0x8000).w("ay8912", FUNC(ay8910_device::data_w)).mirror(0x3ffd); map(0xc000, 0xc000).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)).mirror(0x3ffd); @@ -205,9 +205,9 @@ void pentagon_state::pentagon_io(address_map &map) void pentagon_state::pentagon_switch(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(pentagon_state::beta_neutral_r)); // Overlap with next because we want real addresses on the 3e00-3fff range - map(0x3d00, 0x3dff).r(this, FUNC(pentagon_state::beta_enable_r)); - map(0x4000, 0xffff).r(this, FUNC(pentagon_state::beta_disable_r)); + map(0x0000, 0x3fff).r(FUNC(pentagon_state::beta_neutral_r)); // Overlap with next because we want real addresses on the 3e00-3fff range + map(0x3d00, 0x3dff).r(FUNC(pentagon_state::beta_enable_r)); + map(0x4000, 0xffff).r(FUNC(pentagon_state::beta_disable_r)); } MACHINE_RESET_MEMBER(pentagon_state,pentagon) diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index c689ebf423e..b5f86067ac9 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -196,7 +196,7 @@ void peoplepc_state::peoplepc_map(address_map &map) map(0x00000, 0x7ffff).ram(); map(0xc0000, 0xdffff).ram().share("gvram"); map(0xe0000, 0xe3fff).ram().share("cvram"); - map(0xe4000, 0xe5fff).w(this, FUNC(peoplepc_state::charram_w)); + map(0xe4000, 0xe5fff).w(FUNC(peoplepc_state::charram_w)); map(0xfe000, 0xfffff).rom().region("maincpu", 0); } @@ -215,7 +215,7 @@ void peoplepc_state::peoplepc_io(address_map &map) map(0x0064, 0x0067).m(m_fdc, FUNC(upd765a_device::map)).umask16(0x00ff); map(0x006c, 0x006c).w("h46505", FUNC(mc6845_device::address_w)); map(0x006e, 0x006e).rw("h46505", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x0070, 0x0070).w(this, FUNC(peoplepc_state::dmapg_w)); + map(0x0070, 0x0070).w(FUNC(peoplepc_state::dmapg_w)); } static void peoplepc_floppies(device_slot_interface &device) diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index f80cc85f106..1ec62cd02c8 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -1019,13 +1019,13 @@ void peplus_state::peplus_map(address_map &map) void peplus_state::peplus_iomap(address_map &map) { // Battery-backed RAM (0x1000-0x01fff Extended RAM for Superboards Only) - map(0x0000, 0x1fff).ram().w(this, FUNC(peplus_state::peplus_cmos_w)).share("cmos"); + map(0x0000, 0x1fff).ram().w(FUNC(peplus_state::peplus_cmos_w)).share("cmos"); // CRT Controller - map(0x2008, 0x2008).w(this, FUNC(peplus_state::peplus_crtc_mode_w)); + map(0x2008, 0x2008).w(FUNC(peplus_state::peplus_crtc_mode_w)); map(0x2080, 0x2080).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x2081, 0x2081).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x2083, 0x2083).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(peplus_state::peplus_crtc_display_w)); + map(0x2083, 0x2083).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(peplus_state::peplus_crtc_display_w)); // Superboard Data map(0x3000, 0x3fff).ram().share("s3000_ram"); @@ -1038,7 +1038,7 @@ void peplus_state::peplus_iomap(address_map &map) map(0x5000, 0x5fff).ram().share("s5000_ram"); // Background Color Latch - map(0x6000, 0x6000).r(this, FUNC(peplus_state::peplus_bgcolor_r)).w(this, FUNC(peplus_state::peplus_bgcolor_w)); + map(0x6000, 0x6000).r(FUNC(peplus_state::peplus_bgcolor_r)).w(FUNC(peplus_state::peplus_bgcolor_w)); // Bogus Location for Video RAM map(0x06001, 0x06400).ram().share("videoram"); @@ -1047,25 +1047,25 @@ void peplus_state::peplus_iomap(address_map &map) map(0x7000, 0x7fff).ram().share("s7000_ram"); // Input Bank A, Output Bank C - map(0x8000, 0x8000).r(this, FUNC(peplus_state::peplus_input_bank_a_r)).w(this, FUNC(peplus_state::peplus_output_bank_c_w)); + map(0x8000, 0x8000).r(FUNC(peplus_state::peplus_input_bank_a_r)).w(FUNC(peplus_state::peplus_output_bank_c_w)); // Drop Door, I2C EEPROM Writes - map(0x9000, 0x9000).r(this, FUNC(peplus_state::peplus_dropdoor_r)).w(this, FUNC(peplus_state::i2c_nvram_w)); + map(0x9000, 0x9000).r(FUNC(peplus_state::peplus_dropdoor_r)).w(FUNC(peplus_state::i2c_nvram_w)); // Input Banks B & C, Output Bank B - map(0xa000, 0xa000).r(this, FUNC(peplus_state::peplus_input0_r)).w(this, FUNC(peplus_state::peplus_output_bank_b_w)); + map(0xa000, 0xa000).r(FUNC(peplus_state::peplus_input0_r)).w(FUNC(peplus_state::peplus_output_bank_b_w)); // Superboard Data map(0xb000, 0xbfff).ram().share("sb000_ram"); // Output Bank A - map(0xc000, 0xc000).r(this, FUNC(peplus_state::peplus_watchdog_r)).w(this, FUNC(peplus_state::peplus_output_bank_a_w)); + map(0xc000, 0xc000).r(FUNC(peplus_state::peplus_watchdog_r)).w(FUNC(peplus_state::peplus_output_bank_a_w)); // Superboard Data map(0xd000, 0xdfff).ram().share("sd000_ram"); // DUART - map(0xe000, 0xe00f).rw(this, FUNC(peplus_state::peplus_duart_r), FUNC(peplus_state::peplus_duart_w)); + map(0xe000, 0xe00f).rw(FUNC(peplus_state::peplus_duart_r), FUNC(peplus_state::peplus_duart_w)); // Superboard Data map(0xf000, 0xffff).ram().share("sf000_ram"); diff --git a/src/mame/drivers/pes.cpp b/src/mame/drivers/pes.cpp index 59f3229a7e3..e8e2f87d666 100644 --- a/src/mame/drivers/pes.cpp +++ b/src/mame/drivers/pes.cpp @@ -233,9 +233,9 @@ void pes_state::i80c31_mem(address_map &map) void pes_state::i80c31_io(address_map &map) { map.global_mask(0xff); - map(0x0, 0x0).w(this, FUNC(pes_state::rsq_wsq_w)); /* /WS(0) and /RS(1) */ - map(0x1, 0x1).rw(this, FUNC(pes_state::port1_r), FUNC(pes_state::port1_w)); /* tms5220 reads and writes */ - map(0x3, 0x3).rw(this, FUNC(pes_state::port3_r), FUNC(pes_state::port3_w)); /* writes and reads from port 3, see top of file */ + map(0x0, 0x0).w(FUNC(pes_state::rsq_wsq_w)); /* /WS(0) and /RS(1) */ + map(0x1, 0x1).rw(FUNC(pes_state::port1_r), FUNC(pes_state::port1_w)); /* tms5220 reads and writes */ + map(0x3, 0x3).rw(FUNC(pes_state::port3_r), FUNC(pes_state::port3_w)); /* writes and reads from port 3, see top of file */ } /****************************************************************************** diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 1ecb1e21e05..09451a4b6a2 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -886,7 +886,7 @@ WRITE8_MEMBER( cbm8296_state::write ) void pet_state::pet2001_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(pet_state::read), FUNC(pet_state::write)); + map(0x0000, 0xffff).rw(FUNC(pet_state::read), FUNC(pet_state::write)); } @@ -896,7 +896,7 @@ void pet_state::pet2001_mem(address_map &map) void cbm8296_state::cbm8296_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(cbm8296_state::read), FUNC(cbm8296_state::write)); + map(0x0000, 0xffff).rw(FUNC(cbm8296_state::read), FUNC(cbm8296_state::write)); } diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp index 92905244bad..e0626024c9a 100644 --- a/src/mame/drivers/peyper.cpp +++ b/src/mame/drivers/peyper.cpp @@ -223,12 +223,12 @@ void peyper_state::peyper_io(address_map &map) map(0x08, 0x08).w("ay2", FUNC(ay8910_device::address_w)); map(0x09, 0x09).r("ay2", FUNC(ay8910_device::data_r)); // never actually read? map(0x0a, 0x0a).w("ay2", FUNC(ay8910_device::data_w)); - map(0x0c, 0x0c).w(this, FUNC(peyper_state::sol_w)); - map(0x10, 0x18).w(this, FUNC(peyper_state::lamp_w)); + map(0x0c, 0x0c).w(FUNC(peyper_state::sol_w)); + map(0x10, 0x18).w(FUNC(peyper_state::lamp_w)); map(0x20, 0x20).portr("DSW0"); map(0x24, 0x24).portr("DSW1"); map(0x28, 0x28).portr("SYSTEM"); - map(0x2c, 0x2c).w(this, FUNC(peyper_state::lamp7_w)); + map(0x2c, 0x2c).w(FUNC(peyper_state::lamp7_w)); } static INPUT_PORTS_START( pbsonic_generic ) diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp index b13e298133f..31d373103a7 100644 --- a/src/mame/drivers/pg685.cpp +++ b/src/mame/drivers/pg685.cpp @@ -163,18 +163,18 @@ void pg685_state::pg675_mem(address_map &map) map(0xf9f00, 0xf9f01).rw("kbdc", FUNC(i8279_device::read), FUNC(i8279_device::write)); map(0xf9f02, 0xf9f02).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0xf9f03, 0xf9f03).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0xf9f04, 0xf9f04).rw(this, FUNC(pg685_state::f9f04_r), FUNC(pg685_state::f9f04_w)); + map(0xf9f04, 0xf9f04).rw(FUNC(pg685_state::f9f04_r), FUNC(pg685_state::f9f04_w)); map(0xf9f06, 0xf9f07).rw("mainpic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xf9f08, 0xf9f08).rw("mainuart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xf9f09, 0xf9f09).rw("mainuart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xf9f20, 0xf9f23).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); - map(0xf9f24, 0xf9f24).rw(this, FUNC(pg685_state::f9f24_r), FUNC(pg685_state::f9f24_w)); + map(0xf9f24, 0xf9f24).rw(FUNC(pg685_state::f9f24_r), FUNC(pg685_state::f9f24_w)); map(0xf9f28, 0xf9f2b).rw("modppi1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf9f2c, 0xf9f2f).rw("modppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf9f30, 0xf9f30).rw("moduart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xf9f31, 0xf9f31).rw("moduart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0xf9f32, 0xf9f32).w(this, FUNC(pg685_state::f9f32_w)); - map(0xf9f33, 0xf9f33).r(this, FUNC(pg685_state::f9f33_r)); + map(0xf9f32, 0xf9f32).w(FUNC(pg685_state::f9f32_w)); + map(0xf9f33, 0xf9f33).r(FUNC(pg685_state::f9f33_r)); map(0xf9f40, 0xf9f5f).rw("rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)); map(0xfa000, 0xfa7ff).ram().share("charcopy"); map(0xfb000, 0xfb7ff).ram().share("framebuffer"); @@ -188,10 +188,10 @@ void pg685_state::pg685_mem(address_map &map) map(0xf9f34, 0xf9f37).rw("bppit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0xf9f38, 0xf9f3b).rw("bpuart", FUNC(mc2661_device::read), FUNC(mc2661_device::write)); map(0xf9f3c, 0xf9f3d).rw("bppic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0xf9f3e, 0xf9f3e).w(this, FUNC(pg685_state::f9f3e_w)); + map(0xf9f3e, 0xf9f3e).w(FUNC(pg685_state::f9f3e_w)); map(0xf9f70, 0xf9f77).rw("hdc", FUNC(wd2010_device::read), FUNC(wd2010_device::write)); - map(0xf9f78, 0xf9f78).rw(this, FUNC(pg685_state::f9f78_r), FUNC(pg685_state::f9f78_w)); - map(0xf9f79, 0xf9f79).w(this, FUNC(pg685_state::f9f79_w)); + map(0xf9f78, 0xf9f78).rw(FUNC(pg685_state::f9f78_r), FUNC(pg685_state::f9f78_w)); + map(0xf9f79, 0xf9f79).w(FUNC(pg685_state::f9f79_w)); } void pg685_state::pg685oua12_mem(address_map &map) @@ -201,27 +201,27 @@ void pg685_state::pg685oua12_mem(address_map &map) map(0xe0000, 0xeffff).ram().share("framebuffer16"); map(0xf0000, 0xf1fff).ram(); map(0xf9f00, 0xf9f01).rw("kbdc", FUNC(i8279_device::read), FUNC(i8279_device::write)); - map(0xf9f04, 0xf9f04).rw(this, FUNC(pg685_state::f9f04_r), FUNC(pg685_state::f9f04_w)); + map(0xf9f04, 0xf9f04).rw(FUNC(pg685_state::f9f04_r), FUNC(pg685_state::f9f04_w)); map(0xf9f06, 0xf9f07).rw("mainpic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xf9f08, 0xf9f08).rw("mainuart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xf9f09, 0xf9f09).rw("mainuart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xf9f20, 0xf9f23).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); - map(0xf9f24, 0xf9f24).rw(this, FUNC(pg685_state::f9f24_r), FUNC(pg685_state::f9f24_w)); + map(0xf9f24, 0xf9f24).rw(FUNC(pg685_state::f9f24_r), FUNC(pg685_state::f9f24_w)); map(0xf9f28, 0xf9f2b).rw("modppi1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf9f2c, 0xf9f2f).rw("modppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf9f30, 0xf9f30).rw("moduart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xf9f31, 0xf9f31).rw("moduart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0xf9f32, 0xf9f32).w(this, FUNC(pg685_state::f9f32_w)); - map(0xf9f33, 0xf9f33).r(this, FUNC(pg685_state::f9f33_r)); + map(0xf9f32, 0xf9f32).w(FUNC(pg685_state::f9f32_w)); + map(0xf9f33, 0xf9f33).r(FUNC(pg685_state::f9f33_r)); map(0xf9f34, 0xf9f37).rw("bppit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0xf9f38, 0xf9f3b).rw("bpuart", FUNC(mc2661_device::read), FUNC(mc2661_device::write)); map(0xf9f3c, 0xf9f3d).rw("bppic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0xf9f3e, 0xf9f3e).w(this, FUNC(pg685_state::f9f3e_w)); - map(0xf9f3f, 0xf9f3f).r(this, FUNC(pg685_state::f9f3f_r)); + map(0xf9f3e, 0xf9f3e).w(FUNC(pg685_state::f9f3e_w)); + map(0xf9f3f, 0xf9f3f).r(FUNC(pg685_state::f9f3f_r)); map(0xf9f40, 0xf9f5f).rw("rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)); map(0xf9f70, 0xf9f77).rw("hdc", FUNC(wd2010_device::read), FUNC(wd2010_device::write)); - map(0xf9f78, 0xf9f78).rw(this, FUNC(pg685_state::f9f78_r), FUNC(pg685_state::f9f78_w)); - map(0xf9f79, 0xf9f79).w(this, FUNC(pg685_state::f9f79_w)); + map(0xf9f78, 0xf9f78).rw(FUNC(pg685_state::f9f78_r), FUNC(pg685_state::f9f78_w)); + map(0xf9f79, 0xf9f79).w(FUNC(pg685_state::f9f79_w)); map(0xf9f80, 0xf9f80).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0xf9f81, 0xf9f81).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0xfc000, 0xfffff).ram(); // BIOS RAM shadow diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index 1ae6aecb253..2397f1dd222 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -307,7 +307,7 @@ void pgm_state::pgm_z80_mem(address_map &map) void pgm_state::pgm_z80_io(address_map &map) { map(0x8000, 0x8003).rw("ics", FUNC(ics2115_device::read), FUNC(ics2115_device::write)); - map(0x8100, 0x81ff).r(m_soundlatch3, FUNC(generic_latch_8_device::read)).w(this, FUNC(pgm_state::z80_l3_w)); + map(0x8100, 0x81ff).r(m_soundlatch3, FUNC(generic_latch_8_device::read)).w(FUNC(pgm_state::z80_l3_w)); map(0x8200, 0x82ff).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write)); map(0x8400, 0x84ff).rw("soundlatch2", FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write)); } @@ -320,24 +320,24 @@ void pgm_state::pgm_base_mem(address_map &map) map(0x800000, 0x81ffff).ram().mirror(0x0e0000).share("sram"); /* Main Ram */ - map(0x900000, 0x907fff).mirror(0x0f8000).rw(this, FUNC(pgm_state::pgm_videoram_r), FUNC(pgm_state::pgm_videoram_w)).share("videoram"); /* IGS023 VIDEO CHIP */ + map(0x900000, 0x907fff).mirror(0x0f8000).rw(FUNC(pgm_state::pgm_videoram_r), FUNC(pgm_state::pgm_videoram_w)).share("videoram"); /* IGS023 VIDEO CHIP */ map(0xa00000, 0xa011ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xb00000, 0xb0ffff).ram().share("videoregs"); /* Video Regs inc. Zoom Table */ map(0xc00003, 0xc00003).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xc00002, 0xc00003).w(this, FUNC(pgm_state::m68k_l1_w)); + map(0xc00002, 0xc00003).w(FUNC(pgm_state::m68k_l1_w)); map(0xc00005, 0xc00005).rw("soundlatch2", FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write)); map(0xc00007, 0xc00007).rw("rtc", FUNC(v3021_device::read), FUNC(v3021_device::write)); - map(0xc00008, 0xc00009).w(this, FUNC(pgm_state::z80_reset_w)); - map(0xc0000a, 0xc0000b).w(this, FUNC(pgm_state::z80_ctrl_w)); + map(0xc00008, 0xc00009).w(FUNC(pgm_state::z80_reset_w)); + map(0xc0000a, 0xc0000b).w(FUNC(pgm_state::z80_ctrl_w)); map(0xc0000d, 0xc0000d).rw(m_soundlatch3, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write)); map(0xc08000, 0xc08001).portr("P1P2"); map(0xc08002, 0xc08003).portr("P3P4"); map(0xc08004, 0xc08005).portr("Service"); - map(0xc08006, 0xc08007).portr("DSW").w(this, FUNC(pgm_state::pgm_coin_counter_w)); + map(0xc08006, 0xc08007).portr("DSW").w(FUNC(pgm_state::pgm_coin_counter_w)); - map(0xc10000, 0xc1ffff).rw(this, FUNC(pgm_state::z80_ram_r), FUNC(pgm_state::z80_ram_w)); /* Z80 Program */ + map(0xc10000, 0xc1ffff).rw(FUNC(pgm_state::z80_ram_r), FUNC(pgm_state::z80_ram_w)); /* Z80 Program */ } void pgm_state::pgm_mem(address_map &map) diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp index 344f9c40f10..bef6200e211 100644 --- a/src/mame/drivers/pgm2.cpp +++ b/src/mame/drivers/pgm2.cpp @@ -519,7 +519,7 @@ void pgm2_state::pgm2_map(address_map &map) map(0x02000000, 0x0200ffff).ram().share("sram"); // 'battery ram' (in CPU?) - map(0x03600000, 0x036bffff).rw(this, FUNC(pgm2_state::mcu_r), FUNC(pgm2_state::mcu_w)); + map(0x03600000, 0x036bffff).rw(FUNC(pgm2_state::mcu_r), FUNC(pgm2_state::mcu_w)); map(0x03900000, 0x03900003).portr("INPUTS0"); map(0x03a00000, 0x03a00003).portr("INPUTS1"); @@ -528,8 +528,8 @@ void pgm2_state::pgm2_map(address_map &map) map(0x30000000, 0x30001fff).ram().share("sp_videoram"); // spriteram ('move' ram in test mode) - map(0x30020000, 0x30021fff).ram().w(this, FUNC(pgm2_state::bg_videoram_w)).share("bg_videoram"); - map(0x30040000, 0x30045fff).ram().w(this, FUNC(pgm2_state::fg_videoram_w)).share("fg_videoram"); + map(0x30020000, 0x30021fff).ram().w(FUNC(pgm2_state::bg_videoram_w)).share("bg_videoram"); + map(0x30040000, 0x30045fff).ram().w(FUNC(pgm2_state::fg_videoram_w)).share("fg_videoram"); map(0x30060000, 0x30063fff).ram().w(m_sp_palette, FUNC(palette_device::write32)).share("sp_palette"); @@ -545,15 +545,15 @@ void pgm2_state::pgm2_map(address_map &map) what is the real size? */ map(0x300e0000, 0x300e03ff).ram().share("lineram").mirror(0x000fc00); - map(0x30100000, 0x301000ff).rw(this, FUNC(pgm2_state::shareram_r), FUNC(pgm2_state::shareram_w)).umask32(0x00ff00ff); + map(0x30100000, 0x301000ff).rw(FUNC(pgm2_state::shareram_r), FUNC(pgm2_state::shareram_w)).umask32(0x00ff00ff); map(0x30120000, 0x30120003).ram().share("bgscroll"); // scroll map(0x30120008, 0x3012000b).ram().share("fgscroll"); map(0x3012000c, 0x3012000f).ram().share("vidmode"); - map(0x30120014, 0x30120017).w(this, FUNC(pgm2_state::unk30120014_w)); - map(0x30120018, 0x30120019).w(this, FUNC(pgm2_state::vbl_ack_w)); - map(0x30120032, 0x30120033).w(this, FUNC(pgm2_state::share_bank_w)); - map(0x30120038, 0x3012003b).w(this, FUNC(pgm2_state::sprite_encryption_w)); + map(0x30120014, 0x30120017).w(FUNC(pgm2_state::unk30120014_w)); + map(0x30120018, 0x30120019).w(FUNC(pgm2_state::vbl_ack_w)); + map(0x30120032, 0x30120033).w(FUNC(pgm2_state::share_bank_w)); + map(0x30120038, 0x3012003b).w(FUNC(pgm2_state::sprite_encryption_w)); // there are other 0x301200xx regs map(0x40000000, 0x40000003).r("ymz774", FUNC(ymz774_device::read)).w("ymz774", FUNC(ymz774_device::write)); @@ -568,12 +568,12 @@ void pgm2_state::pgm2_map(address_map &map) map(0xfffff430, 0xfffff437).nopw(); // often // AM_RANGE(0xfffffd00, 0xfffffd0b) RSTC (Reset Controller) // AM_RANGE(0xfffffd20, 0xfffffd2f) RTTC (Real Time Timer) - map(0xfffffd28, 0xfffffd2b).r(this, FUNC(pgm2_state::rtc_r)); + map(0xfffffd28, 0xfffffd2b).r(FUNC(pgm2_state::rtc_r)); // AM_RANGE(0xfffffd40, 0xfffffd4b) WDTC (Watch Dog Timer) // custom IGS036 stuff starts here - map(0xfffffa08, 0xfffffa0b).w(this, FUNC(pgm2_state::encryption_do_w)); // after uploading encryption? table might actually send it or enable external ROM? when read bits0-1 called FUSE 0 and 1, must be 0 - map(0xfffffa0c, 0xfffffa0f).r(this, FUNC(pgm2_state::unk_startup_r)); // written 0, then 0x1c, then expected to return (result&0x180)==0x180, then written 0x7c - map(0xfffffc00, 0xfffffcff).rw(this, FUNC(pgm2_state::encryption_r), FUNC(pgm2_state::encryption_w)); + map(0xfffffa08, 0xfffffa0b).w(FUNC(pgm2_state::encryption_do_w)); // after uploading encryption? table might actually send it or enable external ROM? when read bits0-1 called FUSE 0 and 1, must be 0 + map(0xfffffa0c, 0xfffffa0f).r(FUNC(pgm2_state::unk_startup_r)); // written 0, then 0x1c, then expected to return (result&0x180)==0x180, then written 0x7c + map(0xfffffc00, 0xfffffcff).rw(FUNC(pgm2_state::encryption_r), FUNC(pgm2_state::encryption_w)); } @@ -593,11 +593,11 @@ void pgm2_state::pgm2_ram_rom_map(address_map &map) void pgm2_state::pgm2_module_rom_map(address_map &map) { pgm2_rom_map(map); - map(0x10000000, 0x107fffff).w(this, FUNC(pgm2_state::module_rom_w)); - map(0x10000000, 0x1000000f).r(this, FUNC(pgm2_state::module_rom_r)); - map(0xfffff430, 0xfffff433).w(this, FUNC(pgm2_state::pio_sodr_w)); - map(0xfffff434, 0xfffff437).w(this, FUNC(pgm2_state::pio_codr_w)); - map(0xfffff43c, 0xfffff43f).r(this, FUNC(pgm2_state::pio_pdsr_r)); + map(0x10000000, 0x107fffff).w(FUNC(pgm2_state::module_rom_w)); + map(0x10000000, 0x1000000f).r(FUNC(pgm2_state::module_rom_r)); + map(0xfffff430, 0xfffff433).w(FUNC(pgm2_state::pio_sodr_w)); + map(0xfffff434, 0xfffff437).w(FUNC(pgm2_state::pio_codr_w)); + map(0xfffff43c, 0xfffff43f).r(FUNC(pgm2_state::pio_pdsr_r)); } static INPUT_PORTS_START( pgm2 ) diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp index d77731229e7..d80319ba5e4 100644 --- a/src/mame/drivers/phc25.cpp +++ b/src/mame/drivers/phc25.cpp @@ -131,8 +131,8 @@ void phc25_state::phc25_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x40, 0x40).rw(this, FUNC(phc25_state::port40_r), FUNC(phc25_state::port40_w)); + map(0x00, 0x00).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x40, 0x40).rw(FUNC(phc25_state::port40_r), FUNC(phc25_state::port40_w)); map(0x80, 0x80).portr("KEY0"); map(0x81, 0x81).portr("KEY1"); map(0x82, 0x82).portr("KEY2"); diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp index 242166bd3b2..1ab376031f0 100644 --- a/src/mame/drivers/phoenix.cpp +++ b/src/mame/drivers/phoenix.cpp @@ -60,9 +60,9 @@ Pleiads: void phoenix_state::phoenix_memory_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x4fff).bankr("bank1").w(this, FUNC(phoenix_state::phoenix_videoram_w)); /* 2 pages selected by bit 0 of the video register */ - map(0x5000, 0x53ff).w(this, FUNC(phoenix_state::phoenix_videoreg_w)); - map(0x5800, 0x5bff).w(this, FUNC(phoenix_state::phoenix_scroll_w)); + map(0x4000, 0x4fff).bankr("bank1").w(FUNC(phoenix_state::phoenix_videoram_w)); /* 2 pages selected by bit 0 of the video register */ + map(0x5000, 0x53ff).w(FUNC(phoenix_state::phoenix_videoreg_w)); + map(0x5800, 0x5bff).w(FUNC(phoenix_state::phoenix_scroll_w)); map(0x6000, 0x63ff).w("cust", FUNC(phoenix_sound_device::control_a_w)); map(0x6800, 0x6bff).w("cust", FUNC(phoenix_sound_device::control_b_w)); map(0x7000, 0x73ff).portr("IN0"); /* IN0 or IN1 */ @@ -72,9 +72,9 @@ void phoenix_state::phoenix_memory_map(address_map &map) void phoenix_state::pleiads_memory_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x4fff).bankr("bank1").w(this, FUNC(phoenix_state::phoenix_videoram_w)); /* 2 pages selected by bit 0 of the video register */ - map(0x5000, 0x53ff).w(this, FUNC(phoenix_state::pleiads_videoreg_w)); - map(0x5800, 0x5bff).w(this, FUNC(phoenix_state::phoenix_scroll_w)); + map(0x4000, 0x4fff).bankr("bank1").w(FUNC(phoenix_state::phoenix_videoram_w)); /* 2 pages selected by bit 0 of the video register */ + map(0x5000, 0x53ff).w(FUNC(phoenix_state::pleiads_videoreg_w)); + map(0x5800, 0x5bff).w(FUNC(phoenix_state::phoenix_scroll_w)); map(0x6000, 0x63ff).w(m_pleiads_custom, FUNC(pleiads_sound_device::control_a_w)); map(0x6800, 0x6bff).w(m_pleiads_custom, FUNC(pleiads_sound_device::control_b_w)); map(0x7000, 0x73ff).portr("IN0"); /* IN0 or IN1 + protection */ @@ -84,12 +84,12 @@ void phoenix_state::pleiads_memory_map(address_map &map) void phoenix_state::survival_memory_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x4fff).bankr("bank1").w(this, FUNC(phoenix_state::phoenix_videoram_w)); /* 2 pages selected by bit 0 of the video register */ - map(0x5000, 0x53ff).w(this, FUNC(phoenix_state::phoenix_videoreg_w)); - map(0x5800, 0x5bff).w(this, FUNC(phoenix_state::phoenix_scroll_w)); + map(0x4000, 0x4fff).bankr("bank1").w(FUNC(phoenix_state::phoenix_videoram_w)); /* 2 pages selected by bit 0 of the video register */ + map(0x5000, 0x53ff).w(FUNC(phoenix_state::phoenix_videoreg_w)); + map(0x5800, 0x5bff).w(FUNC(phoenix_state::phoenix_scroll_w)); map(0x6800, 0x68ff).w("aysnd", FUNC(ay8910_device::address_w)); map(0x6900, 0x69ff).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0x7000, 0x73ff).r(this, FUNC(phoenix_state::survival_input_port_0_r)); /* IN0 or IN1 */ + map(0x7000, 0x73ff).r(FUNC(phoenix_state::survival_input_port_0_r)); /* IN0 or IN1 */ map(0x7800, 0x7bff).portr("DSW0"); /* DSW */ } diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp index d490ed2b673..4d1903b2f3d 100644 --- a/src/mame/drivers/photon.cpp +++ b/src/mame/drivers/photon.cpp @@ -142,14 +142,14 @@ void photon_state::pk8000_io(address_map &map) map.unmap_value_high(); map(0x80, 0x83).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x84, 0x87).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x88, 0x88).rw(this, FUNC(photon_state::video_color_r), FUNC(photon_state::video_color_w)); + map(0x88, 0x88).rw(FUNC(photon_state::video_color_r), FUNC(photon_state::video_color_w)); map(0x8c, 0x8c).portr("JOY1"); map(0x8d, 0x8d).portr("JOY2"); - map(0x90, 0x90).rw(this, FUNC(photon_state::text_start_r), FUNC(photon_state::text_start_w)); - map(0x91, 0x91).rw(this, FUNC(photon_state::chargen_start_r), FUNC(photon_state::chargen_start_w)); - map(0x92, 0x92).rw(this, FUNC(photon_state::video_start_r), FUNC(photon_state::video_start_w)); - map(0x93, 0x93).rw(this, FUNC(photon_state::color_start_r), FUNC(photon_state::color_start_w)); - map(0xa0, 0xbf).rw(this, FUNC(photon_state::color_r), FUNC(photon_state::color_w)); + map(0x90, 0x90).rw(FUNC(photon_state::text_start_r), FUNC(photon_state::text_start_w)); + map(0x91, 0x91).rw(FUNC(photon_state::chargen_start_r), FUNC(photon_state::chargen_start_w)); + map(0x92, 0x92).rw(FUNC(photon_state::video_start_r), FUNC(photon_state::video_start_w)); + map(0x93, 0x93).rw(FUNC(photon_state::color_start_r), FUNC(photon_state::color_start_w)); + map(0xa0, 0xbf).rw(FUNC(photon_state::color_r), FUNC(photon_state::color_w)); } static INPUT_PORTS_START( photon ) diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp index 71ea701d102..086e3c58cc6 100644 --- a/src/mame/drivers/photon2.cpp +++ b/src/mame/drivers/photon2.cpp @@ -269,11 +269,11 @@ void photon2_state::spectrum_io(address_map &map) { map.global_mask(0xff); map(0x1f, 0x1f).portr("JOY"); - map(0x5b, 0x5b).portr("COIN").w(this, FUNC(photon2_state::misc_w)); - map(0x7a, 0x7a).w(this, FUNC(photon2_state::membank_w)); + map(0x5b, 0x5b).portr("COIN").w(FUNC(photon2_state::misc_w)); + map(0x7a, 0x7a).w(FUNC(photon2_state::membank_w)); map(0x7b, 0x7b).nopw(); // unknown write - map(0x7e, 0x7e).w(this, FUNC(photon2_state::membank_w)); - map(0xfe, 0xfe).rw(this, FUNC(photon2_state::fe_r), FUNC(photon2_state::fe_w)); + map(0x7e, 0x7e).w(FUNC(photon2_state::membank_w)); + map(0xfe, 0xfe).rw(FUNC(photon2_state::fe_r), FUNC(photon2_state::fe_w)); } /************************************* diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp index fd8e1793dda..7e6d8386c82 100644 --- a/src/mame/drivers/photoply.cpp +++ b/src/mame/drivers/photoply.cpp @@ -196,7 +196,7 @@ void photoply_state::photoply_map(address_map &map) map(0x000a0000, 0x000bffff).rw("vga", FUNC(cirrus_gd5446_device::mem_r), FUNC(cirrus_gd5446_device::mem_w)); // AM_RANGE(0x000c0000, 0x000c7fff) AM_RAM AM_REGION("video_bios", 0) // AM_RANGE(0x000c8000, 0x000cffff) AM_RAM AM_REGION("ex_bios", 0) - map(0x000c0000, 0x000fffff).rw(this, FUNC(photoply_state::bios_r), FUNC(photoply_state::bios_w)); + map(0x000c0000, 0x000fffff).rw(FUNC(photoply_state::bios_r), FUNC(photoply_state::bios_w)); map(0x00100000, 0x07ffffff).ram(); // 64MB RAM, guess! map(0xfffe0000, 0xffffffff).rom().region("bios", 0); } @@ -208,17 +208,17 @@ void photoply_state::photoply_io(address_map &map) pcat32_io_common(map); map(0x00e8, 0x00eb).noprw(); - map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x0202, 0x0202).w(this, FUNC(photoply_state::eeprom_w)); + map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x0202, 0x0202).w(FUNC(photoply_state::eeprom_w)); // AM_RANGE(0x0278, 0x027f) AM_RAM //parallel port 2 - map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); + map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); // AM_RANGE(0x0378, 0x037f) AM_RAM //parallel port map(0x03b0, 0x03bf).rw("vga", FUNC(cirrus_gd5446_device::port_03b0_r), FUNC(cirrus_gd5446_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(cirrus_gd5446_device::port_03c0_r), FUNC(cirrus_gd5446_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(cirrus_gd5446_device::port_03d0_r), FUNC(cirrus_gd5446_device::port_03d0_w)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index 20056694e24..40992105348 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -107,8 +107,8 @@ void phunsy_state::phunsy_io(address_map &map) void phunsy_state::phunsy_data(address_map &map) { map.unmap_value_high(); - map(S2650_CTRL_PORT, S2650_CTRL_PORT).w(this, FUNC(phunsy_state::phunsy_ctrl_w)); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(phunsy_state::phunsy_data_r), FUNC(phunsy_state::phunsy_data_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).w(FUNC(phunsy_state::phunsy_ctrl_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(phunsy_state::phunsy_data_r), FUNC(phunsy_state::phunsy_data_w)); } diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp index 2b10854c90c..c66f2ed398e 100644 --- a/src/mame/drivers/pinball2k.cpp +++ b/src/mame/drivers/pinball2k.cpp @@ -482,9 +482,9 @@ void pinball2k_state::mediagx_map(address_map &map) map(0x000b0000, 0x000b7fff).ram().share("cga_ram"); map(0x000c0000, 0x000fffff).ram().share("bios_ram"); map(0x00100000, 0x00ffffff).ram(); - map(0x40008000, 0x400080ff).rw(this, FUNC(pinball2k_state::biu_ctrl_r), FUNC(pinball2k_state::biu_ctrl_w)); - map(0x40008300, 0x400083ff).rw(this, FUNC(pinball2k_state::disp_ctrl_r), FUNC(pinball2k_state::disp_ctrl_w)); - map(0x40008400, 0x400084ff).rw(this, FUNC(pinball2k_state::memory_ctrl_r), FUNC(pinball2k_state::memory_ctrl_w)); + map(0x40008000, 0x400080ff).rw(FUNC(pinball2k_state::biu_ctrl_r), FUNC(pinball2k_state::biu_ctrl_w)); + map(0x40008300, 0x400083ff).rw(FUNC(pinball2k_state::disp_ctrl_r), FUNC(pinball2k_state::disp_ctrl_w)); + map(0x40008400, 0x400084ff).rw(FUNC(pinball2k_state::memory_ctrl_r), FUNC(pinball2k_state::memory_ctrl_w)); map(0x40800000, 0x40bfffff).ram().share("vram"); map(0xfffc0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ } @@ -492,11 +492,11 @@ void pinball2k_state::mediagx_map(address_map &map) void pinball2k_state::mediagx_io(address_map &map) { pcat32_io_common(map); - map(0x0022, 0x0023).rw(this, FUNC(pinball2k_state::io20_r), FUNC(pinball2k_state::io20_w)); + map(0x0022, 0x0023).rw(FUNC(pinball2k_state::io20_r), FUNC(pinball2k_state::io20_w)); map(0x00e8, 0x00eb).noprw(); // I/O delay port - map(0x0378, 0x037b).rw(this, FUNC(pinball2k_state::parallel_port_r), FUNC(pinball2k_state::parallel_port_w)); - map(0x0400, 0x0403).rw(this, FUNC(pinball2k_state::port400_r), FUNC(pinball2k_state::port400_w)); - map(0x0800, 0x0803).rw(this, FUNC(pinball2k_state::port800_r), FUNC(pinball2k_state::port800_w)); + map(0x0378, 0x037b).rw(FUNC(pinball2k_state::parallel_port_r), FUNC(pinball2k_state::parallel_port_w)); + map(0x0400, 0x0403).rw(FUNC(pinball2k_state::port400_r), FUNC(pinball2k_state::port400_w)); + map(0x0800, 0x0803).rw(FUNC(pinball2k_state::port800_r), FUNC(pinball2k_state::port800_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); } diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp index 77e88f34224..e7af317663f 100644 --- a/src/mame/drivers/pingpong.cpp +++ b/src/mame/drivers/pingpong.cpp @@ -92,8 +92,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(pingpong_state::merlinmm_interrupt) void pingpong_state::pingpong_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(pingpong_state::pingpong_colorram_w)).share("colorram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(pingpong_state::pingpong_videoram_w)).share("videoram"); + map(0x8000, 0x83ff).ram().w(FUNC(pingpong_state::pingpong_colorram_w)).share("colorram"); + map(0x8400, 0x87ff).ram().w(FUNC(pingpong_state::pingpong_videoram_w)).share("videoram"); map(0x9000, 0x9002).ram(); map(0x9003, 0x9052).ram().share("spriteram"); map(0x9053, 0x97ff).ram(); @@ -101,9 +101,9 @@ void pingpong_state::pingpong_map(address_map &map) map(0xa880, 0xa880).portr("INPUTS"); map(0xa900, 0xa900).portr("DSW1"); map(0xa980, 0xa980).portr("DSW2"); - map(0xa000, 0xa000).w(this, FUNC(pingpong_state::coin_w)); /* coin counters + irq enables */ + map(0xa000, 0xa000).w(FUNC(pingpong_state::coin_w)); /* coin counters + irq enables */ map(0xa200, 0xa200).nopw(); /* SN76496 data latch */ - map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::write)); /* trigger read */ + map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::command_w)); /* trigger read */ map(0xa600, 0xa600).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } @@ -114,18 +114,18 @@ void pingpong_state::merlinmm_map(address_map &map) map(0x5400, 0x57ff).ram(); map(0x6000, 0x6007).nopw(); /* solenoid writes */ map(0x7000, 0x7000).portr("IN4"); - map(0x8000, 0x83ff).ram().w(this, FUNC(pingpong_state::pingpong_colorram_w)).share("colorram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(pingpong_state::pingpong_videoram_w)).share("videoram"); + map(0x8000, 0x83ff).ram().w(FUNC(pingpong_state::pingpong_colorram_w)).share("colorram"); + map(0x8400, 0x87ff).ram().w(FUNC(pingpong_state::pingpong_videoram_w)).share("videoram"); map(0x9000, 0x9002).ram(); map(0x9003, 0x9052).ram().share("spriteram"); map(0x9053, 0x97ff).ram(); - map(0xa000, 0xa000).w(this, FUNC(pingpong_state::coin_w)); /* irq enables */ + map(0xa000, 0xa000).w(FUNC(pingpong_state::coin_w)); /* irq enables */ map(0xa000, 0xa000).portr("IN0"); map(0xa080, 0xa080).portr("IN1"); map(0xa100, 0xa100).portr("IN2"); map(0xa180, 0xa180).portr("IN3"); map(0xa200, 0xa200).nopw(); /* SN76496 data latch */ - map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::write)); /* trigger read */ + map(0xa400, 0xa400).w("snsnd", FUNC(sn76496_device::command_w)); /* trigger read */ map(0xa600, 0xa600).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp index b53bdf965d4..f9bc14ec271 100644 --- a/src/mame/drivers/pinkiri8.cpp +++ b/src/mame/drivers/pinkiri8.cpp @@ -477,13 +477,13 @@ void pinkiri8_state::pinkiri8_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x3f).ram(); //Z180 internal I/O - map(0x60, 0x60).w(this, FUNC(pinkiri8_state::output_regs_w)); - map(0x80, 0x83).w(this, FUNC(pinkiri8_state::pinkiri8_vram_w)); + map(0x60, 0x60).w(FUNC(pinkiri8_state::output_regs_w)); + map(0x80, 0x83).w(FUNC(pinkiri8_state::pinkiri8_vram_w)); map(0xa0, 0xa0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); //correct? - map(0xb0, 0xb0).w(this, FUNC(pinkiri8_state::mux_w)); //mux - map(0xb0, 0xb0).r(this, FUNC(pinkiri8_state::mux_p2_r)); // mux inputs - map(0xb1, 0xb1).r(this, FUNC(pinkiri8_state::mux_p1_r)); // mux inputs + map(0xb0, 0xb0).w(FUNC(pinkiri8_state::mux_w)); //mux + map(0xb0, 0xb0).r(FUNC(pinkiri8_state::mux_p2_r)); // mux inputs + map(0xb1, 0xb1).r(FUNC(pinkiri8_state::mux_p1_r)); // mux inputs map(0xb2, 0xb2).portr("SYSTEM"); map(0xf8, 0xf8).portr("DSW1"); map(0xf9, 0xf9).portr("DSW2"); diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp index 5109128c436..4f88446c9b9 100644 --- a/src/mame/drivers/pipbug.cpp +++ b/src/mame/drivers/pipbug.cpp @@ -78,7 +78,7 @@ void pipbug_state::pipbug_mem(address_map &map) void pipbug_state::pipbug_data(address_map &map) { // ADDRESS_MAP_UNMAP_HIGH - map(S2650_CTRL_PORT, S2650_CTRL_PORT).w(this, FUNC(pipbug_state::pipbug_ctrl_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).w(FUNC(pipbug_state::pipbug_ctrl_w)); } /* Input ports */ diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp index 9fe9e395da6..7d7e6d51d59 100644 --- a/src/mame/drivers/pipedrm.cpp +++ b/src/mame/drivers/pipedrm.cpp @@ -258,7 +258,7 @@ void pipedrm_state::main_map(address_map &map) map(0x8000, 0x9fff).ram(); map(0xa000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xd000, 0xffff).rw(this, FUNC(pipedrm_state::fromance_videoram_r), FUNC(pipedrm_state::fromance_videoram_w)).share("videoram"); + map(0xd000, 0xffff).rw(FUNC(pipedrm_state::fromance_videoram_r), FUNC(pipedrm_state::fromance_videoram_w)).share("videoram"); } @@ -267,12 +267,12 @@ void pipedrm_state::main_portmap(address_map &map) map.global_mask(0xff); map(0x10, 0x11).w(m_gga, FUNC(vsystem_gga_device::write)); map(0x20, 0x20).portr("P1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x21, 0x21).portr("P2").w(this, FUNC(pipedrm_state::pipedrm_bankswitch_w)); - map(0x22, 0x25).w(this, FUNC(pipedrm_state::fromance_scroll_w)); + map(0x21, 0x21).portr("P2").w(FUNC(pipedrm_state::pipedrm_bankswitch_w)); + map(0x22, 0x25).w(FUNC(pipedrm_state::fromance_scroll_w)); map(0x22, 0x22).portr("DSW1"); map(0x23, 0x23).portr("DSW2"); map(0x24, 0x24).portr("SYSTEM"); - map(0x25, 0x25).r(this, FUNC(pipedrm_state::pending_command_r)); + map(0x25, 0x25).r(FUNC(pipedrm_state::pending_command_r)); } @@ -294,7 +294,7 @@ void pipedrm_state::sound_map(address_map &map) void pipedrm_state::sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x04, 0x04).w(this, FUNC(pipedrm_state::sound_bankswitch_w)); + map(0x04, 0x04).w(FUNC(pipedrm_state::sound_bankswitch_w)); map(0x16, 0x16).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x17, 0x17).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0x18, 0x1b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); @@ -306,7 +306,7 @@ void pipedrm_state::hatris_sound_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x03).mirror(0x08).rw("ymsnd", FUNC(ym2608_device::read), FUNC(ym2608_device::write)); map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x05, 0x05).r(this, FUNC(pipedrm_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); + map(0x05, 0x05).r(FUNC(pipedrm_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); } diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index 27acef0d319..5819abbb92d 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -226,8 +226,8 @@ void pipeline_state::cpu0_mem(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x97ff).ram().w(this, FUNC(pipeline_state::vram1_w)).share("vram1"); - map(0x9800, 0xa7ff).ram().w(this, FUNC(pipeline_state::vram2_w)).share("vram2"); + map(0x8800, 0x97ff).ram().w(FUNC(pipeline_state::vram1_w)).share("vram1"); + map(0x9800, 0xa7ff).ram().w(FUNC(pipeline_state::vram2_w)).share("vram2"); map(0xb800, 0xb803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xb810, 0xb813).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xb830, 0xb830).noprw(); diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp index 53f08d7aa38..93a5a31c029 100644 --- a/src/mame/drivers/pirates.cpp +++ b/src/mame/drivers/pirates.cpp @@ -162,14 +162,14 @@ void pirates_state::pirates_map(address_map &map) // AM_RANGE(0x500000, 0x5007ff) AM_RAM map(0x500000, 0x5007ff).writeonly().share("spriteram"); // AM_RANGE(0x500800, 0x50080f) AM_WRITENOP - map(0x600000, 0x600001).w(this, FUNC(pirates_state::out_w)); + map(0x600000, 0x600001).w(FUNC(pirates_state::out_w)); map(0x700000, 0x700001).writeonly().share("scroll"); // scroll reg map(0x800000, 0x803fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x900000, 0x90017f).ram(); // more of tilemaps ? - map(0x900180, 0x90137f).ram().w(this, FUNC(pirates_state::tx_tileram_w)).share("tx_tileram"); - map(0x901380, 0x902a7f).ram().w(this, FUNC(pirates_state::fg_tileram_w)).share("fg_tileram"); + map(0x900180, 0x90137f).ram().w(FUNC(pirates_state::tx_tileram_w)).share("tx_tileram"); + map(0x901380, 0x902a7f).ram().w(FUNC(pirates_state::fg_tileram_w)).share("fg_tileram"); // AM_RANGE(0x902580, 0x902a7f) AM_RAM // more of tilemaps ? - map(0x902a80, 0x904187).ram().w(this, FUNC(pirates_state::bg_tileram_w)).share("bg_tileram"); + map(0x902a80, 0x904187).ram().w(FUNC(pirates_state::bg_tileram_w)).share("bg_tileram"); // AM_RANGE(0x903c80, 0x904187) AM_RAM // more of tilemaps ? map(0xa00001, 0xa00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp index 79e03eb0260..bc7e3f85f6d 100644 --- a/src/mame/drivers/piratesh.cpp +++ b/src/mame/drivers/piratesh.cpp @@ -408,10 +408,10 @@ void piratesh_state::piratesh_map(address_map &map) map(0x400004, 0x400005).portr("DSW1"); map(0x400006, 0x400007).portr("DSW2"); map(0x400008, 0x400009).portr("SPECIAL"); - map(0x40000c, 0x40000d).w(this, FUNC(piratesh_state::control1_w)); - map(0x400010, 0x400011).w(this, FUNC(piratesh_state::control2_w)); - map(0x400014, 0x400015).w(this, FUNC(piratesh_state::control3_w)); - map(0x500000, 0x50ffff).r(this, FUNC(piratesh_state::K056832_rom_r)); // VRAM ROM + map(0x40000c, 0x40000d).w(FUNC(piratesh_state::control1_w)); + map(0x400010, 0x400011).w(FUNC(piratesh_state::control2_w)); + map(0x400014, 0x400015).w(FUNC(piratesh_state::control3_w)); + map(0x500000, 0x50ffff).r(FUNC(piratesh_state::K056832_rom_r)); // VRAM ROM map(0x580000, 0x581fff).r(m_k053250, FUNC(k053250ps_device::rom_r)); // LVC ROM access map(0x600000, 0x6004ff).rw("k054539", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0xff00); // SOUND map(0x680000, 0x681fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // TILEMAP diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp index 2b3f2742bbb..ac8c224357b 100644 --- a/src/mame/drivers/pitnrun.cpp +++ b/src/mame/drivers/pitnrun.cpp @@ -109,20 +109,20 @@ void pitnrun_state::pitnrun_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8fff).ram().w(this, FUNC(pitnrun_state::videoram_w)).share("videoram"); - map(0x9000, 0x9fff).ram().w(this, FUNC(pitnrun_state::videoram2_w)).share("videoram2"); + map(0x8800, 0x8fff).ram().w(FUNC(pitnrun_state::videoram_w)).share("videoram"); + map(0x9000, 0x9fff).ram().w(FUNC(pitnrun_state::videoram2_w)).share("videoram2"); map(0xa000, 0xa0ff).ram().share("spriteram"); map(0xa800, 0xa800).portr("SYSTEM"); map(0xa800, 0xa807).w("noiselatch", FUNC(ls259_device::write_d0)); /* Analog Sound */ map(0xb000, 0xb000).portr("DSW"); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xb800, 0xb800).portr("INPUTS").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc800, 0xc801).w(this, FUNC(pitnrun_state::scroll_w)); - map(0xc802, 0xc802).w(this, FUNC(pitnrun_state::scroll_y_w)); + map(0xc800, 0xc801).w(FUNC(pitnrun_state::scroll_w)); + map(0xc802, 0xc802).w(FUNC(pitnrun_state::scroll_y_w)); //AM_RANGE(0xc804, 0xc804) AM_WRITE(mcu_data_w) - map(0xc805, 0xc805).w(this, FUNC(pitnrun_state::h_heed_w)); - map(0xc806, 0xc806).w(this, FUNC(pitnrun_state::v_heed_w)); - map(0xc807, 0xc807).w(this, FUNC(pitnrun_state::ha_w)); + map(0xc805, 0xc805).w(FUNC(pitnrun_state::h_heed_w)); + map(0xc806, 0xc806).w(FUNC(pitnrun_state::v_heed_w)); + map(0xc807, 0xc807).w(FUNC(pitnrun_state::ha_w)); //AM_RANGE(0xd000, 0xd000) AM_READ(mcu_data_r) //AM_RANGE(0xd800, 0xd800) AM_READ(mcu_status_r) map(0xf000, 0xf000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); @@ -131,9 +131,9 @@ void pitnrun_state::pitnrun_map(address_map &map) void pitnrun_state::pitnrun_map_mcu(address_map &map) { pitnrun_map(map); - map(0xc804, 0xc804).w(this, FUNC(pitnrun_state::mcu_data_w)); - map(0xd000, 0xd000).r(this, FUNC(pitnrun_state::mcu_data_r)); - map(0xd800, 0xd800).r(this, FUNC(pitnrun_state::mcu_status_r)); + map(0xc804, 0xc804).w(FUNC(pitnrun_state::mcu_data_w)); + map(0xd000, 0xd000).r(FUNC(pitnrun_state::mcu_data_r)); + map(0xd800, 0xd800).r(FUNC(pitnrun_state::mcu_status_r)); } void pitnrun_state::pitnrun_sound_map(address_map &map) diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp index 4db3b5c59fb..1bcb539e6c6 100644 --- a/src/mame/drivers/pk8000.cpp +++ b/src/mame/drivers/pk8000.cpp @@ -198,14 +198,14 @@ void pk8000_state::pk8000_io(address_map &map) map.unmap_value_high(); map(0x80, 0x83).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x84, 0x87).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x88, 0x88).rw(this, FUNC(pk8000_state::video_color_r), FUNC(pk8000_state::video_color_w)); - map(0x8c, 0x8c).r(this, FUNC(pk8000_state::joy_1_r)); - map(0x8d, 0x8d).r(this, FUNC(pk8000_state::joy_2_r)); - map(0x90, 0x90).rw(this, FUNC(pk8000_state::text_start_r), FUNC(pk8000_state::text_start_w)); - map(0x91, 0x91).rw(this, FUNC(pk8000_state::chargen_start_r), FUNC(pk8000_state::chargen_start_w)); - map(0x92, 0x92).rw(this, FUNC(pk8000_state::video_start_r), FUNC(pk8000_state::video_start_w)); - map(0x93, 0x93).rw(this, FUNC(pk8000_state::color_start_r), FUNC(pk8000_state::color_start_w)); - map(0xa0, 0xbf).rw(this, FUNC(pk8000_state::color_r), FUNC(pk8000_state::color_w)); + map(0x88, 0x88).rw(FUNC(pk8000_state::video_color_r), FUNC(pk8000_state::video_color_w)); + map(0x8c, 0x8c).r(FUNC(pk8000_state::joy_1_r)); + map(0x8d, 0x8d).r(FUNC(pk8000_state::joy_2_r)); + map(0x90, 0x90).rw(FUNC(pk8000_state::text_start_r), FUNC(pk8000_state::text_start_w)); + map(0x91, 0x91).rw(FUNC(pk8000_state::chargen_start_r), FUNC(pk8000_state::chargen_start_w)); + map(0x92, 0x92).rw(FUNC(pk8000_state::video_start_r), FUNC(pk8000_state::video_start_w)); + map(0x93, 0x93).rw(FUNC(pk8000_state::color_start_r), FUNC(pk8000_state::color_start_w)); + map(0xa0, 0xbf).rw(FUNC(pk8000_state::color_r), FUNC(pk8000_state::color_w)); } /* Input ports */ diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp index 6a9fd617f3e..2cd44921993 100644 --- a/src/mame/drivers/pkscram.cpp +++ b/src/mame/drivers/pkscram.cpp @@ -125,14 +125,14 @@ void pkscram_state::pkscramble_map(address_map &map) map(0x000000, 0x01ffff).rom(); map(0x040000, 0x0400ff).ram().share("nvram"); map(0x041000, 0x043fff).ram(); // main ram - map(0x044000, 0x044fff).ram().w(this, FUNC(pkscram_state::pkscramble_fgtilemap_w)).share("fgtilemap_ram"); // fg tilemap - map(0x045000, 0x045fff).ram().w(this, FUNC(pkscram_state::pkscramble_mdtilemap_w)).share("mdtilemap_ram"); // md tilemap (just a copy of fg?) - map(0x046000, 0x046fff).ram().w(this, FUNC(pkscram_state::pkscramble_bgtilemap_w)).share("bgtilemap_ram"); // bg tilemap + map(0x044000, 0x044fff).ram().w(FUNC(pkscram_state::pkscramble_fgtilemap_w)).share("fgtilemap_ram"); // fg tilemap + map(0x045000, 0x045fff).ram().w(FUNC(pkscram_state::pkscramble_mdtilemap_w)).share("mdtilemap_ram"); // md tilemap (just a copy of fg?) + map(0x046000, 0x046fff).ram().w(FUNC(pkscram_state::pkscramble_bgtilemap_w)).share("bgtilemap_ram"); // bg tilemap map(0x047000, 0x047fff).ram(); // unused map(0x048000, 0x048fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x049000, 0x049001).portr("DSW"); map(0x049004, 0x049005).portr("INPUTS"); - map(0x049008, 0x049009).w(this, FUNC(pkscram_state::pkscramble_output_w)); + map(0x049008, 0x049009).w(FUNC(pkscram_state::pkscramble_output_w)); map(0x049010, 0x049011).nopw(); map(0x049014, 0x049015).nopw(); map(0x049018, 0x049019).nopw(); diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp index 27285030b29..1e061c2e6cb 100644 --- a/src/mame/drivers/pktgaldx.cpp +++ b/src/mame/drivers/pktgaldx.cpp @@ -118,9 +118,9 @@ void pktgaldx_state::pktgaldx_map(address_map &map) map(0x150007, 0x150007).r(m_oki2, FUNC(okim6295_device::read)); map(0x161800, 0x16180f).w(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_w)); - map(0x164800, 0x164801).w(this, FUNC(pktgaldx_state::pktgaldx_oki_bank_w)); - map(0x166800, 0x166801).w(this, FUNC(pktgaldx_state::vblank_ack_w)); - map(0x167800, 0x167fff).rw(this, FUNC(pktgaldx_state::pktgaldx_protection_region_f_104_r), FUNC(pktgaldx_state::pktgaldx_protection_region_f_104_w)).share("prot16ram"); /* Protection device */ + map(0x164800, 0x164801).w(FUNC(pktgaldx_state::pktgaldx_oki_bank_w)); + map(0x166800, 0x166801).w(FUNC(pktgaldx_state::vblank_ack_w)); + map(0x167800, 0x167fff).rw(FUNC(pktgaldx_state::pktgaldx_protection_region_f_104_r), FUNC(pktgaldx_state::pktgaldx_protection_region_f_104_w)).share("prot16ram"); /* Protection device */ map(0x170000, 0x17ffff).ram(); } @@ -172,17 +172,17 @@ void pktgaldx_state::pktgaldb_map(address_map &map) map(0x150007, 0x150007).r(m_oki2, FUNC(okim6295_device::read)); // AM_RANGE(0x160000, 0x167fff) AM_RAM - map(0x164800, 0x164801).w(this, FUNC(pktgaldx_state::pktgaldx_oki_bank_w)); - map(0x16500a, 0x16500b).r(this, FUNC(pktgaldx_state::pckgaldx_unknown_r)); - map(0x166800, 0x166801).w(this, FUNC(pktgaldx_state::vblank_ack_w)); + map(0x164800, 0x164801).w(FUNC(pktgaldx_state::pktgaldx_oki_bank_w)); + map(0x16500a, 0x16500b).r(FUNC(pktgaldx_state::pckgaldx_unknown_r)); + map(0x166800, 0x166801).w(FUNC(pktgaldx_state::vblank_ack_w)); /* should we really be using these to read the i/o in the BOOTLEG? these look like i/o through protection ... */ map(0x167842, 0x167843).portr("INPUTS"); map(0x167c4c, 0x167c4d).portr("DSW"); map(0x167db2, 0x167db3).portr("SYSTEM"); - map(0x167d10, 0x167d11).r(this, FUNC(pktgaldx_state::pckgaldx_protection_r)); // check code at 6ea - map(0x167d1a, 0x167d1b).r(this, FUNC(pktgaldx_state::pckgaldx_protection_r)); // check code at 7C4 + map(0x167d10, 0x167d11).r(FUNC(pktgaldx_state::pckgaldx_protection_r)); // check code at 6ea + map(0x167d1a, 0x167d1b).r(FUNC(pktgaldx_state::pckgaldx_protection_r)); // check code at 7C4 map(0x170000, 0x17ffff).ram(); diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index ff23f38f95d..cc801bdccb0 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -101,8 +101,8 @@ void plan80_state::plan80_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x04, 0x04).r(this, FUNC(plan80_state::plan80_04_r)); - map(0x09, 0x09).w(this, FUNC(plan80_state::plan80_09_w)); + map(0x04, 0x04).r(FUNC(plan80_state::plan80_04_r)); + map(0x09, 0x09).w(FUNC(plan80_state::plan80_09_w)); } /* Input ports */ diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp index e82cc822ef3..17bab26a57b 100644 --- a/src/mame/drivers/play_1.cpp +++ b/src/mame/drivers/play_1.cpp @@ -93,13 +93,13 @@ void play_1_state::chance_map(address_map &map) void play_1_state::play_1_io(address_map &map) { - map(0x01, 0x01).portr("IN1").w(this, FUNC(play_1_state::port01_w)); //segments - map(0x02, 0x02).portr("IN2").w(this, FUNC(play_1_state::port02_w)); // N1-8 - map(0x03, 0x03).portr("IN3").w(this, FUNC(play_1_state::port03_w)); // D1-4 - map(0x04, 0x04).portr("IN4").w(this, FUNC(play_1_state::port04_w)); // U1-8 - map(0x05, 0x05).portr("IN5").w(this, FUNC(play_1_state::port05_w)); // V1-8 - map(0x06, 0x06).portr("IN6").w(this, FUNC(play_1_state::port06_w)); // W1-8 - map(0x07, 0x07).r(this, FUNC(play_1_state::port07_r)); + map(0x01, 0x01).portr("IN1").w(FUNC(play_1_state::port01_w)); //segments + map(0x02, 0x02).portr("IN2").w(FUNC(play_1_state::port02_w)); // N1-8 + map(0x03, 0x03).portr("IN3").w(FUNC(play_1_state::port03_w)); // D1-4 + map(0x04, 0x04).portr("IN4").w(FUNC(play_1_state::port04_w)); // U1-8 + map(0x05, 0x05).portr("IN5").w(FUNC(play_1_state::port05_w)); // V1-8 + map(0x06, 0x06).portr("IN6").w(FUNC(play_1_state::port06_w)); // W1-8 + map(0x07, 0x07).r(FUNC(play_1_state::port07_r)); } static INPUT_PORTS_START( chance ) diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp index 7faea668390..cd083205485 100644 --- a/src/mame/drivers/play_2.cpp +++ b/src/mame/drivers/play_2.cpp @@ -114,13 +114,13 @@ void play_2_state::play_2_map(address_map &map) void play_2_state::play_2_io(address_map &map) { - map(0x01, 0x01).w(this, FUNC(play_2_state::port01_w)); // digits - map(0x02, 0x02).w(this, FUNC(play_2_state::port02_w)); + map(0x01, 0x01).w(FUNC(play_2_state::port01_w)); // digits + map(0x02, 0x02).w(FUNC(play_2_state::port02_w)); map(0x03, 0x03).w(m_1863, FUNC(cdp1863_device::str_w)); - map(0x04, 0x04).r(this, FUNC(play_2_state::port04_r)); - map(0x05, 0x05).r(this, FUNC(play_2_state::port05_r)); - map(0x06, 0x06).w(this, FUNC(play_2_state::port06_w)); - map(0x07, 0x07).w(this, FUNC(play_2_state::port07_w)); + map(0x04, 0x04).r(FUNC(play_2_state::port04_r)); + map(0x05, 0x05).r(FUNC(play_2_state::port05_r)); + map(0x06, 0x06).w(FUNC(play_2_state::port06_w)); + map(0x07, 0x07).w(FUNC(play_2_state::port07_w)); } void play_2_state::zira_sound_map(address_map &map) diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp index f40d53799c7..e5278284a7f 100644 --- a/src/mame/drivers/play_3.cpp +++ b/src/mame/drivers/play_3.cpp @@ -134,25 +134,25 @@ void play_3_state::play_3_map(address_map &map) void play_3_state::play_3_io(address_map &map) { - map(0x01, 0x01).w(this, FUNC(play_3_state::port01_w)); // digits, scan-lines - map(0x02, 0x02).w(this, FUNC(play_3_state::port02_w)); // sound code - map(0x03, 0x03).w(this, FUNC(play_3_state::port03_w)); // - map(0x04, 0x04).r(this, FUNC(play_3_state::port04_r)); // switches - map(0x05, 0x05).r(this, FUNC(play_3_state::port05_r)); // more switches - map(0x06, 0x06).w(this, FUNC(play_3_state::port06_w)); // segments - map(0x07, 0x07).w(this, FUNC(play_3_state::port07_w)); // flipflop clear + map(0x01, 0x01).w(FUNC(play_3_state::port01_w)); // digits, scan-lines + map(0x02, 0x02).w(FUNC(play_3_state::port02_w)); // sound code + map(0x03, 0x03).w(FUNC(play_3_state::port03_w)); // + map(0x04, 0x04).r(FUNC(play_3_state::port04_r)); // switches + map(0x05, 0x05).r(FUNC(play_3_state::port05_r)); // more switches + map(0x06, 0x06).w(FUNC(play_3_state::port06_w)); // segments + map(0x07, 0x07).w(FUNC(play_3_state::port07_w)); // flipflop clear } void play_3_state::megaaton_io(address_map &map) { play_3_io(map); - map(0x01, 0x01).w(this, FUNC(play_3_state::megaaton_port01_w)); // digits, scan-lines + map(0x01, 0x01).w(FUNC(play_3_state::megaaton_port01_w)); // digits, scan-lines } void play_3_state::sklflite_io(address_map &map) { play_3_io(map); - map(0x03, 0x03).w(this, FUNC(play_3_state::sklflite_port03_w)); // + map(0x03, 0x03).w(FUNC(play_3_state::sklflite_port03_w)); // } void play_3_state::play_3_audio_map(address_map &map) @@ -165,8 +165,8 @@ void play_3_state::play_3_audio_map(address_map &map) void play_3_state::play_3_audio_io(address_map &map) { - map(0x01, 0x01).w(this, FUNC(play_3_state::port01_a_w)); // irq counter - map(0x02, 0x02).r(this, FUNC(play_3_state::port02_a_r)); // sound code + map(0x01, 0x01).w(FUNC(play_3_state::port01_a_w)); // irq counter + map(0x02, 0x02).r(FUNC(play_3_state::port02_a_r)); // sound code } diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index 598d6af9c17..e4766016db5 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -354,10 +354,10 @@ void playch10_state::bios_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); // 8V - map(0x8800, 0x8fff).rw(this, FUNC(playch10_state::ram_8w_r), FUNC(playch10_state::ram_8w_w)).share("ram_8w"); // 8W - map(0x9000, 0x97ff).ram().w(this, FUNC(playch10_state::playch10_videoram_w)).share("videoram"); + map(0x8800, 0x8fff).rw(FUNC(playch10_state::ram_8w_r), FUNC(playch10_state::ram_8w_w)).share("ram_8w"); // 8W + map(0x9000, 0x97ff).ram().w(FUNC(playch10_state::playch10_videoram_w)).share("videoram"); map(0xc000, 0xdfff).rom(); - map(0xe000, 0xffff).rw(this, FUNC(playch10_state::pc10_prot_r), FUNC(playch10_state::pc10_prot_w)); + map(0xe000, 0xffff).rw(FUNC(playch10_state::pc10_prot_r), FUNC(playch10_state::pc10_prot_w)); } void playch10_state::bios_io_map(address_map &map) @@ -366,19 +366,19 @@ void playch10_state::bios_io_map(address_map &map) map(0x00, 0x00).portr("BIOS"); map(0x01, 0x01).portr("SW1"); map(0x02, 0x02).portr("SW2"); - map(0x03, 0x03).r(this, FUNC(playch10_state::pc10_detectclr_r)); + map(0x03, 0x03).r(FUNC(playch10_state::pc10_detectclr_r)); map(0x00, 0x07).w("outlatch1", FUNC(ls259_device::write_d0)); map(0x08, 0x0f).w("outlatch2", FUNC(ls259_device::write_d0)); - map(0x10, 0x13).w(this, FUNC(playch10_state::time_w)); + map(0x10, 0x13).w(FUNC(playch10_state::time_w)); } void playch10_state::cart_map(address_map &map) { map(0x0000, 0x07ff).ram().mirror(0x1800).share("work_ram"); map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(playch10_state::sprite_dma_w)); - map(0x4016, 0x4016).rw(this, FUNC(playch10_state::pc10_in0_r), FUNC(playch10_state::pc10_in0_w)); - map(0x4017, 0x4017).r(this, FUNC(playch10_state::pc10_in1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x4014, 0x4014).w(FUNC(playch10_state::sprite_dma_w)); + map(0x4016, 0x4016).rw(FUNC(playch10_state::pc10_in0_r), FUNC(playch10_state::pc10_in0_w)); + map(0x4017, 0x4017).r(FUNC(playch10_state::pc10_in1_r)); /* IN1 - input port 2 / PSG second control register */ map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp index 9bcdf106d5a..af32da0c41c 100644 --- a/src/mame/drivers/playmark.cpp +++ b/src/mame/drivers/playmark.cpp @@ -266,20 +266,20 @@ void playmark_state::bigtwin_main_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x304000, 0x304001).noprw(); /* watchdog? irq ack? */ map(0x440000, 0x4403ff).ram().share("spriteram"); - map(0x500000, 0x500fff).w(this, FUNC(playmark_state::wbeachvl_fgvideoram_w)).share("videoram2"); + map(0x500000, 0x500fff).w(FUNC(playmark_state::wbeachvl_fgvideoram_w)).share("videoram2"); map(0x501000, 0x501fff).nopw(); /* unused RAM? */ - map(0x502000, 0x503fff).w(this, FUNC(playmark_state::wbeachvl_txvideoram_w)).share("videoram1"); + map(0x502000, 0x503fff).w(FUNC(playmark_state::wbeachvl_txvideoram_w)).share("videoram1"); map(0x504000, 0x50ffff).nopw(); /* unused RAM? */ - map(0x510000, 0x51000b).w(this, FUNC(playmark_state::bigtwin_scroll_w)); + map(0x510000, 0x51000b).w(FUNC(playmark_state::bigtwin_scroll_w)); map(0x51000c, 0x51000d).nopw(); /* always 3? */ map(0x600000, 0x67ffff).ram().share("bgvideoram"); map(0x700010, 0x700011).portr("SYSTEM"); map(0x700012, 0x700013).portr("P1"); map(0x700014, 0x700015).portr("P2"); - map(0x700016, 0x700017).w(this, FUNC(playmark_state::coinctrl_w)); + map(0x700016, 0x700017).w(FUNC(playmark_state::coinctrl_w)); map(0x70001a, 0x70001b).portr("DSW2"); map(0x70001c, 0x70001d).portr("DSW1"); - map(0x70001e, 0x70001f).w(this, FUNC(playmark_state::playmark_snd_command_w)); + map(0x70001e, 0x70001f).w(FUNC(playmark_state::playmark_snd_command_w)); map(0x780000, 0x7807ff).w(m_palette, FUNC(palette_device::write16)).share("palette"); // AM_RANGE(0xe00000, 0xe00001) ?? written on startup map(0xff0000, 0xffffff).ram(); @@ -288,10 +288,10 @@ void playmark_state::bigtwin_main_map(address_map &map) void playmark_state::bigtwinb_main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x103fff).ram().w(this, FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); - map(0x104000, 0x107fff).ram().w(this, FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); - map(0x108000, 0x10ffff).ram().w(this, FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); - map(0x110000, 0x11000d).w(this, FUNC(playmark_state::hrdtimes_scroll_w)); + map(0x100000, 0x103fff).ram().w(FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); + map(0x104000, 0x107fff).ram().w(FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); + map(0x108000, 0x10ffff).ram().w(FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); + map(0x110000, 0x11000d).w(FUNC(playmark_state::hrdtimes_scroll_w)); map(0x201000, 0x2013ff).ram().share("spriteram"); map(0x280000, 0x2807ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300010, 0x300011).portr("SYSTEM"); @@ -299,7 +299,7 @@ void playmark_state::bigtwinb_main_map(address_map &map) map(0x300014, 0x300015).portr("P2"); map(0x30001a, 0x30001b).portr("DSW2"); map(0x30001c, 0x30001d).portr("DSW1"); - map(0x30001e, 0x30001f).w(this, FUNC(playmark_state::playmark_snd_command_w)); + map(0x30001e, 0x30001f).w(FUNC(playmark_state::playmark_snd_command_w)); map(0x304000, 0x304001).nopw(); /* watchdog? irq ack? */ map(0xff0000, 0xffffff).ram(); } @@ -308,21 +308,21 @@ void playmark_state::wbeachvl_main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x440000, 0x440fff).ram().share("spriteram"); - map(0x500000, 0x501fff).ram().w(this, FUNC(playmark_state::wbeachvl_bgvideoram_w)).share("videoram3"); - map(0x504000, 0x505fff).ram().w(this, FUNC(playmark_state::wbeachvl_fgvideoram_w)).share("videoram2"); - map(0x508000, 0x509fff).ram().w(this, FUNC(playmark_state::wbeachvl_txvideoram_w)).share("videoram1"); + map(0x500000, 0x501fff).ram().w(FUNC(playmark_state::wbeachvl_bgvideoram_w)).share("videoram3"); + map(0x504000, 0x505fff).ram().w(FUNC(playmark_state::wbeachvl_fgvideoram_w)).share("videoram2"); + map(0x508000, 0x509fff).ram().w(FUNC(playmark_state::wbeachvl_txvideoram_w)).share("videoram1"); map(0x50f000, 0x50ffff).ram().share("rowscroll"); - map(0x510000, 0x51000b).w(this, FUNC(playmark_state::wbeachvl_scroll_w)); + map(0x510000, 0x51000b).w(FUNC(playmark_state::wbeachvl_scroll_w)); map(0x51000c, 0x51000d).nopw(); /* 2 and 3 */ // AM_RANGE(0x700000, 0x700001) ?? written on startup map(0x710010, 0x710011).portr("SYSTEM"); map(0x710012, 0x710013).portr("P1"); map(0x710014, 0x710015).portr("P2"); - map(0x710016, 0x710017).w(this, FUNC(playmark_state::wbeachvl_coin_eeprom_w)); + map(0x710016, 0x710017).w(FUNC(playmark_state::wbeachvl_coin_eeprom_w)); map(0x710018, 0x710019).portr("P3"); map(0x71001a, 0x71001b).portr("P4"); // AM_RANGE(0x71001c, 0x71001d) AM_READ(playmark_snd_status???) - map(0x71001e, 0x71001f).w(this, FUNC(playmark_state::playmark_snd_command_w)); + map(0x71001e, 0x71001f).w(FUNC(playmark_state::playmark_snd_command_w)); map(0x780000, 0x780fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xff0000, 0xffffff).ram(); } @@ -332,18 +332,18 @@ void playmark_state::excelsr_main_map(address_map &map) map(0x000000, 0x2fffff).rom(); map(0x304000, 0x304001).nopw(); /* watchdog? irq ack? */ map(0x440000, 0x440cff).ram().share("spriteram"); - map(0x500000, 0x500fff).ram().w(this, FUNC(playmark_state::wbeachvl_fgvideoram_w)).share("videoram2"); - map(0x501000, 0x501fff).ram().w(this, FUNC(playmark_state::wbeachvl_txvideoram_w)).share("videoram1"); - map(0x510000, 0x51000b).w(this, FUNC(playmark_state::excelsr_scroll_w)); + map(0x500000, 0x500fff).ram().w(FUNC(playmark_state::wbeachvl_fgvideoram_w)).share("videoram2"); + map(0x501000, 0x501fff).ram().w(FUNC(playmark_state::wbeachvl_txvideoram_w)).share("videoram1"); + map(0x510000, 0x51000b).w(FUNC(playmark_state::excelsr_scroll_w)); map(0x51000c, 0x51000d).nopw(); /* 2 and 3 */ map(0x600000, 0x67ffff).ram().share("bgvideoram"); map(0x700010, 0x700011).portr("SYSTEM"); map(0x700012, 0x700013).portr("P1"); map(0x700014, 0x700015).portr("P2"); - map(0x700016, 0x700017).w(this, FUNC(playmark_state::coinctrl_w)); + map(0x700016, 0x700017).w(FUNC(playmark_state::coinctrl_w)); map(0x70001a, 0x70001b).portr("DSW2"); map(0x70001c, 0x70001d).portr("DSW1"); - map(0x70001e, 0x70001f).w(this, FUNC(playmark_state::playmark_snd_command_w)); + map(0x70001e, 0x70001f).w(FUNC(playmark_state::playmark_snd_command_w)); map(0x780000, 0x7807ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xff0000, 0xffffff).ram(); } @@ -353,21 +353,21 @@ void playmark_state::hrdtimes_main_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x080000, 0x0bffff).ram(); map(0x0c0000, 0x0fffff).rom().region("maincpu", 0x0c0000); - map(0x100000, 0x1007ff).ram().w(this, FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); // 32*32? + map(0x100000, 0x1007ff).ram().w(FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); // 32*32? map(0x100800, 0x103fff).ram(); - map(0x104000, 0x105fff).ram().w(this, FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); // 128*32? + map(0x104000, 0x105fff).ram().w(FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); // 128*32? map(0x106000, 0x107fff).ram(); - map(0x108000, 0x109fff).ram().w(this, FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); // 64*64? + map(0x108000, 0x109fff).ram().w(FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); // 64*64? map(0x10a000, 0x10bfff).ram(); map(0x10c000, 0x10ffff).ram(); // Unused - map(0x110000, 0x11000d).w(this, FUNC(playmark_state::hrdtimes_scroll_w)); + map(0x110000, 0x11000d).w(FUNC(playmark_state::hrdtimes_scroll_w)); map(0x200000, 0x200fff).ram().share("spriteram"); map(0x280000, 0x2807ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x280800, 0x280fff).ram(); // Unused map(0x300010, 0x300011).portr("SYSTEM"); map(0x300012, 0x300013).portr("P1"); map(0x300014, 0x300015).portr("P2"); - map(0x300016, 0x300017).w(this, FUNC(playmark_state::hrdtimes_coin_w)); + map(0x300016, 0x300017).w(FUNC(playmark_state::hrdtimes_coin_w)); map(0x30001a, 0x30001b).portr("DSW2"); map(0x30001c, 0x30001d).portr("DSW1"); // AM_RANGE(0x30001e, 0x30001f) AM_WRITE(playmark_snd_command_w) @@ -377,18 +377,18 @@ void playmark_state::hrdtimes_main_map(address_map &map) void playmark_state::hotmind_main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x103fff).ram().w(this, FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); - map(0x104000, 0x107fff).ram().w(this, FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); - map(0x108000, 0x10ffff).ram().w(this, FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); - map(0x110000, 0x11000d).w(this, FUNC(playmark_state::hrdtimes_scroll_w)); + map(0x100000, 0x103fff).ram().w(FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); + map(0x104000, 0x107fff).ram().w(FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); + map(0x108000, 0x10ffff).ram().w(FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); + map(0x110000, 0x11000d).w(FUNC(playmark_state::hrdtimes_scroll_w)); map(0x200000, 0x200fff).ram().share("spriteram"); map(0x280000, 0x2807ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300010, 0x300011).portr("COINS"); map(0x300012, 0x300013).portr("P1"); - map(0x300014, 0x300015).portr("DISPENSER").w(this, FUNC(playmark_state::hotmind_coin_eeprom_w)); + map(0x300014, 0x300015).portr("DISPENSER").w(FUNC(playmark_state::hotmind_coin_eeprom_w)); map(0x30001a, 0x30001b).portr("DSW2"); map(0x30001c, 0x30001d).portr("DSW1"); - map(0x30001e, 0x30001f).w(this, FUNC(playmark_state::playmark_snd_command_w)); + map(0x30001e, 0x30001f).w(FUNC(playmark_state::playmark_snd_command_w)); map(0x304000, 0x304001).nopw(); /* watchdog? irq ack? */ map(0xff0000, 0xffffff).ram(); } @@ -396,17 +396,17 @@ void playmark_state::hotmind_main_map(address_map &map) void playmark_state::luckboomh_main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x103fff).ram().w(this, FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); - map(0x104000, 0x107fff).ram().w(this, FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); - map(0x108000, 0x10ffff).ram().w(this, FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); - map(0x110000, 0x11000d).w(this, FUNC(playmark_state::hrdtimes_scroll_w)); + map(0x100000, 0x103fff).ram().w(FUNC(playmark_state::hrdtimes_bgvideoram_w)).share("videoram3"); + map(0x104000, 0x107fff).ram().w(FUNC(playmark_state::hrdtimes_fgvideoram_w)).share("videoram2"); + map(0x108000, 0x10ffff).ram().w(FUNC(playmark_state::hrdtimes_txvideoram_w)).share("videoram1"); + map(0x110000, 0x11000d).w(FUNC(playmark_state::hrdtimes_scroll_w)); map(0x200000, 0x200fff).ram().share("spriteram"); map(0x280000, 0x2807ff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300010, 0x300011).portr("COINS"); map(0x300012, 0x300013).portr("P1"); - map(0x300014, 0x300015).portr("DISPENSER").w(this, FUNC(playmark_state::luckboomh_dispenser_w)); + map(0x300014, 0x300015).portr("DISPENSER").w(FUNC(playmark_state::luckboomh_dispenser_w)); map(0x30001c, 0x30001d).portr("SERVICE"); - map(0x30001e, 0x30001f).w(this, FUNC(playmark_state::playmark_snd_command_w)); + map(0x30001e, 0x30001f).w(FUNC(playmark_state::playmark_snd_command_w)); map(0x304000, 0x304001).nopw(); /* watchdog? irq ack? */ map(0xff0000, 0xff03ff).ram().share("nvram"); map(0xff8000, 0xffffff).ram(); diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp index 89da47896cf..0d5dbe16406 100644 --- a/src/mame/drivers/plus4.cpp +++ b/src/mame/drivers/plus4.cpp @@ -484,7 +484,7 @@ READ8_MEMBER( plus4_state::ted_videoram_r ) void plus4_state::plus4_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(plus4_state::read), FUNC(plus4_state::write)); + map(0x0000, 0xffff).rw(FUNC(plus4_state::read), FUNC(plus4_state::write)); } @@ -494,7 +494,7 @@ void plus4_state::plus4_mem(address_map &map) void plus4_state::ted_videoram_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(plus4_state::ted_videoram_r)); + map(0x0000, 0xffff).r(FUNC(plus4_state::ted_videoram_r)); } diff --git a/src/mame/drivers/pluto5.cpp b/src/mame/drivers/pluto5.cpp index 0756a9b3b9b..7e16f20fb55 100644 --- a/src/mame/drivers/pluto5.cpp +++ b/src/mame/drivers/pluto5.cpp @@ -241,7 +241,7 @@ WRITE32_MEMBER(pluto5_state::pluto5_mem_w) void pluto5_state::pluto5_map(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(pluto5_state::pluto5_mem_r), FUNC(pluto5_state::pluto5_mem_w)); + map(0x00000000, 0xffffffff).rw(FUNC(pluto5_state::pluto5_mem_r), FUNC(pluto5_state::pluto5_mem_w)); } static INPUT_PORTS_START( pluto5 ) diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp index 40e0ce1edcc..13fd6635885 100644 --- a/src/mame/drivers/plygonet.cpp +++ b/src/mame/drivers/plygonet.cpp @@ -418,18 +418,18 @@ void polygonet_state::main_map(address_map &map) map(0x000000, 0x1fffff).rom(); map(0x200000, 0x21ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x400000, 0x40001f).rw(m_k053936, FUNC(k053936_device::ctrl_r), FUNC(k053936_device::ctrl_w)); - map(0x440000, 0x440fff).rw(this, FUNC(polygonet_state::polygonet_roz_ram_r), FUNC(polygonet_state::polygonet_roz_ram_w)); - map(0x480000, 0x480003).r(this, FUNC(polygonet_state::polygonet_inputs_r)); - map(0x4c0000, 0x4c0003).w(this, FUNC(polygonet_state::polygonet_sys_w)); - map(0x500000, 0x503fff).ram().w(this, FUNC(polygonet_state::shared_ram_write)).share("shared_ram"); - map(0x504000, 0x504003).w(this, FUNC(polygonet_state::dsp_w_lines)); - map(0x506000, 0x50600f).rw(this, FUNC(polygonet_state::dsp_host_interface_r), FUNC(polygonet_state::dsp_host_interface_w)); - map(0x540000, 0x540fff).rw(this, FUNC(polygonet_state::polygonet_ttl_ram_r), FUNC(polygonet_state::polygonet_ttl_ram_w)); + map(0x440000, 0x440fff).rw(FUNC(polygonet_state::polygonet_roz_ram_r), FUNC(polygonet_state::polygonet_roz_ram_w)); + map(0x480000, 0x480003).r(FUNC(polygonet_state::polygonet_inputs_r)); + map(0x4c0000, 0x4c0003).w(FUNC(polygonet_state::polygonet_sys_w)); + map(0x500000, 0x503fff).ram().w(FUNC(polygonet_state::shared_ram_write)).share("shared_ram"); + map(0x504000, 0x504003).w(FUNC(polygonet_state::dsp_w_lines)); + map(0x506000, 0x50600f).rw(FUNC(polygonet_state::dsp_host_interface_r), FUNC(polygonet_state::dsp_host_interface_w)); + map(0x540000, 0x540fff).rw(FUNC(polygonet_state::polygonet_ttl_ram_r), FUNC(polygonet_state::polygonet_ttl_ram_w)); map(0x541000, 0x54101f).ram(); map(0x580000, 0x5807ff).ram(); - map(0x580800, 0x580803).r(this, FUNC(polygonet_state::network_r)).nopw(); /* network RAM | registers? */ + map(0x580800, 0x580803).r(FUNC(polygonet_state::network_r)).nopw(); /* network RAM | registers? */ map(0x600000, 0x60000f).m(m_k054321, FUNC(k054321_device::main_map)); - map(0x640000, 0x640003).w(this, FUNC(polygonet_state::sound_irq_w)); + map(0x640000, 0x640003).w(FUNC(polygonet_state::sound_irq_w)); map(0x680000, 0x680003).w("watchdog", FUNC(watchdog_timer_device::reset32_w)); map(0x700000, 0x73ffff).rom().region("gfx2", 0); map(0x780000, 0x79ffff).rom().region("gfx1", 0); @@ -442,17 +442,17 @@ void polygonet_state::dsp_program_map(address_map &map) { map(0x7000, 0x7fff).ram().share("dsp56k_p_mirror"); /* Unsure of size, but 0x1000 matches bank01 */ map(0x8000, 0x87ff).ram().share("dsp56k_p_8000"); - map(0xc000, 0xc000).r(this, FUNC(polygonet_state::dsp56k_bootload_r)); + map(0xc000, 0xc000).r(FUNC(polygonet_state::dsp56k_bootload_r)); } void polygonet_state::dsp_data_map(address_map &map) { map(0x0800, 0x5fff).ram(); /* Appears to not be affected by banking? */ - map(0x6000, 0x6fff).rw(this, FUNC(polygonet_state::dsp56k_ram_bank00_read), FUNC(polygonet_state::dsp56k_ram_bank00_write)); - map(0x7000, 0x7fff).rw(this, FUNC(polygonet_state::dsp56k_ram_bank01_read), FUNC(polygonet_state::dsp56k_ram_bank01_write)); /* Mirrored in program space @ 0x7000 */ - map(0x8000, 0xbfff).rw(this, FUNC(polygonet_state::dsp56k_ram_bank02_read), FUNC(polygonet_state::dsp56k_ram_bank02_write)); - map(0xc000, 0xdfff).rw(this, FUNC(polygonet_state::dsp56k_shared_ram_read), FUNC(polygonet_state::dsp56k_shared_ram_write)); - map(0xe000, 0xffbf).rw(this, FUNC(polygonet_state::dsp56k_ram_bank04_read), FUNC(polygonet_state::dsp56k_ram_bank04_write)); + map(0x6000, 0x6fff).rw(FUNC(polygonet_state::dsp56k_ram_bank00_read), FUNC(polygonet_state::dsp56k_ram_bank00_write)); + map(0x7000, 0x7fff).rw(FUNC(polygonet_state::dsp56k_ram_bank01_read), FUNC(polygonet_state::dsp56k_ram_bank01_write)); /* Mirrored in program space @ 0x7000 */ + map(0x8000, 0xbfff).rw(FUNC(polygonet_state::dsp56k_ram_bank02_read), FUNC(polygonet_state::dsp56k_ram_bank02_write)); + map(0xc000, 0xdfff).rw(FUNC(polygonet_state::dsp56k_shared_ram_read), FUNC(polygonet_state::dsp56k_shared_ram_write)); + map(0xe000, 0xffbf).rw(FUNC(polygonet_state::dsp56k_ram_bank04_read), FUNC(polygonet_state::dsp56k_ram_bank04_write)); } /**********************************************************************************/ @@ -485,7 +485,7 @@ void polygonet_state::sound_map(address_map &map) map(0xe400, 0xe62f).nopr().nopw(); // Second 054539 (not present) map(0xe630, 0xe7ff).ram(); map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map)); - map(0xf800, 0xf800).w(this, FUNC(polygonet_state::sound_ctrl_w)); + map(0xf800, 0xf800).w(FUNC(polygonet_state::sound_ctrl_w)); } diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp index 3065d5a33ee..a260fab04cc 100644 --- a/src/mame/drivers/pmd85.cpp +++ b/src/mame/drivers/pmd85.cpp @@ -222,12 +222,12 @@ uint32_t pmd85_state::screen_update_pmd85(screen_device &screen, bitmap_ind16 &b void pmd85_state::pmd85_io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(pmd85_state::pmd85_io_r), FUNC(pmd85_state::pmd85_io_w)); + map(0x00, 0xff).rw(FUNC(pmd85_state::pmd85_io_r), FUNC(pmd85_state::pmd85_io_w)); } void pmd85_state::mato_io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(pmd85_state::mato_io_r), FUNC(pmd85_state::mato_io_w)); + map(0x00, 0xff).rw(FUNC(pmd85_state::mato_io_r), FUNC(pmd85_state::mato_io_w)); } /* memory w/r functions */ diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp index af0880df92a..8a81969e8fc 100644 --- a/src/mame/drivers/pmi80.cpp +++ b/src/mame/drivers/pmi80.cpp @@ -97,8 +97,8 @@ void pmi80_state::pmi80_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0xf8, 0xf8).w(this, FUNC(pmi80_state::leds_w)); - map(0xfa, 0xfa).rw(this, FUNC(pmi80_state::keyboard_r), FUNC(pmi80_state::keyboard_w)); + map(0xf8, 0xf8).w(FUNC(pmi80_state::leds_w)); + map(0xfa, 0xfa).rw(FUNC(pmi80_state::keyboard_r), FUNC(pmi80_state::keyboard_w)); } /* Input ports */ diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp index 19470904ac9..2ad00d4dbd6 100644 --- a/src/mame/drivers/pntnpuzl.cpp +++ b/src/mame/drivers/pntnpuzl.cpp @@ -284,14 +284,14 @@ READ16_MEMBER(pntnpuzl_state::irq4_ack_r) void pntnpuzl_state::pntnpuzl_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x080000, 0x080001).r(this, FUNC(pntnpuzl_state::irq1_ack_r)); - map(0x100000, 0x100001).r(this, FUNC(pntnpuzl_state::irq2_ack_r)); - map(0x180000, 0x180001).r(this, FUNC(pntnpuzl_state::irq4_ack_r)); - map(0x200000, 0x200001).w(this, FUNC(pntnpuzl_state::pntnpuzl_200000_w)); + map(0x080000, 0x080001).r(FUNC(pntnpuzl_state::irq1_ack_r)); + map(0x100000, 0x100001).r(FUNC(pntnpuzl_state::irq2_ack_r)); + map(0x180000, 0x180001).r(FUNC(pntnpuzl_state::irq4_ack_r)); + map(0x200000, 0x200001).w(FUNC(pntnpuzl_state::pntnpuzl_200000_w)); map(0x280000, 0x28001f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0xff00); - map(0x280014, 0x280015).r(this, FUNC(pntnpuzl_state::pntnpuzl_280014_r)); - map(0x280018, 0x280019).w(this, FUNC(pntnpuzl_state::pntnpuzl_280018_w)); - map(0x28001a, 0x28001b).r(this, FUNC(pntnpuzl_state::pntnpuzl_28001a_r)); + map(0x280014, 0x280015).r(FUNC(pntnpuzl_state::pntnpuzl_280014_r)); + map(0x280018, 0x280019).w(FUNC(pntnpuzl_state::pntnpuzl_280018_w)); + map(0x28001a, 0x28001b).r(FUNC(pntnpuzl_state::pntnpuzl_28001a_r)); /* standard VGA */ map(0x3a0000, 0x3bffff).rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w)); diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp index 241a59c2f66..051e7980d50 100644 --- a/src/mame/drivers/pocketc.cpp +++ b/src/mame/drivers/pocketc.cpp @@ -89,7 +89,7 @@ void pc1401_state::pc1401_mem(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x3800, 0x47ff).ram(); - map(0x6000, 0x67ff).rw(this, FUNC(pc1401_state::pc1401_lcd_read), FUNC(pc1401_state::pc1401_lcd_write)).mirror(0x1000); + map(0x6000, 0x67ff).rw(FUNC(pc1401_state::pc1401_lcd_read), FUNC(pc1401_state::pc1401_lcd_write)).mirror(0x1000); map(0x8000, 0xffff).rom(); } @@ -97,7 +97,7 @@ void pc1401_state::pc1402_mem(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x47ff).ram(); - map(0x6000, 0x67ff).rw(this, FUNC(pc1401_state::pc1401_lcd_read), FUNC(pc1401_state::pc1401_lcd_write)).mirror(0x1000); + map(0x6000, 0x67ff).rw(FUNC(pc1401_state::pc1401_lcd_read), FUNC(pc1401_state::pc1401_lcd_write)).mirror(0x1000); map(0x8000, 0xffff).rom(); } @@ -106,7 +106,7 @@ void pc1251_state::pc1250_mem(address_map &map) map(0x0000, 0x1fff).rom(); map(0x4000, 0x7fff).rom(); map(0xc000, 0xc7ff).ram(); // 2KB RAM - map(0xf800, 0xf8ff).rw(this, FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); + map(0xf800, 0xf8ff).rw(FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); } void pc1251_state::pc1251_mem(address_map &map) @@ -114,7 +114,7 @@ void pc1251_state::pc1251_mem(address_map &map) map(0x0000, 0x1fff).rom(); map(0x4000, 0x7fff).rom(); map(0xb800, 0xc7ff).ram(); // 4KB RAM - map(0xf800, 0xf8ff).rw(this, FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); + map(0xf800, 0xf8ff).rw(FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); } void pc1251_state::pc1255_mem(address_map &map) @@ -122,13 +122,13 @@ void pc1251_state::pc1255_mem(address_map &map) map(0x0000, 0x1fff).rom(); map(0x4000, 0x7fff).rom(); map(0xa000, 0xc7ff).ram(); // 10KB RAM - map(0xf800, 0xf8ff).rw(this, FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); + map(0xf800, 0xf8ff).rw(FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); } void pc1251_state::pc1260_mem(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x20ff).rw(this, FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); + map(0x2000, 0x20ff).rw(FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); //map( 0x2800, 0x28ff) AM_READWRITE(pc1251_lcd_read, pc1251_lcd_write) map(0x5800, 0x67ff).ram(); // 4KB RAM map(0x8000, 0xffff).rom(); @@ -137,7 +137,7 @@ void pc1251_state::pc1260_mem(address_map &map) void pc1251_state::pc1261_mem(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x20ff).rw(this, FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); + map(0x2000, 0x20ff).rw(FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); //map( 0x2800, 0x28ff) AM_READWRITE(pc1251_lcd_read, pc1251_lcd_write) map(0x4000, 0x67ff).ram(); // 10KB RAM map(0x8000, 0xffff).rom(); @@ -147,15 +147,15 @@ void pc1251_state::pc1261_mem(address_map &map) void pc1350_state::pc1350_mem(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x7000, 0x7eff).rw(this, FUNC(pc1350_state::pc1350_lcd_read), FUNC(pc1350_state::pc1350_lcd_write)); + map(0x7000, 0x7eff).rw(FUNC(pc1350_state::pc1350_lcd_read), FUNC(pc1350_state::pc1350_lcd_write)); map(0x8000, 0xffff).rom(); } void pc1403_state::pc1403_mem(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x3000, 0x30bf).rw(this, FUNC(pc1403_state::pc1403_lcd_read), FUNC(pc1403_state::pc1403_lcd_write)); - map(0x3800, 0x3fff).rw(this, FUNC(pc1403_state::pc1403_asic_read), FUNC(pc1403_state::pc1403_asic_write)); + map(0x3000, 0x30bf).rw(FUNC(pc1403_state::pc1403_lcd_read), FUNC(pc1403_state::pc1403_lcd_write)); + map(0x3800, 0x3fff).rw(FUNC(pc1403_state::pc1403_asic_read), FUNC(pc1403_state::pc1403_asic_write)); map(0x4000, 0x7fff).bankr("bank1"); map(0xe000, 0xffff).ram(); } @@ -163,8 +163,8 @@ void pc1403_state::pc1403_mem(address_map &map) void pc1403_state::pc1403h_mem(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x3000, 0x30bf).rw(this, FUNC(pc1403_state::pc1403_lcd_read), FUNC(pc1403_state::pc1403_lcd_write)); - map(0x3800, 0x3fff).rw(this, FUNC(pc1403_state::pc1403_asic_read), FUNC(pc1403_state::pc1403_asic_write)); + map(0x3000, 0x30bf).rw(FUNC(pc1403_state::pc1403_lcd_read), FUNC(pc1403_state::pc1403_lcd_write)); + map(0x3800, 0x3fff).rw(FUNC(pc1403_state::pc1403_asic_read), FUNC(pc1403_state::pc1403_asic_write)); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).ram(); } diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp index 90ef5d4f83a..52c8c6b767e 100644 --- a/src/mame/drivers/pockstat.cpp +++ b/src/mame/drivers/pockstat.cpp @@ -844,18 +844,18 @@ WRITE32_MEMBER(pockstat_state::ps_audio_w) void pockstat_state::pockstat_mem(address_map &map) { map(0x00000000, 0x000007ff).ram(); - map(0x02000000, 0x02ffffff).r(this, FUNC(pockstat_state::ps_rombank_r)); + map(0x02000000, 0x02ffffff).r(FUNC(pockstat_state::ps_rombank_r)); map(0x04000000, 0x04003fff).rom().region("maincpu", 0); - map(0x06000000, 0x06000307).rw(this, FUNC(pockstat_state::ps_ftlb_r), FUNC(pockstat_state::ps_ftlb_w)); - map(0x08000000, 0x0801ffff).rw(this, FUNC(pockstat_state::ps_flash_r), FUNC(pockstat_state::ps_flash_w)); - map(0x0a000000, 0x0a000013).rw(this, FUNC(pockstat_state::ps_intc_r), FUNC(pockstat_state::ps_intc_w)); - map(0x0a800000, 0x0a80002b).rw(this, FUNC(pockstat_state::ps_timer_r), FUNC(pockstat_state::ps_timer_w)); - map(0x0b000000, 0x0b000007).rw(this, FUNC(pockstat_state::ps_clock_r), FUNC(pockstat_state::ps_clock_w)); - map(0x0b800000, 0x0b80000f).rw(this, FUNC(pockstat_state::ps_rtc_r), FUNC(pockstat_state::ps_rtc_w)); - map(0x0d000000, 0x0d000003).rw(this, FUNC(pockstat_state::ps_lcd_r), FUNC(pockstat_state::ps_lcd_w)); + map(0x06000000, 0x06000307).rw(FUNC(pockstat_state::ps_ftlb_r), FUNC(pockstat_state::ps_ftlb_w)); + map(0x08000000, 0x0801ffff).rw(FUNC(pockstat_state::ps_flash_r), FUNC(pockstat_state::ps_flash_w)); + map(0x0a000000, 0x0a000013).rw(FUNC(pockstat_state::ps_intc_r), FUNC(pockstat_state::ps_intc_w)); + map(0x0a800000, 0x0a80002b).rw(FUNC(pockstat_state::ps_timer_r), FUNC(pockstat_state::ps_timer_w)); + map(0x0b000000, 0x0b000007).rw(FUNC(pockstat_state::ps_clock_r), FUNC(pockstat_state::ps_clock_w)); + map(0x0b800000, 0x0b80000f).rw(FUNC(pockstat_state::ps_rtc_r), FUNC(pockstat_state::ps_rtc_w)); + map(0x0d000000, 0x0d000003).rw(FUNC(pockstat_state::ps_lcd_r), FUNC(pockstat_state::ps_lcd_w)); map(0x0d000100, 0x0d00017f).ram().share("lcd_buffer"); - map(0x0d80000c, 0x0d80000f).rw(this, FUNC(pockstat_state::ps_audio_r), FUNC(pockstat_state::ps_audio_w)); - map(0x0d800014, 0x0d800015).w("dac", FUNC(dac_word_interface::write)); + map(0x0d80000c, 0x0d80000f).rw(FUNC(pockstat_state::ps_audio_r), FUNC(pockstat_state::ps_audio_w)); + map(0x0d800014, 0x0d800015).w("dac", FUNC(dac_word_interface::data_w)); } /* Input ports */ diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp index b2316fa61a1..b9951b38e94 100644 --- a/src/mame/drivers/pofo.cpp +++ b/src/mame/drivers/pofo.cpp @@ -783,7 +783,7 @@ WRITE8_MEMBER( portfolio_state::io_w ) void portfolio_state::portfolio_mem(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(portfolio_state::mem_r), FUNC(portfolio_state::mem_w)); + map(0x00000, 0xfffff).rw(FUNC(portfolio_state::mem_r), FUNC(portfolio_state::mem_w)); } @@ -793,7 +793,7 @@ void portfolio_state::portfolio_mem(address_map &map) void portfolio_state::portfolio_io(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(portfolio_state::io_r), FUNC(portfolio_state::io_w)); + map(0x0000, 0xffff).rw(FUNC(portfolio_state::io_r), FUNC(portfolio_state::io_w)); } diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp index 132fd5c7f6e..d829c005e8e 100644 --- a/src/mame/drivers/poisk1.cpp +++ b/src/mame/drivers/poisk1.cpp @@ -629,12 +629,12 @@ void p1_state::poisk1_map(address_map &map) void p1_state::poisk1_io(address_map &map) { map(0x0020, 0x0021).rw(m_pic8259, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x0028, 0x002B).rw(this, FUNC(p1_state::p1_trap_r), FUNC(p1_state::p1_trap_w)); + map(0x0028, 0x002B).rw(FUNC(p1_state::p1_trap_r), FUNC(p1_state::p1_trap_w)); map(0x0040, 0x0043).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); // can't use regular AM_DEVREADWRITE, because THIS IS SPARTA! // 1st PPI occupies ports 60, 69, 6A and 6B; 2nd PPI -- 68, 61, 62 and 63. - map(0x0060, 0x006F).rw(this, FUNC(p1_state::p1_ppi_r), FUNC(p1_state::p1_ppi_w)); - map(0x03D0, 0x03DF).rw(this, FUNC(p1_state::p1_cga_r), FUNC(p1_state::p1_cga_w)); + map(0x0060, 0x006F).rw(FUNC(p1_state::p1_ppi_r), FUNC(p1_state::p1_ppi_w)); + map(0x03D0, 0x03DF).rw(FUNC(p1_state::p1_cga_r), FUNC(p1_state::p1_cga_w)); } static INPUT_PORTS_START( poisk1 ) diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp index 200f33f49ef..a2784703321 100644 --- a/src/mame/drivers/pokechmp.cpp +++ b/src/mame/drivers/pokechmp.cpp @@ -84,16 +84,16 @@ WRITE8_MEMBER(pokechmp_state::pokechmp_sound_w) void pokechmp_state::pokechmp_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x0800, 0x0fff).ram().w(this, FUNC(pokechmp_state::pokechmp_videoram_w)).share("videoram"); + map(0x0800, 0x0fff).ram().w(FUNC(pokechmp_state::pokechmp_videoram_w)).share("videoram"); map(0x1000, 0x11ff).ram().share("spriteram"); map(0x1800, 0x1800).portr("P1"); - map(0x1801, 0x1801).w(this, FUNC(pokechmp_state::pokechmp_flipscreen_w)); + map(0x1801, 0x1801).w(FUNC(pokechmp_state::pokechmp_flipscreen_w)); /* 1800 - 0x181f are unused BAC-06 registers, see video/dec0.c */ map(0x1802, 0x181f).nopw(); - map(0x1a00, 0x1a00).portr("P2").w(this, FUNC(pokechmp_state::pokechmp_sound_w)); - map(0x1c00, 0x1c00).portr("DSW").w(this, FUNC(pokechmp_state::pokechmp_bank_w)); + map(0x1a00, 0x1a00).portr("P2").w(FUNC(pokechmp_state::pokechmp_sound_w)); + map(0x1c00, 0x1c00).portr("DSW").w(FUNC(pokechmp_state::pokechmp_bank_w)); /* Extra on Poke Champ (not on Pocket Gal) */ map(0x2000, 0x23ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); @@ -112,7 +112,7 @@ void pokechmp_state::pokechmp_sound_map(address_map &map) map(0x0800, 0x0801).w("ym1", FUNC(ym2203_device::write)); map(0x1000, 0x1001).w("ym2", FUNC(ym3812_device::write)); map(0x1800, 0x1800).nopw(); /* MSM5205 chip on Pocket Gal, not connected here? */ - map(0x2000, 0x2000).w(this, FUNC(pokechmp_state::pokechmp_sound_bank_w)); /* sound rom bank seems to be replaced with OKI bank */ + map(0x2000, 0x2000).w(FUNC(pokechmp_state::pokechmp_sound_bank_w)); /* sound rom bank seems to be replaced with OKI bank */ map(0x2800, 0x2800).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // extra map(0x3000, 0x3000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); // AM_RANGE(0x3400, 0x3400) AM_READ(pokechmp_adpcm_reset_r) /* not on here */ diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp index c55834269a6..31e4e8645aa 100644 --- a/src/mame/drivers/pokemini.cpp +++ b/src/mame/drivers/pokemini.cpp @@ -129,8 +129,8 @@ void pokemini_state::pokemini_mem_map(address_map &map) { map(0x000000, 0x000fff).rom(); /* bios */ map(0x001000, 0x001fff).ram().share("p_ram"); /* VRAM/RAM */ - map(0x002000, 0x0020ff).rw(this, FUNC(pokemini_state::hwreg_r), FUNC(pokemini_state::hwreg_w)); /* hardware registers */ - map(0x002100, 0x1fffff).r(this, FUNC(pokemini_state::rom_r)); /* cartridge area */ + map(0x002000, 0x0020ff).rw(FUNC(pokemini_state::hwreg_r), FUNC(pokemini_state::hwreg_w)); /* hardware registers */ + map(0x002100, 0x1fffff).r(FUNC(pokemini_state::rom_r)); /* cartridge area */ } diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp index 25708b004c1..c925692c738 100644 --- a/src/mame/drivers/poker72.cpp +++ b/src/mame/drivers/poker72.cpp @@ -120,7 +120,7 @@ void poker72_state::poker72_map(address_map &map) map(0x0000, 0x7fff).bankr("bank1"); map(0xc000, 0xdfff).ram(); //work ram map(0xe000, 0xefff).ram().share("vram"); - map(0xf000, 0xfbff).ram().w(this, FUNC(poker72_state::poker72_paletteram_w)).share("pal"); + map(0xf000, 0xfbff).ram().w(FUNC(poker72_state::poker72_paletteram_w)).share("pal"); map(0xfc00, 0xfdff).ram(); //??? map(0xfe08, 0xfe08).portr("SW1"); map(0xfe09, 0xfe09).portr("IN1"); @@ -130,8 +130,8 @@ void poker72_state::poker72_map(address_map &map) map(0xfe0e, 0xfe0e).portr("SW6"); map(0xfe17, 0xfe17).nopr(); //irq ack - map(0xfe20, 0xfe20).w(this, FUNC(poker72_state::output_w)); //output, irq enable? - map(0xfe22, 0xfe22).w(this, FUNC(poker72_state::tile_bank_w)); + map(0xfe20, 0xfe20).w(FUNC(poker72_state::output_w)); //output, irq enable? + map(0xfe22, 0xfe22).w(FUNC(poker72_state::tile_bank_w)); map(0xfe40, 0xfe40).rw("ay", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0xfe60, 0xfe60).w("ay", FUNC(ay8910_device::address_w)); diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index ae8bf4bd9fe..30a9a5c46cc 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -412,17 +412,17 @@ void polepos_state::z80_map(address_map &map) { map(0x0000, 0x2fff).rom(); map(0x3000, 0x37ff).mirror(0x0800).ram().share("nvram"); /* Battery Backup */ - map(0x4000, 0x47ff).rw(this, FUNC(polepos_state::polepos_sprite_r), FUNC(polepos_state::polepos_sprite_w)); /* Motion Object */ - map(0x4800, 0x4bff).rw(this, FUNC(polepos_state::polepos_road_r), FUNC(polepos_state::polepos_road_w)); /* Road Memory */ - map(0x4c00, 0x4fff).rw(this, FUNC(polepos_state::polepos_alpha_r), FUNC(polepos_state::polepos_alpha_w)); /* Alphanumeric (char ram) */ - map(0x5000, 0x57ff).rw(this, FUNC(polepos_state::polepos_view_r), FUNC(polepos_state::polepos_view_w)); /* Background Memory */ + map(0x4000, 0x47ff).rw(FUNC(polepos_state::polepos_sprite_r), FUNC(polepos_state::polepos_sprite_w)); /* Motion Object */ + map(0x4800, 0x4bff).rw(FUNC(polepos_state::polepos_road_r), FUNC(polepos_state::polepos_road_w)); /* Road Memory */ + map(0x4c00, 0x4fff).rw(FUNC(polepos_state::polepos_alpha_r), FUNC(polepos_state::polepos_alpha_w)); /* Alphanumeric (char ram) */ + map(0x5000, 0x57ff).rw(FUNC(polepos_state::polepos_view_r), FUNC(polepos_state::polepos_view_w)); /* Background Memory */ map(0x8000, 0x83bf).mirror(0x0c00).ram(); /* Sound Memory */ map(0x83c0, 0x83ff).mirror(0x0c00).rw(m_namco_sound, FUNC(namco_device::polepos_sound_r), FUNC(namco_device::polepos_sound_w)); /* Sound data */ map(0x9000, 0x9000).mirror(0x0eff).rw("06xx", FUNC(namco_06xx_device::data_r), FUNC(namco_06xx_device::data_w)); map(0x9100, 0x9100).mirror(0x0eff).rw("06xx", FUNC(namco_06xx_device::ctrl_r), FUNC(namco_06xx_device::ctrl_w)); - map(0xa000, 0xa000).mirror(0x0cff).r(this, FUNC(polepos_state::polepos_ready_r)); /* READY */ + map(0xa000, 0xa000).mirror(0x0cff).r(FUNC(polepos_state::polepos_ready_r)); /* READY */ map(0xa000, 0xa007).mirror(0x0cf8).w(m_latch, FUNC(ls259_device::write_d0)); map(0xa100, 0xa100).mirror(0x0cff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xa200, 0xa200).mirror(0x0cff).w("polepos", FUNC(polepos_sound_device::polepos_engine_sound_lsb_w)); /* Car Sound ( Lower Nibble ) */ @@ -432,7 +432,7 @@ void polepos_state::z80_map(address_map &map) void polepos_state::z80_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(polepos_state::polepos_adc_r)).nopw(); + map(0x00, 0x00).r(FUNC(polepos_state::polepos_adc_r)).nopw(); } @@ -440,24 +440,24 @@ void polepos_state::z80_io(address_map &map) void polepos_state::z8002_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8fff).rw(this, FUNC(polepos_state::polepos_sprite16_r), FUNC(polepos_state::polepos_sprite16_w)).share("sprite16_memory"); /* Motion Object */ - map(0x9000, 0x97ff).rw(this, FUNC(polepos_state::polepos_road16_r), FUNC(polepos_state::polepos_road16_w)).share("road16_memory"); /* Road Memory */ - map(0x9800, 0x9fff).rw(this, FUNC(polepos_state::polepos_alpha16_r), FUNC(polepos_state::polepos_alpha16_w)).share("alpha16_memory"); /* Alphanumeric (char ram) */ - map(0xa000, 0xafff).rw(this, FUNC(polepos_state::polepos_view16_r), FUNC(polepos_state::polepos_view16_w)).share("view16_memory"); /* Background memory */ - map(0xc000, 0xc001).mirror(0x38fe).w(this, FUNC(polepos_state::polepos_view16_hscroll_w)); /* Background horz scroll position */ - map(0xc100, 0xc101).mirror(0x38fe).w(this, FUNC(polepos_state::polepos_road16_vscroll_w)); /* Road vertical position */ + map(0x8000, 0x8fff).rw(FUNC(polepos_state::polepos_sprite16_r), FUNC(polepos_state::polepos_sprite16_w)).share("sprite16_memory"); /* Motion Object */ + map(0x9000, 0x97ff).rw(FUNC(polepos_state::polepos_road16_r), FUNC(polepos_state::polepos_road16_w)).share("road16_memory"); /* Road Memory */ + map(0x9800, 0x9fff).rw(FUNC(polepos_state::polepos_alpha16_r), FUNC(polepos_state::polepos_alpha16_w)).share("alpha16_memory"); /* Alphanumeric (char ram) */ + map(0xa000, 0xafff).rw(FUNC(polepos_state::polepos_view16_r), FUNC(polepos_state::polepos_view16_w)).share("view16_memory"); /* Background memory */ + map(0xc000, 0xc001).mirror(0x38fe).w(FUNC(polepos_state::polepos_view16_hscroll_w)); /* Background horz scroll position */ + map(0xc100, 0xc101).mirror(0x38fe).w(FUNC(polepos_state::polepos_road16_vscroll_w)); /* Road vertical position */ } void polepos_state::z8002_map_1(address_map &map) { z8002_map(map); - map(0x6000, 0x6001).mirror(0x0ffe).w(this, FUNC(polepos_state::polepos_z8002_nvi_enable_w)); /* NVI enable - *NOT* shared by the two CPUs */ + map(0x6000, 0x6001).mirror(0x0ffe).w(FUNC(polepos_state::polepos_z8002_nvi_enable_w)); /* NVI enable - *NOT* shared by the two CPUs */ } void polepos_state::z8002_map_2(address_map &map) { z8002_map(map); - map(0x6000, 0x6001).mirror(0x0ffe).w(this, FUNC(polepos_state::polepos_z8002_nvi_enable_w)); /* NVI enable - *NOT* shared by the two CPUs */ + map(0x6000, 0x6001).mirror(0x0ffe).w(FUNC(polepos_state::polepos_z8002_nvi_enable_w)); /* NVI enable - *NOT* shared by the two CPUs */ } @@ -956,9 +956,9 @@ void polepos_state::topracern_io(address_map &map) z80_io(map); // extra direct mapped inputs read map(0x02, 0x02).portr("STEER").nopw(); - map(0x03, 0x03).portr("IN0").w("dac", FUNC(dac_byte_interface::write)); + map(0x03, 0x03).portr("IN0").w("dac", FUNC(dac_byte_interface::data_w)); map(0x04, 0x04).portr("DSWA").nopw(); // explosion sound trigger - map(0x05, 0x05).portr("DSWB").w(this, FUNC(polepos_state::bootleg_soundlatch_w)); + map(0x05, 0x05).portr("DSWB").w(FUNC(polepos_state::bootleg_soundlatch_w)); } void polepos_state::sound_z80_bootleg_map(address_map &map) diff --git a/src/mame/drivers/polgar.cpp b/src/mame/drivers/polgar.cpp index 90ea1ef4fc4..c0686570977 100644 --- a/src/mame/drivers/polgar.cpp +++ b/src/mame/drivers/polgar.cpp @@ -182,7 +182,7 @@ void mephisto_polgar_state::polgar_mem(address_map &map) map(0x2004, 0x2004).w("display", FUNC(mephisto_display_modul_device::io_w)); map(0x2400, 0x2400).w("board", FUNC(mephisto_board_device::led_w)); map(0x2800, 0x2800).w("board", FUNC(mephisto_board_device::mux_w)); - map(0x2c00, 0x2c07).r(this, FUNC(mephisto_polgar_state::polgar_keys_r)); + map(0x2c00, 0x2c07).r(FUNC(mephisto_polgar_state::polgar_keys_r)); map(0x3000, 0x3000).r("board", FUNC(mephisto_board_device::input_r)); map(0x3400, 0x3407).w("outlatch", FUNC(hc259_device::write_d7)); map(0x4000, 0xffff).rom(); @@ -238,13 +238,13 @@ void mephisto_risc_state::mrisc_mem(address_map &map) map(0x0000, 0x1fff).ram().share("nvram"); map(0x2000, 0x2000).w("display", FUNC(mephisto_display_modul_device::latch_w)); map(0x2004, 0x2004).w("display", FUNC(mephisto_display_modul_device::io_w)); - map(0x2c00, 0x2c07).r(this, FUNC(mephisto_risc_state::polgar_keys_r)); + map(0x2c00, 0x2c07).r(FUNC(mephisto_risc_state::polgar_keys_r)); map(0x2400, 0x2400).w("board", FUNC(mephisto_board_device::led_w)); map(0x2800, 0x2800).w("board", FUNC(mephisto_board_device::mux_w)); map(0x3000, 0x3000).r("board", FUNC(mephisto_board_device::input_r)); map(0x3400, 0x3407).w("outlatch", FUNC(hc259_device::write_d7)); - map(0x3800, 0x3800).w(this, FUNC(mephisto_risc_state::latch1_w)); - map(0x3c00, 0x3c00).r(this, FUNC(mephisto_risc_state::latch0_r)); + map(0x3800, 0x3800).w(FUNC(mephisto_risc_state::latch1_w)); + map(0x3c00, 0x3c00).r(FUNC(mephisto_risc_state::latch0_r)); map(0x4000, 0x7fff).rom(); map(0x8000, 0xffff).bankr("rombank"); } @@ -253,8 +253,8 @@ void mephisto_risc_state::mrisc_mem(address_map &map) void mephisto_risc_state::mrisc_arm_mem(address_map &map) { map(0x00000000, 0x000fffff).ram(); - map(0x00400000, 0x007fffff).rw(this, FUNC(mephisto_risc_state::latch1_r), FUNC(mephisto_risc_state::latch0_w)).umask32(0x000000ff); - map(0x01800000, 0x01800003).r(this, FUNC(mephisto_risc_state::disable_boot_rom_r)); + map(0x00400000, 0x007fffff).rw(FUNC(mephisto_risc_state::latch1_r), FUNC(mephisto_risc_state::latch0_w)).umask32(0x000000ff); + map(0x01800000, 0x01800003).r(FUNC(mephisto_risc_state::disable_boot_rom_r)); } @@ -291,11 +291,11 @@ void mephisto_milano_state::milano_mem(address_map &map) map(0x0000, 0x1fbf).ram().share("nvram"); map(0x1fc0, 0x1fc0).w(m_display, FUNC(mephisto_display_modul_device::latch_w)); - map(0x1fd0, 0x1fd0).w(this, FUNC(mephisto_milano_state::milano_led_w)); - map(0x1fe0, 0x1fe0).r(this, FUNC(mephisto_milano_state::milano_input_r)); + map(0x1fd0, 0x1fd0).w(FUNC(mephisto_milano_state::milano_led_w)); + map(0x1fe0, 0x1fe0).r(FUNC(mephisto_milano_state::milano_input_r)); map(0x1fe8, 0x1fef).w("outlatch", FUNC(hc259_device::write_d7)); - map(0x1fd8, 0x1fdf).r(this, FUNC(mephisto_milano_state::polgar_keys_r)); - map(0x1ff0, 0x1ff0).w(this, FUNC(mephisto_milano_state::milano_io_w)); + map(0x1fd8, 0x1fdf).r(FUNC(mephisto_milano_state::polgar_keys_r)); + map(0x1ff0, 0x1ff0).w(FUNC(mephisto_milano_state::milano_io_w)); map(0x2000, 0xffff).rom(); } @@ -342,10 +342,10 @@ WRITE8_MEMBER(mephisto_modena_state::modena_digits_w) void mephisto_modena_state::modena_mem(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); - map(0x4000, 0x4000).w(this, FUNC(mephisto_modena_state::modena_digits_w)); - map(0x5000, 0x5000).w(this, FUNC(mephisto_modena_state::modena_led_w)); - map(0x6000, 0x6000).w(this, FUNC(mephisto_modena_state::modena_io_w)); - map(0x7000, 0x7fff).r(this, FUNC(mephisto_modena_state::modena_input_r)); + map(0x4000, 0x4000).w(FUNC(mephisto_modena_state::modena_digits_w)); + map(0x5000, 0x5000).w(FUNC(mephisto_modena_state::modena_led_w)); + map(0x6000, 0x6000).w(FUNC(mephisto_modena_state::modena_io_w)); + map(0x7000, 0x7fff).r(FUNC(mephisto_modena_state::modena_input_r)); map(0x8000, 0xffff).rom(); } @@ -385,11 +385,11 @@ READ8_MEMBER(mephisto_academy_state::academy_input_r) void mephisto_academy_state::academy_mem(address_map &map) { map(0x0000, 0x1fff).ram().share("nvram"); - map(0x2400, 0x2400).r(this, FUNC(mephisto_academy_state::academy_input_r)); + map(0x2400, 0x2400).r(FUNC(mephisto_academy_state::academy_input_r)); map(0x2800, 0x2800).w(m_board, FUNC(mephisto_board_device::mux_w)); map(0x2c00, 0x2c00).w(m_board, FUNC(mephisto_board_device::led_w)); map(0x3000, 0x3007).w("outlatch", FUNC(hc259_device::write_d7)); - map(0x3400, 0x3400).w(this, FUNC(mephisto_academy_state::academy_led_w)); + map(0x3400, 0x3400).w(FUNC(mephisto_academy_state::academy_led_w)); map(0x3800, 0x3801).rw("display:hd44780", FUNC(hd44780_device::read), FUNC(hd44780_device::write)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp index f70eafbdf39..8ce78866957 100644 --- a/src/mame/drivers/policetr.cpp +++ b/src/mame/drivers/policetr.cpp @@ -244,15 +244,15 @@ WRITE32_MEMBER(policetr_state::speedup_w) void policetr_state::policetr_map(address_map &map) { map(0x00000000, 0x0001ffff).ram().share("rambase"); - map(0x00200000, 0x0020000f).w(this, FUNC(policetr_state::policetr_video_w)); - map(0x00400000, 0x00400003).r(this, FUNC(policetr_state::policetr_video_r)); + map(0x00200000, 0x0020000f).w(FUNC(policetr_state::policetr_video_w)); + map(0x00400000, 0x00400003).r(FUNC(policetr_state::policetr_video_r)); map(0x00500000, 0x00500003).nopw(); // copies ROM here at startup, plus checksum - map(0x00600000, 0x00600003).r(this, FUNC(policetr_state::bsmt2000_data_r)); - map(0x00700000, 0x00700003).w(this, FUNC(policetr_state::policetr_bsmt2000_reg_w)); - map(0x00800000, 0x00800003).w(this, FUNC(policetr_state::policetr_bsmt2000_data_w)); - map(0x00900000, 0x00900003).w(this, FUNC(policetr_state::policetr_palette_offset_w)); - map(0x00920000, 0x00920003).w(this, FUNC(policetr_state::policetr_palette_data_w)); - map(0x00a00000, 0x00a00003).w(this, FUNC(policetr_state::control_w)); + map(0x00600000, 0x00600003).r(FUNC(policetr_state::bsmt2000_data_r)); + map(0x00700000, 0x00700003).w(FUNC(policetr_state::policetr_bsmt2000_reg_w)); + map(0x00800000, 0x00800003).w(FUNC(policetr_state::policetr_bsmt2000_data_w)); + map(0x00900000, 0x00900003).w(FUNC(policetr_state::policetr_palette_offset_w)); + map(0x00920000, 0x00920003).w(FUNC(policetr_state::policetr_palette_data_w)); + map(0x00a00000, 0x00a00003).w(FUNC(policetr_state::control_w)); map(0x00a00000, 0x00a00003).portr("IN0"); map(0x00a20000, 0x00a20003).portr("IN1"); map(0x00a40000, 0x00a40003).portr("DSW"); @@ -264,15 +264,15 @@ void policetr_state::policetr_map(address_map &map) void policetr_state::sshooter_map(address_map &map) { map(0x00000000, 0x0001ffff).ram().share("rambase"); - map(0x00200000, 0x00200003).w(this, FUNC(policetr_state::policetr_bsmt2000_data_w)); - map(0x00300000, 0x00300003).w(this, FUNC(policetr_state::policetr_palette_offset_w)); - map(0x00320000, 0x00320003).w(this, FUNC(policetr_state::policetr_palette_data_w)); - map(0x00400000, 0x00400003).r(this, FUNC(policetr_state::policetr_video_r)); + map(0x00200000, 0x00200003).w(FUNC(policetr_state::policetr_bsmt2000_data_w)); + map(0x00300000, 0x00300003).w(FUNC(policetr_state::policetr_palette_offset_w)); + map(0x00320000, 0x00320003).w(FUNC(policetr_state::policetr_palette_data_w)); + map(0x00400000, 0x00400003).r(FUNC(policetr_state::policetr_video_r)); map(0x00500000, 0x00500003).nopw(); // copies ROM here at startup, plus checksum - map(0x00600000, 0x00600003).r(this, FUNC(policetr_state::bsmt2000_data_r)); - map(0x00700000, 0x00700003).w(this, FUNC(policetr_state::policetr_bsmt2000_reg_w)); - map(0x00800000, 0x0080000f).w(this, FUNC(policetr_state::policetr_video_w)); - map(0x00a00000, 0x00a00003).w(this, FUNC(policetr_state::control_w)); + map(0x00600000, 0x00600003).r(FUNC(policetr_state::bsmt2000_data_r)); + map(0x00700000, 0x00700003).w(FUNC(policetr_state::policetr_bsmt2000_reg_w)); + map(0x00800000, 0x0080000f).w(FUNC(policetr_state::policetr_video_w)); + map(0x00a00000, 0x00a00003).w(FUNC(policetr_state::control_w)); map(0x00a00000, 0x00a00003).portr("IN0"); map(0x00a20000, 0x00a20003).portr("IN1"); map(0x00a40000, 0x00a40003).portr("DSW"); diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp index 95f33b49f6b..0154f503671 100644 --- a/src/mame/drivers/poly.cpp +++ b/src/mame/drivers/poly.cpp @@ -40,29 +40,29 @@ void poly_state::poly_bank(address_map &map) { map.unmap_value_high(); /* System mode */ - map(0x00000, 0x0ffff).rw(this, FUNC(poly_state::logical_mem_r), FUNC(poly_state::logical_mem_w)); // Logical Memory + map(0x00000, 0x0ffff).rw(FUNC(poly_state::logical_mem_r), FUNC(poly_state::logical_mem_w)); // Logical Memory map(0x0e000, 0x0e003).rw(m_pia[0], FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // Video control PIA 6821 map(0x0e004, 0x0e005).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Optional RS232 Interface - map(0x0e006, 0x0e006).w(this, FUNC(poly_state::baud_rate_w)); // Baud rate controller + map(0x0e006, 0x0e006).w(FUNC(poly_state::baud_rate_w)); // Baud rate controller map(0x0e00c, 0x0e00f).rw(m_pia[1], FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // Keyboard PIA 6821 map(0x0e020, 0x0e027).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); // Timer 6840 - map(0x0e030, 0x0e036).rw(this, FUNC(poly_state::network_r), FUNC(poly_state::network_w)); // Data Link Controller 6854 - map(0x0e040, 0x0e040).w(this, FUNC(poly_state::set_protect_w)); // Set protect flip-flop after 1 E-cycle + map(0x0e030, 0x0e036).rw(FUNC(poly_state::network_r), FUNC(poly_state::network_w)); // Data Link Controller 6854 + map(0x0e040, 0x0e040).w(FUNC(poly_state::set_protect_w)); // Set protect flip-flop after 1 E-cycle map(0x0e050, 0x0e05f).ram().share("dat"); // Dynamic Address Translator - map(0x0e060, 0x0e060).rw(this, FUNC(poly_state::select_map_r), FUNC(poly_state::select_map1_w)); // Select Map 1 - map(0x0e070, 0x0e070).rw(this, FUNC(poly_state::select_map_r), FUNC(poly_state::select_map2_w)); // Select Map 2 + map(0x0e060, 0x0e060).rw(FUNC(poly_state::select_map_r), FUNC(poly_state::select_map1_w)); // Select Map 1 + map(0x0e070, 0x0e070).rw(FUNC(poly_state::select_map_r), FUNC(poly_state::select_map2_w)); // Select Map 2 map(0x0e800, 0x0efff).ram().share("videoram"); // Teletext screens and System data map(0x0f000, 0x0ffff).rom().region("system", 0); // System Program ROM /* User mode */ - map(0x10000, 0x1ffff).rw(this, FUNC(poly_state::logical_mem_r), FUNC(poly_state::logical_mem_w)); // Logical Memory - map(0x1fff0, 0x1ffff).r(this, FUNC(poly_state::vector_r)); // Vector fetch (interrupt and reset) + map(0x10000, 0x1ffff).rw(FUNC(poly_state::logical_mem_r), FUNC(poly_state::logical_mem_w)); // Logical Memory + map(0x1fff0, 0x1ffff).r(FUNC(poly_state::vector_r)); // Vector fetch (interrupt and reset) } void polydev_state::poly_bank(address_map &map) { poly_state::poly_bank(map); - map(0x0e014, 0x0e014).rw(this, FUNC(polydev_state::drive_register_r), FUNC(polydev_state::drive_register_w)); // Drive register - map(0x0e018, 0x0e01b).rw(this, FUNC(polydev_state::fdc_inv_r), FUNC(polydev_state::fdc_inv_w)); // Floppy controller + map(0x0e014, 0x0e014).rw(FUNC(polydev_state::drive_register_r), FUNC(polydev_state::drive_register_w)); // Drive register + map(0x0e018, 0x0e01b).rw(FUNC(polydev_state::fdc_inv_r), FUNC(polydev_state::fdc_inv_w)); // Floppy controller } void poly_state::poly_mem(address_map &map) diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp index e4c2462be4e..90d453e84ca 100644 --- a/src/mame/drivers/poly88.cpp +++ b/src/mame/drivers/poly88.cpp @@ -66,9 +66,9 @@ void poly88_state::poly88_io(address_map &map) map.global_mask(0xff); map(0x00, 0x00).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x01, 0x01).rw(m_uart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x04, 0x04).w(this, FUNC(poly88_state::poly88_baud_rate_w)); - map(0x08, 0x08).w(this, FUNC(poly88_state::poly88_intr_w)); - map(0xf8, 0xf8).r(this, FUNC(poly88_state::poly88_keyboard_r)); + map(0x04, 0x04).w(FUNC(poly88_state::poly88_baud_rate_w)); + map(0x08, 0x08).w(FUNC(poly88_state::poly88_intr_w)); + map(0xf8, 0xf8).r(FUNC(poly88_state::poly88_keyboard_r)); } void poly88_state::poly8813_mem(address_map &map) diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp index 9180f7a5f27..a4aeedbf29d 100644 --- a/src/mame/drivers/poly880.cpp +++ b/src/mame/drivers/poly880.cpp @@ -78,7 +78,7 @@ void poly880_state::poly880_io(address_map &map) map(0x80, 0x83).rw(Z80PIO1_TAG, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x84, 0x87).rw(Z80PIO2_TAG, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x88, 0x8b).rw(Z80CTC_TAG, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0xa0, 0xa0).mirror(0x0f).w(this, FUNC(poly880_state::cldig_w)); + map(0xa0, 0xa0).mirror(0x0f).w(FUNC(poly880_state::cldig_w)); } /* Input Ports */ diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp index 49c69a7acee..2652d8c1350 100644 --- a/src/mame/drivers/polyplay.cpp +++ b/src/mame/drivers/polyplay.cpp @@ -203,7 +203,7 @@ void polyplay_state::polyplay_mem_zre(address_map &map) map(0x0c00, 0x0fff).ram(); map(0x1000, 0x8fff).rom(); map(0xe800, 0xebff).rom().region("gfx1", 0); - map(0xec00, 0xf7ff).ram().w(this, FUNC(polyplay_state::polyplay_characterram_w)).share("characterram"); + map(0xec00, 0xf7ff).ram().w(FUNC(polyplay_state::polyplay_characterram_w)).share("characterram"); map(0xf800, 0xffff).ram().share("videoram"); } @@ -216,7 +216,7 @@ void polyplay_state::polyplay_mem_zrepp(address_map &map) map(0xd000, 0xd7ff).rom().region("gfx1", 0); map(0xea00, 0xebff).ram(); - map(0xec00, 0xf7ff).ram().w(this, FUNC(polyplay_state::polyplay_characterram_w)).share("characterram"); + map(0xec00, 0xf7ff).ram().w(FUNC(polyplay_state::polyplay_characterram_w)).share("characterram"); map(0xf800, 0xffff).ram().share("videoram"); } diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp index 06b00388fba..fbfe8af431a 100644 --- a/src/mame/drivers/poolshrk.cpp +++ b/src/mame/drivers/poolshrk.cpp @@ -108,15 +108,15 @@ void poolshrk_state::poolshrk_cpu_map(address_map &map) map(0x0400, 0x07ff).mirror(0x2000).writeonly().share("playfield_ram"); map(0x0800, 0x080f).mirror(0x23f0).writeonly().share("hpos_ram"); map(0x0c00, 0x0c0f).mirror(0x23f0).writeonly().share("vpos_ram"); - map(0x1000, 0x13ff).mirror(0x2000).rw(this, FUNC(poolshrk_state::input_r), FUNC(poolshrk_state::watchdog_w)); - map(0x1400, 0x17ff).mirror(0x2000).w(this, FUNC(poolshrk_state::scratch_sound_w)); - map(0x1800, 0x1bff).mirror(0x2000).w(this, FUNC(poolshrk_state::score_sound_w)); - map(0x1c00, 0x1fff).mirror(0x2000).w(this, FUNC(poolshrk_state::click_sound_w)); + map(0x1000, 0x13ff).mirror(0x2000).rw(FUNC(poolshrk_state::input_r), FUNC(poolshrk_state::watchdog_w)); + map(0x1400, 0x17ff).mirror(0x2000).w(FUNC(poolshrk_state::scratch_sound_w)); + map(0x1800, 0x1bff).mirror(0x2000).w(FUNC(poolshrk_state::score_sound_w)); + map(0x1c00, 0x1fff).mirror(0x2000).w(FUNC(poolshrk_state::click_sound_w)); map(0x4000, 0x4000).noprw(); /* diagnostic ROM location */ - map(0x6000, 0x63ff).w(this, FUNC(poolshrk_state::da_latch_w)); - map(0x6400, 0x67ff).w(this, FUNC(poolshrk_state::bump_sound_w)); - map(0x6800, 0x6bff).r(this, FUNC(poolshrk_state::irq_reset_r)); - map(0x6c00, 0x6fff).w(this, FUNC(poolshrk_state::led_w)); + map(0x6000, 0x63ff).w(FUNC(poolshrk_state::da_latch_w)); + map(0x6400, 0x67ff).w(FUNC(poolshrk_state::bump_sound_w)); + map(0x6800, 0x6bff).r(FUNC(poolshrk_state::irq_reset_r)); + map(0x6c00, 0x6fff).w(FUNC(poolshrk_state::led_w)); map(0x7000, 0x7fff).rom(); } diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp index 055843ca021..5ae1bf497b4 100644 --- a/src/mame/drivers/pooyan.cpp +++ b/src/mame/drivers/pooyan.cpp @@ -67,8 +67,8 @@ WRITE_LINE_MEMBER(pooyan_state::coin_counter_2_w) void pooyan_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(pooyan_state::colorram_w)).share("colorram"); - map(0x8400, 0x87ff).ram().w(this, FUNC(pooyan_state::videoram_w)).share("videoram"); + map(0x8000, 0x83ff).ram().w(FUNC(pooyan_state::colorram_w)).share("colorram"); + map(0x8400, 0x87ff).ram().w(FUNC(pooyan_state::videoram_w)).share("videoram"); map(0x8800, 0x8fff).ram(); map(0x9000, 0x90ff).mirror(0x0b00).ram().share("spriteram"); map(0x9400, 0x94ff).mirror(0x0b00).ram().share("spriteram2"); diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp index 7fe5aeac515..7f8362c992e 100644 --- a/src/mame/drivers/popeye.cpp +++ b/src/mame/drivers/popeye.cpp @@ -260,10 +260,10 @@ void tnx1_state::maincpu_program_map(address_map &map) map(0x8800, 0x8bff).nopw(); // Attempts to initialize this area with 00 on boot map(0x8c00, 0x8e7f).ram().share("dmasource"); map(0x8e80, 0x8fff).ram(); - map(0xa000, 0xa3ff).w(this, FUNC(tnx1_state::popeye_videoram_w)).share("videoram"); - map(0xa400, 0xa7ff).w(this, FUNC(tnx1_state::popeye_colorram_w)).share("colorram"); - map(0xc000, 0xcfff).w(this, FUNC(tnx1_state::background_w)); - map(0xe000, 0xe001).rw(this, FUNC(tnx1_state::protection_r), FUNC(tnx1_state::protection_w)); + map(0xa000, 0xa3ff).w(FUNC(tnx1_state::popeye_videoram_w)).share("videoram"); + map(0xa400, 0xa7ff).w(FUNC(tnx1_state::popeye_colorram_w)).share("colorram"); + map(0xc000, 0xcfff).w(FUNC(tnx1_state::background_w)); + map(0xe000, 0xe001).rw(FUNC(tnx1_state::protection_r), FUNC(tnx1_state::protection_w)); } void tpp2_state::maincpu_program_map(address_map &map) @@ -271,7 +271,7 @@ void tpp2_state::maincpu_program_map(address_map &map) tpp1_state::maincpu_program_map(map); map(0x8000, 0x87ff).unmaprw(); // 7f (unpopulated) map(0x8800, 0x8bff).ram(); // 7h - map(0xc000, 0xdfff).w(this, FUNC(tpp2_state::background_w)); + map(0xc000, 0xdfff).w(FUNC(tpp2_state::background_w)); } void tpp2_noalu_state::maincpu_program_map(address_map &map) @@ -346,7 +346,7 @@ protected: { T::maincpu_program_map(map); map(0x0000, 0x7fff).rom().region("brazehs", 0); - map(0x9000, 0x9000).rw(this, FUNC(brazehs::eeprom_r), FUNC(brazehs::eeprom_w)); + map(0x9000, 0x9000).rw(FUNC(brazehs::eeprom_r), FUNC(brazehs::eeprom_w)); } }; diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp index 5bd8c69091e..03884e0abbe 100644 --- a/src/mame/drivers/popobear.cpp +++ b/src/mame/drivers/popobear.cpp @@ -479,7 +479,7 @@ void popobear_state::popobear_mem(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x210000, 0x21ffff).ram(); map(0x280000, 0x2fffff).ram().share("spr"); // unknown boundaries, 0x2ff800 contains a sprite list, lower area = sprite gfx - map(0x300000, 0x3fffff).ram().w(this, FUNC(popobear_state::vram_w)).share("vram"); // tile definitions + tilemaps + map(0x300000, 0x3fffff).ram().w(FUNC(popobear_state::vram_w)).share("vram"); // tile definitions + tilemaps /* Most if not all of these are vregs */ @@ -489,7 +489,7 @@ void popobear_state::popobear_mem(address_map &map) // AM_RANGE(0x480020, 0x480021) AM_NOP //AM_READ(480020_r) AM_WRITE(480020_w) // AM_RANGE(0x480028, 0x480029) AM_NOP //AM_WRITE(480028_w) // AM_RANGE(0x48002c, 0x48002d) AM_NOP //AM_WRITE(48002c_w) - map(0x480031, 0x480031).w(this, FUNC(popobear_state::irq_ack_w)); + map(0x480031, 0x480031).w(FUNC(popobear_state::irq_ack_w)); map(0x480034, 0x480035).ram(); // coin counter or coin lockout map(0x48003a, 0x48003b).ram(); //AM_READ(48003a_r) AM_WRITE(48003a_w) @@ -501,7 +501,7 @@ void popobear_state::popobear_mem(address_map &map) map(0x550000, 0x550003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); map(0x600000, 0x600001).nopw(); - map(0x620000, 0x620000).r(this, FUNC(popobear_state::_620000_r)); + map(0x620000, 0x620000).r(FUNC(popobear_state::_620000_r)); map(0x620000, 0x620001).nopw(); map(0x800000, 0xbfffff).rom(); } diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp index 45c84b7f6b1..f662fcbe193 100644 --- a/src/mame/drivers/popper.cpp +++ b/src/mame/drivers/popper.cpp @@ -131,23 +131,23 @@ void popper_state::main_map(address_map &map) map(0xcf00, 0xcfff).ram(); map(0xd000, 0xd7ff).ram().share("sprite_ram"); map(0xd800, 0xdfff).ram().share("shared"); - map(0xe000, 0xe003).mirror(0x03fc).r(this, FUNC(popper_state::inputs_r)); - map(0xe000, 0xe000).mirror(0x1ff8).w(this, FUNC(popper_state::nmi_control_w)); - map(0xe001, 0xe001).mirror(0x1ff8).w(this, FUNC(popper_state::crt_direction_w)); - map(0xe002, 0xe002).mirror(0x1ff8).w(this, FUNC(popper_state::back_color_select_w)); - map(0xe003, 0xe003).mirror(0x1ff8).w(this, FUNC(popper_state::vram_page_select_w)); - map(0xe004, 0xe007).mirror(0x1ff8).w(this, FUNC(popper_state::intcycle_w)); - map(0xe400, 0xe400).mirror(0x03ff).r(this, FUNC(popper_state::subcpu_nmi_r)); + map(0xe000, 0xe003).mirror(0x03fc).r(FUNC(popper_state::inputs_r)); + map(0xe000, 0xe000).mirror(0x1ff8).w(FUNC(popper_state::nmi_control_w)); + map(0xe001, 0xe001).mirror(0x1ff8).w(FUNC(popper_state::crt_direction_w)); + map(0xe002, 0xe002).mirror(0x1ff8).w(FUNC(popper_state::back_color_select_w)); + map(0xe003, 0xe003).mirror(0x1ff8).w(FUNC(popper_state::vram_page_select_w)); + map(0xe004, 0xe007).mirror(0x1ff8).w(FUNC(popper_state::intcycle_w)); + map(0xe400, 0xe400).mirror(0x03ff).r(FUNC(popper_state::subcpu_nmi_r)); map(0xe800, 0xf7ff).noprw(); - map(0xf800, 0xf800).mirror(0x03ff).r(this, FUNC(popper_state::subcpu_reset_r)); - map(0xfc00, 0xfc00).mirror(0x03ff).r(this, FUNC(popper_state::watchdog_clear_r)); + map(0xf800, 0xf800).mirror(0x03ff).r(FUNC(popper_state::subcpu_reset_r)); + map(0xfc00, 0xfc00).mirror(0x03ff).r(FUNC(popper_state::watchdog_clear_r)); } void popper_state::sub_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x7fff).noprw(); - map(0x8000, 0x8003).mirror(0x1ffc).w(this, FUNC(popper_state::ay1_w)); + map(0x8000, 0x8003).mirror(0x1ffc).w(FUNC(popper_state::ay1_w)); map(0xa000, 0xa003).mirror(0x1ffc).w("ay2", FUNC(ay8910_device::write_bc1_bc2)); map(0xc000, 0xc7ff).mirror(0x1800).ram().share("shared"); map(0xe000, 0xffff).noprw(); diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp index ffddda0d0e2..7c363b15f4c 100644 --- a/src/mame/drivers/portrait.cpp +++ b/src/mame/drivers/portrait.cpp @@ -125,18 +125,18 @@ WRITE8_MEMBER(portrait_state::negative_scroll_w) void portrait_state::portrait_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(this, FUNC(portrait_state::bgvideo_write)).share("bgvideoram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(portrait_state::fgvideo_write)).share("fgvideoram"); + map(0x8000, 0x87ff).ram().w(FUNC(portrait_state::bgvideo_write)).share("bgvideoram"); + map(0x8800, 0x8fff).ram().w(FUNC(portrait_state::fgvideo_write)).share("fgvideoram"); map(0x9000, 0x91ff).ram().share("spriteram"); map(0x9200, 0x97ff).ram(); map(0xa000, 0xa000).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xa010, 0xa010).nopw(); // ? map(0xa000, 0xa000).portr("DSW1"); map(0xa004, 0xa004).portr("DSW2"); - map(0xa008, 0xa008).portr("SYSTEM").w(this, FUNC(portrait_state::ctrl_w)); + map(0xa008, 0xa008).portr("SYSTEM").w(FUNC(portrait_state::ctrl_w)); map(0xa010, 0xa010).portr("INPUTS"); - map(0xa018, 0xa018).nopr().w(this, FUNC(portrait_state::positive_scroll_w)); - map(0xa019, 0xa019).w(this, FUNC(portrait_state::negative_scroll_w)); + map(0xa018, 0xa018).nopr().w(FUNC(portrait_state::positive_scroll_w)); + map(0xa019, 0xa019).w(FUNC(portrait_state::negative_scroll_w)); map(0xa800, 0xa83f).ram().share("nvram"); map(0xffff, 0xffff).nopr(); } diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp index 46b92ae4347..28362b2ac3d 100644 --- a/src/mame/drivers/powerbal.cpp +++ b/src/mame/drivers/powerbal.cpp @@ -111,14 +111,14 @@ void powerbal_state::magicstk_main_map(address_map &map) map(0x088000, 0x0883ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x094000, 0x094001).nopw(); map(0x094002, 0x094003).nopw(); - map(0x094004, 0x094005).w(this, FUNC(powerbal_state::tile_banking_w)); - map(0x098180, 0x09917f).ram().w(this, FUNC(powerbal_state::magicstk_bgvideoram_w)).share("videoram1"); + map(0x094004, 0x094005).w(FUNC(powerbal_state::tile_banking_w)); + map(0x098180, 0x09917f).ram().w(FUNC(powerbal_state::magicstk_bgvideoram_w)).share("videoram1"); map(0x0c2010, 0x0c2011).portr("IN0"); map(0x0c2012, 0x0c2013).portr("IN1"); - map(0x0c2014, 0x0c2015).portr("IN2").w(this, FUNC(powerbal_state::magicstk_coin_eeprom_w)); + map(0x0c2014, 0x0c2015).portr("IN2").w(FUNC(powerbal_state::magicstk_coin_eeprom_w)); map(0x0c2016, 0x0c2017).portr("DSW1"); map(0x0c2018, 0x0c2019).portr("DSW2"); - map(0x0c201c, 0x0c201d).w(this, FUNC(powerbal_state::oki_banking)); + map(0x0c201c, 0x0c201d).w(FUNC(powerbal_state::oki_banking)); map(0x0c201f, 0x0c201f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0c4000, 0x0c4001).nopw(); map(0x0e0000, 0x0fffff).ram(); @@ -131,15 +131,15 @@ void powerbal_state::powerbal_main_map(address_map &map) map(0x088000, 0x0883ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x094000, 0x094001).nopw(); map(0x094002, 0x094003).nopw(); - map(0x094004, 0x094005).w(this, FUNC(powerbal_state::tile_banking_w)); - map(0x098000, 0x098fff).ram().w(this, FUNC(powerbal_state::magicstk_bgvideoram_w)).share("videoram1"); + map(0x094004, 0x094005).w(FUNC(powerbal_state::tile_banking_w)); + map(0x098000, 0x098fff).ram().w(FUNC(powerbal_state::magicstk_bgvideoram_w)).share("videoram1"); map(0x099000, 0x09bfff).ram(); // not used map(0x0c2010, 0x0c2011).portr("IN0"); map(0x0c2012, 0x0c2013).portr("IN1"); map(0x0c2014, 0x0c2015).portr("IN2"); map(0x0c2016, 0x0c2017).portr("DSW1"); map(0x0c2018, 0x0c2019).portr("DSW2"); - map(0x0c201c, 0x0c201d).w(this, FUNC(powerbal_state::oki_banking)); + map(0x0c201c, 0x0c201d).w(FUNC(powerbal_state::oki_banking)); map(0x0c201f, 0x0c201f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0c4000, 0x0c4001).nopw(); map(0x0f0000, 0x0fffff).ram(); @@ -154,15 +154,15 @@ void powerbal_state::atombjt_map(address_map &map) map(0x080008, 0x080009).nopr(); // remnant of the original? map(0x080014, 0x080015).noprw(); // always 1 in this bootleg. Flip-screen switch not present according to dip sheet. map(0x088000, 0x0883ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x094000, 0x094001).w(this, FUNC(powerbal_state::atombjt_tile_banking_w)); + map(0x094000, 0x094001).w(FUNC(powerbal_state::atombjt_tile_banking_w)); map(0x094002, 0x094003).noprw(); /* IRQ enable? */ - map(0x09c000, 0x09cfff).mirror(0x1000).ram().w(this, FUNC(powerbal_state::magicstk_bgvideoram_w)).share("videoram1"); + map(0x09c000, 0x09cfff).mirror(0x1000).ram().w(FUNC(powerbal_state::magicstk_bgvideoram_w)).share("videoram1"); map(0x0c2010, 0x0c2011).portr("IN0"); map(0x0c2012, 0x0c2013).portr("IN1"); map(0x0c2014, 0x0c2015).portr("IN2"); map(0x0c2016, 0x0c2017).portr("DSW1"); map(0x0c2018, 0x0c2019).portr("DSW2"); - map(0x0c201c, 0x0c201d).w(this, FUNC(powerbal_state::oki_banking)); + map(0x0c201c, 0x0c201d).w(FUNC(powerbal_state::oki_banking)); map(0x0c201f, 0x0c201f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0c4000, 0x0c4001).nopw(); // always 0? map(0x0f0000, 0x0fffff).ram().share("mainram"); diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp index 007e48b3274..61cf0f044bb 100644 --- a/src/mame/drivers/powerins.cpp +++ b/src/mame/drivers/powerins.cpp @@ -66,15 +66,15 @@ void powerins_state::powerins_map(address_map &map) map(0x100002, 0x100003).portr("P1_P2"); map(0x100008, 0x100009).portr("DSW1"); map(0x10000a, 0x10000b).portr("DSW2"); - map(0x100015, 0x100015).w(this, FUNC(powerins_state::flipscreen_w)); + map(0x100015, 0x100015).w(FUNC(powerins_state::flipscreen_w)); map(0x100016, 0x100017).nopw(); // ? always 1 - map(0x100019, 0x100019).w(this, FUNC(powerins_state::tilebank_w)); + map(0x100019, 0x100019).w(FUNC(powerins_state::tilebank_w)); map(0x10001f, 0x10001f).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x120000, 0x120fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x130000, 0x130007).ram().share("vctrl_0"); - map(0x140000, 0x143fff).ram().w(this, FUNC(powerins_state::vram_0_w)).share("vram_0"); - map(0x170000, 0x170fff).ram().w(this, FUNC(powerins_state::vram_1_w)).share("vram_1"); - map(0x171000, 0x171fff).w(this, FUNC(powerins_state::vram_1_w)); + map(0x140000, 0x143fff).ram().w(FUNC(powerins_state::vram_0_w)).share("vram_0"); + map(0x170000, 0x170fff).ram().w(FUNC(powerins_state::vram_1_w)).share("vram_1"); + map(0x171000, 0x171fff).w(FUNC(powerins_state::vram_1_w)); map(0x180000, 0x18ffff).ram().share("spriteram"); } @@ -82,7 +82,7 @@ void powerins_state::powerins_map(address_map &map) void powerins_state::powerinsa_map(address_map &map) { powerins_map(map); - map(0x100031, 0x100031).w(this, FUNC(powerins_state::powerinsa_okibank_w)); + map(0x100031, 0x100031).w(FUNC(powerins_state::powerinsa_okibank_w)); map(0x10003f, 0x10003f).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -107,7 +107,7 @@ void powerins_state::powerins_sound_io_map(address_map &map) void powerins_state::powerinsb_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(powerins_state::powerinsb_fake_ym2203_r)).nopw(); + map(0x00, 0x00).r(FUNC(powerins_state::powerinsb_fake_ym2203_r)).nopw(); map(0x01, 0x01).noprw(); map(0x80, 0x80).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x88, 0x88).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp index de7e1205779..32bd7818734 100644 --- a/src/mame/drivers/pp01.cpp +++ b/src/mame/drivers/pp01.cpp @@ -42,9 +42,9 @@ void pp01_state::pp01_io(address_map &map) //AM_RANGE(0xc4, 0xc7) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) // user map(0xc8, 0xc8).mirror(2).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xc9, 0xc9).mirror(2).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0xcc, 0xcf).w(this, FUNC(pp01_state::pp01_video_write_mode_w)); + map(0xcc, 0xcf).w(FUNC(pp01_state::pp01_video_write_mode_w)); map(0xd0, 0xd3).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0xe0, 0xef).mirror(0x10).rw(this, FUNC(pp01_state::pp01_mem_block_r), FUNC(pp01_state::pp01_mem_block_w)); + map(0xe0, 0xef).mirror(0x10).rw(FUNC(pp01_state::pp01_mem_block_r), FUNC(pp01_state::pp01_mem_block_w)); } /* Input ports */ diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp index 64a4a4f602d..e29d6a8c2c4 100644 --- a/src/mame/drivers/ppmast93.cpp +++ b/src/mame/drivers/ppmast93.cpp @@ -208,9 +208,9 @@ void ppmast93_state::ppmast93_cpu1_map(address_map &map) { map(0x0000, 0x7fff).rom().nopw(); map(0x8000, 0xbfff).bankr("cpubank"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(ppmast93_state::bgram_w)).share("bgram"); + map(0xd000, 0xd7ff).ram().w(FUNC(ppmast93_state::bgram_w)).share("bgram"); map(0xd800, 0xdfff).nopw(); - map(0xf000, 0xf7ff).ram().w(this, FUNC(ppmast93_state::fgram_w)).share("fgram"); + map(0xf000, 0xf7ff).ram().w(FUNC(ppmast93_state::fgram_w)).share("fgram"); map(0xf800, 0xffff).ram(); } @@ -219,7 +219,7 @@ void ppmast93_state::ppmast93_cpu1_io(address_map &map) map.global_mask(0xff); map(0x00, 0x00).portr("P1").w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x02, 0x02).portr("P2"); - map(0x04, 0x04).portr("SYSTEM").w(this, FUNC(ppmast93_state::port4_w)); + map(0x04, 0x04).portr("SYSTEM").w(FUNC(ppmast93_state::port4_w)); map(0x06, 0x06).portr("DSW1"); map(0x08, 0x08).portr("DSW2"); } @@ -235,7 +235,7 @@ void ppmast93_state::ppmast93_cpu2_io(address_map &map) { map(0x0000, 0xffff).rom().region("sub", 0x20000); map(0x0000, 0x0001).mirror(0xff00).w("ymsnd", FUNC(ym2413_device::write)); - map(0x0002, 0x0002).mirror(0xff00).w("dac", FUNC(dac_byte_interface::write)); + map(0x0002, 0x0002).mirror(0xff00).w("dac", FUNC(dac_byte_interface::data_w)); } static INPUT_PORTS_START( ppmast93 ) diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp index a2193eef5a3..b85348e7f20 100644 --- a/src/mame/drivers/prehisle.cpp +++ b/src/mame/drivers/prehisle.cpp @@ -34,13 +34,13 @@ void prehisle_state::prehisle_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x070000, 0x073fff).ram(); - map(0x090000, 0x0907ff).ram().w(this, FUNC(prehisle_state::tx_vram_w)).share("tx_vram"); + map(0x090000, 0x0907ff).ram().w(FUNC(prehisle_state::tx_vram_w)).share("tx_vram"); map(0x0a0000, 0x0a07ff).ram().share("spriteram"); - map(0x0b0000, 0x0b3fff).ram().w(this, FUNC(prehisle_state::fg_vram_w)).share("fg_vram"); + map(0x0b0000, 0x0b3fff).ram().w(FUNC(prehisle_state::fg_vram_w)).share("fg_vram"); map(0x0d0000, 0x0d07ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0e0000, 0x0e00ff).r(this, FUNC(prehisle_state::control_r)); - map(0x0f0000, 0x0ff0ff).w(this, FUNC(prehisle_state::control_w)); - map(0x0f0070, 0x0ff071).w(this, FUNC(prehisle_state::soundcmd_w)); + map(0x0e0000, 0x0e00ff).r(FUNC(prehisle_state::control_r)); + map(0x0f0000, 0x0ff0ff).w(FUNC(prehisle_state::control_w)); + map(0x0f0070, 0x0ff071).w(FUNC(prehisle_state::soundcmd_w)); } /******************************************************************************/ @@ -70,8 +70,8 @@ void prehisle_state::prehisle_sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x00).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); map(0x20, 0x20).w("ymsnd", FUNC(ym3812_device::write_port_w)); - map(0x40, 0x40).w(this, FUNC(prehisle_state::D7759_write_port_0_w)); - map(0x80, 0x80).w(this, FUNC(prehisle_state::D7759_upd_reset_w)); + map(0x40, 0x40).w(FUNC(prehisle_state::D7759_write_port_0_w)); + map(0x80, 0x80).w(FUNC(prehisle_state::D7759_upd_reset_w)); } /******************************************************************************/ diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp index af14c935c8f..d7d1315f577 100644 --- a/src/mame/drivers/prestige.cpp +++ b/src/mame/drivers/prestige.cpp @@ -336,21 +336,21 @@ void prestige_state::prestige_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x04, 0x05).rw(this, FUNC(prestige_state::mouse_r), FUNC(prestige_state::mouse_w)); - map(0x30, 0x3f).w(this, FUNC(prestige_state::lcdc_w)); - map(0x40, 0x40).w(this, FUNC(prestige_state::kb_w)); - map(0x41, 0x42).r(this, FUNC(prestige_state::kb_r)); - map(0x50, 0x56).rw(this, FUNC(prestige_state::bankswitch_r), FUNC(prestige_state::bankswitch_w)); + map(0x04, 0x05).rw(FUNC(prestige_state::mouse_r), FUNC(prestige_state::mouse_w)); + map(0x30, 0x3f).w(FUNC(prestige_state::lcdc_w)); + map(0x40, 0x40).w(FUNC(prestige_state::kb_w)); + map(0x41, 0x42).r(FUNC(prestige_state::kb_r)); + map(0x50, 0x56).rw(FUNC(prestige_state::bankswitch_r), FUNC(prestige_state::bankswitch_w)); } void prestige_state::glcolor_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x30, 0x3f).w(this, FUNC(prestige_state::lcdc_w)); - map(0x40, 0x40).w(this, FUNC(prestige_state::kb_w)); - map(0x41, 0x42).r(this, FUNC(prestige_state::kb_r)); - map(0x50, 0x56).rw(this, FUNC(prestige_state::bankswitch_r), FUNC(prestige_state::bankswitch_w)); + map(0x30, 0x3f).w(FUNC(prestige_state::lcdc_w)); + map(0x40, 0x40).w(FUNC(prestige_state::kb_w)); + map(0x41, 0x42).r(FUNC(prestige_state::kb_r)); + map(0x50, 0x56).rw(FUNC(prestige_state::bankswitch_r), FUNC(prestige_state::bankswitch_w)); } /* Input ports */ diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp index 91bebfa2cf1..d875b367549 100644 --- a/src/mame/drivers/primo.cpp +++ b/src/mame/drivers/primo.cpp @@ -120,16 +120,16 @@ Interrupts: void primo_state::primoa_port(address_map &map) { map.global_mask(0xff); - map(0x00, 0x3f).rw(this, FUNC(primo_state::primo_be_1_r), FUNC(primo_state::primo_ki_1_w)); - map(0xfd, 0xfd).w(this, FUNC(primo_state::primo_FD_w)); + map(0x00, 0x3f).rw(FUNC(primo_state::primo_be_1_r), FUNC(primo_state::primo_ki_1_w)); + map(0xfd, 0xfd).w(FUNC(primo_state::primo_FD_w)); } void primo_state::primob_port(address_map &map) { map.global_mask(0xff); - map(0x00, 0x3f).rw(this, FUNC(primo_state::primo_be_1_r), FUNC(primo_state::primo_ki_1_w)); - map(0x40, 0x7f).rw(this, FUNC(primo_state::primo_be_2_r), FUNC(primo_state::primo_ki_2_w)); - map(0xfd, 0xfd).w(this, FUNC(primo_state::primo_FD_w)); + map(0x00, 0x3f).rw(FUNC(primo_state::primo_be_1_r), FUNC(primo_state::primo_ki_1_w)); + map(0x40, 0x7f).rw(FUNC(primo_state::primo_be_2_r), FUNC(primo_state::primo_ki_2_w)); + map(0xfd, 0xfd).w(FUNC(primo_state::primo_FD_w)); } void primo_state::primo32_mem(address_map &map) diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp index 9b177d14afd..422eee0fccc 100644 --- a/src/mame/drivers/pro80.cpp +++ b/src/mame/drivers/pro80.cpp @@ -128,9 +128,9 @@ void pro80_state::pro80_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x40, 0x43).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0x44, 0x47).r(this, FUNC(pro80_state::kp_r)); - map(0x48, 0x4b).w(this, FUNC(pro80_state::digit_w)); - map(0x4c, 0x4f).w(this, FUNC(pro80_state::segment_w)); + map(0x44, 0x47).r(FUNC(pro80_state::kp_r)); + map(0x48, 0x4b).w(FUNC(pro80_state::digit_w)); + map(0x4c, 0x4f).w(FUNC(pro80_state::segment_w)); } /* Input ports */ diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index 20236404a3c..9aa39e2fdf3 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -163,54 +163,54 @@ void proconn_state::proconn_portmap(address_map &map) // ADDRESS_MAP_GLOBAL_MASK(0x3ff) // sio (vfd should be connected to it?) - map(0x00ff, 0x00ff).rw(this, FUNC(proconn_state::sio_r<0>), FUNC(proconn_state::sio_w<0>)); - map(0x01ff, 0x01ff).rw(this, FUNC(proconn_state::sio_r<2>), FUNC(proconn_state::sio_w<2>)); - map(0x02ff, 0x02ff).rw(this, FUNC(proconn_state::sio_r<1>), FUNC(proconn_state::sio_w<1>)); - map(0x03ff, 0x03ff).rw(this, FUNC(proconn_state::sio_r<3>), FUNC(proconn_state::sio_w<3>)); + map(0x00ff, 0x00ff).rw(FUNC(proconn_state::sio_r<0>), FUNC(proconn_state::sio_w<0>)); + map(0x01ff, 0x01ff).rw(FUNC(proconn_state::sio_r<2>), FUNC(proconn_state::sio_w<2>)); + map(0x02ff, 0x02ff).rw(FUNC(proconn_state::sio_r<1>), FUNC(proconn_state::sio_w<1>)); + map(0x03ff, 0x03ff).rw(FUNC(proconn_state::sio_r<3>), FUNC(proconn_state::sio_w<3>)); // ctc - map(0x00fe, 0x00fe).rw(this, FUNC(proconn_state::ctc_r<0>), FUNC(proconn_state::ctc_w<0>)); - map(0x01fe, 0x01fe).rw(this, FUNC(proconn_state::ctc_r<2>), FUNC(proconn_state::ctc_w<2>)); - map(0x02fe, 0x02fe).rw(this, FUNC(proconn_state::ctc_r<1>), FUNC(proconn_state::ctc_w<1>)); - map(0x03fe, 0x03fe).rw(this, FUNC(proconn_state::ctc_r<3>), FUNC(proconn_state::ctc_w<3>)); + map(0x00fe, 0x00fe).rw(FUNC(proconn_state::ctc_r<0>), FUNC(proconn_state::ctc_w<0>)); + map(0x01fe, 0x01fe).rw(FUNC(proconn_state::ctc_r<2>), FUNC(proconn_state::ctc_w<2>)); + map(0x02fe, 0x02fe).rw(FUNC(proconn_state::ctc_r<1>), FUNC(proconn_state::ctc_w<1>)); + map(0x03fe, 0x03fe).rw(FUNC(proconn_state::ctc_r<3>), FUNC(proconn_state::ctc_w<3>)); // ay (meters connected to it?) - map(0x00fd, 0x00fd).rw(this, FUNC(proconn_state::ay_r<0>), FUNC(proconn_state::ay_w<0>)); - map(0x00fc, 0x00fc).w(this, FUNC(proconn_state::ay_w<1>)); + map(0x00fd, 0x00fd).rw(FUNC(proconn_state::ay_r<0>), FUNC(proconn_state::ay_w<0>)); + map(0x00fc, 0x00fc).w(FUNC(proconn_state::ay_w<1>)); // ?? map(0xfbf9, 0xfbf9).nopw(); map(0xfff9, 0xfff9).nopw(); // pio5 (lamps?) - map(0x00f0, 0x00f0).rw(this, FUNC(proconn_state::pio5_r<0>), FUNC(proconn_state::pio5_w<0>)); - map(0x01f0, 0x01f0).rw(this, FUNC(proconn_state::pio5_r<1>), FUNC(proconn_state::pio5_w<1>)); - map(0x02f0, 0x02f0).rw(this, FUNC(proconn_state::pio5_r<2>), FUNC(proconn_state::pio5_w<2>)); - map(0x03f0, 0x03f0).rw(this, FUNC(proconn_state::pio5_r<3>), FUNC(proconn_state::pio5_w<3>)); + map(0x00f0, 0x00f0).rw(FUNC(proconn_state::pio5_r<0>), FUNC(proconn_state::pio5_w<0>)); + map(0x01f0, 0x01f0).rw(FUNC(proconn_state::pio5_r<1>), FUNC(proconn_state::pio5_w<1>)); + map(0x02f0, 0x02f0).rw(FUNC(proconn_state::pio5_r<2>), FUNC(proconn_state::pio5_w<2>)); + map(0x03f0, 0x03f0).rw(FUNC(proconn_state::pio5_r<3>), FUNC(proconn_state::pio5_w<3>)); // pio4 (triacs + 7segs) - map(0x00e8, 0x00e8).rw(this, FUNC(proconn_state::pio4_r<0>), FUNC(proconn_state::pio4_w<0>)); - map(0x01e8, 0x01e8).rw(this, FUNC(proconn_state::pio4_r<1>), FUNC(proconn_state::pio4_w<1>)); - map(0x02e8, 0x02e8).rw(this, FUNC(proconn_state::pio4_r<2>), FUNC(proconn_state::pio4_w<2>)); - map(0x03e8, 0x03e8).rw(this, FUNC(proconn_state::pio4_r<3>), FUNC(proconn_state::pio4_w<3>)); + map(0x00e8, 0x00e8).rw(FUNC(proconn_state::pio4_r<0>), FUNC(proconn_state::pio4_w<0>)); + map(0x01e8, 0x01e8).rw(FUNC(proconn_state::pio4_r<1>), FUNC(proconn_state::pio4_w<1>)); + map(0x02e8, 0x02e8).rw(FUNC(proconn_state::pio4_r<2>), FUNC(proconn_state::pio4_w<2>)); + map(0x03e8, 0x03e8).rw(FUNC(proconn_state::pio4_r<3>), FUNC(proconn_state::pio4_w<3>)); // pio3 (lamps? + opto in?) - map(0x00d8, 0x00d8).rw(this, FUNC(proconn_state::pio3_r<0>), FUNC(proconn_state::pio3_w<0>)); - map(0x01d8, 0x01d8).rw(this, FUNC(proconn_state::pio3_r<1>), FUNC(proconn_state::pio3_w<1>)); - map(0x02d8, 0x02d8).rw(this, FUNC(proconn_state::pio3_r<2>), FUNC(proconn_state::pio3_w<2>)); - map(0x03d8, 0x03d8).rw(this, FUNC(proconn_state::pio3_r<3>), FUNC(proconn_state::pio3_w<3>)); + map(0x00d8, 0x00d8).rw(FUNC(proconn_state::pio3_r<0>), FUNC(proconn_state::pio3_w<0>)); + map(0x01d8, 0x01d8).rw(FUNC(proconn_state::pio3_r<1>), FUNC(proconn_state::pio3_w<1>)); + map(0x02d8, 0x02d8).rw(FUNC(proconn_state::pio3_r<2>), FUNC(proconn_state::pio3_w<2>)); + map(0x03d8, 0x03d8).rw(FUNC(proconn_state::pio3_r<3>), FUNC(proconn_state::pio3_w<3>)); // pio2 (reels?) - map(0x00b8, 0x00b8).rw(this, FUNC(proconn_state::pio2_r<0>), FUNC(proconn_state::pio2_w<0>)); - map(0x01b8, 0x01b8).rw(this, FUNC(proconn_state::pio2_r<1>), FUNC(proconn_state::pio2_w<1>)); - map(0x02b8, 0x02b8).rw(this, FUNC(proconn_state::pio2_r<2>), FUNC(proconn_state::pio2_w<2>)); - map(0x03b8, 0x03b8).rw(this, FUNC(proconn_state::pio2_r<3>), FUNC(proconn_state::pio2_w<3>)); + map(0x00b8, 0x00b8).rw(FUNC(proconn_state::pio2_r<0>), FUNC(proconn_state::pio2_w<0>)); + map(0x01b8, 0x01b8).rw(FUNC(proconn_state::pio2_r<1>), FUNC(proconn_state::pio2_w<1>)); + map(0x02b8, 0x02b8).rw(FUNC(proconn_state::pio2_r<2>), FUNC(proconn_state::pio2_w<2>)); + map(0x03b8, 0x03b8).rw(FUNC(proconn_state::pio2_r<3>), FUNC(proconn_state::pio2_w<3>)); // pio1 (reels? + inputs?) - map(0x0078, 0x0078).rw(this, FUNC(proconn_state::pio1_r<0>), FUNC(proconn_state::pio1_w<0>)); - map(0x0178, 0x0178).rw(this, FUNC(proconn_state::pio1_r<1>), FUNC(proconn_state::pio1_w<1>)); - map(0x0278, 0x0278).rw(this, FUNC(proconn_state::pio1_r<2>), FUNC(proconn_state::pio1_w<2>)); - map(0x0378, 0x0378).rw(this, FUNC(proconn_state::pio1_r<3>), FUNC(proconn_state::pio1_w<3>)); + map(0x0078, 0x0078).rw(FUNC(proconn_state::pio1_r<0>), FUNC(proconn_state::pio1_w<0>)); + map(0x0178, 0x0178).rw(FUNC(proconn_state::pio1_r<1>), FUNC(proconn_state::pio1_w<1>)); + map(0x0278, 0x0278).rw(FUNC(proconn_state::pio1_r<2>), FUNC(proconn_state::pio1_w<2>)); + map(0x0378, 0x0378).rw(FUNC(proconn_state::pio1_r<3>), FUNC(proconn_state::pio1_w<3>)); } diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp index 649652ae5ab..4888d2ca6ba 100644 --- a/src/mame/drivers/prof180x.cpp +++ b/src/mame/drivers/prof180x.cpp @@ -188,15 +188,15 @@ READ8_MEMBER( prof180x_state::status_r ) void prof180x_state::prof180x_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(prof180x_state::read), FUNC(prof180x_state::write)); + map(0x0000, 0xffff).rw(FUNC(prof180x_state::read), FUNC(prof180x_state::write)); } void prof180x_state::prof180x_io(address_map &map) { - map(0x08, 0x08).mirror(0xff00).w(this, FUNC(prof180x_state::flr_w)); - map(0x09, 0x09).select(0xff00).r(this, FUNC(prof180x_state::status_r)); + map(0x08, 0x08).mirror(0xff00).w(FUNC(prof180x_state::flr_w)); + map(0x09, 0x09).select(0xff00).r(FUNC(prof180x_state::status_r)); map(0x0a, 0x0a).mirror(0xff00).rw(FDC9268_TAG, FUNC(upd765a_device::mdma_r), FUNC(upd765a_device::mdma_w)); - map(0x0b, 0x0b).mirror(0xff00).w("cent_data_out", FUNC(output_latch_device::write)); + map(0x0b, 0x0b).mirror(0xff00).w("cent_data_out", FUNC(output_latch_device::bus_w)); map(0x0c, 0x0d).mirror(0xff00).m(FDC9268_TAG, FUNC(upd765a_device::map)); } diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp index 2acbc56c0ec..5e805dc524e 100644 --- a/src/mame/drivers/prof80.cpp +++ b/src/mame/drivers/prof80.cpp @@ -304,9 +304,9 @@ void prof80_state::prof80_io(address_map &map) // AM_RANGE(0x9d, 0x9d) AM_MIRROR(0xff00) AM_DEVWRITE(UNIO_CENTRONICS1_TAG, centronics_device, write) // AM_RANGE(0xc0, 0xc0) AM_MIRROR(0xff00) AM_READ(gripc_r) // AM_RANGE(0xc1, 0xc1) AM_MIRROR(0xff00) AM_READWRITE(gripd_r, gripd_w) - map(0xd8, 0xd8).mirror(0xff00).w(this, FUNC(prof80_state::flr_w)); - map(0xda, 0xda).mirror(0xff00).r(this, FUNC(prof80_state::status_r)); - map(0xdb, 0xdb).mirror(0xff00).r(this, FUNC(prof80_state::status2_r)); + map(0xd8, 0xd8).mirror(0xff00).w(FUNC(prof80_state::flr_w)); + map(0xda, 0xda).mirror(0xff00).r(FUNC(prof80_state::status_r)); + map(0xdb, 0xdb).mirror(0xff00).r(FUNC(prof80_state::status2_r)); map(0xdc, 0xdd).mirror(0xff00).m(m_fdc, FUNC(upd765a_device::map)); map(0xde, 0xde).mirror(0x0001).select(0xff00).w(m_mmu, FUNC(prof80_mmu_device::par_w)); } diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp index 01f10ddc29a..55d7afdd516 100644 --- a/src/mame/drivers/progolf.cpp +++ b/src/mame/drivers/progolf.cpp @@ -264,12 +264,12 @@ WRITE8_MEMBER(progolf_state::videoram_w) void progolf_state::main_cpu(address_map &map) { map(0x0000, 0x5fff).ram(); - map(0x6000, 0x7fff).ram().w(this, FUNC(progolf_state::charram_w)).share("fbram"); - map(0x8000, 0x8fff).rw(this, FUNC(progolf_state::videoram_r), FUNC(progolf_state::videoram_w)).share("videoram"); - map(0x9000, 0x9000).portr("IN2").w(this, FUNC(progolf_state::char_vregs_w)); - map(0x9200, 0x9200).portr("P1").w(this, FUNC(progolf_state::scrollx_hi_w)); //p1 inputs - map(0x9400, 0x9400).portr("P2").w(this, FUNC(progolf_state::scrollx_lo_w)); //p2 inputs - map(0x9600, 0x9600).portr("IN0").w(this, FUNC(progolf_state::flip_screen_w)); /* VBLANK */ + map(0x6000, 0x7fff).ram().w(FUNC(progolf_state::charram_w)).share("fbram"); + map(0x8000, 0x8fff).rw(FUNC(progolf_state::videoram_r), FUNC(progolf_state::videoram_w)).share("videoram"); + map(0x9000, 0x9000).portr("IN2").w(FUNC(progolf_state::char_vregs_w)); + map(0x9200, 0x9200).portr("P1").w(FUNC(progolf_state::scrollx_hi_w)); //p1 inputs + map(0x9400, 0x9400).portr("P2").w(FUNC(progolf_state::scrollx_lo_w)); //p2 inputs + map(0x9600, 0x9600).portr("IN0").w(FUNC(progolf_state::flip_screen_w)); /* VBLANK */ map(0x9800, 0x9800).portr("DSW1"); map(0x9800, 0x9800).w("crtc", FUNC(mc6845_device::address_w)); map(0x9801, 0x9801).w("crtc", FUNC(mc6845_device::register_w)); diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp index f218052af7c..d865a624667 100644 --- a/src/mame/drivers/prophet600.cpp +++ b/src/mame/drivers/prophet600.cpp @@ -247,7 +247,7 @@ void prophet600_state::cpu_map(address_map &map) map(0x0000, 0x1fff).rom().region(MAINCPU_TAG, 0); map(0x2000, 0x27ff).ram(); map(0x3000, 0x37ff).ram(); - map(0x4000, 0x4001).w(this, FUNC(prophet600_state::dac_w)); + map(0x4000, 0x4001).w(FUNC(prophet600_state::dac_w)); map(0x6000, 0x6001).w(m_acia, FUNC(acia6850_device::write)); map(0xe000, 0xe001).r(m_acia, FUNC(acia6850_device::read)); } @@ -255,12 +255,12 @@ void prophet600_state::cpu_map(address_map &map) void prophet600_state::io_map(address_map &map) { map(0x00, 0x07).mirror(0xff00).rw(PIT_TAG, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0x08, 0x08).mirror(0xff00).w(this, FUNC(prophet600_state::scanrow_w)); - map(0x09, 0x09).mirror(0xff00).rw(this, FUNC(prophet600_state::comparitor_r), FUNC(prophet600_state::led_w)); - map(0x0a, 0x0a).mirror(0xff00).rw(this, FUNC(prophet600_state::scan_r), FUNC(prophet600_state::potmux_w)); - map(0x0b, 0x0b).mirror(0xff00).w(this, FUNC(prophet600_state::gate_w)); - map(0x0d, 0x0d).mirror(0xff00).w(this, FUNC(prophet600_state::cv_w)); - map(0x0e, 0x0e).mirror(0xff00).w(this, FUNC(prophet600_state::mask_w)); + map(0x08, 0x08).mirror(0xff00).w(FUNC(prophet600_state::scanrow_w)); + map(0x09, 0x09).mirror(0xff00).rw(FUNC(prophet600_state::comparitor_r), FUNC(prophet600_state::led_w)); + map(0x0a, 0x0a).mirror(0xff00).rw(FUNC(prophet600_state::scan_r), FUNC(prophet600_state::potmux_w)); + map(0x0b, 0x0b).mirror(0xff00).w(FUNC(prophet600_state::gate_w)); + map(0x0d, 0x0d).mirror(0xff00).w(FUNC(prophet600_state::cv_w)); + map(0x0e, 0x0e).mirror(0xff00).w(FUNC(prophet600_state::mask_w)); } void prophet600_state::machine_start() diff --git a/src/mame/drivers/proteus.cpp b/src/mame/drivers/proteus.cpp index 0569d67d1e1..75c3c5eafff 100644 --- a/src/mame/drivers/proteus.cpp +++ b/src/mame/drivers/proteus.cpp @@ -241,11 +241,11 @@ void proteus_state::proteus_6809_mem(address_map &map) map(0xe004, 0xe005).rw(m_acia[0], FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Terminal map(0xe008, 0xe009).rw(m_acia[1], FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Printer map(0xe00c, 0xe00d).rw(m_acia[2], FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Modem - map(0xe014, 0xe014).rw(this, FUNC(proteus_state::drive_register_r), FUNC(proteus_state::drive_register_w)); - map(0xe018, 0xe01b).rw(this, FUNC(proteus_state::fdc_inv_r), FUNC(proteus_state::fdc_inv_w)); // Floppy control + map(0xe014, 0xe014).rw(FUNC(proteus_state::drive_register_r), FUNC(proteus_state::drive_register_w)); + map(0xe018, 0xe01b).rw(FUNC(proteus_state::fdc_inv_r), FUNC(proteus_state::fdc_inv_w)); // Floppy control map(0xe020, 0xe027).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); // Timer - map(0xe030, 0xe036).rw(this, FUNC(proteus_state::network_r), FUNC(proteus_state::network_w)); // Poly network - map(0xe060, 0xe060).w(this, FUNC(proteus_state::enable_z80_w)); + map(0xe030, 0xe036).rw(FUNC(proteus_state::network_r), FUNC(proteus_state::network_w)); // Poly network + map(0xe060, 0xe060).w(FUNC(proteus_state::enable_z80_w)); map(0xf000, 0xffff).rom().region("bios", 0); } @@ -262,11 +262,11 @@ void proteus_state::proteus_z80_io(address_map &map) map(0x04, 0x05).mirror(0xff00).rw(m_acia[0], FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Terminal map(0x08, 0x09).mirror(0xff00).rw(m_acia[1], FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Printer map(0x0c, 0x0d).mirror(0xff00).rw(m_acia[2], FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Modem - map(0x14, 0x14).mirror(0xff00).rw(this, FUNC(proteus_state::drive_register_r), FUNC(proteus_state::drive_register_w)); - map(0x18, 0x1b).mirror(0xff00).rw(this, FUNC(proteus_state::fdc_inv_r), FUNC(proteus_state::fdc_inv_w)); // Floppy control + map(0x14, 0x14).mirror(0xff00).rw(FUNC(proteus_state::drive_register_r), FUNC(proteus_state::drive_register_w)); + map(0x18, 0x1b).mirror(0xff00).rw(FUNC(proteus_state::fdc_inv_r), FUNC(proteus_state::fdc_inv_w)); // Floppy control map(0x20, 0x27).mirror(0xff00).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); // Timer - map(0x30, 0x36).mirror(0xff00).rw(this, FUNC(proteus_state::network_r), FUNC(proteus_state::network_w)); // Poly network - map(0x50, 0x50).mirror(0xff00).w(this, FUNC(proteus_state::enable_6809_w)); + map(0x30, 0x36).mirror(0xff00).rw(FUNC(proteus_state::network_r), FUNC(proteus_state::network_w)); // Poly network + map(0x50, 0x50).mirror(0xff00).w(FUNC(proteus_state::enable_6809_w)); } diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp index 389b268074e..5e1c8c6580b 100644 --- a/src/mame/drivers/psikyo.cpp +++ b/src/mame/drivers/psikyo.cpp @@ -253,8 +253,8 @@ void psikyo_state::psikyo_map(address_map &map) map(0x000000, 0x0fffff).rom(); // ROM (not all used) map(0x400000, 0x401fff).ram().share("spriteram"); // Sprites, buffered by two frames (list buffered + fb buffered) map(0x600000, 0x601fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // Palette - map(0x800000, 0x801fff).ram().w(this, FUNC(psikyo_state::vram_w<0>)).share("vram_0"); // Layer 0 - map(0x802000, 0x803fff).ram().w(this, FUNC(psikyo_state::vram_w<1>)).share("vram_1"); // Layer 1 + map(0x800000, 0x801fff).ram().w(FUNC(psikyo_state::vram_w<0>)).share("vram_0"); // Layer 0 + map(0x802000, 0x803fff).ram().w(FUNC(psikyo_state::vram_w<1>)).share("vram_1"); // Layer 1 map(0x804000, 0x807fff).ram().share("vregs"); // RAM + Vregs // AM_RANGE(0xc00000, 0xc0000b) AM_READ(psikyo_input_r) // Depends on board // AM_RANGE(0xc00004, 0xc0000b) AM_WRITE(s1945_mcu_w) // MCU on sh404 @@ -309,12 +309,12 @@ void psikyo_state::psikyo_bootleg_map(address_map &map) map(0x400000, 0x401fff).ram().share("spriteram"); // Sprites, buffered by two frames (list buffered + fb buffered) map(0x600000, 0x601fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // Palette - map(0x800000, 0x801fff).ram().w(this, FUNC(psikyo_state::vram_w<0>)).share("vram_0"); // Layer 0 - map(0x802000, 0x803fff).ram().w(this, FUNC(psikyo_state::vram_w<1>)).share("vram_1"); // Layer 1 + map(0x800000, 0x801fff).ram().w(FUNC(psikyo_state::vram_w<0>)).share("vram_0"); // Layer 0 + map(0x802000, 0x803fff).ram().w(FUNC(psikyo_state::vram_w<1>)).share("vram_1"); // Layer 1 map(0x804000, 0x807fff).ram().share("vregs"); // RAM + Vregs - map(0xc00000, 0xc0000b).r(this, FUNC(psikyo_state::gunbird_input_r)); // input ports + map(0xc00000, 0xc0000b).r(FUNC(psikyo_state::gunbird_input_r)); // input ports - map(0xc00018, 0xc0001b).rw(this, FUNC(psikyo_state::s1945bl_oki_r), FUNC(psikyo_state::s1945bl_oki_w)); + map(0xc00018, 0xc0001b).rw(FUNC(psikyo_state::s1945bl_oki_r), FUNC(psikyo_state::s1945bl_oki_w)); map(0xfe0000, 0xffffff).ram(); // RAM @@ -339,7 +339,7 @@ READ32_MEMBER(psikyo_state::sngkace_input_r) void psikyo_state::sngkace_map(address_map &map) { psikyo_map(map); - map(0xc00000, 0xc0000b).r(this, FUNC(psikyo_state::sngkace_input_r)); + map(0xc00000, 0xc0000b).r(FUNC(psikyo_state::sngkace_input_r)); map(0xc00013, 0xc00013).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -354,7 +354,7 @@ void psikyo_state::sngkace_sound_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x04, 0x04).w(this, FUNC(psikyo_state::sound_bankswitch_w<0>)); + map(0x04, 0x04).w(FUNC(psikyo_state::sound_bankswitch_w<0>)); map(0x08, 0x08).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x0c, 0x0c).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); } @@ -378,14 +378,14 @@ READ32_MEMBER(psikyo_state::gunbird_input_r) void psikyo_state::gunbird_map(address_map &map) { psikyo_map(map); - map(0xc00000, 0xc0000b).r(this, FUNC(psikyo_state::gunbird_input_r)); + map(0xc00000, 0xc0000b).r(FUNC(psikyo_state::gunbird_input_r)); map(0xc00013, 0xc00013).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } void psikyo_state::s1945jn_map(address_map &map) { psikyo_map(map); - map(0xc00000, 0xc0000b).r(this, FUNC(psikyo_state::gunbird_input_r)); + map(0xc00000, 0xc0000b).r(FUNC(psikyo_state::gunbird_input_r)); map(0xc00011, 0xc00011).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -399,7 +399,7 @@ void psikyo_state::gunbird_sound_map(address_map &map) void psikyo_state::gunbird_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(psikyo_state::sound_bankswitch_w<4>)); + map(0x00, 0x00).w(FUNC(psikyo_state::sound_bankswitch_w<4>)); map(0x04, 0x07).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); map(0x08, 0x08).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x0c, 0x0c).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); @@ -424,15 +424,15 @@ READ32_MEMBER(psikyo_state::s1945_input_r) void psikyo_state::s1945_map(address_map &map) { psikyo_map(map); - map(0xc00000, 0xc0000b).r(this, FUNC(psikyo_state::s1945_input_r)); // input ports - map(0xc00004, 0xc0000b).w(this, FUNC(psikyo_state::s1945_mcu_w)); // protection and tile bank switching + map(0xc00000, 0xc0000b).r(FUNC(psikyo_state::s1945_input_r)); // input ports + map(0xc00004, 0xc0000b).w(FUNC(psikyo_state::s1945_mcu_w)); // protection and tile bank switching map(0xc00011, 0xc00011).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } void psikyo_state::s1945_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(psikyo_state::sound_bankswitch_w<4>)); + map(0x00, 0x00).w(FUNC(psikyo_state::sound_bankswitch_w<4>)); map(0x02, 0x03).nopw(); map(0x08, 0x0d).rw("ymf", FUNC(ymf278b_device::read), FUNC(ymf278b_device::write)); map(0x10, 0x10).r(m_soundlatch, FUNC(generic_latch_8_device::read)); diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp index 0953865b6e6..1d907b4062d 100644 --- a/src/mame/drivers/psikyo4.cpp +++ b/src/mame/drivers/psikyo4.cpp @@ -326,20 +326,20 @@ void psikyo4_state::ps4_map(address_map &map) map(0x00000000, 0x000fffff).rom(); // program ROM (1 meg) map(0x02000000, 0x021fffff).rom().region("maincpu", 0x100000); // data ROM map(0x03000000, 0x030037ff).ram().share("spriteram"); - map(0x03003fe0, 0x03003fe3).rw(this, FUNC(psikyo4_state::ps4_eeprom_r), FUNC(psikyo4_state::ps4_eeprom_w)); - map(0x03003fe4, 0x03003fef).ram().w(this, FUNC(psikyo4_state::ps4_vidregs_w)).share("vidregs"); // vid regs? + map(0x03003fe0, 0x03003fe3).rw(FUNC(psikyo4_state::ps4_eeprom_r), FUNC(psikyo4_state::ps4_eeprom_w)); + map(0x03003fe4, 0x03003fef).ram().w(FUNC(psikyo4_state::ps4_vidregs_w)).share("vidregs"); // vid regs? map(0x03003fe4, 0x03003fe7).nopr(); // also writes to this address - might be vblank? // AM_RANGE(0x03003fe4, 0x03003fe7) AM_WRITENOP // might be vblank? - map(0x03003ff0, 0x03003ff3).w(this, FUNC(psikyo4_state::ps4_screen1_brt_w)); // screen 1 brightness - map(0x03003ff4, 0x03003ff7).w(this, FUNC(psikyo4_state::ps4_bgpen_1_dword_w)).share("bgpen_1"); // screen 1 clear colour - map(0x03003ff8, 0x03003ffb).w(this, FUNC(psikyo4_state::ps4_screen2_brt_w)); // screen 2 brightness - map(0x03003ffc, 0x03003fff).w(this, FUNC(psikyo4_state::ps4_bgpen_2_dword_w)).share("bgpen_2"); // screen 2 clear colour - map(0x03004000, 0x03005fff).ram().w(this, FUNC(psikyo4_state::ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w)).share("paletteram"); // palette + map(0x03003ff0, 0x03003ff3).w(FUNC(psikyo4_state::ps4_screen1_brt_w)); // screen 1 brightness + map(0x03003ff4, 0x03003ff7).w(FUNC(psikyo4_state::ps4_bgpen_1_dword_w)).share("bgpen_1"); // screen 1 clear colour + map(0x03003ff8, 0x03003ffb).w(FUNC(psikyo4_state::ps4_screen2_brt_w)); // screen 2 brightness + map(0x03003ffc, 0x03003fff).w(FUNC(psikyo4_state::ps4_bgpen_2_dword_w)).share("bgpen_2"); // screen 2 clear colour + map(0x03004000, 0x03005fff).ram().w(FUNC(psikyo4_state::ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w)).share("paletteram"); // palette map(0x03006000, 0x03007fff).bankr("gfxbank"); // data for rom tests (gfx), data is controlled by vidreg map(0x05000000, 0x05000007).rw("ymf", FUNC(ymf278b_device::read), FUNC(ymf278b_device::write)); map(0x05800000, 0x05800003).portr("P1_P2"); map(0x05800004, 0x05800007).portr("P3_P4"); - map(0x05800008, 0x0580000b).w(this, FUNC(psikyo4_state::io_select_w)); // Used by Mahjong games to choose input (also maps normal loderndf inputs to offsets) + map(0x05800008, 0x0580000b).w(FUNC(psikyo4_state::io_select_w)); // Used by Mahjong games to choose input (also maps normal loderndf inputs to offsets) map(0x06000000, 0x060fffff).ram().share("ram"); // main RAM (1 meg) } diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index 02edd3e74ab..987293c471d 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -497,8 +497,8 @@ void psikyosh_state::ps3v1_map(address_map &map) map(0x03004000, 0x0300ffff).ram().share("bgram"); // video banks 7-0x1f (backgrounds and other effects) map(0x03040000, 0x03044fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // palette.. map(0x03050000, 0x030501ff).ram().share("zoomram"); // sprite zoom lookup table - map(0x0305ffdc, 0x0305ffdf).r("watchdog", FUNC(watchdog_timer_device::reset32_r)).w(this, FUNC(psikyosh_state::psikyosh_irqctrl_w)); // also writes to this address - might be vblank reads? - map(0x0305ffe0, 0x0305ffff).ram().w(this, FUNC(psikyosh_state::psikyosh_vidregs_w)).share("vidregs"); // video registers + map(0x0305ffdc, 0x0305ffdf).r("watchdog", FUNC(watchdog_timer_device::reset32_r)).w(FUNC(psikyosh_state::psikyosh_irqctrl_w)); // also writes to this address - might be vblank reads? + map(0x0305ffe0, 0x0305ffff).ram().w(FUNC(psikyosh_state::psikyosh_vidregs_w)).share("vidregs"); // video registers map(0x03060000, 0x0307ffff).bankr("gfxbank"); // data for rom tests (gfx), data is controlled by vidreg // rom mapping map(0x04060000, 0x0407ffff).bankr("gfxbank"); // data for rom tests (gfx) (Mirrored?) @@ -506,7 +506,7 @@ void psikyosh_state::ps3v1_map(address_map &map) map(0x05000000, 0x05000007).rw("ymf", FUNC(ymf278b_device::read), FUNC(ymf278b_device::write)); // inputs/eeprom map(0x05800000, 0x05800003).portr("INPUTS"); - map(0x05800004, 0x05800007).rw(this, FUNC(psikyosh_state::psh_eeprom_r), FUNC(psikyosh_state::psh_eeprom_w)); + map(0x05800004, 0x05800007).rw(FUNC(psikyosh_state::psh_eeprom_r), FUNC(psikyosh_state::psh_eeprom_w)); // ram map(0x06000000, 0x060fffff).ram().share("ram"); // main RAM (1 meg) } @@ -518,7 +518,7 @@ void psikyosh_state::ps5_map(address_map &map) map(0x00000000, 0x000fffff).rom(); // program ROM (1 meg) // inputs/eeprom map(0x03000000, 0x03000003).portr("INPUTS"); - map(0x03000004, 0x03000007).rw(this, FUNC(psikyosh_state::psh_eeprom_r), FUNC(psikyosh_state::psh_eeprom_w)); + map(0x03000004, 0x03000007).rw(FUNC(psikyosh_state::psh_eeprom_r), FUNC(psikyosh_state::psh_eeprom_w)); // sound chip map(0x03100000, 0x03100007).rw("ymf", FUNC(ymf278b_device::read), FUNC(ymf278b_device::write)); // video chip @@ -526,8 +526,8 @@ void psikyosh_state::ps5_map(address_map &map) map(0x04004000, 0x0400ffff).ram().share("bgram"); // video banks 7-0x1f (backgrounds and other effects) map(0x04040000, 0x04044fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x04050000, 0x040501ff).ram().share("zoomram"); // sprite zoom lookup table - map(0x0405ffdc, 0x0405ffdf).nopr().w(this, FUNC(psikyosh_state::psikyosh_irqctrl_w)); // also writes to this address - might be vblank reads? - map(0x0405ffe0, 0x0405ffff).ram().w(this, FUNC(psikyosh_state::psikyosh_vidregs_w)).share("vidregs"); // video registers + map(0x0405ffdc, 0x0405ffdf).nopr().w(FUNC(psikyosh_state::psikyosh_irqctrl_w)); // also writes to this address - might be vblank reads? + map(0x0405ffe0, 0x0405ffff).ram().w(FUNC(psikyosh_state::psikyosh_vidregs_w)).share("vidregs"); // video registers map(0x04060000, 0x0407ffff).bankr("gfxbank"); // data for rom tests (gfx), data is controlled by vidreg // rom mapping map(0x05000000, 0x0507ffff).rom().region("maincpu", 0x100000); // data ROM diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp index 20a2e33500a..a5e54bdc46e 100644 --- a/src/mame/drivers/psion.cpp +++ b/src/mame/drivers/psion.cpp @@ -251,13 +251,13 @@ READ8_MEMBER( psion1_state::switchoff_r ) void psion1_state::psion1_mem(address_map &map) { - map(0x0000, 0x001f).rw(this, FUNC(psion1_state::hd63701_int_reg_r), FUNC(psion1_state::hd63701_int_reg_w)); + map(0x0000, 0x001f).rw(FUNC(psion1_state::hd63701_int_reg_r), FUNC(psion1_state::hd63701_int_reg_w)); map(0x0040, 0x00ff).ram().share("sys_register"); map(0x2000, 0x2000).mirror(0x07fe).rw(m_lcdc, FUNC(hd44780_device::control_read), FUNC(hd44780_device::control_write)); map(0x2001, 0x2001).mirror(0x07fe).rw(m_lcdc, FUNC(hd44780_device::data_read), FUNC(hd44780_device::data_write)); - map(0x2800, 0x2800).r(this, FUNC(psion1_state::reset_kb_counter_r)); - map(0x2e00, 0x2e00).r(this, FUNC(psion1_state::switchoff_r)); - map(0x3000, 0x3000).r(this, FUNC(psion1_state::inc_kb_counter_r)); + map(0x2800, 0x2800).r(FUNC(psion1_state::reset_kb_counter_r)); + map(0x2e00, 0x2e00).r(FUNC(psion1_state::switchoff_r)); + map(0x3000, 0x3000).r(FUNC(psion1_state::inc_kb_counter_r)); map(0x4000, 0x47ff).ram().share("ram"); map(0xf000, 0xffff).rom(); } @@ -265,9 +265,9 @@ void psion1_state::psion1_mem(address_map &map) void psion_state::psioncm_mem(address_map &map) { map.unmap_value_low(); - map(0x0000, 0x001f).rw(this, FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); + map(0x0000, 0x001f).rw(FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); map(0x0040, 0x00ff).ram().share("sys_register"); - map(0x0100, 0x03ff).rw(this, FUNC(psion_state::io_r), FUNC(psion_state::io_w)); + map(0x0100, 0x03ff).rw(FUNC(psion_state::io_r), FUNC(psion_state::io_w)); map(0x2000, 0x3fff).ram().share("ram"); map(0x8000, 0xffff).rom(); } @@ -275,9 +275,9 @@ void psion_state::psioncm_mem(address_map &map) void psion_state::psionla_mem(address_map &map) { map.unmap_value_low(); - map(0x0000, 0x001f).rw(this, FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); + map(0x0000, 0x001f).rw(FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); map(0x0040, 0x00ff).ram().share("sys_register"); - map(0x0100, 0x03ff).rw(this, FUNC(psion_state::io_r), FUNC(psion_state::io_w)); + map(0x0100, 0x03ff).rw(FUNC(psion_state::io_r), FUNC(psion_state::io_w)); map(0x0400, 0x5fff).ram().share("ram"); map(0x8000, 0xffff).rom(); } @@ -285,9 +285,9 @@ void psion_state::psionla_mem(address_map &map) void psion_state::psionp350_mem(address_map &map) { map.unmap_value_low(); - map(0x0000, 0x001f).rw(this, FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); + map(0x0000, 0x001f).rw(FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); map(0x0040, 0x00ff).ram().share("sys_register"); - map(0x0100, 0x03ff).rw(this, FUNC(psion_state::io_r), FUNC(psion_state::io_w)); + map(0x0100, 0x03ff).rw(FUNC(psion_state::io_r), FUNC(psion_state::io_w)); map(0x0400, 0x3fff).ram().share("ram"); map(0x4000, 0x7fff).bankrw("rambank"); map(0x8000, 0xffff).rom(); @@ -296,9 +296,9 @@ void psion_state::psionp350_mem(address_map &map) void psion_state::psionlam_mem(address_map &map) { map.unmap_value_low(); - map(0x0000, 0x001f).rw(this, FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); + map(0x0000, 0x001f).rw(FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); map(0x0040, 0x00ff).ram().share("sys_register"); - map(0x0100, 0x03ff).rw(this, FUNC(psion_state::io_r), FUNC(psion_state::io_w)); + map(0x0100, 0x03ff).rw(FUNC(psion_state::io_r), FUNC(psion_state::io_w)); map(0x0400, 0x7fff).ram().share("ram"); map(0x8000, 0xbfff).bankr("rombank"); map(0xc000, 0xffff).rom(); @@ -307,9 +307,9 @@ void psion_state::psionlam_mem(address_map &map) void psion_state::psionlz_mem(address_map &map) { map.unmap_value_low(); - map(0x0000, 0x001f).rw(this, FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); + map(0x0000, 0x001f).rw(FUNC(psion_state::hd63701_int_reg_r), FUNC(psion_state::hd63701_int_reg_w)); map(0x0040, 0x00ff).ram().share("sys_register"); - map(0x0100, 0x03ff).rw(this, FUNC(psion_state::io_r), FUNC(psion_state::io_w)); + map(0x0100, 0x03ff).rw(FUNC(psion_state::io_r), FUNC(psion_state::io_w)); map(0x0400, 0x3fff).ram().share("ram"); map(0x4000, 0x7fff).bankrw("rambank"); map(0x8000, 0xbfff).bankr("rombank"); diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp index 295224f4c74..0738e3adc3c 100644 --- a/src/mame/drivers/psx.cpp +++ b/src/mame/drivers/psx.cpp @@ -505,7 +505,7 @@ void psx1_state::cd_dma_write( uint32_t *p_n_psxram, uint32_t n_address, int32_t void psx1_state::psx_map(address_map &map) { - map(0x1f000000, 0x1f07ffff).rw(this, FUNC(psx1_state::parallel_r), FUNC(psx1_state::parallel_w)); + map(0x1f000000, 0x1f07ffff).rw(FUNC(psx1_state::parallel_r), FUNC(psx1_state::parallel_w)); } void psx1_state::subcpu_map(address_map &map) diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp index e80b5b709dd..d497b0b1819 100644 --- a/src/mame/drivers/psychic5.cpp +++ b/src/mame/drivers/psychic5.cpp @@ -442,11 +442,11 @@ void psychic5_state::psychic5_main_map(address_map &map) map(0xc000, 0xdfff).m(m_vrambank, FUNC(address_map_bank_device::amap8)); map(0xe000, 0xefff).ram(); map(0xf000, 0xf000).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xf001, 0xf001).nopr().w(this, FUNC(psychic5_state::psychic5_coin_counter_w)); - map(0xf002, 0xf002).rw(this, FUNC(psychic5_state::bankselect_r), FUNC(psychic5_state::psychic5_bankselect_w)); - map(0xf003, 0xf003).rw(this, FUNC(psychic5_state::vram_page_select_r), FUNC(psychic5_state::vram_page_select_w)); + map(0xf001, 0xf001).nopr().w(FUNC(psychic5_state::psychic5_coin_counter_w)); + map(0xf002, 0xf002).rw(FUNC(psychic5_state::bankselect_r), FUNC(psychic5_state::psychic5_bankselect_w)); + map(0xf003, 0xf003).rw(FUNC(psychic5_state::vram_page_select_r), FUNC(psychic5_state::vram_page_select_w)); map(0xf004, 0xf004).noprw(); // ??? - map(0xf005, 0xf005).nopr().w(this, FUNC(psychic5_state::psychic5_title_screen_w)); + map(0xf005, 0xf005).nopr().w(FUNC(psychic5_state::psychic5_title_screen_w)); map(0xf006, 0xf1ff).noprw(); map(0xf200, 0xf7ff).ram().share("spriteram"); map(0xf800, 0xffff).ram(); @@ -455,7 +455,7 @@ void psychic5_state::psychic5_main_map(address_map &map) void psychic5_state::psychic5_vrambank_map(address_map &map) { - map(0x0000, 0x0fff).ram().w(this, FUNC(psychic5_state::bg_videoram_w)).share("bg_videoram"); + map(0x0000, 0x0fff).ram().w(FUNC(psychic5_state::bg_videoram_w)).share("bg_videoram"); map(0x1000, 0x1fff).ram(); map(0x2000, 0x2000).portr("SYSTEM"); @@ -466,11 +466,11 @@ void psychic5_state::psychic5_vrambank_map(address_map &map) map(0x2308, 0x230c).ram().share("bg_control"); - map(0x2400, 0x25ff).ram().w(this, FUNC(psychic5_state::sprite_col_w)).share("palette_ram_sp"); - map(0x2800, 0x29ff).ram().w(this, FUNC(psychic5_state::bg_col_w)).share("palette_ram_bg"); - map(0x2a00, 0x2bff).ram().w(this, FUNC(psychic5_state::tx_col_w)).share("palette_ram_tx"); + map(0x2400, 0x25ff).ram().w(FUNC(psychic5_state::sprite_col_w)).share("palette_ram_sp"); + map(0x2800, 0x29ff).ram().w(FUNC(psychic5_state::bg_col_w)).share("palette_ram_bg"); + map(0x2a00, 0x2bff).ram().w(FUNC(psychic5_state::tx_col_w)).share("palette_ram_tx"); - map(0x3000, 0x37ff).ram().w(this, FUNC(psychic5_state::fg_videoram_w)).share("fg_videoram"); + map(0x3000, 0x37ff).ram().w(FUNC(psychic5_state::fg_videoram_w)).share("fg_videoram"); } @@ -499,10 +499,10 @@ void psychic5_state::bombsa_main_map(address_map &map) /* ports look like the other games */ map(0xd000, 0xd1ff).ram(); map(0xd000, 0xd000).w("soundlatch", FUNC(generic_latch_8_device::write)); // confirmed - map(0xd001, 0xd001).w(this, FUNC(psychic5_state::bombsa_flipscreen_w)); - map(0xd002, 0xd002).rw(this, FUNC(psychic5_state::bankselect_r), FUNC(psychic5_state::bombsa_bankselect_w)); - map(0xd003, 0xd003).rw(this, FUNC(psychic5_state::vram_page_select_r), FUNC(psychic5_state::vram_page_select_w)); - map(0xd005, 0xd005).w(this, FUNC(psychic5_state::bombsa_unknown_w)); // ? + map(0xd001, 0xd001).w(FUNC(psychic5_state::bombsa_flipscreen_w)); + map(0xd002, 0xd002).rw(FUNC(psychic5_state::bankselect_r), FUNC(psychic5_state::bombsa_bankselect_w)); + map(0xd003, 0xd003).rw(FUNC(psychic5_state::vram_page_select_r), FUNC(psychic5_state::vram_page_select_w)); + map(0xd005, 0xd005).w(FUNC(psychic5_state::bombsa_unknown_w)); // ? map(0xd200, 0xd7ff).ram().share("spriteram"); map(0xd800, 0xdfff).ram(); @@ -527,7 +527,7 @@ void psychic5_state::bombsa_soundport_map(address_map &map) void psychic5_state::bombsa_vrambank_map(address_map &map) { - map(0x0000, 0x1fff).ram().w(this, FUNC(psychic5_state::bg_videoram_w)).share("bg_videoram"); + map(0x0000, 0x1fff).ram().w(FUNC(psychic5_state::bg_videoram_w)).share("bg_videoram"); map(0x2000, 0x2000).portr("SYSTEM"); map(0x2001, 0x2001).portr("P1"); @@ -537,11 +537,11 @@ void psychic5_state::bombsa_vrambank_map(address_map &map) map(0x2308, 0x230c).ram().share("bg_control"); - map(0x3000, 0x31ff).ram().w(this, FUNC(psychic5_state::sprite_col_w)).share("palette_ram_sp"); - map(0x3200, 0x33ff).ram().w(this, FUNC(psychic5_state::bg_col_w)).share("palette_ram_bg"); - map(0x3400, 0x35ff).ram().w(this, FUNC(psychic5_state::tx_col_w)).share("palette_ram_tx"); + map(0x3000, 0x31ff).ram().w(FUNC(psychic5_state::sprite_col_w)).share("palette_ram_sp"); + map(0x3200, 0x33ff).ram().w(FUNC(psychic5_state::bg_col_w)).share("palette_ram_bg"); + map(0x3400, 0x35ff).ram().w(FUNC(psychic5_state::tx_col_w)).share("palette_ram_tx"); - map(0x2800, 0x2fff).ram().w(this, FUNC(psychic5_state::fg_videoram_w)).share("fg_videoram"); + map(0x2800, 0x2fff).ram().w(FUNC(psychic5_state::fg_videoram_w)).share("fg_videoram"); } diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp index 9a8b5c8dabc..9243af0e3a4 100644 --- a/src/mame/drivers/pt68k4.cpp +++ b/src/mame/drivers/pt68k4.cpp @@ -260,11 +260,11 @@ void pt68k4_state::pt68k2_mem(address_map &map) map(0xfa0000, 0xfbffff).rw(m_isa, FUNC(isa8_device::io_r), FUNC(isa8_device::io_w)).umask16(0x00ff); map(0xfe0000, 0xfe001f).rw(m_duart1, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0xfe0040, 0xfe005f).rw(m_duart2, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); - map(0xfe0080, 0xfe00bf).r(this, FUNC(pt68k4_state::pia_stub_r)).umask16(0x00ff); - map(0xfe00c0, 0xfe00ff).w(this, FUNC(pt68k4_state::fdc_select_w)).umask16(0x00ff); + map(0xfe0080, 0xfe00bf).r(FUNC(pt68k4_state::pia_stub_r)).umask16(0x00ff); + map(0xfe00c0, 0xfe00ff).w(FUNC(pt68k4_state::fdc_select_w)).umask16(0x00ff); map(0xfe0100, 0xfe013f).rw(m_wdfdc, FUNC(wd1772_device::read), FUNC(wd1772_device::write)).umask16(0x00ff); - map(0xfe01c0, 0xfe01c3).rw(this, FUNC(pt68k4_state::keyboard_r), FUNC(pt68k4_state::keyboard_w)).umask16(0x00ff); - map(0xff0000, 0xff0fff).rw(this, FUNC(pt68k4_state::hiram_r), FUNC(pt68k4_state::hiram_w)).umask16(0xff00); + map(0xfe01c0, 0xfe01c3).rw(FUNC(pt68k4_state::keyboard_r), FUNC(pt68k4_state::keyboard_w)).umask16(0x00ff); + map(0xff0000, 0xff0fff).rw(FUNC(pt68k4_state::hiram_r), FUNC(pt68k4_state::hiram_w)).umask16(0xff00); map(0xff0000, 0xff0fff).rw(TIMEKEEPER_TAG, FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0x00ff); } @@ -277,8 +277,8 @@ void pt68k4_state::pt68k4_mem(address_map &map) map(0xfa0000, 0xfbffff).rw(m_isa, FUNC(isa8_device::io_r), FUNC(isa8_device::io_w)).umask16(0x00ff); map(0xfe0000, 0xfe001f).rw(m_duart1, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); map(0xfe0040, 0xfe005f).rw(m_duart2, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); - map(0xfe01c0, 0xfe01c3).rw(this, FUNC(pt68k4_state::keyboard_r), FUNC(pt68k4_state::keyboard_w)).umask16(0x00ff); - map(0xff0000, 0xff0fff).rw(this, FUNC(pt68k4_state::hiram_r), FUNC(pt68k4_state::hiram_w)).umask16(0xff00); + map(0xfe01c0, 0xfe01c3).rw(FUNC(pt68k4_state::keyboard_r), FUNC(pt68k4_state::keyboard_w)).umask16(0x00ff); + map(0xff0000, 0xff0fff).rw(FUNC(pt68k4_state::hiram_r), FUNC(pt68k4_state::hiram_w)).umask16(0xff00); map(0xff0000, 0xff0fff).rw(TIMEKEEPER_TAG, FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0x00ff); } diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp index 5f117dd76ef..008ea48ba93 100644 --- a/src/mame/drivers/ptcsol.cpp +++ b/src/mame/drivers/ptcsol.cpp @@ -438,13 +438,13 @@ void sol20_state::sol20_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0xf8, 0xf8).rw(this, FUNC(sol20_state::sol20_f8_r), FUNC(sol20_state::sol20_f8_w)); + map(0xf8, 0xf8).rw(FUNC(sol20_state::sol20_f8_r), FUNC(sol20_state::sol20_f8_w)); map(0xf9, 0xf9).rw(m_uart_s, FUNC(ay51013_device::receive), FUNC(ay51013_device::transmit)); - map(0xfa, 0xfa).rw(this, FUNC(sol20_state::sol20_fa_r), FUNC(sol20_state::sol20_fa_w)); + map(0xfa, 0xfa).rw(FUNC(sol20_state::sol20_fa_r), FUNC(sol20_state::sol20_fa_w)); map(0xfb, 0xfb).rw(m_uart, FUNC(ay51013_device::receive), FUNC(ay51013_device::transmit)); - map(0xfc, 0xfc).r(this, FUNC(sol20_state::sol20_fc_r)); - map(0xfd, 0xfd).rw(this, FUNC(sol20_state::sol20_fd_r), FUNC(sol20_state::sol20_fd_w)); - map(0xfe, 0xfe).w(this, FUNC(sol20_state::sol20_fe_w)); + map(0xfc, 0xfc).r(FUNC(sol20_state::sol20_fc_r)); + map(0xfd, 0xfd).rw(FUNC(sol20_state::sol20_fd_r), FUNC(sol20_state::sol20_fd_w)); + map(0xfe, 0xfe).w(FUNC(sol20_state::sol20_fe_w)); map(0xff, 0xff).portr("S2"); /* map(0xf8, 0xf8) serial status in (bit 6=data av, bit 7=tmbe) map(0xf9, 0xf9) serial data in, out diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp index 01f173c92da..7d4772e9602 100644 --- a/src/mame/drivers/pturn.cpp +++ b/src/mame/drivers/pturn.cpp @@ -347,22 +347,22 @@ void pturn_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xc800, 0xcfff).nopw().r(this, FUNC(pturn_state::custom_r)); + map(0xc800, 0xcfff).nopw().r(FUNC(pturn_state::custom_r)); map(0xdfe0, 0xdfe0).noprw(); - map(0xe000, 0xe3ff).ram().w(this, FUNC(pturn_state::videoram_w)).share("videoram"); - map(0xe400, 0xe400).w(this, FUNC(pturn_state::fgpalette_w)); + map(0xe000, 0xe3ff).ram().w(FUNC(pturn_state::videoram_w)).share("videoram"); + map(0xe400, 0xe400).w(FUNC(pturn_state::fgpalette_w)); map(0xe800, 0xe800).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf000, 0xf0ff).ram().share("spriteram"); - map(0xf400, 0xf400).w(this, FUNC(pturn_state::bg_scrollx_w)); + map(0xf400, 0xf400).w(FUNC(pturn_state::bg_scrollx_w)); map(0xf800, 0xf800).portr("P1").nopw(); - map(0xf801, 0xf801).portr("P2").w(this, FUNC(pturn_state::bgcolor_w)); + map(0xf801, 0xf801).portr("P2").w(FUNC(pturn_state::bgcolor_w)); map(0xf802, 0xf802).portr("SYSTEM"); - map(0xf803, 0xf803).w(this, FUNC(pturn_state::bg_scrolly_w)); + map(0xf803, 0xf803).w(FUNC(pturn_state::bg_scrolly_w)); map(0xf804, 0xf804).portr("DSW2"); map(0xf805, 0xf805).portr("DSW1"); map(0xf806, 0xf806).nopr(); /* Protection related, ((val&3)==2) -> jump to 0 */ @@ -375,7 +375,7 @@ void pturn_state::sub_map(address_map &map) { map(0x0000, 0x0fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x3000, 0x3000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(pturn_state::nmi_sub_enable_w)); + map(0x3000, 0x3000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(pturn_state::nmi_sub_enable_w)); map(0x4000, 0x4000).ram(); map(0x5000, 0x5001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x6000, 0x6001).w("ay2", FUNC(ay8910_device::address_data_w)); diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp index 78acc618a48..ff51a3480e4 100644 --- a/src/mame/drivers/puckpkmn.cpp +++ b/src/mame/drivers/puckpkmn.cpp @@ -222,7 +222,7 @@ void md_boot_state::puckpkmn_map(address_map &map) map(0x700016, 0x700017).portr("DSW1"); map(0x700018, 0x700019).portr("DSW2"); map(0x700023, 0x700023).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xa04000, 0xa04003).rw(this, FUNC(md_boot_state::megadriv_68k_YM2612_read), FUNC(md_boot_state::megadriv_68k_YM2612_write)); + map(0xa04000, 0xa04003).rw(FUNC(md_boot_state::megadriv_68k_YM2612_read), FUNC(md_boot_state::megadriv_68k_YM2612_write)); map(0xc00000, 0xc0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); map(0xe00000, 0xe0ffff).ram().mirror(0x1f0000); @@ -247,7 +247,7 @@ void md_boot_state::jzth_map(address_map &map) map(0x700016, 0x700017).portr("DSW1"); map(0x700018, 0x700019).portr("DSW2"); map(0x700023, 0x700023).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xa04000, 0xa04003).rw(this, FUNC(md_boot_state::megadriv_68k_YM2612_read), FUNC(md_boot_state::megadriv_68k_YM2612_write)); + map(0xa04000, 0xa04003).rw(FUNC(md_boot_state::megadriv_68k_YM2612_read), FUNC(md_boot_state::megadriv_68k_YM2612_write)); map(0xc00000, 0xc0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); map(0xe00000, 0xe0ffff).ram().mirror(0x1f0000); @@ -256,7 +256,7 @@ void md_boot_state::jzth_map(address_map &map) map(0xA11100, 0xA11101).noprw(); - map(0x710000, 0x710001).rw(this, FUNC(md_boot_state::bl_710000_r), FUNC(md_boot_state::bl_710000_w)); // protection, will erase the VDP address causing writes to 0 unless this returns 0xe + map(0x710000, 0x710001).rw(FUNC(md_boot_state::bl_710000_r), FUNC(md_boot_state::bl_710000_w)); // protection, will erase the VDP address causing writes to 0 unless this returns 0xe } READ16_MEMBER(md_boot_state::puckpkmna_70001c_r) @@ -274,8 +274,8 @@ READ16_MEMBER(md_boot_state::puckpkmna_4b2476_r) void md_boot_state::puckpkmna_map(address_map &map) { puckpkmn_map(map); - map(0x4b2476, 0x4b2477).r(this, FUNC(md_boot_state::puckpkmna_4b2476_r)); - map(0x70001c, 0x70001d).r(this, FUNC(md_boot_state::puckpkmna_70001c_r)); + map(0x4b2476, 0x4b2477).r(FUNC(md_boot_state::puckpkmna_4b2476_r)); + map(0x70001c, 0x70001d).r(FUNC(md_boot_state::puckpkmna_70001c_r)); } MACHINE_CONFIG_START(md_boot_state::puckpkmn) diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index f0b512d3289..fefe8a0cc7b 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -96,14 +96,14 @@ void pulsar_state::pulsar_io(address_map &map) map(0xc0, 0xc3).mirror(0x0c).rw("dart", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0xd0, 0xd3).mirror(0x0c).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); map(0xe0, 0xe3).mirror(0x0c).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xf0, 0xff).w(this, FUNC(pulsar_state::baud_w)); + map(0xf0, 0xff).w(FUNC(pulsar_state::baud_w)); } WRITE8_MEMBER( pulsar_state::baud_w ) { - m_brg->str_w(data & 0x0f); - m_brg->stt_w(data >> 4); + m_brg->write_str(data & 0x0f); + m_brg->write_stt(data >> 4); } /* after the first 4 bytes have been read from ROM, switch the ram back in */ diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp index 3feeffa8e4c..9fd885c9c83 100644 --- a/src/mame/drivers/punchout.cpp +++ b/src/mame/drivers/punchout.cpp @@ -147,13 +147,13 @@ void punchout_state::punchout_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc3ff).ram().share("nvram"); map(0xd000, 0xd7ff).ram(); - map(0xd800, 0xdfff).ram().w(this, FUNC(punchout_state::punchout_bg_top_videoram_w)).share("bg_top_videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(punchout_state::punchout_bg_top_videoram_w)).share("bg_top_videoram"); map(0xdff0, 0xdff7).share("spr1_ctrlram"); map(0xdff8, 0xdffc).share("spr2_ctrlram"); map(0xdffd, 0xdffd).share("palettebank"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(punchout_state::punchout_spr1_videoram_w)).share("spr1_videoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(punchout_state::punchout_spr2_videoram_w)).share("spr2_videoram"); - map(0xf000, 0xffff).ram().w(this, FUNC(punchout_state::punchout_bg_bot_videoram_w)).share("bg_bot_videoram"); // also contains scroll RAM + map(0xe000, 0xe7ff).ram().w(FUNC(punchout_state::punchout_spr1_videoram_w)).share("spr1_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(punchout_state::punchout_spr2_videoram_w)).share("spr2_videoram"); + map(0xf000, 0xffff).ram().w(FUNC(punchout_state::punchout_bg_bot_videoram_w)).share("bg_bot_videoram"); // also contains scroll RAM } @@ -162,14 +162,14 @@ void punchout_state::armwrest_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc3ff).ram().share("nvram"); map(0xd000, 0xd7ff).ram(); - map(0xd800, 0xdfff).ram().w(this, FUNC(punchout_state::armwrest_fg_videoram_w)).share("armwrest_fgram"); + map(0xd800, 0xdfff).ram().w(FUNC(punchout_state::armwrest_fg_videoram_w)).share("armwrest_fgram"); map(0xdff0, 0xdff7).share("spr1_ctrlram"); map(0xdff8, 0xdffc).share("spr2_ctrlram"); map(0xdffd, 0xdffd).share("palettebank"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(punchout_state::punchout_spr1_videoram_w)).share("spr1_videoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(punchout_state::punchout_spr2_videoram_w)).share("spr2_videoram"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(punchout_state::punchout_bg_bot_videoram_w)).share("bg_bot_videoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(punchout_state::punchout_bg_top_videoram_w)).share("bg_top_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(punchout_state::punchout_spr1_videoram_w)).share("spr1_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(punchout_state::punchout_spr2_videoram_w)).share("spr2_videoram"); + map(0xf000, 0xf7ff).ram().w(FUNC(punchout_state::punchout_bg_bot_videoram_w)).share("bg_bot_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(punchout_state::punchout_bg_top_videoram_w)).share("bg_top_videoram"); } @@ -244,9 +244,9 @@ WRITE8_MEMBER(punchout_state::spunchout_rp5h01_clock_w) void punchout_state::spnchout_io_map(address_map &map) { punchout_io_map(map); - map(0x05, 0x05).mirror(0xf0).w(this, FUNC(punchout_state::spunchout_rp5h01_reset_w)); - map(0x06, 0x06).mirror(0xf0).w(this, FUNC(punchout_state::spunchout_rp5h01_clock_w)); - map(0x07, 0x07).select(0xf0).rw(this, FUNC(punchout_state::spunchout_exp_r), FUNC(punchout_state::spunchout_exp_w)); // protection ports + map(0x05, 0x05).mirror(0xf0).w(FUNC(punchout_state::spunchout_rp5h01_reset_w)); + map(0x06, 0x06).mirror(0xf0).w(FUNC(punchout_state::spunchout_rp5h01_clock_w)); + map(0x07, 0x07).select(0xf0).rw(FUNC(punchout_state::spunchout_exp_r), FUNC(punchout_state::spunchout_exp_w)); // protection ports } // 2A03 (sound) diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp index 347ee0f9e8c..f3910d8adcb 100644 --- a/src/mame/drivers/pv1000.cpp +++ b/src/mame/drivers/pv1000.cpp @@ -183,14 +183,14 @@ void pv1000_state::pv1000(address_map &map) { //AM_RANGE(0x0000, 0x7fff) // mapped by the cartslot map(0xb800, 0xbbff).ram().share("videoram"); - map(0xbc00, 0xbfff).ram().w(this, FUNC(pv1000_state::gfxram_w)).region("gfxram", 0); + map(0xbc00, 0xbfff).ram().w(FUNC(pv1000_state::gfxram_w)).region("gfxram", 0); } void pv1000_state::pv1000_io(address_map &map) { map.global_mask(0xff); - map(0xf8, 0xff).rw(this, FUNC(pv1000_state::io_r), FUNC(pv1000_state::io_w)); + map(0xf8, 0xff).rw(FUNC(pv1000_state::io_r), FUNC(pv1000_state::io_w)); } diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp index 33cb16e55a9..2bfa63a9a01 100644 --- a/src/mame/drivers/pv2000.cpp +++ b/src/mame/drivers/pv2000.cpp @@ -44,13 +44,13 @@ For BIOS CRC confirmation class pv2000_state : public driver_device { public: - pv2000_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + pv2000_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), m_cart(*this, "cartslot"), m_last_state(0) - { } + { } required_device m_maincpu; required_device m_cass; @@ -182,8 +182,8 @@ void pv2000_state::pv2000_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x4000).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0x4001, 0x4001).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); + map(0x4000, 0x4000).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0x4001, 0x4001).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); map(0x7000, 0x7fff).ram(); //AM_RANGE(0x8000, 0xbfff) ext ram? @@ -196,17 +196,17 @@ void pv2000_state::pv2000_io_map(address_map &map) map.global_mask(0xff); //theres also printer and tape I/O (TODO) - map(0x00, 0x00).w(this, FUNC(pv2000_state::cass_conf_w)); + map(0x00, 0x00).w(FUNC(pv2000_state::cass_conf_w)); //keyboard/joystick - map(0x10, 0x10).r(this, FUNC(pv2000_state::keys_hi_r)); - map(0x20, 0x20).rw(this, FUNC(pv2000_state::keys_lo_r), FUNC(pv2000_state::keys_w)); + map(0x10, 0x10).r(FUNC(pv2000_state::keys_hi_r)); + map(0x20, 0x20).rw(FUNC(pv2000_state::keys_lo_r), FUNC(pv2000_state::keys_w)); //sn76489a - map(0x40, 0x40).r(this, FUNC(pv2000_state::keys_mod_r)).w("sn76489a", FUNC(sn76489a_device::write)); + map(0x40, 0x40).r(FUNC(pv2000_state::keys_mod_r)).w("sn76489a", FUNC(sn76489a_device::command_w)); /* Cassette input. Gets hit a lot after a GLOAD command */ - map(0x60, 0x60).rw(this, FUNC(pv2000_state::cass_in), FUNC(pv2000_state::cass_out)); + map(0x60, 0x60).rw(FUNC(pv2000_state::cass_in), FUNC(pv2000_state::cass_out)); } diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp index e1f2b1ee7ca..7dbae3dba71 100644 --- a/src/mame/drivers/pv9234.cpp +++ b/src/mame/drivers/pv9234.cpp @@ -113,10 +113,10 @@ void pv9234_state::pv9234_map(address_map &map) // AM_RANGE(0x00000060, 0x0000006b) AM_WRITE something // AM_RANGE(0x00007000, 0x00007003) AM_WRITE something // AM_RANGE(0x00008000, 0x00008003) AM_WRITE something - map(0x00008014, 0x00008017).w(this, FUNC(pv9234_state::debug1_w)); + map(0x00008014, 0x00008017).w(FUNC(pv9234_state::debug1_w)); // AM_RANGE(0x00008020, 0x00008027) AM_WRITE something - map(0x000080c0, 0x000080c3).w(this, FUNC(pv9234_state::debug2_w)); - map(0x000080cc, 0x000080cf).w(this, FUNC(pv9234_state::debug_w)); + map(0x000080c0, 0x000080c3).w(FUNC(pv9234_state::debug2_w)); + map(0x000080cc, 0x000080cf).w(FUNC(pv9234_state::debug_w)); // AM_RANGE(0x000080d0, 0x000080d3) AM_WRITE something map(0x0003e000, 0x0003efff).ram().share("p_ram"); map(0x00080000, 0x00087fff).mirror(0x78000).ram().share("share1");//mirror is a guess, writes a prg at 0xc0200 then it jumps at b0200 (!) diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp index 29f342c34ca..8a2ec9cfacb 100644 --- a/src/mame/drivers/pwrview.cpp +++ b/src/mame/drivers/pwrview.cpp @@ -340,61 +340,61 @@ READ8_MEMBER(pwrview_state::pitclock_r) void pwrview_state::bios_bank(address_map &map) { map(0x00000, 0x07fff).rom().region("bios", 0); - map(0x00000, 0x07fff).w(this, FUNC(pwrview_state::nmimem_w)); + map(0x00000, 0x07fff).w(FUNC(pwrview_state::nmimem_w)); - map(0x08000, 0x0ffff).w(this, FUNC(pwrview_state::nmimem_w)); + map(0x08000, 0x0ffff).w(FUNC(pwrview_state::nmimem_w)); map(0x0be00, 0x0be7f).bankrw("vram1"); - map(0x0befe, 0x0beff).rw(this, FUNC(pwrview_state::vram1_r), FUNC(pwrview_state::vram1_w)); + map(0x0befe, 0x0beff).rw(FUNC(pwrview_state::vram1_r), FUNC(pwrview_state::vram1_w)); map(0x0bf00, 0x0bf7f).bankrw("vram2"); - map(0x0bffe, 0x0bfff).rw(this, FUNC(pwrview_state::vram2_r), FUNC(pwrview_state::vram2_w)); + map(0x0bffe, 0x0bfff).rw(FUNC(pwrview_state::vram2_r), FUNC(pwrview_state::vram2_w)); map(0x0c000, 0x0ffff).rom().region("bios", 0x4000); map(0x10000, 0x17fff).ram(); - map(0x18000, 0x1ffff).w(this, FUNC(pwrview_state::nmimem_w)); + map(0x18000, 0x1ffff).w(FUNC(pwrview_state::nmimem_w)); map(0x1be00, 0x1be7f).bankrw("vram1"); - map(0x1befe, 0x1beff).rw(this, FUNC(pwrview_state::vram1_r), FUNC(pwrview_state::vram1_w)); + map(0x1befe, 0x1beff).rw(FUNC(pwrview_state::vram1_r), FUNC(pwrview_state::vram1_w)); map(0x1bf00, 0x1bf7f).bankrw("vram2"); - map(0x1bffe, 0x1bfff).rw(this, FUNC(pwrview_state::vram2_r), FUNC(pwrview_state::vram2_w)); + map(0x1bffe, 0x1bfff).rw(FUNC(pwrview_state::vram2_r), FUNC(pwrview_state::vram2_w)); map(0x1c000, 0x1ffff).rom().region("bios", 0x4000); } void pwrview_state::pwrview_map(address_map &map) { map(0x00000, 0xf7fff).ram().share("ram"); - map(0x00000, 0x003ff).rw(this, FUNC(pwrview_state::bank0_r), FUNC(pwrview_state::bank0_w)); + map(0x00000, 0x003ff).rw(FUNC(pwrview_state::bank0_r), FUNC(pwrview_state::bank0_w)); map(0xf8000, 0xfffff).m(m_biosbank, FUNC(address_map_bank_device::amap16)); } void pwrview_state::pwrview_fetch_map(address_map &map) { map(0x00000, 0xf7fff).ram().share("ram"); - map(0x00000, 0x003ff).r(this, FUNC(pwrview_state::bank0_r)); - map(0xf8000, 0xfffff).r(this, FUNC(pwrview_state::fbios_r)); + map(0x00000, 0x003ff).r(FUNC(pwrview_state::bank0_r)); + map(0xf8000, 0xfffff).r(FUNC(pwrview_state::fbios_r)); } void pwrview_state::pwrview_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(pwrview_state::nmiio_r), FUNC(pwrview_state::nmiio_w)); - map(0xc001, 0xc001).rw(this, FUNC(pwrview_state::unk1_r), FUNC(pwrview_state::unk1_w)); - map(0xc002, 0xc005).rw(this, FUNC(pwrview_state::led_r), FUNC(pwrview_state::led_w)).umask16(0xff00); - map(0xc007, 0xc007).r(this, FUNC(pwrview_state::rotary_r)); - map(0xc009, 0xc009).rw(this, FUNC(pwrview_state::unk2_r), FUNC(pwrview_state::unk2_w)); - map(0xc00b, 0xc00b).r(this, FUNC(pwrview_state::err_r)); + map(0x0000, 0xffff).rw(FUNC(pwrview_state::nmiio_r), FUNC(pwrview_state::nmiio_w)); + map(0xc001, 0xc001).rw(FUNC(pwrview_state::unk1_r), FUNC(pwrview_state::unk1_w)); + map(0xc002, 0xc005).rw(FUNC(pwrview_state::led_r), FUNC(pwrview_state::led_w)).umask16(0xff00); + map(0xc007, 0xc007).r(FUNC(pwrview_state::rotary_r)); + map(0xc009, 0xc009).rw(FUNC(pwrview_state::unk2_r), FUNC(pwrview_state::unk2_w)); + map(0xc00b, 0xc00b).r(FUNC(pwrview_state::err_r)); map(0xc00c, 0xc00d).ram(); - map(0xc080, 0xc080).rw(this, FUNC(pwrview_state::unk4_r), FUNC(pwrview_state::unk4_w)); + map(0xc080, 0xc080).rw(FUNC(pwrview_state::unk4_r), FUNC(pwrview_state::unk4_w)); map(0xc088, 0xc088).w("crtc", FUNC(hd6845_device::address_w)); map(0xc08a, 0xc08a).rw("crtc", FUNC(hd6845_device::register_r), FUNC(hd6845_device::register_w)); - map(0xc280, 0xc287).rw(this, FUNC(pwrview_state::unk3_r), FUNC(pwrview_state::unk3_w)).umask16(0x00ff); + map(0xc280, 0xc287).rw(FUNC(pwrview_state::unk3_r), FUNC(pwrview_state::unk3_w)).umask16(0x00ff); map(0xc288, 0xc28f).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0xc2a0, 0xc2a7).rw("sio", FUNC(z80sio2_device::cd_ba_r), FUNC(z80sio2_device::cd_ba_w)).umask16(0x00ff); map(0xc2c0, 0xc2c0).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0xc2c2, 0xc2c2).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xc2e0, 0xc2e3).m("fdc", FUNC(upd765a_device::map)).umask16(0x00ff); map(0xc2e4, 0xc2e5).ram(); - map(0xc2e6, 0xc2e6).r(this, FUNC(pwrview_state::pitclock_r)); + map(0xc2e6, 0xc2e6).r(FUNC(pwrview_state::pitclock_r)); } static void pwrview_floppies(device_slot_interface &device) diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp index 7f47371c242..d20e1ecc300 100644 --- a/src/mame/drivers/px4.cpp +++ b/src/mame/drivers/px4.cpp @@ -1271,37 +1271,37 @@ void px4_state::px4_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); // gapnit, 0x00-0x07 - map(0x00, 0x00).rw(this, FUNC(px4_state::icrlc_r), FUNC(px4_state::ctrl1_w)); - map(0x01, 0x01).rw(this, FUNC(px4_state::icrhc_r), FUNC(px4_state::cmdr_w)); - map(0x02, 0x02).rw(this, FUNC(px4_state::icrlb_r), FUNC(px4_state::ctrl2_w)); - map(0x03, 0x03).r(this, FUNC(px4_state::icrhb_r)); - map(0x04, 0x04).rw(this, FUNC(px4_state::isr_r), FUNC(px4_state::ier_w)); - map(0x05, 0x05).rw(this, FUNC(px4_state::str_r), FUNC(px4_state::bankr_w)); - map(0x06, 0x06).rw(this, FUNC(px4_state::sior_r), FUNC(px4_state::sior_w)); + map(0x00, 0x00).rw(FUNC(px4_state::icrlc_r), FUNC(px4_state::ctrl1_w)); + map(0x01, 0x01).rw(FUNC(px4_state::icrhc_r), FUNC(px4_state::cmdr_w)); + map(0x02, 0x02).rw(FUNC(px4_state::icrlb_r), FUNC(px4_state::ctrl2_w)); + map(0x03, 0x03).r(FUNC(px4_state::icrhb_r)); + map(0x04, 0x04).rw(FUNC(px4_state::isr_r), FUNC(px4_state::ier_w)); + map(0x05, 0x05).rw(FUNC(px4_state::str_r), FUNC(px4_state::bankr_w)); + map(0x06, 0x06).rw(FUNC(px4_state::sior_r), FUNC(px4_state::sior_w)); map(0x07, 0x07).noprw(); // gapndl, 0x08-0x0f - map(0x08, 0x08).w(this, FUNC(px4_state::vadr_w)); - map(0x09, 0x09).w(this, FUNC(px4_state::yoff_w)); - map(0x0a, 0x0a).w(this, FUNC(px4_state::fr_w)); - map(0x0b, 0x0b).w(this, FUNC(px4_state::spur_w)); + map(0x08, 0x08).w(FUNC(px4_state::vadr_w)); + map(0x09, 0x09).w(FUNC(px4_state::yoff_w)); + map(0x0a, 0x0a).w(FUNC(px4_state::fr_w)); + map(0x0b, 0x0b).w(FUNC(px4_state::spur_w)); map(0x0c, 0x0f).noprw(); // gapnio, 0x10-0x1f - map(0x10, 0x13).rw(this, FUNC(px4_state::ctgif_r), FUNC(px4_state::ctgif_w)); - map(0x14, 0x14).rw(this, FUNC(px4_state::artdir_r), FUNC(px4_state::artdor_w)); - map(0x15, 0x15).rw(this, FUNC(px4_state::artsr_r), FUNC(px4_state::artmr_w)); - map(0x16, 0x16).rw(this, FUNC(px4_state::iostr_r), FUNC(px4_state::artcr_w)); - map(0x17, 0x17).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x18, 0x18).w(this, FUNC(px4_state::swr_w)); - map(0x19, 0x19).w(this, FUNC(px4_state::ioctlr_w)); + map(0x10, 0x13).rw(FUNC(px4_state::ctgif_r), FUNC(px4_state::ctgif_w)); + map(0x14, 0x14).rw(FUNC(px4_state::artdir_r), FUNC(px4_state::artdor_w)); + map(0x15, 0x15).rw(FUNC(px4_state::artsr_r), FUNC(px4_state::artmr_w)); + map(0x16, 0x16).rw(FUNC(px4_state::iostr_r), FUNC(px4_state::artcr_w)); + map(0x17, 0x17).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x18, 0x18).w(FUNC(px4_state::swr_w)); + map(0x19, 0x19).w(FUNC(px4_state::ioctlr_w)); map(0x1a, 0x1f).noprw(); } void px4p_state::px4p_io(address_map &map) { px4_io(map); - map(0x90, 0x92).w(this, FUNC(px4p_state::ramdisk_address_w)); - map(0x93, 0x93).rw(this, FUNC(px4p_state::ramdisk_data_r), FUNC(px4p_state::ramdisk_data_w)); - map(0x94, 0x94).r(this, FUNC(px4p_state::ramdisk_control_r)); + map(0x90, 0x92).w(FUNC(px4p_state::ramdisk_address_w)); + map(0x93, 0x93).rw(FUNC(px4p_state::ramdisk_data_r), FUNC(px4p_state::ramdisk_data_w)); + map(0x94, 0x94).r(FUNC(px4p_state::ramdisk_control_r)); } diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp index 14f59df7ee3..83899c24609 100644 --- a/src/mame/drivers/px8.cpp +++ b/src/mame/drivers/px8.cpp @@ -526,7 +526,7 @@ void px8_state::px8_io(address_map &map) { map.unmap_value_high(); map.global_mask(0x0f); - map(0x00, 0x07).rw(this, FUNC(px8_state::gah40m_r), FUNC(px8_state::gah40m_w)); + map(0x00, 0x07).rw(FUNC(px8_state::gah40m_r), FUNC(px8_state::gah40m_w)); map(0x0c, 0x0c).rw(I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x0d, 0x0d).rw(I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); // AM_RANGE(0x0e, 0x0e) AM_DEVREADWRITE(SED1320_TAG, sed1330_device, status_r, data_w) @@ -540,9 +540,9 @@ void px8_state::px8_io(address_map &map) void px8_state::px8_slave_mem(address_map &map) { map.unmap_value_high(); - map(0x0020, 0x0023).rw(this, FUNC(px8_state::gah40s_r), FUNC(px8_state::gah40s_w)); + map(0x0020, 0x0023).rw(FUNC(px8_state::gah40s_r), FUNC(px8_state::gah40s_w)); // AM_RANGE(0x0024, 0x0027) AM_DEVREADWRITE_LEGACY(SED1320_TAG, ) - map(0x0028, 0x0028).w(this, FUNC(px8_state::gah40s_ier_w)); + map(0x0028, 0x0028).w(FUNC(px8_state::gah40s_ier_w)); map(0x8000, 0x97ff).ram().share("video_ram"); map(0x9800, 0xefff).noprw(); map(0xf000, 0xffff).rom().region(HD6303_TAG, 0); /* internal mask rom */ diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp index 20fef0eb1a0..acb0794a339 100644 --- a/src/mame/drivers/pyl601.cpp +++ b/src/mame/drivers/pyl601.cpp @@ -269,19 +269,19 @@ void pyl601_state::pyl601_mem(address_map &map) map(0xe000, 0xe5ff).bankrw("bank3"); map(0xe600, 0xe600).mirror(4).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0xe601, 0xe601).mirror(4).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0xe628, 0xe628).r(this, FUNC(pyl601_state::keyboard_r)); - map(0xe629, 0xe629).rw(this, FUNC(pyl601_state::video_mode_r), FUNC(pyl601_state::video_mode_w)); - map(0xe62a, 0xe62a).rw(this, FUNC(pyl601_state::keycheck_r), FUNC(pyl601_state::led_w)); - map(0xe62b, 0xe62b).rw(this, FUNC(pyl601_state::timer_r), FUNC(pyl601_state::speaker_w)); - map(0xe62d, 0xe62d).r(this, FUNC(pyl601_state::video_mode_r)); - map(0xe62e, 0xe62e).rw(this, FUNC(pyl601_state::keycheck_r), FUNC(pyl601_state::led_w)); - map(0xe680, 0xe680).w(this, FUNC(pyl601_state::vdisk_page_w)); - map(0xe681, 0xe681).w(this, FUNC(pyl601_state::vdisk_h_w)); - map(0xe682, 0xe682).w(this, FUNC(pyl601_state::vdisk_l_w)); - map(0xe683, 0xe683).rw(this, FUNC(pyl601_state::vdisk_data_r), FUNC(pyl601_state::vdisk_data_w)); - map(0xe6c0, 0xe6c0).rw(this, FUNC(pyl601_state::floppy_r), FUNC(pyl601_state::floppy_w)); + map(0xe628, 0xe628).r(FUNC(pyl601_state::keyboard_r)); + map(0xe629, 0xe629).rw(FUNC(pyl601_state::video_mode_r), FUNC(pyl601_state::video_mode_w)); + map(0xe62a, 0xe62a).rw(FUNC(pyl601_state::keycheck_r), FUNC(pyl601_state::led_w)); + map(0xe62b, 0xe62b).rw(FUNC(pyl601_state::timer_r), FUNC(pyl601_state::speaker_w)); + map(0xe62d, 0xe62d).r(FUNC(pyl601_state::video_mode_r)); + map(0xe62e, 0xe62e).rw(FUNC(pyl601_state::keycheck_r), FUNC(pyl601_state::led_w)); + map(0xe680, 0xe680).w(FUNC(pyl601_state::vdisk_page_w)); + map(0xe681, 0xe681).w(FUNC(pyl601_state::vdisk_h_w)); + map(0xe682, 0xe682).w(FUNC(pyl601_state::vdisk_l_w)); + map(0xe683, 0xe683).rw(FUNC(pyl601_state::vdisk_data_r), FUNC(pyl601_state::vdisk_data_w)); + map(0xe6c0, 0xe6c0).rw(FUNC(pyl601_state::floppy_r), FUNC(pyl601_state::floppy_w)); map(0xe6d0, 0xe6d1).m(m_fdc, FUNC(upd765a_device::map)); - map(0xe6f0, 0xe6f0).rw(this, FUNC(pyl601_state::rom_page_r), FUNC(pyl601_state::rom_page_w)); + map(0xe6f0, 0xe6f0).rw(FUNC(pyl601_state::rom_page_r), FUNC(pyl601_state::rom_page_w)); map(0xe700, 0xefff).bankrw("bank4"); map(0xf000, 0xffff).bankr("bank5").bankw("bank6"); } diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp index 9cecd0cca9e..197f42ffe89 100644 --- a/src/mame/drivers/pzletime.cpp +++ b/src/mame/drivers/pzletime.cpp @@ -236,17 +236,17 @@ CUSTOM_INPUT_MEMBER(pzletime_state::ticket_status_r) void pzletime_state::pzletime_map(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x700000, 0x700005).ram().w(this, FUNC(pzletime_state::video_regs_w)).share("video_regs"); + map(0x700000, 0x700005).ram().w(FUNC(pzletime_state::video_regs_w)).share("video_regs"); map(0x800001, 0x800001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x900000, 0x9005ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xa00000, 0xa00007).ram().share("tilemap_regs"); map(0xb00000, 0xb3ffff).ram().share("bg_videoram"); - map(0xc00000, 0xc00fff).ram().w(this, FUNC(pzletime_state::mid_videoram_w)).share("mid_videoram"); - map(0xc01000, 0xc01fff).ram().w(this, FUNC(pzletime_state::txt_videoram_w)).share("txt_videoram"); + map(0xc00000, 0xc00fff).ram().w(FUNC(pzletime_state::mid_videoram_w)).share("mid_videoram"); + map(0xc01000, 0xc01fff).ram().w(FUNC(pzletime_state::txt_videoram_w)).share("txt_videoram"); map(0xd00000, 0xd01fff).ram().share("spriteram"); - map(0xe00000, 0xe00001).portr("INPUT").w(this, FUNC(pzletime_state::eeprom_w)); - map(0xe00002, 0xe00003).portr("SYSTEM").w(this, FUNC(pzletime_state::ticket_w)); - map(0xe00004, 0xe00005).w(this, FUNC(pzletime_state::oki_bank_w)); + map(0xe00000, 0xe00001).portr("INPUT").w(FUNC(pzletime_state::eeprom_w)); + map(0xe00002, 0xe00003).portr("SYSTEM").w(FUNC(pzletime_state::ticket_w)); + map(0xe00004, 0xe00005).w(FUNC(pzletime_state::oki_bank_w)); map(0xf00000, 0xf0ffff).ram(); } diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp index c6c22972b60..058902cb7ec 100644 --- a/src/mame/drivers/qdrmfgp.cpp +++ b/src/mame/drivers/qdrmfgp.cpp @@ -251,48 +251,48 @@ WRITE_LINE_MEMBER(qdrmfgp_state::gp2_ide_interrupt) void qdrmfgp_state::qdrmfgp_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x10ffff).ram().share("workram"); /* work ram */ - map(0x180000, 0x183fff).ram().share("nvram"); /* backup ram */ + map(0x100000, 0x10ffff).ram().share("workram"); // work ram + map(0x180000, 0x183fff).ram().share("nvram"); // backup ram map(0x280000, 0x280fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x300000, 0x30003f).w(m_k056832, FUNC(k056832_device::word_w)); /* video reg */ - map(0x320000, 0x32001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); /* ccu */ - map(0x330000, 0x330001).portr("SENSOR"); /* battery power & service sw */ - map(0x340000, 0x340001).r(this, FUNC(qdrmfgp_state::inputs_r)); /* inputport */ - map(0x350000, 0x350001).nopw(); /* unknown */ - map(0x360000, 0x360001).nopw(); /* unknown */ - map(0x370000, 0x370001).w(this, FUNC(qdrmfgp_state::gp_control_w)); /* control reg */ - map(0x380000, 0x380001).nopw(); /* Watchdog */ - map(0x800000, 0x80045f).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); /* sound regs */ - map(0x880000, 0x881fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); /* vram */ - map(0x882000, 0x883fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); /* vram (mirror) */ - map(0x900000, 0x901fff).r(this, FUNC(qdrmfgp_state::v_rom_r)); /* gfxrom through */ - map(0xa00000, 0xa0000f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); /* IDE control regs */ - map(0xa40000, 0xa4000f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); /* IDE status control reg */ - map(0xc00000, 0xcbffff).rw(this, FUNC(qdrmfgp_state::sndram_r), FUNC(qdrmfgp_state::sndram_w)); /* sound ram */ + map(0x300000, 0x30003f).w(m_k056832, FUNC(k056832_device::word_w)); // video reg + map(0x320000, 0x32001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); // ccu + map(0x330000, 0x330001).portr("SENSOR"); // battery power & service sw + map(0x340000, 0x340001).r(FUNC(qdrmfgp_state::inputs_r)); // inputport + map(0x350000, 0x350001).nopw(); // unknown + map(0x360000, 0x360001).nopw(); // unknown + map(0x370000, 0x370001).w(FUNC(qdrmfgp_state::gp_control_w)); // control reg + map(0x380000, 0x380001).nopw(); // Watchdog + map(0x800000, 0x80045f).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); // sound regs + map(0x880000, 0x881fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // vram + map(0x882000, 0x883fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // vram (mirror) + map(0x900000, 0x901fff).r(FUNC(qdrmfgp_state::v_rom_r)); // gfxrom through + map(0xa00000, 0xa0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs + map(0xa40000, 0xa4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg + map(0xc00000, 0xcbffff).rw(FUNC(qdrmfgp_state::sndram_r), FUNC(qdrmfgp_state::sndram_w)); // sound ram } void qdrmfgp_state::qdrmfgp2_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x110fff).ram().share("workram"); /* work ram */ - map(0x180000, 0x183fff).ram().share("nvram"); /* backup ram */ + map(0x100000, 0x110fff).ram().share("workram"); // work ram + map(0x180000, 0x183fff).ram().share("nvram"); // backup ram map(0x280000, 0x280fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x300000, 0x30003f).w(m_k056832, FUNC(k056832_device::word_w)); /* video reg */ - map(0x320000, 0x32001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0xff00); /* ccu */ - map(0x330000, 0x330001).portr("SENSOR"); /* battery power & service */ - map(0x340000, 0x340001).r(this, FUNC(qdrmfgp_state::inputs_r)); /* inputport */ - map(0x350000, 0x350001).nopw(); /* unknown */ - map(0x360000, 0x360001).nopw(); /* unknown */ - map(0x370000, 0x370001).w(this, FUNC(qdrmfgp_state::gp2_control_w)); /* control reg */ - map(0x380000, 0x380001).nopw(); /* Watchdog */ - map(0x800000, 0x80045f).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); /* sound regs */ - map(0x880000, 0x881fff).rw(this, FUNC(qdrmfgp_state::gp2_vram_r), FUNC(qdrmfgp_state::gp2_vram_w)); /* vram */ - map(0x89f000, 0x8a0fff).rw(this, FUNC(qdrmfgp_state::gp2_vram_mirror_r), FUNC(qdrmfgp_state::gp2_vram_mirror_w)); /* vram (mirror) */ - map(0x900000, 0x901fff).r(this, FUNC(qdrmfgp_state::v_rom_r)); /* gfxrom through */ - map(0xa00000, 0xa0000f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); /* IDE control regs */ - map(0xa40000, 0xa4000f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); /* IDE status control reg */ - map(0xc00000, 0xcbffff).rw(this, FUNC(qdrmfgp_state::sndram_r), FUNC(qdrmfgp_state::sndram_w)); /* sound ram */ + map(0x300000, 0x30003f).w(m_k056832, FUNC(k056832_device::word_w)); // video reg + map(0x320000, 0x32001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0xff00); // ccu + map(0x330000, 0x330001).portr("SENSOR"); // battery power & service + map(0x340000, 0x340001).r(FUNC(qdrmfgp_state::inputs_r)); // inputport + map(0x350000, 0x350001).nopw(); // unknown + map(0x360000, 0x360001).nopw(); // unknown + map(0x370000, 0x370001).w(FUNC(qdrmfgp_state::gp2_control_w)); // control reg + map(0x380000, 0x380001).nopw(); // Watchdog + map(0x800000, 0x80045f).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); // sound regs + map(0x880000, 0x881fff).rw(FUNC(qdrmfgp_state::gp2_vram_r), FUNC(qdrmfgp_state::gp2_vram_w)); // vram + map(0x89f000, 0x8a0fff).rw(FUNC(qdrmfgp_state::gp2_vram_mirror_r), FUNC(qdrmfgp_state::gp2_vram_mirror_w)); // vram (mirror) + map(0x900000, 0x901fff).r(FUNC(qdrmfgp_state::v_rom_r)); // gfxrom through + map(0xa00000, 0xa0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs + map(0xa40000, 0xa4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg + map(0xc00000, 0xcbffff).rw(FUNC(qdrmfgp_state::sndram_r), FUNC(qdrmfgp_state::sndram_w)); // sound ram } diff --git a/src/mame/drivers/qix.cpp b/src/mame/drivers/qix.cpp index 224537cc677..8ea858683a4 100644 --- a/src/mame/drivers/qix.cpp +++ b/src/mame/drivers/qix.cpp @@ -250,10 +250,10 @@ void qix_state::main_map(address_map &map) map(0x8000, 0x83ff).ram().share("share1"); map(0x8400, 0x87ff).ram(); map(0x8800, 0x8bff).nopr(); /* 6850 ACIA */ - map(0x8c00, 0x8c00).mirror(0x3fe).rw(this, FUNC(qix_state::qix_video_firq_r), FUNC(qix_state::qix_video_firq_w)); - map(0x8c01, 0x8c01).mirror(0x3fe).rw(this, FUNC(qix_state::qix_data_firq_ack_r), FUNC(qix_state::qix_data_firq_ack_w)); + map(0x8c00, 0x8c00).mirror(0x3fe).rw(FUNC(qix_state::qix_video_firq_r), FUNC(qix_state::qix_video_firq_w)); + map(0x8c01, 0x8c01).mirror(0x3fe).rw(FUNC(qix_state::qix_data_firq_ack_r), FUNC(qix_state::qix_data_firq_ack_w)); map(0x9000, 0x93ff).rw(m_sndpia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x9400, 0x97ff).r(m_pia0, FUNC(pia6821_device::read)).w(this, FUNC(qix_state::qix_pia_w)); + map(0x9400, 0x97ff).r(m_pia0, FUNC(pia6821_device::read)).w(FUNC(qix_state::qix_pia_w)); map(0x9800, 0x9bff).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x9c00, 0x9fff).rw(m_pia2, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xa000, 0xffff).rom(); @@ -265,10 +265,10 @@ void qix_state::kram3_main_map(address_map &map) map(0x8000, 0x83ff).ram().share("share1"); map(0x8400, 0x87ff).ram(); map(0x8800, 0x8bff).nopr(); /* 6850 ACIA */ - map(0x8c00, 0x8c00).mirror(0x3fe).rw(this, FUNC(qix_state::qix_video_firq_r), FUNC(qix_state::qix_video_firq_w)); - map(0x8c01, 0x8c01).mirror(0x3fe).rw(this, FUNC(qix_state::qix_data_firq_ack_r), FUNC(qix_state::qix_data_firq_ack_w)); + map(0x8c00, 0x8c00).mirror(0x3fe).rw(FUNC(qix_state::qix_video_firq_r), FUNC(qix_state::qix_video_firq_w)); + map(0x8c01, 0x8c01).mirror(0x3fe).rw(FUNC(qix_state::qix_data_firq_ack_r), FUNC(qix_state::qix_data_firq_ack_w)); map(0x9000, 0x93ff).rw(m_sndpia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x9400, 0x97ff).r(m_pia0, FUNC(pia6821_device::read)).w(this, FUNC(qix_state::qix_pia_w)); + map(0x9400, 0x97ff).r(m_pia0, FUNC(pia6821_device::read)).w(FUNC(qix_state::qix_pia_w)); map(0x9800, 0x9bff).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x9c00, 0x9fff).rw(m_pia2, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xa000, 0xffff).bankr("bank0"); @@ -281,10 +281,10 @@ void qix_state::zoo_main_map(address_map &map) map(0x0000, 0x03ff).ram().share("share1"); map(0x0400, 0x07ff).ram(); map(0x0800, 0x0bff).nopr(); /* ACIA */ - map(0x0c00, 0x0c00).mirror(0x3fe).rw(this, FUNC(qix_state::qix_video_firq_r), FUNC(qix_state::qix_video_firq_w)); - map(0x0c01, 0x0c01).mirror(0x3fe).rw(this, FUNC(qix_state::qix_data_firq_ack_r), FUNC(qix_state::qix_data_firq_ack_w)); + map(0x0c00, 0x0c00).mirror(0x3fe).rw(FUNC(qix_state::qix_video_firq_r), FUNC(qix_state::qix_video_firq_w)); + map(0x0c01, 0x0c01).mirror(0x3fe).rw(FUNC(qix_state::qix_data_firq_ack_r), FUNC(qix_state::qix_data_firq_ack_w)); map(0x1000, 0x13ff).rw(m_sndpia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1400, 0x17ff).r(m_pia0, FUNC(pia6821_device::read)).w(this, FUNC(qix_state::qix_pia_w)); + map(0x1400, 0x17ff).r(m_pia0, FUNC(pia6821_device::read)).w(FUNC(qix_state::qix_pia_w)); map(0x1800, 0x1bff).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x1c00, 0x1fff).rw(m_pia2, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x8000, 0xffff).rom(); diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp index a56d3a3d396..903aec83818 100644 --- a/src/mame/drivers/ql.cpp +++ b/src/mame/drivers/ql.cpp @@ -498,7 +498,7 @@ READ8_MEMBER( ql_state::ipc_bus_r ) void ql_state::ql_mem(address_map &map) { - map(0x000000, 0x0fffff).rw(this, FUNC(ql_state::read), FUNC(ql_state::write)); + map(0x000000, 0x0fffff).rw(FUNC(ql_state::read), FUNC(ql_state::write)); } @@ -508,7 +508,7 @@ void ql_state::ql_mem(address_map &map) void ql_state::ipc_io(address_map &map) { - map(0x00, 0x7f).w(this, FUNC(ql_state::ipc_w)); + map(0x00, 0x7f).w(FUNC(ql_state::ipc_w)); map(0x27, 0x28).nopr(); // IPC reads these to set P0 (bus) to Hi-Z mode } diff --git a/src/mame/drivers/qtsbc.cpp b/src/mame/drivers/qtsbc.cpp index b4f8a4f723b..75109e511b2 100644 --- a/src/mame/drivers/qtsbc.cpp +++ b/src/mame/drivers/qtsbc.cpp @@ -222,13 +222,13 @@ void qtsbc_state::mem_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0xffff).ram().share("ram"); - map(0x0000, 0xffff).rw(this, FUNC(qtsbc_state::memory_r), FUNC(qtsbc_state::memory_w)); + map(0x0000, 0xffff).rw(FUNC(qtsbc_state::memory_r), FUNC(qtsbc_state::memory_w)); } void qtsbc_state::io_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(qtsbc_state::io_r), FUNC(qtsbc_state::io_w)); + map(0x0000, 0xffff).rw(FUNC(qtsbc_state::io_r), FUNC(qtsbc_state::io_w)); } /* Input ports */ diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp index 40ebdbb09e8..9c95e1c89c7 100644 --- a/src/mame/drivers/quantum.cpp +++ b/src/mame/drivers/quantum.cpp @@ -169,11 +169,11 @@ void quantum_state::main_map(address_map &map) map(0x840000, 0x84001f).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)).umask16(0x00ff); map(0x840020, 0x84003f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)).umask16(0x00ff); map(0x900000, 0x9001ff).rw("nvram", FUNC(x2212_device::read), FUNC(x2212_device::write)).umask16(0x00ff); - map(0x940000, 0x940001).r(this, FUNC(quantum_state::trackball_r)); /* trackball */ + map(0x940000, 0x940001).r(FUNC(quantum_state::trackball_r)); /* trackball */ map(0x948000, 0x948001).portr("SYSTEM"); map(0x950000, 0x95001f).writeonly().share("colorram"); - map(0x958000, 0x958001).w(this, FUNC(quantum_state::led_w)); - map(0x960000, 0x960001).w(this, FUNC(quantum_state::nvram_recall_w)); + map(0x958000, 0x958001).w(FUNC(quantum_state::led_w)); + map(0x960000, 0x960001).w(FUNC(quantum_state::nvram_recall_w)); map(0x968000, 0x968001).w(m_avg, FUNC(avg_quantum_device::reset_word_w)); map(0x970000, 0x970001).w(m_avg, FUNC(avg_quantum_device::go_word_w)); map(0x978000, 0x978001).nopr().w("watchdog", FUNC(watchdog_timer_device::reset16_w)); diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp index 72c6d3aa250..429aaecdf72 100644 --- a/src/mame/drivers/quasar.cpp +++ b/src/mame/drivers/quasar.cpp @@ -113,11 +113,11 @@ READ_LINE_MEMBER(quasar_state::audio_t1_r) void quasar_state::quasar(address_map &map) { map(0x0000, 0x13ff).rom(); - map(0x1400, 0x14ff).mirror(0x6000).r(this, FUNC(quasar_state::cvs_bullet_ram_or_palette_r)).w(this, FUNC(quasar_state::quasar_bullet_w)).share("bullet_ram"); - map(0x1500, 0x15ff).mirror(0x6000).rw(this, FUNC(quasar_state::cvs_s2636_0_or_character_ram_r), FUNC(quasar_state::cvs_s2636_0_or_character_ram_w)); - map(0x1600, 0x16ff).mirror(0x6000).rw(this, FUNC(quasar_state::cvs_s2636_1_or_character_ram_r), FUNC(quasar_state::cvs_s2636_1_or_character_ram_w)); - map(0x1700, 0x17ff).mirror(0x6000).rw(this, FUNC(quasar_state::cvs_s2636_2_or_character_ram_r), FUNC(quasar_state::cvs_s2636_2_or_character_ram_w)); - map(0x1800, 0x1bff).mirror(0x6000).r(this, FUNC(quasar_state::cvs_video_or_color_ram_r)).w(this, FUNC(quasar_state::quasar_video_w)).share("video_ram"); + map(0x1400, 0x14ff).mirror(0x6000).r(FUNC(quasar_state::cvs_bullet_ram_or_palette_r)).w(FUNC(quasar_state::quasar_bullet_w)).share("bullet_ram"); + map(0x1500, 0x15ff).mirror(0x6000).rw(FUNC(quasar_state::cvs_s2636_0_or_character_ram_r), FUNC(quasar_state::cvs_s2636_0_or_character_ram_w)); + map(0x1600, 0x16ff).mirror(0x6000).rw(FUNC(quasar_state::cvs_s2636_1_or_character_ram_r), FUNC(quasar_state::cvs_s2636_1_or_character_ram_w)); + map(0x1700, 0x17ff).mirror(0x6000).rw(FUNC(quasar_state::cvs_s2636_2_or_character_ram_r), FUNC(quasar_state::cvs_s2636_2_or_character_ram_w)); + map(0x1800, 0x1bff).mirror(0x6000).r(FUNC(quasar_state::cvs_video_or_color_ram_r)).w(FUNC(quasar_state::quasar_video_w)).share("video_ram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x33ff).rom(); map(0x4000, 0x53ff).rom(); @@ -126,14 +126,14 @@ void quasar_state::quasar(address_map &map) void quasar_state::quasar_io(address_map &map) { - map(0x00, 0x03).rw(this, FUNC(quasar_state::quasar_IO_r), FUNC(quasar_state::video_page_select_w)); - map(0x08, 0x0b).w(this, FUNC(quasar_state::io_page_select_w)); + map(0x00, 0x03).rw(FUNC(quasar_state::quasar_IO_r), FUNC(quasar_state::video_page_select_w)); + map(0x08, 0x0b).w(FUNC(quasar_state::io_page_select_w)); } void quasar_state::quasar_data(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).r(this, FUNC(quasar_state::cvs_collision_r)).nopw(); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(quasar_state::cvs_collision_clear), FUNC(quasar_state::quasar_sh_command_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).r(FUNC(quasar_state::cvs_collision_r)).nopw(); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(quasar_state::cvs_collision_clear), FUNC(quasar_state::quasar_sh_command_w)); } /************************************* @@ -150,7 +150,7 @@ void quasar_state::sound_map(address_map &map) void quasar_state::sound_portmap(address_map &map) { map(0x00, 0x7f).ram(); - map(0x80, 0x80).r(this, FUNC(quasar_state::quasar_sh_command_r)); + map(0x80, 0x80).r(FUNC(quasar_state::quasar_sh_command_r)); } /************************************************************************ @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(quasar_state::quasar) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, quasar_state, audio_t1_r)) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MACHINE_START_OVERRIDE(quasar_state,quasar) MCFG_MACHINE_RESET_OVERRIDE(quasar_state,quasar) diff --git a/src/mame/drivers/queen.cpp b/src/mame/drivers/queen.cpp index 4126aa468e8..0e54dfbc558 100644 --- a/src/mame/drivers/queen.cpp +++ b/src/mame/drivers/queen.cpp @@ -242,8 +242,8 @@ void queen_state::queen_map(address_map &map) { map(0x00000000, 0x0009ffff).ram(); map(0x000a0000, 0x000bffff).rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w)); - map(0x000e0000, 0x000effff).bankr("bios_ext").w(this, FUNC(queen_state::bios_ext_ram_w)); - map(0x000f0000, 0x000fffff).bankr("bios_bank").w(this, FUNC(queen_state::bios_ram_w)); + map(0x000e0000, 0x000effff).bankr("bios_ext").w(FUNC(queen_state::bios_ext_ram_w)); + map(0x000f0000, 0x000fffff).bankr("bios_bank").w(FUNC(queen_state::bios_ram_w)); map(0x00100000, 0x01ffffff).ram(); map(0xfffc0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ } @@ -253,13 +253,13 @@ void queen_state::queen_io(address_map &map) pcat32_io_common(map); map(0x00e8, 0x00ef).noprw(); - map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); - map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); + map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); + map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); map(0x03b0, 0x03bf).rw("vga", FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::read_cs1), FUNC(ide_controller_device::write_cs1)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); } diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp index 256627518b1..97333eeb289 100644 --- a/src/mame/drivers/quickpick5.cpp +++ b/src/mame/drivers/quickpick5.cpp @@ -270,20 +270,20 @@ void quickpick5_state::quickpick5_main(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xdbff).ram().share("nvram"); map(0xdc00, 0xdc0f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)); - map(0xdc40, 0xdc4f).rw(this, FUNC(quickpick5_state::k244_r), FUNC(quickpick5_state::k244_w)); + map(0xdc40, 0xdc4f).rw(FUNC(quickpick5_state::k244_r), FUNC(quickpick5_state::k244_w)); map(0xdc80, 0xdc80).portr("DSW3"); map(0xdc81, 0xdc81).portr("DSW4"); map(0xdcc0, 0xdcc0).portr("DSW1"); map(0xdcc1, 0xdcc1).portr("DSW2"); map(0xdd00, 0xdd00).nopw(); map(0xdd40, 0xdd40).noprw(); - map(0xdd80, 0xdd80).rw(this, FUNC(quickpick5_state::control_r), FUNC(quickpick5_state::control_w)); + map(0xdd80, 0xdd80).rw(FUNC(quickpick5_state::control_r), FUNC(quickpick5_state::control_w)); map(0xddc0, 0xddc0).nopw(); map(0xde00, 0xde00).nopw(); map(0xde40, 0xde40).w(m_oki, FUNC(okim6295_device::write)); - map(0xe000, 0xefff).rw(this, FUNC(quickpick5_state::vram_r), FUNC(quickpick5_state::vram_w)); + map(0xe000, 0xefff).rw(FUNC(quickpick5_state::vram_r), FUNC(quickpick5_state::vram_w)); map(0xf000, 0xf7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); - map(0xf800, 0xffff).rw(this, FUNC(quickpick5_state::k245_r), FUNC(quickpick5_state::k245_w)); + map(0xf800, 0xffff).rw(FUNC(quickpick5_state::k245_r), FUNC(quickpick5_state::k245_w)); } static INPUT_PORTS_START( quickpick5 ) diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp index b9da8785682..15910dd3b15 100644 --- a/src/mame/drivers/quizdna.cpp +++ b/src/mame/drivers/quizdna.cpp @@ -37,22 +37,22 @@ void quizdna_state::quizdna_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("mainbank"); - map(0x8000, 0x9fff).w(this, FUNC(quizdna_state::fg_ram_w)); - map(0xa000, 0xbfff).w(this, FUNC(quizdna_state::bg_ram_w)); + map(0x8000, 0x9fff).w(FUNC(quizdna_state::fg_ram_w)); + map(0xa000, 0xbfff).w(FUNC(quizdna_state::bg_ram_w)); map(0xc000, 0xdfff).ram(); map(0xe000, 0xe1ff).ram().share("spriteram"); map(0xe200, 0xefff).ram(); - map(0xf000, 0xffff).ram().w(this, FUNC(quizdna_state::paletteram_xBGR_RRRR_GGGG_BBBB_w)).share("paletteram"); + map(0xf000, 0xffff).ram().w(FUNC(quizdna_state::paletteram_xBGR_RRRR_GGGG_BBBB_w)).share("paletteram"); } void quizdna_state::gekiretu_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("mainbank"); - map(0x8000, 0x9fff).w(this, FUNC(quizdna_state::fg_ram_w)); - map(0xa000, 0xbfff).w(this, FUNC(quizdna_state::bg_ram_w)); + map(0x8000, 0x9fff).w(FUNC(quizdna_state::fg_ram_w)); + map(0xa000, 0xbfff).w(FUNC(quizdna_state::bg_ram_w)); map(0xc000, 0xdfff).ram(); - map(0xe000, 0xefff).ram().w(this, FUNC(quizdna_state::paletteram_xBGR_RRRR_GGGG_BBBB_w)).share("paletteram"); + map(0xe000, 0xefff).ram().w(FUNC(quizdna_state::paletteram_xBGR_RRRR_GGGG_BBBB_w)).share("paletteram"); map(0xf000, 0xf1ff).ram().share("spriteram"); map(0xf200, 0xffff).ram(); } @@ -60,15 +60,15 @@ void quizdna_state::gekiretu_map(address_map &map) void quizdna_state::quizdna_io_map(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).w(this, FUNC(quizdna_state::bg_xscroll_w)); - map(0x04, 0x04).w(this, FUNC(quizdna_state::bg_yscroll_w)); + map(0x02, 0x03).w(FUNC(quizdna_state::bg_xscroll_w)); + map(0x04, 0x04).w(FUNC(quizdna_state::bg_yscroll_w)); map(0x05, 0x06).nopw(); /* unknown */ map(0x80, 0x80).portr("P1"); map(0x81, 0x81).portr("P2"); map(0x90, 0x90).portr("SYSTEM"); map(0x91, 0x91).portr("SERVICE"); - map(0xc0, 0xc0).w(this, FUNC(quizdna_state::rombank_w)); - map(0xd0, 0xd0).w(this, FUNC(quizdna_state::screen_ctrl_w)); + map(0xc0, 0xc0).w(FUNC(quizdna_state::rombank_w)); + map(0xd0, 0xd0).w(FUNC(quizdna_state::screen_ctrl_w)); map(0xe0, 0xe1).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf0, 0xf0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -76,15 +76,15 @@ void quizdna_state::quizdna_io_map(address_map &map) void quizdna_state::gakupara_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(quizdna_state::bg_xscroll_w)); - map(0x02, 0x02).w(this, FUNC(quizdna_state::bg_yscroll_w)); + map(0x00, 0x01).w(FUNC(quizdna_state::bg_xscroll_w)); + map(0x02, 0x02).w(FUNC(quizdna_state::bg_yscroll_w)); map(0x03, 0x04).nopw(); /* unknown */ map(0x80, 0x80).portr("P1"); map(0x81, 0x81).portr("P2"); map(0x90, 0x90).portr("SYSTEM"); map(0x91, 0x91).portr("SERVICE"); - map(0xc0, 0xc0).w(this, FUNC(quizdna_state::rombank_w)); - map(0xd0, 0xd0).w(this, FUNC(quizdna_state::screen_ctrl_w)); + map(0xc0, 0xc0).w(FUNC(quizdna_state::rombank_w)); + map(0xd0, 0xd0).w(FUNC(quizdna_state::screen_ctrl_w)); map(0xe0, 0xe1).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf0, 0xf0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -92,15 +92,15 @@ void quizdna_state::gakupara_io_map(address_map &map) void quizdna_state::gekiretu_io_map(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).w(this, FUNC(quizdna_state::bg_xscroll_w)); - map(0x04, 0x04).w(this, FUNC(quizdna_state::bg_yscroll_w)); + map(0x02, 0x03).w(FUNC(quizdna_state::bg_xscroll_w)); + map(0x04, 0x04).w(FUNC(quizdna_state::bg_yscroll_w)); map(0x05, 0x06).nopw(); /* unknown */ map(0x80, 0x80).portr("P1"); map(0x81, 0x81).portr("P2"); map(0x90, 0x90).portr("SYSTEM"); map(0x91, 0x91).portr("SERVICE"); - map(0xc0, 0xc0).w(this, FUNC(quizdna_state::gekiretu_rombank_w)); - map(0xd0, 0xd0).w(this, FUNC(quizdna_state::screen_ctrl_w)); + map(0xc0, 0xc0).w(FUNC(quizdna_state::gekiretu_rombank_w)); + map(0xd0, 0xd0).w(FUNC(quizdna_state::screen_ctrl_w)); map(0xe0, 0xe1).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf0, 0xf0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp index ce0223f691e..7c4d6ace181 100644 --- a/src/mame/drivers/quizo.cpp +++ b/src/mame/drivers/quizo.cpp @@ -150,7 +150,7 @@ void quizo_state::memmap(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xffff).w(this, FUNC(quizo_state::vram_w)); + map(0xc000, 0xffff).w(FUNC(quizo_state::vram_w)); } @@ -161,8 +161,8 @@ void quizo_state::portmap(address_map &map) map(0x10, 0x10).portr("IN1"); map(0x40, 0x40).portr("IN2"); map(0x50, 0x51).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0x60, 0x60).w(this, FUNC(quizo_state::port60_w)); - map(0x70, 0x70).w(this, FUNC(quizo_state::port70_w)); + map(0x60, 0x60).w(FUNC(quizo_state::port60_w)); + map(0x70, 0x70).w(FUNC(quizo_state::port70_w)); } static INPUT_PORTS_START( quizo ) diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp index 3776b18d165..09b02a1a88a 100644 --- a/src/mame/drivers/quizpani.cpp +++ b/src/mame/drivers/quizpani.cpp @@ -65,15 +65,15 @@ void quizpani_state::quizpani_map(address_map &map) map(0x10000a, 0x10000b).portr("DSW2"); map(0x100014, 0x100015).nopw(); /* screen flipping? */ map(0x100016, 0x100017).nopw(); /* IRQ enable? */ - map(0x100018, 0x100019).w(this, FUNC(quizpani_state::tilesbank_w)); + map(0x100018, 0x100019).w(FUNC(quizpani_state::tilesbank_w)); map(0x104001, 0x104001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x104020, 0x104027).w("nmk112", FUNC(nmk112_device::okibank_w)).umask16(0x00ff); map(0x108000, 0x1083ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x108400, 0x1085ff).nopw(); map(0x10c000, 0x10c007).ram().share("scrollreg"); map(0x10c008, 0x10c403).nopw(); - map(0x110000, 0x113fff).ram().w(this, FUNC(quizpani_state::bg_videoram_w)).share("bg_videoram"); - map(0x11c000, 0x11ffff).ram().w(this, FUNC(quizpani_state::txt_videoram_w)).share("txt_videoram"); + map(0x110000, 0x113fff).ram().w(FUNC(quizpani_state::bg_videoram_w)).share("bg_videoram"); + map(0x11c000, 0x11ffff).ram().w(FUNC(quizpani_state::txt_videoram_w)).share("txt_videoram"); map(0x180000, 0x18ffff).ram(); map(0x200000, 0x33ffff).rom(); } diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index 63ef7a58f28..daa02efa693 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -328,8 +328,8 @@ void quizpun2_state::quizpun2_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); - map(0xa000, 0xbfff).ram().w(this, FUNC(quizpun2_state::fg_ram_w)).share("fg_ram"); - map(0xc000, 0xcfff).ram().w(this, FUNC(quizpun2_state::bg_ram_w)).share("bg_ram"); + map(0xa000, 0xbfff).ram().w(FUNC(quizpun2_state::fg_ram_w)).share("fg_ram"); + map(0xc000, 0xcfff).ram().w(FUNC(quizpun2_state::bg_ram_w)).share("bg_ram"); map(0xd000, 0xd3ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xe000, 0xffff).ram(); @@ -338,14 +338,14 @@ void quizpun2_state::quizpun2_map(address_map &map) void quizpun2_state::quizpun2_io_map(address_map &map) { map.global_mask(0xff); - map(0x40, 0x40).w(this, FUNC(quizpun2_state::irq_ack)); - map(0x50, 0x50).w(this, FUNC(quizpun2_state::soundlatch_w)); - map(0x60, 0x60).w(this, FUNC(quizpun2_state::rombank_w)); - map(0x70, 0x70).w(this, FUNC(quizpun2_state::scroll_w)); + map(0x40, 0x40).w(FUNC(quizpun2_state::irq_ack)); + map(0x50, 0x50).w(FUNC(quizpun2_state::soundlatch_w)); + map(0x60, 0x60).w(FUNC(quizpun2_state::rombank_w)); + map(0x70, 0x70).w(FUNC(quizpun2_state::scroll_w)); map(0x80, 0x80).portr("DSW"); map(0x90, 0x90).portr("IN0"); map(0xa0, 0xa0).portr("IN1"); - map(0xe0, 0xe0).rw(this, FUNC(quizpun2_state::quizpun_protection_r), FUNC(quizpun2_state::quizpun_protection_w)); + map(0xe0, 0xe0).rw(FUNC(quizpun2_state::quizpun_protection_r), FUNC(quizpun2_state::quizpun_protection_w)); } void quizpun2_state::quizpun2_cop_map(address_map &map) diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp index 2f5e59f8956..1f1f77ad255 100644 --- a/src/mame/drivers/quizshow.cpp +++ b/src/mame/drivers/quizshow.cpp @@ -239,18 +239,18 @@ void quizshow_state::mem_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x0bff).rom(); - map(0x1802, 0x1802).w(this, FUNC(quizshow_state::audio_w)); - map(0x1804, 0x1804).w(this, FUNC(quizshow_state::lamps1_w)); - map(0x1808, 0x1808).w(this, FUNC(quizshow_state::lamps2_w)); - map(0x1810, 0x1810).w(this, FUNC(quizshow_state::lamps3_w)); - map(0x1820, 0x1820).w(this, FUNC(quizshow_state::tape_control_w)); - map(0x1840, 0x1840).w(this, FUNC(quizshow_state::video_disable_w)); + map(0x1802, 0x1802).w(FUNC(quizshow_state::audio_w)); + map(0x1804, 0x1804).w(FUNC(quizshow_state::lamps1_w)); + map(0x1808, 0x1808).w(FUNC(quizshow_state::lamps2_w)); + map(0x1810, 0x1810).w(FUNC(quizshow_state::lamps3_w)); + map(0x1820, 0x1820).w(FUNC(quizshow_state::tape_control_w)); + map(0x1840, 0x1840).w(FUNC(quizshow_state::video_disable_w)); map(0x1881, 0x1881).portr("IN0"); map(0x1882, 0x1882).portr("IN1"); map(0x1884, 0x1884).portr("IN2"); map(0x1888, 0x1888).portr("IN3"); - map(0x1900, 0x1900).r(this, FUNC(quizshow_state::timing_r)); - map(0x1e00, 0x1fff).ram().w(this, FUNC(quizshow_state::main_ram_w)).share("main_ram"); + map(0x1900, 0x1900).r(FUNC(quizshow_state::timing_r)); + map(0x1e00, 0x1fff).ram().w(FUNC(quizshow_state::main_ram_w)).share("main_ram"); } diff --git a/src/mame/drivers/qvt201.cpp b/src/mame/drivers/qvt201.cpp index c200b35e5ff..81375947225 100644 --- a/src/mame/drivers/qvt201.cpp +++ b/src/mame/drivers/qvt201.cpp @@ -86,9 +86,9 @@ void qvt201_state::mem_map(address_map &map) map(0x8800, 0x8fff).ram().share("nvram"); map(0x9000, 0x9007).rw("crtc", FUNC(scn2672_device::read), FUNC(scn2672_device::write)); map(0x9800, 0x980f).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write)); - map(0xa000, 0xa000).w(this, FUNC(qvt201_state::offset_w)); - map(0xa800, 0xa800).w(this, FUNC(qvt201_state::keyboard_w)); - map(0xb000, 0xb000).r(this, FUNC(qvt201_state::keyboard_r)); + map(0xa000, 0xa000).w(FUNC(qvt201_state::offset_w)); + map(0xa800, 0xa800).w(FUNC(qvt201_state::keyboard_w)); + map(0xb000, 0xb000).r(FUNC(qvt201_state::keyboard_r)); map(0xc000, 0xdfff).ram().share("dataram"); map(0xe000, 0xffff).ram().share("attram"); } diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index b463ed551d6..34cf333b6b2 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -556,17 +556,17 @@ void qx10_state::qx10_io(address_map &map) map(0x0c, 0x0d).rw(m_pic_s, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x10, 0x13).rw(m_scc, FUNC(z80dart_device::cd_ba_r), FUNC(z80dart_device::cd_ba_w)); map(0x14, 0x17).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x18, 0x1b).portr("DSW").w(this, FUNC(qx10_state::qx10_18_w)); - map(0x1c, 0x1f).w(this, FUNC(qx10_state::prom_sel_w)); - map(0x20, 0x23).w(this, FUNC(qx10_state::cmos_sel_w)); + map(0x18, 0x1b).portr("DSW").w(FUNC(qx10_state::qx10_18_w)); + map(0x1c, 0x1f).w(FUNC(qx10_state::prom_sel_w)); + map(0x20, 0x23).w(FUNC(qx10_state::cmos_sel_w)); map(0x2c, 0x2c).portr("CONFIG"); - map(0x2d, 0x2d).rw(this, FUNC(qx10_state::vram_bank_r), FUNC(qx10_state::vram_bank_w)); - map(0x30, 0x33).rw(this, FUNC(qx10_state::qx10_30_r), FUNC(qx10_state::fdd_motor_w)); + map(0x2d, 0x2d).rw(FUNC(qx10_state::vram_bank_r), FUNC(qx10_state::vram_bank_w)); + map(0x30, 0x33).rw(FUNC(qx10_state::qx10_30_r), FUNC(qx10_state::fdd_motor_w)); map(0x34, 0x35).m(m_fdc, FUNC(upd765a_device::map)); map(0x38, 0x39).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); // map(0x3a, 0x3a) GDC zoom // map(0x3b, 0x3b) GDC light pen req - map(0x3c, 0x3d).rw(this, FUNC(qx10_state::mc146818_r), FUNC(qx10_state::mc146818_w)); + map(0x3c, 0x3d).rw(FUNC(qx10_state::mc146818_r), FUNC(qx10_state::mc146818_w)); map(0x40, 0x4f).rw(m_dma_1, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x50, 0x5f).rw(m_dma_2, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); // map(0xfc, 0xfd) Multi-Font comms @@ -711,7 +711,7 @@ WRITE16_MEMBER( qx10_state::vram_w ) void qx10_state::upd7220_map(address_map &map) { - map(0x00000, 0x3ffff).rw(this, FUNC(qx10_state::vram_r), FUNC(qx10_state::vram_w)); + map(0x00000, 0x3ffff).rw(FUNC(qx10_state::vram_r), FUNC(qx10_state::vram_w)); } static void keyboard(device_slot_interface &device) diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp index a6bfd3d1ab1..5daa74e3d64 100644 --- a/src/mame/drivers/r2dtank.cpp +++ b/src/mame/drivers/r2dtank.cpp @@ -332,8 +332,8 @@ void r2dtank_state::r2dtank_main_map(address_map &map) map(0x2000, 0x3fff).ram(); map(0x4000, 0x5fff).ram().share("colorram"); map(0x6000, 0x7fff).ram(); - map(0x8000, 0x8003).r("pia_main", FUNC(pia6821_device::read)).w(this, FUNC(r2dtank_state::pia_comp_w)); - map(0x8004, 0x8004).rw(this, FUNC(r2dtank_state::audio_answer_r), FUNC(r2dtank_state::audio_command_w)); + map(0x8000, 0x8003).r("pia_main", FUNC(pia6821_device::read)).w(FUNC(r2dtank_state::pia_comp_w)); + map(0x8004, 0x8004).rw(FUNC(r2dtank_state::audio_answer_r), FUNC(r2dtank_state::audio_command_w)); map(0xb000, 0xb000).w("crtc", FUNC(mc6845_device::address_w)); map(0xb001, 0xb001).w("crtc", FUNC(mc6845_device::register_w)); map(0xc000, 0xc007).ram().share("nvram"); @@ -345,7 +345,7 @@ void r2dtank_state::r2dtank_audio_map(address_map &map) { map(0x0000, 0x007f).ram(); /* internal RAM */ map(0xd000, 0xd003).rw("pia_audio", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0xf000, 0xf000).rw(this, FUNC(r2dtank_state::audio_command_r), FUNC(r2dtank_state::audio_answer_w)); + map(0xf000, 0xf000).rw(FUNC(r2dtank_state::audio_command_r), FUNC(r2dtank_state::audio_answer_w)); map(0xf800, 0xffff).rom(); } diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index 0fc49f6fea4..a262ba7e374 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -387,50 +387,50 @@ void r2dx_v33_state::rdx_v33_map(address_map &map) { map(0x00000, 0x003ff).ram(); // vectors copied here - map(0x00400, 0x00401).w(this, FUNC(r2dx_v33_state::r2dx_tilemapdma_w)); // tilemaps to private buffer - map(0x00402, 0x00403).w(this, FUNC(r2dx_v33_state::r2dx_paldma_w)); // palettes to private buffer + map(0x00400, 0x00401).w(FUNC(r2dx_v33_state::r2dx_tilemapdma_w)); // tilemaps to private buffer + map(0x00402, 0x00403).w(FUNC(r2dx_v33_state::r2dx_paldma_w)); // palettes to private buffer - map(0x00404, 0x00405).w(this, FUNC(r2dx_v33_state::r2dx_rom_bank_w)); - map(0x00406, 0x00407).w(this, FUNC(r2dx_v33_state::tile_bank_w)); + map(0x00404, 0x00405).w(FUNC(r2dx_v33_state::r2dx_rom_bank_w)); + map(0x00406, 0x00407).w(FUNC(r2dx_v33_state::tile_bank_w)); - map(0x00420, 0x00421).w(this, FUNC(r2dx_v33_state::r2dx_dx_w)); - map(0x00422, 0x00423).w(this, FUNC(r2dx_v33_state::r2dx_dy_w)); - map(0x00424, 0x00425).w(this, FUNC(r2dx_v33_state::r2dx_sdistl_w)); - map(0x00426, 0x00427).w(this, FUNC(r2dx_v33_state::r2dx_sdisth_w)); - map(0x00428, 0x00429).w(this, FUNC(r2dx_v33_state::r2dx_angle_w)); + map(0x00420, 0x00421).w(FUNC(r2dx_v33_state::r2dx_dx_w)); + map(0x00422, 0x00423).w(FUNC(r2dx_v33_state::r2dx_dy_w)); + map(0x00424, 0x00425).w(FUNC(r2dx_v33_state::r2dx_sdistl_w)); + map(0x00426, 0x00427).w(FUNC(r2dx_v33_state::r2dx_sdisth_w)); + map(0x00428, 0x00429).w(FUNC(r2dx_v33_state::r2dx_angle_w)); - map(0x00430, 0x00431).r(this, FUNC(r2dx_v33_state::r2dx_angle_r)); - map(0x00432, 0x00433).r(this, FUNC(r2dx_v33_state::r2dx_dist_r)); - map(0x00434, 0x00435).r(this, FUNC(r2dx_v33_state::r2dx_sin_r)); - map(0x00436, 0x00437).r(this, FUNC(r2dx_v33_state::r2dx_cos_r)); + map(0x00430, 0x00431).r(FUNC(r2dx_v33_state::r2dx_angle_r)); + map(0x00432, 0x00433).r(FUNC(r2dx_v33_state::r2dx_dist_r)); + map(0x00434, 0x00435).r(FUNC(r2dx_v33_state::r2dx_sin_r)); + map(0x00436, 0x00437).r(FUNC(r2dx_v33_state::r2dx_cos_r)); map(0x00600, 0x0063f).rw("crtc", FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); //AM_RANGE(0x00640, 0x006bf) AM_DEVREADWRITE("obj", seibu_encrypted_sprite_device, read, write) map(0x0068e, 0x0068f).nopw(); // sprite buffering - map(0x006b0, 0x006b1).w(this, FUNC(r2dx_v33_state::mcu_prog_w)); // could be encryption key uploads just like raiden2.cpp ? - map(0x006b2, 0x006b3).w(this, FUNC(r2dx_v33_state::mcu_prog_w2)); + map(0x006b0, 0x006b1).w(FUNC(r2dx_v33_state::mcu_prog_w)); // could be encryption key uploads just like raiden2.cpp ? + map(0x006b2, 0x006b3).w(FUNC(r2dx_v33_state::mcu_prog_w2)); // AM_RANGE(0x006b4, 0x006b5) AM_WRITENOP // AM_RANGE(0x006b6, 0x006b7) AM_WRITENOP - map(0x006bc, 0x006bd).w(this, FUNC(r2dx_v33_state::mcu_prog_offs_w)); + map(0x006bc, 0x006bd).w(FUNC(r2dx_v33_state::mcu_prog_offs_w)); // AM_RANGE(0x006be, 0x006bf) AM_WRITENOP // sprite protection not 100% verified as the same - map(0x006c0, 0x006c1).rw(this, FUNC(r2dx_v33_state::sprite_prot_off_r), FUNC(r2dx_v33_state::sprite_prot_off_w)); - map(0x006c2, 0x006c3).rw(this, FUNC(r2dx_v33_state::sprite_prot_src_seg_r), FUNC(r2dx_v33_state::sprite_prot_src_seg_w)); - map(0x006c6, 0x006c7).w(this, FUNC(r2dx_v33_state::sprite_prot_dst1_w)); + map(0x006c0, 0x006c1).rw(FUNC(r2dx_v33_state::sprite_prot_off_r), FUNC(r2dx_v33_state::sprite_prot_off_w)); + map(0x006c2, 0x006c3).rw(FUNC(r2dx_v33_state::sprite_prot_src_seg_r), FUNC(r2dx_v33_state::sprite_prot_src_seg_w)); + map(0x006c6, 0x006c7).w(FUNC(r2dx_v33_state::sprite_prot_dst1_w)); - map(0x006d8, 0x006d9).w(this, FUNC(r2dx_v33_state::sprite_prot_x_w)); - map(0x006da, 0x006db).w(this, FUNC(r2dx_v33_state::sprite_prot_y_w)); - map(0x006dc, 0x006dd).rw(this, FUNC(r2dx_v33_state::sprite_prot_maxx_r), FUNC(r2dx_v33_state::sprite_prot_maxx_w)); - map(0x006de, 0x006df).w(this, FUNC(r2dx_v33_state::sprite_prot_src_w)); + map(0x006d8, 0x006d9).w(FUNC(r2dx_v33_state::sprite_prot_x_w)); + map(0x006da, 0x006db).w(FUNC(r2dx_v33_state::sprite_prot_y_w)); + map(0x006dc, 0x006dd).rw(FUNC(r2dx_v33_state::sprite_prot_maxx_r), FUNC(r2dx_v33_state::sprite_prot_maxx_w)); + map(0x006de, 0x006df).w(FUNC(r2dx_v33_state::sprite_prot_src_w)); - map(0x00700, 0x00701).w(this, FUNC(r2dx_v33_state::rdx_v33_eeprom_w)); - map(0x00740, 0x00741).r(this, FUNC(r2dx_v33_state::r2dx_debug_r)); + map(0x00700, 0x00701).w(FUNC(r2dx_v33_state::rdx_v33_eeprom_w)); + map(0x00740, 0x00741).r(FUNC(r2dx_v33_state::r2dx_debug_r)); map(0x00744, 0x00745).portr("INPUT"); map(0x0074c, 0x0074d).portr("SYSTEM"); - map(0x00762, 0x00763).r(this, FUNC(r2dx_v33_state::sprite_prot_dst1_r)); + map(0x00762, 0x00763).r(FUNC(r2dx_v33_state::sprite_prot_dst1_r)); map(0x00780, 0x00780).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // single OKI chip on this version @@ -456,38 +456,38 @@ void r2dx_v33_state::nzeroteam_base_map(address_map &map) { map(0x00000, 0x003ff).ram(); //stack area - map(0x00400, 0x00401).w(this, FUNC(r2dx_v33_state::r2dx_tilemapdma_w)); // tilemaps to private buffer - map(0x00402, 0x00403).w(this, FUNC(r2dx_v33_state::r2dx_paldma_w)); // palettes to private buffer + map(0x00400, 0x00401).w(FUNC(r2dx_v33_state::r2dx_tilemapdma_w)); // tilemaps to private buffer + map(0x00402, 0x00403).w(FUNC(r2dx_v33_state::r2dx_paldma_w)); // palettes to private buffer // 0x404 is bank on r2dx, this doesn't need it // AM_RANGE(0x00406, 0x00407) AM_WRITE(tile_bank_w) // not the same? map(0x00406, 0x00407).noprw(); // always 6022, supposed to be the tile bank but ignores the actual value??? - map(0x00420, 0x00421).w(this, FUNC(r2dx_v33_state::r2dx_dx_w)); - map(0x00422, 0x00423).w(this, FUNC(r2dx_v33_state::r2dx_dy_w)); - map(0x00424, 0x00425).w(this, FUNC(r2dx_v33_state::r2dx_sdistl_w)); - map(0x00426, 0x00427).w(this, FUNC(r2dx_v33_state::r2dx_sdisth_w)); - map(0x00428, 0x00429).w(this, FUNC(r2dx_v33_state::r2dx_angle_w)); + map(0x00420, 0x00421).w(FUNC(r2dx_v33_state::r2dx_dx_w)); + map(0x00422, 0x00423).w(FUNC(r2dx_v33_state::r2dx_dy_w)); + map(0x00424, 0x00425).w(FUNC(r2dx_v33_state::r2dx_sdistl_w)); + map(0x00426, 0x00427).w(FUNC(r2dx_v33_state::r2dx_sdisth_w)); + map(0x00428, 0x00429).w(FUNC(r2dx_v33_state::r2dx_angle_w)); - map(0x00430, 0x00431).r(this, FUNC(r2dx_v33_state::r2dx_angle_r)); - map(0x00432, 0x00433).r(this, FUNC(r2dx_v33_state::r2dx_dist_r)); - map(0x00434, 0x00435).r(this, FUNC(r2dx_v33_state::r2dx_sin_r)); - map(0x00436, 0x00437).r(this, FUNC(r2dx_v33_state::r2dx_cos_r)); + map(0x00430, 0x00431).r(FUNC(r2dx_v33_state::r2dx_angle_r)); + map(0x00432, 0x00433).r(FUNC(r2dx_v33_state::r2dx_dist_r)); + map(0x00434, 0x00435).r(FUNC(r2dx_v33_state::r2dx_sin_r)); + map(0x00436, 0x00437).r(FUNC(r2dx_v33_state::r2dx_cos_r)); map(0x00600, 0x0063f).rw("crtc", FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); //map(0x00640, 0x006bf)rw("obj", FUNC(seibu_encrypted_sprite_device::read), FUNC(seibu_encrypted_sprite_device::write)); map(0x0068e, 0x0068f).nopw(); // sprite buffering - map(0x006b0, 0x006b1).w(this, FUNC(r2dx_v33_state::mcu_prog_w)); - map(0x006b2, 0x006b3).w(this, FUNC(r2dx_v33_state::mcu_prog_w2)); + map(0x006b0, 0x006b1).w(FUNC(r2dx_v33_state::mcu_prog_w)); + map(0x006b2, 0x006b3).w(FUNC(r2dx_v33_state::mcu_prog_w2)); // map(0x006b4, 0x006b5).nopw(); // map(0x006b6, 0x006b7).nopw(); - map(0x006bc, 0x006bd).w(this, FUNC(r2dx_v33_state::mcu_prog_offs_w)); -// map(0x006d8, 0x006d9).w(this, FUNC(r2dx_v33_state::bbbbll_w)); // scroll? -// map(0x006dc, 0x006dd).r(this, FUNC(r2dx_v33_state::nzerotea_unknown_r)); -// map(0x006de, 0x006df).w(this, FUNC(r2dx_v33_state::mcu_unkaa_w)); // mcu command related? -// map(0x00700, 0x00701).w(this, FUNC(r2dx_v33_state::rdx_v33_eeprom_w)); + map(0x006bc, 0x006bd).w(FUNC(r2dx_v33_state::mcu_prog_offs_w)); +// map(0x006d8, 0x006d9).w(FUNC(r2dx_v33_state::bbbbll_w)); // scroll? +// map(0x006dc, 0x006dd).r(FUNC(r2dx_v33_state::nzerotea_unknown_r)); +// map(0x006de, 0x006df).w(FUNC(r2dx_v33_state::mcu_unkaa_w)); // mcu command related? +// map(0x00700, 0x00701).w(FUNC(r2dx_v33_state::rdx_v33_eeprom_w)); -// map(0x00762, 0x00763).r(this, FUNC(r2dx_v33_state::nzerotea_unknown_r)); +// map(0x00762, 0x00763).r(FUNC(r2dx_v33_state::nzerotea_unknown_r)); map(0x00780, 0x0079f).lrw8("seibu_sound_rw", [this](address_space &space, offs_t offset, u8 mem_mask) { @@ -502,10 +502,10 @@ void r2dx_v33_state::nzeroteam_base_map(address_map &map) map(0x0c000, 0x0c7ff).ram().share("sprites"); map(0x0c800, 0x0cfff).ram(); - map(0x0d000, 0x0d7ff).ram(); //.w(this, FUNC(r2dx_v33_state::raiden2_background_w)).share("back_data"); - map(0x0d800, 0x0dfff).ram(); //.w(this, FUNC(r2dx_v33_state::raiden2_foreground_w)).share("fore_data"); - map(0x0e000, 0x0e7ff).ram(); //.w(this, FUNC(r2dx_v33_state::raiden2_midground_w)).share("mid_data"); - map(0x0e800, 0x0f7ff).ram(); //.w(this, FUNC(r2dx_v33_state::raiden2_text_w)).share("text_data"); + map(0x0d000, 0x0d7ff).ram(); //.w(FUNC(r2dx_v33_state::raiden2_background_w)).share("back_data"); + map(0x0d800, 0x0dfff).ram(); //.w(FUNC(r2dx_v33_state::raiden2_foreground_w)).share("fore_data"); + map(0x0e000, 0x0e7ff).ram(); //.w(FUNC(r2dx_v33_state::raiden2_midground_w)).share("mid_data"); + map(0x0e800, 0x0f7ff).ram(); //.w(FUNC(r2dx_v33_state::raiden2_text_w)).share("text_data"); map(0x0f800, 0x0ffff).ram(); /* Stack area */ map(0x10000, 0x1efff).ram(); map(0x1f000, 0x1ffff).ram(); //.w("palette", FUNC(palette_device::write)).share("palette"); @@ -536,7 +536,7 @@ void r2dx_v33_state::zerotm2k_map(address_map &map) map(0x00740, 0x00741).portr("P3_P4"); map(0x00744, 0x00745).portr("INPUT"); map(0x0074c, 0x0074d).portr("SYSTEM"); - map(0x00748, 0x00749).w(this, FUNC(r2dx_v33_state::zerotm2k_eeprom_w)); + map(0x00748, 0x00749).w(FUNC(r2dx_v33_state::zerotm2k_eeprom_w)); } diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp index 91a8c08157d..a28070533f1 100644 --- a/src/mame/drivers/r9751.cpp +++ b/src/mame/drivers/r9751.cpp @@ -624,10 +624,10 @@ void r9751_state::r9751_mem(address_map &map) //ADDRESS_MAP_UNMAP_HIGH map(0x00000000, 0x00ffffff).ram().share("main_ram"); // 16MB map(0x08000000, 0x0800ffff).rom().region("prom", 0); - map(0x5FF00000, 0x5FFFFFFF).rw(this, FUNC(r9751_state::r9751_mmio_5ff_r), FUNC(r9751_state::r9751_mmio_5ff_w)); - map(0xFF010000, 0xFF01FFFF).rw(this, FUNC(r9751_state::r9751_mmio_ff01_r), FUNC(r9751_state::r9751_mmio_ff01_w)); - map(0xFF050000, 0xFF06FFFF).rw(this, FUNC(r9751_state::r9751_mmio_ff05_r), FUNC(r9751_state::r9751_mmio_ff05_w)); - map(0xFFF80000, 0xFFF8FFFF).rw(this, FUNC(r9751_state::r9751_mmio_fff8_r), FUNC(r9751_state::r9751_mmio_fff8_w)); + map(0x5FF00000, 0x5FFFFFFF).rw(FUNC(r9751_state::r9751_mmio_5ff_r), FUNC(r9751_state::r9751_mmio_5ff_w)); + map(0xFF010000, 0xFF01FFFF).rw(FUNC(r9751_state::r9751_mmio_ff01_r), FUNC(r9751_state::r9751_mmio_ff01_w)); + map(0xFF050000, 0xFF06FFFF).rw(FUNC(r9751_state::r9751_mmio_ff05_r), FUNC(r9751_state::r9751_mmio_ff05_w)); + map(0xFFF80000, 0xFFF8FFFF).rw(FUNC(r9751_state::r9751_mmio_fff8_r), FUNC(r9751_state::r9751_mmio_fff8_w)); //AM_RANGE(0xffffff00,0xffffffff) AM_RAM // Unknown area } diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index ef1fda0e115..d9f50daf40a 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -720,8 +720,8 @@ void rabbit_state::rabbit_map(address_map &map) map(0x000010, 0x000013).nopw(); // bug in code / emulation? map(0x000024, 0x000027).nopw(); // bug in code / emulation? map(0x00719c, 0x00719f).nopw(); // bug in code / emulation? - map(0x200000, 0x200003).portr("INPUTS").w(this, FUNC(rabbit_state::eeprom_write)); - map(0x400010, 0x400013).r(this, FUNC(rabbit_state::randomrabbits)); // gfx chip status? + map(0x200000, 0x200003).portr("INPUTS").w(FUNC(rabbit_state::eeprom_write)); + map(0x400010, 0x400013).r(FUNC(rabbit_state::randomrabbits)); // gfx chip status? /* this lot are probably gfxchip/blitter etc. related */ map(0x400010, 0x400013).writeonly().share("viewregs0"); map(0x400100, 0x400117).writeonly().share("tilemap_regs.0"); // tilemap regs1 @@ -729,10 +729,10 @@ void rabbit_state::rabbit_map(address_map &map) map(0x400140, 0x400157).writeonly().share("tilemap_regs.2"); // tilemap regs3 map(0x400160, 0x400177).writeonly().share("tilemap_regs.3"); // tilemap regs4 map(0x400200, 0x40021b).writeonly().share("spriteregs"); // sprregs? - map(0x400300, 0x400303).w(this, FUNC(rabbit_state::rombank_w)); // used during rom testing, rombank/area select + something else? + map(0x400300, 0x400303).w(FUNC(rabbit_state::rombank_w)); // used during rom testing, rombank/area select + something else? map(0x400400, 0x400413).writeonly().share("viewregs6"); // some global controls? (brightness etc.?) map(0x400500, 0x400503).writeonly().share("viewregs7"); - map(0x400700, 0x40070f).w(this, FUNC(rabbit_state::blitter_w)).share("blitterregs"); + map(0x400700, 0x40070f).w(FUNC(rabbit_state::blitter_w)).share("blitterregs"); map(0x400800, 0x40080f).writeonly().share("viewregs9"); // never changes? map(0x400900, 0x4009ff).rw("i5000snd", FUNC(i5000snd_device::read), FUNC(i5000snd_device::write)); /* hmm */ @@ -740,10 +740,10 @@ void rabbit_state::rabbit_map(address_map &map) map(0x440000, 0x47ffff).bankr("bank1"); // data (gfx / sound) rom readback for ROM testing /* tilemaps */ - map(0x480000, 0x483fff).rw(this, FUNC(rabbit_state::tilemap0_r), FUNC(rabbit_state::tilemap0_w)); - map(0x484000, 0x487fff).rw(this, FUNC(rabbit_state::tilemap1_r), FUNC(rabbit_state::tilemap1_w)); - map(0x488000, 0x48bfff).rw(this, FUNC(rabbit_state::tilemap2_r), FUNC(rabbit_state::tilemap2_w)); - map(0x48c000, 0x48ffff).rw(this, FUNC(rabbit_state::tilemap3_r), FUNC(rabbit_state::tilemap3_w)); + map(0x480000, 0x483fff).rw(FUNC(rabbit_state::tilemap0_r), FUNC(rabbit_state::tilemap0_w)); + map(0x484000, 0x487fff).rw(FUNC(rabbit_state::tilemap1_r), FUNC(rabbit_state::tilemap1_w)); + map(0x488000, 0x48bfff).rw(FUNC(rabbit_state::tilemap2_r), FUNC(rabbit_state::tilemap2_w)); + map(0x48c000, 0x48ffff).rw(FUNC(rabbit_state::tilemap3_r), FUNC(rabbit_state::tilemap3_w)); map(0x494000, 0x497fff).ram().share("spriteram"); // sprites? map(0x4a0000, 0x4affff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0xff0000, 0xffffff).ram(); diff --git a/src/mame/drivers/rad_eu3a05.cpp b/src/mame/drivers/rad_eu3a05.cpp index bffc9763077..1d9b150b76f 100644 --- a/src/mame/drivers/rad_eu3a05.cpp +++ b/src/mame/drivers/rad_eu3a05.cpp @@ -912,35 +912,35 @@ void radica_eu3a05_state::radicasi_map(address_map &map) map(0x4800, 0x49ff).ram().share("palram"); // 500x system regs? - map(0x5003, 0x5003).r(this, FUNC(radica_eu3a05_state::radicasi_5003_r)); - map(0x500b, 0x500b).r(this, FUNC(radica_eu3a05_state::radicasi_pal_ntsc_r)); // PAL / NTSC flag at least - map(0x500c, 0x500c).w(this, FUNC(radica_eu3a05_state::radicasi_rombank_hi_w)); - map(0x500d, 0x500d).rw(this, FUNC(radica_eu3a05_state::radicasi_rombank_lo_r), FUNC(radica_eu3a05_state::radicasi_rombank_lo_w)); + map(0x5003, 0x5003).r(FUNC(radica_eu3a05_state::radicasi_5003_r)); + map(0x500b, 0x500b).r(FUNC(radica_eu3a05_state::radicasi_pal_ntsc_r)); // PAL / NTSC flag at least + map(0x500c, 0x500c).w(FUNC(radica_eu3a05_state::radicasi_rombank_hi_w)); + map(0x500d, 0x500d).rw(FUNC(radica_eu3a05_state::radicasi_rombank_lo_r), FUNC(radica_eu3a05_state::radicasi_rombank_lo_w)); // 501x DMA controller - map(0x500F, 0x500F).rw(this, FUNC(radica_eu3a05_state::radicasi_dmasrc_lo_r), FUNC(radica_eu3a05_state::radicasi_dmasrc_lo_w)); - map(0x5010, 0x5010).rw(this, FUNC(radica_eu3a05_state::radicasi_dmasrc_md_r), FUNC(radica_eu3a05_state::radicasi_dmasrc_md_w)); - map(0x5011, 0x5011).rw(this, FUNC(radica_eu3a05_state::radicasi_dmasrc_hi_r), FUNC(radica_eu3a05_state::radicasi_dmasrc_hi_w)); + map(0x500F, 0x500F).rw(FUNC(radica_eu3a05_state::radicasi_dmasrc_lo_r), FUNC(radica_eu3a05_state::radicasi_dmasrc_lo_w)); + map(0x5010, 0x5010).rw(FUNC(radica_eu3a05_state::radicasi_dmasrc_md_r), FUNC(radica_eu3a05_state::radicasi_dmasrc_md_w)); + map(0x5011, 0x5011).rw(FUNC(radica_eu3a05_state::radicasi_dmasrc_hi_r), FUNC(radica_eu3a05_state::radicasi_dmasrc_hi_w)); - map(0x5012, 0x5012).rw(this, FUNC(radica_eu3a05_state::radicasi_dmadst_lo_r), FUNC(radica_eu3a05_state::radicasi_dmadst_lo_w)); - map(0x5013, 0x5013).rw(this, FUNC(radica_eu3a05_state::radicasi_dmadst_hi_r), FUNC(radica_eu3a05_state::radicasi_dmadst_hi_w)); + map(0x5012, 0x5012).rw(FUNC(radica_eu3a05_state::radicasi_dmadst_lo_r), FUNC(radica_eu3a05_state::radicasi_dmadst_lo_w)); + map(0x5013, 0x5013).rw(FUNC(radica_eu3a05_state::radicasi_dmadst_hi_r), FUNC(radica_eu3a05_state::radicasi_dmadst_hi_w)); - map(0x5014, 0x5014).rw(this, FUNC(radica_eu3a05_state::radicasi_dmasize_lo_r), FUNC(radica_eu3a05_state::radicasi_dmasize_lo_w)); - map(0x5015, 0x5015).rw(this, FUNC(radica_eu3a05_state::radicasi_dmasize_hi_r), FUNC(radica_eu3a05_state::radicasi_dmasize_hi_w)); + map(0x5014, 0x5014).rw(FUNC(radica_eu3a05_state::radicasi_dmasize_lo_r), FUNC(radica_eu3a05_state::radicasi_dmasize_lo_w)); + map(0x5015, 0x5015).rw(FUNC(radica_eu3a05_state::radicasi_dmasize_hi_r), FUNC(radica_eu3a05_state::radicasi_dmasize_hi_w)); - map(0x5016, 0x5016).rw(this, FUNC(radica_eu3a05_state::radicasi_dmatrg_r), FUNC(radica_eu3a05_state::radicasi_dmatrg_w)); + map(0x5016, 0x5016).rw(FUNC(radica_eu3a05_state::radicasi_dmatrg_r), FUNC(radica_eu3a05_state::radicasi_dmatrg_w)); // 502x - 503x video regs area? map(0x5020, 0x5026).ram(); // unknown, space invaders sets these to fixed values, tetris has them as 00 - map(0x5027, 0x5027).w(this, FUNC(radica_eu3a05_state::radicasi_vidctrl_w)); + map(0x5027, 0x5027).w(FUNC(radica_eu3a05_state::radicasi_vidctrl_w)); - map(0x5029, 0x5029).rw(this, FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_lo_r), FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_lo_w)); // tilebase - map(0x502a, 0x502a).rw(this, FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_hi_r), FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_hi_w)); // tilebase + map(0x5029, 0x5029).rw(FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_lo_r), FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_lo_w)); // tilebase + map(0x502a, 0x502a).rw(FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_hi_r), FUNC(radica_eu3a05_state::radicasi_tile_gfxbase_hi_w)); // tilebase - map(0x502b, 0x502b).rw(this, FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_lo_r), FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_lo_w)); // tilebase (spr?) - map(0x502c, 0x502c).rw(this, FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_hi_r), FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_hi_w)); // tilebase (spr?) + map(0x502b, 0x502b).rw(FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_lo_r), FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_lo_w)); // tilebase (spr?) + map(0x502c, 0x502c).rw(FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_hi_r), FUNC(radica_eu3a05_state::radicasi_sprite_gfxbase_hi_w)); // tilebase (spr?) - map(0x5031, 0x5032).rw(this, FUNC(radica_eu3a05_state::radicasi_sprite_bg_scroll_r), FUNC(radica_eu3a05_state::radicasi_sprite_bg_scroll_w)); + map(0x5031, 0x5032).rw(FUNC(radica_eu3a05_state::radicasi_sprite_bg_scroll_r), FUNC(radica_eu3a05_state::radicasi_sprite_bg_scroll_w)); // 504x GPIO area? @@ -958,7 +958,7 @@ void radica_eu3a05_state::radicasi_map(address_map &map) map(0x50a8, 0x50a8).r("6ch_sound", FUNC(radica6502_sound_device::radicasi_50a8_r)); // possible 'stopped' status of above channels, waits for it to be 0x3f in places - map(0x50a9, 0x50a9).rw(this, FUNC(radica_eu3a05_state::radicasi_50a9_r), FUNC(radica_eu3a05_state::radicasi_50a9_w)); + map(0x50a9, 0x50a9).rw(FUNC(radica_eu3a05_state::radicasi_50a9_r), FUNC(radica_eu3a05_state::radicasi_50a9_w)); //AM_RANGE(0x5000, 0x50ff) AM_RAM @@ -966,8 +966,8 @@ void radica_eu3a05_state::radicasi_map(address_map &map) map(0xe000, 0xffff).rom().region("maincpu", 0x3f8000); // not sure how these work, might be a modified 6502 core instead. - map(0xfffa, 0xfffb).r(this, FUNC(radica_eu3a05_state::radicasi_nmi_vector_r)); - map(0xfffe, 0xffff).r(this, FUNC(radica_eu3a05_state::radicasi_irq_vector_r)); + map(0xfffa, 0xfffb).r(FUNC(radica_eu3a05_state::radicasi_nmi_vector_r)); + map(0xfffe, 0xffff).r(FUNC(radica_eu3a05_state::radicasi_irq_vector_r)); } diff --git a/src/mame/drivers/rad_eu3a14.cpp b/src/mame/drivers/rad_eu3a14.cpp index 57f0180788d..d6f7bb3024a 100644 --- a/src/mame/drivers/rad_eu3a14.cpp +++ b/src/mame/drivers/rad_eu3a14.cpp @@ -493,13 +493,13 @@ void radica_eu3a14_state::radica_eu3a14_map(address_map &map) map(0x5008, 0x5008).nopw(); // startup map(0x5009, 0x5009).noprw(); map(0x500a, 0x500a).nopw(); // startup - map(0x500b, 0x500b).r(this, FUNC(radica_eu3a14_state::radicasi_pal_ntsc_r)).nopw(); // PAL / NTSC flag at least - map(0x500c, 0x500c).w(this, FUNC(radica_eu3a14_state::radicasi_rombank_hi_w)); - map(0x500d, 0x500d).rw(this, FUNC(radica_eu3a14_state::radicasi_rombank_lo_r), FUNC(radica_eu3a14_state::radicasi_rombank_lo_w)); + map(0x500b, 0x500b).r(FUNC(radica_eu3a14_state::radicasi_pal_ntsc_r)).nopw(); // PAL / NTSC flag at least + map(0x500c, 0x500c).w(FUNC(radica_eu3a14_state::radicasi_rombank_hi_w)); + map(0x500d, 0x500d).rw(FUNC(radica_eu3a14_state::radicasi_rombank_lo_r), FUNC(radica_eu3a14_state::radicasi_rombank_lo_w)); // DMA is similar to, but not the same as eu3a05 map(0x500f, 0x5017).ram().share("dmaparams"); - map(0x5018, 0x5018).rw(this, FUNC(radica_eu3a14_state::dma_trigger_r), FUNC(radica_eu3a14_state::dma_trigger_w)); + map(0x5018, 0x5018).rw(FUNC(radica_eu3a14_state::dma_trigger_r), FUNC(radica_eu3a14_state::dma_trigger_w)); // probably GPIO like eu3a05, although it access 47/48 as unknown instead of 48/49/4a map(0x5040, 0x5040).nopw(); @@ -540,7 +540,7 @@ void radica_eu3a14_state::radica_eu3a14_map(address_map &map) map(0xe000, 0xffff).rom().region("maincpu", 0x0000); - map(0xfffe, 0xffff).r(this, FUNC(radica_eu3a14_state::irq_vector_r)); + map(0xfffe, 0xffff).r(FUNC(radica_eu3a14_state::irq_vector_r)); } READ8_MEMBER(radica_eu3a14_state::dma_trigger_r) diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp index 740f9c19f57..e986eee4232 100644 --- a/src/mame/drivers/radio86.cpp +++ b/src/mame/drivers/radio86.cpp @@ -39,7 +39,7 @@ void radio86_state::radio86_mem(address_map &map) void radio86_state::radio86_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0xff).rw(this, FUNC(radio86_state::radio_io_r), FUNC(radio86_state::radio_io_w)); + map(0x00, 0xff).rw(FUNC(radio86_state::radio_io_r), FUNC(radio86_state::radio_io_w)); } void radio86_state::rk7007_io(address_map &map) @@ -68,7 +68,7 @@ void radio86_state::radio86ram_mem(address_map &map) map(0xf700, 0xf703).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf780, 0xf7bf).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)); // video map(0xf684, 0xf687).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xf688, 0xf688).w(this, FUNC(radio86_state::radio86_pagesel)); + map(0xf688, 0xf688).w(FUNC(radio86_state::radio86_pagesel)); map(0xf800, 0xffff).w(m_dma8257, FUNC(i8257_device::write)); // DMA map(0xf800, 0xffff).rom(); // System ROM page 1 } @@ -78,7 +78,7 @@ void radio86_state::radio86_16_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x0fff).bankrw("bank1"); // First bank map(0x1000, 0x3fff).ram(); // RAM - map(0x4000, 0x7fff).r(this, FUNC(radio86_state::radio_cpu_state_r)); + map(0x4000, 0x7fff).r(FUNC(radio86_state::radio_cpu_state_r)); map(0x8000, 0x8003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc); //AM_RANGE( 0xa000, 0xa003 ) AM_DEVREADWRITE("ppi8255_2", i8255_device, read, write) AM_MIRROR(0x1ffc) map(0xc000, 0xc001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index acf620a1906..1637bd4b2b2 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -93,11 +93,11 @@ void raiden_state::main_map(address_map &map) map(0x07000, 0x07fff).ram().share("spriteram"); map(0x08000, 0x08fff).ram().share("shared_ram"); map(0x0a000, 0x0a00d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); - map(0x0c000, 0x0c7ff).w(this, FUNC(raiden_state::raiden_text_w)).share("videoram"); + map(0x0c000, 0x0c7ff).w(FUNC(raiden_state::raiden_text_w)).share("videoram"); map(0x0e000, 0x0e001).portr("P1_P2"); map(0x0e002, 0x0e003).portr("DSW"); map(0x0e004, 0x0e005).nopw(); // watchdog? - map(0x0e006, 0x0e006).w(this, FUNC(raiden_state::raiden_control_w)); + map(0x0e006, 0x0e006).w(FUNC(raiden_state::raiden_control_w)); map(0x0f000, 0x0f03f).writeonly().share("scroll_ram"); map(0xa0000, 0xfffff).rom(); } @@ -105,8 +105,8 @@ void raiden_state::main_map(address_map &map) void raiden_state::sub_map(address_map &map) { map(0x00000, 0x01fff).ram(); - map(0x02000, 0x027ff).ram().w(this, FUNC(raiden_state::raiden_background_w)).share("back_data"); - map(0x02800, 0x02fff).ram().w(this, FUNC(raiden_state::raiden_foreground_w)).share("fore_data"); + map(0x02000, 0x027ff).ram().w(FUNC(raiden_state::raiden_background_w)).share("back_data"); + map(0x02800, 0x02fff).ram().w(FUNC(raiden_state::raiden_foreground_w)).share("fore_data"); map(0x03000, 0x03fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x04000, 0x04fff).ram().share("shared_ram"); map(0x07ffe, 0x07fff).nopw(); // ? @@ -127,8 +127,8 @@ void raiden_state::raidenu_main_map(address_map &map) map(0x0b000, 0x0b001).portr("P1_P2"); map(0x0b002, 0x0b003).portr("DSW"); map(0x0b004, 0x0b005).nopw(); // watchdog? - map(0x0b006, 0x0b006).w(this, FUNC(raiden_state::raiden_control_w)); - map(0x0c000, 0x0c7ff).w(this, FUNC(raiden_state::raiden_text_w)).share("videoram"); + map(0x0b006, 0x0b006).w(FUNC(raiden_state::raiden_control_w)); + map(0x0c000, 0x0c7ff).w(FUNC(raiden_state::raiden_text_w)).share("videoram"); map(0x0d000, 0x0d00d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); map(0xa0000, 0xfffff).rom(); } @@ -136,8 +136,8 @@ void raiden_state::raidenu_main_map(address_map &map) void raiden_state::raidenu_sub_map(address_map &map) { map(0x00000, 0x05fff).ram(); - map(0x06000, 0x067ff).ram().w(this, FUNC(raiden_state::raiden_background_w)).share("back_data"); - map(0x06800, 0x06fff).ram().w(this, FUNC(raiden_state::raiden_foreground_w)).share("fore_data"); + map(0x06000, 0x067ff).ram().w(FUNC(raiden_state::raiden_background_w)).share("back_data"); + map(0x06800, 0x06fff).ram().w(FUNC(raiden_state::raiden_foreground_w)).share("fore_data"); map(0x07000, 0x07fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x08000, 0x08fff).ram().share("shared_ram"); map(0x0a000, 0x0a001).nopw(); // ? @@ -156,8 +156,8 @@ void raiden_state::raidenb_main_map(address_map &map) map(0x0b000, 0x0b001).portr("P1_P2"); map(0x0b002, 0x0b003).portr("DSW"); map(0x0b004, 0x0b005).nopw(); // watchdog? - map(0x0b006, 0x0b006).w(this, FUNC(raiden_state::raidenb_control_w)); - map(0x0c000, 0x0c7ff).w(this, FUNC(raiden_state::raiden_text_w)).share("videoram"); + map(0x0b006, 0x0b006).w(FUNC(raiden_state::raidenb_control_w)); + map(0x0c000, 0x0c7ff).w(FUNC(raiden_state::raiden_text_w)).share("videoram"); map(0x0d000, 0x0d00d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); map(0x0d040, 0x0d08f).rw("crtc", FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); map(0xa0000, 0xfffff).rom(); diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index c1d61acb00b..16ac0d40761 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -224,10 +224,10 @@ int cnt=0, ccol = -1; WRITE16_MEMBER(raiden2_state::m_videoram_private_w) { - // map(0x0d000, 0x0d7ff).ram().w(this, FUNC(raiden2_state::raiden2_background_w)).share("back_data"); - // map(0x0d800, 0x0dfff).ram().w(this, FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); - // map(0x0e000, 0x0e7ff).ram().w(this, FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); - // map(0x0e800, 0x0f7ff).ram().w(this, FUNC(raiden2_state::raiden2_text_w).share("text_data"); + // map(0x0d000, 0x0d7ff).ram().w(FUNC(raiden2_state::raiden2_background_w)).share("back_data"); + // map(0x0d800, 0x0dfff).ram().w(FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); + // map(0x0e000, 0x0e7ff).ram().w(FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); + // map(0x0e800, 0x0f7ff).ram().w(FUNC(raiden2_state::raiden2_text_w).share("text_data"); if (offset < 0x800 / 2) { @@ -913,7 +913,7 @@ void raiden2_state::raiden2_cop_mem(address_map &map) map(0x00458, 0x00459).w(m_raiden2cop, FUNC(raiden2cop_device::cop_sort_param_w)); map(0x0045a, 0x0045b).w(m_raiden2cop, FUNC(raiden2cop_device::cop_pal_brightness_val_w)); //palette DMA brightness val, used by X Se Dae / Zero Team map(0x0045c, 0x0045d).w(m_raiden2cop, FUNC(raiden2cop_device::cop_pal_brightness_mode_w)); //palette DMA brightness mode, used by X Se Dae / Zero Team (sets to 5) - map(0x00470, 0x00471).rw(this, FUNC(raiden2_state::cop_tile_bank_2_r), FUNC(raiden2_state::cop_tile_bank_2_w)); // implementaton of this varies between games, external hookup? + map(0x00470, 0x00471).rw(FUNC(raiden2_state::cop_tile_bank_2_r), FUNC(raiden2_state::cop_tile_bank_2_w)); // implementaton of this varies between games, external hookup? map(0x00476, 0x00477).w(m_raiden2cop, FUNC(raiden2cop_device::cop_dma_adr_rel_w)); map(0x00478, 0x00479).w(m_raiden2cop, FUNC(raiden2cop_device::cop_dma_src_w)); @@ -934,31 +934,31 @@ void raiden2_state::raiden2_cop_mem(address_map &map) map(0x00600, 0x0063f).rw("crtc", FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); //map(0x00640, 0x006bf).rw("obj", FUNC(seibu_encrypted_sprite_device::read), FUNC(seibu_encrypted_sprite_device::write)); - map(0x006a0, 0x006a3).w(this, FUNC(raiden2_state::sprcpt_val_1_w)); - map(0x006a4, 0x006a7).w(this, FUNC(raiden2_state::sprcpt_data_3_w)); - map(0x006a8, 0x006ab).w(this, FUNC(raiden2_state::sprcpt_data_4_w)); - map(0x006ac, 0x006af).w(this, FUNC(raiden2_state::sprcpt_flags_1_w)); - map(0x006b0, 0x006b3).w(this, FUNC(raiden2_state::sprcpt_data_1_w)); - map(0x006b4, 0x006b7).w(this, FUNC(raiden2_state::sprcpt_data_2_w)); - map(0x006b8, 0x006bb).w(this, FUNC(raiden2_state::sprcpt_val_2_w)); - map(0x006bc, 0x006bf).w(this, FUNC(raiden2_state::sprcpt_adr_w)); - map(0x006c0, 0x006c1).rw(this, FUNC(raiden2_state::sprite_prot_off_r), FUNC(raiden2_state::sprite_prot_off_w)); - map(0x006c2, 0x006c3).rw(this, FUNC(raiden2_state::sprite_prot_src_seg_r), FUNC(raiden2_state::sprite_prot_src_seg_w)); + map(0x006a0, 0x006a3).w(FUNC(raiden2_state::sprcpt_val_1_w)); + map(0x006a4, 0x006a7).w(FUNC(raiden2_state::sprcpt_data_3_w)); + map(0x006a8, 0x006ab).w(FUNC(raiden2_state::sprcpt_data_4_w)); + map(0x006ac, 0x006af).w(FUNC(raiden2_state::sprcpt_flags_1_w)); + map(0x006b0, 0x006b3).w(FUNC(raiden2_state::sprcpt_data_1_w)); + map(0x006b4, 0x006b7).w(FUNC(raiden2_state::sprcpt_data_2_w)); + map(0x006b8, 0x006bb).w(FUNC(raiden2_state::sprcpt_val_2_w)); + map(0x006bc, 0x006bf).w(FUNC(raiden2_state::sprcpt_adr_w)); + map(0x006c0, 0x006c1).rw(FUNC(raiden2_state::sprite_prot_off_r), FUNC(raiden2_state::sprite_prot_off_w)); + map(0x006c2, 0x006c3).rw(FUNC(raiden2_state::sprite_prot_src_seg_r), FUNC(raiden2_state::sprite_prot_src_seg_w)); map(0x006c4, 0x006c5).nopw(); // constant value written along with 0x6c0 - map(0x006c6, 0x006c7).w(this, FUNC(raiden2_state::sprite_prot_dst1_w)); - map(0x006ca, 0x006cb).w(this, FUNC(raiden2_state::raiden2_bank_w)); - map(0x006cc, 0x006cd).w(this, FUNC(raiden2_state::tile_bank_01_w)); - map(0x006ce, 0x006cf).w(this, FUNC(raiden2_state::sprcpt_flags_2_w)); - map(0x006d8, 0x006d9).w(this, FUNC(raiden2_state::sprite_prot_x_w)); - map(0x006da, 0x006db).w(this, FUNC(raiden2_state::sprite_prot_y_w)); - map(0x006dc, 0x006dd).rw(this, FUNC(raiden2_state::sprite_prot_maxx_r), FUNC(raiden2_state::sprite_prot_maxx_w)); - map(0x006de, 0x006df).w(this, FUNC(raiden2_state::sprite_prot_src_w)); + map(0x006c6, 0x006c7).w(FUNC(raiden2_state::sprite_prot_dst1_w)); + map(0x006ca, 0x006cb).w(FUNC(raiden2_state::raiden2_bank_w)); + map(0x006cc, 0x006cd).w(FUNC(raiden2_state::tile_bank_01_w)); + map(0x006ce, 0x006cf).w(FUNC(raiden2_state::sprcpt_flags_2_w)); + map(0x006d8, 0x006d9).w(FUNC(raiden2_state::sprite_prot_x_w)); + map(0x006da, 0x006db).w(FUNC(raiden2_state::sprite_prot_y_w)); + map(0x006dc, 0x006dd).rw(FUNC(raiden2_state::sprite_prot_maxx_r), FUNC(raiden2_state::sprite_prot_maxx_w)); + map(0x006de, 0x006df).w(FUNC(raiden2_state::sprite_prot_src_w)); /* end video block */ map(0x006fc, 0x006fd).w(m_raiden2cop, FUNC(raiden2cop_device::cop_dma_trigger_w)); map(0x006fe, 0x006ff).w(m_raiden2cop, FUNC(raiden2cop_device::cop_sort_dma_trig_w)); // sort-DMA trigger - map(0x00762, 0x00763).r(this, FUNC(raiden2_state::sprite_prot_dst1_r)); + map(0x00762, 0x00763).r(FUNC(raiden2_state::sprite_prot_dst1_r)); } void raiden2_state::raiden2_mem(address_map &map) @@ -984,10 +984,10 @@ void raiden2_state::raiden2_mem(address_map &map) map(0x00800, 0x0bfff).ram(); map(0x0c000, 0x0cfff).ram().share("sprites"); - map(0x0d000, 0x0d7ff).ram(); // .w(this, FUNC(raiden2_state::raiden2_background_w)).share("back_data"); - map(0x0d800, 0x0dfff).ram(); // .w(this, FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); - map(0x0e000, 0x0e7ff).ram(); // .w(this, FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); - map(0x0e800, 0x0f7ff).ram(); // .w(this, FUNC(raiden2_state::raiden2_text_w).share("text_data"); + map(0x0d000, 0x0d7ff).ram(); // .w(FUNC(raiden2_state::raiden2_background_w)).share("back_data"); + map(0x0d800, 0x0dfff).ram(); // .w(FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); + map(0x0e000, 0x0e7ff).ram(); // .w(FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); + map(0x0e800, 0x0f7ff).ram(); // .w(FUNC(raiden2_state::raiden2_text_w).share("text_data"); map(0x0f800, 0x0ffff).ram(); /* Stack area */ map(0x10000, 0x1efff).ram(); @@ -1001,7 +1001,7 @@ void raiden2_state::raiden2_mem(address_map &map) void raiden2_state::raidendx_mem(address_map &map) { raiden2_mem(map); - map(0x00470, 0x00471).rw(this, FUNC(raiden2_state::cop_tile_bank_2_r), FUNC(raiden2_state::raidendx_cop_bank_2_w)); + map(0x00470, 0x00471).rw(FUNC(raiden2_state::cop_tile_bank_2_r), FUNC(raiden2_state::raidendx_cop_bank_2_w)); map(0x004d0, 0x004d7).ram(); //??? map(0x00600, 0x0063f).rw("crtc", FUNC(seibu_crtc_device::read_alt), FUNC(seibu_crtc_device::write_alt)); // map(0x006ca, 0x006cb).nopw(); @@ -1032,10 +1032,10 @@ void raiden2_state::zeroteam_mem(address_map &map) map(0x0074c, 0x0074d).portr("SYSTEM"); map(0x00800, 0x0b7ff).ram(); - map(0x0b800, 0x0bfff).ram(); // .w(this, FUNC(raiden2_state::raiden2_background_w)).share("back_data"); - map(0x0c000, 0x0c7ff).ram(); // .w(this, FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); - map(0x0c800, 0x0cfff).ram(); // .w(this, FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); - map(0x0d000, 0x0dfff).ram(); // .w(this, FUNC(raiden2_state::raiden2_text_w).share("text_data"); + map(0x0b800, 0x0bfff).ram(); // .w(FUNC(raiden2_state::raiden2_background_w)).share("back_data"); + map(0x0c000, 0x0c7ff).ram(); // .w(FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); + map(0x0c800, 0x0cfff).ram(); // .w(FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); + map(0x0d000, 0x0dfff).ram(); // .w(FUNC(raiden2_state::raiden2_text_w).share("text_data"); map(0x0e000, 0x0efff).ram(); // .w("palette", palette_device, write).share("palette"); map(0x0f000, 0x0ffff).ram().share("sprites"); map(0x10000, 0x1ffff).ram(); @@ -1070,10 +1070,10 @@ void raiden2_state::xsedae_mem(address_map &map) map(0x0074c, 0x0074d).portr("SYSTEM"); map(0x00800, 0x0b7ff).ram(); - map(0x0b800, 0x0bfff).ram(); // .w(this, FUNC(raiden2_state::raiden2_background_w)).share("back_data"); - map(0x0c000, 0x0c7ff).ram(); // .w(this, FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); - map(0x0c800, 0x0cfff).ram(); // .w(this, FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); - map(0x0d000, 0x0dfff).ram(); // .w(this, FUNC(raiden2_state::raiden2_text_w).share("text_data"); + map(0x0b800, 0x0bfff).ram(); // .w(FUNC(raiden2_state::raiden2_background_w)).share("back_data"); + map(0x0c000, 0x0c7ff).ram(); // .w(FUNC(raiden2_state::raiden2_foreground_w).share("fore_data"); + map(0x0c800, 0x0cfff).ram(); // .w(FUNC(raiden2_state::raiden2_midground_w).share("mid_data"); + map(0x0d000, 0x0dfff).ram(); // .w(FUNC(raiden2_state::raiden2_text_w).share("text_data"); map(0x0e000, 0x0efff).ram(); // .w("palette", palette_device, write).share("palette"); map(0x0f000, 0x0ffff).ram().share("sprites"); diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 0aa08238d59..c4e4609c135 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -919,142 +919,142 @@ void rainbow_state::machine_start() void rainbow_state::rainbow8088_map(address_map &map) { -map.unmap_value_high(); -map(0x00000, 0x0ffff).ram().share("sh_ram"); -map(0x10000, END_OF_RAM).ram().share("ext_ram").w(this, FUNC(rainbow_state::ext_ram_w)); + map.unmap_value_high(); + map(0x00000, 0x0ffff).ram().share("sh_ram"); + map(0x10000, END_OF_RAM).ram().share("ext_ram").w(FUNC(rainbow_state::ext_ram_w)); -// There is a 2212 (256 x 4 bit) NVRAM from 0xed000 to 0xed0ff (*) -// shadowed at $ec000 - $ecfff and from $ed100 - $edfff. + // There is a 2212 (256 x 4 bit) NVRAM from 0xed000 to 0xed0ff (*) + // shadowed at $ec000 - $ecfff and from $ed100 - $edfff. -// (*) ED000 - ED0FF is the area the DEC-100-B Bios accesses and checks + // (*) ED000 - ED0FF is the area the DEC-100-B Bios accesses and checks -// - Specs say that the CPU has direct access to volatile RAM only. -// So NVRAM is hidden and loads & saves are triggered within the -// 'diagnostic_w' handler (similar to real hardware). + // - Specs say that the CPU has direct access to volatile RAM only. + // So NVRAM is hidden and loads & saves are triggered within the + // 'diagnostic_w' handler (similar to real hardware). -// - Address bits 8-12 are ignored (-> AM_MIRROR). -map(0xed000, 0xed0ff).ram().share("vol_ram"); //AM_MIRROR(0x1f00) -map(0xed100, 0xed1ff).ram().share("nvram"); + // - Address bits 8-12 are ignored (-> AM_MIRROR). + map(0xed000, 0xed0ff).ram().share("vol_ram"); //AM_MIRROR(0x1f00) + map(0xed100, 0xed1ff).ram().share("nvram"); -map(0xee000, 0xeffff).ram().share("p_ram"); -map(0xf0000, 0xfffff).rom(); + map(0xee000, 0xeffff).ram().share("p_ram"); + map(0xf0000, 0xfffff).rom(); } void rainbow_state::rainbow8088_io(address_map &map) { -map.unmap_value_high(); -map.global_mask(0x1ff); -map(0x00, 0x00).rw(this, FUNC(rainbow_state::i8088_latch_r), FUNC(rainbow_state::i8088_latch_w)); -map(0x02, 0x02).rw(this, FUNC(rainbow_state::comm_control_r), FUNC(rainbow_state::comm_control_w)); // Communication status / control register (8088) -map(0x04, 0x04).w(m_crtc, FUNC(rainbow_video_device::dc011_w)); - -map(0x06, 0x06).w(this, FUNC(rainbow_state::comm_bitrate_w)); - -map(0x08, 0x08).r(this, FUNC(rainbow_state::system_parameter_r)); -map(0x0a, 0x0a).rw(this, FUNC(rainbow_state::diagnostic_r), FUNC(rainbow_state::diagnostic_w)); -map(0x0c, 0x0c).select(0x100).w(m_crtc, FUNC(rainbow_video_device::dc012_w)); - -map(0x0e, 0x0e).w(this, FUNC(rainbow_state::printer_bitrate_w)); - -map(0x10, 0x10).rw(m_kbd8251, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); -map(0x11, 0x11).rw(m_kbd8251, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - -// =========================================================== -// There are 4 select lines for Option Select 1 to 4 -// Option Select ------------------- Bundle Option Present -// 1 2 3 4: BDL PRES (L): -// X X o o Communication Option----- X -// o X o o RD51 hard disk controller X --------- (X = SELECT) -// =========================================================== -// 0x20 -> 0x2f ***** EXTENDED COMM. OPTION / Option Select 1. -// See boot rom @1EA6: 0x27 (<- RESET EXTENDED COMM OPTION ) - -// Corvus B/H harddisk controller (incompatible with EXT.COMM OPTION): -map(0x20, 0x20).rw(m_corvus_hdc, FUNC(corvus_hdc_device::read), FUNC(corvus_hdc_device::write)); -map(0x21, 0x21).r(this, FUNC(rainbow_state::corvus_status_r)); - -// =========================================================== -// 0x30 -> 0x3f ***** Option Select 3 -// =========================================================== -// 0x40 COMMUNICATIONS DATA REGISTER (MPSC) -// 0x41 PRINTER DATA REGISTER (MPSC) -// 0x42 COMMUNICATIONS CONTROL / STATUS REGISTER (MPSC) -// 0x43 PRINTER CONTROL / STATUS REGISTER (MPSC) -// =========================================================== -// 0x50 - 0x57 ***** COLOR GRAPHICS OPTION: - -// * Color graphics option (NEC upd7220 GDC plus external hw.). See Programmer's Reference AA-AE36A-TV. -// Either 384 x 240 x 16 or 800 x 240 x 4 colors (out of 4096). 8 x 64 K video RAM. -// (Write Buffer, Pattern Register/Multiplier, ALU/PS, Color Map, readback and offset/scroll hardware): -map(0x50, 0x55).rw(this, FUNC(rainbow_state::GDC_EXTRA_REGISTER_r), FUNC(rainbow_state::GDC_EXTRA_REGISTER_w)); -map(0x56, 0x57).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); // 56 param, 57 command - -// =========================================================== -// 0x60 -> 0x6f ***** EXTENDED COMM. OPTION / Option Select 2. -// =========================================================== -// 0x60 -> 0x6f ***** RD51 HD. CONTROLLER / Option Select 2. -map(0x60, 0x67).rw(m_hdc, FUNC(wd2010_device::read), FUNC(wd2010_device::write)).mirror(0x100); -map(0x68, 0x68).rw(this, FUNC(rainbow_state::hd_status_68_r), FUNC(rainbow_state::hd_status_68_w)); -map(0x69, 0x69).r(this, FUNC(rainbow_state::hd_status_69_r)); -// =========================================================== -// THE RD51 CONTROLLER: WD1010AL - 00 (WDC '83) -// + 2 K x 8 SRAM (SY2128-4 or Japan 8328) 21-17872-01 -// + 74(L)Sxxx glue logic (drive/head select, buffers etc.) -// + 10 Mhz Quartz (/2) -// SERVICE JUMPERS (not to be removed for normal operation): -// JUMPER "W1" : bridge between 10 Mhz master clock and board -// JUMPER "W2" : bridges SYNC within Read Data Circuit -// JUMPER "W3" : bridges 'drive read data' (from hard disk) -// Later RD51 boards (> '83 week 28 ?) have no jumpers at all. -// =========================================================== -// DEC RD TYPE (MByte) CYL ---- HEADS ---- MODEL (typical) -// DEC RD50 (5 Mbyte): 153 cyl. 4 heads -- ST506 -// DEC RD51(10 Mbyte); 306 cyl. 4 heads -- ST412 -// DEC RD31(20 Mbyte); 615 cyl. 4 heads -- ST225 -// DEC RD52(32 Mbyte); 512 cyl. 8 heads -- Q540 [!] -// DEC RD32(40 Mbyte); 820 cyl. 6 heads -- ST251 [!] -// DEC RD53(67 Mbyte); 1024 cyl.8 heads -- 1325 [!] -// [!] More than 4 heads. Prepare with WUTIL and / or DSKPREP. - -// SIZE RESTRICTIONS -// * HARDWARE: -// WD1010 controller has a built-in limit of 8 heads / 1024 cylinders. -// * BOOT LOADERS: -// - the DEC boot loader (and FDISK from DOS 3.10) initially allowed a maximum hard disc size of 20 MB. -// - the custom boot loader that comes with 'WUTIL 3.2' allows 117 MB and 8 surfaces. -// * SOFTWARE: -// - MS-DOS 2 allows a maximum partition size of 16 MB (sizes > 15 MB are incompatible to DOS 3) -// [ no more than 4 partitions of 8 MB size on one hard disk possible ] -// - MS-DOS 3 - and Concurrent CPM - have a global 32 MB (1024 cylinder) limit -// - a CP/M-86-80 partition can have up to 8 MB (all CP/M partitions together must not exceed 10 MB) -// =========================================================== -// 0x70 -> 0x7f ***** Option Select 4 -// =========================================================== -// 0x10c -> (MHFU disable register handled by 0x0c + AM_SELECT) + map.unmap_value_high(); + map.global_mask(0x1ff); + map(0x00, 0x00).rw(FUNC(rainbow_state::i8088_latch_r), FUNC(rainbow_state::i8088_latch_w)); + map(0x02, 0x02).rw(FUNC(rainbow_state::comm_control_r), FUNC(rainbow_state::comm_control_w)); // Communication status / control register (8088) + map(0x04, 0x04).w(m_crtc, FUNC(rainbow_video_device::dc011_w)); + + map(0x06, 0x06).w(FUNC(rainbow_state::comm_bitrate_w)); + + map(0x08, 0x08).r(FUNC(rainbow_state::system_parameter_r)); + map(0x0a, 0x0a).rw(FUNC(rainbow_state::diagnostic_r), FUNC(rainbow_state::diagnostic_w)); + map(0x0c, 0x0c).select(0x100).w(m_crtc, FUNC(rainbow_video_device::dc012_w)); + + map(0x0e, 0x0e).w(FUNC(rainbow_state::printer_bitrate_w)); + + map(0x10, 0x10).rw(m_kbd8251, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); + map(0x11, 0x11).rw(m_kbd8251, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); + + // =========================================================== + // There are 4 select lines for Option Select 1 to 4 + // Option Select ------------------- Bundle Option Present + // 1 2 3 4: BDL PRES (L): + // X X o o Communication Option----- X + // o X o o RD51 hard disk controller X --------- (X = SELECT) + // =========================================================== + // 0x20 -> 0x2f ***** EXTENDED COMM. OPTION / Option Select 1. + // See boot rom @1EA6: 0x27 (<- RESET EXTENDED COMM OPTION ) + + // Corvus B/H harddisk controller (incompatible with EXT.COMM OPTION): + map(0x20, 0x20).rw(m_corvus_hdc, FUNC(corvus_hdc_device::read), FUNC(corvus_hdc_device::write)); + map(0x21, 0x21).r(FUNC(rainbow_state::corvus_status_r)); + + // =========================================================== + // 0x30 -> 0x3f ***** Option Select 3 + // =========================================================== + // 0x40 COMMUNICATIONS DATA REGISTER (MPSC) + // 0x41 PRINTER DATA REGISTER (MPSC) + // 0x42 COMMUNICATIONS CONTROL / STATUS REGISTER (MPSC) + // 0x43 PRINTER CONTROL / STATUS REGISTER (MPSC) + // =========================================================== + // 0x50 - 0x57 ***** COLOR GRAPHICS OPTION: + + // * Color graphics option (NEC upd7220 GDC plus external hw.). See Programmer's Reference AA-AE36A-TV. + // Either 384 x 240 x 16 or 800 x 240 x 4 colors (out of 4096). 8 x 64 K video RAM. + // (Write Buffer, Pattern Register/Multiplier, ALU/PS, Color Map, readback and offset/scroll hardware): + map(0x50, 0x55).rw(FUNC(rainbow_state::GDC_EXTRA_REGISTER_r), FUNC(rainbow_state::GDC_EXTRA_REGISTER_w)); + map(0x56, 0x57).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); // 56 param, 57 command + + // =========================================================== + // 0x60 -> 0x6f ***** EXTENDED COMM. OPTION / Option Select 2. + // =========================================================== + // 0x60 -> 0x6f ***** RD51 HD. CONTROLLER / Option Select 2. + map(0x60, 0x67).rw(m_hdc, FUNC(wd2010_device::read), FUNC(wd2010_device::write)).mirror(0x100); + map(0x68, 0x68).rw(FUNC(rainbow_state::hd_status_68_r), FUNC(rainbow_state::hd_status_68_w)); + map(0x69, 0x69).r(FUNC(rainbow_state::hd_status_69_r)); + // =========================================================== + // THE RD51 CONTROLLER: WD1010AL - 00 (WDC '83) + // + 2 K x 8 SRAM (SY2128-4 or Japan 8328) 21-17872-01 + // + 74(L)Sxxx glue logic (drive/head select, buffers etc.) + // + 10 Mhz Quartz (/2) + // SERVICE JUMPERS (not to be removed for normal operation): + // JUMPER "W1" : bridge between 10 Mhz master clock and board + // JUMPER "W2" : bridges SYNC within Read Data Circuit + // JUMPER "W3" : bridges 'drive read data' (from hard disk) + // Later RD51 boards (> '83 week 28 ?) have no jumpers at all. + // =========================================================== + // DEC RD TYPE (MByte) CYL ---- HEADS ---- MODEL (typical) + // DEC RD50 (5 Mbyte): 153 cyl. 4 heads -- ST506 + // DEC RD51(10 Mbyte); 306 cyl. 4 heads -- ST412 + // DEC RD31(20 Mbyte); 615 cyl. 4 heads -- ST225 + // DEC RD52(32 Mbyte); 512 cyl. 8 heads -- Q540 [!] + // DEC RD32(40 Mbyte); 820 cyl. 6 heads -- ST251 [!] + // DEC RD53(67 Mbyte); 1024 cyl.8 heads -- 1325 [!] + // [!] More than 4 heads. Prepare with WUTIL and / or DSKPREP. + + // SIZE RESTRICTIONS + // * HARDWARE: + // WD1010 controller has a built-in limit of 8 heads / 1024 cylinders. + // * BOOT LOADERS: + // - the DEC boot loader (and FDISK from DOS 3.10) initially allowed a maximum hard disc size of 20 MB. + // - the custom boot loader that comes with 'WUTIL 3.2' allows 117 MB and 8 surfaces. + // * SOFTWARE: + // - MS-DOS 2 allows a maximum partition size of 16 MB (sizes > 15 MB are incompatible to DOS 3) + // [ no more than 4 partitions of 8 MB size on one hard disk possible ] + // - MS-DOS 3 - and Concurrent CPM - have a global 32 MB (1024 cylinder) limit + // - a CP/M-86-80 partition can have up to 8 MB (all CP/M partitions together must not exceed 10 MB) + // =========================================================== + // 0x70 -> 0x7f ***** Option Select 4 + // =========================================================== + // 0x10c -> (MHFU disable register handled by 0x0c + AM_SELECT) } void rainbow_state::rainbowz80_mem(address_map &map) { -map.unmap_value_high(); -map(0x0000, 0xffff).rw(this, FUNC(rainbow_state::share_z80_r), FUNC(rainbow_state::share_z80_w)); + map.unmap_value_high(); + map(0x0000, 0xffff).rw(FUNC(rainbow_state::share_z80_r), FUNC(rainbow_state::share_z80_w)); } void rainbow_state::rainbowz80_io(address_map &map) { -map.unmap_value_high(); -map.global_mask(0xff); -map(0x00, 0x00).rw(this, FUNC(rainbow_state::z80_latch_r), FUNC(rainbow_state::z80_latch_w)); -map(0x20, 0x20).rw(this, FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_read_w)); // read to port 0x20 used by MS-DOS 2.x diskette loader. -map(0x21, 0x21).rw(this, FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_write_w)); -map(0x40, 0x40).rw(this, FUNC(rainbow_state::z80_diskstatus_r), FUNC(rainbow_state::z80_diskcontrol_w)); -map(0x60, 0x63).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); + map.unmap_value_high(); + map.global_mask(0xff); + map(0x00, 0x00).rw(FUNC(rainbow_state::z80_latch_r), FUNC(rainbow_state::z80_latch_w)); + map(0x20, 0x20).rw(FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_read_w)); // read to port 0x20 used by MS-DOS 2.x diskette loader. + map(0x21, 0x21).rw(FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_write_w)); + map(0x40, 0x40).rw(FUNC(rainbow_state::z80_diskstatus_r), FUNC(rainbow_state::z80_diskcontrol_w)); + map(0x60, 0x63).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); -// Z80 I/O shadow area > $80 -map(0x80, 0x80).rw(this, FUNC(rainbow_state::z80_latch_r), FUNC(rainbow_state::z80_latch_w)); -map(0xA0, 0xA0).rw(this, FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_read_w)); // read to port 0x20 used by MS-DOS 2.x diskette loader. -map(0xA1, 0xA1).rw(this, FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_write_w)); -map(0xC0, 0xC0).rw(this, FUNC(rainbow_state::z80_diskstatus_r), FUNC(rainbow_state::z80_diskcontrol_w)); -map(0xE0, 0xE3).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); + // Z80 I/O shadow area > $80 + map(0x80, 0x80).rw(FUNC(rainbow_state::z80_latch_r), FUNC(rainbow_state::z80_latch_w)); + map(0xA0, 0xA0).rw(FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_read_w)); // read to port 0x20 used by MS-DOS 2.x diskette loader. + map(0xA1, 0xA1).rw(FUNC(rainbow_state::z80_generalstat_r), FUNC(rainbow_state::z80_diskdiag_write_w)); + map(0xC0, 0xC0).rw(FUNC(rainbow_state::z80_diskstatus_r), FUNC(rainbow_state::z80_diskcontrol_w)); + map(0xE0, 0xE3).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); } /* Input ports */ @@ -1062,88 +1062,88 @@ map(0xE0, 0xE3).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)) /* DIP switches */ static INPUT_PORTS_START(rainbow100b_in) -PORT_START("MONO MONITOR TYPE") -PORT_DIPNAME(0x03, 0x03, "MONO MONITOR TYPE") -PORT_DIPSETTING(0x01, "WHITE (VR201-A)") -PORT_DIPSETTING(0x02, "GREEN (VR201-B)") -PORT_DIPSETTING(0x03, "AMBER (VR201-C)") - -// MEMORY, FLOPPY, BUNDLE, GRAPHICS affect 'system_parameter_r': -PORT_START("MEMORY PRESENT") -PORT_DIPNAME(0xF0000, 0x20000, "MEMORY PRESENT") -PORT_DIPSETTING(0x10000, "64 K (MINIMUM ON 100-A)") // see MOTHERBOARD_RAM -PORT_DIPSETTING(0x20000, "128 K (MINIMUM ON 100-B)") -PORT_DIPSETTING(0x30000, "192 K (w. MEMORY OPTION)") -PORT_DIPSETTING(0x40000, "256 K (w. MEMORY OPTION)") -PORT_DIPSETTING(0x50000, "320 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0x60000, "384 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0x70000, "448 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0x80000, "512 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0x90000, "576 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0xA0000, "640 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0xB0000, "704 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0xC0000, "768 K (100-B MEMORY OPTION)") -PORT_DIPSETTING(0xD0000, "832 K (100-B MEMORY OPTION)") // see END_OF_RAM -PORT_DIPSETTING(0xE0000, "896 K (100-B MAX. MEMORY)") - -// EXT.COMM.card -or- RD51 HD. controller (marketed later). -PORT_START("DEC HARD DISK") // BUNDLE_OPTION -PORT_DIPNAME(0x01, 0x00, "DEC HARD DISK (#1)") PORT_TOGGLE -PORT_DIPSETTING(0x00, DEF_STR(Off)) -PORT_DIPSETTING(0x01, DEF_STR(On)) - -PORT_START("CORVUS HARD DISKS") -PORT_DIPNAME(0x01, 0x00, "CORVUS HARD DISKS (#2 to #5)") PORT_TOGGLE -PORT_DIPSETTING(0x00, DEF_STR(Off)) -PORT_DIPSETTING(0x01, DEF_STR(On)) - -PORT_START("CLIKCLOK") // DS1315 RTC -PORT_DIPNAME(0x01, 0x00, "REAL TIME CLOCK (CLIKCLOK)") PORT_TOGGLE -PORT_DIPSETTING(0x00, DEF_STR(Off)) -PORT_DIPSETTING(0x01, DEF_STR(On)) - -PORT_START("GRAPHICS OPTION") // GDC-NEW -PORT_DIPNAME(0x01, 0x00, "GRAPHICS OPTION") PORT_TOGGLE -PORT_DIPSETTING(0x00, DEF_STR(Off)) -PORT_DIPSETTING(0x01, DEF_STR(On)) - -// W13 - W18 are used for factory tests and affect the boot process - -PORT_START("W13") -PORT_DIPNAME(0x02, 0x02, "W13 (FACTORY TEST A, LEAVE OFF)") PORT_TOGGLE -PORT_DIPSETTING(0x02, DEF_STR(Off)) -PORT_DIPSETTING(0x00, DEF_STR(On)) - -PORT_START("W14") -PORT_DIPNAME(0x04, 0x04, "W14 (FACTORY TEST B, LEAVE OFF)") PORT_TOGGLE -PORT_DIPSETTING(0x04, DEF_STR(Off)) -PORT_DIPSETTING(0x00, DEF_STR(On)) -PORT_START("W15") -PORT_DIPNAME(0x08, 0x08, "W15 (FACTORY TEST C, LEAVE OFF)") PORT_TOGGLE -PORT_DIPSETTING(0x08, DEF_STR(Off)) -PORT_DIPSETTING(0x00, DEF_STR(On)) - -PORT_START("W18") // DSR = 1 when switch is OFF - see i8251.c -PORT_DIPNAME(0x01, 0x00, "W18 (FACTORY TEST D, LEAVE OFF) (8251A: DSR)") PORT_TOGGLE -PORT_DIPSETTING(0x00, DEF_STR(Off)) -PORT_DIPSETTING(0x01, DEF_STR(On)) -PORT_WRITE_LINE_DEVICE_MEMBER("kbdser", i8251_device, write_dsr) - -// J17 jumper on FDC controller board shifts drive select (experimental) - -PORT_START("J17") -PORT_DIPNAME(0x02, 0x00, "J17 DRIVE SELECT (A => C and B => D)") PORT_TOGGLE -PORT_DIPSETTING(0x00, DEF_STR(Off)) -PORT_DIPSETTING(0x02, DEF_STR(On)) - -PORT_START("WATCHDOG") -PORT_DIPNAME(0x01, 0x00, "WATCHDOG ENABLED (MHFU)") PORT_TOGGLE -PORT_DIPSETTING(0x00, DEF_STR(Off)) -PORT_DIPSETTING(0x01, DEF_STR(On)) - -PORT_START("MONITOR CONFIGURATION") // GDC-NEW -PORT_DIPNAME(0x03, 0x03, "MONITOR CONFIGURATION") -PORT_DIPSETTING(0x01, "MONO ONLY / 4 to 16 monochrome shades (single VR-201)") -PORT_DIPSETTING(0x02, "COLOR ONLY (single VR-241 with BCC-17 cable)") -PORT_DIPSETTING(0x03, "DUAL MONITOR (SCREEN 1: TEXT; SCREEN 2: R-G-B)") + PORT_START("MONO MONITOR TYPE") + PORT_DIPNAME(0x03, 0x03, "MONO MONITOR TYPE") + PORT_DIPSETTING(0x01, "WHITE (VR201-A)") + PORT_DIPSETTING(0x02, "GREEN (VR201-B)") + PORT_DIPSETTING(0x03, "AMBER (VR201-C)") + + // MEMORY, FLOPPY, BUNDLE, GRAPHICS affect 'system_parameter_r': + PORT_START("MEMORY PRESENT") + PORT_DIPNAME(0xF0000, 0x20000, "MEMORY PRESENT") + PORT_DIPSETTING(0x10000, "64 K (MINIMUM ON 100-A)") // see MOTHERBOARD_RAM + PORT_DIPSETTING(0x20000, "128 K (MINIMUM ON 100-B)") + PORT_DIPSETTING(0x30000, "192 K (w. MEMORY OPTION)") + PORT_DIPSETTING(0x40000, "256 K (w. MEMORY OPTION)") + PORT_DIPSETTING(0x50000, "320 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0x60000, "384 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0x70000, "448 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0x80000, "512 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0x90000, "576 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0xA0000, "640 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0xB0000, "704 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0xC0000, "768 K (100-B MEMORY OPTION)") + PORT_DIPSETTING(0xD0000, "832 K (100-B MEMORY OPTION)") // see END_OF_RAM + PORT_DIPSETTING(0xE0000, "896 K (100-B MAX. MEMORY)") + + // EXT.COMM.card -or- RD51 HD. controller (marketed later). + PORT_START("DEC HARD DISK") // BUNDLE_OPTION + PORT_DIPNAME(0x01, 0x00, "DEC HARD DISK (#1)") PORT_TOGGLE + PORT_DIPSETTING(0x00, DEF_STR(Off)) + PORT_DIPSETTING(0x01, DEF_STR(On)) + + PORT_START("CORVUS HARD DISKS") + PORT_DIPNAME(0x01, 0x00, "CORVUS HARD DISKS (#2 to #5)") PORT_TOGGLE + PORT_DIPSETTING(0x00, DEF_STR(Off)) + PORT_DIPSETTING(0x01, DEF_STR(On)) + + PORT_START("CLIKCLOK") // DS1315 RTC + PORT_DIPNAME(0x01, 0x00, "REAL TIME CLOCK (CLIKCLOK)") PORT_TOGGLE + PORT_DIPSETTING(0x00, DEF_STR(Off)) + PORT_DIPSETTING(0x01, DEF_STR(On)) + + PORT_START("GRAPHICS OPTION") // GDC-NEW + PORT_DIPNAME(0x01, 0x00, "GRAPHICS OPTION") PORT_TOGGLE + PORT_DIPSETTING(0x00, DEF_STR(Off)) + PORT_DIPSETTING(0x01, DEF_STR(On)) + + // W13 - W18 are used for factory tests and affect the boot process - + PORT_START("W13") + PORT_DIPNAME(0x02, 0x02, "W13 (FACTORY TEST A, LEAVE OFF)") PORT_TOGGLE + PORT_DIPSETTING(0x02, DEF_STR(Off)) + PORT_DIPSETTING(0x00, DEF_STR(On)) + + PORT_START("W14") + PORT_DIPNAME(0x04, 0x04, "W14 (FACTORY TEST B, LEAVE OFF)") PORT_TOGGLE + PORT_DIPSETTING(0x04, DEF_STR(Off)) + PORT_DIPSETTING(0x00, DEF_STR(On)) + PORT_START("W15") + PORT_DIPNAME(0x08, 0x08, "W15 (FACTORY TEST C, LEAVE OFF)") PORT_TOGGLE + PORT_DIPSETTING(0x08, DEF_STR(Off)) + PORT_DIPSETTING(0x00, DEF_STR(On)) + + PORT_START("W18") // DSR = 1 when switch is OFF - see i8251.c + PORT_DIPNAME(0x01, 0x00, "W18 (FACTORY TEST D, LEAVE OFF) (8251A: DSR)") PORT_TOGGLE + PORT_DIPSETTING(0x00, DEF_STR(Off)) + PORT_DIPSETTING(0x01, DEF_STR(On)) + PORT_WRITE_LINE_DEVICE_MEMBER("kbdser", i8251_device, write_dsr) + + // J17 jumper on FDC controller board shifts drive select (experimental) - + PORT_START("J17") + PORT_DIPNAME(0x02, 0x00, "J17 DRIVE SELECT (A => C and B => D)") PORT_TOGGLE + PORT_DIPSETTING(0x00, DEF_STR(Off)) + PORT_DIPSETTING(0x02, DEF_STR(On)) + + PORT_START("WATCHDOG") + PORT_DIPNAME(0x01, 0x00, "WATCHDOG ENABLED (MHFU)") PORT_TOGGLE + PORT_DIPSETTING(0x00, DEF_STR(Off)) + PORT_DIPSETTING(0x01, DEF_STR(On)) + + PORT_START("MONITOR CONFIGURATION") // GDC-NEW + PORT_DIPNAME(0x03, 0x03, "MONITOR CONFIGURATION") + PORT_DIPSETTING(0x01, "MONO ONLY / 4 to 16 monochrome shades (single VR-201)") + PORT_DIPSETTING(0x02, "COLOR ONLY (single VR-241 with BCC-17 cable)") + PORT_DIPSETTING(0x03, "DUAL MONITOR (SCREEN 1: TEXT; SCREEN 2: R-G-B)") INPUT_PORTS_END void rainbow_state::machine_reset() @@ -1428,10 +1428,10 @@ WRITE_LINE_MEMBER(rainbow_state::mpsc_irq) // PORT 0x06 : Communication bit rates (see page 21 of PC 100 SPEC) WRITE8_MEMBER(rainbow_state::comm_bitrate_w) { - m_dbrg->str_w(data & 0x0f); // PDF is wrong, low nibble is RECEIVE clock (verified in SETUP). + m_dbrg->write_str(data & 0x0f); // PDF is wrong, low nibble is RECEIVE clock (verified in SETUP). logerror("\n(COMM.) receive bitrate = %d ($%02x)\n", comm_rates[data & 0x0f] , data & 0x0f); - m_dbrg->stt_w( ((data & 0xf0) >> 4) ); + m_dbrg->write_stt( ((data & 0xf0) >> 4) ); logerror("(COMM.) transmit bitrate = %d ($%02x)\n", comm_rates[((data & 0xf0) >> 4)] ,(data & 0xf0) >> 4); } @@ -2362,7 +2362,7 @@ READ8_MEMBER(rainbow_state::z80_generalstat_r) last_dir = track > last_track ? 0 : 1; // see WD_FDC last_track = track; - fdc_status = m_fdc->status_r(); + fdc_status = m_fdc->read_status(); if ( (fdc_status & 0x80) == 0) // (see WD_FDC: S_WP = 0x40, S_NRDY = 0x80, S_TR00 = 0x04) fdc_ready = 1; @@ -3207,7 +3207,7 @@ GFXDECODE_END // Allocate 512 K (4 x 64 K x 16 bit) of memory (GDC-NEW): void rainbow_state::upd7220_map(address_map &map) { - map(0x00000, 0x3ffff).rw(this, FUNC(rainbow_state::vram_r), FUNC(rainbow_state::vram_w)).share("vram"); + map(0x00000, 0x3ffff).rw(FUNC(rainbow_state::vram_r), FUNC(rainbow_state::vram_w)).share("vram"); } MACHINE_CONFIG_START(rainbow_state::rainbow) diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp index 2f469c09906..7c14781842d 100644 --- a/src/mame/drivers/rallyx.cpp +++ b/src/mame/drivers/rallyx.cpp @@ -281,7 +281,7 @@ WRITE_LINE_MEMBER(rallyx_state::coin_counter_2_w) void rallyx_state::rallyx_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x8000, 0x8fff).ram().w(this, FUNC(rallyx_state::rallyx_videoram_w)).share("videoram"); + map(0x8000, 0x8fff).ram().w(FUNC(rallyx_state::rallyx_videoram_w)).share("videoram"); map(0x9800, 0x9fff).ram(); map(0xa000, 0xa000).portr("P1"); map(0xa080, 0xa080).portr("P2"); @@ -289,8 +289,8 @@ void rallyx_state::rallyx_map(address_map &map) map(0xa000, 0xa00f).writeonly().share("radarattr"); map(0xa080, 0xa080).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xa100, 0xa11f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w)); - map(0xa130, 0xa130).w(this, FUNC(rallyx_state::rallyx_scrollx_w)); - map(0xa140, 0xa140).w(this, FUNC(rallyx_state::rallyx_scrolly_w)); + map(0xa130, 0xa130).w(FUNC(rallyx_state::rallyx_scrollx_w)); + map(0xa140, 0xa140).w(FUNC(rallyx_state::rallyx_scrolly_w)); map(0xa170, 0xa170).nopw(); /* ? */ map(0xa180, 0xa187).w("mainlatch", FUNC(ls259_device::write_d0)); } @@ -298,14 +298,14 @@ void rallyx_state::rallyx_map(address_map &map) void rallyx_state::io_map(address_map &map) { map.global_mask(0xff); - map(0, 0).w(this, FUNC(rallyx_state::rallyx_interrupt_vector_w)); + map(0, 0).w(FUNC(rallyx_state::rallyx_interrupt_vector_w)); } void rallyx_state::jungler_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8fff).ram().w(this, FUNC(rallyx_state::rallyx_videoram_w)).share("videoram"); + map(0x8000, 0x8fff).ram().w(FUNC(rallyx_state::rallyx_videoram_w)).share("videoram"); map(0x9800, 0x9fff).ram(); map(0xa000, 0xa000).portr("P1"); map(0xa080, 0xa080).portr("P2"); @@ -314,8 +314,8 @@ void rallyx_state::jungler_map(address_map &map) map(0xa000, 0xa00f).mirror(0x00f0).writeonly().share("radarattr"); // jungler writes to a03x map(0xa080, 0xa080).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xa100, 0xa100).w(m_timeplt_audio, FUNC(timeplt_audio_device::sound_data_w)); - map(0xa130, 0xa130).w(this, FUNC(rallyx_state::rallyx_scrollx_w)); /* only jungler and tactcian */ - map(0xa140, 0xa140).w(this, FUNC(rallyx_state::rallyx_scrolly_w)); /* only jungler and tactcian */ + map(0xa130, 0xa130).w(FUNC(rallyx_state::rallyx_scrollx_w)); /* only jungler and tactcian */ + map(0xa140, 0xa140).w(FUNC(rallyx_state::rallyx_scrolly_w)); /* only jungler and tactcian */ map(0xa180, 0xa187).w("mainlatch", FUNC(ls259_device::write_d0)); } diff --git a/src/mame/drivers/rambo.cpp b/src/mame/drivers/rambo.cpp index de5941a82dc..31695deb570 100644 --- a/src/mame/drivers/rambo.cpp +++ b/src/mame/drivers/rambo.cpp @@ -119,7 +119,7 @@ void rambo_state::rambo_data_map(address_map &map) void rambo_state::rambo_io_map(address_map &map) { - map(AVR8_IO_PORTA, AVR8_IO_PORTL).rw(this, FUNC(rambo_state::port_r), FUNC(rambo_state::port_w)); + map(AVR8_IO_PORTA, AVR8_IO_PORTL).rw(FUNC(rambo_state::port_r), FUNC(rambo_state::port_w)); } /****************************************************\ diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp index 95f4192c817..dda73a095f8 100644 --- a/src/mame/drivers/rampart.cpp +++ b/src/mame/drivers/rampart.cpp @@ -143,7 +143,7 @@ void rampart_state::main_map(address_map &map) map(0x480000, 0x480003).mirror(0x019ffc).w(m_ym2413, FUNC(ym2413_device::write)).umask16(0xff00); map(0x500000, 0x500fff).mirror(0x019000).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x5a6000, 0x5a6001).mirror(0x019ffe).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); - map(0x640000, 0x640001).mirror(0x019ffe).w(this, FUNC(rampart_state::latch_w)); + map(0x640000, 0x640001).mirror(0x019ffe).w(FUNC(rampart_state::latch_w)); map(0x640000, 0x640001).mirror(0x019ffc).portr("IN0"); map(0x640002, 0x640003).mirror(0x019ffc).portr("IN1"); map(0x6c0000, 0x6c0001).mirror(0x019ff8).portr("TRACK0"); @@ -151,7 +151,7 @@ void rampart_state::main_map(address_map &map) map(0x6c0004, 0x6c0005).mirror(0x019ff8).portr("TRACK2"); map(0x6c0006, 0x6c0007).mirror(0x019ff8).portr("TRACK3"); map(0x726000, 0x726001).mirror(0x019ffe).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x7e6000, 0x7e6001).mirror(0x019ffe).w(this, FUNC(rampart_state::scanline_int_ack_w)); + map(0x7e6000, 0x7e6001).mirror(0x019ffe).w(FUNC(rampart_state::scanline_int_ack_w)); } diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp index 87eeed36af3..ae69eaf95bc 100644 --- a/src/mame/drivers/rastan.cpp +++ b/src/mame/drivers/rastan.cpp @@ -184,7 +184,7 @@ WRITE_LINE_MEMBER(rastan_state::rastan_msm5205_vck) if (m_adpcm_ff) { - m_adpcm_sel->ba_w(m_adpcm_data[m_adpcm_pos]); + m_adpcm_sel->write_ba(m_adpcm_data[m_adpcm_pos]); m_adpcm_pos = (m_adpcm_pos + 1) & 0xffff; } } @@ -214,7 +214,7 @@ void rastan_state::rastan_map(address_map &map) map(0x10c000, 0x10ffff).ram(); map(0x200000, 0x200fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x350008, 0x350009).nopw(); /* 0 only (often) ? */ - map(0x380000, 0x380001).w(this, FUNC(rastan_state::rastan_spritectrl_w)); /* sprite palette bank, coin counters & lockout */ + map(0x380000, 0x380001).w(FUNC(rastan_state::rastan_spritectrl_w)); /* sprite palette bank, coin counters & lockout */ map(0x390000, 0x390001).portr("P1"); map(0x390002, 0x390003).portr("P2"); map(0x390004, 0x390005).portr("SPECIAL"); @@ -241,9 +241,9 @@ void rastan_state::rastan_s_map(address_map &map) map(0x9000, 0x9001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xa000, 0xa000).w("ciu", FUNC(pc060ha_device::slave_port_w)); map(0xa001, 0xa001).rw("ciu", FUNC(pc060ha_device::slave_comm_r), FUNC(pc060ha_device::slave_comm_w)); - map(0xb000, 0xb000).w(this, FUNC(rastan_state::rastan_msm5205_address_w)); - map(0xc000, 0xc000).w(this, FUNC(rastan_state::rastan_msm5205_start_w)); - map(0xd000, 0xd000).w(this, FUNC(rastan_state::rastan_msm5205_stop_w)); + map(0xb000, 0xb000).w(FUNC(rastan_state::rastan_msm5205_address_w)); + map(0xc000, 0xc000).w(FUNC(rastan_state::rastan_msm5205_start_w)); + map(0xd000, 0xd000).w(FUNC(rastan_state::rastan_msm5205_stop_w)); } diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index 1f8bf9eba2c..a659ecf845b 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -679,19 +679,19 @@ void rastersp_state::cpu_map(address_map &map) map(0x00000000, 0x003fffff).ram().share("dram"); map(0x01000000, 0x010bffff).noprw(); // External ROM map(0x010c0000, 0x010cffff).rom().region("bios", 0); - map(0x02200000, 0x022fffff).rw(this, FUNC(rastersp_state::nvram_r), FUNC(rastersp_state::nvram_w)).umask32(0x000000ff); + map(0x02200000, 0x022fffff).rw(FUNC(rastersp_state::nvram_r), FUNC(rastersp_state::nvram_w)).umask32(0x000000ff); map(0x02200800, 0x02200803).nopw(); // ? map(0x02208000, 0x02208fff).rw("scsibus:7:ncr53c700", FUNC(ncr53c7xx_device::read), FUNC(ncr53c7xx_device::write)); - map(0x0220e000, 0x0220e003).w(this, FUNC(rastersp_state::dpylist_w)); + map(0x0220e000, 0x0220e003).w(FUNC(rastersp_state::dpylist_w)); map(0xfff00000, 0xffffffff).bankrw("bank3"); } void rastersp_state::io_map(address_map &map) { - map(0x0020, 0x0023).w(this, FUNC(rastersp_state::cyrix_cache_w)); - map(0x1000, 0x1003).portr("P1").w(this, FUNC(rastersp_state::port1_w)); - map(0x1004, 0x1007).portr("P2").w(this, FUNC(rastersp_state::port2_w)); - map(0x1008, 0x100b).portr("COMMON").w(this, FUNC(rastersp_state::port3_w)); + map(0x0020, 0x0023).w(FUNC(rastersp_state::cyrix_cache_w)); + map(0x1000, 0x1003).portr("P1").w(FUNC(rastersp_state::port1_w)); + map(0x1004, 0x1007).portr("P2").w(FUNC(rastersp_state::port2_w)); + map(0x1008, 0x100b).portr("COMMON").w(FUNC(rastersp_state::port3_w)); map(0x100c, 0x100f).portr("DSW2"); map(0x1010, 0x1013).portr("DSW1"); map(0x1014, 0x1017).portr("EXTRA"); @@ -704,11 +704,11 @@ void rastersp_state::dsp_map(address_map &map) { map(0x000000, 0x0fffff).bankrw("bank1"); map(0x400000, 0x40ffff).rom().region("dspboot", 0); - map(0x808000, 0x80807f).rw(this, FUNC(rastersp_state::tms32031_control_r), FUNC(rastersp_state::tms32031_control_w)); - map(0x880402, 0x880402).w(this, FUNC(rastersp_state::dsp_unk_w)); - map(0x883c00, 0x883c00).w(this, FUNC(rastersp_state::dsp_486_int_w)); + map(0x808000, 0x80807f).rw(FUNC(rastersp_state::tms32031_control_r), FUNC(rastersp_state::tms32031_control_w)); + map(0x880402, 0x880402).w(FUNC(rastersp_state::dsp_unk_w)); + map(0x883c00, 0x883c00).w(FUNC(rastersp_state::dsp_486_int_w)); map(0xc00000, 0xc03fff).bankrw("bank2"); - map(0xc80000, 0xc80000).w(this, FUNC(rastersp_state::dsp_ctrl_w)); + map(0xc80000, 0xc80000).w(FUNC(rastersp_state::dsp_ctrl_w)); map(0xfc0000, 0xffffff).bankrw("bank3"); } diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index e2556509f71..ff8ad659c0b 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -220,17 +220,17 @@ void ravens_state::ravens_mem(address_map &map) void ravens_state::ravens_io(address_map &map) { map.unmap_value_high(); - map(0x09, 0x09).w(this, FUNC(ravens_state::leds_w)); // LED output port - map(0x10, 0x15).w(this, FUNC(ravens_state::display_w)); // 6-led display - map(0x17, 0x17).r(this, FUNC(ravens_state::port17_r)); // pushbuttons + map(0x09, 0x09).w(FUNC(ravens_state::leds_w)); // LED output port + map(0x10, 0x15).w(FUNC(ravens_state::display_w)); // 6-led display + map(0x17, 0x17).r(FUNC(ravens_state::port17_r)); // pushbuttons } void ravens_state::ravens2_io(address_map &map) { map.unmap_value_high(); - map(0x07, 0x07).r(this, FUNC(ravens_state::port07_r)); - map(0x1b, 0x1b).w(this, FUNC(ravens_state::port1b_w)); - map(0x1c, 0x1c).w(this, FUNC(ravens_state::port1c_w)); + map(0x07, 0x07).r(FUNC(ravens_state::port07_r)); + map(0x1b, 0x1b).w(FUNC(ravens_state::port1b_w)); + map(0x1c, 0x1c).w(FUNC(ravens_state::port1c_w)); } /* Input ports */ diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp index cdc848fb709..c2356a6bba7 100644 --- a/src/mame/drivers/rbisland.cpp +++ b/src/mame/drivers/rbisland.cpp @@ -353,7 +353,7 @@ void rbisland_state::rbisland_map(address_map &map) map(0x200000, 0x200fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x201000, 0x203fff).ram(); /* r/w in initial checks */ map(0x390000, 0x390003).portr("DSWA"); - map(0x3a0000, 0x3a0001).w(this, FUNC(rbisland_state::rbisland_spritectrl_w)); + map(0x3a0000, 0x3a0001).w(FUNC(rbisland_state::rbisland_spritectrl_w)); map(0x3b0000, 0x3b0003).portr("DSWB"); map(0x3c0000, 0x3c0003).nopw(); /* written very often, watchdog? */ map(0x3e0000, 0x3e0001).nopr(); @@ -380,9 +380,9 @@ void rbisland_state::jumping_map(address_map &map) map(0x400002, 0x400003).portr("DSWB"); map(0x401000, 0x401001).portr("401001"); map(0x401002, 0x401003).portr("401003"); - map(0x3a0000, 0x3a0001).w(this, FUNC(rbisland_state::jumping_spritectrl_w)); + map(0x3a0000, 0x3a0001).w(FUNC(rbisland_state::jumping_spritectrl_w)); map(0x3c0000, 0x3c0001).nopw(); /* watchdog? */ - map(0x400006, 0x400007).w(this, FUNC(rbisland_state::jumping_sound_w)); + map(0x400006, 0x400007).w(FUNC(rbisland_state::jumping_sound_w)); map(0x420000, 0x420001).nopr(); /* read, but result not used */ map(0x430000, 0x430003).w(m_pc080sn, FUNC(pc080sn_device::yscroll_word_w)); map(0x440000, 0x4407ff).ram().share("spriteram"); @@ -429,7 +429,7 @@ void rbisland_state::jumping_sound_map(address_map &map) map(0x8000, 0x8fff).ram(); map(0xb000, 0xb001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xb400, 0xb401).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0xb800, 0xb800).r(this, FUNC(rbisland_state::jumping_latch_r)); + map(0xb800, 0xb800).r(FUNC(rbisland_state::jumping_latch_r)); map(0xbc00, 0xbc00).nopw(); /* looks like a bankswitch, but sound works with or without it */ map(0xc000, 0xffff).rom(); } diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp index 9d287e2bfe4..de3e3729287 100644 --- a/src/mame/drivers/rbmk.cpp +++ b/src/mame/drivers/rbmk.cpp @@ -178,25 +178,25 @@ void rbmk_state::rbmk_mem(address_map &map) map(0x980300, 0x983fff).ram(); // 0x2048 words ???, byte access map(0x900000, 0x900fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x9c0000, 0x9c0fff).ram().share("vidram"); - map(0xb00000, 0xb00001).w(this, FUNC(rbmk_state::eeprom_w)); - map(0xc00000, 0xc00001).rw(this, FUNC(rbmk_state::dip_mux_r), FUNC(rbmk_state::dip_mux_w)); - map(0xc08000, 0xc08001).portr("IN1").w(this, FUNC(rbmk_state::tilebank_w)); + map(0xb00000, 0xb00001).w(FUNC(rbmk_state::eeprom_w)); + map(0xc00000, 0xc00001).rw(FUNC(rbmk_state::dip_mux_r), FUNC(rbmk_state::dip_mux_w)); + map(0xc08000, 0xc08001).portr("IN1").w(FUNC(rbmk_state::tilebank_w)); map(0xc10000, 0xc10001).portr("IN2"); - map(0xc18080, 0xc18081).r(this, FUNC(rbmk_state::unk_r)); + map(0xc18080, 0xc18081).r(FUNC(rbmk_state::unk_r)); map(0xc20000, 0xc20001).portr("IN3"); - map(0xc28000, 0xc28001).w(this, FUNC(rbmk_state::unk_w)); + map(0xc28000, 0xc28001).w(FUNC(rbmk_state::unk_w)); } void rbmk_state::rbspm_mem(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x200000, 0x200001).w(this, FUNC(rbmk_state::eeprom_w)); // wrong - map(0x300000, 0x300001).rw(this, FUNC(rbmk_state::dip_mux_r), FUNC(rbmk_state::dip_mux_w)); - map(0x308000, 0x308001).portr("IN1").w(this, FUNC(rbmk_state::tilebank_w)); // ok + map(0x200000, 0x200001).w(FUNC(rbmk_state::eeprom_w)); // wrong + map(0x300000, 0x300001).rw(FUNC(rbmk_state::dip_mux_r), FUNC(rbmk_state::dip_mux_w)); + map(0x308000, 0x308001).portr("IN1").w(FUNC(rbmk_state::tilebank_w)); // ok map(0x310000, 0x310001).portr("IN2"); - map(0x318080, 0x318081).r(this, FUNC(rbmk_state::unk_r)); + map(0x318080, 0x318081).r(FUNC(rbmk_state::unk_r)); map(0x320000, 0x320001).portr("IN3"); - map(0x328000, 0x328001).w(this, FUNC(rbmk_state::unk_w)); + map(0x328000, 0x328001).w(FUNC(rbmk_state::unk_w)); map(0x500000, 0x50ffff).ram(); map(0x900000, 0x900fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // if removed fails gfx test? map(0x940000, 0x940fff).ram().share("vidram2"); // if removed fails palette test? @@ -246,7 +246,7 @@ WRITE8_MEMBER(rbmk_state::mcu_io_mux_w) void rbmk_state::mcu_io(address_map &map) { - map(0x0ff00, 0x0ffff).rw(this, FUNC(rbmk_state::mcu_io_r), FUNC(rbmk_state::mcu_io_w)); + map(0x0ff00, 0x0ffff).rw(FUNC(rbmk_state::mcu_io_r), FUNC(rbmk_state::mcu_io_w)); } static INPUT_PORTS_START( rbmk ) diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index a65fdef8e50..3d4f163c520 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -112,9 +112,9 @@ void rc702_state::rc702_io(address_map &map) map(0x08, 0x0b).rw("sio1", FUNC(z80dart_device::cd_ba_r), FUNC(z80dart_device::cd_ba_w)); // boot sequence doesn't program this map(0x0c, 0x0f).rw(m_ctc1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x10, 0x13).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0x14, 0x17).portr("DSW").w(this, FUNC(rc702_state::port14_w)); // motors - map(0x18, 0x1b).w(this, FUNC(rc702_state::port18_w)); // memory banking - map(0x1c, 0x1f).w(this, FUNC(rc702_state::port1c_w)); // sound + map(0x14, 0x17).portr("DSW").w(FUNC(rc702_state::port14_w)); // motors + map(0x18, 0x1b).w(FUNC(rc702_state::port18_w)); // memory banking + map(0x1c, 0x1f).w(FUNC(rc702_state::port1c_w)); // sound map(0xf0, 0xff).rw(m_dma, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); } diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 39c1e17bf4d..f10dbe5e5ea 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -478,25 +478,25 @@ void rc759_state::rc759_io(address_map &map) { map.unmap_value_high(); map(0x000, 0x003).mirror(0x0c).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x020, 0x020).r(this, FUNC(rc759_state::keyboard_r)); + map(0x020, 0x020).r(FUNC(rc759_state::keyboard_r)); map(0x056, 0x057).noprw(); // in reality, access to sound and rtc is a bit more involved - map(0x05a, 0x05a).w(m_snd, FUNC(sn76489a_device::write)); - map(0x05c, 0x05c).rw(this, FUNC(rc759_state::rtc_r), FUNC(rc759_state::rtc_w)); + map(0x05a, 0x05a).w(m_snd, FUNC(sn76489a_device::command_w)); + map(0x05c, 0x05c).rw(FUNC(rc759_state::rtc_r), FUNC(rc759_state::rtc_w)); // AM_RANGE(0x060, 0x06f) AM_WRITE8(crt_control_w, 0x00ff) map(0x070, 0x077).mirror(0x08).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x080, 0x0ff).rw(this, FUNC(rc759_state::nvram_r), FUNC(rc759_state::nvram_w)).umask16(0x00ff); + map(0x080, 0x0ff).rw(FUNC(rc759_state::nvram_r), FUNC(rc759_state::nvram_w)).umask16(0x00ff); // AM_RANGE(0x100, 0x101) net - map(0x180, 0x1bf).rw(this, FUNC(rc759_state::palette_r), FUNC(rc759_state::palette_w)).umask16(0x00ff); - map(0x230, 0x231).w(this, FUNC(rc759_state::txt_irst_w)); - map(0x240, 0x241).w(this, FUNC(rc759_state::txt_ca_w)); - map(0x250, 0x250).rw(this, FUNC(rc759_state::centronics_data_r), FUNC(rc759_state::centronics_data_w)); - map(0x260, 0x260).rw(this, FUNC(rc759_state::centronics_control_r), FUNC(rc759_state::centronics_control_w)); + map(0x180, 0x1bf).rw(FUNC(rc759_state::palette_r), FUNC(rc759_state::palette_w)).umask16(0x00ff); + map(0x230, 0x231).w(FUNC(rc759_state::txt_irst_w)); + map(0x240, 0x241).w(FUNC(rc759_state::txt_ca_w)); + map(0x250, 0x250).rw(FUNC(rc759_state::centronics_data_r), FUNC(rc759_state::centronics_data_w)); + map(0x260, 0x260).rw(FUNC(rc759_state::centronics_control_r), FUNC(rc759_state::centronics_control_w)); map(0x280, 0x287).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)).umask16(0x00ff); - map(0x288, 0x288).w(this, FUNC(rc759_state::floppy_control_w)); + map(0x288, 0x288).w(FUNC(rc759_state::floppy_control_w)); // AM_RANGE(0x28a, 0x28b) external printer data // AM_RANGE(0x28d, 0x28d) external printer control - map(0x28e, 0x28e).rw(this, FUNC(rc759_state::floppy_ack_r), FUNC(rc759_state::floppy_reserve_w)); - map(0x290, 0x290).w(this, FUNC(rc759_state::floppy_release_w)); + map(0x28e, 0x28e).rw(FUNC(rc759_state::floppy_ack_r), FUNC(rc759_state::floppy_reserve_w)); + map(0x290, 0x290).w(FUNC(rc759_state::floppy_release_w)); // AM_RANGE(0x292, 0x293) AM_READWRITE8(printer_ack_r, printer_reserve_w, 0x00ff) // AM_RANGE(0x294, 0x295) AM_WRITE8(printer_release_w, 0x00ff) map(0x300, 0x30f).rw(m_isbx, FUNC(isbx_slot_device::mcs0_r), FUNC(isbx_slot_device::mcs0_w)).umask16(0x00ff); diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp index 45f5c15004a..1bf64a4da24 100644 --- a/src/mame/drivers/rd110.cpp +++ b/src/mame/drivers/rd110.cpp @@ -218,12 +218,12 @@ PALETTE_INIT_MEMBER(d110_state, d110) void d110_state::d110_map(address_map &map) { - map(0x0100, 0x0100).w(this, FUNC(d110_state::bank_w)); - map(0x0200, 0x0200).w(this, FUNC(d110_state::so_w)); + map(0x0100, 0x0100).w(FUNC(d110_state::bank_w)); + map(0x0200, 0x0200).w(FUNC(d110_state::so_w)); map(0x021a, 0x021a).portr("SC0").nopw(); map(0x021c, 0x021c).portr("SC1"); - map(0x0300, 0x0300).w(this, FUNC(d110_state::lcd_data_w)); - map(0x0380, 0x0380).rw(this, FUNC(d110_state::lcd_ctrl_r), FUNC(d110_state::lcd_ctrl_w)); + map(0x0300, 0x0300).w(FUNC(d110_state::lcd_data_w)); + map(0x0380, 0x0380).rw(FUNC(d110_state::lcd_ctrl_r), FUNC(d110_state::lcd_ctrl_w)); map(0x1000, 0x7fff).rom().region("maincpu", 0x1000); map(0x8000, 0xbfff).bankrw("bank"); map(0xc000, 0xffff).bankrw("fixed"); @@ -231,8 +231,8 @@ void d110_state::d110_map(address_map &map) void d110_state::d110_io(address_map &map) { - map(i8x9x_device::SERIAL, i8x9x_device::SERIAL).w(this, FUNC(d110_state::midi_w)); - map(i8x9x_device::P0, i8x9x_device::P0).r(this, FUNC(d110_state::port0_r)); + map(i8x9x_device::SERIAL, i8x9x_device::SERIAL).w(FUNC(d110_state::midi_w)); + map(i8x9x_device::P0, i8x9x_device::P0).r(FUNC(d110_state::port0_r)); } MACHINE_CONFIG_START(d110_state::d110) diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp index 55862b3c2a1..ce6814e7f5c 100644 --- a/src/mame/drivers/re900.cpp +++ b/src/mame/drivers/re900.cpp @@ -259,11 +259,11 @@ void re900_state::mem_prg(address_map &map) void re900_state::mem_io(address_map &map) { - map(0x0000, 0xbfff).r(this, FUNC(re900_state::rom_r)); + map(0x0000, 0xbfff).r(FUNC(re900_state::rom_r)); map(0xc000, 0xdfff).ram().share("nvram"); - map(0xe000, 0xefff).w(this, FUNC(re900_state::watchdog_reset_w)); - map(0xe000, 0xe000).w("tms9128", FUNC(tms9928a_device::vram_write)); - map(0xe001, 0xe001).w("tms9128", FUNC(tms9928a_device::register_write)); + map(0xe000, 0xefff).w(FUNC(re900_state::watchdog_reset_w)); + map(0xe000, 0xe000).w("tms9128", FUNC(tms9928a_device::vram_w)); + map(0xe001, 0xe001).w("tms9128", FUNC(tms9928a_device::register_w)); map(0xe800, 0xe801).w("ay_re900", FUNC(ay8910_device::address_data_w)); map(0xe802, 0xe802).r("ay_re900", FUNC(ay8910_device::data_r)); } diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp index ed072a23e4f..674aba52bea 100644 --- a/src/mame/drivers/realbrk.cpp +++ b/src/mame/drivers/realbrk.cpp @@ -160,11 +160,11 @@ void realbrk_state::base_mem(address_map &map) map(0x000000, 0x0fffff).rom(); // ROM map(0x200000, 0x203fff).ram().share("spriteram"); // Sprites map(0x400000, 0x40ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0x600000, 0x601fff).ram().w(this, FUNC(realbrk_state::vram_0_w)).share("vram_0"); // Background (0) - map(0x602000, 0x603fff).ram().w(this, FUNC(realbrk_state::vram_1_w)).share("vram_1"); // Background (1) - map(0x604000, 0x604fff).ram().w(this, FUNC(realbrk_state::vram_2_w)).share("vram_2"); // Text (2) + map(0x600000, 0x601fff).ram().w(FUNC(realbrk_state::vram_0_w)).share("vram_0"); // Background (0) + map(0x602000, 0x603fff).ram().w(FUNC(realbrk_state::vram_1_w)).share("vram_1"); // Background (1) + map(0x604000, 0x604fff).ram().w(FUNC(realbrk_state::vram_2_w)).share("vram_2"); // Text (2) map(0x605000, 0x61ffff).ram(); // - map(0x606000, 0x60600f).ram().w(this, FUNC(realbrk_state::vregs_w)).share("vregs"); // Scroll + Video Regs + map(0x606000, 0x60600f).ram().w(FUNC(realbrk_state::vregs_w)).share("vregs"); // Scroll + Video Regs map(0x800000, 0x800003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0xff00); // YMZ280 map(0xfe0000, 0xfeffff).ram(); // RAM map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers @@ -177,7 +177,7 @@ void realbrk_state::realbrk_mem(address_map &map) map(0x800008, 0x80000b).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); // map(0xc00000, 0xc00001).portr("IN0"); // P1 & P2 (Inputs) map(0xc00002, 0xc00003).portr("IN1"); // Coins - map(0xc00004, 0xc00005).ram().r(this, FUNC(realbrk_state::realbrk_dsw_r)).share("dsw_select"); // DSW select + map(0xc00004, 0xc00005).ram().r(FUNC(realbrk_state::realbrk_dsw_r)).share("dsw_select"); // DSW select map(0xff0000, 0xfffbff).ram(); // RAM } @@ -186,8 +186,8 @@ void realbrk_state::pkgnsh_mem(address_map &map) { base_mem(map); map(0x800008, 0x80000b).w("ymsnd", FUNC(ym2413_device::write)).umask16(0xff00); // YM2413 - map(0xc00000, 0xc00013).r(this, FUNC(realbrk_state::pkgnsh_input_r)); // P1 & P2 (Inputs) - map(0xff0000, 0xfffbff).rw(this, FUNC(realbrk_state::backup_ram_r), FUNC(realbrk_state::backup_ram_w)).share("backup_ram"); // RAM + map(0xc00000, 0xc00013).r(FUNC(realbrk_state::pkgnsh_input_r)); // P1 & P2 (Inputs) + map(0xff0000, 0xfffbff).rw(FUNC(realbrk_state::backup_ram_r), FUNC(realbrk_state::backup_ram_w)).share("backup_ram"); // RAM } /*pkgnshdx specific memory map*/ @@ -195,9 +195,9 @@ void realbrk_state::pkgnshdx_mem(address_map &map) { base_mem(map); map(0x800008, 0x80000b).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); // - map(0xc00000, 0xc00013).r(this, FUNC(realbrk_state::pkgnshdx_input_r)); // P1 & P2 (Inputs) + map(0xc00000, 0xc00013).r(FUNC(realbrk_state::pkgnshdx_input_r)); // P1 & P2 (Inputs) map(0xc00004, 0xc00005).writeonly().share("dsw_select"); // DSW select - map(0xff0000, 0xfffbff).rw(this, FUNC(realbrk_state::backup_ram_dx_r), FUNC(realbrk_state::backup_ram_w)).share("backup_ram"); // RAM + map(0xff0000, 0xfffbff).rw(FUNC(realbrk_state::backup_ram_dx_r), FUNC(realbrk_state::backup_ram_w)).share("backup_ram"); // RAM } /*dai2kaku specific memory map*/ @@ -209,9 +209,9 @@ void realbrk_state::dai2kaku_mem(address_map &map) map(0x800008, 0x80000b).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff); // map(0xc00000, 0xc00001).portr("IN0"); // P1 & P2 (Inputs) map(0xc00002, 0xc00003).portr("IN1"); // Coins - map(0xc00004, 0xc00005).ram().r(this, FUNC(realbrk_state::realbrk_dsw_r)).share("dsw_select"); // DSW select + map(0xc00004, 0xc00005).ram().r(FUNC(realbrk_state::realbrk_dsw_r)).share("dsw_select"); // DSW select map(0xff0000, 0xfffbff).ram(); // RAM - map(0xfffd0a, 0xfffd0b).w(this, FUNC(realbrk_state::dai2kaku_flipscreen_w)); // Hack! Parallel port data register + map(0xfffd0a, 0xfffd0b).w(FUNC(realbrk_state::dai2kaku_flipscreen_w)); // Hack! Parallel port data register } /*************************************************************************** diff --git a/src/mame/drivers/redalert.cpp b/src/mame/drivers/redalert.cpp index fcd5b50a598..85d587ecf1e 100644 --- a/src/mame/drivers/redalert.cpp +++ b/src/mame/drivers/redalert.cpp @@ -155,68 +155,68 @@ READ8_MEMBER(redalert_state::panther_unk_r) void redalert_state::redalert_main_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x3fff).ram().w(this, FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); + map(0x2000, 0x3fff).ram().w(FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); map(0x4000, 0x4fff).ram().share("charram"); map(0x5000, 0xbfff).rom(); map(0xc000, 0xc000).mirror(0x0f8f).portr("C000").nopw(); map(0xc010, 0xc010).mirror(0x0f8f).portr("C010").nopw(); map(0xc020, 0xc020).mirror(0x0f8f).portr("C020").nopw(); - map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(this, FUNC(redalert_state::redalert_audio_command_w)); + map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(FUNC(redalert_state::redalert_audio_command_w)); map(0xc040, 0xc040).mirror(0x0f8f).nopr().writeonly().share("video_control"); map(0xc050, 0xc050).mirror(0x0f8f).nopr().writeonly().share("bitmap_color"); - map(0xc060, 0xc060).mirror(0x0f8f).nopr().w(this, FUNC(redalert_state::redalert_voice_command_w)); - map(0xc070, 0xc070).mirror(0x0f8f).rw(this, FUNC(redalert_state::redalert_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); + map(0xc060, 0xc060).mirror(0x0f8f).nopr().w(FUNC(redalert_state::redalert_voice_command_w)); + map(0xc070, 0xc070).mirror(0x0f8f).rw(FUNC(redalert_state::redalert_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); map(0xf000, 0xffff).rom().region("maincpu", 0x8000); } void redalert_state::ww3_main_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x3fff).ram().w(this, FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); + map(0x2000, 0x3fff).ram().w(FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); map(0x4000, 0x4fff).ram().share("charram"); map(0x5000, 0xbfff).rom(); map(0xc000, 0xc000).mirror(0x0f8f).portr("C000").nopw(); map(0xc010, 0xc010).mirror(0x0f8f).portr("C010").nopw(); map(0xc020, 0xc020).mirror(0x0f8f).portr("C020").nopw(); - map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(this, FUNC(redalert_state::redalert_audio_command_w)); + map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(FUNC(redalert_state::redalert_audio_command_w)); map(0xc040, 0xc040).mirror(0x0f8f).nopr().writeonly().share("video_control"); map(0xc050, 0xc050).mirror(0x0f8f).nopr().writeonly().share("bitmap_color"); - map(0xc070, 0xc070).mirror(0x0f8f).rw(this, FUNC(redalert_state::redalert_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); + map(0xc070, 0xc070).mirror(0x0f8f).rw(FUNC(redalert_state::redalert_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); map(0xf000, 0xffff).rom().region("maincpu", 0x8000); } void redalert_state::panther_main_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x3fff).ram().w(this, FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); + map(0x2000, 0x3fff).ram().w(FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); map(0x4000, 0x4fff).ram().share("charram"); map(0x5000, 0xbfff).rom(); map(0xc000, 0xc000).mirror(0x0f8f).portr("C000").nopw(); map(0xc010, 0xc010).mirror(0x0f8f).portr("C010").nopw(); - map(0xc020, 0xc020).mirror(0x0f8f).r(this, FUNC(redalert_state::panther_unk_r)); /* vblank? */ - map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(this, FUNC(redalert_state::redalert_audio_command_w)); + map(0xc020, 0xc020).mirror(0x0f8f).r(FUNC(redalert_state::panther_unk_r)); /* vblank? */ + map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(FUNC(redalert_state::redalert_audio_command_w)); map(0xc040, 0xc040).mirror(0x0f8f).nopr().writeonly().share("video_control"); map(0xc050, 0xc050).mirror(0x0f8f).nopr().writeonly().share("bitmap_color"); - map(0xc070, 0xc070).mirror(0x0f8f).rw(this, FUNC(redalert_state::panther_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); + map(0xc070, 0xc070).mirror(0x0f8f).rw(FUNC(redalert_state::panther_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); map(0xf000, 0xffff).rom().region("maincpu", 0x8000); } void redalert_state::demoneye_main_map(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x3fff).ram().w(this, FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); + map(0x2000, 0x3fff).ram().w(FUNC(redalert_state::redalert_bitmap_videoram_w)).share("bitmap_videoram"); map(0x4000, 0x5fff).ram().share("charram"); map(0x6000, 0xbfff).rom(); map(0xc000, 0xc000).mirror(0x0f8f).portr("C000").nopw(); map(0xc010, 0xc010).mirror(0x0f8f).portr("C010").nopw(); map(0xc020, 0xc020).mirror(0x0f8f).portr("C020").nopw(); - map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(this, FUNC(redalert_state::demoneye_audio_command_w)); + map(0xc030, 0xc030).mirror(0x0f8f).nopr().w(FUNC(redalert_state::demoneye_audio_command_w)); map(0xc040, 0xc040).mirror(0x0f8f).nopr().writeonly().share("video_control"); map(0xc050, 0xc050).mirror(0x0f8f).nopr().writeonly().share("bitmap_color"); map(0xc060, 0xc060).mirror(0x0f80).noprw(); /* unknown */ map(0xc061, 0xc061).mirror(0x0f80).noprw(); /* unknown */ map(0xc062, 0xc062).mirror(0x0f80).noprw(); /* unknown */ - map(0xc070, 0xc070).mirror(0x0f8f).rw(this, FUNC(redalert_state::redalert_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); /* probably not correct */ + map(0xc070, 0xc070).mirror(0x0f8f).rw(FUNC(redalert_state::redalert_interrupt_clear_r), FUNC(redalert_state::redalert_interrupt_clear_w)); /* probably not correct */ map(0xf000, 0xffff).rom().region("maincpu", 0x8000); } diff --git a/src/mame/drivers/redclash.cpp b/src/mame/drivers/redclash.cpp index f5a08f7c239..30d3b0881fb 100644 --- a/src/mame/drivers/redclash.cpp +++ b/src/mame/drivers/redclash.cpp @@ -46,19 +46,19 @@ void redclash_state::zerohour_map(address_map &map) map(0x0000, 0x2fff).rom(); map(0x3000, 0x37ff).ram(); map(0x3800, 0x3bff).ram().share("spriteram"); - map(0x4000, 0x43ff).ram().w(this, FUNC(redclash_state::redclash_videoram_w)).share("videoram"); + map(0x4000, 0x43ff).ram().w(FUNC(redclash_state::redclash_videoram_w)).share("videoram"); map(0x4800, 0x4800).portr("IN0"); /* IN0 */ map(0x4801, 0x4801).portr("IN1"); /* IN1 */ map(0x4802, 0x4802).portr("DSW1"); /* DSW0 */ map(0x4803, 0x4803).portr("DSW2"); /* DSW1 */ map(0x5000, 0x5007).nopw(); /* to sound board */ - map(0x5800, 0x5800).w(this, FUNC(redclash_state::redclash_star_w<0>)); + map(0x5800, 0x5800).w(FUNC(redclash_state::redclash_star_w<0>)); map(0x5801, 0x5804).nopw(); /* to sound board */ - map(0x5805, 0x5805).w(this, FUNC(redclash_state::redclash_star_w<1>)); - map(0x5806, 0x5806).w(this, FUNC(redclash_state::redclash_star_w<2>)); - map(0x5807, 0x5807).w(this, FUNC(redclash_state::redclash_flipscreen_w)); - map(0x7000, 0x7000).w(this, FUNC(redclash_state::redclash_star_reset_w)); - map(0x7800, 0x7800).w(this, FUNC(redclash_state::irqack_w)); + map(0x5805, 0x5805).w(FUNC(redclash_state::redclash_star_w<1>)); + map(0x5806, 0x5806).w(FUNC(redclash_state::redclash_star_w<2>)); + map(0x5807, 0x5807).w(FUNC(redclash_state::redclash_flipscreen_w)); + map(0x7000, 0x7000).w(FUNC(redclash_state::redclash_star_reset_w)); + map(0x7800, 0x7800).w(FUNC(redclash_state::irqack_w)); } void redclash_state::redclash_map(address_map &map) @@ -66,21 +66,21 @@ void redclash_state::redclash_map(address_map &map) map(0x0000, 0x2fff).rom(); // AM_RANGE(0x3000, 0x3000) AM_WRITENOP // AM_RANGE(0x3800, 0x3800) AM_WRITENOP - map(0x4000, 0x43ff).ram().w(this, FUNC(redclash_state::redclash_videoram_w)).share("videoram"); + map(0x4000, 0x43ff).ram().w(FUNC(redclash_state::redclash_videoram_w)).share("videoram"); map(0x4800, 0x4800).portr("IN0"); /* IN0 */ map(0x4801, 0x4801).portr("IN1"); /* IN1 */ map(0x4802, 0x4802).portr("DSW1"); /* DSW0 */ map(0x4803, 0x4803).portr("DSW2"); /* DSW1 */ map(0x5000, 0x5007).nopw(); /* to sound board */ - map(0x5800, 0x5800).w(this, FUNC(redclash_state::redclash_star_w<0>)); - map(0x5801, 0x5801).w(this, FUNC(redclash_state::redclash_gfxbank_w)); - map(0x5805, 0x5805).w(this, FUNC(redclash_state::redclash_star_w<1>)); - map(0x5806, 0x5806).w(this, FUNC(redclash_state::redclash_star_w<2>)); - map(0x5807, 0x5807).w(this, FUNC(redclash_state::redclash_flipscreen_w)); + map(0x5800, 0x5800).w(FUNC(redclash_state::redclash_star_w<0>)); + map(0x5801, 0x5801).w(FUNC(redclash_state::redclash_gfxbank_w)); + map(0x5805, 0x5805).w(FUNC(redclash_state::redclash_star_w<1>)); + map(0x5806, 0x5806).w(FUNC(redclash_state::redclash_star_w<2>)); + map(0x5807, 0x5807).w(FUNC(redclash_state::redclash_flipscreen_w)); map(0x6000, 0x67ff).ram(); map(0x6800, 0x6bff).ram().share("spriteram"); - map(0x7000, 0x7000).w(this, FUNC(redclash_state::redclash_star_reset_w)); - map(0x7800, 0x7800).w(this, FUNC(redclash_state::irqack_w)); + map(0x7000, 0x7000).w(FUNC(redclash_state::redclash_star_reset_w)); + map(0x7800, 0x7800).w(FUNC(redclash_state::irqack_w)); } /* diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp index f2399c26dc0..01b1cd7e67a 100644 --- a/src/mame/drivers/relief.cpp +++ b/src/mame/drivers/relief.cpp @@ -127,13 +127,13 @@ void relief_state::main_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x140000, 0x140003).w(m_ym2413, FUNC(ym2413_device::write)).umask16(0x00ff); map(0x140011, 0x140011).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x140020, 0x140021).w(this, FUNC(relief_state::audio_volume_w)); - map(0x140030, 0x140031).w(this, FUNC(relief_state::audio_control_w)); + map(0x140020, 0x140021).w(FUNC(relief_state::audio_volume_w)); + map(0x140030, 0x140031).w(FUNC(relief_state::audio_control_w)); map(0x180000, 0x180fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0xff00); map(0x1c0030, 0x1c0031).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x260000, 0x260001).portr("260000"); map(0x260002, 0x260003).portr("260002"); - map(0x260010, 0x260011).r(this, FUNC(relief_state::special_port2_r)); + map(0x260010, 0x260011).r(FUNC(relief_state::special_port2_r)); map(0x260012, 0x260013).portr("260012"); map(0x2a0000, 0x2a0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x3e0000, 0x3e0fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp index bd50cbece7d..30298882aa2 100644 --- a/src/mame/drivers/renegade.cpp +++ b/src/mame/drivers/renegade.cpp @@ -237,18 +237,18 @@ WRITE8_MEMBER(renegade_state::coincounter_w) void renegade_state::renegade_nomcu_map(address_map &map) { map(0x0000, 0x17ff).ram(); - map(0x1800, 0x1fff).ram().w(this, FUNC(renegade_state::fg_videoram_w)).share("fg_videoram"); + map(0x1800, 0x1fff).ram().w(FUNC(renegade_state::fg_videoram_w)).share("fg_videoram"); map(0x2000, 0x27ff).ram().share("spriteram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(renegade_state::bg_videoram_w)).share("bg_videoram"); + map(0x2800, 0x2fff).ram().w(FUNC(renegade_state::bg_videoram_w)).share("bg_videoram"); map(0x3000, 0x30ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x3100, 0x31ff).ram().w("palette", FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0x3800, 0x3800).portr("IN0").w(this, FUNC(renegade_state::scroll_lsb_w)); /* Player#1 controls, P1,P2 start */ - map(0x3801, 0x3801).portr("IN1").w(this, FUNC(renegade_state::scroll_msb_w)); /* Player#2 controls, coin triggers */ + map(0x3800, 0x3800).portr("IN0").w(FUNC(renegade_state::scroll_lsb_w)); /* Player#1 controls, P1,P2 start */ + map(0x3801, 0x3801).portr("IN1").w(FUNC(renegade_state::scroll_msb_w)); /* Player#2 controls, coin triggers */ map(0x3802, 0x3802).portr("DSW2").w(m_soundlatch, FUNC(generic_latch_8_device::write)); /* DIP2 various IO ports */ - map(0x3803, 0x3803).portr("DSW1").w(this, FUNC(renegade_state::flipscreen_w)); /* DIP1 */ - map(0x3805, 0x3805).nopr().w(this, FUNC(renegade_state::bankswitch_w)); + map(0x3803, 0x3803).portr("DSW1").w(FUNC(renegade_state::flipscreen_w)); /* DIP1 */ + map(0x3805, 0x3805).nopr().w(FUNC(renegade_state::bankswitch_w)); map(0x3806, 0x3806).nopw(); // ?? watchdog - map(0x3807, 0x3807).w(this, FUNC(renegade_state::coincounter_w)); + map(0x3807, 0x3807).w(FUNC(renegade_state::coincounter_w)); map(0x4000, 0x7fff).bankr("rombank"); map(0x8000, 0xffff).rom(); } @@ -257,17 +257,17 @@ void renegade_state::renegade_map(address_map &map) { renegade_nomcu_map(map); map(0x3804, 0x3804).rw(m_mcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w)); - map(0x3805, 0x3805).r(this, FUNC(renegade_state::mcu_reset_r)); + map(0x3805, 0x3805).r(FUNC(renegade_state::mcu_reset_r)); } void renegade_state::renegade_sound_map(address_map &map) { map(0x0000, 0x0fff).ram(); map(0x1000, 0x1000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x1800, 0x1800).w(this, FUNC(renegade_state::adpcm_start_w)); - map(0x2000, 0x2000).w(this, FUNC(renegade_state::adpcm_addr_w)); + map(0x1800, 0x1800).w(FUNC(renegade_state::adpcm_start_w)); + map(0x2000, 0x2000).w(FUNC(renegade_state::adpcm_addr_w)); map(0x2800, 0x2801).rw("ymsnd", FUNC(ym3526_device::read), FUNC(ym3526_device::write)); - map(0x3000, 0x3000).w(this, FUNC(renegade_state::adpcm_stop_w)); + map(0x3000, 0x3000).w(FUNC(renegade_state::adpcm_stop_w)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp index be2f868fb27..7f75a22be9f 100644 --- a/src/mame/drivers/replicator.cpp +++ b/src/mame/drivers/replicator.cpp @@ -544,7 +544,7 @@ void replicator_state::replicator_data_map(address_map &map) void replicator_state::replicator_io_map(address_map &map) { - map(AVR8_IO_PORTA, AVR8_IO_PORTL).rw(this, FUNC(replicator_state::port_r), FUNC(replicator_state::port_w)); + map(AVR8_IO_PORTA, AVR8_IO_PORTL).rw(FUNC(replicator_state::port_r), FUNC(replicator_state::port_w)); } /****************************************************\ diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index 49cd11d43f8..0259a6940b6 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -180,11 +180,11 @@ READ8_MEMBER(retofinv_state::mcu_status_r) void retofinv_state::bootleg_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x7fff, 0x7fff).w(this, FUNC(retofinv_state::coincounter_w)); - map(0x8000, 0x87ff).ram().w(this, FUNC(retofinv_state::fg_videoram_w)).share("fg_videoram"); + map(0x7fff, 0x7fff).w(FUNC(retofinv_state::coincounter_w)); + map(0x8000, 0x87ff).ram().w(FUNC(retofinv_state::fg_videoram_w)).share("fg_videoram"); map(0x8800, 0x9fff).ram().share("sharedram"); - map(0xa000, 0xa7ff).ram().w(this, FUNC(retofinv_state::bg_videoram_w)).share("bg_videoram"); - map(0xb800, 0xb802).w(this, FUNC(retofinv_state::gfx_ctrl_w)); + map(0xa000, 0xa7ff).ram().w(FUNC(retofinv_state::bg_videoram_w)).share("bg_videoram"); + map(0xb800, 0xb802).w(FUNC(retofinv_state::gfx_ctrl_w)); map(0xc000, 0xc000).portr("P1"); map(0xc001, 0xc001).portr("P2"); map(0xc002, 0xc002).nopr(); /* bit 7 must be 0, otherwise game resets */ @@ -194,14 +194,14 @@ void retofinv_state::bootleg_map(address_map &map) map(0xc007, 0xc007).portr("DSW3"); map(0xc800, 0xc807).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xd000, 0xd000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xd800, 0xd800).w(this, FUNC(retofinv_state::soundcommand_w)); - map(0xf800, 0xf800).r(this, FUNC(retofinv_state::cpu0_mf800_r)); + map(0xd800, 0xd800).w(FUNC(retofinv_state::soundcommand_w)); + map(0xf800, 0xf800).r(FUNC(retofinv_state::cpu0_mf800_r)); } void retofinv_state::main_map(address_map &map) { bootleg_map(map); - map(0xc003, 0xc003).r(this, FUNC(retofinv_state::mcu_status_r)); + map(0xc003, 0xc003).r(FUNC(retofinv_state::mcu_status_r)); map(0xe000, 0xe000).r(m_68705, FUNC(taito68705_mcu_device::data_r)); map(0xe800, 0xe800).w(m_68705, FUNC(taito68705_mcu_device::data_w)); } @@ -209,9 +209,9 @@ void retofinv_state::main_map(address_map &map) void retofinv_state::sub_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(this, FUNC(retofinv_state::fg_videoram_w)).share("fg_videoram"); + map(0x8000, 0x87ff).ram().w(FUNC(retofinv_state::fg_videoram_w)).share("fg_videoram"); map(0x8800, 0x9fff).ram().share("sharedram"); - map(0xa000, 0xa7ff).ram().w(this, FUNC(retofinv_state::bg_videoram_w)).share("bg_videoram"); + map(0xa000, 0xa7ff).ram().w(FUNC(retofinv_state::bg_videoram_w)).share("bg_videoram"); map(0xc800, 0xc807).w("mainlatch", FUNC(ls259_device::write_d0)); } @@ -220,9 +220,9 @@ void retofinv_state::sound_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x27ff).ram(); /* 6116 sram at IC28 */ map(0x4000, 0x4000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x6000, 0x6000).w(this, FUNC(retofinv_state::cpu2_m6000_w)); - map(0x8000, 0x8000).w("sn1", FUNC(sn76489a_device::write)); - map(0xa000, 0xa000).w("sn2", FUNC(sn76489a_device::write)); + map(0x6000, 0x6000).w(FUNC(retofinv_state::cpu2_m6000_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xa000, 0xa000).w("sn2", FUNC(sn76489a_device::command_w)); map(0xe000, 0xffff).rom(); /* space for diagnostic ROM */ } diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index 942db9925b5..392ca878746 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -385,7 +385,7 @@ void oz750_state::oz750_banked_map(address_map &map) { map(0x0000000, 0x01fffff).rw("flash0a", FUNC(intelfsh8_device::read), FUNC(intelfsh8_device::write)); map(0x0200000, 0x02fffff).mirror(0x100000).rw("flash1a", FUNC(intelfsh8_device::read), FUNC(intelfsh8_device::write)); - map(0x0600000, 0x07fffff).rw(this, FUNC(oz750_state::lcd_io_r), FUNC(oz750_state::lcd_io_w)); + map(0x0600000, 0x07fffff).rw(FUNC(oz750_state::lcd_io_r), FUNC(oz750_state::lcd_io_w)); map(0x0800000, 0x083ffff).mirror(0x1c0000).ram().share("nvram"); map(0x0a00000, 0x0a3ffff).mirror(0x1c0000).ram(); } @@ -404,27 +404,27 @@ void rex6000_state::rex6000_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x01, 0x04).rw(this, FUNC(rex6000_state::bankswitch_r), FUNC(rex6000_state::bankswitch_w)); - map(0x05, 0x07).rw(this, FUNC(rex6000_state::irq_r), FUNC(rex6000_state::irq_w)); + map(0x01, 0x04).rw(FUNC(rex6000_state::bankswitch_r), FUNC(rex6000_state::bankswitch_w)); + map(0x05, 0x07).rw(FUNC(rex6000_state::irq_r), FUNC(rex6000_state::irq_w)); map(0x10, 0x10).portr("INPUT"); - map(0x15, 0x19).rw(this, FUNC(rex6000_state::beep_r), FUNC(rex6000_state::beep_w)); - map(0x22, 0x23).rw(this, FUNC(rex6000_state::lcd_base_r), FUNC(rex6000_state::lcd_base_w)); + map(0x15, 0x19).rw(FUNC(rex6000_state::beep_r), FUNC(rex6000_state::beep_w)); + map(0x22, 0x23).rw(FUNC(rex6000_state::lcd_base_r), FUNC(rex6000_state::lcd_base_w)); map(0x30, 0x3f).rw(TC8521_TAG, FUNC(tc8521_device::read), FUNC(tc8521_device::write)); map(0x40, 0x47).mirror(0x08).rw(m_uart, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); - map(0x50, 0x51).rw(this, FUNC(rex6000_state::lcd_io_r), FUNC(rex6000_state::lcd_io_w)); - map(0x60, 0x6f).rw(this, FUNC(rex6000_state::touchscreen_r), FUNC(rex6000_state::touchscreen_w)); + map(0x50, 0x51).rw(FUNC(rex6000_state::lcd_io_r), FUNC(rex6000_state::lcd_io_w)); + map(0x60, 0x6f).rw(FUNC(rex6000_state::touchscreen_r), FUNC(rex6000_state::touchscreen_w)); } void oz750_state::oz750_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x01, 0x04).rw(this, FUNC(oz750_state::bankswitch_r), FUNC(oz750_state::bankswitch_w)); - map(0x05, 0x08).rw(this, FUNC(oz750_state::irq_r), FUNC(oz750_state::irq_w)); - map(0x10, 0x10).r(this, FUNC(oz750_state::kb_data_r)); - map(0x11, 0x12).rw(this, FUNC(oz750_state::kb_status_r), FUNC(oz750_state::kb_mask_w)); - map(0x15, 0x19).rw(this, FUNC(oz750_state::beep_r), FUNC(oz750_state::beep_w)); - map(0x22, 0x23).rw(this, FUNC(oz750_state::lcd_base_r), FUNC(oz750_state::lcd_base_w)); + map(0x01, 0x04).rw(FUNC(oz750_state::bankswitch_r), FUNC(oz750_state::bankswitch_w)); + map(0x05, 0x08).rw(FUNC(oz750_state::irq_r), FUNC(oz750_state::irq_w)); + map(0x10, 0x10).r(FUNC(oz750_state::kb_data_r)); + map(0x11, 0x12).rw(FUNC(oz750_state::kb_status_r), FUNC(oz750_state::kb_mask_w)); + map(0x15, 0x19).rw(FUNC(oz750_state::beep_r), FUNC(oz750_state::beep_w)); + map(0x22, 0x23).rw(FUNC(oz750_state::lcd_base_r), FUNC(oz750_state::lcd_base_w)); map(0x30, 0x3f).rw(TC8521_TAG, FUNC(tc8521_device::read), FUNC(tc8521_device::write)); map(0x40, 0x47).mirror(0x08).rw(m_uart, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)); } diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp index 8f3c3a0f6b9..71e978e8adb 100644 --- a/src/mame/drivers/risc2500.cpp +++ b/src/mame/drivers/risc2500.cpp @@ -45,7 +45,7 @@ public: protected: DECLARE_READ32_MEMBER(p1000_r); DECLARE_WRITE32_MEMBER(p1000_w); - DECLARE_READ32_MEMBER(disable_boot_rom); + DECLARE_READ32_MEMBER(disable_boot_rom_r); TIMER_CALLBACK_MEMBER(disable_boot_rom); virtual void machine_start() override; @@ -268,7 +268,7 @@ WRITE32_MEMBER(risc2500_state::p1000_w) m_p1000 = data; } -READ32_MEMBER(risc2500_state::disable_boot_rom) +READ32_MEMBER(risc2500_state::disable_boot_rom_r) { machine().scheduler().timer_set(m_maincpu->cycles_to_attotime(10), timer_expired_delegate(FUNC(risc2500_state::disable_boot_rom), this)); return 0; @@ -305,8 +305,8 @@ void risc2500_state::machine_reset() void risc2500_state::risc2500_mem(address_map &map) { map(0x00000000, 0x0001ffff).ram(); - map(0x01800000, 0x01800003).r(this, FUNC(risc2500_state::disable_boot_rom)); - map(0x01000000, 0x01000003).rw(this, FUNC(risc2500_state::p1000_r), FUNC(risc2500_state::p1000_w)); + map(0x01800000, 0x01800003).r(FUNC(risc2500_state::disable_boot_rom_r)); + map(0x01000000, 0x01000003).rw(FUNC(risc2500_state::p1000_r), FUNC(risc2500_state::p1000_w)); map(0x02000000, 0x0203ffff).rom().region("maincpu", 0); } diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp index dd2fd27974b..c692e579266 100644 --- a/src/mame/drivers/riscpc.cpp +++ b/src/mame/drivers/riscpc.cpp @@ -771,10 +771,10 @@ void riscpc_state::a7000_mem(address_map &map) // AM_RANGE(0x0302b000, 0x0302bfff) //Network podule // AM_RANGE(0x03040000, 0x0304ffff) //podule space 0,1,2,3 // AM_RANGE(0x03070000, 0x0307ffff) //podule space 4,5,6,7 - map(0x03200000, 0x032001ff).rw(this, FUNC(riscpc_state::a7000_iomd_r), FUNC(riscpc_state::a7000_iomd_w)); //IOMD Registers //mirrored at 0x03000000-0x1ff? + map(0x03200000, 0x032001ff).rw(FUNC(riscpc_state::a7000_iomd_r), FUNC(riscpc_state::a7000_iomd_w)); //IOMD Registers //mirrored at 0x03000000-0x1ff? // AM_RANGE(0x03310000, 0x03310003) //Mouse Buttons - map(0x03400000, 0x037fffff).w(this, FUNC(riscpc_state::a7000_vidc20_w)); + map(0x03400000, 0x037fffff).w(FUNC(riscpc_state::a7000_vidc20_w)); // AM_RANGE(0x08000000, 0x08ffffff) AM_MIRROR(0x07000000) //EASI space map(0x10000000, 0x13ffffff).ram(); //SIMM 0 bank 0 map(0x14000000, 0x17ffffff).ram(); //SIMM 0 bank 1 diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp index 5405befbe5a..f1da035c15a 100644 --- a/src/mame/drivers/rltennis.cpp +++ b/src/mame/drivers/rltennis.cpp @@ -96,15 +96,15 @@ void rltennis_state::rltennis_main(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x100000, 0x103fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x200000, 0x20ffff).ram(); - map(0x700000, 0x70000f).w(this, FUNC(rltennis_state::blitter_w)); + map(0x700000, 0x70000f).w(FUNC(rltennis_state::blitter_w)); map(0x720001, 0x720001).w("ramdac", FUNC(ramdac_device::index_w)); map(0x720003, 0x720003).rw("ramdac", FUNC(ramdac_device::pal_r), FUNC(ramdac_device::pal_w)); map(0x720007, 0x720007).w("ramdac", FUNC(ramdac_device::index_r_w)); - map(0x740000, 0x740001).w(this, FUNC(rltennis_state::snd1_w)); - map(0x760000, 0x760001).w(this, FUNC(rltennis_state::snd2_w)); + map(0x740000, 0x740001).w(FUNC(rltennis_state::snd1_w)); + map(0x760000, 0x760001).w(FUNC(rltennis_state::snd2_w)); map(0x780000, 0x780001).nopw(); /* sound control, unknown, usually = 0x0044 */ map(0x7a0000, 0x7a0003).nopr(); /* unknown, read only at boot time*/ - map(0x7e0000, 0x7e0001).r(this, FUNC(rltennis_state::io_r)); + map(0x7e0000, 0x7e0001).r(FUNC(rltennis_state::io_r)); map(0x7e0002, 0x7e0003).portr("P2"); } diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp index 8f0360661ce..2ce135497ee 100644 --- a/src/mame/drivers/rm380z.cpp +++ b/src/mame/drivers/rm380z.cpp @@ -174,20 +174,20 @@ Module timer tag static_vblank_timer name m_expire.seconds void rm380z_state::rm380z_mem(address_map &map) { map(0xe000, 0xefff).rom().region(RM380Z_MAINCPU_TAG, 0); - map(0xf000, 0xf5ff).rw(this, FUNC(rm380z_state::videoram_read), FUNC(rm380z_state::videoram_write)); + map(0xf000, 0xf5ff).rw(FUNC(rm380z_state::videoram_read), FUNC(rm380z_state::videoram_write)); map(0xf600, 0xf9ff).rom().region(RM380Z_MAINCPU_TAG, 0x1000); /* Extra ROM space for COS4.0 */ map(0xfa00, 0xfaff).ram(); - map(0xfb00, 0xfbff).rw(this, FUNC(rm380z_state::port_read), FUNC(rm380z_state::port_write)); - map(0xfc00, 0xffff).rw(this, FUNC(rm380z_state::hiram_read), FUNC(rm380z_state::hiram_write)); + map(0xfb00, 0xfbff).rw(FUNC(rm380z_state::port_read), FUNC(rm380z_state::port_write)); + map(0xfc00, 0xffff).rw(FUNC(rm380z_state::hiram_read), FUNC(rm380z_state::hiram_write)); } void rm380z_state::rm380z_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0xbf).rw(this, FUNC(rm380z_state::rm380z_portlow_r), FUNC(rm380z_state::rm380z_portlow_w)); + map(0x00, 0xbf).rw(FUNC(rm380z_state::rm380z_portlow_r), FUNC(rm380z_state::rm380z_portlow_w)); map(0xc0, 0xc3).rw(m_fdc, FUNC(fd1771_device::read), FUNC(fd1771_device::write)); - map(0xc4, 0xc4).w(this, FUNC(rm380z_state::disk_0_control)); - map(0xc5, 0xff).rw(this, FUNC(rm380z_state::rm380z_porthi_r), FUNC(rm380z_state::rm380z_porthi_w)); + map(0xc4, 0xc4).w(FUNC(rm380z_state::disk_0_control)); + map(0xc5, 0xff).rw(FUNC(rm380z_state::rm380z_porthi_r), FUNC(rm380z_state::rm380z_porthi_w)); } void rm380z_state::rm480z_mem(address_map &map) diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index f01e3ee78d1..f15d2d4cc17 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -255,8 +255,8 @@ void rmhaihai_state::rmhaihai_map(address_map &map) { map(0x0000, 0x9fff).rom(); map(0xa000, 0xa7ff).ram().share("nvram"); - map(0xa800, 0xafff).ram().w(this, FUNC(rmhaihai_state::colorram_w)).share("colorram"); - map(0xb000, 0xb7ff).ram().w(this, FUNC(rmhaihai_state::videoram_w)).share("videoram"); + map(0xa800, 0xafff).ram().w(FUNC(rmhaihai_state::colorram_w)).share("colorram"); + map(0xb000, 0xb7ff).ram().w(FUNC(rmhaihai_state::videoram_w)).share("videoram"); map(0xb83c, 0xb83c).nopw(); // ?? map(0xbc00, 0xbc00).nopw(); // ?? map(0xc000, 0xdfff).rom(); @@ -265,13 +265,13 @@ void rmhaihai_state::rmhaihai_map(address_map &map) void rmhaihai_state::rmhaihai_io_map(address_map &map) { - map(0x0000, 0x7fff).r(this, FUNC(rmhaihai_state::samples_r)); - map(0x8000, 0x8000).r(this, FUNC(rmhaihai_state::keyboard_r)).nopw(); // ?? - map(0x8001, 0x8001).nopr().w(this, FUNC(rmhaihai_state::keyboard_w)); // ?? + map(0x0000, 0x7fff).r(FUNC(rmhaihai_state::samples_r)); + map(0x8000, 0x8000).r(FUNC(rmhaihai_state::keyboard_r)).nopw(); // ?? + map(0x8001, 0x8001).nopr().w(FUNC(rmhaihai_state::keyboard_w)); // ?? map(0x8020, 0x8020).r("aysnd", FUNC(ay8910_device::data_r)); map(0x8020, 0x8021).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0x8040, 0x8040).w(this, FUNC(rmhaihai_state::adpcm_w)); - map(0x8060, 0x8060).w(this, FUNC(rmhaihai_state::ctrl_w)); + map(0x8040, 0x8040).w(FUNC(rmhaihai_state::adpcm_w)); + map(0x8060, 0x8060).w(FUNC(rmhaihai_state::ctrl_w)); map(0x8080, 0x8080).nopw(); // ?? map(0xbc04, 0xbc04).nopw(); // ?? map(0xbc0c, 0xbc0c).nopw(); // ?? @@ -282,23 +282,23 @@ void themj_state::themj_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); map(0xa000, 0xa7ff).ram(); - map(0xa800, 0xafff).ram().w(this, FUNC(themj_state::colorram_w)).share("colorram"); - map(0xb000, 0xb7ff).ram().w(this, FUNC(themj_state::videoram_w)).share("videoram"); + map(0xa800, 0xafff).ram().w(FUNC(themj_state::colorram_w)).share("colorram"); + map(0xb000, 0xb7ff).ram().w(FUNC(themj_state::videoram_w)).share("videoram"); map(0xc000, 0xdfff).bankr("bank2"); map(0xe000, 0xffff).rom(); } void themj_state::themj_io_map(address_map &map) { - map(0x0000, 0x7fff).r(this, FUNC(themj_state::samples_r)); - map(0x8000, 0x8000).r(this, FUNC(themj_state::keyboard_r)).nopw(); // ?? - map(0x8001, 0x8001).nopr().w(this, FUNC(themj_state::keyboard_w)); // ?? + map(0x0000, 0x7fff).r(FUNC(themj_state::samples_r)); + map(0x8000, 0x8000).r(FUNC(themj_state::keyboard_r)).nopw(); // ?? + map(0x8001, 0x8001).nopr().w(FUNC(themj_state::keyboard_w)); // ?? map(0x8020, 0x8020).r("aysnd", FUNC(ay8910_device::data_r)); map(0x8020, 0x8021).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0x8040, 0x8040).w(this, FUNC(themj_state::adpcm_w)); - map(0x8060, 0x8060).w(this, FUNC(themj_state::ctrl_w)); + map(0x8040, 0x8040).w(FUNC(themj_state::adpcm_w)); + map(0x8060, 0x8060).w(FUNC(themj_state::ctrl_w)); map(0x8080, 0x8080).nopw(); // ?? - map(0x80a0, 0x80a0).w(this, FUNC(themj_state::themj_rombank_w)); + map(0x80a0, 0x80a0).w(FUNC(themj_state::themj_rombank_w)); map(0xbc04, 0xbc04).nopw(); // ?? map(0xbc0c, 0xbc0c).nopw(); // ?? } diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp index 4053d278be5..6e4f5807a22 100644 --- a/src/mame/drivers/rmnimbus.cpp +++ b/src/mame/drivers/rmnimbus.cpp @@ -53,16 +53,16 @@ void rmnimbus_state::nimbus_mem(address_map &map) void rmnimbus_state::nimbus_io(address_map &map) { - map(0x0000, 0x0031).rw(this, FUNC(rmnimbus_state::nimbus_video_io_r), FUNC(rmnimbus_state::nimbus_video_io_w)); - map(0x0080, 0x0080).rw(this, FUNC(rmnimbus_state::nimbus_mcu_r), FUNC(rmnimbus_state::nimbus_mcu_w)); - map(0x0092, 0x0092).rw(this, FUNC(rmnimbus_state::nimbus_iou_r), FUNC(rmnimbus_state::nimbus_iou_w)); - map(0x00a4, 0x00a4).rw(this, FUNC(rmnimbus_state::nimbus_mouse_js_r), FUNC(rmnimbus_state::nimbus_mouse_js_w)); - map(0x00c0, 0x00cf).rw(this, FUNC(rmnimbus_state::nimbus_pc8031_r), FUNC(rmnimbus_state::nimbus_pc8031_w)).umask16(0x00ff); + map(0x0000, 0x0031).rw(FUNC(rmnimbus_state::nimbus_video_io_r), FUNC(rmnimbus_state::nimbus_video_io_w)); + map(0x0080, 0x0080).rw(FUNC(rmnimbus_state::nimbus_mcu_r), FUNC(rmnimbus_state::nimbus_mcu_w)); + map(0x0092, 0x0092).rw(FUNC(rmnimbus_state::nimbus_iou_r), FUNC(rmnimbus_state::nimbus_iou_w)); + map(0x00a4, 0x00a4).rw(FUNC(rmnimbus_state::nimbus_mouse_js_r), FUNC(rmnimbus_state::nimbus_mouse_js_w)); + map(0x00c0, 0x00cf).rw(FUNC(rmnimbus_state::nimbus_pc8031_r), FUNC(rmnimbus_state::nimbus_pc8031_w)).umask16(0x00ff); map(0x00e0, 0x00ef).rw(AY8910_TAG, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x00f0, 0x00f7).rw(m_z80sio, FUNC(z80sio2_device::cd_ba_r), FUNC(z80sio2_device::cd_ba_w)).umask16(0x00ff); - map(0x0400, 0x0400).w(this, FUNC(rmnimbus_state::fdc_ctl_w)); + map(0x0400, 0x0400).w(FUNC(rmnimbus_state::fdc_ctl_w)); map(0x0408, 0x040f).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)).umask16(0x00ff); - map(0x0410, 0x041f).rw(this, FUNC(rmnimbus_state::scsi_r), FUNC(rmnimbus_state::scsi_w)).umask16(0x00ff); + map(0x0410, 0x041f).rw(FUNC(rmnimbus_state::scsi_r), FUNC(rmnimbus_state::scsi_w)).umask16(0x00ff); map(0x0480, 0x049f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0x00ff); } @@ -102,7 +102,7 @@ void rmnimbus_state::nimbus_iocpu_mem(address_map &map) void rmnimbus_state::nimbus_iocpu_io(address_map &map) { map.unmap_value_high(); - map(0x00000, 0x000FF).rw(this, FUNC(rmnimbus_state::nimbus_pc8031_iou_r), FUNC(rmnimbus_state::nimbus_pc8031_iou_w)); + map(0x00000, 0x000FF).rw(FUNC(rmnimbus_state::nimbus_pc8031_iou_r), FUNC(rmnimbus_state::nimbus_pc8031_iou_w)); } MACHINE_CONFIG_START(rmnimbus_state::nimbus) @@ -183,7 +183,7 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus) MCFG_EEPROM_SERIAL_93C06_ADD(ER59256_TAG) MCFG_DEVICE_ADD(VIA_TAG, VIA6522, 1000000) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, rmnimbus_state,nimbus_via_write_portb)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(MAINCPU_TAG, i80186_cpu_device, int3_w)) diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp index a4ae5f237f4..8965a538622 100644 --- a/src/mame/drivers/rmt32.cpp +++ b/src/mame/drivers/rmt32.cpp @@ -334,12 +334,12 @@ PALETTE_INIT_MEMBER(mt32_state, mt32) void mt32_state::mt32_map(address_map &map) { - map(0x0100, 0x0100).w(this, FUNC(mt32_state::bank_w)); - map(0x0200, 0x0200).w(this, FUNC(mt32_state::so_w)); + map(0x0100, 0x0100).w(FUNC(mt32_state::bank_w)); + map(0x0200, 0x0200).w(FUNC(mt32_state::so_w)); map(0x021a, 0x021a).portr("SC0"); map(0x021c, 0x021c).portr("SC1"); - map(0x0300, 0x0300).w(this, FUNC(mt32_state::lcd_data_w)); - map(0x0380, 0x0380).rw(this, FUNC(mt32_state::lcd_ctrl_r), FUNC(mt32_state::lcd_ctrl_w)); + map(0x0300, 0x0300).w(FUNC(mt32_state::lcd_data_w)); + map(0x0380, 0x0380).rw(FUNC(mt32_state::lcd_ctrl_r), FUNC(mt32_state::lcd_ctrl_w)); map(0x1000, 0x7fff).rom().region("maincpu", 0x1000); map(0x8000, 0xbfff).bankrw("bank"); map(0xc000, 0xffff).bankrw("fixed"); @@ -348,8 +348,8 @@ void mt32_state::mt32_map(address_map &map) void mt32_state::mt32_io(address_map &map) { map(i8x9x_device::A7, i8x9x_device::A7).portr("A7"); - map(i8x9x_device::SERIAL, i8x9x_device::SERIAL).w(this, FUNC(mt32_state::midi_w)); - map(i8x9x_device::P0, i8x9x_device::P0).r(this, FUNC(mt32_state::port0_r)); + map(i8x9x_device::SERIAL, i8x9x_device::SERIAL).w(FUNC(mt32_state::midi_w)); + map(i8x9x_device::P0, i8x9x_device::P0).r(FUNC(mt32_state::port0_r)); } MACHINE_CONFIG_START(mt32_state::mt32) diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index 1d1f896bb80..366bf17e94a 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -109,10 +109,10 @@ void rockrage_state::rockrage_map(address_map &map) map(0x2e02, 0x2e02).portr("P2"); map(0x2e03, 0x2e03).portr("DSW2"); map(0x2e40, 0x2e40).portr("DSW1"); - map(0x2e80, 0x2e80).w(this, FUNC(rockrage_state::rockrage_sh_irqtrigger_w)); /* cause interrupt on audio CPU */ + map(0x2e80, 0x2e80).w(FUNC(rockrage_state::rockrage_sh_irqtrigger_w)); /* cause interrupt on audio CPU */ map(0x2ec0, 0x2ec0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x2f00, 0x2f00).w(this, FUNC(rockrage_state::rockrage_vreg_w)); /* ??? */ - map(0x2f40, 0x2f40).w(this, FUNC(rockrage_state::rockrage_bankswitch_w)); /* bankswitch control */ + map(0x2f00, 0x2f00).w(FUNC(rockrage_state::rockrage_vreg_w)); /* ??? */ + map(0x2f40, 0x2f40).w(FUNC(rockrage_state::rockrage_bankswitch_w)); /* bankswitch control */ map(0x4000, 0x5fff).ram(); /* RAM */ map(0x6000, 0x7fff).bankr("rombank"); /* banked ROM */ map(0x8000, 0xffff).rom(); /* ROM */ @@ -121,8 +121,8 @@ void rockrage_state::rockrage_map(address_map &map) void rockrage_state::rockrage_sound_map(address_map &map) { map(0x2000, 0x2000).w(m_vlm, FUNC(vlm5030_device::data_w)); /* VLM5030 */ - map(0x3000, 0x3000).r(this, FUNC(rockrage_state::rockrage_VLM5030_busy_r)); /* VLM5030 */ - map(0x4000, 0x4000).w(this, FUNC(rockrage_state::rockrage_speech_w)); /* VLM5030 */ + map(0x3000, 0x3000).r(FUNC(rockrage_state::rockrage_VLM5030_busy_r)); /* VLM5030 */ + map(0x4000, 0x4000).w(FUNC(rockrage_state::rockrage_speech_w)); /* VLM5030 */ map(0x5000, 0x5000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x6000, 0x6001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); /* YM 2151 */ map(0x7000, 0x77ff).ram(); /* RAM */ diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp index f530306f958..013c481d78a 100644 --- a/src/mame/drivers/rocnrope.cpp +++ b/src/mame/drivers/rocnrope.cpp @@ -71,13 +71,13 @@ void rocnrope_state::rocnrope_map(address_map &map) map(0x4000, 0x47ff).ram(); map(0x4000, 0x402f).ram().share("spriteram2"); map(0x4400, 0x442f).ram().share("spriteram"); - map(0x4800, 0x4bff).ram().w(this, FUNC(rocnrope_state::rocnrope_colorram_w)).share("colorram"); - map(0x4c00, 0x4fff).ram().w(this, FUNC(rocnrope_state::rocnrope_videoram_w)).share("videoram"); + map(0x4800, 0x4bff).ram().w(FUNC(rocnrope_state::rocnrope_colorram_w)).share("colorram"); + map(0x4c00, 0x4fff).ram().w(FUNC(rocnrope_state::rocnrope_videoram_w)).share("videoram"); map(0x5000, 0x5fff).ram(); map(0x8000, 0x8000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x8080, 0x8087).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x8100, 0x8100).w("timeplt_audio", FUNC(timeplt_audio_device::sound_data_w)); - map(0x8182, 0x818d).w(this, FUNC(rocnrope_state::rocnrope_interrupt_vector_w)); + map(0x8182, 0x818d).w(FUNC(rocnrope_state::rocnrope_interrupt_vector_w)); map(0x6000, 0xffff).rom(); } diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp index 840e11ecc85..87704621b15 100644 --- a/src/mame/drivers/rohga.cpp +++ b/src/mame/drivers/rohga.cpp @@ -166,16 +166,16 @@ void rohga_state::rohga_map(address_map &map) map(0x200000, 0x20000f).w("tilegen1", FUNC(deco16ic_device::pf_control_w)); map(0x240000, 0x24000f).w("tilegen2", FUNC(deco16ic_device::pf_control_w)); - map(0x280000, 0x283fff).rw(this, FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ + map(0x280000, 0x283fff).rw(FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ map(0x2c0000, 0x2c0001).portr("DSW3"); - map(0x300000, 0x300001).w(this, FUNC(rohga_state::rohga_buffer_spriteram16_w)); /* write 1 for sprite dma */ + map(0x300000, 0x300001).w(FUNC(rohga_state::rohga_buffer_spriteram16_w)); /* write 1 for sprite dma */ map(0x310000, 0x310009).nopw(); /* Palette control? */ map(0x31000a, 0x31000b).w(m_decocomn, FUNC(decocomn_device::palette_dma_w)); /* Write 1111 for dma? (Or any value?) */ map(0x320000, 0x320001).nopw(); /* ? */ map(0x322000, 0x322001).w(m_decocomn, FUNC(decocomn_device::priority_w)); - map(0x321100, 0x321101).r(this, FUNC(rohga_state::rohga_irq_ack_r)); /* Irq ack? Value not used */ + map(0x321100, 0x321101).r(FUNC(rohga_state::rohga_irq_ack_r)); /* Irq ack? Value not used */ map(0x3c0000, 0x3c1fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x3c2000, 0x3c2fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); @@ -211,7 +211,7 @@ void rohga_state::wizdfire_map(address_map &map) map(0x320000, 0x320001).w(m_decocomn, FUNC(decocomn_device::priority_w)); /* Priority */ map(0x320002, 0x320003).nopw(); /* ? */ - map(0x320004, 0x320005).w(this, FUNC(rohga_state::wizdfire_irq_ack_w)); /* VBL IRQ ack */ + map(0x320004, 0x320005).w(FUNC(rohga_state::wizdfire_irq_ack_w)); /* VBL IRQ ack */ map(0x340000, 0x3407ff).ram().share("spriteram1"); map(0x350000, 0x350001).w("spriteram1", FUNC(buffered_spriteram16_device::write)); /* Triggers DMA for spriteram */ @@ -222,7 +222,7 @@ void rohga_state::wizdfire_map(address_map &map) map(0x390008, 0x390009).w(m_decocomn, FUNC(decocomn_device::palette_dma_w)); map(0xfdc000, 0xffffff).ram(); - map(0xfe4000, 0xfe7fff).rw(this, FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ + map(0xfe4000, 0xfe7fff).rw(FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ } @@ -245,7 +245,7 @@ void rohga_state::nitrobal_map(address_map &map) map(0x320000, 0x320001).portr("DSW3").w(m_decocomn, FUNC(decocomn_device::priority_w)); /* Priority */ map(0x320002, 0x320003).nopw(); /* ? */ - map(0x320004, 0x320005).w(this, FUNC(rohga_state::wizdfire_irq_ack_w)); /* VBL IRQ ack */ + map(0x320004, 0x320005).w(FUNC(rohga_state::wizdfire_irq_ack_w)); /* VBL IRQ ack */ map(0x340000, 0x3407ff).ram().share("spriteram1"); map(0x350000, 0x350001).w("spriteram1", FUNC(buffered_spriteram16_device::write)); /* Triggers DMA for spriteram */ @@ -256,7 +256,7 @@ void rohga_state::nitrobal_map(address_map &map) map(0x390008, 0x390009).w(m_decocomn, FUNC(decocomn_device::palette_dma_w)); map(0xfec000, 0xff3fff).ram(); - map(0xff4000, 0xff7fff).rw(this, FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ + map(0xff4000, 0xff7fff).rw(FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ map(0xff8000, 0xffffff).ram(); } @@ -267,16 +267,16 @@ void rohga_state::hotb_base_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x20000f).w("tilegen1", FUNC(deco16ic_device::pf_control_w)); map(0x240000, 0x24000f).w("tilegen2", FUNC(deco16ic_device::pf_control_w)); - map(0x280000, 0x283fff).rw(this, FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ + map(0x280000, 0x283fff).rw(FUNC(rohga_state::ioprot_r), FUNC(rohga_state::ioprot_w)).share("prot16ram"); /* Protection device */ map(0x2c0000, 0x2c0001).portr("DSW3"); - map(0x300000, 0x300001).portr("DSW3").w(this, FUNC(rohga_state::rohga_buffer_spriteram16_w)); /* write 1 for sprite dma */ + map(0x300000, 0x300001).portr("DSW3").w(FUNC(rohga_state::rohga_buffer_spriteram16_w)); /* write 1 for sprite dma */ map(0x310002, 0x310003).portr("SYSTEM"); map(0x310000, 0x310009).nopw(); /* Palette control? */ map(0x31000a, 0x31000b).w(m_decocomn, FUNC(decocomn_device::palette_dma_w)); /* Write 1111 for dma? (Or any value?) */ map(0x320000, 0x320001).nopw(); /* bit 4: cleared on irq routine start, set on end */ map(0x322000, 0x322001).w(m_decocomn, FUNC(decocomn_device::priority_w)); - map(0x321100, 0x321101).w(this, FUNC(rohga_state::wizdfire_irq_ack_w)); /* Irq ack? Value not used */ + map(0x321100, 0x321101).w(FUNC(rohga_state::wizdfire_irq_ack_w)); /* Irq ack? Value not used */ map(0x3c0000, 0x3c1fff).rw("tilegen1", FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x3c2000, 0x3c2fff).rw("tilegen1", FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp index 57909b2cd6e..c30d7b86d0a 100644 --- a/src/mame/drivers/rollerg.cpp +++ b/src/mame/drivers/rollerg.cpp @@ -79,20 +79,20 @@ READ8_MEMBER(rollerg_state::pip_r) void rollerg_state::rollerg_map(address_map &map) { - map(0x0010, 0x0010).w(this, FUNC(rollerg_state::rollerg_0010_w)); + map(0x0010, 0x0010).w(FUNC(rollerg_state::rollerg_0010_w)); map(0x0020, 0x0020).rw("watchdog", FUNC(watchdog_timer_device::reset_r), FUNC(watchdog_timer_device::reset_w)); map(0x0030, 0x0031).rw("k053260", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)); - map(0x0040, 0x0040).w(this, FUNC(rollerg_state::soundirq_w)); + map(0x0040, 0x0040).w(FUNC(rollerg_state::soundirq_w)); map(0x0050, 0x0050).portr("P1"); map(0x0051, 0x0051).portr("P2"); map(0x0052, 0x0052).portr("DSW3"); map(0x0053, 0x0053).portr("DSW1"); map(0x0060, 0x0060).portr("DSW2"); - map(0x0061, 0x0061).r(this, FUNC(rollerg_state::pip_r)); /* ????? */ + map(0x0061, 0x0061).r(FUNC(rollerg_state::pip_r)); /* ????? */ map(0x0100, 0x010f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)); /* 053252? */ map(0x0200, 0x020f).w(m_k051316, FUNC(k051316_device::ctrl_w)); map(0x0300, 0x030f).rw(m_k053244, FUNC(k05324x_device::k053244_r), FUNC(k05324x_device::k053244_w)); - map(0x0800, 0x0fff).r(this, FUNC(rollerg_state::rollerg_k051316_r)).w(m_k051316, FUNC(k051316_device::write)); + map(0x0800, 0x0fff).r(FUNC(rollerg_state::rollerg_k051316_r)).w(m_k051316, FUNC(k051316_device::write)); map(0x1000, 0x17ff).rw(m_k053244, FUNC(k05324x_device::k053245_r), FUNC(k05324x_device::k053245_w)); map(0x1800, 0x1fff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0x2000, 0x3aff).ram(); @@ -106,7 +106,7 @@ void rollerg_state::rollerg_sound_map(address_map &map) map(0x8000, 0x87ff).ram(); map(0xa000, 0xa02f).rw("k053260", FUNC(k053260_device::read), FUNC(k053260_device::write)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); - map(0xfc00, 0xfc00).w(this, FUNC(rollerg_state::sound_arm_nmi_w)); + map(0xfc00, 0xfc00).w(FUNC(rollerg_state::sound_arm_nmi_w)); } /*************************************************************************** diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp index b3ff2a08c69..cfc0f877eba 100644 --- a/src/mame/drivers/rollext.cpp +++ b/src/mame/drivers/rollext.cpp @@ -515,8 +515,8 @@ void rollext_state::memmap(address_map &map) map(0x60000000, 0x600fffff).ram().share("disp_ram"); map(0x80000000, 0x8000ffff).ram().share("palette_ram"); map(0x90000000, 0x9007ffff).ram().share("texture_mask"); - map(0xa0000000, 0xa00000ff).rw(this, FUNC(rollext_state::a0000000_r), FUNC(rollext_state::a0000000_w)); - map(0xb0000000, 0xb0000007).r(this, FUNC(rollext_state::b0000000_r)); + map(0xa0000000, 0xa00000ff).rw(FUNC(rollext_state::a0000000_r), FUNC(rollext_state::a0000000_w)); + map(0xb0000000, 0xb0000007).r(FUNC(rollext_state::b0000000_r)); map(0xc0000000, 0xc03fffff).rom().region("rom1", 0); map(0xff000000, 0xffffffff).ram().region("rom0", 0); } diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp index e95c9b896b3..0d405a30e85 100644 --- a/src/mame/drivers/rollrace.cpp +++ b/src/mame/drivers/rollrace.cpp @@ -72,17 +72,17 @@ void rollrace_state::rollrace_map(address_map &map) map(0x8000, 0x9fff).rom(); /* only rollace2 */ map(0xc000, 0xcfff).ram(); map(0xd806, 0xd806).nopr(); /* looks like a watchdog, bit4 checked*/ - map(0xd900, 0xd900).rw(this, FUNC(rollrace_state::fake_d800_r), FUNC(rollrace_state::fake_d800_w)); /* protection ??*/ - map(0xe000, 0xe3ff).ram().w(this, FUNC(rollrace_state::vram_w)).share("videoram"); - map(0xe400, 0xe47f).ram().w(this, FUNC(rollrace_state::cram_w)).share("colorram"); + map(0xd900, 0xd900).rw(FUNC(rollrace_state::fake_d800_r), FUNC(rollrace_state::fake_d800_w)); /* protection ??*/ + map(0xe000, 0xe3ff).ram().w(FUNC(rollrace_state::vram_w)).share("videoram"); + map(0xe400, 0xe47f).ram().w(FUNC(rollrace_state::cram_w)).share("colorram"); map(0xe800, 0xe800).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xec00, 0xec0f).noprw(); /* Analog sound effects ?? ec00 sound enable ?*/ map(0xf000, 0xf0ff).ram().share("spriteram"); - map(0xf400, 0xf400).w(this, FUNC(rollrace_state::backgroundcolor_w)); + map(0xf400, 0xf400).w(FUNC(rollrace_state::backgroundcolor_w)); map(0xf800, 0xf800).portr("P1"); - map(0xf801, 0xf801).portr("P2").w(this, FUNC(rollrace_state::bkgpen_w)); - map(0xf802, 0xf802).portr("SYSTEM").w(this, FUNC(rollrace_state::backgroundpage_w)); - map(0xf803, 0xf803).w(this, FUNC(rollrace_state::flipy_w)); + map(0xf801, 0xf801).portr("P2").w(FUNC(rollrace_state::bkgpen_w)); + map(0xf802, 0xf802).portr("SYSTEM").w(FUNC(rollrace_state::backgroundpage_w)); + map(0xf803, 0xf803).w(FUNC(rollrace_state::flipy_w)); map(0xf804, 0xf804).portr("DSW1"); map(0xf805, 0xf805).portr("DSW2"); map(0xfc00, 0xfc07).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -93,7 +93,7 @@ void rollrace_state::rollrace_sound_map(address_map &map) { map(0x0000, 0x0fff).rom(); map(0x2000, 0x2fff).ram(); - map(0x3000, 0x3000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(this, FUNC(rollrace_state::sound_nmi_mask_w)); + map(0x3000, 0x3000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(FUNC(rollrace_state::sound_nmi_mask_w)); map(0x4000, 0x4001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x5000, 0x5001).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x6000, 0x6001).w("ay3", FUNC(ay8910_device::address_data_w)); diff --git a/src/mame/drivers/ron.cpp b/src/mame/drivers/ron.cpp index c075f087833..c5551d03ea2 100644 --- a/src/mame/drivers/ron.cpp +++ b/src/mame/drivers/ron.cpp @@ -210,11 +210,11 @@ void ron_state::ron_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x00, 0x01).r(this, FUNC(ron_state::p1_mux_r)); - map(0x02, 0x03).r(this, FUNC(ron_state::p2_mux_r)); - map(0x03, 0x03).w(this, FUNC(ron_state::mux_w)); - map(0x07, 0x07).w(this, FUNC(ron_state::sound_cmd_w)); - map(0x0a, 0x0a).w(this, FUNC(ron_state::output_w)); + map(0x00, 0x01).r(FUNC(ron_state::p1_mux_r)); + map(0x02, 0x03).r(FUNC(ron_state::p2_mux_r)); + map(0x03, 0x03).w(FUNC(ron_state::mux_w)); + map(0x07, 0x07).w(FUNC(ron_state::sound_cmd_w)); + map(0x0a, 0x0a).w(FUNC(ron_state::output_w)); } void ron_state::ron_audio_map(address_map &map) diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp index 77727c759ea..bea9a00df82 100644 --- a/src/mame/drivers/rotaryf.cpp +++ b/src/mame/drivers/rotaryf.cpp @@ -211,7 +211,7 @@ void rotaryf_state::rotaryf_io_map(address_map &map) map(0x21, 0x21).portr("COIN").nopw(); map(0x26, 0x26).portr("DSW"); map(0x28, 0x2b).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x30, 0x30).w(this, FUNC(rotaryf_state::port30_w)); + map(0x30, 0x30).w(FUNC(rotaryf_state::port30_w)); } diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp index 2ec1caf4bd8..ee5a0b64c85 100644 --- a/src/mame/drivers/roul.cpp +++ b/src/mame/drivers/roul.cpp @@ -220,13 +220,13 @@ void roul_state::roul_map(address_map &map) void roul_state::roul_cpu_io_map(address_map &map) { map.global_mask(0xff); - map(0xf0, 0xf4).w(this, FUNC(roul_state::blitter_cmd_w)); - map(0xf5, 0xf5).r(this, FUNC(roul_state::blitter_status_r)); + map(0xf0, 0xf4).w(FUNC(roul_state::blitter_cmd_w)); + map(0xf5, 0xf5).r(FUNC(roul_state::blitter_status_r)); map(0xf8, 0xf8).portr("DSW"); - map(0xf9, 0xf9).w(this, FUNC(roul_state::ball_w)); + map(0xf9, 0xf9).w(FUNC(roul_state::ball_w)); map(0xfa, 0xfa).portr("IN0"); map(0xfd, 0xfd).portr("IN1"); - map(0xfe, 0xfe).w(this, FUNC(roul_state::sound_latch_w)); + map(0xfe, 0xfe).w(FUNC(roul_state::sound_latch_w)); } void roul_state::sound_map(address_map &map) diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp index 585681451d6..4ce75a8b8ce 100644 --- a/src/mame/drivers/route16.cpp +++ b/src/mame/drivers/route16.cpp @@ -220,10 +220,10 @@ WRITE8_MEMBER(route16_state::speakres_out2_w) void route16_state::route16_cpu1_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x3000, 0x3001).r(this, FUNC(route16_state::route16_prot_read)); - map(0x4000, 0x43ff).ram().w(this, FUNC(route16_state::route16_sharedram_w)).share("sharedram"); - map(0x4800, 0x4800).portr("DSW").w(this, FUNC(route16_state::out0_w)); - map(0x5000, 0x5000).portr("P1").w(this, FUNC(route16_state::out1_w)); + map(0x3000, 0x3001).r(FUNC(route16_state::route16_prot_read)); + map(0x4000, 0x43ff).ram().w(FUNC(route16_state::route16_sharedram_w)).share("sharedram"); + map(0x4800, 0x4800).portr("DSW").w(FUNC(route16_state::out0_w)); + map(0x5000, 0x5000).portr("P1").w(FUNC(route16_state::out1_w)); map(0x5800, 0x5800).portr("P2"); map(0x8000, 0xbfff).ram().share("videoram1"); } @@ -232,11 +232,11 @@ void route16_state::route16_cpu1_map(address_map &map) void route16_state::routex_cpu1_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).ram().w(this, FUNC(route16_state::route16_sharedram_w)).share("sharedram"); - map(0x4800, 0x4800).portr("DSW").w(this, FUNC(route16_state::out0_w)); - map(0x5000, 0x5000).portr("P1").w(this, FUNC(route16_state::out1_w)); + map(0x4000, 0x43ff).ram().w(FUNC(route16_state::route16_sharedram_w)).share("sharedram"); + map(0x4800, 0x4800).portr("DSW").w(FUNC(route16_state::out0_w)); + map(0x5000, 0x5000).portr("P1").w(FUNC(route16_state::out1_w)); map(0x5800, 0x5800).portr("P2"); - map(0x6400, 0x6400).r(this, FUNC(route16_state::routex_prot_read)); + map(0x6400, 0x6400).r(FUNC(route16_state::routex_prot_read)); map(0x8000, 0xbfff).ram().share("videoram1"); } @@ -245,8 +245,8 @@ void route16_state::stratvox_cpu1_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram().share("sharedram"); - map(0x4800, 0x4800).portr("DSW").w(this, FUNC(route16_state::out0_w)); - map(0x5000, 0x5000).portr("P1").w(this, FUNC(route16_state::out1_w)); + map(0x4800, 0x4800).portr("DSW").w(FUNC(route16_state::out0_w)); + map(0x5000, 0x5000).portr("P1").w(FUNC(route16_state::out1_w)); map(0x5800, 0x5800).portr("P2"); map(0x8000, 0xbfff).ram().share("videoram1"); } @@ -256,10 +256,10 @@ void route16_state::speakres_cpu1_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram().share("sharedram"); - map(0x4800, 0x4800).portr("DSW").w(this, FUNC(route16_state::out0_w)); - map(0x5000, 0x5000).portr("P1").w(this, FUNC(route16_state::out1_w)); - map(0x5800, 0x5800).portr("P2").w(this, FUNC(route16_state::speakres_out2_w)); - map(0x6000, 0x6000).r(this, FUNC(route16_state::speakres_in3_r)); + map(0x4800, 0x4800).portr("DSW").w(FUNC(route16_state::out0_w)); + map(0x5000, 0x5000).portr("P1").w(FUNC(route16_state::out1_w)); + map(0x5800, 0x5800).portr("P2").w(FUNC(route16_state::speakres_out2_w)); + map(0x6000, 0x6000).r(FUNC(route16_state::speakres_in3_r)); map(0x8000, 0xbfff).ram().share("videoram1"); } @@ -268,9 +268,9 @@ void route16_state::ttmahjng_cpu1_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram().share("sharedram"); - map(0x4800, 0x4800).portr("DSW").w(this, FUNC(route16_state::out0_w)); - map(0x5000, 0x5000).r(this, FUNC(route16_state::ttmahjng_p2_matrix_r)).w(this, FUNC(route16_state::out1_w)); - map(0x5800, 0x5800).rw(this, FUNC(route16_state::ttmahjng_p1_matrix_r), FUNC(route16_state::ttmahjng_input_port_matrix_w)); + map(0x4800, 0x4800).portr("DSW").w(FUNC(route16_state::out0_w)); + map(0x5000, 0x5000).r(FUNC(route16_state::ttmahjng_p2_matrix_r)).w(FUNC(route16_state::out1_w)); + map(0x5800, 0x5800).rw(FUNC(route16_state::ttmahjng_p1_matrix_r), FUNC(route16_state::ttmahjng_input_port_matrix_w)); map(0x6800, 0x6800).w("ay8910", FUNC(ay8910_device::data_w)); map(0x6900, 0x6900).w("ay8910", FUNC(ay8910_device::address_w)); map(0x8000, 0xbfff).ram().share("videoram1"); @@ -280,7 +280,7 @@ void route16_state::ttmahjng_cpu1_map(address_map &map) void route16_state::route16_cpu2_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x4000, 0x43ff).ram().w(this, FUNC(route16_state::route16_sharedram_w)).share("sharedram"); + map(0x4000, 0x43ff).ram().w(FUNC(route16_state::route16_sharedram_w)).share("sharedram"); map(0x8000, 0xbfff).ram().share("videoram2"); } @@ -288,7 +288,7 @@ void route16_state::route16_cpu2_map(address_map &map) void route16_state::stratvox_cpu2_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2800, 0x2800).w("dac", FUNC(dac_byte_interface::write)); + map(0x2800, 0x2800).w("dac", FUNC(dac_byte_interface::data_w)); map(0x4000, 0x43ff).ram().share("sharedram"); map(0x8000, 0xbfff).ram().share("videoram2"); } diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp index 74188c8f5a8..462810750a8 100644 --- a/src/mame/drivers/rowamet.cpp +++ b/src/mame/drivers/rowamet.cpp @@ -84,7 +84,7 @@ void rowamet_state::rowamet_map(address_map &map) map(0x2808, 0x2808).portr("X8"); map(0x4000, 0x407f).ram(); map(0x4080, 0x408f).ram().share("ram"); - map(0x4090, 0x409f).rw(this, FUNC(rowamet_state::io_r), FUNC(rowamet_state::io_w)); + map(0x4090, 0x409f).rw(FUNC(rowamet_state::io_r), FUNC(rowamet_state::io_w)); map(0x40a0, 0x40ff).ram(); } @@ -97,8 +97,8 @@ void rowamet_state::rowamet_sub_map(address_map &map) void rowamet_state::rowamet_sub_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(rowamet_state::sound_r), FUNC(rowamet_state::mute_w)); - map(0x01, 0x01).w("dac", FUNC(dac_byte_interface::write)); + map(0x00, 0x00).rw(FUNC(rowamet_state::sound_r), FUNC(rowamet_state::mute_w)); + map(0x01, 0x01).w("dac", FUNC(dac_byte_interface::data_w)); } static INPUT_PORTS_START( rowamet ) diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp index a12fe9a3301..2bb981c2a35 100644 --- a/src/mame/drivers/royalmah.cpp +++ b/src/mame/drivers/royalmah.cpp @@ -621,7 +621,7 @@ void royalmah_state::mjapinky_map(address_map &map) map(0x7800, 0x7fff).ram(); map(0x8000, 0xffff).bankr("mainbank"); map(0x8000, 0xffff).writeonly().share("videoram"); - map(0x8000, 0x8000).r(this, FUNC(royalmah_state::mjapinky_dsw_r)); + map(0x8000, 0x8000).r(FUNC(royalmah_state::mjapinky_dsw_r)); } void royalmah_state::tahjong_map(address_map &map) @@ -640,8 +640,8 @@ void royalmah_state::royalmah_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); } void royalmah_state::ippatsu_iomap(address_map &map) @@ -649,8 +649,8 @@ void royalmah_state::ippatsu_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); map(0x12, 0x12).portr("DSW2"); map(0x13, 0x13).portr("DSW3"); } @@ -672,8 +672,8 @@ void royalmah_state::seljan_iomap(address_map &map) { map(0x0001, 0x0001).mirror(0x7f00).r(m_ay, FUNC(ay8910_device::data_r)); map(0x0002, 0x0003).mirror(0x7f00).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x0010, 0x0010).mirror(0x7f00).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x0011, 0x0011).mirror(0x7f00).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x0010, 0x0010).mirror(0x7f00).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x0011, 0x0011).mirror(0x7f00).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); map(0x0012, 0x0012).mirror(0x7f00).portr("DSW2").w("crtc", FUNC(mc6845_device::address_w)); map(0x0013, 0x0013).mirror(0x7f00).portr("DSW3").w("crtc", FUNC(mc6845_device::register_w)); @@ -686,9 +686,9 @@ void royalmah_state::tahjong_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x12, 0x12).w(this, FUNC(royalmah_state::tahjong_bank_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0x12, 0x12).w(FUNC(royalmah_state::tahjong_bank_w)); map(0x13, 0x13).portr("DSW2"); } @@ -697,10 +697,10 @@ void royalmah_state::suzume_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x80, 0x80).r(this, FUNC(royalmah_state::suzume_dsw_r)); - map(0x81, 0x81).w(this, FUNC(royalmah_state::suzume_bank_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0x80, 0x80).r(FUNC(royalmah_state::suzume_dsw_r)); + map(0x81, 0x81).w(FUNC(royalmah_state::suzume_bank_w)); } void royalmah_state::mjyarou_iomap(address_map &map) @@ -708,8 +708,8 @@ void royalmah_state::mjyarou_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); map(0x12, 0x12).portr("DSW2"); } @@ -718,11 +718,11 @@ void royalmah_state::dondenmj_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); map(0x85, 0x85).portr("DSW2"); // DSW2 map(0x86, 0x86).portr("DSW3"); // DSW3 - map(0x87, 0x87).w(this, FUNC(royalmah_state::dynax_bank_w)); + map(0x87, 0x87).w(FUNC(royalmah_state::dynax_bank_w)); } void royalmah_state::makaijan_iomap(address_map &map) @@ -730,11 +730,11 @@ void royalmah_state::makaijan_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); map(0x84, 0x84).portr("DSW2"); // DSW2 map(0x85, 0x85).portr("DSW3"); // DSW3 - map(0x86, 0x86).w(this, FUNC(royalmah_state::dynax_bank_w)); + map(0x86, 0x86).w(FUNC(royalmah_state::dynax_bank_w)); } void royalmah_state::daisyari_iomap(address_map &map) @@ -742,19 +742,19 @@ void royalmah_state::daisyari_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0xc0, 0xc0).rw(this, FUNC(royalmah_state::daisyari_dsw_r), FUNC(royalmah_state::daisyari_bank_w)); + map(0x10, 0x10).w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0xc0, 0xc0).rw(FUNC(royalmah_state::daisyari_dsw_r), FUNC(royalmah_state::daisyari_bank_w)); } void royalmah_state::mjclub_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(royalmah_state::mjclub_dsw_r), FUNC(royalmah_state::mjclub_bank_w)); + map(0x00, 0x00).rw(FUNC(royalmah_state::mjclub_dsw_r), FUNC(royalmah_state::mjclub_bank_w)); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); } void royalmah_state::mjdiplob_iomap(address_map &map) @@ -762,9 +762,9 @@ void royalmah_state::mjdiplob_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x61, 0x61).w(this, FUNC(royalmah_state::tontonb_bank_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0x61, 0x61).w(FUNC(royalmah_state::tontonb_bank_w)); map(0x62, 0x62).portr("DSW2"); // DSW2 map(0x63, 0x63).portr("DSW3"); // DSW3 } @@ -774,9 +774,9 @@ void royalmah_state::tontonb_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x44, 0x44).w(this, FUNC(royalmah_state::tontonb_bank_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0x44, 0x44).w(FUNC(royalmah_state::tontonb_bank_w)); map(0x46, 0x46).portr("DSW2"); // DSW2 map(0x47, 0x47).portr("DSW3"); // DSW3 } @@ -786,9 +786,9 @@ void royalmah_state::majs101b_iomap(address_map &map) map.global_mask(0xff); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::royalmah_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x00, 0x00).rw(this, FUNC(royalmah_state::majs101b_dsw_r), FUNC(royalmah_state::dynax_bank_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::royalmah_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0x00, 0x00).rw(FUNC(royalmah_state::majs101b_dsw_r), FUNC(royalmah_state::dynax_bank_w)); } void royalmah_state::mjderngr_iomap(address_map &map) @@ -797,23 +797,23 @@ void royalmah_state::mjderngr_iomap(address_map &map) map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); // AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") - map(0x10, 0x10).w(this, FUNC(royalmah_state::mjderngr_coin_w)); // palette bank is set separately - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x20, 0x20).w(this, FUNC(royalmah_state::dynax_bank_w)); + map(0x10, 0x10).w(FUNC(royalmah_state::mjderngr_coin_w)); // palette bank is set separately + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0x20, 0x20).w(FUNC(royalmah_state::dynax_bank_w)); map(0x40, 0x40).portr("DSW2"); map(0x4c, 0x4c).portr("DSW1"); - map(0x60, 0x60).w(this, FUNC(royalmah_state::mjderngr_palbank_w)); + map(0x60, 0x60).w(FUNC(royalmah_state::mjderngr_palbank_w)); } void royalmah_state::mjapinky_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(royalmah_state::mjapinky_bank_w)); + map(0x00, 0x00).w(FUNC(royalmah_state::mjapinky_bank_w)); map(0x01, 0x01).r(m_ay, FUNC(ay8910_device::data_r)); map(0x02, 0x03).w(m_ay, FUNC(ay8910_device::data_address_w)); map(0x04, 0x04).portr("DSW2"); - map(0x10, 0x10).portr("DSW1").w(this, FUNC(royalmah_state::mjapinky_palbank_w)); - map(0x11, 0x11).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x10, 0x10).portr("DSW1").w(FUNC(royalmah_state::mjapinky_palbank_w)); + map(0x11, 0x11).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); } void royalmah_state::janoh_map(address_map &map) @@ -927,16 +927,16 @@ void royalmah_state::jansou_map(address_map &map) { map(0x0000, 0x3fff).rom().nopw(); - map(0x6000, 0x600f).w(this, FUNC(royalmah_state::jansou_colortable_w)); - map(0x6400, 0x6400).w(this, FUNC(royalmah_state::jansou_6400_w)); - map(0x6401, 0x6401).w(this, FUNC(royalmah_state::jansou_6401_w)); - map(0x6402, 0x6402).w(this, FUNC(royalmah_state::jansou_6402_w)); - map(0x6403, 0x6403).r(this, FUNC(royalmah_state::jansou_6403_r)); - map(0x6404, 0x6404).r(this, FUNC(royalmah_state::jansou_6404_r)); - map(0x6405, 0x6405).r(this, FUNC(royalmah_state::jansou_6405_r)); - map(0x6406, 0x6406).w(this, FUNC(royalmah_state::jansou_dsw_sel_w)); - map(0x6407, 0x6407).r(this, FUNC(royalmah_state::jansou_dsw_r)); - map(0x6800, 0x6800).w(this, FUNC(royalmah_state::jansou_sound_w)); + map(0x6000, 0x600f).w(FUNC(royalmah_state::jansou_colortable_w)); + map(0x6400, 0x6400).w(FUNC(royalmah_state::jansou_6400_w)); + map(0x6401, 0x6401).w(FUNC(royalmah_state::jansou_6401_w)); + map(0x6402, 0x6402).w(FUNC(royalmah_state::jansou_6402_w)); + map(0x6403, 0x6403).r(FUNC(royalmah_state::jansou_6403_r)); + map(0x6404, 0x6404).r(FUNC(royalmah_state::jansou_6404_r)); + map(0x6405, 0x6405).r(FUNC(royalmah_state::jansou_6405_r)); + map(0x6406, 0x6406).w(FUNC(royalmah_state::jansou_dsw_sel_w)); + map(0x6407, 0x6407).r(FUNC(royalmah_state::jansou_dsw_r)); + map(0x6800, 0x6800).w(FUNC(royalmah_state::jansou_sound_w)); map(0x7000, 0x77ff).ram().share("nvram"); map(0x8000, 0xffff).writeonly().share("videoram"); @@ -951,7 +951,7 @@ void royalmah_state::jansou_sub_map(address_map &map) void royalmah_state::jansou_sub_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("dac", FUNC(dac_byte_interface::write)); + map(0x00, 0x00).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("dac", FUNC(dac_byte_interface::data_w)); } @@ -1011,14 +1011,14 @@ WRITE8_MEMBER(royalmah_state::janptr96_coin_counter_w) void royalmah_state::janptr96_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(royalmah_state::janptr96_rombank_w)); // BANK ROM Select - map(0x20, 0x20).rw(this, FUNC(royalmah_state::janptr96_unknown_r), FUNC(royalmah_state::janptr96_rambank_w)); - map(0x50, 0x50).w(this, FUNC(royalmah_state::mjderngr_palbank_w)); + map(0x00, 0x00).w(FUNC(royalmah_state::janptr96_rombank_w)); // BANK ROM Select + map(0x20, 0x20).rw(FUNC(royalmah_state::janptr96_unknown_r), FUNC(royalmah_state::janptr96_rambank_w)); + map(0x50, 0x50).w(FUNC(royalmah_state::mjderngr_palbank_w)); map(0x60, 0x6f).rw(m_rtc, FUNC(msm6242_device::read), FUNC(msm6242_device::write)); map(0x81, 0x81).r(m_ay, FUNC(ay8910_device::data_r)); map(0x82, 0x83).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x93, 0x93).w(this, FUNC(royalmah_state::input_port_select_w)); - map(0xd8, 0xd8).w(this, FUNC(royalmah_state::janptr96_coin_counter_w)); + map(0x93, 0x93).w(FUNC(royalmah_state::input_port_select_w)); + map(0xd8, 0xd8).w(FUNC(royalmah_state::janptr96_coin_counter_w)); map(0xd9, 0xd9).portr("SYSTEM").nopw(); // second input select? } @@ -1089,8 +1089,8 @@ void royalmah_state::mjifb_map(address_map &map) { map(0x0000, 0x6fff).rom(); map(0x7000, 0x7fff).ram().share("nvram"); - map(0x8000, 0xbfff).rw(this, FUNC(royalmah_state::mjifb_rom_io_r), FUNC(royalmah_state::mjifb_rom_io_w)).share("videoram"); - map(0xc000, 0xffff).rom().w(this, FUNC(royalmah_state::mjifb_videoram_w)); + map(0x8000, 0xbfff).rw(FUNC(royalmah_state::mjifb_rom_io_r), FUNC(royalmah_state::mjifb_rom_io_w)).share("videoram"); + map(0xc000, 0xffff).rom().w(FUNC(royalmah_state::mjifb_videoram_w)); // AM_RANGE( 0xc000, 0xffff ) AM_ROM AM_WRITEONLY This should, but doesn't work } @@ -1180,8 +1180,8 @@ void royalmah_state::mjdejavu_map(address_map &map) { map(0x0000, 0x6fff).rom(); map(0x7000, 0x7fff).ram().share("nvram"); - map(0x8000, 0xbfff).rw(this, FUNC(royalmah_state::mjdejavu_rom_io_r), FUNC(royalmah_state::mjdejavu_rom_io_w)).share("videoram"); - map(0xc000, 0xffff).rom().w(this, FUNC(royalmah_state::mjifb_videoram_w)); + map(0x8000, 0xbfff).rw(FUNC(royalmah_state::mjdejavu_rom_io_r), FUNC(royalmah_state::mjdejavu_rom_io_w)).share("videoram"); + map(0xc000, 0xffff).rom().w(FUNC(royalmah_state::mjifb_videoram_w)); } @@ -1215,12 +1215,12 @@ void royalmah_state::mjtensin_map(address_map &map) map(0x6000, 0x6fbf).ram(); map(0x6fc1, 0x6fc1).r(m_ay, FUNC(ay8910_device::data_r)); map(0x6fc2, 0x6fc3).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x6fd0, 0x6fd0).w(this, FUNC(royalmah_state::janptr96_coin_counter_w)); - map(0x6fd1, 0x6fd1).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); + map(0x6fd0, 0x6fd0).w(FUNC(royalmah_state::janptr96_coin_counter_w)); + map(0x6fd1, 0x6fd1).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); map(0x6fe0, 0x6fef).rw(m_rtc, FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x6ff0, 0x6ff0).rw(this, FUNC(royalmah_state::janptr96_dsw_r), FUNC(royalmah_state::janptr96_dswsel_w)); - map(0x6ff1, 0x6ff1).w(this, FUNC(royalmah_state::mjderngr_palbank_w)); - map(0x6ff3, 0x6ff3).w(this, FUNC(royalmah_state::mjtensin_6ff3_w)); + map(0x6ff0, 0x6ff0).rw(FUNC(royalmah_state::janptr96_dsw_r), FUNC(royalmah_state::janptr96_dswsel_w)); + map(0x6ff1, 0x6ff1).w(FUNC(royalmah_state::mjderngr_palbank_w)); + map(0x6ff3, 0x6ff3).w(FUNC(royalmah_state::mjtensin_6ff3_w)); map(0x7000, 0x7fff).ram().share("nvram"); map(0x8000, 0xffff).bankr("mainbank"); map(0x8000, 0xffff).writeonly().share("videoram"); @@ -1279,14 +1279,14 @@ void royalmah_state::cafetime_map(address_map &map) map(0x6000, 0x7eff).ram().share("nvram"); map(0x7fc1, 0x7fc1).r(m_ay, FUNC(ay8910_device::data_r)); map(0x7fc2, 0x7fc3).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x7fd0, 0x7fd0).w(this, FUNC(royalmah_state::janptr96_coin_counter_w)); + map(0x7fd0, 0x7fd0).w(FUNC(royalmah_state::janptr96_coin_counter_w)); map(0x7fd1, 0x7fd1).portr("SYSTEM").nopw(); - map(0x7fd3, 0x7fd3).w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x7fe0, 0x7fe0).r(this, FUNC(royalmah_state::cafetime_dsw_r)); - map(0x7fe1, 0x7fe1).w(this, FUNC(royalmah_state::cafetime_dsw_w)); - map(0x7fe2, 0x7fe2).w(this, FUNC(royalmah_state::mjderngr_palbank_w)); - map(0x7fe3, 0x7fe3).w(this, FUNC(royalmah_state::cafetime_7fe3_w)); - map(0x7fe4, 0x7fe4).r(this, FUNC(royalmah_state::cafetime_7fe4_r)); + map(0x7fd3, 0x7fd3).w(FUNC(royalmah_state::input_port_select_w)); + map(0x7fe0, 0x7fe0).r(FUNC(royalmah_state::cafetime_dsw_r)); + map(0x7fe1, 0x7fe1).w(FUNC(royalmah_state::cafetime_dsw_w)); + map(0x7fe2, 0x7fe2).w(FUNC(royalmah_state::mjderngr_palbank_w)); + map(0x7fe3, 0x7fe3).w(FUNC(royalmah_state::cafetime_7fe3_w)); + map(0x7fe4, 0x7fe4).r(FUNC(royalmah_state::cafetime_7fe4_r)); map(0x7ff0, 0x7fff).rw(m_rtc, FUNC(msm6242_device::read), FUNC(msm6242_device::write)); map(0x8000, 0xffff).bankr("mainbank"); map(0x8000, 0xffff).writeonly().share("videoram"); @@ -1369,20 +1369,20 @@ void royalmah_state::mjvegasa_map(address_map &map) map(0x00000, 0x05fff).rom(); map(0x06000, 0x07fff).ram().share("nvram"); - map(0x08000, 0x0ffff).rw(this, FUNC(royalmah_state::mjvegasa_rom_io_r), FUNC(royalmah_state::mjvegasa_rom_io_w)).share("videoram"); + map(0x08000, 0x0ffff).rw(FUNC(royalmah_state::mjvegasa_rom_io_r), FUNC(royalmah_state::mjvegasa_rom_io_w)).share("videoram"); map(0x10001, 0x10001).r(m_ay, FUNC(ay8910_device::data_r)); map(0x10002, 0x10003).w(m_ay, FUNC(ay8910_device::data_address_w)); - map(0x10010, 0x10010).w(this, FUNC(royalmah_state::mjvegasa_coin_counter_w)); - map(0x10011, 0x10011).portr("SYSTEM").w(this, FUNC(royalmah_state::input_port_select_w)); - map(0x10013, 0x10013).w(this, FUNC(royalmah_state::input_port_select_w)); - - map(0x12000, 0x12000).w(this, FUNC(royalmah_state::mjvegasa_rombank_w)); - map(0x12100, 0x12100).r(this, FUNC(royalmah_state::cafetime_dsw_r)); - map(0x12200, 0x12200).w(this, FUNC(royalmah_state::cafetime_dsw_w)); - map(0x12300, 0x12300).w(this, FUNC(royalmah_state::mjderngr_palbank_w)); - map(0x12400, 0x12400).w(this, FUNC(royalmah_state::mjvegasa_12400_w)); - map(0x12500, 0x12500).r(this, FUNC(royalmah_state::mjvegasa_12500_r)); + map(0x10010, 0x10010).w(FUNC(royalmah_state::mjvegasa_coin_counter_w)); + map(0x10011, 0x10011).portr("SYSTEM").w(FUNC(royalmah_state::input_port_select_w)); + map(0x10013, 0x10013).w(FUNC(royalmah_state::input_port_select_w)); + + map(0x12000, 0x12000).w(FUNC(royalmah_state::mjvegasa_rombank_w)); + map(0x12100, 0x12100).r(FUNC(royalmah_state::cafetime_dsw_r)); + map(0x12200, 0x12200).w(FUNC(royalmah_state::cafetime_dsw_w)); + map(0x12300, 0x12300).w(FUNC(royalmah_state::mjderngr_palbank_w)); + map(0x12400, 0x12400).w(FUNC(royalmah_state::mjvegasa_12400_w)); + map(0x12500, 0x12500).r(FUNC(royalmah_state::mjvegasa_12500_r)); } diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp index 8d70ef8e0db..e133ebf98ef 100644 --- a/src/mame/drivers/rpunch.cpp +++ b/src/mame/drivers/rpunch.cpp @@ -208,17 +208,17 @@ void rpunch_state::main_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x040000, 0x04ffff).ram().share("bitmapram"); map(0x060000, 0x060fff).ram().share("spriteram"); - map(0x080000, 0x083fff).ram().w(this, FUNC(rpunch_state::rpunch_videoram_w)).share("videoram"); + map(0x080000, 0x083fff).ram().w(FUNC(rpunch_state::rpunch_videoram_w)).share("videoram"); map(0x0a0000, 0x0a07ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0c0000, 0x0c0007).w(this, FUNC(rpunch_state::rpunch_scrollreg_w)); - map(0x0c0009, 0x0c0009).select(0x20).w(this, FUNC(rpunch_state::rpunch_gga_w)); - map(0x0c000c, 0x0c000d).w(this, FUNC(rpunch_state::rpunch_videoreg_w)); + map(0x0c0000, 0x0c0007).w(FUNC(rpunch_state::rpunch_scrollreg_w)); + map(0x0c0009, 0x0c0009).select(0x20).w(FUNC(rpunch_state::rpunch_gga_w)); + map(0x0c000c, 0x0c000d).w(FUNC(rpunch_state::rpunch_videoreg_w)); map(0x0c000f, 0x0c000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x0c0010, 0x0c0013).w(this, FUNC(rpunch_state::rpunch_ins_w)); + map(0x0c0010, 0x0c0013).w(FUNC(rpunch_state::rpunch_ins_w)); map(0x0c0018, 0x0c0019).portr("P1"); map(0x0c001a, 0x0c001b).portr("P2"); map(0x0c001c, 0x0c001d).portr("DSW"); - map(0x0c001e, 0x0c001f).r(this, FUNC(rpunch_state::sound_busy_r)); + map(0x0c001e, 0x0c001f).r(FUNC(rpunch_state::sound_busy_r)); map(0x0fc000, 0x0fffff).ram(); } @@ -235,8 +235,8 @@ void rpunch_state::sound_map(address_map &map) map(0x0000, 0xefff).rom(); map(0xf000, 0xf001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xf200, 0xf200).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xf400, 0xf400).w(this, FUNC(rpunch_state::upd_control_w)); - map(0xf600, 0xf600).w(this, FUNC(rpunch_state::upd_data_w)); + map(0xf400, 0xf400).w(FUNC(rpunch_state::upd_control_w)); + map(0xf600, 0xf600).w(FUNC(rpunch_state::upd_data_w)); map(0xf800, 0xffff).ram(); } diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index ae0abfabad7..8d54527a509 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -204,21 +204,21 @@ void rt1715_state::rt1715_io(address_map &map) map(0x08, 0x0b).rw("a30", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0c, 0x0f).rw("a29", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); map(0x18, 0x19).rw("a26", FUNC(i8275_device::read), FUNC(i8275_device::write)); - map(0x20, 0x20).w(this, FUNC(rt1715_state::rt1715_floppy_enable)); - map(0x28, 0x28).w(this, FUNC(rt1715_state::rt1715_rom_disable)); + map(0x20, 0x20).w(FUNC(rt1715_state::rt1715_floppy_enable)); + map(0x28, 0x28).w(FUNC(rt1715_state::rt1715_rom_disable)); } void rt1715_state::k7658_mem(address_map &map) { - map(0x0000, 0xffff).w(this, FUNC(rt1715_state::k7658_data_w)); + map(0x0000, 0xffff).w(FUNC(rt1715_state::k7658_data_w)); map(0x0000, 0x07ff).mirror(0xf800).rom(); } void rt1715_state::k7658_io(address_map &map) { - map(0x2000, 0x2000).mirror(0x8000).r(this, FUNC(rt1715_state::k7658_led1_r)); - map(0x4000, 0x4000).mirror(0x8000).r(this, FUNC(rt1715_state::k7658_led2_r)); - map(0x8000, 0x9fff).r(this, FUNC(rt1715_state::k7658_data_r)); + map(0x2000, 0x2000).mirror(0x8000).r(FUNC(rt1715_state::k7658_led1_r)); + map(0x4000, 0x4000).mirror(0x8000).r(FUNC(rt1715_state::k7658_led2_r)); + map(0x8000, 0x9fff).r(FUNC(rt1715_state::k7658_data_r)); } diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp index 391c40ae474..82d8dad2f93 100644 --- a/src/mame/drivers/runaway.cpp +++ b/src/mame/drivers/runaway.cpp @@ -86,18 +86,18 @@ WRITE8_MEMBER(runaway_state::runaway_irq_ack_w) void runaway_state::runaway_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07bf).ram().w(this, FUNC(runaway_state::runaway_video_ram_w)).share("video_ram"); + map(0x0400, 0x07bf).ram().w(FUNC(runaway_state::runaway_video_ram_w)).share("video_ram"); map(0x07c0, 0x07ff).ram().share("sprite_ram"); - map(0x1000, 0x1000).w(this, FUNC(runaway_state::runaway_irq_ack_w)); + map(0x1000, 0x1000).w(FUNC(runaway_state::runaway_irq_ack_w)); map(0x1400, 0x143f).w("earom", FUNC(atari_vg_earom_device::write)); map(0x1800, 0x1800).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); - map(0x1c00, 0x1c0f).w(this, FUNC(runaway_state::runaway_paletteram_w)); + map(0x1c00, 0x1c0f).w(FUNC(runaway_state::runaway_paletteram_w)); map(0x2000, 0x2000).nopw(); /* coin counter? */ map(0x2001, 0x2001).nopw(); /* coin counter? */ - map(0x2003, 0x2004).w(this, FUNC(runaway_state::runaway_led_w)); - map(0x2005, 0x2005).w(this, FUNC(runaway_state::runaway_tile_bank_w)); + map(0x2003, 0x2004).w(FUNC(runaway_state::runaway_led_w)); + map(0x2005, 0x2005).w(FUNC(runaway_state::runaway_tile_bank_w)); - map(0x3000, 0x3007).r(this, FUNC(runaway_state::runaway_input_r)); + map(0x3000, 0x3007).r(FUNC(runaway_state::runaway_input_r)); map(0x4000, 0x4000).portr("4000"); map(0x5000, 0x5000).r("earom", FUNC(atari_vg_earom_device::read)); map(0x6000, 0x600f).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp index 0646ccd52d6..904546dc68e 100644 --- a/src/mame/drivers/rungun.cpp +++ b/src/mame/drivers/rungun.cpp @@ -183,21 +183,21 @@ WRITE16_MEMBER(rungun_state::palette_write) void rungun_state::rungun_map(address_map &map) { map(0x000000, 0x2fffff).rom(); // main program + data - map(0x300000, 0x3007ff).rw(this, FUNC(rungun_state::palette_read), FUNC(rungun_state::palette_write)); + map(0x300000, 0x3007ff).rw(FUNC(rungun_state::palette_read), FUNC(rungun_state::palette_write)); map(0x380000, 0x39ffff).ram(); // work RAM - map(0x400000, 0x43ffff).r(this, FUNC(rungun_state::k53936_rom_r)).umask16(0x00ff); // '936 ROM readback window - map(0x480000, 0x48001f).rw(this, FUNC(rungun_state::sysregs_r), FUNC(rungun_state::sysregs_w)).share("sysreg"); + map(0x400000, 0x43ffff).r(FUNC(rungun_state::k53936_rom_r)).umask16(0x00ff); // '936 ROM readback window + map(0x480000, 0x48001f).rw(FUNC(rungun_state::sysregs_r), FUNC(rungun_state::sysregs_w)).share("sysreg"); map(0x4c0000, 0x4c001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); // CCU (for scanline and vblank polling) - map(0x540000, 0x540001).w(this, FUNC(rungun_state::sound_irq_w)); + map(0x540000, 0x540001).w(FUNC(rungun_state::sound_irq_w)); map(0x580000, 0x58001f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0xff00); map(0x5c0000, 0x5c000f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); // 246A ROM readback window map(0x5c0010, 0x5c001f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w)); map(0x600000, 0x601fff).bankrw("spriteram_bank"); // OBJ RAM map(0x640000, 0x640007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); // '246A registers map(0x680000, 0x68001f).w(m_k053936, FUNC(k053936_device::ctrl_w)); // '936 registers - map(0x6c0000, 0x6cffff).rw(this, FUNC(rungun_state::psac2_videoram_r), FUNC(rungun_state::psac2_videoram_w)); // PSAC2 ('936) RAM (34v + 35v) + map(0x6c0000, 0x6cffff).rw(FUNC(rungun_state::psac2_videoram_r), FUNC(rungun_state::psac2_videoram_w)); // PSAC2 ('936) RAM (34v + 35v) map(0x700000, 0x7007ff).rw(m_k053936, FUNC(k053936_device::linectrl_r), FUNC(k053936_device::linectrl_w)); // PSAC "Line RAM" - map(0x740000, 0x741fff).rw(this, FUNC(rungun_state::ttl_ram_r), FUNC(rungun_state::ttl_ram_w)); // text plane RAM + map(0x740000, 0x741fff).rw(FUNC(rungun_state::ttl_ram_r), FUNC(rungun_state::ttl_ram_w)); // text plane RAM map(0x7c0000, 0x7c0001).nopw(); // watchdog } @@ -251,7 +251,7 @@ void rungun_state::rungun_sound_map(address_map &map) map(0xe400, 0xe62f).rw(m_k054539_2, FUNC(k054539_device::read), FUNC(k054539_device::write)); map(0xe630, 0xe7ff).ram(); map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map)); - map(0xf800, 0xf800).w(this, FUNC(rungun_state::sound_ctrl_w)); + map(0xf800, 0xf800).w(FUNC(rungun_state::sound_ctrl_w)); map(0xfff0, 0xfff3).nopw(); } diff --git a/src/mame/drivers/rvoice.cpp b/src/mame/drivers/rvoice.cpp index 30a03f53b3e..878d3dace62 100644 --- a/src/mame/drivers/rvoice.cpp +++ b/src/mame/drivers/rvoice.cpp @@ -337,7 +337,7 @@ WRITE8_MEMBER(rvoice_state::main_hd63701_internal_registers_w) void rvoice_state::hd63701_main_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x0027).rw(this, FUNC(rvoice_state::main_hd63701_internal_registers_r), FUNC(rvoice_state::main_hd63701_internal_registers_w)); // INTERNAL REGS + map(0x0000, 0x0027).rw(FUNC(rvoice_state::main_hd63701_internal_registers_r), FUNC(rvoice_state::main_hd63701_internal_registers_w)); // INTERNAL REGS map(0x0040, 0x005f).ram(); // INTERNAL RAM (overlaps acia) map(0x0060, 0x007f).rw("acia65c51", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); // ACIA 65C51 map(0x0080, 0x013f).ram(); // INTERNAL RAM (overlaps acia) diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index 763c9f41886..bf3a8626291 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -282,7 +282,7 @@ void rx78_state::rx78_mem(address_map &map) //AM_RANGE(0x2000, 0x5fff) // mapped by the cartslot map(0x6000, 0xafff).ram(); //ext RAM map(0xb000, 0xebff).ram(); - map(0xec00, 0xffff).rw(this, FUNC(rx78_state::vram_r), FUNC(rx78_state::vram_w)); + map(0xec00, 0xffff).rw(FUNC(rx78_state::vram_r), FUNC(rx78_state::vram_w)); } void rx78_state::rx78_io(address_map &map) @@ -291,14 +291,14 @@ void rx78_state::rx78_io(address_map &map) map.global_mask(0xff); // AM_RANGE(0xe2, 0xe2) AM_READNOP AM_WRITENOP //printer // AM_RANGE(0xe3, 0xe3) AM_WRITENOP //printer - map(0xf0, 0xf0).rw(this, FUNC(rx78_state::cass_r), FUNC(rx78_state::cass_w)); //cmt - map(0xf1, 0xf1).w(this, FUNC(rx78_state::vram_read_bank_w)); - map(0xf2, 0xf2).w(this, FUNC(rx78_state::vram_write_bank_w)); - map(0xf4, 0xf4).rw(this, FUNC(rx78_state::key_r), FUNC(rx78_state::key_w)); //keyboard - map(0xf5, 0xfb).w(this, FUNC(rx78_state::vdp_reg_w)); //vdp - map(0xfc, 0xfc).w(this, FUNC(rx78_state::vdp_bg_reg_w)); //vdp - map(0xfe, 0xfe).w(this, FUNC(rx78_state::vdp_pri_mask_w)); - map(0xff, 0xff).w("sn1", FUNC(sn76489a_device::write)); //psg + map(0xf0, 0xf0).rw(FUNC(rx78_state::cass_r), FUNC(rx78_state::cass_w)); //cmt + map(0xf1, 0xf1).w(FUNC(rx78_state::vram_read_bank_w)); + map(0xf2, 0xf2).w(FUNC(rx78_state::vram_write_bank_w)); + map(0xf4, 0xf4).rw(FUNC(rx78_state::key_r), FUNC(rx78_state::key_w)); //keyboard + map(0xf5, 0xfb).w(FUNC(rx78_state::vdp_reg_w)); //vdp + map(0xfc, 0xfc).w(FUNC(rx78_state::vdp_bg_reg_w)); //vdp + map(0xfe, 0xfe).w(FUNC(rx78_state::vdp_pri_mask_w)); + map(0xff, 0xff).w("sn1", FUNC(sn76489a_device::command_w)); //psg } /* Input ports */ diff --git a/src/mame/drivers/rz1.cpp b/src/mame/drivers/rz1.cpp index 96468340ad9..77b0f38726a 100644 --- a/src/mame/drivers/rz1.cpp +++ b/src/mame/drivers/rz1.cpp @@ -99,11 +99,11 @@ void rz1_state::map(address_map &map) // map(0x0000, 0x0fff).rom().region("maincpu", 0); map(0x2000, 0x3fff).ram(); map(0x4000, 0x7fff).rom().region("program", 0); - map(0x8000, 0x8fff).w(this, FUNC(rz1_state::upd934g_c_w)); - map(0x9000, 0x9fff).rw(this, FUNC(rz1_state::key_r), FUNC(rz1_state::upd934g_b_w)); + map(0x8000, 0x8fff).w(FUNC(rz1_state::upd934g_c_w)); + map(0x9000, 0x9fff).rw(FUNC(rz1_state::key_r), FUNC(rz1_state::upd934g_b_w)); map(0xa000, 0xbfff).ram(); // sample ram 1 map(0xc000, 0xdfff).ram(); // sample ram 2 - map(0xe000, 0xe001).w(this, FUNC(rz1_state::leds_w)); + map(0xe000, 0xe001).w(FUNC(rz1_state::leds_w)); } diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index 530a9aa1e71..785b5d5da31 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -32,7 +32,7 @@ void s11_state::s11_main_map(address_map &map) { map(0x0000, 0x07ff).ram().share("nvram"); map(0x2100, 0x2103).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).w(this, FUNC(s11_state::sol3_w)); // solenoids + map(0x2200, 0x2200).w(FUNC(s11_state::sol3_w)); // solenoids map(0x2400, 0x2403).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x2c00, 0x2c03).rw(m_pia2c, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display @@ -44,7 +44,7 @@ void s11_state::s11_main_map(address_map &map) void s11_state::s11_audio_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x0800).ram(); - map(0x1000, 0x1fff).w(this, FUNC(s11_state::bank_w)); + map(0x1000, 0x1fff).w(FUNC(s11_state::bank_w)); map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x8000, 0xbfff).bankr("bank0"); map(0xc000, 0xffff).bankr("bank1"); @@ -459,7 +459,7 @@ MACHINE_CONFIG_START(s11_state::s11) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pias_ca2_w)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pias_cb2_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) @@ -477,7 +477,7 @@ MACHINE_CONFIG_START(s11_state::s11) MCFG_DEVICE_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25) MCFG_DEVICE_ADD("pia40", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, data_w)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia40_pb_w)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia40_cb2_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE)) diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp index 04e917ad90b..1d15af82ce9 100644 --- a/src/mame/drivers/s11a.cpp +++ b/src/mame/drivers/s11a.cpp @@ -35,7 +35,7 @@ void s11a_state::s11a_main_map(address_map &map) { map(0x0000, 0x0fff).ram().share("nvram"); map(0x2100, 0x2103).mirror(0x00fc).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).mirror(0x01ff).w(this, FUNC(s11a_state::sol3_w)); // solenoids + map(0x2200, 0x2200).mirror(0x01ff).w(FUNC(s11a_state::sol3_w)); // solenoids map(0x2400, 0x2403).mirror(0x03fc).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).mirror(0x03fc).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x2c00, 0x2c03).mirror(0x03fc).rw(m_pia2c, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display @@ -47,7 +47,7 @@ void s11a_state::s11a_main_map(address_map &map) void s11a_state::s11a_audio_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x0800).ram(); - map(0x1000, 0x1fff).w(this, FUNC(s11a_state::bank_w)); + map(0x1000, 0x1fff).w(FUNC(s11a_state::bank_w)); map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x8000, 0xbfff).bankr("bank0"); map(0xc000, 0xffff).bankr("bank1"); @@ -58,7 +58,7 @@ void s11a_state::s11a_bg_map(address_map &map) map(0x0000, 0x07ff).mirror(0x1800).ram(); map(0x2000, 0x2001).mirror(0x1ffe).rw(m_ym, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x4000, 0x4003).mirror(0x1ffc).rw(m_pia40, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x7800, 0x7fff).w(this, FUNC(s11a_state::bgbank_w)); + map(0x7800, 0x7fff).w(FUNC(s11a_state::bgbank_w)); map(0x8000, 0xffff).bankr("bgbank"); } @@ -251,7 +251,7 @@ MACHINE_CONFIG_START(s11a_state::s11a) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia40_cb2_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) @@ -268,7 +268,7 @@ MACHINE_CONFIG_START(s11a_state::s11a) MCFG_DEVICE_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25) MCFG_DEVICE_ADD("pia40", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, data_w)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia40_pb_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pias_ca2_w)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pias_cb2_w)) diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp index 90a39295130..cece3355e77 100644 --- a/src/mame/drivers/s11b.cpp +++ b/src/mame/drivers/s11b.cpp @@ -36,7 +36,7 @@ void s11b_state::s11b_main_map(address_map &map) { map(0x0000, 0x0fff).ram().share("nvram"); map(0x2100, 0x2103).mirror(0x00fc).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).mirror(0x01ff).w(this, FUNC(s11b_state::sol3_w)); // solenoids + map(0x2200, 0x2200).mirror(0x01ff).w(FUNC(s11b_state::sol3_w)); // solenoids map(0x2400, 0x2403).mirror(0x03fc).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).mirror(0x03fc).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x2c00, 0x2c03).mirror(0x03fc).rw(m_pia2c, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display @@ -48,7 +48,7 @@ void s11b_state::s11b_main_map(address_map &map) void s11b_state::s11b_audio_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x0800).ram(); - map(0x1000, 0x1fff).w(this, FUNC(s11b_state::bank_w)); + map(0x1000, 0x1fff).w(FUNC(s11b_state::bank_w)); map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x8000, 0xbfff).bankr("bank0"); map(0xc000, 0xffff).bankr("bank1"); @@ -59,9 +59,9 @@ void s11b_state::s11b_bg_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x2000, 0x2001).mirror(0x1ffe).rw(m_ym, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x4000, 0x4003).mirror(0x1ffc).rw(m_pia40, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x6000, 0x67ff).w(this, FUNC(s11b_state::bg_speech_digit_w)); - map(0x6800, 0x6fff).w(this, FUNC(s11b_state::bg_speech_clock_w)); - map(0x7800, 0x7fff).w(this, FUNC(s11b_state::bgbank_w)); + map(0x6000, 0x67ff).w(FUNC(s11b_state::bg_speech_digit_w)); + map(0x6800, 0x6fff).w(FUNC(s11b_state::bg_speech_clock_w)); + map(0x7800, 0x7fff).w(FUNC(s11b_state::bgbank_w)); map(0x8000, 0xffff).bankr("bgbank"); } @@ -325,7 +325,7 @@ MACHINE_CONFIG_START(s11b_state::s11b) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pias_ca2_w)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pias_cb2_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) @@ -347,7 +347,7 @@ MACHINE_CONFIG_START(s11b_state::s11b) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50) MCFG_DEVICE_ADD("pia40", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, data_w)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia40_pb_w)) MCFG_PIA_CA2_HANDLER(WRITELINE("ym2151", ym2151_device, reset_w)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia40_cb2_w)) diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp index aef00f5caf8..7571a91a015 100644 --- a/src/mame/drivers/s11c.cpp +++ b/src/mame/drivers/s11c.cpp @@ -18,7 +18,7 @@ void s11c_state::s11c_main_map(address_map &map) { map(0x0000, 0x0fff).ram().share("nvram"); map(0x2100, 0x2103).mirror(0x00fc).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).mirror(0x01ff).w(this, FUNC(s11c_state::sol3_w)); // solenoids + map(0x2200, 0x2200).mirror(0x01ff).w(FUNC(s11c_state::sol3_w)); // solenoids map(0x2400, 0x2403).mirror(0x03fc).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).mirror(0x03fc).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x2c00, 0x2c03).mirror(0x03fc).rw(m_pia2c, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display @@ -30,7 +30,7 @@ void s11c_state::s11c_main_map(address_map &map) void s11c_state::s11c_audio_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x0800).ram(); - map(0x1000, 0x1fff).w(this, FUNC(s11c_state::bank_w)); + map(0x1000, 0x1fff).w(FUNC(s11c_state::bank_w)); map(0x2000, 0x2003).mirror(0x0ffc).rw("pias", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x8000, 0xbfff).bankr("bank0"); map(0xc000, 0xffff).bankr("bank1"); @@ -41,9 +41,9 @@ void s11c_state::s11c_bg_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x2000, 0x2001).mirror(0x1ffe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x4000, 0x4003).mirror(0x1ffc).rw("pia40", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x6000, 0x67ff).w(this, FUNC(s11c_state::bg_speech_digit_w)); - map(0x6800, 0x6fff).w(this, FUNC(s11c_state::bg_speech_clock_w)); - map(0x7800, 0x7fff).w(this, FUNC(s11c_state::bgbank_w)); + map(0x6000, 0x67ff).w(FUNC(s11c_state::bg_speech_digit_w)); + map(0x6800, 0x6fff).w(FUNC(s11c_state::bg_speech_clock_w)); + map(0x7800, 0x7fff).w(FUNC(s11c_state::bgbank_w)); map(0x8000, 0xffff).bankr("bgbank"); } diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp index b7b1d229d27..cbfaee98789 100644 --- a/src/mame/drivers/s3.cpp +++ b/src/mame/drivers/s3.cpp @@ -499,7 +499,7 @@ MACHINE_CONFIG_START(s3_state::s3a) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPB_HANDLER(READ8(*this, s3_state,sound_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp index eb31f6a1dae..62b6d50e6ca 100644 --- a/src/mame/drivers/s4.cpp +++ b/src/mame/drivers/s4.cpp @@ -493,7 +493,7 @@ MACHINE_CONFIG_START(s4_state::s4a) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPB_HANDLER(READ8(*this, s4_state, sound_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index e6d4b3f301a..4d5d8aff38b 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -467,7 +467,7 @@ MACHINE_CONFIG_START(s6_state::s6) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPB_HANDLER(READ8(*this, s6_state, sound_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w)) MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp index c3229e084d4..bcd6279b038 100644 --- a/src/mame/drivers/s6a.cpp +++ b/src/mame/drivers/s6a.cpp @@ -450,7 +450,7 @@ MACHINE_CONFIG_START(s6a_state::s6a) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPB_HANDLER(READ8(*this, s6a_state, sound_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w)) MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index 5edb8ef0f8d..019b5ae36b8 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -147,7 +147,7 @@ void s7_state::s7_main_map(address_map &map) { map.global_mask(0x7fff); map(0x0000, 0x00ff).ram().mirror(0x1000); - map(0x0100, 0x01ff).rw(this, FUNC(s7_state::nvram_r), FUNC(s7_state::nvram_w)); + map(0x0100, 0x01ff).rw(FUNC(s7_state::nvram_r), FUNC(s7_state::nvram_w)); map(0x0200, 0x03ff).ram().mirror(0x1000); map(0x1100, 0x11ff).ram(); map(0x2100, 0x2103).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids @@ -503,7 +503,7 @@ MACHINE_CONFIG_START(s7_state::s7) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPB_HANDLER(READ8(*this, s7_state, sound_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_WRITEPB_HANDLER(NOOP) MCFG_PIA_READCA1_HANDLER(VCC) MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w)) diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index ddf0fab4492..fc6e1db34a0 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -119,7 +119,7 @@ void s8_state::s8_main_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x07ff).ram().share("nvram"); map(0x2100, 0x2103).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).w(this, FUNC(s8_state::sol3_w)); // solenoids + map(0x2200, 0x2200).w(FUNC(s8_state::sol3_w)); // solenoids map(0x2400, 0x2403).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x3000, 0x3003).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs @@ -369,7 +369,7 @@ MACHINE_CONFIG_START(s8_state::s8) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, sound_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp index bcec8dd5f3c..93f362885ae 100644 --- a/src/mame/drivers/s8a.cpp +++ b/src/mame/drivers/s8a.cpp @@ -95,7 +95,7 @@ void s8a_state::s8a_main_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x07ff).ram().share("nvram"); map(0x2100, 0x2103).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).w(this, FUNC(s8a_state::sol3_w)); // solenoids + map(0x2200, 0x2200).w(FUNC(s8a_state::sol3_w)); // solenoids map(0x2400, 0x2403).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x3000, 0x3003).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs @@ -341,7 +341,7 @@ MACHINE_CONFIG_START(s8a_state::s8a) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(*this, s8a_state, sound_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index 2ea48175ff3..4c4c64ca5e1 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -107,7 +107,7 @@ void s9_state::s9_main_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x07ff).ram().share("nvram"); map(0x2100, 0x2103).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids - map(0x2200, 0x2200).w(this, FUNC(s9_state::sol3_w)); // solenoids + map(0x2200, 0x2200).w(FUNC(s9_state::sol3_w)); // solenoids map(0x2400, 0x2403).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps map(0x2800, 0x2803).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display map(0x3000, 0x3003).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs @@ -379,7 +379,7 @@ MACHINE_CONFIG_START(s9_state::s9) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, sound_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w)) MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) diff --git a/src/mame/drivers/sacstate.cpp b/src/mame/drivers/sacstate.cpp index 8943bd88bb9..fe225bb28fa 100644 --- a/src/mame/drivers/sacstate.cpp +++ b/src/mame/drivers/sacstate.cpp @@ -105,10 +105,10 @@ void sacstate_state::sacstate_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(sacstate_state::port00_r)); - map(0x01, 0x01).r(this, FUNC(sacstate_state::port01_r)); - map(0x04, 0x04).r(this, FUNC(sacstate_state::port04_r)); - map(0x08, 0x08).w(this, FUNC(sacstate_state::port08_w)); + map(0x00, 0x00).r(FUNC(sacstate_state::port00_r)); + map(0x01, 0x01).r(FUNC(sacstate_state::port01_r)); + map(0x04, 0x04).r(FUNC(sacstate_state::port04_r)); + map(0x08, 0x08).w(FUNC(sacstate_state::port08_w)); map(0x16, 0x16).w(m_terminal, FUNC(generic_terminal_device::write)); map(0x17, 0x1f).nopw(); } diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index 1c696e35067..3261b333432 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -345,10 +345,10 @@ void safarir_state::machine_start() void safarir_state::main_map(address_map &map) { map(0x0000, 0x17ff).rom(); - map(0x2000, 0x27ff).rw(this, FUNC(safarir_state::ram_r), FUNC(safarir_state::ram_w)).share("ram"); - map(0x2800, 0x2800).mirror(0x03ff).nopr().w(this, FUNC(safarir_state::ram_bank_w)); + map(0x2000, 0x27ff).rw(FUNC(safarir_state::ram_r), FUNC(safarir_state::ram_w)).share("ram"); + map(0x2800, 0x2800).mirror(0x03ff).nopr().w(FUNC(safarir_state::ram_bank_w)); map(0x2c00, 0x2c00).mirror(0x03ff).nopr().writeonly().share("bg_scroll"); - map(0x3000, 0x3000).mirror(0x03ff).w(this, FUNC(safarir_state::safarir_audio_w)); /* goes to SN76477 */ + map(0x3000, 0x3000).mirror(0x03ff).w(FUNC(safarir_state::safarir_audio_w)); /* goes to SN76477 */ map(0x3400, 0x3400).mirror(0x03ff).nopw(); /* cleared at the beginning */ map(0x3800, 0x3800).mirror(0x03ff).portr("INPUTS").nopw(); map(0x3c00, 0x3c00).mirror(0x03ff).portr("DSW").nopw(); diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp index 1ba2b6f544d..37940ef10cc 100644 --- a/src/mame/drivers/sage2.cpp +++ b/src/mame/drivers/sage2.cpp @@ -425,7 +425,7 @@ MACHINE_CONFIG_START(sage2_state::sage2) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sage2_state, ppi0_pc_w)) MCFG_DEVICE_ADD(I8255A_1_TAG, I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTB_CB(READ8(*this, sage2_state, ppi1_pb_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sage2_state, ppi1_pc_w)) diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp index 037c55112da..72536821f09 100644 --- a/src/mame/drivers/samcoupe.cpp +++ b/src/mame/drivers/samcoupe.cpp @@ -84,15 +84,7 @@ READ8_MEMBER(samcoupe_state::samcoupe_disk_r) m_fdc->set_floppy(floppy); /* bit 1 and 2 select the controller register */ - switch (offset & 0x03) - { - case 0: return m_fdc->status_r(); - case 1: return m_fdc->track_r(); - case 2: return m_fdc->sector_r(); - case 3: return m_fdc->data_r(); - } - - return 0xff; + return m_fdc->gen_r(offset & 0x03); } WRITE8_MEMBER(samcoupe_state::samcoupe_disk_w) @@ -106,13 +98,7 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_disk_w) m_fdc->set_floppy(floppy); /* bit 1 and 2 select the controller register */ - switch (offset & 0x03) - { - case 0: m_fdc->cmd_w(data); break; - case 1: m_fdc->track_w(data); break; - case 2: m_fdc->sector_w(data); break; - case 3: m_fdc->data_w(data); break; - } + return m_fdc->gen_w(offset & 0x03, data); } READ8_MEMBER(samcoupe_state::samcoupe_pen_r) @@ -305,28 +291,28 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_lpt2_strobe_w) void samcoupe_state::samcoupe_mem(address_map &map) { - map(0x0000, 0x3fff).ram().rw(this, FUNC(samcoupe_state::sam_bank1_r), FUNC(samcoupe_state::sam_bank1_w)); // AM_RAMBANK("bank1") - map(0x4000, 0x7fff).ram().rw(this, FUNC(samcoupe_state::sam_bank2_r), FUNC(samcoupe_state::sam_bank2_w)); // AM_RAMBANK("bank2") - map(0x8000, 0xbfff).ram().rw(this, FUNC(samcoupe_state::sam_bank3_r), FUNC(samcoupe_state::sam_bank3_w)); // AM_RAMBANK("bank3") - map(0xc000, 0xffff).ram().rw(this, FUNC(samcoupe_state::sam_bank4_r), FUNC(samcoupe_state::sam_bank4_w)); // AM_RAMBANK("bank4") + map(0x0000, 0x3fff).ram().rw(FUNC(samcoupe_state::sam_bank1_r), FUNC(samcoupe_state::sam_bank1_w)); // AM_RAMBANK("bank1") + map(0x4000, 0x7fff).ram().rw(FUNC(samcoupe_state::sam_bank2_r), FUNC(samcoupe_state::sam_bank2_w)); // AM_RAMBANK("bank2") + map(0x8000, 0xbfff).ram().rw(FUNC(samcoupe_state::sam_bank3_r), FUNC(samcoupe_state::sam_bank3_w)); // AM_RAMBANK("bank3") + map(0xc000, 0xffff).ram().rw(FUNC(samcoupe_state::sam_bank4_r), FUNC(samcoupe_state::sam_bank4_w)); // AM_RAMBANK("bank4") } void samcoupe_state::samcoupe_io(address_map &map) { - map(0x0080, 0x0081).select(0xff00).w(this, FUNC(samcoupe_state::samcoupe_ext_mem_w)); - map(0x00e0, 0x00e7).select(0xff10).rw(this, FUNC(samcoupe_state::samcoupe_disk_r), FUNC(samcoupe_state::samcoupe_disk_w)); - map(0x00e8, 0x00e8).select(0xff00).w("lpt1_data_out", FUNC(output_latch_device::write)); - map(0x00e9, 0x00e9).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_lpt1_busy_r), FUNC(samcoupe_state::samcoupe_lpt1_strobe_w)); - map(0x00ea, 0x00ea).select(0xff00).w("lpt2_data_out", FUNC(output_latch_device::write)); - map(0x00eb, 0x00eb).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_lpt2_busy_r), FUNC(samcoupe_state::samcoupe_lpt2_strobe_w)); - map(0x00f8, 0x00f8).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_pen_r), FUNC(samcoupe_state::samcoupe_clut_w)); - map(0x00f9, 0x00f9).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_status_r), FUNC(samcoupe_state::samcoupe_line_int_w)); - map(0x00fa, 0x00fa).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_lmpr_r), FUNC(samcoupe_state::samcoupe_lmpr_w)); - map(0x00fb, 0x00fb).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_hmpr_r), FUNC(samcoupe_state::samcoupe_hmpr_w)); - map(0x00fc, 0x00fc).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_vmpr_r), FUNC(samcoupe_state::samcoupe_vmpr_w)); - map(0x00fd, 0x00fd).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_midi_r), FUNC(samcoupe_state::samcoupe_midi_w)); - map(0x00fe, 0x00fe).select(0xff00).rw(this, FUNC(samcoupe_state::samcoupe_keyboard_r), FUNC(samcoupe_state::samcoupe_border_w)); - map(0x00ff, 0x00ff).select(0xff00).r(this, FUNC(samcoupe_state::samcoupe_attributes_r)); + map(0x0080, 0x0081).select(0xff00).w(FUNC(samcoupe_state::samcoupe_ext_mem_w)); + map(0x00e0, 0x00e7).select(0xff10).rw(FUNC(samcoupe_state::samcoupe_disk_r), FUNC(samcoupe_state::samcoupe_disk_w)); + map(0x00e8, 0x00e8).select(0xff00).w("lpt1_data_out", FUNC(output_latch_device::bus_w)); + map(0x00e9, 0x00e9).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lpt1_busy_r), FUNC(samcoupe_state::samcoupe_lpt1_strobe_w)); + map(0x00ea, 0x00ea).select(0xff00).w("lpt2_data_out", FUNC(output_latch_device::bus_w)); + map(0x00eb, 0x00eb).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lpt2_busy_r), FUNC(samcoupe_state::samcoupe_lpt2_strobe_w)); + map(0x00f8, 0x00f8).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_pen_r), FUNC(samcoupe_state::samcoupe_clut_w)); + map(0x00f9, 0x00f9).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_status_r), FUNC(samcoupe_state::samcoupe_line_int_w)); + map(0x00fa, 0x00fa).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lmpr_r), FUNC(samcoupe_state::samcoupe_lmpr_w)); + map(0x00fb, 0x00fb).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_hmpr_r), FUNC(samcoupe_state::samcoupe_hmpr_w)); + map(0x00fc, 0x00fc).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_vmpr_r), FUNC(samcoupe_state::samcoupe_vmpr_w)); + map(0x00fd, 0x00fd).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_midi_r), FUNC(samcoupe_state::samcoupe_midi_w)); + map(0x00fe, 0x00fe).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_keyboard_r), FUNC(samcoupe_state::samcoupe_border_w)); + map(0x00ff, 0x00ff).select(0xff00).r(FUNC(samcoupe_state::samcoupe_attributes_r)); map(0x00ff, 0x00ff).select(0xfe00).w("saa1099", FUNC(saa1099_device::data_w)); map(0x01ff, 0x01ff).select(0xfe00).w("saa1099", FUNC(saa1099_device::control_w)); } diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp index 4a61962e41c..db862a45b8f 100644 --- a/src/mame/drivers/sandscrp.cpp +++ b/src/mame/drivers/sandscrp.cpp @@ -278,7 +278,7 @@ WRITE8_MEMBER(sandscrp_state::soundlatch_w) void sandscrp_state::sandscrp(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x100000, 0x100001).w(this, FUNC(sandscrp_state::irq_cause_w)); // IRQ Ack + map(0x100000, 0x100001).w(FUNC(sandscrp_state::irq_cause_w)); // IRQ Ack map(0x700000, 0x70ffff).ram(); // RAM map(0x200000, 0x20001f).rw("calc1_mcu", FUNC(kaneko_hit_device::kaneko_hit_r), FUNC(kaneko_hit_device::kaneko_hit_w)); @@ -286,15 +286,15 @@ void sandscrp_state::sandscrp(address_map &map) map(0x400000, 0x403fff).rw(m_view2, FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_r), FUNC(kaneko_view2_tilemap_device::kaneko_tmap_vram_w)); map(0x500000, 0x501fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); // sprites map(0x600000, 0x600fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); // Palette - map(0xa00000, 0xa00001).w(this, FUNC(sandscrp_state::coincounter_w)); // Coin Counters (Lockout unused) + map(0xa00000, 0xa00001).w(FUNC(sandscrp_state::coincounter_w)); // Coin Counters (Lockout unused) map(0xb00000, 0xb00001).portr("P1"); map(0xb00002, 0xb00003).portr("P2"); map(0xb00004, 0xb00005).portr("SYSTEM"); map(0xb00006, 0xb00007).portr("UNK"); map(0xec0000, 0xec0001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x800000, 0x800001).r(this, FUNC(sandscrp_state::irq_cause_r)); // IRQ Cause - map(0xe00001, 0xe00001).rw(this, FUNC(sandscrp_state::soundlatch_r<1>), FUNC(sandscrp_state::soundlatch_w<0>)); // From/To Sound CPU - map(0xe40000, 0xe40001).rw(this, FUNC(sandscrp_state::latchstatus_word_r), FUNC(sandscrp_state::latchstatus_word_w)); // + map(0x800000, 0x800001).r(FUNC(sandscrp_state::irq_cause_r)); // IRQ Cause + map(0xe00001, 0xe00001).rw(FUNC(sandscrp_state::soundlatch_r<1>), FUNC(sandscrp_state::soundlatch_w<0>)); // From/To Sound CPU + map(0xe40000, 0xe40001).rw(FUNC(sandscrp_state::latchstatus_word_r), FUNC(sandscrp_state::latchstatus_word_w)); // } @@ -324,12 +324,12 @@ void sandscrp_state::sandscrp_soundmem(address_map &map) void sandscrp_state::sandscrp_soundport(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(sandscrp_state::bankswitch_w)); // ROM Bank + map(0x00, 0x00).w(FUNC(sandscrp_state::bankswitch_w)); // ROM Bank map(0x02, 0x03).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // PORTA/B read map(0x04, 0x04).w("oki", FUNC(okim6295_device::write)); // OKIM6295 - map(0x06, 0x06).w(this, FUNC(sandscrp_state::soundlatch_w<1>)); // - map(0x07, 0x07).r(this, FUNC(sandscrp_state::soundlatch_r<0>)); // - map(0x08, 0x08).r(this, FUNC(sandscrp_state::latchstatus_r)); // + map(0x06, 0x06).w(FUNC(sandscrp_state::soundlatch_w<1>)); // + map(0x07, 0x07).r(FUNC(sandscrp_state::soundlatch_r<0>)); // + map(0x08, 0x08).r(FUNC(sandscrp_state::latchstatus_r)); // } diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp index 0edc21881e7..186e0f01c70 100644 --- a/src/mame/drivers/sangho.cpp +++ b/src/mame/drivers/sangho.cpp @@ -313,11 +313,11 @@ void pzlestar_state::pzlestar_io_map(address_map &map) { map.global_mask(0xff); map(0x7c, 0x7d).w("ymsnd", FUNC(ym2413_device::write)); - map(0x91, 0x91).w(this, FUNC(pzlestar_state::pzlestar_bank_w)); + map(0x91, 0x91).w(FUNC(pzlestar_state::pzlestar_bank_w)); map(0x98, 0x9b).rw(m_v9958, FUNC(v9958_device::read), FUNC(v9958_device::write)); map(0xa0, 0xa0).portr("P1"); map(0xa1, 0xa1).portr("P2"); - map(0xa8, 0xa8).rw(this, FUNC(pzlestar_state::pzlestar_mem_bank_r), FUNC(pzlestar_state::pzlestar_mem_bank_w)); + map(0xa8, 0xa8).rw(FUNC(pzlestar_state::pzlestar_mem_bank_r), FUNC(pzlestar_state::pzlestar_mem_bank_w)); map(0xf7, 0xf7).portr("DSW"); } @@ -331,7 +331,7 @@ void sexyboom_state::sexyboom_io_map(address_map &map) map(0xa1, 0xa1).portr("P2"); map(0xf0, 0xf3).rw(m_v9958, FUNC(v9958_device::read), FUNC(v9958_device::write)); map(0xf7, 0xf7).portr("DSW"); - map(0xf8, 0xff).w(this, FUNC(sexyboom_state::sexyboom_bank_w)); + map(0xf8, 0xff).w(FUNC(sexyboom_state::sexyboom_bank_w)); } static INPUT_PORTS_START( sexyboom ) diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp index fdaf06e836a..750be9da40b 100644 --- a/src/mame/drivers/sanremo.cpp +++ b/src/mame/drivers/sanremo.cpp @@ -233,7 +233,7 @@ WRITE8_MEMBER(sanremo_state::banksel_w) void sanremo_state::sanremo_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(this, FUNC(sanremo_state::videoram_w)).share("videoram"); // 2x 76C28 (1x accessed directly, latched bank written to other like subsino etc.) + map(0x8000, 0x87ff).ram().w(FUNC(sanremo_state::videoram_w)).share("videoram"); // 2x 76C28 (1x accessed directly, latched bank written to other like subsino etc.) map(0xc000, 0xc7ff).ram().share("nvram"); // battery backed UM6116 } @@ -243,10 +243,10 @@ void sanremo_state::sanremo_portmap(address_map &map) map(0x01, 0x01).portr("IN0"); map(0x02, 0x02).portr("IN1"); map(0x04, 0x04).w("crtc", FUNC(mc6845_device::address_w)); - map(0x05, 0x05).w(this, FUNC(sanremo_state::lamps_w)); + map(0x05, 0x05).w(FUNC(sanremo_state::lamps_w)); map(0x14, 0x14).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x17, 0x17).w("ay8910", FUNC(ay8910_device::data_w)); - map(0x24, 0x24).w(this, FUNC(sanremo_state::banksel_w)); + map(0x24, 0x24).w(FUNC(sanremo_state::banksel_w)); map(0x27, 0x27).r("ay8910", FUNC(ay8910_device::data_r)); map(0x37, 0x37).w("ay8910", FUNC(ay8910_device::address_w)); } diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index 63c0e5480a5..f6f09c2593f 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -195,7 +195,7 @@ void sapi1_state::sapi1_mem(address_map &map) map(0x0000, 0x0fff).rom(); map(0x1000, 0x1fff).rom(); // Extension ROM map(0x2000, 0x23ff).ram(); - map(0x2400, 0x27ff).rw(this, FUNC(sapi1_state::sapi1_keyboard_r), FUNC(sapi1_state::sapi1_keyboard_w)); // PORT 0 - keyboard + map(0x2400, 0x27ff).rw(FUNC(sapi1_state::sapi1_keyboard_r), FUNC(sapi1_state::sapi1_keyboard_w)); // PORT 0 - keyboard //AM_RANGE(0x2800, 0x2bff) AM_NOP // PORT 1 //AM_RANGE(0x2c00, 0x2fff) AM_NOP // PORT 2 //AM_RANGE(0x3000, 0x33ff) AM_NOP // 3214 @@ -209,8 +209,8 @@ void sapi1_state::sapi2_mem(address_map &map) map(0x0000, 0x0fff).rom(); map(0x1000, 0x1fff).rom(); // Extension ROM map(0x2000, 0x23ff).ram(); - map(0x2400, 0x27ff).r(this, FUNC(sapi1_state::sapi2_keyboard_status_r)); - map(0x2800, 0x28ff).r(this, FUNC(sapi1_state::sapi2_keyboard_data_r)); + map(0x2400, 0x27ff).r(FUNC(sapi1_state::sapi2_keyboard_status_r)); + map(0x2800, 0x28ff).r(FUNC(sapi1_state::sapi2_keyboard_data_r)); map(0x3800, 0x3fff).ram().share("videoram"); // AND-1 (video RAM) map(0x4000, 0x7fff).ram(); // REM-1 } @@ -245,29 +245,29 @@ void sapi1_state::sapi3_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(sapi1_state::sapi3_00_w)); - map(0x25, 0x25).rw(this, FUNC(sapi1_state::sapi3_25_r), FUNC(sapi1_state::sapi3_25_w)); + map(0x00, 0x00).w(FUNC(sapi1_state::sapi3_00_w)); + map(0x25, 0x25).rw(FUNC(sapi1_state::sapi3_25_r), FUNC(sapi1_state::sapi3_25_w)); } void sapi1_state::sapi3a_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(sapi1_state::sapi3_00_w)); - map(0x10, 0x10).rw(this, FUNC(sapi1_state::uart_status_r), FUNC(sapi1_state::modem_control_w)); - map(0x11, 0x11).rw(this, FUNC(sapi1_state::uart_ready_r), FUNC(sapi1_state::uart_mode_w)); + map(0x00, 0x00).w(FUNC(sapi1_state::sapi3_00_w)); + map(0x10, 0x10).rw(FUNC(sapi1_state::uart_status_r), FUNC(sapi1_state::modem_control_w)); + map(0x11, 0x11).rw(FUNC(sapi1_state::uart_ready_r), FUNC(sapi1_state::uart_mode_w)); map(0x12, 0x12).rw(m_uart, FUNC(ay51013_device::receive), FUNC(ay51013_device::transmit)); - map(0x13, 0x13).w(this, FUNC(sapi1_state::uart_reset_w)); - map(0x25, 0x25).rw(this, FUNC(sapi1_state::sapi3_25_r), FUNC(sapi1_state::sapi3_25_w)); + map(0x13, 0x13).w(FUNC(sapi1_state::uart_reset_w)); + map(0x25, 0x25).rw(FUNC(sapi1_state::sapi3_25_r), FUNC(sapi1_state::sapi3_25_w)); } void sapi1_state::sapi3b_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(sapi1_state::sapi3_00_w)); - map(0x0c, 0x0c).r(this, FUNC(sapi1_state::sapi3_0c_r)); - map(0x25, 0x25).rw(this, FUNC(sapi1_state::sapi3_25_r), FUNC(sapi1_state::sapi3_25_w)); + map(0x00, 0x00).w(FUNC(sapi1_state::sapi3_00_w)); + map(0x0c, 0x0c).r(FUNC(sapi1_state::sapi3_0c_r)); + map(0x25, 0x25).rw(FUNC(sapi1_state::sapi3_25_r), FUNC(sapi1_state::sapi3_25_w)); map(0xe0, 0xe0).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0xe1, 0xe1).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index 3e50fef8d7c..a983b5386a9 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -522,26 +522,26 @@ void sat_console_state::saturn_mem(address_map &map) { map(0x00000000, 0x0007ffff).rom().mirror(0x20000000).region("bios", 0).nopw(); // bios map(0x00100000, 0x0010007f).rw(m_smpc_hle, FUNC(smpc_hle_device::read), FUNC(smpc_hle_device::write)); - map(0x00180000, 0x0018ffff).rw(this, FUNC(sat_console_state::saturn_backupram_r), FUNC(sat_console_state::saturn_backupram_w)).share("share1"); + map(0x00180000, 0x0018ffff).rw(FUNC(sat_console_state::saturn_backupram_r), FUNC(sat_console_state::saturn_backupram_w)).share("share1"); map(0x00200000, 0x002fffff).ram().mirror(0x20100000).share("workram_l"); - map(0x01000000, 0x017fffff).w(this, FUNC(sat_console_state::saturn_minit_w)); - map(0x01800000, 0x01ffffff).w(this, FUNC(sat_console_state::saturn_sinit_w)); + map(0x01000000, 0x017fffff).w(FUNC(sat_console_state::saturn_minit_w)); + map(0x01800000, 0x01ffffff).w(FUNC(sat_console_state::saturn_sinit_w)); // AM_RANGE(0x02000000, 0x023fffff) AM_ROM AM_MIRROR(0x20000000) // Cartridge area // AM_RANGE(0x02400000, 0x027fffff) AM_RAM // External Data RAM area // AM_RANGE(0x04000000, 0x047fffff) AM_RAM // External Battery RAM area - map(0x04ffffff, 0x04ffffff).r(this, FUNC(sat_console_state::saturn_cart_type_r)); - map(0x05000000, 0x057fffff).r(this, FUNC(sat_console_state::abus_dummy_r)); + map(0x04ffffff, 0x04ffffff).r(FUNC(sat_console_state::saturn_cart_type_r)); + map(0x05000000, 0x057fffff).r(FUNC(sat_console_state::abus_dummy_r)); map(0x05800000, 0x0589ffff).rw(m_stvcd, FUNC(stvcd_device::stvcd_r), FUNC(stvcd_device::stvcd_w)); /* Sound */ - map(0x05a00000, 0x05a7ffff).rw(this, FUNC(sat_console_state::saturn_soundram_r), FUNC(sat_console_state::saturn_soundram_w)); + map(0x05a00000, 0x05a7ffff).rw(FUNC(sat_console_state::saturn_soundram_r), FUNC(sat_console_state::saturn_soundram_w)); map(0x05b00000, 0x05b00fff).rw("scsp", FUNC(scsp_device::read), FUNC(scsp_device::write)); /* VDP1 */ - map(0x05c00000, 0x05c7ffff).rw(this, FUNC(sat_console_state::saturn_vdp1_vram_r), FUNC(sat_console_state::saturn_vdp1_vram_w)); - map(0x05c80000, 0x05cbffff).rw(this, FUNC(sat_console_state::saturn_vdp1_framebuffer0_r), FUNC(sat_console_state::saturn_vdp1_framebuffer0_w)); - map(0x05d00000, 0x05d0001f).rw(this, FUNC(sat_console_state::saturn_vdp1_regs_r), FUNC(sat_console_state::saturn_vdp1_regs_w)); - map(0x05e00000, 0x05e7ffff).mirror(0x80000).rw(this, FUNC(sat_console_state::saturn_vdp2_vram_r), FUNC(sat_console_state::saturn_vdp2_vram_w)); - map(0x05f00000, 0x05f7ffff).rw(this, FUNC(sat_console_state::saturn_vdp2_cram_r), FUNC(sat_console_state::saturn_vdp2_cram_w)); - map(0x05f80000, 0x05fbffff).rw(this, FUNC(sat_console_state::saturn_vdp2_regs_r), FUNC(sat_console_state::saturn_vdp2_regs_w)); + map(0x05c00000, 0x05c7ffff).rw(FUNC(sat_console_state::saturn_vdp1_vram_r), FUNC(sat_console_state::saturn_vdp1_vram_w)); + map(0x05c80000, 0x05cbffff).rw(FUNC(sat_console_state::saturn_vdp1_framebuffer0_r), FUNC(sat_console_state::saturn_vdp1_framebuffer0_w)); + map(0x05d00000, 0x05d0001f).rw(FUNC(sat_console_state::saturn_vdp1_regs_r), FUNC(sat_console_state::saturn_vdp1_regs_w)); + map(0x05e00000, 0x05e7ffff).mirror(0x80000).rw(FUNC(sat_console_state::saturn_vdp2_vram_r), FUNC(sat_console_state::saturn_vdp2_vram_w)); + map(0x05f00000, 0x05f7ffff).rw(FUNC(sat_console_state::saturn_vdp2_cram_r), FUNC(sat_console_state::saturn_vdp2_cram_w)); + map(0x05f80000, 0x05fbffff).rw(FUNC(sat_console_state::saturn_vdp2_regs_r), FUNC(sat_console_state::saturn_vdp2_regs_w)); map(0x05fe0000, 0x05fe00cf).m(m_scu, FUNC(sega_scu_device::regs_map)); //AM_READWRITE(saturn_scu_r, saturn_scu_w) map(0x06000000, 0x060fffff).ram().mirror(0x21f00000).share("workram_h"); map(0x45000000, 0x46ffffff).nopw(); diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index f239cd1f5f5..efa7fb2589b 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -190,10 +190,10 @@ void sauro_state::sauro_map(address_map &map) map(0x0000, 0xdfff).rom(); map(0xe000, 0xe7ff).ram().share("nvram"); map(0xe800, 0xebff).ram().share("spriteram"); - map(0xf000, 0xf3ff).ram().w(this, FUNC(sauro_state::videoram_w)).share("videoram"); - map(0xf400, 0xf7ff).ram().w(this, FUNC(sauro_state::colorram_w)).share("colorram"); - map(0xf800, 0xfbff).ram().w(this, FUNC(sauro_state::sauro_videoram2_w)).share("videoram2"); - map(0xfc00, 0xffff).ram().w(this, FUNC(sauro_state::sauro_colorram2_w)).share("colorram2"); + map(0xf000, 0xf3ff).ram().w(FUNC(sauro_state::videoram_w)).share("videoram"); + map(0xf400, 0xf7ff).ram().w(FUNC(sauro_state::colorram_w)).share("colorram"); + map(0xf800, 0xfbff).ram().w(FUNC(sauro_state::sauro_videoram2_w)).share("videoram2"); + map(0xfc00, 0xffff).ram().w(FUNC(sauro_state::sauro_colorram2_w)).share("colorram2"); } void sauro_state::sauro_io_map(address_map &map) @@ -203,9 +203,9 @@ void sauro_state::sauro_io_map(address_map &map) map(0x20, 0x20).portr("DSW2"); map(0x40, 0x40).portr("P1"); map(0x60, 0x60).portr("P2"); - map(0x80, 0x80).w(this, FUNC(sauro_state::sauro_sound_command_w)); - map(0xa0, 0xa0).w(this, FUNC(sauro_state::scroll_bg_w)); - map(0xa1, 0xa1).w(this, FUNC(sauro_state::sauro_scroll_fg_w)); + map(0x80, 0x80).w(FUNC(sauro_state::sauro_sound_command_w)); + map(0xa0, 0xa0).w(FUNC(sauro_state::scroll_bg_w)); + map(0xa1, 0xa1).w(FUNC(sauro_state::sauro_scroll_fg_w)); map(0xc0, 0xcf).w("mainlatch", FUNC(ls259_device::write_a0)); map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } @@ -215,8 +215,8 @@ void sauro_state::sauro_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0xc000, 0xc001).w("ymsnd", FUNC(ym3812_device::write)); - map(0xa000, 0xa000).w(this, FUNC(sauro_state::adpcm_w)); - map(0xe000, 0xe000).r(this, FUNC(sauro_state::sauro_sound_command_r)); + map(0xa000, 0xa000).w(FUNC(sauro_state::adpcm_w)); + map(0xe000, 0xe000).r(FUNC(sauro_state::sauro_sound_command_r)); map(0xe000, 0xe006).nopw(); /* echo from write to e0000 */ map(0xe00e, 0xe00f).nopw(); } @@ -228,7 +228,7 @@ void sauro_state::saurob_sound_map(address_map &map) map(0x8000, 0x87ff).ram(); map(0xc000, 0xc001).w("ymsnd", FUNC(ym3812_device::write)); map(0xa000, 0xa000).nopw(); - map(0xe000, 0xe000).r(this, FUNC(sauro_state::sauro_sound_command_r)); + map(0xe000, 0xe000).r(FUNC(sauro_state::sauro_sound_command_r)); map(0xe000, 0xe006).nopw(); /* echo from write to e0000 */ map(0xe00e, 0xe00f).nopw(); } @@ -239,15 +239,15 @@ void sauro_state::trckydoc_map(address_map &map) map(0x0000, 0xdfff).rom(); map(0xe000, 0xe7ff).ram().share("nvram"); map(0xe800, 0xebff).ram().mirror(0x400).share("spriteram"); - map(0xf000, 0xf3ff).ram().w(this, FUNC(sauro_state::videoram_w)).share("videoram"); - map(0xf400, 0xf7ff).ram().w(this, FUNC(sauro_state::colorram_w)).share("colorram"); + map(0xf000, 0xf3ff).ram().w(FUNC(sauro_state::videoram_w)).share("videoram"); + map(0xf400, 0xf7ff).ram().w(FUNC(sauro_state::colorram_w)).share("colorram"); map(0xf800, 0xf800).portr("DSW1"); map(0xf808, 0xf808).portr("DSW2"); map(0xf810, 0xf810).portr("P1"); map(0xf818, 0xf818).portr("P2"); map(0xf820, 0xf821).w("ymsnd", FUNC(ym3812_device::write)); map(0xf828, 0xf828).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xf830, 0xf830).w(this, FUNC(sauro_state::scroll_bg_w)); + map(0xf830, 0xf830).w(FUNC(sauro_state::scroll_bg_w)); map(0xf838, 0xf83f).w("mainlatch", FUNC(ls259_device::write_d0)); } diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp index d2f547d758c..db683288005 100644 --- a/src/mame/drivers/savquest.cpp +++ b/src/mame/drivers/savquest.cpp @@ -740,13 +740,13 @@ void savquest_state::savquest_map(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x0009ffff).ram(); - map(0x000a0000, 0x000bffff).rw(this, FUNC(savquest_state::smram_r), FUNC(savquest_state::smram_w)); //AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) + map(0x000a0000, 0x000bffff).rw(FUNC(savquest_state::smram_r), FUNC(savquest_state::smram_w)); //AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0); - map(0x000f0000, 0x000fffff).bankr("bios_f0000").w(this, FUNC(savquest_state::bios_f0000_ram_w)); - map(0x000e0000, 0x000e3fff).bankr("bios_e0000").w(this, FUNC(savquest_state::bios_e0000_ram_w)); - map(0x000e4000, 0x000e7fff).bankr("bios_e4000").w(this, FUNC(savquest_state::bios_e4000_ram_w)); - map(0x000e8000, 0x000ebfff).bankr("bios_e8000").w(this, FUNC(savquest_state::bios_e8000_ram_w)); - map(0x000ec000, 0x000effff).bankr("bios_ec000").w(this, FUNC(savquest_state::bios_ec000_ram_w)); + map(0x000f0000, 0x000fffff).bankr("bios_f0000").w(FUNC(savquest_state::bios_f0000_ram_w)); + map(0x000e0000, 0x000e3fff).bankr("bios_e0000").w(FUNC(savquest_state::bios_e0000_ram_w)); + map(0x000e4000, 0x000e7fff).bankr("bios_e4000").w(FUNC(savquest_state::bios_e4000_ram_w)); + map(0x000e8000, 0x000ebfff).bankr("bios_e8000").w(FUNC(savquest_state::bios_e8000_ram_w)); + map(0x000ec000, 0x000effff).bankr("bios_ec000").w(FUNC(savquest_state::bios_ec000_ram_w)); map(0x00100000, 0x07ffffff).ram(); // 128MB RAM map(0xe0000000, 0xe0fbffff).rw(m_voodoo, FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); map(0xfffc0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ @@ -759,14 +759,14 @@ void savquest_state::savquest_io(address_map &map) map(0x00e8, 0x00ef).noprw(); - map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::read_cs0), FUNC(ide_controller_32_device::write_cs0)); - map(0x0378, 0x037b).rw(this, FUNC(savquest_state::parallel_port_r), FUNC(savquest_state::parallel_port_w)); + map(0x0170, 0x0177).rw("ide2", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_32_device::cs0_r), FUNC(ide_controller_32_device::cs0_w)); + map(0x0378, 0x037b).rw(FUNC(savquest_state::parallel_port_r), FUNC(savquest_state::parallel_port_w)); map(0x03b0, 0x03bf).rw(m_vga, FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w)); map(0x03c0, 0x03cf).rw(m_vga, FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw(m_vga, FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); - map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::read_cs1), FUNC(ide_controller_32_device::write_cs1)); + map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index a9730c684d7..88174e3f4e0 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -80,8 +80,8 @@ WRITE_LINE_MEMBER(sbasketb_state::irq_mask_w) void sbasketb_state::sbasketb_map(address_map &map) { map(0x2000, 0x2fff).ram(); - map(0x3000, 0x33ff).ram().w(this, FUNC(sbasketb_state::sbasketb_colorram_w)).share(m_colorram); - map(0x3400, 0x37ff).ram().w(this, FUNC(sbasketb_state::sbasketb_videoram_w)).share(m_videoram); + map(0x3000, 0x33ff).ram().w(FUNC(sbasketb_state::sbasketb_colorram_w)).share(m_colorram); + map(0x3400, 0x37ff).ram().w(FUNC(sbasketb_state::sbasketb_videoram_w)).share(m_videoram); map(0x3800, 0x39ff).ram().share(m_spriteram); map(0x3a00, 0x3bff).ram(); /* Probably unused, but initialized */ map(0x3c00, 0x3c00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); @@ -89,7 +89,7 @@ void sbasketb_state::sbasketb_map(address_map &map) map(0x3c20, 0x3c20).writeonly().share(m_palettebank); map(0x3c80, 0x3c87).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x3d00, 0x3d00).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x3d80, 0x3d80).w(this, FUNC(sbasketb_state::sbasketb_sh_irqtrigger_w)); + map(0x3d80, 0x3d80).w(FUNC(sbasketb_state::sbasketb_sh_irqtrigger_w)); map(0x3e00, 0x3e00).portr("SYSTEM"); map(0x3e01, 0x3e01).portr("P1"); map(0x3e02, 0x3e02).portr("P2"); @@ -108,9 +108,9 @@ void sbasketb_state::sbasketb_sound_map(address_map &map) map(0x8000, 0x8000).r(m_soundbrd, FUNC(trackfld_audio_device::hyperspt_sh_timer_r)); map(0xa000, 0xa000).w(m_vlm, FUNC(vlm5030_device::data_w)); /* speech data */ map(0xc000, 0xdfff).w(m_soundbrd, FUNC(trackfld_audio_device::hyperspt_sound_w)); /* speech and output control */ - map(0xe000, 0xe000).w(m_dac, FUNC(dac_byte_interface::write)); - map(0xe001, 0xe001).w(this, FUNC(sbasketb_state::konami_SN76496_latch_w)); /* Loads the snd command into the snd latch */ - map(0xe002, 0xe002).w(this, FUNC(sbasketb_state::konami_SN76496_w)); /* This address triggers the SN chip to read the data port. */ + map(0xe000, 0xe000).w(m_dac, FUNC(dac_byte_interface::data_w)); + map(0xe001, 0xe001).w(FUNC(sbasketb_state::konami_SN76496_latch_w)); /* Loads the snd command into the snd latch */ + map(0xe002, 0xe002).w(FUNC(sbasketb_state::konami_SN76496_w)); /* This address triggers the SN chip to read the data port. */ } diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp index 8cad8f9c9de..1daad70503e 100644 --- a/src/mame/drivers/sbc6510.cpp +++ b/src/mame/drivers/sbc6510.cpp @@ -98,7 +98,7 @@ void sbc6510_state::sbc6510_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0001).ram(); - map(0x0002, 0x0002).rw(this, FUNC(sbc6510_state::a2_r), FUNC(sbc6510_state::a2_w)); + map(0x0002, 0x0002).rw(FUNC(sbc6510_state::a2_r), FUNC(sbc6510_state::a2_w)); map(0x0003, 0xdfff).ram(); map(0xe000, 0xe00f).mirror(0x1f0).rw("cia6526", FUNC(mos6526_device::read), FUNC(mos6526_device::write)); map(0xe800, 0xe800).mirror(0x1ff).w("ay8910", FUNC(ay8910_device::address_w)); diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp index d3bc30d264c..c3cc1ec9274 100644 --- a/src/mame/drivers/sbowling.cpp +++ b/src/mame/drivers/sbowling.cpp @@ -250,7 +250,7 @@ READ8_MEMBER(sbowling_state::controls_r) void sbowling_state::main_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x8000, 0xbfff).ram().w(this, FUNC(sbowling_state::videoram_w)).share("videoram"); + map(0x8000, 0xbfff).ram().w(FUNC(sbowling_state::videoram_w)).share("videoram"); map(0xf800, 0xf801).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xf801, 0xf801).r("aysnd", FUNC(ay8910_device::data_r)); map(0xfc00, 0xffff).ram(); @@ -260,11 +260,11 @@ void sbowling_state::main_map(address_map &map) void sbowling_state::port_map(address_map &map) { map(0x00, 0x00).portr("IN0").w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x01, 0x01).rw(this, FUNC(sbowling_state::controls_r), FUNC(sbowling_state::pix_data_w)); - map(0x02, 0x02).rw(this, FUNC(sbowling_state::pix_data_r), FUNC(sbowling_state::pix_shift_w)); + map(0x01, 0x01).rw(FUNC(sbowling_state::controls_r), FUNC(sbowling_state::pix_data_w)); + map(0x02, 0x02).rw(FUNC(sbowling_state::pix_data_r), FUNC(sbowling_state::pix_shift_w)); map(0x03, 0x03).portr("IN1").nopw(); - map(0x04, 0x04).portr("DSW0").w(this, FUNC(sbowling_state::system_w)); - map(0x05, 0x05).portr("DSW1").w(this, FUNC(sbowling_state::graph_control_w)); + map(0x04, 0x04).portr("DSW0").w(FUNC(sbowling_state::system_w)); + map(0x05, 0x05).portr("DSW1").w(FUNC(sbowling_state::graph_control_w)); } diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index 1570dafc161..444362b422b 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -138,11 +138,11 @@ void sbrain_state::sbrain_io(address_map &map) map.global_mask(0xff); map(0x40, 0x40).mirror(6).rw(m_u0, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x41, 0x41).mirror(6).rw(m_u0, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x48, 0x4f).r(this, FUNC(sbrain_state::port48_r)); //chr_int_latch - map(0x50, 0x57).r(this, FUNC(sbrain_state::port50_r)); + map(0x48, 0x4f).r(FUNC(sbrain_state::port48_r)); //chr_int_latch + map(0x50, 0x57).r(FUNC(sbrain_state::port50_r)); map(0x58, 0x58).mirror(6).rw(m_u1, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x59, 0x59).mirror(6).rw(m_u1, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x60, 0x67).w(this, FUNC(sbrain_state::baud_w)); + map(0x60, 0x67).w(FUNC(sbrain_state::baud_w)); map(0x68, 0x6b).mirror(4).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); } @@ -156,7 +156,7 @@ void sbrain_state::sbrain_subio(address_map &map) { map.global_mask(0xff); map(0x08, 0x0b).rw(m_fdc, FUNC(fd1791_device::read), FUNC(fd1791_device::write)); - map(0x10, 0x10).rw(this, FUNC(sbrain_state::port10_r), FUNC(sbrain_state::port10_w)); + map(0x10, 0x10).rw(FUNC(sbrain_state::port10_r), FUNC(sbrain_state::port10_w)); } @@ -204,8 +204,8 @@ WRITE8_MEMBER( sbrain_state::port10_w ) WRITE8_MEMBER( sbrain_state::baud_w ) { - m_brg->str_w(data & 0x0f); - m_brg->stt_w(data >> 4); + m_brg->write_str(data & 0x0f); + m_brg->write_stt(data >> 4); } READ8_MEMBER( sbrain_state::ppi_pa_r ) diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp index 6a83b071342..16d3d6c142c 100644 --- a/src/mame/drivers/sbrkout.cpp +++ b/src/mame/drivers/sbrkout.cpp @@ -400,16 +400,16 @@ void sbrkout_state::main_map(address_map &map) { map.global_mask(0x3fff); map(0x0000, 0x007f).mirror(0x380).bankrw("bank1"); - map(0x0400, 0x07ff).ram().w(this, FUNC(sbrkout_state::sbrkout_videoram_w)).share("videoram"); - map(0x0800, 0x083f).r(this, FUNC(sbrkout_state::switches_r)); + map(0x0400, 0x07ff).ram().w(FUNC(sbrkout_state::sbrkout_videoram_w)).share("videoram"); + map(0x0800, 0x083f).r(FUNC(sbrkout_state::switches_r)); map(0x0840, 0x0840).mirror(0x003f).portr("COIN"); map(0x0880, 0x0880).mirror(0x003f).portr("START"); map(0x08c0, 0x08c0).mirror(0x003f).portr("SERVICE"); - map(0x0c00, 0x0c00).mirror(0x03ff).r(this, FUNC(sbrkout_state::sync_r)); - map(0x0c00, 0x0c7f).w(this, FUNC(sbrkout_state::output_latch_w)); + map(0x0c00, 0x0c00).mirror(0x03ff).r(FUNC(sbrkout_state::sync_r)); + map(0x0c00, 0x0c7f).w(FUNC(sbrkout_state::output_latch_w)); map(0x0c80, 0x0c80).mirror(0x007f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0e00, 0x0e00).mirror(0x007f).w(this, FUNC(sbrkout_state::irq_ack_w)); - map(0x1000, 0x1000).mirror(0x03ff).r(this, FUNC(sbrkout_state::sync2_r)); + map(0x0e00, 0x0e00).mirror(0x007f).w(FUNC(sbrkout_state::irq_ack_w)); + map(0x1000, 0x1000).mirror(0x03ff).r(FUNC(sbrkout_state::sync2_r)); map(0x2800, 0x3fff).rom(); } diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp index a5135dde331..b7870da3b67 100644 --- a/src/mame/drivers/sbugger.cpp +++ b/src/mame/drivers/sbugger.cpp @@ -114,8 +114,8 @@ Sound PCB void sbugger_state::sbugger_map(address_map &map) { map(0x0000, 0x37ff).rom(); - map(0xc800, 0xcbff).ram().w(this, FUNC(sbugger_state::videoram_attr_w)).share("videoram_attr"); - map(0xcc00, 0xcfff).ram().w(this, FUNC(sbugger_state::videoram_w)).share("videoram"); + map(0xc800, 0xcbff).ram().w(FUNC(sbugger_state::videoram_attr_w)).share("videoram_attr"); + map(0xcc00, 0xcfff).ram().w(FUNC(sbugger_state::videoram_w)).share("videoram"); map(0xe000, 0xe0ff).rw("i8156", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); /* sp is set to e0ff */ map(0xf400, 0xffff).ram(); } @@ -123,8 +123,8 @@ void sbugger_state::sbugger_map(address_map &map) void sbugger_state::sbugger_io_map(address_map &map) { map(0xe0, 0xe7).rw("i8156", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w)); - map(0xe8, 0xe8).w("sn76489.1", FUNC(sn76489_device::write)); - map(0xe9, 0xe9).w("sn76489.2", FUNC(sn76489_device::write)); + map(0xe8, 0xe8).w("sn76489.1", FUNC(sn76489_device::command_w)); + map(0xe9, 0xe9).w("sn76489.2", FUNC(sn76489_device::command_w)); } diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp index d7ad7be97bb..7e2d944cbed 100644 --- a/src/mame/drivers/sc1.cpp +++ b/src/mame/drivers/sc1.cpp @@ -117,7 +117,7 @@ void sc1_state::sc1_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x80, 0x83).rw("z80pio", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0xfc, 0xfc).w(this, FUNC(sc1_state::matrix_w)); + map(0xfc, 0xfc).w(FUNC(sc1_state::matrix_w)); } /* Input ports */ diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp index ad8f2890016..0e8c72e1562 100644 --- a/src/mame/drivers/sc2.cpp +++ b/src/mame/drivers/sc2.cpp @@ -72,7 +72,7 @@ void sc2_state::sc2_mem(address_map &map) map(0x0000, 0x0fff).rom(); map(0x1000, 0x13ff).ram(); map(0x2000, 0x33ff).rom(); - map(0x3c00, 0x3c00).r(this, FUNC(sc2_state::sc2_beep)); + map(0x3c00, 0x3c00).r(FUNC(sc2_state::sc2_beep)); } void sc2_state::sc2_io(address_map &map) diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp index 1acaa019904..2f856995bfd 100644 --- a/src/mame/drivers/scobra.cpp +++ b/src/mame/drivers/scobra.cpp @@ -142,18 +142,18 @@ void scobra_state::type1_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); - map(0x9000, 0x903f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); + map(0x8800, 0x8bff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); + map(0x9000, 0x903f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); map(0x9040, 0x905f).ram().share("spriteram"); map(0x9060, 0x907f).ram().share("bulletsram"); map(0x9080, 0x90ff).ram(); map(0x9800, 0x9803).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xa000, 0xa003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa801, 0xa801).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); - map(0xa802, 0xa802).w(this, FUNC(scobra_state::galaxold_coin_counter_w)); - map(0xa804, 0xa804).w(this, FUNC(scobra_state::galaxold_stars_enable_w)); - map(0xa806, 0xa806).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); - map(0xa807, 0xa807).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); + map(0xa801, 0xa801).w(FUNC(scobra_state::galaxold_nmi_enable_w)); + map(0xa802, 0xa802).w(FUNC(scobra_state::galaxold_coin_counter_w)); + map(0xa804, 0xa804).w(FUNC(scobra_state::galaxold_stars_enable_w)); + map(0xa806, 0xa806).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); + map(0xa807, 0xa807).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); map(0xb000, 0xb000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -161,73 +161,73 @@ void scobra_state::type2_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x883f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); + map(0x8800, 0x883f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); map(0x8840, 0x885f).ram().share("spriteram"); map(0x8860, 0x887f).ram().share("bulletsram"); map(0x8880, 0x88ff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); + map(0x9000, 0x93ff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); map(0x9800, 0x9800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xa000, 0xa00f).rw(this, FUNC(scobra_state::scobra_type2_ppi8255_0_r), FUNC(scobra_state::scobra_type2_ppi8255_0_w)); - map(0xa800, 0xa80f).rw(this, FUNC(scobra_state::scobra_type2_ppi8255_1_r), FUNC(scobra_state::scobra_type2_ppi8255_1_w)); - map(0xb000, 0xb000).w(this, FUNC(scobra_state::galaxold_stars_enable_w)); - map(0xb004, 0xb004).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); - map(0xb006, 0xb006).w(this, FUNC(scobra_state::galaxold_coin_counter_0_w)); - map(0xb008, 0xb008).w(this, FUNC(scobra_state::galaxold_coin_counter_1_w)); - map(0xb00c, 0xb00c).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); - map(0xb00e, 0xb00e).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); + map(0xa000, 0xa00f).rw(FUNC(scobra_state::scobra_type2_ppi8255_0_r), FUNC(scobra_state::scobra_type2_ppi8255_0_w)); + map(0xa800, 0xa80f).rw(FUNC(scobra_state::scobra_type2_ppi8255_1_r), FUNC(scobra_state::scobra_type2_ppi8255_1_w)); + map(0xb000, 0xb000).w(FUNC(scobra_state::galaxold_stars_enable_w)); + map(0xb004, 0xb004).w(FUNC(scobra_state::galaxold_nmi_enable_w)); + map(0xb006, 0xb006).w(FUNC(scobra_state::galaxold_coin_counter_0_w)); + map(0xb008, 0xb008).w(FUNC(scobra_state::galaxold_coin_counter_1_w)); + map(0xb00c, 0xb00c).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); + map(0xb00e, 0xb00e).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); } void scobra_state::tazmani3_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x883f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); + map(0x8800, 0x883f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); map(0x8840, 0x885f).ram().share("spriteram"); map(0x8860, 0x887f).ram().share("bulletsram"); map(0x8880, 0x88ff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); + map(0x9000, 0x93ff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); map(0x9800, 0x9800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xa000, 0xa003).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xa800, 0xa803).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xb000, 0xb000).w(this, FUNC(scobra_state::galaxold_stars_enable_w)); - map(0xb001, 0xb001).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); - map(0xb006, 0xb006).w(this, FUNC(scobra_state::galaxold_coin_counter_0_w)); - map(0xb008, 0xb008).w(this, FUNC(scobra_state::galaxold_coin_counter_1_w)); - map(0xb00c, 0xb00c).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); - map(0xb00e, 0xb00e).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); + map(0xb000, 0xb000).w(FUNC(scobra_state::galaxold_stars_enable_w)); + map(0xb001, 0xb001).w(FUNC(scobra_state::galaxold_nmi_enable_w)); + map(0xb006, 0xb006).w(FUNC(scobra_state::galaxold_coin_counter_0_w)); + map(0xb008, 0xb008).w(FUNC(scobra_state::galaxold_coin_counter_1_w)); + map(0xb00c, 0xb00c).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); + map(0xb00e, 0xb00e).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); } void scobra_state::hustler_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); - map(0x9000, 0x903f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); + map(0x8800, 0x8bff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); + map(0x9000, 0x903f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); map(0x9040, 0x905f).ram().share("spriteram"); map(0x9060, 0x907f).ram().share("bulletsram"); map(0x9080, 0x90ff).ram(); - map(0xa802, 0xa802).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); - map(0xa804, 0xa804).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); - map(0xa806, 0xa806).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); + map(0xa802, 0xa802).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); + map(0xa804, 0xa804).w(FUNC(scobra_state::galaxold_nmi_enable_w)); + map(0xa806, 0xa806).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); map(0xa80e, 0xa80e).nopw(); /* coin counters */ map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xd000, 0xd01f).rw(this, FUNC(scobra_state::hustler_ppi8255_0_r), FUNC(scobra_state::hustler_ppi8255_0_w)); - map(0xe000, 0xe01f).rw(this, FUNC(scobra_state::hustler_ppi8255_1_r), FUNC(scobra_state::hustler_ppi8255_1_w)); + map(0xd000, 0xd01f).rw(FUNC(scobra_state::hustler_ppi8255_0_r), FUNC(scobra_state::hustler_ppi8255_0_w)); + map(0xe000, 0xe01f).rw(FUNC(scobra_state::hustler_ppi8255_1_r), FUNC(scobra_state::hustler_ppi8255_1_w)); } void scobra_state::hustlerb_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); - map(0x9000, 0x903f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); + map(0x8800, 0x8bff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); + map(0x9000, 0x903f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); map(0x9040, 0x905f).ram().share("spriteram"); map(0x9060, 0x907f).ram().share("bulletsram"); map(0x9080, 0x90ff).ram(); - map(0xa801, 0xa801).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); + map(0xa801, 0xa801).w(FUNC(scobra_state::galaxold_nmi_enable_w)); map(0xa802, 0xa802).nopw(); /* coin counters */ - map(0xa806, 0xa806).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); - map(0xa807, 0xa807).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); + map(0xa806, 0xa806).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); + map(0xa807, 0xa807).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); map(0xb000, 0xb000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xc100, 0xc103).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc200, 0xc203).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -238,17 +238,17 @@ void scobra_state::mimonkey_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); - map(0x9000, 0x903f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); + map(0x8800, 0x8bff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram").mirror(0x0400); + map(0x9000, 0x903f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); map(0x9040, 0x905f).ram().share("spriteram"); map(0x9060, 0x907f).ram().share("bulletsram"); map(0x9080, 0x90ff).ram(); map(0x9800, 0x9803).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xa000, 0xa003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa800, 0xa802).w(this, FUNC(scobra_state::galaxold_gfxbank_w)); - map(0xa801, 0xa801).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); - map(0xa806, 0xa806).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); - map(0xa807, 0xa807).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); + map(0xa800, 0xa802).w(FUNC(scobra_state::galaxold_gfxbank_w)); + map(0xa801, 0xa801).w(FUNC(scobra_state::galaxold_nmi_enable_w)); + map(0xa806, 0xa806).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); + map(0xa807, 0xa807).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); map(0xb000, 0xb000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xc000, 0xffff).rom(); } @@ -258,8 +258,8 @@ void scobra_state::rescuefe_map(address_map &map) { map(0x0000, 0x05ff).rom(); map(0x0600, 0x0fff).ram(); // sets stack here - map(0x1000, 0x13ff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); - map(0x1400, 0x143f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); + map(0x1000, 0x13ff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); + map(0x1400, 0x143f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); map(0x1440, 0x145f).ram().share("spriteram"); map(0x1460, 0x147f).ram().share("bulletsram"); map(0x1480, 0x14ff).ram(); @@ -271,10 +271,10 @@ void scobra_state::rescuefe_map(address_map &map) map(0xa600, 0xa6ff).rom(); // wrong (taunt string) jumps to around a600 so something must map in this area? - map(0xEA01, 0xEA01).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); - map(0xEA93, 0xEA93).w(this, FUNC(scobra_state::scrambold_background_enable_w)); - map(0xEA86, 0xEA86).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); - map(0xEA87, 0xEA87).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); + map(0xEA01, 0xEA01).w(FUNC(scobra_state::galaxold_nmi_enable_w)); + map(0xEA93, 0xEA93).w(FUNC(scobra_state::scrambold_background_enable_w)); + map(0xEA86, 0xEA86).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); + map(0xEA87, 0xEA87).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); // does it have a real ppi8255? map(0xC190, 0xC193).r(m_ppi8255_0, FUNC(i8255_device::read)); // ? @@ -293,7 +293,7 @@ void scobra_state::rescuefe_map(address_map &map) void scobra_state::minefldfe_map(address_map &map) { map(0x0000, 0x0bff).rom(); // ok - map(0x0c00, 0x0c3f).ram().w(this, FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); // ok + map(0x0c00, 0x0c3f).ram().w(FUNC(scobra_state::galaxold_attributesram_w)).share("attributesram"); // ok map(0x0c40, 0x0c5f).ram().share("spriteram"); // ok map(0x0c60, 0x0c7f).ram().share("bulletsram"); // ok map(0x0c80, 0x17ff).ram(); @@ -302,13 +302,13 @@ void scobra_state::minefldfe_map(address_map &map) map(0x5800, 0x6dff).rom(); map(0x8a00, 0x91ff).rom(); - map(0x4200, 0x45ff).ram().w(this, FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); // ok + map(0x4200, 0x45ff).ram().w(FUNC(scobra_state::galaxold_videoram_w)).share("videoram"); // ok - map(0x7621, 0x7621).w(this, FUNC(scobra_state::galaxold_nmi_enable_w)); // a801 - map(0x7673, 0x7673).w(this, FUNC(scobra_state::scrambold_background_enable_w)); // a083 - map(0x7704, 0x7704).w(this, FUNC(scobra_state::galaxold_stars_enable_w)); // a804 - map(0x7616, 0x7616).w(this, FUNC(scobra_state::galaxold_flip_screen_x_w)); // a806 - map(0x7617, 0x7617).w(this, FUNC(scobra_state::galaxold_flip_screen_y_w)); // a807 + map(0x7621, 0x7621).w(FUNC(scobra_state::galaxold_nmi_enable_w)); // a801 + map(0x7673, 0x7673).w(FUNC(scobra_state::scrambold_background_enable_w)); // a083 + map(0x7704, 0x7704).w(FUNC(scobra_state::galaxold_stars_enable_w)); // a804 + map(0x7616, 0x7616).w(FUNC(scobra_state::galaxold_flip_screen_x_w)); // a806 + map(0x7617, 0x7617).w(FUNC(scobra_state::galaxold_flip_screen_y_w)); // a807 map(0x4C00, 0x4C03).mirror(0x00fc).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x4B00, 0x4B03).mirror(0x00fc).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -320,7 +320,7 @@ void scobra_state::minefldfe_map(address_map &map) // addresses below are WRONG, just moved to keep things out the way while the rom mapping is figured out - map(0xf802, 0xf802).w(this, FUNC(scobra_state::galaxold_coin_counter_w)); + map(0xf802, 0xf802).w(FUNC(scobra_state::galaxold_coin_counter_w)); } @@ -337,8 +337,8 @@ WRITE8_MEMBER(scobra_state::scobra_soundram_w) void scobra_state::scobra_sound_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x8000, 0x8fff).rw(this, FUNC(scobra_state::scobra_soundram_r), FUNC(scobra_state::scobra_soundram_w)).share("soundram"); - map(0x9000, 0x9fff).nopw(); // w(this, FUNC(scobra_state::scramble_filter_w)); - scobra doesn't instantiate any RC filters. This is dead code! + map(0x8000, 0x8fff).rw(FUNC(scobra_state::scobra_soundram_r), FUNC(scobra_state::scobra_soundram_w)).share("soundram"); + map(0x9000, 0x9fff).nopw(); // w(FUNC(scobra_state::scramble_filter_w)); - scobra doesn't instantiate any RC filters. This is dead code! } @@ -355,7 +355,7 @@ void scobra_state::hustler_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x6000, 0x6fff).nopw(); // w(this, FUNC(scobra_state::frogger_filter_w)); - hustler doesn't instantiate any RC filters. This is dead code! + map(0x6000, 0x6fff).nopw(); // w(FUNC(scobra_state::frogger_filter_w)); - hustler doesn't instantiate any RC filters. This is dead code! } void scobra_state::hustler_sound_io_map(address_map &map) @@ -369,8 +369,8 @@ void scobra_state::hustler_sound_io_map(address_map &map) void scobra_state::hustlerb_sound_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x6000, 0x6fff).nopw(); // w(this, FUNC(scobra_state::frogger_filter_w)); - hustlerb doesn't instantiate any RC filters. This is dead code! - map(0x8000, 0x8fff).ram().r(this, FUNC(scobra_state::scobra_soundram_r)).share("soundram"); /* only here to initialize pointer */ + map(0x6000, 0x6fff).nopw(); // w(FUNC(scobra_state::frogger_filter_w)); - hustlerb doesn't instantiate any RC filters. This is dead code! + map(0x8000, 0x8fff).ram().r(FUNC(scobra_state::scobra_soundram_r)).share("soundram"); /* only here to initialize pointer */ } void scobra_state::hustlerb_sound_io_map(address_map &map) diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp index 55c17fb83c2..27594d41c7e 100644 --- a/src/mame/drivers/scorpion.cpp +++ b/src/mame/drivers/scorpion.cpp @@ -178,7 +178,7 @@ READ8_MEMBER(scorpion_state::beta_disable_r) void scorpion_state::scorpion_mem(address_map &map) { - map(0x0000, 0x3fff).bankr("bank1").w(this, FUNC(scorpion_state::scorpion_0000_w)); + map(0x0000, 0x3fff).bankr("bank1").w(FUNC(scorpion_state::scorpion_0000_w)); map(0x4000, 0x7fff).bankrw("bank2"); map(0x8000, 0xbfff).bankrw("bank3"); map(0xc000, 0xffff).bankrw("bank4"); @@ -191,19 +191,19 @@ void scorpion_state::scorpion_io(address_map &map) map(0x003f, 0x003f).rw(m_beta, FUNC(beta_disk_device::track_r), FUNC(beta_disk_device::track_w)).mirror(0xff00); map(0x005f, 0x005f).rw(m_beta, FUNC(beta_disk_device::sector_r), FUNC(beta_disk_device::sector_w)).mirror(0xff00); map(0x007f, 0x007f).rw(m_beta, FUNC(beta_disk_device::data_r), FUNC(beta_disk_device::data_w)).mirror(0xff00); - map(0x00fe, 0x00fe).rw(this, FUNC(scorpion_state::spectrum_port_fe_r), FUNC(scorpion_state::spectrum_port_fe_w)).select(0xff00); + map(0x00fe, 0x00fe).rw(FUNC(scorpion_state::spectrum_port_fe_r), FUNC(scorpion_state::spectrum_port_fe_w)).select(0xff00); map(0x00ff, 0x00ff).rw(m_beta, FUNC(beta_disk_device::state_r), FUNC(beta_disk_device::param_w)).mirror(0xff00); - map(0x4021, 0x4021).w(this, FUNC(scorpion_state::scorpion_port_7ffd_w)).mirror(0x3fdc); + map(0x4021, 0x4021).w(FUNC(scorpion_state::scorpion_port_7ffd_w)).mirror(0x3fdc); map(0x8021, 0x8021).w("ay8912", FUNC(ay8910_device::data_w)).mirror(0x3fdc); map(0xc021, 0xc021).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)).mirror(0x3fdc); - map(0x0021, 0x0021).w(this, FUNC(scorpion_state::scorpion_port_1ffd_w)).mirror(0x3fdc); + map(0x0021, 0x0021).w(FUNC(scorpion_state::scorpion_port_1ffd_w)).mirror(0x3fdc); } void scorpion_state::scorpion_switch(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(scorpion_state::beta_neutral_r)); // Overlap with previous because we want real addresses on the 3e00-3fff range - map(0x3d00, 0x3dff).r(this, FUNC(scorpion_state::beta_enable_r)); - map(0x4000, 0xffff).r(this, FUNC(scorpion_state::beta_disable_r)); + map(0x0000, 0x3fff).r(FUNC(scorpion_state::beta_neutral_r)); // Overlap with previous because we want real addresses on the 3e00-3fff range + map(0x3d00, 0x3dff).r(FUNC(scorpion_state::beta_enable_r)); + map(0x4000, 0xffff).r(FUNC(scorpion_state::beta_disable_r)); } MACHINE_RESET_MEMBER(scorpion_state,scorpion) diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp index 6b8f76ced5e..b15d18cf5af 100644 --- a/src/mame/drivers/scotrsht.cpp +++ b/src/mame/drivers/scotrsht.cpp @@ -66,18 +66,18 @@ WRITE8_MEMBER(scotrsht_state::soundlatch_w) void scotrsht_state::scotrsht_map(address_map &map) { - map(0x0000, 0x07ff).ram().w(this, FUNC(scotrsht_state::colorram_w)).share("colorram"); - map(0x0800, 0x0fff).ram().w(this, FUNC(scotrsht_state::videoram_w)).share("videoram"); + map(0x0000, 0x07ff).ram().w(FUNC(scotrsht_state::colorram_w)).share("colorram"); + map(0x0800, 0x0fff).ram().w(FUNC(scotrsht_state::videoram_w)).share("videoram"); map(0x1000, 0x10bf).ram().share("spriteram"); /* sprites */ map(0x10c0, 0x1fff).ram(); /* work ram */ map(0x2000, 0x201f).ram().share("scroll"); /* scroll registers */ map(0x2040, 0x2040).nopw(); map(0x2041, 0x2041).nopw(); map(0x2042, 0x2042).nopw(); /* it should be -> bit 2 = scroll direction like in jailbrek, but it's not used */ - map(0x2043, 0x2043).w(this, FUNC(scotrsht_state::charbank_w)); - map(0x2044, 0x2044).w(this, FUNC(scotrsht_state::ctrl_w)); - map(0x3000, 0x3000).w(this, FUNC(scotrsht_state::palettebank_w)); - map(0x3100, 0x3100).w(this, FUNC(scotrsht_state::soundlatch_w)); + map(0x2043, 0x2043).w(FUNC(scotrsht_state::charbank_w)); + map(0x2044, 0x2044).w(FUNC(scotrsht_state::ctrl_w)); + map(0x3000, 0x3000).w(FUNC(scotrsht_state::palettebank_w)); + map(0x3100, 0x3100).w(FUNC(scotrsht_state::soundlatch_w)); map(0x3200, 0x3200).nopw(); /* it writes 0, 1 */ map(0x3100, 0x3100).portr("DSW2"); map(0x3200, 0x3200).portr("DSW3"); diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index 93f79028822..3a747222cd9 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -44,17 +44,17 @@ void scramble_state::scramble_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).rw(this, FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); /* mirror address */ - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).rw(FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); /* mirror address */ + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0x6802, 0x6802).w(this, FUNC(scramble_state::galaxold_coin_counter_w)); - map(0x6804, 0x6804).w(this, FUNC(scramble_state::galaxold_stars_enable_w)); - map(0x6806, 0x6806).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0x6807, 0x6807).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x6802, 0x6802).w(FUNC(scramble_state::galaxold_coin_counter_w)); + map(0x6804, 0x6804).w(FUNC(scramble_state::galaxold_stars_enable_w)); + map(0x6806, 0x6806).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0x6807, 0x6807).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0x7000, 0x7000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x7800, 0x7800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x8100, 0x8103).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -75,8 +75,8 @@ WRITE8_MEMBER(scramble_state::scramble_soundram_w) void scramble_state::scramble_sound_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x8000, 0x8fff).rw(this, FUNC(scramble_state::scramble_soundram_r), FUNC(scramble_state::scramble_soundram_w)).share("soundram"); - map(0x9000, 0x9fff).nopw(); // w(this, FUNC(scramble_state::scramble_filter_w)); - scramble doesn't instantiate any RC filters. This is dead code! + map(0x8000, 0x8fff).rw(FUNC(scramble_state::scramble_soundram_r), FUNC(scramble_state::scramble_soundram_w)).share("soundram"); + map(0x9000, 0x9fff).nopw(); // w(FUNC(scramble_state::scramble_filter_w)); - scramble doesn't instantiate any RC filters. This is dead code! } void scramble_state::scramble_sound_io_map(address_map &map) @@ -95,15 +95,15 @@ void scramble_state::ckongs_map(address_map &map) map(0x6000, 0x6bff).ram(); map(0x7000, 0x7003).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x7800, 0x7803).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x9000, 0x93ff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x9800, 0x983f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x9000, 0x93ff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x9800, 0x983f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x987f).ram().share("bulletsram"); map(0x9880, 0x98ff).ram(); - map(0xa801, 0xa801).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0xa802, 0xa802).w(this, FUNC(scramble_state::galaxold_coin_counter_w)); - map(0xa806, 0xa806).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0xa807, 0xa807).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0xa801, 0xa801).w(FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0xa802, 0xa802).w(FUNC(scramble_state::galaxold_coin_counter_w)); + map(0xa806, 0xa806).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0xa807, 0xa807).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0xb000, 0xb000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -133,22 +133,22 @@ void scramble_state::mars_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).r(this, FUNC(scramble_state::galaxold_videoram_r)); - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).r(FUNC(scramble_state::galaxold_videoram_r)); + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); - map(0x6800, 0x6800).w(this, FUNC(scramble_state::galaxold_coin_counter_1_w)); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_stars_enable_w)); - map(0x6802, 0x6802).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0x6808, 0x6808).w(this, FUNC(scramble_state::galaxold_coin_counter_0_w)); - map(0x6809, 0x6809).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0x680b, 0x680b).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0x6800, 0x6800).w(FUNC(scramble_state::galaxold_coin_counter_1_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_stars_enable_w)); + map(0x6802, 0x6802).w(FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x6808, 0x6808).w(FUNC(scramble_state::galaxold_coin_counter_0_w)); + map(0x6809, 0x6809).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0x680b, 0x680b).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0x7000, 0x7000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x7000, 0x7000).nopr(); - map(0x8100, 0x810f).rw(this, FUNC(scramble_state::mars_ppi8255_0_r), FUNC(scramble_state::mars_ppi8255_0_w)); - map(0x8200, 0x820f).rw(this, FUNC(scramble_state::mars_ppi8255_1_r), FUNC(scramble_state::mars_ppi8255_1_w)); + map(0x8100, 0x810f).rw(FUNC(scramble_state::mars_ppi8255_0_r), FUNC(scramble_state::mars_ppi8255_0_w)); + map(0x8200, 0x820f).rw(FUNC(scramble_state::mars_ppi8255_1_r), FUNC(scramble_state::mars_ppi8255_1_w)); } @@ -157,22 +157,22 @@ void scramble_state::newsin7_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).r(this, FUNC(scramble_state::galaxold_videoram_r)); - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).r(FUNC(scramble_state::galaxold_videoram_r)); + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); - map(0x6800, 0x6800).w(this, FUNC(scramble_state::galaxold_coin_counter_1_w)); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_stars_enable_w)); + map(0x6800, 0x6800).w(FUNC(scramble_state::galaxold_coin_counter_1_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_stars_enable_w)); //AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxold_nmi_enable_w) - map(0x6808, 0x6808).w(this, FUNC(scramble_state::galaxold_coin_counter_0_w)); - map(0x6809, 0x6809).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0x680b, 0x680b).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0x6808, 0x6808).w(FUNC(scramble_state::galaxold_coin_counter_0_w)); + map(0x6809, 0x6809).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0x680b, 0x680b).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0x7000, 0x7000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0x8200, 0x820f).rw(this, FUNC(scramble_state::mars_ppi8255_1_r), FUNC(scramble_state::mars_ppi8255_1_w)); + map(0x8200, 0x820f).rw(FUNC(scramble_state::mars_ppi8255_1_r), FUNC(scramble_state::mars_ppi8255_1_w)); map(0xa000, 0xafff).rom(); - map(0xc100, 0xc10f).rw(this, FUNC(scramble_state::mars_ppi8255_0_r), FUNC(scramble_state::mars_ppi8255_0_w)); + map(0xc100, 0xc10f).rw(FUNC(scramble_state::mars_ppi8255_0_r), FUNC(scramble_state::mars_ppi8255_0_w)); } @@ -181,20 +181,20 @@ void scramble_state::mrkougar_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).rw(this, FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).rw(FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); - map(0x6800, 0x6800).w(this, FUNC(scramble_state::galaxold_coin_counter_1_w)); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0x6808, 0x6808).w(this, FUNC(scramble_state::galaxold_coin_counter_0_w)); - map(0x6809, 0x6809).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0x680b, 0x680b).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0x6800, 0x6800).w(FUNC(scramble_state::galaxold_coin_counter_1_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x6808, 0x6808).w(FUNC(scramble_state::galaxold_coin_counter_0_w)); + map(0x6809, 0x6809).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0x680b, 0x680b).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0x7000, 0x7000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0x8100, 0x810f).rw(this, FUNC(scramble_state::mars_ppi8255_0_r), FUNC(scramble_state::mars_ppi8255_0_w)); - map(0x8200, 0x820f).rw(this, FUNC(scramble_state::mars_ppi8255_1_r), FUNC(scramble_state::mars_ppi8255_1_w)); + map(0x8100, 0x810f).rw(FUNC(scramble_state::mars_ppi8255_0_r), FUNC(scramble_state::mars_ppi8255_0_w)); + map(0x8200, 0x820f).rw(FUNC(scramble_state::mars_ppi8255_1_r), FUNC(scramble_state::mars_ppi8255_1_w)); } @@ -203,24 +203,24 @@ void scramble_state::hotshock_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).r(this, FUNC(scramble_state::galaxold_videoram_r)); - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).r(FUNC(scramble_state::galaxold_videoram_r)); + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); - map(0x6000, 0x6000).w(this, FUNC(scramble_state::galaxold_coin_counter_2_w)); - map(0x6002, 0x6002).w(this, FUNC(scramble_state::galaxold_coin_counter_1_w)); - map(0x6004, 0x6004).w(this, FUNC(scramble_state::hotshock_flip_screen_w)); - map(0x6005, 0x6005).w(this, FUNC(scramble_state::galaxold_coin_counter_0_w)); - map(0x6006, 0x6006).w(this, FUNC(scramble_state::galaxold_gfxbank_w)); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x6000, 0x6000).w(FUNC(scramble_state::galaxold_coin_counter_2_w)); + map(0x6002, 0x6002).w(FUNC(scramble_state::galaxold_coin_counter_1_w)); + map(0x6004, 0x6004).w(FUNC(scramble_state::hotshock_flip_screen_w)); + map(0x6005, 0x6005).w(FUNC(scramble_state::galaxold_coin_counter_0_w)); + map(0x6006, 0x6006).w(FUNC(scramble_state::galaxold_gfxbank_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_nmi_enable_w)); map(0x7000, 0x7000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x8000, 0x8000).portr("IN0").w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x8001, 0x8001).portr("IN1"); map(0x8002, 0x8002).portr("IN2"); map(0x8003, 0x8003).portr("IN3"); - map(0x9000, 0x9000).w(this, FUNC(scramble_state::hotshock_sh_irqtrigger_w)); + map(0x9000, 0x9000).w(FUNC(scramble_state::hotshock_sh_irqtrigger_w)); } @@ -229,23 +229,23 @@ void scramble_state::hunchbks_map(address_map &map) { map(0x0000, 0x0fff).rom(); map(0x1210, 0x1213).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x1400, 0x143f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x1400, 0x143f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x1440, 0x145f).ram().share("spriteram"); map(0x1460, 0x147f).ram().share("bulletsram"); map(0x1480, 0x14ff).ram(); map(0x1500, 0x1503).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x1606, 0x1606).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0x1607, 0x1607).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0x1606, 0x1606).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0x1607, 0x1607).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0x1680, 0x1680).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x1780, 0x1780).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0x1800, 0x1bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); map(0x1c00, 0x1fff).ram(); map(0x2000, 0x2fff).rom(); - map(0x3000, 0x3fff).rw(this, FUNC(scramble_state::hunchbks_mirror_r), FUNC(scramble_state::hunchbks_mirror_w)); + map(0x3000, 0x3fff).rw(FUNC(scramble_state::hunchbks_mirror_r), FUNC(scramble_state::hunchbks_mirror_w)); map(0x4000, 0x4fff).rom(); - map(0x5000, 0x5fff).rw(this, FUNC(scramble_state::hunchbks_mirror_r), FUNC(scramble_state::hunchbks_mirror_w)); + map(0x5000, 0x5fff).rw(FUNC(scramble_state::hunchbks_mirror_r), FUNC(scramble_state::hunchbks_mirror_w)); map(0x6000, 0x6fff).rom(); - map(0x7000, 0x7fff).rw(this, FUNC(scramble_state::hunchbks_mirror_r), FUNC(scramble_state::hunchbks_mirror_w)); + map(0x7000, 0x7fff).rw(FUNC(scramble_state::hunchbks_mirror_r), FUNC(scramble_state::hunchbks_mirror_w)); } @@ -253,17 +253,17 @@ void scramble_state::hunchbks_map(address_map &map) void scramble_state::mimonscr_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).rw(this, FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); /* mirror address?, probably not */ + map(0x4000, 0x43ff).rw(FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); /* mirror address?, probably not */ map(0x4400, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); - map(0x6800, 0x6802).w(this, FUNC(scramble_state::galaxold_gfxbank_w)); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0x6806, 0x6806).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0x6807, 0x6807).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0x6800, 0x6802).w(FUNC(scramble_state::galaxold_gfxbank_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x6806, 0x6806).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0x6807, 0x6807).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0x7000, 0x7000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x8100, 0x8103).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x8200, 0x8203).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -276,20 +276,20 @@ void scramble_state::ad2083_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).rw(this, FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).rw(FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); - map(0x6004, 0x6004).w(this, FUNC(scramble_state::hotshock_flip_screen_w)); - map(0x6800, 0x6800).w(this, FUNC(scramble_state::galaxold_coin_counter_2_w)); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0x6802, 0x6802).w(this, FUNC(scramble_state::galaxold_coin_counter_0_w)); - map(0x6803, 0x6803).w(this, FUNC(scramble_state::scrambold_background_blue_w)); - map(0x6805, 0x6805).w(this, FUNC(scramble_state::galaxold_coin_counter_1_w)); - map(0x6806, 0x6806).w(this, FUNC(scramble_state::scrambold_background_red_w)); - map(0x6807, 0x6807).w(this, FUNC(scramble_state::scrambold_background_green_w)); + map(0x6004, 0x6004).w(FUNC(scramble_state::hotshock_flip_screen_w)); + map(0x6800, 0x6800).w(FUNC(scramble_state::galaxold_coin_counter_2_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x6802, 0x6802).w(FUNC(scramble_state::galaxold_coin_counter_0_w)); + map(0x6803, 0x6803).w(FUNC(scramble_state::scrambold_background_blue_w)); + map(0x6805, 0x6805).w(FUNC(scramble_state::galaxold_coin_counter_1_w)); + map(0x6806, 0x6806).w(FUNC(scramble_state::scrambold_background_red_w)); + map(0x6807, 0x6807).w(FUNC(scramble_state::scrambold_background_green_w)); map(0x8000, 0x8000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x9000, 0x9000).w(this, FUNC(scramble_state::hotshock_sh_irqtrigger_w)); + map(0x9000, 0x9000).w(FUNC(scramble_state::hotshock_sh_irqtrigger_w)); map(0x7000, 0x7000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x8000, 0x8000).portr("IN0"); map(0x8001, 0x8001).portr("IN1"); @@ -305,18 +305,18 @@ void scramble_state::triplep_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x4800, 0x4bff).ram().w(this, FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).rw(this, FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); /* mirror address */ - map(0x5000, 0x503f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4800, 0x4bff).ram().w(FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).rw(FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); /* mirror address */ + map(0x5000, 0x503f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x5040, 0x505f).ram().share("spriteram"); map(0x5060, 0x507f).ram().share("bulletsram"); map(0x5080, 0x50ff).ram(); map(0x5800, 0x67ff).rom(); - map(0x6801, 0x6801).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0x6802, 0x6802).w(this, FUNC(scramble_state::galaxold_coin_counter_w)); - map(0x6804, 0x6804).w(this, FUNC(scramble_state::galaxold_stars_enable_w)); - map(0x6806, 0x6806).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); - map(0x6807, 0x6807).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); + map(0x6801, 0x6801).w(FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x6802, 0x6802).w(FUNC(scramble_state::galaxold_coin_counter_w)); + map(0x6804, 0x6804).w(FUNC(scramble_state::galaxold_stars_enable_w)); + map(0x6806, 0x6806).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); + map(0x6807, 0x6807).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); map(0x7000, 0x7000).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x8100, 0x8103).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); } @@ -326,8 +326,8 @@ void scramble_state::triplep_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x01).w("8910.1", FUNC(ay8910_device::data_address_w)); map(0x01, 0x01).r("8910.1", FUNC(ay8910_device::data_r)); - map(0x02, 0x02).r(this, FUNC(scramble_state::triplep_pip_r)); - map(0x03, 0x03).r(this, FUNC(scramble_state::triplep_pap_r)); + map(0x02, 0x02).r(FUNC(scramble_state::triplep_pip_r)); + map(0x03, 0x03).r(FUNC(scramble_state::triplep_pap_r)); } void scramble_state::hotshock_sound_io_map(address_map &map) @@ -351,7 +351,7 @@ READ8_MEMBER(scramble_state::hncholms_prot_r) void scramble_state::hunchbks_readport(address_map &map) { - map(0x00, 0x00).r(this, FUNC(scramble_state::hncholms_prot_r)); + map(0x00, 0x00).r(FUNC(scramble_state::hncholms_prot_r)); } @@ -363,25 +363,25 @@ void scramble_state::harem_map(address_map &map) map(0x2000, 0x27ff).ram(); - map(0x4000, 0x403f).ram().w(this, FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); + map(0x4000, 0x403f).ram().w(FUNC(scramble_state::galaxold_attributesram_w)).share("attributesram"); map(0x4040, 0x405f).ram().share("spriteram"); map(0x4060, 0x407f).ram().share("bulletsram"); map(0x4080, 0x47ff).ram(); - map(0x4800, 0x4bff).rw(this, FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).rw(this, FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); // mirror address + map(0x4800, 0x4bff).rw(FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).rw(FUNC(scramble_state::galaxold_videoram_r), FUNC(scramble_state::galaxold_videoram_w)); // mirror address - map(0x5000, 0x5000).ram().w(this, FUNC(scramble_state::racknrol_tiles_bank_w)).share("racknrol_tbank"); // high bits of tiles, 1 bit every 4 columns - map(0x5800, 0x5800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(scramble_state::galaxold_nmi_enable_w)); + map(0x5000, 0x5000).ram().w(FUNC(scramble_state::racknrol_tiles_bank_w)).share("racknrol_tbank"); // high bits of tiles, 1 bit every 4 columns + map(0x5800, 0x5800).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(scramble_state::galaxold_nmi_enable_w)); - map(0x5801, 0x5801).w(this, FUNC(scramble_state::harem_decrypt_clk_w)); // run-time bitswap selection - map(0x5802, 0x5802).w(this, FUNC(scramble_state::harem_decrypt_bit_w)); - map(0x5803, 0x5803).w(this, FUNC(scramble_state::harem_decrypt_rst_w)); + map(0x5801, 0x5801).w(FUNC(scramble_state::harem_decrypt_clk_w)); // run-time bitswap selection + map(0x5802, 0x5802).w(FUNC(scramble_state::harem_decrypt_bit_w)); + map(0x5803, 0x5803).w(FUNC(scramble_state::harem_decrypt_rst_w)); - map(0x5804, 0x5804).w(this, FUNC(scramble_state::galaxold_coin_counter_w)); - map(0x5805, 0x5805).w(this, FUNC(scramble_state::galaxold_gfxbank_w)); // bit 0 = sprite tiles high bit - map(0x5806, 0x5806).w(this, FUNC(scramble_state::galaxold_flip_screen_x_w)); // maybe (0 at boot) - map(0x5807, 0x5807).w(this, FUNC(scramble_state::galaxold_flip_screen_y_w)); // "" + map(0x5804, 0x5804).w(FUNC(scramble_state::galaxold_coin_counter_w)); + map(0x5805, 0x5805).w(FUNC(scramble_state::galaxold_gfxbank_w)); // bit 0 = sprite tiles high bit + map(0x5806, 0x5806).w(FUNC(scramble_state::galaxold_flip_screen_x_w)); // maybe (0 at boot) + map(0x5807, 0x5807).w(FUNC(scramble_state::galaxold_flip_screen_y_w)); // "" map(0x6100, 0x6103).rw(m_ppi8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x6200, 0x6203).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -398,9 +398,9 @@ void scramble_state::decrypted_opcodes_map(address_map &map) void scramble_state::harem_sound_map(address_map &map) { map(0x0000, 0x2fff).rom(); - map(0x6000, 0x6000).r(this, FUNC(scramble_state::harem_digitalker_intr_r)); + map(0x6000, 0x6000).r(FUNC(scramble_state::harem_digitalker_intr_r)); map(0x8000, 0x83ff).ram(); - map(0xa000, 0xafff).nopw(); // w(this, FUNC(scramble_state::scramble_filter_w)); - scramble/harem don't instantiate any RC filters. This is dead code! + map(0xa000, 0xafff).nopw(); // w(FUNC(scramble_state::scramble_filter_w)); - scramble/harem don't instantiate any RC filters. This is dead code! } void scramble_state::harem_sound_io_map(address_map &map) diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp index 4b0294cf114..0d21b2c1945 100644 --- a/src/mame/drivers/scregg.cpp +++ b/src/mame/drivers/scregg.cpp @@ -104,12 +104,12 @@ void scregg_state::dommy_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x2000, 0x23ff).ram().share("videoram"); map(0x2400, 0x27ff).ram().share("colorram"); - map(0x2800, 0x2bff).rw(this, FUNC(scregg_state::btime_mirrorvideoram_r), FUNC(scregg_state::btime_mirrorvideoram_w)); - map(0x4000, 0x4000).portr("DSW1").w(this, FUNC(scregg_state::scregg_irqack_w)); - map(0x4001, 0x4001).portr("DSW2").w(this, FUNC(scregg_state::btime_video_control_w)); + map(0x2800, 0x2bff).rw(FUNC(scregg_state::btime_mirrorvideoram_r), FUNC(scregg_state::btime_mirrorvideoram_w)); + map(0x4000, 0x4000).portr("DSW1").w(FUNC(scregg_state::scregg_irqack_w)); + map(0x4001, 0x4001).portr("DSW2").w(FUNC(scregg_state::btime_video_control_w)); map(0x4002, 0x4002).portr("P1"); map(0x4003, 0x4003).portr("P2"); - map(0x4004, 0x4005).w("ay1", FUNC(ay8910_device::address_data_w)).r(this, FUNC(scregg_state::scregg_irqack_r)); + map(0x4004, 0x4005).w("ay1", FUNC(ay8910_device::address_data_w)).r(FUNC(scregg_state::scregg_irqack_r)); map(0x4006, 0x4007).w("ay2", FUNC(ay8910_device::address_data_w)); map(0xa000, 0xffff).rom(); } @@ -120,13 +120,13 @@ void scregg_state::eggs_map(address_map &map) map(0x0000, 0x07ff).ram(); map(0x1000, 0x13ff).ram().share("videoram"); map(0x1400, 0x17ff).ram().share("colorram"); - map(0x1800, 0x1bff).rw(this, FUNC(scregg_state::btime_mirrorvideoram_r), FUNC(scregg_state::btime_mirrorvideoram_w)); - map(0x1c00, 0x1fff).rw(this, FUNC(scregg_state::btime_mirrorcolorram_r), FUNC(scregg_state::btime_mirrorcolorram_w)); - map(0x2000, 0x2000).portr("DSW1").w(this, FUNC(scregg_state::btime_video_control_w)); - map(0x2001, 0x2001).portr("DSW2").w(this, FUNC(scregg_state::scregg_irqack_w)); + map(0x1800, 0x1bff).rw(FUNC(scregg_state::btime_mirrorvideoram_r), FUNC(scregg_state::btime_mirrorvideoram_w)); + map(0x1c00, 0x1fff).rw(FUNC(scregg_state::btime_mirrorcolorram_r), FUNC(scregg_state::btime_mirrorcolorram_w)); + map(0x2000, 0x2000).portr("DSW1").w(FUNC(scregg_state::btime_video_control_w)); + map(0x2001, 0x2001).portr("DSW2").w(FUNC(scregg_state::scregg_irqack_w)); map(0x2002, 0x2002).portr("P1"); map(0x2003, 0x2003).portr("P2"); - map(0x2004, 0x2005).w("ay1", FUNC(ay8910_device::address_data_w)).r(this, FUNC(scregg_state::scregg_irqack_r)); + map(0x2004, 0x2005).w("ay1", FUNC(ay8910_device::address_data_w)).r(FUNC(scregg_state::scregg_irqack_r)); map(0x2006, 0x2007).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x3000, 0x7fff).rom(); map(0xf000, 0xffff).rom(); /* reset/interrupt vectors */ diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp index 031bf5747a4..928365d9367 100644 --- a/src/mame/drivers/scyclone.cpp +++ b/src/mame/drivers/scyclone.cpp @@ -303,7 +303,7 @@ void scyclone_state::scyclone_map(address_map &map) { map(0x0000, 0x2fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x4400, 0x5fff).rw(this, FUNC(scyclone_state::vram_r), FUNC(scyclone_state::vram_w)); + map(0x4400, 0x5fff).rw(FUNC(scyclone_state::vram_r), FUNC(scyclone_state::vram_w)); map(0x6000, 0x60ff).noprw(); // this just seems to be overflow from the VRAM writes, probably goes nowhere } @@ -314,17 +314,17 @@ void scyclone_state::scyclone_iomap(address_map &map) map(0x00, 0x00).r("mb14241", FUNC(mb14241_device::shift_result_r)).w("mb14241", FUNC(mb14241_device::shift_count_w)); map(0x01, 0x01).portr("IN0").w("mb14241", FUNC(mb14241_device::shift_data_w)); map(0x02, 0x02).portr("IN1"); - map(0x03, 0x03).portr("DSW0").w(this, FUNC(scyclone_state::vidctrl_w)); - map(0x04, 0x04).w(this, FUNC(scyclone_state::sprite_xpos_w)); - map(0x05, 0x05).w(this, FUNC(scyclone_state::sprite_ypos_w)); - map(0x06, 0x06).w(this, FUNC(scyclone_state::port06_w)); // possible watchdog, unlikely to be twinkle related. - map(0x08, 0x08).w(this, FUNC(scyclone_state::sprite_colour_w)); - map(0x09, 0x09).w(this, FUNC(scyclone_state::sprite_tile_w)); - map(0x0a, 0x0a).w(this, FUNC(scyclone_state::starscroll_w)); - map(0x0e, 0x0e).w(this, FUNC(scyclone_state::port0e_w)); + map(0x03, 0x03).portr("DSW0").w(FUNC(scyclone_state::vidctrl_w)); + map(0x04, 0x04).w(FUNC(scyclone_state::sprite_xpos_w)); + map(0x05, 0x05).w(FUNC(scyclone_state::sprite_ypos_w)); + map(0x06, 0x06).w(FUNC(scyclone_state::port06_w)); // possible watchdog, unlikely to be twinkle related. + map(0x08, 0x08).w(FUNC(scyclone_state::sprite_colour_w)); + map(0x09, 0x09).w(FUNC(scyclone_state::sprite_tile_w)); + map(0x0a, 0x0a).w(FUNC(scyclone_state::starscroll_w)); + map(0x0e, 0x0e).w(FUNC(scyclone_state::port0e_w)); map(0x0f, 0x0f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x40, 0x40).w(this, FUNC(scyclone_state::videomask1_w)); - map(0x80, 0x80).w(this, FUNC(scyclone_state::videomask2_w)); + map(0x40, 0x40).w(FUNC(scyclone_state::videomask1_w)); + map(0x80, 0x80).w(FUNC(scyclone_state::videomask2_w)); } @@ -333,12 +333,12 @@ void scyclone_state::scyclone_sub_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x3000, 0x3000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("dac", FUNC(dac_byte_interface::write)); // music - map(0x3001, 0x3001).w(this, FUNC(scyclone_state::snd_3001_w)); // written at the same time, with the same data as 0x3005 - map(0x3002, 0x3002).w("dac2", FUNC(dac_byte_interface::write)); // speech + map(0x3000, 0x3000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("dac", FUNC(dac_byte_interface::data_w)); // music + map(0x3001, 0x3001).w(FUNC(scyclone_state::snd_3001_w)); // written at the same time, with the same data as 0x3005 + map(0x3002, 0x3002).w("dac2", FUNC(dac_byte_interface::data_w)); // speech // AM_RANGE(0x3003, 0x3003) AM_WRITE(snd_3003_w) // writes 02 or 00 // AM_RANGE(0x3004, 0x3004) AM_WRITE(snd_3004_w) // always writes 00? - map(0x3005, 0x3005).w(this, FUNC(scyclone_state::snd_3005_w)); // written at the same time, with the same data as 0x3001 + map(0x3005, 0x3005).w(FUNC(scyclone_state::snd_3005_w)); // written at the same time, with the same data as 0x3001 } void scyclone_state::scyclone_sub_iomap(address_map &map) diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index d1e2427b758..08cb316ae04 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -299,15 +299,15 @@ WRITE16_MEMBER(sderby_state::roulette_out_w) void sderby_state::sderby_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); map(0x10400c, 0x10400d).nopw(); /* ??? - check code at 0x000456 (executed once at startup) */ map(0x10400e, 0x10400f).nopw(); /* ??? - check code at 0x000524 (executed once at startup) */ map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::sderby_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::sderby_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x500001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ @@ -318,15 +318,15 @@ void sderby_state::sderby_map(address_map &map) void sderby_state::sderbya_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); map(0x10400c, 0x10400d).nopw(); /* ??? - check code at 0x000456 (executed once at startup) */ map(0x10400e, 0x10400f).nopw(); /* ??? - check code at 0x000524 (executed once at startup) */ map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderbya_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::sderby_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderbya_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::sderby_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300000, 0x300001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ //MOD @@ -338,15 +338,15 @@ void sderby_state::sderbya_map(address_map &map) void sderby_state::luckboom_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); map(0x10400c, 0x10400d).nopw(); /* ??? - check code at 0x000456 (executed once at startup) */ map(0x10400e, 0x10400f).nopw(); /* ??? - check code at 0x000524 (executed once at startup) */ map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::sderby_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::sderby_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x500001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ @@ -357,16 +357,16 @@ void sderby_state::luckboom_map(address_map &map) void sderby_state::spacewin_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ map(0x10400c, 0x10400d).nopw(); /* seems another video register. constantly used */ map(0x10400e, 0x10400f).nopw(); /* seems another video register. constantly used */ map(0x104010, 0x105fff).nopw(); /* unknown */ map(0x300000, 0x300001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::scmatto_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::scmatto_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xd00000, 0xd001ff).ram(); @@ -379,15 +379,15 @@ void sderby_state::spacewin_map(address_map &map) void sderby_state::shinygld_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ map(0x10400c, 0x10400d).nopw(); /* seems another video register. constantly used */ map(0x10400e, 0x10400f).nopw(); /* seems another video register. constantly used */ map(0x104010, 0x105fff).nopw(); /* unknown */ map(0x300000, 0x300001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); map(0x308008, 0x308009).nopw(); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -401,17 +401,17 @@ void sderby_state::roulette_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x440000, 0x440fff).writeonly().share("spriteram"); - map(0x500000, 0x500fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x501000, 0x501fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x502000, 0x503fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x504000, 0x50400b).ram().w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x500000, 0x500fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x501000, 0x501fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x502000, 0x503fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x504000, 0x50400b).ram().w(FUNC(sderby_state::sderby_scroll_w)); map(0x50400e, 0x50400f).nopw(); - map(0x708000, 0x708009).r(this, FUNC(sderby_state::roulette_input_r)); - map(0x708006, 0x708007).w(this, FUNC(sderby_state::roulette_out_w)); + map(0x708000, 0x708009).r(FUNC(sderby_state::roulette_input_r)); + map(0x708006, 0x708007).w(FUNC(sderby_state::roulette_out_w)); map(0x70800b, 0x70800b).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x70800c, 0x70800d).nopw(); /* watchdog?? (0x0003) */ - map(0x70800e, 0x70800f).rw(this, FUNC(sderby_state::rprot_r), FUNC(sderby_state::rprot_w)); /* MCU communication */ + map(0x70800e, 0x70800f).rw(FUNC(sderby_state::rprot_r), FUNC(sderby_state::rprot_w)); /* MCU communication */ map(0x780000, 0x780fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xff0000, 0xff07ff).ram().share("nvram"); diff --git a/src/mame/drivers/sderby2.cpp b/src/mame/drivers/sderby2.cpp index ac54e2f6b63..72809ab93c2 100644 --- a/src/mame/drivers/sderby2.cpp +++ b/src/mame/drivers/sderby2.cpp @@ -198,10 +198,10 @@ void sderby2_state::main_program_map(address_map &map) void sderby2_state::main_io_map(address_map &map) { map.global_mask(0xff); - map(0x10, 0x10).r(this, FUNC(sderby2_state::host_r)); - map(0x20, 0x20).w(this, FUNC(sderby2_state::sub_nmi)); + map(0x10, 0x10).r(FUNC(sderby2_state::host_r)); + map(0x20, 0x20).w(FUNC(sderby2_state::sub_nmi)); map(0x30, 0x30).nopw(); // Written with 0x12 byte sequence at start - map(0x40, 0x40).w(this, FUNC(sderby2_state::host_io_40_w)); // Occasionally written + map(0x40, 0x40).w(FUNC(sderby2_state::host_io_40_w)); // Occasionally written } @@ -228,9 +228,9 @@ void sderby2_state::sub_program_map(address_map &map) void sderby2_state::sub_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(sderby2_state::sub_io_0_r)); - map(0x20, 0x20).r(this, FUNC(sderby2_state::sub_r)); - map(0x40, 0x40).w(this, FUNC(sderby2_state::main_nmi)); + map(0x00, 0x00).r(FUNC(sderby2_state::sub_io_0_r)); + map(0x20, 0x20).r(FUNC(sderby2_state::sub_r)); + map(0x40, 0x40).w(FUNC(sderby2_state::main_nmi)); map(0x60, 0x60).nopw(); // Written with 0x12 byte sequence at start } diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp index c678f558d58..913395224f7 100644 --- a/src/mame/drivers/seabattl.cpp +++ b/src/mame/drivers/seabattl.cpp @@ -256,24 +256,24 @@ void seabattl_state::seabattl_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x13ff).rom(); map(0x2000, 0x33ff).rom(); - map(0x1400, 0x17ff).mirror(0x2000).ram().w(this, FUNC(seabattl_state::seabattl_colorram_w)).share("colorram"); - map(0x1800, 0x1bff).mirror(0x2000).ram().w(this, FUNC(seabattl_state::seabattl_videoram_w)).share("videoram"); + map(0x1400, 0x17ff).mirror(0x2000).ram().w(FUNC(seabattl_state::seabattl_colorram_w)).share("colorram"); + map(0x1800, 0x1bff).mirror(0x2000).ram().w(FUNC(seabattl_state::seabattl_videoram_w)).share("videoram"); map(0x1c00, 0x1cff).mirror(0x2000).ram(); map(0x1d00, 0x1dff).mirror(0x2000).ram().share("objram"); - map(0x1e00, 0x1e00).mirror(0x20f0).w(this, FUNC(seabattl_state::time_display_w)); - map(0x1e01, 0x1e01).mirror(0x20f0).w(this, FUNC(seabattl_state::score_display_w)); - map(0x1e02, 0x1e02).mirror(0x20f0).portr("IN0").w(this, FUNC(seabattl_state::score2_display_w)); + map(0x1e00, 0x1e00).mirror(0x20f0).w(FUNC(seabattl_state::time_display_w)); + map(0x1e01, 0x1e01).mirror(0x20f0).w(FUNC(seabattl_state::score_display_w)); + map(0x1e02, 0x1e02).mirror(0x20f0).portr("IN0").w(FUNC(seabattl_state::score2_display_w)); map(0x1e05, 0x1e05).mirror(0x20f0).portr("DIPS2"); - map(0x1e06, 0x1e06).mirror(0x20f0).portr("DIPS1").w(this, FUNC(seabattl_state::sound_w)); - map(0x1e07, 0x1e07).mirror(0x20f0).portr("DIPS0").w(this, FUNC(seabattl_state::sound2_w)); + map(0x1e06, 0x1e06).mirror(0x20f0).portr("DIPS1").w(FUNC(seabattl_state::sound_w)); + map(0x1e07, 0x1e07).mirror(0x20f0).portr("DIPS0").w(FUNC(seabattl_state::sound2_w)); map(0x1f00, 0x1fff).mirror(0x2000).rw(m_s2636, FUNC(s2636_device::read_data), FUNC(s2636_device::write_data)); map(0x1fcc, 0x1fcc).mirror(0x2000).portr("IN1"); } void seabattl_state::seabattl_data_map(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(seabattl_state::seabattl_collision_r), FUNC(seabattl_state::seabattl_control_w)); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(seabattl_state::seabattl_collision_clear_r), FUNC(seabattl_state::seabattl_collision_clear_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(seabattl_state::seabattl_collision_r), FUNC(seabattl_state::seabattl_control_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(seabattl_state::seabattl_collision_clear_r), FUNC(seabattl_state::seabattl_collision_clear_w)); } READ8_MEMBER(seabattl_state::seabattl_collision_r) diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp index 431e35e933a..a41e0bf0b90 100644 --- a/src/mame/drivers/seattle.cpp +++ b/src/mame/drivers/seattle.cpp @@ -1111,48 +1111,48 @@ void seattle_state::seattle_cs0_map(address_map &map) void seattle_state::seattle_cs1_map(address_map &map) { - map(0x01000000, 0x01000003).w(this, FUNC(seattle_state::asic_fifo_w)); + map(0x01000000, 0x01000003).w(FUNC(seattle_state::asic_fifo_w)); } void seattle_state::seattle_cs2_map(address_map &map) { - map(0x00000000, 0x00000003).rw(this, FUNC(seattle_state::analog_port_r), FUNC(seattle_state::analog_port_w)); // Flagstaff only + map(0x00000000, 0x00000003).rw(FUNC(seattle_state::analog_port_r), FUNC(seattle_state::analog_port_w)); // Flagstaff only } // This map shares the PHOENIX, SEATTLE, and SEATTLE_WIDGET calls void seattle_state::seattle_cs3_map(address_map &map) { map(0x00000000, 0x0000003f).rw(m_ioasic, FUNC(midway_ioasic_device::read), FUNC(midway_ioasic_device::write)); - map(0x00100000, 0x0011ffff).rw(this, FUNC(seattle_state::cmos_r), FUNC(seattle_state::cmos_w)); - map(0x00800000, 0x0080001f).rw(this, FUNC(seattle_state::carnevil_gun_r), FUNC(seattle_state::carnevil_gun_w)); // Carnevil driver only - map(0x00c00000, 0x00c0001f).rw(this, FUNC(seattle_state::widget_r), FUNC(seattle_state::widget_w)); // Seattle widget only - map(0x01000000, 0x01000003).rw(this, FUNC(seattle_state::cmos_protect_r), FUNC(seattle_state::cmos_protect_w)); - map(0x01100000, 0x01100003).w(this, FUNC(seattle_state::seattle_watchdog_w)); - map(0x01300000, 0x01300003).rw(this, FUNC(seattle_state::seattle_interrupt_enable_r), FUNC(seattle_state::seattle_interrupt_enable_w)); - map(0x01400000, 0x01400003).rw(this, FUNC(seattle_state::interrupt_config_r), FUNC(seattle_state::interrupt_config_w)); - map(0x01500000, 0x01500003).r(this, FUNC(seattle_state::interrupt_state_r)); - map(0x01600000, 0x01600003).r(this, FUNC(seattle_state::interrupt_state2_r)); - map(0x01700000, 0x01700003).w(this, FUNC(seattle_state::vblank_clear_w)); + map(0x00100000, 0x0011ffff).rw(FUNC(seattle_state::cmos_r), FUNC(seattle_state::cmos_w)); + map(0x00800000, 0x0080001f).rw(FUNC(seattle_state::carnevil_gun_r), FUNC(seattle_state::carnevil_gun_w)); // Carnevil driver only + map(0x00c00000, 0x00c0001f).rw(FUNC(seattle_state::widget_r), FUNC(seattle_state::widget_w)); // Seattle widget only + map(0x01000000, 0x01000003).rw(FUNC(seattle_state::cmos_protect_r), FUNC(seattle_state::cmos_protect_w)); + map(0x01100000, 0x01100003).w(FUNC(seattle_state::seattle_watchdog_w)); + map(0x01300000, 0x01300003).rw(FUNC(seattle_state::seattle_interrupt_enable_r), FUNC(seattle_state::seattle_interrupt_enable_w)); + map(0x01400000, 0x01400003).rw(FUNC(seattle_state::interrupt_config_r), FUNC(seattle_state::interrupt_config_w)); + map(0x01500000, 0x01500003).r(FUNC(seattle_state::interrupt_state_r)); + map(0x01600000, 0x01600003).r(FUNC(seattle_state::interrupt_state2_r)); + map(0x01700000, 0x01700003).w(FUNC(seattle_state::vblank_clear_w)); map(0x01800000, 0x01800003).noprw(); - map(0x01900000, 0x01900003).rw(this, FUNC(seattle_state::status_leds_r), FUNC(seattle_state::status_leds_w)); - map(0x01f00000, 0x01f00003).rw(this, FUNC(seattle_state::asic_reset_r), FUNC(seattle_state::asic_reset_w)); + map(0x01900000, 0x01900003).rw(FUNC(seattle_state::status_leds_r), FUNC(seattle_state::status_leds_w)); + map(0x01f00000, 0x01f00003).rw(FUNC(seattle_state::asic_reset_r), FUNC(seattle_state::asic_reset_w)); } void seattle_state::seattle_flagstaff_cs3_map(address_map &map) { map(0x00000000, 0x0000003f).rw(m_ioasic, FUNC(midway_ioasic_device::read), FUNC(midway_ioasic_device::write)); - map(0x00100000, 0x0011ffff).rw(this, FUNC(seattle_state::cmos_r), FUNC(seattle_state::cmos_w)); - map(0x00c00000, 0x00c0003f).rw(this, FUNC(seattle_state::ethernet_r), FUNC(seattle_state::ethernet_w)); - map(0x01000000, 0x01000003).rw(this, FUNC(seattle_state::cmos_protect_r), FUNC(seattle_state::cmos_protect_w)); - map(0x01100000, 0x01100003).w(this, FUNC(seattle_state::seattle_watchdog_w)); - map(0x01300000, 0x01300003).rw(this, FUNC(seattle_state::seattle_interrupt_enable_r), FUNC(seattle_state::seattle_interrupt_enable_w)); - map(0x01400000, 0x01400003).rw(this, FUNC(seattle_state::interrupt_config_r), FUNC(seattle_state::interrupt_config_w)); - map(0x01500000, 0x01500003).r(this, FUNC(seattle_state::interrupt_state_r)); - map(0x01600000, 0x01600003).r(this, FUNC(seattle_state::interrupt_state2_r)); - map(0x01700000, 0x01700003).w(this, FUNC(seattle_state::vblank_clear_w)); + map(0x00100000, 0x0011ffff).rw(FUNC(seattle_state::cmos_r), FUNC(seattle_state::cmos_w)); + map(0x00c00000, 0x00c0003f).rw(FUNC(seattle_state::ethernet_r), FUNC(seattle_state::ethernet_w)); + map(0x01000000, 0x01000003).rw(FUNC(seattle_state::cmos_protect_r), FUNC(seattle_state::cmos_protect_w)); + map(0x01100000, 0x01100003).w(FUNC(seattle_state::seattle_watchdog_w)); + map(0x01300000, 0x01300003).rw(FUNC(seattle_state::seattle_interrupt_enable_r), FUNC(seattle_state::seattle_interrupt_enable_w)); + map(0x01400000, 0x01400003).rw(FUNC(seattle_state::interrupt_config_r), FUNC(seattle_state::interrupt_config_w)); + map(0x01500000, 0x01500003).r(FUNC(seattle_state::interrupt_state_r)); + map(0x01600000, 0x01600003).r(FUNC(seattle_state::interrupt_state2_r)); + map(0x01700000, 0x01700003).w(FUNC(seattle_state::vblank_clear_w)); map(0x01800000, 0x01800003).noprw(); - map(0x01900000, 0x01900003).rw(this, FUNC(seattle_state::status_leds_r), FUNC(seattle_state::status_leds_w)); - map(0x01f00000, 0x01f00003).rw(this, FUNC(seattle_state::asic_reset_r), FUNC(seattle_state::asic_reset_w)); + map(0x01900000, 0x01900003).rw(FUNC(seattle_state::status_leds_r), FUNC(seattle_state::status_leds_w)); + map(0x01f00000, 0x01f00003).rw(FUNC(seattle_state::asic_reset_r), FUNC(seattle_state::asic_reset_w)); } /************************************* diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index b73330d40f1..d101d16661f 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -642,12 +642,12 @@ WRITE16_MEMBER(segac2_state::print_club_camera_w) void segac2_state::main_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0x800001, 0x800001).mirror(0x13fdfe).rw(this, FUNC(segac2_state::prot_r), FUNC(segac2_state::prot_w)); - map(0x800201, 0x800201).mirror(0x13fdfe).w(this, FUNC(segac2_state::control_w)); + map(0x800001, 0x800001).mirror(0x13fdfe).rw(FUNC(segac2_state::prot_r), FUNC(segac2_state::prot_w)); + map(0x800201, 0x800201).mirror(0x13fdfe).w(FUNC(segac2_state::control_w)); map(0x840000, 0x84001f).mirror(0x13fee0).rw("io", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write)).umask16(0x00ff); map(0x840100, 0x840107).mirror(0x13fef8).rw(m_ymsnd, FUNC(ym3438_device::read), FUNC(ym3438_device::write)).umask16(0x00ff); - map(0x880101, 0x880101).mirror(0x13fefe).w(this, FUNC(segac2_state::counter_timer_w)); - map(0x8c0000, 0x8c0fff).mirror(0x13f000).rw(this, FUNC(segac2_state::palette_r), FUNC(segac2_state::palette_w)).share("paletteram"); + map(0x880101, 0x880101).mirror(0x13fefe).w(FUNC(segac2_state::counter_timer_w)); + map(0x8c0000, 0x8c0fff).mirror(0x13f000).rw(FUNC(segac2_state::palette_r), FUNC(segac2_state::palette_w)).share("paletteram"); map(0xc00000, 0xc0001f).mirror(0x18ff00).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); map(0xe00000, 0xe0ffff).mirror(0x1f0000).ram().share("nvram"); } diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp index 4197babb7a5..356484eb431 100644 --- a/src/mame/drivers/segae.cpp +++ b/src/mame/drivers/segae.cpp @@ -408,8 +408,8 @@ void systeme_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x7b, 0x7b).w("sn1", FUNC(segapsg_device::write)); - map(0x7e, 0x7f).w("sn2", FUNC(segapsg_device::write)); + map(0x7b, 0x7b).w("sn1", FUNC(segapsg_device::command_w)); + map(0x7e, 0x7f).w("sn2", FUNC(segapsg_device::command_w)); map(0x7e, 0x7e).r(m_vdp1, FUNC(sega315_5124_device::vcount_read)); map(0xba, 0xba).rw(m_vdp1, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0xbb, 0xbb).rw(m_vdp1, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); @@ -420,7 +420,7 @@ void systeme_state::io_map(address_map &map) map(0xe2, 0xe2).portr("e2"); map(0xf2, 0xf2).portr("f2"); map(0xf3, 0xf3).portr("f3"); - map(0xf7, 0xf7).w(this, FUNC(systeme_state::bank_write)); + map(0xf7, 0xf7).w(FUNC(systeme_state::bank_write)); map(0xf8, 0xfb).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); } diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index 1f97d595eb8..605f88f0a31 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -318,11 +318,11 @@ WRITE8_MEMBER(segag80r_state::sindbadm_misc_w) /* the data lines are flipped */ WRITE8_MEMBER(segag80r_state::sindbadm_sn1_SN76496_w) { - m_sn1->write(space, offset, bitswap<8>(data, 0,1,2,3,4,5,6,7)); + m_sn1->write(bitswap<8>(data, 0,1,2,3,4,5,6,7)); } WRITE8_MEMBER(segag80r_state::sindbadm_sn2_SN76496_w) { - m_sn2->write(space, offset, bitswap<8>(data, 0,1,2,3,4,5,6,7)); + m_sn2->write(bitswap<8>(data, 0,1,2,3,4,5,6,7)); } @@ -338,21 +338,21 @@ void segag80r_state::main_map(address_map &map) map(0x0000, 0x07ff).rom(); /* CPU board ROM */ map(0x0800, 0x7fff).rom(); /* PROM board ROM area */ map(0x8000, 0xbfff).rom(); /* PROM board ROM area */ - map(0xc800, 0xcfff).ram().w(this, FUNC(segag80r_state::mainram_w)).share("mainram"); - map(0xe000, 0xffff).ram().w(this, FUNC(segag80r_state::vidram_w)).share("videoram"); + map(0xc800, 0xcfff).ram().w(FUNC(segag80r_state::mainram_w)).share("mainram"); + map(0xe000, 0xffff).ram().w(FUNC(segag80r_state::vidram_w)).share("videoram"); } void segag80r_state::g80r_opcodes_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(segag80r_state::g80r_opcode_r)); + map(0x0000, 0xffff).r(FUNC(segag80r_state::g80r_opcode_r)); } void segag80r_state::sega_315_opcodes_map(address_map &map) { map(0x0000, 0x7fff).rom().share("decrypted_opcodes"); map(0x8000, 0xbfff).rom().region("maincpu", 0x8000); - map(0xc800, 0xcfff).ram().w(this, FUNC(segag80r_state::mainram_w)).share("mainram"); - map(0xe000, 0xffff).ram().w(this, FUNC(segag80r_state::vidram_w)).share("videoram"); + map(0xc800, 0xcfff).ram().w(FUNC(segag80r_state::mainram_w)).share("mainram"); + map(0xe000, 0xffff).ram().w(FUNC(segag80r_state::vidram_w)).share("videoram"); } @@ -360,9 +360,9 @@ void segag80r_state::sega_315_opcodes_map(address_map &map) void segag80r_state::main_portmap(address_map &map) { map.global_mask(0xff); - map(0xbe, 0xbf).rw(this, FUNC(segag80r_state::segag80r_video_port_r), FUNC(segag80r_state::segag80r_video_port_w)); - map(0xf9, 0xf9).mirror(0x04).w(this, FUNC(segag80r_state::coin_count_w)); - map(0xf8, 0xfb).r(this, FUNC(segag80r_state::mangled_ports_r)); + map(0xbe, 0xbf).rw(FUNC(segag80r_state::segag80r_video_port_r), FUNC(segag80r_state::segag80r_video_port_w)); + map(0xf9, 0xf9).mirror(0x04).w(FUNC(segag80r_state::coin_count_w)); + map(0xf8, 0xfb).r(FUNC(segag80r_state::mangled_ports_r)); map(0xfc, 0xfc).portr("FC"); } @@ -371,9 +371,9 @@ void segag80r_state::main_ppi8255_portmap(address_map &map) { map.global_mask(0xff); map(0x0c, 0x0f).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xbe, 0xbf).rw(this, FUNC(segag80r_state::segag80r_video_port_r), FUNC(segag80r_state::segag80r_video_port_w)); - map(0xf9, 0xf9).mirror(0x04).w(this, FUNC(segag80r_state::coin_count_w)); - map(0xf8, 0xfb).r(this, FUNC(segag80r_state::mangled_ports_r)); + map(0xbe, 0xbf).rw(FUNC(segag80r_state::segag80r_video_port_r), FUNC(segag80r_state::segag80r_video_port_w)); + map(0xf9, 0xf9).mirror(0x04).w(FUNC(segag80r_state::coin_count_w)); + map(0xf8, 0xfb).r(FUNC(segag80r_state::mangled_ports_r)); map(0xfc, 0xfc).portr("FC"); } @@ -381,9 +381,9 @@ void segag80r_state::main_ppi8255_portmap(address_map &map) void segag80r_state::sindbadm_portmap(address_map &map) { map.global_mask(0xff); - map(0x42, 0x43).rw(this, FUNC(segag80r_state::segag80r_video_port_r), FUNC(segag80r_state::segag80r_video_port_w)); + map(0x42, 0x43).rw(FUNC(segag80r_state::segag80r_video_port_r), FUNC(segag80r_state::segag80r_video_port_w)); map(0x80, 0x83).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xf8, 0xfb).r(this, FUNC(segag80r_state::mangled_ports_r)); + map(0xf8, 0xfb).r(FUNC(segag80r_state::mangled_ports_r)); } @@ -399,9 +399,9 @@ void segag80r_state::sindbadm_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x8000, 0x87ff).mirror(0x1800).ram(); - map(0xa000, 0xa003).mirror(0x1ffc).w(this, FUNC(segag80r_state::sindbadm_sn1_SN76496_w)); - map(0xc000, 0xc003).mirror(0x1ffc).w(this, FUNC(segag80r_state::sindbadm_sn2_SN76496_w)); - map(0xe000, 0xe000).mirror(0x1fff).r(this, FUNC(segag80r_state::sindbadm_sound_data_r)); + map(0xa000, 0xa003).mirror(0x1ffc).w(FUNC(segag80r_state::sindbadm_sn1_SN76496_w)); + map(0xc000, 0xc003).mirror(0x1ffc).w(FUNC(segag80r_state::sindbadm_sn2_SN76496_w)); + map(0xe000, 0xe000).mirror(0x1fff).r(FUNC(segag80r_state::sindbadm_sound_data_r)); } diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp index c2aca88ebc7..a2b4e2425dc 100644 --- a/src/mame/drivers/segag80v.cpp +++ b/src/mame/drivers/segag80v.cpp @@ -392,13 +392,13 @@ void segag80v_state::main_map(address_map &map) { map(0x0000, 0x07ff).rom(); /* CPU board ROM */ map(0x0800, 0xbfff).rom(); /* PROM board ROM area */ - map(0xc800, 0xcfff).ram().w(this, FUNC(segag80v_state::mainram_w)).share("mainram"); - map(0xe000, 0xefff).ram().w(this, FUNC(segag80v_state::vectorram_w)).share("vectorram"); + map(0xc800, 0xcfff).ram().w(FUNC(segag80v_state::mainram_w)).share("mainram"); + map(0xe000, 0xefff).ram().w(FUNC(segag80v_state::vectorram_w)).share("vectorram"); } void segag80v_state::opcodes_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(segag80v_state::g80v_opcode_r)); + map(0x0000, 0xffff).r(FUNC(segag80v_state::g80v_opcode_r)); } @@ -407,12 +407,12 @@ void segag80v_state::main_portmap(address_map &map) { map.global_mask(0xff); map(0xbc, 0xbc); /* AM_READ ??? */ - map(0xbd, 0xbe).w(this, FUNC(segag80v_state::multiply_w)); - map(0xbe, 0xbe).r(this, FUNC(segag80v_state::multiply_r)); - map(0xbf, 0xbf).w(this, FUNC(segag80v_state::unknown_w)); + map(0xbd, 0xbe).w(FUNC(segag80v_state::multiply_w)); + map(0xbe, 0xbe).r(FUNC(segag80v_state::multiply_r)); + map(0xbf, 0xbf).w(FUNC(segag80v_state::unknown_w)); - map(0xf9, 0xf9).mirror(0x04).w(this, FUNC(segag80v_state::coin_count_w)); - map(0xf8, 0xfb).r(this, FUNC(segag80v_state::mangled_ports_r)); + map(0xf9, 0xf9).mirror(0x04).w(FUNC(segag80v_state::coin_count_w)); + map(0xf8, 0xfb).r(FUNC(segag80v_state::mangled_ports_r)); map(0xfc, 0xfc).portr("FC"); } diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index 819f840ce8f..54e0a035a0e 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -404,11 +404,11 @@ void segahang_state::hangon_map(address_map &map) map(0x400000, 0x403fff).rw(m_segaic16vid, FUNC(segaic16_video_device::tileram_r), FUNC(segaic16_video_device::tileram_w)).share("tileram"); map(0x410000, 0x410fff).rw(m_segaic16vid, FUNC(segaic16_video_device::textram_r), FUNC(segaic16_video_device::textram_w)).share("textram"); map(0x600000, 0x6007ff).ram().share("sprites"); - map(0xa00000, 0xa00fff).ram().w(this, FUNC(segahang_state::paletteram_w)).share("paletteram"); + map(0xa00000, 0xa00fff).ram().w(FUNC(segahang_state::paletteram_w)).share("paletteram"); map(0xc00000, 0xc3ffff).rom().region("subcpu", 0); map(0xc68000, 0xc68fff).ram().share("roadram"); map(0xc7c000, 0xc7ffff).ram().share("subram"); - map(0xe00000, 0xffffff).rw(this, FUNC(segahang_state::hangon_io_r), FUNC(segahang_state::hangon_io_w)); + map(0xe00000, 0xffffff).rw(FUNC(segahang_state::hangon_io_r), FUNC(segahang_state::hangon_io_w)); } void segahang_state::decrypted_opcodes_map(address_map &map) @@ -424,10 +424,10 @@ void segahang_state::sharrier_map(address_map &map) map(0x040000, 0x043fff).ram().share("workram"); map(0x100000, 0x107fff).rw(m_segaic16vid, FUNC(segaic16_video_device::tileram_r), FUNC(segaic16_video_device::tileram_w)).share("tileram"); map(0x108000, 0x108fff).rw(m_segaic16vid, FUNC(segaic16_video_device::textram_r), FUNC(segaic16_video_device::textram_w)).share("textram"); - map(0x110000, 0x110fff).ram().w(this, FUNC(segahang_state::paletteram_w)).share("paletteram"); + map(0x110000, 0x110fff).ram().w(FUNC(segahang_state::paletteram_w)).share("paletteram"); map(0x124000, 0x127fff).ram().share("subram"); map(0x130000, 0x130fff).ram().share("sprites"); - map(0x140000, 0x14ffff).rw(this, FUNC(segahang_state::sharrier_io_r), FUNC(segahang_state::sharrier_io_w)); + map(0x140000, 0x14ffff).rw(FUNC(segahang_state::sharrier_io_r), FUNC(segahang_state::sharrier_io_w)); map(0xc68000, 0xc68fff).ram().share("roadram"); } @@ -469,7 +469,7 @@ void segahang_state::sound_portmap_2203(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x40, 0x40).mirror(0x3f).r(this, FUNC(segahang_state::sound_data_r)); + map(0x40, 0x40).mirror(0x3f).r(FUNC(segahang_state::sound_data_r)); } void segahang_state::sound_map_2151(address_map &map) @@ -485,7 +485,7 @@ void segahang_state::sound_portmap_2151(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).mirror(0x3e).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x40, 0x40).mirror(0x3f).r(this, FUNC(segahang_state::sound_data_r)); + map(0x40, 0x40).mirror(0x3f).r(FUNC(segahang_state::sound_data_r)); } void segahang_state::sound_portmap_2203x2(address_map &map) @@ -493,7 +493,7 @@ void segahang_state::sound_portmap_2203x2(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).mirror(0x3e).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x40, 0x40).mirror(0x3f).r(this, FUNC(segahang_state::sound_data_r)); + map(0x40, 0x40).mirror(0x3f).r(FUNC(segahang_state::sound_data_r)); map(0xc0, 0xc1).mirror(0x3e).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); } diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp index 2ed018576e2..419c415ecdb 100644 --- a/src/mame/drivers/segald.cpp +++ b/src/mame/drivers/segald.cpp @@ -259,15 +259,15 @@ void segald_state::mainmem(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xc7ff).rw(this, FUNC(segald_state::astron_OBJ_read), FUNC(segald_state::astron_OBJ_write)).share("obj_ram"); /* OBJ according to the schematics (sprite) */ - map(0xc800, 0xcfff).rw(this, FUNC(segald_state::astron_DISC_read), FUNC(segald_state::astron_DISC_write)); /* DISC interface according to schematics */ + map(0xc000, 0xc7ff).rw(FUNC(segald_state::astron_OBJ_read), FUNC(segald_state::astron_OBJ_write)).share("obj_ram"); /* OBJ according to the schematics (sprite) */ + map(0xc800, 0xcfff).rw(FUNC(segald_state::astron_DISC_read), FUNC(segald_state::astron_DISC_write)); /* DISC interface according to schematics */ map(0xd000, 0xd000).portr("DSWA"); /* SW bank 2 (DIPs) */ map(0xd001, 0xd001).portr("DSWB"); /* SW bank 3 (DIPs) */ map(0xd002, 0xd002).portr("IN0"); /* SW bank 0 (IO) */ map(0xd003, 0xd003).portr("IN1"); /* SW bank 1 (IO) */ - map(0xd800, 0xd803).rw(this, FUNC(segald_state::astron_OUT_read), FUNC(segald_state::astron_OUT_write)).share("out_ram"); /* OUT according to schematics (output port) */ - map(0xe000, 0xe1ff).rw(this, FUNC(segald_state::astron_COLOR_read), FUNC(segald_state::astron_COLOR_write)).share("color_ram"); /* COLOR according to the schematics */ - map(0xf000, 0xf7ff).w(this, FUNC(segald_state::astron_FIX_write)).share("fix_ram"); /* FIX according to schematics (characters) */ + map(0xd800, 0xd803).rw(FUNC(segald_state::astron_OUT_read), FUNC(segald_state::astron_OUT_write)).share("out_ram"); /* OUT according to schematics (output port) */ + map(0xe000, 0xe1ff).rw(FUNC(segald_state::astron_COLOR_read), FUNC(segald_state::astron_COLOR_write)).share("color_ram"); /* COLOR according to the schematics */ + map(0xf000, 0xf7ff).w(FUNC(segald_state::astron_FIX_write)).share("fix_ram"); /* FIX according to schematics (characters) */ map(0xf800, 0xffff).ram(); /* RAM according to schematics */ } @@ -276,7 +276,7 @@ void segald_state::mainmem(address_map &map) void segald_state::mainport(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(segald_state::astron_io_bankswitch_w)); + map(0x00, 0x01).w(FUNC(segald_state::astron_io_bankswitch_w)); } diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp index e3bc07bf2b1..d2fe17b8fb4 100644 --- a/src/mame/drivers/segam1.cpp +++ b/src/mame/drivers/segam1.cpp @@ -194,7 +194,7 @@ void segam1_state::segam1_map(address_map &map) map(0xb60000, 0xb60001).nopw(); /* Frame trigger position (XVOUT) */ map(0xb70000, 0xb70001).nopw(); /* Synchronization mode */ map(0xb80000, 0xbfffff).rw(m_tile, FUNC(segas24_tile_device::char_r), FUNC(segas24_tile_device::char_w)); - map(0xc00000, 0xc03fff).ram().w(this, FUNC(segam1_state::paletteram_w)).share("paletteram"); + map(0xc00000, 0xc03fff).ram().w(FUNC(segam1_state::paletteram_w)).share("paletteram"); map(0xc04000, 0xc0401f).rw(m_mixer, FUNC(segas24_mixer_device::read), FUNC(segas24_mixer_device::write)); map(0xe00000, 0xe0001f).rw("io1", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write)).umask16(0x00ff); map(0xe40000, 0xe40001).portr("INX"); @@ -223,7 +223,7 @@ void segam1_state::segam1_sound_io_map(address_map &map) { map.global_mask(0xff); map(0x80, 0x83).rw(m_ymsnd, FUNC(ym3438_device::read), FUNC(ym3438_device::write)); - map(0xa0, 0xa0).w(this, FUNC(segam1_state::sound_a0_bank_w)); + map(0xa0, 0xa0).w(FUNC(segam1_state::sound_a0_bank_w)); map(0xc0, 0xc0).r("soundlatch", FUNC(generic_latch_8_device::read)).nopw(); } diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp index 19fb33b7235..dadc897a2f5 100644 --- a/src/mame/drivers/segapico.cpp +++ b/src/mame/drivers/segapico.cpp @@ -344,7 +344,7 @@ WRITE16_MEMBER(pico_base_state::pico_68k_io_write ) void pico_base_state::pico_mem(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x800000, 0x80001f).rw(this, FUNC(pico_base_state::pico_68k_io_read), FUNC(pico_base_state::pico_68k_io_write)); + map(0x800000, 0x80001f).rw(FUNC(pico_base_state::pico_68k_io_read), FUNC(pico_base_state::pico_68k_io_write)); map(0xc00000, 0xc0001f).rw("gen_vdp", FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); map(0xe00000, 0xe0ffff).ram().mirror(0x1f0000); } @@ -574,7 +574,7 @@ void copera_state::copera_mem(address_map &map) { map(0x000000, 0x3fffff).rom(); - map(0x800000, 0x80001f).rw(this, FUNC(copera_state::pico_68k_io_read), FUNC(copera_state::pico_68k_io_write)); + map(0x800000, 0x80001f).rw(FUNC(copera_state::pico_68k_io_read), FUNC(copera_state::pico_68k_io_write)); map(0xc00000, 0xc0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index f470e8effdb..ed4f6273a34 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -960,8 +960,8 @@ void segas16a_state::system16a_map(address_map &map) map(0x400000, 0x407fff).mirror(0xb88000).rw(m_segaic16vid, FUNC(segaic16_video_device::tileram_r), FUNC(segaic16_video_device::tileram_w)).share("tileram"); map(0x410000, 0x410fff).mirror(0xb8f000).rw(m_segaic16vid, FUNC(segaic16_video_device::textram_r), FUNC(segaic16_video_device::textram_w)).share("textram"); map(0x440000, 0x4407ff).mirror(0x3bf800).ram().share("sprites"); - map(0x840000, 0x840fff).mirror(0x3bf000).ram().w(this, FUNC(segas16a_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc43fff).mirror(0x39c000).rw(this, FUNC(segas16a_state::misc_io_r), FUNC(segas16a_state::misc_io_w)); + map(0x840000, 0x840fff).mirror(0x3bf000).ram().w(FUNC(segas16a_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc43fff).mirror(0x39c000).rw(FUNC(segas16a_state::misc_io_r), FUNC(segas16a_state::misc_io_w)); map(0xc60000, 0xc6ffff).r(m_watchdog, FUNC(watchdog_timer_device::reset16_r)); map(0xc70000, 0xc73fff).mirror(0x38c000).ram().share("nvram"); } @@ -979,7 +979,7 @@ void segas16a_state::sound_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x7fff).rom(); - map(0xe800, 0xe800).r(this, FUNC(segas16a_state::sound_data_r)); + map(0xe800, 0xe800).r(FUNC(segas16a_state::sound_data_r)); map(0xf800, 0xffff).ram(); } @@ -993,8 +993,8 @@ void segas16a_state::sound_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).mirror(0x3e).rw(m_ymsnd, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x80, 0x80).mirror(0x3f).w(this, FUNC(segas16a_state::n7751_command_w)); - map(0xc0, 0xc0).mirror(0x3f).r(this, FUNC(segas16a_state::sound_data_r)); + map(0x80, 0x80).mirror(0x3f).w(FUNC(segas16a_state::n7751_command_w)); + map(0xc0, 0xc0).mirror(0x3f).r(FUNC(segas16a_state::sound_data_r)); } void segas16a_state::sound_no7751_portmap(address_map &map) @@ -1003,7 +1003,7 @@ void segas16a_state::sound_no7751_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x01).mirror(0x3e).rw(m_ymsnd, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x80, 0x80).mirror(0x3f).noprw(); - map(0xc0, 0xc0).mirror(0x3f).r(this, FUNC(segas16a_state::sound_data_r)); + map(0xc0, 0xc0).mirror(0x3f).r(FUNC(segas16a_state::sound_data_r)); } @@ -1014,7 +1014,7 @@ void segas16a_state::sound_no7751_portmap(address_map &map) void segas16a_state::mcu_io_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(segas16a_state::mcu_io_r), FUNC(segas16a_state::mcu_io_w)); + map(0x0000, 0xffff).rw(FUNC(segas16a_state::mcu_io_r), FUNC(segas16a_state::mcu_io_w)); } @@ -1976,7 +1976,7 @@ MACHINE_CONFIG_START(segas16a_state::system16a) MCFG_DEVICE_ADD("n7751", N7751, 6000000) MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, segas16a_state, n7751_rom_r)) MCFG_MCS48_PORT_T1_IN_CB(GND) // labelled as "TEST", connected to ground - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, segas16a_state, n7751_p2_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, segas16a_state, n7751_p2_w)) MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("n7751_8243", i8243_device, prog_w)) diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 4f596595cb9..4a6087927ff 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -1723,13 +1723,13 @@ void segas16b_state::system16b_bootleg_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x200000, 0x23ffff).ram(); // used during startup for decompression - map(0x3f0000, 0x3fffff).w(this, FUNC(segas16b_state::rom_5704_bank_w)); + map(0x3f0000, 0x3fffff).w(FUNC(segas16b_state::rom_5704_bank_w)); map(0x400000, 0x40ffff).rw(m_segaic16vid, FUNC(segaic16_video_device::tileram_r), FUNC(segaic16_video_device::tileram_w)).share("tileram"); map(0x410000, 0x410fff).rw(m_segaic16vid, FUNC(segaic16_video_device::textram_r), FUNC(segaic16_video_device::textram_w)).share("textram"); map(0x440000, 0x4407ff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas16b_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc43fff).rw(this, FUNC(segas16b_state::bootleg_custom_io_r), FUNC(segas16b_state::bootleg_custom_io_w)); - map(0x123406, 0x123407).w(this, FUNC(segas16b_state::sound_w16)); + map(0x840000, 0x840fff).ram().w(FUNC(segas16b_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc43fff).rw(FUNC(segas16b_state::bootleg_custom_io_r), FUNC(segas16b_state::bootleg_custom_io_w)); + map(0x123406, 0x123407).w(FUNC(segas16b_state::sound_w16)); map(0xffc000, 0xffffff).ram().share("workram"); } @@ -1743,7 +1743,7 @@ void segas16b_state::map_fpointbla(address_map &map) map(0x410000, 0x410fff).rw(m_segaic16vid, FUNC(segaic16_video_device::textram_r), FUNC(segaic16_video_device::textram_w)).share("textram"); map(0x440000, 0x4407ff).ram().share("sprites"); map(0x443002, 0x443003).portr("SERVICE"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas16b_state::paletteram_w)).share("paletteram"); + map(0x840000, 0x840fff).ram().w(FUNC(segas16b_state::paletteram_w)).share("paletteram"); map(0x843018, 0x843019).portr("DSW1"); map(0xfe0005, 0xfe0005).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xfe000c, 0xfe000d).portr("P1"); @@ -1766,11 +1766,11 @@ void segas16b_state::lockonph_map(address_map &map) { // this still appears to have a mapper device, does the hardware use it? should we move this to all be configured by it? map(0x000000, 0x0bffff).rom(); - map(0x3f0000, 0x3fffff).w(this, FUNC(segas16b_state::rom_5704_bank_w)); + map(0x3f0000, 0x3fffff).w(FUNC(segas16b_state::rom_5704_bank_w)); map(0x400000, 0x40ffff).rw(m_segaic16vid, FUNC(segaic16_video_device::tileram_r), FUNC(segaic16_video_device::tileram_w)).share("tileram"); map(0x410000, 0x410fff).rw(m_segaic16vid, FUNC(segaic16_video_device::textram_r), FUNC(segaic16_video_device::textram_w)).share("textram"); map(0x440000, 0x4407ff).ram().share("sprites"); - map(0x840000, 0x841fff).ram().w(this, FUNC(segas16b_state::philko_paletteram_w)).share("paletteram"); + map(0x840000, 0x841fff).ram().w(FUNC(segas16b_state::philko_paletteram_w)).share("paletteram"); map(0xC40000, 0xC40001).nopw(); // coin counters etc.? @@ -1803,7 +1803,7 @@ void segas16b_state::fpointbl_map(address_map &map) map(0x600000, 0x600001).portr("DSW2"); map(0x600002, 0x600003).portr("DSW1"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas16b_state::paletteram_w)).share("paletteram"); + map(0x840000, 0x840fff).ram().w(FUNC(segas16b_state::paletteram_w)).share("paletteram"); map(0x843000, 0x843001).nopw(); map(0xC46000, 0xC4601f).ram().share("bootleg_scroll"); @@ -1859,8 +1859,8 @@ void segas16b_state::sound_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).mirror(0x3e).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x40, 0x40).mirror(0x3f).w(this, FUNC(segas16b_state::upd7759_control_w)); - map(0x80, 0x80).mirror(0x3f).r(this, FUNC(segas16b_state::upd7759_status_r)).w(m_upd7759, FUNC(upd7759_device::port_w)); + map(0x40, 0x40).mirror(0x3f).w(FUNC(segas16b_state::upd7759_control_w)); + map(0x80, 0x80).mirror(0x3f).r(FUNC(segas16b_state::upd7759_status_r)).w(m_upd7759, FUNC(upd7759_device::port_w)); map(0xc0, 0xc0).mirror(0x3f).r(m_mapper, FUNC(sega_315_5195_mapper_device::pread)); } @@ -1878,8 +1878,8 @@ void segas16b_state::bootleg_sound_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).mirror(0x3e).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x40, 0x40).mirror(0x3f).w(this, FUNC(segas16b_state::upd7759_control_w)); - map(0x80, 0x80).mirror(0x3f).r(this, FUNC(segas16b_state::upd7759_status_r)).w(m_upd7759, FUNC(upd7759_device::port_w)); + map(0x40, 0x40).mirror(0x3f).w(FUNC(segas16b_state::upd7759_control_w)); + map(0x80, 0x80).mirror(0x3f).r(FUNC(segas16b_state::upd7759_status_r)).w(m_upd7759, FUNC(upd7759_device::port_w)); map(0xc0, 0xc0).mirror(0x3f).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -9609,30 +9609,30 @@ void isgsm_state::isgsm_map(address_map &map) map(0x000000, 0x0fffff).bankr(ISGSM_MAIN_BANK).region("bios", 0); // this area is ALWAYS read-only, even when the game is banked in map(0x200000, 0x23ffff).ram(); // used during startup for decompression - map(0x3f0000, 0x3fffff).w(this, FUNC(isgsm_state::rom_5704_bank_w)); + map(0x3f0000, 0x3fffff).w(FUNC(isgsm_state::rom_5704_bank_w)); map(0x400000, 0x40ffff).rw(m_segaic16vid, FUNC(segaic16_video_device::tileram_r), FUNC(segaic16_video_device::tileram_w)).share("tileram"); map(0x410000, 0x410fff).rw(m_segaic16vid, FUNC(segaic16_video_device::textram_r), FUNC(segaic16_video_device::textram_w)).share("textram"); map(0x440000, 0x4407ff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(isgsm_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc43fff).rw(this, FUNC(isgsm_state::standard_io_r), FUNC(isgsm_state::standard_io_w)); + map(0x840000, 0x840fff).ram().w(FUNC(isgsm_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc43fff).rw(FUNC(isgsm_state::standard_io_r), FUNC(isgsm_state::standard_io_w)); - map(0xe00000, 0xe00001).w(this, FUNC(isgsm_state::data_w)); // writes decompressed data here (copied from RAM..) - map(0xe00002, 0xe00003).w(this, FUNC(isgsm_state::datatype_w)); // selects which 'type' of data we're writing - map(0xe00004, 0xe00005).w(this, FUNC(isgsm_state::addr_high_w)); // high address, and some mode bits - map(0xe00006, 0xe00007).w(this, FUNC(isgsm_state::addr_low_w)); // low address + map(0xe00000, 0xe00001).w(FUNC(isgsm_state::data_w)); // writes decompressed data here (copied from RAM..) + map(0xe00002, 0xe00003).w(FUNC(isgsm_state::datatype_w)); // selects which 'type' of data we're writing + map(0xe00004, 0xe00005).w(FUNC(isgsm_state::addr_high_w)); // high address, and some mode bits + map(0xe00006, 0xe00007).w(FUNC(isgsm_state::addr_low_w)); // low address - map(0xe80000, 0xe80001).r(this, FUNC(isgsm_state::cart_data_r)); // 8-bit port that the entire cart can be read from + map(0xe80000, 0xe80001).r(FUNC(isgsm_state::cart_data_r)); // 8-bit port that the entire cart can be read from map(0xe80002, 0xe80003).portr("CARDDSW"); - map(0xe80004, 0xe80005).w(this, FUNC(isgsm_state::cart_addr_high_w)); - map(0xe80006, 0xe80007).w(this, FUNC(isgsm_state::cart_addr_low_w)); - map(0xe80008, 0xe80009).rw(this, FUNC(isgsm_state::cart_security_high_r), FUNC(isgsm_state::cart_security_high_w)); // 32-bit bitswap device.. - map(0xe8000a, 0xe8000b).rw(this, FUNC(isgsm_state::cart_security_low_r), FUNC(isgsm_state::cart_security_low_w)); + map(0xe80004, 0xe80005).w(FUNC(isgsm_state::cart_addr_high_w)); + map(0xe80006, 0xe80007).w(FUNC(isgsm_state::cart_addr_low_w)); + map(0xe80008, 0xe80009).rw(FUNC(isgsm_state::cart_security_high_r), FUNC(isgsm_state::cart_security_high_w)); // 32-bit bitswap device.. + map(0xe8000a, 0xe8000b).rw(FUNC(isgsm_state::cart_security_low_r), FUNC(isgsm_state::cart_security_low_w)); map(0xee0000, 0xefffff).rom().region("gamecart_rgn", 0); // only the first 0x20000 bytes of the cart are visible here.. - map(0xfe0006, 0xfe0007).w(this, FUNC(isgsm_state::sound_w16)); - map(0xfe0008, 0xfe0009).w(this, FUNC(isgsm_state::sound_reset_w)); - map(0xfe000a, 0xfe000b).w(this, FUNC(isgsm_state::main_bank_change_w)); + map(0xfe0006, 0xfe0007).w(FUNC(isgsm_state::sound_w16)); + map(0xfe0008, 0xfe0009).w(FUNC(isgsm_state::sound_reset_w)); + map(0xfe000a, 0xfe000b).w(FUNC(isgsm_state::main_bank_change_w)); map(0xffc000, 0xffffff).ram().share("workram"); } diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index 330fdbbece5..612df7d5f44 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -591,7 +591,7 @@ READ16_MEMBER( segas18_state::wwally_custom_io_r ) WRITE16_MEMBER( segas18_state::wwally_custom_io_w ) { if (offset >= 0x3000/2 && offset < 0x3018/2) - m_upd4701[(offset & 0x0018/2) >> 2]->reset_xy(space, 0); + m_upd4701[(offset & 0x0018/2) >> 2]->reset_xy_r(space, 0); } @@ -656,7 +656,7 @@ void segas18_state::sound_portmap(address_map &map) map.global_mask(0xff); map(0x80, 0x83).mirror(0x0c).rw("ym1", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); map(0x90, 0x93).mirror(0x0c).rw("ym2", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); - map(0xa0, 0xa0).mirror(0x1f).w(this, FUNC(segas18_state::soundbank_w)); + map(0xa0, 0xa0).mirror(0x1f).w(FUNC(segas18_state::soundbank_w)); map(0xc0, 0xc0).mirror(0x1f).rw(m_mapper, FUNC(sega_315_5195_mapper_device::pread), FUNC(sega_315_5195_mapper_device::pwrite)); } diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp index 70f57c83370..43c5e6e99e4 100644 --- a/src/mame/drivers/segas24.cpp +++ b/src/mame/drivers/segas24.cpp @@ -1074,25 +1074,25 @@ void segas24_state::system24_cpu1_map(address_map &map) map(0x260000, 0x260001).mirror(0x10fffe).nopw(); /* Frame trigger position (XVOUT) */ map(0x270000, 0x270001).mirror(0x10fffe).nopw(); /* Synchronization mode */ map(0x280000, 0x29ffff).mirror(0x160000).rw("tile", FUNC(segas24_tile_device::char_r), FUNC(segas24_tile_device::char_w)); - map(0x400000, 0x403fff).mirror(0x1f8000).rw(this, FUNC(segas24_state::sys16_paletteram_r), FUNC(segas24_state::sys16_paletteram_w)).share("paletteram"); + map(0x400000, 0x403fff).mirror(0x1f8000).rw(FUNC(segas24_state::sys16_paletteram_r), FUNC(segas24_state::sys16_paletteram_w)).share("paletteram"); map(0x404000, 0x40401f).mirror(0x1fbfe0).rw("mixer", FUNC(segas24_mixer_device::read), FUNC(segas24_mixer_device::write)); map(0x600000, 0x63ffff).mirror(0x180000).rw("sprite", FUNC(segas24_sprite_device::read), FUNC(segas24_sprite_device::write)); map(0x800000, 0x80003f).mirror(0x1ffe00).rw("io", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write)).umask16(0x00ff); - map(0x800040, 0x80007f).mirror(0x1ffe00).rw(this, FUNC(segas24_state::iod_r), FUNC(segas24_state::iod_w)); + map(0x800040, 0x80007f).mirror(0x1ffe00).rw(FUNC(segas24_state::iod_r), FUNC(segas24_state::iod_w)); map(0x800100, 0x800103).mirror(0x1ffe00).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); - map(0xa00000, 0xa00007).mirror(0x0ffff8).rw(this, FUNC(segas24_state::irq_r), FUNC(segas24_state::irq_w)); - map(0xb00000, 0xb00007).mirror(0x07fff0).rw(this, FUNC(segas24_state::fdc_r), FUNC(segas24_state::fdc_w)); - map(0xb00008, 0xb0000f).mirror(0x07fff0).rw(this, FUNC(segas24_state::fdc_status_r), FUNC(segas24_state::fdc_ctrl_w)); + map(0xa00000, 0xa00007).mirror(0x0ffff8).rw(FUNC(segas24_state::irq_r), FUNC(segas24_state::irq_w)); + map(0xb00000, 0xb00007).mirror(0x07fff0).rw(FUNC(segas24_state::fdc_r), FUNC(segas24_state::fdc_w)); + map(0xb00008, 0xb0000f).mirror(0x07fff0).rw(FUNC(segas24_state::fdc_status_r), FUNC(segas24_state::fdc_ctrl_w)); map(0xb80000, 0xbbffff).bankr("bank1"); - map(0xbc0000, 0xbc0001).mirror(0x03fff8).rw(this, FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); - map(0xbc0003, 0xbc0003).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); - map(0xbc0005, 0xbc0005).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); - map(0xbc0006, 0xbc0007).mirror(0x03fff8).rw(this, FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); + map(0xbc0000, 0xbc0001).mirror(0x03fff8).rw(FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); + map(0xbc0003, 0xbc0003).mirror(0x03fff8).rw(FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); + map(0xbc0005, 0xbc0005).mirror(0x03fff8).rw(FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); + map(0xbc0006, 0xbc0007).mirror(0x03fff8).rw(FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); map(0xc80000, 0xcbffff).bankr("bank2"); - map(0xcc0000, 0xcc0001).mirror(0x03fff8).rw(this, FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); - map(0xcc0003, 0xcc0003).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); - map(0xcc0005, 0xcc0005).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); - map(0xcc0006, 0xcc0007).mirror(0x03fff8).rw(this, FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); + map(0xcc0000, 0xcc0001).mirror(0x03fff8).rw(FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); + map(0xcc0003, 0xcc0003).mirror(0x03fff8).rw(FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); + map(0xcc0005, 0xcc0005).mirror(0x03fff8).rw(FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); + map(0xcc0006, 0xcc0007).mirror(0x03fff8).rw(FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); map(0xf00000, 0xf3ffff).mirror(0x040000).ram().share("subcpu"); map(0xf80000, 0xfbffff).mirror(0x040000).ram().share("share1"); } @@ -1131,25 +1131,25 @@ void segas24_state::system24_cpu2_map(address_map &map) map(0x260000, 0x260001).mirror(0x10fffe).nopw(); /* Frame trigger position (XVOUT) */ map(0x270000, 0x270001).mirror(0x10fffe).nopw(); /* Synchronization mode */ map(0x280000, 0x29ffff).mirror(0x160000).rw("tile", FUNC(segas24_tile_device::char_r), FUNC(segas24_tile_device::char_w)); - map(0x400000, 0x403fff).mirror(0x1f8000).rw(this, FUNC(segas24_state::sys16_paletteram_r), FUNC(segas24_state::sys16_paletteram_w)).share("paletteram"); + map(0x400000, 0x403fff).mirror(0x1f8000).rw(FUNC(segas24_state::sys16_paletteram_r), FUNC(segas24_state::sys16_paletteram_w)).share("paletteram"); map(0x404000, 0x40401f).mirror(0x1fbfe0).rw("mixer", FUNC(segas24_mixer_device::read), FUNC(segas24_mixer_device::write)); map(0x600000, 0x63ffff).mirror(0x180000).rw("sprite", FUNC(segas24_sprite_device::read), FUNC(segas24_sprite_device::write)); map(0x800000, 0x80003f).mirror(0x1ffe00).rw("io", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write)).umask16(0x00ff); - map(0x800040, 0x80007f).mirror(0x1ffe00).rw(this, FUNC(segas24_state::iod_r), FUNC(segas24_state::iod_w)); + map(0x800040, 0x80007f).mirror(0x1ffe00).rw(FUNC(segas24_state::iod_r), FUNC(segas24_state::iod_w)); map(0x800100, 0x800103).mirror(0x1ffe00).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); - map(0xa00000, 0xa00007).mirror(0x0ffff8).rw(this, FUNC(segas24_state::irq_r), FUNC(segas24_state::irq_w)); - map(0xb00000, 0xb00007).mirror(0x07fff0).rw(this, FUNC(segas24_state::fdc_r), FUNC(segas24_state::fdc_w)); - map(0xb00008, 0xb0000f).mirror(0x07fff0).rw(this, FUNC(segas24_state::fdc_status_r), FUNC(segas24_state::fdc_ctrl_w)); + map(0xa00000, 0xa00007).mirror(0x0ffff8).rw(FUNC(segas24_state::irq_r), FUNC(segas24_state::irq_w)); + map(0xb00000, 0xb00007).mirror(0x07fff0).rw(FUNC(segas24_state::fdc_r), FUNC(segas24_state::fdc_w)); + map(0xb00008, 0xb0000f).mirror(0x07fff0).rw(FUNC(segas24_state::fdc_status_r), FUNC(segas24_state::fdc_ctrl_w)); map(0xb80000, 0xbbffff).bankr("bank1"); - map(0xbc0000, 0xbc0001).mirror(0x03fff8).rw(this, FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); - map(0xbc0003, 0xbc0003).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); - map(0xbc0005, 0xbc0005).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); - map(0xbc0006, 0xbc0007).mirror(0x03fff8).rw(this, FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); + map(0xbc0000, 0xbc0001).mirror(0x03fff8).rw(FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); + map(0xbc0003, 0xbc0003).mirror(0x03fff8).rw(FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); + map(0xbc0005, 0xbc0005).mirror(0x03fff8).rw(FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); + map(0xbc0006, 0xbc0007).mirror(0x03fff8).rw(FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); map(0xc80000, 0xcbffff).bankr("bank2"); - map(0xcc0000, 0xcc0001).mirror(0x03fff8).rw(this, FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); - map(0xcc0003, 0xcc0003).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); - map(0xcc0005, 0xcc0005).mirror(0x03fff8).rw(this, FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); - map(0xcc0006, 0xcc0007).mirror(0x03fff8).rw(this, FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); + map(0xcc0000, 0xcc0001).mirror(0x03fff8).rw(FUNC(segas24_state::curbank_r), FUNC(segas24_state::curbank_w)); + map(0xcc0003, 0xcc0003).mirror(0x03fff8).rw(FUNC(segas24_state::frc_mode_r), FUNC(segas24_state::frc_mode_w)); + map(0xcc0005, 0xcc0005).mirror(0x03fff8).rw(FUNC(segas24_state::frc_r), FUNC(segas24_state::frc_w)); + map(0xcc0006, 0xcc0007).mirror(0x03fff8).rw(FUNC(segas24_state::mlatch_r), FUNC(segas24_state::mlatch_w)); map(0xf00000, 0xf3ffff).mirror(0x040000).ram().share("subcpu"); map(0xf80000, 0xfbffff).mirror(0x040000).ram().share("share1"); } @@ -1881,7 +1881,7 @@ MACHINE_CONFIG_START(segas24_state::system24) MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE")) MCFG_315_5296_IN_PORTF_CB(IOPORT("COINAGE")) MCFG_315_5296_IN_PORTG_CB(IOPORT("DSW")) - MCFG_315_5296_OUT_PORTH_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_315_5296_OUT_PORTH_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas24_state, cnt1)) MCFG_315_5296_OUT_CNT2_CB(WRITELINE("ymsnd", ym2151_device, reset_w)) diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index d84924f4373..f4a1e03d0c2 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -1061,19 +1061,19 @@ void segas32_state::system32_map(address_map &map) map.unmap_value_high(); map(0x000000, 0x1fffff).rom(); map(0x200000, 0x20ffff).mirror(0x0f0000).ram().share("workram"); - map(0x300000, 0x31ffff).mirror(0x0e0000).rw(this, FUNC(segas32_state::system32_videoram_r), FUNC(segas32_state::system32_videoram_w)).share("videoram"); - map(0x400000, 0x41ffff).mirror(0x0e0000).rw(this, FUNC(segas32_state::system32_spriteram_r), FUNC(segas32_state::system32_spriteram_w)).share("spriteram"); - map(0x500000, 0x50000f).mirror(0x0ffff0).rw(this, FUNC(segas32_state::sprite_control_r), FUNC(segas32_state::sprite_control_w)).umask16(0x00ff); - map(0x600000, 0x60ffff).mirror(0x0e0000).rw(this, FUNC(segas32_state::system32_paletteram_r), FUNC(segas32_state::system32_paletteram_w)).share("paletteram.0"); - map(0x610000, 0x61007f).mirror(0x0eff80).rw(this, FUNC(segas32_state::system32_mixer_r), FUNC(segas32_state::system32_mixer_w)); - map(0x700000, 0x701fff).mirror(0x0fe000).rw(this, FUNC(segas32_state::shared_ram_r), FUNC(segas32_state::shared_ram_w)); + map(0x300000, 0x31ffff).mirror(0x0e0000).rw(FUNC(segas32_state::system32_videoram_r), FUNC(segas32_state::system32_videoram_w)).share("videoram"); + map(0x400000, 0x41ffff).mirror(0x0e0000).rw(FUNC(segas32_state::system32_spriteram_r), FUNC(segas32_state::system32_spriteram_w)).share("spriteram"); + map(0x500000, 0x50000f).mirror(0x0ffff0).rw(FUNC(segas32_state::sprite_control_r), FUNC(segas32_state::sprite_control_w)).umask16(0x00ff); + map(0x600000, 0x60ffff).mirror(0x0e0000).rw(FUNC(segas32_state::system32_paletteram_r), FUNC(segas32_state::system32_paletteram_w)).share("paletteram.0"); + map(0x610000, 0x61007f).mirror(0x0eff80).rw(FUNC(segas32_state::system32_mixer_r), FUNC(segas32_state::system32_mixer_w)); + map(0x700000, 0x701fff).mirror(0x0fe000).rw(FUNC(segas32_state::shared_ram_r), FUNC(segas32_state::shared_ram_w)); map(0x800000, 0x800fff).rw("s32comm", FUNC(s32comm_device::share_r), FUNC(s32comm_device::share_w)).umask16(0x00ff); map(0x801000, 0x801000).rw("s32comm", FUNC(s32comm_device::cn_r), FUNC(s32comm_device::cn_w)); map(0x801002, 0x801002).rw("s32comm", FUNC(s32comm_device::fg_r), FUNC(s32comm_device::fg_w)); map(0xc00000, 0xc0001f).mirror(0x0fff80).rw("io_chip", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write)).umask16(0x00ff); // 0xc00040-0xc0007f - I/O expansion area - map(0xd00000, 0xd0000f).mirror(0x07fff0).rw(this, FUNC(segas32_state::int_control_r), FUNC(segas32_state::int_control_w)); - map(0xd80000, 0xdfffff).rw(this, FUNC(segas32_state::random_number_r), FUNC(segas32_state::random_number_w)); + map(0xd00000, 0xd0000f).mirror(0x07fff0).rw(FUNC(segas32_state::int_control_r), FUNC(segas32_state::int_control_w)); + map(0xd80000, 0xdfffff).rw(FUNC(segas32_state::random_number_r), FUNC(segas32_state::random_number_w)); map(0xf00000, 0xffffff).rom().region("maincpu", 0); } @@ -1084,14 +1084,14 @@ void segas32_state::multi32_map(address_map &map) map.global_mask(0xffffff); map(0x000000, 0x1fffff).rom(); map(0x200000, 0x21ffff).mirror(0x0e0000).ram(); - map(0x300000, 0x31ffff).mirror(0x0e0000).rw(this, FUNC(segas32_state::system32_videoram_r), FUNC(segas32_state::system32_videoram_w)).share("videoram"); - map(0x400000, 0x41ffff).mirror(0x0e0000).rw(this, FUNC(segas32_state::multi32_spriteram_r), FUNC(segas32_state::multi32_spriteram_w)).share("spriteram"); - map(0x500000, 0x50000f).mirror(0x0ffff0).rw(this, FUNC(segas32_state::sprite_control_r), FUNC(segas32_state::sprite_control_w)).umask32(0x00ff00ff); - map(0x600000, 0x60ffff).mirror(0x060000).rw(this, FUNC(segas32_state::multi32_paletteram_0_r), FUNC(segas32_state::multi32_paletteram_0_w)).share("paletteram.0"); - map(0x610000, 0x61007f).mirror(0x06ff80).w(this, FUNC(segas32_state::multi32_mixer_0_w)); - map(0x680000, 0x68ffff).mirror(0x060000).rw(this, FUNC(segas32_state::multi32_paletteram_1_r), FUNC(segas32_state::multi32_paletteram_1_w)).share("paletteram.1"); - map(0x690000, 0x69007f).mirror(0x06ff80).w(this, FUNC(segas32_state::multi32_mixer_1_w)); - map(0x700000, 0x701fff).mirror(0x0fe000).rw(this, FUNC(segas32_state::shared_ram_r), FUNC(segas32_state::shared_ram_w)); + map(0x300000, 0x31ffff).mirror(0x0e0000).rw(FUNC(segas32_state::system32_videoram_r), FUNC(segas32_state::system32_videoram_w)).share("videoram"); + map(0x400000, 0x41ffff).mirror(0x0e0000).rw(FUNC(segas32_state::multi32_spriteram_r), FUNC(segas32_state::multi32_spriteram_w)).share("spriteram"); + map(0x500000, 0x50000f).mirror(0x0ffff0).rw(FUNC(segas32_state::sprite_control_r), FUNC(segas32_state::sprite_control_w)).umask32(0x00ff00ff); + map(0x600000, 0x60ffff).mirror(0x060000).rw(FUNC(segas32_state::multi32_paletteram_0_r), FUNC(segas32_state::multi32_paletteram_0_w)).share("paletteram.0"); + map(0x610000, 0x61007f).mirror(0x06ff80).w(FUNC(segas32_state::multi32_mixer_0_w)); + map(0x680000, 0x68ffff).mirror(0x060000).rw(FUNC(segas32_state::multi32_paletteram_1_r), FUNC(segas32_state::multi32_paletteram_1_w)).share("paletteram.1"); + map(0x690000, 0x69007f).mirror(0x06ff80).w(FUNC(segas32_state::multi32_mixer_1_w)); + map(0x700000, 0x701fff).mirror(0x0fe000).rw(FUNC(segas32_state::shared_ram_r), FUNC(segas32_state::shared_ram_w)); map(0x800000, 0x800fff).rw("s32comm", FUNC(s32comm_device::share_r), FUNC(s32comm_device::share_w)).umask32(0x00ff00ff); map(0x801000, 0x801000).rw("s32comm", FUNC(s32comm_device::cn_r), FUNC(s32comm_device::cn_w)); map(0x801002, 0x801002).rw("s32comm", FUNC(s32comm_device::fg_r), FUNC(s32comm_device::fg_w)); @@ -1099,8 +1099,8 @@ void segas32_state::multi32_map(address_map &map) // 0xc00040-0xc0007f - I/O expansion area 0 map(0xc80000, 0xc8001f).mirror(0x07ff80).rw("io_chip_1", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write)).umask32(0x00ff00ff); // 0xc80040-0xc8007f - I/O expansion area 1 - map(0xd00000, 0xd0000f).mirror(0x07fff0).rw(this, FUNC(segas32_state::int_control_r), FUNC(segas32_state::int_control_w)); - map(0xd80000, 0xdfffff).rw(this, FUNC(segas32_state::random_number_r), FUNC(segas32_state::random_number_w)); + map(0xd00000, 0xd0000f).mirror(0x07fff0).rw(FUNC(segas32_state::int_control_r), FUNC(segas32_state::int_control_w)); + map(0xd80000, 0xdfffff).rw(FUNC(segas32_state::random_number_r), FUNC(segas32_state::random_number_w)); map(0xf00000, 0xffffff).rom().region("maincpu", 0); } @@ -1127,11 +1127,11 @@ void segas32_state::system32_sound_portmap(address_map &map) map.global_mask(0xff); map(0x80, 0x83).mirror(0x0c).rw("ym1", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); map(0x90, 0x93).mirror(0x0c).rw("ym2", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); - map(0xa0, 0xaf).w(this, FUNC(segas32_state::sound_bank_lo_w)); - map(0xb0, 0xbf).w(this, FUNC(segas32_state::sound_bank_hi_w)); - map(0xc0, 0xcf).w(this, FUNC(segas32_state::sound_int_control_lo_w)); - map(0xd0, 0xd3).mirror(0x04).w(this, FUNC(segas32_state::sound_int_control_hi_w)); - map(0xf1, 0xf1).rw(this, FUNC(segas32_state::sound_dummy_r), FUNC(segas32_state::sound_dummy_w)); + map(0xa0, 0xaf).w(FUNC(segas32_state::sound_bank_lo_w)); + map(0xb0, 0xbf).w(FUNC(segas32_state::sound_bank_hi_w)); + map(0xc0, 0xcf).w(FUNC(segas32_state::sound_int_control_lo_w)); + map(0xd0, 0xd3).mirror(0x04).w(FUNC(segas32_state::sound_int_control_hi_w)); + map(0xf1, 0xf1).rw(FUNC(segas32_state::sound_dummy_r), FUNC(segas32_state::sound_dummy_w)); } void segas32_state::rf5c68_map(address_map &map) @@ -1154,11 +1154,11 @@ void segas32_state::multi32_sound_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x80, 0x83).mirror(0x0c).rw("ymsnd", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); - map(0xa0, 0xaf).w(this, FUNC(segas32_state::sound_bank_lo_w)); - map(0xb0, 0xbf).w(this, FUNC(segas32_state::multipcm_bank_w)); - map(0xc0, 0xcf).w(this, FUNC(segas32_state::sound_int_control_lo_w)); - map(0xd0, 0xd3).mirror(0x04).w(this, FUNC(segas32_state::sound_int_control_hi_w)); - map(0xf1, 0xf1).rw(this, FUNC(segas32_state::sound_dummy_r), FUNC(segas32_state::sound_dummy_w)); + map(0xa0, 0xaf).w(FUNC(segas32_state::sound_bank_lo_w)); + map(0xb0, 0xbf).w(FUNC(segas32_state::multipcm_bank_w)); + map(0xc0, 0xcf).w(FUNC(segas32_state::sound_int_control_lo_w)); + map(0xd0, 0xd3).mirror(0x04).w(FUNC(segas32_state::sound_int_control_hi_w)); + map(0xf1, 0xf1).rw(FUNC(segas32_state::sound_dummy_r), FUNC(segas32_state::sound_dummy_w)); } @@ -2314,9 +2314,9 @@ void segas32_trackball_state::system32_trackball_map(address_map &map) map.unmap_value_high(); system32_map(map); //AM_RANGE(0xc00040, 0xc0005f) AM_MIRROR(0x0fff80) AM_READWRITE8(sonic_custom_io_r, sonic_custom_io_w, 0x00ff) - map(0xc00040, 0xc00047).mirror(0x0fff80).rw("upd1", FUNC(upd4701_device::read_xy), FUNC(upd4701_device::reset_xy)).umask16(0x00ff); - map(0xc00048, 0xc0004f).mirror(0x0fff80).rw("upd2", FUNC(upd4701_device::read_xy), FUNC(upd4701_device::reset_xy)).umask16(0x00ff); - map(0xc00050, 0xc00057).mirror(0x0fff80).rw("upd3", FUNC(upd4701_device::read_xy), FUNC(upd4701_device::reset_xy)).umask16(0x00ff); + map(0xc00040, 0xc00047).mirror(0x0fff80).rw("upd1", FUNC(upd4701_device::read_xy), FUNC(upd4701_device::reset_xy_w)).umask16(0x00ff); + map(0xc00048, 0xc0004f).mirror(0x0fff80).rw("upd2", FUNC(upd4701_device::read_xy), FUNC(upd4701_device::reset_xy_w)).umask16(0x00ff); + map(0xc00050, 0xc00057).mirror(0x0fff80).rw("upd3", FUNC(upd4701_device::read_xy), FUNC(upd4701_device::reset_xy_w)).umask16(0x00ff); } MACHINE_CONFIG_START(segas32_trackball_state::device_add_mconfig) @@ -2608,7 +2608,7 @@ void sega_multi32_analog_state::multi32_analog_map(address_map &map) map.global_mask(0xffffff); multi32_map(map); map(0xc00050, 0xc00057).mirror(0x07ff80).rw("adc", FUNC(msm6253_device::d7_r), FUNC(msm6253_device::address_w)).umask32(0x00ff00ff); - map(0xc00060, 0xc00060).mirror(0x07ff80).w(this, FUNC(sega_multi32_analog_state::analog_bank_w)); + map(0xc00060, 0xc00060).mirror(0x07ff80).w(FUNC(sega_multi32_analog_state::analog_bank_w)); } MACHINE_CONFIG_START(sega_multi32_analog_state::device_add_mconfig) diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp index 482a3bfcd1a..17d6b03b449 100644 --- a/src/mame/drivers/segasp.cpp +++ b/src/mame/drivers/segasp.cpp @@ -183,26 +183,26 @@ void segasp_state::segasp_map(address_map &map) /* Area 0 */ map(0x00000000, 0x001fffff).mirror(0xa2000000).rom().region("maincpu", 0); // BIOS - map(0x005f6800, 0x005f69ff).mirror(0x02000000).rw(this, FUNC(segasp_state::dc_sysctrl_r), FUNC(segasp_state::dc_sysctrl_w)); + map(0x005f6800, 0x005f69ff).mirror(0x02000000).rw(FUNC(segasp_state::dc_sysctrl_r), FUNC(segasp_state::dc_sysctrl_w)); map(0x005f6c00, 0x005f6cff).mirror(0x02000000).m(m_maple, FUNC(maple_dc_device::amap)); map(0x005f7000, 0x005f70ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::submap)).umask64(0x0000ffff0000ffff); map(0x005f7400, 0x005f74ff).mirror(0x02000000).m(m_naomig1, FUNC(naomi_g1_device::amap)); - map(0x005f7800, 0x005f78ff).mirror(0x02000000).rw(this, FUNC(segasp_state::dc_g2_ctrl_r), FUNC(segasp_state::dc_g2_ctrl_w)); + map(0x005f7800, 0x005f78ff).mirror(0x02000000).rw(FUNC(segasp_state::dc_g2_ctrl_r), FUNC(segasp_state::dc_g2_ctrl_w)); map(0x005f7c00, 0x005f7cff).mirror(0x02000000).m(m_powervr2, FUNC(powervr2_device::pd_dma_map)); map(0x005f8000, 0x005f9fff).mirror(0x02000000).m(m_powervr2, FUNC(powervr2_device::ta_map)); - map(0x00600000, 0x006007ff).mirror(0x02000000).rw(this, FUNC(segasp_state::dc_modem_r), FUNC(segasp_state::dc_modem_w)); - map(0x00700000, 0x00707fff).mirror(0x02000000).rw(this, FUNC(segasp_state::dc_aica_reg_r), FUNC(segasp_state::dc_aica_reg_w)); + map(0x00600000, 0x006007ff).mirror(0x02000000).rw(FUNC(segasp_state::dc_modem_r), FUNC(segasp_state::dc_modem_w)); + map(0x00700000, 0x00707fff).mirror(0x02000000).rw(FUNC(segasp_state::dc_aica_reg_r), FUNC(segasp_state::dc_aica_reg_w)); map(0x00710000, 0x0071000f).mirror(0x02000000).rw("aicartc", FUNC(aicartc_device::read), FUNC(aicartc_device::write)).umask64(0x0000ffff0000ffff); - map(0x00800000, 0x00ffffff).mirror(0x02000000).rw(this, FUNC(segasp_state::sh4_soundram_r), FUNC(segasp_state::sh4_soundram_w)); // sound RAM (8 MB) + map(0x00800000, 0x00ffffff).mirror(0x02000000).rw(FUNC(segasp_state::sh4_soundram_r), FUNC(segasp_state::sh4_soundram_w)); // sound RAM (8 MB) /* External Device */ map(0x01000000, 0x0100ffff).ram(); // banked access to ROM/NET board address space, mainly backup SRAM and ATA - map(0x01010000, 0x01010007).rw(this, FUNC(segasp_state::sp_bank_r), FUNC(segasp_state::sp_bank_w)); + map(0x01010000, 0x01010007).rw(FUNC(segasp_state::sp_bank_r), FUNC(segasp_state::sp_bank_w)); // AM_RANGE(0x01010080, 0x01010087) IRQ pending/reset, ATA control - map(0x01010100, 0x01010127).r(this, FUNC(segasp_state::sp_io_r)); - map(0x01010128, 0x0101012f).rw(this, FUNC(segasp_state::sp_eeprom_r), FUNC(segasp_state::sp_eeprom_w)); - map(0x01010150, 0x01010157).r(this, FUNC(segasp_state::sp_rombdflg_r)); + map(0x01010100, 0x01010127).r(FUNC(segasp_state::sp_io_r)); + map(0x01010128, 0x0101012f).rw(FUNC(segasp_state::sp_eeprom_r), FUNC(segasp_state::sp_eeprom_w)); + map(0x01010150, 0x01010157).r(FUNC(segasp_state::sp_rombdflg_r)); // AM_RANGE(0x01010180, 0x010101af) custom UART 1 // AM_RANGE(0x010101c0, 0x010101ef) custom UART 2 @@ -235,7 +235,7 @@ void segasp_state::segasp_map(address_map &map) void segasp_state::onchip_port(address_map &map) { - map(0x00, 0x0f).rw(this, FUNC(segasp_state::sn_93c46a_r), FUNC(segasp_state::sn_93c46a_w)); + map(0x00, 0x0f).rw(FUNC(segasp_state::sn_93c46a_r), FUNC(segasp_state::sn_93c46a_w)); } diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 449b89591a5..d20362e4eb1 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -929,11 +929,11 @@ void segaxbd_state::main_map(address_map &map) map(0x0e8000, 0x0e801f).mirror(0x003fe0).rw("cmptimer_main", FUNC(sega_315_5250_compare_timer_device::read), FUNC(sega_315_5250_compare_timer_device::write)); map(0x100000, 0x100fff).mirror(0x00f000).ram().share("sprites"); map(0x110000, 0x11ffff).w("sprites", FUNC(sega_xboard_sprite_device::draw_write)); - map(0x120000, 0x123fff).mirror(0x00c000).ram().w(this, FUNC(segaxbd_state::paletteram_w)).share("paletteram"); - map(0x130000, 0x13ffff).rw(this, FUNC(segaxbd_state::adc_r), FUNC(segaxbd_state::adc_w)); + map(0x120000, 0x123fff).mirror(0x00c000).ram().w(FUNC(segaxbd_state::paletteram_w)).share("paletteram"); + map(0x130000, 0x13ffff).rw(FUNC(segaxbd_state::adc_r), FUNC(segaxbd_state::adc_w)); map(0x140000, 0x14000f).mirror(0x00fff0).rw("iochip_0", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)).umask16(0x00ff); map(0x150000, 0x15000f).mirror(0x00fff0).rw("iochip_1", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)).umask16(0x00ff); - map(0x160000, 0x16ffff).w(this, FUNC(segaxbd_state::iocontrol_w)); + map(0x160000, 0x16ffff).w(FUNC(segaxbd_state::iocontrol_w)); map(0x200000, 0x27ffff).rom().region("subcpu", 0x00000); map(0x280000, 0x283fff).mirror(0x01c000).ram().share("subram0"); map(0x2a0000, 0x2a3fff).mirror(0x01c000).ram().share("subram1"); diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index b56f152e8db..51e0a9e4d1c 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -626,7 +626,7 @@ void segaybd_state::suby_map(address_map &map) map(0x0c0000, 0x0cffff).ram().share("shareram"); map(0x180000, 0x1807ff).mirror(0x007800).ram().share("rotateram"); map(0x188000, 0x188fff).mirror(0x007000).ram().share("bsprites"); - map(0x190000, 0x193fff).mirror(0x004000).ram().w(this, FUNC(segaybd_state::paletteram_w)).share("paletteram"); + map(0x190000, 0x193fff).mirror(0x004000).ram().w(FUNC(segaybd_state::paletteram_w)).share("paletteram"); map(0x198000, 0x19ffff).r(m_segaic16vid, FUNC(segaic16_video_device::rotate_control_r)); map(0x1f0000, 0x1fffff).ram(); } @@ -690,8 +690,8 @@ void segaybd_state::main_map_link(address_map &map) { main_map(map); map(0x190000, 0x190fff).rw("mb8421", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)).umask16(0x00ff); - map(0x191000, 0x191001).r(this, FUNC(segaybd_state::link_r)); - map(0x192000, 0x192001).rw(this, FUNC(segaybd_state::link2_r), FUNC(segaybd_state::link2_w)); + map(0x191000, 0x191001).r(FUNC(segaybd_state::link_r)); + map(0x192000, 0x192001).rw(FUNC(segaybd_state::link2_r), FUNC(segaybd_state::link2_w)); } diff --git a/src/mame/drivers/seibucats.cpp b/src/mame/drivers/seibucats.cpp index 282b7545ce6..ed4e0e84e89 100644 --- a/src/mame/drivers/seibucats.cpp +++ b/src/mame/drivers/seibucats.cpp @@ -168,15 +168,15 @@ void seibucats_state::seibucats_map(address_map &map) // TODO: map devices map(0x00000000, 0x0003ffff).ram().share("mainram"); - map(0x00000010, 0x00000010).r(this, FUNC(seibucats_state::spi_status_r)); - map(0x00000400, 0x00000401).w(this, FUNC(seibucats_state::input_select_w)); - map(0x00000404, 0x00000405).w(this, FUNC(seibucats_state::output_latch_w)); - map(0x00000484, 0x00000487).w(this, FUNC(seibucats_state::palette_dma_start_w)); - map(0x00000490, 0x00000493).w(this, FUNC(seibucats_state::video_dma_length_w)); - map(0x00000494, 0x00000497).w(this, FUNC(seibucats_state::video_dma_address_w)); - map(0x00000562, 0x00000563).w(this, FUNC(seibucats_state::sprite_dma_start_w)); + map(0x00000010, 0x00000010).r(FUNC(seibucats_state::spi_status_r)); + map(0x00000400, 0x00000401).w(FUNC(seibucats_state::input_select_w)); + map(0x00000404, 0x00000405).w(FUNC(seibucats_state::output_latch_w)); + map(0x00000484, 0x00000487).w(FUNC(seibucats_state::palette_dma_start_w)); + map(0x00000490, 0x00000493).w(FUNC(seibucats_state::video_dma_length_w)); + map(0x00000494, 0x00000497).w(FUNC(seibucats_state::video_dma_address_w)); + map(0x00000562, 0x00000563).w(FUNC(seibucats_state::sprite_dma_start_w)); - map(0x00000600, 0x00000607).r(this, FUNC(seibucats_state::input_mux_r)).umask32(0x0000ffff); + map(0x00000600, 0x00000607).r(FUNC(seibucats_state::input_mux_r)).umask32(0x0000ffff); map(0x00200000, 0x003fffff).rom().region("ipl", 0).nopw(); // emjjoshi attempts to write there? // following are likely to be Seibu CATS specific @@ -188,7 +188,7 @@ void seibucats_state::seibucats_map(address_map &map) map(0x01200300, 0x01200300).rw("usart2", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x01200304, 0x01200304).rw("usart2", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0xa0000000, 0xa1ffffff).noprw(); // NVRAM on ROM board - map(0xa2000000, 0xa2000001).w(this, FUNC(seibucats_state::aux_rtc_w)); + map(0xa2000000, 0xa2000001).w(FUNC(seibucats_state::aux_rtc_w)); map(0xffe00000, 0xffffffff).rom().region("ipl", 0); } diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index f49ada72920..b9222c35f28 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -997,12 +997,12 @@ void seibuspi_state::base_map(address_map &map) { map(0x00000000, 0x0003ffff).ram().share("mainram"); map(0x00000400, 0x0000043f).rw("crtc", FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write)); - map(0x00000480, 0x00000483).w(this, FUNC(seibuspi_state::tilemap_dma_start_w)); - map(0x00000484, 0x00000487).w(this, FUNC(seibuspi_state::palette_dma_start_w)); - map(0x00000490, 0x00000493).w(this, FUNC(seibuspi_state::video_dma_length_w)); - map(0x00000494, 0x00000497).w(this, FUNC(seibuspi_state::video_dma_address_w)); + map(0x00000480, 0x00000483).w(FUNC(seibuspi_state::tilemap_dma_start_w)); + map(0x00000484, 0x00000487).w(FUNC(seibuspi_state::palette_dma_start_w)); + map(0x00000490, 0x00000493).w(FUNC(seibuspi_state::video_dma_length_w)); + map(0x00000494, 0x00000497).w(FUNC(seibuspi_state::video_dma_address_w)); map(0x00000498, 0x0000049b).nopw(); // ? dma address high bits? (always writes 0) - map(0x00000600, 0x00000600).r(this, FUNC(seibuspi_state::spi_status_r)); + map(0x00000600, 0x00000600).r(FUNC(seibuspi_state::spi_status_r)); map(0x00000604, 0x00000607).portr("INPUTS"); map(0x00000608, 0x0000060b).portr("EXCH"); map(0x0000060c, 0x0000060f).portr("SYSTEM"); @@ -1013,7 +1013,7 @@ void seibuspi_state::base_map(address_map &map) void seibuspi_state::sei252_map(address_map &map) { //AM_RANGE(0x00000500, 0x0000057f) AM_DEVREADWRITE16("obj", sei252_device, read_xor, write_xor, 0xffffffff) - map(0x0000050e, 0x0000050f).w(this, FUNC(seibuspi_state::sprite_dma_start_w)); + map(0x0000050e, 0x0000050f).w(FUNC(seibuspi_state::sprite_dma_start_w)); map(0x00000524, 0x00000527).nopw(); // SEI252 sprite decryption key, see machine/spisprit.c map(0x00000528, 0x0000052b).nopw(); // SEI252 sprite decryption unknown map(0x00000530, 0x00000533).nopw(); // SEI252 sprite decryption table key, see machine/spisprit.c @@ -1025,7 +1025,7 @@ void seibuspi_state::rise_map(address_map &map) { //AM_RANGE(0x00000500, 0x0000057f) AM_DEVREADWRITE16("obj", seibu_encrypted_sprite_device, read, write, 0xffffffff) map(0x0000054c, 0x0000054f).nopw(); // RISE10/11 sprite decryption key, see machine/seibuspi.c - map(0x00000562, 0x00000563).w(this, FUNC(seibuspi_state::sprite_dma_start_w)); + map(0x00000562, 0x00000563).w(FUNC(seibuspi_state::sprite_dma_start_w)); } void seibuspi_state::spi_map(address_map &map) @@ -1035,15 +1035,15 @@ void seibuspi_state::spi_map(address_map &map) map(0x00000600, 0x00000603).nopw(); // ? map(0x00000680, 0x00000680).r("soundfifo2", FUNC(fifo7200_device::data_byte_r)); map(0x00000680, 0x00000680).w("soundfifo1", FUNC(fifo7200_device::data_byte_w)); - map(0x00000684, 0x00000684).r(this, FUNC(seibuspi_state::sound_fifo_status_r)); - map(0x00000688, 0x00000688).w(this, FUNC(seibuspi_state::z80_prg_transfer_w)); - map(0x0000068c, 0x0000068c).w(this, FUNC(seibuspi_state::z80_enable_w)); - map(0x0000068e, 0x0000068e).w(this, FUNC(seibuspi_state::rf2_layer_bank_w)); + map(0x00000684, 0x00000684).r(FUNC(seibuspi_state::sound_fifo_status_r)); + map(0x00000688, 0x00000688).w(FUNC(seibuspi_state::z80_prg_transfer_w)); + map(0x0000068c, 0x0000068c).w(FUNC(seibuspi_state::z80_enable_w)); + map(0x0000068e, 0x0000068e).w(FUNC(seibuspi_state::rf2_layer_bank_w)); map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::ds2404_1w_reset_w)); map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::ds2404_data_w)); map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::ds2404_clk_w)); map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::ds2404_data_r)); - map(0x000006dd, 0x000006dd).r(this, FUNC(seibuspi_state::spi_ds2404_unknown_r)); + map(0x000006dd, 0x000006dd).r(FUNC(seibuspi_state::spi_ds2404_unknown_r)); map(0x00a00000, 0x013fffff).rom().region("sound01", 0); } @@ -1054,15 +1054,15 @@ void seibuspi_state::rdft2_map(address_map &map) map(0x00000600, 0x00000603).nopw(); // ? map(0x00000680, 0x00000680).r("soundfifo2", FUNC(fifo7200_device::data_byte_r)); map(0x00000680, 0x00000680).w("soundfifo1", FUNC(fifo7200_device::data_byte_w)); - map(0x00000684, 0x00000684).r(this, FUNC(seibuspi_state::sound_fifo_status_r)); - map(0x00000688, 0x00000688).w(this, FUNC(seibuspi_state::z80_prg_transfer_w)); - map(0x0000068c, 0x0000068c).w(this, FUNC(seibuspi_state::z80_enable_w)); - map(0x0000068e, 0x0000068e).w(this, FUNC(seibuspi_state::rf2_layer_bank_w)); + map(0x00000684, 0x00000684).r(FUNC(seibuspi_state::sound_fifo_status_r)); + map(0x00000688, 0x00000688).w(FUNC(seibuspi_state::z80_prg_transfer_w)); + map(0x0000068c, 0x0000068c).w(FUNC(seibuspi_state::z80_enable_w)); + map(0x0000068e, 0x0000068e).w(FUNC(seibuspi_state::rf2_layer_bank_w)); map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::ds2404_1w_reset_w)); map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::ds2404_data_w)); map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::ds2404_clk_w)); map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::ds2404_data_r)); - map(0x000006dd, 0x000006dd).r(this, FUNC(seibuspi_state::spi_ds2404_unknown_r)); + map(0x000006dd, 0x000006dd).r(FUNC(seibuspi_state::spi_ds2404_unknown_r)); map(0x00a00000, 0x013fffff).rom().region("sound01", 0); } @@ -1070,27 +1070,27 @@ void seibuspi_state::sxx2e_map(address_map &map) { base_map(map); sei252_map(map); - map(0x00000680, 0x00000680).r(this, FUNC(seibuspi_state::sb_coin_r)); + map(0x00000680, 0x00000680).r(FUNC(seibuspi_state::sb_coin_r)); map(0x00000680, 0x00000680).w("soundfifo1", FUNC(fifo7200_device::data_byte_w)); - map(0x00000684, 0x00000684).r(this, FUNC(seibuspi_state::sound_fifo_status_r)); + map(0x00000684, 0x00000684).r(FUNC(seibuspi_state::sound_fifo_status_r)); map(0x00000688, 0x0000068b).noprw(); // ? map(0x0000068c, 0x0000068f).nopw(); map(0x000006d0, 0x000006d0).w("ds2404", FUNC(ds2404_device::ds2404_1w_reset_w)); map(0x000006d4, 0x000006d4).w("ds2404", FUNC(ds2404_device::ds2404_data_w)); map(0x000006d8, 0x000006d8).w("ds2404", FUNC(ds2404_device::ds2404_clk_w)); map(0x000006dc, 0x000006dc).r("ds2404", FUNC(ds2404_device::ds2404_data_r)); - map(0x000006dd, 0x000006dd).r(this, FUNC(seibuspi_state::spi_ds2404_unknown_r)); + map(0x000006dd, 0x000006dd).r(FUNC(seibuspi_state::spi_ds2404_unknown_r)); } void seibuspi_state::sxx2f_map(address_map &map) { base_map(map); rise_map(map); - map(0x00000680, 0x00000680).r(this, FUNC(seibuspi_state::sb_coin_r)); + map(0x00000680, 0x00000680).r(FUNC(seibuspi_state::sb_coin_r)); map(0x00000680, 0x00000680).w("soundfifo1", FUNC(fifo7200_device::data_byte_w)); - map(0x00000684, 0x00000684).r(this, FUNC(seibuspi_state::sound_fifo_status_r)); + map(0x00000684, 0x00000684).r(FUNC(seibuspi_state::sound_fifo_status_r)); map(0x00000688, 0x0000068b).noprw(); // ? - map(0x0000068e, 0x0000068e).w(this, FUNC(seibuspi_state::spi_layerbanks_eeprom_w)); + map(0x0000068e, 0x0000068e).w(FUNC(seibuspi_state::spi_layerbanks_eeprom_w)); map(0x00000690, 0x00000693).nopw(); // ? } @@ -1098,8 +1098,8 @@ void seibuspi_state::sys386i_map(address_map &map) { base_map(map); rise_map(map); - map(0x0000068e, 0x0000068e).w(this, FUNC(seibuspi_state::spi_layerbanks_eeprom_w)); - map(0x0000068f, 0x0000068f).w(this, FUNC(seibuspi_state::oki_bank_w)); + map(0x0000068e, 0x0000068e).w(FUNC(seibuspi_state::spi_layerbanks_eeprom_w)); + map(0x0000068f, 0x0000068f).w(FUNC(seibuspi_state::oki_bank_w)); map(0x01200000, 0x01200000).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x01200004, 0x01200004).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -1108,15 +1108,15 @@ void seibuspi_state::sys386f_map(address_map &map) { map(0x00000000, 0x0003ffff).ram().share("mainram"); rise_map(map); - map(0x00000010, 0x00000010).r(this, FUNC(seibuspi_state::spi_status_r)); - map(0x00000400, 0x00000403).portr("SYSTEM").w(this, FUNC(seibuspi_state::ejsakura_input_select_w)); - map(0x00000404, 0x00000404).w(this, FUNC(seibuspi_state::eeprom_w)); + map(0x00000010, 0x00000010).r(FUNC(seibuspi_state::spi_status_r)); + map(0x00000400, 0x00000403).portr("SYSTEM").w(FUNC(seibuspi_state::ejsakura_input_select_w)); + map(0x00000404, 0x00000404).w(FUNC(seibuspi_state::eeprom_w)); map(0x00000408, 0x0000040f).w("ymz", FUNC(ymz280b_device::write)).umask32(0x000000ff); - map(0x00000484, 0x00000487).w(this, FUNC(seibuspi_state::palette_dma_start_w)); - map(0x00000490, 0x00000493).w(this, FUNC(seibuspi_state::video_dma_length_w)); - map(0x00000494, 0x00000497).w(this, FUNC(seibuspi_state::video_dma_address_w)); + map(0x00000484, 0x00000487).w(FUNC(seibuspi_state::palette_dma_start_w)); + map(0x00000490, 0x00000493).w(FUNC(seibuspi_state::video_dma_length_w)); + map(0x00000494, 0x00000497).w(FUNC(seibuspi_state::video_dma_address_w)); map(0x00000600, 0x00000607).r("ymz", FUNC(ymz280b_device::read)).umask32(0x000000ff); - map(0x0000060c, 0x0000060f).r(this, FUNC(seibuspi_state::ejsakura_keyboard_r)); + map(0x0000060c, 0x0000060f).r(FUNC(seibuspi_state::ejsakura_keyboard_r)); map(0x00200000, 0x003fffff).rom().share("share1"); map(0xffe00000, 0xffffffff).rom().region("maincpu", 0).share("share1"); // ROM location in real-mode } @@ -1166,13 +1166,13 @@ void seibuspi_state::sxx2e_soundmap(address_map &map) map(0x2000, 0x3fff).ram(); map(0x4002, 0x4002).nopw(); // ? map(0x4003, 0x4003).nopw(); // ? - map(0x4004, 0x4004).w(this, FUNC(seibuspi_state::spi_coin_w)); + map(0x4004, 0x4004).w(FUNC(seibuspi_state::spi_coin_w)); map(0x4008, 0x4008).r("soundfifo1", FUNC(fifo7200_device::data_byte_r)); map(0x4008, 0x4008).nopw(); // ? - map(0x4009, 0x4009).r(this, FUNC(seibuspi_state::z80_soundfifo_status_r)); + map(0x4009, 0x4009).r(FUNC(seibuspi_state::z80_soundfifo_status_r)); map(0x400b, 0x400b).nopw(); // ? map(0x4013, 0x4013).portr("COIN"); - map(0x401b, 0x401b).w(this, FUNC(seibuspi_state::z80_bank_w)); + map(0x401b, 0x401b).w(FUNC(seibuspi_state::z80_bank_w)); map(0x6000, 0x600f).rw("ymf", FUNC(ymf271_device::read), FUNC(ymf271_device::write)); map(0x8000, 0xffff).bankr("z80_bank"); } diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp index 5ef9492b100..751e69e4e38 100644 --- a/src/mame/drivers/seicross.cpp +++ b/src/mame/drivers/seicross.cpp @@ -115,10 +115,10 @@ void seicross_state::main_map(address_map &map) map(0x0000, 0x77ff).rom(); map(0x7800, 0x7fff).ram().share("share1"); map(0x8820, 0x887f).ram().share("spriteram"); - map(0x9000, 0x93ff).ram().w(this, FUNC(seicross_state::videoram_w)).share("videoram"); /* video RAM */ + map(0x9000, 0x93ff).ram().w(FUNC(seicross_state::videoram_w)).share("videoram"); /* video RAM */ map(0x9800, 0x981f).ram().share("row_scroll"); map(0x9880, 0x989f).writeonly().share("spriteram2"); - map(0x9c00, 0x9fff).ram().w(this, FUNC(seicross_state::colorram_w)).share("colorram"); + map(0x9c00, 0x9fff).ram().w(FUNC(seicross_state::colorram_w)).share("colorram"); map(0xa000, 0xa000).portr("IN0"); /* IN0 */ map(0xa800, 0xa800).portr("IN1"); /* IN1 */ map(0xb000, 0xb000).portr("TEST"); /* test */ @@ -137,7 +137,7 @@ void seicross_state::mcu_nvram_map(address_map &map) { map(0x0000, 0x007f).ram(); map(0x1000, 0x10ff).ram().share("nvram"); - map(0x2000, 0x2000).w(this, FUNC(seicross_state::dac_w)); + map(0x2000, 0x2000).w(FUNC(seicross_state::dac_w)); map(0x8000, 0xf7ff).rom().region("maincpu", 0); map(0xf800, 0xffff).ram().share("share1"); } @@ -148,7 +148,7 @@ void seicross_state::mcu_no_nvram_map(address_map &map) map(0x1003, 0x1003).portr("DSW1"); /* DSW1 */ map(0x1005, 0x1005).portr("DSW2"); /* DSW2 */ map(0x1006, 0x1006).portr("DSW3"); /* DSW3 */ - map(0x2000, 0x2000).w(this, FUNC(seicross_state::dac_w)); + map(0x2000, 0x2000).w(FUNC(seicross_state::dac_w)); map(0x8000, 0xf7ff).rom().region("maincpu", 0); map(0xf800, 0xffff).ram().share("share1"); } diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp index 755543816fe..77be1cf660f 100644 --- a/src/mame/drivers/seicupbl.cpp +++ b/src/mame/drivers/seicupbl.cpp @@ -343,7 +343,7 @@ void seicupbl_state::cupsocbl_mem(address_map &map) // AM_IMPORT_FROM( legionna_cop_mem ) map(0x000000, 0x0fffff).rom(); map(0x100400, 0x1005ff).rw("seibucop_boot", FUNC(seibu_cop_bootleg_device::read), FUNC(seibu_cop_bootleg_device::write)); - map(0x10065c, 0x10065d).w(this, FUNC(seicupbl_state::layer_disable_w)); + map(0x10065c, 0x10065d).w(FUNC(seicupbl_state::layer_disable_w)); map(0x100660, 0x10066f).ram().share("vregs"); map(0x100700, 0x100701).portr("DSW1"); map(0x100704, 0x100705).portr("PLAYERS12"); @@ -351,10 +351,10 @@ void seicupbl_state::cupsocbl_mem(address_map &map) map(0x10070c, 0x10070d).portr("SYSTEM"); map(0x10071c, 0x10071d).portr("DSW2"); map(0x100741, 0x100741).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x100800, 0x100fff).ram().w(this, FUNC(seicupbl_state::vram_sc0_w)).share("back_data"); - map(0x101000, 0x1017ff).ram().w(this, FUNC(seicupbl_state::vram_sc2_w)).share("fore_data"); - map(0x101800, 0x101fff).ram().w(this, FUNC(seicupbl_state::vram_sc1_w)).share("mid_data"); - map(0x102000, 0x102fff).ram().w(this, FUNC(seicupbl_state::vram_sc3_w)).share("textram"); + map(0x100800, 0x100fff).ram().w(FUNC(seicupbl_state::vram_sc0_w)).share("back_data"); + map(0x101000, 0x1017ff).ram().w(FUNC(seicupbl_state::vram_sc2_w)).share("fore_data"); + map(0x101800, 0x101fff).ram().w(FUNC(seicupbl_state::vram_sc1_w)).share("mid_data"); + map(0x102000, 0x102fff).ram().w(FUNC(seicupbl_state::vram_sc3_w)).share("textram"); map(0x103000, 0x103fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x104000, 0x106fff).ram(); map(0x107000, 0x1077ff).ram().share("spriteram"); @@ -372,7 +372,7 @@ void seicupbl_state::cupsocbl_sound_mem(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(seicupbl_state::okim_rombank_w)); + map(0x9000, 0x9000).w(FUNC(seicupbl_state::okim_rombank_w)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp index 1007f7f3049..efa3df31985 100644 --- a/src/mame/drivers/sengokmj.cpp +++ b/src/mame/drivers/sengokmj.cpp @@ -394,10 +394,10 @@ void sengokmj_state::sengokmj_map(address_map &map) { map(0x00000, 0x07fff).ram(); map(0x08000, 0x09fff).ram().share("nvram"); - map(0x0c000, 0x0c7ff).ram().w(this, FUNC(sengokmj_state::seibucrtc_sc0vram_w)).share("sc0_vram"); - map(0x0c800, 0x0cfff).ram().w(this, FUNC(sengokmj_state::seibucrtc_sc1vram_w)).share("sc1_vram"); - map(0x0d000, 0x0d7ff).ram().w(this, FUNC(sengokmj_state::seibucrtc_sc2vram_w)).share("sc2_vram"); - map(0x0d800, 0x0e7ff).ram().w(this, FUNC(sengokmj_state::seibucrtc_sc3vram_w)).share("sc3_vram"); + map(0x0c000, 0x0c7ff).ram().w(FUNC(sengokmj_state::seibucrtc_sc0vram_w)).share("sc0_vram"); + map(0x0c800, 0x0cfff).ram().w(FUNC(sengokmj_state::seibucrtc_sc1vram_w)).share("sc1_vram"); + map(0x0d000, 0x0d7ff).ram().w(FUNC(sengokmj_state::seibucrtc_sc2vram_w)).share("sc2_vram"); + map(0x0d800, 0x0e7ff).ram().w(FUNC(sengokmj_state::seibucrtc_sc3vram_w)).share("sc3_vram"); map(0x0e800, 0x0f7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x0f800, 0x0ffff).ram().share("sprite_ram"); map(0xc0000, 0xfffff).rom(); @@ -412,11 +412,11 @@ void sengokmj_state::sengokmj_io_map(address_map &map) // AM_RANGE(0x8080, 0x8081) CRTC extra register? // AM_RANGE(0x80c0, 0x80c1) CRTC extra register? // AM_RANGE(0x8100, 0x8101) AM_WRITENOP // always 0 - map(0x8180, 0x8181).w(this, FUNC(sengokmj_state::out_w)); - map(0x8140, 0x8141).w(this, FUNC(sengokmj_state::mahjong_panel_w)); + map(0x8180, 0x8181).w(FUNC(sengokmj_state::out_w)); + map(0x8140, 0x8141).w(FUNC(sengokmj_state::mahjong_panel_w)); map(0xc000, 0xc001).portr("DSW"); - map(0xc002, 0xc003).r(this, FUNC(sengokmj_state::mahjong_panel_r)); - map(0xc004, 0xc005).r(this, FUNC(sengokmj_state::system_r)); //switches + map(0xc002, 0xc003).r(FUNC(sengokmj_state::mahjong_panel_r)); + map(0xc004, 0xc005).r(FUNC(sengokmj_state::system_r)); //switches } diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index 923709d13e3..24df8de20d3 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -127,8 +127,8 @@ void senjyo_state::senjyo_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); + map(0x9000, 0x93ff).ram().w(FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); + map(0x9400, 0x97ff).ram().w(FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); map(0x9800, 0x987f).ram().share("spriteram"); map(0x9c00, 0x9dff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x9e00, 0x9e3f).ram(); @@ -145,15 +145,15 @@ void senjyo_state::senjyo_map(address_map &map) map(0x9e35, 0x9e35).ram().share("scrollx1"); /* 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) */ - map(0xa000, 0xa7ff).ram().w(this, FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); - map(0xa800, 0xafff).ram().w(this, FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); - map(0xb000, 0xb7ff).ram().w(this, FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); + map(0xa000, 0xa7ff).ram().w(FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); + map(0xa800, 0xafff).ram().w(FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); + map(0xb000, 0xb7ff).ram().w(FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); map(0xb800, 0xbbff).ram().share("radarram"); - map(0xd000, 0xd000).portr("P1").w(this, FUNC(senjyo_state::flip_screen_w)); + map(0xd000, 0xd000).portr("P1").w(FUNC(senjyo_state::flip_screen_w)); map(0xd001, 0xd001).portr("P2"); - map(0xd002, 0xd002).portr("SYSTEM").w(this, FUNC(senjyo_state::irq_ctrl_w)); + map(0xd002, 0xd002).portr("SYSTEM").w(FUNC(senjyo_state::irq_ctrl_w)); map(0xd003, 0xd003).nopr(); // debug cheat port? (i.e. bit 0 in starforc: invincibility, bit 3-0 in senyjo: disables enemy fire) - map(0xd004, 0xd004).portr("DSW1").w(this, FUNC(senjyo_state::sound_cmd_w)); + map(0xd004, 0xd004).portr("DSW1").w(FUNC(senjyo_state::sound_cmd_w)); map(0xd005, 0xd005).portr("DSW2"); } @@ -166,10 +166,10 @@ void senjyo_state::senjyo_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write)); - map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write)); - map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write)); - map(0xd000, 0xd000).w(this, FUNC(senjyo_state::volume_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w)); + map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w)); + map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w)); + map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w)); } void senjyo_state::senjyo_sound_io_map(address_map &map) @@ -198,25 +198,25 @@ void senjyo_state::starforb_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); + map(0x9000, 0x93ff).ram().w(FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); + map(0x9400, 0x97ff).ram().w(FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); map(0x9800, 0x987f).ram().share("spriteram"); map(0x9c00, 0x9dff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); /* The format / use of the ram here is different on the bootleg */ map(0x9e00, 0x9e3f).ram(); map(0x9e20, 0x9e21).ram().share("scrolly3"); map(0x9e25, 0x9e25).ram().share("scrollx3"); - map(0x9e30, 0x9e31).ram().w(this, FUNC(senjyo_state::starforb_scrolly2)).share("scrolly2"); // ok - map(0x9e35, 0x9e35).ram().w(this, FUNC(senjyo_state::starforb_scrollx2)).share("scrollx2"); // ok + map(0x9e30, 0x9e31).ram().w(FUNC(senjyo_state::starforb_scrolly2)).share("scrolly2"); // ok + map(0x9e35, 0x9e35).ram().w(FUNC(senjyo_state::starforb_scrollx2)).share("scrollx2"); // ok - map(0xa000, 0xa7ff).ram().w(this, FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); - map(0xa800, 0xafff).ram().w(this, FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); - map(0xb000, 0xb7ff).ram().w(this, FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); + map(0xa000, 0xa7ff).ram().w(FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); + map(0xa800, 0xafff).ram().w(FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); + map(0xb000, 0xb7ff).ram().w(FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); map(0xb800, 0xbbff).ram().share("radarram"); - map(0xd000, 0xd000).portr("P1").w(this, FUNC(senjyo_state::flip_screen_w)); + map(0xd000, 0xd000).portr("P1").w(FUNC(senjyo_state::flip_screen_w)); map(0xd001, 0xd001).portr("P2"); - map(0xd002, 0xd002).portr("SYSTEM").w(this, FUNC(senjyo_state::irq_ctrl_w)); - map(0xd004, 0xd004).portr("DSW1").w(this, FUNC(senjyo_state::sound_cmd_w)); + map(0xd002, 0xd002).portr("SYSTEM").w(FUNC(senjyo_state::irq_ctrl_w)); + map(0xd004, 0xd004).portr("DSW1").w(FUNC(senjyo_state::sound_cmd_w)); map(0xd005, 0xd005).portr("DSW2"); /* these aren't used / written, left here to make sure memory is allocated */ @@ -231,10 +231,10 @@ void senjyo_state::starforb_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write)); - map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write)); - map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write)); - map(0xd000, 0xd000).w(this, FUNC(senjyo_state::volume_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w)); + map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w)); + map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w)); + map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w)); map(0xf000, 0xffff).ram(); } diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index bee40948f5e..41ba1384311 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1703,7 +1703,7 @@ WRITE16_MEMBER(seta_state::ipl2_ack_w) void seta_state::tndrcade_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM - map(0x200000, 0x200001).w(this, FUNC(seta_state::ipl1_ack_w)); + map(0x200000, 0x200001).w(FUNC(seta_state::ipl1_ack_w)); map(0x280000, 0x280001).nopw(); // ? 0 / 1 (sub cpu related?) map(0x300000, 0x300001).nopw(); // ? 0 / 1 map(0x380000, 0x3803ff).ram().share("paletteram1"); // Palette @@ -1711,8 +1711,8 @@ void seta_state::tndrcade_map(address_map &map) map(0x600000, 0x6005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0x600600, 0x600607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); - map(0x800000, 0x800007).w(this, FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control? - map(0xa00000, 0xa00fff).rw(this, FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM + map(0x800000, 0x800007).w(FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control? + map(0xa00000, 0xa00fff).rw(FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr map(0xe00000, 0xe03fff).ram().share("share1"); // RAM (Mirrored?) map(0xffc000, 0xffffff).ram().share("share1"); // RAM (Mirrored?) @@ -1738,15 +1738,15 @@ void seta_state::downtown_map(address_map &map) map(0x000000, 0x09ffff).rom(); // ROM map(0x100000, 0x103fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0x200000, 0x200001).noprw(); // watchdog? (twineagl) - map(0x300000, 0x300001).w(this, FUNC(seta_state::ipl1_ack_w)); - map(0x400000, 0x400007).w(this, FUNC(seta_state::twineagl_tilebank_w)); // special tile banking to animate water in twineagl - map(0x500001, 0x500001).w(this, FUNC(seta_state::twineagl_ctrl_w)); - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x300000, 0x300001).w(FUNC(seta_state::ipl1_ack_w)); + map(0x400000, 0x400007).w(FUNC(seta_state::twineagl_tilebank_w)); // special tile banking to animate water in twineagl + map(0x500001, 0x500001).w(FUNC(seta_state::twineagl_ctrl_w)); + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette map(0x800000, 0x800005).writeonly().share("vctrl_0");// VRAM Ctrl - map(0x900000, 0x903fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM - map(0xa00000, 0xa00007).w(this, FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control? - map(0xb00000, 0xb00fff).rw(this, FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM + map(0x900000, 0x903fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM + map(0xa00000, 0xa00007).w(FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control? + map(0xb00000, 0xb00fff).rw(FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM map(0xc00000, 0xc00001).nopw(); // ? $4000 map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); @@ -1762,22 +1762,22 @@ void seta_state::downtown_map(address_map &map) void seta_state::calibr50_map(address_map &map) { map(0x000000, 0x09ffff).rom(); // ROM - map(0x100000, 0x100001).r(this, FUNC(seta_state::ipl2_ack_r)); + map(0x100000, 0x100001).r(FUNC(seta_state::ipl2_ack_r)); map(0x200000, 0x200fff).ram(); // NVRAM - map(0x300000, 0x300001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); + map(0x300000, 0x300001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); map(0x400000, 0x400001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); map(0x500000, 0x500001).nopw(); // ? - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette map(0x800000, 0x800005).writeonly().share("vctrl_0");// VRAM Ctrl - map(0x900000, 0x903fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM + map(0x900000, 0x903fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM map(0x904000, 0x904fff).ram(); // map(0xa00000, 0xa00001).portr("P1"); // X1-004 map(0xa00002, 0xa00003).portr("P2"); // X1-004 map(0xa00008, 0xa00009).portr("COINS"); // X1-004 map(0xa00010, 0xa00017).r(m_upd4701, FUNC(upd4701_device::read_xy)).umask16(0x00ff); - map(0xa00019, 0xa00019).r(m_upd4701, FUNC(upd4701_device::reset_xy)); + map(0xa00019, 0xa00019).r(m_upd4701, FUNC(upd4701_device::reset_xy_r)); map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); @@ -1845,15 +1845,15 @@ void seta_state::usclssic_map(address_map &map) map(0xa00000, 0xa00005).ram().share("vctrl_0"); // VRAM Ctrl map(0xb00000, 0xb003ff).ram().share("paletteram1"); // Palette map(0xb40000, 0xb40007).r(m_upd4701, FUNC(upd4701_device::read_xy)).umask16(0x00ff); - map(0xb40001, 0xb40001).w(this, FUNC(seta_state::usclssic_lockout_w)); // Coin Lockout + Tiles Banking - map(0xb4000a, 0xb4000b).w(this, FUNC(seta_state::ipl1_ack_w)); + map(0xb40001, 0xb40001).w(FUNC(seta_state::usclssic_lockout_w)); // Coin Lockout + Tiles Banking + map(0xb4000a, 0xb4000b).w(FUNC(seta_state::ipl1_ack_w)); map(0xb40010, 0xb40011).portr("COINS"); // Coins map(0xb40011, 0xb40011).w("soundlatch1", FUNC(generic_latch_8_device::write)); // To Sub CPU - map(0xb40018, 0xb4001f).r(this, FUNC(seta_state::usclssic_dsw_r)); // 2 DSWs + map(0xb40018, 0xb4001f).r(FUNC(seta_state::usclssic_dsw_r)); // 2 DSWs map(0xb40018, 0xb40019).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0xb80000, 0xb80001).r(this, FUNC(seta_state::ipl2_ack_r)); + map(0xb80000, 0xb80001).r(FUNC(seta_state::ipl2_ack_r)); map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr - map(0xd00000, 0xd03fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM + map(0xd00000, 0xd03fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM map(0xd04000, 0xd04fff).ram(); // map(0xe00000, 0xe00fff).ram(); // NVRAM? (odd bytes) } @@ -1871,7 +1871,7 @@ void seta_state::atehate_map(address_map &map) map(0x200000, 0x200001).nopw(); // ? watchdog ? map(0x300000, 0x300001).nopw(); // ? 0 (irq ack lev 2?) map(0x500000, 0x500001).nopw(); // ? (end of lev 1: bit 4 goes 1,0,1) - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xa00600, 0xa00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); @@ -1896,10 +1896,10 @@ void seta_state::blandia_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk) map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x703c00, 0x7047ff).ram().share("paletteram2"); // 2nd Palette for the palette offset effect @@ -1909,9 +1909,9 @@ void seta_state::blandia_map(address_map &map) map(0x900000, 0x903fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr map(0xa00000, 0xa00005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0xa80000, 0xa80005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl - map(0xb00000, 0xb03fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0xb00000, 0xb03fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0xb04000, 0xb0ffff).ram(); // (jjsquawk) - map(0xb80000, 0xb83fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0xb80000, 0xb83fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0xb84000, 0xb8ffff).ram(); // (jjsquawk) map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xd00000, 0xd00007).nopw(); // ? @@ -1934,16 +1934,16 @@ void seta_state::blandiap_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk) map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x703c00, 0x7047ff).ram().share("paletteram2"); // 2nd Palette for the palette offset effect - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x80ffff).ram(); // (jjsquawk) - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x88ffff).ram(); // (jjsquawk) map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2006,18 +2006,18 @@ void seta_state::wrofaero_map(address_map &map) map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); - map(0x500006, 0x500007).r(this, FUNC(seta_state::extra_r)); // Buttons 4,5,6 (Daioh only) + map(0x500006, 0x500007).r(FUNC(seta_state::extra_r)); // Buttons 4,5,6 (Daioh only) - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk) map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x701000, 0x70ffff).ram(); // - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x80ffff).ram(); // (jjsquawk) - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x88ffff).ram(); // (jjsquawk) map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2027,7 +2027,7 @@ void seta_state::wrofaero_map(address_map &map) map(0xb00000, 0xb03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound #if __uPD71054_TIMER - map(0xd00000, 0xd00007).w(this, FUNC(seta_state::timer_regs_w)); // ? + map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ? #else map(0xd00000, 0xd00007).nopw(); // ? #endif @@ -2039,8 +2039,8 @@ void seta_state::zombraid_map(address_map &map) { wrofaero_map(map); map(0x300000, 0x30ffff).ram().share("nvram"); // actually 8K x8 SRAM - map(0xf00000, 0xf00001).w(this, FUNC(seta_state::zombraid_gun_w)); - map(0xf00002, 0xf00003).r(this, FUNC(seta_state::zombraid_gun_r)); + map(0xf00000, 0xf00001).w(FUNC(seta_state::zombraid_gun_w)); + map(0xf00002, 0xf00003).r(FUNC(seta_state::zombraid_gun_r)); } READ16_MEMBER(seta_state::zingzipbl_unknown_r) @@ -2056,22 +2056,22 @@ void seta_state::zingzipbl_map(address_map &map) map(0x300000, 0x30ffff).ram(); // RAM (wrofaero only?) // AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 // AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 - map(0x400002, 0x400003).r(this, FUNC(seta_state::zingzipbl_unknown_r)); // P2 + map(0x400002, 0x400003).r(FUNC(seta_state::zingzipbl_unknown_r)); // P2 // AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); //AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r) // DSW map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk) map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x701000, 0x70ffff).ram(); // - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x80ffff).ram(); // (jjsquawk) - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x88ffff).ram(); // (jjsquawk) map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl - map(0x902010, 0x902013).r(this, FUNC(seta_state::zingzipbl_unknown_r)); + map(0x902010, 0x902013).r(FUNC(seta_state::zingzipbl_unknown_r)); map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y @@ -2080,7 +2080,7 @@ void seta_state::zingzipbl_map(address_map &map) map(0xb00000, 0xb03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr map(0xc00000, 0xc03fff).ram(); // soundram on original #if __uPD71054_TIMER - map(0xd00000, 0xd00007).w(this, FUNC(seta_state::timer_regs_w)); // ? + map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ? #else map(0xd00000, 0xd00007).nopw(); // ? #endif @@ -2097,15 +2097,15 @@ void seta_state::jjsquawb_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x70b3ff).ram(); // RZ: (rezon,jjsquawk) map(0x70b400, 0x70bfff).ram().share("paletteram1"); // Palette map(0x70c000, 0x70ffff).ram(); // - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0 - map(0x804000, 0x807fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0 + map(0x804000, 0x807fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2 map(0x884000, 0x88ffff).ram(); // (jjsquawk) map(0x908000, 0x908005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x909000, 0x909005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2115,7 +2115,7 @@ void seta_state::jjsquawb_map(address_map &map) map(0xb0c000, 0xb0ffff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // RZ: Sprites Code + X + Attr map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound #if __uPD71054_TIMER - map(0xd00000, 0xd00007).w(this, FUNC(seta_state::timer_regs_w)); // ? + map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ? #else map(0xd00000, 0xd00007).nopw(); // ? #endif @@ -2133,7 +2133,7 @@ void seta_state::orbs_map(address_map &map) map(0xf00000, 0xf0ffff).ram(); // RAM map(0x100000, 0x100001).nopr(); // ? map(0x200000, 0x200001).nopr(); // ? - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x400000, 0x400001).nopw(); // ? map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 @@ -2212,17 +2212,17 @@ void seta_state::keroppi_map(address_map &map) { map(0x000000, 0x07ffff).rom(); // ROM map(0xf00000, 0xf0ffff).ram(); // RAM - map(0x100000, 0x100001).r(this, FUNC(seta_state::keroppi_protection_r)); // - map(0x200000, 0x200001).r(this, FUNC(seta_state::keroppi_protection_init_r)); // - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x100000, 0x100001).r(FUNC(seta_state::keroppi_protection_r)); // + map(0x200000, 0x200001).r(FUNC(seta_state::keroppi_protection_init_r)); // + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x400000, 0x400001).nopw(); // ? map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 - map(0x500004, 0x500005).r(this, FUNC(seta_state::keroppi_coin_r)); // Coins + map(0x500004, 0x500005).r(FUNC(seta_state::keroppi_coin_r)); // Coins map(0x8000f0, 0x8000f1).ram(); // NVRAM map(0x800100, 0x8001ff).ram(); // NVRAM map(0x900000, 0x900001).nopw(); // ? - map(0x900002, 0x900003).w(this, FUNC(seta_state::keroppi_prize_w)); // + map(0x900002, 0x900003).w(FUNC(seta_state::keroppi_prize_w)); // map(0xa00000, 0xa03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xb00000, 0xb003ff).ram().share("paletteram1"); // Palette map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr @@ -2250,8 +2250,8 @@ void seta_state::blockcar_map(address_map &map) map(0xf05000, 0xf050ff).ram(); // Backup RAM? map(0x100000, 0x100001).nopw(); // ? 1 (start of interrupts, main loop: watchdog?) map(0x200000, 0x200001).nopw(); // ? 0/1 (IRQ acknowledge?) - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW - map(0x400001, 0x400001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?) + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW + map(0x400001, 0x400001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?) map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 map(0x500004, 0x500005).portr("COINS"); // Coins @@ -2271,8 +2271,8 @@ void seta_state::blockcarb_map(address_map &map) map(0xf05000, 0xf050ff).ram(); // Backup RAM? map(0x100000, 0x100001).nopw(); // ? 1 (start of interrupts, main loop: watchdog?) map(0x200000, 0x200001).nopw(); // ? 0/1 (IRQ acknowledge?) - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW - map(0x400001, 0x400001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?) + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW + map(0x400001, 0x400001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?) map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 map(0x500004, 0x500005).portr("COINS"); // Coins @@ -2297,17 +2297,17 @@ void seta_state::daioh_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); map(0x500006, 0x500007).portr("EXTRA"); // Buttons 4,5,6 - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram(); map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x701000, 0x70ffff).ram(); // - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x80ffff).ram(); // - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x88ffff).ram(); // map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2334,17 +2334,17 @@ void seta_state::daiohp_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); map(0x500006, 0x500007).portr("EXTRA"); // Buttons 4,5,6 - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram(); map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x701000, 0x70ffff).ram(); // - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x80ffff).ram(); // - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x88ffff).ram(); // map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2373,12 +2373,12 @@ void seta_state::drgnunit_map(address_map &map) map(0x100000, 0x103fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0x200000, 0x200001).nopw(); // Watchdog map(0x300000, 0x300001).nopw(); // ? IRQ Ack - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette map(0x800000, 0x800005).ram().share("vctrl_0"); // VRAM Ctrl - map(0x900000, 0x903fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM + map(0x900000, 0x903fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM map(0x904000, 0x90ffff).nopw(); // unused (qzkklogy) map(0xb00000, 0xb00001).portr("P1"); // P1 map(0xb00002, 0xb00003).portr("P2"); // P2 @@ -2537,32 +2537,32 @@ void setaroul_state::setaroul_map(address_map &map) map(0xc40000, 0xc40001).noprw(); // lev. 2/5 irq ack map(0xc80000, 0xc80001).noprw(); // lev. 4 irq ack - map(0xcc0000, 0xcc001f).rw(this, FUNC(setaroul_state::rtc_r), FUNC(setaroul_state::rtc_w)); + map(0xcc0000, 0xcc001f).rw(FUNC(setaroul_state::rtc_r), FUNC(setaroul_state::rtc_w)); map(0xd00000, 0xd00001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0xd40000, 0xd40001).portr("DSW1-A"); - map(0xd40001, 0xd40001).w(this, FUNC(setaroul_state::pay_w)); + map(0xd40001, 0xd40001).w(FUNC(setaroul_state::pay_w)); map(0xd40002, 0xd40003).portr("DSW1-B"); map(0xd40004, 0xd40005).portr("DSW2-A"); map(0xd40006, 0xd40007).portr("DSW2-B"); map(0xd40008, 0xd40009).portr("COIN"); - map(0xd40009, 0xd40009).w(this, FUNC(setaroul_state::led_w)); + map(0xd40009, 0xd40009).w(FUNC(setaroul_state::led_w)); map(0xd4000a, 0xd4000b).portr("DOOR"); - map(0xd40010, 0xd40011).rw(this, FUNC(setaroul_state::inputs_r), FUNC(setaroul_state::mux_w)); + map(0xd40010, 0xd40011).rw(FUNC(setaroul_state::inputs_r), FUNC(setaroul_state::mux_w)); map(0xd40018, 0xd40019).portr("DSW3"); map(0xdc0000, 0xdc3fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound - map(0xe00000, 0xe03fff).ram().w(this, FUNC(setaroul_state::vram_w<0>)).share("vram_0"); + map(0xe00000, 0xe03fff).ram().w(FUNC(setaroul_state::vram_w<0>)).share("vram_0"); map(0xe40000, 0xe40005).ram().share("vctrl_0"); // VRAM Ctrl - map(0xf00000, 0xf03fff).rw(this, FUNC(setaroul_state::spritecode_r), FUNC(setaroul_state::spritecode_w)); - map(0xf40000, 0xf40bff).w(this, FUNC(setaroul_state::spriteylow_w)); - map(0xf40c00, 0xf40c11).w(this, FUNC(setaroul_state::spritectrl_w)); + map(0xf00000, 0xf03fff).rw(FUNC(setaroul_state::spritecode_r), FUNC(setaroul_state::spritecode_w)); + map(0xf40000, 0xf40bff).w(FUNC(setaroul_state::spriteylow_w)); + map(0xf40c00, 0xf40c11).w(FUNC(setaroul_state::spritectrl_w)); // AM_RANGE(0xf80000, 0xf80001) AM_WRITE // $40 at boot } @@ -2581,16 +2581,16 @@ void seta_state::extdwnhl_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x400008, 0x40000b).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x400008, 0x40000b).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x40000c, 0x40000d).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); // Watchdog (extdwnhl (R) & sokonuke (W) MUST RETURN $FFFF) - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500007).noprw(); // IRQ Ack (extdwnhl (R) & sokonuke (W)) map(0x600400, 0x600fff).ram().share("paletteram1"); // Palette map(0x601000, 0x610bff).ram(); // - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x80ffff).ram(); // - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x88ffff).ram(); // map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2613,19 +2613,19 @@ void seta_state::kamenrid_map(address_map &map) map(0x200000, 0x20ffff).ram(); // RAM map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 - map(0x500004, 0x500007).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x500004, 0x500007).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x500008, 0x500009).portr("COINS"); // Coins map(0x50000c, 0x50000d).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); // xx Watchdog? (sokonuke) - map(0x600001, 0x600001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) - map(0x600003, 0x600003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers - map(0x600004, 0x600005).w(this, FUNC(seta_state::ipl1_ack_w)); - map(0x600006, 0x600007).w(this, FUNC(seta_state::ipl2_ack_w)); + map(0x600001, 0x600001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) + map(0x600003, 0x600003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x600004, 0x600005).w(FUNC(seta_state::ipl1_ack_w)); + map(0x600006, 0x600007).w(FUNC(seta_state::ipl2_ack_w)); map(0x700000, 0x7003ff).ram(); // Palette RAM (tested) map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x701000, 0x703fff).ram(); // Palette - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x807fff).ram(); // tested - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x887fff).ram(); // tested map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2646,15 +2646,15 @@ void seta_state::madshark_map(address_map &map) map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 map(0x500004, 0x500005).portr("COINS"); // Coins - map(0x500008, 0x50000b).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x500008, 0x50000b).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x50000c, 0x50000d).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x600001, 0x600001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x600003, 0x600003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers - map(0x600004, 0x600005).w(this, FUNC(seta_state::ipl1_ack_w)); - map(0x600006, 0x600007).w(this, FUNC(seta_state::ipl2_ack_w)); + map(0x600001, 0x600001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x600003, 0x600003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x600004, 0x600005).w(FUNC(seta_state::ipl1_ack_w)); + map(0x600006, 0x600007).w(FUNC(seta_state::ipl2_ack_w)); map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2686,20 +2686,20 @@ void seta_state::magspeed_map(address_map &map) map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 map(0x500004, 0x500005).portr("COINS"); // Coins - map(0x500008, 0x50000b).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x500008, 0x50000b).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x50000c, 0x50000d).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x500011, 0x500011).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) - map(0x500015, 0x500015).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers - map(0x500018, 0x500019).w(this, FUNC(seta_state::ipl1_ack_w)); // lev 2 irq ack? - map(0x50001c, 0x50001d).w(this, FUNC(seta_state::ipl2_ack_w)); // lev 4 irq ack? - map(0x600000, 0x600005).w(this, FUNC(seta_state::magspeed_lights_w)); // Lights + map(0x500011, 0x500011).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout) + map(0x500015, 0x500015).w(FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500018, 0x500019).w(FUNC(seta_state::ipl1_ack_w)); // lev 2 irq ack? + map(0x50001c, 0x50001d).w(FUNC(seta_state::ipl2_ack_w)); // lev 4 irq ack? + map(0x600000, 0x600005).w(FUNC(seta_state::magspeed_lights_w)); // Lights map(0x600006, 0x600007).nopw(); // ? map(0x700000, 0x7003ff).ram(); // Palette RAM (tested) map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x701000, 0x703fff).ram(); // Palette RAM (tested) - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0x804000, 0x807fff).ram(); // tested - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x884000, 0x887fff).ram(); // tested map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl @@ -2723,7 +2723,7 @@ void seta_state::krzybowl_map(address_map &map) map(0xf00000, 0xf0ffff).ram(); // RAM map(0x100000, 0x100001).nopr(); // ? map(0x200000, 0x200001).nopr(); // ? - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x400000, 0x400001).nopw(); // ? map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 @@ -2755,19 +2755,19 @@ void seta_state::msgundam_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x400000, 0x400001).w(this, FUNC(seta_state::ipl1_ack_w)); // Lev 2 IRQ Ack - map(0x400004, 0x400005).w(this, FUNC(seta_state::ipl2_ack_w)); // Lev 4 IRQ Ack - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x400000, 0x400001).w(FUNC(seta_state::ipl1_ack_w)); // Lev 2 IRQ Ack + map(0x400004, 0x400005).w(FUNC(seta_state::ipl2_ack_w)); // Lev 4 IRQ Ack + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout map(0x500002, 0x500003).nopw(); // ? - map(0x500005, 0x500005).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x500005, 0x500005).w(FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette map(0x800000, 0x8005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0x800600, 0x800607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); map(0x880000, 0x880001).ram(); // ? 0x4000 map(0x900000, 0x903fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr - map(0xa00000, 0xa03fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 - map(0xa80000, 0xa83fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0xa00000, 0xa03fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0xa80000, 0xa83fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0xb00000, 0xb00005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0xb80000, 0xb80005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound @@ -2785,17 +2785,17 @@ void seta_state::oisipuzl_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x17ffff).rom(); // ROM map(0x200000, 0x20ffff).ram(); // RAM - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins map(0x400000, 0x400001).nopw(); // ? IRQ Ack - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); // ? IRQ Ack map(0x700000, 0x703fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y @@ -2817,18 +2817,18 @@ void seta_state::triplfun_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x100000, 0x17ffff).rom(); // ROM map(0x200000, 0x20ffff).ram(); // RAM - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins map(0x400000, 0x400001).nopw(); // ? IRQ Ack - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers map(0x500004, 0x500005).nopw(); // ? IRQ Ack map(0x500007, 0x500007).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // tfun sound map(0x700000, 0x703fff).noprw(); - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y @@ -2881,8 +2881,8 @@ void seta_state::kiwame_map(address_map &map) map(0xa00600, 0xa00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); map(0xb00000, 0xb003ff).ram().share("paletteram1"); // Palette map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound - map(0xd00000, 0xd00009).r(this, FUNC(seta_state::kiwame_input_r)); // mahjong panel - map(0xe00000, 0xe00003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0xd00000, 0xd00009).r(FUNC(seta_state::kiwame_input_r)); // mahjong panel + map(0xe00000, 0xe00003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0xfffc00, 0xffffff).rw("tmp68301", FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); } @@ -2908,16 +2908,16 @@ void seta_state::thunderl_map(address_map &map) map(0x000000, 0x00ffff).rom(); // ROM map(0xffc000, 0xffffff).ram(); // RAM map(0x100000, 0x103fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound - map(0x200000, 0x200001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); + map(0x200000, 0x200001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); map(0x300000, 0x300001).nopw(); // ? - map(0x400000, 0x40ffff).w(this, FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits) - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x400000, 0x40ffff).w(FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits) + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette map(0xb00000, 0xb00001).portr("P1"); // P1 map(0xb00002, 0xb00003).portr("P2"); // P2 map(0xb00004, 0xb00005).portr("COINS"); // Coins - map(0xb0000c, 0xb0000d).r(this, FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits) + map(0xb0000c, 0xb0000d).r(FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits) map(0xb00008, 0xb00009).portr("P3"); // P3 (wits) map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits) map(0xc00000, 0xc00001).ram(); // ? 0x4000 @@ -2933,16 +2933,16 @@ void seta_state::thunderlbl_map(address_map &map) map(0x000000, 0x00ffff).rom(); // ROM map(0xffc000, 0xffffff).ram(); // RAM // map(0x100000, 0x103fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound - map(0x200000, 0x200001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); + map(0x200000, 0x200001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); map(0x300000, 0x300001).nopw(); // ? -// map(0x400000, 0x40ffff).w(this, FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits) - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW +// map(0x400000, 0x40ffff).w(FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits) + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette map(0xb00000, 0xb00001).portr("P1"); // P1 map(0xb00002, 0xb00003).portr("P2"); // P2 map(0xb00004, 0xb00005).portr("COINS"); // Coins -// map(0xb0000c, 0xb0000d).r(this, FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits) +// map(0xb0000c, 0xb0000d).r(FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits) map(0xb00008, 0xb00009).portr("P3"); // P3 (wits) map(0xb00008, 0xb00008).w("soundlatch1", FUNC(generic_latch_8_device::write)); map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits) @@ -2962,16 +2962,16 @@ void seta_state::wiggie_map(address_map &map) map(0x000000, 0x01ffff).rom(); // ROM map(0xffc000, 0xffffff).ram(); // RAM map(0x100000, 0x103fff).noprw(); // X1_010 is not used - map(0x200000, 0x200001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); + map(0x200000, 0x200001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w)); map(0x300000, 0x300001).nopw(); // ? - map(0x400000, 0x40ffff).w(this, FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits) - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x400000, 0x40ffff).w(FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits) + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette map(0xb00000, 0xb00001).portr("P1"); // P1 map(0xb00002, 0xb00003).portr("P2"); // P2 map(0xb00004, 0xb00005).portr("COINS"); // Coins - map(0xb0000c, 0xb0000d).r(this, FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits) + map(0xb0000c, 0xb0000d).r(FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits) map(0xb00008, 0xb00009).portr("P3"); // P3 (wits) map(0xb00008, 0xb00008).w("soundlatch1", FUNC(generic_latch_8_device::write)); map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits) @@ -3006,8 +3006,8 @@ void seta_state::umanclub_map(address_map &map) map(0x400004, 0x400005).portr("COINS"); // Coins map(0x400000, 0x400001).nopw(); // ? (end of lev 2) map(0x400004, 0x400005).nopw(); // ? (end of lev 2) - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xa00600, 0xa00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); map(0xa80000, 0xa80001).ram(); // ? 0x4000 @@ -3035,12 +3035,12 @@ void seta_state::utoukond_map(address_map &map) map(0x400000, 0x400001).portr("P1"); // P1 map(0x400002, 0x400003).portr("P2"); // P2 map(0x400004, 0x400005).portr("COINS"); // Coins - map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout - map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers - map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW + map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers + map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette - map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 - map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 + map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3 map(0x900000, 0x900005).writeonly().share("vctrl_0");// VRAM 0&1 Ctrl map(0x980000, 0x980005).writeonly().share("vctrl_1");// VRAM 2&3 Ctrl map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y @@ -3076,12 +3076,12 @@ void seta_state::pairlove_map(address_map &map) map(0x000000, 0x03ffff).rom(); // ROM map(0x100000, 0x100001).nopw(); // ? 1 (start of interrupts, main loop: watchdog?) map(0x200000, 0x200001).nopw(); // ? 0/1 (IRQ acknowledge?) - map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW - map(0x400001, 0x400001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?) + map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW + map(0x400001, 0x400001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?) map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 map(0x500004, 0x500005).portr("COINS"); // Coins - map(0x900000, 0x9001ff).rw(this, FUNC(seta_state::pairlove_prot_r), FUNC(seta_state::pairlove_prot_w)); + map(0x900000, 0x9001ff).rw(FUNC(seta_state::pairlove_prot_r), FUNC(seta_state::pairlove_prot_w)); map(0xa00000, 0xa03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xb00000, 0xb00fff).ram().share("paletteram1"); // Palette map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr @@ -3105,13 +3105,13 @@ void seta_state::crazyfgt_map(address_map &map) map(0x610004, 0x610005).portr("INPUT"); map(0x610006, 0x610007).nopw(); map(0x620000, 0x620003).nopw(); // protection - map(0x630000, 0x630003).r(this, FUNC(seta_state::seta_dsw_r)); + map(0x630000, 0x630003).r(FUNC(seta_state::seta_dsw_r)); map(0x640400, 0x640fff).writeonly().share("paletteram1"); // Palette map(0x650000, 0x650003).w("ymsnd", FUNC(ym3812_device::write)).umask16(0x00ff); map(0x658001, 0x658001).w("oki", FUNC(okim6295_device::write)); map(0x670000, 0x670001).nopr(); // watchdog? - map(0x800000, 0x803fff).w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2 - map(0x880000, 0x883fff).w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0 + map(0x800000, 0x803fff).w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2 + map(0x880000, 0x883fff).w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0 map(0x900000, 0x900005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl map(0x980000, 0x980005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y @@ -3275,9 +3275,9 @@ void jockeyc_state::jockeyc_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // ROM (up to 2MB) - map(0x200000, 0x200001).rw(this, FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::jockeyc_mux_w)); + map(0x200000, 0x200001).rw(FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::jockeyc_mux_w)); map(0x200002, 0x200003).portr("COIN"); - map(0x200010, 0x200011).portr("SERVICE").w(this, FUNC(jockeyc_state::jockeyc_out_w)); + map(0x200010, 0x200011).portr("SERVICE").w(FUNC(jockeyc_state::jockeyc_out_w)); map(0x300000, 0x300001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x300002, 0x300003).noprw(); // clr.l $300000 (watchdog) @@ -3288,19 +3288,19 @@ void jockeyc_state::jockeyc_map(address_map &map) map(0x300060, 0x300061).nopw(); // lev6 ack #if JOCKEYC_HIDDEN_EDITOR - map(0x400000, 0x400007).r(this, FUNC(jockeyc_state::trackball_r)); + map(0x400000, 0x400007).r(FUNC(jockeyc_state::trackball_r)); #endif - map(0x500000, 0x500003).r(this, FUNC(jockeyc_state::dsw_r)); // DSW x 3 - map(0x600000, 0x600001).r(this, FUNC(jockeyc_state::comm_r)); // comm data - map(0x600002, 0x600003).r(this, FUNC(jockeyc_state::comm_r)); // comm status (bits 0,4,5,6) + map(0x500000, 0x500003).r(FUNC(jockeyc_state::dsw_r)); // DSW x 3 + map(0x600000, 0x600001).r(FUNC(jockeyc_state::comm_r)); // comm data + map(0x600002, 0x600003).r(FUNC(jockeyc_state::comm_r)); // comm status (bits 0,4,5,6) - map(0x800000, 0x80001f).rw(this, FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w)); + map(0x800000, 0x80001f).rw(FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w)); map(0x900000, 0x903fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xa00000, 0xa00005).writeonly().share("vctrl_0"); // VRAM 0&1 Ctrl - map(0xb00000, 0xb03fff).ram().w(this, FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0xb00000, 0xb03fff).ram().w(FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0xb04000, 0xb0ffff).nopw(); // likely left-over map(0xc00000, 0xc00001).ram(); // ? 0x4000 @@ -3363,9 +3363,9 @@ void jockeyc_state::inttoote_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // ROM (up to 2MB) - map(0x200000, 0x200001).rw(this, FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::inttoote_mux_w)); + map(0x200000, 0x200001).rw(FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::inttoote_mux_w)); map(0x200002, 0x200003).portr("COIN"); - map(0x200010, 0x200011).portr("SERVICE").w(this, FUNC(jockeyc_state::inttoote_out_w)); + map(0x200010, 0x200011).portr("SERVICE").w(FUNC(jockeyc_state::inttoote_out_w)); map(0x300000, 0x300001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); @@ -3374,16 +3374,16 @@ void jockeyc_state::inttoote_map(address_map &map) map(0x300040, 0x300041).nopw(); // lev4 ack map(0x300060, 0x300061).nopw(); // lev6 ack - map(0x500000, 0x500003).r(this, FUNC(jockeyc_state::dsw_r)); // DSW x 3 + map(0x500000, 0x500003).r(FUNC(jockeyc_state::dsw_r)); // DSW x 3 - map(0x700000, 0x700101).ram().r(this, FUNC(jockeyc_state::inttoote_700000_r)).share("inttoote_700000"); + map(0x700000, 0x700101).ram().r(FUNC(jockeyc_state::inttoote_700000_r)).share("inttoote_700000"); - map(0x800000, 0x80001f).rw(this, FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w)); + map(0x800000, 0x80001f).rw(FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w)); map(0x900000, 0x903fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xa00000, 0xa00005).writeonly().share("vctrl_0"); // VRAM 0&1 Ctrl - map(0xb00000, 0xb03fff).ram().w(this, FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 + map(0xb00000, 0xb03fff).ram().w(FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1 map(0xc00000, 0xc00001).ram(); // ? 0x4000 @@ -3425,11 +3425,11 @@ READ8_MEMBER(seta_state::ff_r){return 0xff;} void seta_state::tndrcade_sub_map(address_map &map) { map(0x0000, 0x01ff).ram(); // RAM - map(0x0800, 0x0800).r(this, FUNC(seta_state::ff_r)); // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom) + map(0x0800, 0x0800).r(FUNC(seta_state::ff_r)); // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom) //AM_RANGE(0x0800, 0x0800) AM_DEVREAD("soundlatch1", generic_latch_8_device, read) // //AM_RANGE(0x0801, 0x0801) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) // map(0x1000, 0x1000).portr("P1"); // P1 - map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout + map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x1001, 0x1001).portr("P2"); // P2 map(0x1002, 0x1002).portr("COINS"); // Coins map(0x2000, 0x2001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); @@ -3451,7 +3451,7 @@ void seta_state::twineagl_sub_map(address_map &map) map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); // map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); // map(0x1000, 0x1000).portr("P1"); // P1 - map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout + map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x1001, 0x1001).portr("P2"); // P2 map(0x1002, 0x1002).portr("COINS"); // Coins map(0x5000, 0x57ff).ram().share("sharedram"); // Shared RAM @@ -3493,8 +3493,8 @@ void seta_state::downtown_sub_map(address_map &map) map(0x0000, 0x01ff).ram(); // RAM map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); // map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); // - map(0x1000, 0x1007).r(this, FUNC(seta_state::downtown_ip_r)); // Input Ports - map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout + map(0x1000, 0x1007).r(FUNC(seta_state::downtown_ip_r)); // Input Ports + map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x5000, 0x57ff).ram().share("sharedram"); // Shared RAM map(0x7000, 0x7fff).rom(); // ROM map(0x8000, 0xbfff).bankr("subbank"); // Banked ROM @@ -3538,10 +3538,10 @@ void seta_state::calibr50_sub_map(address_map &map) { map(0x0000, 0x1fff).rw(m_x1, FUNC(x1_010_device::read), FUNC(x1_010_device::write)); // Sound map(0x4000, 0x4000).r("soundlatch1", FUNC(generic_latch_8_device::read)); // From Main CPU - map(0x4000, 0x4000).w(this, FUNC(seta_state::calibr50_sub_bankswitch_w)); // Bankswitching + map(0x4000, 0x4000).w(FUNC(seta_state::calibr50_sub_bankswitch_w)); // Bankswitching map(0x8000, 0xbfff).bankr("subbank"); // Banked ROM map(0xc000, 0xffff).rom(); // ROM - map(0xc000, 0xc000).w(this, FUNC(seta_state::calibr50_soundlatch2_w)); // To Main CPU + map(0xc000, 0xc000).w(FUNC(seta_state::calibr50_soundlatch2_w)); // To Main CPU } @@ -3555,7 +3555,7 @@ void seta_state::metafox_sub_map(address_map &map) map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); // map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); // map(0x1000, 0x1000).portr("COINS"); // Coins - map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout + map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x1002, 0x1002).portr("P1"); // P1 //AM_RANGE(0x1004, 0x1004) AM_READNOP // ? map(0x1006, 0x1006).portr("P2"); // P2 @@ -3581,7 +3581,7 @@ void seta_state::utoukond_sound_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("ymsnd", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); - map(0x80, 0x80).w(this, FUNC(seta_state::utoukond_sound_control_w)); + map(0x80, 0x80).w(FUNC(seta_state::utoukond_sound_control_w)); map(0xc0, 0xc0).r("soundlatch1", FUNC(generic_latch_8_device::read)); } @@ -8007,7 +8007,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::calibr50_interrupt) MACHINE_START_MEMBER(seta_state, usclssic) { - m_buttonmux->ab_w(0xff); + m_buttonmux->write_ab(0xff); } diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index fb4ce316de5..16469cb6a21 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -173,13 +173,13 @@ void seta2_state::grdians_map(address_map &map) map(0x700002, 0x700003).portr("P2"); // P2 map(0x700004, 0x700005).portr("SYSTEM"); // Coins map(0x70000c, 0x70000d).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x800000, 0x800001).w(this, FUNC(seta2_state::grdians_lockout_w)); + map(0x800000, 0x800001).w(FUNC(seta2_state::grdians_lockout_w)); map(0xb00000, 0xb03fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xc00000, 0xc3ffff).ram().share("spriteram"); // Sprites map(0xc40000, 0xc4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0xc50000, 0xc5ffff).ram(); // cleared - map(0xc60000, 0xc6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers - map(0xe00010, 0xe0001f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0xc60000, 0xc6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xe00010, 0xe0001f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -212,13 +212,13 @@ void seta2_state::gundamex_map(address_map &map) map(0x700008, 0x700009).portr("IN0"); // P1 map(0x70000a, 0x70000b).portr("IN1"); // P2 map(0x70000c, 0x70000d).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x800000, 0x800001).w(this, FUNC(seta2_state::grdians_lockout_w)); + map(0x800000, 0x800001).w(FUNC(seta2_state::grdians_lockout_w)); map(0xb00000, 0xb03fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xc00000, 0xc3ffff).ram().share("spriteram"); // Sprites map(0xc40000, 0xc4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0xc50000, 0xc5ffff).ram(); // cleared - map(0xc60000, 0xc6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers - map(0xe00010, 0xe0001f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0xc60000, 0xc6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xe00010, 0xe0001f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -269,19 +269,19 @@ void seta2_state::mj4simai_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // ROM map(0x200000, 0x20ffff).ram(); // RAM - map(0x600000, 0x600001).r(this, FUNC(seta2_state::mj4simai_p1_r)); // P1 - map(0x600002, 0x600003).r(this, FUNC(seta2_state::mj4simai_p2_r)); // P2 - map(0x600004, 0x600005).w(this, FUNC(seta2_state::mj4simai_keyboard_w)); // select keyboard row to read + map(0x600000, 0x600001).r(FUNC(seta2_state::mj4simai_p1_r)); // P1 + map(0x600002, 0x600003).r(FUNC(seta2_state::mj4simai_p2_r)); // P2 + map(0x600004, 0x600005).w(FUNC(seta2_state::mj4simai_keyboard_w)); // select keyboard row to read map(0x600006, 0x600007).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); map(0x600100, 0x600101).portr("SYSTEM"); // map(0x600200, 0x600201).nopw(); // Leds? Coins? map(0x600300, 0x600301).portr("DSW1"); // DSW 1 map(0x600302, 0x600303).portr("DSW2"); // DSW 2 - map(0x600300, 0x60030f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0x600300, 0x60030f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0xb00000, 0xb03fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xc00000, 0xc3ffff).ram().share("spriteram"); // Sprites map(0xc40000, 0xc4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0xc60000, 0xc6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xc60000, 0xc6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -301,11 +301,11 @@ void seta2_state::myangel_map(address_map &map) map(0x700200, 0x700201).nopw(); // Leds? Coins? map(0x700300, 0x700301).portr("DSW1"); // DSW 1 map(0x700302, 0x700303).portr("DSW2"); // DSW 2 - map(0x700310, 0x70031f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0x700310, 0x70031f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0xb00000, 0xb03fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xc00000, 0xc3ffff).ram().share("spriteram"); // Sprites map(0xc40000, 0xc4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0xc60000, 0xc6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xc60000, 0xc6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -325,11 +325,11 @@ void seta2_state::myangel2_map(address_map &map) map(0x600200, 0x600201).nopw(); // Leds? Coins? map(0x600300, 0x600301).portr("DSW1"); // DSW 1 map(0x600302, 0x600303).portr("DSW2"); // DSW 2 - map(0x600300, 0x60030f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0x600300, 0x60030f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0xb00000, 0xb03fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xd00000, 0xd3ffff).ram().share("spriteram"); // Sprites map(0xd40000, 0xd4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0xd60000, 0xd6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xd60000, 0xd6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -366,15 +366,15 @@ void seta2_state::pzlbowl_map(address_map &map) map(0x200000, 0x20ffff).ram(); // RAM map(0x400300, 0x400301).portr("DSW1"); // DSW 1 map(0x400302, 0x400303).portr("DSW2"); // DSW 2 - map(0x400300, 0x40030f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0x400300, 0x40030f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0x500000, 0x500001).portr("P1"); // P1 map(0x500002, 0x500003).portr("P2"); // P2 - map(0x500004, 0x500005).rw(this, FUNC(seta2_state::pzlbowl_coins_r), FUNC(seta2_state::pzlbowl_coin_counter_w)); // Coins + Protection? + map(0x500004, 0x500005).rw(FUNC(seta2_state::pzlbowl_coins_r), FUNC(seta2_state::pzlbowl_coin_counter_w)); // Coins + Protection? map(0x500006, 0x500007).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x700000, 0x700001).r(this, FUNC(seta2_state::pzlbowl_protection_r)); // Protection + map(0x700000, 0x700001).r(FUNC(seta2_state::pzlbowl_protection_r)); // Protection map(0x800000, 0x83ffff).ram().share("spriteram"); // Sprites map(0x840000, 0x84ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0x860000, 0x86003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0x860000, 0x86003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0x900000, 0x903fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -394,7 +394,7 @@ void seta2_state::penbros_base_map(address_map &map) map(0x600000, 0x600001).portr("P1"); map(0x600002, 0x600003).portr("P2"); map(0x600004, 0x600005).portr("SYSTEM"); - map(0x600004, 0x600005).w(this, FUNC(seta2_state::pzlbowl_coin_counter_w)); + map(0x600004, 0x600005).w(FUNC(seta2_state::pzlbowl_coin_counter_w)); map(0x600006, 0x600007).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); map(0xa00000, 0xa03fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); map(0xb00000, 0xb3ffff).ram().share("spriteram"); @@ -407,8 +407,8 @@ void seta2_state::penbros_map(address_map &map) map(0x300000, 0x30ffff).ram(); map(0x500300, 0x500301).portr("DSW1"); map(0x500302, 0x500303).portr("DSW2"); - map(0x500300, 0x50030f).w(this, FUNC(seta2_state::sound_bank_w)); - map(0xb60000, 0xb6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); + map(0x500300, 0x50030f).w(FUNC(seta2_state::sound_bank_w)); + map(0xb60000, 0xb6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); } @@ -468,14 +468,14 @@ void seta2_state::reelquak_map(address_map &map) map(0x400002, 0x400003).portr("TICKET"); // Tickets map(0x400004, 0x400005).portr("SYSTEM"); // Coins map(0x400006, 0x400007).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x400200, 0x400201).w(this, FUNC(seta2_state::reelquak_coin_w)); // Coin Counters / IRQ Ack + map(0x400200, 0x400201).w(FUNC(seta2_state::reelquak_coin_w)); // Coin Counters / IRQ Ack map(0x400300, 0x400301).portr("DSW1"); // DSW 1 map(0x400302, 0x400303).portr("DSW2"); // DSW 2 - map(0x400300, 0x40030f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0x400300, 0x40030f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0xb00000, 0xb03fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xc00000, 0xc3ffff).ram().share("spriteram"); // Sprites map(0xc40000, 0xc4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0xc60000, 0xc6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xc60000, 0xc6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -490,7 +490,7 @@ void seta2_state::namcostr_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x200000, 0x20ffff).ram(); // RAM map(0xc00000, 0xc3ffff).ram().share("spriteram"); // Sprites - map(0xc60000, 0xc6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xc60000, 0xc6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -521,19 +521,19 @@ void seta2_state::samshoot_map(address_map &map) map(0x400000, 0x400001).portr("DSW1"); // DSW 1 map(0x400002, 0x400003).portr("BUTTONS"); // Buttons - map(0x400300, 0x40030f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0x400300, 0x40030f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0x500000, 0x500001).portr("GUN1"); // P1 map(0x580000, 0x580001).portr("GUN2"); // P2 map(0x700000, 0x700001).portr("TRIGGER"); // Trigger map(0x700002, 0x700003).portr("PUMP"); // Pump - map(0x700004, 0x700005).portr("COIN").w(this, FUNC(seta2_state::samshoot_coin_w)); // Coins + map(0x700004, 0x700005).portr("COIN").w(FUNC(seta2_state::samshoot_coin_w)); // Coins map(0x700006, 0x700007).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // Watchdog? map(0x800000, 0x83ffff).ram().share("spriteram"); // Sprites map(0x840000, 0x84ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0x860000, 0x86003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0x860000, 0x86003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0x900000, 0x903fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound @@ -613,25 +613,25 @@ void staraudi_state::staraudi_map(address_map &map) map(0x000000, 0x1fffff).rom(); // ROM map(0x200000, 0x23ffff).ram(); // RAM - map(0x400000, 0x45ffff).rw(this, FUNC(staraudi_state::staraudi_tileram_r), FUNC(staraudi_state::staraudi_tileram_w)).share("tileram"); // Tile RAM + map(0x400000, 0x45ffff).rw(FUNC(staraudi_state::staraudi_tileram_r), FUNC(staraudi_state::staraudi_tileram_w)).share("tileram"); // Tile RAM // AM_RANGE(0x500000, 0x53ffff) AM_RAM // Camera RAM (r8g8) // AM_RANGE(0x540000, 0x57ffff) AM_RAM // Camera RAM (00b8) map(0x500000, 0x57ffff).ram().share("rgbram"); - map(0x600000, 0x600001).w(this, FUNC(staraudi_state::staraudi_camera_w)); // Camera Outputs + map(0x600000, 0x600001).w(FUNC(staraudi_state::staraudi_camera_w)); // Camera Outputs map(0x700000, 0x700001).portr("P1"); // P1 map(0x700002, 0x700003).portr("P2"); // P2 map(0x700004, 0x700005).portr("SYSTEM"); // Coins map(0x700006, 0x700007).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); - map(0x700100, 0x700101).w(this, FUNC(staraudi_state::staraudi_lamps1_w)); // Lamps 1 + map(0x700100, 0x700101).w(FUNC(staraudi_state::staraudi_lamps1_w)); // Lamps 1 map(0x700180, 0x70018f).rw(m_rtc, FUNC(upd4992_device::read), FUNC(upd4992_device::write)).umask16(0x00ff); - map(0x700200, 0x700201).w(this, FUNC(staraudi_state::staraudi_lamps2_w)); // Lamps 2 + map(0x700200, 0x700201).w(FUNC(staraudi_state::staraudi_lamps2_w)); // Lamps 2 map(0x700300, 0x700301).portr("DSW1"); // DSW 1 map(0x700302, 0x700303).portr("DSW2"); // DSW 2 - map(0x700300, 0x70030f).w(this, FUNC(staraudi_state::sound_bank_w)); // Samples Banks + map(0x700300, 0x70030f).w(FUNC(staraudi_state::sound_bank_w)); // Samples Banks map(0x800000, 0x9fffff).rw(m_flash, FUNC(intelfsh16_device::read), FUNC(intelfsh16_device::write)); @@ -639,7 +639,7 @@ void staraudi_state::staraudi_map(address_map &map) map(0xc00000, 0xc3ffff).ram().share("spriteram"); // Sprites map(0xc40000, 0xc4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0xc50000, 0xc5ffff).ram(); // cleared - map(0xc60000, 0xc6003f).w(this, FUNC(staraudi_state::vregs_w)).share("vregs"); // Video Registers + map(0xc60000, 0xc6003f).w(FUNC(staraudi_state::vregs_w)).share("vregs"); // Video Registers map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -704,16 +704,16 @@ void seta2_state::telpacfl_map(address_map &map) map(0x700002, 0x700003).portr("P1"); // P1 + Dispenser map(0x700004, 0x700005).portr("SERVICE"); // Service map(0x700006, 0x700007).portr("UNKNOWN"); // (unused?) - map(0x700008, 0x700009).w(this, FUNC(seta2_state::telpacfl_lamp1_w)); // Lamps - map(0x70000c, 0x70000d).w(this, FUNC(seta2_state::telpacfl_lamp2_w)); // "" - map(0x800000, 0x800001).w(this, FUNC(seta2_state::telpacfl_lockout_w)); // Coin Blockers + map(0x700008, 0x700009).w(FUNC(seta2_state::telpacfl_lamp1_w)); // Lamps + map(0x70000c, 0x70000d).w(FUNC(seta2_state::telpacfl_lamp2_w)); // "" + map(0x800000, 0x800001).w(FUNC(seta2_state::telpacfl_lockout_w)); // Coin Blockers map(0x900000, 0x903fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound map(0xb00000, 0xb3ffff).ram().share("spriteram"); // Sprites map(0xb40000, 0xb4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0xb60000, 0xb6003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers + map(0xb60000, 0xb6003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); // Video Registers map(0xd00006, 0xd00007).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // AM_RANGE(0xe00000, 0xe00001) AM_WRITE - map(0xe00010, 0xe0001f).w(this, FUNC(seta2_state::sound_bank_w)); // Samples Banks + map(0xe00010, 0xe0001f).w(FUNC(seta2_state::sound_bank_w)); // Samples Banks map(0xfffc00, 0xffffff).rw(m_tmp68301, FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w)); // TMP68301 Registers } @@ -903,16 +903,16 @@ void funcube_state::funcube_map(address_map &map) map(0x00000000, 0x0007ffff).rom(); map(0x00200000, 0x0020ffff).ram(); - map(0x00400000, 0x00400003).r(this, FUNC(funcube_state::funcube_debug_r)); + map(0x00400000, 0x00400003).r(FUNC(funcube_state::funcube_debug_r)); map(0x00400004, 0x00400007).r("watchdog", FUNC(watchdog_timer_device::reset32_r)).nopw(); - map(0x00500000, 0x00500003).rw(this, FUNC(seta2_state::oki_read), FUNC(seta2_state::oki_write)); + map(0x00500000, 0x00500003).rw(FUNC(seta2_state::oki_read), FUNC(seta2_state::oki_write)); - map(0x00800000, 0x0083ffff).rw(this, FUNC(seta2_state::spriteram16_word_r), FUNC(seta2_state::spriteram16_word_w)).share("spriteram"); + map(0x00800000, 0x0083ffff).rw(FUNC(seta2_state::spriteram16_word_r), FUNC(seta2_state::spriteram16_word_w)).share("spriteram"); map(0x00840000, 0x0084ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // Palette - map(0x00860000, 0x0086003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); + map(0x00860000, 0x0086003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); - map(0x00c00000, 0x00c002ff).rw(this, FUNC(funcube_state::funcube_nvram_dword_r), FUNC(funcube_state::funcube_nvram_dword_w)); + map(0x00c00000, 0x00c002ff).rw(FUNC(funcube_state::funcube_nvram_dword_r), FUNC(funcube_state::funcube_nvram_dword_w)); map(0xf0000000, 0xf00001ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_r), FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_w)); // technically this can be moved with MBAR map(0xffffe000, 0xffffffff).ram(); // SRAM @@ -923,16 +923,16 @@ void funcube_state::funcube2_map(address_map &map) map(0x00000000, 0x0007ffff).rom(); map(0x00200000, 0x0020ffff).ram(); - map(0x00500000, 0x00500003).r(this, FUNC(funcube_state::funcube_debug_r)); + map(0x00500000, 0x00500003).r(FUNC(funcube_state::funcube_debug_r)); map(0x00500004, 0x00500007).r("watchdog", FUNC(watchdog_timer_device::reset32_r)).nopw(); - map(0x00600000, 0x00600003).rw(this, FUNC(seta2_state::oki_read), FUNC(seta2_state::oki_write)); + map(0x00600000, 0x00600003).rw(FUNC(seta2_state::oki_read), FUNC(seta2_state::oki_write)); - map(0x00800000, 0x0083ffff).rw(this, FUNC(seta2_state::spriteram16_word_r), FUNC(seta2_state::spriteram16_word_w)).share("spriteram"); + map(0x00800000, 0x0083ffff).rw(FUNC(seta2_state::spriteram16_word_r), FUNC(seta2_state::spriteram16_word_w)).share("spriteram"); map(0x00840000, 0x0084ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); - map(0x00860000, 0x0086003f).w(this, FUNC(seta2_state::vregs_w)).share("vregs"); + map(0x00860000, 0x0086003f).w(FUNC(seta2_state::vregs_w)).share("vregs"); - map(0x00c00000, 0x00c002ff).rw(this, FUNC(funcube_state::funcube_nvram_dword_r), FUNC(funcube_state::funcube_nvram_dword_w)); + map(0x00c00000, 0x00c002ff).rw(FUNC(funcube_state::funcube_nvram_dword_r), FUNC(funcube_state::funcube_nvram_dword_w)); map(0xf0000000, 0xf00001ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_r), FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_w)); // technically this can be moved with MBAR map(0xffffe000, 0xffffffff).ram(); // SRAM @@ -1037,18 +1037,18 @@ READ16_MEMBER(funcube_state::funcube_battery_r) // cabinet linking on sci0 void funcube_state::funcube_sub_io(address_map &map) { - map(h8_device::PORT_7, h8_device::PORT_7).r(this, FUNC(funcube_state::funcube_coins_r)); - map(h8_device::PORT_4, h8_device::PORT_4).r(this, FUNC(funcube_state::funcube_battery_r)); - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(funcube_state::funcube_outputs_r), FUNC(funcube_state::funcube_outputs_w)).share("funcube_outputs"); - map(h8_device::PORT_B, h8_device::PORT_B).w(this, FUNC(funcube_state::funcube_leds_w)).share("funcube_leds"); + map(h8_device::PORT_7, h8_device::PORT_7).r(FUNC(funcube_state::funcube_coins_r)); + map(h8_device::PORT_4, h8_device::PORT_4).r(FUNC(funcube_state::funcube_battery_r)); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(funcube_state::funcube_outputs_r), FUNC(funcube_state::funcube_outputs_w)).share("funcube_outputs"); + map(h8_device::PORT_B, h8_device::PORT_B).w(FUNC(funcube_state::funcube_leds_w)).share("funcube_leds"); } void funcube_state::funcube2_sub_io(address_map &map) { - map(h8_device::PORT_7, h8_device::PORT_7).r(this, FUNC(funcube_state::funcube_coins_r)); + map(h8_device::PORT_7, h8_device::PORT_7).r(FUNC(funcube_state::funcube_coins_r)); map(h8_device::PORT_4, h8_device::PORT_4).noprw(); // unused - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(funcube_state::funcube_outputs_r), FUNC(funcube_state::funcube_outputs_w)).share("funcube_outputs"); - map(h8_device::PORT_B, h8_device::PORT_B).w(this, FUNC(funcube_state::funcube_leds_w)).share("funcube_leds"); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(funcube_state::funcube_outputs_r), FUNC(funcube_state::funcube_outputs_w)).share("funcube_outputs"); + map(h8_device::PORT_B, h8_device::PORT_B).w(FUNC(funcube_state::funcube_leds_w)).share("funcube_leds"); } diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index 6f8697c0f98..455e7b1dddb 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -165,7 +165,7 @@ void sf_state::sfan_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x04ffff).rom(); - map(0x800000, 0x800fff).ram().w(this, FUNC(sf_state::videoram_w)).share("videoram"); + map(0x800000, 0x800fff).ram().w(FUNC(sf_state::videoram_w)).share("videoram"); map(0xb00000, 0xb007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xc00000, 0xc00001).portr("IN0"); map(0xc00002, 0xc00003).portr("IN1"); @@ -175,11 +175,11 @@ void sf_state::sfan_map(address_map &map) map(0xc0000a, 0xc0000b).portr("DSW2"); map(0xc0000c, 0xc0000d).portr("SYSTEM"); map(0xc0000e, 0xc0000f).nopr(); - map(0xc00011, 0xc00011).w(this, FUNC(sf_state::coin_w)); - map(0xc00014, 0xc00015).w(this, FUNC(sf_state::fg_scroll_w)); - map(0xc00018, 0xc00019).w(this, FUNC(sf_state::bg_scroll_w)); - map(0xc0001a, 0xc0001b).w(this, FUNC(sf_state::gfxctrl_w)); - map(0xc0001d, 0xc0001d).w(this, FUNC(sf_state::soundcmd_w)); + map(0xc00011, 0xc00011).w(FUNC(sf_state::coin_w)); + map(0xc00014, 0xc00015).w(FUNC(sf_state::fg_scroll_w)); + map(0xc00018, 0xc00019).w(FUNC(sf_state::bg_scroll_w)); + map(0xc0001a, 0xc0001b).w(FUNC(sf_state::gfxctrl_w)); + map(0xc0001d, 0xc0001d).w(FUNC(sf_state::soundcmd_w)); // AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w) map(0xff8000, 0xffdfff).ram(); map(0xffe000, 0xffffff).ram().share("objectram"); @@ -189,7 +189,7 @@ void sf_state::sfus_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x04ffff).rom(); - map(0x800000, 0x800fff).ram().w(this, FUNC(sf_state::videoram_w)).share("videoram"); + map(0x800000, 0x800fff).ram().w(FUNC(sf_state::videoram_w)).share("videoram"); map(0xb00000, 0xb007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xc00000, 0xc00001).portr("IN0"); map(0xc00002, 0xc00003).portr("IN1"); @@ -199,11 +199,11 @@ void sf_state::sfus_map(address_map &map) map(0xc0000a, 0xc0000b).portr("DSW2"); map(0xc0000c, 0xc0000d).portr("SYSTEM"); map(0xc0000e, 0xc0000f).nopr(); - map(0xc00011, 0xc00011).w(this, FUNC(sf_state::coin_w)); - map(0xc00014, 0xc00015).w(this, FUNC(sf_state::fg_scroll_w)); - map(0xc00018, 0xc00019).w(this, FUNC(sf_state::bg_scroll_w)); - map(0xc0001a, 0xc0001b).w(this, FUNC(sf_state::gfxctrl_w)); - map(0xc0001d, 0xc0001d).w(this, FUNC(sf_state::soundcmd_w)); + map(0xc00011, 0xc00011).w(FUNC(sf_state::coin_w)); + map(0xc00014, 0xc00015).w(FUNC(sf_state::fg_scroll_w)); + map(0xc00018, 0xc00019).w(FUNC(sf_state::bg_scroll_w)); + map(0xc0001a, 0xc0001b).w(FUNC(sf_state::gfxctrl_w)); + map(0xc0001d, 0xc0001d).w(FUNC(sf_state::soundcmd_w)); // AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w) map(0xff8000, 0xffdfff).ram(); map(0xffe000, 0xffffff).ram().share("objectram"); @@ -213,7 +213,7 @@ void sf_state::sfjp_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x04ffff).rom(); - map(0x800000, 0x800fff).ram().w(this, FUNC(sf_state::videoram_w)).share("videoram"); + map(0x800000, 0x800fff).ram().w(FUNC(sf_state::videoram_w)).share("videoram"); map(0xb00000, 0xb007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xc00000, 0xc00001).portr("IN0"); map(0xc00002, 0xc00003).portr("IN1"); @@ -223,12 +223,12 @@ void sf_state::sfjp_map(address_map &map) map(0xc0000a, 0xc0000b).portr("DSW2"); map(0xc0000c, 0xc0000d).portr("SYSTEM"); map(0xc0000e, 0xc0000f).nopr(); - map(0xc00011, 0xc00011).w(this, FUNC(sf_state::coin_w)); - map(0xc00014, 0xc00015).w(this, FUNC(sf_state::fg_scroll_w)); - map(0xc00018, 0xc00019).w(this, FUNC(sf_state::bg_scroll_w)); - map(0xc0001a, 0xc0001b).w(this, FUNC(sf_state::gfxctrl_w)); - map(0xc0001d, 0xc0001d).w(this, FUNC(sf_state::soundcmd_w)); - map(0xc0001e, 0xc0001f).w(this, FUNC(sf_state::protection_w)); + map(0xc00011, 0xc00011).w(FUNC(sf_state::coin_w)); + map(0xc00014, 0xc00015).w(FUNC(sf_state::fg_scroll_w)); + map(0xc00018, 0xc00019).w(FUNC(sf_state::bg_scroll_w)); + map(0xc0001a, 0xc0001b).w(FUNC(sf_state::gfxctrl_w)); + map(0xc0001d, 0xc0001d).w(FUNC(sf_state::soundcmd_w)); + map(0xc0001e, 0xc0001f).w(FUNC(sf_state::protection_w)); map(0xff8000, 0xffdfff).ram(); map(0xffe000, 0xffffff).ram().share("objectram"); } @@ -252,10 +252,10 @@ void sf_state::sound2_map(address_map &map) void sf_state::sound2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(sf_state::msm1_5205_w)); - map(0x01, 0x01).w(this, FUNC(sf_state::msm2_5205_w)); + map(0x00, 0x00).w(FUNC(sf_state::msm1_5205_w)); + map(0x01, 0x01).w(FUNC(sf_state::msm2_5205_w)); map(0x01, 0x01).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x02, 0x02).w(this, FUNC(sf_state::sound2_bank_w)); + map(0x02, 0x02).w(FUNC(sf_state::sound2_bank_w)); } diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp index 4e7dd7383e6..31f13b0d108 100644 --- a/src/mame/drivers/sfbonus.cpp +++ b/src/mame/drivers/sfbonus.cpp @@ -1218,7 +1218,7 @@ uint32_t sfbonus_state::screen_update_sfbonus(screen_device &screen, bitmap_ind1 void sfbonus_state::sfbonus_map(address_map &map) { - map(0x0000, 0xefff).bankr("bank1").w(this, FUNC(sfbonus_state::sfbonus_videoram_w)); + map(0x0000, 0xefff).bankr("bank1").w(FUNC(sfbonus_state::sfbonus_videoram_w)); map(0xf000, 0xffff).ram().share("nvram"); } @@ -1305,21 +1305,21 @@ void sfbonus_state::sfbonus_io(address_map &map) map(0x0c01, 0x0c01).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x0c02, 0x0c02).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x1800, 0x1807).w(this, FUNC(sfbonus_state::sfbonus_1800_w)).share("1800_regs"); // lamps and coin counters + map(0x1800, 0x1807).w(FUNC(sfbonus_state::sfbonus_1800_w)).share("1800_regs"); // lamps and coin counters map(0x2400, 0x241f).ram().share("vregs"); - map(0x2800, 0x2800).r(this, FUNC(sfbonus_state::sfbonus_2800_r)); - map(0x2801, 0x2801).r(this, FUNC(sfbonus_state::sfbonus_2801_r)).w(this, FUNC(sfbonus_state::sfbonus_2801_w)).share("2801_regs"); + map(0x2800, 0x2800).r(FUNC(sfbonus_state::sfbonus_2800_r)); + map(0x2801, 0x2801).r(FUNC(sfbonus_state::sfbonus_2801_r)).w(FUNC(sfbonus_state::sfbonus_2801_w)).share("2801_regs"); - map(0x2c00, 0x2c00).r(this, FUNC(sfbonus_state::sfbonus_2c00_r)); - map(0x2c01, 0x2c01).r(this, FUNC(sfbonus_state::sfbonus_2c01_r)).w(this, FUNC(sfbonus_state::sfbonus_2c01_w)).share("2c01_regs"); + map(0x2c00, 0x2c00).r(FUNC(sfbonus_state::sfbonus_2c00_r)); + map(0x2c01, 0x2c01).r(FUNC(sfbonus_state::sfbonus_2c01_r)).w(FUNC(sfbonus_state::sfbonus_2c01_w)).share("2c01_regs"); - map(0x3000, 0x3000).w(this, FUNC(sfbonus_state::sfbonus_3000_w)).share("3000_regs"); - map(0x3400, 0x3400).w(this, FUNC(sfbonus_state::sfbonus_bank_w)); - map(0x3800, 0x3800).r(this, FUNC(sfbonus_state::sfbonus_3800_r)); + map(0x3000, 0x3000).w(FUNC(sfbonus_state::sfbonus_3000_w)).share("3000_regs"); + map(0x3400, 0x3400).w(FUNC(sfbonus_state::sfbonus_bank_w)); + map(0x3800, 0x3800).r(FUNC(sfbonus_state::sfbonus_3800_r)); - map(0x3800, 0x3807).w(this, FUNC(sfbonus_state::sfbonus_3800_w)).share("3800_regs"); + map(0x3800, 0x3807).w(FUNC(sfbonus_state::sfbonus_3800_w)).share("3800_regs"); } diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp index 565b6873f20..6bc0df68f4d 100644 --- a/src/mame/drivers/sfcbox.cpp +++ b/src/mame/drivers/sfcbox.cpp @@ -169,9 +169,9 @@ uint32_t sfcbox_state::screen_update( screen_device &screen, bitmap_rgb32 &bitma void sfcbox_state::snes_map(address_map &map) { - map(0x000000, 0x7dffff).rw(this, FUNC(sfcbox_state::snes_r_bank1), FUNC(sfcbox_state::snes_w_bank1)); + map(0x000000, 0x7dffff).rw(FUNC(sfcbox_state::snes_r_bank1), FUNC(sfcbox_state::snes_w_bank1)); map(0x7e0000, 0x7fffff).ram(); /* 8KB Low RAM, 24KB High RAM, 96KB Expanded RAM */ - map(0x800000, 0xffffff).rw(this, FUNC(sfcbox_state::snes_r_bank2), FUNC(sfcbox_state::snes_w_bank2)); /* Mirror and ROM */ + map(0x800000, 0xffffff).rw(FUNC(sfcbox_state::snes_r_bank2), FUNC(sfcbox_state::snes_w_bank2)); /* Mirror and ROM */ } READ8_MEMBER(sfcbox_state::spc_ram_100_r) @@ -188,7 +188,7 @@ void sfcbox_state::spc_mem(address_map &map) { map(0x0000, 0x00ef).rw(m_spc700, FUNC(snes_sound_device::spc_ram_r), FUNC(snes_sound_device::spc_ram_w)); /* lower 32k ram */ map(0x00f0, 0x00ff).rw(m_spc700, FUNC(snes_sound_device::spc_io_r), FUNC(snes_sound_device::spc_io_w)); /* spc io */ - map(0x0100, 0xffff).rw(this, FUNC(sfcbox_state::spc_ram_100_r), FUNC(sfcbox_state::spc_ram_100_w)); + map(0x0100, 0xffff).rw(FUNC(sfcbox_state::spc_ram_100_r), FUNC(sfcbox_state::spc_ram_100_w)); } void sfcbox_state::sfcbox_map(address_map &map) @@ -290,17 +290,17 @@ void sfcbox_state::sfcbox_io(address_map &map) { map(0x00, 0x3f).ram(); // internal i/o map(0x0b, 0x0b).w(m_mb90082, FUNC(mb90082_device::write)); - map(0x80, 0x80).portr("KEY").w(this, FUNC(sfcbox_state::port_80_w)); // Keyswitch and Button Inputs / SNES Transfer and Misc Output - map(0x81, 0x81).rw(this, FUNC(sfcbox_state::port_81_r), FUNC(sfcbox_state::port_81_w)); // SNES Transfer and Misc Input / Misc Output + map(0x80, 0x80).portr("KEY").w(FUNC(sfcbox_state::port_80_w)); // Keyswitch and Button Inputs / SNES Transfer and Misc Output + map(0x81, 0x81).rw(FUNC(sfcbox_state::port_81_r), FUNC(sfcbox_state::port_81_w)); // SNES Transfer and Misc Input / Misc Output // AM_RANGE(0x82, 0x82) // Unknown/unused - map(0x83, 0x83).rw(this, FUNC(sfcbox_state::port_83_r), FUNC(sfcbox_state::port_83_w)); // Joypad Input/Status / Joypad Output/Control + map(0x83, 0x83).rw(FUNC(sfcbox_state::port_83_r), FUNC(sfcbox_state::port_83_w)); // Joypad Input/Status / Joypad Output/Control // AM_RANGE(0x84, 0x84) // Joypad 1, MSB (1st 8 bits) (eg. Bit7=ButtonB, 0=Low=Pressed) // AM_RANGE(0x85, 0x85) // Joypad 1, LSB (2nd 8 bits) (eg. Bit0=LSB of ID, 0=Low=One) // AM_RANGE(0x86, 0x86) // Joypad 2, MSB (1st 8 bits) (eg. Bit7=ButtonB, 0=Low=Pressed) // AM_RANGE(0x87, 0x87) // Joypad 2, LSB (2nd 8 bits) (eg. Bit0=LSB of ID, 0=Low=One) map(0xa0, 0xa0).portr("RTC_R").portw("RTC_W"); // Real Time Clock - map(0xc0, 0xc0).w(this, FUNC(sfcbox_state::snes_map_0_w)); // SNES Mapping Register 0 - map(0xc1, 0xc1).w(this, FUNC(sfcbox_state::snes_map_1_w)); // SNES Mapping Register 1 + map(0xc0, 0xc0).w(FUNC(sfcbox_state::snes_map_0_w)); // SNES Mapping Register 0 + map(0xc1, 0xc1).w(FUNC(sfcbox_state::snes_map_1_w)); // SNES Mapping Register 1 } diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp index ee7962e3c49..797ced80a9a 100644 --- a/src/mame/drivers/sfkick.cpp +++ b/src/mame/drivers/sfkick.cpp @@ -475,10 +475,10 @@ void sfkick_state::sfkick_map(address_map &map) map(0xa000, 0xbfff).bankr("bank6"); map(0xc000, 0xdfff).bankr("bank7"); map(0xe000, 0xffff).bankr("bank8"); - map(0x0000, 0x3fff).w(this, FUNC(sfkick_state::page0_w)); - map(0x4000, 0x7fff).w(this, FUNC(sfkick_state::page1_w)); - map(0x8000, 0xbfff).w(this, FUNC(sfkick_state::page2_w)); - map(0xc000, 0xffff).w(this, FUNC(sfkick_state::page3_w)); + map(0x0000, 0x3fff).w(FUNC(sfkick_state::page0_w)); + map(0x4000, 0x7fff).w(FUNC(sfkick_state::page1_w)); + map(0x8000, 0xbfff).w(FUNC(sfkick_state::page2_w)); + map(0xc000, 0xffff).w(FUNC(sfkick_state::page3_w)); } void sfkick_state::sfkick_io_map(address_map &map) diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp index 5625e7a1b11..ac7e0ec9efc 100644 --- a/src/mame/drivers/sg1000.cpp +++ b/src/mame/drivers/sg1000.cpp @@ -136,10 +136,10 @@ void sg1000_state::sg1000_map(address_map &map) void sg1000_state::sg1000_io_map(address_map &map) { map.global_mask(0xff); - map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); - map(0x80, 0x80).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_read), FUNC(tms9918a_device::vram_write)); - map(0x81, 0x81).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_read), FUNC(tms9918a_device::register_write)); - map(0xdc, 0xdf).rw(this, FUNC(sg1000_state::peripheral_r), FUNC(sg1000_state::peripheral_w)); + map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x80, 0x80).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); + map(0x81, 0x81).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); + map(0xdc, 0xdf).rw(FUNC(sg1000_state::peripheral_r), FUNC(sg1000_state::peripheral_w)); } /*------------------------------------------------- @@ -148,7 +148,7 @@ void sg1000_state::sg1000_io_map(address_map &map) void sg1000_state::omv_map(address_map &map) { - map(0x0000, 0xbfff).rw(this, FUNC(sg1000_state::omv_r), FUNC(sg1000_state::omv_w)); + map(0x0000, 0xbfff).rw(FUNC(sg1000_state::omv_r), FUNC(sg1000_state::omv_w)); map(0xc000, 0xc7ff).mirror(0x3800).ram(); } @@ -159,9 +159,9 @@ void sg1000_state::omv_map(address_map &map) void sg1000_state::omv_io_map(address_map &map) { map.global_mask(0xff); - map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); - map(0x80, 0x80).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_read), FUNC(tms9918a_device::vram_write)); - map(0x81, 0x81).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_read), FUNC(tms9918a_device::register_write)); + map(0x40, 0x40).mirror(0x3f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x80, 0x80).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); + map(0x81, 0x81).mirror(0x3e).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); map(0xc0, 0xc0).mirror(0x38).portr("C0"); map(0xc1, 0xc1).mirror(0x38).portr("C1"); map(0xc2, 0xc2).mirror(0x38).portr("C2"); @@ -187,10 +187,10 @@ void sg1000_state::sc3000_map(address_map &map) void sg1000_state::sc3000_io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); - map(0xbe, 0xbe).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_read), FUNC(tms9918a_device::vram_write)); - map(0xbf, 0xbf).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_read), FUNC(tms9918a_device::register_write)); - map(0xdc, 0xdf).rw(this, FUNC(sg1000_state::peripheral_r), FUNC(sg1000_state::peripheral_w)); + map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0xbe, 0xbe).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); + map(0xbf, 0xbf).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); + map(0xdc, 0xdf).rw(FUNC(sg1000_state::peripheral_r), FUNC(sg1000_state::peripheral_w)); } /* This is how the I/O ports are really mapped, but MAME does not support overlapping ranges @@ -198,10 +198,10 @@ void sg1000_state::sc3000_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).mirror(0xdf).rw(UPD9255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x00, 0x00).mirror(0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); - map(0x00, 0x00).mirror(0xae).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_read), FUNC(tms9918a_device::vram_write)); - map(0x01, 0x01).mirror(0xae).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_read), FUNC(tms9918a_device::register_write)); - map(0x60, 0x60).mirror(0x9f).r(this, FUNC(sg1000_state::sc3000_r_r)); + map(0x00, 0x00).mirror(0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0x00, 0x00).mirror(0xae).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); + map(0x01, 0x01).mirror(0xae).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); + map(0x60, 0x60).mirror(0x9f).r(FUNC(sg1000_state::sc3000_r_r)); } */ @@ -222,10 +222,10 @@ void sf7000_state::sf7000_map(address_map &map) void sf7000_state::sf7000_io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::write)); - map(0xbe, 0xbe).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_read), FUNC(tms9918a_device::vram_write)); - map(0xbf, 0xbf).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_read), FUNC(tms9918a_device::register_write)); - map(0xdc, 0xdf).rw(this, FUNC(sf7000_state::peripheral_r), FUNC(sf7000_state::peripheral_w)); + map(0x7f, 0x7f).w(SN76489AN_TAG, FUNC(sn76489a_device::command_w)); + map(0xbe, 0xbe).rw(TMS9918A_TAG, FUNC(tms9918a_device::vram_r), FUNC(tms9918a_device::vram_w)); + map(0xbf, 0xbf).rw(TMS9918A_TAG, FUNC(tms9918a_device::register_r), FUNC(tms9918a_device::register_w)); + map(0xdc, 0xdf).rw(FUNC(sf7000_state::peripheral_r), FUNC(sf7000_state::peripheral_w)); map(0xe0, 0xe1).m(m_fdc, FUNC(upd765a_device::map)); map(0xe4, 0xe7).rw(UPD9255_1_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xe8, 0xe8).rw(UPD8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); @@ -641,7 +641,7 @@ MACHINE_CONFIG_START(sf7000_state::sf7000) /* devices */ MCFG_DEVICE_ADD(UPD9255_1_TAG, I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, sf7000_state, ppi_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sf7000_state, ppi_pc_w)) MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0) diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp index a94e34e28d1..c181174ebf1 100644 --- a/src/mame/drivers/sg1000a.cpp +++ b/src/mame/drivers/sg1000a.cpp @@ -321,18 +321,18 @@ void sg1000a_state::decrypted_opcodes_map(address_map &map) void sg1000a_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w("snsnd", FUNC(sn76489a_device::write)); - map(0xbe, 0xbe).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0xbf, 0xbf).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); + map(0x7f, 0x7f).w("snsnd", FUNC(sn76489a_device::command_w)); + map(0xbe, 0xbe).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0xbf, 0xbf).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); map(0xdc, 0xdf).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); } void sg1000a_state::sderby2_io_map(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w("snsnd", FUNC(sn76489a_device::write)); - map(0xbe, 0xbe).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); - map(0xbf, 0xbf).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write)); + map(0x7f, 0x7f).w("snsnd", FUNC(sn76489a_device::command_w)); + map(0xbe, 0xbe).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); + map(0xbf, 0xbf).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w)); // AM_RANGE(0xc0, 0xc1) NEC D8251AC UART map(0xc8, 0xcb).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); // NEC D8255AC-2 } diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp index 3ef37faaa33..14ca2204ceb 100644 --- a/src/mame/drivers/shadfrce.cpp +++ b/src/mame/drivers/shadfrce.cpp @@ -352,31 +352,31 @@ TIMER_DEVICE_CALLBACK_MEMBER(shadfrce_state::scanline) void shadfrce_state::shadfrce_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(shadfrce_state::bg0videoram_w)).share("bg0videoram"); /* video */ + map(0x100000, 0x100fff).ram().w(FUNC(shadfrce_state::bg0videoram_w)).share("bg0videoram"); /* video */ map(0x101000, 0x101fff).ram(); - map(0x102000, 0x1027ff).ram().w(this, FUNC(shadfrce_state::bg1videoram_w)).share("bg1videoram"); /* bg 2 */ + map(0x102000, 0x1027ff).ram().w(FUNC(shadfrce_state::bg1videoram_w)).share("bg1videoram"); /* bg 2 */ map(0x102800, 0x103fff).ram(); - map(0x140000, 0x141fff).ram().w(this, FUNC(shadfrce_state::fgvideoram_w)).share("fgvideoram"); + map(0x140000, 0x141fff).ram().w(FUNC(shadfrce_state::fgvideoram_w)).share("fgvideoram"); map(0x142000, 0x143fff).ram().share("spvideoram"); /* sprites */ map(0x180000, 0x187fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x1c0000, 0x1c0001).w(this, FUNC(shadfrce_state::bg0scrollx_w)); /* SCROLL X */ - map(0x1c0002, 0x1c0003).w(this, FUNC(shadfrce_state::bg0scrolly_w)); /* SCROLL Y */ - map(0x1c0004, 0x1c0005).w(this, FUNC(shadfrce_state::bg1scrollx_w)); /* SCROLL X */ - map(0x1c0006, 0x1c0007).w(this, FUNC(shadfrce_state::bg1scrolly_w)); /* SCROLL Y */ + map(0x1c0000, 0x1c0001).w(FUNC(shadfrce_state::bg0scrollx_w)); /* SCROLL X */ + map(0x1c0002, 0x1c0003).w(FUNC(shadfrce_state::bg0scrolly_w)); /* SCROLL Y */ + map(0x1c0004, 0x1c0005).w(FUNC(shadfrce_state::bg1scrollx_w)); /* SCROLL X */ + map(0x1c0006, 0x1c0007).w(FUNC(shadfrce_state::bg1scrolly_w)); /* SCROLL Y */ map(0x1c0008, 0x1c0009).nopw(); /* ?? */ - map(0x1c000a, 0x1c000b).nopr().w(this, FUNC(shadfrce_state::flip_screen)); + map(0x1c000a, 0x1c000b).nopr().w(FUNC(shadfrce_state::flip_screen)); map(0x1c000c, 0x1c000d).nopw(); /* ?? */ - map(0x1d0000, 0x1d0005).w(this, FUNC(shadfrce_state::irq_ack_w)); - map(0x1d0006, 0x1d0007).w(this, FUNC(shadfrce_state::irq_w)); - map(0x1d0008, 0x1d0009).w(this, FUNC(shadfrce_state::scanline_w)); + map(0x1d0000, 0x1d0005).w(FUNC(shadfrce_state::irq_ack_w)); + map(0x1d0006, 0x1d0007).w(FUNC(shadfrce_state::irq_w)); + map(0x1d0008, 0x1d0009).w(FUNC(shadfrce_state::scanline_w)); map(0x1d000c, 0x1d000d).nopr(); map(0x1d000c, 0x1d000c).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x1d000d, 0x1d000d).w(this, FUNC(shadfrce_state::screen_brt_w)); + map(0x1d000d, 0x1d000d).w(FUNC(shadfrce_state::screen_brt_w)); map(0x1d0010, 0x1d0011).nopw(); /* ?? */ map(0x1d0012, 0x1d0013).nopw(); /* ?? */ map(0x1d0014, 0x1d0015).nopw(); /* ?? */ map(0x1d0016, 0x1d0017).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x1d0020, 0x1d0027).r(this, FUNC(shadfrce_state::input_ports_r)); + map(0x1d0020, 0x1d0027).r(FUNC(shadfrce_state::input_ports_r)); map(0x1f0000, 0x1fffff).ram(); } @@ -394,7 +394,7 @@ void shadfrce_state::shadfrce_sound_map(address_map &map) map(0xc800, 0xc801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xd800, 0xd800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe800, 0xe800).w(this, FUNC(shadfrce_state::oki_bankswitch_w)); + map(0xe800, 0xe800).w(FUNC(shadfrce_state::oki_bankswitch_w)); map(0xf000, 0xffff).ram(); } diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index 096c22175d0..2a2f34495e3 100644 --- a/src/mame/drivers/shangha3.cpp +++ b/src/mame/drivers/shangha3.cpp @@ -121,17 +121,17 @@ void shangha3_state::shangha3_map(address_map &map) map(0x100000, 0x100fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x200000, 0x200001).portr("INPUTS"); map(0x200002, 0x200003).portr("SYSTEM"); - map(0x200008, 0x200009).w(this, FUNC(shangha3_state::blitter_go_w)); - map(0x20000a, 0x20000b).w(this, FUNC(shangha3_state::irq_ack_w)); - map(0x20000c, 0x20000d).w(this, FUNC(shangha3_state::shangha3_coinctrl_w)); + map(0x200008, 0x200009).w(FUNC(shangha3_state::blitter_go_w)); + map(0x20000a, 0x20000b).w(FUNC(shangha3_state::irq_ack_w)); + map(0x20000c, 0x20000d).w(FUNC(shangha3_state::shangha3_coinctrl_w)); map(0x20001f, 0x20001f).r("aysnd", FUNC(ym2149_device::data_r)); map(0x20002f, 0x20002f).w("aysnd", FUNC(ym2149_device::data_w)); map(0x20003f, 0x20003f).w("aysnd", FUNC(ym2149_device::address_w)); - map(0x20004e, 0x20004f).rw(this, FUNC(shangha3_state::shangha3_prot_r), FUNC(shangha3_state::shangha3_prot_w)); + map(0x20004e, 0x20004f).rw(FUNC(shangha3_state::shangha3_prot_r), FUNC(shangha3_state::shangha3_prot_w)); map(0x20006f, 0x20006f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x300000, 0x30ffff).ram().share("ram"); /* gfx & work ram */ - map(0x340000, 0x340001).w(this, FUNC(shangha3_state::flipscreen_w)); - map(0x360000, 0x360001).w(this, FUNC(shangha3_state::gfxlist_addr_w)); + map(0x340000, 0x340001).w(FUNC(shangha3_state::flipscreen_w)); + map(0x360000, 0x360001).w(FUNC(shangha3_state::gfxlist_addr_w)); } void shangha3_state::heberpop_map(address_map &map) @@ -141,13 +141,13 @@ void shangha3_state::heberpop_map(address_map &map) map(0x200000, 0x200001).portr("INPUTS"); map(0x200002, 0x200003).portr("SYSTEM"); map(0x200004, 0x200005).portr("DSW"); - map(0x200008, 0x200009).w(this, FUNC(shangha3_state::blitter_go_w)); - map(0x20000a, 0x20000b).w(this, FUNC(shangha3_state::irq_ack_w)); - map(0x20000c, 0x20000d).w(this, FUNC(shangha3_state::heberpop_coinctrl_w)); + map(0x200008, 0x200009).w(FUNC(shangha3_state::blitter_go_w)); + map(0x20000a, 0x20000b).w(FUNC(shangha3_state::irq_ack_w)); + map(0x20000c, 0x20000d).w(FUNC(shangha3_state::heberpop_coinctrl_w)); map(0x20000f, 0x20000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x300000, 0x30ffff).ram().share("ram"); /* gfx & work ram */ - map(0x340000, 0x340001).w(this, FUNC(shangha3_state::flipscreen_w)); - map(0x360000, 0x360001).w(this, FUNC(shangha3_state::gfxlist_addr_w)); + map(0x340000, 0x340001).w(FUNC(shangha3_state::flipscreen_w)); + map(0x360000, 0x360001).w(FUNC(shangha3_state::gfxlist_addr_w)); map(0x800000, 0xb7ffff).rom().region("gfx1", 0); } @@ -157,14 +157,14 @@ void shangha3_state::blocken_map(address_map &map) map(0x100000, 0x100001).portr("INPUTS"); map(0x100002, 0x100003).portr("SYSTEM").nopw(); // w -> unknown purpose map(0x100004, 0x100005).portr("DSW"); - map(0x100008, 0x100009).w(this, FUNC(shangha3_state::blitter_go_w)); - map(0x10000a, 0x10000b).nopr().w(this, FUNC(shangha3_state::irq_ack_w)); // r -> unknown purpose (value doesn't matter, left-over?) - map(0x10000c, 0x10000d).w(this, FUNC(shangha3_state::blocken_coinctrl_w)); + map(0x100008, 0x100009).w(FUNC(shangha3_state::blitter_go_w)); + map(0x10000a, 0x10000b).nopr().w(FUNC(shangha3_state::irq_ack_w)); // r -> unknown purpose (value doesn't matter, left-over?) + map(0x10000c, 0x10000d).w(FUNC(shangha3_state::blocken_coinctrl_w)); map(0x10000f, 0x10000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x200000, 0x200fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300000, 0x30ffff).ram().share("ram"); /* gfx & work ram */ - map(0x340000, 0x340001).w(this, FUNC(shangha3_state::flipscreen_w)); - map(0x360000, 0x360001).w(this, FUNC(shangha3_state::gfxlist_addr_w)); + map(0x340000, 0x340001).w(FUNC(shangha3_state::flipscreen_w)); + map(0x360000, 0x360001).w(FUNC(shangha3_state::gfxlist_addr_w)); map(0x800000, 0xb7ffff).rom().region("gfx1", 0); } diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp index 337d14065a9..6b9ac99d658 100644 --- a/src/mame/drivers/shanghai.cpp +++ b/src/mame/drivers/shanghai.cpp @@ -123,7 +123,7 @@ void shanghai_state::shanghai_portmap(address_map &map) map(0x40, 0x41).portr("P1"); map(0x44, 0x45).portr("P2"); map(0x48, 0x49).portr("SYSTEM"); - map(0x4c, 0x4c).w(this, FUNC(shanghai_state::shanghai_coin_w)); + map(0x4c, 0x4c).w(FUNC(shanghai_state::shanghai_coin_w)); } @@ -135,7 +135,7 @@ void shanghai_state::shangha2_portmap(address_map &map) map(0x30, 0x31).rw("hd63484", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w)); map(0x32, 0x33).rw("hd63484", FUNC(hd63484_device::data16_r), FUNC(hd63484_device::data16_w)); map(0x40, 0x43).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)).umask16(0x00ff); - map(0x50, 0x50).w(this, FUNC(shanghai_state::shanghai_coin_w)); + map(0x50, 0x50).w(FUNC(shanghai_state::shanghai_coin_w)); } void shanghai_state::kothello_map(address_map &map) diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index de83c1c82f1..a29db7ce2ba 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -279,15 +279,15 @@ GFXDECODE_END void shangkid_state::chinhero_main_map(address_map &map) { map(0x0000, 0x9fff).rom(); - map(0xa000, 0xa000).w(this, FUNC(shangkid_state::nmiq_1_w)); - map(0xa800, 0xa800).w(this, FUNC(shangkid_state::nmiq_2_w)); + map(0xa000, 0xa000).w(FUNC(shangkid_state::nmiq_1_w)); + map(0xa800, 0xa800).w(FUNC(shangkid_state::nmiq_2_w)); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xb800, 0xb800).portr("DSW"); map(0xb801, 0xb801).portr("SYSTEM"); map(0xb802, 0xb802).portr("P2"); map(0xb803, 0xb803).portr("P1"); map(0xc000, 0xc002).writeonly().share("videoreg"); - map(0xd000, 0xdfff).ram().w(this, FUNC(shangkid_state::videoram_w)).share("videoram"); + map(0xd000, 0xdfff).ram().w(FUNC(shangkid_state::videoram_w)).share("videoram"); map(0xe000, 0xfdff).ram().share("share2"); map(0xfe00, 0xffff).ram().share("spriteram"); } @@ -296,15 +296,15 @@ void shangkid_state::shangkid_main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("bank1"); - map(0xa000, 0xa000).w(this, FUNC(shangkid_state::nmiq_1_w)); - map(0xa800, 0xa800).w(this, FUNC(shangkid_state::nmiq_2_w)); + map(0xa000, 0xa000).w(FUNC(shangkid_state::nmiq_1_w)); + map(0xa800, 0xa800).w(FUNC(shangkid_state::nmiq_2_w)); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xb800, 0xb800).portr("DSW"); map(0xb801, 0xb801).portr("SYSTEM"); map(0xb802, 0xb802).portr("P2"); map(0xb803, 0xb803).portr("P1"); map(0xc000, 0xc002).writeonly().share("videoreg"); - map(0xd000, 0xdfff).ram().w(this, FUNC(shangkid_state::videoram_w)).share("videoram"); + map(0xd000, 0xdfff).ram().w(FUNC(shangkid_state::videoram_w)).share("videoram"); map(0xe000, 0xfdff).ram().share("share2"); map(0xfe00, 0xffff).ram().share("spriteram"); } @@ -314,14 +314,14 @@ void shangkid_state::shangkid_main_map(address_map &map) void shangkid_state::chinhero_bbx_map(address_map &map) { map(0x0000, 0x9fff).rom(); - map(0xa000, 0xa000).w(this, FUNC(shangkid_state::nmiq_1_w)); - map(0xa800, 0xa800).w(this, FUNC(shangkid_state::nmiq_2_w)); + map(0xa000, 0xa000).w(FUNC(shangkid_state::nmiq_1_w)); + map(0xa800, 0xa800).w(FUNC(shangkid_state::nmiq_2_w)); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xb800, 0xb800).portr("DSW"); map(0xb801, 0xb801).portr("SYSTEM"); map(0xb802, 0xb802).portr("P2"); map(0xb803, 0xb803).portr("P1"); - map(0xd000, 0xdfff).ram().w(this, FUNC(shangkid_state::videoram_w)).share("videoram"); + map(0xd000, 0xdfff).ram().w(FUNC(shangkid_state::videoram_w)).share("videoram"); map(0xe000, 0xfdff).ram().share("share2"); map(0xfe00, 0xffff).ram().share("spriteram"); } @@ -329,14 +329,14 @@ void shangkid_state::chinhero_bbx_map(address_map &map) void shangkid_state::shangkid_bbx_map(address_map &map) { map(0x0000, 0x9fff).rom(); - map(0xa000, 0xa000).w(this, FUNC(shangkid_state::nmiq_1_w)); - map(0xa800, 0xa800).w(this, FUNC(shangkid_state::nmiq_2_w)); + map(0xa000, 0xa000).w(FUNC(shangkid_state::nmiq_1_w)); + map(0xa800, 0xa800).w(FUNC(shangkid_state::nmiq_2_w)); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xb800, 0xb800).portr("DSW"); map(0xb801, 0xb801).portr("SYSTEM"); map(0xb802, 0xb802).portr("P2"); map(0xb803, 0xb803).portr("P1"); - map(0xd000, 0xdfff).ram().w(this, FUNC(shangkid_state::videoram_w)).share("videoram"); + map(0xd000, 0xdfff).ram().w(FUNC(shangkid_state::videoram_w)).share("videoram"); map(0xe000, 0xfdff).ram().share("share2"); map(0xfe00, 0xffff).ram().share("spriteram"); } @@ -370,7 +370,7 @@ void shangkid_state::shangkid_sound_map(address_map &map) void shangkid_state::sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(shangkid_state::soundlatch_r)).w("dac", FUNC(dac_byte_interface::write)); + map(0x00, 0x00).r(FUNC(shangkid_state::soundlatch_r)).w("dac", FUNC(dac_byte_interface::data_w)); } /***************************************************************************************/ diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp index 035ebf9e0f9..401e02a0e9d 100644 --- a/src/mame/drivers/shaolins.cpp +++ b/src/mame/drivers/shaolins.cpp @@ -34,11 +34,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(shaolins_state::interrupt) void shaolins_state::shaolins_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(shaolins_state::nmi_w)); /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */ + map(0x0000, 0x0000).w(FUNC(shaolins_state::nmi_w)); /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */ /* bit 3, bit 4 = coin counters */ map(0x0100, 0x0100).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0300, 0x0300).w("sn1", FUNC(sn76489a_device::write)); /* trigger chip to read from latch. The program always */ - map(0x0400, 0x0400).w("sn2", FUNC(sn76489a_device::write)); /* writes the same number as the latch, so we don't */ + map(0x0300, 0x0300).w("sn1", FUNC(sn76489a_device::command_w)); /* trigger chip to read from latch. The program always */ + map(0x0400, 0x0400).w("sn2", FUNC(sn76489a_device::command_w)); /* writes the same number as the latch, so we don't */ /* bother emulating them. */ map(0x0500, 0x0500).portr("DSW1"); map(0x0600, 0x0600).portr("DSW2"); @@ -48,13 +48,13 @@ void shaolins_state::shaolins_map(address_map &map) map(0x0703, 0x0703).portr("DSW3"); map(0x0800, 0x0800).nopw(); /* latch for 76496 #0 */ map(0x1000, 0x1000).nopw(); /* latch for 76496 #1 */ - map(0x1800, 0x1800).w(this, FUNC(shaolins_state::palettebank_w)); - map(0x2000, 0x2000).w(this, FUNC(shaolins_state::scroll_w)); + map(0x1800, 0x1800).w(FUNC(shaolins_state::palettebank_w)); + map(0x2000, 0x2000).w(FUNC(shaolins_state::scroll_w)); map(0x2800, 0x2bff).ram(); /* RAM BANK 2 */ map(0x3000, 0x30ff).ram(); /* RAM BANK 1 */ map(0x3100, 0x33ff).ram().share("spriteram"); - map(0x3800, 0x3bff).ram().w(this, FUNC(shaolins_state::colorram_w)).share("colorram"); - map(0x3c00, 0x3fff).ram().w(this, FUNC(shaolins_state::videoram_w)).share("videoram"); + map(0x3800, 0x3bff).ram().w(FUNC(shaolins_state::colorram_w)).share("colorram"); + map(0x3c00, 0x3fff).ram().w(FUNC(shaolins_state::videoram_w)).share("videoram"); map(0x4000, 0x5fff).rom(); /* Machine checks for extra rom */ map(0x6000, 0xffff).rom(); } diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index 4270d476250..e2325a0fdad 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -53,17 +53,17 @@ void shisen_state::shisen_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc800, 0xcaff).ram().w(this, FUNC(shisen_state::paletteram_w)).share("paletteram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(shisen_state::videoram_w)).share("videoram"); + map(0xc800, 0xcaff).ram().w(FUNC(shisen_state::paletteram_w)).share("paletteram"); + map(0xd000, 0xdfff).ram().w(FUNC(shisen_state::videoram_w)).share("videoram"); map(0xe000, 0xffff).ram(); } void shisen_state::shisen_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(shisen_state::dsw1_r), FUNC(shisen_state::coin_w)); + map(0x00, 0x00).rw(FUNC(shisen_state::dsw1_r), FUNC(shisen_state::coin_w)); map(0x01, 0x01).portr("DSW2").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x02, 0x02).portr("P1").w(this, FUNC(shisen_state::bankswitch_w)); + map(0x02, 0x02).portr("P1").w(FUNC(shisen_state::bankswitch_w)); map(0x03, 0x03).portr("P2"); map(0x04, 0x04).portr("COIN"); } diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index 3830ab961fd..c5a4a86ea94 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -106,14 +106,14 @@ WRITE8_MEMBER(shootout_state::coincounter_w) void shootout_state::shootout_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x1000).portr("DSW1").w(this, FUNC(shootout_state::bankswitch_w)); - map(0x1001, 0x1001).portr("P1").w(this, FUNC(shootout_state::flipscreen_w)); - map(0x1002, 0x1002).portr("P2").w(this, FUNC(shootout_state::coincounter_w)); - map(0x1003, 0x1003).portr("DSW2").w(this, FUNC(shootout_state::sound_cpu_command_w)); + map(0x1000, 0x1000).portr("DSW1").w(FUNC(shootout_state::bankswitch_w)); + map(0x1001, 0x1001).portr("P1").w(FUNC(shootout_state::flipscreen_w)); + map(0x1002, 0x1002).portr("P2").w(FUNC(shootout_state::coincounter_w)); + map(0x1003, 0x1003).portr("DSW2").w(FUNC(shootout_state::sound_cpu_command_w)); map(0x1004, 0x17ff).ram(); map(0x1800, 0x19ff).ram().share("spriteram"); - map(0x2000, 0x27ff).ram().w(this, FUNC(shootout_state::textram_w)).share("textram"); - map(0x2800, 0x2fff).ram().w(this, FUNC(shootout_state::videoram_w)).share("videoram"); + map(0x2000, 0x27ff).ram().w(FUNC(shootout_state::textram_w)).share("textram"); + map(0x2800, 0x2fff).ram().w(FUNC(shootout_state::videoram_w)).share("videoram"); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom().region("maincpu", 0x0000); } @@ -126,11 +126,11 @@ void shootout_state::shootouj_map(address_map &map) map(0x1002, 0x1002).portr("P2"); map(0x1003, 0x1003).portr("DSW2"); map(0x1004, 0x17ff).ram(); - map(0x1800, 0x1800).w(this, FUNC(shootout_state::coincounter_w)); + map(0x1800, 0x1800).w(FUNC(shootout_state::coincounter_w)); map(0x2000, 0x21ff).ram().share("spriteram"); map(0x2800, 0x2801).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x3000, 0x37ff).ram().w(this, FUNC(shootout_state::textram_w)).share("textram"); - map(0x3800, 0x3fff).ram().w(this, FUNC(shootout_state::videoram_w)).share("videoram"); + map(0x3000, 0x37ff).ram().w(FUNC(shootout_state::textram_w)).share("textram"); + map(0x3800, 0x3fff).ram().w(FUNC(shootout_state::videoram_w)).share("videoram"); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom().region("maincpu", 0x0000); } @@ -142,7 +142,7 @@ void shootout_state::shootout_sound_map(address_map &map) { map(0x0000, 0x07ff).ram(); map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0xa000, 0xa000).r(this, FUNC(shootout_state::sound_cpu_command_r)); + map(0xa000, 0xa000).r(FUNC(shootout_state::sound_cpu_command_r)); map(0xc000, 0xffff).rom().region("audiocpu", 0x0000); map(0xd000, 0xd000).nopw(); // Unknown, NOT irq/nmi mask (Always 0x80 ???) } diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp index 83653c7acee..42f29d40331 100644 --- a/src/mame/drivers/shougi.cpp +++ b/src/mame/drivers/shougi.cpp @@ -283,7 +283,7 @@ void shougi_state::sub_map(address_map &map) void shougi_state::readport_sub(address_map &map) { map.global_mask(0x00ff); - map(0x00, 0x00).r(this, FUNC(shougi_state::semaphore_r)); + map(0x00, 0x00).r(FUNC(shougi_state::semaphore_r)); } diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp index 28378d462a7..108fdff5e82 100644 --- a/src/mame/drivers/shuuz.cpp +++ b/src/mame/drivers/shuuz.cpp @@ -116,8 +116,8 @@ void shuuz_state::main_map(address_map &map) map(0x100000, 0x100fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x101000, 0x101fff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x102000, 0x102001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x103000, 0x103003).r(this, FUNC(shuuz_state::leta_r)); - map(0x105000, 0x105001).rw(this, FUNC(shuuz_state::special_port0_r), FUNC(shuuz_state::latch_w)); + map(0x103000, 0x103003).r(FUNC(shuuz_state::leta_r)); + map(0x105000, 0x105001).rw(FUNC(shuuz_state::special_port0_r), FUNC(shuuz_state::latch_w)); map(0x105002, 0x105003).portr("BUTTONS"); map(0x106001, 0x106001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x107000, 0x107007).noprw(); diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp index 7beffb0b641..f7c3726ae66 100644 --- a/src/mame/drivers/sidearms.cpp +++ b/src/mame/drivers/sidearms.cpp @@ -84,17 +84,17 @@ void sidearms_state::sidearms_map(address_map &map) map(0xc000, 0xc3ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xc400, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xc800, 0xc800).portr("SYSTEM").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc801, 0xc801).portr("P1").w(this, FUNC(sidearms_state::bankswitch_w)); + map(0xc801, 0xc801).portr("P1").w(FUNC(sidearms_state::bankswitch_w)); map(0xc802, 0xc802).portr("P2").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xc803, 0xc803).portr("DSW0"); - map(0xc804, 0xc804).portr("DSW1").w(this, FUNC(sidearms_state::c804_w)); - map(0xc805, 0xc805).portr("DSW2").w(this, FUNC(sidearms_state::star_scrollx_w)); - map(0xc806, 0xc806).w(this, FUNC(sidearms_state::star_scrolly_w)); + map(0xc804, 0xc804).portr("DSW1").w(FUNC(sidearms_state::c804_w)); + map(0xc805, 0xc805).portr("DSW2").w(FUNC(sidearms_state::star_scrollx_w)); + map(0xc806, 0xc806).w(FUNC(sidearms_state::star_scrolly_w)); map(0xc808, 0xc809).writeonly().share("bg_scrollx"); map(0xc80a, 0xc80b).writeonly().share("bg_scrolly"); - map(0xc80c, 0xc80c).w(this, FUNC(sidearms_state::gfxctrl_w)); /* background and sprite enable */ - map(0xd000, 0xd7ff).ram().w(this, FUNC(sidearms_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(sidearms_state::colorram_w)).share("colorram"); + map(0xc80c, 0xc80c).w(FUNC(sidearms_state::gfxctrl_w)); /* background and sprite enable */ + map(0xd000, 0xd7ff).ram().w(FUNC(sidearms_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(sidearms_state::colorram_w)).share("colorram"); map(0xe000, 0xefff).ram(); map(0xf000, 0xffff).ram().share("spriteram"); } @@ -107,18 +107,18 @@ void sidearms_state::turtship_map(address_map &map) map(0xd000, 0xdfff).ram().share("spriteram"); map(0xe000, 0xe3ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xe400, 0xe7ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0xe800, 0xe807).r(this, FUNC(sidearms_state::turtship_ports_r)); + map(0xe800, 0xe807).r(FUNC(sidearms_state::turtship_ports_r)); map(0xe800, 0xe800).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xe801, 0xe801).w(this, FUNC(sidearms_state::bankswitch_w)); + map(0xe801, 0xe801).w(FUNC(sidearms_state::bankswitch_w)); map(0xe802, 0xe802).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xe804, 0xe804).w(this, FUNC(sidearms_state::c804_w)); - map(0xe805, 0xe805).w(this, FUNC(sidearms_state::star_scrollx_w)); - map(0xe806, 0xe806).w(this, FUNC(sidearms_state::star_scrolly_w)); + map(0xe804, 0xe804).w(FUNC(sidearms_state::c804_w)); + map(0xe805, 0xe805).w(FUNC(sidearms_state::star_scrollx_w)); + map(0xe806, 0xe806).w(FUNC(sidearms_state::star_scrolly_w)); map(0xe808, 0xe809).writeonly().share("bg_scrollx"); map(0xe80a, 0xe80b).writeonly().share("bg_scrolly"); - map(0xe80c, 0xe80c).w(this, FUNC(sidearms_state::gfxctrl_w)); /* background and sprite enable */ - map(0xf000, 0xf7ff).ram().w(this, FUNC(sidearms_state::videoram_w)).share("videoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(sidearms_state::colorram_w)).share("colorram"); + map(0xe80c, 0xe80c).w(FUNC(sidearms_state::gfxctrl_w)); /* background and sprite enable */ + map(0xf000, 0xf7ff).ram().w(FUNC(sidearms_state::videoram_w)).share("videoram"); + map(0xf800, 0xffff).ram().w(FUNC(sidearms_state::colorram_w)).share("colorram"); } void sidearms_state::sidearms_sound_map(address_map &map) @@ -152,21 +152,21 @@ void sidearms_state::whizz_map(address_map &map) map(0xc000, 0xc3ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xc400, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0xc800, 0xc800).portr("DSW0").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xc801, 0xc801).portr("DSW1").w(this, FUNC(sidearms_state::whizz_bankswitch_w)); + map(0xc801, 0xc801).portr("DSW1").w(FUNC(sidearms_state::whizz_bankswitch_w)); map(0xc802, 0xc802).portr("DSW2").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xc803, 0xc803).portr("IN0").nopw(); - map(0xc804, 0xc804).portr("IN1").w(this, FUNC(sidearms_state::c804_w)); + map(0xc804, 0xc804).portr("IN1").w(FUNC(sidearms_state::c804_w)); map(0xc805, 0xc805).portr("IN2").nopw(); map(0xc806, 0xc806).portr("IN3"); map(0xc807, 0xc807).portr("IN4"); map(0xc808, 0xc809).writeonly().share("bg_scrollx"); map(0xc80a, 0xc80b).writeonly().share("bg_scrolly"); - map(0xc80c, 0xc80c).w(this, FUNC(sidearms_state::gfxctrl_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(sidearms_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(sidearms_state::colorram_w)).share("colorram"); + map(0xc80c, 0xc80c).w(FUNC(sidearms_state::gfxctrl_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(sidearms_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(sidearms_state::colorram_w)).share("colorram"); map(0xe000, 0xefff).ram(); - map(0xe805, 0xe805).w(this, FUNC(sidearms_state::star_scrollx_w)); - map(0xe806, 0xe806).w(this, FUNC(sidearms_state::star_scrolly_w)); + map(0xe805, 0xe805).w(FUNC(sidearms_state::star_scrollx_w)); + map(0xe806, 0xe806).w(FUNC(sidearms_state::star_scrolly_w)); map(0xf000, 0xffff).ram().share("spriteram"); } diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp index e60b78b0860..673e6219a78 100644 --- a/src/mame/drivers/sidepckt.cpp +++ b/src/mame/drivers/sidepckt.cpp @@ -200,8 +200,8 @@ WRITE8_MEMBER(sidepckt_state::i8751_w) void sidepckt_state::sidepckt_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x13ff).mirror(0x400).ram().w(this, FUNC(sidepckt_state::videoram_w)).share("videoram"); - map(0x1800, 0x1bff).mirror(0x400).ram().w(this, FUNC(sidepckt_state::colorram_w)).share("colorram"); + map(0x1000, 0x13ff).mirror(0x400).ram().w(FUNC(sidepckt_state::videoram_w)).share("videoram"); + map(0x1800, 0x1bff).mirror(0x400).ram().w(FUNC(sidepckt_state::colorram_w)).share("colorram"); map(0x2000, 0x20ff).ram().share("spriteram"); map(0x2100, 0x24ff).nopw(); // ??? (Unused spriteram? The game writes some values at boot, but never read) map(0x3000, 0x3000).portr("P1"); @@ -209,9 +209,9 @@ void sidepckt_state::sidepckt_map(address_map &map) map(0x3002, 0x3002).portr("DSW1"); map(0x3003, 0x3003).portr("DSW2"); map(0x3004, 0x3004).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x300c, 0x300c).rw(this, FUNC(sidepckt_state::scroll_y_r), FUNC(sidepckt_state::scroll_y_w)); - map(0x3014, 0x3014).r(this, FUNC(sidepckt_state::i8751_r)); - map(0x3018, 0x3018).w(this, FUNC(sidepckt_state::i8751_w)); + map(0x300c, 0x300c).rw(FUNC(sidepckt_state::scroll_y_r), FUNC(sidepckt_state::scroll_y_w)); + map(0x3014, 0x3014).r(FUNC(sidepckt_state::i8751_r)); + map(0x3018, 0x3018).w(FUNC(sidepckt_state::i8751_w)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp index 75f451326a8..af803bd4ae3 100644 --- a/src/mame/drivers/sigmab52.cpp +++ b/src/mame/drivers/sigmab52.cpp @@ -325,15 +325,15 @@ void sigmab52_state::jwildb52_map(address_map &map) map(0x8000, 0xf6ff).rom(); - map(0xf700, 0xf700).r(this, FUNC(sigmab52_state::unk_f700_r)); // ACIA ??? - map(0xf710, 0xf710).w(this, FUNC(sigmab52_state::bank1_w)); + map(0xf700, 0xf700).r(FUNC(sigmab52_state::unk_f700_r)); // ACIA ??? + map(0xf710, 0xf710).w(FUNC(sigmab52_state::bank1_w)); map(0xf720, 0xf727).rw("6840ptm_1", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0xf730, 0xf730).rw("hd63484", FUNC(hd63484_device::status8_r), FUNC(hd63484_device::address8_w)); map(0xf731, 0xf731).rw("hd63484", FUNC(hd63484_device::data8_r), FUNC(hd63484_device::data8_w)); - map(0xf740, 0xf740).r(this, FUNC(sigmab52_state::in0_r)); + map(0xf740, 0xf740).r(FUNC(sigmab52_state::in0_r)); map(0xf741, 0xf741).portr("IN1"); map(0xf742, 0xf742).portr("IN2"); map(0xf743, 0xf743).portr("DSW1"); @@ -341,20 +341,20 @@ void sigmab52_state::jwildb52_map(address_map &map) map(0xf745, 0xf745).portr("DSW3"); map(0xf746, 0xf746).portr("DSW4"); map(0xf747, 0xf747).portr("IN3"); - map(0xf750, 0xf750).w(this, FUNC(sigmab52_state::palette_bank_w)); + map(0xf750, 0xf750).w(FUNC(sigmab52_state::palette_bank_w)); - map(0xf760, 0xf760).r(this, FUNC(sigmab52_state::unk_f760_r)); + map(0xf760, 0xf760).r(FUNC(sigmab52_state::unk_f760_r)); // AM_RANGE(0xf770, 0xf77f) Bill validator - map(0xf780, 0xf780).w(this, FUNC(sigmab52_state::audiocpu_cmd_irq_w)); + map(0xf780, 0xf780).w(FUNC(sigmab52_state::audiocpu_cmd_irq_w)); map(0xf790, 0xf790).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xf7b0, 0xf7b0).w(this, FUNC(sigmab52_state::coin_enable_w)); - map(0xf7d5, 0xf7d5).w(this, FUNC(sigmab52_state::hopper_w)); - map(0xf7b2, 0xf7b7).w(this, FUNC(sigmab52_state::lamps1_w)); - map(0xf7c0, 0xf7c3).w(this, FUNC(sigmab52_state::lamps2_w)); - map(0xf7d6, 0xf7d7).w(this, FUNC(sigmab52_state::tower_lamps_w)); + map(0xf7b0, 0xf7b0).w(FUNC(sigmab52_state::coin_enable_w)); + map(0xf7d5, 0xf7d5).w(FUNC(sigmab52_state::hopper_w)); + map(0xf7b2, 0xf7b7).w(FUNC(sigmab52_state::lamps1_w)); + map(0xf7c0, 0xf7c3).w(FUNC(sigmab52_state::lamps2_w)); + map(0xf7d6, 0xf7d7).w(FUNC(sigmab52_state::tower_lamps_w)); map(0xf800, 0xffff).rom(); } @@ -374,7 +374,7 @@ void sigmab52_state::sound_prog_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); - map(0x6030, 0x6030).w(this, FUNC(sigmab52_state::audiocpu_irq_ack_w)); + map(0x6030, 0x6030).w(FUNC(sigmab52_state::audiocpu_irq_ack_w)); map(0x6050, 0x6050).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x6060, 0x6061).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x8000, 0xffff).rom().region("audiocpu", 0); diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index 87ca1f24ff5..e9d4a7f2005 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -818,9 +818,9 @@ void sigmab98_state::dodghero_mem_map(address_map &map) map(0xd800, 0xdfff).bankrw("rambank"); // not used, where is it mapped? - map(0xd800, 0xd821).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); - map(0xd813, 0xd813).r(this, FUNC(sigmab98_state::d013_r)); - map(0xd821, 0xd821).r(this, FUNC(sigmab98_state::d021_r)); + map(0xd800, 0xd821).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0xd813, 0xd813).r(FUNC(sigmab98_state::d013_r)); + map(0xd821, 0xd821).r(FUNC(sigmab98_state::d021_r)); map(0xe000, 0xefff).ram().share("nvram"); // battery backed RAM @@ -833,15 +833,15 @@ void sigmab98_state::dodghero_io_map(address_map &map) map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0xa0, 0xa1).rw(this, FUNC(sigmab98_state::dodghero_regs_r), FUNC(sigmab98_state::dodghero_regs_w)); + map(0xa0, 0xa1).rw(FUNC(sigmab98_state::dodghero_regs_r), FUNC(sigmab98_state::dodghero_regs_w)); // AM_RANGE( 0xa2, 0xa3 ) - map(0xa4, 0xa5).rw(this, FUNC(sigmab98_state::dodghero_regs2_r), FUNC(sigmab98_state::dodghero_regs2_w)); + map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dodghero_regs2_r), FUNC(sigmab98_state::dodghero_regs2_w)); - map(0xc0, 0xc0).portr("EEPROM").w(this, FUNC(sigmab98_state::eeprom_w)); + map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w)); map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(sigmab98_state::c4_w)); - map(0xc6, 0xc6).w(this, FUNC(sigmab98_state::c6_w)); - map(0xc8, 0xc8).w(this, FUNC(sigmab98_state::c8_w)); + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w)); + map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w)); + map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w)); } /*************************************************************************** @@ -1014,9 +1014,9 @@ void sigmab98_state::gegege_mem_map(address_map &map) map(0xc800, 0xc87f).ram().share("vtable"); - map(0xd000, 0xd021).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); - map(0xd013, 0xd013).r(this, FUNC(sigmab98_state::d013_r)); - map(0xd021, 0xd021).r(this, FUNC(sigmab98_state::d021_r)); + map(0xd000, 0xd021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0xd013, 0xd013).r(FUNC(sigmab98_state::d013_r)); + map(0xd021, 0xd021).r(FUNC(sigmab98_state::d021_r)); map(0xd800, 0xdfff).bankrw("rambank"); @@ -1031,15 +1031,15 @@ void sigmab98_state::gegege_io_map(address_map &map) map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0xa0, 0xa1).rw(this, FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); + map(0xa0, 0xa1).rw(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); // AM_RANGE( 0xa2, 0xa3 ) - map(0xa4, 0xa5).rw(this, FUNC(sigmab98_state::gegege_regs2_r), FUNC(sigmab98_state::gegege_regs2_w)); + map(0xa4, 0xa5).rw(FUNC(sigmab98_state::gegege_regs2_r), FUNC(sigmab98_state::gegege_regs2_w)); - map(0xc0, 0xc0).portr("EEPROM").w(this, FUNC(sigmab98_state::eeprom_w)); + map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w)); map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(sigmab98_state::c4_w)); - map(0xc6, 0xc6).w(this, FUNC(sigmab98_state::c6_w)); - map(0xc8, 0xc8).w(this, FUNC(sigmab98_state::c8_w)); + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w)); + map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w)); + map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w)); map(0xe5, 0xe5).nopr(); // during irq } @@ -1110,15 +1110,15 @@ void sigmab98_state::dashhero_io_map(address_map &map) map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0xa0, 0xa1).rw(this, FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); + map(0xa0, 0xa1).rw(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); // AM_RANGE( 0xa2, 0xa3 ) - map(0xa4, 0xa5).rw(this, FUNC(sigmab98_state::dashhero_regs2_r), FUNC(sigmab98_state::dashhero_regs2_w)); + map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dashhero_regs2_r), FUNC(sigmab98_state::dashhero_regs2_w)); - map(0xc0, 0xc0).portr("EEPROM").w(this, FUNC(sigmab98_state::eeprom_w)); + map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w)); map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(sigmab98_state::c4_w)); - map(0xc6, 0xc6).w(this, FUNC(sigmab98_state::c6_w)); - map(0xc8, 0xc8).w(this, FUNC(sigmab98_state::c8_w)); + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w)); + map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w)); + map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w)); map(0xe5, 0xe5).nopr(); // during irq } @@ -1246,9 +1246,9 @@ void lufykzku_state::lufykzku_mem_map(address_map &map) map(0xd000, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // more palette entries - map(0xf000, 0xf021).rw(this, FUNC(lufykzku_state::vregs_r), FUNC(lufykzku_state::vregs_w)).share("vregs"); - map(0xf013, 0xf013).r(this, FUNC(lufykzku_state::d013_r)); - map(0xf021, 0xf021).r(this, FUNC(lufykzku_state::d021_r)); + map(0xf000, 0xf021).rw(FUNC(lufykzku_state::vregs_r), FUNC(lufykzku_state::vregs_w)).share("vregs"); + map(0xf013, 0xf013).r(FUNC(lufykzku_state::d013_r)); + map(0xf021, 0xf021).r(FUNC(lufykzku_state::d021_r)); map(0xf400, 0xf47f).ram().share("vtable"); @@ -1259,15 +1259,15 @@ void lufykzku_state::lufykzku_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).w("oki", FUNC(okim9810_device::write)); - map(0x01, 0x01).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x01, 0x01).w("oki", FUNC(okim9810_device::tmp_register_w)); - map(0xa2, 0xa3).rw(this, FUNC(lufykzku_state::lufykzku_regs_r), FUNC(lufykzku_state::lufykzku_regs_w)); + map(0xa2, 0xa3).rw(FUNC(lufykzku_state::lufykzku_regs_r), FUNC(lufykzku_state::lufykzku_regs_w)); - map(0xc0, 0xc0).portr("COIN").w(this, FUNC(lufykzku_state::lufykzku_watchdog_w)); // bit 7 -> watchdog + map(0xc0, 0xc0).portr("COIN").w(FUNC(lufykzku_state::lufykzku_watchdog_w)); // bit 7 -> watchdog map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(lufykzku_state::lufykzku_c4_w)); // bit 7 = medal lock, bit 6 = coin3, bit 5 = yen - map(0xc6, 0xc6).w(this, FUNC(lufykzku_state::lufykzku_c6_w)); - map(0xc8, 0xc8).rw(this, FUNC(lufykzku_state::lufykzku_c8_r), FUNC(lufykzku_state::lufykzku_c8_w)); // 0xc8 bit 6 read (eeprom?) + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(lufykzku_state::lufykzku_c4_w)); // bit 7 = medal lock, bit 6 = coin3, bit 5 = yen + map(0xc6, 0xc6).w(FUNC(lufykzku_state::lufykzku_c6_w)); + map(0xc8, 0xc8).rw(FUNC(lufykzku_state::lufykzku_c8_r), FUNC(lufykzku_state::lufykzku_c8_w)); // 0xc8 bit 6 read (eeprom?) } @@ -1491,9 +1491,9 @@ void sigmab98_state::animalc_map(address_map &map) map(0xd000, 0xd1ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xd800, 0xd87f).ram().share("vtable"); - map(0xe000, 0xe021).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0xe000, 0xe021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); map(0xe011, 0xe011).nopw(); // IRQ Enable? Screen disable? - map(0xe013, 0xe013).rw(this, FUNC(sigmab98_state::vblank_r), FUNC(sigmab98_state::vblank_w)); // IRQ Ack? + map(0xe013, 0xe013).rw(FUNC(sigmab98_state::vblank_r), FUNC(sigmab98_state::vblank_w)); // IRQ Ack? map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -1501,19 +1501,19 @@ void sigmab98_state::animalc_map(address_map &map) void sigmab98_state::animalc_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::animalc_rombank_r), FUNC(sigmab98_state::animalc_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::animalc_rambank_r), FUNC(sigmab98_state::animalc_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::animalc_rombank_r), FUNC(sigmab98_state::animalc_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::animalc_rambank_r), FUNC(sigmab98_state::animalc_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); - map(0x34, 0x34).r(this, FUNC(sigmab98_state::unk_34_r)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); + map(0x34, 0x34).r(FUNC(sigmab98_state::unk_34_r)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } @@ -1773,9 +1773,9 @@ void sigmab98_state::gocowboy_map(address_map &map) { map(0x0000, 0x43ff).rom(); - map(0x4400, 0xdbff).rw(this, FUNC(sigmab98_state::gocowboy_4400_r), FUNC(sigmab98_state::gocowboy_4400_w)); // SPRITERAM + PALETTERAM + VTABLE + VREGS | NVRAM + map(0x4400, 0xdbff).rw(FUNC(sigmab98_state::gocowboy_4400_r), FUNC(sigmab98_state::gocowboy_4400_w)); // SPRITERAM + PALETTERAM + VTABLE + VREGS | NVRAM - map(0xdc00, 0xfbff).rw(this, FUNC(sigmab98_state::gocowboy_dc00_r), FUNC(sigmab98_state::gocowboy_dc00_w)).share("nvram"); // PALETTERAM | NVRAM + map(0xdc00, 0xfbff).rw(FUNC(sigmab98_state::gocowboy_dc00_r), FUNC(sigmab98_state::gocowboy_dc00_w)).share("nvram"); // PALETTERAM | NVRAM map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -1800,16 +1800,16 @@ WRITE8_MEMBER(sigmab98_state::gocowboy_leds_w) void sigmab98_state::gocowboy_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::gocowboy_rombank_r), FUNC(sigmab98_state::gocowboy_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::gocowboy_rambank_r), FUNC(sigmab98_state::gocowboy_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::gocowboy_rombank_r), FUNC(sigmab98_state::gocowboy_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::gocowboy_rambank_r), FUNC(sigmab98_state::gocowboy_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::gocowboy_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::gocowboy_leds_w)); map(0x90, 0x90).rw("oki", FUNC(okim9810_device::read), FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); map(0xb0, 0xb0).nopw(); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 @@ -2038,7 +2038,7 @@ WRITE8_MEMBER(sigmab98_state::haekaka_coin_counter_w) void sigmab98_state::haekaka_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xb000, 0xcfff).rw(this, FUNC(sigmab98_state::haekaka_b000_r), FUNC(sigmab98_state::haekaka_b000_w)); + map(0xb000, 0xcfff).rw(FUNC(sigmab98_state::haekaka_b000_r), FUNC(sigmab98_state::haekaka_b000_w)); map(0xd000, 0xefff).ram().share("nvram"); map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -2046,18 +2046,18 @@ void sigmab98_state::haekaka_map(address_map &map) void sigmab98_state::haekaka_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::haekaka_rombank_r), FUNC(sigmab98_state::haekaka_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::haekaka_rambank_r), FUNC(sigmab98_state::haekaka_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::haekaka_rombank_r), FUNC(sigmab98_state::haekaka_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::haekaka_rambank_r), FUNC(sigmab98_state::haekaka_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::haekaka_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::haekaka_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::haekaka_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::haekaka_leds_w)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } @@ -2281,13 +2281,13 @@ void sigmab98_state::itazuram_map(address_map &map) map(0x3800, 0x47ff).bankr("rombank0").bankw("sprbank0"); map(0x4800, 0x57ff).bankr("rombank1").bankw("sprbank1"); - map(0x5800, 0x59ff).rw(this, FUNC(sigmab98_state::itazuram_palette_r), FUNC(sigmab98_state::itazuram_palette_w)); + map(0x5800, 0x59ff).rw(FUNC(sigmab98_state::itazuram_palette_r), FUNC(sigmab98_state::itazuram_palette_w)); map(0x6000, 0x607f).ram().share("vtable"); - map(0x6800, 0x6821).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0x6800, 0x6821).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); map(0x6811, 0x6811).nopw(); // IRQ Enable? Screen disable? map(0x6813, 0x6813).nopw(); // IRQ Ack? - map(0xdc00, 0xfdff).bankr("palbank").w(this, FUNC(sigmab98_state::itazuram_nvram_palette_w)).share("nvram"); // nvram | paletteram + map(0xdc00, 0xfdff).bankr("palbank").w(FUNC(sigmab98_state::itazuram_nvram_palette_w)).share("nvram"); // nvram | paletteram map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -2295,18 +2295,18 @@ void sigmab98_state::itazuram_map(address_map &map) void sigmab98_state::itazuram_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::itazuram_rombank_r), FUNC(sigmab98_state::itazuram_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::itazuram_rambank_r), FUNC(sigmab98_state::itazuram_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::itazuram_rombank_r), FUNC(sigmab98_state::itazuram_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::itazuram_rambank_r), FUNC(sigmab98_state::itazuram_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } @@ -2317,7 +2317,7 @@ void sigmab98_state::itazuram_io(address_map &map) void sigmab98_state::pyenaget_io(address_map &map) { haekaka_io(map); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); } /*************************************************************************** @@ -2519,7 +2519,7 @@ WRITE8_MEMBER(sigmab98_state::tdoboon_c000_w) void sigmab98_state::tdoboon_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xcfff).rw(this, FUNC(sigmab98_state::tdoboon_c000_r), FUNC(sigmab98_state::tdoboon_c000_w)); + map(0xc000, 0xcfff).rw(FUNC(sigmab98_state::tdoboon_c000_r), FUNC(sigmab98_state::tdoboon_c000_w)); map(0xd000, 0xefff).ram().share("nvram"); map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -2527,18 +2527,18 @@ void sigmab98_state::tdoboon_map(address_map &map) void sigmab98_state::tdoboon_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::tdoboon_rombank_r), FUNC(sigmab98_state::tdoboon_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::tdoboon_rambank_r), FUNC(sigmab98_state::tdoboon_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::tdoboon_rombank_r), FUNC(sigmab98_state::tdoboon_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::tdoboon_rambank_r), FUNC(sigmab98_state::tdoboon_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp index 9aaf1ef7fe9..0aaa509cd0a 100644 --- a/src/mame/drivers/silkroad.cpp +++ b/src/mame/drivers/silkroad.cpp @@ -161,17 +161,17 @@ void silkroad_state::cpu_map(address_map &map) { map(0x000000, 0x1fffff).rom(); map(0x40c000, 0x40cfff).ram().share("sprram"); // sprites - map(0x600000, 0x603fff).ram().w(this, FUNC(silkroad_state::paletteram32_xRRRRRGGGGGBBBBB_dword_w)).share("paletteram"); // palette - map(0x800000, 0x803fff).ram().w(this, FUNC(silkroad_state::silkroad_fgram_w)).share("vidram"); // lower Layer - map(0x804000, 0x807fff).ram().w(this, FUNC(silkroad_state::silkroad_fgram2_w)).share("vidram2"); // mid layer - map(0x808000, 0x80bfff).ram().w(this, FUNC(silkroad_state::silkroad_fgram3_w)).share("vidram3"); // higher layer + map(0x600000, 0x603fff).ram().w(FUNC(silkroad_state::paletteram32_xRRRRRGGGGGBBBBB_dword_w)).share("paletteram"); // palette + map(0x800000, 0x803fff).ram().w(FUNC(silkroad_state::silkroad_fgram_w)).share("vidram"); // lower Layer + map(0x804000, 0x807fff).ram().w(FUNC(silkroad_state::silkroad_fgram2_w)).share("vidram2"); // mid layer + map(0x808000, 0x80bfff).ram().w(FUNC(silkroad_state::silkroad_fgram3_w)).share("vidram3"); // higher layer map(0xc00000, 0xc00003).portr("INPUTS"); map(0xc00004, 0xc00007).portr("DSW"); map(0xc00025, 0xc00025).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xc00028, 0xc0002f).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask32(0x00ff0000); map(0xc00031, 0xc00031).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xc00034, 0xc00037).w(this, FUNC(silkroad_state::silk_6295_bank_w)); - map(0xc00038, 0xc0003b).w(this, FUNC(silkroad_state::silk_coin_counter_w)); + map(0xc00034, 0xc00037).w(FUNC(silkroad_state::silk_6295_bank_w)); + map(0xc00038, 0xc0003b).w(FUNC(silkroad_state::silk_coin_counter_w)); map(0xc0010c, 0xc00123).writeonly().share("regs"); map(0xfe0000, 0xffffff).ram(); } diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index eae26e47a57..a8dd39558ea 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -187,18 +187,18 @@ void silvmil_state::silvmil_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x100001).w(this, FUNC(silvmil_state::silvmil_tilebank1_w)); - map(0x100002, 0x100003).w(this, FUNC(silvmil_state::silvmil_fg_scrollx_w)); - map(0x100004, 0x100005).w(this, FUNC(silvmil_state::silvmil_fg_scrolly_w)); - map(0x100006, 0x100007).w(this, FUNC(silvmil_state::silvmil_bg_scrollx_w)); - map(0x100008, 0x100009).w(this, FUNC(silvmil_state::silvmil_bg_scrolly_w)); - map(0x10000e, 0x10000f).w(this, FUNC(silvmil_state::silvmil_tilebank_w)); - - map(0x120000, 0x120fff).ram().w(this, FUNC(silvmil_state::silvmil_fg_videoram_w)).share("fg_videoram"); - map(0x122000, 0x122fff).ram().w(this, FUNC(silvmil_state::silvmil_bg_videoram_w)).share("bg_videoram"); + map(0x100000, 0x100001).w(FUNC(silvmil_state::silvmil_tilebank1_w)); + map(0x100002, 0x100003).w(FUNC(silvmil_state::silvmil_fg_scrollx_w)); + map(0x100004, 0x100005).w(FUNC(silvmil_state::silvmil_fg_scrolly_w)); + map(0x100006, 0x100007).w(FUNC(silvmil_state::silvmil_bg_scrollx_w)); + map(0x100008, 0x100009).w(FUNC(silvmil_state::silvmil_bg_scrolly_w)); + map(0x10000e, 0x10000f).w(FUNC(silvmil_state::silvmil_tilebank_w)); + + map(0x120000, 0x120fff).ram().w(FUNC(silvmil_state::silvmil_fg_videoram_w)).share("fg_videoram"); + map(0x122000, 0x122fff).ram().w(FUNC(silvmil_state::silvmil_bg_videoram_w)).share("bg_videoram"); map(0x200000, 0x2005ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x210000, 0x2107ff).ram().share("spriteram"); - map(0x270000, 0x270001).w(this, FUNC(silvmil_state::silvmil_soundcmd_w)); + map(0x270000, 0x270001).w(FUNC(silvmil_state::silvmil_soundcmd_w)); map(0x280000, 0x280001).portr("P1_P2"); map(0x280002, 0x280003).portr("COIN"); map(0x280004, 0x280005).portr("DSW"); diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp index 5468f372058..9143acadf87 100644 --- a/src/mame/drivers/simpl156.cpp +++ b/src/mame/drivers/simpl156.cpp @@ -225,16 +225,16 @@ void simpl156_state::joemacr_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x107fff).rw(this, FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram - map(0x110000, 0x111fff).rw(this, FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); + map(0x100000, 0x107fff).rw(FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram + map(0x110000, 0x111fff).rw(FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); map(0x120000, 0x120fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); - map(0x130000, 0x130003).portr("IN1").w(this, FUNC(simpl156_state::simpl156_eeprom_w)); + map(0x130000, 0x130003).portr("IN1").w(FUNC(simpl156_state::simpl156_eeprom_w)); map(0x140000, 0x14001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x150000, 0x151fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x152000, 0x153fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x154000, 0x155fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x160000, 0x161fff).rw(this, FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); - map(0x164000, 0x165fff).rw(this, FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); + map(0x160000, 0x161fff).rw(FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); + map(0x164000, 0x165fff).rw(FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); map(0x170000, 0x170003).readonly().nopw(); // ? map(0x180000, 0x180000).rw("okisfx", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x1c0000, 0x1c0000).rw(m_okimusic, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -251,16 +251,16 @@ void simpl156_state::chainrec_map(address_map &map) map(0x200000, 0x200003).portr("IN0"); map(0x201000, 0x201fff).ram().share("systemram"); // work ram (32-bit) map(0x3c0000, 0x3c0000).rw(m_okimusic, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x400000, 0x407fff).rw(this, FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram? - map(0x410000, 0x411fff).rw(this, FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); + map(0x400000, 0x407fff).rw(FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram? + map(0x410000, 0x411fff).rw(FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); map(0x420000, 0x420fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); - map(0x430000, 0x430003).portr("IN1").w(this, FUNC(simpl156_state::simpl156_eeprom_w)); + map(0x430000, 0x430003).portr("IN1").w(FUNC(simpl156_state::simpl156_eeprom_w)); map(0x440000, 0x44001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x450000, 0x451fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x452000, 0x453fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x454000, 0x455fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x460000, 0x461fff).rw(this, FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); - map(0x464000, 0x465fff).rw(this, FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); + map(0x460000, 0x461fff).rw(FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); + map(0x464000, 0x465fff).rw(FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); map(0x470000, 0x470003).readonly().nopw(); // ?? map(0x480000, 0x480000).rw("okisfx", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -274,16 +274,16 @@ void simpl156_state::magdrop_map(address_map &map) map(0x200000, 0x200003).portr("IN0"); map(0x201000, 0x201fff).ram().share("systemram"); // work ram (32-bit) map(0x340000, 0x340000).rw(m_okimusic, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x380000, 0x387fff).rw(this, FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram? - map(0x390000, 0x391fff).rw(this, FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); + map(0x380000, 0x387fff).rw(FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram? + map(0x390000, 0x391fff).rw(FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); map(0x3a0000, 0x3a0fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); - map(0x3b0000, 0x3b0003).portr("IN1").w(this, FUNC(simpl156_state::simpl156_eeprom_w)); + map(0x3b0000, 0x3b0003).portr("IN1").w(FUNC(simpl156_state::simpl156_eeprom_w)); map(0x3c0000, 0x3c001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x3d0000, 0x3d1fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x3d2000, 0x3d3fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x3d4000, 0x3d5fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x3e0000, 0x3e1fff).rw(this, FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); - map(0x3e4000, 0x3e5fff).rw(this, FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); + map(0x3e0000, 0x3e1fff).rw(FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); + map(0x3e4000, 0x3e5fff).rw(FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); map(0x3f0000, 0x3f0003).readonly().nopw(); //? map(0x400000, 0x400000).rw("okisfx", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -297,16 +297,16 @@ void simpl156_state::magdropp_map(address_map &map) map(0x200000, 0x200003).portr("IN0"); map(0x201000, 0x201fff).ram().share("systemram"); // work ram (32-bit) map(0x4c0000, 0x4c0000).rw(m_okimusic, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x680000, 0x687fff).rw(this, FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram? - map(0x690000, 0x691fff).rw(this, FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); + map(0x680000, 0x687fff).rw(FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram? + map(0x690000, 0x691fff).rw(FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); map(0x6a0000, 0x6a0fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); - map(0x6b0000, 0x6b0003).portr("IN1").w(this, FUNC(simpl156_state::simpl156_eeprom_w)); + map(0x6b0000, 0x6b0003).portr("IN1").w(FUNC(simpl156_state::simpl156_eeprom_w)); map(0x6c0000, 0x6c001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x6d0000, 0x6d1fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x6d2000, 0x6d3fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x6d4000, 0x6d5fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x6e0000, 0x6e1fff).rw(this, FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); - map(0x6e4000, 0x6e5fff).rw(this, FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); + map(0x6e0000, 0x6e1fff).rw(FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); + map(0x6e4000, 0x6e5fff).rw(FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); map(0x6f0000, 0x6f0003).readonly().nopw(); // ? map(0x780000, 0x780000).rw("okisfx", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -319,16 +319,16 @@ void simpl156_state::mitchell156_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x100000).rw("okisfx", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x140000, 0x140000).rw(m_okimusic, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x180000, 0x187fff).rw(this, FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram - map(0x190000, 0x191fff).rw(this, FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); + map(0x180000, 0x187fff).rw(FUNC(simpl156_state::simpl156_mainram_r), FUNC(simpl156_state::simpl156_mainram_w)).share("mainram"); // main ram + map(0x190000, 0x191fff).rw(FUNC(simpl156_state::simpl156_spriteram_r), FUNC(simpl156_state::simpl156_spriteram_w)); map(0x1a0000, 0x1a0fff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); - map(0x1b0000, 0x1b0003).portr("IN1").w(this, FUNC(simpl156_state::simpl156_eeprom_w)); + map(0x1b0000, 0x1b0003).portr("IN1").w(FUNC(simpl156_state::simpl156_eeprom_w)); map(0x1c0000, 0x1c001f).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_dword_r), FUNC(deco16ic_device::pf_control_dword_w)); map(0x1d0000, 0x1d1fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1d2000, 0x1d3fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_dword_r), FUNC(deco16ic_device::pf1_data_dword_w)); map(0x1d4000, 0x1d5fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf2_data_dword_r), FUNC(deco16ic_device::pf2_data_dword_w)); - map(0x1e0000, 0x1e1fff).rw(this, FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); - map(0x1e4000, 0x1e5fff).rw(this, FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); + map(0x1e0000, 0x1e1fff).rw(FUNC(simpl156_state::simpl156_pf1_rowscroll_r), FUNC(simpl156_state::simpl156_pf1_rowscroll_w)); + map(0x1e4000, 0x1e5fff).rw(FUNC(simpl156_state::simpl156_pf2_rowscroll_r), FUNC(simpl156_state::simpl156_pf2_rowscroll_w)); map(0x1f0000, 0x1f0003).readonly().nopw(); // ? map(0x200000, 0x200003).portr("IN0"); map(0x201000, 0x201fff).ram().share("systemram"); // work ram (32-bit) diff --git a/src/mame/drivers/simple_st0016.cpp b/src/mame/drivers/simple_st0016.cpp index b2ff9e8f8b2..a9218cb746c 100644 --- a/src/mame/drivers/simple_st0016.cpp +++ b/src/mame/drivers/simple_st0016.cpp @@ -92,12 +92,12 @@ WRITE8_MEMBER(st0016_state::st0016_rom_bank_w) void st0016_state::st0016_io(address_map &map) { map.global_mask(0xff); - map(0xc0, 0xc0).portr("P1").w(this, FUNC(st0016_state::mux_select_w)); + map(0xc0, 0xc0).portr("P1").w(FUNC(st0016_state::mux_select_w)); map(0xc1, 0xc1).portr("P2").nopw(); - map(0xc2, 0xc2).r(this, FUNC(st0016_state::mux_r)).nopw(); + map(0xc2, 0xc2).r(FUNC(st0016_state::mux_r)).nopw(); map(0xc3, 0xc3).portr("P2").nopw(); map(0xe0, 0xe0).nopw(); /* renju = $40, neratte = 0 */ - map(0xe1, 0xe1).w(this, FUNC(st0016_state::st0016_rom_bank_w)); + map(0xe1, 0xe1).w(FUNC(st0016_state::st0016_rom_bank_w)); map(0xe6, 0xe6).nopw(); /* banking ? ram bank ? shared rambank ? */ map(0xe7, 0xe7).nopw(); /* watchdog */ } @@ -146,20 +146,20 @@ void st0016_state::v810_mem(address_map &map) map(0x00000000, 0x0001ffff).ram(); map(0x80000000, 0x8001ffff).ram(); map(0xc0000000, 0xc001ffff).ram(); - map(0x40000000, 0x4000000f).r(this, FUNC(st0016_state::latch32_r)).w(this, FUNC(st0016_state::latch32_w)); + map(0x40000000, 0x4000000f).r(FUNC(st0016_state::latch32_r)).w(FUNC(st0016_state::latch32_w)); map(0xfff80000, 0xffffffff).bankr("bank2"); } void st0016_state::st0016_m2_io(address_map &map) { map.global_mask(0xff); - map(0xc0, 0xc3).r(this, FUNC(st0016_state::latch8_r)).w(this, FUNC(st0016_state::latch8_w)); - map(0xd0, 0xd0).portr("P1").w(this, FUNC(st0016_state::mux_select_w)); + map(0xc0, 0xc3).r(FUNC(st0016_state::latch8_r)).w(FUNC(st0016_state::latch8_w)); + map(0xd0, 0xd0).portr("P1").w(FUNC(st0016_state::mux_select_w)); map(0xd1, 0xd1).portr("P2").nopw(); - map(0xd2, 0xd2).r(this, FUNC(st0016_state::mux_r)).nopw(); + map(0xd2, 0xd2).r(FUNC(st0016_state::mux_r)).nopw(); map(0xd3, 0xd3).portr("P2").nopw(); map(0xe0, 0xe0).nopw(); - map(0xe1, 0xe1).w(this, FUNC(st0016_state::st0016_rom_bank_w)); + map(0xe1, 0xe1).w(FUNC(st0016_state::st0016_rom_bank_w)); map(0xe6, 0xe6).nopw(); /* banking ? ram bank ? shared rambank ? */ map(0xe7, 0xe7).nopw(); /* watchdog */ } diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp index c1faad0cc7c..034e8528d67 100644 --- a/src/mame/drivers/simpsons.cpp +++ b/src/mame/drivers/simpsons.cpp @@ -128,9 +128,9 @@ void simpsons_state::main_map(address_map &map) map(0x1f93, 0x1f93).portr("P4"); map(0x1fa0, 0x1fa7).w(m_k053246, FUNC(k053247_device::k053246_w)); map(0x1fb0, 0x1fbf).w(m_k053251, FUNC(k053251_device::write)); - map(0x1fc0, 0x1fc0).w(this, FUNC(simpsons_state::simpsons_coin_counter_w)); - map(0x1fc2, 0x1fc2).w(this, FUNC(simpsons_state::simpsons_eeprom_w)); - map(0x1fc4, 0x1fc4).r(this, FUNC(simpsons_state::simpsons_sound_interrupt_r)); + map(0x1fc0, 0x1fc0).w(FUNC(simpsons_state::simpsons_coin_counter_w)); + map(0x1fc2, 0x1fc2).w(FUNC(simpsons_state::simpsons_eeprom_w)); + map(0x1fc4, 0x1fc4).r(FUNC(simpsons_state::simpsons_sound_interrupt_r)); map(0x1fc6, 0x1fc7).rw("k053260", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)); map(0x1fc8, 0x1fc9).r(m_k053246, FUNC(k053247_device::k053246_r)); map(0x1fca, 0x1fca).r("watchdog", FUNC(watchdog_timer_device::reset_r)); @@ -147,8 +147,8 @@ void simpsons_state::bank0000_map(address_map &map) void simpsons_state::bank2000_map(address_map &map) { - map(0x0000, 0x1fff).rw(this, FUNC(simpsons_state::simpsons_k052109_r), FUNC(simpsons_state::simpsons_k052109_w)); - map(0x2000, 0x2fff).rw(this, FUNC(simpsons_state::simpsons_k053247_r), FUNC(simpsons_state::simpsons_k053247_w)); + map(0x0000, 0x1fff).rw(FUNC(simpsons_state::simpsons_k052109_r), FUNC(simpsons_state::simpsons_k052109_w)); + map(0x2000, 0x2fff).rw(FUNC(simpsons_state::simpsons_k053247_r), FUNC(simpsons_state::simpsons_k053247_w)); map(0x3000, 0x3fff).ram(); } @@ -195,9 +195,9 @@ void simpsons_state::z80_map(address_map &map) map(0x8000, 0xbfff).bankr("bank2"); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xfa00, 0xfa00).w(this, FUNC(simpsons_state::z80_arm_nmi_w)); + map(0xfa00, 0xfa00).w(FUNC(simpsons_state::z80_arm_nmi_w)); map(0xfc00, 0xfc2f).rw("k053260", FUNC(k053260_device::read), FUNC(k053260_device::write)); - map(0xfe00, 0xfe00).w(this, FUNC(simpsons_state::z80_bankswitch_w)); + map(0xfe00, 0xfe00).w(FUNC(simpsons_state::z80_bankswitch_w)); } /*************************************************************************** diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp index 9e432d97752..ac7272a6cd9 100644 --- a/src/mame/drivers/skeetsht.cpp +++ b/src/mame/drivers/skeetsht.cpp @@ -191,14 +191,14 @@ WRITE8_MEMBER(skeetsht_state::ay8910_w) void skeetsht_state::hc11_pgm_map(address_map &map) { map(0x0000, 0xffff).rom().region("68hc11", 0); - map(0x1800, 0x1800).w(this, FUNC(skeetsht_state::ay8910_w)); - map(0x2800, 0x2807).rw(this, FUNC(skeetsht_state::tms_r), FUNC(skeetsht_state::tms_w)); + map(0x1800, 0x1800).w(FUNC(skeetsht_state::ay8910_w)); + map(0x2800, 0x2807).rw(FUNC(skeetsht_state::tms_r), FUNC(skeetsht_state::tms_w)); map(0xb600, 0xbdff).ram(); //internal EEPROM } void skeetsht_state::hc11_io_map(address_map &map) { - map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(this, FUNC(skeetsht_state::hc11_porta_r), FUNC(skeetsht_state::hc11_porta_w)); + map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(FUNC(skeetsht_state::hc11_porta_r), FUNC(skeetsht_state::hc11_porta_w)); } @@ -211,7 +211,7 @@ void skeetsht_state::hc11_io_map(address_map &map) void skeetsht_state::tms_program_map(address_map &map) { map(0x00000000, 0x003fffff).ram().share("tms_vram"); - map(0x00440000, 0x004fffff).rw(this, FUNC(skeetsht_state::ramdac_r), FUNC(skeetsht_state::ramdac_w)); + map(0x00440000, 0x004fffff).rw(FUNC(skeetsht_state::ramdac_r), FUNC(skeetsht_state::ramdac_w)); map(0xc0000000, 0xc00001ff).rw(m_tms, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xff800000, 0xffbfffff).rom().mirror(0x00400000).region("tms", 0); } diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp index 822d516f28f..76c6cc47177 100644 --- a/src/mame/drivers/skimaxx.cpp +++ b/src/mame/drivers/skimaxx.cpp @@ -313,7 +313,7 @@ READ32_MEMBER(skimaxx_state::skimaxx_analog_r) void skimaxx_state::m68030_1_map(address_map &map) { map(0x00000000, 0x001fffff).rom(); - map(0x10000000, 0x10000003).w(this, FUNC(skimaxx_state::skimaxx_sub_ctrl_w)); + map(0x10000000, 0x10000003).w(FUNC(skimaxx_state::skimaxx_sub_ctrl_w)); map(0x10100000, 0x1010000f).rw(m_tms, FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w)).umask32(0x0000ffff); // AM_RANGE(0x10180000, 0x10187fff) AM_RAM AM_SHARE("share1") map(0x10180000, 0x1018ffff).ram().share("share1"); // above 10188000 accessed at level end (game bug?) @@ -324,15 +324,15 @@ void skimaxx_state::m68030_1_map(address_map &map) map(0x2000001b, 0x2000001b).rw("oki3", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // right map(0x2000001f, 0x2000001f).rw("oki4", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // right - map(0x20000020, 0x20000023).r(this, FUNC(skimaxx_state::skimaxx_unk1_r)); // units linking? - map(0x20000024, 0x20000027).w(this, FUNC(skimaxx_state::skimaxx_unk1_w)); // "" + map(0x20000020, 0x20000023).r(FUNC(skimaxx_state::skimaxx_unk1_r)); // units linking? + map(0x20000024, 0x20000027).w(FUNC(skimaxx_state::skimaxx_unk1_w)); // "" map(0x20000040, 0x20000043).ram(); // write map(0x20000044, 0x20000047).portr("DSW"); map(0x20000048, 0x2000004b).portr("COIN"); - map(0x2000004c, 0x2000004f).r(this, FUNC(skimaxx_state::unk_r)); // bit 7, bit 0 + map(0x2000004c, 0x2000004f).r(FUNC(skimaxx_state::unk_r)); // bit 7, bit 0 - map(0x20000050, 0x20000057).r(this, FUNC(skimaxx_state::skimaxx_analog_r)).nopw(); // read (0-1f), write motor? + map(0x20000050, 0x20000057).r(FUNC(skimaxx_state::skimaxx_analog_r)).nopw(); // read (0-1f), write motor? map(0xfffc0000, 0xfffdffff).ram().mirror(0x00020000); } @@ -348,10 +348,10 @@ void skimaxx_state::m68030_2_map(address_map &map) { map(0x00000000, 0x003fffff).rom(); - map(0x20000000, 0x2007ffff).r(this, FUNC(skimaxx_state::skimaxx_blitter_r)); // do blit - map(0x30000000, 0x3000000f).w(this, FUNC(skimaxx_state::skimaxx_blitter_w)).share("blitter_regs"); + map(0x20000000, 0x2007ffff).r(FUNC(skimaxx_state::skimaxx_blitter_r)); // do blit + map(0x30000000, 0x3000000f).w(FUNC(skimaxx_state::skimaxx_blitter_w)).share("blitter_regs"); - map(0x40000000, 0x40000003).w(this, FUNC(skimaxx_state::skimaxx_fpga_ctrl_w)).share("fpga_ctrl"); + map(0x40000000, 0x40000003).w(FUNC(skimaxx_state::skimaxx_fpga_ctrl_w)).share("fpga_ctrl"); map(0x50000000, 0x5007ffff).bankrw("bank1"); // background ram allocated here at video_start (skimaxx_bg_buffer_back/front) // AM_RANGE(0xfffc0000, 0xfffc7fff) AM_RAM AM_SHARE("share1") diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp index 700428ba0df..e651bf15a41 100644 --- a/src/mame/drivers/skullxbo.cpp +++ b/src/mame/drivers/skullxbo.cpp @@ -101,28 +101,28 @@ WRITE16_MEMBER(skullxbo_state::skullxbo_mobwr_w) void skullxbo_state::main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0xff0000, 0xff07ff).w(this, FUNC(skullxbo_state::skullxbo_mobmsb_w)); - map(0xff0800, 0xff0bff).w(this, FUNC(skullxbo_state::skullxbo_halt_until_hblank_0_w)); + map(0xff0000, 0xff07ff).w(FUNC(skullxbo_state::skullxbo_mobmsb_w)); + map(0xff0800, 0xff0bff).w(FUNC(skullxbo_state::skullxbo_halt_until_hblank_0_w)); map(0xff0c00, 0xff0fff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); - map(0xff1000, 0xff13ff).w(this, FUNC(skullxbo_state::video_int_ack_w)); + map(0xff1000, 0xff13ff).w(FUNC(skullxbo_state::video_int_ack_w)); map(0xff1400, 0xff17ff).w(m_jsa, FUNC(atari_jsa_ii_device::main_command_w)).umask16(0x00ff); map(0xff1800, 0xff1bff).w(m_jsa, FUNC(atari_jsa_ii_device::sound_reset_w)); - map(0xff1c00, 0xff1c7f).w(this, FUNC(skullxbo_state::playfield_latch_w)); - map(0xff1c80, 0xff1cff).w(this, FUNC(skullxbo_state::skullxbo_xscroll_w)).share("xscroll"); - map(0xff1d00, 0xff1d7f).w(this, FUNC(skullxbo_state::scanline_int_ack_w)); + map(0xff1c00, 0xff1c7f).w(FUNC(skullxbo_state::playfield_latch_w)); + map(0xff1c80, 0xff1cff).w(FUNC(skullxbo_state::skullxbo_xscroll_w)).share("xscroll"); + map(0xff1d00, 0xff1d7f).w(FUNC(skullxbo_state::scanline_int_ack_w)); map(0xff1d80, 0xff1dff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0xff1e00, 0xff1e7f).w(this, FUNC(skullxbo_state::playfield_latch_w)); - map(0xff1e80, 0xff1eff).w(this, FUNC(skullxbo_state::skullxbo_xscroll_w)); - map(0xff1f00, 0xff1f7f).w(this, FUNC(skullxbo_state::scanline_int_ack_w)); + map(0xff1e00, 0xff1e7f).w(FUNC(skullxbo_state::playfield_latch_w)); + map(0xff1e80, 0xff1eff).w(FUNC(skullxbo_state::skullxbo_xscroll_w)); + map(0xff1f00, 0xff1f7f).w(FUNC(skullxbo_state::scanline_int_ack_w)); map(0xff1f80, 0xff1fff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0xff2000, 0xff2fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xff4000, 0xff47ff).w(this, FUNC(skullxbo_state::skullxbo_yscroll_w)).share("yscroll"); - map(0xff4800, 0xff4fff).w(this, FUNC(skullxbo_state::skullxbo_mobwr_w)); + map(0xff4000, 0xff47ff).w(FUNC(skullxbo_state::skullxbo_yscroll_w)).share("yscroll"); + map(0xff4800, 0xff4fff).w(FUNC(skullxbo_state::skullxbo_mobwr_w)); map(0xff5001, 0xff5001).r(m_jsa, FUNC(atari_jsa_ii_device::main_response_r)); map(0xff5800, 0xff5801).portr("FF5800"); map(0xff5802, 0xff5803).portr("FF5802"); map(0xff6000, 0xff6fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); - map(0xff8000, 0xff9fff).ram().w(this, FUNC(skullxbo_state::playfield_latched_w)).share("playfield"); + map(0xff8000, 0xff9fff).ram().w(FUNC(skullxbo_state::playfield_latched_w)).share("playfield"); map(0xffa000, 0xffbfff).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16_ext)).share("playfield_ext"); map(0xffc000, 0xffcf7f).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); map(0xffcf80, 0xffcfff).ram().share("mob:slip"); diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp index 2cf21ded4f3..f664e5d95ac 100644 --- a/src/mame/drivers/skyarmy.cpp +++ b/src/mame/drivers/skyarmy.cpp @@ -214,8 +214,8 @@ void skyarmy_state::skyarmy_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8fff).ram().w(this, FUNC(skyarmy_state::videoram_w)).share("videoram"); /* Video RAM */ - map(0x9000, 0x93ff).ram().w(this, FUNC(skyarmy_state::colorram_w)).share("colorram"); /* Color RAM */ + map(0x8800, 0x8fff).ram().w(FUNC(skyarmy_state::videoram_w)).share("videoram"); /* Video RAM */ + map(0x9000, 0x93ff).ram().w(FUNC(skyarmy_state::colorram_w)).share("colorram"); /* Color RAM */ map(0x9800, 0x983f).ram().share("spriteram"); /* Sprites */ map(0x9840, 0x985f).ram().share("scrollram"); /* Scroll RAM */ map(0xa000, 0xa000).portr("DSW"); diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp index bb35dc56928..5af0db89290 100644 --- a/src/mame/drivers/skydiver.cpp +++ b/src/mame/drivers/skydiver.cpp @@ -175,9 +175,9 @@ INTERRUPT_GEN_MEMBER(skydiver_state::interrupt) void skydiver_state::skydiver_map(address_map &map) { map.global_mask(0x7fff); - map(0x0000, 0x007f).mirror(0x4300).rw(this, FUNC(skydiver_state::wram_r), FUNC(skydiver_state::wram_w)); + map(0x0000, 0x007f).mirror(0x4300).rw(FUNC(skydiver_state::wram_r), FUNC(skydiver_state::wram_w)); map(0x0080, 0x00ff).mirror(0x4000).ram(); /* RAM B1 */ - map(0x0400, 0x07ff).mirror(0x4000).ram().w(this, FUNC(skydiver_state::videoram_w)).share("videoram"); /* RAMs K1,M1,P1,J1,N1,K/L1,L1,H/J1 */ + map(0x0400, 0x07ff).mirror(0x4000).ram().w(FUNC(skydiver_state::videoram_w)).share("videoram"); /* RAMs K1,M1,P1,J1,N1,K/L1,L1,H/J1 */ map(0x0800, 0x080f).mirror(0x47f0).w("latch1", FUNC(f9334_device::write_a0)); map(0x1000, 0x100f).mirror(0x47f0).w("latch2", FUNC(f9334_device::write_a0)); map(0x1800, 0x1800).mirror(0x47e0).portr("IN0"); @@ -194,7 +194,7 @@ void skydiver_state::skydiver_map(address_map &map) map(0x180b, 0x180b).mirror(0x47e4).portr("IN11"); map(0x1810, 0x1810).mirror(0x47e4).portr("IN12"); map(0x1811, 0x1811).mirror(0x47e4).portr("IN13"); - map(0x2000, 0x201f).mirror(0x47e0).r(m_watchdog, FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(skydiver_state::latch3_watchdog_w)); + map(0x2000, 0x201f).mirror(0x47e0).r(m_watchdog, FUNC(watchdog_timer_device::reset_r)).w(FUNC(skydiver_state::latch3_watchdog_w)); map(0x2800, 0x2fff).mirror(0x4000).rom(); map(0x3000, 0x37ff).mirror(0x4000).rom(); map(0x3800, 0x3fff).rom(); diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp index fd480ea2f85..464622e317b 100644 --- a/src/mame/drivers/skyfox.cpp +++ b/src/mame/drivers/skyfox.cpp @@ -59,7 +59,7 @@ void skyfox_state::skyfox_map(address_map &map) map(0xe000, 0xe000).portr("INPUTS"); map(0xe001, 0xe001).portr("DSW0"); map(0xe002, 0xe002).portr("DSW1"); - map(0xe008, 0xe00f).w(this, FUNC(skyfox_state::skyfox_vregs_w)); + map(0xe008, 0xe00f).w(FUNC(skyfox_state::skyfox_vregs_w)); map(0xf001, 0xf001).portr("DSW2"); } diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp index 200a362bd39..4eeede35f26 100644 --- a/src/mame/drivers/skykid.cpp +++ b/src/mame/drivers/skykid.cpp @@ -108,18 +108,18 @@ void skykid_state::machine_start() void skykid_state::skykid_map(address_map &map) { map(0x0000, 0x1fff).bankr("bank1"); /* banked ROM */ - map(0x2000, 0x2fff).rw(this, FUNC(skykid_state::skykid_videoram_r), FUNC(skykid_state::skykid_videoram_w)).share("videoram");/* Video RAM (background) */ - map(0x4000, 0x47ff).rw(this, FUNC(skykid_state::skykid_textram_r), FUNC(skykid_state::skykid_textram_w)).share("textram"); /* video RAM (text layer) */ + map(0x2000, 0x2fff).rw(FUNC(skykid_state::skykid_videoram_r), FUNC(skykid_state::skykid_videoram_w)).share("videoram");/* Video RAM (background) */ + map(0x4000, 0x47ff).rw(FUNC(skykid_state::skykid_textram_r), FUNC(skykid_state::skykid_textram_w)).share("textram"); /* video RAM (text layer) */ map(0x4800, 0x5fff).ram().share("spriteram"); /* RAM + Sprite RAM */ - map(0x6000, 0x60ff).w(this, FUNC(skykid_state::skykid_scroll_y_w)); /* Y scroll register map */ - map(0x6200, 0x63ff).w(this, FUNC(skykid_state::skykid_scroll_x_w)); /* X scroll register map */ + map(0x6000, 0x60ff).w(FUNC(skykid_state::skykid_scroll_y_w)); /* Y scroll register map */ + map(0x6200, 0x63ff).w(FUNC(skykid_state::skykid_scroll_x_w)); /* X scroll register map */ map(0x6800, 0x6bff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); /* PSG device, shared RAM */ - map(0x7000, 0x7fff).w(this, FUNC(skykid_state::skykid_irq_1_ctrl_w)); /* IRQ control */ + map(0x7000, 0x7fff).w(FUNC(skykid_state::skykid_irq_1_ctrl_w)); /* IRQ control */ map(0x7800, 0x7fff).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0x8000, 0xffff).rom(); /* ROM */ - map(0x8000, 0x8fff).w(this, FUNC(skykid_state::skykid_subreset_w)); /* MCU control */ - map(0x9000, 0x9fff).w(this, FUNC(skykid_state::skykid_bankswitch_w)); /* Bankswitch control */ - map(0xa000, 0xa001).w(this, FUNC(skykid_state::skykid_flipscreen_priority_w)); /* flip screen & priority */ + map(0x8000, 0x8fff).w(FUNC(skykid_state::skykid_subreset_w)); /* MCU control */ + map(0x9000, 0x9fff).w(FUNC(skykid_state::skykid_bankswitch_w)); /* Bankswitch control */ + map(0xa000, 0xa001).w(FUNC(skykid_state::skykid_flipscreen_priority_w)); /* flip screen & priority */ } void skykid_state::mcu_map(address_map &map) @@ -128,7 +128,7 @@ void skykid_state::mcu_map(address_map &map) map(0x0080, 0x00ff).ram(); map(0x1000, 0x13ff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); /* PSG device, shared RAM */ map(0x2000, 0x3fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog? */ - map(0x4000, 0x7fff).w(this, FUNC(skykid_state::skykid_irq_2_ctrl_w)); + map(0x4000, 0x7fff).w(FUNC(skykid_state::skykid_irq_2_ctrl_w)); map(0x8000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); map(0xf000, 0xffff).rom(); @@ -142,10 +142,10 @@ READ8_MEMBER(skykid_state::readFF) void skykid_state::mcu_port_map(address_map &map) { - map(M6801_PORT1, M6801_PORT1).r(this, FUNC(skykid_state::inputport_r)); /* input ports read */ - map(M6801_PORT1, M6801_PORT1).w(this, FUNC(skykid_state::inputport_select_w)); /* input port select */ - map(M6801_PORT2, M6801_PORT2).r(this, FUNC(skykid_state::readFF)); /* leds won't work otherwise */ - map(M6801_PORT2, M6801_PORT2).w(this, FUNC(skykid_state::skykid_led_w)); /* lamps */ + map(M6801_PORT1, M6801_PORT1).r(FUNC(skykid_state::inputport_r)); /* input ports read */ + map(M6801_PORT1, M6801_PORT1).w(FUNC(skykid_state::inputport_select_w)); /* input port select */ + map(M6801_PORT2, M6801_PORT2).r(FUNC(skykid_state::readFF)); /* leds won't work otherwise */ + map(M6801_PORT2, M6801_PORT2).w(FUNC(skykid_state::skykid_led_w)); /* lamps */ } diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index bd7ecc01b1a..282b43dcbe6 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -466,55 +466,55 @@ void skylncr_state::mem_map_skylncr(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0x8800, 0x8fff).ram().w(this, FUNC(skylncr_state::skylncr_videoram_w)).share("videoram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(skylncr_state::skylncr_colorram_w)).share("colorram"); - - map(0x9800, 0x99ff).ram().w(this, FUNC(skylncr_state::reeltiles_1_w)).share("reeltiles_1_ram"); - map(0x9a00, 0x9bff).ram().w(this, FUNC(skylncr_state::reeltiles_2_w)).share("reeltiles_2_ram"); - map(0x9c00, 0x9dff).ram().w(this, FUNC(skylncr_state::reeltiles_3_w)).share("reeltiles_3_ram"); - map(0x9e00, 0x9fff).ram().w(this, FUNC(skylncr_state::reeltiles_4_w)).share("reeltiles_4_ram"); - map(0xa000, 0xa1ff).ram().w(this, FUNC(skylncr_state::reeltileshigh_1_w)).share("rthigh_1_ram"); - map(0xa200, 0xa3ff).ram().w(this, FUNC(skylncr_state::reeltileshigh_2_w)).share("rthigh_2_ram"); - map(0xa400, 0xa5ff).ram().w(this, FUNC(skylncr_state::reeltileshigh_3_w)).share("rthigh_3_ram"); - map(0xa600, 0xa7ff).ram().w(this, FUNC(skylncr_state::reeltileshigh_4_w)).share("rthigh_4_ram"); - - map(0xaa55, 0xaa55).r(this, FUNC(skylncr_state::ret_ff)); - - map(0xb000, 0xb03f).ram().w(this, FUNC(skylncr_state::reelscroll1_w)).share("reelscroll1"); - map(0xb040, 0xb07f).ram().w(this, FUNC(skylncr_state::reelscroll1_w)); - map(0xb080, 0xb0bf).ram().w(this, FUNC(skylncr_state::reelscroll1_w)); - map(0xb0c0, 0xb0ff).ram().w(this, FUNC(skylncr_state::reelscroll1_w)); - map(0xb100, 0xb13f).ram().w(this, FUNC(skylncr_state::reelscroll1_w)); - map(0xb140, 0xb17f).ram().w(this, FUNC(skylncr_state::reelscroll1_w)); - map(0xb180, 0xb1bf).ram().w(this, FUNC(skylncr_state::reelscroll1_w)); - map(0xb1c0, 0xb1ff).ram().w(this, FUNC(skylncr_state::reelscroll1_w)); - - map(0xb200, 0xb23f).ram().w(this, FUNC(skylncr_state::reelscroll2_w)).share("reelscroll2"); - map(0xb240, 0xb27f).ram().w(this, FUNC(skylncr_state::reelscroll2_w)); - map(0xb280, 0xb2bf).ram().w(this, FUNC(skylncr_state::reelscroll2_w)); - map(0xb2c0, 0xb2ff).ram().w(this, FUNC(skylncr_state::reelscroll2_w)); - map(0xb300, 0xb33f).ram().w(this, FUNC(skylncr_state::reelscroll2_w)); - map(0xb340, 0xb37f).ram().w(this, FUNC(skylncr_state::reelscroll2_w)); - map(0xb380, 0xb3bf).ram().w(this, FUNC(skylncr_state::reelscroll2_w)); - map(0xb3c0, 0xb3ff).ram().w(this, FUNC(skylncr_state::reelscroll2_w)); - - map(0xb400, 0xb43f).ram().w(this, FUNC(skylncr_state::reelscroll3_w)).share("reelscroll3"); - map(0xb440, 0xb47f).ram().w(this, FUNC(skylncr_state::reelscroll3_w)); - map(0xb480, 0xb4bf).ram().w(this, FUNC(skylncr_state::reelscroll3_w)); - map(0xb4c0, 0xb4ff).ram().w(this, FUNC(skylncr_state::reelscroll3_w)); - map(0xb500, 0xb53f).ram().w(this, FUNC(skylncr_state::reelscroll3_w)); - map(0xb540, 0xb57f).ram().w(this, FUNC(skylncr_state::reelscroll3_w)); - map(0xb580, 0xb5bf).ram().w(this, FUNC(skylncr_state::reelscroll3_w)); - map(0xb5c0, 0xb5ff).ram().w(this, FUNC(skylncr_state::reelscroll3_w)); - - map(0xb600, 0xb63f).ram().w(this, FUNC(skylncr_state::reelscroll4_w)).share("reelscroll4"); - map(0xb640, 0xb67f).ram().w(this, FUNC(skylncr_state::reelscroll4_w)); - map(0xb680, 0xb6bf).ram().w(this, FUNC(skylncr_state::reelscroll4_w)); - map(0xb6c0, 0xb6ff).ram().w(this, FUNC(skylncr_state::reelscroll4_w)); - map(0xb700, 0xb73f).ram().w(this, FUNC(skylncr_state::reelscroll4_w)); - map(0xb740, 0xb77f).ram().w(this, FUNC(skylncr_state::reelscroll4_w)); - map(0xb780, 0xb7bf).ram().w(this, FUNC(skylncr_state::reelscroll4_w)); - map(0xb7c0, 0xb7ff).ram().w(this, FUNC(skylncr_state::reelscroll4_w)); + map(0x8800, 0x8fff).ram().w(FUNC(skylncr_state::skylncr_videoram_w)).share("videoram"); + map(0x9000, 0x97ff).ram().w(FUNC(skylncr_state::skylncr_colorram_w)).share("colorram"); + + map(0x9800, 0x99ff).ram().w(FUNC(skylncr_state::reeltiles_1_w)).share("reeltiles_1_ram"); + map(0x9a00, 0x9bff).ram().w(FUNC(skylncr_state::reeltiles_2_w)).share("reeltiles_2_ram"); + map(0x9c00, 0x9dff).ram().w(FUNC(skylncr_state::reeltiles_3_w)).share("reeltiles_3_ram"); + map(0x9e00, 0x9fff).ram().w(FUNC(skylncr_state::reeltiles_4_w)).share("reeltiles_4_ram"); + map(0xa000, 0xa1ff).ram().w(FUNC(skylncr_state::reeltileshigh_1_w)).share("rthigh_1_ram"); + map(0xa200, 0xa3ff).ram().w(FUNC(skylncr_state::reeltileshigh_2_w)).share("rthigh_2_ram"); + map(0xa400, 0xa5ff).ram().w(FUNC(skylncr_state::reeltileshigh_3_w)).share("rthigh_3_ram"); + map(0xa600, 0xa7ff).ram().w(FUNC(skylncr_state::reeltileshigh_4_w)).share("rthigh_4_ram"); + + map(0xaa55, 0xaa55).r(FUNC(skylncr_state::ret_ff)); + + map(0xb000, 0xb03f).ram().w(FUNC(skylncr_state::reelscroll1_w)).share("reelscroll1"); + map(0xb040, 0xb07f).ram().w(FUNC(skylncr_state::reelscroll1_w)); + map(0xb080, 0xb0bf).ram().w(FUNC(skylncr_state::reelscroll1_w)); + map(0xb0c0, 0xb0ff).ram().w(FUNC(skylncr_state::reelscroll1_w)); + map(0xb100, 0xb13f).ram().w(FUNC(skylncr_state::reelscroll1_w)); + map(0xb140, 0xb17f).ram().w(FUNC(skylncr_state::reelscroll1_w)); + map(0xb180, 0xb1bf).ram().w(FUNC(skylncr_state::reelscroll1_w)); + map(0xb1c0, 0xb1ff).ram().w(FUNC(skylncr_state::reelscroll1_w)); + + map(0xb200, 0xb23f).ram().w(FUNC(skylncr_state::reelscroll2_w)).share("reelscroll2"); + map(0xb240, 0xb27f).ram().w(FUNC(skylncr_state::reelscroll2_w)); + map(0xb280, 0xb2bf).ram().w(FUNC(skylncr_state::reelscroll2_w)); + map(0xb2c0, 0xb2ff).ram().w(FUNC(skylncr_state::reelscroll2_w)); + map(0xb300, 0xb33f).ram().w(FUNC(skylncr_state::reelscroll2_w)); + map(0xb340, 0xb37f).ram().w(FUNC(skylncr_state::reelscroll2_w)); + map(0xb380, 0xb3bf).ram().w(FUNC(skylncr_state::reelscroll2_w)); + map(0xb3c0, 0xb3ff).ram().w(FUNC(skylncr_state::reelscroll2_w)); + + map(0xb400, 0xb43f).ram().w(FUNC(skylncr_state::reelscroll3_w)).share("reelscroll3"); + map(0xb440, 0xb47f).ram().w(FUNC(skylncr_state::reelscroll3_w)); + map(0xb480, 0xb4bf).ram().w(FUNC(skylncr_state::reelscroll3_w)); + map(0xb4c0, 0xb4ff).ram().w(FUNC(skylncr_state::reelscroll3_w)); + map(0xb500, 0xb53f).ram().w(FUNC(skylncr_state::reelscroll3_w)); + map(0xb540, 0xb57f).ram().w(FUNC(skylncr_state::reelscroll3_w)); + map(0xb580, 0xb5bf).ram().w(FUNC(skylncr_state::reelscroll3_w)); + map(0xb5c0, 0xb5ff).ram().w(FUNC(skylncr_state::reelscroll3_w)); + + map(0xb600, 0xb63f).ram().w(FUNC(skylncr_state::reelscroll4_w)).share("reelscroll4"); + map(0xb640, 0xb67f).ram().w(FUNC(skylncr_state::reelscroll4_w)); + map(0xb680, 0xb6bf).ram().w(FUNC(skylncr_state::reelscroll4_w)); + map(0xb6c0, 0xb6ff).ram().w(FUNC(skylncr_state::reelscroll4_w)); + map(0xb700, 0xb73f).ram().w(FUNC(skylncr_state::reelscroll4_w)); + map(0xb740, 0xb77f).ram().w(FUNC(skylncr_state::reelscroll4_w)); + map(0xb780, 0xb7bf).ram().w(FUNC(skylncr_state::reelscroll4_w)); + map(0xb7c0, 0xb7ff).ram().w(FUNC(skylncr_state::reelscroll4_w)); map(0xc000, 0xffff).rom(); } @@ -527,7 +527,7 @@ void skylncr_state::io_map_skylncr(address_map &map) map(0x00, 0x03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports */ map(0x10, 0x13).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* Input Ports */ - map(0x20, 0x20).w(this, FUNC(skylncr_state::skylncr_coin_w)); + map(0x20, 0x20).w(FUNC(skylncr_state::skylncr_coin_w)); map(0x30, 0x31).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0x31, 0x31).r("aysnd", FUNC(ay8910_device::data_r)); @@ -540,7 +540,7 @@ void skylncr_state::io_map_skylncr(address_map &map) map(0x51, 0x51).w("ramdac2", FUNC(ramdac_device::pal_w)); map(0x52, 0x52).w("ramdac2", FUNC(ramdac_device::mask_w)); - map(0x70, 0x70).w(this, FUNC(skylncr_state::skylncr_nmi_enable_w)); + map(0x70, 0x70).w(FUNC(skylncr_state::skylncr_nmi_enable_w)); } @@ -548,13 +548,13 @@ void skylncr_state::io_map_mbutrfly(address_map &map) { map.global_mask(0xff); io_map_skylncr(map); - map(0x60, 0x60).w(this, FUNC(skylncr_state::mbutrfly_prot_w)); + map(0x60, 0x60).w(FUNC(skylncr_state::mbutrfly_prot_w)); } void skylncr_state::bdream97_opcode_map(address_map &map) { - map(0x0000, 0xffff).r(this, FUNC(skylncr_state::bdream97_opcode_r)); + map(0x0000, 0xffff).r(FUNC(skylncr_state::bdream97_opcode_r)); } diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp index e0b6eaf7aff..64137991f2b 100644 --- a/src/mame/drivers/skyraid.cpp +++ b/src/mame/drivers/skyraid.cpp @@ -79,16 +79,16 @@ void skyraid_state::skyraid_map(address_map &map) map(0x0000, 0x00ff).ram().mirror(0x300); map(0x0400, 0x040f).writeonly().share("pos_ram"); map(0x0800, 0x087f).ram().mirror(0x480).share("alpha_num_ram"); - map(0x1000, 0x1000).r(this, FUNC(skyraid_state::skyraid_port_0_r)); + map(0x1000, 0x1000).r(FUNC(skyraid_state::skyraid_port_0_r)); map(0x1001, 0x1001).portr("DSW"); map(0x1400, 0x1400).portr("COIN"); map(0x1401, 0x1401).portr("SYSTEM"); map(0x1c00, 0x1c0f).writeonly().share("obj_ram"); - map(0x4000, 0x4000).w(this, FUNC(skyraid_state::skyraid_scroll_w)); - map(0x4400, 0x4400).w(this, FUNC(skyraid_state::skyraid_sound_w)); - map(0x4800, 0x4800).w(this, FUNC(skyraid_state::skyraid_range_w)); + map(0x4000, 0x4000).w(FUNC(skyraid_state::skyraid_scroll_w)); + map(0x4400, 0x4400).w(FUNC(skyraid_state::skyraid_sound_w)); + map(0x4800, 0x4800).w(FUNC(skyraid_state::skyraid_range_w)); map(0x5000, 0x5000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x5800, 0x5800).w(this, FUNC(skyraid_state::skyraid_offset_w)); + map(0x5800, 0x5800).w(FUNC(skyraid_state::skyraid_offset_w)); map(0x7000, 0x7fff).rom(); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index feacfbb9e97..272421e9329 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -278,8 +278,8 @@ void slapfght_state::perfrman_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0x8800, 0x8fff).ram().share("share1"); - map(0x9000, 0x97ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0x9800, 0x9fff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0x9000, 0x97ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0x9800, 0x9fff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xa000, 0xa7ff).ram().share("spriteram"); } @@ -289,14 +289,14 @@ void slapfght_state::tigerh_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0xd000, 0xd7ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xe000, 0xe7ff).ram().share("spriteram"); - map(0xe800, 0xe800).w(this, FUNC(slapfght_state::scrollx_lo_w)); - map(0xe801, 0xe801).w(this, FUNC(slapfght_state::scrollx_hi_w)); - map(0xe802, 0xe802).w(this, FUNC(slapfght_state::scrolly_w)); - map(0xf000, 0xf7ff).ram().w(this, FUNC(slapfght_state::fixram_w)).share("fixvideoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); + map(0xe800, 0xe800).w(FUNC(slapfght_state::scrollx_lo_w)); + map(0xe801, 0xe801).w(FUNC(slapfght_state::scrollx_hi_w)); + map(0xe802, 0xe802).w(FUNC(slapfght_state::scrolly_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(slapfght_state::fixram_w)).share("fixvideoram"); + map(0xf800, 0xffff).ram().w(FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); } void slapfght_state::tigerh_map_mcu(address_map &map) @@ -308,7 +308,7 @@ void slapfght_state::tigerh_map_mcu(address_map &map) void slapfght_state::tigerhb1_map(address_map &map) { tigerh_map(map); - map(0xe803, 0xe803).rw(this, FUNC(slapfght_state::tigerhb1_prot_r), FUNC(slapfght_state::tigerhb1_prot_w)); + map(0xe803, 0xe803).rw(FUNC(slapfght_state::tigerhb1_prot_r), FUNC(slapfght_state::tigerhb1_prot_w)); } void slapfght_state::tigerhb2_map(address_map &map) @@ -324,14 +324,14 @@ void slapfght_state::slapfigh_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0xd000, 0xd7ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xe000, 0xe7ff).ram().share("spriteram"); - map(0xe800, 0xe800).w(this, FUNC(slapfght_state::scrollx_lo_w)); - map(0xe801, 0xe801).w(this, FUNC(slapfght_state::scrollx_hi_w)); - map(0xe802, 0xe802).w(this, FUNC(slapfght_state::scrolly_w)); - map(0xf000, 0xf7ff).ram().w(this, FUNC(slapfght_state::fixram_w)).share("fixvideoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); + map(0xe800, 0xe800).w(FUNC(slapfght_state::scrollx_lo_w)); + map(0xe801, 0xe801).w(FUNC(slapfght_state::scrollx_hi_w)); + map(0xe802, 0xe802).w(FUNC(slapfght_state::scrolly_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(slapfght_state::fixram_w)).share("fixvideoram"); + map(0xf800, 0xffff).ram().w(FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); } void slapfght_state::slapfigh_map_mcu(address_map &map) @@ -349,7 +349,7 @@ void slapfght_state::slapfighb1_map(address_map &map) void slapfght_state::getstar_map(address_map &map) { slapfigh_map(map); - map(0xe803, 0xe803).rw(this, FUNC(slapfght_state::getstar_mcusim_r), FUNC(slapfght_state::getstar_mcusim_w)); + map(0xe803, 0xe803).rw(FUNC(slapfght_state::getstar_mcusim_r), FUNC(slapfght_state::getstar_mcusim_w)); } void slapfght_state::slapfighb2_map(address_map &map) @@ -358,15 +358,15 @@ void slapfght_state::slapfighb2_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0xd000, 0xd7ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xe000, 0xe7ff).ram().share("spriteram"); - map(0xe800, 0xe800).w(this, FUNC(slapfght_state::scrollx_hi_w)); - map(0xe802, 0xe802).w(this, FUNC(slapfght_state::scrolly_w)); - map(0xe803, 0xe803).w(this, FUNC(slapfght_state::scrollx_lo_w)); + map(0xe800, 0xe800).w(FUNC(slapfght_state::scrollx_hi_w)); + map(0xe802, 0xe802).w(FUNC(slapfght_state::scrolly_w)); + map(0xe803, 0xe803).w(FUNC(slapfght_state::scrollx_lo_w)); map(0xec00, 0xefff).rom(); // it reads a copy of the logo from here! - map(0xf000, 0xf7ff).ram().w(this, FUNC(slapfght_state::fixram_w)).share("fixvideoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); + map(0xf000, 0xf7ff).ram().w(FUNC(slapfght_state::fixram_w)).share("fixvideoram"); + map(0xf800, 0xffff).ram().w(FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); } @@ -402,28 +402,28 @@ READ8_MEMBER(slapfght_state::vblank_r) void slapfght_state::io_map_nomcu(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::vblank_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::vblank_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } void slapfght_state::io_map_mcu(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::tigerh_mcu_status_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::tigerh_mcu_status_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } void slapfght_state::getstarb1_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::getstarb1_prot_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::getstarb1_prot_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } void slapfght_state::getstarb2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::getstar_mcusim_status_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::getstar_mcusim_status_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } @@ -456,7 +456,7 @@ void slapfght_state::perfrman_sound_map(address_map &map) map(0xa090, 0xa090).w("ay2", FUNC(ay8910_device::address_w)); map(0xa091, 0xa091).r("ay2", FUNC(ay8910_device::data_r)); map(0xa092, 0xa092).w("ay2", FUNC(ay8910_device::data_w)); - map(0xa0e0, 0xa0e0).select(0x0010).w(this, FUNC(slapfght_state::sound_nmi_enable_w)); + map(0xa0e0, 0xa0e0).select(0x0010).w(FUNC(slapfght_state::sound_nmi_enable_w)); } void slapfght_state::tigerh_sound_map(address_map &map) @@ -468,7 +468,7 @@ void slapfght_state::tigerh_sound_map(address_map &map) map(0xa090, 0xa090).w("ay2", FUNC(ay8910_device::address_w)); map(0xa091, 0xa091).r("ay2", FUNC(ay8910_device::data_r)); map(0xa092, 0xa092).w("ay2", FUNC(ay8910_device::data_w)); - map(0xa0e0, 0xa0e0).select(0x0010).w(this, FUNC(slapfght_state::sound_nmi_enable_w)); + map(0xa0e0, 0xa0e0).select(0x0010).w(FUNC(slapfght_state::sound_nmi_enable_w)); map(0xc800, 0xcfff).ram().share("share1"); map(0xd000, 0xffff).ram(); } diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp index 170043d8fb8..1d784f00c58 100644 --- a/src/mame/drivers/slapshot.cpp +++ b/src/mame/drivers/slapshot.cpp @@ -242,8 +242,8 @@ void slapshot_state::slapshot_map(address_map &map) map(0xa00000, 0xa03fff).rw("mk48t08", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0xff00); /* nvram (only low bytes used) */ map(0xb00000, 0xb0001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0xff00); /* priority chip */ map(0xc00000, 0xc0000f).rw(m_tc0640fio, FUNC(tc0640fio_device::halfword_byteswap_r), FUNC(tc0640fio_device::halfword_byteswap_w)); - map(0xc00020, 0xc0002f).r(this, FUNC(slapshot_state::service_input_r)); /* service mirror */ - map(0xd00000, 0xd00003).rw(this, FUNC(slapshot_state::msb_sound_r), FUNC(slapshot_state::msb_sound_w)); + map(0xc00020, 0xc0002f).r(FUNC(slapshot_state::service_input_r)); /* service mirror */ + map(0xd00000, 0xd00003).rw(FUNC(slapshot_state::msb_sound_r), FUNC(slapshot_state::msb_sound_w)); } void slapshot_state::opwolf3_map(address_map &map) @@ -258,8 +258,8 @@ void slapshot_state::opwolf3_map(address_map &map) map(0xa00000, 0xa03fff).rw("mk48t08", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0xff00); /* nvram (only low bytes used) */ map(0xb00000, 0xb0001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0xff00); /* priority chip */ map(0xc00000, 0xc0000f).rw(m_tc0640fio, FUNC(tc0640fio_device::halfword_byteswap_r), FUNC(tc0640fio_device::halfword_byteswap_w)); - map(0xc00020, 0xc0002f).r(this, FUNC(slapshot_state::service_input_r)); /* service mirror */ - map(0xd00000, 0xd00003).rw(this, FUNC(slapshot_state::msb_sound_r), FUNC(slapshot_state::msb_sound_w)); + map(0xc00020, 0xc0002f).r(FUNC(slapshot_state::service_input_r)); /* service mirror */ + map(0xd00000, 0xd00003).rw(FUNC(slapshot_state::msb_sound_r), FUNC(slapshot_state::msb_sound_w)); map(0xe00000, 0xe0000f).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask16(0xff00); // map(0xe80000, 0xe80001) // gun recoil here? } @@ -279,7 +279,7 @@ void slapshot_state::opwolf3_z80_sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(slapshot_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(slapshot_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp index 90cd7f3facd..316d82a016b 100644 --- a/src/mame/drivers/slc1.cpp +++ b/src/mame/drivers/slc1.cpp @@ -205,7 +205,7 @@ void slc1_state::mem_map(address_map &map) void slc1_state::io_map(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(slc1_state::io_r), FUNC(slc1_state::io_w)); + map(0x0000, 0xffff).rw(FUNC(slc1_state::io_r), FUNC(slc1_state::io_w)); } diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp index 86dc51d3885..192dcdfba04 100644 --- a/src/mame/drivers/slicer.cpp +++ b/src/mame/drivers/slicer.cpp @@ -77,10 +77,10 @@ void slicer_state::slicer_io(address_map &map) map(0x0080, 0x00ff).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write)).umask16(0x00ff); //PCS1 map(0x0100, 0x0107).mirror(0x0078).w("drivelatch", FUNC(ls259_device::write_d0)).umask16(0x00ff); //PCS2 // TODO: 0x180 sets ack - map(0x0180, 0x0180).r("sasi_data_in", FUNC(input_buffer_device::read)).w("sasi_data_out", FUNC(output_latch_device::write)).umask16(0x00ff); //PCS3 - map(0x0181, 0x0181).r("sasi_ctrl_in", FUNC(input_buffer_device::read)); - map(0x0184, 0x0184).r("sasi_data_in", FUNC(input_buffer_device::read)).w("sasi_data_out", FUNC(output_latch_device::write)).umask16(0x00ff); - map(0x0185, 0x0185).r("sasi_ctrl_in", FUNC(input_buffer_device::read)); + map(0x0180, 0x0180).r("sasi_data_in", FUNC(input_buffer_device::bus_r)).w("sasi_data_out", FUNC(output_latch_device::bus_w)).umask16(0x00ff); //PCS3 + map(0x0181, 0x0181).r("sasi_ctrl_in", FUNC(input_buffer_device::bus_r)); + map(0x0184, 0x0184).r("sasi_data_in", FUNC(input_buffer_device::bus_r)).w("sasi_data_out", FUNC(output_latch_device::bus_w)).umask16(0x00ff); + map(0x0185, 0x0185).r("sasi_ctrl_in", FUNC(input_buffer_device::bus_r)); } static void slicer_floppies(device_slot_interface &device) diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp index 9a8621da3c4..a454b38d459 100644 --- a/src/mame/drivers/sliver.cpp +++ b/src/mame/drivers/sliver.cpp @@ -362,20 +362,20 @@ void sliver_state::sliver_map(address_map &map) map(0x300002, 0x300003).noprw(); // bit 0 tested, writes 0xe0 and 0xc0 - both r and w at the end of interrupt code - map(0x300004, 0x300005).w(this, FUNC(sliver_state::io_offset_w)); //unknown i/o device - map(0x300006, 0x300007).w(this, FUNC(sliver_state::io_data_w)); + map(0x300004, 0x300005).w(FUNC(sliver_state::io_offset_w)); //unknown i/o device + map(0x300006, 0x300007).w(FUNC(sliver_state::io_data_w)); map(0x400000, 0x400001).portr("P1_P2"); map(0x400002, 0x400003).portr("SYSTEM"); map(0x400004, 0x400005).portr("DSW"); - map(0x400006, 0x400007).w(this, FUNC(sliver_state::fifo_data_w)); - map(0x400008, 0x400009).w(this, FUNC(sliver_state::fifo_clear_w)); - map(0x40000a, 0x40000b).w(this, FUNC(sliver_state::fifo_flush_w)); - map(0x40000c, 0x40000d).w(this, FUNC(sliver_state::jpeg1_w)); - map(0x40000e, 0x40000f).w(this, FUNC(sliver_state::jpeg2_w)); + map(0x400006, 0x400007).w(FUNC(sliver_state::fifo_data_w)); + map(0x400008, 0x400009).w(FUNC(sliver_state::fifo_clear_w)); + map(0x40000a, 0x40000b).w(FUNC(sliver_state::fifo_flush_w)); + map(0x40000c, 0x40000d).w(FUNC(sliver_state::jpeg1_w)); + map(0x40000e, 0x40000f).w(FUNC(sliver_state::jpeg2_w)); map(0x400010, 0x400015).nopw(); //unknown - map(0x400016, 0x400017).w(this, FUNC(sliver_state::sound_w)); + map(0x400016, 0x400017).w(FUNC(sliver_state::sound_w)); map(0x400018, 0x400019).nopw(); //unknown map(0xff0000, 0xffffff).ram(); diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp index fbf205396c6..6efc88104cc 100644 --- a/src/mame/drivers/slotcarn.cpp +++ b/src/mame/drivers/slotcarn.cpp @@ -197,7 +197,7 @@ void slotcarn_state::slotcarn_map(address_map &map) map(0xe800, 0xefff).ram().share("raattr"); map(0xf000, 0xf7ff).ram().share("ravideo"); - map(0xf800, 0xfbff).rw(this, FUNC(slotcarn_state::palette_r), FUNC(slotcarn_state::palette_w)); + map(0xf800, 0xfbff).rw(FUNC(slotcarn_state::palette_r), FUNC(slotcarn_state::palette_w)); } // spielbud - is the ay mirrored, or are there now 2? diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp index 3d63364b67e..d1c57419599 100644 --- a/src/mame/drivers/sm7238.cpp +++ b/src/mame/drivers/sm7238.cpp @@ -131,8 +131,8 @@ void sm7238_state::sm7238_mem(address_map &map) map(0x0000, 0x9fff).rom(); map(0xa000, 0xa7ff).ram(); map(0xb000, 0xb3ff).ram().share("nvram"); - map(0xb800, 0xb800).w(this, FUNC(sm7238_state::text_control_w)); - map(0xbc00, 0xbc00).w(this, FUNC(sm7238_state::control_w)); + map(0xb800, 0xb800).w(FUNC(sm7238_state::text_control_w)); + map(0xbc00, 0xbc00).w(FUNC(sm7238_state::control_w)); map(0xc000, 0xcfff).ram(); // chargen map(0xe000, 0xffff).m(m_videobank, FUNC(address_map_bank_device::amap8)); } @@ -140,7 +140,7 @@ void sm7238_state::sm7238_mem(address_map &map) void sm7238_state::videobank_map(address_map &map) { map(0x0000, 0x1fff).ram().share("videoram"); - map(0x2000, 0x2fff).mirror(0x1000).w(this, FUNC(sm7238_state::vmem_w)); + map(0x2000, 0x2fff).mirror(0x1000).w(FUNC(sm7238_state::vmem_w)); } void sm7238_state::sm7238_io(address_map &map) diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index 20855452a15..8de51d178f8 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -663,46 +663,46 @@ WRITE8_MEMBER(smc777_state::irq_mask_w) void smc777_state::smc777_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(smc777_state::smc777_mem_r), FUNC(smc777_state::smc777_mem_w)); + map(0x0000, 0xffff).rw(FUNC(smc777_state::smc777_mem_r), FUNC(smc777_state::smc777_mem_w)); } void smc777_state::smc777_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x07).select(0xff00).rw(this, FUNC(smc777_state::vram_r), FUNC(smc777_state::vram_w)); - map(0x08, 0x0f).select(0xff00).rw(this, FUNC(smc777_state::attr_r), FUNC(smc777_state::attr_w)); - map(0x10, 0x17).select(0xff00).rw(this, FUNC(smc777_state::pcg_r), FUNC(smc777_state::pcg_w)); - map(0x18, 0x19).mirror(0xff00).w(this, FUNC(smc777_state::mc6845_w)); - map(0x1a, 0x1b).mirror(0xff00).rw(this, FUNC(smc777_state::key_r), FUNC(smc777_state::key_w)); - map(0x1c, 0x1c).mirror(0xff00).rw(this, FUNC(smc777_state::system_input_r), FUNC(smc777_state::system_output_w)); + map(0x00, 0x07).select(0xff00).rw(FUNC(smc777_state::vram_r), FUNC(smc777_state::vram_w)); + map(0x08, 0x0f).select(0xff00).rw(FUNC(smc777_state::attr_r), FUNC(smc777_state::attr_w)); + map(0x10, 0x17).select(0xff00).rw(FUNC(smc777_state::pcg_r), FUNC(smc777_state::pcg_w)); + map(0x18, 0x19).mirror(0xff00).w(FUNC(smc777_state::mc6845_w)); + map(0x1a, 0x1b).mirror(0xff00).rw(FUNC(smc777_state::key_r), FUNC(smc777_state::key_w)); + map(0x1c, 0x1c).mirror(0xff00).rw(FUNC(smc777_state::system_input_r), FUNC(smc777_state::system_output_w)); // AM_RANGE(0x1d, 0x1d) system and control read, printer strobe write // AM_RANGE(0x1e, 0x1f) rs232 irq control - map(0x20, 0x20).mirror(0xff00).rw(this, FUNC(smc777_state::display_reg_r), FUNC(smc777_state::display_reg_w)); - map(0x21, 0x21).mirror(0xff00).rw(this, FUNC(smc777_state::irq_mask_r), FUNC(smc777_state::irq_mask_w)); + map(0x20, 0x20).mirror(0xff00).rw(FUNC(smc777_state::display_reg_r), FUNC(smc777_state::display_reg_w)); + map(0x21, 0x21).mirror(0xff00).rw(FUNC(smc777_state::irq_mask_r), FUNC(smc777_state::irq_mask_w)); // AM_RANGE(0x22, 0x22) printer output data - map(0x23, 0x23).mirror(0xff00).w(this, FUNC(smc777_state::border_col_w)); + map(0x23, 0x23).mirror(0xff00).w(FUNC(smc777_state::border_col_w)); // AM_RANGE(0x24, 0x24) rtc write address // AM_RANGE(0x25, 0x25) rtc read // AM_RANGE(0x26, 0x26) rs232 #1 // AM_RANGE(0x28, 0x2c) fdc #2 // AM_RANGE(0x2d, 0x2f) rs232 #2 - map(0x30, 0x33).mirror(0xff00).rw(this, FUNC(smc777_state::fdc_r), FUNC(smc777_state::fdc_w)); - map(0x34, 0x34).mirror(0xff00).rw(this, FUNC(smc777_state::fdc_request_r), FUNC(smc777_state::floppy_select_w)); + map(0x30, 0x33).mirror(0xff00).rw(FUNC(smc777_state::fdc_r), FUNC(smc777_state::fdc_w)); + map(0x34, 0x34).mirror(0xff00).rw(FUNC(smc777_state::fdc_request_r), FUNC(smc777_state::floppy_select_w)); // AM_RANGE(0x35, 0x37) rs232 #3 // AM_RANGE(0x38, 0x3b) cache disk unit // AM_RANGE(0x3c, 0x3d) rgb superimposer // AM_RANGE(0x40, 0x47) ieee-488 // AM_RANGE(0x48, 0x4f) hdd (winchester) - map(0x51, 0x51).mirror(0xff00).portr("JOY_1P").w(this, FUNC(smc777_state::color_mode_w)); - map(0x52, 0x52).select(0xff00).w(this, FUNC(smc777_state::ramdac_w)); - map(0x53, 0x53).mirror(0xff00).w("sn1", FUNC(sn76489a_device::write)); + map(0x51, 0x51).mirror(0xff00).portr("JOY_1P").w(FUNC(smc777_state::color_mode_w)); + map(0x52, 0x52).select(0xff00).w(FUNC(smc777_state::ramdac_w)); + map(0x53, 0x53).mirror(0xff00).w("sn1", FUNC(sn76489a_device::command_w)); // AM_RANGE(0x54, 0x59) vrt controller // AM_RANGE(0x5a, 0x5b) ram banking // AM_RANGE(0x70, 0x70) auto-start rom // AM_RANGE(0x74, 0x74) ieee-488 rom // AM_RANGE(0x75, 0x75) vrt controller rom // AM_RANGE(0x7e, 0x7f) kanji rom - map(0x80, 0xff).select(0xff00).rw(this, FUNC(smc777_state::fbuf_r), FUNC(smc777_state::fbuf_w)); + map(0x80, 0xff).select(0xff00).rw(FUNC(smc777_state::fbuf_r), FUNC(smc777_state::fbuf_w)); } /* Input ports */ diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index b48274e7f93..38e297f9940 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -266,32 +266,32 @@ DC00 - Selection buttons #2, 9-16 (R) void sms_state::sms1_mem(address_map &map) { - map(0x0000, 0xbfff).w(this, FUNC(sms_state::write_cart)); - map(0x0000, 0x3fff).r(this, FUNC(sms_state::read_0000)); - map(0x4000, 0x7fff).r(this, FUNC(sms_state::read_4000)); - map(0x8000, 0xbfff).r(this, FUNC(sms_state::read_8000)); - map(0xc000, 0xfff7).rw(this, FUNC(sms_state::read_ram), FUNC(sms_state::write_ram)); - map(0xfff8, 0xfffb).rw(this, FUNC(sms_state::sms_sscope_r), FUNC(sms_state::sms_sscope_w)); /* 3-D glasses */ - map(0xfffc, 0xffff).rw(this, FUNC(sms_state::sms_mapper_r), FUNC(sms_state::sms_mapper_w)); /* Bankswitch control */ + map(0x0000, 0xbfff).w(FUNC(sms_state::write_cart)); + map(0x0000, 0x3fff).r(FUNC(sms_state::read_0000)); + map(0x4000, 0x7fff).r(FUNC(sms_state::read_4000)); + map(0x8000, 0xbfff).r(FUNC(sms_state::read_8000)); + map(0xc000, 0xfff7).rw(FUNC(sms_state::read_ram), FUNC(sms_state::write_ram)); + map(0xfff8, 0xfffb).rw(FUNC(sms_state::sms_sscope_r), FUNC(sms_state::sms_sscope_w)); /* 3-D glasses */ + map(0xfffc, 0xffff).rw(FUNC(sms_state::sms_mapper_r), FUNC(sms_state::sms_mapper_w)); /* Bankswitch control */ } void sms_state::sms_mem(address_map &map) { - map(0x0000, 0xbfff).w(this, FUNC(sms_state::write_cart)); - map(0x0000, 0x3fff).r(this, FUNC(sms_state::read_0000)); - map(0x4000, 0x7fff).r(this, FUNC(sms_state::read_4000)); - map(0x8000, 0xbfff).r(this, FUNC(sms_state::read_8000)); - map(0xc000, 0xfffb).rw(this, FUNC(sms_state::read_ram), FUNC(sms_state::write_ram)); - map(0xfffc, 0xffff).rw(this, FUNC(sms_state::sms_mapper_r), FUNC(sms_state::sms_mapper_w)); /* Bankswitch control */ + map(0x0000, 0xbfff).w(FUNC(sms_state::write_cart)); + map(0x0000, 0x3fff).r(FUNC(sms_state::read_0000)); + map(0x4000, 0x7fff).r(FUNC(sms_state::read_4000)); + map(0x8000, 0xbfff).r(FUNC(sms_state::read_8000)); + map(0xc000, 0xfffb).rw(FUNC(sms_state::read_ram), FUNC(sms_state::write_ram)); + map(0xfffc, 0xffff).rw(FUNC(sms_state::sms_mapper_r), FUNC(sms_state::sms_mapper_w)); /* Bankswitch control */ } void smssdisp_state::sms_store_mem(address_map &map) { map(0x0000, 0x3fff).rom(); /* BIOS */ map(0x4000, 0x47ff).ram(); /* RAM */ - map(0x6000, 0x7fff).r(this, FUNC(smssdisp_state::store_cart_peek)); - map(0x8000, 0x8000).portr("DSW").w(this, FUNC(smssdisp_state::sms_store_control_w)); /* Control */ - map(0xc000, 0xc000).rw(this, FUNC(smssdisp_state::sms_store_cart_select_r), FUNC(smssdisp_state::sms_store_cart_select_w)); /* cartridge/card slot selector */ + map(0x6000, 0x7fff).r(FUNC(smssdisp_state::store_cart_peek)); + map(0x8000, 0x8000).portr("DSW").w(FUNC(smssdisp_state::sms_store_control_w)); /* Control */ + map(0xc000, 0xc000).rw(FUNC(smssdisp_state::sms_store_cart_select_r), FUNC(smssdisp_state::sms_store_cart_select_w)); /* cartridge/card slot selector */ map(0xd800, 0xd800).portr("GAMESEL1"); /* Game selector port #1 */ map(0xdc00, 0xdc00).portr("GAMESEL2"); /* Game selector port #2 */ } @@ -301,23 +301,23 @@ void sms_state::sg1000m3_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x40, 0x7f).rw(this, FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); + map(0x40, 0x7f).rw(FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); - map(0xc0, 0xc7).mirror(0x38).rw(this, FUNC(sms_state::sg1000m3_peripheral_r), FUNC(sms_state::sg1000m3_peripheral_w)); + map(0xc0, 0xc7).mirror(0x38).rw(FUNC(sms_state::sg1000m3_peripheral_r), FUNC(sms_state::sg1000m3_peripheral_w)); } void sms_state::sms_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x00, 0x00).mirror(0x3e).w(this, FUNC(sms_state::sms_mem_control_w)); - map(0x01, 0x01).mirror(0x3e).w(this, FUNC(sms_state::sms_io_control_w)); - map(0x40, 0x7f).rw(this, FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); + map(0x00, 0x00).mirror(0x3e).w(FUNC(sms_state::sms_mem_control_w)); + map(0x01, 0x01).mirror(0x3e).w(FUNC(sms_state::sms_io_control_w)); + map(0x40, 0x7f).rw(FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); - map(0xc0, 0xc0).mirror(0x3e).r(this, FUNC(sms_state::sms_input_port_dc_r)); - map(0xc1, 0xc1).mirror(0x3e).r(this, FUNC(sms_state::sms_input_port_dd_r)); + map(0xc0, 0xc0).mirror(0x3e).r(FUNC(sms_state::sms_input_port_dc_r)); + map(0xc1, 0xc1).mirror(0x3e).r(FUNC(sms_state::sms_input_port_dd_r)); } @@ -329,13 +329,13 @@ void sms_state::smskr_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x3e, 0x3e).w(this, FUNC(sms_state::sms_mem_control_w)); - map(0x3f, 0x3f).w(this, FUNC(sms_state::sms_io_control_w)); - map(0x40, 0x7f).rw(this, FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); + map(0x3e, 0x3e).w(FUNC(sms_state::sms_mem_control_w)); + map(0x3f, 0x3f).w(FUNC(sms_state::sms_io_control_w)); + map(0x40, 0x7f).rw(FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); - map(0xc0, 0xc0).mirror(0x3e).r(this, FUNC(sms_state::sms_input_port_dc_r)); - map(0xc1, 0xc1).mirror(0x3e).r(this, FUNC(sms_state::sms_input_port_dd_r)); + map(0xc0, 0xc0).mirror(0x3e).r(FUNC(sms_state::sms_input_port_dc_r)); + map(0xc1, 0xc1).mirror(0x3e).r(FUNC(sms_state::sms_input_port_dd_r)); } @@ -345,18 +345,18 @@ void sms_state::smsj_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x3e, 0x3e).w(this, FUNC(sms_state::sms_mem_control_w)); - map(0x3f, 0x3f).w(this, FUNC(sms_state::sms_io_control_w)); - map(0x40, 0x7f).rw(this, FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); + map(0x3e, 0x3e).w(FUNC(sms_state::sms_mem_control_w)); + map(0x3f, 0x3f).w(FUNC(sms_state::sms_io_control_w)); + map(0x40, 0x7f).rw(FUNC(sms_state::sms_count_r), FUNC(sms_state::sms_psg_w)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); - map(0xc0, 0xc0).r(this, FUNC(sms_state::sms_input_port_dc_r)); - map(0xc1, 0xc1).r(this, FUNC(sms_state::sms_input_port_dd_r)); - map(0xdc, 0xdc).r(this, FUNC(sms_state::sms_input_port_dc_r)); - map(0xdd, 0xdd).r(this, FUNC(sms_state::sms_input_port_dd_r)); - map(0xf0, 0xf0).w(this, FUNC(sms_state::smsj_ym2413_register_port_w)); - map(0xf1, 0xf1).w(this, FUNC(sms_state::smsj_ym2413_data_port_w)); - map(0xf2, 0xf2).rw(this, FUNC(sms_state::smsj_audio_control_r), FUNC(sms_state::smsj_audio_control_w)); + map(0xc0, 0xc0).r(FUNC(sms_state::sms_input_port_dc_r)); + map(0xc1, 0xc1).r(FUNC(sms_state::sms_input_port_dd_r)); + map(0xdc, 0xdc).r(FUNC(sms_state::sms_input_port_dc_r)); + map(0xdd, 0xdd).r(FUNC(sms_state::sms_input_port_dd_r)); + map(0xf0, 0xf0).w(FUNC(sms_state::smsj_ym2413_register_port_w)); + map(0xf1, 0xf1).w(FUNC(sms_state::smsj_ym2413_data_port_w)); + map(0xf2, 0xf2).rw(FUNC(sms_state::smsj_audio_control_r), FUNC(sms_state::smsj_audio_control_w)); } @@ -366,18 +366,18 @@ void sms_state::gg_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x00, 0x00).r(this, FUNC(sms_state::gg_input_port_00_r)); - map(0x01, 0x05).rw(this, FUNC(sms_state::gg_sio_r), FUNC(sms_state::gg_sio_w)); - map(0x06, 0x06).w(this, FUNC(sms_state::gg_psg_stereo_w)); - map(0x3e, 0x3e).w(this, FUNC(sms_state::sms_mem_control_w)); - map(0x3f, 0x3f).w(this, FUNC(sms_state::sms_io_control_w)); - map(0x40, 0x7f).rw(this, FUNC(sms_state::sms_count_r), FUNC(sms_state::gg_psg_w)); + map(0x00, 0x00).r(FUNC(sms_state::gg_input_port_00_r)); + map(0x01, 0x05).rw(FUNC(sms_state::gg_sio_r), FUNC(sms_state::gg_sio_w)); + map(0x06, 0x06).w(FUNC(sms_state::gg_psg_stereo_w)); + map(0x3e, 0x3e).w(FUNC(sms_state::sms_mem_control_w)); + map(0x3f, 0x3f).w(FUNC(sms_state::sms_io_control_w)); + map(0x40, 0x7f).rw(FUNC(sms_state::sms_count_r), FUNC(sms_state::gg_psg_w)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); - map(0xc0, 0xc0).r(this, FUNC(sms_state::sms_input_port_dc_r)); - map(0xc1, 0xc1).r(this, FUNC(sms_state::sms_input_port_dd_r)); - map(0xdc, 0xdc).r(this, FUNC(sms_state::sms_input_port_dc_r)); - map(0xdd, 0xdd).r(this, FUNC(sms_state::sms_input_port_dd_r)); + map(0xc0, 0xc0).r(FUNC(sms_state::sms_input_port_dc_r)); + map(0xc1, 0xc1).r(FUNC(sms_state::sms_input_port_dd_r)); + map(0xdc, 0xdc).r(FUNC(sms_state::sms_input_port_dc_r)); + map(0xdd, 0xdd).r(FUNC(sms_state::sms_input_port_dd_r)); } diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp index e71a40ee39c..feeb391ef38 100644 --- a/src/mame/drivers/sms_bootleg.cpp +++ b/src/mame/drivers/sms_bootleg.cpp @@ -260,11 +260,11 @@ void smsbootleg_state::sms_supergame_io(address_map &map) map.unmap_value_high(); map(0x04, 0x04).nopr(); //AM_READ_PORT("IN0") // these - map(0x08, 0x08).w(this, FUNC(smsbootleg_state::port08_w)); + map(0x08, 0x08).w(FUNC(smsbootleg_state::port08_w)); map(0x14, 0x14).nopr(); //AM_READ_PORT("IN1") // seem to be from a coinage / timer MCU, changing them directly changes the credits / time value - map(0x18, 0x18).w(this, FUNC(smsbootleg_state::port18_w)); + map(0x18, 0x18).w(FUNC(smsbootleg_state::port18_w)); - map(0x40, 0x7f).rw(this, FUNC(smsbootleg_state::sms_count_r), FUNC(smsbootleg_state::sms_psg_w)); + map(0x40, 0x7f).rw(FUNC(smsbootleg_state::sms_count_r), FUNC(smsbootleg_state::sms_psg_w)); map(0x80, 0x80).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::vram_read), FUNC(sega315_5124_device::vram_write)); map(0x81, 0x81).mirror(0x3e).rw(m_vdp, FUNC(sega315_5124_device::register_read), FUNC(sega315_5124_device::register_write)); diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp index a9cb2660a0b..e91381fec18 100644 --- a/src/mame/drivers/smsmcorp.cpp +++ b/src/mame/drivers/smsmcorp.cpp @@ -494,10 +494,10 @@ void smsmfg_state::sms_map(address_map &map) { map(0x00000, 0x007ff).ram().share("nvram"); map(0x00800, 0x00803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x01000, 0x01007).w(this, FUNC(smsmfg_state::video_w)); - map(0x01800, 0x01803).rw(this, FUNC(smsmfg_state::link_r), FUNC(smsmfg_state::link_w)); + map(0x01000, 0x01007).w(FUNC(smsmfg_state::video_w)); + map(0x01800, 0x01803).rw(FUNC(smsmfg_state::link_r), FUNC(smsmfg_state::link_w)); map(0x04000, 0x07fff).bankr("bank1"); - map(0x04000, 0x04000).w(this, FUNC(smsmfg_state::bankswitch_w)); + map(0x04000, 0x04000).w(FUNC(smsmfg_state::bankswitch_w)); map(0x08000, 0x0ffff).rom(); map(0xf8000, 0xfffff).rom(); // mirror for vectors } @@ -505,9 +505,9 @@ void smsmfg_state::sms_map(address_map &map) void smsmfg_state::sureshot_map(address_map &map) { map(0x00000, 0x007ff).ram().share("nvram"); - map(0x02000, 0x02007).w(this, FUNC(smsmfg_state::video_w)); + map(0x02000, 0x02007).w(FUNC(smsmfg_state::video_w)); map(0x03000, 0x03003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x03800, 0x03803).rw(this, FUNC(smsmfg_state::link_r), FUNC(smsmfg_state::link_w)); + map(0x03800, 0x03803).rw(FUNC(smsmfg_state::link_r), FUNC(smsmfg_state::link_w)); map(0x08000, 0x0ffff).rom(); map(0xf8000, 0xfffff).rom(); // mirror for vectors } @@ -518,8 +518,8 @@ void smsmfg_state::sub_map(address_map &map) map(0x2000, 0x27ff).ram(); map(0x3100, 0x3103).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x3381, 0x3382).w("aysnd", FUNC(ay8910_device::data_address_w)); - map(0x3400, 0x3400).r(this, FUNC(smsmfg_state::z80_8088_r)); - map(0x3500, 0x3501).rw(this, FUNC(smsmfg_state::p03_r), FUNC(smsmfg_state::p03_w)); + map(0x3400, 0x3400).r(FUNC(smsmfg_state::z80_8088_r)); + map(0x3500, 0x3501).rw(FUNC(smsmfg_state::p03_r), FUNC(smsmfg_state::p03_w)); } /************************************* diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp index 8e88cd88f9a..e09e624fc9d 100644 --- a/src/mame/drivers/snes.cpp +++ b/src/mame/drivers/snes.cpp @@ -1023,7 +1023,7 @@ void snes_console_state::spc_map(address_map &map) { map(0x0000, 0x00ef).rw(m_spc700, FUNC(snes_sound_device::spc_ram_r), FUNC(snes_sound_device::spc_ram_w)); /* lower 32k ram */ map(0x00f0, 0x00ff).rw(m_spc700, FUNC(snes_sound_device::spc_io_r), FUNC(snes_sound_device::spc_io_w)); /* spc io */ - map(0x0100, 0xffff).rw(this, FUNC(snes_console_state::spc_ram_100_r), FUNC(snes_console_state::spc_ram_100_w)); + map(0x0100, 0xffff).rw(FUNC(snes_console_state::spc_ram_100_r), FUNC(snes_console_state::spc_ram_100_w)); } diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp index ba764891716..de6bebbc5dd 100644 --- a/src/mame/drivers/snesb.cpp +++ b/src/mame/drivers/snesb.cpp @@ -299,9 +299,9 @@ READ8_MEMBER(snesb_state::snesb_coin_r) void snesb_state::snesb_map(address_map &map) { - map(0x000000, 0x7dffff).rw(this, FUNC(snesb_state::snes_r_bank1), FUNC(snesb_state::snes_w_bank1)); + map(0x000000, 0x7dffff).rw(FUNC(snesb_state::snes_r_bank1), FUNC(snesb_state::snes_w_bank1)); map(0x7e0000, 0x7fffff).ram(); /* 8KB Low RAM, 24KB High RAM, 96KB Expanded RAM */ - map(0x800000, 0xffffff).rw(this, FUNC(snesb_state::snes_r_bank2), FUNC(snesb_state::snes_w_bank2)); /* Mirror and ROM */ + map(0x800000, 0xffffff).rw(FUNC(snesb_state::snes_r_bank2), FUNC(snesb_state::snes_w_bank2)); /* Mirror and ROM */ } READ8_MEMBER(snesb_state::spc_ram_100_r) @@ -318,7 +318,7 @@ void snesb_state::spc_mem(address_map &map) { map(0x0000, 0x00ef).rw(m_spc700, FUNC(snes_sound_device::spc_ram_r), FUNC(snes_sound_device::spc_ram_w)); /* lower 32k ram */ map(0x00f0, 0x00ff).rw(m_spc700, FUNC(snes_sound_device::spc_io_r), FUNC(snes_sound_device::spc_io_w)); /* spc io */ - map(0x0100, 0xffff).rw(this, FUNC(snesb_state::spc_ram_100_r), FUNC(snesb_state::spc_ram_100_w)); + map(0x0100, 0xffff).rw(FUNC(snesb_state::spc_ram_100_r), FUNC(snesb_state::spc_ram_100_w)); } static INPUT_PORTS_START( snes_common ) diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index 4e0e22b5339..c3e162d92a2 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -822,49 +822,49 @@ CUSTOM_INPUT_MEMBER(snk_state::snk_bonus_r) void snk_state::marvins_cpuA_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0x6000, 0x6000).w(this, FUNC(snk_state::marvins_palette_bank_w)); + map(0x6000, 0x6000).w(FUNC(snk_state::marvins_palette_bank_w)); map(0x8000, 0x8000).portr("IN0"); map(0x8100, 0x8100).portr("IN1"); map(0x8200, 0x8200).portr("IN2"); - map(0x8300, 0x8300).w(this, FUNC(snk_state::marvins_soundlatch_w)); + map(0x8300, 0x8300).w(FUNC(snk_state::marvins_soundlatch_w)); map(0x8400, 0x8400).portr("DSW1"); map(0x8500, 0x8500).portr("DSW2"); - map(0x8600, 0x8600).w(this, FUNC(snk_state::marvins_flipscreen_w)); - map(0x8700, 0x8700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0x8600, 0x8600).w(FUNC(snk_state::marvins_flipscreen_w)); + map(0x8700, 0x8700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); map(0xc000, 0xcfff).ram().share("spriteram"); // + work ram - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); map(0xd800, 0xdfff).ram().share("share3"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); map(0xe800, 0xefff).ram().share("share5"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM - map(0xf800, 0xf800).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xf900, 0xf900).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xfa00, 0xfa00).w(this, FUNC(snk_state::snk_fg_scrolly_w)); - map(0xfb00, 0xfb00).w(this, FUNC(snk_state::snk_fg_scrollx_w)); - map(0xfc00, 0xfc00).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xfd00, 0xfd00).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xfe00, 0xfe00).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xff00, 0xff00).w(this, FUNC(snk_state::marvins_scroll_msb_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xf800, 0xf800).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xf900, 0xf900).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xfa00, 0xfa00).w(FUNC(snk_state::snk_fg_scrolly_w)); + map(0xfb00, 0xfb00).w(FUNC(snk_state::snk_fg_scrollx_w)); + map(0xfc00, 0xfc00).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xfd00, 0xfd00).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xfe00, 0xfe00).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xff00, 0xff00).w(FUNC(snk_state::marvins_scroll_msb_w)); } void snk_state::marvins_cpuB_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0x8700, 0x8700).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0x8700, 0x8700).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); map(0xc000, 0xcfff).ram().share("spriteram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); map(0xd800, 0xdfff).ram().share("share3"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); map(0xe800, 0xefff).ram().share("share5"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); - map(0xf800, 0xf800).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xf900, 0xf900).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xfa00, 0xfa00).w(this, FUNC(snk_state::snk_fg_scrolly_w)); - map(0xfb00, 0xfb00).w(this, FUNC(snk_state::snk_fg_scrollx_w)); - map(0xfc00, 0xfc00).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xfd00, 0xfd00).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xfe00, 0xfe00).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xff00, 0xff00).w(this, FUNC(snk_state::marvins_scroll_msb_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xf800, 0xf800).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xf900, 0xf900).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xfa00, 0xfa00).w(FUNC(snk_state::snk_fg_scrolly_w)); + map(0xfb00, 0xfb00).w(FUNC(snk_state::snk_fg_scrollx_w)); + map(0xfc00, 0xfc00).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xfd00, 0xfd00).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xfe00, 0xfe00).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xff00, 0xff00).w(FUNC(snk_state::marvins_scroll_msb_w)); } @@ -875,46 +875,46 @@ void snk_state::madcrash_cpuA_map(address_map &map) map(0x8000, 0x8000).portr("IN0"); map(0x8100, 0x8100).portr("IN1"); map(0x8200, 0x8200).portr("IN2"); - map(0x8300, 0x8300).w(this, FUNC(snk_state::marvins_soundlatch_w)); + map(0x8300, 0x8300).w(FUNC(snk_state::marvins_soundlatch_w)); map(0x8400, 0x8400).portr("DSW1"); map(0x8500, 0x8500).portr("DSW2"); - map(0x8600, 0x8600).mirror(0xff).w(this, FUNC(snk_state::marvins_flipscreen_w)); - map(0x8700, 0x8700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0x8600, 0x8600).mirror(0xff).w(FUNC(snk_state::marvins_flipscreen_w)); + map(0x8700, 0x8700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); map(0xc000, 0xc7ff).ram().share("spriteram"); // + work ram - map(0xc800, 0xc800).mirror(0xff).w(this, FUNC(snk_state::marvins_palette_bank_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xc800, 0xc800).mirror(0xff).w(FUNC(snk_state::marvins_palette_bank_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share3"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); map(0xe800, 0xefff).ram().share("share5"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM - map(0xf800, 0xf800).mirror(0xff).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xf900, 0xf900).mirror(0xff).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xfa00, 0xfa00).mirror(0xff).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xfb00, 0xfb00).mirror(0xff).w(this, FUNC(snk_state::marvins_scroll_msb_w)); - map(0xfc00, 0xfc00).mirror(0xff).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xfd00, 0xfd00).mirror(0xff).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xfe00, 0xfe00).mirror(0xff).w(this, FUNC(snk_state::snk_fg_scrolly_w)); - map(0xff00, 0xff00).mirror(0xff).w(this, FUNC(snk_state::snk_fg_scrollx_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xf800, 0xf800).mirror(0xff).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xf900, 0xf900).mirror(0xff).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xfa00, 0xfa00).mirror(0xff).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xfb00, 0xfb00).mirror(0xff).w(FUNC(snk_state::marvins_scroll_msb_w)); + map(0xfc00, 0xfc00).mirror(0xff).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xfd00, 0xfd00).mirror(0xff).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xfe00, 0xfe00).mirror(0xff).w(FUNC(snk_state::snk_fg_scrolly_w)); + map(0xff00, 0xff00).mirror(0xff).w(FUNC(snk_state::snk_fg_scrollx_w)); } void snk_state::madcrash_cpuB_map(address_map &map) { map(0x0000, 0x9fff).rom(); - map(0x8700, 0x8700).w(this, FUNC(snk_state::snk_cpuB_nmi_ack_w)); // vangrd2 - map(0xa000, 0xa000).w(this, FUNC(snk_state::snk_cpuB_nmi_ack_w)); // madcrash - map(0xc000, 0xc7ff).ram().w(this, FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); + map(0x8700, 0x8700).w(FUNC(snk_state::snk_cpuB_nmi_ack_w)); // vangrd2 + map(0xa000, 0xa000).w(FUNC(snk_state::snk_cpuB_nmi_ack_w)); // madcrash + map(0xc000, 0xc7ff).ram().w(FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); map(0xc800, 0xcfff).ram().share("share5"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); - map(0xd800, 0xd800).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xd900, 0xd900).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xda00, 0xda00).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xdb00, 0xdb00).w(this, FUNC(snk_state::marvins_scroll_msb_w)); - map(0xdc00, 0xdc00).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xdd00, 0xdd00).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xde00, 0xde00).w(this, FUNC(snk_state::snk_fg_scrolly_w)); - map(0xdf00, 0xdf00).w(this, FUNC(snk_state::snk_fg_scrollx_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xd800, 0xd800).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xd900, 0xd900).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xda00, 0xda00).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xdb00, 0xdb00).w(FUNC(snk_state::marvins_scroll_msb_w)); + map(0xdc00, 0xdc00).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xdd00, 0xdd00).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xde00, 0xde00).w(FUNC(snk_state::snk_fg_scrolly_w)); + map(0xdf00, 0xdf00).w(FUNC(snk_state::snk_fg_scrollx_w)); map(0xe000, 0xe7ff).ram().share("spriteram"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); map(0xf800, 0xffff).ram().share("share3"); } @@ -924,47 +924,47 @@ void snk_state::madcrush_cpuA_map(address_map &map) map(0x8000, 0x8000).portr("IN0"); map(0x8100, 0x8100).portr("IN1"); map(0x8200, 0x8200).portr("IN2"); - map(0x8300, 0x8300).w(this, FUNC(snk_state::marvins_soundlatch_w)); + map(0x8300, 0x8300).w(FUNC(snk_state::marvins_soundlatch_w)); map(0x8400, 0x8400).portr("DSW1"); map(0x8500, 0x8500).portr("DSW2"); - map(0x8600, 0x8600).mirror(0xff).w(this, FUNC(snk_state::marvins_flipscreen_w)); - map(0x8700, 0x8700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0x8600, 0x8600).mirror(0xff).w(FUNC(snk_state::marvins_flipscreen_w)); + map(0x8700, 0x8700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); map(0xc000, 0xc7ff).ram().share("spriteram"); // + work ram - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); - map(0xc800, 0xc800).mirror(0xff).w(this, FUNC(snk_state::marvins_palette_bank_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); + map(0xc800, 0xc800).mirror(0xff).w(FUNC(snk_state::marvins_palette_bank_w)); map(0xd800, 0xdfff).ram().share("share5"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); map(0xe800, 0xefff).ram().share("share3"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); - map(0xf800, 0xf800).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xf900, 0xf900).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xfa00, 0xfa00).w(this, FUNC(snk_state::snk_fg_scrolly_w)); - map(0xfb00, 0xfb00).w(this, FUNC(snk_state::snk_fg_scrollx_w)); - map(0xfc00, 0xfc00).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xfd00, 0xfd00).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xfe00, 0xfe00).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xff00, 0xff00).w(this, FUNC(snk_state::marvins_scroll_msb_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xf800, 0xf800).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xf900, 0xf900).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xfa00, 0xfa00).w(FUNC(snk_state::snk_fg_scrolly_w)); + map(0xfb00, 0xfb00).w(FUNC(snk_state::snk_fg_scrollx_w)); + map(0xfc00, 0xfc00).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xfd00, 0xfd00).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xfe00, 0xfe00).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xff00, 0xff00).w(FUNC(snk_state::marvins_scroll_msb_w)); } void snk_state::madcrush_cpuB_map(address_map &map) { map(0x0000, 0x9fff).rom(); - map(0xa000, 0xa000).w(this, FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xa000, 0xa000).w(FUNC(snk_state::snk_cpuB_nmi_ack_w)); map(0xc000, 0xc7ff).ram().share("spriteram"); // + work ram map(0xc800, 0xcfff).ram().share("share5"); - map(0xc800, 0xc800).mirror(0xff).w(this, FUNC(snk_state::marvins_palette_bank_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); // ?? + map(0xc800, 0xc800).mirror(0xff).w(FUNC(snk_state::marvins_palette_bank_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::marvins_fg_videoram_w)).share("fg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); // ?? map(0xe800, 0xefff).ram().share("share3"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); - map(0xf800, 0xf800).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xf900, 0xf900).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xfa00, 0xfa00).w(this, FUNC(snk_state::snk_fg_scrolly_w)); - map(0xfb00, 0xfb00).w(this, FUNC(snk_state::snk_fg_scrollx_w)); - map(0xfc00, 0xfc00).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xfd00, 0xfd00).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xfe00, 0xfe00).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xff00, 0xff00).w(this, FUNC(snk_state::marvins_scroll_msb_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xf800, 0xf800).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xf900, 0xf900).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xfa00, 0xfa00).w(FUNC(snk_state::snk_fg_scrolly_w)); + map(0xfb00, 0xfb00).w(FUNC(snk_state::snk_fg_scrollx_w)); + map(0xfc00, 0xfc00).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xfd00, 0xfd00).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xfe00, 0xfe00).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xff00, 0xff00).w(FUNC(snk_state::marvins_scroll_msb_w)); } @@ -974,29 +974,29 @@ void snk_state::jcross_cpuA_map(address_map &map) map(0xa000, 0xa000).portr("IN0"); map(0xa100, 0xa100).portr("IN1"); map(0xa200, 0xa200).portr("IN2"); - map(0xa300, 0xa300).w(this, FUNC(snk_state::sgladiat_soundlatch_w)); + map(0xa300, 0xa300).w(FUNC(snk_state::sgladiat_soundlatch_w)); map(0xa400, 0xa400).portr("DSW1"); map(0xa500, 0xa500).portr("DSW2"); - map(0xa600, 0xa600).w(this, FUNC(snk_state::sgladiat_flipscreen_w)); // flip screen, bg palette bank - map(0xa700, 0xa700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xd300, 0xd300).w(this, FUNC(snk_state::jcross_scroll_msb_w)); - map(0xd400, 0xd400).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xd500, 0xd500).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xd600, 0xd600).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xd700, 0xd700).w(this, FUNC(snk_state::snk_bg_scrollx_w)); + map(0xa600, 0xa600).w(FUNC(snk_state::sgladiat_flipscreen_w)); // flip screen, bg palette bank + map(0xa700, 0xa700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xd300, 0xd300).w(FUNC(snk_state::jcross_scroll_msb_w)); + map(0xd400, 0xd400).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xd500, 0xd500).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xd600, 0xd600).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xd700, 0xd700).w(FUNC(snk_state::snk_bg_scrollx_w)); map(0xd800, 0xdfff).ram().share("spriteram"); // + work ram - map(0xe000, 0xefff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xe000, 0xefff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM map(0xffff, 0xffff).nopw(); // simply a program patch to not write to two not existing video registers? } void snk_state::jcross_cpuB_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xa700, 0xa700).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xa700, 0xa700).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); map(0xc000, 0xc7ff).ram().share("spriteram"); - map(0xc800, 0xd7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xc800, 0xd7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1006,37 +1006,37 @@ void snk_state::sgladiat_cpuA_map(address_map &map) map(0xa000, 0xa000).portr("IN0"); map(0xa100, 0xa100).portr("IN1"); map(0xa200, 0xa200).portr("IN2"); - map(0xa300, 0xa300).w(this, FUNC(snk_state::sgladiat_soundlatch_w)); + map(0xa300, 0xa300).w(FUNC(snk_state::sgladiat_soundlatch_w)); map(0xa400, 0xa400).portr("DSW1"); map(0xa500, 0xa500).portr("DSW2"); - map(0xa600, 0xa600).w(this, FUNC(snk_state::sgladiat_flipscreen_w)); // flip screen, bg palette bank - map(0xa700, 0xa700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xa600, 0xa600).w(FUNC(snk_state::sgladiat_flipscreen_w)); // flip screen, bg palette bank + map(0xa700, 0xa700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); map(0xd200, 0xd200).nopw(); // unknown - map(0xd300, 0xd300).w(this, FUNC(snk_state::sgladiat_scroll_msb_w)); - map(0xd400, 0xd400).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xd500, 0xd500).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xd600, 0xd600).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xd700, 0xd700).w(this, FUNC(snk_state::snk_bg_scrollx_w)); + map(0xd300, 0xd300).w(FUNC(snk_state::sgladiat_scroll_msb_w)); + map(0xd400, 0xd400).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xd500, 0xd500).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xd600, 0xd600).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xd700, 0xd700).w(FUNC(snk_state::snk_bg_scrollx_w)); map(0xd800, 0xdfff).ram().share("spriteram"); // + work ram - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); map(0xe800, 0xefff).ram(); - map(0xf000, 0xf7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xf000, 0xf7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::sgladiat_cpuB_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xa000, 0xa000).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); - map(0xa600, 0xa600).w(this, FUNC(snk_state::sgladiat_flipscreen_w)); // flip screen, bg palette bank + map(0xa000, 0xa000).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xa600, 0xa600).w(FUNC(snk_state::sgladiat_flipscreen_w)); // flip screen, bg palette bank map(0xc000, 0xc7ff).ram().share("spriteram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xc800, 0xcfff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); map(0xda00, 0xda00).nopw(); // unknown - map(0xdb00, 0xdb00).w(this, FUNC(snk_state::sgladiat_scroll_msb_w)); - map(0xdc00, 0xdc00).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xdd00, 0xdd00).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xde00, 0xde00).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xdf00, 0xdf00).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xe000, 0xe7ff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xdb00, 0xdb00).w(FUNC(snk_state::sgladiat_scroll_msb_w)); + map(0xdc00, 0xdc00).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xdd00, 0xdd00).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xde00, 0xde00).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xdf00, 0xdf00).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xe000, 0xe7ff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1046,28 +1046,28 @@ void snk_state::hal21_cpuA_map(address_map &map) map(0xc000, 0xc000).portr("IN0"); map(0xc100, 0xc100).portr("IN1"); map(0xc200, 0xc200).portr("IN2"); - map(0xc300, 0xc300).w(this, FUNC(snk_state::sgladiat_soundlatch_w)); + map(0xc300, 0xc300).w(FUNC(snk_state::sgladiat_soundlatch_w)); map(0xc400, 0xc400).portr("DSW1"); map(0xc500, 0xc500).portr("DSW2"); - map(0xc600, 0xc600).w(this, FUNC(snk_state::hal21_flipscreen_w)); // flip screen, bg tile and palette bank - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xd300, 0xd300).w(this, FUNC(snk_state::jcross_scroll_msb_w)); - map(0xd400, 0xd400).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xd500, 0xd500).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xd600, 0xd600).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xd700, 0xd700).w(this, FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc600, 0xc600).w(FUNC(snk_state::hal21_flipscreen_w)); // flip screen, bg tile and palette bank + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xd300, 0xd300).w(FUNC(snk_state::jcross_scroll_msb_w)); + map(0xd400, 0xd400).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xd500, 0xd500).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xd600, 0xd600).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xd700, 0xd700).w(FUNC(snk_state::snk_bg_scrollx_w)); map(0xe000, 0xe7ff).ram().share("spriteram"); // + work ram - map(0xe800, 0xf7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xe800, 0xf7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::hal21_cpuB_map(address_map &map) { map(0x0000, 0x9fff).rom(); - map(0xa000, 0xa000).w(this, FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xa000, 0xa000).w(FUNC(snk_state::snk_cpuB_nmi_ack_w)); map(0xc000, 0xc7ff).ram().share("spriteram"); - map(0xd000, 0xdfff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xd000, 0xdfff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1077,31 +1077,31 @@ void snk_state::aso_cpuA_map(address_map &map) map(0xc000, 0xc000).portr("IN0"); map(0xc100, 0xc100).portr("IN1"); map(0xc200, 0xc200).portr("IN2"); - map(0xc400, 0xc400).w(this, FUNC(snk_state::snk_soundlatch_w)); + map(0xc400, 0xc400).w(FUNC(snk_state::snk_soundlatch_w)); map(0xc500, 0xc500).portr("DSW1"); map(0xc600, 0xc600).portr("DSW2"); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xc800, 0xc800).w(this, FUNC(snk_state::aso_videoattrs_w)); // flip screen, scroll msb - map(0xc900, 0xc900).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xca00, 0xca00).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xcb00, 0xcb00).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xcc00, 0xcc00).w(this, FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xc800, 0xc800).w(FUNC(snk_state::aso_videoattrs_w)); // flip screen, scroll msb + map(0xc900, 0xc900).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xca00, 0xca00).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xcb00, 0xcb00).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xcc00, 0xcc00).w(FUNC(snk_state::snk_bg_scrollx_w)); map(0xce00, 0xce00).nopw(); // always 05? - map(0xcf00, 0xcf00).w(this, FUNC(snk_state::aso_bg_bank_w)); // tile and palette bank + map(0xcf00, 0xcf00).w(FUNC(snk_state::aso_bg_bank_w)); // tile and palette bank map(0xd800, 0xdfff).ram().share("share1"); map(0xe000, 0xe7ff).ram().share("spriteram"); // + work ram - map(0xe800, 0xf7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xe800, 0xf7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::aso_cpuB_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc000).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xc000, 0xc000).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); map(0xc800, 0xcfff).ram().share("share1"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xe7ff).ram().w(this, FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xd800, 0xe7ff).ram().w(FUNC(snk_state::marvins_bg_videoram_w)).share("bg_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1113,31 +1113,31 @@ void snk_state::tnk3_cpuA_map(address_map &map) map(0xc200, 0xc200).portr("IN2"); // c300 is an input in tnk3, output in athena/fitegolf (coin counter) // and in countryc (trackball select) (see DRIVER_INIT). - map(0xc300, 0xc300).portr("IN3").w(this, FUNC(snk_state::athena_coin_counter_w)); - map(0xc400, 0xc400).w(this, FUNC(snk_state::snk_soundlatch_w)); + map(0xc300, 0xc300).portr("IN3").w(FUNC(snk_state::athena_coin_counter_w)); + map(0xc400, 0xc400).w(FUNC(snk_state::snk_soundlatch_w)); map(0xc500, 0xc500).portr("DSW1"); map(0xc600, 0xc600).portr("DSW2"); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xc800, 0xc800).w(this, FUNC(snk_state::tnk3_videoattrs_w)); // flip screen, char bank, scroll msb - map(0xc900, 0xc900).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xca00, 0xca00).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xcb00, 0xcb00).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xcc00, 0xcc00).w(this, FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xc800, 0xc800).w(FUNC(snk_state::tnk3_videoattrs_w)); // flip screen, char bank, scroll msb + map(0xc900, 0xc900).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xca00, 0xca00).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xcb00, 0xcb00).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xcc00, 0xcc00).w(FUNC(snk_state::snk_bg_scrollx_w)); map(0xcf00, 0xcf00).nopw(); // fitegolf/countryc only. Either 0 or 1. Video related? map(0xd000, 0xd7ff).ram().share("spriteram"); // + work ram - map(0xd800, 0xf7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xd800, 0xf7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::tnk3_cpuB_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc000).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // tnk3, athena - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // fitegolf + map(0xc000, 0xc000).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // tnk3, athena + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // fitegolf map(0xc800, 0xcfff).ram().share("spriteram"); - map(0xd000, 0xefff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xd000, 0xefff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xf000, 0xf7ff).ram(); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1147,54 +1147,54 @@ void snk_state::ikari_cpuA_map(address_map &map) map(0xc000, 0xc000).portr("IN0"); map(0xc100, 0xc100).portr("IN1"); map(0xc200, 0xc200).portr("IN2"); - map(0xc300, 0xc300).portr("IN3").w(this, FUNC(snk_state::ikari_coin_counter_w)); // ikarijp doesn't use the coin counter - map(0xc400, 0xc400).w(this, FUNC(snk_state::snk_soundlatch_w)); + map(0xc300, 0xc300).portr("IN3").w(FUNC(snk_state::ikari_coin_counter_w)); // ikarijp doesn't use the coin counter + map(0xc400, 0xc400).w(FUNC(snk_state::snk_soundlatch_w)); map(0xc500, 0xc500).portr("DSW1"); map(0xc600, 0xc600).portr("DSW2"); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xc800, 0xc800).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xc880, 0xc880).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xc900, 0xc900).w(this, FUNC(snk_state::ikari_bg_scroll_msb_w)); - map(0xc980, 0xc980).w(this, FUNC(snk_state::ikari_unknown_video_w)); - map(0xca00, 0xca00).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xca80, 0xca80).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xcb00, 0xcb00).w(this, FUNC(snk_state::snk_sp32_scrolly_w)); - map(0xcb80, 0xcb80).w(this, FUNC(snk_state::snk_sp32_scrollx_w)); - map(0xcc00, 0xcc00).w(this, FUNC(snk_state::hardflags_scrolly_w)); - map(0xcc80, 0xcc80).w(this, FUNC(snk_state::hardflags_scrollx_w)); - map(0xcd00, 0xcd00).w(this, FUNC(snk_state::ikari_sp_scroll_msb_w)); - map(0xcd80, 0xcd80).w(this, FUNC(snk_state::hardflags_scroll_msb_w)); - map(0xce00, 0xce00).r(this, FUNC(snk_state::hardflags1_r)); - map(0xce20, 0xce20).r(this, FUNC(snk_state::hardflags2_r)); - map(0xce40, 0xce40).r(this, FUNC(snk_state::hardflags3_r)); - map(0xce60, 0xce60).r(this, FUNC(snk_state::hardflags4_r)); - map(0xce80, 0xce80).r(this, FUNC(snk_state::hardflags5_r)); - map(0xcea0, 0xcea0).r(this, FUNC(snk_state::hardflags6_r)); - map(0xcee0, 0xcee0).r(this, FUNC(snk_state::hardflags7_r)); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xc800, 0xc800).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xc880, 0xc880).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc900, 0xc900).w(FUNC(snk_state::ikari_bg_scroll_msb_w)); + map(0xc980, 0xc980).w(FUNC(snk_state::ikari_unknown_video_w)); + map(0xca00, 0xca00).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xca80, 0xca80).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xcb00, 0xcb00).w(FUNC(snk_state::snk_sp32_scrolly_w)); + map(0xcb80, 0xcb80).w(FUNC(snk_state::snk_sp32_scrollx_w)); + map(0xcc00, 0xcc00).w(FUNC(snk_state::hardflags_scrolly_w)); + map(0xcc80, 0xcc80).w(FUNC(snk_state::hardflags_scrollx_w)); + map(0xcd00, 0xcd00).w(FUNC(snk_state::ikari_sp_scroll_msb_w)); + map(0xcd80, 0xcd80).w(FUNC(snk_state::hardflags_scroll_msb_w)); + map(0xce00, 0xce00).r(FUNC(snk_state::hardflags1_r)); + map(0xce20, 0xce20).r(FUNC(snk_state::hardflags2_r)); + map(0xce40, 0xce40).r(FUNC(snk_state::hardflags3_r)); + map(0xce60, 0xce60).r(FUNC(snk_state::hardflags4_r)); + map(0xce80, 0xce80).r(FUNC(snk_state::hardflags5_r)); + map(0xcea0, 0xcea0).r(FUNC(snk_state::hardflags6_r)); + map(0xcee0, 0xcee0).r(FUNC(snk_state::hardflags7_r)); // note the mirror. ikari and victroad use d800, ikarijp uses d000 - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).mirror(0x0800).share("bg_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).mirror(0x0800).share("bg_videoram"); map(0xe000, 0xf7ff).ram().share("spriteram"); // + work ram - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::ikari_cpuB_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc000).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); - map(0xc980, 0xc980).w(this, FUNC(snk_state::ikari_unknown_video_w)); - map(0xcc00, 0xcc00).w(this, FUNC(snk_state::hardflags_scrolly_w)); - map(0xcc80, 0xcc80).w(this, FUNC(snk_state::hardflags_scrollx_w)); - map(0xcd80, 0xcd80).w(this, FUNC(snk_state::hardflags_scroll_msb_w)); - map(0xce00, 0xce00).r(this, FUNC(snk_state::hardflags1_r)); - map(0xce20, 0xce20).r(this, FUNC(snk_state::hardflags2_r)); - map(0xce40, 0xce40).r(this, FUNC(snk_state::hardflags3_r)); - map(0xce60, 0xce60).r(this, FUNC(snk_state::hardflags4_r)); - map(0xce80, 0xce80).r(this, FUNC(snk_state::hardflags5_r)); - map(0xcea0, 0xcea0).r(this, FUNC(snk_state::hardflags6_r)); - map(0xcee0, 0xcee0).r(this, FUNC(snk_state::hardflags7_r)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).mirror(0x0800).share("bg_videoram"); + map(0xc000, 0xc000).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xc980, 0xc980).w(FUNC(snk_state::ikari_unknown_video_w)); + map(0xcc00, 0xcc00).w(FUNC(snk_state::hardflags_scrolly_w)); + map(0xcc80, 0xcc80).w(FUNC(snk_state::hardflags_scrollx_w)); + map(0xcd80, 0xcd80).w(FUNC(snk_state::hardflags_scroll_msb_w)); + map(0xce00, 0xce00).r(FUNC(snk_state::hardflags1_r)); + map(0xce20, 0xce20).r(FUNC(snk_state::hardflags2_r)); + map(0xce40, 0xce40).r(FUNC(snk_state::hardflags3_r)); + map(0xce60, 0xce60).r(FUNC(snk_state::hardflags4_r)); + map(0xce80, 0xce80).r(FUNC(snk_state::hardflags5_r)); + map(0xcea0, 0xcea0).r(FUNC(snk_state::hardflags6_r)); + map(0xcee0, 0xcee0).r(FUNC(snk_state::hardflags7_r)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).mirror(0x0800).share("bg_videoram"); map(0xe000, 0xf7ff).ram().share("spriteram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1204,62 +1204,62 @@ void snk_state::bermudat_cpuA_map(address_map &map) map(0xc000, 0xc000).portr("IN0"); map(0xc100, 0xc100).portr("IN1"); map(0xc200, 0xc200).portr("IN2"); - map(0xc300, 0xc300).portr("IN3").w(this, FUNC(snk_state::ikari_coin_counter_w)); - map(0xc400, 0xc400).w(this, FUNC(snk_state::snk_soundlatch_w)); + map(0xc300, 0xc300).portr("IN3").w(FUNC(snk_state::ikari_coin_counter_w)); + map(0xc400, 0xc400).w(FUNC(snk_state::snk_soundlatch_w)); map(0xc500, 0xc500).portr("DSW1"); map(0xc600, 0xc600).portr("DSW2"); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xc800, 0xc800).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xc840, 0xc840).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xc880, 0xc880).w(this, FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb - map(0xc8c0, 0xc8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank - map(0xc900, 0xc900).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xc940, 0xc940).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xc980, 0xc980).w(this, FUNC(snk_state::snk_sp32_scrolly_w)); - map(0xc9c0, 0xc9c0).w(this, FUNC(snk_state::snk_sp32_scrollx_w)); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xc800, 0xc800).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xc840, 0xc840).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc880, 0xc880).w(FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb + map(0xc8c0, 0xc8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xc900, 0xc900).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xc940, 0xc940).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xc980, 0xc980).w(FUNC(snk_state::snk_sp32_scrolly_w)); + map(0xc9c0, 0xc9c0).w(FUNC(snk_state::snk_sp32_scrollx_w)); // the "turbo check" addresses are only used by bermudat/bermudaj, not bermudaa/worldwar or the other games - map(0xca00, 0xca00).w(this, FUNC(snk_state::turbocheck16_1_w)); - map(0xca40, 0xca40).w(this, FUNC(snk_state::turbocheck16_2_w)); - map(0xca80, 0xca80).w(this, FUNC(snk_state::gwara_sp_scroll_msb_w)); - map(0xcac0, 0xcac0).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xcb00, 0xcb00).r(this, FUNC(snk_state::turbocheck16_1_r)); - map(0xcb10, 0xcb10).r(this, FUNC(snk_state::turbocheck16_2_r)); - map(0xcb20, 0xcb20).r(this, FUNC(snk_state::turbocheck16_3_r)); - map(0xcb30, 0xcb30).r(this, FUNC(snk_state::turbocheck16_4_r)); - map(0xcb40, 0xcb40).r(this, FUNC(snk_state::turbocheck16_5_r)); - map(0xcb50, 0xcb50).r(this, FUNC(snk_state::turbocheck16_6_r)); - map(0xcb60, 0xcb60).r(this, FUNC(snk_state::turbocheck16_7_r)); - map(0xcb70, 0xcb70).r(this, FUNC(snk_state::turbocheck16_8_r)); - map(0xcc00, 0xcc00).w(this, FUNC(snk_state::turbocheck32_1_w)); - map(0xcc40, 0xcc40).w(this, FUNC(snk_state::turbocheck32_2_w)); - map(0xcc80, 0xcc80).w(this, FUNC(snk_state::turbocheck_msb_w)); - map(0xccc0, 0xccc0).r(this, FUNC(snk_state::turbocheck32_1_r)); - map(0xccd0, 0xccd0).r(this, FUNC(snk_state::turbocheck32_2_r)); - map(0xcce0, 0xcce0).r(this, FUNC(snk_state::turbocheck32_3_r)); - map(0xccf0, 0xccf0).r(this, FUNC(snk_state::turbocheck32_4_r)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xca00, 0xca00).w(FUNC(snk_state::turbocheck16_1_w)); + map(0xca40, 0xca40).w(FUNC(snk_state::turbocheck16_2_w)); + map(0xca80, 0xca80).w(FUNC(snk_state::gwara_sp_scroll_msb_w)); + map(0xcac0, 0xcac0).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xcb00, 0xcb00).r(FUNC(snk_state::turbocheck16_1_r)); + map(0xcb10, 0xcb10).r(FUNC(snk_state::turbocheck16_2_r)); + map(0xcb20, 0xcb20).r(FUNC(snk_state::turbocheck16_3_r)); + map(0xcb30, 0xcb30).r(FUNC(snk_state::turbocheck16_4_r)); + map(0xcb40, 0xcb40).r(FUNC(snk_state::turbocheck16_5_r)); + map(0xcb50, 0xcb50).r(FUNC(snk_state::turbocheck16_6_r)); + map(0xcb60, 0xcb60).r(FUNC(snk_state::turbocheck16_7_r)); + map(0xcb70, 0xcb70).r(FUNC(snk_state::turbocheck16_8_r)); + map(0xcc00, 0xcc00).w(FUNC(snk_state::turbocheck32_1_w)); + map(0xcc40, 0xcc40).w(FUNC(snk_state::turbocheck32_2_w)); + map(0xcc80, 0xcc80).w(FUNC(snk_state::turbocheck_msb_w)); + map(0xccc0, 0xccc0).r(FUNC(snk_state::turbocheck32_1_r)); + map(0xccd0, 0xccd0).r(FUNC(snk_state::turbocheck32_2_r)); + map(0xcce0, 0xcce0).r(FUNC(snk_state::turbocheck32_3_r)); + map(0xccf0, 0xccf0).r(FUNC(snk_state::turbocheck32_4_r)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share2"); map(0xe000, 0xf7ff).ram().share("spriteram"); // + work ram - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::bermudat_cpuB_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); - map(0xc800, 0xc800).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xc840, 0xc840).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xc880, 0xc880).w(this, FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb - map(0xc8c0, 0xc8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank - map(0xc900, 0xc900).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xc940, 0xc940).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xc980, 0xc980).w(this, FUNC(snk_state::snk_sp32_scrolly_w)); - map(0xc9c0, 0xc9c0).w(this, FUNC(snk_state::snk_sp32_scrollx_w)); - map(0xca80, 0xca80).w(this, FUNC(snk_state::gwara_sp_scroll_msb_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xc800, 0xc800).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xc840, 0xc840).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc880, 0xc880).w(FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb + map(0xc8c0, 0xc8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xc900, 0xc900).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xc940, 0xc940).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xc980, 0xc980).w(FUNC(snk_state::snk_sp32_scrolly_w)); + map(0xc9c0, 0xc9c0).w(FUNC(snk_state::snk_sp32_scrollx_w)); + map(0xca80, 0xca80).w(FUNC(snk_state::gwara_sp_scroll_msb_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share2"); map(0xe000, 0xf7ff).ram().share("spriteram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1269,37 +1269,37 @@ void snk_state::gwar_cpuA_map(address_map &map) map(0xc000, 0xc000).portr("IN0"); map(0xc100, 0xc100).portr("IN1"); map(0xc200, 0xc200).portr("IN2"); - map(0xc300, 0xc300).portr("IN3").w(this, FUNC(snk_state::ikari_coin_counter_w)); - map(0xc400, 0xc400).w(this, FUNC(snk_state::snk_soundlatch_w)); + map(0xc300, 0xc300).portr("IN3").w(FUNC(snk_state::ikari_coin_counter_w)); + map(0xc400, 0xc400).w(FUNC(snk_state::snk_soundlatch_w)); map(0xc500, 0xc500).portr("DSW1"); map(0xc600, 0xc600).portr("DSW2"); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xc800, 0xc800).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xc840, 0xc840).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xc880, 0xc880).w(this, FUNC(snk_state::gwar_videoattrs_w)); // flip screen, scroll msb - map(0xc8c0, 0xc8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank - map(0xc900, 0xc900).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xc940, 0xc940).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xc980, 0xc980).w(this, FUNC(snk_state::snk_sp32_scrolly_w)); - map(0xc9c0, 0xc9c0).w(this, FUNC(snk_state::snk_sp32_scrollx_w)); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xc800, 0xc800).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xc840, 0xc840).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc880, 0xc880).w(FUNC(snk_state::gwar_videoattrs_w)); // flip screen, scroll msb + map(0xc8c0, 0xc8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xc900, 0xc900).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xc940, 0xc940).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xc980, 0xc980).w(FUNC(snk_state::snk_sp32_scrolly_w)); + map(0xc9c0, 0xc9c0).w(FUNC(snk_state::snk_sp32_scrollx_w)); map(0xca00, 0xca00).nopw(); // always 0? map(0xca40, 0xca40).nopw(); // always 0? - map(0xcac0, 0xcac0).w(this, FUNC(snk_state::snk_sprite_split_point_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xcac0, 0xcac0).w(FUNC(snk_state::snk_sprite_split_point_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share2"); map(0xe000, 0xf7ff).ram().share("spriteram"); // + work ram - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::gwar_cpuB_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc000).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); - map(0xc8c0, 0xc8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xc000, 0xc000).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xc8c0, 0xc8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share2"); map(0xe000, 0xf7ff).ram().share("spriteram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } @@ -1309,36 +1309,36 @@ void snk_state::gwara_cpuA_map(address_map &map) map(0xc000, 0xc000).portr("IN0"); map(0xc100, 0xc100).portr("IN1"); map(0xc200, 0xc200).portr("IN2"); - map(0xc300, 0xc300).portr("IN3").w(this, FUNC(snk_state::ikari_coin_counter_w)); - map(0xc400, 0xc400).w(this, FUNC(snk_state::snk_soundlatch_w)); + map(0xc300, 0xc300).portr("IN3").w(FUNC(snk_state::ikari_coin_counter_w)); + map(0xc400, 0xc400).w(FUNC(snk_state::snk_soundlatch_w)); map(0xc500, 0xc500).portr("DSW1"); map(0xc600, 0xc600).portr("DSW2"); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xc800, 0xcfff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xc800, 0xcfff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share3"); map(0xe000, 0xf7ff).ram().share("spriteram"); // + work ram - map(0xf800, 0xf800).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xf840, 0xf840).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xf880, 0xf880).w(this, FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb - map(0xf8c0, 0xf8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank - map(0xf900, 0xf900).w(this, FUNC(snk_state::snk_sp16_scrolly_w)); - map(0xf940, 0xf940).w(this, FUNC(snk_state::snk_sp16_scrollx_w)); - map(0xf980, 0xf980).w(this, FUNC(snk_state::snk_sp32_scrolly_w)); - map(0xf9c0, 0xf9c0).w(this, FUNC(snk_state::snk_sp32_scrollx_w)); - map(0xfa80, 0xfa80).w(this, FUNC(snk_state::gwara_sp_scroll_msb_w)); - map(0xfac0, 0xfac0).w(this, FUNC(snk_state::snk_sprite_split_point_w)); + map(0xf800, 0xf800).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xf840, 0xf840).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xf880, 0xf880).w(FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb + map(0xf8c0, 0xf8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xf900, 0xf900).w(FUNC(snk_state::snk_sp16_scrolly_w)); + map(0xf940, 0xf940).w(FUNC(snk_state::snk_sp16_scrollx_w)); + map(0xf980, 0xf980).w(FUNC(snk_state::snk_sp32_scrolly_w)); + map(0xf9c0, 0xf9c0).w(FUNC(snk_state::snk_sp32_scrollx_w)); + map(0xfa80, 0xfa80).w(FUNC(snk_state::gwara_sp_scroll_msb_w)); + map(0xfac0, 0xfac0).w(FUNC(snk_state::snk_sprite_split_point_w)); } void snk_state::gwara_cpuB_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc000).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); - map(0xc800, 0xcfff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xc000, 0xc000).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); + map(0xc800, 0xcfff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share3"); map(0xe000, 0xf7ff).ram().share("spriteram"); // + work ram - map(0xf8c0, 0xf8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xf8c0, 0xf8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank } @@ -1355,34 +1355,34 @@ void snk_state::tdfever_cpuA_map(address_map &map) map(0xc380, 0xc380).portr("IN7"); map(0xc400, 0xc400).portr("IN8"); map(0xc480, 0xc480).portr("IN9"); - map(0xc500, 0xc500).w(this, FUNC(snk_state::snk_soundlatch_w)); + map(0xc500, 0xc500).w(FUNC(snk_state::snk_soundlatch_w)); map(0xc580, 0xc580).portr("DSW1"); map(0xc600, 0xc600).portr("DSW2"); - map(0xc680, 0xc680).w(this, FUNC(snk_state::tdfever_coin_counter_w)); - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); - map(0xc800, 0xc800).w(this, FUNC(snk_state::snk_bg_scrolly_w)); - map(0xc840, 0xc840).w(this, FUNC(snk_state::snk_bg_scrollx_w)); - map(0xc880, 0xc880).w(this, FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb - map(0xc8c0, 0xc8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank - map(0xc900, 0xc900).w(this, FUNC(snk_state::tdfever_sp_scroll_msb_w)); - map(0xc980, 0xc980).w(this, FUNC(snk_state::snk_sp32_scrolly_w)); - map(0xc9c0, 0xc9c0).w(this, FUNC(snk_state::snk_sp32_scrollx_w)); - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xc680, 0xc680).w(FUNC(snk_state::tdfever_coin_counter_w)); + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuB_nmi_trigger_r), FUNC(snk_state::snk_cpuA_nmi_ack_w)); + map(0xc800, 0xc800).w(FUNC(snk_state::snk_bg_scrolly_w)); + map(0xc840, 0xc840).w(FUNC(snk_state::snk_bg_scrollx_w)); + map(0xc880, 0xc880).w(FUNC(snk_state::gwara_videoattrs_w)); // flip screen, scroll msb + map(0xc8c0, 0xc8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xc900, 0xc900).w(FUNC(snk_state::tdfever_sp_scroll_msb_w)); + map(0xc980, 0xc980).w(FUNC(snk_state::snk_sp32_scrolly_w)); + map(0xc9c0, 0xc9c0).w(FUNC(snk_state::snk_sp32_scrollx_w)); + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share2"); - map(0xe000, 0xf7ff).ram().w(this, FUNC(snk_state::tdfever_spriteram_w)).share("spriteram"); // + work ram - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM + map(0xe000, 0xf7ff).ram().w(FUNC(snk_state::tdfever_spriteram_w)).share("spriteram"); // + work ram + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); // + work RAM } void snk_state::tdfever_cpuB_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc000).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // tdfever, tdfever2 - map(0xc700, 0xc700).rw(this, FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // fsoccer - map(0xc8c0, 0xc8c0).w(this, FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank - map(0xd000, 0xd7ff).ram().w(this, FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); + map(0xc000, 0xc000).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // tdfever, tdfever2 + map(0xc700, 0xc700).rw(FUNC(snk_state::snk_cpuA_nmi_trigger_r), FUNC(snk_state::snk_cpuB_nmi_ack_w)); // fsoccer + map(0xc8c0, 0xc8c0).w(FUNC(snk_state::gwar_tx_bank_w)); // char and palette bank + map(0xd000, 0xd7ff).ram().w(FUNC(snk_state::snk_bg_videoram_w)).share("bg_videoram"); map(0xd800, 0xdfff).ram().share("share2"); - map(0xe000, 0xf7ff).ram().w(this, FUNC(snk_state::tdfever_spriteram_w)).share("spriteram"); - map(0xf800, 0xffff).ram().w(this, FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); + map(0xe000, 0xf7ff).ram().w(FUNC(snk_state::tdfever_spriteram_w)).share("spriteram"); + map(0xf800, 0xffff).ram().w(FUNC(snk_state::snk_tx_videoram_w)).share("tx_videoram"); } /***********************************************************************/ @@ -1390,11 +1390,11 @@ void snk_state::tdfever_cpuB_map(address_map &map) void snk_state::marvins_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x4000).r(this, FUNC(snk_state::marvins_soundlatch_r)); + map(0x4000, 0x4000).r(FUNC(snk_state::marvins_soundlatch_r)); map(0x8000, 0x8001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x8002, 0x8007).w("wave", FUNC(snkwave_device::snkwave_w)); map(0x8008, 0x8009).w("ay2", FUNC(ay8910_device::address_data_w)); - map(0xa000, 0xa000).r(this, FUNC(snk_state::marvins_sound_nmi_ack_r)); + map(0xa000, 0xa000).r(FUNC(snk_state::marvins_sound_nmi_ack_r)); map(0xe000, 0xe7ff).ram(); } @@ -1409,8 +1409,8 @@ void snk_state::jcross_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa000).r(this, FUNC(snk_state::sgladiat_soundlatch_r)); - map(0xc000, 0xc000).r(this, FUNC(snk_state::sgladiat_sound_nmi_ack_r)); + map(0xa000, 0xa000).r(FUNC(snk_state::sgladiat_soundlatch_r)); + map(0xc000, 0xc000).r(FUNC(snk_state::sgladiat_sound_nmi_ack_r)); map(0xe000, 0xe001).w("ay1", FUNC(ay8910_device::address_data_w)); map(0xe002, 0xe003).nopw(); // ? always FFFF, snkwave leftover? map(0xe004, 0xe005).w("ay2", FUNC(ay8910_device::address_data_w)); @@ -1419,7 +1419,7 @@ void snk_state::jcross_sound_map(address_map &map) void snk_state::jcross_sound_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(snk_state::sgladiat_sound_irq_ack_r)); + map(0x00, 0x00).r(FUNC(snk_state::sgladiat_sound_irq_ack_r)); } @@ -1427,8 +1427,8 @@ void snk_state::hal21_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa000).r(this, FUNC(snk_state::sgladiat_soundlatch_r)); - map(0xc000, 0xc000).r(this, FUNC(snk_state::sgladiat_sound_nmi_ack_r)); + map(0xa000, 0xa000).r(FUNC(snk_state::sgladiat_soundlatch_r)); + map(0xc000, 0xc000).r(FUNC(snk_state::sgladiat_sound_nmi_ack_r)); map(0xe000, 0xe001).w("ay1", FUNC(ay8910_device::address_data_w)); // AM_RANGE(0xe002, 0xe002) AM_WRITENOP // bitfielded(0-5) details unknown. Filter enable? map(0xe008, 0xe009).w("ay2", FUNC(ay8910_device::address_data_w)); @@ -1446,10 +1446,10 @@ void snk_state::tnk3_YM3526_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xc000, 0xc000).r(this, FUNC(snk_state::tnk3_busy_clear_r)); + map(0xc000, 0xc000).r(FUNC(snk_state::tnk3_busy_clear_r)); map(0xe000, 0xe001).rw("ym1", FUNC(ym3526_device::read), FUNC(ym3526_device::write)); - map(0xe004, 0xe004).r(this, FUNC(snk_state::tnk3_cmdirq_ack_r)); - map(0xe006, 0xe006).r(this, FUNC(snk_state::tnk3_ymirq_ack_r)); + map(0xe004, 0xe004).r(FUNC(snk_state::tnk3_cmdirq_ack_r)); + map(0xe006, 0xe006).r(FUNC(snk_state::tnk3_ymirq_ack_r)); } void snk_state::aso_YM3526_sound_map(address_map &map) @@ -1457,11 +1457,11 @@ void snk_state::aso_YM3526_sound_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); map(0xd000, 0xd000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe000, 0xe000).r(this, FUNC(snk_state::tnk3_busy_clear_r)); + map(0xe000, 0xe000).r(FUNC(snk_state::tnk3_busy_clear_r)); map(0xf000, 0xf001).rw("ym1", FUNC(ym3526_device::read), FUNC(ym3526_device::write)); // AM_RANGE(0xf002, 0xf002) AM_READNOP unknown - map(0xf004, 0xf004).r(this, FUNC(snk_state::tnk3_cmdirq_ack_r)); - map(0xf006, 0xf006).r(this, FUNC(snk_state::tnk3_ymirq_ack_r)); + map(0xf004, 0xf004).r(FUNC(snk_state::tnk3_cmdirq_ack_r)); + map(0xf006, 0xf006).r(FUNC(snk_state::tnk3_ymirq_ack_r)); } void snk_state::YM3526_YM3526_sound_map(address_map &map) @@ -1473,7 +1473,7 @@ void snk_state::YM3526_YM3526_sound_map(address_map &map) map(0xec00, 0xec00).w("ym1", FUNC(ym3526_device::write_port_w)); map(0xf000, 0xf000).rw("ym2", FUNC(ym3526_device::status_port_r), FUNC(ym3526_device::control_port_w)); map(0xf400, 0xf400).w("ym2", FUNC(ym3526_device::write_port_w)); - map(0xf800, 0xf800).rw(this, FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); + map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); } void snk_state::YM3812_sound_map(address_map &map) @@ -1483,7 +1483,7 @@ void snk_state::YM3812_sound_map(address_map &map) map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xe800, 0xe800).rw("ym1", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); map(0xec00, 0xec00).w("ym1", FUNC(ym3812_device::write_port_w)); - map(0xf800, 0xf800).rw(this, FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); + map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); } void snk_state::YM3526_Y8950_sound_map(address_map &map) @@ -1495,7 +1495,7 @@ void snk_state::YM3526_Y8950_sound_map(address_map &map) map(0xec00, 0xec00).w("ym1", FUNC(ym3526_device::write_port_w)); map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_port_r), FUNC(y8950_device::control_port_w)); map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::write_port_w)); - map(0xf800, 0xf800).rw(this, FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); + map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); } void snk_state::YM3812_Y8950_sound_map(address_map &map) @@ -1507,7 +1507,7 @@ void snk_state::YM3812_Y8950_sound_map(address_map &map) map(0xec00, 0xec00).w("ym1", FUNC(ym3812_device::write_port_w)); map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_port_r), FUNC(y8950_device::control_port_w)); map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::write_port_w)); - map(0xf800, 0xf800).rw(this, FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); + map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); } void snk_state::Y8950_sound_map(address_map &map) @@ -1517,7 +1517,7 @@ void snk_state::Y8950_sound_map(address_map &map) map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_port_r), FUNC(y8950_device::control_port_w)); map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::write_port_w)); - map(0xf800, 0xf800).rw(this, FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); + map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w)); } /*********************************************************************/ diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp index 2fd8eeea006..774b687db2c 100644 --- a/src/mame/drivers/snk6502.cpp +++ b/src/mame/drivers/snk6502.cpp @@ -345,16 +345,16 @@ CUSTOM_INPUT_MEMBER(snk6502_state::sasuke_count_r) void snk6502_state::sasuke_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(snk6502_state::videoram2_w)).share("videoram2"); - map(0x0800, 0x0bff).ram().w(this, FUNC(snk6502_state::videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(snk6502_state::colorram_w)).share("colorram"); - map(0x1000, 0x1fff).ram().w(this, FUNC(snk6502_state::charram_w)).share("charram"); + map(0x0400, 0x07ff).ram().w(FUNC(snk6502_state::videoram2_w)).share("videoram2"); + map(0x0800, 0x0bff).ram().w(FUNC(snk6502_state::videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(snk6502_state::colorram_w)).share("colorram"); + map(0x1000, 0x1fff).ram().w(FUNC(snk6502_state::charram_w)).share("charram"); map(0x3000, 0x3000).w("crtc", FUNC(mc6845_device::address_w)); map(0x3001, 0x3001).w("crtc", FUNC(mc6845_device::register_w)); map(0x4000, 0x8fff).rom(); map(0xb000, 0xb001).w("snk6502", FUNC(sasuke_sound_device::sound_w)); - map(0xb002, 0xb002).w(this, FUNC(snk6502_state::satansat_b002_w)); /* flip screen & irq enable */ - map(0xb003, 0xb003).w(this, FUNC(snk6502_state::satansat_backcolor_w)); + map(0xb002, 0xb002).w(FUNC(snk6502_state::satansat_b002_w)); /* flip screen & irq enable */ + map(0xb003, 0xb003).w(FUNC(snk6502_state::satansat_backcolor_w)); map(0xb004, 0xb004).portr("IN0"); map(0xb005, 0xb005).portr("IN1"); map(0xb006, 0xb006).portr("DSW"); @@ -365,16 +365,16 @@ void snk6502_state::sasuke_map(address_map &map) void snk6502_state::satansat_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(snk6502_state::videoram2_w)).share("videoram2"); - map(0x0800, 0x0bff).ram().w(this, FUNC(snk6502_state::videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(snk6502_state::colorram_w)).share("colorram"); - map(0x1000, 0x1fff).ram().w(this, FUNC(snk6502_state::charram_w)).share("charram"); + map(0x0400, 0x07ff).ram().w(FUNC(snk6502_state::videoram2_w)).share("videoram2"); + map(0x0800, 0x0bff).ram().w(FUNC(snk6502_state::videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(snk6502_state::colorram_w)).share("colorram"); + map(0x1000, 0x1fff).ram().w(FUNC(snk6502_state::charram_w)).share("charram"); map(0x3000, 0x3000).w("crtc", FUNC(mc6845_device::address_w)); map(0x3001, 0x3001).w("crtc", FUNC(mc6845_device::register_w)); map(0x4000, 0x9fff).rom(); map(0xb000, 0xb001).w("snk6502", FUNC(satansat_sound_device::sound_w)); - map(0xb002, 0xb002).w(this, FUNC(snk6502_state::satansat_b002_w)); /* flip screen & irq enable */ - map(0xb003, 0xb003).w(this, FUNC(snk6502_state::satansat_backcolor_w)); + map(0xb002, 0xb002).w(FUNC(snk6502_state::satansat_b002_w)); /* flip screen & irq enable */ + map(0xb003, 0xb003).w(FUNC(snk6502_state::satansat_backcolor_w)); map(0xb004, 0xb004).portr("IN0"); map(0xb005, 0xb005).portr("IN1"); map(0xb006, 0xb006).portr("DSW"); @@ -385,20 +385,20 @@ void snk6502_state::satansat_map(address_map &map) void snk6502_state::vanguard_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(snk6502_state::videoram2_w)).share("videoram2"); - map(0x0800, 0x0bff).ram().w(this, FUNC(snk6502_state::videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(snk6502_state::colorram_w)).share("colorram"); - map(0x1000, 0x1fff).ram().w(this, FUNC(snk6502_state::charram_w)).share("charram"); + map(0x0400, 0x07ff).ram().w(FUNC(snk6502_state::videoram2_w)).share("videoram2"); + map(0x0800, 0x0bff).ram().w(FUNC(snk6502_state::videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(snk6502_state::colorram_w)).share("colorram"); + map(0x1000, 0x1fff).ram().w(FUNC(snk6502_state::charram_w)).share("charram"); map(0x3000, 0x3000).w("crtc", FUNC(mc6845_device::address_w)); map(0x3001, 0x3001).w("crtc", FUNC(mc6845_device::register_w)); map(0x3100, 0x3102).w("snk6502", FUNC(vanguard_sound_device::sound_w)); - map(0x3103, 0x3103).w(this, FUNC(snk6502_state::flipscreen_w)); + map(0x3103, 0x3103).w(FUNC(snk6502_state::flipscreen_w)); map(0x3104, 0x3104).portr("IN0"); map(0x3105, 0x3105).portr("IN1"); map(0x3106, 0x3106).portr("DSW"); map(0x3107, 0x3107).portr("IN2"); - map(0x3200, 0x3200).w(this, FUNC(snk6502_state::scrollx_w)); - map(0x3300, 0x3300).w(this, FUNC(snk6502_state::scrolly_w)); + map(0x3200, 0x3200).w(FUNC(snk6502_state::scrollx_w)); + map(0x3300, 0x3300).w(FUNC(snk6502_state::scrolly_w)); map(0x3400, 0x3400).w("snk6502", FUNC(vanguard_sound_device::speech_w)); // speech map(0x4000, 0xbfff).rom(); map(0xf000, 0xffff).rom(); /* for the reset / interrupt vectors */ @@ -407,20 +407,20 @@ void snk6502_state::vanguard_map(address_map &map) void fantasy_state::fantasy_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(fantasy_state::videoram2_w)).share("videoram2"); - map(0x0800, 0x0bff).ram().w(this, FUNC(fantasy_state::videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(fantasy_state::colorram_w)).share("colorram"); - map(0x1000, 0x1fff).ram().w(this, FUNC(fantasy_state::charram_w)).share("charram"); + map(0x0400, 0x07ff).ram().w(FUNC(fantasy_state::videoram2_w)).share("videoram2"); + map(0x0800, 0x0bff).ram().w(FUNC(fantasy_state::videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(fantasy_state::colorram_w)).share("colorram"); + map(0x1000, 0x1fff).ram().w(FUNC(fantasy_state::charram_w)).share("charram"); map(0x2000, 0x2000).w("crtc", FUNC(mc6845_device::address_w)); map(0x2001, 0x2001).w("crtc", FUNC(mc6845_device::register_w)); map(0x2100, 0x2102).w("snk6502", FUNC(fantasy_sound_device::sound_w)); - map(0x2103, 0x2103).w(this, FUNC(fantasy_state::fantasy_flipscreen_w)); // affects both video and sound + map(0x2103, 0x2103).w(FUNC(fantasy_state::fantasy_flipscreen_w)); // affects both video and sound map(0x2104, 0x2104).portr("IN0"); map(0x2105, 0x2105).portr("IN1"); map(0x2106, 0x2106).portr("DSW"); map(0x2107, 0x2107).portr("IN2"); - map(0x2200, 0x2200).w(this, FUNC(fantasy_state::scrollx_w)); - map(0x2300, 0x2300).w(this, FUNC(fantasy_state::scrolly_w)); + map(0x2200, 0x2200).w(FUNC(fantasy_state::scrollx_w)); + map(0x2300, 0x2300).w(FUNC(fantasy_state::scrolly_w)); map(0x2400, 0x2400).w("snk6502", FUNC(fantasy_sound_device::speech_w)); // speech map(0x3000, 0xbfff).rom(); map(0xf000, 0xffff).rom(); @@ -429,21 +429,21 @@ void fantasy_state::fantasy_map(address_map &map) void fantasy_state::pballoon_map(address_map &map) { map(0x0000, 0x03ff).ram(); - map(0x0400, 0x07ff).ram().w(this, FUNC(fantasy_state::videoram2_w)).share("videoram2"); - map(0x0800, 0x0bff).ram().w(this, FUNC(fantasy_state::videoram_w)).share("videoram"); - map(0x0c00, 0x0fff).ram().w(this, FUNC(fantasy_state::colorram_w)).share("colorram"); - map(0x1000, 0x1fff).ram().w(this, FUNC(fantasy_state::charram_w)).share("charram"); + map(0x0400, 0x07ff).ram().w(FUNC(fantasy_state::videoram2_w)).share("videoram2"); + map(0x0800, 0x0bff).ram().w(FUNC(fantasy_state::videoram_w)).share("videoram"); + map(0x0c00, 0x0fff).ram().w(FUNC(fantasy_state::colorram_w)).share("colorram"); + map(0x1000, 0x1fff).ram().w(FUNC(fantasy_state::charram_w)).share("charram"); map(0x3000, 0x9fff).rom(); map(0xb000, 0xb000).w("crtc", FUNC(mc6845_device::address_w)); map(0xb001, 0xb001).w("crtc", FUNC(mc6845_device::register_w)); map(0xb100, 0xb102).w("snk6502", FUNC(fantasy_sound_device::sound_w)); - map(0xb103, 0xb103).w(this, FUNC(fantasy_state::fantasy_flipscreen_w)); // affects both video and sound + map(0xb103, 0xb103).w(FUNC(fantasy_state::fantasy_flipscreen_w)); // affects both video and sound map(0xb104, 0xb104).portr("IN0"); map(0xb105, 0xb105).portr("IN1"); map(0xb106, 0xb106).portr("DSW"); map(0xb107, 0xb107).portr("IN2"); - map(0xb200, 0xb200).w(this, FUNC(fantasy_state::scrollx_w)); - map(0xb300, 0xb300).w(this, FUNC(fantasy_state::scrolly_w)); + map(0xb200, 0xb200).w(FUNC(fantasy_state::scrollx_w)); + map(0xb300, 0xb300).w(FUNC(fantasy_state::scrolly_w)); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp index fe939fefc62..6c8c3603870 100644 --- a/src/mame/drivers/snk68.cpp +++ b/src/mame/drivers/snk68.cpp @@ -108,16 +108,16 @@ void snk68_state::pow_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x040000, 0x043fff).ram(); - map(0x080000, 0x080001).r(this, FUNC(snk68_state::control_1_r)); - map(0x080000, 0x080000).w(this, FUNC(snk68_state::sound_w)); + map(0x080000, 0x080001).r(FUNC(snk68_state::control_1_r)); + map(0x080000, 0x080000).w(FUNC(snk68_state::sound_w)); map(0x0c0000, 0x0c0001).portr("SYSTEM"); - map(0x0c0000, 0x0c0001).w(this, FUNC(snk68_state::pow_flipscreen_w)); // + char bank + map(0x0c0000, 0x0c0001).w(FUNC(snk68_state::pow_flipscreen_w)); // + char bank map(0x0e0000, 0x0e0001).nopr(); /* Watchdog or IRQ ack */ map(0x0e8000, 0x0e8001).nopr(); /* Watchdog or IRQ ack */ map(0x0f0000, 0x0f0001).portr("DSW1"); map(0x0f0008, 0x0f0009).portr("DSW2"); // AM_RANGE(0x0f0008, 0x0f0009) AM_WRITENOP /* ?? */ - map(0x100000, 0x100fff).rw(this, FUNC(snk68_state::pow_fg_videoram_r), FUNC(snk68_state::pow_fg_videoram_w)).mirror(0x1000).share("pow_fg_videoram"); // 8-bit + map(0x100000, 0x100fff).rw(FUNC(snk68_state::pow_fg_videoram_r), FUNC(snk68_state::pow_fg_videoram_w)).mirror(0x1000).share("pow_fg_videoram"); // 8-bit map(0x200000, 0x207fff).rw(m_sprites, FUNC(snk68_spr_device::spriteram_r), FUNC(snk68_spr_device::spriteram_w)).share("spriteram"); // only partially populated map(0x400000, 0x400fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); } @@ -126,13 +126,13 @@ void snk68_state::searchar_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x040000, 0x043fff).ram(); - map(0x080000, 0x080005).r(this, FUNC(snk68_state::protcontrols_r)); /* Player 1 & 2 */ - map(0x080000, 0x080000).w(this, FUNC(snk68_state::sound_w)); - map(0x080006, 0x080007).w(this, FUNC(snk68_state::protection_w)); /* top byte unknown, bottom is protection in ikari3 and streetsm */ - map(0x0c0000, 0x0c0001).w(this, FUNC(snk68_state::searchar_flipscreen_w)); - map(0x0c0000, 0x0c0001).r(this, FUNC(snk68_state::rotary_1_r)); /* Player 1 rotary */ - map(0x0c8000, 0x0c8001).r(this, FUNC(snk68_state::rotary_2_r)); /* Player 2 rotary */ - map(0x0d0000, 0x0d0001).r(this, FUNC(snk68_state::rotary_lsb_r)); /* Extra rotary bits */ + map(0x080000, 0x080005).r(FUNC(snk68_state::protcontrols_r)); /* Player 1 & 2 */ + map(0x080000, 0x080000).w(FUNC(snk68_state::sound_w)); + map(0x080006, 0x080007).w(FUNC(snk68_state::protection_w)); /* top byte unknown, bottom is protection in ikari3 and streetsm */ + map(0x0c0000, 0x0c0001).w(FUNC(snk68_state::searchar_flipscreen_w)); + map(0x0c0000, 0x0c0001).r(FUNC(snk68_state::rotary_1_r)); /* Player 1 rotary */ + map(0x0c8000, 0x0c8001).r(FUNC(snk68_state::rotary_2_r)); /* Player 2 rotary */ + map(0x0d0000, 0x0d0001).r(FUNC(snk68_state::rotary_lsb_r)); /* Extra rotary bits */ map(0x0e0000, 0x0e0001).nopr(); /* Watchdog or IRQ ack */ map(0x0e8000, 0x0e8001).nopr(); /* Watchdog or IRQ ack */ // AM_RANGE(0x0f0000, 0x0f0001) AM_WRITENOP /* ?? */ @@ -140,7 +140,7 @@ void snk68_state::searchar_map(address_map &map) map(0x0f0008, 0x0f0009).portr("DSW2"); map(0x0f8000, 0x0f8000).r("soundlatch2", FUNC(generic_latch_8_device::read)); map(0x100000, 0x107fff).rw(m_sprites, FUNC(snk68_spr_device::spriteram_r), FUNC(snk68_spr_device::spriteram_w)).share("spriteram"); // only partially populated - map(0x200000, 0x200fff).ram().w(this, FUNC(snk68_state::searchar_fg_videoram_w)).mirror(0x1000).share("pow_fg_videoram"); /* Mirror is used by Ikari 3 */ + map(0x200000, 0x200fff).ram().w(FUNC(snk68_state::searchar_fg_videoram_w)).mirror(0x1000).share("pow_fg_videoram"); /* Mirror is used by Ikari 3 */ map(0x300000, 0x33ffff).rom().region("user1", 0); /* Extra code bank */ map(0x400000, 0x400fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); } @@ -171,8 +171,8 @@ void snk68_state::sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x00).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); map(0x20, 0x20).w("ymsnd", FUNC(ym3812_device::write_port_w)); - map(0x40, 0x40).w(this, FUNC(snk68_state::D7759_write_port_0_w)); - map(0x80, 0x80).w(this, FUNC(snk68_state::D7759_upd_reset_w)); + map(0x40, 0x40).w(FUNC(snk68_state::D7759_write_port_0_w)); + map(0x80, 0x80).w(FUNC(snk68_state::D7759_upd_reset_w)); } /******************************************************************************/ diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index 72cb2d38998..1ea56a38e36 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -772,11 +772,11 @@ void snookr10_state::snookr10_map(address_map &map) map(0x3001, 0x3001).portr("IN1"); /* IN1 */ map(0x3002, 0x3002).portr("IN2"); /* IN2 */ map(0x3003, 0x3003).portr("SW1"); /* DS1 */ - map(0x3004, 0x3004).r(this, FUNC(snookr10_state::dsw_port_1_r)); /* complement of DS1, bit 7 */ - map(0x5000, 0x5000).w(this, FUNC(snookr10_state::output_port_0_w)); /* OUT0 */ - map(0x5001, 0x5001).w(this, FUNC(snookr10_state::output_port_1_w)); /* OUT1 */ - map(0x6000, 0x6fff).ram().w(this, FUNC(snookr10_state::snookr10_videoram_w)).share("videoram"); - map(0x7000, 0x7fff).ram().w(this, FUNC(snookr10_state::snookr10_colorram_w)).share("colorram"); + map(0x3004, 0x3004).r(FUNC(snookr10_state::dsw_port_1_r)); /* complement of DS1, bit 7 */ + map(0x5000, 0x5000).w(FUNC(snookr10_state::output_port_0_w)); /* OUT0 */ + map(0x5001, 0x5001).w(FUNC(snookr10_state::output_port_1_w)); /* OUT1 */ + map(0x6000, 0x6fff).ram().w(FUNC(snookr10_state::snookr10_videoram_w)).share("videoram"); + map(0x7000, 0x7fff).ram().w(FUNC(snookr10_state::snookr10_colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } @@ -788,26 +788,26 @@ void snookr10_state::tenballs_map(address_map &map) map(0x4001, 0x4001).portr("IN1"); /* IN1 */ map(0x4002, 0x4002).portr("IN2"); /* IN2 */ map(0x4003, 0x4003).portr("SW1"); /* DS1 */ - map(0x5000, 0x5000).w(this, FUNC(snookr10_state::output_port_0_w)); /* OUT0 */ - map(0x5001, 0x5001).w(this, FUNC(snookr10_state::output_port_1_w)); /* OUT1 */ - map(0x6000, 0x6fff).ram().w(this, FUNC(snookr10_state::snookr10_videoram_w)).share("videoram"); - map(0x7000, 0x7fff).ram().w(this, FUNC(snookr10_state::snookr10_colorram_w)).share("colorram"); + map(0x5000, 0x5000).w(FUNC(snookr10_state::output_port_0_w)); /* OUT0 */ + map(0x5001, 0x5001).w(FUNC(snookr10_state::output_port_1_w)); /* OUT1 */ + map(0x6000, 0x6fff).ram().w(FUNC(snookr10_state::snookr10_videoram_w)).share("videoram"); + map(0x7000, 0x7fff).ram().w(FUNC(snookr10_state::snookr10_colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } void snookr10_state::crystalc_map(address_map &map) { map(0x0000, 0x07ff).ram().share("nvram"); /* battery backed 6116 */ - map(0x1000, 0x1000).w(this, FUNC(snookr10_state::output_port_0_w)); /* OUT0 */ - map(0x1001, 0x1001).w(this, FUNC(snookr10_state::output_port_1_w)); /* OUT1 */ - map(0x2000, 0x2008).r(this, FUNC(snookr10_state::port2000_8_r)); /* unknown... protection or data channels? */ + map(0x1000, 0x1000).w(FUNC(snookr10_state::output_port_0_w)); /* OUT0 */ + map(0x1001, 0x1001).w(FUNC(snookr10_state::output_port_1_w)); /* OUT1 */ + map(0x2000, 0x2008).r(FUNC(snookr10_state::port2000_8_r)); /* unknown... protection or data channels? */ map(0x3000, 0x3000).portr("IN0"); /* IN0 */ map(0x3001, 0x3001).portr("IN1"); /* IN1 */ map(0x3002, 0x3002).portr("IN2"); /* IN2 */ map(0x3003, 0x3003).portr("SW1"); /* DS1 */ map(0x5000, 0x5000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x6000, 0x6fff).ram().w(this, FUNC(snookr10_state::snookr10_videoram_w)).share("videoram"); - map(0x7000, 0x7fff).ram().w(this, FUNC(snookr10_state::snookr10_colorram_w)).share("colorram"); + map(0x6000, 0x6fff).ram().w(FUNC(snookr10_state::snookr10_videoram_w)).share("videoram"); + map(0x7000, 0x7fff).ram().w(FUNC(snookr10_state::snookr10_colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp index c5f036ac5a3..932b061620c 100644 --- a/src/mame/drivers/snowbros.cpp +++ b/src/mame/drivers/snowbros.cpp @@ -198,15 +198,15 @@ void snowbros_state::snowbros_map(address_map &map) map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400000).w(this, FUNC(snowbros_state::snowbros_flipscreen_w)); + map(0x400000, 0x400000).w(FUNC(snowbros_state::snowbros_flipscreen_w)); map(0x500000, 0x500001).portr("DSW1"); map(0x500002, 0x500003).portr("DSW2"); map(0x500004, 0x500005).portr("SYSTEM"); map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); - map(0x800000, 0x800001).w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } void snowbros_state::sound_map(address_map &map) @@ -257,15 +257,15 @@ void snowbros_state::wintbob_map(address_map &map) map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400000).w(this, FUNC(snowbros_state::bootleg_flipscreen_w)); + map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); map(0x500000, 0x500001).portr("DSW1"); map(0x500002, 0x500003).portr("DSW2"); map(0x500004, 0x500005).portr("SYSTEM"); map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x700000, 0x701fff).ram().share("spriteram16b"); - map(0x800000, 0x800001).w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } /* Honey Dolls */ @@ -276,9 +276,9 @@ void snowbros_state::honeydol_map(address_map &map) map(0x100000, 0x10ffff).ram().share("hyperpac_ram"); map(0x200000, 0x200001).nopw(); /* ? */ map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400001).w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x500000, 0x500001).w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0x600000, 0x600001).w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x400000, 0x400001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x500000, 0x500001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0x600000, 0x600001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ map(0x800000, 0x800001).nopw(); /* ? */ map(0x900000, 0x900001).portr("DSW1"); map(0x900002, 0x900003).portr("DSW2"); @@ -311,16 +311,16 @@ void snowbros_state::twinadv_map(address_map &map) map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400000).w(this, FUNC(snowbros_state::bootleg_flipscreen_w)); + map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); map(0x500000, 0x500001).portr("DSW1"); map(0x500002, 0x500003).portr("DSW2"); map(0x500004, 0x500005).portr("SYSTEM"); map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x700000, 0x701fff).ram().share("spriteram16b"); - map(0x800000, 0x800001).w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } WRITE8_MEMBER(snowbros_state::twinadv_oki_bank_w) @@ -337,7 +337,7 @@ void snowbros_state::twinadv_sound_io_map(address_map &map) map.global_mask(0xff); map(0x02, 0x02).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x02, 0x02).w("soundlatch2", FUNC(generic_latch_8_device::write)); // back to 68k? - map(0x04, 0x04).w(this, FUNC(snowbros_state::twinadv_oki_bank_w)); // oki bank? + map(0x04, 0x04).w(FUNC(snowbros_state::twinadv_oki_bank_w)); // oki bank? map(0x06, 0x06).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -361,9 +361,9 @@ void snowbros_state::hyperpac_map(address_map &map) map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); - map(0x800000, 0x800001).w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } void snowbros_state::hyperpac_sound_map(address_map &map) @@ -487,17 +487,17 @@ void snowbros_state::snowbros3_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x103fff).ram(); map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x300000, 0x300001).r(this, FUNC(snowbros_state::sb3_sound_r)); // ? - map(0x300000, 0x300001).w(this, FUNC(snowbros_state::sb3_sound_w)); // ? - map(0x400000, 0x400000).w(this, FUNC(snowbros_state::bootleg_flipscreen_w)); + map(0x300000, 0x300001).r(FUNC(snowbros_state::sb3_sound_r)); // ? + map(0x300000, 0x300001).w(FUNC(snowbros_state::sb3_sound_w)); // ? + map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); map(0x500000, 0x500001).portr("DSW1"); map(0x500002, 0x500003).portr("DSW2"); map(0x500004, 0x500005).portr("SYSTEM"); map(0x600000, 0x6003ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x700000, 0x7021ff).ram().share("spriteram16b"); - map(0x800000, 0x800001).w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } /* Final Tetris */ @@ -515,9 +515,9 @@ void snowbros_state::finalttr_map(address_map &map) map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); - map(0x800000, 0x800001).w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } @@ -546,9 +546,9 @@ void snowbros_state::yutnori_map(address_map &map) map(0x700000, 0x70ffff).ram(); - map(0x800000, 0x800001).nopr().w(this, FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).nopr().w(this, FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).nopr().w(this, FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).nopr().w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).nopr().w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).nopr().w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } static INPUT_PORTS_START( snowbros ) diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp index bdd144807e5..bb6410183ba 100644 --- a/src/mame/drivers/socrates.cpp +++ b/src/mame/drivers/socrates.cpp @@ -435,7 +435,7 @@ WRITE8_MEMBER(socrates_state::common_ram_bank_w) READ8_MEMBER(socrates_state::socrates_cart_r) { - ///TODO: do m_rombank->space(AS_PROGRAM).install_write_handler(0x0002, 0x0002, write8_delegate(FUNC(dac_byte_interface::write), (dac_byte_interface *)m_dac)); style stuff + ///TODO: do m_rombank->space(AS_PROGRAM).install_write_handler(0x0002, 0x0002, write8_delegate(FUNC(dac_byte_interface::data_w), (dac_byte_interface *)m_dac)); style stuff // demangle the offset, offset passed is bits 11111111 11111111 00000000 00000000 // where . is 0 EDCBA987 65432.10 FEDCBA98 76543210 offset = ((offset&0x3FFFF)|((offset&0xF80000)>>1)); @@ -990,8 +990,8 @@ void socrates_state::socrates_rombank_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x03ffff).rom().region("maincpu", 0).mirror(0xF00000); // xxxx 00** **** **** **** **** - map(0x040000, 0x07ffff).r(this, FUNC(socrates_state::socrates_cart_r)).select(0xF80000); // **** *1** **** **** **** **** - map(0x080000, 0x0bffff).r(this, FUNC(socrates_state::read_f3)); // xxxx 10** **** **** **** **** + map(0x040000, 0x07ffff).r(FUNC(socrates_state::socrates_cart_r)).select(0xF80000); // **** *1** **** **** **** **** + map(0x080000, 0x0bffff).r(FUNC(socrates_state::read_f3)); // xxxx 10** **** **** **** **** } void socrates_state::socrates_rambank_map(address_map &map) @@ -1004,9 +1004,9 @@ void socrates_state::z80_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).rw(this, FUNC(socrates_state::common_rom_bank_r), FUNC(socrates_state::common_rom_bank_w)).mirror(0x7); /* rom bank select - RW - 8 bits */ - map(0x08, 0x08).rw(this, FUNC(socrates_state::common_ram_bank_r), FUNC(socrates_state::common_ram_bank_w)).mirror(0x7); /* ram banks select - RW - 4 low bits; Format: 0b****HHLL where LL controls whether window 0 points at ram area: 0b00: 0x0000-0x3fff; 0b01: 0x4000-0x7fff; 0b10: 0x8000-0xbfff; 0b11: 0xc000-0xffff. HH controls the same thing for window 1 */ - map(0x10, 0x17).rw(this, FUNC(socrates_state::read_f3), FUNC(socrates_state::socrates_sound_w)).mirror(0x8); /* sound section: + map(0x00, 0x00).rw(FUNC(socrates_state::common_rom_bank_r), FUNC(socrates_state::common_rom_bank_w)).mirror(0x7); /* rom bank select - RW - 8 bits */ + map(0x08, 0x08).rw(FUNC(socrates_state::common_ram_bank_r), FUNC(socrates_state::common_ram_bank_w)).mirror(0x7); /* ram banks select - RW - 4 low bits; Format: 0b****HHLL where LL controls whether window 0 points at ram area: 0b00: 0x0000-0x3fff; 0b01: 0x4000-0x7fff; 0b10: 0x8000-0xbfff; 0b11: 0xc000-0xffff. HH controls the same thing for window 1 */ + map(0x10, 0x17).rw(FUNC(socrates_state::read_f3), FUNC(socrates_state::socrates_sound_w)).mirror(0x8); /* sound section: 0x10 - W - frequency control for channel 1 (louder channel) - 01=high pitch, ff=low; time between 1->0/0->1 transitions = (XTAL(21'477'272)/(512+256) / (freq_reg+1)) (note that this is double the actual frequency since each full low and high squarewave pulse is two transitions) 0x11 - W - frequency control for channel 2 (softer channel) - 01=high pitch, ff=low; same equation as above 0x12 - W - 0b***EVVVV enable, volume control for channel 1 @@ -1018,12 +1018,12 @@ void socrates_state::z80_io(address_map &map) 0xC0 produces a DMC wave read from an unknown address at around 342hz */ - map(0x20, 0x21).rw(this, FUNC(socrates_state::read_f3), FUNC(socrates_state::socrates_scroll_w)).mirror(0xE); - map(0x30, 0x30).rw(this, FUNC(socrates_state::read_f3), FUNC(socrates_state::kbmcu_reset)).mirror(0xF); /* resets the keyboard IR decoder MCU */ - map(0x40, 0x40).rw(this, FUNC(socrates_state::status_and_speech), FUNC(socrates_state::speech_command)).mirror(0xF); /* reads status register for vblank/hblank/speech, also reads and writes speech module */ - map(0x50, 0x51).rw(this, FUNC(socrates_state::keyboard_buffer_read), FUNC(socrates_state::keyboard_buffer_update)).mirror(0xE); /* Keyboard fifo read, pop fifo on write */ - map(0x60, 0x60).rw(this, FUNC(socrates_state::read_f3), FUNC(socrates_state::reset_speech)).mirror(0xF); /* reset the speech module, or perhaps fire an NMI? */ - map(0x70, 0xFF).r(this, FUNC(socrates_state::read_f3)); // nothing mapped here afaik + map(0x20, 0x21).rw(FUNC(socrates_state::read_f3), FUNC(socrates_state::socrates_scroll_w)).mirror(0xE); + map(0x30, 0x30).rw(FUNC(socrates_state::read_f3), FUNC(socrates_state::kbmcu_reset)).mirror(0xF); /* resets the keyboard IR decoder MCU */ + map(0x40, 0x40).rw(FUNC(socrates_state::status_and_speech), FUNC(socrates_state::speech_command)).mirror(0xF); /* reads status register for vblank/hblank/speech, also reads and writes speech module */ + map(0x50, 0x51).rw(FUNC(socrates_state::keyboard_buffer_read), FUNC(socrates_state::keyboard_buffer_update)).mirror(0xE); /* Keyboard fifo read, pop fifo on write */ + map(0x60, 0x60).rw(FUNC(socrates_state::read_f3), FUNC(socrates_state::reset_speech)).mirror(0xF); /* reset the speech module, or perhaps fire an NMI? */ + map(0x70, 0xFF).r(FUNC(socrates_state::read_f3)); // nothing mapped here afaik } void iqunlimz_state::iqunlimz_mem(address_map &map) @@ -1039,7 +1039,7 @@ void iqunlimz_state::iqunlimz_rombank_map(address_map &map) { map.unmap_value_high(); map(0x000000, 0x03ffff).rom().region("maincpu", 0).mirror(0xF00000); // xxxx 00** **** **** **** **** - map(0x040000, 0x07ffff).r(this, FUNC(iqunlimz_state::socrates_cart_r)).select(0xF80000); // **** *1** **** **** **** **** + map(0x040000, 0x07ffff).r(FUNC(iqunlimz_state::socrates_cart_r)).select(0xF80000); // **** *1** **** **** **** **** map(0x080000, 0x0bffff).rom().region("maincpu", 0x40000).mirror(0xF00000);// xxxx 10** **** **** **** **** } @@ -1053,19 +1053,19 @@ void iqunlimz_state::iqunlimz_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x01).rw(this, FUNC(iqunlimz_state::common_rom_bank_r), FUNC(iqunlimz_state::common_rom_bank_w)).mirror(0x06); - map(0x08, 0x08).rw(this, FUNC(iqunlimz_state::common_ram_bank_r), FUNC(iqunlimz_state::common_ram_bank_w)).mirror(0x07); - map(0x10, 0x17).w(this, FUNC(iqunlimz_state::socrates_sound_w)).mirror(0x08); - map(0x20, 0x21).w(this, FUNC(iqunlimz_state::socrates_scroll_w)).mirror(0x0E); + map(0x00, 0x01).rw(FUNC(iqunlimz_state::common_rom_bank_r), FUNC(iqunlimz_state::common_rom_bank_w)).mirror(0x06); + map(0x08, 0x08).rw(FUNC(iqunlimz_state::common_ram_bank_r), FUNC(iqunlimz_state::common_ram_bank_w)).mirror(0x07); + map(0x10, 0x17).w(FUNC(iqunlimz_state::socrates_sound_w)).mirror(0x08); + map(0x20, 0x21).w(FUNC(iqunlimz_state::socrates_scroll_w)).mirror(0x0E); // 30: writes an incrementing value here, once per keypress? // 40: some sort of serial select/reset or enable, related to 0x60 - map(0x50, 0x51).rw(this, FUNC(iqunlimz_state::keyboard_buffer_read), FUNC(iqunlimz_state::keyboard_buffer_update)).mirror(0xE); + map(0x50, 0x51).rw(FUNC(iqunlimz_state::keyboard_buffer_read), FUNC(iqunlimz_state::keyboard_buffer_update)).mirror(0xE); // 60: some sort of serial read/write port, related to 0x40 - map(0x70, 0x73).rw(this, FUNC(iqunlimz_state::video_regs_r), FUNC(iqunlimz_state::video_regs_w)).mirror(0x0C); + map(0x70, 0x73).rw(FUNC(iqunlimz_state::video_regs_r), FUNC(iqunlimz_state::video_regs_w)).mirror(0x0C); map(0x80, 0x81).nopw(); // LCD map(0xb1, 0xb1).nopw(); - map(0xa0, 0xa0).r(this, FUNC(iqunlimz_state::status_r)).mirror(0x0F); - map(0xe0, 0xe7).w(this, FUNC(iqunlimz_state::colors_w)).mirror(0x08); + map(0xa0, 0xa0).r(FUNC(iqunlimz_state::status_r)).mirror(0x0F); + map(0xe0, 0xe7).w(FUNC(iqunlimz_state::colors_w)).mirror(0x08); } diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp index 6a730054c20..4e41e30b84a 100644 --- a/src/mame/drivers/softbox.cpp +++ b/src/mame/drivers/softbox.cpp @@ -109,8 +109,8 @@ WRITE8_MEMBER( softbox_state::dbrg_w ) { - m_dbrg->str_w(data & 0x0f); - m_dbrg->stt_w(data >> 4); + m_dbrg->write_str(data & 0x0f); + m_dbrg->write_stt(data >> 4); } @@ -139,7 +139,7 @@ void softbox_state::softbox_io(address_map &map) map.global_mask(0xff); map(0x08, 0x08).rw(I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x09, 0x09).rw(I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x0c, 0x0c).w(this, FUNC(softbox_state::dbrg_w)); + map(0x0c, 0x0c).w(FUNC(softbox_state::dbrg_w)); map(0x10, 0x13).rw(I8255_0_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x14, 0x17).rw(I8255_1_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x18, 0x18).rw(m_hdc, FUNC(corvus_hdc_device::read), FUNC(corvus_hdc_device::write)); @@ -182,12 +182,12 @@ INPUT_PORTS_END READ8_MEMBER( softbox_state::ppi0_pa_r ) { - return m_ieee->dio_r() ^ 0xff; + return m_ieee->read_dio() ^ 0xff; } WRITE8_MEMBER( softbox_state::ppi0_pb_w ) { - m_ieee->dio_w(data ^ 0xff); + m_ieee->write_dio(data ^ 0xff); } //------------------------------------------------- diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp index cb6588ee33d..cdb486c2f95 100644 --- a/src/mame/drivers/solomon.cpp +++ b/src/mame/drivers/solomon.cpp @@ -53,22 +53,22 @@ void solomon_state::main_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); - map(0xd000, 0xd3ff).ram().w(this, FUNC(solomon_state::solomon_colorram_w)).share("colorram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(solomon_state::solomon_videoram_w)).share("videoram"); - map(0xd800, 0xdbff).ram().w(this, FUNC(solomon_state::solomon_colorram2_w)).share("colorram2"); - map(0xdc00, 0xdfff).ram().w(this, FUNC(solomon_state::solomon_videoram2_w)).share("videoram2"); + map(0xd000, 0xd3ff).ram().w(FUNC(solomon_state::solomon_colorram_w)).share("colorram"); + map(0xd400, 0xd7ff).ram().w(FUNC(solomon_state::solomon_videoram_w)).share("videoram"); + map(0xd800, 0xdbff).ram().w(FUNC(solomon_state::solomon_colorram2_w)).share("colorram2"); + map(0xdc00, 0xdfff).ram().w(FUNC(solomon_state::solomon_videoram2_w)).share("videoram2"); map(0xe000, 0xe07f).ram().share("spriteram"); map(0xe400, 0xe5ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xe600, 0xe600).portr("P1"); map(0xe601, 0xe601).portr("P2"); map(0xe602, 0xe602).portr("SYSTEM"); - map(0xe603, 0xe603).r(this, FUNC(solomon_state::solomon_0xe603_r)); + map(0xe603, 0xe603).r(FUNC(solomon_state::solomon_0xe603_r)); map(0xe604, 0xe604).portr("DSW1"); map(0xe605, 0xe605).portr("DSW2"); map(0xe606, 0xe606).nopr(); /* watchdog? */ - map(0xe600, 0xe600).w(this, FUNC(solomon_state::nmi_mask_w)); - map(0xe604, 0xe604).w(this, FUNC(solomon_state::solomon_flipscreen_w)); - map(0xe800, 0xe800).w(this, FUNC(solomon_state::solomon_sh_command_w)); + map(0xe600, 0xe600).w(FUNC(solomon_state::nmi_mask_w)); + map(0xe604, 0xe604).w(FUNC(solomon_state::solomon_flipscreen_w)); + map(0xe800, 0xe800).w(FUNC(solomon_state::solomon_sh_command_w)); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp index 2e34bda9fc3..d74285fc582 100644 --- a/src/mame/drivers/sonson.cpp +++ b/src/mame/drivers/sonson.cpp @@ -81,10 +81,10 @@ WRITE_LINE_MEMBER(sonson_state::coin2_counter_w) void sonson_state::main_map(address_map &map) { map(0x0000, 0x0fff).ram(); - map(0x1000, 0x13ff).ram().w(this, FUNC(sonson_state::sonson_videoram_w)).share("videoram"); - map(0x1400, 0x17ff).ram().w(this, FUNC(sonson_state::sonson_colorram_w)).share("colorram"); + map(0x1000, 0x13ff).ram().w(FUNC(sonson_state::sonson_videoram_w)).share("videoram"); + map(0x1400, 0x17ff).ram().w(FUNC(sonson_state::sonson_colorram_w)).share("colorram"); map(0x2020, 0x207f).ram().share("spriteram"); - map(0x3000, 0x3000).w(this, FUNC(sonson_state::sonson_scrollx_w)); + map(0x3000, 0x3000).w(FUNC(sonson_state::sonson_scrollx_w)); map(0x3002, 0x3002).portr("P1"); map(0x3003, 0x3003).portr("P2"); map(0x3004, 0x3004).portr("SYSTEM"); diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 727bdef8ba9..dc82354afec 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -199,10 +199,10 @@ void sorcerer_state::sorcerer_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0xfc, 0xfc).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xfd, 0xfd).rw(this, FUNC(sorcerer_state::sorcerer_fd_r), FUNC(sorcerer_state::sorcerer_fd_w)); - map(0xfe, 0xfe).rw(this, FUNC(sorcerer_state::sorcerer_fe_r), FUNC(sorcerer_state::sorcerer_fe_w)); - map(0xff, 0xff).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0xff, 0xff).w(this, FUNC(sorcerer_state::sorcerer_ff_w)); + map(0xfd, 0xfd).rw(FUNC(sorcerer_state::sorcerer_fd_r), FUNC(sorcerer_state::sorcerer_fd_w)); + map(0xfe, 0xfe).rw(FUNC(sorcerer_state::sorcerer_fe_r), FUNC(sorcerer_state::sorcerer_fe_w)); + map(0xff, 0xff).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0xff, 0xff).w(FUNC(sorcerer_state::sorcerer_ff_w)); } static INPUT_PORTS_START(sorcerer) diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp index 463955471fc..4028f7dabef 100644 --- a/src/mame/drivers/sothello.cpp +++ b/src/mame/drivers/sothello.cpp @@ -180,12 +180,12 @@ void sothello_state::maincpu_io_map(address_map &map) map(0x00, 0x0f).portr("INPUT1"); map(0x10, 0x1f).portr("INPUT2"); map(0x20, 0x2f).portr("SYSTEM"); - map(0x30, 0x30).r(this, FUNC(sothello_state::subcpu_halt_set)); - map(0x31, 0x31).r(this, FUNC(sothello_state::subcpu_halt_clear)); - map(0x32, 0x32).r(this, FUNC(sothello_state::subcpu_comm_status)); - map(0x33, 0x33).r(this, FUNC(sothello_state::soundcpu_status_r)); + map(0x30, 0x30).r(FUNC(sothello_state::subcpu_halt_set)); + map(0x31, 0x31).r(FUNC(sothello_state::subcpu_halt_clear)); + map(0x32, 0x32).r(FUNC(sothello_state::subcpu_comm_status)); + map(0x33, 0x33).r(FUNC(sothello_state::soundcpu_status_r)); map(0x40, 0x4f).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x50, 0x50).w(this, FUNC(sothello_state::bank_w)); + map(0x50, 0x50).w(FUNC(sothello_state::bank_w)); map(0x60, 0x61).mirror(0x02).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); /* not sure, but the A1 line is ignored, code @ $8b8 */ map(0x70, 0x73).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); @@ -235,11 +235,11 @@ void sothello_state::soundcpu_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x01, 0x01).w(this, FUNC(sothello_state::msm_data_w)); - map(0x02, 0x02).w(this, FUNC(sothello_state::msm_cfg_w)); - map(0x03, 0x03).w(this, FUNC(sothello_state::soundcpu_busyflag_set_w)); - map(0x04, 0x04).w(this, FUNC(sothello_state::soundcpu_busyflag_reset_w)); - map(0x05, 0x05).w(this, FUNC(sothello_state::soundcpu_int_clear_w)); + map(0x01, 0x01).w(FUNC(sothello_state::msm_data_w)); + map(0x02, 0x02).w(FUNC(sothello_state::msm_cfg_w)); + map(0x03, 0x03).w(FUNC(sothello_state::soundcpu_busyflag_set_w)); + map(0x04, 0x04).w(FUNC(sothello_state::soundcpu_busyflag_reset_w)); + map(0x05, 0x05).w(FUNC(sothello_state::soundcpu_int_clear_w)); } /* sub 6809 */ @@ -269,7 +269,7 @@ READ8_MEMBER(sothello_state::subcpu_status_r) void sothello_state::subcpu_mem_map(address_map &map) { - map(0x0000, 0x1fff).rw(this, FUNC(sothello_state::subcpu_status_r), FUNC(sothello_state::subcpu_status_w)); + map(0x0000, 0x1fff).rw(FUNC(sothello_state::subcpu_status_r), FUNC(sothello_state::subcpu_status_w)); map(0x2000, 0x77ff).ram(); map(0x7800, 0x7fff).ram().share("mainsub"); /* upper 0x800 of 6264 is shared with main cpu */ map(0x8000, 0xffff).rom().region("subcpu", 0); diff --git a/src/mame/drivers/spacefb.cpp b/src/mame/drivers/spacefb.cpp index 02678d8775c..8317d720f3b 100644 --- a/src/mame/drivers/spacefb.cpp +++ b/src/mame/drivers/spacefb.cpp @@ -239,9 +239,9 @@ void spacefb_state::spacefb_main_io_map(address_map &map) map(0x03, 0x03).portr("DSW"); map(0x04, 0x07).nopr(); /* yes, this is correct (1-of-8 decoder) */ - map(0x00, 0x00).mirror(0x04).w(this, FUNC(spacefb_state::port_0_w)); - map(0x01, 0x01).mirror(0x04).w(this, FUNC(spacefb_state::port_1_w)); - map(0x02, 0x02).mirror(0x04).w(this, FUNC(spacefb_state::port_2_w)); + map(0x00, 0x00).mirror(0x04).w(FUNC(spacefb_state::port_0_w)); + map(0x01, 0x01).mirror(0x04).w(FUNC(spacefb_state::port_1_w)); + map(0x02, 0x02).mirror(0x04).w(FUNC(spacefb_state::port_2_w)); map(0x03, 0x03).mirror(0x04).nopw(); } @@ -340,7 +340,7 @@ MACHINE_CONFIG_START(spacefb_state::spacefb) MCFG_DEVICE_ADD("audiocpu", I8035, SPACEFB_AUDIO_CPU_CLOCK) MCFG_DEVICE_PROGRAM_MAP(spacefb_audio_map) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, spacefb_state, audio_p2_r)) MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, spacefb_state, audio_t0_r)) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, spacefb_state, audio_t1_r)) diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp index c3d2cb73c77..974ef7ef702 100644 --- a/src/mame/drivers/spaceg.cpp +++ b/src/mame/drivers/spaceg.cpp @@ -430,8 +430,8 @@ void spaceg_state::spaceg_map(address_map &map) map(0x3000, 0x3fff).rom(); map(0x7000, 0x77ff).ram(); - map(0xa000, 0xbfff).ram().r(this, FUNC(spaceg_state::colorram_r)).share("colorram"); - map(0xc000, 0xdfff).ram().w(this, FUNC(spaceg_state::zvideoram_w)).share("videoram"); + map(0xa000, 0xbfff).ram().r(FUNC(spaceg_state::colorram_r)).share("colorram"); + map(0xc000, 0xdfff).ram().w(FUNC(spaceg_state::zvideoram_w)).share("videoram"); map(0x9400, 0x9400).writeonly().share("io9400"); /* gfx ctrl */ map(0x9401, 0x9401).writeonly().share("io9401"); /* gfx ctrl */ @@ -442,9 +442,9 @@ void spaceg_state::spaceg_map(address_map &map) bit 7 - unknown - set to 1 during the gameplay (coinlock ?) */ map(0x9402, 0x9402).nopw(); - map(0x9405, 0x9405).w(this, FUNC(spaceg_state::sound1_w)); - map(0x9406, 0x9406).w(this, FUNC(spaceg_state::sound2_w)); - map(0x9407, 0x9407).w(this, FUNC(spaceg_state::sound3_w)); + map(0x9405, 0x9405).w(FUNC(spaceg_state::sound1_w)); + map(0x9406, 0x9406).w(FUNC(spaceg_state::sound2_w)); + map(0x9407, 0x9407).w(FUNC(spaceg_state::sound3_w)); map(0x9800, 0x9800).portr("9800"); map(0x9801, 0x9801).portr("9801"); diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index 8851965dfc7..7287622a7ea 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -194,14 +194,14 @@ void spartanxtec_state::spartanxtec_map(address_map &map) map(0x8102, 0x8102).portr("SYSTEM"); map(0x8103, 0x8103).portr("P1"); - map(0x8200, 0x8200).w(this, FUNC(spartanxtec_state::irq_ack)); + map(0x8200, 0x8200).w(FUNC(spartanxtec_state::irq_ack)); - map(0xA801, 0xA801).w(this, FUNC(spartanxtec_state::a801_w)); + map(0xA801, 0xA801).w(FUNC(spartanxtec_state::a801_w)); map(0xa900, 0xa903).ram().share("scroll_lo"); map(0xa980, 0xa983).ram().share("scroll_hi"); - map(0xd000, 0xdfff).ram().w(this, FUNC(spartanxtec_state::kungfum_tileram_w)).share("m62_tileram"); + map(0xd000, 0xdfff).ram().w(FUNC(spartanxtec_state::kungfum_tileram_w)).share("m62_tileram"); map(0xe000, 0xefff).ram(); @@ -227,7 +227,7 @@ void spartanxtec_state::spartanxtec_sound_map(address_map &map) void spartanxtec_state::spartanxtec_sound_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).w(this, FUNC(spartanxtec_state::sound_irq_ack)); + map(0x0000, 0x0000).w(FUNC(spartanxtec_state::sound_irq_ack)); map(0x0012, 0x0013).w("ay3", FUNC(ay8912_device::address_data_w)); map(0x0012, 0x0012).r("ay3", FUNC(ay8912_device::data_r)); diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp index 97b2af00d96..f6a0fa0a961 100644 --- a/src/mame/drivers/spbactn.cpp +++ b/src/mame/drivers/spbactn.cpp @@ -151,8 +151,8 @@ void spbactn_state::spbactn_map(address_map &map) map(0x00000, 0x3ffff).rom(); map(0x40000, 0x43fff).ram(); // main ram map(0x50000, 0x50fff).ram().share("spvideoram"); - map(0x60000, 0x67fff).ram().w(this, FUNC(spbactn_state::fg_videoram_w)).share("fgvideoram"); - map(0x70000, 0x77fff).ram().w(this, FUNC(spbactn_state::bg_videoram_w)).share("bgvideoram"); + map(0x60000, 0x67fff).ram().w(FUNC(spbactn_state::fg_videoram_w)).share("fgvideoram"); + map(0x70000, 0x77fff).ram().w(FUNC(spbactn_state::bg_videoram_w)).share("bgvideoram"); map(0x80000, 0x827ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x90000, 0x90001).portr("IN0"); map(0x90010, 0x90011).portr("IN1"); @@ -163,7 +163,7 @@ void spbactn_state::spbactn_map(address_map &map) /* this are an awful lot of unknowns */ map(0x90000, 0x90001).nopw(); map(0x90011, 0x90011).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x90020, 0x90021).w(this, FUNC(spbactn_state::main_irq_ack_w)); + map(0x90020, 0x90021).w(FUNC(spbactn_state::main_irq_ack_w)); map(0x90030, 0x90031).nopw(); map(0x90050, 0x90051).nopw(); @@ -201,22 +201,22 @@ void spbactn_state::spbactnp_map(address_map &map) map(0x00000, 0x3ffff).rom(); map(0x40000, 0x43fff).ram(); // main ram map(0x50000, 0x50fff).ram().share("spvideoram"); - map(0x60000, 0x67fff).ram().w(this, FUNC(spbactn_state::fg_videoram_w)).share("fgvideoram"); - map(0x70000, 0x77fff).ram().w(this, FUNC(spbactn_state::bg_videoram_w)).share("bgvideoram"); + map(0x60000, 0x67fff).ram().w(FUNC(spbactn_state::fg_videoram_w)).share("fgvideoram"); + map(0x70000, 0x77fff).ram().w(FUNC(spbactn_state::bg_videoram_w)).share("bgvideoram"); map(0x80000, 0x827ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // yes R and G are swapped vs. the released version - map(0x90002, 0x90003).w(this, FUNC(spbactn_state::main_irq_ack_w)); - map(0x90006, 0x90007).w(this, FUNC(spbactn_state::spbatnp_90006_w)); - map(0x9000a, 0x9000b).w(this, FUNC(spbactn_state::spbatnp_9000a_w)); - map(0x9000c, 0x9000d).w(this, FUNC(spbactn_state::spbatnp_9000c_w)); - map(0x9000e, 0x9000f).w(this, FUNC(spbactn_state::spbatnp_9000e_w)); + map(0x90002, 0x90003).w(FUNC(spbactn_state::main_irq_ack_w)); + map(0x90006, 0x90007).w(FUNC(spbactn_state::spbatnp_90006_w)); + map(0x9000a, 0x9000b).w(FUNC(spbactn_state::spbatnp_9000a_w)); + map(0x9000c, 0x9000d).w(FUNC(spbactn_state::spbatnp_9000c_w)); + map(0x9000e, 0x9000f).w(FUNC(spbactn_state::spbatnp_9000e_w)); - map(0x90124, 0x90125).w(this, FUNC(spbactn_state::spbatnp_90124_w)); // bg scroll - map(0x9012c, 0x9012d).w(this, FUNC(spbactn_state::spbatnp_9012c_w)); // bg scroll + map(0x90124, 0x90125).w(FUNC(spbactn_state::spbatnp_90124_w)); // bg scroll + map(0x9012c, 0x9012d).w(FUNC(spbactn_state::spbatnp_9012c_w)); // bg scroll - map(0x90000, 0x900ff).r(this, FUNC(spbactn_state::temp_read_handler_r)); // temp + map(0x90000, 0x900ff).r(FUNC(spbactn_state::temp_read_handler_r)); // temp } @@ -238,7 +238,7 @@ void spbactn_state::spbactnp_extra_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram().share("extraram2"); map(0xe000, 0xefff).ram(); - map(0xd000, 0xd1ff).ram().w(this, FUNC(spbactn_state::extraram_w)).share("extraram"); + map(0xd000, 0xd1ff).ram().w(FUNC(spbactn_state::extraram_w)).share("extraram"); map(0xd200, 0xd200).ram(); } diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp index 55ce1e0a051..6c3f2c5c77c 100644 --- a/src/mame/drivers/spc1000.cpp +++ b/src/mame/drivers/spc1000.cpp @@ -269,12 +269,12 @@ void spc1000_state::spc1000_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x1fff).ram().share("videoram"); - map(0x2000, 0x3fff).rw(this, FUNC(spc1000_state::gmode_r), FUNC(spc1000_state::gmode_w)); + map(0x2000, 0x3fff).rw(FUNC(spc1000_state::gmode_r), FUNC(spc1000_state::gmode_w)); map(0x4000, 0x4000).w("ay8910", FUNC(ay8910_device::address_w)); map(0x4001, 0x4001).rw("ay8910", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0x6000, 0x6000).w(this, FUNC(spc1000_state::cass_w)); - map(0x8000, 0x9fff).r(this, FUNC(spc1000_state::keyboard_r)); - map(0xa000, 0xa000).rw(this, FUNC(spc1000_state::iplk_r), FUNC(spc1000_state::iplk_w)); + map(0x6000, 0x6000).w(FUNC(spc1000_state::cass_w)); + map(0x8000, 0x9fff).r(FUNC(spc1000_state::keyboard_r)); + map(0xa000, 0xa000).rw(FUNC(spc1000_state::iplk_r), FUNC(spc1000_state::iplk_w)); map(0xc000, 0xdfff).rw("ext1", FUNC(spc1000_exp_device::read), FUNC(spc1000_exp_device::write)); } @@ -484,7 +484,7 @@ MACHINE_CONFIG_START(spc1000_state::spc1000) SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(4'000'000) / 1) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, spc1000_state, porta_r)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp index 6ba02055d15..49ccc520484 100644 --- a/src/mame/drivers/spc1500.cpp +++ b/src/mame/drivers/spc1500.cpp @@ -684,7 +684,7 @@ void spc1500_state::spc1500_double_io(address_map &map) map.unmap_value_high(); map(0x2000, 0xffff).ram().share("videoram"); map(0x0000, 0x17ff).ram().share("pcgram"); - map(0x0000, 0xffff).rw(this, FUNC(spc1500_state::io_r), FUNC(spc1500_state::double_w)); + map(0x0000, 0xffff).rw(FUNC(spc1500_state::io_r), FUNC(spc1500_state::double_w)); } /* Input ports */ @@ -898,7 +898,7 @@ MACHINE_CONFIG_START(spc1500_state::spc1500) MCFG_VIDEO_START_OVERRIDE(spc1500_state, spc) MCFG_DEVICE_ADD("ppi8255", I8255, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTB_CB(READ8(*this, spc1500_state, portb_r)) MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spc1500_state, portb_w)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spc1500_state, portc_w)) diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp index e0425fa9ba4..a27ee8759b6 100644 --- a/src/mame/drivers/spcforce.cpp +++ b/src/mame/drivers/spcforce.cpp @@ -91,9 +91,9 @@ WRITE8_MEMBER(spcforce_state::SN76496_select_w) { m_sn76496_select = data; - if (~data & 0x40) m_sn1->write(space, 0, m_sn76496_latch); - if (~data & 0x20) m_sn2->write(space, 0, m_sn76496_latch); - if (~data & 0x10) m_sn3->write(space, 0, m_sn76496_latch); + if (~data & 0x40) m_sn1->write(m_sn76496_latch); + if (~data & 0x20) m_sn2->write(m_sn76496_latch); + if (~data & 0x10) m_sn3->write(m_sn76496_latch); } READ_LINE_MEMBER(spcforce_state::t0_r) @@ -131,8 +131,8 @@ void spcforce_state::spcforce_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram(); map(0x7000, 0x7000).portr("DSW").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x7001, 0x7001).portr("P1").w(this, FUNC(spcforce_state::soundtrigger_w)); - map(0x7002, 0x7002).portr("P2").w(this, FUNC(spcforce_state::misc_outputs_w)); + map(0x7001, 0x7001).portr("P1").w(FUNC(spcforce_state::soundtrigger_w)); + map(0x7002, 0x7002).portr("P2").w(FUNC(spcforce_state::misc_outputs_w)); map(0x7008, 0x700f).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x8000, 0x83ff).ram().share("videoram"); map(0x9000, 0x93ff).ram().share("colorram"); diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp index 4028caca25c..e4fe0a4d237 100644 --- a/src/mame/drivers/spdodgeb.cpp +++ b/src/mame/drivers/spdodgeb.cpp @@ -240,16 +240,16 @@ void spdodgeb_state::spdodgeb_map(address_map &map) { map(0x0000, 0x0fff).ram(); map(0x1000, 0x10ff).writeonly().share("spriteram"); - map(0x2000, 0x2fff).ram().w(this, FUNC(spdodgeb_state::videoram_w)).share("videoram"); + map(0x2000, 0x2fff).ram().w(FUNC(spdodgeb_state::videoram_w)).share("videoram"); map(0x3000, 0x3000).portr("IN0"); //AM_WRITENOP map(0x3001, 0x3001).portr("DSW"); //AM_WRITENOP map(0x3002, 0x3002).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // AM_RANGE(0x3003, 0x3003) AM_WRITENOP - map(0x3004, 0x3004).w(this, FUNC(spdodgeb_state::scrollx_lo_w)); + map(0x3004, 0x3004).w(FUNC(spdodgeb_state::scrollx_lo_w)); // AM_RANGE(0x3005, 0x3005) AM_WRITENOP /* mcu63701_output_w */ - map(0x3006, 0x3006).w(this, FUNC(spdodgeb_state::ctrl_w)); /* scroll hi, flip screen, bank switch, palette select */ - map(0x3800, 0x3800).w(this, FUNC(spdodgeb_state::mcu63701_w)); - map(0x3801, 0x3805).r(this, FUNC(spdodgeb_state::mcu63701_r)); + map(0x3006, 0x3006).w(FUNC(spdodgeb_state::ctrl_w)); /* scroll hi, flip screen, bank switch, palette select */ + map(0x3800, 0x3800).w(FUNC(spdodgeb_state::mcu63701_w)); + map(0x3801, 0x3805).r(FUNC(spdodgeb_state::mcu63701_r)); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } @@ -259,7 +259,7 @@ void spdodgeb_state::spdodgeb_sound_map(address_map &map) map(0x0000, 0x0fff).ram(); map(0x1000, 0x1000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x2800, 0x2801).w("ymsnd", FUNC(ym3812_device::write)); - map(0x3800, 0x3807).w(this, FUNC(spdodgeb_state::spd_adpcm_w)); + map(0x3800, 0x3807).w(FUNC(spdodgeb_state::spd_adpcm_w)); map(0x8000, 0xffff).rom().region("audiocpu", 0); } diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp index e5475fe8a0e..c9cce8d8ae6 100644 --- a/src/mame/drivers/spec128.cpp +++ b/src/mame/drivers/spec128.cpp @@ -235,16 +235,16 @@ READ8_MEMBER( spectrum_state::spectrum_128_ula_r ) void spectrum_state::spectrum_128_io(address_map &map) { - map(0x0000, 0x0000).rw(this, FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); - map(0x0001, 0x0001).w(this, FUNC(spectrum_state::spectrum_128_port_7ffd_w)).mirror(0x7ffc); // (A15 | A1) == 0, note: reading from this port does write to it by value from data bus + map(0x0000, 0x0000).rw(FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); + map(0x0001, 0x0001).w(FUNC(spectrum_state::spectrum_128_port_7ffd_w)).mirror(0x7ffc); // (A15 | A1) == 0, note: reading from this port does write to it by value from data bus map(0x8000, 0x8000).w("ay8912", FUNC(ay8910_device::data_w)).mirror(0x3ffd); map(0xc000, 0xc000).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)).mirror(0x3ffd); - map(0x0001, 0x0001).r(this, FUNC(spectrum_state::spectrum_128_ula_r)).mirror(0xfffe); + map(0x0001, 0x0001).r(FUNC(spectrum_state::spectrum_128_ula_r)).mirror(0xfffe); } void spectrum_state::spectrum_128_mem(address_map &map) { - map(0x0000, 0x3fff).rw(this, FUNC(spectrum_state::spectrum_128_bank1_r), FUNC(spectrum_state::spectrum_128_bank1_w)); + map(0x0000, 0x3fff).rw(FUNC(spectrum_state::spectrum_128_bank1_r), FUNC(spectrum_state::spectrum_128_bank1_w)); map(0x4000, 0x7fff).bankrw("bank2"); map(0x8000, 0xbfff).bankrw("bank3"); map(0xc000, 0xffff).bankrw("bank4"); diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp index a8501ffb530..5595df3a519 100644 --- a/src/mame/drivers/special.cpp +++ b/src/mame/drivers/special.cpp @@ -50,9 +50,9 @@ void special_state::erik_mem(address_map &map) void special_state::erik_io_map(address_map &map) { map.global_mask(0xff); - map(0xf1, 0xf1).rw(this, FUNC(special_state::erik_rr_reg_r), FUNC(special_state::erik_rr_reg_w)); - map(0xf2, 0xf2).rw(this, FUNC(special_state::erik_rc_reg_r), FUNC(special_state::erik_rc_reg_w)); - map(0xf3, 0xf3).rw(this, FUNC(special_state::erik_disk_reg_r), FUNC(special_state::erik_disk_reg_w)); + map(0xf1, 0xf1).rw(FUNC(special_state::erik_rr_reg_r), FUNC(special_state::erik_rr_reg_w)); + map(0xf2, 0xf2).rw(FUNC(special_state::erik_rc_reg_r), FUNC(special_state::erik_rc_reg_w)); + map(0xf3, 0xf3).rw(FUNC(special_state::erik_disk_reg_r), FUNC(special_state::erik_disk_reg_w)); map(0xf4, 0xf7).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); } @@ -67,9 +67,9 @@ void special_state::specimx_mem(address_map &map) map(0xffe4, 0xffe7).ram(); //external 8255 map(0xffe8, 0xffeb).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); map(0xffec, 0xffef).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); - map(0xfff0, 0xfff3).rw(this, FUNC(special_state::specimx_disk_ctrl_r), FUNC(special_state::specimx_disk_ctrl_w)); - map(0xfff8, 0xfffb).rw(this, FUNC(special_state::specimx_video_color_r), FUNC(special_state::specimx_video_color_w)); - map(0xfffc, 0xffff).w(this, FUNC(special_state::specimx_select_bank)); + map(0xfff0, 0xfff3).rw(FUNC(special_state::specimx_disk_ctrl_r), FUNC(special_state::specimx_disk_ctrl_w)); + map(0xfff8, 0xfffb).rw(FUNC(special_state::specimx_video_color_r), FUNC(special_state::specimx_video_color_w)); + map(0xfffc, 0xffff).w(FUNC(special_state::specimx_select_bank)); } /* Input ports */ diff --git a/src/mame/drivers/specpls3.cpp b/src/mame/drivers/specpls3.cpp index 0e6d0634e40..6756d3b16f8 100644 --- a/src/mame/drivers/specpls3.cpp +++ b/src/mame/drivers/specpls3.cpp @@ -308,13 +308,13 @@ The function decodes the ports appropriately */ void spectrum_state::spectrum_plus3_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x0000).rw(this, FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); - map(0x4000, 0x4000).w(this, FUNC(spectrum_state::spectrum_plus3_port_7ffd_w)).mirror(0x3ffd); + map(0x0000, 0x0000).rw(FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); + map(0x4000, 0x4000).w(FUNC(spectrum_state::spectrum_plus3_port_7ffd_w)).mirror(0x3ffd); map(0x8000, 0x8000).w("ay8912", FUNC(ay8910_device::data_w)).mirror(0x3ffd); map(0xc000, 0xc000).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)).mirror(0x3ffd); - map(0x1000, 0x1000).w(this, FUNC(spectrum_state::spectrum_plus3_port_1ffd_w)).mirror(0x0ffd); - map(0x2000, 0x2000).r(this, FUNC(spectrum_state::spectrum_plus3_port_2ffd_r)).mirror(0x0ffd); - map(0x3000, 0x3000).rw(this, FUNC(spectrum_state::spectrum_plus3_port_3ffd_r), FUNC(spectrum_state::spectrum_plus3_port_3ffd_w)).mirror(0x0ffd); + map(0x1000, 0x1000).w(FUNC(spectrum_state::spectrum_plus3_port_1ffd_w)).mirror(0x0ffd); + map(0x2000, 0x2000).r(FUNC(spectrum_state::spectrum_plus3_port_2ffd_r)).mirror(0x0ffd); + map(0x3000, 0x3000).rw(FUNC(spectrum_state::spectrum_plus3_port_3ffd_r), FUNC(spectrum_state::spectrum_plus3_port_3ffd_w)).mirror(0x0ffd); } void spectrum_state::spectrum_plus3_mem(address_map &map) diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index 73a756edf29..c73b9bc03b1 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -433,7 +433,7 @@ READ8_MEMBER(spectrum_state::spectrum_port_ula_r) void spectrum_state::spectrum_mem(address_map &map) { - map(0x0000, 0x3fff).rw(this, FUNC(spectrum_state::spectrum_rom_r), FUNC(spectrum_state::spectrum_rom_w)); + map(0x0000, 0x3fff).rw(FUNC(spectrum_state::spectrum_rom_r), FUNC(spectrum_state::spectrum_rom_w)); map(0x4000, 0x5aff).ram().share("video_ram"); // AM_RANGE(0x5b00, 0x7fff) AM_RAM // AM_RANGE(0x8000, 0xffff) AM_RAM @@ -443,8 +443,8 @@ void spectrum_state::spectrum_mem(address_map &map) The function decodes the ports appropriately */ void spectrum_state::spectrum_io(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); - map(0x01, 0x01).r(this, FUNC(spectrum_state::spectrum_port_ula_r)).mirror(0xfffe); + map(0x00, 0x00).rw(FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); + map(0x01, 0x01).r(FUNC(spectrum_state::spectrum_port_ula_r)).mirror(0xfffe); } /* Input ports */ diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp index 4a110026b3a..5dda53b5564 100644 --- a/src/mame/drivers/speedatk.cpp +++ b/src/mame/drivers/speedatk.cpp @@ -184,8 +184,8 @@ WRITE8_MEMBER(speedatk_state::key_matrix_status_w) void speedatk_state::speedatk_mem(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8000).rw(this, FUNC(speedatk_state::key_matrix_r), FUNC(speedatk_state::key_matrix_w)); - map(0x8001, 0x8001).rw(this, FUNC(speedatk_state::key_matrix_status_r), FUNC(speedatk_state::key_matrix_status_w)); + map(0x8000, 0x8000).rw(FUNC(speedatk_state::key_matrix_r), FUNC(speedatk_state::key_matrix_w)); + map(0x8001, 0x8001).rw(FUNC(speedatk_state::key_matrix_status_r), FUNC(speedatk_state::key_matrix_status_w)); map(0x8800, 0x8fff).ram(); map(0xa000, 0xa3ff).ram().share("videoram"); map(0xb000, 0xb3ff).ram().share("colorram"); @@ -195,7 +195,7 @@ void speedatk_state::speedatk_mem(address_map &map) void speedatk_state::speedatk_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).w(this, FUNC(speedatk_state::m6845_w)); //h46505 address / data routing + map(0x00, 0x01).w(FUNC(speedatk_state::m6845_w)); //h46505 address / data routing map(0x24, 0x24).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x40, 0x40).r("aysnd", FUNC(ay8910_device::data_r)); map(0x40, 0x41).w("aysnd", FUNC(ay8910_device::address_data_w)); diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp index 72c1d60198a..368740bc60d 100644 --- a/src/mame/drivers/speedbal.cpp +++ b/src/mame/drivers/speedbal.cpp @@ -59,8 +59,8 @@ void speedbal_state::main_cpu_map(address_map &map) { map(0x0000, 0xdbff).rom(); map(0xdc00, 0xdfff).ram().share("share1"); // shared with SOUND - map(0xe000, 0xe1ff).ram().w(this, FUNC(speedbal_state::background_videoram_w)).share("bg_videoram"); - map(0xe800, 0xefff).ram().w(this, FUNC(speedbal_state::foreground_videoram_w)).share("fg_videoram"); + map(0xe000, 0xe1ff).ram().w(FUNC(speedbal_state::background_videoram_w)).share("bg_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(speedbal_state::foreground_videoram_w)).share("fg_videoram"); map(0xf000, 0xf5ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf600, 0xfeff).ram(); map(0xff00, 0xffff).ram().share("spriteram"); @@ -78,8 +78,8 @@ void speedbal_state::main_cpu_io_map(address_map &map) map(0x10, 0x10).portr("DSW1"); map(0x20, 0x20).portr("P1"); map(0x30, 0x30).portr("P2"); - map(0x40, 0x40).w(this, FUNC(speedbal_state::coincounter_w)); - map(0x50, 0x50).w(this, FUNC(speedbal_state::maincpu_50_w)); + map(0x40, 0x40).w(FUNC(speedbal_state::coincounter_w)); + map(0x50, 0x50).w(FUNC(speedbal_state::maincpu_50_w)); } void speedbal_state::sound_cpu_map(address_map &map) @@ -125,10 +125,10 @@ void speedbal_state::sound_cpu_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); - map(0x40, 0x40).w(this, FUNC(speedbal_state::leds_output_block)); - map(0x80, 0x80).w(this, FUNC(speedbal_state::leds_start_block)); + map(0x40, 0x40).w(FUNC(speedbal_state::leds_output_block)); + map(0x80, 0x80).w(FUNC(speedbal_state::leds_start_block)); map(0x82, 0x82).nopw(); // ? - map(0xc1, 0xc1).w(this, FUNC(speedbal_state::leds_shift_bit)); + map(0xc1, 0xc1).w(FUNC(speedbal_state::leds_shift_bit)); } diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp index feb2cce13ca..d8c6f034a0b 100644 --- a/src/mame/drivers/speedspn.cpp +++ b/src/mame/drivers/speedspn.cpp @@ -97,8 +97,8 @@ void speedspn_state::program_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); /* RAM COLOUR */ - map(0x8800, 0x8fff).ram().w(this, FUNC(speedspn_state::attram_w)).share("attram"); - map(0x9000, 0x9fff).rw(this, FUNC(speedspn_state::vidram_r), FUNC(speedspn_state::vidram_w)); /* RAM FIX / RAM OBJECTS (selected by bit 0 of port 17) */ + map(0x8800, 0x8fff).ram().w(FUNC(speedspn_state::attram_w)).share("attram"); + map(0x9000, 0x9fff).rw(FUNC(speedspn_state::vidram_r), FUNC(speedspn_state::vidram_w)); /* RAM FIX / RAM OBJECTS (selected by bit 0 of port 17) */ map(0xa000, 0xa7ff).ram(); map(0xa800, 0xafff).ram(); map(0xb000, 0xbfff).ram(); /* RAM PROGRAM */ @@ -108,14 +108,14 @@ void speedspn_state::program_map(address_map &map) void speedspn_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x07, 0x07).w(this, FUNC(speedspn_state::display_disable_w)); + map(0x07, 0x07).w(FUNC(speedspn_state::display_disable_w)); map(0x10, 0x10).portr("SYSTEM"); map(0x11, 0x11).portr("P1"); - map(0x12, 0x12).portr("P2").w(this, FUNC(speedspn_state::rombank_w)); - map(0x13, 0x13).portr("DSW1").w(this, FUNC(speedspn_state::sound_w)); + map(0x12, 0x12).portr("P2").w(FUNC(speedspn_state::rombank_w)); + map(0x13, 0x13).portr("DSW1").w(FUNC(speedspn_state::sound_w)); map(0x14, 0x14).portr("DSW2"); - map(0x16, 0x16).r(this, FUNC(speedspn_state::irq_ack_r)); // @@@ could be watchdog, value is discarded - map(0x17, 0x17).w(this, FUNC(speedspn_state::vidram_bank_w)); + map(0x16, 0x16).r(FUNC(speedspn_state::irq_ack_r)); // @@@ could be watchdog, value is discarded + map(0x17, 0x17).w(FUNC(speedspn_state::vidram_bank_w)); } /* sound cpu */ @@ -124,7 +124,7 @@ void speedspn_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(speedspn_state::okibank_w)); + map(0x9000, 0x9000).w(FUNC(speedspn_state::okibank_w)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp index d581cae6fb2..d6cd23a5015 100644 --- a/src/mame/drivers/speglsht.cpp +++ b/src/mame/drivers/speglsht.cpp @@ -187,7 +187,7 @@ void speglsht_state::st0016_io(address_map &map) { map.global_mask(0xff); //AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) - map(0xe1, 0xe1).w(this, FUNC(speglsht_state::st0016_rom_bank_w)); + map(0xe1, 0xe1).w(FUNC(speglsht_state::st0016_rom_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) @@ -267,17 +267,17 @@ void speglsht_state::speglsht_mem(address_map &map) { map(0x00000000, 0x000fffff).ram(); map(0x01000000, 0x01007fff).ram(); //tested - STATIC RAM - map(0x01600000, 0x0160004f).rw(this, FUNC(speglsht_state::cop_r), FUNC(speglsht_state::cop_w)).share("cop_ram"); - map(0x01800200, 0x01800203).w(this, FUNC(speglsht_state::videoreg_w)); + map(0x01600000, 0x0160004f).rw(FUNC(speglsht_state::cop_r), FUNC(speglsht_state::cop_w)).share("cop_ram"); + map(0x01800200, 0x01800203).w(FUNC(speglsht_state::videoreg_w)); map(0x01800300, 0x01800303).portr("IN0"); map(0x01800400, 0x01800403).portr("IN1"); map(0x01a00000, 0x01afffff).ram().share("framebuffer"); map(0x01b00000, 0x01b07fff).ram(); //cleared ... video related ? map(0x01c00000, 0x01dfffff).rom().region("user2", 0); - map(0x0a000000, 0x0a003fff).rw(this, FUNC(speglsht_state::shared_r), FUNC(speglsht_state::shared_w)); + map(0x0a000000, 0x0a003fff).rw(FUNC(speglsht_state::shared_r), FUNC(speglsht_state::shared_w)); map(0x0fc00000, 0x0fdfffff).rom().mirror(0x10000000).region("user1", 0); map(0x1eff0000, 0x1eff001f).ram(); - map(0x1eff003c, 0x1eff003f).r(this, FUNC(speglsht_state::irq_ack_clear)); + map(0x1eff003c, 0x1eff003f).r(FUNC(speglsht_state::irq_ack_clear)); } static INPUT_PORTS_START( speglsht ) diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp index aef7e5a3155..b713e0c73e4 100644 --- a/src/mame/drivers/spinb.cpp +++ b/src/mame/drivers/spinb.cpp @@ -149,9 +149,9 @@ void spinb_state::spinb_map(address_map &map) map(0x6400, 0x6403).mirror(0x13fc).rw("ppi64", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x6800, 0x6803).mirror(0x13fc).rw("ppi68", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x6c00, 0x6c03).mirror(0x131c).rw("ppi6c", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x6c20, 0x6c3f).mirror(0x1300).w(this, FUNC(spinb_state::sndcmd_w)); - map(0x6c40, 0x6c45).mirror(0x1300).w(this, FUNC(spinb_state::lamp1_w)); - map(0x6c60, 0x6c60).mirror(0x1300).w(this, FUNC(spinb_state::disp_w)); + map(0x6c20, 0x6c3f).mirror(0x1300).w(FUNC(spinb_state::sndcmd_w)); + map(0x6c40, 0x6c45).mirror(0x1300).w(FUNC(spinb_state::lamp1_w)); + map(0x6c60, 0x6c60).mirror(0x1300).w(FUNC(spinb_state::disp_w)); map(0x6ce0, 0x6ce0).nopw(); } @@ -163,9 +163,9 @@ void spinb_state::vrnwrld_map(address_map &map) map(0xc400, 0xc403).mirror(0x13fc).rw("ppi64", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xc800, 0xc803).mirror(0x13fc).rw("ppi68", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xcc00, 0xcc03).mirror(0x131c).rw("ppi6c", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xcc20, 0xcc3f).mirror(0x1300).w(this, FUNC(spinb_state::sndcmd_w)); - map(0xcc40, 0xcc45).mirror(0x1300).w(this, FUNC(spinb_state::lamp1_w)); - map(0xcc60, 0xcc60).mirror(0x1300).w(this, FUNC(spinb_state::disp_w)); + map(0xcc20, 0xcc3f).mirror(0x1300).w(FUNC(spinb_state::sndcmd_w)); + map(0xcc40, 0xcc45).mirror(0x1300).w(FUNC(spinb_state::lamp1_w)); + map(0xcc60, 0xcc60).mirror(0x1300).w(FUNC(spinb_state::disp_w)); map(0xcce0, 0xcce0).nopw(); } @@ -174,8 +174,8 @@ void spinb_state::spinb_audio_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x3fff).ram(); // 6164 map(0x4000, 0x4003).mirror(0x1ffc).rw("ppia", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x6000, 0x6000).w(this, FUNC(spinb_state::sndbank_a_w)); - map(0x8000, 0x8000).r(this, FUNC(spinb_state::sndcmd_r)); + map(0x6000, 0x6000).w(FUNC(spinb_state::sndbank_a_w)); + map(0x8000, 0x8000).r(FUNC(spinb_state::sndcmd_r)); } void spinb_state::spinb_music_map(address_map &map) @@ -183,9 +183,9 @@ void spinb_state::spinb_music_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x3fff).ram(); // 6164 map(0x4000, 0x4003).mirror(0x1ffc).rw("ppim", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x6000, 0x6000).w(this, FUNC(spinb_state::sndbank_m_w)); - map(0x8000, 0x8000).r(this, FUNC(spinb_state::sndcmd_r)); - map(0xA000, 0xA000).w(this, FUNC(spinb_state::volume_w)); + map(0x6000, 0x6000).w(FUNC(spinb_state::sndbank_m_w)); + map(0x8000, 0x8000).r(FUNC(spinb_state::sndcmd_r)); + map(0xA000, 0xA000).w(FUNC(spinb_state::volume_w)); } void spinb_state::dmd_mem(address_map &map) @@ -195,8 +195,8 @@ void spinb_state::dmd_mem(address_map &map) void spinb_state::dmd_io(address_map &map) { - map(0x0000, 0x1fff).w(this, FUNC(spinb_state::dmdram_w)); - map(0x0000, 0xffff).r(this, FUNC(spinb_state::dmdram_r)); + map(0x0000, 0x1fff).w(FUNC(spinb_state::dmdram_w)); + map(0x0000, 0xffff).r(FUNC(spinb_state::dmdram_r)); } static INPUT_PORTS_START( spinb ) @@ -453,17 +453,17 @@ WRITE8_MEMBER( spinb_state::sndbank_m_w ) void spinb_state::update_sound_a() { if (m_sndbank_a != 0xff) - m_ic14a->ba_w(m_p_audio[m_sound_addr_a]); + m_ic14a->write_ba(m_p_audio[m_sound_addr_a]); else - m_ic14a->ba_w(0); + m_ic14a->write_ba(0); } void spinb_state::update_sound_m() { if (m_sndbank_m != 0xff) - m_ic14m->ba_w(m_p_music[m_sound_addr_m]); + m_ic14m->write_ba(m_p_music[m_sound_addr_m]); else - m_ic14m->ba_w(0); + m_ic14m->write_ba(0); } WRITE_LINE_MEMBER( spinb_state::ic5a_w ) diff --git a/src/mame/drivers/spirit76.cpp b/src/mame/drivers/spirit76.cpp index f658f1df49b..9194cb0c6b5 100644 --- a/src/mame/drivers/spirit76.cpp +++ b/src/mame/drivers/spirit76.cpp @@ -54,8 +54,8 @@ void spirit76_state::maincpu_map(address_map &map) // ADDRESS_MAP_GLOBAL_MASK(0xfff) // this could most likely go in once the memory map is sorted map(0x0000, 0x00ff).ram(); // 2x 2112 map(0x2200, 0x2203).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // 6820 - map(0x2400, 0x2400).r(this, FUNC(spirit76_state::unk_r)); - map(0x2401, 0x2401).w(this, FUNC(spirit76_state::unk_w)); + map(0x2400, 0x2400).r(FUNC(spirit76_state::unk_r)); + map(0x2401, 0x2401).w(FUNC(spirit76_state::unk_w)); map(0x0600, 0x0fff).rom().region("roms", 0); map(0xfe00, 0xffff).rom().region("roms", 0x800); } diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 93dceb955fd..1900eeadd57 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -86,7 +86,7 @@ void splash_state::splash_map(address_map &map) m_outlatch->write_d0(space, offset >> 3, data, mem_mask); }); map(0x84000f, 0x84000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x880000, 0x8817ff).ram().w(this, FUNC(splash_state::vram_w)).share("videoram"); /* Video RAM */ + map(0x880000, 0x8817ff).ram().w(FUNC(splash_state::vram_w)).share("videoram"); /* Video RAM */ map(0x881800, 0x881803).ram().share("vregs"); /* Scroll registers */ map(0x881804, 0x881fff).ram(); /* Work RAM */ map(0x8c0000, 0x8c0fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");/* Palette is xRRRRxGGGGxBBBBx */ @@ -113,8 +113,8 @@ WRITE_LINE_MEMBER(splash_state::splash_msm5205_int) void splash_state::splash_sound_map(address_map &map) { map(0x0000, 0xd7ff).rom(); /* ROM */ - map(0xd800, 0xd800).w(this, FUNC(splash_state::splash_adpcm_data_w)); /* ADPCM data for the MSM5205 chip */ - map(0xe000, 0xe000).w(this, FUNC(splash_state::splash_adpcm_control_w)); + map(0xd800, 0xd800).w(FUNC(splash_state::splash_adpcm_data_w)); /* ADPCM data for the MSM5205 chip */ + map(0xe000, 0xe000).w(FUNC(splash_state::splash_adpcm_control_w)); map(0xe800, 0xe800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* Sound latch */ map(0xf000, 0xf001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); /* YM3812 */ map(0xf800, 0xffff).ram(); /* RAM */ @@ -169,11 +169,11 @@ void splash_state::roldfrog_map(address_map &map) m_outlatch->write_d0(space, offset >> 3, data, mem_mask); }); map(0x84000f, 0x84000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x880000, 0x8817ff).ram().w(this, FUNC(splash_state::vram_w)).share("videoram"); /* Video RAM */ + map(0x880000, 0x8817ff).ram().w(FUNC(splash_state::vram_w)).share("videoram"); /* Video RAM */ map(0x881800, 0x881803).ram().share("vregs"); /* Scroll registers */ map(0x881804, 0x881fff).ram(); /* Work RAM */ map(0x8c0000, 0x8c0fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");/* Palette is xRRRRxGGGGxBBBBx */ - map(0xa00000, 0xa00001).r(this, FUNC(splash_state::roldfrog_bombs_r)); + map(0xa00000, 0xa00001).r(FUNC(splash_state::roldfrog_bombs_r)); map(0xd00000, 0xd00fff).ram().share("spriteram"); /* Sprite RAM */ map(0xe00000, 0xe00001).writeonly().share("bitmap_mode"); /* Bitmap Mode? */ map(0xffc000, 0xffffff).ram(); /* Work RAM */ @@ -196,12 +196,12 @@ void splash_state::roldfrog_sound_io_map(address_map &map) { map.global_mask(0xff); map(0x10, 0x11).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x31, 0x31).w(this, FUNC(splash_state::sound_bank_w)); - map(0x37, 0x37).w(this, FUNC(splash_state::roldfrog_vblank_ack_w)); + map(0x31, 0x31).w(FUNC(splash_state::sound_bank_w)); + map(0x37, 0x37).w(FUNC(splash_state::roldfrog_vblank_ack_w)); map(0x40, 0x40).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0x70, 0x70).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x20, 0x23).r(this, FUNC(splash_state::roldfrog_unk_r)); + map(0x20, 0x23).r(FUNC(splash_state::roldfrog_unk_r)); } READ16_MEMBER(funystrp_state::spr_read) @@ -233,13 +233,13 @@ void funystrp_state::funystrp_map(address_map &map) map(0x840006, 0x840007).portr("P2"); map(0x840008, 0x840009).portr("SYSTEM"); map(0x84000a, 0x84000b).nopr(); - map(0x84000a, 0x84000a).w(this, FUNC(funystrp_state::eeprom_w)); + map(0x84000a, 0x84000a).w(FUNC(funystrp_state::eeprom_w)); map(0x84000e, 0x84000e).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x880000, 0x8817ff).ram().w(this, FUNC(funystrp_state::vram_w)).share("videoram"); /* Video RAM */ + map(0x880000, 0x8817ff).ram().w(FUNC(funystrp_state::vram_w)).share("videoram"); /* Video RAM */ map(0x881800, 0x881803).ram().share("vregs"); /* Scroll registers */ map(0x881804, 0x881fff).ram(); map(0x8c0000, 0x8c0fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");/* Palette is xRRRRxGGGGxBBBBx */ - map(0xd00000, 0xd01fff).rw(this, FUNC(funystrp_state::spr_read), FUNC(funystrp_state::spr_write)).share("spriteram"); /* Sprite RAM */ + map(0xd00000, 0xd01fff).rw(FUNC(funystrp_state::spr_read), FUNC(funystrp_state::spr_write)).share("spriteram"); /* Sprite RAM */ map(0xfe0000, 0xfeffff).ram().mirror(0x10000); /* there's fe0000 <-> ff0000 compare */ /* Work RAM */ } @@ -282,13 +282,13 @@ WRITE8_MEMBER(funystrp_state::msm2_data_w) void funystrp_state::funystrp_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(funystrp_state::msm1_data_w)); - map(0x01, 0x01).w(this, FUNC(funystrp_state::msm2_data_w)); - map(0x02, 0x02).w(this, FUNC(funystrp_state::sound_bank_w)); + map(0x00, 0x00).w(FUNC(funystrp_state::msm1_data_w)); + map(0x01, 0x01).w(FUNC(funystrp_state::msm2_data_w)); + map(0x02, 0x02).w(FUNC(funystrp_state::sound_bank_w)); map(0x03, 0x03).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x04, 0x04).r(this, FUNC(funystrp_state::int_source_r)); - map(0x06, 0x06).w(this, FUNC(funystrp_state::msm1_interrupt_w)); - map(0x07, 0x07).w(this, FUNC(funystrp_state::msm2_interrupt_w)); + map(0x04, 0x04).r(FUNC(funystrp_state::int_source_r)); + map(0x06, 0x06).w(FUNC(funystrp_state::msm1_interrupt_w)); + map(0x07, 0x07).w(FUNC(funystrp_state::msm2_interrupt_w)); } diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp index edb7f20e548..78302502a4c 100644 --- a/src/mame/drivers/splus.cpp +++ b/src/mame/drivers/splus.cpp @@ -590,32 +590,32 @@ void splus_state::splus_map(address_map &map) void splus_state::splus_iomap(address_map &map) { // Serial I/O - map(0x0000, 0x0000).r(this, FUNC(splus_state::splus_serial_r)).w(this, FUNC(splus_state::splus_serial_w)); + map(0x0000, 0x0000).r(FUNC(splus_state::splus_serial_r)).w(FUNC(splus_state::splus_serial_w)); // Battery-backed RAM (Lower 4K) 0x1500-0x16ff eeprom staging area map(0x1000, 0x1fff).ram().share("cmosl"); // Watchdog, 7-segment Display - map(0x2000, 0x2000).rw(this, FUNC(splus_state::splus_watchdog_r), FUNC(splus_state::splus_7seg_w)); + map(0x2000, 0x2000).rw(FUNC(splus_state::splus_watchdog_r), FUNC(splus_state::splus_7seg_w)); // DUART - map(0x3000, 0x300f).rw(this, FUNC(splus_state::splus_duart_r), FUNC(splus_state::splus_duart_w)); + map(0x3000, 0x300f).rw(FUNC(splus_state::splus_duart_r), FUNC(splus_state::splus_duart_w)); // Dip Switches, Sound map(0x4000, 0x4000).portr("SW1").w("aysnd", FUNC(ay8910_device::address_w)); map(0x4001, 0x4001).w("aysnd", FUNC(ay8910_device::data_w)); // Reel Optics, EEPROM - map(0x5000, 0x5000).r(this, FUNC(splus_state::splus_reel_optics_r)).w(this, FUNC(splus_state::i2c_nvram_w)); + map(0x5000, 0x5000).r(FUNC(splus_state::splus_reel_optics_r)).w(FUNC(splus_state::i2c_nvram_w)); // Reset Registers in Realtime Clock, Serial I/O Load Pulse - map(0x6000, 0x6000).rw(this, FUNC(splus_state::splus_registers_r), FUNC(splus_state::splus_load_pulse_w)); + map(0x6000, 0x6000).rw(FUNC(splus_state::splus_registers_r), FUNC(splus_state::splus_load_pulse_w)); // Battery-backed RAM (Upper 4K) map(0x7000, 0x7fff).ram().share("cmosh"); // SSxxxx Reel Chip - map(0x8000, 0x9fff).r(this, FUNC(splus_state::splus_m_reel_ram_r)).share("reel_ram"); + map(0x8000, 0x9fff).r(FUNC(splus_state::splus_m_reel_ram_r)).share("reel_ram"); } /************************* diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp index 41264a5ec3c..edd9cfea0e2 100644 --- a/src/mame/drivers/spoker.cpp +++ b/src/mame/drivers/spoker.cpp @@ -278,15 +278,15 @@ void spoker_state::spoker_portmap(address_map &map) map(0x0000, 0x003f).ram(); // Z180 internal regs map(0x2000, 0x23ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2400, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0x3000, 0x33ff).ram().w(this, FUNC(spoker_state::bg_tile_w)).share("bg_tile_ram"); - map(0x5000, 0x5fff).ram().w(this, FUNC(spoker_state::fg_tile_w)).share("fg_tile_ram"); + map(0x3000, 0x33ff).ram().w(FUNC(spoker_state::bg_tile_w)).share("bg_tile_ram"); + map(0x5000, 0x5fff).ram().w(FUNC(spoker_state::fg_tile_w)).share("fg_tile_ram"); map(0x6480, 0x6483).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* NMI and coins (w), service (r), coins (r) */ map(0x6490, 0x6493).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* buttons 1 (r), video and leds (w), leds (w) */ map(0x64a0, 0x64a0).portr("BUTTONS2"); map(0x64b0, 0x64b1).w("ymsnd", FUNC(ym2413_device::write)); map(0x64c0, 0x64c0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x64d0, 0x64d1).rw(this, FUNC(spoker_state::magic_r), FUNC(spoker_state::magic_w)); // DSW1-5 - map(0x7000, 0x7fff).ram().w(this, FUNC(spoker_state::fg_color_w)).share("fg_color_ram"); + map(0x64d0, 0x64d1).rw(FUNC(spoker_state::magic_r), FUNC(spoker_state::magic_w)); // DSW1-5 + map(0x7000, 0x7fff).ram().w(FUNC(spoker_state::fg_color_w)).share("fg_color_ram"); } void spoker_state::_3super8_portmap(address_map &map) @@ -294,14 +294,14 @@ void spoker_state::_3super8_portmap(address_map &map) // AM_RANGE(0x1000, 0x1fff) AM_WRITENOP map(0x2000, 0x27ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x2800, 0x2fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); - map(0x3000, 0x33ff).ram().w(this, FUNC(spoker_state::bg_tile_w)).share("bg_tile_ram"); + map(0x3000, 0x33ff).ram().w(FUNC(spoker_state::bg_tile_w)).share("bg_tile_ram"); map(0x4000, 0x4000).portr("DSW1"); map(0x4001, 0x4001).portr("DSW2"); map(0x4002, 0x4002).portr("DSW3"); map(0x4003, 0x4003).portr("DSW4"); map(0x4004, 0x4004).portr("DSW5"); // AM_RANGE(0x4000, 0x40ff) AM_WRITENOP - map(0x5000, 0x5fff).ram().w(this, FUNC(spoker_state::fg_tile_w)).share("fg_tile_ram"); + map(0x5000, 0x5fff).ram().w(FUNC(spoker_state::fg_tile_w)).share("fg_tile_ram"); // The following one (0x6480) should be output. At beginning of code, there is a PPI initialization // setting O-I-I for ports ABC. Except these routines are just a leftover from the original game, @@ -311,10 +311,10 @@ void spoker_state::_3super8_portmap(address_map &map) map(0x6491, 0x6491).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x64a0, 0x64a0).portr("IN2"); - map(0x64b0, 0x64b0).w(this, FUNC(spoker_state::leds_w)); + map(0x64b0, 0x64b0).w(FUNC(spoker_state::leds_w)); map(0x64c0, 0x64c0).nopr(); //irq ack? - map(0x64f0, 0x64f0).w(this, FUNC(spoker_state::nmi_and_coins_w)); - map(0x7000, 0x7fff).ram().w(this, FUNC(spoker_state::fg_color_w)).share("fg_color_ram"); + map(0x64f0, 0x64f0).w(FUNC(spoker_state::nmi_and_coins_w)); + map(0x7000, 0x7fff).ram().w(FUNC(spoker_state::fg_color_w)).share("fg_color_ram"); } diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp index fd30bf607be..a7ffc30b7bb 100644 --- a/src/mame/drivers/spool99.cpp +++ b/src/mame/drivers/spool99.cpp @@ -233,17 +233,17 @@ void spool99_state::spool99_map(address_map &map) { map(0x0000, 0x00ff).ram().share("mainram"); map(0x0100, 0xaeff).rom().region("maincpu", 0x100).nopw(); - map(0xaf00, 0xafff).r(this, FUNC(spool99_state::spool99_io_r)); - map(0xafed, 0xafed).w(this, FUNC(spool99_state::eeprom_resetline_w)); - map(0xafee, 0xafee).w(this, FUNC(spool99_state::eeprom_clockline_w)); - map(0xafef, 0xafef).w(this, FUNC(spool99_state::eeprom_dataline_w)); + map(0xaf00, 0xafff).r(FUNC(spool99_state::spool99_io_r)); + map(0xafed, 0xafed).w(FUNC(spool99_state::eeprom_resetline_w)); + map(0xafee, 0xafee).w(FUNC(spool99_state::eeprom_clockline_w)); + map(0xafef, 0xafef).w(FUNC(spool99_state::eeprom_dataline_w)); map(0xaff8, 0xaff8).w(m_oki, FUNC(okim6295_device::write)); map(0xb000, 0xb3ff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0xb800, 0xdfff).ram(); - map(0xe000, 0xefff).ram().w(this, FUNC(spool99_state::vram_w)).share("vram"); - map(0xf000, 0xffff).ram().w(this, FUNC(spool99_state::cram_w)).share("cram"); + map(0xe000, 0xefff).ram().w(FUNC(spool99_state::vram_w)).share("vram"); + map(0xf000, 0xffff).ram().w(FUNC(spool99_state::cram_w)).share("cram"); } READ8_MEMBER(spool99_state::vcarn_io_r) @@ -280,18 +280,18 @@ void spool99_state::vcarn_map(address_map &map) { map(0x0000, 0x00ff).ram().share("mainram"); map(0x0100, 0xa6ff).rom().region("maincpu", 0x100).nopw(); - map(0xa700, 0xa7ff).r(this, FUNC(spool99_state::vcarn_io_r)); - map(0xa745, 0xa745).w(this, FUNC(spool99_state::eeprom_resetline_w)); - map(0xa746, 0xa746).w(this, FUNC(spool99_state::eeprom_clockline_w)); - map(0xa747, 0xa747).w(this, FUNC(spool99_state::eeprom_dataline_w)); + map(0xa700, 0xa7ff).r(FUNC(spool99_state::vcarn_io_r)); + map(0xa745, 0xa745).w(FUNC(spool99_state::eeprom_resetline_w)); + map(0xa746, 0xa746).w(FUNC(spool99_state::eeprom_clockline_w)); + map(0xa747, 0xa747).w(FUNC(spool99_state::eeprom_dataline_w)); map(0xa780, 0xa780).w(m_oki, FUNC(okim6295_device::write)); map(0xa800, 0xabff).ram().w("palette", FUNC(palette_device::write8)).share("palette"); map(0xb000, 0xdfff).ram(); // AM_RANGE(0xdf00, 0xdfff) AM_READWRITE(vcarn_io_r,vcarn_io_w) AM_SHARE("vcarn_io") - map(0xe000, 0xefff).ram().w(this, FUNC(spool99_state::vram_w)).share("vram"); - map(0xf000, 0xffff).ram().w(this, FUNC(spool99_state::cram_w)).share("cram"); + map(0xe000, 0xefff).ram().w(FUNC(spool99_state::vram_w)).share("vram"); + map(0xf000, 0xffff).ram().w(FUNC(spool99_state::cram_w)).share("cram"); } diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp index 9ec4d68c2e2..e763d96efd0 100644 --- a/src/mame/drivers/sprcros2.cpp +++ b/src/mame/drivers/sprcros2.cpp @@ -65,15 +65,15 @@ class sprcros2_state : public driver_device { public: sprcros2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_master_cpu(*this, "master_cpu"), - m_slave_cpu(*this, "slave_cpu"), - m_gfxdecode(*this, "gfxdecode"), - m_fgvram(*this, "fgvram"), - m_fgattr(*this, "fgattr"), - m_bgvram(*this, "bgvram"), - m_bgattr(*this, "bgattr"), - m_sprram(*this, "sprram") + : driver_device(mconfig, type, tag) + , m_master_cpu(*this, "master_cpu") + , m_slave_cpu(*this, "slave_cpu") + , m_gfxdecode(*this, "gfxdecode") + , m_fgvram(*this, "fgvram") + , m_fgattr(*this, "fgattr") + , m_bgvram(*this, "bgvram") + , m_bgattr(*this, "bgattr") + , m_sprram(*this, "sprram") { } // devices @@ -257,12 +257,12 @@ void sprcros2_state::master_map(address_map &map) void sprcros2_state::master_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::write)); - map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::write)); - map(0x02, 0x02).portr("EXTRA").w("sn3", FUNC(sn76489_device::write)); + map(0x00, 0x00).portr("P1").w("sn1", FUNC(sn76489_device::command_w)); + map(0x01, 0x01).portr("P2").w("sn2", FUNC(sn76489_device::command_w)); + map(0x02, 0x02).portr("EXTRA").w("sn3", FUNC(sn76489_device::command_w)); map(0x04, 0x04).portr("DSW1"); map(0x05, 0x05).portr("DSW2"); - map(0x07, 0x07).w(this, FUNC(sprcros2_state::master_output_w)); + map(0x07, 0x07).w(FUNC(sprcros2_state::master_output_w)); } void sprcros2_state::slave_map(address_map &map) @@ -278,9 +278,9 @@ void sprcros2_state::slave_map(address_map &map) void sprcros2_state::slave_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(sprcros2_state::bg_scrollx_w)); - map(0x01, 0x01).w(this, FUNC(sprcros2_state::bg_scrolly_w)); - map(0x03, 0x03).w(this, FUNC(sprcros2_state::slave_output_w)); + map(0x00, 0x00).w(FUNC(sprcros2_state::bg_scrollx_w)); + map(0x01, 0x01).w(FUNC(sprcros2_state::bg_scrolly_w)); + map(0x03, 0x03).w(FUNC(sprcros2_state::slave_output_w)); } static INPUT_PORTS_START( sprcros2 ) diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp index 8ef6cb85b00..2d26099221f 100644 --- a/src/mame/drivers/sprint2.cpp +++ b/src/mame/drivers/sprint2.cpp @@ -225,24 +225,24 @@ WRITE8_MEMBER(sprint2_state::sprint2_noise_reset_w) void sprint2_state::sprint2_map(address_map &map) { map.global_mask(0x3fff); - map(0x0000, 0x03ff).rw(this, FUNC(sprint2_state::sprint2_wram_r), FUNC(sprint2_state::sprint2_wram_w)); - map(0x0400, 0x07ff).ram().w(this, FUNC(sprint2_state::sprint2_video_ram_w)).share("video_ram"); - map(0x0818, 0x081f).r(this, FUNC(sprint2_state::sprint2_input_A_r)); - map(0x0828, 0x082f).r(this, FUNC(sprint2_state::sprint2_input_B_r)); - map(0x0830, 0x0837).r(this, FUNC(sprint2_state::sprint2_dip_r)); + map(0x0000, 0x03ff).rw(FUNC(sprint2_state::sprint2_wram_r), FUNC(sprint2_state::sprint2_wram_w)); + map(0x0400, 0x07ff).ram().w(FUNC(sprint2_state::sprint2_video_ram_w)).share("video_ram"); + map(0x0818, 0x081f).r(FUNC(sprint2_state::sprint2_input_A_r)); + map(0x0828, 0x082f).r(FUNC(sprint2_state::sprint2_input_B_r)); + map(0x0830, 0x0837).r(FUNC(sprint2_state::sprint2_dip_r)); map(0x0840, 0x087f).portr("COIN"); - map(0x0880, 0x08bf).r(this, FUNC(sprint2_state::sprint2_steering1_r)); - map(0x08c0, 0x08ff).r(this, FUNC(sprint2_state::sprint2_steering2_r)); - map(0x0c00, 0x0fff).r(this, FUNC(sprint2_state::sprint2_sync_r)); - map(0x0c00, 0x0c7f).w(this, FUNC(sprint2_state::output_latch_w)); + map(0x0880, 0x08bf).r(FUNC(sprint2_state::sprint2_steering1_r)); + map(0x08c0, 0x08ff).r(FUNC(sprint2_state::sprint2_steering2_r)); + map(0x0c00, 0x0fff).r(FUNC(sprint2_state::sprint2_sync_r)); + map(0x0c00, 0x0c7f).w(FUNC(sprint2_state::output_latch_w)); map(0x0c80, 0x0cff).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); - map(0x0d00, 0x0d7f).w(this, FUNC(sprint2_state::sprint2_collision_reset1_w)); - map(0x0d80, 0x0dff).w(this, FUNC(sprint2_state::sprint2_collision_reset2_w)); - map(0x0e00, 0x0e7f).w(this, FUNC(sprint2_state::sprint2_steering_reset1_w)); - map(0x0e80, 0x0eff).w(this, FUNC(sprint2_state::sprint2_steering_reset2_w)); - map(0x0f00, 0x0f7f).w(this, FUNC(sprint2_state::sprint2_noise_reset_w)); - map(0x1000, 0x13ff).r(this, FUNC(sprint2_state::sprint2_collision1_r)); - map(0x1400, 0x17ff).r(this, FUNC(sprint2_state::sprint2_collision2_r)); + map(0x0d00, 0x0d7f).w(FUNC(sprint2_state::sprint2_collision_reset1_w)); + map(0x0d80, 0x0dff).w(FUNC(sprint2_state::sprint2_collision_reset2_w)); + map(0x0e00, 0x0e7f).w(FUNC(sprint2_state::sprint2_steering_reset1_w)); + map(0x0e80, 0x0eff).w(FUNC(sprint2_state::sprint2_steering_reset2_w)); + map(0x0f00, 0x0f7f).w(FUNC(sprint2_state::sprint2_noise_reset_w)); + map(0x1000, 0x13ff).r(FUNC(sprint2_state::sprint2_collision1_r)); + map(0x1400, 0x17ff).r(FUNC(sprint2_state::sprint2_collision2_r)); map(0x1800, 0x1800).nopr(); /* debugger ROM location? */ map(0x2000, 0x3fff).rom(); } diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp index 0e6cc849e02..2f3851b4586 100644 --- a/src/mame/drivers/sprint4.cpp +++ b/src/mame/drivers/sprint4.cpp @@ -222,21 +222,21 @@ void sprint4_state::sprint4_cpu_map(address_map &map) map.global_mask(0x3fff); - map(0x0080, 0x00ff).mirror(0x700).rw(this, FUNC(sprint4_state::wram_r), FUNC(sprint4_state::wram_w)); - map(0x0800, 0x0bff).mirror(0x400).ram().w(this, FUNC(sprint4_state::video_ram_w)).share("videoram"); + map(0x0080, 0x00ff).mirror(0x700).rw(FUNC(sprint4_state::wram_r), FUNC(sprint4_state::wram_w)); + map(0x0800, 0x0bff).mirror(0x400).ram().w(FUNC(sprint4_state::video_ram_w)).share("videoram"); - map(0x0000, 0x0007).mirror(0x718).r(this, FUNC(sprint4_state::analog_r)); - map(0x0020, 0x0027).mirror(0x718).r(this, FUNC(sprint4_state::coin_r)); - map(0x0040, 0x0047).mirror(0x718).r(this, FUNC(sprint4_state::collision_r)); - map(0x0060, 0x0063).mirror(0x71c).r(this, FUNC(sprint4_state::options_r)); + map(0x0000, 0x0007).mirror(0x718).r(FUNC(sprint4_state::analog_r)); + map(0x0020, 0x0027).mirror(0x718).r(FUNC(sprint4_state::coin_r)); + map(0x0040, 0x0047).mirror(0x718).r(FUNC(sprint4_state::collision_r)); + map(0x0060, 0x0063).mirror(0x71c).r(FUNC(sprint4_state::options_r)); map(0x1000, 0x17ff).portr("IN0"); map(0x1800, 0x1fff).portr("IN1"); - map(0x0000, 0x0000).mirror(0x71f).w(this, FUNC(sprint4_state::attract_w)); - map(0x0020, 0x0027).mirror(0x718).w(this, FUNC(sprint4_state::collision_reset_w)); - map(0x0040, 0x0041).mirror(0x718).w(this, FUNC(sprint4_state::da_latch_w)); - map(0x0042, 0x0043).mirror(0x718).w(this, FUNC(sprint4_state::bang_w)); + map(0x0000, 0x0000).mirror(0x71f).w(FUNC(sprint4_state::attract_w)); + map(0x0020, 0x0027).mirror(0x718).w(FUNC(sprint4_state::collision_reset_w)); + map(0x0040, 0x0041).mirror(0x718).w(FUNC(sprint4_state::da_latch_w)); + map(0x0042, 0x0043).mirror(0x718).w(FUNC(sprint4_state::bang_w)); map(0x0044, 0x0045).mirror(0x718).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x0060, 0x006f).mirror(0x710).w("latch", FUNC(f9334_device::write_a0)); diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp index a1dd5e84d53..50ca37bf8ca 100644 --- a/src/mame/drivers/sprint8.cpp +++ b/src/mame/drivers/sprint8.cpp @@ -112,16 +112,16 @@ WRITE_LINE_MEMBER(sprint8_state::team_w) void sprint8_state::sprint8_map(address_map &map) { map(0x0000, 0x00ff).ram(); - map(0x1800, 0x1bff).ram().w(this, FUNC(sprint8_state::video_ram_w)).share("video_ram"); - map(0x1c00, 0x1c00).r(this, FUNC(sprint8_state::collision_r)); - map(0x1c01, 0x1c08).r(this, FUNC(sprint8_state::input_r)); + map(0x1800, 0x1bff).ram().w(FUNC(sprint8_state::video_ram_w)).share("video_ram"); + map(0x1c00, 0x1c00).r(FUNC(sprint8_state::collision_r)); + map(0x1c01, 0x1c08).r(FUNC(sprint8_state::input_r)); map(0x1c09, 0x1c09).portr("IN0"); map(0x1c0a, 0x1c0a).portr("IN1"); map(0x1c0f, 0x1c0f).portr("VBLANK"); map(0x1c00, 0x1c0f).writeonly().share("pos_h_ram"); map(0x1c10, 0x1c1f).writeonly().share("pos_v_ram"); map(0x1c20, 0x1c2f).writeonly().share("pos_d_ram"); - map(0x1c30, 0x1c37).w(this, FUNC(sprint8_state::lockout_w)); + map(0x1c30, 0x1c37).w(FUNC(sprint8_state::lockout_w)); map(0x1d00, 0x1d07).w("latch", FUNC(f9334_device::write_d0)); map(0x1e00, 0x1e07).w("motor", FUNC(f9334_device::write_d0)); map(0x1f00, 0x1f00).nopw(); /* probably a watchdog, disabled in service mode */ diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp index 8093f69d9bf..c7a6aa51e75 100644 --- a/src/mame/drivers/spy.cpp +++ b/src/mame/drivers/spy.cpp @@ -376,14 +376,14 @@ WRITE8_MEMBER(spy_state::k052109_051960_w) void spy_state::spy_map(address_map &map) { - map(0x0000, 0x07ff).rw(this, FUNC(spy_state::spy_bankedram1_r), FUNC(spy_state::spy_bankedram1_w)).share("ram"); + map(0x0000, 0x07ff).rw(FUNC(spy_state::spy_bankedram1_r), FUNC(spy_state::spy_bankedram1_w)).share("ram"); map(0x0800, 0x1aff).ram(); - map(0x2000, 0x5fff).rw(this, FUNC(spy_state::k052109_051960_r), FUNC(spy_state::k052109_051960_w)); - map(0x3f80, 0x3f80).w(this, FUNC(spy_state::bankswitch_w)); - map(0x3f90, 0x3f90).w(this, FUNC(spy_state::spy_3f90_w)); + map(0x2000, 0x5fff).rw(FUNC(spy_state::k052109_051960_r), FUNC(spy_state::k052109_051960_w)); + map(0x3f80, 0x3f80).w(FUNC(spy_state::bankswitch_w)); + map(0x3f90, 0x3f90).w(FUNC(spy_state::spy_3f90_w)); map(0x3fa0, 0x3fa0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3fb0, 0x3fb0).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x3fc0, 0x3fc0).w(this, FUNC(spy_state::spy_sh_irqtrigger_w)); + map(0x3fc0, 0x3fc0).w(FUNC(spy_state::spy_sh_irqtrigger_w)); map(0x3fd0, 0x3fd0).portr("SYSTEM"); map(0x3fd1, 0x3fd1).portr("P1"); map(0x3fd2, 0x3fd2).portr("P2"); @@ -397,7 +397,7 @@ void spy_state::spy_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(spy_state::sound_bank_w)); + map(0x9000, 0x9000).w(FUNC(spy_state::sound_bank_w)); map(0xa000, 0xa00d).rw(m_k007232_1, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xb000, 0xb00d).rw(m_k007232_2, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 6405dbddc75..1bb1ad5fb76 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -432,16 +432,16 @@ void spyhuntertec_state::spyhuntertec_map(address_map &map) map(0xa800, 0xa8ff).ram(); // the ROM is a solid fill in these areas, and they get tested as RAM, I think they moved the 'real' scroll regs here map(0xa900, 0xa9ff).ram(); - map(0xe000, 0xe7ff).ram().w(this, FUNC(spyhuntertec_state::spyhunt_videoram_w)).share("videoram"); - map(0xe800, 0xebff).mirror(0x0400).ram().w(this, FUNC(spyhuntertec_state::spyhunt_alpharam_w)).share("spyhunt_alpha"); + map(0xe000, 0xe7ff).ram().w(FUNC(spyhuntertec_state::spyhunt_videoram_w)).share("videoram"); + map(0xe800, 0xebff).mirror(0x0400).ram().w(FUNC(spyhuntertec_state::spyhunt_alpharam_w)).share("spyhunt_alpha"); map(0xf000, 0xf7ff).ram(); //AM_SHARE("nvram") map(0xf800, 0xf9ff).ram().share("spriteram"); // origional spriteram - map(0xfa00, 0xfa7f).mirror(0x0180).ram().w(this, FUNC(spyhuntertec_state::spyhuntertec_paletteram_w)).share("paletteram"); + map(0xfa00, 0xfa7f).mirror(0x0180).ram().w(FUNC(spyhuntertec_state::spyhuntertec_paletteram_w)).share("paletteram"); map(0xfc00, 0xfc00).portr("DSW0"); map(0xfc01, 0xfc01).portr("DSW1"); - map(0xfc02, 0xfc02).r(this, FUNC(spyhuntertec_state::spyhuntertec_in2_r)); - map(0xfc03, 0xfc03).r(this, FUNC(spyhuntertec_state::spyhuntertec_in3_r)); + map(0xfc02, 0xfc02).r(FUNC(spyhuntertec_state::spyhuntertec_in2_r)); + map(0xfc03, 0xfc03).r(FUNC(spyhuntertec_state::spyhuntertec_in3_r)); map(0xfd00, 0xfd00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); @@ -462,11 +462,11 @@ void spyhuntertec_state::spyhuntertec_portmap(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x04, 0x04).w(this, FUNC(spyhuntertec_state::spyhuntertec_port04_w)); - map(0x84, 0x86).w(this, FUNC(spyhuntertec_state::spyhunt_scroll_value_w)); + map(0x04, 0x04).w(FUNC(spyhuntertec_state::spyhuntertec_port04_w)); + map(0x84, 0x86).w(FUNC(spyhuntertec_state::spyhunt_scroll_value_w)); map(0xe0, 0xe0).nopw(); // was watchdog // AM_RANGE(0xe8, 0xe8) AM_WRITENOP - map(0xf0, 0xf0).w(this, FUNC(spyhuntertec_state::spyhuntertec_portf0_w)); + map(0xf0, 0xf0).w(FUNC(spyhuntertec_state::spyhuntertec_portf0_w)); } @@ -489,7 +489,7 @@ void spyhuntertec_state::spyhuntertec_sound_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(spyhuntertec_state::sound_irq_ack)); + map(0x00, 0x00).w(FUNC(spyhuntertec_state::sound_irq_ack)); map(0x0012, 0x0013).w("ay3", FUNC(ay8912_device::address_data_w)); map(0x0012, 0x0012).r("ay3", FUNC(ay8912_device::data_r)); diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index 9290d62b49d..c7586bc512c 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -622,16 +622,16 @@ void squale_state::squale_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0xefff).ram(); map(0xf000, 0xf00f).rw(m_ef9365, FUNC(ef9365_device::data_r), FUNC(ef9365_device::data_w)); - map(0xf010, 0xf01f).w(this, FUNC(squale_state::ctrl_w)); - map(0xf020, 0xf02f).r(this, FUNC(squale_state::video_ram_read_reg1)); - map(0xf030, 0xf03f).r(this, FUNC(squale_state::video_ram_read_reg2)); + map(0xf010, 0xf01f).w(FUNC(squale_state::ctrl_w)); + map(0xf020, 0xf02f).r(FUNC(squale_state::video_ram_read_reg1)); + map(0xf030, 0xf03f).r(FUNC(squale_state::video_ram_read_reg2)); map(0xf044, 0xf047).rw(m_pia_u75, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xf048, 0xf04b).rw(m_pia_u72, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xf050, 0xf05f).rw(m_acia, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); map(0xf060, 0xf06f).rw(m_ay8910, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0xf080, 0xf083).rw(m_fdc, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); - map(0xf08a, 0xf08a).rw(this, FUNC(squale_state::fdc_sel0_r), FUNC(squale_state::fdc_sel0_w)); - map(0xf08b, 0xf08b).rw(this, FUNC(squale_state::fdc_sel1_r), FUNC(squale_state::fdc_sel1_w)); + map(0xf08a, 0xf08a).rw(FUNC(squale_state::fdc_sel0_r), FUNC(squale_state::fdc_sel0_w)); + map(0xf08b, 0xf08b).rw(FUNC(squale_state::fdc_sel1_r), FUNC(squale_state::fdc_sel1_w)); map(0xf100, 0xffff).bankr("rom_bank"); } diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index 3efffe5bfdd..1ef157a9956 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -400,15 +400,15 @@ void srmp2_state::srmp2_map(address_map &map) map(0x180000, 0x1805ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); /* Sprites Y */ map(0x180600, 0x180607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); map(0x1c0000, 0x1c0001).nopw(); /* ??? */ - map(0x800000, 0x800001).w(this, FUNC(srmp2_state::srmp2_flags_w)); /* ADPCM bank, Color bank, etc. */ + map(0x800000, 0x800001).w(FUNC(srmp2_state::srmp2_flags_w)); /* ADPCM bank, Color bank, etc. */ map(0x900000, 0x900001).portr("SYSTEM"); /* Coinage */ map(0x900000, 0x900001).nopw(); /* ??? */ - map(0xa00001, 0xa00001).rw(this, FUNC(srmp2_state::iox_mux_r), FUNC(srmp2_state::iox_command_w)); /* key matrix | I/O */ - map(0xa00003, 0xa00003).rw(this, FUNC(srmp2_state::iox_status_r), FUNC(srmp2_state::iox_data_w)); - map(0xb00001, 0xb00001).w(this, FUNC(srmp2_state::adpcm_code_w)); /* ADPCM number */ - map(0xb00003, 0xb00003).r(this, FUNC(srmp2_state::vox_status_r)); /* ADPCM voice status */ - map(0xc00001, 0xc00001).w(this, FUNC(srmp2_state::srmp2_irq2_ack_w)); /* irq ack lv 2 */ - map(0xd00001, 0xd00001).w(this, FUNC(srmp2_state::srmp2_irq4_ack_w)); /* irq ack lv 4 */ + map(0xa00001, 0xa00001).rw(FUNC(srmp2_state::iox_mux_r), FUNC(srmp2_state::iox_command_w)); /* key matrix | I/O */ + map(0xa00003, 0xa00003).rw(FUNC(srmp2_state::iox_status_r), FUNC(srmp2_state::iox_data_w)); + map(0xb00001, 0xb00001).w(FUNC(srmp2_state::adpcm_code_w)); /* ADPCM number */ + map(0xb00003, 0xb00003).r(FUNC(srmp2_state::vox_status_r)); /* ADPCM voice status */ + map(0xc00001, 0xc00001).w(FUNC(srmp2_state::srmp2_irq2_ack_w)); /* irq ack lv 2 */ + map(0xd00001, 0xd00001).w(FUNC(srmp2_state::srmp2_irq4_ack_w)); /* irq ack lv 4 */ map(0xe00000, 0xe00001).nopw(); /* watchdog */ map(0xf00001, 0xf00001).r("aysnd", FUNC(ay8910_device::data_r)); map(0xf00000, 0xf00003).w("aysnd", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); @@ -430,19 +430,19 @@ void srmp2_state::mjyuugi_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x100001).portr("SYSTEM"); /* Coinage */ - map(0x100000, 0x100001).w(this, FUNC(srmp2_state::mjyuugi_flags_w)); /* Coin Counter */ + map(0x100000, 0x100001).w(FUNC(srmp2_state::mjyuugi_flags_w)); /* Coin Counter */ map(0x100010, 0x100011).nopr(); /* ??? */ - map(0x100010, 0x100011).w(this, FUNC(srmp2_state::mjyuugi_adpcm_bank_w)); /* ADPCM bank, GFX bank */ - map(0x200001, 0x200001).r(this, FUNC(srmp2_state::mjyuugi_irq2_ack_r)); /* irq ack lv 2? */ - map(0x300001, 0x300001).r(this, FUNC(srmp2_state::mjyuugi_irq4_ack_r)); /* irq ack lv 4? */ + map(0x100010, 0x100011).w(FUNC(srmp2_state::mjyuugi_adpcm_bank_w)); /* ADPCM bank, GFX bank */ + map(0x200001, 0x200001).r(FUNC(srmp2_state::mjyuugi_irq2_ack_r)); /* irq ack lv 2? */ + map(0x300001, 0x300001).r(FUNC(srmp2_state::mjyuugi_irq4_ack_r)); /* irq ack lv 4? */ map(0x500000, 0x500001).portr("DSW3-1"); /* DSW 3-1 */ map(0x500010, 0x500011).portr("DSW3-2"); /* DSW 3-2 */ map(0x700000, 0x7003ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x800000, 0x800001).nopr(); /* ??? */ - map(0x900001, 0x900001).rw(this, FUNC(srmp2_state::iox_mux_r), FUNC(srmp2_state::iox_command_w)); /* key matrix | I/O */ - map(0x900003, 0x900003).rw(this, FUNC(srmp2_state::iox_status_r), FUNC(srmp2_state::iox_data_w)); - map(0xa00001, 0xa00001).w(this, FUNC(srmp2_state::adpcm_code_w)); /* ADPCM number */ - map(0xb00003, 0xb00003).r(this, FUNC(srmp2_state::vox_status_r)); /* ADPCM voice status */ + map(0x900001, 0x900001).rw(FUNC(srmp2_state::iox_mux_r), FUNC(srmp2_state::iox_command_w)); /* key matrix | I/O */ + map(0x900003, 0x900003).rw(FUNC(srmp2_state::iox_status_r), FUNC(srmp2_state::iox_data_w)); + map(0xa00001, 0xa00001).w(FUNC(srmp2_state::adpcm_code_w)); /* ADPCM number */ + map(0xb00003, 0xb00003).r(FUNC(srmp2_state::vox_status_r)); /* ADPCM voice status */ map(0xb00001, 0xb00001).r("aysnd", FUNC(ay8910_device::data_r)); map(0xb00000, 0xb00003).w("aysnd", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0xc00000, 0xc00001).nopw(); /* ??? */ @@ -489,13 +489,13 @@ void srmp2_state::srmp3_map(address_map &map) void srmp2_state::srmp3_io_map(address_map &map) { map.global_mask(0xff); - map(0x20, 0x20).w(this, FUNC(srmp2_state::srmp3_irq_ack_w)); /* interrupt acknowledge */ - map(0x40, 0x40).portr("SYSTEM").w(this, FUNC(srmp2_state::srmp3_flags_w)); /* coin, service | GFX bank, counter, lockout */ - map(0x60, 0x60).w(this, FUNC(srmp2_state::srmp3_rombank_w)); /* ROM bank select */ - map(0xa0, 0xa0).w(this, FUNC(srmp2_state::adpcm_code_w)); /* ADPCM number */ - map(0xa1, 0xa1).r(this, FUNC(srmp2_state::vox_status_r)); /* ADPCM voice status */ - map(0xc0, 0xc0).rw(this, FUNC(srmp2_state::iox_mux_r), FUNC(srmp2_state::iox_command_w)); /* key matrix | I/O */ - map(0xc1, 0xc1).rw(this, FUNC(srmp2_state::iox_status_r), FUNC(srmp2_state::iox_data_w)); + map(0x20, 0x20).w(FUNC(srmp2_state::srmp3_irq_ack_w)); /* interrupt acknowledge */ + map(0x40, 0x40).portr("SYSTEM").w(FUNC(srmp2_state::srmp3_flags_w)); /* coin, service | GFX bank, counter, lockout */ + map(0x60, 0x60).w(FUNC(srmp2_state::srmp3_rombank_w)); /* ROM bank select */ + map(0xa0, 0xa0).w(FUNC(srmp2_state::adpcm_code_w)); /* ADPCM number */ + map(0xa1, 0xa1).r(FUNC(srmp2_state::vox_status_r)); /* ADPCM voice status */ + map(0xc0, 0xc0).rw(FUNC(srmp2_state::iox_mux_r), FUNC(srmp2_state::iox_command_w)); /* key matrix | I/O */ + map(0xc1, 0xc1).rw(FUNC(srmp2_state::iox_status_r), FUNC(srmp2_state::iox_data_w)); map(0xe0, 0xe1).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xe2, 0xe2).r("aysnd", FUNC(ay8910_device::data_r)); } @@ -528,7 +528,7 @@ void srmp2_state::rmgoldyh_io_map(address_map &map) map.global_mask(0xff); srmp3_io_map(map); map(0x00, 0x00).nopw(); /* watchdog */ - map(0x60, 0x60).w(this, FUNC(srmp2_state::rmgoldyh_rombank_w)); /* ROM bank select */ + map(0x60, 0x60).w(FUNC(srmp2_state::rmgoldyh_rombank_w)); /* ROM bank select */ map(0x80, 0x80).portr("DSW4"); map(0x81, 0x81).portr("DSW3"); } diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp index 2b7b63fffeb..b027751ea89 100644 --- a/src/mame/drivers/srmp5.cpp +++ b/src/mame/drivers/srmp5.cpp @@ -370,27 +370,27 @@ void srmp5_state::srmp5_mem(address_map &map) map(0x01800000, 0x01800003).ram(); //?1 map(0x01800004, 0x01800007).portr("DSW1"); map(0x01800008, 0x0180000b).portr("DSW2"); - map(0x0180000c, 0x0180000f).w(this, FUNC(srmp5_state::bank_w)); - map(0x01800010, 0x01800013).r(this, FUNC(srmp5_state::srmp5_inputs_r)); //multiplexed controls (selected by writes to 1c) + map(0x0180000c, 0x0180000f).w(FUNC(srmp5_state::bank_w)); + map(0x01800010, 0x01800013).r(FUNC(srmp5_state::srmp5_inputs_r)); //multiplexed controls (selected by writes to 1c) map(0x01800014, 0x01800017).portr("TEST"); - map(0x0180001c, 0x0180001f).w(this, FUNC(srmp5_state::input_select_w));//c1 c2 c4 c8 => mahjong inputs (at $10) - bits 0-3 + map(0x0180001c, 0x0180001f).w(FUNC(srmp5_state::input_select_w));//c1 c2 c4 c8 => mahjong inputs (at $10) - bits 0-3 map(0x01800200, 0x01800203).ram(); //sound related ? only few writes after boot - map(0x01802000, 0x01802003).w(this, FUNC(srmp5_state::cmd1_w)); - map(0x01802004, 0x01802007).w(this, FUNC(srmp5_state::cmd2_w)); - map(0x01802008, 0x0180200b).r(this, FUNC(srmp5_state::cmd_stat32_r)); - map(0x01a00000, 0x01bfffff).r(this, FUNC(srmp5_state::chrrom_r)); + map(0x01802000, 0x01802003).w(FUNC(srmp5_state::cmd1_w)); + map(0x01802004, 0x01802007).w(FUNC(srmp5_state::cmd2_w)); + map(0x01802008, 0x0180200b).r(FUNC(srmp5_state::cmd_stat32_r)); + map(0x01a00000, 0x01bfffff).r(FUNC(srmp5_state::chrrom_r)); map(0x01c00000, 0x01c00003).nopr(); // debug? 'Toru' - map(0x0a000000, 0x0a0fffff).rw(this, FUNC(srmp5_state::spr_r), FUNC(srmp5_state::spr_w)); + map(0x0a000000, 0x0a0fffff).rw(FUNC(srmp5_state::spr_r), FUNC(srmp5_state::spr_w)); map(0x0a100000, 0x0a17ffff).rw(m_palette, FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); //0?N???A?????????i?????????? - map(0x0a180000, 0x0a18011f).rw(this, FUNC(srmp5_state::srmp5_vidregs_r), FUNC(srmp5_state::srmp5_vidregs_w)); + map(0x0a180000, 0x0a18011f).rw(FUNC(srmp5_state::srmp5_vidregs_r), FUNC(srmp5_state::srmp5_vidregs_w)); map(0x0a180000, 0x0a180003).nopr(); // write 0x00000400 - map(0x0a200000, 0x0a3fffff).rw(this, FUNC(srmp5_state::tileram_r), FUNC(srmp5_state::tileram_w)); + map(0x0a200000, 0x0a3fffff).rw(FUNC(srmp5_state::tileram_r), FUNC(srmp5_state::tileram_w)); map(0x0fc00000, 0x0fdfffff).mirror(0x10000000).rom().region("maincpu", 0); map(0x1eff0000, 0x1eff001f).writeonly(); - map(0x1eff003c, 0x1eff003f).r(this, FUNC(srmp5_state::irq_ack_clear)); + map(0x1eff003c, 0x1eff003f).r(FUNC(srmp5_state::irq_ack_clear)); } void srmp5_state::st0016_mem(address_map &map) @@ -429,11 +429,11 @@ void srmp5_state::st0016_io(address_map &map) { map.global_mask(0xff); //AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) - map(0xc0, 0xc0).r(this, FUNC(srmp5_state::cmd1_r)); - map(0xc1, 0xc1).r(this, FUNC(srmp5_state::cmd2_r)); - map(0xc2, 0xc2).r(this, FUNC(srmp5_state::cmd_stat8_r)); - map(0xe1, 0xe1).w(this, FUNC(srmp5_state::st0016_rom_bank_w)); - map(0xe7, 0xe7).w(this, FUNC(srmp5_state::st0016_rom_bank_w)); + map(0xc0, 0xc0).r(FUNC(srmp5_state::cmd1_r)); + map(0xc1, 0xc1).r(FUNC(srmp5_state::cmd2_r)); + map(0xc2, 0xc2).r(FUNC(srmp5_state::cmd_stat8_r)); + map(0xe1, 0xe1).w(FUNC(srmp5_state::st0016_rom_bank_w)); + map(0xe7, 0xe7).w(FUNC(srmp5_state::st0016_rom_bank_w)); //AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r) } diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp index 158dc4ca000..757cb0e9e4e 100644 --- a/src/mame/drivers/srmp6.cpp +++ b/src/mame/drivers/srmp6.cpp @@ -560,18 +560,18 @@ void srmp6_state::srmp6_map(address_map &map) map(0x600000, 0x7fffff).bankr("bank1"); // banked ROM (used by ROM check) map(0x800000, 0x9fffff).rom().region("user1", 0); - map(0x300000, 0x300005).rw(this, FUNC(srmp6_state::srmp6_inputs_r), FUNC(srmp6_state::srmp6_input_select_w)); // inputs - map(0x480000, 0x480fff).ram().w(this, FUNC(srmp6_state::paletteram_w)).share("palette"); - map(0x4d0000, 0x4d0001).r(this, FUNC(srmp6_state::srmp6_irq_ack_r)); + map(0x300000, 0x300005).rw(FUNC(srmp6_state::srmp6_inputs_r), FUNC(srmp6_state::srmp6_input_select_w)); // inputs + map(0x480000, 0x480fff).ram().w(FUNC(srmp6_state::paletteram_w)).share("palette"); + map(0x4d0000, 0x4d0001).r(FUNC(srmp6_state::srmp6_irq_ack_r)); // OBJ RAM: checked [$400000-$47dfff] map(0x400000, 0x47ffff).ram().share("sprram"); // CHR RAM: checked [$500000-$5fffff] - map(0x500000, 0x5fffff).rw(this, FUNC(srmp6_state::tileram_r), FUNC(srmp6_state::tileram_w)).share("chrram"); + map(0x500000, 0x5fffff).rw(FUNC(srmp6_state::tileram_r), FUNC(srmp6_state::tileram_w)).share("chrram"); //AM_RANGE(0x5fff00, 0x5fffff) AM_WRITE(dma_w) AM_SHARE("dmaram") - map(0x4c0000, 0x4c006f).rw(this, FUNC(srmp6_state::video_regs_r), FUNC(srmp6_state::video_regs_w)).share("video_regs"); // ? gfx regs ST-0026 NiLe + map(0x4c0000, 0x4c006f).rw(FUNC(srmp6_state::video_regs_r), FUNC(srmp6_state::video_regs_w)).share("video_regs"); // ? gfx regs ST-0026 NiLe map(0x4e0000, 0x4e00ff).rw("nile", FUNC(nile_device::nile_snd_r), FUNC(nile_device::nile_snd_w)); map(0x4e0100, 0x4e0101).rw("nile", FUNC(nile_device::nile_sndctrl_r), FUNC(nile_device::nile_sndctrl_w)); //AM_RANGE(0x4e0110, 0x4e0111) AM_NOP // ? accessed once ($268dc, written $b.w) diff --git a/src/mame/drivers/srumbler.cpp b/src/mame/drivers/srumbler.cpp index 504a69192d2..158dfd44b02 100644 --- a/src/mame/drivers/srumbler.cpp +++ b/src/mame/drivers/srumbler.cpp @@ -85,15 +85,15 @@ void srumbler_state::srumbler_map(address_map &map) { map(0x0000, 0x1dff).ram(); /* RAM (of 1 sort or another) */ map(0x1e00, 0x1fff).ram().share("spriteram"); - map(0x2000, 0x3fff).ram().w(this, FUNC(srumbler_state::background_w)).share("backgroundram"); - map(0x4008, 0x4008).portr("SYSTEM").w(this, FUNC(srumbler_state::bankswitch_w)); - map(0x4009, 0x4009).portr("P1").w(this, FUNC(srumbler_state::_4009_w)); + map(0x2000, 0x3fff).ram().w(FUNC(srumbler_state::background_w)).share("backgroundram"); + map(0x4008, 0x4008).portr("SYSTEM").w(FUNC(srumbler_state::bankswitch_w)); + map(0x4009, 0x4009).portr("P1").w(FUNC(srumbler_state::_4009_w)); map(0x400a, 0x400a).portr("P2"); map(0x400b, 0x400b).portr("DSW1"); map(0x400c, 0x400c).portr("DSW2"); - map(0x400a, 0x400d).w(this, FUNC(srumbler_state::scroll_w)); + map(0x400a, 0x400d).w(FUNC(srumbler_state::scroll_w)); map(0x400e, 0x400e).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x5000, 0x5fff).bankr("5000").w(this, FUNC(srumbler_state::foreground_w)).share("foregroundram"); /* Banked ROM */ + map(0x5000, 0x5fff).bankr("5000").w(FUNC(srumbler_state::foreground_w)).share("foregroundram"); /* Banked ROM */ map(0x6000, 0x6fff).bankr("6000"); /* Banked ROM */ map(0x6000, 0x6fff).nopw(); /* Video RAM 2 ??? (not used) */ map(0x7000, 0x7fff).bankr("7000"); /* Banked ROM */ diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp index 7f4ec356f0a..d8ffa76d6d9 100644 --- a/src/mame/drivers/ssfindo.cpp +++ b/src/mame/drivers/ssfindo.cpp @@ -604,34 +604,34 @@ READ32_MEMBER(ssfindo_state::randomized_r) void ssfindo_state::ssfindo_map(address_map &map) { map(0x00000000, 0x000fffff).rom(); - map(0x03200000, 0x032001ff).rw(this, FUNC(ssfindo_state::PS7500_IO_r), FUNC(ssfindo_state::PS7500_IO_w)); + map(0x03200000, 0x032001ff).rw(FUNC(ssfindo_state::PS7500_IO_r), FUNC(ssfindo_state::PS7500_IO_w)); map(0x03012e60, 0x03012e67).noprw(); - map(0x03012fe0, 0x03012fe3).w(this, FUNC(ssfindo_state::debug_w)); + map(0x03012fe0, 0x03012fe3).w(FUNC(ssfindo_state::debug_w)); map(0x03012ff0, 0x03012ff3).noprw(); - map(0x03012ff4, 0x03012ff7).nopw().r(this, FUNC(ssfindo_state::ff4_r)); //status flag ? + map(0x03012ff4, 0x03012ff7).nopw().r(FUNC(ssfindo_state::ff4_r)); //status flag ? map(0x03012ff8, 0x03012fff).noprw(); map(0x03240000, 0x03240003).portr("IN0").nopw(); map(0x03241000, 0x03241003).portr("IN1").nopw(); - map(0x03242000, 0x03242003).r(this, FUNC(ssfindo_state::io_r)).w(this, FUNC(ssfindo_state::io_w)); + map(0x03242000, 0x03242003).r(FUNC(ssfindo_state::io_r)).w(FUNC(ssfindo_state::io_w)); map(0x03243000, 0x03243003).portr("DSW").nopw(); - map(0x0324f000, 0x0324f003).r(this, FUNC(ssfindo_state::SIMPLEIO_r)); + map(0x0324f000, 0x0324f003).r(FUNC(ssfindo_state::SIMPLEIO_r)); map(0x03245000, 0x03245003).nopw(); /* sound ? */ - map(0x03400000, 0x03400003).w(this, FUNC(ssfindo_state::FIFO_w)); + map(0x03400000, 0x03400003).w(FUNC(ssfindo_state::FIFO_w)); map(0x10000000, 0x11ffffff).ram().share("vram"); } void ssfindo_state::ppcar_map(address_map &map) { map(0x00000000, 0x000fffff).rom(); - map(0x03200000, 0x032001ff).rw(this, FUNC(ssfindo_state::PS7500_IO_r), FUNC(ssfindo_state::PS7500_IO_w)); - map(0x03012b00, 0x03012bff).r(this, FUNC(ssfindo_state::randomized_r)).nopw(); + map(0x03200000, 0x032001ff).rw(FUNC(ssfindo_state::PS7500_IO_r), FUNC(ssfindo_state::PS7500_IO_w)); + map(0x03012b00, 0x03012bff).r(FUNC(ssfindo_state::randomized_r)).nopw(); map(0x03012e60, 0x03012e67).nopw(); map(0x03012ff8, 0x03012ffb).portr("IN0").nopw(); map(0x032c0000, 0x032c0003).portr("IN1").nopw(); map(0x03340000, 0x03340007).nopw(); map(0x03341000, 0x0334101f).nopw(); - map(0x033c0000, 0x033c0003).r(this, FUNC(ssfindo_state::io_r)).w(this, FUNC(ssfindo_state::io_w)); - map(0x03400000, 0x03400003).w(this, FUNC(ssfindo_state::FIFO_w)); + map(0x033c0000, 0x033c0003).r(FUNC(ssfindo_state::io_r)).w(FUNC(ssfindo_state::io_w)); + map(0x03400000, 0x03400003).w(FUNC(ssfindo_state::FIFO_w)); map(0x08000000, 0x08ffffff).ram(); map(0x10000000, 0x10ffffff).ram().share("vram"); } @@ -650,12 +650,12 @@ WRITE32_MEMBER(ssfindo_state::tetfight_unk_w) void ssfindo_state::tetfight_map(address_map &map) { map(0x00000000, 0x001fffff).rom(); - map(0x03200000, 0x032001ff).rw(this, FUNC(ssfindo_state::PS7500_IO_r), FUNC(ssfindo_state::PS7500_IO_w)); - map(0x03400000, 0x03400003).w(this, FUNC(ssfindo_state::FIFO_w)); + map(0x03200000, 0x032001ff).rw(FUNC(ssfindo_state::PS7500_IO_r), FUNC(ssfindo_state::PS7500_IO_w)); + map(0x03400000, 0x03400003).w(FUNC(ssfindo_state::FIFO_w)); map(0x03240000, 0x03240003).portr("IN0"); map(0x03240004, 0x03240007).portr("IN1"); map(0x03240008, 0x0324000b).portr("DSW2"); - map(0x03240020, 0x03240023).rw(this, FUNC(ssfindo_state::tetfight_unk_r), FUNC(ssfindo_state::tetfight_unk_w)); + map(0x03240020, 0x03240023).rw(FUNC(ssfindo_state::tetfight_unk_r), FUNC(ssfindo_state::tetfight_unk_w)); map(0x10000000, 0x14ffffff).ram().share("vram"); } diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp index d7a79a9df40..04e0c57452c 100644 --- a/src/mame/drivers/sshangha.cpp +++ b/src/mame/drivers/sshangha.cpp @@ -180,31 +180,31 @@ void sshangha_state::sshangha_map(address_map &map) map(0x206000, 0x2067ff).ram().share("pf2_rowscroll"); map(0x206800, 0x207fff).ram(); map(0x300000, 0x30000f).w(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_w)); - map(0x320000, 0x320001).w(this, FUNC(sshangha_state::sshangha_video_w)); + map(0x320000, 0x320001).w(FUNC(sshangha_state::sshangha_video_w)); map(0x320002, 0x320005).nopw(); map(0x320006, 0x320007).nopr(); //irq ack map(0x340000, 0x340fff).ram().share("spriteram2"); - map(0x350000, 0x350001).r(this, FUNC(sshangha_state::deco_71_r)); + map(0x350000, 0x350001).r(FUNC(sshangha_state::deco_71_r)); map(0x350000, 0x350007).nopw(); map(0x360000, 0x360fff).ram().share("spriteram"); - map(0x370000, 0x370001).r(this, FUNC(sshangha_state::deco_71_r)); + map(0x370000, 0x370001).r(FUNC(sshangha_state::deco_71_r)); map(0x370000, 0x370007).nopw(); - map(0x380000, 0x3803ff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites_w)).share("sprite_palram"); - map(0x380400, 0x3807ff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_tilehigh_w)).share("tile_palram2"); - map(0x380800, 0x380bff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites2_w)).share("sprite_palram2"); - map(0x380c00, 0x380fff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_tilelow_w)).share("tile_palram1"); + map(0x380000, 0x3803ff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites_w)).share("sprite_palram"); + map(0x380400, 0x3807ff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_tilehigh_w)).share("tile_palram2"); + map(0x380800, 0x380bff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites2_w)).share("sprite_palram2"); + map(0x380c00, 0x380fff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_tilelow_w)).share("tile_palram1"); map(0x381000, 0x383fff).ram(); // unused palette area - map(0x3e0000, 0x3e3fff).rw(this, FUNC(sshangha_state::sshangha_protection_region_8_146_r), FUNC(sshangha_state::sshangha_protection_region_8_146_w)); + map(0x3e0000, 0x3e3fff).rw(FUNC(sshangha_state::sshangha_protection_region_8_146_r), FUNC(sshangha_state::sshangha_protection_region_8_146_w)); map(0x3ec000, 0x3f3fff).ram(); - map(0x3f4000, 0x3f7fff).rw(this, FUNC(sshangha_state::sshangha_protection_region_d_146_r), FUNC(sshangha_state::sshangha_protection_region_d_146_w)).share("prot_data"); + map(0x3f4000, 0x3f7fff).rw(FUNC(sshangha_state::sshangha_protection_region_d_146_r), FUNC(sshangha_state::sshangha_protection_region_d_146_w)).share("prot_data"); } void sshangha_state::sshanghb_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x084000, 0x0847ff).r(this, FUNC(sshangha_state::sshanghb_protection16_r)); + map(0x084000, 0x0847ff).r(FUNC(sshangha_state::sshanghb_protection16_r)); map(0x101000, 0x10100f).ram().share("sound_shared"); /* the bootleg writes here */ map(0x200000, 0x201fff).rw(m_deco_tilegen1, FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); @@ -213,16 +213,16 @@ void sshangha_state::sshanghb_map(address_map &map) map(0x206000, 0x2067ff).ram().share("pf2_rowscroll"); map(0x206800, 0x207fff).ram(); map(0x300000, 0x30000f).w(m_deco_tilegen1, FUNC(deco16ic_device::pf_control_w)); - map(0x320000, 0x320001).w(this, FUNC(sshangha_state::sshangha_video_w)); + map(0x320000, 0x320001).w(FUNC(sshangha_state::sshangha_video_w)); map(0x320002, 0x320005).nopw(); map(0x320006, 0x320007).nopr(); //irq ack map(0x340000, 0x340fff).ram(); // original spriteram - map(0x380000, 0x3803ff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites_w)).share("sprite_palram"); - map(0x380400, 0x3807ff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_tilehigh_w)).share("tile_palram2"); - map(0x380800, 0x380bff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites2_w)).share("sprite_palram2"); - map(0x380c00, 0x380fff).ram().w(this, FUNC(sshangha_state::paletteram16_xbgr_word_be_tilelow_w)).share("tile_palram1"); + map(0x380000, 0x3803ff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites_w)).share("sprite_palram"); + map(0x380400, 0x3807ff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_tilehigh_w)).share("tile_palram2"); + map(0x380800, 0x380bff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_sprites2_w)).share("sprite_palram2"); + map(0x380c00, 0x380fff).ram().w(FUNC(sshangha_state::paletteram16_xbgr_word_be_tilelow_w)).share("tile_palram1"); map(0x381000, 0x383fff).ram(); // unused palette area map(0x3c0000, 0x3c0fff).ram().share("spriteram"); // bootleg spriteram @@ -250,7 +250,7 @@ void sshangha_state::sshangha_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xc200, 0xc201).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xf800, 0xf807).rw(this, FUNC(sshangha_state::sshangha_sound_shared_r), FUNC(sshangha_state::sshangha_sound_shared_w)); + map(0xf800, 0xf807).rw(FUNC(sshangha_state::sshangha_sound_shared_r), FUNC(sshangha_state::sshangha_sound_shared_w)); map(0xf808, 0xffff).ram(); } diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp index be1bbf0e708..e50a304b70e 100644 --- a/src/mame/drivers/sshot.cpp +++ b/src/mame/drivers/sshot.cpp @@ -271,14 +271,14 @@ WRITE8_MEMBER(supershot_state::supershot_output1_w) void supershot_state::supershot_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x23ff).ram().w(this, FUNC(supershot_state::supershot_vidram_w)).share("videoram"); + map(0x2000, 0x23ff).ram().w(FUNC(supershot_state::supershot_vidram_w)).share("videoram"); map(0x4100, 0x41ff).ram(); map(0x4200, 0x4200).portr("GUNX"); map(0x4201, 0x4201).portr("GUNY"); map(0x4202, 0x4202).portr("IN0"); map(0x4203, 0x4203).portr("DSW"); - map(0x4206, 0x4206).w(this, FUNC(supershot_state::supershot_output0_w)); - map(0x4207, 0x4207).w(this, FUNC(supershot_state::supershot_output1_w)); + map(0x4206, 0x4206).w(FUNC(supershot_state::supershot_output0_w)); + map(0x4207, 0x4207).w(FUNC(supershot_state::supershot_output1_w)); } diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp index 7c26793268b..fbda9d2c3f7 100644 --- a/src/mame/drivers/ssingles.cpp +++ b/src/mame/drivers/ssingles.cpp @@ -339,11 +339,11 @@ CUSTOM_INPUT_MEMBER(ssingles_state::controls_r) void ssingles_state::ssingles_map(address_map &map) { - map(0x0000, 0x00ff).w(this, FUNC(ssingles_state::ssingles_videoram_w)); - map(0x0800, 0x08ff).w(this, FUNC(ssingles_state::ssingles_colorram_w)); + map(0x0000, 0x00ff).w(FUNC(ssingles_state::ssingles_videoram_w)); + map(0x0800, 0x08ff).w(FUNC(ssingles_state::ssingles_colorram_w)); map(0x0000, 0x1fff).rom(); - map(0xc000, 0xc000).r(this, FUNC(ssingles_state::c000_r)); - map(0xc001, 0xc001).rw(this, FUNC(ssingles_state::c001_r), FUNC(ssingles_state::c001_w)); + map(0xc000, 0xc000).r(FUNC(ssingles_state::c000_r)); + map(0xc001, 0xc001).rw(FUNC(ssingles_state::c001_r), FUNC(ssingles_state::c001_w)); map(0x6000, 0xbfff).rom(); map(0xf800, 0xffff).ram(); } @@ -378,13 +378,13 @@ WRITE8_MEMBER(ssingles_state::atamanot_prot_w) void ssingles_state::atamanot_map(address_map &map) { - map(0x0000, 0x00ff).w(this, FUNC(ssingles_state::ssingles_videoram_w)); - map(0x0800, 0x08ff).w(this, FUNC(ssingles_state::ssingles_colorram_w)); + map(0x0000, 0x00ff).w(FUNC(ssingles_state::ssingles_videoram_w)); + map(0x0800, 0x08ff).w(FUNC(ssingles_state::ssingles_colorram_w)); map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); map(0x6000, 0x60ff).ram(); //kanji tilemap? // AM_RANGE(0x6000, 0x7fff) AM_ROM - map(0x8000, 0x83ff).r(this, FUNC(ssingles_state::atamanot_prot_r)); + map(0x8000, 0x83ff).r(FUNC(ssingles_state::atamanot_prot_r)); // AM_RANGE(0x8000, 0x9fff) AM_ROM AM_REGION("question",0x10000) // AM_RANGE(0xc000, 0xc000) AM_READ(c000_r ) // AM_RANGE(0xc001, 0xc001) AM_READWRITE(c001_r, c001_w ) @@ -415,7 +415,7 @@ void ssingles_state::atamanot_io_map(address_map &map) map(0x08, 0x08).nopr(); map(0x0a, 0x0a).w("ay2", FUNC(ay8910_device::data_w)); map(0x16, 0x16).portr("DSW0"); - map(0x18, 0x18).portr("DSW1").w(this, FUNC(ssingles_state::atamanot_prot_w)); + map(0x18, 0x18).portr("DSW1").w(FUNC(ssingles_state::atamanot_prot_w)); map(0x1c, 0x1c).portr("INPUTS"); // AM_RANGE(0x1a, 0x1a) AM_WRITENOP //video/crt related map(0xfe, 0xfe).w("crtc", FUNC(mc6845_device::address_w)); diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index f4ebd420f20..18fb8def468 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -380,9 +380,9 @@ void sslam_state::sslam_program_map(address_map &map) map(0x000000, 0xffffff).rom(); /* I don't honestly know where the rom is mirrored .. so all unmapped reads / writes go to rom */ map(0x000400, 0x07ffff).ram(); - map(0x100000, 0x103fff).ram().w(this, FUNC(sslam_state::sslam_bg_tileram_w)).share("bg_tileram"); - map(0x104000, 0x107fff).ram().w(this, FUNC(sslam_state::sslam_md_tileram_w)).share("md_tileram"); - map(0x108000, 0x10ffff).ram().w(this, FUNC(sslam_state::sslam_tx_tileram_w)).share("tx_tileram"); + map(0x100000, 0x103fff).ram().w(FUNC(sslam_state::sslam_bg_tileram_w)).share("bg_tileram"); + map(0x104000, 0x107fff).ram().w(FUNC(sslam_state::sslam_md_tileram_w)).share("md_tileram"); + map(0x108000, 0x10ffff).ram().w(FUNC(sslam_state::sslam_tx_tileram_w)).share("tx_tileram"); map(0x110000, 0x11000d).ram().share("regs"); map(0x200000, 0x200001).nopw(); map(0x280000, 0x280fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -395,14 +395,14 @@ void sslam_state::sslam_program_map(address_map &map) map(0x300018, 0x300019).portr("IN4"); map(0x30001a, 0x30001b).portr("DSW2"); map(0x30001c, 0x30001d).portr("DSW1"); - map(0x30001f, 0x30001f).w(this, FUNC(sslam_state::sslam_snd_w)); + map(0x30001f, 0x30001f).w(FUNC(sslam_state::sslam_snd_w)); map(0xf00000, 0xffffff).ram(); /* Main RAM */ } void sslam_state::powerbls_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x103fff).ram().w(this, FUNC(sslam_state::powerbls_bg_tileram_w)).share("bg_tileram"); + map(0x100000, 0x103fff).ram().w(FUNC(sslam_state::powerbls_bg_tileram_w)).share("bg_tileram"); map(0x104000, 0x107fff).ram(); // not used map(0x110000, 0x11000d).ram().share("regs"); map(0x200000, 0x200001).nopw(); @@ -413,7 +413,7 @@ void sslam_state::powerbls_map(address_map &map) map(0x300014, 0x300015).portr("IN2"); map(0x30001a, 0x30001b).portr("DSW1"); map(0x30001c, 0x30001d).portr("DSW2"); - map(0x30001e, 0x30001f).w(this, FUNC(sslam_state::powerbls_sound_w)); + map(0x30001e, 0x30001f).w(FUNC(sslam_state::powerbls_sound_w)); map(0x304000, 0x304001).nopw(); map(0xff0000, 0xffffff).ram(); /* Main RAM */ } diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp index 08f748db059..70b871090db 100644 --- a/src/mame/drivers/ssozumo.cpp +++ b/src/mame/drivers/ssozumo.cpp @@ -32,18 +32,18 @@ void ssozumo_state::ssozumo_map(address_map &map) { map(0x0000, 0x077f).ram(); map(0x0780, 0x07ff).ram().share("spriteram"); - map(0x2000, 0x23ff).ram().w(this, FUNC(ssozumo_state::videoram2_w)).share("videoram2"); - map(0x2400, 0x27ff).ram().w(this, FUNC(ssozumo_state::colorram2_w)).share("colorram2"); - map(0x3000, 0x31ff).ram().w(this, FUNC(ssozumo_state::videoram_w)).share("videoram"); - map(0x3200, 0x33ff).ram().w(this, FUNC(ssozumo_state::colorram_w)).share("colorram"); + map(0x2000, 0x23ff).ram().w(FUNC(ssozumo_state::videoram2_w)).share("videoram2"); + map(0x2400, 0x27ff).ram().w(FUNC(ssozumo_state::colorram2_w)).share("colorram2"); + map(0x3000, 0x31ff).ram().w(FUNC(ssozumo_state::videoram_w)).share("videoram"); + map(0x3200, 0x33ff).ram().w(FUNC(ssozumo_state::colorram_w)).share("colorram"); map(0x3400, 0x35ff).ram(); map(0x3600, 0x37ff).ram(); - map(0x4000, 0x4000).portr("P1").w(this, FUNC(ssozumo_state::flipscreen_w)); + map(0x4000, 0x4000).portr("P1").w(FUNC(ssozumo_state::flipscreen_w)); map(0x4010, 0x4010).portr("P2").w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x4020, 0x4020).portr("DSW2").w(this, FUNC(ssozumo_state::scroll_w)); + map(0x4020, 0x4020).portr("DSW2").w(FUNC(ssozumo_state::scroll_w)); map(0x4030, 0x4030).portr("DSW1"); // AM_RANGE(0x4030, 0x4030) AM_WRITEONLY - map(0x4050, 0x407f).ram().w(this, FUNC(ssozumo_state::paletteram_w)).share("paletteram"); + map(0x4050, 0x407f).ram().w(FUNC(ssozumo_state::paletteram_w)).share("paletteram"); map(0x6000, 0xffff).rom(); } @@ -59,8 +59,8 @@ void ssozumo_state::ssozumo_sound_map(address_map &map) map(0x0000, 0x01ff).ram(); map(0x2000, 0x2001).w("ay1", FUNC(ay8910_device::data_address_w)); map(0x2002, 0x2003).w("ay2", FUNC(ay8910_device::data_address_w)); - map(0x2004, 0x2004).w("dac", FUNC(dac_byte_interface::write)); - map(0x2005, 0x2005).w(this, FUNC(ssozumo_state::sound_nmi_mask_w)); + map(0x2004, 0x2004).w("dac", FUNC(dac_byte_interface::data_w)); + map(0x2005, 0x2005).w(FUNC(ssozumo_state::sound_nmi_mask_w)); map(0x2007, 0x2007).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp index a8b86553b22..cd9f2366b8a 100644 --- a/src/mame/drivers/sspeedr.cpp +++ b/src/mame/drivers/sspeedr.cpp @@ -83,7 +83,7 @@ void sspeedr_state::sspeedr_map(address_map &map) { map(0x0000, 0x0fff).rom(); map(0x2000, 0x21ff).ram(); - map(0x7f00, 0x7f17).w(this, FUNC(sspeedr_state::sspeedr_score_w)); + map(0x7f00, 0x7f17).w(FUNC(sspeedr_state::sspeedr_score_w)); } @@ -92,25 +92,25 @@ void sspeedr_state::sspeedr_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x00).portr("IN0"); map(0x01, 0x01).portr("IN1"); - map(0x00, 0x01).w(this, FUNC(sspeedr_state::sspeedr_sound_w)); - map(0x02, 0x02).w(this, FUNC(sspeedr_state::sspeedr_lamp_w)); + map(0x00, 0x01).w(FUNC(sspeedr_state::sspeedr_sound_w)); + map(0x02, 0x02).w(FUNC(sspeedr_state::sspeedr_lamp_w)); map(0x03, 0x03).portr("DSW"); map(0x04, 0x04).portr("IN2"); - map(0x04, 0x05).w(this, FUNC(sspeedr_state::sspeedr_time_w)); + map(0x04, 0x05).w(FUNC(sspeedr_state::sspeedr_time_w)); map(0x06, 0x06).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x10, 0x10).w(this, FUNC(sspeedr_state::sspeedr_driver_horz_w)); - map(0x11, 0x11).w(this, FUNC(sspeedr_state::sspeedr_driver_pic_w)); - map(0x12, 0x12).w(this, FUNC(sspeedr_state::sspeedr_driver_horz_2_w)); - map(0x13, 0x13).w(this, FUNC(sspeedr_state::sspeedr_drones_horz_w)); - map(0x14, 0x14).w(this, FUNC(sspeedr_state::sspeedr_drones_horz_2_w)); - map(0x15, 0x15).w(this, FUNC(sspeedr_state::sspeedr_drones_mask_w)); - map(0x16, 0x16).w(this, FUNC(sspeedr_state::sspeedr_driver_vert_w)); - map(0x17, 0x18).w(this, FUNC(sspeedr_state::sspeedr_track_vert_w)); - map(0x19, 0x19).w(this, FUNC(sspeedr_state::sspeedr_track_horz_w)); - map(0x1a, 0x1a).w(this, FUNC(sspeedr_state::sspeedr_track_horz_2_w)); - map(0x1b, 0x1b).w(this, FUNC(sspeedr_state::sspeedr_track_ice_w)); - map(0x1c, 0x1e).w(this, FUNC(sspeedr_state::sspeedr_drones_vert_w)); - map(0x1f, 0x1f).w(this, FUNC(sspeedr_state::sspeedr_int_ack_w)); + map(0x10, 0x10).w(FUNC(sspeedr_state::sspeedr_driver_horz_w)); + map(0x11, 0x11).w(FUNC(sspeedr_state::sspeedr_driver_pic_w)); + map(0x12, 0x12).w(FUNC(sspeedr_state::sspeedr_driver_horz_2_w)); + map(0x13, 0x13).w(FUNC(sspeedr_state::sspeedr_drones_horz_w)); + map(0x14, 0x14).w(FUNC(sspeedr_state::sspeedr_drones_horz_2_w)); + map(0x15, 0x15).w(FUNC(sspeedr_state::sspeedr_drones_mask_w)); + map(0x16, 0x16).w(FUNC(sspeedr_state::sspeedr_driver_vert_w)); + map(0x17, 0x18).w(FUNC(sspeedr_state::sspeedr_track_vert_w)); + map(0x19, 0x19).w(FUNC(sspeedr_state::sspeedr_track_horz_w)); + map(0x1a, 0x1a).w(FUNC(sspeedr_state::sspeedr_track_horz_2_w)); + map(0x1b, 0x1b).w(FUNC(sspeedr_state::sspeedr_track_ice_w)); + map(0x1c, 0x1e).w(FUNC(sspeedr_state::sspeedr_drones_vert_w)); + map(0x1f, 0x1f).w(FUNC(sspeedr_state::sspeedr_int_ack_w)); } diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp index 3b7528c767c..b02327b26da 100644 --- a/src/mame/drivers/ssrj.cpp +++ b/src/mame/drivers/ssrj.cpp @@ -65,14 +65,14 @@ READ8_MEMBER(ssrj_state::wheel_r) void ssrj_state::ssrj_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xc000, 0xc7ff).ram().w(this, FUNC(ssrj_state::vram1_w)).share("vram1"); - map(0xc800, 0xcfff).ram().w(this, FUNC(ssrj_state::vram2_w)).share("vram2"); + map(0xc000, 0xc7ff).ram().w(FUNC(ssrj_state::vram1_w)).share("vram1"); + map(0xc800, 0xcfff).ram().w(FUNC(ssrj_state::vram2_w)).share("vram2"); map(0xd000, 0xd7ff).ram().share("vram3"); - map(0xd800, 0xdfff).ram().w(this, FUNC(ssrj_state::vram4_w)).share("vram4"); + map(0xd800, 0xdfff).ram().w(FUNC(ssrj_state::vram4_w)).share("vram4"); map(0xe000, 0xe7ff).ram(); map(0xe800, 0xefff).ram().share("scrollram"); map(0xf000, 0xf000).portr("IN0"); - map(0xf001, 0xf001).r(this, FUNC(ssrj_state::wheel_r)); + map(0xf001, 0xf001).r(FUNC(ssrj_state::wheel_r)); map(0xf002, 0xf002).portr("IN2"); map(0xf003, 0xf003).nopw(); /* unknown */ map(0xf401, 0xf401).r("aysnd", FUNC(ay8910_device::data_r)); diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp index 5b40d97caf4..11283e6ef6b 100644 --- a/src/mame/drivers/sstrangr.cpp +++ b/src/mame/drivers/sstrangr.cpp @@ -149,7 +149,7 @@ void sstrangr_state::sstrangr_io_map(address_map &map) { map(0x41, 0x41).portr("DSW"); map(0x42, 0x42).portr("INPUTS"); - map(0x44, 0x44).portr("EXT").w(this, FUNC(sstrangr_state::port_w)); + map(0x44, 0x44).portr("EXT").w(FUNC(sstrangr_state::port_w)); } diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index 59dbabfcedb..33d784d7a91 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -398,19 +398,19 @@ void ssv_state::ssv_map(address_map &map, u32 rom) map(0x100000, 0x13ffff).ram().share("spriteram"); /* Sprites */ map(0x140000, 0x15ffff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); /* Palette */ map(0x160000, 0x17ffff).ram(); /* */ - map(0x1c0000, 0x1c0001).r(this, FUNC(ssv_state::vblank_r)); /* Vblank? */ + map(0x1c0000, 0x1c0001).r(FUNC(ssv_state::vblank_r)); /* Vblank? */ /**/map(0x1c0002, 0x1c007f).readonly(); /* Scroll */ - map(0x1c0000, 0x1c007f).w(this, FUNC(ssv_state::scroll_w)).share("scroll"); /* Scroll */ + map(0x1c0000, 0x1c007f).w(FUNC(ssv_state::scroll_w)).share("scroll"); /* Scroll */ map(0x210002, 0x210003).portr("DSW1"); map(0x210004, 0x210005).portr("DSW2"); map(0x210008, 0x210009).portr("P1"); map(0x21000a, 0x21000b).portr("P2"); map(0x21000c, 0x21000d).portr("SYSTEM"); - map(0x21000e, 0x21000f).nopr().w(this, FUNC(ssv_state::lockout_w)); /* Lockout */ + map(0x21000e, 0x21000f).nopr().w(FUNC(ssv_state::lockout_w)); /* Lockout */ map(0x210010, 0x210011).nopw(); map(0x230000, 0x230071).writeonly().share("irq_vectors"); /* IRQ Vec */ - map(0x240000, 0x240071).w(this, FUNC(ssv_state::irq_ack_w)); /* IRQ Ack */ - map(0x260000, 0x260001).w(this, FUNC(ssv_state::irq_enable_w)); /* IRQ En */ + map(0x240000, 0x240071).w(FUNC(ssv_state::irq_ack_w)); /* IRQ Ack */ + map(0x260000, 0x260001).w(FUNC(ssv_state::irq_enable_w)); /* IRQ En */ map(0x300000, 0x30007f).rw("ensoniq", FUNC(es5506_device::read), FUNC(es5506_device::write)).umask16(0x00ff); /* Sound */ map(rom, 0xffffff).rom().region("maincpu", 0); /* ROM */ } @@ -429,12 +429,12 @@ void ssv_state::drifto94_map(address_map &map) ssv_map(map, 0xc00000); // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start map(0x400000, 0x47ffff).writeonly(); // ? - map(0x480000, 0x480001).rw(this, FUNC(ssv_state::dsp_dr_r), FUNC(ssv_state::dsp_dr_w)); - map(0x482000, 0x482fff).rw(this, FUNC(ssv_state::dsp_r), FUNC(ssv_state::dsp_w)); + map(0x480000, 0x480001).rw(FUNC(ssv_state::dsp_dr_r), FUNC(ssv_state::dsp_dr_w)); + map(0x482000, 0x482fff).rw(FUNC(ssv_state::dsp_r), FUNC(ssv_state::dsp_w)); map(0x483000, 0x485fff).nopw(); // ? map(0x500000, 0x500001).nopw(); // ?? - map(0x510000, 0x510001).r(this, FUNC(ssv_state::drifto94_unknown_r)); // ?? - map(0x520000, 0x520001).r(this, FUNC(ssv_state::drifto94_unknown_r)); // ?? + map(0x510000, 0x510001).r(FUNC(ssv_state::drifto94_unknown_r)); // ?? + map(0x520000, 0x520001).r(FUNC(ssv_state::drifto94_unknown_r)); // ?? map(0x580000, 0x5807ff).ram().share("nvram"); // NVRAM } @@ -476,11 +476,11 @@ WRITE16_MEMBER(ssv_state::gdfs_eeprom_w) void ssv_state::gdfs_map(address_map &map) { ssv_map(map, 0xc00000); - map(0x400000, 0x41ffff).ram().w(this, FUNC(ssv_state::gdfs_tmapram_w)).share("gdfs_tmapram"); + map(0x400000, 0x41ffff).ram().w(FUNC(ssv_state::gdfs_tmapram_w)).share("gdfs_tmapram"); map(0x420000, 0x43ffff).ram(); map(0x440000, 0x44003f).ram().share("gdfs_tmapscroll"); - map(0x500000, 0x500001).w(this, FUNC(ssv_state::gdfs_eeprom_w)); - map(0x540000, 0x540001).r(this, FUNC(ssv_state::gdfs_eeprom_r)); + map(0x500000, 0x500001).w(FUNC(ssv_state::gdfs_eeprom_w)); + map(0x540000, 0x540001).r(FUNC(ssv_state::gdfs_eeprom_r)); map(0x600000, 0x600fff).ram(); map(0x800000, 0x87ffff).rw(m_gdfs_st0020, FUNC(st0020_device::sprram_r), FUNC(st0020_device::sprram_w)); map(0x8c0000, 0x8c00ff).rw(m_gdfs_st0020, FUNC(st0020_device::regs_r), FUNC(st0020_device::regs_w)); @@ -517,9 +517,9 @@ void ssv_state::hypreact_map(address_map &map) ssv_map(map, 0xf00000); map(0x210000, 0x210001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 5 at the start - map(0x21000e, 0x21000f).w(this, FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines + map(0x21000e, 0x21000f).w(FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines // AM_RANGE(0x280000, 0x280001) AM_READNOP // ? read at the start, value not used - map(0xc00000, 0xc00001).r(this, FUNC(ssv_state::hypreact_input_r)); // Inputs + map(0xc00000, 0xc00001).r(FUNC(ssv_state::hypreact_input_r)); // Inputs map(0xc00006, 0xc00007).ram().share("input_sel"); // map(0xc00008, 0xc00009).noprw(); // } @@ -534,10 +534,10 @@ void ssv_state::hypreac2_map(address_map &map) ssv_map(map, 0xe00000); map(0x210000, 0x210001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 5 at the start - map(0x21000e, 0x21000f).w(this, FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines + map(0x21000e, 0x21000f).w(FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines // AM_RANGE(0x280000, 0x280001) AM_READNOP // ? read at the start, value not used - map(0x500000, 0x500001).r(this, FUNC(ssv_state::hypreact_input_r)); // Inputs - map(0x500002, 0x500003).r(this, FUNC(ssv_state::hypreact_input_r)); // (again?) + map(0x500000, 0x500001).r(FUNC(ssv_state::hypreact_input_r)); // Inputs + map(0x500002, 0x500003).r(FUNC(ssv_state::hypreact_input_r)); // (again?) map(0x520000, 0x520001).writeonly().share("input_sel"); // Inputs // 0x540000, 0x540003 communication with other units } @@ -556,7 +556,7 @@ void ssv_state::janjans1_map(address_map &map) // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start map(0x210006, 0x210007).nopr(); map(0x800000, 0x800001).writeonly().share("input_sel"); // Inputs - map(0x800002, 0x800003).r(this, FUNC(ssv_state::srmp4_input_r)); // Inputs + map(0x800002, 0x800003).r(FUNC(ssv_state::srmp4_input_r)); // Inputs } @@ -607,7 +607,7 @@ WRITE16_MEMBER(ssv_state::mainram_w) void ssv_state::mslider_map(address_map &map) { ssv_map(map, 0xf00000); - map(0x010000, 0x01ffff).rw(this, FUNC(ssv_state::mainram_r), FUNC(ssv_state::mainram_w)); // RAM Mirror + map(0x010000, 0x01ffff).rw(FUNC(ssv_state::mainram_r), FUNC(ssv_state::mainram_w)); // RAM Mirror // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start map(0x400000, 0x47ffff).writeonly(); // ? // AM_RANGE(0x500000, 0x500001) AM_WRITENOP // ? ff at the start @@ -647,7 +647,7 @@ void ssv_state::srmp4_map(address_map &map) ssv_map(map, 0xf00000); map(0x210000, 0x210001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1,5 at the start - map(0xc0000a, 0xc0000b).r(this, FUNC(ssv_state::srmp4_input_r)); // Inputs + map(0xc0000a, 0xc0000b).r(FUNC(ssv_state::srmp4_input_r)); // Inputs map(0xc0000e, 0xc0000f).writeonly().share("input_sel"); // Inputs map(0xc00010, 0xc00011).nopw(); // } @@ -696,11 +696,11 @@ void ssv_state::srmp7_map(address_map &map) map(0x010000, 0x050faf).ram(); // More RAM map(0x210000, 0x210001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 0,4 at the start - map(0x21000e, 0x21000f).w(this, FUNC(ssv_state::lockout_inv_w)); // Coin Counters / Lockouts - map(0x300076, 0x300077).r(this, FUNC(ssv_state::srmp7_irqv_r)); // Sound + map(0x21000e, 0x21000f).w(FUNC(ssv_state::lockout_inv_w)); // Coin Counters / Lockouts + map(0x300076, 0x300077).r(FUNC(ssv_state::srmp7_irqv_r)); // Sound // 0x540000, 0x540003, related to lev 5 irq? - map(0x580000, 0x580001).w(this, FUNC(ssv_state::srmp7_sound_bank_w)); // Sound Bank - map(0x600000, 0x600001).r(this, FUNC(ssv_state::srmp7_input_r)); // Inputs + map(0x580000, 0x580001).w(FUNC(ssv_state::srmp7_sound_bank_w)); // Sound Bank + map(0x600000, 0x600001).r(FUNC(ssv_state::srmp7_input_r)); // Inputs map(0x680000, 0x680001).writeonly().share("input_sel"); // Inputs } @@ -764,10 +764,10 @@ void ssv_state::sxyreact_map(address_map &map) // AM_RANGE(0x020000, 0x03ffff) AM_READWRITE(mainram_r, mainram_w) // sxyreac2 reads / writes here, why? map(0x210000, 0x210001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start - map(0x21000e, 0x21000f).w(this, FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines - map(0x500002, 0x500003).r(this, FUNC(ssv_state::sxyreact_ballswitch_r)); // ? - map(0x500004, 0x500005).rw(this, FUNC(ssv_state::sxyreact_dial_r), FUNC(ssv_state::sxyreact_motor_w)); // Dial Value (serial) - map(0x520000, 0x520001).w(this, FUNC(ssv_state::sxyreact_dial_w)); // Dial Value (advance 1 bit) + map(0x21000e, 0x21000f).w(FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines + map(0x500002, 0x500003).r(FUNC(ssv_state::sxyreact_ballswitch_r)); // ? + map(0x500004, 0x500005).rw(FUNC(ssv_state::sxyreact_dial_r), FUNC(ssv_state::sxyreact_motor_w)); // Dial Value (serial) + map(0x520000, 0x520001).w(FUNC(ssv_state::sxyreact_dial_w)); // Dial Value (advance 1 bit) map(0x580000, 0x58ffff).ram().share("nvram"); // NVRAM } @@ -783,8 +783,8 @@ void ssv_state::twineag2_map(address_map &map) ssv_map(map, 0xe00000); map(0x010000, 0x03ffff).ram(); // More RAM map(0x210000, 0x210001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // Watchdog (also value is cmp.b with mem 8) - map(0x480000, 0x480001).rw(this, FUNC(ssv_state::dsp_dr_r), FUNC(ssv_state::dsp_dr_w)); - map(0x482000, 0x482fff).rw(this, FUNC(ssv_state::dsp_r), FUNC(ssv_state::dsp_w)); + map(0x480000, 0x480001).rw(FUNC(ssv_state::dsp_dr_r), FUNC(ssv_state::dsp_dr_w)); + map(0x482000, 0x482fff).rw(FUNC(ssv_state::dsp_r), FUNC(ssv_state::dsp_w)); } @@ -841,10 +841,10 @@ WRITE16_MEMBER(ssv_state::latch16_w) void ssv_state::jsk_map(address_map &map) { ssv_map(map, 0xf00000); - map(0x050000, 0x05ffff).rw(this, FUNC(ssv_state::mainram_r), FUNC(ssv_state::mainram_w)); // RAM Mirror? + map(0x050000, 0x05ffff).rw(FUNC(ssv_state::mainram_r), FUNC(ssv_state::mainram_w)); // RAM Mirror? map(0x210000, 0x210001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x400000, 0x47ffff).ram(); // RAM? - map(0x900000, 0x900007).rw(this, FUNC(ssv_state::latch16_r), FUNC(ssv_state::latch16_w)); + map(0x900000, 0x900007).rw(FUNC(ssv_state::latch16_r), FUNC(ssv_state::latch16_w)); } @@ -853,7 +853,7 @@ void ssv_state::jsk_v810_mem(address_map &map) map(0x00000000, 0x0001ffff).ram(); map(0x80000000, 0x8001ffff).ram(); map(0xc0000000, 0xc001ffff).ram(); - map(0x40000000, 0x4000000f).rw(this, FUNC(ssv_state::latch32_r), FUNC(ssv_state::latch32_w)); + map(0x40000000, 0x4000000f).rw(FUNC(ssv_state::latch32_r), FUNC(ssv_state::latch32_w)); map(0xfff80000, 0xffffffff).rom().region("sub", 0); } @@ -896,12 +896,12 @@ WRITE16_MEMBER(ssv_state::eaglshot_gfxram_w) void ssv_state::eaglshot_map(address_map &map) { ssv_map(map, 0xf00000); - map(0x180000, 0x1bffff).rw(this, FUNC(ssv_state::eaglshot_gfxram_r), FUNC(ssv_state::eaglshot_gfxram_w)); + map(0x180000, 0x1bffff).rw(FUNC(ssv_state::eaglshot_gfxram_r), FUNC(ssv_state::eaglshot_gfxram_w)); map(0x210000, 0x210001).nopr(); /*AM_DEVREAD("watchdog", watchdog_timer_device, reset16_r)*/ // Watchdog // AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 0,4 at the start - map(0x21000e, 0x21000f).w(this, FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines - map(0x800000, 0x800000).w(this, FUNC(ssv_state::eaglshot_gfxrom_bank_w)); - map(0x900000, 0x900000).w(this, FUNC(ssv_state::eaglshot_trackball_w)); + map(0x21000e, 0x21000f).w(FUNC(ssv_state::lockout_inv_w)); // Inverted lockout lines + map(0x800000, 0x800000).w(FUNC(ssv_state::eaglshot_gfxrom_bank_w)); + map(0x900000, 0x900000).w(FUNC(ssv_state::eaglshot_trackball_w)); map(0xa00000, 0xbfffff).bankr("gfxrom"); map(0xc00000, 0xc007ff).ram().share("nvram"); // NVRAM map(0xd00000, 0xd00000).r(m_upd4701, FUNC(upd4701_device::d_r)); diff --git a/src/mame/drivers/stactics.cpp b/src/mame/drivers/stactics.cpp index f0fd2ad562b..c85ab37b883 100644 --- a/src/mame/drivers/stactics.cpp +++ b/src/mame/drivers/stactics.cpp @@ -186,18 +186,18 @@ void stactics_state::main_map(address_map &map) map(0x6000, 0x6007).mirror(0x0f08).w(m_outlatch, FUNC(ls259_device::write_d0)); map(0x6010, 0x6017).mirror(0x0f08).w("audiolatch", FUNC(ls259_device::write_d0)); map(0x6020, 0x6027).mirror(0x0f08).w("lamplatch", FUNC(ls259_device::write_d0)); - map(0x6030, 0x6030).mirror(0x0f0f).w(this, FUNC(stactics_state::speed_latch_w)); - map(0x6040, 0x6040).mirror(0x0f0f).w(this, FUNC(stactics_state::shot_trigger_w)); - map(0x6050, 0x6050).mirror(0x0f0f).w(this, FUNC(stactics_state::shot_flag_clear_w)); + map(0x6030, 0x6030).mirror(0x0f0f).w(FUNC(stactics_state::speed_latch_w)); + map(0x6040, 0x6040).mirror(0x0f0f).w(FUNC(stactics_state::shot_trigger_w)); + map(0x6050, 0x6050).mirror(0x0f0f).w(FUNC(stactics_state::shot_flag_clear_w)); map(0x6060, 0x606f).mirror(0x0f00).writeonly().share("display_buffer"); map(0x6070, 0x609f).mirror(0x0f00).nopw(); /* AM_RANGE(0x60a0, 0x60ef) AM_MIRROR(0x0f00) AM_WRITE(sound2_w) */ map(0x60f0, 0x60ff).mirror(0x0f00).nopw(); map(0x7000, 0x7000).mirror(0x0fff).portr("IN2"); map(0x8000, 0x8000).mirror(0x0fff).portr("IN3"); - map(0x8000, 0x87ff).mirror(0x0800).w(this, FUNC(stactics_state::scroll_ram_w)); - map(0x9000, 0x9000).mirror(0x0fff).r(this, FUNC(stactics_state::vert_pos_r)); - map(0xa000, 0xa000).mirror(0x0fff).r(this, FUNC(stactics_state::horiz_pos_r)); + map(0x8000, 0x87ff).mirror(0x0800).w(FUNC(stactics_state::scroll_ram_w)); + map(0x9000, 0x9000).mirror(0x0fff).r(FUNC(stactics_state::vert_pos_r)); + map(0xa000, 0xa000).mirror(0x0fff).r(FUNC(stactics_state::horiz_pos_r)); map(0xb000, 0xbfff).ram().share("videoram_b"); map(0xc000, 0xcfff).noprw(); map(0xd000, 0xdfff).ram().share("videoram_d"); diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp index 98241f54bc7..29f746814c5 100644 --- a/src/mame/drivers/stadhero.cpp +++ b/src/mame/drivers/stadhero.cpp @@ -56,14 +56,14 @@ WRITE16_MEMBER(stadhero_state::stadhero_control_w) void stadhero_state::main_map(address_map &map) { map(0x000000, 0x01ffff).rom(); - map(0x200000, 0x2007ff).ram().w(this, FUNC(stadhero_state::stadhero_pf1_data_w)).share("pf1_data"); + map(0x200000, 0x2007ff).ram().w(FUNC(stadhero_state::stadhero_pf1_data_w)).share("pf1_data"); map(0x240000, 0x240007).w(m_tilegen1, FUNC(deco_bac06_device::pf_control_0_w)); /* text layer */ map(0x240010, 0x240017).w(m_tilegen1, FUNC(deco_bac06_device::pf_control_1_w)); map(0x260000, 0x261fff).rw(m_tilegen1, FUNC(deco_bac06_device::pf_data_r), FUNC(deco_bac06_device::pf_data_w)); map(0x30c000, 0x30c001).portr("INPUTS"); map(0x30c002, 0x30c003).portr("COIN"); map(0x30c004, 0x30c005).portr("DSW"); - map(0x30c000, 0x30c00b).w(this, FUNC(stadhero_state::stadhero_control_w)); + map(0x30c000, 0x30c00b).w(FUNC(stadhero_state::stadhero_control_w)); map(0x310000, 0x3107ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0xff8000, 0xffbfff).ram(); /* Main ram */ map(0xffc000, 0xffc7ff).mirror(0x000800).ram().share("spriteram"); diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp index 4df6ca05d52..a9783f9369a 100644 --- a/src/mame/drivers/starcrus.cpp +++ b/src/mame/drivers/starcrus.cpp @@ -32,18 +32,18 @@ void starcrus_state::starcrus_map(address_map &map) void starcrus_state::starcrus_io_map(address_map &map) { - map(0x00, 0x00).portr("P1").w(this, FUNC(starcrus_state::s1_x_w)); - map(0x01, 0x01).portr("P2").w(this, FUNC(starcrus_state::s1_y_w)); - map(0x02, 0x02).rw(this, FUNC(starcrus_state::coll_det_r), FUNC(starcrus_state::s2_x_w)); - map(0x03, 0x03).portr("DSW").w(this, FUNC(starcrus_state::s2_y_w)); - map(0x04, 0x04).w(this, FUNC(starcrus_state::p1_x_w)); - map(0x05, 0x05).w(this, FUNC(starcrus_state::p1_y_w)); - map(0x06, 0x06).w(this, FUNC(starcrus_state::p2_x_w)); - map(0x07, 0x07).w(this, FUNC(starcrus_state::p2_y_w)); - map(0x08, 0x08).w(this, FUNC(starcrus_state::ship_parm_1_w)); - map(0x09, 0x09).w(this, FUNC(starcrus_state::ship_parm_2_w)); - map(0x0a, 0x0a).w(this, FUNC(starcrus_state::proj_parm_1_w)); - map(0x0b, 0x0b).w(this, FUNC(starcrus_state::proj_parm_2_w)); + map(0x00, 0x00).portr("P1").w(FUNC(starcrus_state::s1_x_w)); + map(0x01, 0x01).portr("P2").w(FUNC(starcrus_state::s1_y_w)); + map(0x02, 0x02).rw(FUNC(starcrus_state::coll_det_r), FUNC(starcrus_state::s2_x_w)); + map(0x03, 0x03).portr("DSW").w(FUNC(starcrus_state::s2_y_w)); + map(0x04, 0x04).w(FUNC(starcrus_state::p1_x_w)); + map(0x05, 0x05).w(FUNC(starcrus_state::p1_y_w)); + map(0x06, 0x06).w(FUNC(starcrus_state::p2_x_w)); + map(0x07, 0x07).w(FUNC(starcrus_state::p2_y_w)); + map(0x08, 0x08).w(FUNC(starcrus_state::ship_parm_1_w)); + map(0x09, 0x09).w(FUNC(starcrus_state::ship_parm_2_w)); + map(0x0a, 0x0a).w(FUNC(starcrus_state::proj_parm_1_w)); + map(0x0b, 0x0b).w(FUNC(starcrus_state::proj_parm_2_w)); } diff --git a/src/mame/drivers/starfire.cpp b/src/mame/drivers/starfire.cpp index 750c4b63bbd..45c08749097 100644 --- a/src/mame/drivers/starfire.cpp +++ b/src/mame/drivers/starfire.cpp @@ -193,9 +193,9 @@ READ8_MEMBER(starfire_state::fireone_input_r) void starfire_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x9fff).rw(this, FUNC(starfire_state::starfire_scratch_r), FUNC(starfire_state::starfire_scratch_w)); - map(0xa000, 0xbfff).rw(this, FUNC(starfire_state::starfire_colorram_r), FUNC(starfire_state::starfire_colorram_w)).share("colorram"); - map(0xc000, 0xffff).rw(this, FUNC(starfire_state::starfire_videoram_r), FUNC(starfire_state::starfire_videoram_w)).share("videoram"); + map(0x8000, 0x9fff).rw(FUNC(starfire_state::starfire_scratch_r), FUNC(starfire_state::starfire_scratch_w)); + map(0xa000, 0xbfff).rw(FUNC(starfire_state::starfire_colorram_r), FUNC(starfire_state::starfire_colorram_w)).share("colorram"); + map(0xc000, 0xffff).rw(FUNC(starfire_state::starfire_videoram_r), FUNC(starfire_state::starfire_videoram_w)).share("videoram"); } diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp index e8f29d61ebe..bbad6a68b4c 100644 --- a/src/mame/drivers/stargame.cpp +++ b/src/mame/drivers/stargame.cpp @@ -70,7 +70,7 @@ void stargame_state::audiocpu_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x4001).mirror(0x3ffe).rw("mea8000", FUNC(mea8000_device::read), FUNC(mea8000_device::write)); map(0x8000, 0x87ff).mirror(0x3800).ram(); - map(0xc000, 0xdfff).w(this, FUNC(stargame_state::rint_w)); // RINT - turn off interrupt of the audiocpu + map(0xc000, 0xdfff).w(FUNC(stargame_state::rint_w)); // RINT - turn off interrupt of the audiocpu map(0xe000, 0xffff).rw("soundlatch", FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); // COMAND - acknowledge NMI and read the sound command } diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp index 8bb81955048..36ee9d022dc 100644 --- a/src/mame/drivers/starshp1.cpp +++ b/src/mame/drivers/starshp1.cpp @@ -161,19 +161,19 @@ void starshp1_state::starshp1_map(address_map &map) map(0x2c00, 0x3fff).rom(); map(0xa000, 0xa000).portr("SYSTEM"); map(0xb000, 0xb000).portr("VBLANK"); - map(0xc300, 0xc3ff).w(this, FUNC(starshp1_state::starshp1_sspic_w)); /* spaceship picture */ + map(0xc300, 0xc3ff).w(FUNC(starshp1_state::starshp1_sspic_w)); /* spaceship picture */ map(0xc400, 0xc400).portr("COINAGE"); - map(0xc400, 0xc4ff).w(this, FUNC(starshp1_state::starshp1_ssadd_w)); /* spaceship address */ - map(0xc800, 0xc9ff).ram().w(this, FUNC(starshp1_state::starshp1_playfield_w)).share("playfield_ram"); + map(0xc400, 0xc4ff).w(FUNC(starshp1_state::starshp1_ssadd_w)); /* spaceship address */ + map(0xc800, 0xc9ff).ram().w(FUNC(starshp1_state::starshp1_playfield_w)).share("playfield_ram"); map(0xcc00, 0xcc0f).writeonly().share("hpos_ram"); map(0xd000, 0xd00f).writeonly().share("vpos_ram"); map(0xd400, 0xd40f).writeonly().share("obj_ram"); - map(0xd800, 0xd800).r(this, FUNC(starshp1_state::starshp1_rng_r)); - map(0xd800, 0xd80f).w(this, FUNC(starshp1_state::starshp1_collision_reset_w)); + map(0xd800, 0xd800).r(FUNC(starshp1_state::starshp1_rng_r)); + map(0xd800, 0xd80f).w(FUNC(starshp1_state::starshp1_collision_reset_w)); map(0xdc00, 0xdc07).mirror(0x0008).w("misclatch", FUNC(f9334_device::write_d0)); - map(0xdd00, 0xdd0f).w(this, FUNC(starshp1_state::starshp1_analog_in_w)); + map(0xdd00, 0xdd0f).w(FUNC(starshp1_state::starshp1_analog_in_w)); map(0xde00, 0xde07).mirror(0x0008).w("audiolatch", FUNC(f9334_device::write_d0)); - map(0xdf00, 0xdf0f).w(this, FUNC(starshp1_state::starshp1_analog_out_w)); + map(0xdf00, 0xdf0f).w(FUNC(starshp1_state::starshp1_analog_out_w)); map(0xf000, 0xffff).rom(); } diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp index 616a54df7ab..6e6bfa14c52 100644 --- a/src/mame/drivers/starwars.cpp +++ b/src/mame/drivers/starwars.cpp @@ -48,7 +48,7 @@ WRITE8_MEMBER(starwars_state::quad_pokeyn_w) int control = (offset & 0x20) >> 2; int pokey_reg = (offset % 8) | control; - m_pokey[pokey_num]->write(pokey_reg, data); + m_pokey[pokey_num]->write(space, pokey_reg, data); } /************************************* @@ -137,20 +137,20 @@ void starwars_state::main_map(address_map &map) map(0x4380, 0x439f).r("adc", FUNC(adc0809_device::data_r)); map(0x4400, 0x4400).r(m_mainlatch, FUNC(generic_latch_8_device::read)); map(0x4400, 0x4400).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x4401, 0x4401).r(this, FUNC(starwars_state::starwars_main_ready_flag_r)); + map(0x4401, 0x4401).r(FUNC(starwars_state::starwars_main_ready_flag_r)); map(0x4500, 0x45ff).rw("x2212", FUNC(x2212_device::read), FUNC(x2212_device::write)); map(0x4600, 0x461f).w("avg", FUNC(avg_starwars_device::go_w)); map(0x4620, 0x463f).w("avg", FUNC(avg_starwars_device::reset_w)); map(0x4640, 0x465f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x4660, 0x467f).w(this, FUNC(starwars_state::irq_ack_w)); + map(0x4660, 0x467f).w(FUNC(starwars_state::irq_ack_w)); map(0x4680, 0x4687).nopr().mirror(0x0018).w("outlatch", FUNC(ls259_device::write_d7)); - map(0x46a0, 0x46bf).w(this, FUNC(starwars_state::starwars_nstore_w)); + map(0x46a0, 0x46bf).w(FUNC(starwars_state::starwars_nstore_w)); map(0x46c0, 0x46c3).w("adc", FUNC(adc0809_device::address_offset_start_w)); - map(0x46e0, 0x46e0).w(this, FUNC(starwars_state::starwars_soundrst_w)); - map(0x4700, 0x4707).w(this, FUNC(starwars_state::starwars_math_w)); - map(0x4700, 0x4700).r(this, FUNC(starwars_state::starwars_div_reh_r)); - map(0x4701, 0x4701).r(this, FUNC(starwars_state::starwars_div_rel_r)); - map(0x4703, 0x4703).r(this, FUNC(starwars_state::starwars_prng_r)); /* pseudo random number generator */ + map(0x46e0, 0x46e0).w(FUNC(starwars_state::starwars_soundrst_w)); + map(0x4700, 0x4707).w(FUNC(starwars_state::starwars_math_w)); + map(0x4700, 0x4700).r(FUNC(starwars_state::starwars_div_reh_r)); + map(0x4701, 0x4701).r(FUNC(starwars_state::starwars_div_rel_r)); + map(0x4703, 0x4703).r(FUNC(starwars_state::starwars_prng_r)); /* pseudo random number generator */ map(0x4800, 0x4fff).ram(); /* CPU and Math RAM */ map(0x5000, 0x5fff).ram().share("mathram"); /* CPU and Math RAM */ map(0x6000, 0x7fff).bankr("bank1"); /* banked ROM */ @@ -160,7 +160,7 @@ void starwars_state::main_map(address_map &map) void starwars_state::esb_main_map(address_map &map) { main_map(map); - map(0x8000, 0x9fff).rw(this, FUNC(starwars_state::esb_slapstic_r), FUNC(starwars_state::esb_slapstic_w)); + map(0x8000, 0x9fff).rw(FUNC(starwars_state::esb_slapstic_r), FUNC(starwars_state::esb_slapstic_w)); map(0xa000, 0xffff).bankr("bank2"); } @@ -177,7 +177,7 @@ void starwars_state::sound_map(address_map &map) map(0x0800, 0x0fff).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* SIN Read */ map(0x1000, 0x107f).ram(); /* 6532 ram */ map(0x1080, 0x109f).rw(m_riot, FUNC(riot6532_device::read), FUNC(riot6532_device::write)); - map(0x1800, 0x183f).w(this, FUNC(starwars_state::quad_pokeyn_w)); + map(0x1800, 0x183f).w(FUNC(starwars_state::quad_pokeyn_w)); map(0x2000, 0x27ff).ram(); /* program RAM */ map(0x4000, 0x7fff).rom(); /* sound roms */ map(0xb000, 0xffff).rom(); /* more sound roms */ diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index 3cdfd56a8ab..bb150ad7a8e 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -291,13 +291,13 @@ void statriv2_state::statriv2_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram(); map(0x4800, 0x48ff).ram().share("nvram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(statriv2_state::statriv2_videoram_w)).share("videoram"); + map(0xc800, 0xcfff).ram().w(FUNC(statriv2_state::statriv2_videoram_w)).share("videoram"); } void statriv2_state::statriv2_io_map(address_map &map) { map(0x20, 0x23).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x28, 0x2b).r(this, FUNC(statriv2_state::question_data_r)).writeonly().share("question_offset"); + map(0x28, 0x2b).r(FUNC(statriv2_state::question_data_r)).writeonly().share("question_offset"); map(0xb0, 0xb1).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0xb1, 0xb1).r("aysnd", FUNC(ay8910_device::data_r)); map(0xc0, 0xcf).rw(m_tms, FUNC(tms9927_device::read), FUNC(tms9927_device::write)); diff --git a/src/mame/drivers/stellafr.cpp b/src/mame/drivers/stellafr.cpp index 71d5c8ef73a..a3aa5b1d43c 100644 --- a/src/mame/drivers/stellafr.cpp +++ b/src/mame/drivers/stellafr.cpp @@ -76,8 +76,8 @@ WRITE8_MEMBER(stellafr_state::ay8910_portb_w) void stellafr_state::stellafr_map(address_map &map) { map(0x000000, 0x01ffff).rom(); - map(0x8000c1, 0x8000c1).w(this, FUNC(stellafr_state::write_8000c1)); - map(0x800101, 0x800101).rw(this, FUNC(stellafr_state::read_800101), FUNC(stellafr_state::write_800101)); + map(0x8000c1, 0x8000c1).w(FUNC(stellafr_state::write_8000c1)); + map(0x800101, 0x800101).rw(FUNC(stellafr_state::read_800101), FUNC(stellafr_state::write_800101)); map(0x800141, 0x800141).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w)); map(0x800143, 0x800143).w("aysnd", FUNC(ay8910_device::data_w)); map(0x800180, 0x80019f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); diff --git a/src/mame/drivers/stfight.cpp b/src/mame/drivers/stfight.cpp index 6a4d791f856..9ccd0e23470 100644 --- a/src/mame/drivers/stfight.cpp +++ b/src/mame/drivers/stfight.cpp @@ -278,11 +278,11 @@ void stfight_state::cpu1_map(address_map &map) map(0xc202, 0xc202).portr("START"); map(0xc203, 0xc203).portr("DSW0"); map(0xc204, 0xc204).portr("DSW1"); - map(0xc205, 0xc205).r(this, FUNC(stfight_state::stfight_coin_r)); - map(0xc500, 0xc500).w(this, FUNC(stfight_state::stfight_fm_w)); - map(0xc600, 0xc600).w(this, FUNC(stfight_state::stfight_mcu_w)); - map(0xc700, 0xc700).w(this, FUNC(stfight_state::stfight_coin_w)); - map(0xc804, 0xc804).w(this, FUNC(stfight_state::stfight_io_w)); + map(0xc205, 0xc205).r(FUNC(stfight_state::stfight_coin_r)); + map(0xc500, 0xc500).w(FUNC(stfight_state::stfight_fm_w)); + map(0xc600, 0xc600).w(FUNC(stfight_state::stfight_mcu_w)); + map(0xc700, 0xc700).w(FUNC(stfight_state::stfight_coin_w)); + map(0xc804, 0xc804).w(FUNC(stfight_state::stfight_io_w)); map(0xc806, 0xc806).nopw(); /* TBD */ map(0xe000, 0xefff).ram(); } @@ -306,7 +306,7 @@ void stfight_state::decrypted_opcodes_map(address_map &map) void stfight_state::cshooter_cpu1_map(address_map &map) { cpu1_map(map); - map(0xc801, 0xc801).w(this, FUNC(stfight_state::stfight_bank_w)); + map(0xc801, 0xc801).w(FUNC(stfight_state::stfight_bank_w)); map(0xd000, 0xd7ff).ram().w("airraid_vid", FUNC(airraid_video_device::txram_w)).share("txram"); map(0xd800, 0xd80f).ram().w("airraid_vid", FUNC(airraid_video_device::vregs_w)).share("vregs"); // wrong? map(0xe000, 0xfdff).ram(); @@ -323,7 +323,7 @@ void stfight_state::cpu2_map(address_map &map) map(0xd000, 0xd000).nopr(); map(0xd800, 0xd800).nopw(); map(0xe800, 0xe800).nopw(); - map(0xf000, 0xf000).r(this, FUNC(stfight_state::stfight_fm_r)); + map(0xf000, 0xf000).r(FUNC(stfight_state::stfight_fm_r)); map(0xf800, 0xffff).ram(); } diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp index 85d96d72b15..82f03625bf3 100644 --- a/src/mame/drivers/stlforce.cpp +++ b/src/mame/drivers/stlforce.cpp @@ -95,10 +95,10 @@ WRITE8_MEMBER(stlforce_state::oki_bank_w) void stlforce_state::stlforce_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x1007ff).ram().w(this, FUNC(stlforce_state::bg_videoram_w)).share("bg_videoram"); - map(0x100800, 0x100fff).ram().w(this, FUNC(stlforce_state::mlow_videoram_w)).share("mlow_videoram"); - map(0x101000, 0x1017ff).ram().w(this, FUNC(stlforce_state::mhigh_videoram_w)).share("mhigh_videoram"); - map(0x101800, 0x1027ff).ram().w(this, FUNC(stlforce_state::tx_videoram_w)).share("tx_videoram"); + map(0x100000, 0x1007ff).ram().w(FUNC(stlforce_state::bg_videoram_w)).share("bg_videoram"); + map(0x100800, 0x100fff).ram().w(FUNC(stlforce_state::mlow_videoram_w)).share("mlow_videoram"); + map(0x101000, 0x1017ff).ram().w(FUNC(stlforce_state::mhigh_videoram_w)).share("mhigh_videoram"); + map(0x101800, 0x1027ff).ram().w(FUNC(stlforce_state::tx_videoram_w)).share("tx_videoram"); map(0x102800, 0x102fff).ram(); /* unknown / ram */ map(0x103000, 0x1033ff).ram().share("bg_scrollram"); map(0x103400, 0x1037ff).ram().share("mlow_scrollram"); @@ -110,8 +110,8 @@ void stlforce_state::stlforce_map(address_map &map) map(0x109000, 0x11ffff).ram(); map(0x400000, 0x400001).portr("INPUT"); map(0x400002, 0x400003).portr("SYSTEM"); - map(0x400011, 0x400011).w(this, FUNC(stlforce_state::eeprom_w)); - map(0x400012, 0x400012).w(this, FUNC(stlforce_state::oki_bank_w)); + map(0x400011, 0x400011).w(FUNC(stlforce_state::eeprom_w)); + map(0x400012, 0x400012).w(FUNC(stlforce_state::oki_bank_w)); map(0x40001e, 0x40001f).nopw(); // sprites buffer commands map(0x410001, 0x410001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp index 02d5c10c973..518756c31b8 100644 --- a/src/mame/drivers/stratos.cpp +++ b/src/mame/drivers/stratos.cpp @@ -333,12 +333,12 @@ WRITE8_MEMBER(stratos_state::lcd_w) void stratos_state::stratos_mem(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2000).w(this, FUNC(stratos_state::p2000_w)); - map(0x2200, 0x2200).rw(this, FUNC(stratos_state::p2200_r), FUNC(stratos_state::p2200_w)); - map(0x2400, 0x2400).w(this, FUNC(stratos_state::p2400_w)); - map(0x2600, 0x2600).rw(this, FUNC(stratos_state::control_r), FUNC(stratos_state::control_w)); + map(0x2000, 0x2000).w(FUNC(stratos_state::p2000_w)); + map(0x2200, 0x2200).rw(FUNC(stratos_state::p2200_r), FUNC(stratos_state::p2200_w)); + map(0x2400, 0x2400).w(FUNC(stratos_state::p2400_w)); + map(0x2600, 0x2600).rw(FUNC(stratos_state::control_r), FUNC(stratos_state::control_w)); map(0x2800, 0x37ff).bankrw("nvram_bank"); - map(0x3800, 0x3800).rw(this, FUNC(stratos_state::lcd_r), FUNC(stratos_state::lcd_w)); + map(0x3800, 0x3800).rw(FUNC(stratos_state::lcd_r), FUNC(stratos_state::lcd_w)); map(0x4000, 0x7fff).bankr("bank_4000"); map(0x8000, 0xffff).bankr("bank_8000"); } diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 9ecff4ffe3f..26938614ac3 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -344,8 +344,8 @@ void studio2_state::studio2_map(address_map &map) void studio2_state::studio2_io_map(address_map &map) { map.unmap_value_high(); - map(0x01, 0x01).r(this, FUNC(studio2_state::dispon_r)); - map(0x02, 0x02).w(this, FUNC(studio2_state::keylatch_w)); + map(0x01, 0x01).r(FUNC(studio2_state::dispon_r)); + map(0x02, 0x02).w(FUNC(studio2_state::keylatch_w)); } void visicom_state::visicom_map(address_map &map) @@ -359,8 +359,8 @@ void visicom_state::visicom_map(address_map &map) void visicom_state::visicom_io_map(address_map &map) { - map(0x01, 0x01).w(this, FUNC(visicom_state::dispon_w)); - map(0x02, 0x02).w(this, FUNC(visicom_state::keylatch_w)); + map(0x01, 0x01).w(FUNC(visicom_state::dispon_w)); + map(0x02, 0x02).w(FUNC(visicom_state::keylatch_w)); } void mpt02_state::mpt02_map(address_map &map) @@ -374,7 +374,7 @@ void mpt02_state::mpt02_map(address_map &map) void mpt02_state::mpt02_io_map(address_map &map) { map(0x01, 0x01).rw(m_cti, FUNC(cdp1864_device::dispon_r), FUNC(cdp1864_device::step_bgcolor_w)); - map(0x02, 0x02).w(this, FUNC(mpt02_state::keylatch_w)); + map(0x02, 0x02).w(FUNC(mpt02_state::keylatch_w)); map(0x04, 0x04).rw(m_cti, FUNC(cdp1864_device::dispoff_r), FUNC(cdp1864_device::tone_latch_w)); } diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index 90f15446543..f290bfc7c0f 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -324,17 +324,17 @@ void stuntair_state::stuntair_map(address_map &map) { map(0x0000, 0x9fff).rom(); map(0xc000, 0xc7ff).ram().share("nvram"); - map(0xc800, 0xcbff).ram().w(this, FUNC(stuntair_state::stuntair_bgattrram_w)).share("bgattrram"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(stuntair_state::stuntair_bgram_w)).share("bgram"); + map(0xc800, 0xcbff).ram().w(FUNC(stuntair_state::stuntair_bgattrram_w)).share("bgattrram"); + map(0xd000, 0xd3ff).ram().w(FUNC(stuntair_state::stuntair_bgram_w)).share("bgram"); map(0xd800, 0xdfff).ram().share("sprram"); - map(0xe000, 0xe000).portr("DSWB").w(this, FUNC(stuntair_state::stuntair_coin_w)); - map(0xe800, 0xe800).portr("DSWA").w(this, FUNC(stuntair_state::stuntair_bgxscroll_w)); + map(0xe000, 0xe000).portr("DSWB").w(FUNC(stuntair_state::stuntair_coin_w)); + map(0xe800, 0xe800).portr("DSWA").w(FUNC(stuntair_state::stuntair_bgxscroll_w)); map(0xf000, 0xf000).portr("IN2"); map(0xf002, 0xf002).portr("IN3"); map(0xf003, 0xf003).r("watchdog", FUNC(watchdog_timer_device::reset_r)); map(0xf000, 0xf007).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xf800, 0xfbff).ram().w(this, FUNC(stuntair_state::stuntair_fgram_w)).share("fgram"); - map(0xfc03, 0xfc03).w(this, FUNC(stuntair_state::stuntair_sound_w)); + map(0xf800, 0xfbff).ram().w(FUNC(stuntair_state::stuntair_fgram_w)).share("fgram"); + map(0xfc03, 0xfc03).w(FUNC(stuntair_state::stuntair_sound_w)); } // sound Z80 diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 5a48e538fa9..7f213eaf4b6 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -976,22 +976,22 @@ void stv_state::stv_mem(address_map &map) { map(0x00000000, 0x0007ffff).rom().mirror(0x20000000).region("bios", 0); // bios map(0x00100000, 0x0010007f).rw(m_smpc_hle, FUNC(smpc_hle_device::read), FUNC(smpc_hle_device::write)); - map(0x00180000, 0x0018ffff).rw(this, FUNC(stv_state::saturn_backupram_r), FUNC(stv_state::saturn_backupram_w)).share("share1"); + map(0x00180000, 0x0018ffff).rw(FUNC(stv_state::saturn_backupram_r), FUNC(stv_state::saturn_backupram_w)).share("share1"); map(0x00200000, 0x002fffff).ram().mirror(0x20100000).share("workram_l"); // AM_RANGE(0x00400000, 0x0040001f) AM_READWRITE(stv_ioga_r32, stv_io_w32) AM_SHARE("ioga") AM_MIRROR(0x20) /* installed with per-game specific */ - map(0x01000000, 0x017fffff).w(this, FUNC(stv_state::minit_w)); - map(0x01800000, 0x01ffffff).w(this, FUNC(stv_state::sinit_w)); + map(0x01000000, 0x017fffff).w(FUNC(stv_state::minit_w)); + map(0x01800000, 0x01ffffff).w(FUNC(stv_state::sinit_w)); map(0x02000000, 0x04ffffff).rom().mirror(0x20000000).region("abus", 0); // cartridge /* Sound */ - map(0x05a00000, 0x05afffff).rw(this, FUNC(stv_state::saturn_soundram_r), FUNC(stv_state::saturn_soundram_w)); + map(0x05a00000, 0x05afffff).rw(FUNC(stv_state::saturn_soundram_r), FUNC(stv_state::saturn_soundram_w)); map(0x05b00000, 0x05b00fff).rw("scsp", FUNC(scsp_device::read), FUNC(scsp_device::write)); /* VDP1 */ - map(0x05c00000, 0x05c7ffff).rw(this, FUNC(stv_state::saturn_vdp1_vram_r), FUNC(stv_state::saturn_vdp1_vram_w)); - map(0x05c80000, 0x05cbffff).rw(this, FUNC(stv_state::saturn_vdp1_framebuffer0_r), FUNC(stv_state::saturn_vdp1_framebuffer0_w)); - map(0x05d00000, 0x05d0001f).rw(this, FUNC(stv_state::saturn_vdp1_regs_r), FUNC(stv_state::saturn_vdp1_regs_w)); - map(0x05e00000, 0x05e7ffff).mirror(0x80000).rw(this, FUNC(stv_state::saturn_vdp2_vram_r), FUNC(stv_state::saturn_vdp2_vram_w)); - map(0x05f00000, 0x05f7ffff).rw(this, FUNC(stv_state::saturn_vdp2_cram_r), FUNC(stv_state::saturn_vdp2_cram_w)); - map(0x05f80000, 0x05fbffff).rw(this, FUNC(stv_state::saturn_vdp2_regs_r), FUNC(stv_state::saturn_vdp2_regs_w)); + map(0x05c00000, 0x05c7ffff).rw(FUNC(stv_state::saturn_vdp1_vram_r), FUNC(stv_state::saturn_vdp1_vram_w)); + map(0x05c80000, 0x05cbffff).rw(FUNC(stv_state::saturn_vdp1_framebuffer0_r), FUNC(stv_state::saturn_vdp1_framebuffer0_w)); + map(0x05d00000, 0x05d0001f).rw(FUNC(stv_state::saturn_vdp1_regs_r), FUNC(stv_state::saturn_vdp1_regs_w)); + map(0x05e00000, 0x05e7ffff).mirror(0x80000).rw(FUNC(stv_state::saturn_vdp2_vram_r), FUNC(stv_state::saturn_vdp2_vram_w)); + map(0x05f00000, 0x05f7ffff).rw(FUNC(stv_state::saturn_vdp2_cram_r), FUNC(stv_state::saturn_vdp2_cram_w)); + map(0x05f80000, 0x05fbffff).rw(FUNC(stv_state::saturn_vdp2_regs_r), FUNC(stv_state::saturn_vdp2_regs_w)); map(0x05fe0000, 0x05fe00cf).m(m_scu, FUNC(sega_scu_device::regs_map)); //AM_READWRITE(saturn_scu_r, saturn_scu_w) map(0x06000000, 0x060fffff).ram().mirror(0x21f00000).share("workram_h"); map(0x60000000, 0x600003ff).nopw(); diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp index 37cde369e04..6aae529452a 100644 --- a/src/mame/drivers/sub.cpp +++ b/src/mame/drivers/sub.cpp @@ -129,11 +129,11 @@ void sub_state::subm_map(address_map &map) { map(0x0000, 0xafff).rom(); map(0xb000, 0xbfff).ram(); - map(0xc000, 0xc3ff).ram().w(this, FUNC(sub_state::attr_w)).share("attr"); - map(0xc400, 0xc7ff).ram().w(this, FUNC(sub_state::vram_w)).share("vram"); + map(0xc000, 0xc3ff).ram().w(FUNC(sub_state::attr_w)).share("attr"); + map(0xc400, 0xc7ff).ram().w(FUNC(sub_state::vram_w)).share("vram"); map(0xd000, 0xd03f).ram().share("spriteram"); map(0xd800, 0xd83f).ram().share("spriteram2"); - map(0xd840, 0xd85f).ram().w(this, FUNC(sub_state::scrolly_w)).share("scrolly"); + map(0xd840, 0xd85f).ram().w(FUNC(sub_state::scrolly_w)).share("scrolly"); map(0xe000, 0xe000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xe800, 0xe807).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -161,7 +161,7 @@ void sub_state::subm_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x6000, 0x6000).w(this, FUNC(sub_state::nmi_mask_w)); + map(0x6000, 0x6000).w(FUNC(sub_state::nmi_mask_w)); } void sub_state::subm_sound_io(address_map &map) diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp index 0154634419f..ffee6453e88 100644 --- a/src/mame/drivers/subs.cpp +++ b/src/mame/drivers/subs.cpp @@ -55,12 +55,12 @@ void subs_state::main_map(address_map &map) { map.global_mask(0x3fff); map(0x0000, 0x01ff).ram(); - map(0x0000, 0x0000).w(this, FUNC(subs_state::noise_reset_w)); - map(0x0000, 0x0007).r(this, FUNC(subs_state::control_r)); - map(0x0020, 0x0020).w(this, FUNC(subs_state::steer_reset_w)); - map(0x0020, 0x0027).r(this, FUNC(subs_state::coin_r)); + map(0x0000, 0x0000).w(FUNC(subs_state::noise_reset_w)); + map(0x0000, 0x0007).r(FUNC(subs_state::control_r)); + map(0x0020, 0x0020).w(FUNC(subs_state::steer_reset_w)); + map(0x0020, 0x0027).r(FUNC(subs_state::coin_r)); // AM_RANGE(0x0040, 0x0040) AM_WRITE(timer_reset_w) - map(0x0060, 0x0063).r(this, FUNC(subs_state::options_r)); + map(0x0060, 0x0063).r(FUNC(subs_state::options_r)); map(0x0060, 0x006f).w("latch", FUNC(ls259_device::write_a0)); map(0x0090, 0x009f).share("spriteram"); map(0x0800, 0x0bff).ram().share("videoram"); diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index 3c2b9440e22..c271c2552f6 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -779,8 +779,8 @@ void subsino_state::srider_map(address_map &map) map(0x0d000, 0x0d002).r("ppi1", FUNC(i8255_device::read)); map(0x0d004, 0x0d006).r("ppi2", FUNC(i8255_device::read)); - map(0x0d009, 0x0d009).w(this, FUNC(subsino_state::out_b_w)); - map(0x0d00a, 0x0d00a).w(this, FUNC(subsino_state::out_a_w)); + map(0x0d009, 0x0d009).w(FUNC(subsino_state::out_b_w)); + map(0x0d00a, 0x0d00a).w(FUNC(subsino_state::out_a_w)); map(0x0d00c, 0x0d00c).portr("INC"); @@ -788,10 +788,10 @@ void subsino_state::srider_map(address_map &map) map(0x0d018, 0x0d018).w("oki", FUNC(okim6295_device::write)); - map(0x0d01b, 0x0d01b).w(this, FUNC(subsino_state::tiles_offset_w)); + map(0x0d01b, 0x0d01b).w(FUNC(subsino_state::tiles_offset_w)); - map(0x0e000, 0x0e7ff).ram().w(this, FUNC(subsino_state::colorram_w)).share("colorram"); - map(0x0e800, 0x0efff).ram().w(this, FUNC(subsino_state::videoram_w)).share("videoram"); + map(0x0e000, 0x0e7ff).ram().w(FUNC(subsino_state::colorram_w)).share("colorram"); + map(0x0e800, 0x0efff).ram().w(FUNC(subsino_state::videoram_w)).share("videoram"); } @@ -803,8 +803,8 @@ void subsino_state::sharkpy_map(address_map &map) map(0x09000, 0x09002).r("ppi1", FUNC(i8255_device::read)); map(0x09004, 0x09006).r("ppi2", FUNC(i8255_device::read)); - map(0x09009, 0x09009).w(this, FUNC(subsino_state::out_b_w)); - map(0x0900a, 0x0900a).w(this, FUNC(subsino_state::out_a_w)); + map(0x09009, 0x09009).w(FUNC(subsino_state::out_b_w)); + map(0x0900a, 0x0900a).w(FUNC(subsino_state::out_a_w)); map(0x0900c, 0x0900c).portr("INC"); @@ -812,11 +812,11 @@ void subsino_state::sharkpy_map(address_map &map) map(0x09018, 0x09018).w("oki", FUNC(okim6295_device::write)); - map(0x0901b, 0x0901b).w(this, FUNC(subsino_state::tiles_offset_w)); + map(0x0901b, 0x0901b).w(FUNC(subsino_state::tiles_offset_w)); map(0x07800, 0x07fff).ram(); - map(0x08000, 0x087ff).ram().w(this, FUNC(subsino_state::colorram_w)).share("colorram"); - map(0x08800, 0x08fff).ram().w(this, FUNC(subsino_state::videoram_w)).share("videoram"); + map(0x08000, 0x087ff).ram().w(FUNC(subsino_state::colorram_w)).share("colorram"); + map(0x08800, 0x08fff).ram().w(FUNC(subsino_state::videoram_w)).share("videoram"); } /* @@ -844,11 +844,11 @@ void subsino_state::victor21_map(address_map &map) map(0x0900e, 0x0900f).w("ymsnd", FUNC(ym2413_device::write)); - map(0x0900d, 0x0900d).w(this, FUNC(subsino_state::tiles_offset_w)); + map(0x0900d, 0x0900d).w(FUNC(subsino_state::tiles_offset_w)); map(0x07800, 0x07fff).ram(); - map(0x08000, 0x087ff).ram().w(this, FUNC(subsino_state::videoram_w)).share("videoram"); - map(0x08800, 0x08fff).ram().w(this, FUNC(subsino_state::colorram_w)).share("colorram"); + map(0x08000, 0x087ff).ram().w(FUNC(subsino_state::videoram_w)).share("videoram"); + map(0x08800, 0x08fff).ram().w(FUNC(subsino_state::colorram_w)).share("colorram"); map(0x10000, 0x13fff).rom(); } @@ -908,7 +908,7 @@ WRITE8_MEMBER(subsino_state::flash_w) void subsino_state::victor5_map(address_map &map) { victor21_map(map); - map(0x0900a, 0x0900a).rw(this, FUNC(subsino_state::flash_r), FUNC(subsino_state::flash_w)); + map(0x0900a, 0x0900a).rw(FUNC(subsino_state::flash_r), FUNC(subsino_state::flash_w)); map(0x0900b, 0x0900b).nopr(); //"flash" status, bit 0 } @@ -930,13 +930,13 @@ void subsino_state::crsbingo_map(address_map &map) map(0x09002, 0x09002).portr("INA"); map(0x09003, 0x09003).portr("INB"); map(0x09004, 0x09004).portr("INC"); - map(0x09005, 0x09005).w(this, FUNC(subsino_state::out_a_w)); + map(0x09005, 0x09005).w(FUNC(subsino_state::out_a_w)); map(0x09008, 0x09008).portr("SW4"); map(0x09009, 0x09009).portr("SW3"); // AM_WRITE(out_a_w ) - map(0x0900a, 0x0900a).rw(this, FUNC(subsino_state::hwcheck_r), FUNC(subsino_state::out_b_w)); + map(0x0900a, 0x0900a).rw(FUNC(subsino_state::hwcheck_r), FUNC(subsino_state::out_b_w)); - map(0x09010, 0x09010).rw(this, FUNC(subsino_state::flash_r), FUNC(subsino_state::flash_w)); + map(0x09010, 0x09010).rw(FUNC(subsino_state::flash_r), FUNC(subsino_state::flash_w)); // AM_RANGE( 0x09011, 0x09011 ) //"flash" status, bit 0 // AM_RANGE( 0x0900c, 0x0900c ) AM_READ_PORT( "INC" ) map(0x0900c, 0x0900d).w("ymsnd", FUNC(ym2413_device::write)); @@ -946,8 +946,8 @@ void subsino_state::crsbingo_map(address_map &map) // AM_RANGE( 0x0900d, 0x0900d ) AM_WRITE(tiles_offset_w ) map(0x07800, 0x07fff).ram(); - map(0x08000, 0x087ff).ram().w(this, FUNC(subsino_state::videoram_w)).share("videoram"); - map(0x08800, 0x08fff).ram().w(this, FUNC(subsino_state::colorram_w)).share("colorram"); + map(0x08000, 0x087ff).ram().w(FUNC(subsino_state::videoram_w)).share("videoram"); + map(0x08800, 0x08fff).ram().w(FUNC(subsino_state::colorram_w)).share("colorram"); map(0x10000, 0x13fff).rom(); //overlap unmapped regions @@ -976,9 +976,9 @@ void subsino_state::tisub_map(address_map &map) map(0x09004, 0x09006).r("ppi2", FUNC(i8255_device::read)); /* 0x09008: is marked as OUTPUT C in the test mode. */ - map(0x09008, 0x09008).w(this, FUNC(subsino_state::out_c_w)); - map(0x09009, 0x09009).w(this, FUNC(subsino_state::out_b_w)); - map(0x0900a, 0x0900a).w(this, FUNC(subsino_state::out_a_w)); + map(0x09008, 0x09008).w(FUNC(subsino_state::out_c_w)); + map(0x09009, 0x09009).w(FUNC(subsino_state::out_b_w)); + map(0x0900a, 0x0900a).w(FUNC(subsino_state::out_a_w)); map(0x0900c, 0x0900c).portr("INC"); @@ -986,11 +986,11 @@ void subsino_state::tisub_map(address_map &map) // AM_RANGE( 0x0900c, 0x0900c ) AM_DEVWRITE("oki", okim6295_device, write) - map(0x0901b, 0x0901b).w(this, FUNC(subsino_state::tiles_offset_w)); + map(0x0901b, 0x0901b).w(FUNC(subsino_state::tiles_offset_w)); map(0x07800, 0x07fff).ram(); - map(0x08800, 0x08fff).ram().w(this, FUNC(subsino_state::videoram_w)).share("videoram"); - map(0x08000, 0x087ff).ram().w(this, FUNC(subsino_state::colorram_w)).share("colorram"); + map(0x08800, 0x08fff).ram().w(FUNC(subsino_state::videoram_w)).share("videoram"); + map(0x08000, 0x087ff).ram().w(FUNC(subsino_state::colorram_w)).share("colorram"); map(0x10000, 0x13fff).rom(); map(0x14000, 0x14fff).rom(); // reads the card face data here (see rom copy in rom loading) @@ -999,9 +999,9 @@ void subsino_state::tisub_map(address_map &map) map(0x15140, 0x1517f).ram().share("reel_scroll.1"); map(0x15180, 0x151bf).ram().share("reel_scroll.0"); - map(0x15800, 0x159ff).ram().w(this, FUNC(subsino_state::reel_ram_w<0>)).share("reel_ram.0"); - map(0x15a00, 0x15bff).ram().w(this, FUNC(subsino_state::reel_ram_w<1>)).share("reel_ram.1"); - map(0x15c00, 0x15dff).ram().w(this, FUNC(subsino_state::reel_ram_w<2>)).share("reel_ram.2"); + map(0x15800, 0x159ff).ram().w(FUNC(subsino_state::reel_ram_w<0>)).share("reel_ram.0"); + map(0x15a00, 0x15bff).ram().w(FUNC(subsino_state::reel_ram_w<1>)).share("reel_ram.1"); + map(0x15c00, 0x15dff).ram().w(FUNC(subsino_state::reel_ram_w<2>)).share("reel_ram.2"); } void subsino_state::ramdac_map(address_map &map) @@ -1071,8 +1071,8 @@ void subsino_state::stbsub_map(address_map &map) map(0x0d008, 0x0d008).ram().share("stbsub_out_c"); - map(0x0d009, 0x0d009).w(this, FUNC(subsino_state::out_b_w)); - map(0x0d00a, 0x0d00a).w(this, FUNC(subsino_state::out_a_w)); + map(0x0d009, 0x0d009).w(FUNC(subsino_state::out_b_w)); + map(0x0d00a, 0x0d00a).w(FUNC(subsino_state::out_a_w)); map(0x0d00c, 0x0d00c).portr("INC"); @@ -1084,14 +1084,14 @@ void subsino_state::stbsub_map(address_map &map) // AM_RANGE( 0x0d01b, 0x0d01b ) AM_WRITE(tiles_offset_w ) - map(0x0e000, 0x0e7ff).ram().w(this, FUNC(subsino_state::colorram_w)).share("colorram"); - map(0x0e800, 0x0efff).ram().w(this, FUNC(subsino_state::videoram_w)).share("videoram"); + map(0x0e000, 0x0e7ff).ram().w(FUNC(subsino_state::colorram_w)).share("colorram"); + map(0x0e800, 0x0efff).ram().w(FUNC(subsino_state::videoram_w)).share("videoram"); - map(0xf000, 0xf7ff).rw(this, FUNC(subsino_state::reel_scrollattr_r), FUNC(subsino_state::reel_scrollattr_w)); + map(0xf000, 0xf7ff).rw(FUNC(subsino_state::reel_scrollattr_r), FUNC(subsino_state::reel_scrollattr_w)); - map(0xf800, 0xf9ff).ram().w(this, FUNC(subsino_state::reel_ram_w<0>)).share("reel_ram.0"); - map(0xfa00, 0xfbff).ram().w(this, FUNC(subsino_state::reel_ram_w<1>)).share("reel_ram.1"); - map(0xfc00, 0xfdff).ram().w(this, FUNC(subsino_state::reel_ram_w<2>)).share("reel_ram.2"); + map(0xf800, 0xf9ff).ram().w(FUNC(subsino_state::reel_ram_w<0>)).share("reel_ram.0"); + map(0xfa00, 0xfbff).ram().w(FUNC(subsino_state::reel_ram_w<1>)).share("reel_ram.1"); + map(0xfc00, 0xfdff).ram().w(FUNC(subsino_state::reel_ram_w<2>)).share("reel_ram.2"); } @@ -1124,14 +1124,14 @@ void subsino_state::mtrainnv_map(address_map &map) // AM_RANGE( 0x0d018, 0x0d018 ) AM_DEVREADWRITE("oki", okim6295_device, read, write) - map(0x0e000, 0x0e7ff).ram().w(this, FUNC(subsino_state::colorram_w)).share("colorram"); - map(0x0e800, 0x0efff).ram().w(this, FUNC(subsino_state::videoram_w)).share("videoram"); + map(0x0e000, 0x0e7ff).ram().w(FUNC(subsino_state::colorram_w)).share("colorram"); + map(0x0e800, 0x0efff).ram().w(FUNC(subsino_state::videoram_w)).share("videoram"); - map(0xf000, 0xf7ff).rw(this, FUNC(subsino_state::reel_scrollattr_r), FUNC(subsino_state::reel_scrollattr_w)); + map(0xf000, 0xf7ff).rw(FUNC(subsino_state::reel_scrollattr_r), FUNC(subsino_state::reel_scrollattr_w)); - map(0xf800, 0xf9ff).ram().w(this, FUNC(subsino_state::reel_ram_w<0>)).share("reel_ram.0"); - map(0xfa00, 0xfbff).ram().w(this, FUNC(subsino_state::reel_ram_w<1>)).share("reel_ram.1"); - map(0xfc00, 0xfdff).ram().w(this, FUNC(subsino_state::reel_ram_w<2>)).share("reel_ram.2"); + map(0xf800, 0xf9ff).ram().w(FUNC(subsino_state::reel_ram_w<0>)).share("reel_ram.0"); + map(0xfa00, 0xfbff).ram().w(FUNC(subsino_state::reel_ram_w<1>)).share("reel_ram.1"); + map(0xfc00, 0xfdff).ram().w(FUNC(subsino_state::reel_ram_w<2>)).share("reel_ram.2"); } diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index 4b1c38acc08..6c462820667 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -939,44 +939,44 @@ void subsino2_state::bishjan_map(address_map &map) map(0x200000, 0x207fff).ram().share("nvram"); // battery // read lo (L1) (only half tilemap?) - map(0x412000, 0x412fff).r(this, FUNC(subsino2_state::ss9601_videoram_1_lo_r)); - map(0x413000, 0x4131ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); + map(0x412000, 0x412fff).r(FUNC(subsino2_state::ss9601_videoram_1_lo_r)); + map(0x413000, 0x4131ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); // read lo (REEL) - map(0x416000, 0x416fff).r(this, FUNC(subsino2_state::ss9601_reelram_lo_r)); - map(0x417000, 0x4171ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); + map(0x416000, 0x416fff).r(FUNC(subsino2_state::ss9601_reelram_lo_r)); + map(0x417000, 0x4171ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); // read hi (L1) - map(0x422000, 0x422fff).r(this, FUNC(subsino2_state::ss9601_videoram_1_hi_r)); - map(0x423000, 0x4231ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); + map(0x422000, 0x422fff).r(FUNC(subsino2_state::ss9601_videoram_1_hi_r)); + map(0x423000, 0x4231ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); // read hi (REEL) - map(0x426000, 0x426fff).r(this, FUNC(subsino2_state::ss9601_reelram_hi_r)); - map(0x427000, 0x4271ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); + map(0x426000, 0x426fff).r(FUNC(subsino2_state::ss9601_reelram_hi_r)); + map(0x427000, 0x4271ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); // write both (L1) - map(0x430000, 0x431fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); - map(0x432000, 0x432fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); - map(0x433000, 0x4331ff).w(this, FUNC(subsino2_state::ss9601_scrollram_1_hi_lo_w)); + map(0x430000, 0x431fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); + map(0x432000, 0x432fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); + map(0x433000, 0x4331ff).w(FUNC(subsino2_state::ss9601_scrollram_1_hi_lo_w)); // write both (L0 & REEL) - map(0x434000, 0x435fff).w(this, FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); - map(0x436000, 0x436fff).w(this, FUNC(subsino2_state::ss9601_reelram_hi_lo_w)); - map(0x437000, 0x4371ff).w(this, FUNC(subsino2_state::ss9601_scrollram_0_hi_lo_w)); + map(0x434000, 0x435fff).w(FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); + map(0x436000, 0x436fff).w(FUNC(subsino2_state::ss9601_reelram_hi_lo_w)); + map(0x437000, 0x4371ff).w(FUNC(subsino2_state::ss9601_scrollram_0_hi_lo_w)); - map(0x600000, 0x600001).nopr().w(this, FUNC(subsino2_state::bishjan_sound_w)); - map(0x600040, 0x600040).w(this, FUNC(subsino2_state::ss9601_scrollctrl_w)); + map(0x600000, 0x600001).nopr().w(FUNC(subsino2_state::bishjan_sound_w)); + map(0x600040, 0x600040).w(FUNC(subsino2_state::ss9601_scrollctrl_w)); map(0x600060, 0x600060).w("ramdac", FUNC(ramdac_device::index_w)); map(0x600061, 0x600061).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x600062, 0x600062).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x600080, 0x600080).w(this, FUNC(subsino2_state::ss9601_tilesize_w)); - map(0x6000a0, 0x6000a0).w(this, FUNC(subsino2_state::ss9601_byte_lo_w)); + map(0x600080, 0x600080).w(FUNC(subsino2_state::ss9601_tilesize_w)); + map(0x6000a0, 0x6000a0).w(FUNC(subsino2_state::ss9601_byte_lo_w)); - map(0xa0001f, 0xa0001f).w(this, FUNC(subsino2_state::ss9601_disable_w)); - map(0xa00020, 0xa00025).w(this, FUNC(subsino2_state::ss9601_scroll_w)); + map(0xa0001f, 0xa0001f).w(FUNC(subsino2_state::ss9601_disable_w)); + map(0xa00020, 0xa00025).w(FUNC(subsino2_state::ss9601_scroll_w)); map(0xc00000, 0xc00001).portr("DSW"); // SW1 - map(0xc00002, 0xc00003).portr("JOY").w(this, FUNC(subsino2_state::bishjan_input_w)); // IN C - map(0xc00004, 0xc00005).r(this, FUNC(subsino2_state::bishjan_input_r)); // IN A & B - map(0xc00006, 0xc00007).r(this, FUNC(subsino2_state::bishjan_serial_r)); // IN D - map(0xc00008, 0xc00009).portr("RESET").w(this, FUNC(subsino2_state::bishjan_outputs_w)).share("outputs16"); + map(0xc00002, 0xc00003).portr("JOY").w(FUNC(subsino2_state::bishjan_input_w)); // IN C + map(0xc00004, 0xc00005).r(FUNC(subsino2_state::bishjan_input_r)); // IN A & B + map(0xc00006, 0xc00007).r(FUNC(subsino2_state::bishjan_serial_r)); // IN D + map(0xc00008, 0xc00009).portr("RESET").w(FUNC(subsino2_state::bishjan_outputs_w)).share("outputs16"); } void subsino2_state::ramdac_map(address_map &map) @@ -1029,54 +1029,54 @@ void subsino2_state::new2001_base_map(address_map &map) map(0x200000, 0x207fff).ram().share("nvram"); // battery // write both (L1, byte_lo2) - map(0x410000, 0x411fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo2_w)); + map(0x410000, 0x411fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo2_w)); // read lo (L1) (only half tilemap?) - map(0x412000, 0x412fff).r(this, FUNC(subsino2_state::ss9601_videoram_1_lo_r)); - map(0x413000, 0x4131ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); + map(0x412000, 0x412fff).r(FUNC(subsino2_state::ss9601_videoram_1_lo_r)); + map(0x413000, 0x4131ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); // write both (L0 & REEL, byte_lo2) - map(0x414000, 0x415fff).w(this, FUNC(subsino2_state::ss9601_videoram_0_hi_lo2_w)); + map(0x414000, 0x415fff).w(FUNC(subsino2_state::ss9601_videoram_0_hi_lo2_w)); // read lo (REEL) - map(0x416000, 0x416fff).r(this, FUNC(subsino2_state::ss9601_reelram_lo_r)); - map(0x417000, 0x4171ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); + map(0x416000, 0x416fff).r(FUNC(subsino2_state::ss9601_reelram_lo_r)); + map(0x417000, 0x4171ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); // read hi (L1) - map(0x422000, 0x422fff).r(this, FUNC(subsino2_state::ss9601_videoram_1_hi_r)); - map(0x423000, 0x4231ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); + map(0x422000, 0x422fff).r(FUNC(subsino2_state::ss9601_videoram_1_hi_r)); + map(0x423000, 0x4231ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); // read hi (REEL) - map(0x426000, 0x426fff).r(this, FUNC(subsino2_state::ss9601_reelram_hi_r)); - map(0x427000, 0x4271ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); + map(0x426000, 0x426fff).r(FUNC(subsino2_state::ss9601_reelram_hi_r)); + map(0x427000, 0x4271ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); // write both (L1, byte_lo) - map(0x430000, 0x431fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); - map(0x432000, 0x432fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); - map(0x433000, 0x4331ff).w(this, FUNC(subsino2_state::ss9601_scrollram_1_hi_lo_w)); + map(0x430000, 0x431fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); + map(0x432000, 0x432fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); + map(0x433000, 0x4331ff).w(FUNC(subsino2_state::ss9601_scrollram_1_hi_lo_w)); // write both (L0 & REEL, byte_lo) - map(0x434000, 0x435fff).w(this, FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); - map(0x436000, 0x436fff).w(this, FUNC(subsino2_state::ss9601_reelram_hi_lo_w)); - map(0x437000, 0x4371ff).w(this, FUNC(subsino2_state::ss9601_scrollram_0_hi_lo_w)); + map(0x434000, 0x435fff).w(FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); + map(0x436000, 0x436fff).w(FUNC(subsino2_state::ss9601_reelram_hi_lo_w)); + map(0x437000, 0x4371ff).w(FUNC(subsino2_state::ss9601_scrollram_0_hi_lo_w)); - map(0x600000, 0x600001).nopr().w(this, FUNC(subsino2_state::bishjan_sound_w)); - map(0x600020, 0x600020).w(this, FUNC(subsino2_state::ss9601_byte_lo2_w)); - map(0x600040, 0x600040).w(this, FUNC(subsino2_state::ss9601_scrollctrl_w)); + map(0x600000, 0x600001).nopr().w(FUNC(subsino2_state::bishjan_sound_w)); + map(0x600020, 0x600020).w(FUNC(subsino2_state::ss9601_byte_lo2_w)); + map(0x600040, 0x600040).w(FUNC(subsino2_state::ss9601_scrollctrl_w)); map(0x600060, 0x600060).w("ramdac", FUNC(ramdac_device::index_w)); map(0x600061, 0x600061).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x600062, 0x600062).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x600080, 0x600080).w(this, FUNC(subsino2_state::ss9601_tilesize_w)); - map(0x6000a0, 0x6000a0).w(this, FUNC(subsino2_state::ss9601_byte_lo_w)); + map(0x600080, 0x600080).w(FUNC(subsino2_state::ss9601_tilesize_w)); + map(0x6000a0, 0x6000a0).w(FUNC(subsino2_state::ss9601_byte_lo_w)); - map(0xa0001f, 0xa0001f).w(this, FUNC(subsino2_state::ss9601_disable_w)); - map(0xa00020, 0xa00025).w(this, FUNC(subsino2_state::ss9601_scroll_w)); + map(0xa0001f, 0xa0001f).w(FUNC(subsino2_state::ss9601_disable_w)); + map(0xa00020, 0xa00025).w(FUNC(subsino2_state::ss9601_scroll_w)); map(0xc00000, 0xc00001).portr("DSW"); map(0xc00002, 0xc00003).portr("IN C"); map(0xc00004, 0xc00005).portr("IN A & B"); - map(0xc00006, 0xc00007).r(this, FUNC(subsino2_state::bishjan_serial_r)); + map(0xc00006, 0xc00007).r(FUNC(subsino2_state::bishjan_serial_r)); } void subsino2_state::new2001_map(address_map &map) { new2001_base_map(map); - map(0xc00008, 0xc00009).w(this, FUNC(subsino2_state::new2001_outputs_w)).share("outputs16"); + map(0xc00008, 0xc00009).w(FUNC(subsino2_state::new2001_outputs_w)).share("outputs16"); } /*************************************************************************** @@ -1113,7 +1113,7 @@ WRITE16_MEMBER(subsino2_state::humlan_outputs_w) void subsino2_state::humlan_map(address_map &map) { new2001_base_map(map); - map(0xc00008, 0xc00009).w(this, FUNC(subsino2_state::humlan_outputs_w)).share("outputs16"); + map(0xc00008, 0xc00009).w(FUNC(subsino2_state::humlan_outputs_w)).share("outputs16"); } /*************************************************************************** @@ -1251,30 +1251,30 @@ void subsino2_state::mtrain_map(address_map &map) map(0x07800, 0x07fff).ram().share("nvram"); // battery - map(0x08000, 0x08fff).w(this, FUNC(subsino2_state::mtrain_videoram_w)); + map(0x08000, 0x08fff).w(FUNC(subsino2_state::mtrain_videoram_w)); - map(0x0911f, 0x0911f).w(this, FUNC(subsino2_state::ss9601_disable_w)); - map(0x09120, 0x09125).w(this, FUNC(subsino2_state::ss9601_scroll_w)); + map(0x0911f, 0x0911f).w(FUNC(subsino2_state::ss9601_disable_w)); + map(0x09120, 0x09125).w(FUNC(subsino2_state::ss9601_scroll_w)); - map(0x0912f, 0x0912f).w(this, FUNC(subsino2_state::ss9601_byte_lo_w)); + map(0x0912f, 0x0912f).w(FUNC(subsino2_state::ss9601_byte_lo_w)); - map(0x09140, 0x09142).w(this, FUNC(subsino2_state::mtrain_outputs_w)).share("outputs"); + map(0x09140, 0x09142).w(FUNC(subsino2_state::mtrain_outputs_w)).share("outputs"); map(0x09143, 0x09143).portr("IN D"); // (not shown in system test) 0x40 serial out, 0x80 serial in map(0x09144, 0x09144).portr("IN A"); // A map(0x09145, 0x09145).portr("IN B"); // B map(0x09146, 0x09146).portr("IN C"); // C - map(0x09147, 0x09147).r(this, FUNC(subsino2_state::dsw_r)); - map(0x09148, 0x09148).w(this, FUNC(subsino2_state::dsw_mask_w)); + map(0x09147, 0x09147).r(FUNC(subsino2_state::dsw_r)); + map(0x09148, 0x09148).w(FUNC(subsino2_state::dsw_mask_w)); - map(0x09152, 0x09152).r(this, FUNC(subsino2_state::vblank_bit2_r)).w(this, FUNC(subsino2_state::oki_bank_bit0_w)); + map(0x09152, 0x09152).r(FUNC(subsino2_state::vblank_bit2_r)).w(FUNC(subsino2_state::oki_bank_bit0_w)); - map(0x09158, 0x0915e).r(this, FUNC(subsino2_state::mtrain_prot_r)); + map(0x09158, 0x0915e).r(FUNC(subsino2_state::mtrain_prot_r)); map(0x09160, 0x09160).w("ramdac", FUNC(ramdac_device::index_w)); map(0x09161, 0x09161).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x09162, 0x09162).w("ramdac", FUNC(ramdac_device::mask_w)); map(0x09164, 0x09164).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x09168, 0x09168).w(this, FUNC(subsino2_state::mtrain_tilesize_w)); + map(0x09168, 0x09168).w(FUNC(subsino2_state::mtrain_tilesize_w)); map(0x09800, 0x09fff).ram(); @@ -1320,30 +1320,30 @@ void subsino2_state::saklove_map(address_map &map) map(0x00000, 0x07fff).ram().share("nvram"); // battery // read lo (L1) (only half tilemap?) - map(0x12000, 0x12fff).rw(this, FUNC(subsino2_state::ss9601_videoram_1_lo_r), FUNC(subsino2_state::ss9601_videoram_1_lo_w)); - map(0x13000, 0x131ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); + map(0x12000, 0x12fff).rw(FUNC(subsino2_state::ss9601_videoram_1_lo_r), FUNC(subsino2_state::ss9601_videoram_1_lo_w)); + map(0x13000, 0x131ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); // read lo (L0) - map(0x16000, 0x16fff).rw(this, FUNC(subsino2_state::ss9601_videoram_0_lo_r), FUNC(subsino2_state::ss9601_videoram_0_lo_w)); - map(0x17000, 0x171ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); + map(0x16000, 0x16fff).rw(FUNC(subsino2_state::ss9601_videoram_0_lo_r), FUNC(subsino2_state::ss9601_videoram_0_lo_w)); + map(0x17000, 0x171ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); // read hi (L1) - map(0x22000, 0x22fff).rw(this, FUNC(subsino2_state::ss9601_videoram_1_hi_r), FUNC(subsino2_state::ss9601_videoram_1_hi_w)); - map(0x23000, 0x231ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); + map(0x22000, 0x22fff).rw(FUNC(subsino2_state::ss9601_videoram_1_hi_r), FUNC(subsino2_state::ss9601_videoram_1_hi_w)); + map(0x23000, 0x231ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); // read hi (L0) - map(0x26000, 0x26fff).rw(this, FUNC(subsino2_state::ss9601_videoram_0_hi_r), FUNC(subsino2_state::ss9601_videoram_0_hi_w)); - map(0x27000, 0x271ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); + map(0x26000, 0x26fff).rw(FUNC(subsino2_state::ss9601_videoram_0_hi_r), FUNC(subsino2_state::ss9601_videoram_0_hi_w)); + map(0x27000, 0x271ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); // write both (L1) - map(0x30000, 0x31fff).rw(this, FUNC(subsino2_state::ss9601_videoram_1_hi_r), FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); + map(0x30000, 0x31fff).rw(FUNC(subsino2_state::ss9601_videoram_1_hi_r), FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); // write both (L0) - map(0x34000, 0x35fff).rw(this, FUNC(subsino2_state::ss9601_videoram_0_hi_r), FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); + map(0x34000, 0x35fff).rw(FUNC(subsino2_state::ss9601_videoram_0_hi_r), FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); map(0xe0000, 0xfffff).rom().region("maincpu", 0); } void subsino2_state::saklove_io(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(subsino2_state::ss9601_scrollctrl_w)); + map(0x0000, 0x0000).w(FUNC(subsino2_state::ss9601_scrollctrl_w)); map(0x0020, 0x0020).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0040, 0x0041).w("ymsnd", FUNC(ym3812_device::write)); @@ -1352,21 +1352,21 @@ void subsino2_state::saklove_io(address_map &map) map(0x0061, 0x0061).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x0062, 0x0062).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x0080, 0x0080).w(this, FUNC(subsino2_state::ss9601_tilesize_w)); - map(0x00a0, 0x00a0).w(this, FUNC(subsino2_state::ss9601_byte_lo_w)); - map(0x021f, 0x021f).w(this, FUNC(subsino2_state::ss9601_disable_w)); - map(0x0220, 0x0225).w(this, FUNC(subsino2_state::ss9601_scroll_w)); + map(0x0080, 0x0080).w(FUNC(subsino2_state::ss9601_tilesize_w)); + map(0x00a0, 0x00a0).w(FUNC(subsino2_state::ss9601_byte_lo_w)); + map(0x021f, 0x021f).w(FUNC(subsino2_state::ss9601_disable_w)); + map(0x0220, 0x0225).w(FUNC(subsino2_state::ss9601_scroll_w)); - map(0x0300, 0x0303).w(this, FUNC(subsino2_state::saklove_outputs_w)).share("outputs"); + map(0x0300, 0x0303).w(FUNC(subsino2_state::saklove_outputs_w)).share("outputs"); map(0x0303, 0x0303).portr("IN D"); // 0x40 serial out, 0x80 serial in map(0x0304, 0x0304).portr("IN A"); map(0x0305, 0x0305).portr("IN B"); map(0x0306, 0x0306).portr("IN C"); - map(0x0307, 0x0307).r(this, FUNC(subsino2_state::dsw_r)); - map(0x0308, 0x0308).w(this, FUNC(subsino2_state::dsw_mask_w)); + map(0x0307, 0x0307).r(FUNC(subsino2_state::dsw_r)); + map(0x0308, 0x0308).w(FUNC(subsino2_state::dsw_mask_w)); - map(0x0312, 0x0312).r(this, FUNC(subsino2_state::vblank_bit2_r)).w(this, FUNC(subsino2_state::oki_bank_bit0_w)); + map(0x0312, 0x0312).r(FUNC(subsino2_state::vblank_bit2_r)).w(FUNC(subsino2_state::oki_bank_bit0_w)); } @@ -1412,32 +1412,32 @@ void subsino2_state::xplan_map(address_map &map) map(0x00000, 0x07fff).ram().share("nvram"); // battery // write both (L1, byte_lo2) - map(0x10000, 0x11fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo2_w)); + map(0x10000, 0x11fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo2_w)); // read lo (L1) (only half tilemap?) - map(0x12000, 0x12fff).r(this, FUNC(subsino2_state::ss9601_videoram_1_lo_r)); - map(0x13000, 0x131ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); + map(0x12000, 0x12fff).r(FUNC(subsino2_state::ss9601_videoram_1_lo_r)); + map(0x13000, 0x131ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_lo_r), FUNC(subsino2_state::ss9601_scrollram_1_lo_w)); // write both (L0, byte_lo2) - map(0x14000, 0x15fff).w(this, FUNC(subsino2_state::ss9601_videoram_0_hi_lo2_w)); + map(0x14000, 0x15fff).w(FUNC(subsino2_state::ss9601_videoram_0_hi_lo2_w)); // read lo (REEL) - map(0x16000, 0x16fff).r(this, FUNC(subsino2_state::ss9601_reelram_lo_r)); - map(0x17000, 0x171ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); + map(0x16000, 0x16fff).r(FUNC(subsino2_state::ss9601_reelram_lo_r)); + map(0x17000, 0x171ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_lo_r), FUNC(subsino2_state::ss9601_scrollram_0_lo_w)); // read hi (L1) - map(0x22000, 0x22fff).r(this, FUNC(subsino2_state::ss9601_videoram_1_hi_r)); - map(0x23000, 0x231ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); + map(0x22000, 0x22fff).r(FUNC(subsino2_state::ss9601_videoram_1_hi_r)); + map(0x23000, 0x231ff).rw(FUNC(subsino2_state::ss9601_scrollram_1_hi_r), FUNC(subsino2_state::ss9601_scrollram_1_hi_w)); // read hi (REEL) - map(0x26000, 0x26fff).r(this, FUNC(subsino2_state::ss9601_reelram_hi_r)); - map(0x27000, 0x271ff).rw(this, FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); + map(0x26000, 0x26fff).r(FUNC(subsino2_state::ss9601_reelram_hi_r)); + map(0x27000, 0x271ff).rw(FUNC(subsino2_state::ss9601_scrollram_0_hi_r), FUNC(subsino2_state::ss9601_scrollram_0_hi_w)); // write both (L1, byte_lo) - map(0x30000, 0x31fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); - map(0x32000, 0x32fff).w(this, FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); - map(0x33000, 0x331ff).w(this, FUNC(subsino2_state::ss9601_scrollram_1_hi_lo_w)); + map(0x30000, 0x31fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); + map(0x32000, 0x32fff).w(FUNC(subsino2_state::ss9601_videoram_1_hi_lo_w)); + map(0x33000, 0x331ff).w(FUNC(subsino2_state::ss9601_scrollram_1_hi_lo_w)); // write both (L0 & REEL, byte_lo) - map(0x34000, 0x35fff).w(this, FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); - map(0x36000, 0x36fff).w(this, FUNC(subsino2_state::ss9601_reelram_hi_lo_w)); - map(0x37000, 0x371ff).w(this, FUNC(subsino2_state::ss9601_scrollram_0_hi_lo_w)); + map(0x34000, 0x35fff).w(FUNC(subsino2_state::ss9601_videoram_0_hi_lo_w)); + map(0x36000, 0x36fff).w(FUNC(subsino2_state::ss9601_reelram_hi_lo_w)); + map(0x37000, 0x371ff).w(FUNC(subsino2_state::ss9601_scrollram_0_hi_lo_w)); map(0xc0000, 0xfffff).rom().region("maincpu", 0); } @@ -1446,32 +1446,32 @@ void subsino2_state::xplan_io(address_map &map) { map(0x0000, 0x0000).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x0020, 0x0020).w(this, FUNC(subsino2_state::ss9601_byte_lo2_w)); + map(0x0020, 0x0020).w(FUNC(subsino2_state::ss9601_byte_lo2_w)); - map(0x0040, 0x0040).w(this, FUNC(subsino2_state::ss9601_scrollctrl_w)); + map(0x0040, 0x0040).w(FUNC(subsino2_state::ss9601_scrollctrl_w)); map(0x0060, 0x0060).w("ramdac", FUNC(ramdac_device::index_w)); map(0x0061, 0x0061).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x0062, 0x0062).w("ramdac", FUNC(ramdac_device::mask_w)); - map(0x0080, 0x0080).w(this, FUNC(subsino2_state::ss9601_tilesize_w)); - map(0x00a0, 0x00a0).w(this, FUNC(subsino2_state::ss9601_byte_lo_w)); + map(0x0080, 0x0080).w(FUNC(subsino2_state::ss9601_tilesize_w)); + map(0x00a0, 0x00a0).w(FUNC(subsino2_state::ss9601_byte_lo_w)); - map(0x021f, 0x021f).w(this, FUNC(subsino2_state::ss9601_disable_w)); - map(0x0220, 0x0225).w(this, FUNC(subsino2_state::ss9601_scroll_w)); + map(0x021f, 0x021f).w(FUNC(subsino2_state::ss9601_disable_w)); + map(0x0220, 0x0225).w(FUNC(subsino2_state::ss9601_scroll_w)); map(0x0235, 0x0235).noprw(); // INT0 Ack.? - map(0x0300, 0x0300).r(this, FUNC(subsino2_state::vblank_bit6_r)).w(this, FUNC(subsino2_state::oki_bank_bit4_w)); - map(0x0301, 0x0301).w(this, FUNC(subsino2_state::dsw_mask_w)); - map(0x0302, 0x0302).r(this, FUNC(subsino2_state::dsw_r)); + map(0x0300, 0x0300).r(FUNC(subsino2_state::vblank_bit6_r)).w(FUNC(subsino2_state::oki_bank_bit4_w)); + map(0x0301, 0x0301).w(FUNC(subsino2_state::dsw_mask_w)); + map(0x0302, 0x0302).r(FUNC(subsino2_state::dsw_r)); map(0x0303, 0x0303).portr("IN C"); map(0x0304, 0x0304).portr("IN B"); map(0x0305, 0x0305).portr("IN A"); map(0x0306, 0x0306).portr("IN D"); // 0x40 serial out, 0x80 serial in // 306 = d, 307 = c, 308 = b, 309 = a - map(0x0306, 0x0309).w(this, FUNC(subsino2_state::xplan_outputs_w)).share("outputs"); + map(0x0306, 0x0309).w(FUNC(subsino2_state::xplan_outputs_w)).share("outputs"); } /*************************************************************************** @@ -1517,7 +1517,7 @@ void subsino2_state::expcard_io(address_map &map) xplan_io(map); // 306 = d, 307 = c, 308 = b, 309 = a - map(0x0306, 0x0309).w(this, FUNC(subsino2_state::expcard_outputs_w)).share("outputs"); + map(0x0306, 0x0309).w(FUNC(subsino2_state::expcard_outputs_w)).share("outputs"); } void subsino2_state::xtrain_io(address_map &map) @@ -1525,7 +1525,7 @@ void subsino2_state::xtrain_io(address_map &map) xplan_io(map); // 306 = d, 307 = c, 308 = b, 309 = a - map(0x0306, 0x0309).w(this, FUNC(subsino2_state::xtrain_outputs_w)).share("outputs"); + map(0x0306, 0x0309).w(FUNC(subsino2_state::xtrain_outputs_w)).share("outputs"); } diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp index ca547470489..badc93d4d98 100644 --- a/src/mame/drivers/summit.cpp +++ b/src/mame/drivers/summit.cpp @@ -86,7 +86,7 @@ void summit_state::mainmap(address_map &map) map(0x3800, 0x3800).portr("IN0"); // AM_RANGE(0x3880, 0x3880) AM_WRITE(out_w) - map(0x3900, 0x3900).portr("IN1").w(this, FUNC(summit_state::out_w)); // lamps + map(0x3900, 0x3900).portr("IN1").w(FUNC(summit_state::out_w)); // lamps // AM_RANGE(0x3980, 0x3980) AM_WRITE(out_w) map(0x3a00, 0x3a00).portr("IN2"); //AM_WRITE(out_w) map(0x3b00, 0x3b00).portr("IN3"); diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp index 8ea685b2cb7..9b40f705e15 100644 --- a/src/mame/drivers/sun2.cpp +++ b/src/mame/drivers/sun2.cpp @@ -482,21 +482,21 @@ WRITE16_MEMBER( sun2_state::video_ctrl_w ) void sun2_state::sun2_mem(address_map &map) { - map(0x000000, 0xffffff).rw(this, FUNC(sun2_state::tl_mmu_r), FUNC(sun2_state::tl_mmu_w)); + map(0x000000, 0xffffff).rw(FUNC(sun2_state::tl_mmu_r), FUNC(sun2_state::tl_mmu_w)); } // VME memory spaces // type 0 device space void sun2_state::vmetype0space_map(address_map &map) { - map(0x000000, 0x7fffff).rw(this, FUNC(sun2_state::ram_r), FUNC(sun2_state::ram_w)); + map(0x000000, 0x7fffff).rw(FUNC(sun2_state::ram_r), FUNC(sun2_state::ram_w)); } // type 1 device space void sun2_state::vmetype1space_map(address_map &map) { map(0x000000, 0x01ffff).ram().share("bw2_vram"); - map(0x020000, 0x020001).rw(this, FUNC(sun2_state::video_ctrl_r), FUNC(sun2_state::video_ctrl_w)); + map(0x020000, 0x020001).rw(FUNC(sun2_state::video_ctrl_r), FUNC(sun2_state::video_ctrl_w)); map(0x7f0000, 0x7f07ff).rom().region("bootprom", 0); // uses MMU loophole to read 32k from a 2k window // 7f0800-7f0fff: Ethernet interface // 7f1000-7f17ff: AM9518 encryption processor @@ -525,11 +525,11 @@ void sun2_state::vmetype3space_map(address_map &map) // type 0 device space void sun2_state::mbustype0space_map(address_map &map) { - map(0x000000, 0x3fffff).rw(this, FUNC(sun2_state::ram_r), FUNC(sun2_state::ram_w)); + map(0x000000, 0x3fffff).rw(FUNC(sun2_state::ram_r), FUNC(sun2_state::ram_w)); // 7f80000-7f807ff: Keyboard/mouse SCC8530 //AM_RANGE(0x7f8000, 0x7f8007) AM_DEVREADWRITE8(SCC1_TAG, z80scc_device, ba_cd_inv_r, ba_cd_inv_w, 0xff00) map(0x700000, 0x71ffff).ram().share("bw2_vram"); - map(0x781800, 0x781801).rw(this, FUNC(sun2_state::video_ctrl_r), FUNC(sun2_state::video_ctrl_w)); + map(0x781800, 0x781801).rw(FUNC(sun2_state::video_ctrl_r), FUNC(sun2_state::video_ctrl_w)); } // type 1 device space diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp index 9a82fd4556a..f8dbad0f454 100644 --- a/src/mame/drivers/sun3.cpp +++ b/src/mame/drivers/sun3.cpp @@ -721,13 +721,13 @@ WRITE32_MEMBER(sun3_state::parity_w) void sun3_state::sun3_mem(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(sun3_state::tl_mmu_r), FUNC(sun3_state::tl_mmu_w)); + map(0x00000000, 0xffffffff).rw(FUNC(sun3_state::tl_mmu_r), FUNC(sun3_state::tl_mmu_w)); } // type 0 device space void sun3_state::vmetype0space_map(address_map &map) { - map(0x00000000, 0x08ffffff).rw(this, FUNC(sun3_state::ram_r), FUNC(sun3_state::ram_w)); + map(0x00000000, 0x08ffffff).rw(FUNC(sun3_state::ram_r), FUNC(sun3_state::ram_w)); map(0xfe400000, 0xfe41ffff).ram(); // not sure what's going on here (3/110) map(0xff000000, 0xff03ffff).ram().share("bw2_vram"); } @@ -735,7 +735,7 @@ void sun3_state::vmetype0space_map(address_map &map) // type 0 without VRAM (3/50) void sun3_state::vmetype0space_novram_map(address_map &map) { - map(0x00000000, 0x08ffffff).rw(this, FUNC(sun3_state::ram_r), FUNC(sun3_state::ram_w)); + map(0x00000000, 0x08ffffff).rw(FUNC(sun3_state::ram_r), FUNC(sun3_state::ram_w)); } // type 1 device space @@ -744,11 +744,11 @@ void sun3_state::vmetype1space_map(address_map &map) map(0x00000000, 0x0000000f).rw(m_scc1, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x00020000, 0x0002000f).rw(m_scc2, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x00040000, 0x000407ff).ram().share("nvram"); // type 2816 parallel EEPROM - map(0x00060000, 0x0006ffff).rw(this, FUNC(sun3_state::rtc7170_r), FUNC(sun3_state::rtc7170_w)); - map(0x00080000, 0x0008000f).rw(this, FUNC(sun3_state::parity_r), FUNC(sun3_state::parity_w)); - map(0x000a0000, 0x000a0003).rw(this, FUNC(sun3_state::irqctrl_r), FUNC(sun3_state::irqctrl_w)); + map(0x00060000, 0x0006ffff).rw(FUNC(sun3_state::rtc7170_r), FUNC(sun3_state::rtc7170_w)); + map(0x00080000, 0x0008000f).rw(FUNC(sun3_state::parity_r), FUNC(sun3_state::parity_w)); + map(0x000a0000, 0x000a0003).rw(FUNC(sun3_state::irqctrl_r), FUNC(sun3_state::irqctrl_w)); map(0x00100000, 0x0010ffff).rom().region("user1", 0); - map(0x001e0000, 0x001e00ff).rw(this, FUNC(sun3_state::ecc_r), FUNC(sun3_state::ecc_w)); + map(0x001e0000, 0x001e00ff).rw(FUNC(sun3_state::ecc_r), FUNC(sun3_state::ecc_w)); } // type 2 device space diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp index 4f0d47d7365..3da47d59ec9 100644 --- a/src/mame/drivers/sun3x.cpp +++ b/src/mame/drivers/sun3x.cpp @@ -220,47 +220,47 @@ private: void sun3x_state::sun3_80_mem(address_map &map) { - map(0x00000000, 0x03ffffff).ram().share("p_ram").w(this, FUNC(sun3x_state::ramwrite_w)); - map(0x40000000, 0x40000003).rw(this, FUNC(sun3x_state::cause_buserr_r), FUNC(sun3x_state::cause_buserr_w)); - map(0x50300000, 0x50300003).r(this, FUNC(sun3x_state::p4id_r)); + map(0x00000000, 0x03ffffff).ram().share("p_ram").w(FUNC(sun3x_state::ramwrite_w)); + map(0x40000000, 0x40000003).rw(FUNC(sun3x_state::cause_buserr_r), FUNC(sun3x_state::cause_buserr_w)); + map(0x50300000, 0x50300003).r(FUNC(sun3x_state::p4id_r)); map(0x50400000, 0x504fffff).ram().share("bw2_vram"); - map(0x60000000, 0x60001fff).rw(this, FUNC(sun3x_state::iommu_r), FUNC(sun3x_state::iommu_w)); - map(0x61000000, 0x61000003).rw(this, FUNC(sun3x_state::enable_r), FUNC(sun3x_state::enable_w)); - map(0x61000400, 0x61000403).rw(this, FUNC(sun3x_state::buserr_r), FUNC(sun3x_state::buserr_w)); - map(0x61000800, 0x61000803).rw(this, FUNC(sun3x_state::diag_r), FUNC(sun3x_state::diag_w)); - map(0x61001000, 0x61001003).rw(this, FUNC(sun3x_state::memreg_r), FUNC(sun3x_state::memreg_w)); - map(0x61001004, 0x61001007).rw(this, FUNC(sun3x_state::memrerraddr_r), FUNC(sun3x_state::memrerraddr_w)); - map(0x61001400, 0x61001403).rw(this, FUNC(sun3x_state::irqctrl_r), FUNC(sun3x_state::irqctrl_w)); + map(0x60000000, 0x60001fff).rw(FUNC(sun3x_state::iommu_r), FUNC(sun3x_state::iommu_w)); + map(0x61000000, 0x61000003).rw(FUNC(sun3x_state::enable_r), FUNC(sun3x_state::enable_w)); + map(0x61000400, 0x61000403).rw(FUNC(sun3x_state::buserr_r), FUNC(sun3x_state::buserr_w)); + map(0x61000800, 0x61000803).rw(FUNC(sun3x_state::diag_r), FUNC(sun3x_state::diag_w)); + map(0x61001000, 0x61001003).rw(FUNC(sun3x_state::memreg_r), FUNC(sun3x_state::memreg_w)); + map(0x61001004, 0x61001007).rw(FUNC(sun3x_state::memrerraddr_r), FUNC(sun3x_state::memrerraddr_w)); + map(0x61001400, 0x61001403).rw(FUNC(sun3x_state::irqctrl_r), FUNC(sun3x_state::irqctrl_w)); map(0x62000000, 0x6200000f).rw(m_scc1, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x62002000, 0x6200200f).rw(m_scc2, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x63000000, 0x6301ffff).rom().region("user1", 0); map(0x64000000, 0x640007ff).rw(TIMEKEEPER_TAG, FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); map(0x66000000, 0x6600003f).rw(ESP_TAG, FUNC(ncr539x_device::read), FUNC(ncr539x_device::write)).umask32(0xff000000); map(0x6e000000, 0x6e000007).m(m_fdc, FUNC(n82077aa_device::map)); - map(0x6e000400, 0x6e000403).rw(this, FUNC(sun3x_state::fdc_control_r), FUNC(sun3x_state::fdc_control_w)); - map(0x6f00003c, 0x6f00003f).rw(this, FUNC(sun3x_state::printer_r), FUNC(sun3x_state::printer_w)); + map(0x6e000400, 0x6e000403).rw(FUNC(sun3x_state::fdc_control_r), FUNC(sun3x_state::fdc_control_w)); + map(0x6f00003c, 0x6f00003f).rw(FUNC(sun3x_state::printer_r), FUNC(sun3x_state::printer_w)); map(0xfefe0000, 0xfefeffff).rom().region("user1", 0); } void sun3x_state::sun3_460_mem(address_map &map) { - map(0x00000000, 0x03ffffff).ram().share("p_ram").w(this, FUNC(sun3x_state::ramwrite_w)); - map(0x09000000, 0x09000003).rw(this, FUNC(sun3x_state::cause_buserr_r), FUNC(sun3x_state::cause_buserr_w)); - map(0x50300000, 0x50300003).r(this, FUNC(sun3x_state::p4id_r)); + map(0x00000000, 0x03ffffff).ram().share("p_ram").w(FUNC(sun3x_state::ramwrite_w)); + map(0x09000000, 0x09000003).rw(FUNC(sun3x_state::cause_buserr_r), FUNC(sun3x_state::cause_buserr_w)); + map(0x50300000, 0x50300003).r(FUNC(sun3x_state::p4id_r)); map(0x50400000, 0x504fffff).ram().share("bw2_vram"); - map(0x5c000f14, 0x5c000f17).r(this, FUNC(sun3x_state::fpa_r)); - map(0x60000000, 0x60001fff).rw(this, FUNC(sun3x_state::iommu_r), FUNC(sun3x_state::iommu_w)); - map(0x61000000, 0x61000003).rw(this, FUNC(sun3x_state::enable_r), FUNC(sun3x_state::enable_w)); - map(0x61000400, 0x61000403).rw(this, FUNC(sun3x_state::buserr_r), FUNC(sun3x_state::buserr_w)); - map(0x61000800, 0x61000803).rw(this, FUNC(sun3x_state::diag_r), FUNC(sun3x_state::diag_w)); - map(0x61001000, 0x61001003).rw(this, FUNC(sun3x_state::memreg_r), FUNC(sun3x_state::memreg_w)); - map(0x61001004, 0x61001007).rw(this, FUNC(sun3x_state::memrerraddr_r), FUNC(sun3x_state::memrerraddr_w)); - map(0x61001400, 0x61001403).rw(this, FUNC(sun3x_state::irqctrl_r), FUNC(sun3x_state::irqctrl_w)); + map(0x5c000f14, 0x5c000f17).r(FUNC(sun3x_state::fpa_r)); + map(0x60000000, 0x60001fff).rw(FUNC(sun3x_state::iommu_r), FUNC(sun3x_state::iommu_w)); + map(0x61000000, 0x61000003).rw(FUNC(sun3x_state::enable_r), FUNC(sun3x_state::enable_w)); + map(0x61000400, 0x61000403).rw(FUNC(sun3x_state::buserr_r), FUNC(sun3x_state::buserr_w)); + map(0x61000800, 0x61000803).rw(FUNC(sun3x_state::diag_r), FUNC(sun3x_state::diag_w)); + map(0x61001000, 0x61001003).rw(FUNC(sun3x_state::memreg_r), FUNC(sun3x_state::memreg_w)); + map(0x61001004, 0x61001007).rw(FUNC(sun3x_state::memrerraddr_r), FUNC(sun3x_state::memrerraddr_w)); + map(0x61001400, 0x61001403).rw(FUNC(sun3x_state::irqctrl_r), FUNC(sun3x_state::irqctrl_w)); map(0x62000000, 0x6200000f).rw(m_scc1, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x62002000, 0x6200200f).rw(m_scc2, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x63000000, 0x6301ffff).rom().region("user1", 0); - map(0x6f00003c, 0x6f00003f).rw(this, FUNC(sun3x_state::printer_r), FUNC(sun3x_state::printer_w)); + map(0x6f00003c, 0x6f00003f).rw(FUNC(sun3x_state::printer_r), FUNC(sun3x_state::printer_w)); map(0xfefe0000, 0xfefeffff).rom().region("user1", 0); } diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 244d3be326f..ad2c324de19 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -1333,12 +1333,12 @@ void sun4_state::fcodes_command(int ref, const std::vector ¶ms) void sun4_state::sun4_mem(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(sun4_state::sun4_mmu_r), FUNC(sun4_state::sun4_mmu_w)); + map(0x00000000, 0xffffffff).rw(FUNC(sun4_state::sun4_mmu_r), FUNC(sun4_state::sun4_mmu_w)); } void sun4_state::sun4c_mem(address_map &map) { - map(0x00000000, 0xffffffff).rw(this, FUNC(sun4_state::sun4c_mmu_r), FUNC(sun4_state::sun4c_mmu_w)); + map(0x00000000, 0xffffffff).rw(FUNC(sun4_state::sun4c_mmu_r), FUNC(sun4_state::sun4c_mmu_w)); } /* Input ports */ @@ -1464,7 +1464,7 @@ WRITE32_MEMBER( sun4_state::ram_w ) void sun4_state::type0space_map(address_map &map) { - map(0x00000000, 0x03ffffff).rw(this, FUNC(sun4_state::ram_r), FUNC(sun4_state::ram_w)); + map(0x00000000, 0x03ffffff).rw(FUNC(sun4_state::ram_r), FUNC(sun4_state::ram_w)); } void sun4_state::type1space_map(address_map &map) @@ -1472,14 +1472,14 @@ void sun4_state::type1space_map(address_map &map) map(0x00000000, 0x0000000f).rw(m_scc1, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x01000000, 0x0100000f).rw(m_scc2, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0xff00ff00); map(0x02000000, 0x020007ff).rw(m_timekpr, FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); - map(0x03000000, 0x0300000f).rw(this, FUNC(sun4_state::timer_r), FUNC(sun4_state::timer_w)).mirror(0xfffff0); - map(0x05000000, 0x05000003).rw(this, FUNC(sun4_state::irq_r), FUNC(sun4_state::irq_w)); + map(0x03000000, 0x0300000f).rw(FUNC(sun4_state::timer_r), FUNC(sun4_state::timer_w)).mirror(0xfffff0); + map(0x05000000, 0x05000003).rw(FUNC(sun4_state::irq_r), FUNC(sun4_state::irq_w)); map(0x06000000, 0x0607ffff).rom().region("user1", 0); - map(0x07200000, 0x07200003).rw(this, FUNC(sun4_state::fdc_r), FUNC(sun4_state::fdc_w)); - map(0x08000000, 0x08000003).r(this, FUNC(sun4_state::ss1_sl0_id)); // slot 0 contains SCSI/DMA/Ethernet - map(0x08400000, 0x0840000f).rw(this, FUNC(sun4_state::dma_r), FUNC(sun4_state::dma_w)); + map(0x07200000, 0x07200003).rw(FUNC(sun4_state::fdc_r), FUNC(sun4_state::fdc_w)); + map(0x08000000, 0x08000003).r(FUNC(sun4_state::ss1_sl0_id)); // slot 0 contains SCSI/DMA/Ethernet + map(0x08400000, 0x0840000f).rw(FUNC(sun4_state::dma_r), FUNC(sun4_state::dma_w)); map(0x08800000, 0x0880001f).m(m_scsi, FUNC(ncr5390_device::map)).umask32(0xff000000); - map(0x0e000000, 0x0e000003).r(this, FUNC(sun4_state::ss1_sl3_id)); // slot 3 contains video board + map(0x0e000000, 0x0e000003).r(FUNC(sun4_state::ss1_sl3_id)); // slot 3 contains video board map(0x0e800000, 0x0e8fffff).ram().share("bw2_vram"); } diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index 4bffc8a9a42..6a0e31168e6 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -99,12 +99,12 @@ void suna16_state::bssoccer_map(address_map &map) { map(0x000000, 0x1fffff).rom(); // ROM map(0x200000, 0x203fff).ram(); // RAM - map(0x400000, 0x4001ff).rw(this, FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); // Banked Palette + map(0x400000, 0x4001ff).rw(FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); // Banked Palette map(0x400200, 0x400fff).ram(); // map(0x600000, 0x61ffff).ram().share("spriteram"); // Sprites - map(0xa00000, 0xa00001).portr("P1").w(this, FUNC(suna16_state::soundlatch_w)); // To Sound CPU - map(0xa00002, 0xa00003).portr("P2").w(this, FUNC(suna16_state::flipscreen_w)); // Flip Screen - map(0xa00004, 0xa00005).portr("P3").w(this, FUNC(suna16_state::bssoccer_leds_w)); // Leds + map(0xa00000, 0xa00001).portr("P1").w(FUNC(suna16_state::soundlatch_w)); // To Sound CPU + map(0xa00002, 0xa00003).portr("P2").w(FUNC(suna16_state::flipscreen_w)); // Flip Screen + map(0xa00004, 0xa00005).portr("P3").w(FUNC(suna16_state::bssoccer_leds_w)); // Leds map(0xa00006, 0xa00007).portr("P4").nopw(); // ? IRQ 1 Ack map(0xa00008, 0xa00009).portr("DSW1").nopw(); // ? IRQ 2 Ack map(0xa0000a, 0xa0000b).portr("DSW2"); @@ -156,17 +156,17 @@ void suna16_state::uballoon_map(address_map &map) { map(0x000000, 0x0fffff).rom(); // ROM map(0x800000, 0x803fff).ram(); // RAM - map(0x200000, 0x2001ff).rw(this, FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); // Banked Palette + map(0x200000, 0x2001ff).rw(FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); // Banked Palette map(0x200200, 0x200fff).ram(); // map(0x400000, 0x41ffff).mirror(0x1e0000).ram().share("spriteram"); // Sprites - map(0x600000, 0x600001).portr("P1").w(this, FUNC(suna16_state::soundlatch_w)); // To Sound CPU + map(0x600000, 0x600001).portr("P1").w(FUNC(suna16_state::soundlatch_w)); // To Sound CPU map(0x600002, 0x600003).portr("P2"); - map(0x600004, 0x600005).portr("DSW1").w(this, FUNC(suna16_state::flipscreen_w)); // Flip Screen + map(0x600004, 0x600005).portr("DSW1").w(FUNC(suna16_state::flipscreen_w)); // Flip Screen map(0x600006, 0x600007).portr("DSW2"); - map(0x600008, 0x600009).w(this, FUNC(suna16_state::uballoon_leds_w)); // Leds + map(0x600008, 0x600009).w(FUNC(suna16_state::uballoon_leds_w)); // Leds map(0x60000c, 0x60000d).nopw(); // ? IRQ 1 Ack map(0x600010, 0x600011).nopw(); // ? IRQ 1 Ack - map(0xa00000, 0xa0ffff).rw(this, FUNC(suna16_state::uballoon_prot_r), FUNC(suna16_state::uballoon_prot_w)).umask16(0x00ff); // Protection + map(0xa00000, 0xa0ffff).rw(FUNC(suna16_state::uballoon_prot_r), FUNC(suna16_state::uballoon_prot_w)).umask16(0x00ff); // Protection } @@ -177,11 +177,11 @@ void suna16_state::uballoon_map(address_map &map) void suna16_state::sunaq_map(address_map &map) { map(0x000000, 0x0fffff).rom(); // ROM - map(0x500000, 0x500001).portr("P1").w(this, FUNC(suna16_state::soundlatch_w)); // To Sound CPU - map(0x500002, 0x500003).portr("P2").w(this, FUNC(suna16_state::flipscreen_w)); // Flip Screen + map(0x500000, 0x500001).portr("P1").w(FUNC(suna16_state::soundlatch_w)); // To Sound CPU + map(0x500002, 0x500003).portr("P2").w(FUNC(suna16_state::flipscreen_w)); // Flip Screen map(0x500004, 0x500005).portr("DSW1"); map(0x500006, 0x500007).portr("DSW2"); // (unused?) - map(0x540000, 0x5401ff).rw(this, FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); + map(0x540000, 0x5401ff).rw(FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); map(0x540200, 0x540fff).ram(); // RAM map(0x580000, 0x583fff).ram(); // RAM map(0x5c0000, 0x5dffff).ram().share("spriteram"); // Sprites @@ -212,12 +212,12 @@ void suna16_state::bestbest_map(address_map &map) { map(0x000000, 0x03ffff).rom().mirror(0xc0000); // ROM map(0x200000, 0x2fffff).rom().region("user1", 0); // ROM - map(0x500000, 0x500001).portr("P1").w(this, FUNC(suna16_state::soundlatch_w)); // To Sound CPU - map(0x500002, 0x500003).portr("P2").w(this, FUNC(suna16_state::bestbest_flipscreen_w)); // P2 + Coins, Flip Screen - map(0x500004, 0x500005).portr("DSW").w(this, FUNC(suna16_state::bestbest_coin_w)); // Coin Counter - map(0x500009, 0x500009).w(this, FUNC(suna16_state::bestbest_prot_w)); // Protection - map(0x500019, 0x500019).r(this, FUNC(suna16_state::bestbest_prot_r)); // " - map(0x540000, 0x540fff).rw(this, FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); // Banked(?) Palette + map(0x500000, 0x500001).portr("P1").w(FUNC(suna16_state::soundlatch_w)); // To Sound CPU + map(0x500002, 0x500003).portr("P2").w(FUNC(suna16_state::bestbest_flipscreen_w)); // P2 + Coins, Flip Screen + map(0x500004, 0x500005).portr("DSW").w(FUNC(suna16_state::bestbest_coin_w)); // Coin Counter + map(0x500009, 0x500009).w(FUNC(suna16_state::bestbest_prot_w)); // Protection + map(0x500019, 0x500019).r(FUNC(suna16_state::bestbest_prot_r)); // " + map(0x540000, 0x540fff).rw(FUNC(suna16_state::paletteram_r), FUNC(suna16_state::paletteram_w)); // Banked(?) Palette map(0x541000, 0x54ffff).ram(); // map(0x580000, 0x58ffff).ram(); // RAM map(0x5c0000, 0x5dffff).ram().share("spriteram"); // Sprites (Chip 1) @@ -353,18 +353,18 @@ void suna16_state::bssoccer_pcm_1_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch2", FUNC(generic_latch_8_device::read)); // From The Sound Z80 - map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::write)); - map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w(this, FUNC(suna16_state::bssoccer_pcm_1_bankswitch_w)); // Rom Bank + map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::data_w)); + map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w(FUNC(suna16_state::bssoccer_pcm_1_bankswitch_w)); // Rom Bank } void suna16_state::bssoccer_pcm_2_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch3", FUNC(generic_latch_8_device::read)); // From The Sound Z80 - map(0x00, 0x00).w("ldac2", FUNC(dac_byte_interface::write)); - map(0x01, 0x01).w("rdac2", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w(this, FUNC(suna16_state::bssoccer_pcm_2_bankswitch_w)); // Rom Bank + map(0x00, 0x00).w("ldac2", FUNC(dac_byte_interface::data_w)); + map(0x01, 0x01).w("rdac2", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w(FUNC(suna16_state::bssoccer_pcm_2_bankswitch_w)); // Rom Bank } @@ -393,9 +393,9 @@ void suna16_state::uballoon_pcm_1_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch2", FUNC(generic_latch_8_device::read)); // From The Sound Z80 - map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::write)); - map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w(this, FUNC(suna16_state::uballoon_pcm_1_bankswitch_w)); // Rom Bank + map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::data_w)); + map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w(FUNC(suna16_state::uballoon_pcm_1_bankswitch_w)); // Rom Bank } MACHINE_START_MEMBER(suna16_state,uballoon) @@ -427,10 +427,10 @@ void suna16_state::bestbest_pcm_1_iomap(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch2", FUNC(generic_latch_8_device::read)); // From The Sound Z80 - map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::write)); - map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::write)); - map(0x02, 0x02).w("ldac2", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w("rdac2", FUNC(dac_byte_interface::write)); + map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::data_w)); + map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::data_w)); + map(0x02, 0x02).w("ldac2", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w("rdac2", FUNC(dac_byte_interface::data_w)); } /*************************************************************************** diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index ce6bac06856..4418c8a76db 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -556,15 +556,15 @@ void suna8_state::hardhead_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); // Banked ROM map(0xc000, 0xd7ff).ram(); // RAM map(0xd800, 0xd9ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // Palette - map(0xda00, 0xda00).ram().r(this, FUNC(suna8_state::hardhead_ip_r)).share("hardhead_ip"); // Input Port Select - map(0xda80, 0xda80).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(this, FUNC(suna8_state::hardhead_bankswitch_w)); // ROM Banking + map(0xda00, 0xda00).ram().r(FUNC(suna8_state::hardhead_ip_r)).share("hardhead_ip"); // Input Port Select + map(0xda80, 0xda80).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(FUNC(suna8_state::hardhead_bankswitch_w)); // ROM Banking map(0xdb00, 0xdb00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU - map(0xdb80, 0xdb80).w(this, FUNC(suna8_state::hardhead_flipscreen_w)); // Flip Screen + Coin Lockout + map(0xdb80, 0xdb80).w(FUNC(suna8_state::hardhead_flipscreen_w)); // Flip Screen + Coin Lockout map(0xdc00, 0xdc00).noprw(); // <- R (after bank select) map(0xdc80, 0xdc80).noprw(); // <- R (after bank select) map(0xdd00, 0xdd00).noprw(); // <- R (after ip select) - map(0xdd80, 0xddff).rw(this, FUNC(suna8_state::hardhead_protection_r), FUNC(suna8_state::hardhead_protection_w)); // Protection - map(0xe000, 0xffff).ram().w(this, FUNC(suna8_state::suna8_spriteram_w)).share("spriteram"); // Sprites + map(0xdd80, 0xddff).rw(FUNC(suna8_state::hardhead_protection_r), FUNC(suna8_state::hardhead_protection_w)); // Protection + map(0xe000, 0xffff).ram().w(FUNC(suna8_state::suna8_spriteram_w)).share("spriteram"); // Sprites } void suna8_state::hardhead_io_map(address_map &map) @@ -624,17 +624,17 @@ void suna8_state::rranger_map(address_map &map) map(0x0000, 0x7fff).rom(); // ROM map(0x8000, 0xbfff).bankr("bank1"); // Banked ROM map(0xc000, 0xc000).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU - map(0xc002, 0xc002).w(this, FUNC(suna8_state::rranger_bankswitch_w)); // ROM Banking + map(0xc002, 0xc002).w(FUNC(suna8_state::rranger_bankswitch_w)); // ROM Banking map(0xc002, 0xc002).portr("P1"); // P1 (Inputs) map(0xc003, 0xc003).portr("P2"); // P2 - map(0xc004, 0xc004).r(this, FUNC(suna8_state::rranger_soundstatus_r)); // Latch Status? - map(0xc200, 0xc200).nopr().w(this, FUNC(suna8_state::sranger_prot_w));// Protection? + map(0xc004, 0xc004).r(FUNC(suna8_state::rranger_soundstatus_r)); // Latch Status? + map(0xc200, 0xc200).nopr().w(FUNC(suna8_state::sranger_prot_w));// Protection? map(0xc280, 0xc280).nopw(); // ? NMI Ack map(0xc280, 0xc280).portr("DSW1"); // DSW 1 map(0xc2c0, 0xc2c0).portr("DSW2"); // DSW 2 map(0xc600, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // Palette map(0xc800, 0xdfff).ram(); // Work RAM - map(0xe000, 0xffff).ram().w(this, FUNC(suna8_state::suna8_spriteram_w)).share("spriteram"); // Sprites + map(0xe000, 0xffff).ram().w(FUNC(suna8_state::suna8_spriteram_w)).share("spriteram"); // Sprites } @@ -734,10 +734,10 @@ void suna8_state::brickzn11_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); // Banked ROM map(0xc000, 0xc000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU - map(0xc040, 0xc040).w(this, FUNC(suna8_state::brickzn_sprbank_w)); // Sprite RAM Bank + Flip Screen + Protection - map(0xc060, 0xc060).w(this, FUNC(suna8_state::brickzn_rombank_w)); // ROM Bank - map(0xc080, 0xc080).w(this, FUNC(suna8_state::brickzn_leds_w)); // Leds - map(0xc0a0, 0xc0a0).w(this, FUNC(suna8_state::brickzn_palbank_w)); // Palette RAM Bank + map(0xc040, 0xc040).w(FUNC(suna8_state::brickzn_sprbank_w)); // Sprite RAM Bank + Flip Screen + Protection + map(0xc060, 0xc060).w(FUNC(suna8_state::brickzn_rombank_w)); // ROM Bank + map(0xc080, 0xc080).w(FUNC(suna8_state::brickzn_leds_w)); // Leds + map(0xc0a0, 0xc0a0).w(FUNC(suna8_state::brickzn_palbank_w)); // Palette RAM Bank // AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(brickzn_prot2_w ) // Protection 2 map(0xc100, 0xc100).portr("P1"); // P1 (Buttons) @@ -747,11 +747,11 @@ void suna8_state::brickzn11_map(address_map &map) map(0xc108, 0xc108).portr("SPIN1"); // P1 (Spinner) map(0xc10c, 0xc10c).portr("SPIN2"); // P2 (Spinner) - map(0xc140, 0xc140).r(this, FUNC(suna8_state::brickzn_cheats_r)); // Cheats / Debugging Inputs + map(0xc140, 0xc140).r(FUNC(suna8_state::brickzn_cheats_r)); // Cheats / Debugging Inputs - map(0xc600, 0xc7ff).rw(this, FUNC(suna8_state::banked_paletteram_r), FUNC(suna8_state::brickzn_banked_paletteram_w)).share("paletteram"); // Palette (Banked) + map(0xc600, 0xc7ff).rw(FUNC(suna8_state::banked_paletteram_r), FUNC(suna8_state::brickzn_banked_paletteram_w)).share("paletteram"); // Palette (Banked) map(0xc800, 0xdfff).ram().share("wram"); // Work RAM - map(0xe000, 0xffff).rw(this, FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) + map(0xe000, 0xffff).rw(FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) } /* @@ -864,12 +864,12 @@ void suna8_state::brickzn_map(address_map &map) // c000 writes before reading buttons // c010 writes? - map(0xc040, 0xc040).w(this, FUNC(suna8_state::brickzn_rombank_w)); // ROM Bank - map(0xc060, 0xc060).w(this, FUNC(suna8_state::brickzn_sprbank_w)); // Sprite RAM Bank + Flip Screen + Protection + map(0xc040, 0xc040).w(FUNC(suna8_state::brickzn_rombank_w)); // ROM Bank + map(0xc060, 0xc060).w(FUNC(suna8_state::brickzn_sprbank_w)); // Sprite RAM Bank + Flip Screen + Protection // c080 writes? // c090 writes? - map(0xc0a0, 0xc0a0).w(this, FUNC(suna8_state::brickzn_multi_w)); // Palette RAM Bank / Sound Latch / ... - map(0xc0c0, 0xc0c0).w(this, FUNC(suna8_state::brickzn_prot2_w)); // Protection 2 + map(0xc0a0, 0xc0a0).w(FUNC(suna8_state::brickzn_multi_w)); // Palette RAM Bank / Sound Latch / ... + map(0xc0c0, 0xc0c0).w(FUNC(suna8_state::brickzn_prot2_w)); // Protection 2 map(0xc100, 0xc100).portr("P1"); // P1 (Buttons) map(0xc101, 0xc101).portr("P2"); // P2 (Buttons) @@ -878,13 +878,13 @@ void suna8_state::brickzn_map(address_map &map) map(0xc108, 0xc108).portr("SPIN1"); // P1 (Spinner) map(0xc10c, 0xc10c).portr("SPIN2"); // P2 (Spinner) - map(0xc140, 0xc140).r(this, FUNC(suna8_state::brickzn_cheats_r)); // Cheats / Debugging Inputs + map(0xc140, 0xc140).r(FUNC(suna8_state::brickzn_cheats_r)); // Cheats / Debugging Inputs // c144 reads? // c14a reads? - map(0xc600, 0xc7ff).rw(this, FUNC(suna8_state::banked_paletteram_r), FUNC(suna8_state::brickzn_banked_paletteram_w)).share("paletteram"); // Palette (Banked) + map(0xc600, 0xc7ff).rw(FUNC(suna8_state::banked_paletteram_r), FUNC(suna8_state::brickzn_banked_paletteram_w)).share("paletteram"); // Palette (Banked) map(0xc800, 0xdfff).ram().share("wram"); // Work RAM - map(0xe000, 0xffff).rw(this, FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) + map(0xe000, 0xffff).rw(FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) } void suna8_state::decrypted_opcodes_map(address_map &map) @@ -895,8 +895,8 @@ void suna8_state::decrypted_opcodes_map(address_map &map) void suna8_state::brickzn_io_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(suna8_state::brickzn_disab_palram_w)); // Disable Palette RAM - map(0x00a1, 0x00a1).w(this, FUNC(suna8_state::brickzn_enab_palram_w)); // Enable Palette RAM + map(0x0000, 0x0000).w(FUNC(suna8_state::brickzn_disab_palram_w)); // Disable Palette RAM + map(0x00a1, 0x00a1).w(FUNC(suna8_state::brickzn_enab_palram_w)); // Enable Palette RAM } /*************************************************************************** @@ -983,36 +983,36 @@ void suna8_state::hardhea2_map(address_map &map) map(0xc002, 0xc002).portr("DSW1"); // DSW 1 map(0xc003, 0xc003).portr("DSW2"); // DSW 2 map(0xc080, 0xc080).portr("BUTTONS"); // vblank? - map(0xc200, 0xc200).w(this, FUNC(suna8_state::hardhea2_spritebank_w)); // Sprite RAM Bank - map(0xc280, 0xc280).w(this, FUNC(suna8_state::hardhea2_rombank_w)); // ROM Bank (?mirrored up to c2ff?) + map(0xc200, 0xc200).w(FUNC(suna8_state::hardhea2_spritebank_w)); // Sprite RAM Bank + map(0xc280, 0xc280).w(FUNC(suna8_state::hardhea2_rombank_w)); // ROM Bank (?mirrored up to c2ff?) // *** Protection - map(0xc28c, 0xc28c).w(this, FUNC(suna8_state::hardhea2_rombank_w)); + map(0xc28c, 0xc28c).w(FUNC(suna8_state::hardhea2_rombank_w)); // Protection *** - map(0xc300, 0xc300).w(this, FUNC(suna8_state::hardhea2_flipscreen_w)); // Flip Screen - map(0xc380, 0xc380).w(this, FUNC(suna8_state::hardhea2_nmi_w)); // ? NMI related ? - map(0xc400, 0xc400).w(this, FUNC(suna8_state::hardhea2_leds_w)); // Leds + Coin Counter + map(0xc300, 0xc300).w(FUNC(suna8_state::hardhea2_flipscreen_w)); // Flip Screen + map(0xc380, 0xc380).w(FUNC(suna8_state::hardhea2_nmi_w)); // ? NMI related ? + map(0xc400, 0xc400).w(FUNC(suna8_state::hardhea2_leds_w)); // Leds + Coin Counter map(0xc480, 0xc480).nopw(); // ~ROM Bank map(0xc500, 0xc500).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU // *** Protection - map(0xc50f, 0xc50f).w(this, FUNC(suna8_state::hardhea2_spritebank_1_w)); - map(0xc508, 0xc508).w(this, FUNC(suna8_state::hardhea2_spritebank_0_w)); + map(0xc50f, 0xc50f).w(FUNC(suna8_state::hardhea2_spritebank_1_w)); + map(0xc508, 0xc508).w(FUNC(suna8_state::hardhea2_spritebank_0_w)); - map(0xc507, 0xc507).w(this, FUNC(suna8_state::hardhea2_rambank_1_w)); - map(0xc522, 0xc522).w(this, FUNC(suna8_state::hardhea2_rambank_0_w)); + map(0xc507, 0xc507).w(FUNC(suna8_state::hardhea2_rambank_1_w)); + map(0xc522, 0xc522).w(FUNC(suna8_state::hardhea2_rambank_0_w)); - map(0xc556, 0xc556).w(this, FUNC(suna8_state::hardhea2_rambank_1_w)); - map(0xc528, 0xc528).w(this, FUNC(suna8_state::hardhea2_rambank_0_w)); + map(0xc556, 0xc556).w(FUNC(suna8_state::hardhea2_rambank_1_w)); + map(0xc528, 0xc528).w(FUNC(suna8_state::hardhea2_rambank_0_w)); - map(0xc560, 0xc560).w(this, FUNC(suna8_state::hardhea2_rambank_1_w)); - map(0xc533, 0xc533).w(this, FUNC(suna8_state::hardhea2_rambank_0_w)); + map(0xc560, 0xc560).w(FUNC(suna8_state::hardhea2_rambank_1_w)); + map(0xc533, 0xc533).w(FUNC(suna8_state::hardhea2_rambank_0_w)); // Protection *** map(0xc600, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // Palette map(0xc800, 0xdfff).bankrw("bank2"); // Work RAM (Banked) - map(0xe000, 0xffff).rw(this, FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) + map(0xe000, 0xffff).rw(FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) } @@ -1104,20 +1104,20 @@ void suna8_state::starfigh_map(address_map &map) map(0xc001, 0xc001).portr("P2"); // P2 map(0xc002, 0xc002).portr("DSW1"); // DSW 1 map(0xc003, 0xc003).portr("DSW2"); // DSW 2 - map(0xc080, 0xc080).r(this, FUNC(suna8_state::starfigh_cheats_r)); // Cheats? + map(0xc080, 0xc080).r(FUNC(suna8_state::starfigh_cheats_r)); // Cheats? - map(0xc200, 0xc200).w(this, FUNC(suna8_state::starfigh_spritebank_w)); // Sprite RAM Bank - map(0xc280, 0xc2ff).w(this, FUNC(suna8_state::starfigh_rombank_latch_w)); // ROM Bank Latch (?mirrored up to c2ff?) - map(0xc300, 0xc300).w(this, FUNC(suna8_state::hardhea2_flipscreen_w)); // Flip Screen - map(0xc380, 0xc3ff).w(this, FUNC(suna8_state::starfigh_spritebank_latch_w)); // Sprite RAM Bank Latch - map(0xc400, 0xc47f).w(this, FUNC(suna8_state::starfigh_leds_w)); // Leds + Coin Counter + ROM Bank + map(0xc200, 0xc200).w(FUNC(suna8_state::starfigh_spritebank_w)); // Sprite RAM Bank + map(0xc280, 0xc2ff).w(FUNC(suna8_state::starfigh_rombank_latch_w)); // ROM Bank Latch (?mirrored up to c2ff?) + map(0xc300, 0xc300).w(FUNC(suna8_state::hardhea2_flipscreen_w)); // Flip Screen + map(0xc380, 0xc3ff).w(FUNC(suna8_state::starfigh_spritebank_latch_w)); // Sprite RAM Bank Latch + map(0xc400, 0xc47f).w(FUNC(suna8_state::starfigh_leds_w)); // Leds + Coin Counter + ROM Bank // c480 write? - map(0xc500, 0xc500).w(this, FUNC(suna8_state::starfigh_sound_latch_w)); // To Sound CPU (can be disabled) + map(0xc500, 0xc500).w(FUNC(suna8_state::starfigh_sound_latch_w)); // To Sound CPU (can be disabled) // (c522 + R & 0x1f) write? map(0xc600, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // Palette map(0xc800, 0xdfff).ram(); // Work RAM - map(0xe000, 0xffff).rw(this, FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) + map(0xe000, 0xffff).rw(FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) } @@ -1234,19 +1234,19 @@ void suna8_state::sparkman_map(address_map &map) map(0xc002, 0xc002).portr("DSW1"); // DSW 1 map(0xc003, 0xc003).portr("DSW2"); // DSW 2 map(0xc080, 0xc080).portr("BUTTONS"); // Buttons - map(0xc0a3, 0xc0a3).r(this, FUNC(suna8_state::sparkman_c0a3_r)); // ??? + map(0xc0a3, 0xc0a3).r(FUNC(suna8_state::sparkman_c0a3_r)); // ??? - map(0xc200, 0xc27f).w(this, FUNC(suna8_state::sparkman_spritebank_w)); // Sprite RAM Bank - map(0xc280, 0xc2ff).w(this, FUNC(suna8_state::sparkman_rombank_latch_w)); // ROM Bank Latch - map(0xc300, 0xc37f).w(this, FUNC(suna8_state::sparkman_spritebank_latch_w)); // Sprite RAM Bank Latch (Invert) + Flip Screen - map(0xc380, 0xc3ff).w(this, FUNC(suna8_state::sparkman_write_disable_w)); // Work RAM Writes Disable + NMI Enable - map(0xc400, 0xc47f).w(this, FUNC(suna8_state::sparkman_rombank_w)); // ROM Bank + Leds - map(0xc480, 0xc480).w(this, FUNC(suna8_state::sparkman_coin_counter_w)); // Coin Counter - map(0xc500, 0xc57f).w(this, FUNC(suna8_state::starfigh_sound_latch_w)); // To Sound CPU (can be disabled) + map(0xc200, 0xc27f).w(FUNC(suna8_state::sparkman_spritebank_w)); // Sprite RAM Bank + map(0xc280, 0xc2ff).w(FUNC(suna8_state::sparkman_rombank_latch_w)); // ROM Bank Latch + map(0xc300, 0xc37f).w(FUNC(suna8_state::sparkman_spritebank_latch_w)); // Sprite RAM Bank Latch (Invert) + Flip Screen + map(0xc380, 0xc3ff).w(FUNC(suna8_state::sparkman_write_disable_w)); // Work RAM Writes Disable + NMI Enable + map(0xc400, 0xc47f).w(FUNC(suna8_state::sparkman_rombank_w)); // ROM Bank + Leds + map(0xc480, 0xc480).w(FUNC(suna8_state::sparkman_coin_counter_w)); // Coin Counter + map(0xc500, 0xc57f).w(FUNC(suna8_state::starfigh_sound_latch_w)); // To Sound CPU (can be disabled) map(0xc600, 0xc7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // Palette - map(0xc800, 0xdfff).ram().w(this, FUNC(suna8_state::suna8_wram_w)).share("wram"); // RAM - map(0xe000, 0xffff).rw(this, FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) + map(0xc800, 0xdfff).ram().w(FUNC(suna8_state::suna8_wram_w)).share("wram"); // RAM + map(0xe000, 0xffff).rw(FUNC(suna8_state::suna8_banked_spriteram_r), FUNC(suna8_state::suna8_banked_spriteram_w)); // Sprites (Banked) } @@ -1323,10 +1323,10 @@ void suna8_state::brickzn_pcm_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); // From Sound CPU - map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::write)); - map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::write)); - map(0x02, 0x02).w("ldac2", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w("rdac2", FUNC(dac_byte_interface::write)); + map(0x00, 0x00).w("ldac", FUNC(dac_byte_interface::data_w)); + map(0x01, 0x01).w("rdac", FUNC(dac_byte_interface::data_w)); + map(0x02, 0x02).w("ldac2", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w("rdac2", FUNC(dac_byte_interface::data_w)); } /*************************************************************************** diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp index f44de172d3c..a33394c3785 100644 --- a/src/mame/drivers/supbtime.cpp +++ b/src/mame/drivers/supbtime.cpp @@ -80,7 +80,7 @@ void supbtime_state::supbtime_map(address_map &map) map(0x180000, 0x180001).portr("INPUTS"); map(0x180002, 0x180003).portr("DSW"); map(0x180008, 0x180009).portr("SYSTEM"); - map(0x18000a, 0x18000b).r(this, FUNC(supbtime_state::vblank_ack_r)); + map(0x18000a, 0x18000b).r(FUNC(supbtime_state::vblank_ack_r)); map(0x18000a, 0x18000d).nopw(); // ? map(0x1a0001, 0x1a0001).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x300000, 0x30000f).rw(m_deco_tilegen, FUNC(deco16ic_device::pf_control_r), FUNC(deco16ic_device::pf_control_w)); @@ -99,7 +99,7 @@ void supbtime_state::chinatwn_map(address_map &map) map(0x180000, 0x180001).portr("INPUTS"); map(0x180002, 0x180003).portr("DSW"); map(0x180008, 0x180009).portr("SYSTEM"); - map(0x18000a, 0x18000b).r(this, FUNC(supbtime_state::vblank_ack_r)); + map(0x18000a, 0x18000b).r(FUNC(supbtime_state::vblank_ack_r)); map(0x18000a, 0x18000d).nopw(); // ? map(0x1a0000, 0x1a3fff).ram(); map(0x300000, 0x30000f).rw(m_deco_tilegen, FUNC(deco16ic_device::pf_control_r), FUNC(deco16ic_device::pf_control_w)); @@ -121,7 +121,7 @@ void supbtime_state::tumblep_map(address_map &map) map(0x180000, 0x180001).portr("INPUTS"); map(0x180002, 0x180003).portr("DSW"); map(0x180008, 0x180009).portr("SYSTEM"); - map(0x18000a, 0x18000b).r(this, FUNC(supbtime_state::vblank_ack_r)); + map(0x18000a, 0x18000b).r(FUNC(supbtime_state::vblank_ack_r)); map(0x18000a, 0x18000d).nopw(); // ? map(0x1a0000, 0x1a07ff).ram().share("spriteram"); map(0x300000, 0x30000f).w(m_deco_tilegen, FUNC(deco16ic_device::pf_control_w)); diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp index 4f18ae4d47a..1278f531b53 100644 --- a/src/mame/drivers/supdrapo.cpp +++ b/src/mame/drivers/supdrapo.cpp @@ -287,16 +287,16 @@ void supdrapo_state::sdpoker_mem(address_map &map) map(0x6800, 0x6bff).ram().share("videoram"); map(0x6c00, 0x6fff).ram().share("char_bank"); map(0x7000, 0x7bff).ram(); //$7600 seems watchdog - map(0x7c00, 0x7c00).w(this, FUNC(supdrapo_state::debug7c00_w)); - map(0x8000, 0x8000).portr("IN4").w(this, FUNC(supdrapo_state::wdog8000_w)); + map(0x7c00, 0x7c00).w(FUNC(supdrapo_state::debug7c00_w)); + map(0x8000, 0x8000).portr("IN4").w(FUNC(supdrapo_state::wdog8000_w)); map(0x8001, 0x8001).portr("IN0"); - map(0x8002, 0x8002).portr("IN1").w(this, FUNC(supdrapo_state::payout_w)); - map(0x8003, 0x8003).portr("IN2").w(this, FUNC(supdrapo_state::coinin_w)); - map(0x8004, 0x8004).portr("IN3").w(this, FUNC(supdrapo_state::debug8004_w)); + map(0x8002, 0x8002).portr("IN1").w(FUNC(supdrapo_state::payout_w)); + map(0x8003, 0x8003).portr("IN2").w(FUNC(supdrapo_state::coinin_w)); + map(0x8004, 0x8004).portr("IN3").w(FUNC(supdrapo_state::debug8004_w)); map(0x8005, 0x8005).portr("SW1"); map(0x8006, 0x8006).portr("SW2"); map(0x9000, 0x90ff).ram().share("nvram"); - map(0x9400, 0x9400).r(this, FUNC(supdrapo_state::rng_r)); + map(0x9400, 0x9400).r(FUNC(supdrapo_state::rng_r)); map(0x9800, 0x9801).w("aysnd", FUNC(ay8910_device::data_address_w)); } diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index 625a4229bcf..51dd854cce7 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -251,16 +251,16 @@ void supduck_state::main_map(address_map &map) map(0x000000, 0x03ffff).rom().nopw(); map(0xfe0000, 0xfe1fff).ram().share("spriteram"); - map(0xfe4000, 0xfe4001).portr("P1_P2").w(this, FUNC(supduck_state::supduck_4000_w)); - map(0xfe4002, 0xfe4003).portr("SYSTEM").w(this, FUNC(supduck_state::supduck_4002_w)); + map(0xfe4000, 0xfe4001).portr("P1_P2").w(FUNC(supduck_state::supduck_4000_w)); + map(0xfe4002, 0xfe4003).portr("SYSTEM").w(FUNC(supduck_state::supduck_4002_w)); map(0xfe4004, 0xfe4005).portr("DSW"); - map(0xfe8000, 0xfe8007).w(this, FUNC(supduck_state::supduck_scroll_w)); + map(0xfe8000, 0xfe8007).w(FUNC(supduck_state::supduck_scroll_w)); map(0xfe800e, 0xfe800f).nopw(); // watchdog or irqack - map(0xfec000, 0xfecfff).ram().w(this, FUNC(supduck_state::text_videoram_w)).share("textvideoram"); - map(0xff0000, 0xff3fff).ram().w(this, FUNC(supduck_state::back_videoram_w)).share("backvideoram"); - map(0xff4000, 0xff7fff).ram().w(this, FUNC(supduck_state::fore_videoram_w)).share("forevideoram"); + map(0xfec000, 0xfecfff).ram().w(FUNC(supduck_state::text_videoram_w)).share("textvideoram"); + map(0xff0000, 0xff3fff).ram().w(FUNC(supduck_state::back_videoram_w)).share("backvideoram"); + map(0xff4000, 0xff7fff).ram().w(FUNC(supduck_state::fore_videoram_w)).share("forevideoram"); map(0xff8000, 0xff87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xffc000, 0xffffff).ram(); /* working RAM */ } @@ -269,7 +269,7 @@ void supduck_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(supduck_state::okibank_w)); + map(0x9000, 0x9000).w(FUNC(supduck_state::okibank_w)); map(0x9800, 0x9800).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp index 09195694e3c..d55cc48d4a6 100644 --- a/src/mame/drivers/super6.cpp +++ b/src/mame/drivers/super6.cpp @@ -263,8 +263,8 @@ WRITE8_MEMBER( super6_state::baud_w ) */ - m_brg->str_w(data & 0x0f); - m_brg->stt_w(data >> 4); + m_brg->write_str(data & 0x0f); + m_brg->write_stt(data >> 4); } @@ -293,12 +293,12 @@ void super6_state::super6_io(address_map &map) map(0x04, 0x07).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x0c, 0x0f).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); - map(0x10, 0x10).mirror(0x03).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0x14, 0x14).rw(this, FUNC(super6_state::fdc_r), FUNC(super6_state::fdc_w)); - map(0x15, 0x15).portr("J7").w(this, FUNC(super6_state::s100_w)); - map(0x16, 0x16).w(this, FUNC(super6_state::bank0_w)); - map(0x17, 0x17).w(this, FUNC(super6_state::bank1_w)); - map(0x18, 0x18).mirror(0x03).w(this, FUNC(super6_state::baud_w)); + map(0x10, 0x10).mirror(0x03).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x14, 0x14).rw(FUNC(super6_state::fdc_r), FUNC(super6_state::fdc_w)); + map(0x15, 0x15).portr("J7").w(FUNC(super6_state::s100_w)); + map(0x16, 0x16).w(FUNC(super6_state::bank0_w)); + map(0x17, 0x17).w(FUNC(super6_state::bank1_w)); + map(0x18, 0x18).mirror(0x03).w(FUNC(super6_state::baud_w)); // AM_RANGE(0x40, 0x40) ? // AM_RANGE(0xe0, 0xe7) HDC? } @@ -464,8 +464,8 @@ void super6_state::machine_reset() uint8_t baud = m_j7->read(); - m_brg->str_w(baud & 0x0f); - m_brg->stt_w((baud >> 4) & 0x07); + m_brg->write_str(baud & 0x0f); + m_brg->write_stt((baud >> 4) & 0x07); } diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index f8f27ec2882..485bcf55238 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -251,7 +251,7 @@ void super80_state::super80_map(address_map &map) map(0x0000, 0x3fff).bankrw("boot").region("maincpu", 0x0000); map(0x4000, 0xbfff).ram().region("maincpu", 0x4000); map(0xc000, 0xefff).rom(); - map(0xf000, 0xffff).r(this, FUNC(super80_state::super80_read_ff)).nopw(); + map(0xf000, 0xffff).r(FUNC(super80_state::super80_read_ff)).nopw(); } void super80_state::super80m_map(address_map &map) @@ -267,19 +267,19 @@ void super80_state::super80v_map(address_map &map) map(0x0000, 0x3fff).bankrw("boot"); map(0x4000, 0xbfff).ram(); map(0xc000, 0xefff).rom(); - map(0xf000, 0xf7ff).rw(this, FUNC(super80_state::super80v_low_r), FUNC(super80_state::super80v_low_w)); - map(0xf800, 0xffff).rw(this, FUNC(super80_state::super80v_high_r), FUNC(super80_state::super80v_high_w)); + map(0xf000, 0xf7ff).rw(FUNC(super80_state::super80v_low_r), FUNC(super80_state::super80v_low_w)); + map(0xf800, 0xffff).rw(FUNC(super80_state::super80v_high_r), FUNC(super80_state::super80v_high_w)); } void super80_state::super80_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0xdc, 0xdc).w(this, FUNC(super80_state::super80_dc_w)); - map(0xe0, 0xe0).mirror(0x14).w(this, FUNC(super80_state::super80_f0_w)); - map(0xe1, 0xe1).mirror(0x14).w(this, FUNC(super80_state::super80_f1_w)); - map(0xe2, 0xe2).mirror(0x14).r(this, FUNC(super80_state::super80_f2_r)); + map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0xdc, 0xdc).w(FUNC(super80_state::super80_dc_w)); + map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80_f0_w)); + map(0xe1, 0xe1).mirror(0x14).w(FUNC(super80_state::super80_f1_w)); + map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::super80_f2_r)); map(0xf8, 0xfb).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); } @@ -287,11 +287,11 @@ void super80_state::super80e_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xbc, 0xbc).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0xbc, 0xbc).w(this, FUNC(super80_state::super80_dc_w)); - map(0xe0, 0xe0).mirror(0x14).w(this, FUNC(super80_state::super80_f0_w)); - map(0xe1, 0xe1).mirror(0x14).w(this, FUNC(super80_state::super80_f1_w)); - map(0xe2, 0xe2).mirror(0x14).r(this, FUNC(super80_state::super80_f2_r)); + map(0xbc, 0xbc).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0xbc, 0xbc).w(FUNC(super80_state::super80_dc_w)); + map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80_f0_w)); + map(0xe1, 0xe1).mirror(0x14).w(FUNC(super80_state::super80_f1_w)); + map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::super80_f2_r)); map(0xf8, 0xfb).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); } @@ -299,17 +299,17 @@ void super80_state::super80r_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x10, 0x10).w(this, FUNC(super80_state::super80v_10_w)); + map(0x10, 0x10).w(FUNC(super80_state::super80v_10_w)); map(0x11, 0x11).r(m_crtc, FUNC(mc6845_device::register_r)); - map(0x11, 0x11).w(this, FUNC(super80_state::super80v_11_w)); - map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); + map(0x11, 0x11).w(FUNC(super80_state::super80v_11_w)); + map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); map(0x38, 0x3b).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)); - map(0x3e, 0x3e).r(this, FUNC(super80_state::port3e_r)); - map(0x3f, 0x3f).w(this, FUNC(super80_state::port3f_w)); - map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0xdc, 0xdc).w(this, FUNC(super80_state::super80_dc_w)); - map(0xe0, 0xe0).mirror(0x14).w(this, FUNC(super80_state::super80r_f0_w)); - map(0xe2, 0xe2).mirror(0x14).r(this, FUNC(super80_state::super80_f2_r)); + map(0x3e, 0x3e).r(FUNC(super80_state::port3e_r)); + map(0x3f, 0x3f).w(FUNC(super80_state::port3f_w)); + map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0xdc, 0xdc).w(FUNC(super80_state::super80_dc_w)); + map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80r_f0_w)); + map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::super80_f2_r)); map(0xf8, 0xfb).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); } @@ -317,13 +317,13 @@ void super80_state::super80v_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x10, 0x10).w(this, FUNC(super80_state::super80v_10_w)); + map(0x10, 0x10).w(FUNC(super80_state::super80v_10_w)); map(0x11, 0x11).r(m_crtc, FUNC(mc6845_device::register_r)); - map(0x11, 0x11).w(this, FUNC(super80_state::super80v_11_w)); - map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read)); - map(0xdc, 0xdc).w(this, FUNC(super80_state::super80_dc_w)); - map(0xe0, 0xe0).mirror(0x14).w(this, FUNC(super80_state::super80_f0_w)); - map(0xe2, 0xe2).mirror(0x14).r(this, FUNC(super80_state::super80_f2_r)); + map(0x11, 0x11).w(FUNC(super80_state::super80v_11_w)); + map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::bus_r)); + map(0xdc, 0xdc).w(FUNC(super80_state::super80_dc_w)); + map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80_f0_w)); + map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::super80_f2_r)); map(0xf8, 0xfb).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); } diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp index 24c287eed56..bd8ec2b8fac 100644 --- a/src/mame/drivers/superchs.cpp +++ b/src/mame/drivers/superchs.cpp @@ -125,7 +125,7 @@ void superchs_state::superchs_map(address_map &map) map(0x180000, 0x18ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::long_r), FUNC(tc0480scp_device::long_w)); map(0x1b0000, 0x1b002f).rw(m_tc0480scp, FUNC(tc0480scp_device::ctrl_long_r), FUNC(tc0480scp_device::ctrl_long_w)); map(0x200000, 0x20ffff).ram().share("shared_ram"); - map(0x240000, 0x240003).w(this, FUNC(superchs_state::cpua_ctrl_w)); + map(0x240000, 0x240003).w(FUNC(superchs_state::cpua_ctrl_w)); map(0x280000, 0x287fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x2c0000, 0x2c07ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); map(0x300000, 0x300007).rw("tc0510nio", FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)); @@ -137,7 +137,7 @@ void superchs_state::superchs_cpub_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x200000, 0x20ffff).ram(); map(0x600000, 0x60ffff).w(m_tc0480scp, FUNC(tc0480scp_device::word_w)); /* Only written upon errors */ - map(0x800000, 0x80ffff).rw(this, FUNC(superchs_state::shared_ram_r), FUNC(superchs_state::shared_ram_w)); + map(0x800000, 0x80ffff).rw(FUNC(superchs_state::shared_ram_r), FUNC(superchs_state::shared_ram_w)); map(0xa00000, 0xa001ff).ram(); /* Extra road control?? */ } @@ -147,7 +147,7 @@ void superchs_state::chase3_cpub_map(address_map &map) map(0x200000, 0x20ffff).ram(); map(0x400000, 0x40ffff).ram(); map(0x600000, 0x60ffff).w(m_tc0480scp, FUNC(tc0480scp_device::word_w)); /* Only written upon errors */ - map(0x800000, 0x80ffff).rw(this, FUNC(superchs_state::shared_ram_r), FUNC(superchs_state::shared_ram_w)); + map(0x800000, 0x80ffff).rw(FUNC(superchs_state::shared_ram_r), FUNC(superchs_state::shared_ram_w)); map(0xa00000, 0xa001ff).ram(); /* Extra road control?? */ } diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp index 38f4f61defb..3ea746ea099 100644 --- a/src/mame/drivers/supercrd.cpp +++ b/src/mame/drivers/supercrd.cpp @@ -290,8 +290,8 @@ uint32_t supercrd_state::screen_update_supercrd(screen_device &screen, bitmap_in void supercrd_state::supercrd_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xcfff).ram().w(this, FUNC(supercrd_state::supercrd_videoram_w)).share("videoram"); // wrong - map(0xd000, 0xdfff).ram().w(this, FUNC(supercrd_state::supercrd_colorram_w)).share("colorram"); // wrong + map(0xc000, 0xcfff).ram().w(FUNC(supercrd_state::supercrd_videoram_w)).share("videoram"); // wrong + map(0xd000, 0xdfff).ram().w(FUNC(supercrd_state::supercrd_colorram_w)).share("colorram"); // wrong // AM_RANGE(0x0000, 0x0000) AM_RAM AM_SHARE("nvram") // AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_device, address_w) // AM_RANGE(0xe001, 0xe001) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp index 391497e0511..8b18881f593 100644 --- a/src/mame/drivers/superdq.cpp +++ b/src/mame/drivers/superdq.cpp @@ -212,18 +212,18 @@ void superdq_state::superdq_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x5c00, 0x5fff).ram().w(this, FUNC(superdq_state::superdq_videoram_w)).share("videoram"); + map(0x5c00, 0x5fff).ram().w(FUNC(superdq_state::superdq_videoram_w)).share("videoram"); } void superdq_state::superdq_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w(this, FUNC(superdq_state::superdq_ld_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(superdq_state::superdq_ld_w)); map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("DSW1"); map(0x03, 0x03).portr("DSW2"); - map(0x04, 0x04).r(this, FUNC(superdq_state::superdq_ld_r)).w("snsnd", FUNC(sn76496_device::write)); - map(0x08, 0x08).w(this, FUNC(superdq_state::superdq_io_w)); + map(0x04, 0x04).r(FUNC(superdq_state::superdq_ld_r)).w("snsnd", FUNC(sn76496_device::command_w)); + map(0x08, 0x08).w(FUNC(superdq_state::superdq_io_w)); map(0x0c, 0x0d).noprw(); /* HD46505S */ } diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index 9170ec772d3..b320a76fdee 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -986,7 +986,7 @@ void superqix_state_base::main_map(address_map &map) // the following four ranges are part of a single 6264 64Kibit SRAM chip, called 'VRAM' in POST map(0xe000, 0xe0ff).ram().share("spriteram"); map(0xe100, 0xe7ff).ram(); - map(0xe800, 0xefff).ram().w(this, FUNC(superqix_state_base::superqix_videoram_w)).share("videoram"); + map(0xe800, 0xefff).ram().w(FUNC(superqix_state_base::superqix_videoram_w)).share("videoram"); map(0xf000, 0xffff).ram(); } @@ -996,11 +996,11 @@ void hotsmash_state::pbillian_port_map(address_map &map) //AM_RANGE(0x0200, 0x03ff) AM_RAM // looks like leftover crap from a dev board which had double the color ram? zeroes written here, never read. map(0x0401, 0x0401).r(m_ay1, FUNC(ay8910_device::data_r)); // ay i/o ports connect to "SYSTEM" and "BUTTONS" inputs which includes mcu semaphore flags map(0x0402, 0x0403).w(m_ay1, FUNC(ay8910_device::data_address_w)); - map(0x0408, 0x0408).rw(this, FUNC(hotsmash_state::hotsmash_Z80_mcu_r), FUNC(hotsmash_state::hotsmash_Z80_mcu_w)); - map(0x0410, 0x0410).w(this, FUNC(hotsmash_state::pbillian_0410_w)); /* Coin Counters, ROM bank, NMI enable, Flipscreen */ - map(0x0418, 0x0418).r(this, FUNC(hotsmash_state::nmi_ack_r)); + map(0x0408, 0x0408).rw(FUNC(hotsmash_state::hotsmash_Z80_mcu_r), FUNC(hotsmash_state::hotsmash_Z80_mcu_w)); + map(0x0410, 0x0410).w(FUNC(hotsmash_state::pbillian_0410_w)); /* Coin Counters, ROM bank, NMI enable, Flipscreen */ + map(0x0418, 0x0418).r(FUNC(hotsmash_state::nmi_ack_r)); map(0x0419, 0x0419).nopw(); // ??? is this a watchdog, or something else? manual reset of mcu semaphores? manual nmi TRIGGER? used by prebillian - map(0x041a, 0x041a).w(this, FUNC(hotsmash_state::pbillian_sample_trigger_w)); + map(0x041a, 0x041a).w(FUNC(hotsmash_state::pbillian_sample_trigger_w)); map(0x041b, 0x041b).nopr(); // input related? but probably not used, may be 'sample has stopped playing' flag? used by prebillian } @@ -1009,15 +1009,15 @@ void superqix_state::sqix_port_map(address_map &map) map(0x0000, 0x00ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x0401, 0x0401).r(m_ay1, FUNC(ay8910_device::data_r)); map(0x0402, 0x0402).w(m_ay1, FUNC(ay8910_device::data_w)); - map(0x0403, 0x0403).w(this, FUNC(superqix_state::z80_ay1_sync_address_w)); // sync on address write, so semaphores are accurately read + map(0x0403, 0x0403).w(FUNC(superqix_state::z80_ay1_sync_address_w)); // sync on address write, so semaphores are accurately read map(0x0405, 0x0405).r(m_ay2, FUNC(ay8910_device::data_r)); map(0x0406, 0x0407).w(m_ay2, FUNC(ay8910_device::data_address_w)); - map(0x0408, 0x0408).r(this, FUNC(superqix_state::z80_semaphore_assert_r)); - map(0x0410, 0x0410).w(this, FUNC(superqix_state::superqix_0410_w)); /* ROM bank, NMI enable, tile bank, bitmap bank */ - map(0x0418, 0x0418).r(this, FUNC(superqix_state::nmi_ack_r)); + map(0x0408, 0x0408).r(FUNC(superqix_state::z80_semaphore_assert_r)); + map(0x0410, 0x0410).w(FUNC(superqix_state::superqix_0410_w)); /* ROM bank, NMI enable, tile bank, bitmap bank */ + map(0x0418, 0x0418).r(FUNC(superqix_state::nmi_ack_r)); // following two ranges are made of two 64kx4 4464 DRAM chips at 9L and 9M, "GRAPHICS RAM" or "GRP BIT" if there is an error in POST - map(0x0800, 0x77ff).ram().w(this, FUNC(superqix_state::superqix_bitmapram_w)).share("bitmapram"); - map(0x8800, 0xf7ff).ram().w(this, FUNC(superqix_state::superqix_bitmapram2_w)).share("bitmapram2"); + map(0x0800, 0x77ff).ram().w(FUNC(superqix_state::superqix_bitmapram_w)).share("bitmapram"); + map(0x8800, 0xf7ff).ram().w(FUNC(superqix_state::superqix_bitmapram2_w)).share("bitmapram2"); //AM_RANGE(0xf970, 0xfa6f) AM_RAM // this is probably a portion of the remainder of the chips at 9L and 9M which isn't used or tested for graphics ram } diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp index f01dfe921e3..993d903f2a1 100644 --- a/src/mame/drivers/superslave.cpp +++ b/src/mame/drivers/superslave.cpp @@ -160,8 +160,8 @@ WRITE8_MEMBER( superslave_state::write ) WRITE8_MEMBER( superslave_state::baud_w ) { - m_dbrg->str_w(data & 0x0f); - m_dbrg->stt_w(data >> 4); + m_dbrg->write_str(data & 0x0f); + m_dbrg->write_stt(data >> 4); } @@ -259,7 +259,7 @@ WRITE8_MEMBER( superslave_state::cmd_w ) void superslave_state::superslave_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(superslave_state::read), FUNC(superslave_state::write)); + map(0x0000, 0xffff).rw(FUNC(superslave_state::read), FUNC(superslave_state::write)); } @@ -272,13 +272,13 @@ void superslave_state::superslave_io(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw(Z80DART_0_TAG, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); map(0x0c, 0x0f).rw(Z80DART_1_TAG, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); - map(0x10, 0x10).mirror(0x03).w(this, FUNC(superslave_state::baud_w)); + map(0x10, 0x10).mirror(0x03).w(FUNC(superslave_state::baud_w)); map(0x14, 0x17).rw(Z80PIO_TAG, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x18, 0x18).mirror(0x02).rw(AM9519_TAG, FUNC(am9519_device::data_r), FUNC(am9519_device::data_w)); map(0x19, 0x19).mirror(0x02).rw(AM9519_TAG, FUNC(am9519_device::stat_r), FUNC(am9519_device::cmd_w)); - map(0x1d, 0x1d).w(this, FUNC(superslave_state::memctrl_w)); + map(0x1d, 0x1d).w(FUNC(superslave_state::memctrl_w)); map(0x1e, 0x1e).noprw(); // master communications - map(0x1f, 0x1f).rw(this, FUNC(superslave_state::status_r), FUNC(superslave_state::cmd_w)); + map(0x1f, 0x1f).rw(FUNC(superslave_state::status_r), FUNC(superslave_state::cmd_w)); } diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp index 43a0fcadcf2..1030abd6f2b 100644 --- a/src/mame/drivers/supertnk.cpp +++ b/src/mame/drivers/supertnk.cpp @@ -322,7 +322,7 @@ void supertnk_state::supertnk_map(address_map &map) map(0x1efe, 0x1eff).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0x1efe, 0x1efe).portr("DSW"); map(0x1eff, 0x1eff).portr("UNK"); - map(0x2000, 0x3fff).rw(this, FUNC(supertnk_state::supertnk_videoram_r), FUNC(supertnk_state::supertnk_videoram_w)); + map(0x2000, 0x3fff).rw(FUNC(supertnk_state::supertnk_videoram_r), FUNC(supertnk_state::supertnk_videoram_w)); } @@ -336,11 +336,11 @@ void supertnk_state::supertnk_map(address_map &map) void supertnk_state::supertnk_io_map(address_map &map) { map(0x0000, 0x0000).nopw(); - map(0x0400, 0x0400).w(this, FUNC(supertnk_state::supertnk_bitplane_select_0_w)); - map(0x0401, 0x0401).w(this, FUNC(supertnk_state::supertnk_bitplane_select_1_w)); - map(0x0402, 0x0402).w(this, FUNC(supertnk_state::supertnk_bankswitch_0_w)); - map(0x0404, 0x0404).w(this, FUNC(supertnk_state::supertnk_bankswitch_1_w)); - map(0x0406, 0x0406).w(this, FUNC(supertnk_state::supertnk_interrupt_ack_w)); + map(0x0400, 0x0400).w(FUNC(supertnk_state::supertnk_bitplane_select_0_w)); + map(0x0401, 0x0401).w(FUNC(supertnk_state::supertnk_bitplane_select_1_w)); + map(0x0402, 0x0402).w(FUNC(supertnk_state::supertnk_bankswitch_0_w)); + map(0x0404, 0x0404).w(FUNC(supertnk_state::supertnk_bankswitch_1_w)); + map(0x0406, 0x0406).w(FUNC(supertnk_state::supertnk_interrupt_ack_w)); map(0x0407, 0x0407).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp index 7c58ce104fb..19f0f14bb38 100644 --- a/src/mame/drivers/superwng.cpp +++ b/src/mame/drivers/superwng.cpp @@ -325,32 +325,32 @@ void superwng_state::superwng_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x6fff).bankr("bank1"); map(0x7000, 0x7fff).ram(); - map(0x8000, 0x83ff).ram().w(this, FUNC(superwng_state::superwng_bg_vram_w)).share("videorabg"); - map(0x8400, 0x87ff).ram().w(this, FUNC(superwng_state::superwng_fg_vram_w)).share("videorafg"); - map(0x8800, 0x8bff).ram().w(this, FUNC(superwng_state::superwng_bg_cram_w)).share("colorrabg"); - map(0x8c00, 0x8fff).ram().w(this, FUNC(superwng_state::superwng_fg_cram_w)).share("colorrafg"); + map(0x8000, 0x83ff).ram().w(FUNC(superwng_state::superwng_bg_vram_w)).share("videorabg"); + map(0x8400, 0x87ff).ram().w(FUNC(superwng_state::superwng_fg_vram_w)).share("videorafg"); + map(0x8800, 0x8bff).ram().w(FUNC(superwng_state::superwng_bg_cram_w)).share("colorrabg"); + map(0x8c00, 0x8fff).ram().w(FUNC(superwng_state::superwng_fg_cram_w)).share("colorrafg"); map(0x9800, 0x99ff).ram(); map(0xa000, 0xa000).portr("P1"); - map(0xa000, 0xa000).w(this, FUNC(superwng_state::superwng_hopper_w)); + map(0xa000, 0xa000).w(FUNC(superwng_state::superwng_hopper_w)); map(0xa080, 0xa080).portr("P2"); map(0xa100, 0xa100).portr("DSW1"); - map(0xa100, 0xa100).w(this, FUNC(superwng_state::superwng_sound_interrupt_w)); + map(0xa100, 0xa100).w(FUNC(superwng_state::superwng_sound_interrupt_w)); map(0xa180, 0xa180).portr("DSW2"); map(0xa180, 0xa180).nopw(); // watchdog? int ack? - map(0xa181, 0xa181).w(this, FUNC(superwng_state::superwng_nmi_enable_w)); - map(0xa182, 0xa182).w(this, FUNC(superwng_state::superwng_tilebank_w)); - map(0xa183, 0xa183).w(this, FUNC(superwng_state::superwng_flip_screen_w)); - map(0xa184, 0xa184).w(this, FUNC(superwng_state::superwng_cointcnt1_w)); - map(0xa185, 0xa185).w(this, FUNC(superwng_state::superwng_unk_a185_w)); // unknown, always(?) 0 - map(0xa186, 0xa186).w(this, FUNC(superwng_state::superwng_cointcnt2_w)); - map(0xa187, 0xa187).w(this, FUNC(superwng_state::superwng_unk_a187_w)); // unknown, always(?) 0 + map(0xa181, 0xa181).w(FUNC(superwng_state::superwng_nmi_enable_w)); + map(0xa182, 0xa182).w(FUNC(superwng_state::superwng_tilebank_w)); + map(0xa183, 0xa183).w(FUNC(superwng_state::superwng_flip_screen_w)); + map(0xa184, 0xa184).w(FUNC(superwng_state::superwng_cointcnt1_w)); + map(0xa185, 0xa185).w(FUNC(superwng_state::superwng_unk_a185_w)); // unknown, always(?) 0 + map(0xa186, 0xa186).w(FUNC(superwng_state::superwng_cointcnt2_w)); + map(0xa187, 0xa187).w(FUNC(superwng_state::superwng_unk_a187_w)); // unknown, always(?) 0 } void superwng_state::superwng_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x3000, 0x3000).w(this, FUNC(superwng_state::superwng_sound_nmi_clear_w)); + map(0x3000, 0x3000).w(FUNC(superwng_state::superwng_sound_nmi_clear_w)); map(0x4000, 0x4000).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0x5000, 0x5000).w("ay1", FUNC(ay8910_device::address_w)); map(0x6000, 0x6000).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index 8e125b0b5d3..f6a2a081459 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -1123,18 +1123,18 @@ WRITE16_MEMBER( supracan_state::vram_w ) void supracan_state::supracan_mem(address_map &map) { //AM_RANGE( 0x000000, 0x3fffff ) // mapped by the cartslot - map(0xe80000, 0xe8ffff).rw(this, FUNC(supracan_state::_68k_soundram_r), FUNC(supracan_state::_68k_soundram_w)); + map(0xe80000, 0xe8ffff).rw(FUNC(supracan_state::_68k_soundram_r), FUNC(supracan_state::_68k_soundram_w)); map(0xe80200, 0xe80201).portr("P1"); map(0xe80202, 0xe80203).portr("P2"); map(0xe80208, 0xe80209).portr("P3"); map(0xe8020c, 0xe8020d).portr("P4"); - map(0xe90000, 0xe9001f).rw(this, FUNC(supracan_state::sound_r), FUNC(supracan_state::sound_w)); - map(0xe90020, 0xe9002f).w(this, FUNC(supracan_state::dma_channel0_w)); - map(0xe90030, 0xe9003f).w(this, FUNC(supracan_state::dma_channel1_w)); + map(0xe90000, 0xe9001f).rw(FUNC(supracan_state::sound_r), FUNC(supracan_state::sound_w)); + map(0xe90020, 0xe9002f).w(FUNC(supracan_state::dma_channel0_w)); + map(0xe90030, 0xe9003f).w(FUNC(supracan_state::dma_channel1_w)); - map(0xf00000, 0xf001ff).rw(this, FUNC(supracan_state::video_r), FUNC(supracan_state::video_w)); + map(0xf00000, 0xf001ff).rw(FUNC(supracan_state::video_r), FUNC(supracan_state::video_w)); map(0xf00200, 0xf003ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0xf40000, 0xf5ffff).ram().w(this, FUNC(supracan_state::vram_w)).share("vram"); + map(0xf40000, 0xf5ffff).ram().w(FUNC(supracan_state::vram_w)).share("vram"); map(0xfc0000, 0xfcffff).mirror(0x30000).ram(); /* System work ram */ } @@ -1234,7 +1234,7 @@ WRITE8_MEMBER( supracan_state::_6502_soundmem_w ) void supracan_state::supracan_sound_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(supracan_state::_6502_soundmem_r), FUNC(supracan_state::_6502_soundmem_w)).share("soundram"); + map(0x0000, 0xffff).rw(FUNC(supracan_state::_6502_soundmem_r), FUNC(supracan_state::_6502_soundmem_w)).share("soundram"); } static INPUT_PORTS_START( supracan ) diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index 40c8ede3043..99d8c360786 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -342,11 +342,11 @@ void suprgolf_state::suprgolf_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x7fff).bankr("bank1"); - map(0x4000, 0x4000).w(this, FUNC(suprgolf_state::rom2_bank_select_w)); + map(0x4000, 0x4000).w(FUNC(suprgolf_state::rom2_bank_select_w)); map(0x8000, 0xbfff).bankr("bank2"); - map(0xc000, 0xdfff).rw(this, FUNC(suprgolf_state::bg_vram_r), FUNC(suprgolf_state::bg_vram_w)); // banked background vram - map(0xe000, 0xefff).rw(this, FUNC(suprgolf_state::videoram_r), FUNC(suprgolf_state::videoram_w)).share("videoram"); //foreground vram + paletteram - map(0xf000, 0xf000).w(this, FUNC(suprgolf_state::pen_w)); + map(0xc000, 0xdfff).rw(FUNC(suprgolf_state::bg_vram_r), FUNC(suprgolf_state::bg_vram_w)); // banked background vram + map(0xe000, 0xefff).rw(FUNC(suprgolf_state::videoram_r), FUNC(suprgolf_state::videoram_w)).share("videoram"); //foreground vram + paletteram + map(0xf000, 0xf000).w(FUNC(suprgolf_state::pen_w)); map(0xf800, 0xffff).ram(); } @@ -356,7 +356,7 @@ void suprgolf_state::io_map(address_map &map) map(0x00, 0x03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x04, 0x07).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x08, 0x09).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x0c, 0x0c).w(this, FUNC(suprgolf_state::adpcm_data_w)); + map(0x0c, 0x0c).w(FUNC(suprgolf_state::adpcm_data_w)); } static INPUT_PORTS_START( suprgolf ) diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp index f29199c59c1..9ce498e6f05 100644 --- a/src/mame/drivers/suprloco.cpp +++ b/src/mame/drivers/suprloco.cpp @@ -49,9 +49,9 @@ void suprloco_state::main_map(address_map &map) map(0xe000, 0xe000).portr("DSW1"); map(0xe001, 0xe001).portr("DSW2"); map(0xe800, 0xe803).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xf000, 0xf6ff).ram().w(this, FUNC(suprloco_state::videoram_w)).share("videoram"); + map(0xf000, 0xf6ff).ram().w(FUNC(suprloco_state::videoram_w)).share("videoram"); map(0xf700, 0xf7df).ram(); /* unused */ - map(0xf7e0, 0xf7ff).ram().w(this, FUNC(suprloco_state::scrollram_w)).share("scrollram"); + map(0xf7e0, 0xf7ff).ram().w(FUNC(suprloco_state::scrollram_w)).share("scrollram"); map(0xf800, 0xffff).ram(); } @@ -65,9 +65,9 @@ void suprloco_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa003).w("sn1", FUNC(sn76496_device::write)); - map(0xc000, 0xc003).w("sn2", FUNC(sn76496_device::write)); - map(0xe000, 0xe000).r(this, FUNC(suprloco_state::soundport_r)); + map(0xa000, 0xa003).w("sn1", FUNC(sn76496_device::command_w)); + map(0xc000, 0xc003).w("sn2", FUNC(sn76496_device::command_w)); + map(0xe000, 0xe000).r(FUNC(suprloco_state::soundport_r)); } diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 28fc436fe3b..14f81967688 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -725,7 +725,7 @@ WRITE32_MEMBER(skns_state::v3t_w) void skns_state::skns_map(address_map &map) { map(0x00000000, 0x0007ffff).rom(); /* BIOS ROM */ - map(0x00400000, 0x0040000f).w(this, FUNC(skns_state::io_w)); /* I/O Write */ + map(0x00400000, 0x0040000f).w(FUNC(skns_state::io_w)); /* I/O Write */ map(0x00400000, 0x00400003).portr("400000"); map(0x00400004, 0x00400007).portr("400004"); /* In between is write only */ @@ -733,18 +733,18 @@ void skns_state::skns_map(address_map &map) map(0x00800000, 0x00801fff).ram().share("nvram"); /* 'backup' RAM */ map(0x00c00000, 0x00c00001).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); /* ymz280_w (sound) */ map(0x01000000, 0x0100000f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write)); - map(0x01800000, 0x01800003).w(this, FUNC(skns_state::hit2_w)); + map(0x01800000, 0x01800003).w(FUNC(skns_state::hit2_w)); map(0x02000000, 0x02003fff).ram().share("spriteram"); /* sprite ram */ map(0x02100000, 0x0210003f).ram().share("spc_regs"); /* sprite registers */ - map(0x02400000, 0x0240007f).ram().w(this, FUNC(skns_state::v3_regs_w)).share("v3_regs"); /* tilemap registers */ - map(0x02500000, 0x02503fff).ram().w(this, FUNC(skns_state::tilemapA_w)).share("tilemapa_ram"); /* tilemap A */ - map(0x02504000, 0x02507fff).ram().w(this, FUNC(skns_state::tilemapB_w)).share("tilemapb_ram"); /* tilemap B */ + map(0x02400000, 0x0240007f).ram().w(FUNC(skns_state::v3_regs_w)).share("v3_regs"); /* tilemap registers */ + map(0x02500000, 0x02503fff).ram().w(FUNC(skns_state::tilemapA_w)).share("tilemapa_ram"); /* tilemap A */ + map(0x02504000, 0x02507fff).ram().w(FUNC(skns_state::tilemapB_w)).share("tilemapb_ram"); /* tilemap B */ map(0x02600000, 0x02607fff).ram().share("v3slc_ram"); /* tilemap linescroll */ - map(0x02a00000, 0x02a0001f).ram().w(this, FUNC(skns_state::pal_regs_w)).share("pal_regs"); - map(0x02a40000, 0x02a5ffff).ram().w(this, FUNC(skns_state::palette_ram_w)).share("palette_ram"); - map(0x02f00000, 0x02f000ff).rw(this, FUNC(skns_state::hit_r), FUNC(skns_state::hit_w)); + map(0x02a00000, 0x02a0001f).ram().w(FUNC(skns_state::pal_regs_w)).share("pal_regs"); + map(0x02a40000, 0x02a5ffff).ram().w(FUNC(skns_state::palette_ram_w)).share("palette_ram"); + map(0x02f00000, 0x02f000ff).rw(FUNC(skns_state::hit_r), FUNC(skns_state::hit_w)); map(0x04000000, 0x041fffff).bankr("bank1"); /* GAME ROM */ - map(0x04800000, 0x0483ffff).ram().w(this, FUNC(skns_state::v3t_w)).share("v3t_ram"); /* tilemap b ram based tiles */ + map(0x04800000, 0x0483ffff).ram().w(FUNC(skns_state::v3t_w)).share("v3t_ram"); /* tilemap b ram based tiles */ map(0x06000000, 0x060fffff).ram().share("main_ram"); map(0xc0000000, 0xc0000fff).ram().share("cache_ram"); /* 'cache' RAM */ } diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp index da0a7791c07..dea41e8bc42 100644 --- a/src/mame/drivers/suprridr.cpp +++ b/src/mame/drivers/suprridr.cpp @@ -147,21 +147,21 @@ void suprridr_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).ram().w(this, FUNC(suprridr_state::bgram_w)).share("bgram"); - map(0x9000, 0x97ff).ram().w(this, FUNC(suprridr_state::fgram_w)).share("fgram"); + map(0x8800, 0x8bff).ram().w(FUNC(suprridr_state::bgram_w)).share("bgram"); + map(0x9000, 0x97ff).ram().w(FUNC(suprridr_state::fgram_w)).share("fgram"); map(0x9800, 0x983f).ram(); map(0x9840, 0x987f).ram().share("spriteram"); map(0x9880, 0x9bff).ram(); map(0xa000, 0xa000).portr("INPUTS"); map(0xa800, 0xa800).portr("SYSTEM"); - map(0xb000, 0xb000).portr("DSW").w(this, FUNC(suprridr_state::nmi_enable_w)); - map(0xb002, 0xb003).w(this, FUNC(suprridr_state::coin_lock_w)); - map(0xb006, 0xb006).w(this, FUNC(suprridr_state::flipx_w)); - map(0xb007, 0xb007).w(this, FUNC(suprridr_state::flipy_w)); + map(0xb000, 0xb000).portr("DSW").w(FUNC(suprridr_state::nmi_enable_w)); + map(0xb002, 0xb003).w(FUNC(suprridr_state::coin_lock_w)); + map(0xb006, 0xb006).w(FUNC(suprridr_state::flipx_w)); + map(0xb007, 0xb007).w(FUNC(suprridr_state::flipy_w)); map(0xb800, 0xb800).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xc801, 0xc801).w(this, FUNC(suprridr_state::fgdisable_w)); - map(0xc802, 0xc802).w(this, FUNC(suprridr_state::fgscrolly_w)); - map(0xc804, 0xc804).w(this, FUNC(suprridr_state::bgscrolly_w)); + map(0xc801, 0xc801).w(FUNC(suprridr_state::fgdisable_w)); + map(0xc802, 0xc802).w(FUNC(suprridr_state::fgscrolly_w)); + map(0xc804, 0xc804).w(FUNC(suprridr_state::bgscrolly_w)); map(0xc000, 0xefff).rom(); } diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp index f9c41d7e3e2..b91461e27a3 100644 --- a/src/mame/drivers/suprslam.cpp +++ b/src/mame/drivers/suprslam.cpp @@ -108,15 +108,15 @@ void suprslam_state::suprslam_map(address_map &map) map(0xfb0000, 0xfb1fff).ram().share("spriteram"); map(0xfc0000, 0xfcffff).ram().share("sp_videoram"); map(0xfd0000, 0xfdffff).ram(); - map(0xfe0000, 0xfe0fff).ram().w(this, FUNC(suprslam_state::suprslam_screen_videoram_w)).share("screen_videoram"); - map(0xff0000, 0xff1fff).ram().w(this, FUNC(suprslam_state::suprslam_bg_videoram_w)).share("bg_videoram"); + map(0xfe0000, 0xfe0fff).ram().w(FUNC(suprslam_state::suprslam_screen_videoram_w)).share("screen_videoram"); + map(0xff0000, 0xff1fff).ram().w(FUNC(suprslam_state::suprslam_bg_videoram_w)).share("bg_videoram"); map(0xff2000, 0xff203f).ram().share("screen_vregs"); map(0xff3000, 0xff3001).nopw(); // sprite buffer trigger? map(0xff8000, 0xff8fff).rw(m_k053936, FUNC(k053936_device::linectrl_r), FUNC(k053936_device::linectrl_w)); map(0xff9001, 0xff9001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xffa000, 0xffafff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xffd000, 0xffd01f).w(m_k053936, FUNC(k053936_device::ctrl_w)); - map(0xffe000, 0xffe001).w(this, FUNC(suprslam_state::suprslam_bank_w)); + map(0xffe000, 0xffe001).w(FUNC(suprslam_state::suprslam_bank_w)); map(0xfff000, 0xfff01f).rw("io", FUNC(vs9209_device::read), FUNC(vs9209_device::write)).umask16(0x00ff); } @@ -130,7 +130,7 @@ void suprslam_state::sound_map(address_map &map) void suprslam_state::sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(suprslam_state::suprslam_sh_bankswitch_w)); + map(0x00, 0x00).w(FUNC(suprslam_state::suprslam_sh_bankswitch_w)); map(0x04, 0x04).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0x08, 0x0b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } diff --git a/src/mame/drivers/supstarf.cpp b/src/mame/drivers/supstarf.cpp index 27b96660d39..78ffa6db7f7 100644 --- a/src/mame/drivers/supstarf.cpp +++ b/src/mame/drivers/supstarf.cpp @@ -67,7 +67,7 @@ void supstarf_state::main_map(address_map &map) void supstarf_state::main_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).w(this, FUNC(supstarf_state::driver_clk_w)); + map(0x00, 0xff).w(FUNC(supstarf_state::driver_clk_w)); } void supstarf_state::sound_map(address_map &map) @@ -77,7 +77,7 @@ void supstarf_state::sound_map(address_map &map) void supstarf_state::sound_io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(supstarf_state::psg_latch_r), FUNC(supstarf_state::psg_latch_w)); + map(0x00, 0xff).rw(FUNC(supstarf_state::psg_latch_r), FUNC(supstarf_state::psg_latch_w)); } READ8_MEMBER(supstarf_state::psg_latch_r) diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index f8af824f999..bc77d91e960 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -71,9 +71,9 @@ void surpratk_state::surpratk_map(address_map &map) map(0x5f90, 0x5f90).portr("DSW2"); map(0x5fa0, 0x5faf).rw(m_k053244, FUNC(k05324x_device::k053244_r), FUNC(k05324x_device::k053244_w)); map(0x5fb0, 0x5fbf).w(m_k053251, FUNC(k053251_device::write)); - map(0x5fc0, 0x5fc0).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(surpratk_state::surpratk_5fc0_w)); + map(0x5fc0, 0x5fc0).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(surpratk_state::surpratk_5fc0_w)); map(0x5fd0, 0x5fd1).w("ymsnd", FUNC(ym2151_device::write)); - map(0x5fc4, 0x5fc4).w(this, FUNC(surpratk_state::surpratk_videobank_w)); + map(0x5fc4, 0x5fc4).w(FUNC(surpratk_state::surpratk_videobank_w)); map(0x8000, 0xffff).rom().region("maincpu", 0x38000); } diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp index 013b6bb157e..b6f7b64fa00 100644 --- a/src/mame/drivers/svi318.cpp +++ b/src/mame/drivers/svi318.cpp @@ -50,8 +50,8 @@ class svi3x8_state : public driver_device { public: - svi3x8_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + svi3x8_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), m_io(*this, "io"), @@ -136,7 +136,7 @@ private: void svi3x8_state::svi3x8_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(svi3x8_state::mreq_r), FUNC(svi3x8_state::mreq_w)); + map(0x0000, 0xffff).rw(FUNC(svi3x8_state::mreq_r), FUNC(svi3x8_state::mreq_w)); } void svi3x8_state::svi3x8_io(address_map &map) @@ -149,10 +149,10 @@ void svi3x8_state::svi3x8_io_bank(address_map &map) { map(0x000, 0x0ff).rw(m_expander, FUNC(svi_expander_device::iorq_r), FUNC(svi_expander_device::iorq_w)); map(0x100, 0x17f).rw(m_expander, FUNC(svi_expander_device::iorq_r), FUNC(svi_expander_device::iorq_w)); - map(0x180, 0x180).mirror(0x22).w(m_vdp, FUNC(tms9928a_device::vram_write)); - map(0x181, 0x181).mirror(0x22).w(m_vdp, FUNC(tms9928a_device::register_write)); - map(0x184, 0x184).mirror(0x22).r(m_vdp, FUNC(tms9928a_device::vram_read)); - map(0x185, 0x185).mirror(0x22).r(m_vdp, FUNC(tms9928a_device::register_read)); + map(0x180, 0x180).mirror(0x22).w(m_vdp, FUNC(tms9928a_device::vram_w)); + map(0x181, 0x181).mirror(0x22).w(m_vdp, FUNC(tms9928a_device::register_w)); + map(0x184, 0x184).mirror(0x22).r(m_vdp, FUNC(tms9928a_device::vram_r)); + map(0x185, 0x185).mirror(0x22).r(m_vdp, FUNC(tms9928a_device::register_r)); map(0x188, 0x188).mirror(0x23).w("psg", FUNC(ay8910_device::address_w)); map(0x18c, 0x18c).mirror(0x23).w("psg", FUNC(ay8910_device::data_w)); map(0x190, 0x190).mirror(0x23).r("psg", FUNC(ay8910_device::data_r)); @@ -495,17 +495,17 @@ WRITE_LINE_MEMBER( svi3x8_state::ctrl1_w ) READ8_MEMBER( svi3x8_state::excs_r ) { if (offset & 1) - return m_vdp->register_read(space, 0); + return m_vdp->register_read(); else - return m_vdp->vram_read(space, 0); + return m_vdp->vram_read(); } WRITE8_MEMBER( svi3x8_state::excs_w ) { if (offset & 1) - m_vdp->register_write(space, 0, data); + m_vdp->register_write(data); else - m_vdp->vram_write(space, 0, data); + m_vdp->vram_write(data); } diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index 2aa5122d22d..ff23812bce0 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -250,7 +250,7 @@ WRITE8_MEMBER(svision_state::tvlink_w) void svision_state::svision_mem(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x3fff).rw(this, FUNC(svision_state::svision_r), FUNC(svision_state::svision_w)).share(m_reg); + map(0x2000, 0x3fff).rw(FUNC(svision_state::svision_r), FUNC(svision_state::svision_w)).share(m_reg); map(0x4000, 0x5fff).ram().share(m_videoram); map(0x6000, 0x7fff).noprw(); map(0x8000, 0xbfff).bankr(m_bank1); @@ -260,7 +260,7 @@ void svision_state::svision_mem(address_map &map) void svision_state::tvlink_mem(address_map &map) { map(0x0000, 0x1fff).ram(); - map(0x2000, 0x3fff).rw(this, FUNC(svision_state::tvlink_r), FUNC(svision_state::tvlink_w)).share(m_reg); + map(0x2000, 0x3fff).rw(FUNC(svision_state::tvlink_r), FUNC(svision_state::tvlink_w)).share(m_reg); map(0x4000, 0x5fff).ram().share(m_videoram); map(0x6000, 0x7fff).noprw(); map(0x8000, 0xbfff).bankr(m_bank1); diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index e4250736093..1cfab6c03f4 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -70,9 +70,9 @@ WRITE8_MEMBER(svmu_state::page_w) READ8_MEMBER(svmu_state::prog_r) { if (m_page == 1) - return m_flash->read(offset); + return m_flash->read(space, offset); else if (m_page == 2) - return m_flash->read(0x10000 + offset); + return m_flash->read(space, 0x10000 + offset); else return m_bios[offset]; } @@ -80,9 +80,9 @@ READ8_MEMBER(svmu_state::prog_r) WRITE8_MEMBER(svmu_state::prog_w) { if (m_page == 1) - m_flash->write(offset, data); + m_flash->write(space, offset, data); else if (m_page == 2) - m_flash->write(0x10000 + offset, data); + m_flash->write(space, 0x10000 + offset, data); } /* @@ -127,14 +127,14 @@ READ8_MEMBER(svmu_state::p7_r) void svmu_state::svmu_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(svmu_state::prog_r), FUNC(svmu_state::prog_w)); + map(0x0000, 0xffff).rw(FUNC(svmu_state::prog_r), FUNC(svmu_state::prog_w)); } void svmu_state::svmu_io_mem(address_map &map) { - map(LC8670_PORT1, LC8670_PORT1).rw(this, FUNC(svmu_state::p1_r), FUNC(svmu_state::p1_w)); + map(LC8670_PORT1, LC8670_PORT1).rw(FUNC(svmu_state::p1_r), FUNC(svmu_state::p1_w)); map(LC8670_PORT3, LC8670_PORT3).portr("P3"); - map(LC8670_PORT7, LC8670_PORT7).r(this, FUNC(svmu_state::p7_r)); + map(LC8670_PORT7, LC8670_PORT7).r(FUNC(svmu_state::p7_r)); } /* Input ports */ diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp index bc16e26432d..00435181997 100644 --- a/src/mame/drivers/swtpc09.cpp +++ b/src/mame/drivers/swtpc09.cpp @@ -62,7 +62,7 @@ void swtpc09_state::mp09_mem(address_map &map) { - map(0x0000, 0xfeff).rw(this, FUNC(swtpc09_state::main_r), FUNC(swtpc09_state::main_w)); + map(0x0000, 0xfeff).rw(FUNC(swtpc09_state::main_r), FUNC(swtpc09_state::main_w)); map(0xff00, 0xffff).rom().region("maincpu", 0xff00); map(0xff00, 0xff0f).mirror(0xf0).writeonly().share("dat"); } @@ -75,9 +75,9 @@ void swtpc09_state::flex_dmf2_mem(address_map &map) map(0xe080, 0xe083).mirror(0xf000c).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xe090, 0xe097).mirror(0xf0008).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0xe0a0, 0xefff).mirror(0xf0000).noprw(); - map(0xf000, 0xf01f).mirror(0xf0000).rw(this, FUNC(swtpc09_state::m6844_r), FUNC(swtpc09_state::m6844_w)); + map(0xf000, 0xf01f).mirror(0xf0000).rw(FUNC(swtpc09_state::m6844_r), FUNC(swtpc09_state::m6844_w)); map(0xf020, 0xf023).mirror(0xf0000).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0xf024, 0xf03f).mirror(0xf0000).rw(this, FUNC(swtpc09_state::dmf2_control_reg_r), FUNC(swtpc09_state::dmf2_control_reg_w)); + map(0xf024, 0xf03f).mirror(0xf0000).rw(FUNC(swtpc09_state::dmf2_control_reg_r), FUNC(swtpc09_state::dmf2_control_reg_w)); //AM_RANGE(0xf042, 0xf7ff) AM_MIRROR(0xf0000) AM_NOP map(0xf800, 0xffff).mirror(0xf0000).rom().region("maincpu", 0xf800); } @@ -87,7 +87,7 @@ void swtpc09_state::flex_dc4_piaide_mem(address_map &map) map(0x00000, 0xfffff).ram().share("mainram"); // by default everything is ram, 1MB ram emulated map(0xe000, 0xe003).mirror(0xf0000).noprw(); map(0xe004, 0xe005).mirror(0xf0000).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); - map(0xe014, 0xe014).mirror(0xf0000).w(this, FUNC(swtpc09_state::dc4_control_reg_w)); + map(0xe014, 0xe014).mirror(0xf0000).w(FUNC(swtpc09_state::dc4_control_reg_w)); map(0xe018, 0xe01b).mirror(0xf0000).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); //AM_RANGE(0xe01c, 0xe05f) AM_MIRROR(0xf0000) AM_NOP map(0xe060, 0xe063).mirror(0xf000c).rw(m_piaide, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); @@ -112,9 +112,9 @@ void swtpc09_state::uniflex_dmf2_mem(address_map &map) map(0xe080, 0xe083).mirror(0xf000c).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xe090, 0xe097).mirror(0xf0008).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0xe0a0, 0xefff).mirror(0xf0000).noprw(); - map(0xf000, 0xf01f).mirror(0xf0000).rw(this, FUNC(swtpc09_state::m6844_r), FUNC(swtpc09_state::m6844_w)); + map(0xf000, 0xf01f).mirror(0xf0000).rw(FUNC(swtpc09_state::m6844_r), FUNC(swtpc09_state::m6844_w)); map(0xf020, 0xf023).mirror(0xf0000).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0xf024, 0xf03f).mirror(0xf0000).rw(this, FUNC(swtpc09_state::dmf2_control_reg_r), FUNC(swtpc09_state::dmf2_control_reg_w)); + map(0xf024, 0xf03f).mirror(0xf0000).rw(FUNC(swtpc09_state::dmf2_control_reg_r), FUNC(swtpc09_state::dmf2_control_reg_w)); //AM_RANGE(0xf042, 0xf7ff) AM_MIRROR(0xf0000) AM_NOP map(0xf800, 0xffff).mirror(0xf0000).rom().region("maincpu", 0xf800); } @@ -127,10 +127,10 @@ void swtpc09_state::uniflex_dmf3_mem(address_map &map) map(0xe080, 0xe083).mirror(0xf000c).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xe090, 0xe097).mirror(0xf0008).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); map(0xe0a0, 0xefff).mirror(0xf0000).noprw(); - map(0xf000, 0xf01f).mirror(0xf0000).rw(this, FUNC(swtpc09_state::m6844_r), FUNC(swtpc09_state::m6844_w)); + map(0xf000, 0xf01f).mirror(0xf0000).rw(FUNC(swtpc09_state::m6844_r), FUNC(swtpc09_state::m6844_w)); map(0xf020, 0xf023).mirror(0xf0000).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0xf024, 0xf024).mirror(0xf0000).rw(this, FUNC(swtpc09_state::dmf3_control_reg_r), FUNC(swtpc09_state::dmf3_control_reg_w)); - map(0xf025, 0xf025).mirror(0xf0000).rw(this, FUNC(swtpc09_state::dmf3_dma_address_reg_r), FUNC(swtpc09_state::dmf3_dma_address_reg_w)); + map(0xf024, 0xf024).mirror(0xf0000).rw(FUNC(swtpc09_state::dmf3_control_reg_r), FUNC(swtpc09_state::dmf3_control_reg_w)); + map(0xf025, 0xf025).mirror(0xf0000).rw(FUNC(swtpc09_state::dmf3_dma_address_reg_r), FUNC(swtpc09_state::dmf3_dma_address_reg_w)); //AM_RANGE(0xf030, 0xf03f) AM_MIRROR(0xf0000) AM_NOP map(0xf040, 0xf04f).mirror(0xf0000).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); //AM_RANGE(0xf050, 0xf7ff) AM_MIRROR(0xf0000) AM_NOP diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index e25c82e3ca5..7eb2e742a21 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -298,8 +298,8 @@ ToDo: class swyft_state : public driver_device { public: - swyft_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + swyft_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ctx(*this, "ctx"), m_ctx_data_out(*this, "ctx_data_out"), @@ -316,7 +316,7 @@ public: m_y5(*this, "Y5"), m_y6(*this, "Y6"), m_y7(*this, "Y7")*/ - { } + { } required_device m_maincpu; optional_device m_ctx; @@ -567,10 +567,10 @@ void swyft_state::swyft_mem(address_map &map) map.global_mask(0xfffff); map(0x000000, 0x00ffff).rom(); // 64 KB ROM map(0x040000, 0x07ffff).ram().share("p_swyft_vram"); // 256 KB RAM - map(0x0d0000, 0x0d000f).r(this, FUNC(swyft_state::swyft_d0000)); // status of something? reads from d0000, d0004, d0008, d000a, d000e + map(0x0d0000, 0x0d000f).r(FUNC(swyft_state::swyft_d0000)); // status of something? reads from d0000, d0004, d0008, d000a, d000e map(0x0e1000, 0x0e1000).w(m_acia6850, FUNC(acia6850_device::control_w)); // 6850 ACIA lives here - map(0x0e2000, 0x0e2fff).rw(this, FUNC(swyft_state::swyft_via0_r), FUNC(swyft_state::swyft_via0_w)); // io area with selector on a9 a8 a7 a6? - map(0x0e4000, 0x0e4fff).rw(this, FUNC(swyft_state::swyft_via1_r), FUNC(swyft_state::swyft_via1_w)); + map(0x0e2000, 0x0e2fff).rw(FUNC(swyft_state::swyft_via0_r), FUNC(swyft_state::swyft_via0_w)); // io area with selector on a9 a8 a7 a6? + map(0x0e4000, 0x0e4fff).rw(FUNC(swyft_state::swyft_via1_r), FUNC(swyft_state::swyft_via1_w)); } MACHINE_START_MEMBER(swyft_state,swyft) diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index 7c14f8f0a1c..3d9f0d72549 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -760,12 +760,12 @@ void system1_state::system1_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram().share("ram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); - map(0xe000, 0xefff).rw(this, FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); - map(0xf000, 0xf3ff).rw(this, FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); - map(0xf400, 0xf7ff).w(this, FUNC(system1_state::system1_mixer_collision_reset_w)); - map(0xf800, 0xfbff).rw(this, FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); - map(0xfc00, 0xffff).w(this, FUNC(system1_state::system1_sprite_collision_reset_w)); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xe000, 0xefff).rw(FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); + map(0xf000, 0xf3ff).rw(FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); + map(0xf400, 0xf7ff).w(FUNC(system1_state::system1_mixer_collision_reset_w)); + map(0xf800, 0xfbff).rw(FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); + map(0xfc00, 0xffff).w(FUNC(system1_state::system1_sprite_collision_reset_w)); } void system1_state::decrypted_opcodes_map(address_map &map) @@ -774,7 +774,7 @@ void system1_state::decrypted_opcodes_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram().share("ram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); } void system1_state::banked_decrypted_opcodes_map(address_map &map) @@ -783,7 +783,7 @@ void system1_state::banked_decrypted_opcodes_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1d"); map(0xc000, 0xcfff).ram().share("ram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); } /* same as normal System 1 except address map is shuffled (RAM/collision are swapped) */ @@ -791,13 +791,13 @@ void system1_state::nobo_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xc3ff).rw(this, FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); - map(0xc400, 0xc7ff).w(this, FUNC(system1_state::system1_mixer_collision_reset_w)); - map(0xc800, 0xcbff).rw(this, FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); - map(0xcc00, 0xcfff).w(this, FUNC(system1_state::system1_sprite_collision_reset_w)); + map(0xc000, 0xc3ff).rw(FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); + map(0xc400, 0xc7ff).w(FUNC(system1_state::system1_mixer_collision_reset_w)); + map(0xc800, 0xcbff).rw(FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); + map(0xcc00, 0xcfff).w(FUNC(system1_state::system1_sprite_collision_reset_w)); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); - map(0xe000, 0xefff).rw(this, FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xe000, 0xefff).rw(FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); map(0xf000, 0xffff).ram().share("ram"); } @@ -839,9 +839,9 @@ void system1_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).mirror(0x1800).ram(); - map(0xa000, 0xa000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::write)); - map(0xc000, 0xc000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::write)); - map(0xe000, 0xe000).mirror(0x1fff).r(this, FUNC(system1_state::sound_data_r)); + map(0xa000, 0xa000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xc000, 0xc000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xe000, 0xe000).mirror(0x1fff).r(FUNC(system1_state::sound_data_r)); } @@ -854,7 +854,7 @@ void system1_state::sound_map(address_map &map) void system1_state::mcu_io_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(system1_state::mcu_io_r), FUNC(system1_state::mcu_io_w)); + map(0x0000, 0xffff).rw(FUNC(system1_state::mcu_io_r), FUNC(system1_state::mcu_io_w)); } diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index edd0795c13a..53dea9c4095 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -146,22 +146,22 @@ void segas1x_bootleg_state::shinobib_map(address_map &map) map(0x411000, 0x411fff).ram().share("bg0_tileram"); map(0x412000, 0x412fff).ram().share("bg1_tileram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); -// map(0xc40000, 0xc40001).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); +// map(0xc40000, 0xc40001).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc41002, 0xc41003).portr("P1"); map(0xc41006, 0xc41007).portr("P2"); map(0xc42000, 0xc42001).portr("DSW1"); map(0xc42002, 0xc42003).portr("DSW2"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc43000, 0xc43001).nopw(); map(0xc44000, 0xc44001).noprw(); - map(0xc46000, 0xc46001).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); - map(0xc46002, 0xc46003).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); - map(0xc46004, 0xc46005).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); - map(0xc46006, 0xc46007).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); - map(0xc46008, 0xc46009).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); + map(0xc46000, 0xc46001).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); + map(0xc46002, 0xc46003).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); + map(0xc46004, 0xc46005).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); + map(0xc46006, 0xc46007).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); + map(0xc46008, 0xc46009).w(FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); map(0xc60000, 0xc60001).nopr(); map(0xffc000, 0xffffff).ram(); // work ram } @@ -194,19 +194,19 @@ void segas1x_bootleg_state::passshtb_map(address_map &map) map(0x410000, 0x410fff).ram().share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc40001).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc40001).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0xc41002, 0xc41003).portr("P1"); map(0xc41004, 0xc41005).portr("P2"); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc42002, 0xc42003).portr("DSW1"); map(0xc42000, 0xc42001).portr("DSW2"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); - map(0xc46000, 0xc46001).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); - map(0xc46002, 0xc46003).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); - map(0xc46004, 0xc46005).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); - map(0xc46006, 0xc46007).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); - map(0xc46008, 0xc46009).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc46000, 0xc46001).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); + map(0xc46002, 0xc46003).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); + map(0xc46004, 0xc46005).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); + map(0xc46006, 0xc46007).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); + map(0xc46008, 0xc46009).w(FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); map(0xffc000, 0xffffff).ram(); // work ram } @@ -273,24 +273,24 @@ void segas1x_bootleg_state::passht4b_map(address_map &map) map(0x40a000, 0x40afff).ram().share("bg1_tileram"); map(0x410000, 0x410fff).ram().share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0xc41000, 0xc41001).r(this, FUNC(segas1x_bootleg_state::passht4b_service_r)); - map(0xc41002, 0xc41003).r(this, FUNC(segas1x_bootleg_state::passht4b_io1_r)); - map(0xc41004, 0xc41005).r(this, FUNC(segas1x_bootleg_state::passht4b_io2_r)); - map(0xc41006, 0xc41007).r(this, FUNC(segas1x_bootleg_state::passht4b_io3_r)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0xc41000, 0xc41001).r(FUNC(segas1x_bootleg_state::passht4b_service_r)); + map(0xc41002, 0xc41003).r(FUNC(segas1x_bootleg_state::passht4b_io1_r)); + map(0xc41004, 0xc41005).r(FUNC(segas1x_bootleg_state::passht4b_io2_r)); + map(0xc41006, 0xc41007).r(FUNC(segas1x_bootleg_state::passht4b_io3_r)); map(0xc42000, 0xc42001).portr("DSW2"); map(0xc42002, 0xc42003).portr("DSW1"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc43000, 0xc43001).portr("P1"); // test mode only map(0xc43002, 0xc43003).portr("P2"); map(0xc43004, 0xc43005).portr("P3"); map(0xc43006, 0xc43007).portr("P4"); - map(0xc4600a, 0xc4600b).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); /* coin counter doesn't work */ - map(0xc46000, 0xc46001).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); - map(0xc46002, 0xc46003).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); - map(0xc46004, 0xc46005).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); - map(0xc46006, 0xc46007).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); - map(0xc46008, 0xc46009).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); + map(0xc4600a, 0xc4600b).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); /* coin counter doesn't work */ + map(0xc46000, 0xc46001).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); + map(0xc46002, 0xc46003).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); + map(0xc46004, 0xc46005).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); + map(0xc46006, 0xc46007).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); + map(0xc46008, 0xc46009).w(FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); map(0xffc000, 0xffffff).ram(); // work ram } @@ -308,26 +308,26 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys16_tilebank_w) void segas1x_bootleg_state::wb3bbl_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x3f0000, 0x3fffff).w(this, FUNC(segas1x_bootleg_state::sys16_tilebank_w)); + map(0x3f0000, 0x3fffff).w(FUNC(segas1x_bootleg_state::sys16_tilebank_w)); map(0x400000, 0x407fff).ram(); // tilemap ram on the original, used as a buffer on the bootlegs map(0x409000, 0x409fff).ram().share("bg0_tileram"); map(0x40a000, 0x40afff).ram().share("bg1_tileram"); map(0x410000, 0x410fff).ram().share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc40001).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc40001).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc41002, 0xc41003).portr("P1"); map(0xc41004, 0xc41005).portr("P2"); map(0xc42000, 0xc42001).portr("DSW2"); map(0xc42002, 0xc42003).portr("DSW1"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc44000, 0xc44001).nopw(); - map(0xc46000, 0xc46001).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); - map(0xc46002, 0xc46003).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); - map(0xc46004, 0xc46005).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); - map(0xc46006, 0xc46007).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); - map(0xc46008, 0xc46009).w(this, FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); + map(0xc46000, 0xc46001).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)); + map(0xc46002, 0xc46003).w(FUNC(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)); + map(0xc46004, 0xc46005).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)); + map(0xc46006, 0xc46007).w(FUNC(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)); + map(0xc46008, 0xc46009).w(FUNC(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)); map(0xff0000, 0xffffff).ram(); // work ram } @@ -417,10 +417,10 @@ WRITE8_MEMBER(segas1x_bootleg_state::tturfbl_soundbank_w) void segas1x_bootleg_state::tturfbl_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0xbfff).r(this, FUNC(segas1x_bootleg_state::tturfbl_soundbank_r)); - map(0xe000, 0xe000).w(this, FUNC(segas1x_bootleg_state::tturfbl_soundbank_w)); + map(0x8000, 0xbfff).r(FUNC(segas1x_bootleg_state::tturfbl_soundbank_r)); + map(0xe000, 0xe000).w(FUNC(segas1x_bootleg_state::tturfbl_soundbank_w)); map(0xe800, 0xe800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xf000, 0xf000).w(this, FUNC(segas1x_bootleg_state::tturfbl_msm5205_data_w)); + map(0xf000, 0xf000).w(FUNC(segas1x_bootleg_state::tturfbl_msm5205_data_w)); map(0xf800, 0xffff).ram(); } @@ -440,9 +440,9 @@ void segas1x_bootleg_state::shinobi_datsu_sound_map(address_map &map) map(0x8000, 0xbfff).bankr("soundbank"); map(0xe000, 0xe001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xe400, 0xe401).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0xe800, 0xe800).r(this, FUNC(segas1x_bootleg_state::sound_command_irq_r)); + map(0xe800, 0xe800).r(FUNC(segas1x_bootleg_state::sound_command_irq_r)); map(0xec00, 0xec00).w(m_adpcm_select, FUNC(ls157_device::ba_w)); - map(0xf000, 0xf000).w(this, FUNC(segas1x_bootleg_state::soundbank_msm_w)); + map(0xf000, 0xf000).w(FUNC(segas1x_bootleg_state::soundbank_msm_w)); map(0xf800, 0xffff).ram(); } @@ -497,7 +497,7 @@ void segas1x_bootleg_state::sound_7759_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x40, 0x40).w(this, FUNC(segas1x_bootleg_state::upd7759_bank_w)); + map(0x40, 0x40).w(FUNC(segas1x_bootleg_state::upd7759_bank_w)); map(0x80, 0x80).w(m_upd7759, FUNC(upd7759_device::port_w)); map(0xc0, 0xc0).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -590,23 +590,23 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16bl_bgscrolly_w) void segas1x_bootleg_state::goldnaxeb1_map(address_map &map) { map(0x000000, 0x0bffff).rom(); - map(0x100000, 0x10ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x110000, 0x110fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x118000, 0x118001).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0x118008, 0x118009).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); // and tile bank - map(0x118010, 0x118011).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0x118018, 0x118019).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); - map(0x118020, 0x118021).w(this, FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); - map(0x118028, 0x118029).w(this, FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); - map(0x140000, 0x143fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x100000, 0x10ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x110000, 0x110fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x118000, 0x118001).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0x118008, 0x118009).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); // and tile bank + map(0x118010, 0x118011).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0x118018, 0x118019).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); + map(0x118020, 0x118021).w(FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); + map(0x118028, 0x118029).w(FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); + map(0x140000, 0x143fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); map(0x200000, 0x200fff).ram().share("sprites"); - map(0xc40000, 0xc40001).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0xc40000, 0xc40001).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0xc41002, 0xc41003).portr("P1"); map(0xc41006, 0xc41007).portr("P2"); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc42002, 0xc42003).portr("DSW1"); map(0xc42000, 0xc42001).portr("DSW2"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc43000, 0xc43001).nopw(); map(0xc43034, 0xc43035).nopw(); map(0xc80000, 0xc80001).nopw(); @@ -618,21 +618,21 @@ void segas1x_bootleg_state::bayrouteb1_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x500000, 0x503fff).ram(); // work ram map(0x600000, 0x600fff).ram().share("sprites"); - map(0x700000, 0x70ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x710000, 0x710fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x718000, 0x718001).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0x718008, 0x718009).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); // and tile bank - map(0x718010, 0x718011).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0x718018, 0x718019).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); - map(0x718020, 0x718021).w(this, FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); - map(0x718028, 0x718029).w(this, FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); - map(0x800000, 0x800fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0x901000, 0x901001).portr("SERVICE").w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x700000, 0x70ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x710000, 0x710fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x718000, 0x718001).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0x718008, 0x718009).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); // and tile bank + map(0x718010, 0x718011).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0x718018, 0x718019).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); + map(0x718020, 0x718021).w(FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); + map(0x718028, 0x718029).w(FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); + map(0x800000, 0x800fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x901000, 0x901001).portr("SERVICE").w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0x901002, 0x901003).portr("P1"); map(0x901006, 0x901007).portr("P2"); map(0x902000, 0x902001).portr("DSW2"); map(0x902002, 0x902003).portr("DSW1"); - map(0x902006, 0x902007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0x902006, 0x902007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); } void segas1x_bootleg_state::decrypted_opcodes_map(address_map &map) @@ -672,22 +672,22 @@ void segas1x_bootleg_state::bayrouteb2_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x500000, 0x503fff).ram(); // work ram map(0x600000, 0x600fff).ram().share("sprites"); - map(0x700000, 0x70ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x710000, 0x710fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x718000, 0x718001).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0x718008, 0x718009).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); // and tile bank - map(0x718010, 0x718011).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0x718018, 0x718019).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); - map(0x718020, 0x718021).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<0>)); - map(0x718022, 0x718023).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<1>)); - map(0x718024, 0x718025).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<2>)); - map(0x718026, 0x718027).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<3>)); - - map(0x800000, 0x800fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x700000, 0x70ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x710000, 0x710fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x718000, 0x718001).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0x718008, 0x718009).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); // and tile bank + map(0x718010, 0x718011).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0x718018, 0x718019).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); + map(0x718020, 0x718021).w(FUNC(segas1x_bootleg_state::datsu_page_w<0>)); + map(0x718022, 0x718023).w(FUNC(segas1x_bootleg_state::datsu_page_w<1>)); + map(0x718024, 0x718025).w(FUNC(segas1x_bootleg_state::datsu_page_w<2>)); + map(0x718026, 0x718027).w(FUNC(segas1x_bootleg_state::datsu_page_w<3>)); + + map(0x800000, 0x800fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); map(0x900000, 0x900001).portr("DSW1"); map(0x900002, 0x900003).portr("DSW2"); - map(0x900006, 0x900007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); - map(0x901000, 0x901001).portr("SERVICE").w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x900006, 0x900007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0x901000, 0x901001).portr("SERVICE").w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0x901002, 0x901003).portr("P1"); map(0x901006, 0x901007).portr("P2"); } @@ -695,27 +695,27 @@ void segas1x_bootleg_state::bayrouteb2_map(address_map &map) void segas1x_bootleg_state::dduxbl_map(address_map &map) { map(0x000000, 0x0bffff).rom(); - map(0x3f0000, 0x3fffff).w(this, FUNC(segas1x_bootleg_state::sys16_tilebank_w)); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x3f0000, 0x3fffff).w(FUNC(segas1x_bootleg_state::sys16_tilebank_w)); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc40001).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); - map(0xc40006, 0xc40007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc40001).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0xc40006, 0xc40007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc41002, 0xc41003).portr("P1"); map(0xc41004, 0xc41005).portr("P2"); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc42002, 0xc42003).portr("DSW1"); map(0xc42000, 0xc42001).portr("DSW2"); - map(0xC46000, 0xC46001).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0xC46008, 0xC46009).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); - map(0xC46010, 0xC46011).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0xC46018, 0xC46019).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); - map(0xC46020, 0xC46021).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<0>)); - map(0xC46022, 0xC46023).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<1>)); - map(0xC46024, 0xC46025).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<2>)); - map(0xC46026, 0xC46027).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<3>)); + map(0xC46000, 0xC46001).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0xC46008, 0xC46009).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); + map(0xC46010, 0xC46011).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0xC46018, 0xC46019).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); + map(0xC46020, 0xC46021).w(FUNC(segas1x_bootleg_state::datsu_page_w<0>)); + map(0xC46022, 0xC46023).w(FUNC(segas1x_bootleg_state::datsu_page_w<1>)); + map(0xC46024, 0xC46025).w(FUNC(segas1x_bootleg_state::datsu_page_w<2>)); + map(0xC46026, 0xC46027).w(FUNC(segas1x_bootleg_state::datsu_page_w<3>)); map(0xffc000, 0xffffff).ram(); // work ram } @@ -789,9 +789,9 @@ WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_bgpage_w) void segas1x_bootleg_state::goldnaxeb2_map(address_map &map) { map(0x000000, 0x0bffff).rom(); - map(0x100000, 0x10ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x110000, 0x110fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x140000, 0x143fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x100000, 0x10ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x110000, 0x110fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x140000, 0x143fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); map(0x200000, 0x200fff).ram().share("sprites"); map(0xc40000, 0xc40001).portr("DSW2").nopw(); map(0xc40002, 0xc40003).portr("DSW1"); @@ -799,15 +799,15 @@ void segas1x_bootleg_state::goldnaxeb2_map(address_map &map) map(0xc41002, 0xc41003).portr("P1"); map(0xc41004, 0xc41005).portr("P2"); map(0xc43000, 0xc43001).nopw(); - map(0xc44000, 0xc44001).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrolly_w)); - map(0xc44008, 0xc44009).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrollx_w)); // and tile bank - map(0xc44010, 0xc44011).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrolly_w)); - map(0xc44018, 0xc44019).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrollx_w)); - map(0xc44020, 0xc44027).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_bgpage_w)).share("gab2_bgpage"); - map(0xc44060, 0xc44067).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_fgpage_w)).share("gab2_fgpage"); + map(0xc44000, 0xc44001).w(FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrolly_w)); + map(0xc44008, 0xc44009).w(FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrollx_w)); // and tile bank + map(0xc44010, 0xc44011).w(FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrolly_w)); + map(0xc44018, 0xc44019).w(FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrollx_w)); + map(0xc44020, 0xc44027).w(FUNC(segas1x_bootleg_state::goldnaxeb2_bgpage_w)).share("gab2_bgpage"); + map(0xc44060, 0xc44067).w(FUNC(segas1x_bootleg_state::goldnaxeb2_fgpage_w)).share("gab2_fgpage"); map(0xc46000, 0xc46001).nopw(); map(0xc43034, 0xc43035).nopw(); - map(0xfe0006, 0xfe0007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xfe0006, 0xfe0007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xffc000, 0xffffff).ram(); // work ram } @@ -827,26 +827,26 @@ void segas1x_bootleg_state::eswatbl_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x3e2000, 0x3e2001).w(this, FUNC(segas1x_bootleg_state::eswat_tilebank0_w)); // external tile bank ( > 0x4000 tiles ) + map(0x3e2000, 0x3e2001).w(FUNC(segas1x_bootleg_state::eswat_tilebank0_w)); // external tile bank ( > 0x4000 tiles ) - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x418000, 0x418001).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0x418008, 0x418009).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); // and tile bank - map(0x418010, 0x418011).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0x418018, 0x418019).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); - map(0x418020, 0x418021).w(this, FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); - map(0x418028, 0x418029).w(this, FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x418000, 0x418001).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0x418008, 0x418009).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); // and tile bank + map(0x418010, 0x418011).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0x418018, 0x418019).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)); + map(0x418020, 0x418021).w(FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); + map(0x418028, 0x418029).w(FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc40001).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc40001).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0xc41002, 0xc41003).portr("P1"); map(0xc41006, 0xc41007).portr("P2"); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc42002, 0xc42003).portr("DSW1"); map(0xc42000, 0xc42001).portr("DSW2"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc80000, 0xc80001).nopw(); map(0xffc000, 0xffffff).ram(); // work ram } @@ -856,26 +856,26 @@ void segas1x_bootleg_state::eswatbl2_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x123420, 0x12343f).nopw(); // written on boot only map(0x200000, 0x200fff).ram().share("sprites"); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); map(0x440000, 0x4407ff).nopw(); // 0xffff, possibly old sprites ram location - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc40001).portr("DSW2").w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc40001).portr("DSW2").w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0xc40002, 0xc40003).portr("DSW1"); - map(0xc40006, 0xc40007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc40006, 0xc40007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc41002, 0xc41003).portr("P1"); map(0xc41004, 0xc41005).portr("P2"); map(0xc42000, 0xc42001).portr("DSW2"); // test mode still reads them from here map(0xc42002, 0xc42003).portr("DSW1"); // test mode still reads them from here map(0xc43034, 0xc43035).nopw(); - map(0xc44000, 0xc44001).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrolly_w)); - map(0xc44008, 0xc44009).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrollx_w)); // and tile bank - map(0xc44010, 0xc44011).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrolly_w)); - map(0xc44018, 0xc44019).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrollx_w)); - map(0xc44020, 0xc44027).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_bgpage_w)).share("gab2_bgpage"); + map(0xc44000, 0xc44001).w(FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrolly_w)); + map(0xc44008, 0xc44009).w(FUNC(segas1x_bootleg_state::goldnaxeb2_fgscrollx_w)); // and tile bank + map(0xc44010, 0xc44011).w(FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrolly_w)); + map(0xc44018, 0xc44019).w(FUNC(segas1x_bootleg_state::goldnaxeb2_bgscrollx_w)); + map(0xc44020, 0xc44027).w(FUNC(segas1x_bootleg_state::goldnaxeb2_bgpage_w)).share("gab2_bgpage"); map(0xc44028, 0xc44029).nopw(); - map(0xc44060, 0xc44067).w(this, FUNC(segas1x_bootleg_state::goldnaxeb2_fgpage_w)).share("gab2_fgpage"); + map(0xc44060, 0xc44067).w(FUNC(segas1x_bootleg_state::goldnaxeb2_fgpage_w)).share("gab2_fgpage"); map(0xc46000, 0xc46001).noprw(); map(0xffc000, 0xffffff).ram(); // work ram } @@ -885,25 +885,25 @@ void segas1x_bootleg_state::eswatbl2_map(address_map &map) void segas1x_bootleg_state::tetrisbl_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x418000, 0x418001).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0x418008, 0x418009).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); - map(0x418010, 0x418011).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0x418018, 0x418019).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); - map(0x418020, 0x418021).w(this, FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); - map(0x418028, 0x418029).w(this, FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); + map(0x418000, 0x418001).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0x418008, 0x418009).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); + map(0x418010, 0x418011).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0x418018, 0x418019).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); + map(0x418020, 0x418021).w(FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); + map(0x418028, 0x418029).w(FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0xc40000, 0xc40001).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0xc40000, 0xc40001).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc41002, 0xc41003).portr("P1"); map(0xc41006, 0xc41007).portr("P2"); map(0xc42000, 0xc42001).portr("DSW2"); map(0xc42002, 0xc42003).portr("DSW1"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc43034, 0xc43035).nopw(); map(0xc80000, 0xc80001).noprw(); map(0xffc000, 0xffffff).ram(); // work ram @@ -922,27 +922,27 @@ void segas1x_bootleg_state::beautyb_map(address_map &map) map(0x000000, 0x00ffff).rom().nopw(); map(0x010000, 0x03ffff).nopw(); - map(0x0280D6, 0x0280D7).r(this, FUNC(segas1x_bootleg_state::beautyb_unkx_r)); - map(0x0280D8, 0x0280D9).r(this, FUNC(segas1x_bootleg_state::beautyb_unkx_r)); + map(0x0280D6, 0x0280D7).r(FUNC(segas1x_bootleg_state::beautyb_unkx_r)); + map(0x0280D8, 0x0280D9).r(FUNC(segas1x_bootleg_state::beautyb_unkx_r)); - map(0x3f0000, 0x3fffff).w(this, FUNC(segas1x_bootleg_state::sys16_tilebank_w)); + map(0x3f0000, 0x3fffff).w(FUNC(segas1x_bootleg_state::sys16_tilebank_w)); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x413fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x413fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x418000, 0x418001).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0x418008, 0x418009).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); - map(0x418010, 0x418011).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0x418018, 0x418019).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); - map(0x418020, 0x418021).w(this, FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); - map(0x418028, 0x418029).w(this, FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); + map(0x418000, 0x418001).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0x418008, 0x418009).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); + map(0x418010, 0x418011).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0x418018, 0x418019).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); + map(0x418020, 0x418021).w(FUNC(segas1x_bootleg_state::s16bl_bgpage_w)); + map(0x418028, 0x418029).w(FUNC(segas1x_bootleg_state::s16bl_fgpage_w)); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc41002, 0xc41003).portr("P1"); map(0xc41004, 0xc41005).portr("P2"); - map(0xc42006, 0xc42007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc42006, 0xc42007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc40000, 0xc40001).nopw(); map(0xc80000, 0xc80001).noprw(); // vblank irq ack @@ -957,13 +957,13 @@ void segas1x_bootleg_state::tturfbl_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x200000, 0x203fff).ram(); // work ram map(0x300000, 0x300fff).ram().share("sprites"); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x500000, 0x500fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); - map(0x600000, 0x600001).w(this, FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x500000, 0x500fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x600000, 0x600001).w(FUNC(segas1x_bootleg_state::sys16_coinctrl_w)); map(0x600000, 0x600001).portr("DSW2"); map(0x600002, 0x600003).portr("DSW1"); - map(0x600006, 0x600007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0x600006, 0x600007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0x601000, 0x601001).portr("SERVICE"); map(0x601002, 0x601003).portr("P1"); map(0x601004, 0x601005).portr("P2"); @@ -971,14 +971,14 @@ void segas1x_bootleg_state::tturfbl_map(address_map &map) map(0x602002, 0x602003).portr("DSW1"); map(0xc44000, 0xc44001).nopw(); - map(0xC46000, 0xC46001).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); - map(0xC46008, 0xC46009).w(this, FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); - map(0xC46010, 0xC46011).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); - map(0xC46018, 0xC46019).w(this, FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); - map(0xC46020, 0xC46021).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<0>)); - map(0xc46022, 0xc46023).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<1>)); - map(0xC46024, 0xC46025).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<2>)); - map(0xC46026, 0xC46027).w(this, FUNC(segas1x_bootleg_state::datsu_page_w<3>)); + map(0xC46000, 0xC46001).w(FUNC(segas1x_bootleg_state::s16bl_fgscrolly_w)); + map(0xC46008, 0xC46009).w(FUNC(segas1x_bootleg_state::s16bl_fgscrollx_w)); + map(0xC46010, 0xC46011).w(FUNC(segas1x_bootleg_state::s16bl_bgscrolly_w)); + map(0xC46018, 0xC46019).w(FUNC(segas1x_bootleg_state::s16bl_bgscrollx_w)); + map(0xC46020, 0xC46021).w(FUNC(segas1x_bootleg_state::datsu_page_w<0>)); + map(0xc46022, 0xc46023).w(FUNC(segas1x_bootleg_state::datsu_page_w<1>)); + map(0xC46024, 0xC46025).w(FUNC(segas1x_bootleg_state::datsu_page_w<2>)); + map(0xC46026, 0xC46027).w(FUNC(segas1x_bootleg_state::datsu_page_w<3>)); } /***************************************************************************/ @@ -1011,7 +1011,7 @@ READ8_MEMBER(segas1x_bootleg_state::system18_bank_r) void segas1x_bootleg_state::sound_18_map(address_map &map) { map(0x0000, 0x9fff).rom(); - map(0xa000, 0xbfff).r(this, FUNC(segas1x_bootleg_state::system18_bank_r)); + map(0xa000, 0xbfff).r(FUNC(segas1x_bootleg_state::system18_bank_r)); /**** D/A register ****/ map(0xc000, 0xc008).w("5c68", FUNC(rf5c68_device::rf5c68_w)); map(0xd000, 0xdfff).rw("5c68", FUNC(rf5c68_device::rf5c68_mem_r), FUNC(rf5c68_device::rf5c68_mem_w)); @@ -1038,7 +1038,7 @@ void segas1x_bootleg_state::sound_18_io_map(address_map &map) map.global_mask(0xff); map(0x80, 0x83).rw("3438.0", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); map(0x90, 0x93).rw("3438.1", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); - map(0xa0, 0xa0).w(this, FUNC(segas1x_bootleg_state::sys18_soundbank_w)); + map(0xa0, 0xa0).w(FUNC(segas1x_bootleg_state::sys18_soundbank_w)); map(0xc0, 0xc0).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -1095,14 +1095,14 @@ void segas1x_bootleg_state::pcm_map(address_map &map) void segas1x_bootleg_state::shdancbl_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); map(0xc00000, 0xc0ffff).noprw(); map(0xc40000, 0xc40001).portr("COINAGE"); map(0xc40002, 0xc40003).portr("DSW1"); - map(0xc40006, 0xc40007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xc40006, 0xc40007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xc41000, 0xc41001).portr("SERVICE"); map(0xc41002, 0xc41003).portr("P1"); map(0xc41004, 0xc41005).portr("P2"); @@ -1116,20 +1116,20 @@ void segas1x_bootleg_state::shdancbl_map(address_map &map) void segas1x_bootleg_state::shdancbla_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); // moved from C4xxxx to E4xxxx map(0xe40000, 0xe40001).portr("COINAGE"); map(0xe40002, 0xe40003).portr("DSW1"); - map(0xe40006, 0xe40007).w(this, FUNC(segas1x_bootleg_state::sound_command_irq_w)); + map(0xe40006, 0xe40007).w(FUNC(segas1x_bootleg_state::sound_command_irq_w)); map(0xe41000, 0xe41001).portr("SERVICE"); map(0xe41002, 0xe41003).portr("P1"); map(0xe41004, 0xe41005).portr("P2"); -// map(0xff8038, 0xff8039).r(this, FUNC(segas1x_bootleg_state::shdancbla_ff8038_r)); +// map(0xff8038, 0xff8039).r(FUNC(segas1x_bootleg_state::shdancbla_ff8038_r)); map(0xffc000, 0xffffff).ram(); } /*************************************************************************** @@ -1218,13 +1218,13 @@ WRITE8_MEMBER(segas1x_bootleg_state::shdancbl_bankctrl_w) void segas1x_bootleg_state::shdancbl_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0xbfff).r(this, FUNC(segas1x_bootleg_state::shdancbl_soundbank_r)); + map(0x8000, 0xbfff).r(FUNC(segas1x_bootleg_state::shdancbl_soundbank_r)); map(0xc000, 0xc00f).nopw(); map(0xc400, 0xc400).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xc800, 0xc800).w(this, FUNC(segas1x_bootleg_state::shdancbl_msm5205_data_w)); + map(0xc800, 0xc800).w(FUNC(segas1x_bootleg_state::shdancbl_msm5205_data_w)); map(0xcc00, 0xcc03).rw("3438.0", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); map(0xd000, 0xd003).rw("3438.1", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); - map(0xd400, 0xd400).w(this, FUNC(segas1x_bootleg_state::shdancbl_bankctrl_w)); + map(0xd400, 0xd400).w(FUNC(segas1x_bootleg_state::shdancbl_bankctrl_w)); map(0xdf00, 0xdfff).noprw(); map(0xe000, 0xffff).ram(); } @@ -1241,7 +1241,7 @@ void segas1x_bootleg_state::shdancbl_sound_io_map(address_map &map) void segas1x_bootleg_state::shdancbla_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0xbfff).r(this, FUNC(segas1x_bootleg_state::shdancbl_soundbank_r)); + map(0x8000, 0xbfff).r(FUNC(segas1x_bootleg_state::shdancbl_soundbank_r)); map(0xc000, 0xc003).rw("3438.0", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); map(0xc000, 0xc000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); @@ -1265,10 +1265,10 @@ void segas1x_bootleg_state::shdancbla_sound_map(address_map &map) void segas1x_bootleg_state::mwalkbl_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); /* bootleg video regs */ /* map(0xc00000, 0xc00001).nop(); @@ -1290,8 +1290,8 @@ void segas1x_bootleg_state::mwalkbl_map(address_map &map) map(0xc41004, 0xc41005).portr("P2"); map(0xc41006, 0xc41007).portr("P3"); map(0xc41008, 0xc41009).nopr(); // figure this out, extra input for 3p? - map(0xc46600, 0xc46601).w(this, FUNC(segas1x_bootleg_state::sys18_refreshenable_w)); - map(0xc46800, 0xc46801).w(this, FUNC(segas1x_bootleg_state::sys18_tilebank_w)); + map(0xc46600, 0xc46601).w(FUNC(segas1x_bootleg_state::sys18_refreshenable_w)); + map(0xc46800, 0xc46801).w(FUNC(segas1x_bootleg_state::sys18_tilebank_w)); map(0xfe0020, 0xfe003f).nopw(); // config regs map(0xffc000, 0xffffff).ram(); @@ -1314,14 +1314,14 @@ WRITE8_MEMBER(segas1x_bootleg_state::sys18bl_okibank_w) // TODO: verify correctn void segas1x_bootleg_state::astormbl_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x10ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x110000, 0x110fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); - map(0x140000, 0x140fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); + map(0x100000, 0x10ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x110000, 0x110fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x140000, 0x140fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); map(0x200000, 0x200fff).ram().share("sprites"); map(0xa00000, 0xa00001).portr("COINAGE"); map(0xa00002, 0xa00003).portr("DSW1"); - map(0xa00006, 0xa00007).w(this, FUNC(segas1x_bootleg_state::sound_command_nmi_w)); - map(0xa0000e, 0xa0000f).w(this, FUNC(segas1x_bootleg_state::sys18_tilebank_w)); + map(0xa00006, 0xa00007).w(FUNC(segas1x_bootleg_state::sound_command_nmi_w)); + map(0xa0000e, 0xa0000f).w(FUNC(segas1x_bootleg_state::sys18_tilebank_w)); map(0xa01000, 0xa01001).portr("SERVICE"); map(0xa01002, 0xa01003).portr("P1"); map(0xa01004, 0xa01005).portr("P2"); @@ -1341,7 +1341,7 @@ void segas1x_bootleg_state::astormbl_map(address_map &map) map(0xc46400, 0xc464ff).noprw(); // scroll? map(0xc46500, 0xc465ff).noprw(); // scroll? - map(0xc46600, 0xc46601).w(this, FUNC(segas1x_bootleg_state::sys18_refreshenable_w)); + map(0xc46600, 0xc46601).w(FUNC(segas1x_bootleg_state::sys18_refreshenable_w)); map(0xfe0020, 0xfe003f).nopw(); map(0xffc000, 0xffffff).ram(); } @@ -1349,7 +1349,7 @@ void segas1x_bootleg_state::astormbl_map(address_map &map) void segas1x_bootleg_state::sys18bl_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x9000, 0x9000).w(this, FUNC(segas1x_bootleg_state::sys18bl_okibank_w)); + map(0x9000, 0x9000).w(FUNC(segas1x_bootleg_state::sys18bl_okibank_w)); map(0x9800, 0x9800).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x8000, 0x87ff).ram(); @@ -1383,11 +1383,11 @@ void segas1x_bootleg_state::ddcrewbl_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ok map(0x200000, 0x27ffff).rom(); // ok - map(0x400000, 0x40ffff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); - map(0x410000, 0x410fff).ram().w(this, FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); + map(0x400000, 0x40ffff).ram().w(FUNC(segas1x_bootleg_state::sys16_tileram_w)).share("tileram"); + map(0x410000, 0x410fff).ram().w(FUNC(segas1x_bootleg_state::sys16_textram_w)).share("textram"); map(0x440000, 0x440fff).ram().share("sprites"); // ok - map(0x840000, 0x840fff).ram().w(this, FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); // ok + map(0x840000, 0x840fff).ram().w(FUNC(segas1x_bootleg_state::paletteram_w)).share("paletteram"); // ok map(0xc00000, 0xc00001).nopw(); // vdp leftovers maybe? map(0xc00004, 0xc00005).nopw(); @@ -1402,9 +1402,9 @@ void segas1x_bootleg_state::ddcrewbl_map(address_map &map) map(0xc44001, 0xc44001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xc46600, 0xc46601).w(this, FUNC(segas1x_bootleg_state::sys18_refreshenable_w)); + map(0xc46600, 0xc46601).w(FUNC(segas1x_bootleg_state::sys18_refreshenable_w)); - map(0xc46038, 0xc4603f).w(this, FUNC(segas1x_bootleg_state::ddcrewbl_spritebank_w)); // ok + map(0xc46038, 0xc4603f).w(FUNC(segas1x_bootleg_state::ddcrewbl_spritebank_w)); // ok map(0xc46000, 0xc46001).nopw(); map(0xc46010, 0xc46011).nopw(); diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp index d1019a0bae8..93abcc2a935 100644 --- a/src/mame/drivers/tagteam.cpp +++ b/src/mame/drivers/tagteam.cpp @@ -50,15 +50,15 @@ WRITE8_MEMBER(tagteam_state::irq_clear_w) void tagteam_state::main_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x2000, 0x2000).portr("P2").w(this, FUNC(tagteam_state::flipscreen_w)); - map(0x2001, 0x2001).portr("P1").w(this, FUNC(tagteam_state::control_w)); + map(0x2000, 0x2000).portr("P2").w(FUNC(tagteam_state::flipscreen_w)); + map(0x2001, 0x2001).portr("P1").w(FUNC(tagteam_state::control_w)); map(0x2002, 0x2002).portr("DSW1").w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x2003, 0x2003).portr("DSW2").w(this, FUNC(tagteam_state::irq_clear_w)); - map(0x4000, 0x43ff).rw(this, FUNC(tagteam_state::mirrorvideoram_r), FUNC(tagteam_state::mirrorvideoram_w)); - map(0x4400, 0x47ff).rw(this, FUNC(tagteam_state::mirrorcolorram_r), FUNC(tagteam_state::mirrorcolorram_w)); + map(0x2003, 0x2003).portr("DSW2").w(FUNC(tagteam_state::irq_clear_w)); + map(0x4000, 0x43ff).rw(FUNC(tagteam_state::mirrorvideoram_r), FUNC(tagteam_state::mirrorvideoram_w)); + map(0x4400, 0x47ff).rw(FUNC(tagteam_state::mirrorcolorram_r), FUNC(tagteam_state::mirrorcolorram_w)); map(0x4800, 0x4fff).readonly(); - map(0x4800, 0x4bff).w(this, FUNC(tagteam_state::videoram_w)).share("videoram"); - map(0x4c00, 0x4fff).w(this, FUNC(tagteam_state::colorram_w)).share("colorram"); + map(0x4800, 0x4bff).w(FUNC(tagteam_state::videoram_w)).share("videoram"); + map(0x4c00, 0x4fff).w(FUNC(tagteam_state::colorram_w)).share("colorram"); map(0x8000, 0xffff).rom(); } @@ -73,8 +73,8 @@ void tagteam_state::sound_map(address_map &map) map(0x0000, 0x03ff).ram(); map(0x2000, 0x2001).w("ay1", FUNC(ay8910_device::data_address_w)); map(0x2002, 0x2003).w("ay2", FUNC(ay8910_device::data_address_w)); - map(0x2004, 0x2004).w("dac", FUNC(dac_byte_interface::write)); - map(0x2005, 0x2005).w(this, FUNC(tagteam_state::sound_nmi_mask_w)); + map(0x2004, 0x2004).w("dac", FUNC(dac_byte_interface::data_w)); + map(0x2005, 0x2005).w(FUNC(tagteam_state::sound_nmi_mask_w)); map(0x2007, 0x2007).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x4000, 0xffff).rom(); } diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp index 25b1c365249..bddc374f86a 100644 --- a/src/mame/drivers/tail2nos.cpp +++ b/src/mame/drivers/tail2nos.cpp @@ -40,19 +40,19 @@ void tail2nos_state::main_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x200000, 0x27ffff).rom().region("user1", 0); /* extra ROM */ map(0x2c0000, 0x2dffff).rom().region("user2", 0); - map(0x400000, 0x41ffff).ram().w(this, FUNC(tail2nos_state::tail2nos_zoomdata_w)).share("k051316"); + map(0x400000, 0x41ffff).ram().w(FUNC(tail2nos_state::tail2nos_zoomdata_w)).share("k051316"); map(0x500000, 0x500fff).rw(m_k051316, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); map(0x510000, 0x51001f).w(m_k051316, FUNC(k051316_device::ctrl_w)).umask16(0x00ff); map(0xff8000, 0xffbfff).ram(); /* work RAM */ map(0xffc000, 0xffc2ff).ram().share("spriteram"); map(0xffc300, 0xffcfff).ram(); - map(0xffd000, 0xffdfff).ram().w(this, FUNC(tail2nos_state::tail2nos_txvideoram_w)).share("txvideoram"); + map(0xffd000, 0xffdfff).ram().w(FUNC(tail2nos_state::tail2nos_txvideoram_w)).share("txvideoram"); map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("IN0"); - map(0xfff001, 0xfff001).w(this, FUNC(tail2nos_state::tail2nos_gfxbank_w)); + map(0xfff001, 0xfff001).w(FUNC(tail2nos_state::tail2nos_gfxbank_w)); map(0xfff002, 0xfff003).portr("IN1"); map(0xfff004, 0xfff005).portr("DSW"); - map(0xfff009, 0xfff009).r(this, FUNC(tail2nos_state::sound_semaphore_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff009, 0xfff009).r(FUNC(tail2nos_state::sound_semaphore_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0xfff020, 0xfff023).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff); map(0xfff030, 0xfff033).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); } diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index d5e3725470b..26e283ed70d 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -129,7 +129,7 @@ void taito_state::taito_map(address_map &map) map(0x283f, 0x283f).mirror(0x0080).portr("X7"); map(0x4000, 0x407f).ram(); map(0x4080, 0x408f).ram().share("ram"); - map(0x4090, 0x409f).rw(this, FUNC(taito_state::io_r), FUNC(taito_state::io_w)); + map(0x4090, 0x409f).rw(FUNC(taito_state::io_r), FUNC(taito_state::io_w)); map(0x40a0, 0x40ff).ram(); map(0x4800, 0x48ff).rom().region("roms", 0x2000); } @@ -171,7 +171,7 @@ void taito_state::shock_map(address_map &map) map.global_mask(0x1fff); map(0x0000, 0x0fff).rom().region("roms", 0); map(0x1000, 0x100f).ram().share("ram"); - map(0x1010, 0x101f).rw(this, FUNC(taito_state::io_r), FUNC(taito_state::io_w)); + map(0x1010, 0x101f).rw(FUNC(taito_state::io_r), FUNC(taito_state::io_w)); map(0x1020, 0x10ff).ram(); map(0x1400, 0x1400).portr("X0"); map(0x1401, 0x1401).portr("X1"); @@ -368,7 +368,7 @@ MACHINE_CONFIG_START(taito_state::taito) MCFG_DEVICE_ADD("pia", PIA6821, 0) //MCFG_PIA_READPA_HANDLER(READ8(*this, taito_state, pia_pa_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_READPB_HANDLER(READ8(*this, taito_state, pia_pb_r)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, taito_state, pia_pb_w)) //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, taito_state, pia_ca2_w)) diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 11aef15a155..e86abc31fc1 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -355,7 +355,7 @@ void taitob_state::tc0180vcu_memrw(address_map &map, u32 addr) map(addr+0x11980, addr+0x137ff).ram(); map(addr+0x13800, addr+0x13fff).rw(m_tc0180vcu, FUNC(tc0180vcu_device::scroll_r), FUNC(tc0180vcu_device::scroll_w)); map(addr+0x18000, addr+0x1801f).rw(m_tc0180vcu, FUNC(tc0180vcu_device::ctrl_r), FUNC(tc0180vcu_device::ctrl_w)); - map(addr+0x40000, addr+0x7ffff).rw(this, FUNC(taitob_state::tc0180vcu_framebuffer_word_r), FUNC(taitob_state::tc0180vcu_framebuffer_word_w)); + map(addr+0x40000, addr+0x7ffff).rw(FUNC(taitob_state::tc0180vcu_framebuffer_word_r), FUNC(taitob_state::tc0180vcu_framebuffer_word_w)); } void taitob_state::rastsag2_map(address_map &map) @@ -420,8 +420,8 @@ void taitob_state::hitice_map(address_map &map) map(0x700002, 0x700002).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); map(0x800000, 0x803fff).ram(); /* Main RAM */ map(0xa00000, 0xa01fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xb00000, 0xb7ffff).ram().w(this, FUNC(taitob_state::hitice_pixelram_w)).share("pixelram"); - map(0xbffff0, 0xbffff5).w(this, FUNC(taitob_state::hitice_pixel_scroll_w)); + map(0xb00000, 0xb7ffff).ram().w(FUNC(taitob_state::hitice_pixelram_w)).share("pixelram"); + map(0xbffff0, 0xbffff5).w(FUNC(taitob_state::hitice_pixel_scroll_w)); // { 0xbffffa, 0xbffffb, ??? } @@ -434,14 +434,14 @@ void taitob_state::rambo3_map(address_map &map) map(0x200002, 0x200002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); tc0180vcu_memrw(map, 0x400000); map(0x600000, 0x60000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0xff00); - map(0x600010, 0x600011).r(this, FUNC(taitob_state::tracky1_lo_r)); /*player 1*/ - map(0x600012, 0x600013).r(this, FUNC(taitob_state::tracky1_hi_r)); - map(0x600014, 0x600015).r(this, FUNC(taitob_state::trackx1_lo_r)); - map(0x600016, 0x600017).r(this, FUNC(taitob_state::trackx1_hi_r)); - map(0x600018, 0x600019).r(this, FUNC(taitob_state::tracky2_lo_r)); /*player 2*/ - map(0x60001a, 0x60001b).r(this, FUNC(taitob_state::tracky2_hi_r)); - map(0x60001c, 0x60001d).r(this, FUNC(taitob_state::trackx2_lo_r)); - map(0x60001e, 0x60001f).r(this, FUNC(taitob_state::trackx2_hi_r)); + map(0x600010, 0x600011).r(FUNC(taitob_state::tracky1_lo_r)); /*player 1*/ + map(0x600012, 0x600013).r(FUNC(taitob_state::tracky1_hi_r)); + map(0x600014, 0x600015).r(FUNC(taitob_state::trackx1_lo_r)); + map(0x600016, 0x600017).r(FUNC(taitob_state::trackx1_hi_r)); + map(0x600018, 0x600019).r(FUNC(taitob_state::tracky2_lo_r)); /*player 2*/ + map(0x60001a, 0x60001b).r(FUNC(taitob_state::tracky2_hi_r)); + map(0x60001c, 0x60001d).r(FUNC(taitob_state::trackx2_lo_r)); + map(0x60001e, 0x60001f).r(FUNC(taitob_state::trackx2_hi_r)); map(0x800000, 0x803fff).ram(); /* Main RAM */ map(0xa00000, 0xa01fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); } @@ -453,10 +453,10 @@ void taitob_state::pbobble_map(address_map &map) tc0180vcu_memrw(map, 0x400000); map(0x500000, 0x50000f).rw(m_tc0640fio, FUNC(tc0640fio_device::halfword_byteswap_r), FUNC(tc0640fio_device::halfword_byteswap_w)); map(0x500024, 0x500025).portr("P3_P4_A"); /* shown in service mode, game omits to read it */ - map(0x500026, 0x500027).rw(this, FUNC(taitob_state::eep_latch_r), FUNC(taitob_state::eeprom_w)); - map(0x500028, 0x500029).w(this, FUNC(taitob_state::player_34_coin_ctrl_w)); /* simply locks coins 3&4 out */ + map(0x500026, 0x500027).rw(FUNC(taitob_state::eep_latch_r), FUNC(taitob_state::eeprom_w)); + map(0x500028, 0x500029).w(FUNC(taitob_state::player_34_coin_ctrl_w)); /* simply locks coins 3&4 out */ map(0x50002e, 0x50002f).portr("P3_P4_B"); /* shown in service mode, game omits to read it */ - map(0x600000, 0x600003).w(this, FUNC(taitob_state::gain_control_w)); + map(0x600000, 0x600003).w(FUNC(taitob_state::gain_control_w)); map(0x700000, 0x700001).nopr(); map(0x700000, 0x700000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x700002, 0x700002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); @@ -471,10 +471,10 @@ void taitob_state::spacedx_map(address_map &map) tc0180vcu_memrw(map, 0x400000); map(0x500000, 0x50000f).rw(m_tc0640fio, FUNC(tc0640fio_device::halfword_byteswap_r), FUNC(tc0640fio_device::halfword_byteswap_w)); map(0x500024, 0x500025).portr("P3_P4_A"); - map(0x500026, 0x500027).rw(this, FUNC(taitob_state::eep_latch_r), FUNC(taitob_state::eeprom_w)); - map(0x500028, 0x500029).w(this, FUNC(taitob_state::player_34_coin_ctrl_w)); /* simply locks coins 3&4 out */ + map(0x500026, 0x500027).rw(FUNC(taitob_state::eep_latch_r), FUNC(taitob_state::eeprom_w)); + map(0x500028, 0x500029).w(FUNC(taitob_state::player_34_coin_ctrl_w)); /* simply locks coins 3&4 out */ map(0x50002e, 0x50002f).portr("P3_P4_B"); - map(0x600000, 0x600003).w(this, FUNC(taitob_state::gain_control_w)); + map(0x600000, 0x600003).w(FUNC(taitob_state::gain_control_w)); map(0x700000, 0x700001).nopr(); map(0x700000, 0x700000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x700002, 0x700002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); @@ -489,7 +489,7 @@ void taitob_state::spacedxo_map(address_map &map) map(0x100000, 0x100000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x100002, 0x100002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); map(0x200000, 0x20000f).r(m_tc0220ioc, FUNC(tc0220ioc_device::read)).umask16(0x00ff); - map(0x200000, 0x20000f).w(this, FUNC(taitob_state::spacedxo_tc0220ioc_w)); + map(0x200000, 0x20000f).w(FUNC(taitob_state::spacedxo_tc0220ioc_w)); map(0x210000, 0x210001).portr("IN3"); map(0x220000, 0x220001).portr("IN4"); map(0x230000, 0x230001).portr("IN5"); @@ -505,14 +505,14 @@ void taitob_state::qzshowby_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x20000f).rw(m_tc0640fio, FUNC(tc0640fio_device::halfword_byteswap_r), FUNC(tc0640fio_device::halfword_byteswap_w)); map(0x200024, 0x200025).portr("P3_P4_A"); /* player 3,4 start */ - map(0x200026, 0x200027).w(this, FUNC(taitob_state::eeprom_w)); - map(0x200028, 0x200029).rw(this, FUNC(taitob_state::player_34_coin_ctrl_r), FUNC(taitob_state::player_34_coin_ctrl_w)); + map(0x200026, 0x200027).w(FUNC(taitob_state::eeprom_w)); + map(0x200028, 0x200029).rw(FUNC(taitob_state::player_34_coin_ctrl_r), FUNC(taitob_state::player_34_coin_ctrl_w)); map(0x20002e, 0x20002f).portr("P3_P4_B"); /* player 3,4 buttons */ tc0180vcu_memrw(map, 0x400000); map(0x600000, 0x600001).nopr(); map(0x600000, 0x600000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x600002, 0x600002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0x700000, 0x700003).w(this, FUNC(taitob_state::gain_control_w)); + map(0x700000, 0x700003).w(FUNC(taitob_state::gain_control_w)); map(0x800000, 0x801fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x900000, 0x90ffff).ram(); /* Main RAM */ } @@ -597,12 +597,12 @@ void taitob_state::realpunc_map(address_map &map) map(0x110000, 0x12ffff).ram(); map(0x130000, 0x13ffff).ram(); // Check me map(0x180000, 0x18000f).rw(m_tc0510nio, FUNC(tc0510nio_device::halfword_wordswap_r), FUNC(tc0510nio_device::halfword_wordswap_w)); - map(0x184000, 0x184001).w(this, FUNC(taitob_state::realpunc_video_ctrl_w)); + map(0x184000, 0x184001).w(FUNC(taitob_state::realpunc_video_ctrl_w)); map(0x188000, 0x188001).nopr(); map(0x188000, 0x188000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x188002, 0x188003).nopr(); map(0x188002, 0x188002).w("tc0140syt", FUNC(tc0140syt_device::master_comm_w)); - map(0x18c000, 0x18c001).w(this, FUNC(taitob_state::realpunc_output_w)); + map(0x18c000, 0x18c001).w(FUNC(taitob_state::realpunc_output_w)); tc0180vcu_memrw(map, 0x200000); map(0x280000, 0x281fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300000, 0x300001).rw("hd63484", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w)); @@ -640,7 +640,7 @@ void taitob_state::sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(taitob_state::bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(taitob_state::bankswitch_w)); } void taitob_state::viofight_sound_map(address_map &map) diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index dff43c12cfd..b6a4ad4b39f 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -701,7 +701,7 @@ void taitof2_state::cameltry_map(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x200000, 0x201fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300000, 0x30000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); - map(0x300018, 0x30001f).r(this, FUNC(taitof2_state::cameltry_paddle_r)); + map(0x300018, 0x30001f).r(FUNC(taitof2_state::cameltry_paddle_r)); map(0x320000, 0x320000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x320002, 0x320002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); map(0x800000, 0x813fff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ @@ -718,7 +718,7 @@ void taitof2_state::cameltrya_map(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x200000, 0x201fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300000, 0x30000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); - map(0x300018, 0x30001f).r(this, FUNC(taitof2_state::cameltry_paddle_r)); + map(0x300018, 0x30001f).r(FUNC(taitof2_state::cameltry_paddle_r)); map(0x320000, 0x320000).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0x320002, 0x320002).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); map(0x800000, 0x813fff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ @@ -762,7 +762,7 @@ void taitof2_state::quizhq_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x100000, 0x10ffff).ram(); map(0x200000, 0x200007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::word_w)); /* palette */ - map(0x500004, 0x500005).w(this, FUNC(taitof2_state::growl_coin_word_w)); + map(0x500004, 0x500005).w(FUNC(taitof2_state::growl_coin_word_w)); map(0x500000, 0x500001).portr("DSWB"); map(0x500002, 0x500003).portr("IN0"); map(0x580000, 0x580001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* ??? */ @@ -813,7 +813,7 @@ void taitof2_state::growl_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x100000, 0x10ffff).ram(); map(0x200000, 0x201fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x300004, 0x300005).w(this, FUNC(taitof2_state::growl_coin_word_w)); + map(0x300004, 0x300005).w(FUNC(taitof2_state::growl_coin_word_w)); map(0x300000, 0x300001).portr("DSWA"); map(0x300002, 0x300003).portr("DSWB"); map(0x320000, 0x320001).portr("IN0"); @@ -822,7 +822,7 @@ void taitof2_state::growl_map(address_map &map) map(0x340000, 0x340001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x400000, 0x400000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x400002, 0x400002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0x500000, 0x50000f).w(this, FUNC(taitof2_state::taitof2_spritebank_w)); + map(0x500000, 0x50000f).w(FUNC(taitof2_state::taitof2_spritebank_w)); map(0x504000, 0x504001).nopw(); /* unknown... various values */ map(0x508000, 0x50800f).portr("IN3"); map(0x50c000, 0x50c00f).portr("IN4"); @@ -838,9 +838,9 @@ void taitof2_state::mjnquest_map(address_map &map) map(0x110000, 0x11ffff).ram(); /* "sram" */ map(0x120000, 0x12ffff).ram(); map(0x200000, 0x200007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::word_w)); /* palette */ - map(0x300000, 0x30000f).r(this, FUNC(taitof2_state::mjnquest_dsw_r)); - map(0x310000, 0x310001).r(this, FUNC(taitof2_state::mjnquest_input_r)); - map(0x320000, 0x320001).w(this, FUNC(taitof2_state::mjnquest_inputselect_w)); + map(0x300000, 0x30000f).r(FUNC(taitof2_state::mjnquest_dsw_r)); + map(0x310000, 0x310001).r(FUNC(taitof2_state::mjnquest_input_r)); + map(0x320000, 0x320001).w(FUNC(taitof2_state::mjnquest_inputselect_w)); map(0x330000, 0x330001).nopw(); /* watchdog ? */ map(0x350000, 0x350001).nopw(); /* watchdog ? */ map(0x360000, 0x360000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); @@ -856,7 +856,7 @@ void taitof2_state::footchmp_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x10ffff).ram(); map(0x200000, 0x20ffff).ram().share("spriteram"); - map(0x300000, 0x30000f).w(this, FUNC(taitof2_state::taitof2_spritebank_w)); /* updated at $a6e, off irq5 */ + map(0x300000, 0x30000f).w(FUNC(taitof2_state::taitof2_spritebank_w)); /* updated at $a6e, off irq5 */ map(0x400000, 0x40ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::word_r), FUNC(tc0480scp_device::word_w)); /* tilemaps */ map(0x430000, 0x43002f).rw(m_tc0480scp, FUNC(tc0480scp_device::ctrl_word_r), FUNC(tc0480scp_device::ctrl_word_w)); map(0x500000, 0x50001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0x00ff); /* 500002 written like a watchdog?! */ @@ -878,7 +878,7 @@ void taitof2_state::koshien_map(address_map &map) map(0x800000, 0x80ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x820000, 0x82000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x900000, 0x90ffff).ram().share("spriteram"); - map(0xa20000, 0xa20001).w(this, FUNC(taitof2_state::koshien_spritebank_w)); + map(0xa20000, 0xa20001).w(FUNC(taitof2_state::koshien_spritebank_w)); map(0xb00000, 0xb0001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0xff00); } @@ -893,7 +893,7 @@ void taitof2_state::yuyugogo_map(address_map &map) map(0x900000, 0x90ffff).ram().share("spriteram"); map(0xa00000, 0xa01fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xb00000, 0xb10fff).ram(); /* deliberate writes to $b10xxx, I think */ - map(0xc00000, 0xc01fff).w(this, FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); + map(0xc00000, 0xc01fff).w(FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); map(0xd00000, 0xdfffff).rom().region("extra", 0); } @@ -906,7 +906,7 @@ void taitof2_state::ninjak_map(address_map &map) map(0x380000, 0x380001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* ??? */ map(0x400000, 0x400000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x400002, 0x400002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0x600000, 0x60000f).w(this, FUNC(taitof2_state::taitof2_spritebank_w)); + map(0x600000, 0x60000f).w(FUNC(taitof2_state::taitof2_spritebank_w)); map(0x800000, 0x80ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x820000, 0x82000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x900000, 0x90ffff).ram().share("spriteram"); @@ -918,7 +918,7 @@ void taitof2_state::solfigtr_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x10ffff).ram(); map(0x200000, 0x201fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x300004, 0x300005).w(this, FUNC(taitof2_state::growl_coin_word_w)); /* NOT VERIFIED */ + map(0x300004, 0x300005).w(FUNC(taitof2_state::growl_coin_word_w)); /* NOT VERIFIED */ map(0x300000, 0x300001).portr("DSWA"); map(0x300002, 0x300003).portr("DSWB"); map(0x320000, 0x320001).portr("IN0"); @@ -927,7 +927,7 @@ void taitof2_state::solfigtr_map(address_map &map) map(0x340000, 0x340001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* NOT VERIFIED */ map(0x400000, 0x400000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x400002, 0x400002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0x500000, 0x50000f).w(this, FUNC(taitof2_state::taitof2_spritebank_w)); + map(0x500000, 0x50000f).w(FUNC(taitof2_state::taitof2_spritebank_w)); map(0x504000, 0x504001).nopw(); /* unknown... various values */ map(0x800000, 0x80ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x820000, 0x82000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -957,7 +957,7 @@ void taitof2_state::pulirula_map(address_map &map) map(0x400000, 0x401fff).rw(m_tc0430grw, FUNC(tc0280grd_device::tc0430grw_word_r), FUNC(tc0280grd_device::tc0430grw_word_w)); /* ROZ tilemap */ map(0x402000, 0x40200f).w(m_tc0430grw, FUNC(tc0280grd_device::tc0430grw_ctrl_word_w)); // AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* ??? */ - map(0x600000, 0x603fff).w(this, FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); + map(0x600000, 0x603fff).w(FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); map(0x700000, 0x701fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x800000, 0x80ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x820000, 0x82000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -1020,7 +1020,7 @@ void taitof2_state::deadconx_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x100000, 0x10ffff).ram(); map(0x200000, 0x20ffff).ram().share("spriteram"); - map(0x300000, 0x30000f).w(this, FUNC(taitof2_state::taitof2_spritebank_w)); + map(0x300000, 0x30000f).w(FUNC(taitof2_state::taitof2_spritebank_w)); map(0x400000, 0x40ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::word_r), FUNC(tc0480scp_device::word_w)); /* tilemaps */ // AM_RANGE(0x42000c, 0x42000f) AM_WRITENOP /* zeroed */ map(0x430000, 0x43002f).rw(m_tc0480scp, FUNC(tc0480scp_device::ctrl_word_r), FUNC(tc0480scp_device::ctrl_word_w)); @@ -1036,7 +1036,7 @@ void taitof2_state::dinorex_map(address_map &map) { map(0x000000, 0x2fffff).rom(); map(0x300000, 0x30000f).rw(m_tc0510nio, FUNC(tc0510nio_device::halfword_r), FUNC(tc0510nio_device::halfword_w)); - map(0x400000, 0x400fff).w(this, FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); + map(0x400000, 0x400fff).w(FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); map(0x500000, 0x501fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x600000, 0x60ffff).ram(); map(0x700000, 0x70001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0x00ff); /* ?? */ @@ -1055,7 +1055,7 @@ void taitof2_state::qjinsei_map(address_map &map) map(0x200002, 0x200002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); map(0x300000, 0x30ffff).ram(); map(0x500000, 0x500001).nopw(); /* watchdog ? */ - map(0x600000, 0x603fff).w(this, FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); + map(0x600000, 0x603fff).w(FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); map(0x700000, 0x701fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x800000, 0x80ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x820000, 0x82000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -1072,7 +1072,7 @@ void taitof2_state::qcrayon_map(address_map &map) map(0x300000, 0x3fffff).rom().region("extra", 0); /* extra data rom */ map(0x500000, 0x500000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x500002, 0x500002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0x600000, 0x603fff).w(this, FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); + map(0x600000, 0x603fff).w(FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); map(0x700000, 0x701fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x800000, 0x80ffff).ram().share("spriteram"); map(0x900000, 0x90ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ @@ -1094,7 +1094,7 @@ void taitof2_state::qcrayon2_map(address_map &map) map(0x900000, 0x90001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0x00ff); /* ?? */ map(0xa00000, 0xa00000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0xa00002, 0xa00002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0xb00000, 0xb017ff).w(this, FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); + map(0xb00000, 0xb017ff).w(FUNC(taitof2_state::taitof2_sprite_extension_w)).share("sprite_ext"); } void taitof2_state::driftout_map(address_map &map) @@ -1119,7 +1119,7 @@ void taitof2_state::driftout_map(address_map &map) void taitof2_state::driveout_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x200000, 0x200003).nopr().w(this, FUNC(taitof2_state::driveout_sound_command_w)); + map(0x200000, 0x200003).nopr().w(FUNC(taitof2_state::driveout_sound_command_w)); map(0x300000, 0x30ffff).ram(); map(0x400000, 0x401fff).rw(m_tc0430grw, FUNC(tc0280grd_device::tc0430grw_word_r), FUNC(tc0280grd_device::tc0430grw_word_w)); /* ROZ tilemap */ map(0x402000, 0x40200f).w(m_tc0430grw, FUNC(tc0280grd_device::tc0430grw_ctrl_word_w)); @@ -1148,7 +1148,7 @@ void taitof2_state::sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(taitof2_state::sound_bankswitch_w)); /* ?? */ + map(0xf200, 0xf200).w(FUNC(taitof2_state::sound_bankswitch_w)); /* ?? */ } @@ -1170,9 +1170,9 @@ void taitof2_state::driveout_sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(taitof2_state::oki_bank_w)); + map(0x9000, 0x9000).w(FUNC(taitof2_state::oki_bank_w)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xa000, 0xa000).r(this, FUNC(taitof2_state::driveout_sound_command_r)); + map(0xa000, 0xa000).r(FUNC(taitof2_state::driveout_sound_command_r)); } /*********************************************************** diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index 8b71cfa2cd0..29d369e053b 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -187,41 +187,41 @@ WRITE16_MEMBER(taito_f3_state::f3_unk_w) void taito_f3_state::f3_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0x300000, 0x30007f).w(this, FUNC(taito_f3_state::f3_sound_bankswitch_w)); + map(0x300000, 0x30007f).w(FUNC(taito_f3_state::f3_sound_bankswitch_w)); map(0x400000, 0x41ffff).mirror(0x20000).ram().share("f3_ram"); - map(0x440000, 0x447fff).ram().w(this, FUNC(taito_f3_state::f3_palette_24bit_w)).share("paletteram"); - map(0x4a0000, 0x4a001f).rw(this, FUNC(taito_f3_state::f3_control_r), FUNC(taito_f3_state::f3_control_w)); - map(0x4c0000, 0x4c0003).w(this, FUNC(taito_f3_state::f3_unk_w)); - map(0x600000, 0x60ffff).rw(this, FUNC(taito_f3_state::f3_spriteram_r), FUNC(taito_f3_state::f3_spriteram_w)); //AM_SHARE("spriteram") - map(0x610000, 0x61bfff).rw(this, FUNC(taito_f3_state::f3_pf_data_r), FUNC(taito_f3_state::f3_pf_data_w)); //AM_SHARE("f3_pf_data") - map(0x61c000, 0x61dfff).rw(this, FUNC(taito_f3_state::f3_videoram_r), FUNC(taito_f3_state::f3_videoram_w)); //AM_SHARE("videoram") - map(0x61e000, 0x61ffff).rw(this, FUNC(taito_f3_state::f3_vram_r), FUNC(taito_f3_state::f3_vram_w)); //AM_SHARE("f3_vram") - map(0x620000, 0x62ffff).rw(this, FUNC(taito_f3_state::f3_lineram_r), FUNC(taito_f3_state::f3_lineram_w)); //AM_SHARE("f3_line_ram") - map(0x630000, 0x63ffff).rw(this, FUNC(taito_f3_state::f3_pivot_r), FUNC(taito_f3_state::f3_pivot_w)); //AM_SHARE("f3_pivot_ram") - map(0x660000, 0x66000f).w(this, FUNC(taito_f3_state::f3_control_0_w)); - map(0x660010, 0x66001f).w(this, FUNC(taito_f3_state::f3_control_1_w)); + map(0x440000, 0x447fff).ram().w(FUNC(taito_f3_state::f3_palette_24bit_w)).share("paletteram"); + map(0x4a0000, 0x4a001f).rw(FUNC(taito_f3_state::f3_control_r), FUNC(taito_f3_state::f3_control_w)); + map(0x4c0000, 0x4c0003).w(FUNC(taito_f3_state::f3_unk_w)); + map(0x600000, 0x60ffff).rw(FUNC(taito_f3_state::f3_spriteram_r), FUNC(taito_f3_state::f3_spriteram_w)); //AM_SHARE("spriteram") + map(0x610000, 0x61bfff).rw(FUNC(taito_f3_state::f3_pf_data_r), FUNC(taito_f3_state::f3_pf_data_w)); //AM_SHARE("f3_pf_data") + map(0x61c000, 0x61dfff).rw(FUNC(taito_f3_state::f3_videoram_r), FUNC(taito_f3_state::f3_videoram_w)); //AM_SHARE("videoram") + map(0x61e000, 0x61ffff).rw(FUNC(taito_f3_state::f3_vram_r), FUNC(taito_f3_state::f3_vram_w)); //AM_SHARE("f3_vram") + map(0x620000, 0x62ffff).rw(FUNC(taito_f3_state::f3_lineram_r), FUNC(taito_f3_state::f3_lineram_w)); //AM_SHARE("f3_line_ram") + map(0x630000, 0x63ffff).rw(FUNC(taito_f3_state::f3_pivot_r), FUNC(taito_f3_state::f3_pivot_w)); //AM_SHARE("f3_pivot_ram") + map(0x660000, 0x66000f).w(FUNC(taito_f3_state::f3_control_0_w)); + map(0x660010, 0x66001f).w(FUNC(taito_f3_state::f3_control_1_w)); map(0xc00000, 0xc007ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); - map(0xc80000, 0xc80003).w(this, FUNC(taito_f3_state::f3_sound_reset_0_w)); - map(0xc80100, 0xc80103).w(this, FUNC(taito_f3_state::f3_sound_reset_1_w)); + map(0xc80000, 0xc80003).w(FUNC(taito_f3_state::f3_sound_reset_0_w)); + map(0xc80100, 0xc80103).w(FUNC(taito_f3_state::f3_sound_reset_1_w)); } void taito_f3_state::bubsympb_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0x300000, 0x30007f).w(this, FUNC(taito_f3_state::f3_sound_bankswitch_w)); + map(0x300000, 0x30007f).w(FUNC(taito_f3_state::f3_sound_bankswitch_w)); map(0x400000, 0x41ffff).mirror(0x20000).ram().share("f3_ram"); - map(0x440000, 0x447fff).ram().w(this, FUNC(taito_f3_state::f3_palette_24bit_w)).share("paletteram"); - map(0x4a0000, 0x4a001b).rw(this, FUNC(taito_f3_state::f3_control_r), FUNC(taito_f3_state::f3_control_w)); - map(0x4a001c, 0x4a001f).rw(this, FUNC(taito_f3_state::bubsympb_oki_r), FUNC(taito_f3_state::bubsympb_oki_w)); - map(0x4c0000, 0x4c0003).w(this, FUNC(taito_f3_state::f3_unk_w)); - map(0x600000, 0x60ffff).rw(this, FUNC(taito_f3_state::f3_spriteram_r), FUNC(taito_f3_state::f3_spriteram_w)); //AM_SHARE("spriteram") - map(0x610000, 0x61bfff).rw(this, FUNC(taito_f3_state::f3_pf_data_r), FUNC(taito_f3_state::f3_pf_data_w)); //AM_SHARE("f3_pf_data") - map(0x61c000, 0x61dfff).rw(this, FUNC(taito_f3_state::f3_videoram_r), FUNC(taito_f3_state::f3_videoram_w)); //AM_SHARE("videoram") - map(0x61e000, 0x61ffff).rw(this, FUNC(taito_f3_state::f3_vram_r), FUNC(taito_f3_state::f3_vram_w)); //AM_SHARE("f3_vram") - map(0x620000, 0x62ffff).rw(this, FUNC(taito_f3_state::f3_lineram_r), FUNC(taito_f3_state::f3_lineram_w)); //AM_SHARE("f3_line_ram") - map(0x630000, 0x63ffff).rw(this, FUNC(taito_f3_state::f3_pivot_r), FUNC(taito_f3_state::f3_pivot_w)); //AM_SHARE("f3_pivot_ram") - map(0x660000, 0x66000f).w(this, FUNC(taito_f3_state::f3_control_0_w)); - map(0x660010, 0x66001f).w(this, FUNC(taito_f3_state::f3_control_1_w)); + map(0x440000, 0x447fff).ram().w(FUNC(taito_f3_state::f3_palette_24bit_w)).share("paletteram"); + map(0x4a0000, 0x4a001b).rw(FUNC(taito_f3_state::f3_control_r), FUNC(taito_f3_state::f3_control_w)); + map(0x4a001c, 0x4a001f).rw(FUNC(taito_f3_state::bubsympb_oki_r), FUNC(taito_f3_state::bubsympb_oki_w)); + map(0x4c0000, 0x4c0003).w(FUNC(taito_f3_state::f3_unk_w)); + map(0x600000, 0x60ffff).rw(FUNC(taito_f3_state::f3_spriteram_r), FUNC(taito_f3_state::f3_spriteram_w)); //AM_SHARE("spriteram") + map(0x610000, 0x61bfff).rw(FUNC(taito_f3_state::f3_pf_data_r), FUNC(taito_f3_state::f3_pf_data_w)); //AM_SHARE("f3_pf_data") + map(0x61c000, 0x61dfff).rw(FUNC(taito_f3_state::f3_videoram_r), FUNC(taito_f3_state::f3_videoram_w)); //AM_SHARE("videoram") + map(0x61e000, 0x61ffff).rw(FUNC(taito_f3_state::f3_vram_r), FUNC(taito_f3_state::f3_vram_w)); //AM_SHARE("f3_vram") + map(0x620000, 0x62ffff).rw(FUNC(taito_f3_state::f3_lineram_r), FUNC(taito_f3_state::f3_lineram_w)); //AM_SHARE("f3_line_ram") + map(0x630000, 0x63ffff).rw(FUNC(taito_f3_state::f3_pivot_r), FUNC(taito_f3_state::f3_pivot_w)); //AM_SHARE("f3_pivot_ram") + map(0x660000, 0x66000f).w(FUNC(taito_f3_state::f3_control_0_w)); + map(0x660010, 0x66001f).w(FUNC(taito_f3_state::f3_control_1_w)); map(0xc00000, 0xc007ff).ram(); } diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp index b62b85aa650..9902e60a6a8 100644 --- a/src/mame/drivers/taito_h.cpp +++ b/src/mame/drivers/taito_h.cpp @@ -239,7 +239,7 @@ void taitoh_state::syvalion_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x10ffff).mirror(0x010000).ram().share("m68000_mainram"); - map(0x200001, 0x200001).r(this, FUNC(taitoh_state::syvalion_input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); + map(0x200001, 0x200001).r(FUNC(taitoh_state::syvalion_input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); map(0x200003, 0x200003).rw(m_tc0040ioc, FUNC(tc0040ioc_device::port_r), FUNC(tc0040ioc_device::port_w)); map(0x300000, 0x300001).nopr(); map(0x300001, 0x300001).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); @@ -298,7 +298,7 @@ void taitoh_state::sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(taitoh_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(taitoh_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 65ab91263ca..3a60f83eaf0 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -385,18 +385,18 @@ void taitol_state::common_banks_map(address_map &map) map(0xd000, 0xdfff).m("rambank2", FUNC(address_map_bank_device::amap8)); map(0xe000, 0xefff).m("rambank3", FUNC(address_map_bank_device::amap8)); map(0xf000, 0xfdff).m("rambank4", FUNC(address_map_bank_device::amap8)); - map(0xfe00, 0xfe03).rw(this, FUNC(taitol_state::taitol_bankc_r), FUNC(taitol_state::taitol_bankc_w)); - map(0xfe04, 0xfe04).rw(this, FUNC(taitol_state::taitol_control_r), FUNC(taitol_state::taitol_control_w)); - map(0xff00, 0xff02).rw(this, FUNC(taitol_state::irq_adr_r), FUNC(taitol_state::irq_adr_w)); - map(0xff03, 0xff03).rw(this, FUNC(taitol_state::irq_enable_r), FUNC(taitol_state::irq_enable_w)); - map(0xff04, 0xff07).rw(this, FUNC(taitol_state::rambankswitch_r), FUNC(taitol_state::rambankswitch_w)); - map(0xff08, 0xff08).rw(this, FUNC(taitol_state::rombankswitch_r), FUNC(taitol_state::rombankswitch_w)); + map(0xfe00, 0xfe03).rw(FUNC(taitol_state::taitol_bankc_r), FUNC(taitol_state::taitol_bankc_w)); + map(0xfe04, 0xfe04).rw(FUNC(taitol_state::taitol_control_r), FUNC(taitol_state::taitol_control_w)); + map(0xff00, 0xff02).rw(FUNC(taitol_state::irq_adr_r), FUNC(taitol_state::irq_adr_w)); + map(0xff03, 0xff03).rw(FUNC(taitol_state::irq_enable_r), FUNC(taitol_state::irq_enable_w)); + map(0xff04, 0xff07).rw(FUNC(taitol_state::rambankswitch_r), FUNC(taitol_state::rambankswitch_w)); + map(0xff08, 0xff08).rw(FUNC(taitol_state::rombankswitch_r), FUNC(taitol_state::rombankswitch_w)); } void taitol_state::tc0090lvc_map(address_map &map) { - map(0x10000, 0x1ffff).ram().w(this, FUNC(taitol_state::vram_w)).share("vram"); + map(0x10000, 0x1ffff).ram().w(FUNC(taitol_state::vram_w)).share("vram"); map(0x80000, 0x801ff).mirror(0x00e00).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); } @@ -412,7 +412,7 @@ void fhawk_state::fhawk_2_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("slavebank"); - map(0xc000, 0xc000).w(this, FUNC(fhawk_state::rombank2switch_w)); + map(0xc000, 0xc000).w(FUNC(fhawk_state::rombank2switch_w)); map(0xc800, 0xc800).nopr().w("ciu", FUNC(pc060ha_device::master_port_w)); map(0xc801, 0xc801).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); map(0xd000, 0xd007).rw("tc0220ioc", FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)); @@ -465,7 +465,7 @@ void taitol_2cpu_state::raimais_3_map(address_map &map) map(0xe600, 0xe600).nopw(); /* ? */ map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(taitol_2cpu_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(taitol_2cpu_state::sound_bankswitch_w)); } @@ -485,7 +485,7 @@ void champwr_state::champwr_2_map(address_map &map) map(0xe008, 0xe00f).nopr(); map(0xe800, 0xe800).nopr().w("ciu", FUNC(pc060ha_device::master_port_w)); map(0xe801, 0xe801).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); - map(0xf000, 0xf000).rw(this, FUNC(champwr_state::rombank2switch_r), FUNC(champwr_state::rombank2switch_w)); + map(0xf000, 0xf000).rw(FUNC(champwr_state::rombank2switch_r), FUNC(champwr_state::rombank2switch_w)); } void champwr_state::champwr_3_map(address_map &map) @@ -496,10 +496,10 @@ void champwr_state::champwr_3_map(address_map &map) map(0x9000, 0x9001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xa000, 0xa000).nopr().w("ciu", FUNC(pc060ha_device::slave_port_w)); map(0xa001, 0xa001).rw("ciu", FUNC(pc060ha_device::slave_comm_r), FUNC(pc060ha_device::slave_comm_w)); - map(0xb000, 0xb000).w(this, FUNC(champwr_state::msm5205_hi_w)); - map(0xc000, 0xc000).w(this, FUNC(champwr_state::msm5205_lo_w)); - map(0xd000, 0xd000).w(this, FUNC(champwr_state::msm5205_start_w)); - map(0xe000, 0xe000).w(this, FUNC(champwr_state::msm5205_stop_w)); + map(0xb000, 0xb000).w(FUNC(champwr_state::msm5205_hi_w)); + map(0xc000, 0xc000).w(FUNC(champwr_state::msm5205_lo_w)); + map(0xd000, 0xd000).w(FUNC(champwr_state::msm5205_start_w)); + map(0xe000, 0xe000).w(FUNC(champwr_state::msm5205_stop_w)); } @@ -526,10 +526,10 @@ void taitol_1cpu_state::puzznic_map(address_map &map) { common_banks_map(map); map(0x8000, 0x9fff).ram(); - map(0xa000, 0xa003).r(this, FUNC(taitol_1cpu_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); + map(0xa000, 0xa003).r(FUNC(taitol_1cpu_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); map(0xa800, 0xa800).nopr(); // Watchdog map(0xb800, 0xb800).rw("mcu", FUNC(arkanoid_68705p3_device::data_r), FUNC(arkanoid_68705p3_device::data_w)); - map(0xb801, 0xb801).rw(this, FUNC(taitol_1cpu_state::mcu_control_r), FUNC(taitol_1cpu_state::mcu_control_w)); + map(0xb801, 0xb801).rw(FUNC(taitol_1cpu_state::mcu_control_r), FUNC(taitol_1cpu_state::mcu_control_w)); map(0xbc00, 0xbc00).nopw(); // Control register, function unknown } @@ -538,9 +538,9 @@ void taitol_1cpu_state::puzznici_map(address_map &map) { common_banks_map(map); map(0x8000, 0x9fff).ram(); - map(0xa000, 0xa003).r(this, FUNC(taitol_1cpu_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); + map(0xa000, 0xa003).r(FUNC(taitol_1cpu_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); map(0xa800, 0xa800).nopr(); // Watchdog - map(0xb801, 0xb801).r(this, FUNC(taitol_1cpu_state::mcu_control_r)); + map(0xb801, 0xb801).r(FUNC(taitol_1cpu_state::mcu_control_r)); // AM_RANGE(0xb801, 0xb801) AM_WRITE(mcu_control_w) map(0xbc00, 0xbc00).nopw(); // Control register, function unknown } @@ -550,7 +550,7 @@ void taitol_1cpu_state::plotting_map(address_map &map) { common_banks_map(map); map(0x8000, 0x9fff).ram(); - map(0xa000, 0xa003).r(this, FUNC(taitol_1cpu_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); + map(0xa000, 0xa003).r(FUNC(taitol_1cpu_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); map(0xa800, 0xa800).nopw(); // Watchdog or interrupt ack map(0xb800, 0xb800).nopw(); // Control register, function unknown } @@ -575,7 +575,7 @@ void taitol_1cpu_state::cachat_map(address_map &map) map(0xa800, 0xa803).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xb000, 0xb000).nopw(); // Control register, function unknown map(0xb001, 0xb001).nopr(); // Watchdog or interrupt ack (value ignored) - map(0xfff8, 0xfff8).rw(this, FUNC(taitol_1cpu_state::rombankswitch_r), FUNC(taitol_1cpu_state::rombankswitch_w)); + map(0xfff8, 0xfff8).rw(FUNC(taitol_1cpu_state::rombankswitch_r), FUNC(taitol_1cpu_state::rombankswitch_w)); } @@ -583,15 +583,15 @@ void horshoes_state::horshoes_map(address_map &map) { common_banks_map(map); map(0x8000, 0x9fff).ram(); - map(0xa000, 0xa003).r(this, FUNC(horshoes_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); + map(0xa000, 0xa003).r(FUNC(horshoes_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write)); map(0xa800, 0xa800).select(0x000c).lr8("upd4701_r", [this](address_space &space, offs_t offset, u8 mem_mask) { return m_upd4701->read_xy(space, offset >> 2, mem_mask); }); - map(0xa802, 0xa802).r(m_upd4701, FUNC(upd4701_device::reset_x)); - map(0xa803, 0xa803).r(m_upd4701, FUNC(upd4701_device::reset_y)); + map(0xa802, 0xa802).r(m_upd4701, FUNC(upd4701_device::reset_x_r)); + map(0xa803, 0xa803).r(m_upd4701, FUNC(upd4701_device::reset_y_r)); map(0xb801, 0xb801).nopr(); // Watchdog or interrupt ack - map(0xb802, 0xb802).w(this, FUNC(horshoes_state::bankg_w)); + map(0xb802, 0xb802).w(FUNC(horshoes_state::bankg_w)); map(0xbc00, 0xbc00).nopw(); } diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp index 9403d02138b..d09da0d7018 100644 --- a/src/mame/drivers/taito_o.cpp +++ b/src/mame/drivers/taito_o.cpp @@ -69,7 +69,7 @@ void taitoo_state::parentj_map(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x100000, 0x10ffff).mirror(0x010000).ram(); - map(0x200000, 0x20000f).rw(this, FUNC(taitoo_state::io_r), FUNC(taitoo_state::io_w)); /* TC0220IOC ? */ + map(0x200000, 0x20000f).rw(FUNC(taitoo_state::io_r), FUNC(taitoo_state::io_w)); /* TC0220IOC ? */ map(0x300000, 0x300003).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)).umask16(0x00ff); map(0x400000, 0x420fff).rw(m_tc0080vco, FUNC(tc0080vco_device::word_r), FUNC(tc0080vco_device::word_w)); map(0x500800, 0x500fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 459ea330c7b..1f2a5b985a3 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -422,7 +422,7 @@ void taitox_state::superman_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x300000, 0x300001).nopw(); /* written each frame at $3a9c, mostly 0x10 */ map(0x400000, 0x400001).nopw(); /* written each frame at $3aa2, mostly 0x10 */ - map(0x500000, 0x500007).r(this, FUNC(taitox_state::superman_dsw_input_r)); + map(0x500000, 0x500007).r(FUNC(taitox_state::superman_dsw_input_r)); map(0x600000, 0x600001).nopw(); /* written each frame at $3ab0, mostly 0x10 */ map(0x800000, 0x800001).nopr(); map(0x800001, 0x800001).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); @@ -440,12 +440,12 @@ void taitox_state::daisenpu_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // map(0x400000, 0x400001).nopw(); /* written each frame at $2ac, values change */ - map(0x500000, 0x50000f).r(this, FUNC(taitox_state::superman_dsw_input_r)); + map(0x500000, 0x50000f).r(FUNC(taitox_state::superman_dsw_input_r)); // map(0x600000, 0x600001).nopw(); /* written each frame at $2a2, values change */ map(0x800000, 0x800001).nopr(); map(0x800001, 0x800001).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0x800003, 0x800003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); - map(0x900000, 0x90000f).rw(this, FUNC(taitox_state::daisenpu_input_r), FUNC(taitox_state::daisenpu_input_w)); + map(0x900000, 0x90000f).rw(FUNC(taitox_state::daisenpu_input_r), FUNC(taitox_state::daisenpu_input_w)); map(0xb00000, 0xb00fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); @@ -457,12 +457,12 @@ void taitox_state::gigandes_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x400000, 0x400001).nopw(); /* 0x1 written each frame at $d42, watchdog? */ - map(0x500000, 0x500007).r(this, FUNC(taitox_state::superman_dsw_input_r)); + map(0x500000, 0x500007).r(FUNC(taitox_state::superman_dsw_input_r)); map(0x600000, 0x600001).nopw(); /* 0x1 written each frame at $d3c, watchdog? */ map(0x800000, 0x800001).nopr(); map(0x800001, 0x800001).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x800003, 0x800003).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0x900000, 0x90000f).rw(this, FUNC(taitox_state::daisenpu_input_r), FUNC(taitox_state::daisenpu_input_w)); + map(0x900000, 0x90000f).rw(FUNC(taitox_state::daisenpu_input_r), FUNC(taitox_state::daisenpu_input_w)); map(0xb00000, 0xb00fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); @@ -474,12 +474,12 @@ void taitox_state::ballbros_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x400000, 0x400001).nopw(); /* 0x1 written each frame at $c56, watchdog? */ - map(0x500000, 0x50000f).r(this, FUNC(taitox_state::superman_dsw_input_r)); + map(0x500000, 0x50000f).r(FUNC(taitox_state::superman_dsw_input_r)); map(0x600000, 0x600001).nopw(); /* 0x1 written each frame at $c4e, watchdog? */ map(0x800000, 0x800001).nopr(); map(0x800001, 0x800001).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x800003, 0x800003).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); - map(0x900000, 0x90000f).rw(this, FUNC(taitox_state::daisenpu_input_r), FUNC(taitox_state::daisenpu_input_w)); + map(0x900000, 0x90000f).rw(FUNC(taitox_state::daisenpu_input_r), FUNC(taitox_state::daisenpu_input_w)); map(0xb00000, 0xb00fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); @@ -502,7 +502,7 @@ void taitox_state::sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(taitox_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(taitox_state::sound_bankswitch_w)); } void taitox_state::daisenpu_sound_map(address_map &map) @@ -517,7 +517,7 @@ void taitox_state::daisenpu_sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); - map(0xf200, 0xf200).w(this, FUNC(taitox_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(taitox_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index 61516ff8093..91eac2260ab 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -1668,7 +1668,7 @@ void taitoz_state::contcirc_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x080000, 0x083fff).ram(); map(0x084000, 0x087fff).ram().share("share1"); - map(0x090000, 0x090001).w(this, FUNC(taitoz_state::contcirc_out_w)); /* road palette bank, sub CPU reset, 3d glasses control */ + map(0x090000, 0x090001).w(FUNC(taitoz_state::contcirc_out_w)); /* road palette bank, sub CPU reset, 3d glasses control */ map(0x100000, 0x100007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_rbswap_word_w)); /* palette */ map(0x200000, 0x20ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x220000, 0x22000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -1681,9 +1681,9 @@ void taitoz_state::contcirc_cpub_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x080000, 0x083fff).ram(); map(0x084000, 0x087fff).ram().share("share1"); - map(0x100001, 0x100001).r(this, FUNC(taitoz_state::contcirc_input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); + map(0x100001, 0x100001).r(FUNC(taitoz_state::contcirc_input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); map(0x100003, 0x100003).rw(m_tc0040ioc, FUNC(tc0040ioc_device::watchdog_r), FUNC(tc0040ioc_device::port_w)); - map(0x200000, 0x200003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x200000, 0x200003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); } @@ -1693,15 +1693,15 @@ void taitoz_state::chasehq_map(address_map &map) map(0x100000, 0x107fff).ram(); map(0x108000, 0x10bfff).ram().share("share1"); map(0x10c000, 0x10ffff).ram(); - map(0x400001, 0x400001).r(this, FUNC(taitoz_state::chasehq_input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); + map(0x400001, 0x400001).r(FUNC(taitoz_state::chasehq_input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); map(0x400003, 0x400003).rw(m_tc0040ioc, FUNC(tc0040ioc_device::watchdog_r), FUNC(tc0040ioc_device::port_w)); - map(0x800000, 0x800001).w(this, FUNC(taitoz_state::chasehq_cpua_ctrl_w)); - map(0x820000, 0x820003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x800000, 0x800001).w(FUNC(taitoz_state::chasehq_cpua_ctrl_w)); + map(0x820000, 0x820003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); map(0xa00000, 0xa00007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette */ map(0xc00000, 0xc0ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0xc20000, 0xc2000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0xd00000, 0xd007ff).ram().share("spriteram"); - map(0xe00000, 0xe003ff).rw(this, FUNC(taitoz_state::chasehq_motor_r), FUNC(taitoz_state::chasehq_motor_w)); /* motor cpu */ + map(0xe00000, 0xe003ff).rw(FUNC(taitoz_state::chasehq_motor_r), FUNC(taitoz_state::chasehq_motor_w)); /* motor cpu */ } void taitoz_state::chq_cpub_map(address_map &map) @@ -1718,7 +1718,7 @@ void taitoz_state::enforce_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x103fff).ram(); map(0x104000, 0x107fff).ram().share("share1"); - map(0x200000, 0x200001).w(this, FUNC(taitoz_state::cpua_ctrl_w)); // works without? + map(0x200000, 0x200001).w(FUNC(taitoz_state::cpua_ctrl_w)); // works without? map(0x300000, 0x3006ff).ram().share("spriteram"); map(0x400000, 0x401fff).rw(m_tc0150rod, FUNC(tc0150rod_device::word_r), FUNC(tc0150rod_device::word_w)); /* "root ram" ??? */ map(0x500000, 0x500007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_rbswap_word_w)); /* palette */ @@ -1731,7 +1731,7 @@ void taitoz_state::enforce_cpub_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x103fff).ram(); map(0x104000, 0x107fff).ram().share("share1"); - map(0x200000, 0x200003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x200000, 0x200003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); map(0x300000, 0x300003).rw(m_tc0040ioc, FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); } @@ -1742,7 +1742,7 @@ void taitoz_state::bshark_map(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x110000, 0x113fff).ram().share("share1"); map(0x400000, 0x40000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); - map(0x600000, 0x600001).w(this, FUNC(taitoz_state::cpua_ctrl_w)); + map(0x600000, 0x600001).w(FUNC(taitoz_state::cpua_ctrl_w)); map(0x800000, 0x80000f).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask16(0x00ff); map(0xa00000, 0xa01fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0xc00000, 0xc00fff).ram().share("spriteram"); @@ -1756,7 +1756,7 @@ void taitoz_state::bsharkjjs_map(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x110000, 0x113fff).ram().share("share1"); map(0x400000, 0x40000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); - map(0x600000, 0x600001).w(this, FUNC(taitoz_state::cpua_ctrl_w)); + map(0x600000, 0x600001).w(FUNC(taitoz_state::cpua_ctrl_w)); // map(0x800000, 0x80000f) // No analog stick, this is the Joystick version map(0xa00000, 0xa01fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0xc00000, 0xc00fff).ram().share("spriteram"); @@ -1769,8 +1769,8 @@ void taitoz_state::bshark_cpub_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x108000, 0x10bfff).ram(); map(0x110000, 0x113fff).ram().share("share1"); - map(0x400000, 0x400007).w(this, FUNC(taitoz_state::taitoz_pancontrol)).umask16(0x00ff); /* pan */ -// map(0x40000a, 0x40000b).r(this, FUNC(taitoz_state::taitoz_unknown_r)); // ??? + map(0x400000, 0x400007).w(FUNC(taitoz_state::taitoz_pancontrol)).umask16(0x00ff); /* pan */ +// map(0x40000a, 0x40000b).r(FUNC(taitoz_state::taitoz_unknown_r)); // ??? map(0x600000, 0x600007).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)).umask16(0x00ff); map(0x60000c, 0x60000d).noprw(); // interrupt controller? map(0x60000e, 0x60000f).noprw(); @@ -1785,14 +1785,14 @@ void taitoz_state::sci_map(address_map &map) map(0x108000, 0x10bfff).ram().share("share1"); map(0x10c000, 0x10ffff).ram(); map(0x200000, 0x20000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); - map(0x200010, 0x20001f).r(this, FUNC(taitoz_state::sci_steer_input_r)); -// map(0x400000, 0x400001).w(this, FUNC(taitoz_state::cpua_ctrl_w)); // ?? doesn't seem to fit what's written - map(0x420000, 0x420003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x200010, 0x20001f).r(FUNC(taitoz_state::sci_steer_input_r)); +// map(0x400000, 0x400001).w(FUNC(taitoz_state::cpua_ctrl_w)); // ?? doesn't seem to fit what's written + map(0x420000, 0x420003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); map(0x800000, 0x801fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0xa00000, 0xa0ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0xa20000, 0xa2000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0xc00000, 0xc03fff).ram().share("spriteram"); - map(0xc08000, 0xc08001).rw(this, FUNC(taitoz_state::sci_spriteframe_r), FUNC(taitoz_state::sci_spriteframe_w)); + map(0xc08000, 0xc08001).rw(FUNC(taitoz_state::sci_spriteframe_r), FUNC(taitoz_state::sci_spriteframe_w)); } void taitoz_state::sci_cpub_map(address_map &map) @@ -1810,13 +1810,13 @@ void taitoz_state::nightstr_map(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x110000, 0x113fff).ram().share("share1"); map(0x400000, 0x40000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); - map(0x800000, 0x800001).w(this, FUNC(taitoz_state::cpua_ctrl_w)); - map(0x820000, 0x820003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x800000, 0x800001).w(FUNC(taitoz_state::cpua_ctrl_w)); + map(0x820000, 0x820003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); map(0xa00000, 0xa00007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette */ map(0xc00000, 0xc0ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0xc20000, 0xc2000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0xd00000, 0xd007ff).ram().share("spriteram"); - map(0xe00000, 0xe00011).w(this, FUNC(taitoz_state::nightstr_motor_w)); /* Motor outputs */ + map(0xe00000, 0xe00011).w(FUNC(taitoz_state::nightstr_motor_w)); /* Motor outputs */ map(0xe40000, 0xe4000f).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask16(0x00ff); } @@ -1834,7 +1834,7 @@ void taitoz_state::aquajack_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x103fff).ram(); map(0x104000, 0x107fff).ram().share("share1"); - map(0x200000, 0x200001).w(this, FUNC(taitoz_state::cpua_ctrl_w)); // not needed, but it's probably like the others + map(0x200000, 0x200001).w(FUNC(taitoz_state::cpua_ctrl_w)); // not needed, but it's probably like the others map(0x300000, 0x300007).rw(m_tc0110pcr, FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette */ map(0x800000, 0x801fff).rw(m_tc0150rod, FUNC(tc0150rod_device::word_r), FUNC(tc0150rod_device::word_w)); map(0xa00000, 0xa0ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ @@ -1848,10 +1848,10 @@ void taitoz_state::aquajack_cpub_map(address_map &map) map(0x100000, 0x103fff).ram(); map(0x104000, 0x107fff).ram().share("share1"); map(0x200000, 0x20000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); - map(0x300000, 0x300003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); - map(0x800800, 0x80083f).r(this, FUNC(taitoz_state::aquajack_unknown_r)); // Read regularly after write to 800800... -// map(0x800800, 0x800801).w(this, FUNC(taitoz_state::taitoz_unknown_w)); -// map(0x900000, 0x900007).rw(this, FUNC(taitoz_state::taitoz_unknown_r), FUNC(taitoz_state::taitoz_unknown_w)); + map(0x300000, 0x300003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x800800, 0x80083f).r(FUNC(taitoz_state::aquajack_unknown_r)); // Read regularly after write to 800800... +// map(0x800800, 0x800801).w(FUNC(taitoz_state::taitoz_unknown_w)); +// map(0x900000, 0x900007).rw(FUNC(taitoz_state::taitoz_unknown_r), FUNC(taitoz_state::taitoz_unknown_w)); } @@ -1875,8 +1875,8 @@ void taitoz_state::spacegun_cpub_map(address_map &map) map(0xc00000, 0xc00007).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)).umask16(0x00ff); map(0xc0000c, 0xc0000d).noprw(); // interrupt controller? map(0xc0000e, 0xc0000f).noprw(); - map(0xc20000, 0xc20007).w(this, FUNC(taitoz_state::taitoz_pancontrol)).umask16(0x00ff); /* pan */ - map(0xe00000, 0xe00001).w(this, FUNC(taitoz_state::spacegun_gun_output_w)); /* gun outputs */ + map(0xc20000, 0xc20007).w(FUNC(taitoz_state::taitoz_pancontrol)).umask16(0x00ff); /* pan */ + map(0xe00000, 0xe00001).w(FUNC(taitoz_state::spacegun_gun_output_w)); /* gun outputs */ map(0xf00000, 0xf0000f).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask16(0x00ff); } @@ -1887,15 +1887,15 @@ void taitoz_state::dblaxle_map(address_map &map) map(0x200000, 0x203fff).ram(); map(0x210000, 0x21ffff).ram().share("share1"); map(0x400000, 0x40000f).rw(m_tc0510nio, FUNC(tc0510nio_device::halfword_wordswap_r), FUNC(tc0510nio_device::halfword_wordswap_w)); - map(0x400010, 0x40001f).r(this, FUNC(taitoz_state::dblaxle_steer_input_r)); - map(0x600000, 0x600001).w(this, FUNC(taitoz_state::dblaxle_cpua_ctrl_w)); /* could this be causing int6 ? */ - map(0x620000, 0x620003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x400010, 0x40001f).r(FUNC(taitoz_state::dblaxle_steer_input_r)); + map(0x600000, 0x600001).w(FUNC(taitoz_state::dblaxle_cpua_ctrl_w)); /* could this be causing int6 ? */ + map(0x620000, 0x620003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); map(0x800000, 0x801fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x900000, 0x90ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::word_r), FUNC(tc0480scp_device::word_w)); /* tilemap mirror */ map(0xa00000, 0xa0ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::word_r), FUNC(tc0480scp_device::word_w)); /* tilemaps */ map(0xa30000, 0xa3002f).rw(m_tc0480scp, FUNC(tc0480scp_device::ctrl_word_r), FUNC(tc0480scp_device::ctrl_word_w)); map(0xc00000, 0xc03fff).ram().share("spriteram"); /* mostly unused ? */ - map(0xc08000, 0xc08001).rw(this, FUNC(taitoz_state::sci_spriteframe_r), FUNC(taitoz_state::sci_spriteframe_w)); /* set in int6, seems to stay zero */ + map(0xc08000, 0xc08001).rw(FUNC(taitoz_state::sci_spriteframe_r), FUNC(taitoz_state::sci_spriteframe_w)); /* set in int6, seems to stay zero */ } void taitoz_state::dblaxle_cpub_map(address_map &map) @@ -1914,14 +1914,14 @@ void taitoz_state::racingb_map(address_map &map) map(0x100000, 0x103fff).ram(); map(0x110000, 0x11ffff).ram().share("share1"); map(0x300000, 0x30000f).rw(m_tc0510nio, FUNC(tc0510nio_device::halfword_wordswap_r), FUNC(tc0510nio_device::halfword_wordswap_w)); - map(0x300010, 0x30001f).r(this, FUNC(taitoz_state::dblaxle_steer_input_r)); - map(0x500002, 0x500003).w(this, FUNC(taitoz_state::cpua_ctrl_w)); - map(0x520000, 0x520003).rw(this, FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); + map(0x300010, 0x30001f).r(FUNC(taitoz_state::dblaxle_steer_input_r)); + map(0x500002, 0x500003).w(FUNC(taitoz_state::cpua_ctrl_w)); + map(0x520000, 0x520003).rw(FUNC(taitoz_state::taitoz_sound_r), FUNC(taitoz_state::taitoz_sound_w)); map(0x700000, 0x701fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x900000, 0x90ffff).rw(m_tc0480scp, FUNC(tc0480scp_device::word_r), FUNC(tc0480scp_device::word_w)); /* tilemaps */ map(0x930000, 0x93002f).rw(m_tc0480scp, FUNC(tc0480scp_device::ctrl_word_r), FUNC(tc0480scp_device::ctrl_word_w)); map(0xb00000, 0xb03fff).ram().share("spriteram"); /* mostly unused ? */ - map(0xb08000, 0xb08001).rw(this, FUNC(taitoz_state::sci_spriteframe_r), FUNC(taitoz_state::sci_spriteframe_w)); /* alternates 0/0x100 */ + map(0xb08000, 0xb08001).rw(FUNC(taitoz_state::sci_spriteframe_r), FUNC(taitoz_state::sci_spriteframe_w)); /* alternates 0/0x100 */ } void taitoz_state::racingb_cpub_map(address_map &map) @@ -1944,11 +1944,11 @@ void taitoz_state::z80_sound_map(address_map &map) map(0xe000, 0xe003).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); map(0xe200, 0xe200).nopr().w(m_tc0140syt, FUNC(tc0140syt_device::slave_port_w)); map(0xe201, 0xe201).rw(m_tc0140syt, FUNC(tc0140syt_device::slave_comm_r), FUNC(tc0140syt_device::slave_comm_w)); - map(0xe400, 0xe403).w(this, FUNC(taitoz_state::taitoz_pancontrol)); /* pan */ + map(0xe400, 0xe403).w(FUNC(taitoz_state::taitoz_pancontrol)); /* pan */ map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(taitoz_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(taitoz_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp index 5a3b418b78f..00de3b4e413 100644 --- a/src/mame/drivers/taitoair.cpp +++ b/src/mame/drivers/taitoair.cpp @@ -383,16 +383,16 @@ void taitoair_state::airsys_map(address_map &map) { map(0x000000, 0x0bffff).rom(); map(0x0c0000, 0x0cffff).ram().share("m68000_mainram"); - map(0x140000, 0x140001).w(this, FUNC(taitoair_state::system_control_w)); /* Pause the TMS32025 */ - map(0x180000, 0x187fff).ram().w(this, FUNC(taitoair_state::airsys_gradram_w)).share("gradram"); /* "gradiation ram (0/1)" */ - map(0x188000, 0x189fff).mirror(0x2000).ram().w(this, FUNC(taitoair_state::airsys_paletteram16_w)).share("paletteram"); + map(0x140000, 0x140001).w(FUNC(taitoair_state::system_control_w)); /* Pause the TMS32025 */ + map(0x180000, 0x187fff).ram().w(FUNC(taitoair_state::airsys_gradram_w)).share("gradram"); /* "gradiation ram (0/1)" */ + map(0x188000, 0x189fff).mirror(0x2000).ram().w(FUNC(taitoair_state::airsys_paletteram16_w)).share("paletteram"); map(0x800000, 0x820fff).rw(m_tc0080vco, FUNC(tc0080vco_device::word_r), FUNC(tc0080vco_device::word_w)); /* tilemaps, sprites */ - map(0x906000, 0x906007).w(this, FUNC(taitoair_state::dma_regs_w)); // DMA? + map(0x906000, 0x906007).w(FUNC(taitoair_state::dma_regs_w)); // DMA? map(0x908000, 0x90ffff).ram().share("line_ram"); /* "line ram" */ map(0x910000, 0x91ffff).ram().share("dsp_ram"); /* "dsp common ram" (TMS320C25) */ map(0x980000, 0x98000f).ram().share("tc0430grw"); /* TC0430GRW roz transform coefficients */ - map(0xa00000, 0xa00007).r(this, FUNC(taitoair_state::stick_input_r)); - map(0xa00100, 0xa00107).r(this, FUNC(taitoair_state::stick2_input_r)); + map(0xa00000, 0xa00007).r(FUNC(taitoair_state::stick_input_r)); + map(0xa00100, 0xa00107).r(FUNC(taitoair_state::stick2_input_r)); map(0xa00200, 0xa0020f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); /* other I/O */ map(0xa80000, 0xa80001).nopr(); map(0xa80001, 0xa80001).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); @@ -414,7 +414,7 @@ void taitoair_state::sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(taitoair_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(taitoair_state::sound_bankswitch_w)); } /********************************** TMS32025 ********************************/ @@ -523,26 +523,26 @@ void taitoair_state::DSP_map_program(address_map &map) void taitoair_state::DSP_map_data(address_map &map) { map(0x2003, 0x2003).nopr(); //bit 0 DMA status flag or vblank - map(0x3000, 0x3002).w(this, FUNC(taitoair_state::dsp_flags_w)); - map(0x3404, 0x3404).w(this, FUNC(taitoair_state::dsp_muldiv_a_1_w)); - map(0x3405, 0x3405).w(this, FUNC(taitoair_state::dsp_muldiv_b_1_w)); - map(0x3406, 0x3406).w(this, FUNC(taitoair_state::dsp_muldiv_c_1_w)); - map(0x3407, 0x3407).r(this, FUNC(taitoair_state::dsp_muldiv_1_r)); - - map(0x3408, 0x3408).w(this, FUNC(taitoair_state::dsp_muldiv_a_2_w)); - map(0x3409, 0x3409).w(this, FUNC(taitoair_state::dsp_muldiv_b_2_w)); - map(0x340a, 0x340a).w(this, FUNC(taitoair_state::dsp_muldiv_c_2_w)); - map(0x340b, 0x340b).r(this, FUNC(taitoair_state::dsp_muldiv_2_r)); - - map(0x3418, 0x3418).w(this, FUNC(taitoair_state::dsp_test_x_w)); - map(0x3419, 0x3419).w(this, FUNC(taitoair_state::dsp_test_y_w)); - map(0x341a, 0x341a).w(this, FUNC(taitoair_state::dsp_test_z_w)); - map(0x341b, 0x341b).rw(this, FUNC(taitoair_state::dsp_test_point_r), FUNC(taitoair_state::dsp_test_start_w)); - map(0x341c, 0x341c).r(this, FUNC(taitoair_state::dsp_test_and_clip_r)); - map(0x341d, 0x341d).r(this, FUNC(taitoair_state::dsp_test_or_clip_r)); - - map(0x4000, 0x7fff).rw(this, FUNC(taitoair_state::lineram_r), FUNC(taitoair_state::lineram_w)); - map(0x8000, 0xffff).rw(this, FUNC(taitoair_state::dspram_r), FUNC(taitoair_state::dspram_w)); + map(0x3000, 0x3002).w(FUNC(taitoair_state::dsp_flags_w)); + map(0x3404, 0x3404).w(FUNC(taitoair_state::dsp_muldiv_a_1_w)); + map(0x3405, 0x3405).w(FUNC(taitoair_state::dsp_muldiv_b_1_w)); + map(0x3406, 0x3406).w(FUNC(taitoair_state::dsp_muldiv_c_1_w)); + map(0x3407, 0x3407).r(FUNC(taitoair_state::dsp_muldiv_1_r)); + + map(0x3408, 0x3408).w(FUNC(taitoair_state::dsp_muldiv_a_2_w)); + map(0x3409, 0x3409).w(FUNC(taitoair_state::dsp_muldiv_b_2_w)); + map(0x340a, 0x340a).w(FUNC(taitoair_state::dsp_muldiv_c_2_w)); + map(0x340b, 0x340b).r(FUNC(taitoair_state::dsp_muldiv_2_r)); + + map(0x3418, 0x3418).w(FUNC(taitoair_state::dsp_test_x_w)); + map(0x3419, 0x3419).w(FUNC(taitoair_state::dsp_test_y_w)); + map(0x341a, 0x341a).w(FUNC(taitoair_state::dsp_test_z_w)); + map(0x341b, 0x341b).rw(FUNC(taitoair_state::dsp_test_point_r), FUNC(taitoair_state::dsp_test_start_w)); + map(0x341c, 0x341c).r(FUNC(taitoair_state::dsp_test_and_clip_r)); + map(0x341d, 0x341d).r(FUNC(taitoair_state::dsp_test_or_clip_r)); + + map(0x4000, 0x7fff).rw(FUNC(taitoair_state::lineram_r), FUNC(taitoair_state::lineram_w)); + map(0x8000, 0xffff).rw(FUNC(taitoair_state::dspram_r), FUNC(taitoair_state::dspram_w)); } diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp index 4b69a2502b4..050792d0402 100644 --- a/src/mame/drivers/taitogn.cpp +++ b/src/mame/drivers/taitogn.cpp @@ -458,10 +458,10 @@ WRITE8_MEMBER(taitogn_state::control_w) m_zoom->reset(); // assume that this also readys the sound flash chips - m_pgmflash->write(0, 0xff); - m_sndflash[0]->write(0, 0xff); - m_sndflash[1]->write(0, 0xff); - m_sndflash[2]->write(0, 0xff); + m_pgmflash->write(space, 0, 0xff); + m_sndflash[0]->write(space, 0, 0xff); + m_sndflash[1]->write(space, 0, 0xff); + m_sndflash[2]->write(space, 0, 0xff); } } @@ -593,7 +593,7 @@ READ32_MEMBER(taitogn_state::zsg2_ext_r) { case 0x000000: case 0x100000: - case 0x200000: return m_sndflash[offset >> 20]->read(offset & 0xfffff) | m_sndflash[offset >> 20]->read((offset & 0xfffff) | 1) << 16; + case 0x200000: return m_sndflash[offset >> 20]->read(space, offset & 0xfffff) | m_sndflash[offset >> 20]->read(space, (offset & 0xfffff) | 1) << 16; default: break; @@ -636,17 +636,17 @@ void taitogn_state::taitogn_map(address_map &map) map(0x1fa00300, 0x1fa00303).portr("SYSTEM"); map(0x1fa10000, 0x1fa10003).portr("P3"); map(0x1fa10100, 0x1fa10103).portr("P4"); - map(0x1fa10200, 0x1fa10200).r(this, FUNC(taitogn_state::boardconfig_r)); - map(0x1fa10300, 0x1fa10300).rw(this, FUNC(taitogn_state::znsecsel_r), FUNC(taitogn_state::znsecsel_w)); - map(0x1fa20000, 0x1fa20000).rw(this, FUNC(taitogn_state::coin_r), FUNC(taitogn_state::coin_w)); - map(0x1fa30000, 0x1fa30000).rw(this, FUNC(taitogn_state::control3_r), FUNC(taitogn_state::control3_w)); + map(0x1fa10200, 0x1fa10200).r(FUNC(taitogn_state::boardconfig_r)); + map(0x1fa10300, 0x1fa10300).rw(FUNC(taitogn_state::znsecsel_r), FUNC(taitogn_state::znsecsel_w)); + map(0x1fa20000, 0x1fa20000).rw(FUNC(taitogn_state::coin_r), FUNC(taitogn_state::coin_w)); + map(0x1fa30000, 0x1fa30000).rw(FUNC(taitogn_state::control3_r), FUNC(taitogn_state::control3_w)); map(0x1fa51c00, 0x1fa51dff).nopr(); // systematic read at spu_address + 250000, result dropped, maybe other accesses - map(0x1fa60000, 0x1fa60003).r(this, FUNC(taitogn_state::hack1_r)); + map(0x1fa60000, 0x1fa60003).r(FUNC(taitogn_state::hack1_r)); map(0x1faf0000, 0x1faf07ff).rw("at28c16", FUNC(at28c16_device::read), FUNC(at28c16_device::write)); /* eeprom */ map(0x1fb00000, 0x1fb0ffff).rw("rf5c296", FUNC(rf5c296_device::io_r), FUNC(rf5c296_device::io_w)); - map(0x1fb40000, 0x1fb40000).rw(this, FUNC(taitogn_state::control_r), FUNC(taitogn_state::control_w)); - map(0x1fb60000, 0x1fb60001).w(this, FUNC(taitogn_state::control2_w)); - map(0x1fb70000, 0x1fb70001).rw(this, FUNC(taitogn_state::gn_1fb70000_r), FUNC(taitogn_state::gn_1fb70000_w)); + map(0x1fb40000, 0x1fb40000).rw(FUNC(taitogn_state::control_r), FUNC(taitogn_state::control_w)); + map(0x1fb60000, 0x1fb60001).w(FUNC(taitogn_state::control2_w)); + map(0x1fb70000, 0x1fb70001).rw(FUNC(taitogn_state::gn_1fb70000_r), FUNC(taitogn_state::gn_1fb70000_w)); map(0x1fb80000, 0x1fb80001).w(m_zoom, FUNC(taito_zoom_device::reg_data_w)); map(0x1fb80002, 0x1fb80003).w(m_zoom, FUNC(taito_zoom_device::reg_address_w)); map(0x1fba0000, 0x1fba0001).w(m_zoom, FUNC(taito_zoom_device::sound_irq_w)); @@ -675,7 +675,7 @@ void taitogn_state::flashbank_map(address_map &map) void taitogn_state::taitogn_mp_map(address_map &map) { taitogn_map(map); - map(0x1fa10100, 0x1fa10100).r(this, FUNC(taitogn_state::gnet_mahjong_panel_r)); + map(0x1fa10100, 0x1fa10100).r(FUNC(taitogn_state::gnet_mahjong_panel_r)); } void slot_ataflash(device_slot_interface &device) diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp index 47a36331094..727d547f7f4 100644 --- a/src/mame/drivers/taitojc.cpp +++ b/src/mame/drivers/taitojc.cpp @@ -623,21 +623,21 @@ void taitojc_state::taitojc_map(address_map &map) map(0x00000000, 0x001fffff).rom().mirror(0x200000); map(0x00400000, 0x01bfffff).rom().region("gfx1", 0); map(0x04000000, 0x040f7fff).ram().share("vram"); - map(0x040f8000, 0x040fbfff).rw(this, FUNC(taitojc_state::taitojc_tile_r), FUNC(taitojc_state::taitojc_tile_w)); - map(0x040fc000, 0x040fefff).rw(this, FUNC(taitojc_state::taitojc_char_r), FUNC(taitojc_state::taitojc_char_w)); + map(0x040f8000, 0x040fbfff).rw(FUNC(taitojc_state::taitojc_tile_r), FUNC(taitojc_state::taitojc_tile_w)); + map(0x040fc000, 0x040fefff).rw(FUNC(taitojc_state::taitojc_char_r), FUNC(taitojc_state::taitojc_char_w)); map(0x040ff000, 0x040fffff).ram().share("objlist"); - map(0x05800000, 0x0580003f).r(this, FUNC(taitojc_state::jc_pcbid_r)); - map(0x05900000, 0x05900007).rw(this, FUNC(taitojc_state::mcu_comm_r), FUNC(taitojc_state::mcu_comm_w)); - map(0x06400000, 0x0641ffff).rw(this, FUNC(taitojc_state::taitojc_palette_r), FUNC(taitojc_state::taitojc_palette_w)).share("palette_ram"); + map(0x05800000, 0x0580003f).r(FUNC(taitojc_state::jc_pcbid_r)); + map(0x05900000, 0x05900007).rw(FUNC(taitojc_state::mcu_comm_r), FUNC(taitojc_state::mcu_comm_w)); + map(0x06400000, 0x0641ffff).rw(FUNC(taitojc_state::taitojc_palette_r), FUNC(taitojc_state::taitojc_palette_w)).share("palette_ram"); map(0x06600000, 0x0660001f).rw(m_tc0640fio, FUNC(tc0640fio_device::read), FUNC(tc0640fio_device::write)).umask32(0xff000000); map(0x0660004c, 0x0660004f).portw("EEPROMOUT"); - map(0x06800001, 0x06800001).w(this, FUNC(taitojc_state::jc_irq_unk_w)); + map(0x06800001, 0x06800001).w(FUNC(taitojc_state::jc_irq_unk_w)); map(0x06a00000, 0x06a01fff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)).umask32(0xff000000); - map(0x06c00000, 0x06c0001f).rw(this, FUNC(taitojc_state::jc_lan_r), FUNC(taitojc_state::jc_lan_w)).umask32(0x00ff0000); + map(0x06c00000, 0x06c0001f).rw(FUNC(taitojc_state::jc_lan_r), FUNC(taitojc_state::jc_lan_w)).umask32(0x00ff0000); map(0x08000000, 0x080fffff).ram().share("main_ram"); - map(0x10000000, 0x10001fff).rw(this, FUNC(taitojc_state::dsp_shared_r), FUNC(taitojc_state::dsp_shared_w)).umask32(0xffff0000); - map(0x10001ff8, 0x10001ff9).r(this, FUNC(taitojc_state::dsp_to_main_7fe_r)); - map(0x10001ffc, 0x10001ffd).w(this, FUNC(taitojc_state::main_to_dsp_7ff_w)); + map(0x10000000, 0x10001fff).rw(FUNC(taitojc_state::dsp_shared_r), FUNC(taitojc_state::dsp_shared_w)).umask32(0xffff0000); + map(0x10001ff8, 0x10001ff9).r(FUNC(taitojc_state::dsp_to_main_7fe_r)); + map(0x10001ffc, 0x10001ffd).w(FUNC(taitojc_state::main_to_dsp_7ff_w)); } @@ -672,8 +672,8 @@ WRITE8_MEMBER(taitojc_state::dendego_brakemeter_w) void taitojc_state::dendego_map(address_map &map) { taitojc_map(map); - map(0x06e00001, 0x06e00001).w(this, FUNC(taitojc_state::dendego_speedmeter_w)); - map(0x06e00005, 0x06e00005).w(this, FUNC(taitojc_state::dendego_brakemeter_w)); + map(0x06e00001, 0x06e00001).w(FUNC(taitojc_state::dendego_speedmeter_w)); + map(0x06e00005, 0x06e00005).w(FUNC(taitojc_state::dendego_brakemeter_w)); map(0x06e0000d, 0x06e0000d).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } @@ -754,10 +754,10 @@ void taitojc_state::hc11_pgm_map(address_map &map) void taitojc_state::hc11_io_map(address_map &map) { map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).nopr(); // ? - map(MC68HC11_IO_PORTG, MC68HC11_IO_PORTG).rw(this, FUNC(taitojc_state::hc11_comm_r), FUNC(taitojc_state::hc11_comm_w)); - map(MC68HC11_IO_PORTH, MC68HC11_IO_PORTH).rw(this, FUNC(taitojc_state::hc11_output_r), FUNC(taitojc_state::hc11_output_w)); - map(MC68HC11_IO_SPI2_DATA, MC68HC11_IO_SPI2_DATA).rw(this, FUNC(taitojc_state::hc11_data_r), FUNC(taitojc_state::hc11_data_w)); - map(MC68HC11_IO_AD0, MC68HC11_IO_AD7).r(this, FUNC(taitojc_state::hc11_analog_r)); + map(MC68HC11_IO_PORTG, MC68HC11_IO_PORTG).rw(FUNC(taitojc_state::hc11_comm_r), FUNC(taitojc_state::hc11_comm_w)); + map(MC68HC11_IO_PORTH, MC68HC11_IO_PORTH).rw(FUNC(taitojc_state::hc11_output_r), FUNC(taitojc_state::hc11_output_w)); + map(MC68HC11_IO_SPI2_DATA, MC68HC11_IO_SPI2_DATA).rw(FUNC(taitojc_state::hc11_data_r), FUNC(taitojc_state::hc11_data_w)); + map(MC68HC11_IO_AD0, MC68HC11_IO_AD7).r(FUNC(taitojc_state::hc11_analog_r)); } @@ -862,16 +862,16 @@ void taitojc_state::tms_data_map(address_map &map) map(0x6b20, 0x6b20).w(m_tc0780fpa, FUNC(tc0780fpa_device::poly_fifo_w)); map(0x6b22, 0x6b22).w(m_tc0780fpa, FUNC(tc0780fpa_device::tex_w)); map(0x6b23, 0x6b23).rw(m_tc0780fpa, FUNC(tc0780fpa_device::tex_addr_r), FUNC(tc0780fpa_device::tex_addr_w)); - map(0x6c00, 0x6c01).rw(this, FUNC(taitojc_state::dsp_rom_r), FUNC(taitojc_state::dsp_rom_w)); - map(0x7000, 0x7002).w(this, FUNC(taitojc_state::dsp_math_projection_w)); - map(0x7010, 0x7012).w(this, FUNC(taitojc_state::dsp_math_intersection_w)); - map(0x7013, 0x7015).w(this, FUNC(taitojc_state::dsp_math_viewport_w)); - map(0x701b, 0x701b).r(this, FUNC(taitojc_state::dsp_math_intersection_r)); - map(0x701d, 0x701d).r(this, FUNC(taitojc_state::dsp_math_projection_y_r)); - map(0x701f, 0x701f).r(this, FUNC(taitojc_state::dsp_math_projection_x_r)); - map(0x7022, 0x7022).r(this, FUNC(taitojc_state::dsp_math_unk_r)); + map(0x6c00, 0x6c01).rw(FUNC(taitojc_state::dsp_rom_r), FUNC(taitojc_state::dsp_rom_w)); + map(0x7000, 0x7002).w(FUNC(taitojc_state::dsp_math_projection_w)); + map(0x7010, 0x7012).w(FUNC(taitojc_state::dsp_math_intersection_w)); + map(0x7013, 0x7015).w(FUNC(taitojc_state::dsp_math_viewport_w)); + map(0x701b, 0x701b).r(FUNC(taitojc_state::dsp_math_intersection_r)); + map(0x701d, 0x701d).r(FUNC(taitojc_state::dsp_math_projection_y_r)); + map(0x701f, 0x701f).r(FUNC(taitojc_state::dsp_math_projection_x_r)); + map(0x7022, 0x7022).r(FUNC(taitojc_state::dsp_math_unk_r)); map(0x7800, 0x7fff).ram().share("dsp_shared"); - map(0x7ffe, 0x7ffe).w(this, FUNC(taitojc_state::dsp_to_main_7fe_w)); + map(0x7ffe, 0x7ffe).w(FUNC(taitojc_state::dsp_to_main_7fe_w)); map(0x8000, 0xffff).ram(); } diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp index 67bda373929..f88c94f623c 100644 --- a/src/mame/drivers/taitopjc.cpp +++ b/src/mame/drivers/taitopjc.cpp @@ -529,9 +529,9 @@ WRITE64_MEMBER(taitopjc_state::dsp_w) void taitopjc_state::ppc603e_mem(address_map &map) { map(0x00000000, 0x003fffff).ram(); // Work RAM - map(0x40000000, 0x4000000f).rw(this, FUNC(taitopjc_state::video_r), FUNC(taitopjc_state::video_w)); - map(0x80000000, 0x80003fff).rw(this, FUNC(taitopjc_state::dsp_r), FUNC(taitopjc_state::dsp_w)); - map(0xc0000000, 0xc0003fff).rw(this, FUNC(taitopjc_state::ppc_common_r), FUNC(taitopjc_state::ppc_common_w)); + map(0x40000000, 0x4000000f).rw(FUNC(taitopjc_state::video_r), FUNC(taitopjc_state::video_w)); + map(0x80000000, 0x80003fff).rw(FUNC(taitopjc_state::dsp_r), FUNC(taitopjc_state::dsp_w)); + map(0xc0000000, 0xc0003fff).rw(FUNC(taitopjc_state::ppc_common_r), FUNC(taitopjc_state::ppc_common_w)); map(0xfe800000, 0xff7fffff).rom().region("gfx1", 0); map(0xffe00000, 0xffffffff).rom().region("user1", 0); } @@ -629,10 +629,10 @@ WRITE16_MEMBER(taitopjc_state::tlcs_unk_w) void taitopjc_state::tlcs900h_mem(address_map &map) { map(0x010000, 0x02ffff).ram(); // Work RAM - map(0x040000, 0x0400ff).rw(this, FUNC(taitopjc_state::tlcs_sound_r), FUNC(taitopjc_state::tlcs_sound_w)); + map(0x040000, 0x0400ff).rw(FUNC(taitopjc_state::tlcs_sound_r), FUNC(taitopjc_state::tlcs_sound_w)); map(0x044000, 0x045fff).ram().share("nvram"); - map(0x060000, 0x061fff).rw(this, FUNC(taitopjc_state::tlcs_common_r), FUNC(taitopjc_state::tlcs_common_w)); - map(0x06c000, 0x06c00f).w(this, FUNC(taitopjc_state::tlcs_unk_w)); + map(0x060000, 0x061fff).rw(FUNC(taitopjc_state::tlcs_common_r), FUNC(taitopjc_state::tlcs_common_w)); + map(0x06c000, 0x06c00f).w(FUNC(taitopjc_state::tlcs_unk_w)); map(0xfc0000, 0xffffff).rom().region("io_cpu", 0); } @@ -689,17 +689,17 @@ void taitopjc_state::tms_data_map(address_map &map) { map(0x4000, 0x6fff).rom().region("user2", 0x8000); map(0x7000, 0xefff).ram(); - map(0xf000, 0xffff).rw(this, FUNC(taitopjc_state::tms_dspshare_r), FUNC(taitopjc_state::tms_dspshare_w)); + map(0xf000, 0xffff).rw(FUNC(taitopjc_state::tms_dspshare_r), FUNC(taitopjc_state::tms_dspshare_w)); } void taitopjc_state::tms_io_map(address_map &map) { - map(0x0053, 0x0053).w(this, FUNC(taitopjc_state::dsp_roml_w)); - map(0x0057, 0x0057).w(this, FUNC(taitopjc_state::dsp_romh_w)); + map(0x0053, 0x0053).w(FUNC(taitopjc_state::dsp_roml_w)); + map(0x0057, 0x0057).w(FUNC(taitopjc_state::dsp_romh_w)); map(0x0058, 0x0058).w(m_tc0780fpa, FUNC(tc0780fpa_device::poly_fifo_w)); map(0x005a, 0x005a).w(m_tc0780fpa, FUNC(tc0780fpa_device::tex_w)); map(0x005b, 0x005b).rw(m_tc0780fpa, FUNC(tc0780fpa_device::tex_addr_r), FUNC(tc0780fpa_device::tex_addr_w)); - map(0x005f, 0x005f).r(this, FUNC(taitopjc_state::dsp_rom_r)); + map(0x005f, 0x005f).r(FUNC(taitopjc_state::dsp_rom_r)); } diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp index d38234f4746..16c48a2dfe6 100644 --- a/src/mame/drivers/taitosj.cpp +++ b/src/mame/drivers/taitosj.cpp @@ -207,9 +207,9 @@ void taitosj_state::taitosj_main_nomcu_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x7fff).bankr("bank1"); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8800).mirror(0x07fe).rw(this, FUNC(taitosj_state::taitosj_fake_data_r), FUNC(taitosj_state::taitosj_fake_data_w)); - map(0x8801, 0x8801).mirror(0x07fe).r(this, FUNC(taitosj_state::taitosj_fake_status_r)); - map(0x9000, 0xbfff).w(this, FUNC(taitosj_state::taitosj_characterram_w)).share("characterram"); + map(0x8800, 0x8800).mirror(0x07fe).rw(FUNC(taitosj_state::taitosj_fake_data_r), FUNC(taitosj_state::taitosj_fake_data_w)); + map(0x8801, 0x8801).mirror(0x07fe).r(FUNC(taitosj_state::taitosj_fake_status_r)); + map(0x9000, 0xbfff).w(FUNC(taitosj_state::taitosj_characterram_w)).share("characterram"); map(0xc000, 0xc3ff).ram(); map(0xc400, 0xc7ff).ram().share("videoram_1"); map(0xc800, 0xcbff).ram().share("videoram_2"); @@ -219,7 +219,7 @@ void taitosj_state::taitosj_main_nomcu_map(address_map &map) map(0xd200, 0xd27f).mirror(0x0080).ram().share("paletteram"); map(0xd300, 0xd300).mirror(0x00ff).writeonly().share("video_priority"); map(0xd400, 0xd403).mirror(0x00f0).readonly().share("collision_reg"); - map(0xd404, 0xd404).mirror(0x00f3).r(this, FUNC(taitosj_state::taitosj_gfxrom_r)); + map(0xd404, 0xd404).mirror(0x00f3).r(FUNC(taitosj_state::taitosj_gfxrom_r)); map(0xd408, 0xd408).mirror(0x00f0).portr("IN0"); map(0xd409, 0xd409).mirror(0x00f0).portr("IN1"); map(0xd40a, 0xd40a).mirror(0x00f0).portr("DSW1"); /* DSW1 */ @@ -230,12 +230,12 @@ void taitosj_state::taitosj_main_nomcu_map(address_map &map) map(0xd40f, 0xd40f).mirror(0x00f0).r(m_ay1, FUNC(ay8910_device::data_r)); /* DSW2 and DSW3 */ map(0xd500, 0xd505).mirror(0x00f0).writeonly().share("scroll"); map(0xd506, 0xd507).mirror(0x00f0).writeonly().share("colorbank"); - map(0xd508, 0xd508).mirror(0x00f0).w(this, FUNC(taitosj_state::taitosj_collision_reg_clear_w)); + map(0xd508, 0xd508).mirror(0x00f0).w(FUNC(taitosj_state::taitosj_collision_reg_clear_w)); map(0xd509, 0xd50a).mirror(0x00f0).writeonly().share("gfxpointer"); - map(0xd50b, 0xd50b).mirror(0x00f0).w(this, FUNC(taitosj_state::soundlatch_w)); - map(0xd50c, 0xd50c).mirror(0x00f0).w(this, FUNC(taitosj_state::sound_semaphore2_w)); + map(0xd50b, 0xd50b).mirror(0x00f0).w(FUNC(taitosj_state::soundlatch_w)); + map(0xd50c, 0xd50c).mirror(0x00f0).w(FUNC(taitosj_state::sound_semaphore2_w)); map(0xd50d, 0xd50d).mirror(0x00f0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xd50e, 0xd50e).mirror(0x00f0).w(this, FUNC(taitosj_state::taitosj_bankswitch_w)); + map(0xd50e, 0xd50e).mirror(0x00f0).w(FUNC(taitosj_state::taitosj_bankswitch_w)); map(0xd50f, 0xd50f).mirror(0x00f0).nopw(); map(0xd600, 0xd600).mirror(0x00ff).writeonly().share("video_mode"); map(0xd700, 0xdfff).noprw(); @@ -282,7 +282,7 @@ void taitosj_state::kikstart_main_map(address_map &map) map(0x8800, 0x8801).rw(m_mcu, FUNC(taito_sj_security_mcu_device::data_r), FUNC(taito_sj_security_mcu_device::data_w)); map(0x8802, 0x8802).noprw(); map(0x8a00, 0x8a5f).writeonly().share("colscrolly"); - map(0x9000, 0xbfff).w(this, FUNC(taitosj_state::taitosj_characterram_w)).share("characterram"); + map(0x9000, 0xbfff).w(FUNC(taitosj_state::taitosj_characterram_w)).share("characterram"); map(0xc000, 0xc3ff).ram(); map(0xc400, 0xc7ff).ram().share("videoram_1"); map(0xc800, 0xcbff).ram().share("videoram_2"); @@ -293,7 +293,7 @@ void taitosj_state::kikstart_main_map(address_map &map) map(0xd200, 0xd27f).ram().share("paletteram"); map(0xd300, 0xd300).writeonly().share("video_priority"); map(0xd400, 0xd403).readonly().share("collision_reg"); - map(0xd404, 0xd404).r(this, FUNC(taitosj_state::taitosj_gfxrom_r)); + map(0xd404, 0xd404).r(FUNC(taitosj_state::taitosj_gfxrom_r)); map(0xd408, 0xd408).mirror(0x00f0).portr("IN0"); map(0xd409, 0xd409).mirror(0x00f0).portr("IN1"); map(0xd40a, 0xd40a).mirror(0x00f0).portr("DSW1"); /* DSW1 */ @@ -302,12 +302,12 @@ void taitosj_state::kikstart_main_map(address_map &map) map(0xd40d, 0xd40d).mirror(0x00f0).portr("IN4"); map(0xd40e, 0xd40f).w(m_ay1, FUNC(ay8910_device::address_data_w)); map(0xd40f, 0xd40f).r(m_ay1, FUNC(ay8910_device::data_r)); /* DSW2 and DSW3 */ - map(0xd508, 0xd508).w(this, FUNC(taitosj_state::taitosj_collision_reg_clear_w)); + map(0xd508, 0xd508).w(FUNC(taitosj_state::taitosj_collision_reg_clear_w)); map(0xd509, 0xd50a).writeonly().share("gfxpointer"); - map(0xd50b, 0xd50b).w(this, FUNC(taitosj_state::soundlatch_w)); - map(0xd50c, 0xd50c).w(this, FUNC(taitosj_state::sound_semaphore2_w)); + map(0xd50b, 0xd50b).w(FUNC(taitosj_state::soundlatch_w)); + map(0xd50c, 0xd50c).w(FUNC(taitosj_state::sound_semaphore2_w)); map(0xd50d, 0xd50d).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xd50e, 0xd50e).w(this, FUNC(taitosj_state::taitosj_bankswitch_w)); + map(0xd50e, 0xd50e).w(FUNC(taitosj_state::taitosj_bankswitch_w)); map(0xd600, 0xd600).writeonly().share("video_mode"); map(0xd800, 0xdfff).ram().share("kikstart_scroll");// scroll ram + ??? map(0xe000, 0xefff).rom(); @@ -381,8 +381,8 @@ void taitosj_state::taitosj_audio_map(address_map &map) map(0x4803, 0x4803).mirror(0x07f8).r(m_ay3, FUNC(ay8910_device::data_r)); map(0x4804, 0x4805).mirror(0x07fa).w(m_ay4, FUNC(ay8910_device::address_data_w)); map(0x4805, 0x4805).mirror(0x07fa).r(m_ay4, FUNC(ay8910_device::data_r)); - map(0x5000, 0x5000).mirror(0x07fc).rw(this, FUNC(taitosj_state::soundlatch_r), FUNC(taitosj_state::soundlatch_clear7_w)); - map(0x5001, 0x5001).mirror(0x07fc).rw(this, FUNC(taitosj_state::soundlatch_flags_r), FUNC(taitosj_state::sound_semaphore2_clear_w)); + map(0x5000, 0x5000).mirror(0x07fc).rw(FUNC(taitosj_state::soundlatch_r), FUNC(taitosj_state::soundlatch_clear7_w)); + map(0x5001, 0x5001).mirror(0x07fc).rw(FUNC(taitosj_state::soundlatch_flags_r), FUNC(taitosj_state::sound_semaphore2_clear_w)); map(0xe000, 0xefff).rom(); /* space for diagnostic ROM */ } @@ -1801,7 +1801,7 @@ MACHINE_CONFIG_START(taitosj_state::nomcu) MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC51 MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, taitosj_state, taitosj_dacvol_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp index bc391352748..584a08dab9b 100644 --- a/src/mame/drivers/taitotz.cpp +++ b/src/mame/drivers/taitotz.cpp @@ -2064,11 +2064,11 @@ WRITE64_MEMBER(taitotz_state::ppc_common_w) void taitotz_state::ppc603e_mem(address_map &map) { - map(0x00000000, 0x0000001f).rw(this, FUNC(taitotz_state::video_chip_r), FUNC(taitotz_state::video_chip_w)); - map(0x10000000, 0x1000001f).rw(this, FUNC(taitotz_state::video_fifo_r), FUNC(taitotz_state::video_fifo_w)); + map(0x00000000, 0x0000001f).rw(FUNC(taitotz_state::video_chip_r), FUNC(taitotz_state::video_chip_w)); + map(0x10000000, 0x1000001f).rw(FUNC(taitotz_state::video_fifo_r), FUNC(taitotz_state::video_fifo_w)); map(0x40000000, 0x40ffffff).ram().share("work_ram"); // Work RAM - map(0xa4000000, 0xa40000ff).rw(this, FUNC(taitotz_state::ieee1394_r), FUNC(taitotz_state::ieee1394_w)); // IEEE1394 network - map(0xa8000000, 0xa8003fff).rw(this, FUNC(taitotz_state::ppc_common_r), FUNC(taitotz_state::ppc_common_w)); // Common RAM (with TLCS-900) + map(0xa4000000, 0xa40000ff).rw(FUNC(taitotz_state::ieee1394_r), FUNC(taitotz_state::ieee1394_w)); // IEEE1394 network + map(0xa8000000, 0xa8003fff).rw(FUNC(taitotz_state::ppc_common_r), FUNC(taitotz_state::ppc_common_w)); // Common RAM (with TLCS-900) map(0xac000000, 0xac0fffff).rom().region("user1", 0); // Apparently this should be flash ROM read/write access map(0xfff00000, 0xffffffff).rom().region("user1", 0); } @@ -2227,11 +2227,11 @@ void taitotz_state::tlcs900h_mem(address_map &map) { map(0x010000, 0x02ffff).ram(); // Work RAM map(0x040000, 0x041fff).ram().share("nvram"); // Backup RAM - map(0x044000, 0x04400f).rw(this, FUNC(taitotz_state::tlcs_rtc_r), FUNC(taitotz_state::tlcs_rtc_w)); - map(0x060000, 0x061fff).rw(this, FUNC(taitotz_state::tlcs_common_r), FUNC(taitotz_state::tlcs_common_w)); + map(0x044000, 0x04400f).rw(FUNC(taitotz_state::tlcs_rtc_r), FUNC(taitotz_state::tlcs_rtc_w)); + map(0x060000, 0x061fff).rw(FUNC(taitotz_state::tlcs_common_r), FUNC(taitotz_state::tlcs_common_w)); map(0x064000, 0x064fff).ram().share("mbox_ram"); // MBox - map(0x068000, 0x06800f).w(m_ata, FUNC(ata_interface_device::write_cs0)).r(this, FUNC(taitotz_state::tlcs_ide0_r)); - map(0x06c000, 0x06c00f).w(m_ata, FUNC(ata_interface_device::write_cs1)).r(this, FUNC(taitotz_state::tlcs_ide1_r)); + map(0x068000, 0x06800f).w(m_ata, FUNC(ata_interface_device::cs0_w)).r(FUNC(taitotz_state::tlcs_ide0_r)); + map(0x06c000, 0x06c00f).w(m_ata, FUNC(ata_interface_device::cs1_w)).r(FUNC(taitotz_state::tlcs_ide1_r)); map(0xfc0000, 0xffffff).rom().region("io_cpu", 0); } @@ -2239,11 +2239,11 @@ void taitotz_state::landhigh_tlcs900h_mem(address_map &map) { map(0x200000, 0x21ffff).ram(); // Work RAM map(0x400000, 0x401fff).ram().share("nvram"); // Backup RAM - map(0x404000, 0x40400f).rw(this, FUNC(taitotz_state::tlcs_rtc_r), FUNC(taitotz_state::tlcs_rtc_w)); - map(0x900000, 0x901fff).rw(this, FUNC(taitotz_state::tlcs_common_r), FUNC(taitotz_state::tlcs_common_w)); + map(0x404000, 0x40400f).rw(FUNC(taitotz_state::tlcs_rtc_r), FUNC(taitotz_state::tlcs_rtc_w)); + map(0x900000, 0x901fff).rw(FUNC(taitotz_state::tlcs_common_r), FUNC(taitotz_state::tlcs_common_w)); map(0x910000, 0x910fff).ram().share("mbox_ram"); // MBox - map(0x908000, 0x90800f).w(m_ata, FUNC(ata_interface_device::write_cs0)).r(this, FUNC(taitotz_state::tlcs_ide0_r)); - map(0x918000, 0x91800f).w(m_ata, FUNC(ata_interface_device::write_cs1)).r(this, FUNC(taitotz_state::tlcs_ide1_r)); + map(0x908000, 0x90800f).w(m_ata, FUNC(ata_interface_device::cs0_w)).r(FUNC(taitotz_state::tlcs_ide0_r)); + map(0x918000, 0x91800f).w(m_ata, FUNC(ata_interface_device::cs1_w)).r(FUNC(taitotz_state::tlcs_ide1_r)); map(0xfc0000, 0xffffff).rom().region("io_cpu", 0); } diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp index 9c1e88fca7b..5ff066ebcf8 100644 --- a/src/mame/drivers/taitowlf.cpp +++ b/src/mame/drivers/taitowlf.cpp @@ -291,7 +291,7 @@ void taitowlf_state::taitowlf_map(address_map &map) #endif map(0x000e0000, 0x000effff).ram(); map(0x000f0000, 0x000fffff).bankr("bank1"); - map(0x000f0000, 0x000fffff).w(this, FUNC(taitowlf_state::bios_ram_w)); + map(0x000f0000, 0x000fffff).w(FUNC(taitowlf_state::bios_ram_w)); map(0x00100000, 0x01ffffff).ram(); // AM_RANGE(0xf8000000, 0xf83fffff) AM_ROM AM_REGION("user3", 0) map(0xfffc0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ @@ -304,13 +304,13 @@ void taitowlf_state::taitowlf_io(address_map &map) map(0x00e8, 0x00eb).noprw(); map(0x0300, 0x03af).noprw(); map(0x03b0, 0x03df).noprw(); - map(0x0278, 0x027b).w(this, FUNC(taitowlf_state::pnp_config_w)); + map(0x0278, 0x027b).w(FUNC(taitowlf_state::pnp_config_w)); #if ENABLE_VGA map(0x03b0, 0x03bf).rw("vga", FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w)); map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); #endif - map(0x0a78, 0x0a7b).w(this, FUNC(taitowlf_state::pnp_data_w)); + map(0x0a78, 0x0a7b).w(FUNC(taitowlf_state::pnp_data_w)); map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); } diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 17a50f57db5..67157c1548b 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -559,11 +559,11 @@ void tandy1000_state::tandy1000_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(t1000_mb_device::map)); - map(0x0060, 0x0063).rw(this, FUNC(tandy1000_state::tandy1000_pio_r), FUNC(tandy1000_state::tandy1000_pio_w)); - map(0x00a0, 0x00a0).w(this, FUNC(tandy1000_state::nmi_vram_bank_w)); - map(0x00c0, 0x00c0).w("sn76496", FUNC(ncr7496_device::write)); + map(0x0060, 0x0063).rw(FUNC(tandy1000_state::tandy1000_pio_r), FUNC(tandy1000_state::tandy1000_pio_w)); + map(0x00a0, 0x00a0).w(FUNC(tandy1000_state::nmi_vram_bank_w)); + map(0x00c0, 0x00c0).w("sn76496", FUNC(ncr7496_device::command_w)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); - map(0x0378, 0x037f).rw(this, FUNC(tandy1000_state::pc_t1t_p37x_r), FUNC(tandy1000_state::pc_t1t_p37x_w)); + map(0x0378, 0x037f).rw(FUNC(tandy1000_state::pc_t1t_p37x_r), FUNC(tandy1000_state::pc_t1t_p37x_w)); map(0x03d0, 0x03df).r(m_video, FUNC(pcvideo_t1000_device::read)).w(m_video, FUNC(pcvideo_t1000_device::write)); } @@ -585,28 +585,28 @@ void tandy1000_state::tandy1000_16_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m(m_mb, FUNC(t1000_mb_device::map)); - map(0x0060, 0x0063).rw(this, FUNC(tandy1000_state::tandy1000_pio_r), FUNC(tandy1000_state::tandy1000_pio_w)); - map(0x0065, 0x0065).w(this, FUNC(tandy1000_state::devctrl_w)); - map(0x00a0, 0x00a0).r(this, FUNC(tandy1000_state::unk_r)); - map(0x00c0, 0x00c1).w("sn76496", FUNC(ncr7496_device::write)); + map(0x0060, 0x0063).rw(FUNC(tandy1000_state::tandy1000_pio_r), FUNC(tandy1000_state::tandy1000_pio_w)); + map(0x0065, 0x0065).w(FUNC(tandy1000_state::devctrl_w)); + map(0x00a0, 0x00a0).r(FUNC(tandy1000_state::unk_r)); + map(0x00c0, 0x00c1).w("sn76496", FUNC(ncr7496_device::command_w)); map(0x0200, 0x0207).rw("pc_joy", FUNC(pc_joy_device::joy_port_r), FUNC(pc_joy_device::joy_port_w)); - map(0x0378, 0x037f).rw(this, FUNC(tandy1000_state::pc_t1t_p37x_r), FUNC(tandy1000_state::pc_t1t_p37x_w)); + map(0x0378, 0x037f).rw(FUNC(tandy1000_state::pc_t1t_p37x_r), FUNC(tandy1000_state::pc_t1t_p37x_w)); map(0x03d0, 0x03df).r(m_video, FUNC(pcvideo_t1000_device::read)).w(m_video, FUNC(pcvideo_t1000_device::write)); - map(0xffe8, 0xffe8).w(this, FUNC(tandy1000_state::vram_bank_w)); + map(0xffe8, 0xffe8).w(FUNC(tandy1000_state::vram_bank_w)); } void tandy1000_state::tandy1000_bank_io(address_map &map) { map.unmap_value_high(); tandy1000_16_io(map); - map(0xffea, 0xffeb).rw(this, FUNC(tandy1000_state::tandy1000_bank_r), FUNC(tandy1000_state::tandy1000_bank_w)); + map(0xffea, 0xffeb).rw(FUNC(tandy1000_state::tandy1000_bank_r), FUNC(tandy1000_state::tandy1000_bank_w)); } void tandy1000_state::tandy1000tx_io(address_map &map) { map.unmap_value_high(); tandy1000_16_io(map); - map(0x00a0, 0x00a0).w(this, FUNC(tandy1000_state::nmi_vram_bank_w)); + map(0x00a0, 0x00a0).w(FUNC(tandy1000_state::nmi_vram_bank_w)); } void tandy1000_state::tandy1000_286_map(address_map &map) diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index c3ae650b6f9..424d6a8206c 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -312,26 +312,26 @@ void tandy2k_state::tandy2k_mem(address_map &map) map.unmap_value_high(); // AM_RANGE(0x00000, 0xdffff) AM_RAM map(0xe0000, 0xf7fff).ram().share("hires_ram"); - map(0xf8000, 0xfbfff).rw(this, FUNC(tandy2k_state::char_ram_r), FUNC(tandy2k_state::char_ram_w)).umask16(0x00ff); + map(0xf8000, 0xfbfff).rw(FUNC(tandy2k_state::char_ram_r), FUNC(tandy2k_state::char_ram_w)).umask16(0x00ff); map(0xfc000, 0xfdfff).mirror(0x2000).rom().region(I80186_TAG, 0); } void tandy2k_state::tandy2k_io(address_map &map) { map.unmap_value_high(); - map(0x00000, 0x00000).mirror(0x8).rw(this, FUNC(tandy2k_state::enable_r), FUNC(tandy2k_state::enable_w)); - map(0x00002, 0x00002).mirror(0x8).w(this, FUNC(tandy2k_state::dma_mux_w)); - map(0x00004, 0x00004).mirror(0x8).rw(this, FUNC(tandy2k_state::fldtc_r), FUNC(tandy2k_state::fldtc_w)); + map(0x00000, 0x00000).mirror(0x8).rw(FUNC(tandy2k_state::enable_r), FUNC(tandy2k_state::enable_w)); + map(0x00002, 0x00002).mirror(0x8).w(FUNC(tandy2k_state::dma_mux_w)); + map(0x00004, 0x00004).mirror(0x8).rw(FUNC(tandy2k_state::fldtc_r), FUNC(tandy2k_state::fldtc_w)); map(0x00010, 0x00013).mirror(0xc).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)).umask16(0x00ff); map(0x00030, 0x00033).mirror(0xc).m(m_fdc, FUNC(i8272a_device::map)).umask16(0x00ff); map(0x00040, 0x00047).mirror(0x8).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); map(0x00050, 0x00057).mirror(0x8).rw(m_i8255a, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); - map(0x00052, 0x00052).mirror(0x8).r(this, FUNC(tandy2k_state::kbint_clr_r)); + map(0x00052, 0x00052).mirror(0x8).r(FUNC(tandy2k_state::kbint_clr_r)); map(0x00060, 0x00063).mirror(0xc).rw(m_pic0, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x00070, 0x00073).mirror(0xc).rw(m_pic1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); map(0x00080, 0x00080).mirror(0xe).rw(m_fdc, FUNC(i8272a_device::mdma_r), FUNC(i8272a_device::mdma_w)); // AM_RANGE(0x00100, 0x0017f) AM_DEVREADWRITE8(CRT9007_TAG, crt9007_t, read, write, 0x00ff) AM_WRITE8(addr_ctrl_w, 0xff00) - map(0x00100, 0x0017f).rw(this, FUNC(tandy2k_state::vpac_r), FUNC(tandy2k_state::vpac_w)); + map(0x00100, 0x0017f).rw(FUNC(tandy2k_state::vpac_r), FUNC(tandy2k_state::vpac_w)); // AM_RANGE(0x00180, 0x00180) AM_READ8(hires_status_r, 0x00ff) // AM_RANGE(0x00180, 0x001bf) AM_WRITE(hires_palette_w) // AM_RANGE(0x001a0, 0x001a0) AM_READ8(hires_plane_w, 0x00ff) @@ -348,7 +348,7 @@ void tandy2k_state::tandy2k_hd_io(address_map &map) void tandy2k_state::vpac_mem(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(tandy2k_state::videoram_r)); + map(0x0000, 0x3fff).r(FUNC(tandy2k_state::videoram_r)); } // Input Ports @@ -821,7 +821,7 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k) // devices MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTB_CB(READ8(*this, tandy2k_state, ppi_pb_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tandy2k_state, ppi_pc_w)) diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp index 2c6fe90b0ed..241fbff118d 100644 --- a/src/mame/drivers/tank8.cpp +++ b/src/mame/drivers/tank8.cpp @@ -101,7 +101,7 @@ void tank8_state::tank8_cpu_map(address_map &map) map(0x0400, 0x17ff).rom(); map(0xf800, 0xffff).rom(); - map(0x1c00, 0x1c00).r(this, FUNC(tank8_state::collision_r)); + map(0x1c00, 0x1c00).r(FUNC(tank8_state::collision_r)); map(0x1c01, 0x1c01).portr("P1"); map(0x1c02, 0x1c02).portr("P2"); @@ -116,20 +116,20 @@ void tank8_state::tank8_cpu_map(address_map &map) map(0x1c0b, 0x1c0b).portr("RC"); map(0x1c0f, 0x1c0f).portr("VBLANK"); - map(0x1800, 0x1bff).w(this, FUNC(tank8_state::video_ram_w)).share("video_ram"); + map(0x1800, 0x1bff).w(FUNC(tank8_state::video_ram_w)).share("video_ram"); map(0x1c00, 0x1c0f).writeonly().share("pos_h_ram"); map(0x1c10, 0x1c1f).writeonly().share("pos_v_ram"); map(0x1c20, 0x1c2f).writeonly().share("pos_d_ram"); - map(0x1c30, 0x1c37).w(this, FUNC(tank8_state::lockout_w)); - map(0x1d00, 0x1d00).w(this, FUNC(tank8_state::int_reset_w)); - map(0x1d01, 0x1d01).w(this, FUNC(tank8_state::crash_w)); - map(0x1d02, 0x1d02).w(this, FUNC(tank8_state::explosion_w)); - map(0x1d03, 0x1d03).w(this, FUNC(tank8_state::bugle_w)); - map(0x1d04, 0x1d04).w(this, FUNC(tank8_state::bug_w)); + map(0x1c30, 0x1c37).w(FUNC(tank8_state::lockout_w)); + map(0x1d00, 0x1d00).w(FUNC(tank8_state::int_reset_w)); + map(0x1d01, 0x1d01).w(FUNC(tank8_state::crash_w)); + map(0x1d02, 0x1d02).w(FUNC(tank8_state::explosion_w)); + map(0x1d03, 0x1d03).w(FUNC(tank8_state::bugle_w)); + map(0x1d04, 0x1d04).w(FUNC(tank8_state::bug_w)); map(0x1d05, 0x1d05).writeonly().share("team"); - map(0x1d06, 0x1d06).w(this, FUNC(tank8_state::attract_w)); - map(0x1e00, 0x1e07).w(this, FUNC(tank8_state::motor_w)); + map(0x1d06, 0x1d06).w(FUNC(tank8_state::attract_w)); + map(0x1e00, 0x1e07).w(FUNC(tank8_state::motor_w)); } diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp index 2db68efb0aa..7e161152288 100644 --- a/src/mame/drivers/tankbatt.cpp +++ b/src/mame/drivers/tankbatt.cpp @@ -162,11 +162,11 @@ void tankbatt_state::main_map(address_map &map) map(0x0000, 0x000f).ram().share("bulletsram"); map(0x0010, 0x01ff).ram(); map(0x0200, 0x07ff).ram(); - map(0x0800, 0x0bff).ram().w(this, FUNC(tankbatt_state::videoram_w)).share("videoram"); - map(0x0c00, 0x0c07).r(this, FUNC(tankbatt_state::in0_r)).w("outlatch", FUNC(cd4099_device::write_d0)); - map(0x0c08, 0x0c0f).r(this, FUNC(tankbatt_state::in1_r)).w("mainlatch", FUNC(cd4099_device::write_d0)); - map(0x0c10, 0x0c10).w(this, FUNC(tankbatt_state::irq_ack_w)); - map(0x0c18, 0x0c1f).r(this, FUNC(tankbatt_state::dsw_r)); + map(0x0800, 0x0bff).ram().w(FUNC(tankbatt_state::videoram_w)).share("videoram"); + map(0x0c00, 0x0c07).r(FUNC(tankbatt_state::in0_r)).w("outlatch", FUNC(cd4099_device::write_d0)); + map(0x0c08, 0x0c0f).r(FUNC(tankbatt_state::in1_r)).w("mainlatch", FUNC(cd4099_device::write_d0)); + map(0x0c10, 0x0c10).w(FUNC(tankbatt_state::irq_ack_w)); + map(0x0c18, 0x0c1f).r(FUNC(tankbatt_state::dsw_r)); map(0x0c18, 0x0c18).nopw(); /* watchdog ?? */ map(0x6000, 0x7fff).rom().region("maincpu", 0); map(0xe000, 0xffff).rom().region("maincpu", 0); //mirror for the reset/irq vectors diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp index c6efd1883ee..97e2871a558 100644 --- a/src/mame/drivers/tankbust.cpp +++ b/src/mame/drivers/tankbust.cpp @@ -195,16 +195,16 @@ void tankbust_state::main_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x9fff).bankr("bank1"); map(0xa000, 0xbfff).bankr("bank2"); - map(0xc000, 0xc7ff).ram().w(this, FUNC(tankbust_state::background_videoram_w)).share("videoram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(tankbust_state::background_colorram_w)).share("colorram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(tankbust_state::txtram_w)).share("txtram"); + map(0xc000, 0xc7ff).ram().w(FUNC(tankbust_state::background_videoram_w)).share("videoram"); + map(0xc800, 0xcfff).ram().w(FUNC(tankbust_state::background_colorram_w)).share("colorram"); + map(0xd000, 0xd7ff).ram().w(FUNC(tankbust_state::txtram_w)).share("txtram"); map(0xd800, 0xd8ff).ram().share("spriteram"); - map(0xe000, 0xe007).rw(this, FUNC(tankbust_state::debug_output_area_r), FUNC(tankbust_state::e0xx_w)); - map(0xe800, 0xe800).portr("INPUTS").w(this, FUNC(tankbust_state::yscroll_w)); + map(0xe000, 0xe007).rw(FUNC(tankbust_state::debug_output_area_r), FUNC(tankbust_state::e0xx_w)); + map(0xe800, 0xe800).portr("INPUTS").w(FUNC(tankbust_state::yscroll_w)); map(0xe801, 0xe801).portr("SYSTEM"); map(0xe802, 0xe802).portr("DSW"); - map(0xe801, 0xe802).w(this, FUNC(tankbust_state::xscroll_w)); - map(0xe803, 0xe803).rw(this, FUNC(tankbust_state::some_changing_input), FUNC(tankbust_state::soundlatch_w)); /*unknown. Game expects this to change so this is not player input */ + map(0xe801, 0xe802).w(FUNC(tankbust_state::xscroll_w)); + map(0xe803, 0xe803).rw(FUNC(tankbust_state::some_changing_input), FUNC(tankbust_state::soundlatch_w)); /*unknown. Game expects this to change so this is not player input */ map(0xe804, 0xe804).nopw(); /* watchdog ? ; written in long-lasting loops */ map(0xf000, 0xf7ff).ram(); //AM_RANGE(0xf800, 0xffff) AM_READ(read_from_unmapped_memory) /* a bug in game code ? */ diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp index 6d9b80b9875..0481af03a2a 100644 --- a/src/mame/drivers/taotaido.cpp +++ b/src/mame/drivers/taotaido.cpp @@ -99,7 +99,7 @@ WRITE8_MEMBER(taotaido_state::unknown_output_w) void taotaido_state::main_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x800000, 0x803fff).ram().w(this, FUNC(taotaido_state::bgvideoram_w)).share("bgram"); // bg ram? + map(0x800000, 0x803fff).ram().w(FUNC(taotaido_state::bgvideoram_w)).share("bgram"); // bg ram? map(0xa00000, 0xa01fff).ram().share("spriteram"); // sprite ram map(0xc00000, 0xc0ffff).ram().share("spriteram2"); // sprite tile lookup ram map(0xfe0000, 0xfeffff).ram(); // main ram @@ -107,12 +107,12 @@ void taotaido_state::main_map(address_map &map) map(0xffe000, 0xffe3ff).ram().share("scrollram"); // rowscroll / rowselect / scroll ram map(0xffff80, 0xffff9f).rw("io1", FUNC(vs9209_device::read), FUNC(vs9209_device::write)).umask16(0x00ff); map(0xffffa0, 0xffffbf).rw("io2", FUNC(vs9209_device::read), FUNC(vs9209_device::write)).umask16(0x00ff); - map(0xffff00, 0xffff0f).w(this, FUNC(taotaido_state::tileregs_w)); + map(0xffff00, 0xffff0f).w(FUNC(taotaido_state::tileregs_w)); map(0xffff10, 0xffff11).nopw(); // unknown map(0xffff20, 0xffff21).nopw(); // unknown - flip screen related - map(0xffff40, 0xffff47).w(this, FUNC(taotaido_state::sprite_character_bank_select_w)); + map(0xffff40, 0xffff47).w(FUNC(taotaido_state::sprite_character_bank_select_w)); map(0xffffc1, 0xffffc1).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // seems right - map(0xffffe0, 0xffffe1).r(this, FUNC(taotaido_state::pending_command_r)); // guess - seems to be needed for all the sounds to work + map(0xffffe0, 0xffffe1).r(FUNC(taotaido_state::pending_command_r)); // guess - seems to be needed for all the sounds to work } /* sound cpu - same as aerofgt */ @@ -134,7 +134,7 @@ void taotaido_state::sound_port_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x04, 0x04).w(this, FUNC(taotaido_state::sh_bankswitch_w)); + map(0x04, 0x04).w(FUNC(taotaido_state::sh_bankswitch_w)); map(0x08, 0x08).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0x0c, 0x0c).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp index e140a3882c7..fc10488ff35 100644 --- a/src/mame/drivers/tapatune.cpp +++ b/src/mame/drivers/tapatune.cpp @@ -285,9 +285,9 @@ void tapatune_state::video_map(address_map &map) map(0x000000, 0x2fffff).rom(); map(0x300000, 0x31ffff).ram().share("videoram"); map(0x320000, 0x33ffff).ram(); - map(0x400000, 0x400003).rw(this, FUNC(tapatune_state::read_from_z80), FUNC(tapatune_state::write_to_z80)); + map(0x400000, 0x400003).rw(FUNC(tapatune_state::read_from_z80), FUNC(tapatune_state::write_to_z80)); map(0x400010, 0x400011).noprw(); // Watchdog? - map(0x600000, 0x600005).w(this, FUNC(tapatune_state::palette_w)); + map(0x600000, 0x600005).w(FUNC(tapatune_state::palette_w)); map(0x800000, 0x800000).w("crtc", FUNC(mc6845_device::address_w)); map(0x800002, 0x800002).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } @@ -303,20 +303,20 @@ void tapatune_state::maincpu_map(address_map &map) void tapatune_state::maincpu_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(tapatune_state::bsmt_data_lo_w)); - map(0x08, 0x08).w(this, FUNC(tapatune_state::bsmt_data_hi_w)); - map(0x10, 0x10).w(this, FUNC(tapatune_state::bsmt_reg_w)); - map(0x18, 0x18).w(this, FUNC(tapatune_state::controls_mux)); - map(0x20, 0x20).r(this, FUNC(tapatune_state::sound_irq_clear)); - map(0x28, 0x28).r(this, FUNC(tapatune_state::status_r)); - map(0x30, 0x30).r(this, FUNC(tapatune_state::controls_r)); + map(0x00, 0x00).w(FUNC(tapatune_state::bsmt_data_lo_w)); + map(0x08, 0x08).w(FUNC(tapatune_state::bsmt_data_hi_w)); + map(0x10, 0x10).w(FUNC(tapatune_state::bsmt_reg_w)); + map(0x18, 0x18).w(FUNC(tapatune_state::controls_mux)); + map(0x20, 0x20).r(FUNC(tapatune_state::sound_irq_clear)); + map(0x28, 0x28).r(FUNC(tapatune_state::status_r)); + map(0x30, 0x30).r(FUNC(tapatune_state::controls_r)); map(0x38, 0x38).portr("COINS"); - map(0x60, 0x60).w(this, FUNC(tapatune_state::write_index_to_68k)); - map(0x61, 0x61).w(this, FUNC(tapatune_state::write_data_to_68k)); - map(0x63, 0x63).w(this, FUNC(tapatune_state::lamps_w)); - map(0x68, 0x68).r(this, FUNC(tapatune_state::read_index_from_68k)); - map(0x69, 0x69).r(this, FUNC(tapatune_state::read_data_from_68k)); - map(0x6b, 0x6b).r(this, FUNC(tapatune_state::special_r)); + map(0x60, 0x60).w(FUNC(tapatune_state::write_index_to_68k)); + map(0x61, 0x61).w(FUNC(tapatune_state::write_data_to_68k)); + map(0x63, 0x63).w(FUNC(tapatune_state::lamps_w)); + map(0x68, 0x68).r(FUNC(tapatune_state::read_index_from_68k)); + map(0x69, 0x69).r(FUNC(tapatune_state::read_data_from_68k)); + map(0x6b, 0x6b).r(FUNC(tapatune_state::special_r)); } diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index f2c22f3099d..8988f0adeea 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -140,13 +140,13 @@ READ8_MEMBER(targeth_state::shareram_r) void targeth_state::mcu_hostmem_map(address_map &map) { - map(0x8000, 0xffff).rw(this, FUNC(targeth_state::shareram_r), FUNC(targeth_state::shareram_w)); // confirmed that 0x8000 - 0xffff is a window into 68k shared RAM + map(0x8000, 0xffff).rw(FUNC(targeth_state::shareram_r), FUNC(targeth_state::shareram_w)); // confirmed that 0x8000 - 0xffff is a window into 68k shared RAM } void targeth_state::main_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x103fff).ram().w(this, FUNC(targeth_state::vram_w)).share("videoram"); /* Video RAM */ + map(0x100000, 0x103fff).ram().w(FUNC(targeth_state::vram_w)).share("videoram"); /* Video RAM */ map(0x108000, 0x108007).writeonly().share("vregs"); /* Video Registers */ map(0x108000, 0x108001).portr("GUNX1"); map(0x108002, 0x108003).portr("GUNY1"); @@ -160,8 +160,8 @@ void targeth_state::main_map(address_map &map) map(0x700002, 0x700003).portr("DSW1"); map(0x700006, 0x700007).portr("SYSTEM"); /* Coins, Start & Fire buttons */ map(0x700008, 0x700009).portr("SERVICE"); /* Service & Guns Reload? */ - map(0x70000a, 0x70000b).select(0x000070).w(this, FUNC(targeth_state::output_latch_w)); - map(0x70000c, 0x70000d).w(this, FUNC(targeth_state::OKIM6295_bankswitch_w)); /* OKI6295 bankswitch */ + map(0x70000a, 0x70000b).select(0x000070).w(FUNC(targeth_state::output_latch_w)); + map(0x70000c, 0x70000d).w(FUNC(targeth_state::OKIM6295_bankswitch_w)); /* OKI6295 bankswitch */ map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status register */ map(0x700010, 0x700011).nopw(); /* ??? Guns reload related? */ map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index ff1571c4ff4..e0c29806cde 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -244,21 +244,21 @@ void kongambl_state::kongambl_map(address_map &map) map(0x4cc000, 0x4cc00f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); - map(0x4d0000, 0x4d0000).w(this, FUNC(kongambl_state::kongambl_ff_w)); + map(0x4d0000, 0x4d0000).w(FUNC(kongambl_state::kongambl_ff_w)); map(0x500000, 0x5007ff).ram(); - map(0x500380, 0x500383).r(this, FUNC(kongambl_state::test_r)); + map(0x500380, 0x500383).r(FUNC(kongambl_state::test_r)); // AM_RANGE(0x500400, 0x500403) AM_NOP //dual port? // AM_RANGE(0x500420, 0x500423) AM_NOP //dual port? // AM_RANGE(0x500500, 0x500503) AM_NOP // reads sound ROM in here, polled from m68k? - map(0x580000, 0x580007).r(this, FUNC(kongambl_state::test_r)); + map(0x580000, 0x580007).r(FUNC(kongambl_state::test_r)); - map(0x600000, 0x60000f).r(this, FUNC(kongambl_state::test_r)); + map(0x600000, 0x60000f).r(FUNC(kongambl_state::test_r)); - map(0x700000, 0x700003).r(this, FUNC(kongambl_state::eeprom_r)); + map(0x700000, 0x700003).r(FUNC(kongambl_state::eeprom_r)); map(0x700004, 0x700007).portr("IN1"); map(0x700008, 0x70000b).portr("IN3"); - map(0x780000, 0x780003).w(this, FUNC(kongambl_state::eeprom_w)); + map(0x780000, 0x780003).w(FUNC(kongambl_state::eeprom_w)); //AM_RANGE(0x780004, 0x780007) AM_WRITENOP } diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 025c9f397b6..da6417d3ec7 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -244,13 +244,13 @@ void apache3_state::apache3_v30_map(address_map &map) map(0x00000, 0x03fff).ram(); map(0x04000, 0x07fff).ram().share("nvram"); map(0x08000, 0x08fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0c000, 0x0dfff).ram().w(this, FUNC(apache3_state::text_w)).share("videoram"); - map(0x0e800, 0x0e803).w(this, FUNC(tatsumi_state::hd6445_crt_w)).umask16(0x00ff); + map(0x0c000, 0x0dfff).ram().w(FUNC(apache3_state::text_w)).share("videoram"); + map(0x0e800, 0x0e803).w(FUNC(tatsumi_state::hd6445_crt_w)).umask16(0x00ff); map(0x0f000, 0x0f001).portr("DSW"); map(0x0f000, 0x0f001).nopw(); // todo - map(0x0f800, 0x0f801).rw(this, FUNC(apache3_state::apache3_bank_r), FUNC(apache3_state::apache3_bank_w)); - map(0x10000, 0x1ffff).rw(this, FUNC(apache3_state::apache3_v30_v20_r), FUNC(apache3_state::apache3_v30_v20_w)); - map(0x20000, 0x2ffff).rw(this, FUNC(apache3_state::tatsumi_v30_68000_r), FUNC(apache3_state::tatsumi_v30_68000_w)); + map(0x0f800, 0x0f801).rw(FUNC(apache3_state::apache3_bank_r), FUNC(apache3_state::apache3_bank_w)); + map(0x10000, 0x1ffff).rw(FUNC(apache3_state::apache3_v30_v20_r), FUNC(apache3_state::apache3_v30_v20_w)); + map(0x20000, 0x2ffff).rw(FUNC(apache3_state::tatsumi_v30_68000_r), FUNC(apache3_state::tatsumi_v30_68000_w)); map(0x80000, 0xfffff).rom().region("master_rom", 0); } @@ -259,12 +259,12 @@ void apache3_state::apache3_68000_map(address_map &map) map(0x00000, 0x7ffff).rom().region("slave_rom", 0); map(0x80000, 0x83fff).ram().share("sharedram"); map(0x90000, 0x93fff).ram().share("spriteram"); - map(0x9a000, 0x9a1ff).rw(this, FUNC(apache3_state::tatsumi_sprite_control_r), FUNC(apache3_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); - map(0xa0000, 0xa0001).w(this, FUNC(apache3_state::apache3_rotate_w)); // /BNKCS - map(0xb0000, 0xb0001).w(this, FUNC(apache3_state::apache3_z80_ctrl_w)); - map(0xc0000, 0xc0001).w(this, FUNC(apache3_state::apache3_road_z_w)); // /LINCS + map(0x9a000, 0x9a1ff).rw(FUNC(apache3_state::tatsumi_sprite_control_r), FUNC(apache3_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); + map(0xa0000, 0xa0001).w(FUNC(apache3_state::apache3_rotate_w)); // /BNKCS + map(0xb0000, 0xb0001).w(FUNC(apache3_state::apache3_z80_ctrl_w)); + map(0xc0000, 0xc0001).w(FUNC(apache3_state::apache3_road_z_w)); // /LINCS map(0xd0000, 0xdffff).ram().share("apache3_g_ram"); // /GRDCS - map(0xe0000, 0xe7fff).rw(this, FUNC(apache3_state::apache3_z80_r), FUNC(apache3_state::apache3_z80_w)); + map(0xe0000, 0xe7fff).rw(FUNC(apache3_state::apache3_z80_r), FUNC(apache3_state::apache3_z80_w)); } void apache3_state::apache3_v20_map(address_map &map) @@ -272,7 +272,7 @@ void apache3_state::apache3_v20_map(address_map &map) map(0x00000, 0x01fff).ram(); map(0x04000, 0x04003).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x06000, 0x06001).portr("IN0"); // esw - map(0x08000, 0x08001).r(this, FUNC(apache3_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write)); + map(0x08000, 0x08001).r(FUNC(apache3_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write)); map(0x0a000, 0x0a000).r(m_oki, FUNC(okim6295_device::read)).w(m_oki, FUNC(okim6295_device::write)); map(0x0e000, 0x0e007).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)); map(0xf0000, 0xfffff).rom().region("sound_rom", 0); @@ -281,7 +281,7 @@ void apache3_state::apache3_v20_map(address_map &map) void apache3_state::apache3_z80_map(address_map &map) { map(0x0000, 0x1fff).ram().share("apache3_z80_ram"); - map(0x8000, 0xffff).w(this, FUNC(apache3_state::apache3_road_x_w)); + map(0x8000, 0xffff).w(FUNC(apache3_state::apache3_road_x_w)); } /*****************************************************************/ @@ -289,17 +289,17 @@ void apache3_state::apache3_z80_map(address_map &map) void roundup5_state::roundup5_v30_map(address_map &map) { map(0x00000, 0x07fff).ram(); - map(0x08000, 0x0bfff).ram().w(this, FUNC(roundup5_state::text_w)).share("videoram"); - map(0x0c000, 0x0c003).w(this, FUNC(tatsumi_state::hd6445_crt_w)).umask16(0x00ff); + map(0x08000, 0x0bfff).ram().w(FUNC(roundup5_state::text_w)).share("videoram"); + map(0x0c000, 0x0c003).w(FUNC(tatsumi_state::hd6445_crt_w)).umask16(0x00ff); map(0x0d000, 0x0d001).portr("DSW"); map(0x0d400, 0x0d40f).ram().share("vregs"); map(0x0d800, 0x0d801).writeonly().share("bg_scrollx"); map(0x0dc00, 0x0dc01).writeonly().share("bg_scrolly"); - map(0x0e000, 0x0e001).w(this, FUNC(roundup5_state::roundup5_control_w)); + map(0x0e000, 0x0e001).w(FUNC(roundup5_state::roundup5_control_w)); map(0x0f000, 0x0ffff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); - map(0x10000, 0x1ffff).rw(this, FUNC(roundup5_state::roundup_v30_z80_r), FUNC(roundup5_state::roundup_v30_z80_w)); - map(0x20000, 0x2ffff).rw(this, FUNC(roundup5_state::tatsumi_v30_68000_r), FUNC(roundup5_state::tatsumi_v30_68000_w)); - map(0x30000, 0x3ffff).rw(this, FUNC(roundup5_state::gfxdata_r), FUNC(roundup5_state::gfxdata_w)).umask16(0x00ff); + map(0x10000, 0x1ffff).rw(FUNC(roundup5_state::roundup_v30_z80_r), FUNC(roundup5_state::roundup_v30_z80_w)); + map(0x20000, 0x2ffff).rw(FUNC(roundup5_state::tatsumi_v30_68000_r), FUNC(roundup5_state::tatsumi_v30_68000_w)); + map(0x30000, 0x3ffff).rw(FUNC(roundup5_state::gfxdata_r), FUNC(roundup5_state::gfxdata_w)).umask16(0x00ff); map(0x80000, 0xfffff).rom().region("master_rom", 0); } @@ -308,19 +308,19 @@ void roundup5_state::roundup5_68000_map(address_map &map) map(0x00000, 0x7ffff).rom().region("slave_rom", 0); map(0x80000, 0x83fff).ram().share("sharedram"); map(0x90000, 0x93fff).ram().share("spriteram"); - map(0x9a000, 0x9a1ff).rw(this, FUNC(roundup5_state::tatsumi_sprite_control_r), FUNC(roundup5_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); + map(0x9a000, 0x9a1ff).rw(FUNC(roundup5_state::tatsumi_sprite_control_r), FUNC(roundup5_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); map(0xa0000, 0xa0fff).ram().share("road_ctrl_ram"); // Road control data map(0xb0000, 0xb0fff).ram().share("road_pixel_ram"); // Road pixel data map(0xc0000, 0xc0fff).ram().share("road_color_ram"); // Road colour data map(0xd0000, 0xd0001).ram().share("road_yclip"); - map(0xe0000, 0xe0001).ram().w(this, FUNC(roundup5_state::road_vregs_w)).share("road_vregs"); + map(0xe0000, 0xe0001).ram().w(FUNC(roundup5_state::road_vregs_w)).share("road_vregs"); } void roundup5_state::roundup5_z80_map(address_map &map) { map(0x0000, 0xdfff).rom(); map(0xe000, 0xffef).ram(); - map(0xfff0, 0xfff1).r(this, FUNC(roundup5_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write)); + map(0xfff0, 0xfff1).r(FUNC(roundup5_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write)); map(0xfff4, 0xfff4).r(m_oki, FUNC(okim6295_device::read)).w(m_oki, FUNC(okim6295_device::write)); map(0xfff8, 0xfffb).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xfffc, 0xfffc).portr("STICKX"); @@ -330,21 +330,21 @@ void roundup5_state::roundup5_z80_map(address_map &map) void cyclwarr_state::common_map(address_map &map) { - map(0x080000, 0x08ffff).rw(this, FUNC(cyclwarr_state::cyclwarr_videoram_r<1>), FUNC(cyclwarr_state::cyclwarr_videoram_w<1>)).share("cw_videoram1"); - map(0x090000, 0x09ffff).rw(this, FUNC(cyclwarr_state::cyclwarr_videoram_r<0>), FUNC(cyclwarr_state::cyclwarr_videoram_w<0>)).share("cw_videoram0"); + map(0x080000, 0x08ffff).rw(FUNC(cyclwarr_state::cyclwarr_videoram_r<1>), FUNC(cyclwarr_state::cyclwarr_videoram_w<1>)).share("cw_videoram1"); + map(0x090000, 0x09ffff).rw(FUNC(cyclwarr_state::cyclwarr_videoram_r<0>), FUNC(cyclwarr_state::cyclwarr_videoram_w<0>)).share("cw_videoram0"); - map(0x0a2000, 0x0a2007).w(this, FUNC(cyclwarr_state::video_config_w)); - map(0x0a4000, 0x0a4001).w(this, FUNC(cyclwarr_state::bigfight_a40000_w)); - map(0x0a6000, 0x0a6001).w(this, FUNC(cyclwarr_state::mixing_control_w)); - map(0x0ac000, 0x0ac003).w(this, FUNC(tatsumi_state::hd6445_crt_w)).umask16(0x00ff); + map(0x0a2000, 0x0a2007).w(FUNC(cyclwarr_state::video_config_w)); + map(0x0a4000, 0x0a4001).w(FUNC(cyclwarr_state::bigfight_a40000_w)); + map(0x0a6000, 0x0a6001).w(FUNC(cyclwarr_state::mixing_control_w)); + map(0x0ac000, 0x0ac003).w(FUNC(tatsumi_state::hd6445_crt_w)).umask16(0x00ff); - map(0x0b8000, 0x0b8001).w(this, FUNC(cyclwarr_state::cyclwarr_sound_w)).umask16(0xff00); + map(0x0b8000, 0x0b8001).w(FUNC(cyclwarr_state::cyclwarr_sound_w)).umask16(0xff00); map(0x0b9000, 0x0b900f).rw("io1", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)).umask16(0x00ff).cswidth(16); map(0x0ba000, 0x0ba00f).rw("io2", FUNC(cxd1095_device::read), FUNC(cxd1095_device::write)).umask16(0x00ff).cswidth(16); - map(0x0bc000, 0x0bc001).w(this, FUNC(cyclwarr_state::output_w)); + map(0x0bc000, 0x0bc001).w(FUNC(cyclwarr_state::output_w)); - map(0x0c0000, 0x0c3fff).rw(this, FUNC(cyclwarr_state::cyclwarr_sprite_r), FUNC(cyclwarr_state::cyclwarr_sprite_w)).share("spriteram"); - map(0x0ca000, 0x0ca1ff).rw(this, FUNC(cyclwarr_state::tatsumi_sprite_control_r), FUNC(cyclwarr_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); + map(0x0c0000, 0x0c3fff).rw(FUNC(cyclwarr_state::cyclwarr_sprite_r), FUNC(cyclwarr_state::cyclwarr_sprite_w)).share("spriteram"); + map(0x0ca000, 0x0ca1ff).rw(FUNC(cyclwarr_state::tatsumi_sprite_control_r), FUNC(cyclwarr_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); map(0x0d0000, 0x0d3fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // games accesses these ranges differently, we do mirroring in rom loading to make them match. @@ -379,8 +379,8 @@ void cyclwarr_state::sound_map(address_map &map) { map(0x0000, 0xdfff).rom(); map(0xe000, 0xffef).ram(); - map(0xfff0, 0xfff1).r(this, FUNC(cyclwarr_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write)); - map(0xfff4, 0xfff4).r(this, FUNC(cyclwarr_state::oki_status_xor_r)).w(m_oki, FUNC(okim6295_device::write)); + map(0xfff0, 0xfff1).r(FUNC(cyclwarr_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write)); + map(0xfff4, 0xfff4).r(FUNC(cyclwarr_state::oki_status_xor_r)).w(m_oki, FUNC(okim6295_device::write)); map(0xfffc, 0xfffc).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xfffe, 0xfffe).nopw(); } diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp index e1e207d4cb1..2e0db4504cb 100644 --- a/src/mame/drivers/tattack.cpp +++ b/src/mame/drivers/tattack.cpp @@ -272,11 +272,11 @@ void tattack_state::tattack_map(address_map &map) map(0x6000, 0x6000).portr("DSW2"); map(0x7000, 0x73ff).ram().share("colorram"); // color map ? something else .. only bits 1-3 are used map(0xa000, 0xa000).portr("DSW1"); // dsw ? something else ? - map(0xc000, 0xc000).portr("INPUTS").w(this, FUNC(tattack_state::sound_w)); // sound - map(0xc001, 0xc001).w(this, FUNC(tattack_state::brick_dma_w)); // bit 7 = strobe ($302) + map(0xc000, 0xc000).portr("INPUTS").w(FUNC(tattack_state::sound_w)); // sound + map(0xc001, 0xc001).w(FUNC(tattack_state::brick_dma_w)); // bit 7 = strobe ($302) map(0xc002, 0xc002).nopw(); // same as sound port, outputs? - map(0xc005, 0xc005).w(this, FUNC(tattack_state::paddle_w)); - map(0xc006, 0xc007).w(this, FUNC(tattack_state::ball_w)); + map(0xc005, 0xc005).w(FUNC(tattack_state::paddle_w)); + map(0xc006, 0xc007).w(FUNC(tattack_state::ball_w)); map(0xe000, 0xe3ff).ram().share("ram"); } diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index 42e0839e812..0d8bcf09744 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -135,7 +135,7 @@ void tavernie_state::ivg09_mem(address_map &map) map(0x2080, 0x2080).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); map(0x2081, 0x2081).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0xe000, 0xe003).rw(m_fdc, FUNC(fd1795_device::read), FUNC(fd1795_device::write)); - map(0xe080, 0xe080).w(this, FUNC(tavernie_state::ds_w)); + map(0xe080, 0xe080).w(FUNC(tavernie_state::ds_w)); map(0xeb00, 0xeb03).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xeb04, 0xeb05).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write)); map(0xeb08, 0xeb0f).rw("ptm", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index bd4559a488e..59e5d42eaf8 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -61,18 +61,18 @@ void tbowl_state::_6206B_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).ram(); - map(0xa000, 0xbfff).ram().w(this, FUNC(tbowl_state::bg2videoram_w)).share("bg2videoram"); - map(0xc000, 0xdfff).ram().w(this, FUNC(tbowl_state::bgvideoram_w)).share("bgvideoram"); - map(0xe000, 0xefff).ram().w(this, FUNC(tbowl_state::txvideoram_w)).share("txvideoram"); + map(0xa000, 0xbfff).ram().w(FUNC(tbowl_state::bg2videoram_w)).share("bg2videoram"); + map(0xc000, 0xdfff).ram().w(FUNC(tbowl_state::bgvideoram_w)).share("bgvideoram"); + map(0xe000, 0xefff).ram().w(FUNC(tbowl_state::txvideoram_w)).share("txvideoram"); // AM_RANGE(0xf000, 0xf000) AM_WRITE(unknown_write) * written during start-up, not again */ map(0xf000, 0xf7ff).bankr("mainbank"); map(0xf800, 0xfbff).ram().share("shared_ram"); /* check */ - map(0xfc00, 0xfc00).portr("P1").w(this, FUNC(tbowl_state::boardb_bankswitch_w)); + map(0xfc00, 0xfc00).portr("P1").w(FUNC(tbowl_state::boardb_bankswitch_w)); map(0xfc01, 0xfc01).portr("P2"); // AM_RANGE(0xfc01, 0xfc01) AM_WRITE(unknown_write) /* written during start-up, not again */ map(0xfc02, 0xfc02).portr("P3"); // AM_RANGE(0xfc02, 0xfc02) AM_WRITE(unknown_write) /* written during start-up, not again */ - map(0xfc03, 0xfc03).portr("P4").w(this, FUNC(tbowl_state::coincounter_w)); + map(0xfc03, 0xfc03).portr("P4").w(FUNC(tbowl_state::coincounter_w)); // AM_RANGE(0xfc05, 0xfc05) AM_WRITE(unknown_write) /* no idea */ // AM_RANGE(0xfc06, 0xfc06) AM_READ(dummy_r) /* Read During NMI */ map(0xfc07, 0xfc07).portr("SYSTEM"); @@ -82,14 +82,14 @@ void tbowl_state::_6206B_map(address_map &map) map(0xfc0a, 0xfc0a).portr("DSW3"); // AM_RANGE(0xfc0a, 0xfc0a) AM_WRITE(unknown_write) /* hardly used .. */ map(0xfc0d, 0xfc0d).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xfc10, 0xfc10).w(this, FUNC(tbowl_state::bg2xscroll_lo)); - map(0xfc11, 0xfc11).w(this, FUNC(tbowl_state::bg2xscroll_hi)); - map(0xfc12, 0xfc12).w(this, FUNC(tbowl_state::bg2yscroll_lo)); - map(0xfc13, 0xfc13).w(this, FUNC(tbowl_state::bg2yscroll_hi)); - map(0xfc14, 0xfc14).w(this, FUNC(tbowl_state::bgxscroll_lo)); - map(0xfc15, 0xfc15).w(this, FUNC(tbowl_state::bgxscroll_hi)); - map(0xfc16, 0xfc16).w(this, FUNC(tbowl_state::bgyscroll_lo)); - map(0xfc17, 0xfc17).w(this, FUNC(tbowl_state::bgyscroll_hi)); + map(0xfc10, 0xfc10).w(FUNC(tbowl_state::bg2xscroll_lo)); + map(0xfc11, 0xfc11).w(FUNC(tbowl_state::bg2xscroll_hi)); + map(0xfc12, 0xfc12).w(FUNC(tbowl_state::bg2yscroll_lo)); + map(0xfc13, 0xfc13).w(FUNC(tbowl_state::bg2yscroll_hi)); + map(0xfc14, 0xfc14).w(FUNC(tbowl_state::bgxscroll_lo)); + map(0xfc15, 0xfc15).w(FUNC(tbowl_state::bgxscroll_hi)); + map(0xfc16, 0xfc16).w(FUNC(tbowl_state::bgyscroll_lo)); + map(0xfc17, 0xfc17).w(FUNC(tbowl_state::bgyscroll_hi)); } /* Board C */ @@ -108,9 +108,9 @@ void tbowl_state::_6206C_map(address_map &map) map(0xe000, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // 2x palettes, one for each monitor? map(0xf000, 0xf7ff).bankr("subbank"); map(0xf800, 0xfbff).ram().share("shared_ram"); - map(0xfc00, 0xfc00).w(this, FUNC(tbowl_state::boardc_bankswitch_w)); + map(0xfc00, 0xfc00).w(FUNC(tbowl_state::boardc_bankswitch_w)); map(0xfc01, 0xfc01).nopw(); /* ? */ - map(0xfc02, 0xfc02).w(this, FUNC(tbowl_state::trigger_nmi)); /* ? */ + map(0xfc02, 0xfc02).w(FUNC(tbowl_state::trigger_nmi)); /* ? */ map(0xfc03, 0xfc03).nopw(); /* ? */ map(0xfc06, 0xfc06).nopw(); /* ? */ } @@ -170,9 +170,9 @@ void tbowl_state::_6206A_map(address_map &map) map(0xc000, 0xc7ff).ram(); map(0xd000, 0xd001).w("ym1", FUNC(ym3812_device::write)); map(0xd800, 0xd801).w("ym2", FUNC(ym3812_device::write)); - map(0xe000, 0xe001).w(this, FUNC(tbowl_state::adpcm_end_w)); - map(0xe002, 0xe003).w(this, FUNC(tbowl_state::adpcm_start_w)); - map(0xe004, 0xe005).w(this, FUNC(tbowl_state::adpcm_vol_w)); + map(0xe000, 0xe001).w(FUNC(tbowl_state::adpcm_end_w)); + map(0xe002, 0xe003).w(FUNC(tbowl_state::adpcm_start_w)); + map(0xe004, 0xe005).w(FUNC(tbowl_state::adpcm_vol_w)); map(0xe006, 0xe006).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0xe007, 0xe007).nopw(); // sound watchdog map(0xe010, 0xe010).r(m_soundlatch, FUNC(generic_latch_8_device::read)); diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp index 53cbde29c35..8a44e4d7d90 100644 --- a/src/mame/drivers/tceptor.cpp +++ b/src/mame/drivers/tceptor.cpp @@ -127,16 +127,16 @@ READ8_MEMBER(tceptor_state::input1_r) void tceptor_state::m6809_map(address_map &map) { map(0x0000, 0x17ff).ram(); - map(0x1800, 0x1bff).ram().w(this, FUNC(tceptor_state::tceptor_tile_ram_w)).share("tile_ram"); - map(0x1c00, 0x1fff).ram().w(this, FUNC(tceptor_state::tceptor_tile_attr_w)).share("tile_attr"); - map(0x2000, 0x3fff).ram().w(this, FUNC(tceptor_state::tceptor_bg_ram_w)).share("bg_ram"); // background (VIEW RAM) + map(0x1800, 0x1bff).ram().w(FUNC(tceptor_state::tceptor_tile_ram_w)).share("tile_ram"); + map(0x1c00, 0x1fff).ram().w(FUNC(tceptor_state::tceptor_tile_attr_w)).share("tile_attr"); + map(0x2000, 0x3fff).ram().w(FUNC(tceptor_state::tceptor_bg_ram_w)).share("bg_ram"); // background (VIEW RAM) map(0x4000, 0x43ff).rw(m_cus30, FUNC(namco_cus30_device::namcos1_cus30_r), FUNC(namco_cus30_device::namcos1_cus30_w)); - map(0x4800, 0x4800).w(this, FUNC(tceptor_state::tceptor2_shutter_w)); + map(0x4800, 0x4800).w(FUNC(tceptor_state::tceptor2_shutter_w)); map(0x4f00, 0x4f07).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)); - map(0x5000, 0x5006).w(this, FUNC(tceptor_state::tceptor_bg_scroll_w)); // bg scroll + map(0x5000, 0x5006).w(FUNC(tceptor_state::tceptor_bg_scroll_w)); // bg scroll map(0x6000, 0x7fff).ram().share("m68k_shared_ram"); // COM RAM - map(0x8000, 0x8000).w(this, FUNC(tceptor_state::m6809_irq_disable_w)); - map(0x8800, 0x8800).w(this, FUNC(tceptor_state::m6809_irq_enable_w)); + map(0x8000, 0x8000).w(FUNC(tceptor_state::m6809_irq_disable_w)); + map(0x8800, 0x8800).w(FUNC(tceptor_state::m6809_irq_enable_w)); map(0x8000, 0xffff).rom(); } @@ -158,7 +158,7 @@ void tceptor_state::m6502_b_map(address_map &map) { map(0x0000, 0x00ff).ram().share("share2"); map(0x0100, 0x01ff).ram(); - map(0x4000, 0x4000).w("dac", FUNC(dac_byte_interface::write)); + map(0x4000, 0x4000).w("dac", FUNC(dac_byte_interface::data_w)); map(0x5000, 0x5000).writeonly(); // voice ctrl?? map(0x8000, 0xffff).rom(); } @@ -172,8 +172,8 @@ void tceptor_state::m68k_map(address_map &map) map(0x300000, 0x300001).writeonly(); map(0x400000, 0x4001ff).writeonly().share("sprite_ram"); map(0x500000, 0x51ffff).w(m_c45_road, FUNC(namco_c45_road_device::write)); - map(0x600000, 0x600001).w(this, FUNC(tceptor_state::m68k_irq_enable_w)); // not sure - map(0x700000, 0x703fff).rw(this, FUNC(tceptor_state::m68k_shared_r), FUNC(tceptor_state::m68k_shared_w)).umask16(0x00ff); + map(0x600000, 0x600001).w(FUNC(tceptor_state::m68k_irq_enable_w)); // not sure + map(0x700000, 0x703fff).rw(FUNC(tceptor_state::m68k_shared_r), FUNC(tceptor_state::m68k_shared_w)).umask16(0x00ff); } @@ -185,12 +185,12 @@ void tceptor_state::mcu_map(address_map &map) map(0x1400, 0x154d).ram(); map(0x17c0, 0x17ff).ram(); map(0x2000, 0x20ff).ram().share("share3"); - map(0x2100, 0x2100).r(this, FUNC(tceptor_state::dsw0_r)); - map(0x2101, 0x2101).r(this, FUNC(tceptor_state::dsw1_r)); - map(0x2200, 0x2200).r(this, FUNC(tceptor_state::input0_r)); - map(0x2201, 0x2201).r(this, FUNC(tceptor_state::input1_r)); - map(0x8000, 0x8000).w(this, FUNC(tceptor_state::mcu_irq_disable_w)); - map(0x8800, 0x8800).w(this, FUNC(tceptor_state::mcu_irq_enable_w)); + map(0x2100, 0x2100).r(FUNC(tceptor_state::dsw0_r)); + map(0x2101, 0x2101).r(FUNC(tceptor_state::dsw1_r)); + map(0x2200, 0x2200).r(FUNC(tceptor_state::input0_r)); + map(0x2201, 0x2201).r(FUNC(tceptor_state::input1_r)); + map(0x8000, 0x8000).w(FUNC(tceptor_state::mcu_irq_disable_w)); + map(0x8800, 0x8800).w(FUNC(tceptor_state::mcu_irq_enable_w)); map(0x8000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xdfff).ram().share("nvram"); // Battery Backup diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp index dbac7abf6c4..99a7f2588e1 100644 --- a/src/mame/drivers/tdv2324.cpp +++ b/src/mame/drivers/tdv2324.cpp @@ -153,9 +153,9 @@ void tdv2324_state::tdv2324_io(address_map &map) /* 0x30 is read by main code and if high bit isn't set at some point it will never get anywhere */ /* e0, e2, e8, ea are written to */ /* 30, e6 and e2 are readable */ - map(0x30, 0x30).r(this, FUNC(tdv2324_state::tdv2324_main_io_30)); + map(0x30, 0x30).r(FUNC(tdv2324_state::tdv2324_main_io_30)); // AM_RANGE(0xe2, 0xe2) AM_WRITE(tdv2324_main_io_e2) console output - map(0xe6, 0xe6).r(this, FUNC(tdv2324_state::tdv2324_main_io_e6)); + map(0xe6, 0xe6).r(FUNC(tdv2324_state::tdv2324_main_io_e6)); // AM_RANGE(0x, 0x) AM_DEVREADWRITE(P8253_5_0_TAG, pit8253_device, read, write) // AM_RANGE(0x, 0x) AM_DEVREADWRITE(MK3887N4_TAG, z80dart_device, ba_cd_r, ba_cd_w) // AM_RANGE(0x, 0x) AM_DEVREADWRITE(P8259A_TAG, pic8259_device, read, write) diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp index ef5041c1d8c..07da9e83a3a 100644 --- a/src/mame/drivers/tec1.cpp +++ b/src/mame/drivers/tec1.cpp @@ -341,9 +341,9 @@ void tec1_state::tec1_map(address_map &map) void tec1_state::tec1_io(address_map &map) { map.global_mask(0x07); - map(0x00, 0x00).r(this, FUNC(tec1_state::tec1_kbd_r)); - map(0x01, 0x01).w(this, FUNC(tec1_state::tec1_digit_w)); - map(0x02, 0x02).w(this, FUNC(tec1_state::tec1_segment_w)); + map(0x00, 0x00).r(FUNC(tec1_state::tec1_kbd_r)); + map(0x01, 0x01).w(FUNC(tec1_state::tec1_digit_w)); + map(0x02, 0x02).w(FUNC(tec1_state::tec1_segment_w)); } @@ -358,10 +358,10 @@ void tec1_state::tecjmon_map(address_map &map) void tec1_state::tecjmon_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(tec1_state::tec1_kbd_r)); - map(0x01, 0x01).w(this, FUNC(tec1_state::tecjmon_digit_w)); - map(0x02, 0x02).w(this, FUNC(tec1_state::tec1_segment_w)); - map(0x03, 0x03).r(this, FUNC(tec1_state::latch_r)); + map(0x00, 0x00).r(FUNC(tec1_state::tec1_kbd_r)); + map(0x01, 0x01).w(FUNC(tec1_state::tecjmon_digit_w)); + map(0x02, 0x02).w(FUNC(tec1_state::tec1_segment_w)); + map(0x03, 0x03).r(FUNC(tec1_state::latch_r)); //AM_RANGE(0x04, 0x04) AM_WRITE(lcd_en_w) //AM_RANGE(0x84, 0x84) AM_WRITE(lcd_2nd_w) } diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp index ff964a0ed7b..8c305e7f17f 100644 --- a/src/mame/drivers/techno.cpp +++ b/src/mame/drivers/techno.cpp @@ -80,20 +80,20 @@ void techno_state::techno_map(address_map &map) map(0x00000, 0x03fff).rom(); map(0x04000, 0x04fff).ram().share("nvram"); // battery backed-up map(0x06000, 0x0ffff).rom(); - map(0x14000, 0x147ff).rw(this, FUNC(techno_state::key_r), FUNC(techno_state::lamp1_w)); - map(0x14800, 0x14fff).rw(this, FUNC(techno_state::sound_r), FUNC(techno_state::lamp2_w)); - map(0x15000, 0x157ff).rw(this, FUNC(techno_state::rtrg_r), FUNC(techno_state::sol1_w)); - map(0x15800, 0x15fff).nopr().w(this, FUNC(techno_state::sol2_w)); // reads from 15800, but shown as not connected - map(0x16000, 0x167ff).w(this, FUNC(techno_state::sound_w)); - map(0x16800, 0x16fff).w(this, FUNC(techno_state::disp1_w)); - map(0x17000, 0x177ff).w(this, FUNC(techno_state::disp2_w)); - map(0x17800, 0x17fff).w(this, FUNC(techno_state::setout_w)); + map(0x14000, 0x147ff).rw(FUNC(techno_state::key_r), FUNC(techno_state::lamp1_w)); + map(0x14800, 0x14fff).rw(FUNC(techno_state::sound_r), FUNC(techno_state::lamp2_w)); + map(0x15000, 0x157ff).rw(FUNC(techno_state::rtrg_r), FUNC(techno_state::sol1_w)); + map(0x15800, 0x15fff).nopr().w(FUNC(techno_state::sol2_w)); // reads from 15800, but shown as not connected + map(0x16000, 0x167ff).w(FUNC(techno_state::sound_w)); + map(0x16800, 0x16fff).w(FUNC(techno_state::disp1_w)); + map(0x17000, 0x177ff).w(FUNC(techno_state::disp2_w)); + map(0x17800, 0x17fff).w(FUNC(techno_state::setout_w)); } void techno_state::techno_sub_map(address_map &map) { // no ram here, must be internal to the cpu - map(0x0000, 0x3fff).r(this, FUNC(techno_state::rd_r)); // to TKY2016A audio processor which has its own 3.58MHz clock - map(0x4000, 0x7fff).w(this, FUNC(techno_state::wr_w)); // A11=LED;A12=WR2 (DAC) ;A13=WR1 (TKY2016A as above) + map(0x0000, 0x3fff).r(FUNC(techno_state::rd_r)); // to TKY2016A audio processor which has its own 3.58MHz clock + map(0x4000, 0x7fff).w(FUNC(techno_state::wr_w)); // A11=LED;A12=WR2 (DAC) ;A13=WR1 (TKY2016A as above) map(0x4000, 0xbfff).rom(); // 4000-7FFF is same as 8000-BFFF; 4x 16k ROMS bankswitched map(0xc000, 0xffff).rom(); // another 16k ROM } diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp index ec9f27de6ea..3c05672371a 100644 --- a/src/mame/drivers/tecmo.cpp +++ b/src/mame/drivers/tecmo.cpp @@ -141,9 +141,9 @@ void tecmo_state::rygar_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); - map(0xd000, 0xd7ff).ram().w(this, FUNC(tecmo_state::txvideoram_w)).share("txvideoram"); - map(0xd800, 0xdbff).ram().w(this, FUNC(tecmo_state::fgvideoram_w)).share("fgvideoram"); - map(0xdc00, 0xdfff).ram().w(this, FUNC(tecmo_state::bgvideoram_w)).share("bgvideoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(tecmo_state::txvideoram_w)).share("txvideoram"); + map(0xd800, 0xdbff).ram().w(FUNC(tecmo_state::fgvideoram_w)).share("fgvideoram"); + map(0xdc00, 0xdfff).ram().w(FUNC(tecmo_state::bgvideoram_w)).share("bgvideoram"); map(0xe000, 0xe7ff).ram().share("spriteram"); map(0xe800, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf000, 0xf7ff).bankr("bank1"); @@ -153,16 +153,16 @@ void tecmo_state::rygar_map(address_map &map) map(0xf803, 0xf803).portr("BUTTONS2"); map(0xf804, 0xf804).portr("SYS_0"); map(0xf805, 0xf805).portr("SYS_1"); - map(0xf806, 0xf806).r(this, FUNC(tecmo_state::dswa_l_r)); - map(0xf807, 0xf807).r(this, FUNC(tecmo_state::dswa_h_r)); - map(0xf808, 0xf808).r(this, FUNC(tecmo_state::dswb_l_r)); - map(0xf809, 0xf809).r(this, FUNC(tecmo_state::dswb_h_r)); + map(0xf806, 0xf806).r(FUNC(tecmo_state::dswa_l_r)); + map(0xf807, 0xf807).r(FUNC(tecmo_state::dswa_h_r)); + map(0xf808, 0xf808).r(FUNC(tecmo_state::dswb_l_r)); + map(0xf809, 0xf809).r(FUNC(tecmo_state::dswb_h_r)); map(0xf80f, 0xf80f).portr("SYS_2"); - map(0xf800, 0xf802).w(this, FUNC(tecmo_state::fgscroll_w)); - map(0xf803, 0xf805).w(this, FUNC(tecmo_state::bgscroll_w)); + map(0xf800, 0xf802).w(FUNC(tecmo_state::fgscroll_w)); + map(0xf803, 0xf805).w(FUNC(tecmo_state::bgscroll_w)); map(0xf806, 0xf806).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xf807, 0xf807).w(this, FUNC(tecmo_state::flipscreen_w)); - map(0xf808, 0xf808).w(this, FUNC(tecmo_state::bankswitch_w)); + map(0xf807, 0xf807).w(FUNC(tecmo_state::flipscreen_w)); + map(0xf808, 0xf808).w(FUNC(tecmo_state::bankswitch_w)); map(0xf80b, 0xf80b).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } @@ -170,9 +170,9 @@ void tecmo_state::gemini_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); - map(0xd000, 0xd7ff).ram().w(this, FUNC(tecmo_state::txvideoram_w)).share("txvideoram"); - map(0xd800, 0xdbff).ram().w(this, FUNC(tecmo_state::fgvideoram_w)).share("fgvideoram"); - map(0xdc00, 0xdfff).ram().w(this, FUNC(tecmo_state::bgvideoram_w)).share("bgvideoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(tecmo_state::txvideoram_w)).share("txvideoram"); + map(0xd800, 0xdbff).ram().w(FUNC(tecmo_state::fgvideoram_w)).share("fgvideoram"); + map(0xdc00, 0xdfff).ram().w(FUNC(tecmo_state::bgvideoram_w)).share("bgvideoram"); map(0xe000, 0xe7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xe800, 0xefff).ram().share("spriteram"); map(0xf000, 0xf7ff).bankr("bank1"); @@ -182,25 +182,25 @@ void tecmo_state::gemini_map(address_map &map) map(0xf803, 0xf803).portr("BUTTONS2"); map(0xf804, 0xf804).portr("SYS_0"); map(0xf805, 0xf805).portr("SYS_1"); - map(0xf806, 0xf806).r(this, FUNC(tecmo_state::dswa_l_r)); - map(0xf807, 0xf807).r(this, FUNC(tecmo_state::dswa_h_r)); - map(0xf808, 0xf808).r(this, FUNC(tecmo_state::dswb_l_r)); - map(0xf809, 0xf809).r(this, FUNC(tecmo_state::dswb_h_r)); + map(0xf806, 0xf806).r(FUNC(tecmo_state::dswa_l_r)); + map(0xf807, 0xf807).r(FUNC(tecmo_state::dswa_h_r)); + map(0xf808, 0xf808).r(FUNC(tecmo_state::dswb_l_r)); + map(0xf809, 0xf809).r(FUNC(tecmo_state::dswb_h_r)); map(0xf80f, 0xf80f).portr("SYS_2"); - map(0xf800, 0xf802).w(this, FUNC(tecmo_state::fgscroll_w)); - map(0xf803, 0xf805).w(this, FUNC(tecmo_state::bgscroll_w)); + map(0xf800, 0xf802).w(FUNC(tecmo_state::fgscroll_w)); + map(0xf803, 0xf805).w(FUNC(tecmo_state::bgscroll_w)); map(0xf806, 0xf806).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xf807, 0xf807).w(this, FUNC(tecmo_state::flipscreen_w)); - map(0xf808, 0xf808).w(this, FUNC(tecmo_state::bankswitch_w)); + map(0xf807, 0xf807).w(FUNC(tecmo_state::flipscreen_w)); + map(0xf808, 0xf808).w(FUNC(tecmo_state::bankswitch_w)); map(0xf80b, 0xf80b).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } void tecmo_state::silkworm_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc3ff).ram().w(this, FUNC(tecmo_state::bgvideoram_w)).share("bgvideoram"); - map(0xc400, 0xc7ff).ram().w(this, FUNC(tecmo_state::fgvideoram_w)).share("fgvideoram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(tecmo_state::txvideoram_w)).share("txvideoram"); + map(0xc000, 0xc3ff).ram().w(FUNC(tecmo_state::bgvideoram_w)).share("bgvideoram"); + map(0xc400, 0xc7ff).ram().w(FUNC(tecmo_state::fgvideoram_w)).share("fgvideoram"); + map(0xc800, 0xcfff).ram().w(FUNC(tecmo_state::txvideoram_w)).share("txvideoram"); map(0xd000, 0xdfff).ram(); map(0xe000, 0xe7ff).ram().share("spriteram"); map(0xe800, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); @@ -211,17 +211,17 @@ void tecmo_state::silkworm_map(address_map &map) map(0xf803, 0xf803).portr("BUTTONS2"); map(0xf804, 0xf804).portr("SYS_0"); map(0xf805, 0xf805).portr("SYS_1"); - map(0xf806, 0xf806).r(this, FUNC(tecmo_state::dswa_l_r)); - map(0xf807, 0xf807).r(this, FUNC(tecmo_state::dswa_h_r)); - map(0xf808, 0xf808).r(this, FUNC(tecmo_state::dswb_l_r)); - map(0xf809, 0xf809).r(this, FUNC(tecmo_state::dswb_h_r)); + map(0xf806, 0xf806).r(FUNC(tecmo_state::dswa_l_r)); + map(0xf807, 0xf807).r(FUNC(tecmo_state::dswa_h_r)); + map(0xf808, 0xf808).r(FUNC(tecmo_state::dswb_l_r)); + map(0xf809, 0xf809).r(FUNC(tecmo_state::dswb_h_r)); map(0xf80e, 0xf80e).portr("SYS_3"); map(0xf80f, 0xf80f).portr("SYS_2"); - map(0xf800, 0xf802).w(this, FUNC(tecmo_state::fgscroll_w)); - map(0xf803, 0xf805).w(this, FUNC(tecmo_state::bgscroll_w)); + map(0xf800, 0xf802).w(FUNC(tecmo_state::fgscroll_w)); + map(0xf803, 0xf805).w(FUNC(tecmo_state::bgscroll_w)); map(0xf806, 0xf806).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xf807, 0xf807).w(this, FUNC(tecmo_state::flipscreen_w)); - map(0xf808, 0xf808).w(this, FUNC(tecmo_state::bankswitch_w)); + map(0xf807, 0xf807).w(FUNC(tecmo_state::flipscreen_w)); + map(0xf808, 0xf808).w(FUNC(tecmo_state::bankswitch_w)); map(0xf809, 0xf809).nopw(); /* ? */ map(0xf80b, 0xf80b).nopw(); /* ? if mapped to watchdog like in the others, causes reset */ } @@ -231,9 +231,9 @@ void tecmo_state::rygar_sound_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); map(0x8000, 0x8001).w("ymsnd", FUNC(ym3526_device::write)); - map(0xc000, 0xc000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(this, FUNC(tecmo_state::adpcm_start_w)); - map(0xd000, 0xd000).w(this, FUNC(tecmo_state::adpcm_end_w)); - map(0xe000, 0xe000).w(this, FUNC(tecmo_state::adpcm_vol_w)); + map(0xc000, 0xc000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(FUNC(tecmo_state::adpcm_start_w)); + map(0xd000, 0xd000).w(FUNC(tecmo_state::adpcm_end_w)); + map(0xe000, 0xe000).w(FUNC(tecmo_state::adpcm_vol_w)); map(0xf000, 0xf000).w("soundlatch", FUNC(generic_latch_8_device::acknowledge_w)); } @@ -244,9 +244,9 @@ void tecmo_state::tecmo_sound_map(address_map &map) /* writes code to this area */ map(0x8000, 0x87ff).ram(); map(0xa000, 0xa001).w("ymsnd", FUNC(ym3812_device::write)); - map(0xc000, 0xc000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(this, FUNC(tecmo_state::adpcm_start_w)); - map(0xc400, 0xc400).w(this, FUNC(tecmo_state::adpcm_end_w)); - map(0xc800, 0xc800).w(this, FUNC(tecmo_state::adpcm_vol_w)); + map(0xc000, 0xc000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(FUNC(tecmo_state::adpcm_start_w)); + map(0xc400, 0xc400).w(FUNC(tecmo_state::adpcm_end_w)); + map(0xc800, 0xc800).w(FUNC(tecmo_state::adpcm_vol_w)); map(0xcc00, 0xcc00).w("soundlatch", FUNC(generic_latch_8_device::acknowledge_w)); } diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp index d8fc26b9d47..969d7690f33 100644 --- a/src/mame/drivers/tecmo16.cpp +++ b/src/mame/drivers/tecmo16.cpp @@ -42,50 +42,50 @@ void tecmo16_state::fstarfrc_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); /* Main RAM */ - map(0x110000, 0x110fff).ram().w(this, FUNC(tecmo16_state::charram_w)).share("charram"); - map(0x120000, 0x1207ff).ram().w(this, FUNC(tecmo16_state::videoram_w)).share("videoram"); - map(0x120800, 0x120fff).ram().w(this, FUNC(tecmo16_state::colorram_w)).share("colorram"); - map(0x121000, 0x1217ff).ram().w(this, FUNC(tecmo16_state::videoram2_w)).share("videoram2"); - map(0x121800, 0x121fff).ram().w(this, FUNC(tecmo16_state::colorram2_w)).share("colorram2"); + map(0x110000, 0x110fff).ram().w(FUNC(tecmo16_state::charram_w)).share("charram"); + map(0x120000, 0x1207ff).ram().w(FUNC(tecmo16_state::videoram_w)).share("videoram"); + map(0x120800, 0x120fff).ram().w(FUNC(tecmo16_state::colorram_w)).share("colorram"); + map(0x121000, 0x1217ff).ram().w(FUNC(tecmo16_state::videoram2_w)).share("videoram2"); + map(0x121800, 0x121fff).ram().w(FUNC(tecmo16_state::colorram2_w)).share("colorram2"); map(0x122000, 0x127fff).ram(); /* work area */ map(0x130000, 0x130fff).ram().share("spriteram"); map(0x140000, 0x141fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x150000, 0x150001).w(this, FUNC(tecmo16_state::flipscreen_w)); + map(0x150000, 0x150001).w(FUNC(tecmo16_state::flipscreen_w)); map(0x150011, 0x150011).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x150030, 0x150031).portr("DSW2").nopw(); /* ??? */ map(0x150040, 0x150041).portr("DSW1"); map(0x150050, 0x150051).portr("P1_P2"); - map(0x160000, 0x160001).w(this, FUNC(tecmo16_state::scroll_char_x_w)); - map(0x16000c, 0x16000d).w(this, FUNC(tecmo16_state::scroll_x_w)); - map(0x160012, 0x160013).w(this, FUNC(tecmo16_state::scroll_y_w)); - map(0x160018, 0x160019).w(this, FUNC(tecmo16_state::scroll2_x_w)); - map(0x16001e, 0x16001f).w(this, FUNC(tecmo16_state::scroll2_y_w)); + map(0x160000, 0x160001).w(FUNC(tecmo16_state::scroll_char_x_w)); + map(0x16000c, 0x16000d).w(FUNC(tecmo16_state::scroll_x_w)); + map(0x160012, 0x160013).w(FUNC(tecmo16_state::scroll_y_w)); + map(0x160018, 0x160019).w(FUNC(tecmo16_state::scroll2_x_w)); + map(0x16001e, 0x16001f).w(FUNC(tecmo16_state::scroll2_y_w)); } void tecmo16_state::ginkun_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); /* Main RAM */ - map(0x110000, 0x110fff).ram().w(this, FUNC(tecmo16_state::charram_w)).share("charram"); - map(0x120000, 0x120fff).ram().w(this, FUNC(tecmo16_state::videoram_w)).share("videoram"); - map(0x121000, 0x121fff).ram().w(this, FUNC(tecmo16_state::colorram_w)).share("colorram"); - map(0x122000, 0x122fff).ram().w(this, FUNC(tecmo16_state::videoram2_w)).share("videoram2"); - map(0x123000, 0x123fff).ram().w(this, FUNC(tecmo16_state::colorram2_w)).share("colorram2"); + map(0x110000, 0x110fff).ram().w(FUNC(tecmo16_state::charram_w)).share("charram"); + map(0x120000, 0x120fff).ram().w(FUNC(tecmo16_state::videoram_w)).share("videoram"); + map(0x121000, 0x121fff).ram().w(FUNC(tecmo16_state::colorram_w)).share("colorram"); + map(0x122000, 0x122fff).ram().w(FUNC(tecmo16_state::videoram2_w)).share("videoram2"); + map(0x123000, 0x123fff).ram().w(FUNC(tecmo16_state::colorram2_w)).share("colorram2"); map(0x124000, 0x124fff).ram(); /* extra RAM for Riot */ map(0x130000, 0x130fff).ram().share("spriteram"); map(0x140000, 0x141fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x150000, 0x150001).w(this, FUNC(tecmo16_state::flipscreen_w)); + map(0x150000, 0x150001).w(FUNC(tecmo16_state::flipscreen_w)); map(0x150011, 0x150011).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x150020, 0x150021).portr("EXTRA").nopw(); /* ??? */ map(0x150030, 0x150031).portr("DSW2").nopw(); /* ??? */ map(0x150040, 0x150041).portr("DSW1"); map(0x150050, 0x150051).portr("P1_P2"); - map(0x160000, 0x160001).w(this, FUNC(tecmo16_state::scroll_char_x_w)); - map(0x160006, 0x160007).w(this, FUNC(tecmo16_state::scroll_char_y_w)); - map(0x16000c, 0x16000d).w(this, FUNC(tecmo16_state::scroll_x_w)); - map(0x160012, 0x160013).w(this, FUNC(tecmo16_state::scroll_y_w)); - map(0x160018, 0x160019).w(this, FUNC(tecmo16_state::scroll2_x_w)); - map(0x16001e, 0x16001f).w(this, FUNC(tecmo16_state::scroll2_y_w)); + map(0x160000, 0x160001).w(FUNC(tecmo16_state::scroll_char_x_w)); + map(0x160006, 0x160007).w(FUNC(tecmo16_state::scroll_char_y_w)); + map(0x16000c, 0x16000d).w(FUNC(tecmo16_state::scroll_x_w)); + map(0x160012, 0x160013).w(FUNC(tecmo16_state::scroll_y_w)); + map(0x160018, 0x160019).w(FUNC(tecmo16_state::scroll2_x_w)); + map(0x16001e, 0x16001f).w(FUNC(tecmo16_state::scroll2_y_w)); } void tecmo16_state::sound_map(address_map &map) diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp index 904f1e4d884..3b3909261d0 100644 --- a/src/mame/drivers/tecmosys.cpp +++ b/src/mame/drivers/tecmosys.cpp @@ -297,39 +297,39 @@ void tecmosys_state::main_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x20ffff).ram(); // work ram map(0x210000, 0x210001).nopr(); // single byte overflow on stack defined as 0x210000 - map(0x300000, 0x300fff).ram().w(this, FUNC(tecmosys_state::vram_w<1>)).share("vram_1"); // bg0 ram - map(0x301000, 0x3013ff).ram().w(this, FUNC(tecmosys_state::lineram_w<0>)).share("bg0_lineram");// bg0 linescroll? (guess) + map(0x300000, 0x300fff).ram().w(FUNC(tecmosys_state::vram_w<1>)).share("vram_1"); // bg0 ram + map(0x301000, 0x3013ff).ram().w(FUNC(tecmosys_state::lineram_w<0>)).share("bg0_lineram");// bg0 linescroll? (guess) - map(0x400000, 0x400fff).ram().w(this, FUNC(tecmosys_state::vram_w<2>)).share("vram_2"); // bg1 ram - map(0x401000, 0x4013ff).ram().w(this, FUNC(tecmosys_state::lineram_w<1>)).share("bg1_lineram");// bg1 linescroll? (guess) + map(0x400000, 0x400fff).ram().w(FUNC(tecmosys_state::vram_w<2>)).share("vram_2"); // bg1 ram + map(0x401000, 0x4013ff).ram().w(FUNC(tecmosys_state::lineram_w<1>)).share("bg1_lineram");// bg1 linescroll? (guess) - map(0x500000, 0x500fff).ram().w(this, FUNC(tecmosys_state::vram_w<3>)).share("vram_3"); // bg2 ram - map(0x501000, 0x5013ff).ram().w(this, FUNC(tecmosys_state::lineram_w<2>)).share("bg2_lineram"); // bg2 linescroll? (guess) + map(0x500000, 0x500fff).ram().w(FUNC(tecmosys_state::vram_w<3>)).share("vram_3"); // bg2 ram + map(0x501000, 0x5013ff).ram().w(FUNC(tecmosys_state::lineram_w<2>)).share("bg2_lineram"); // bg2 linescroll? (guess) - map(0x700000, 0x703fff).ram().w(this, FUNC(tecmosys_state::vram_w<0>)).share("vram_0"); // fix ram + map(0x700000, 0x703fff).ram().w(FUNC(tecmosys_state::vram_w<0>)).share("vram_0"); // fix ram map(0x800000, 0x80ffff).ram().share("spriteram"); // obj ram - map(0x880000, 0x88000b).r(this, FUNC(tecmosys_state::unk880000_r)); - map(0x880000, 0x88002f).w(this, FUNC(tecmosys_state::unk880000_w)).share("880000regs"); // 10 byte dta@88000c, 880022=watchdog? + map(0x880000, 0x88000b).r(FUNC(tecmosys_state::unk880000_r)); + map(0x880000, 0x88002f).w(FUNC(tecmosys_state::unk880000_w)).share("880000regs"); // 10 byte dta@88000c, 880022=watchdog? map(0x900000, 0x907fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // AM_WRITEONLY // obj pal //map(0x980000, 0x9807ff).writeonly(); // bg pal - //map(0x980800, 0x980fff).w(this, FUNC(tecmosys_state::paletteram_xGGGGGRRRRRBBBBB_word_w)).share("paletteram"); // fix pal + //map(0x980800, 0x980fff).w(FUNC(tecmosys_state::paletteram_xGGGGGRRRRRBBBBB_word_w)).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. - map(0x980000, 0x980fff).ram().w(this, FUNC(tecmosys_state::tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w)).share("tmap_palette"); + map(0x980000, 0x980fff).ram().w(FUNC(tecmosys_state::tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w)).share("tmap_palette"); - map(0xa00000, 0xa00001).w(this, FUNC(tecmosys_state::eeprom_w)); + map(0xa00000, 0xa00001).w(FUNC(tecmosys_state::eeprom_w)); map(0xa80000, 0xa80005).writeonly().share("scroll_2"); // a80000-3 scroll? a80004 inverted ? 3 : 0 map(0xb00000, 0xb00005).writeonly().share("scroll_3"); // b00000-3 scrool?, b00004 inverted ? 3 : 0 - map(0xb80000, 0xb80001).rw(this, FUNC(tecmosys_state::prot_status_r), FUNC(tecmosys_state::prot_status_w)); + map(0xb80000, 0xb80001).rw(FUNC(tecmosys_state::prot_status_r), FUNC(tecmosys_state::prot_status_w)); map(0xc00000, 0xc00005).writeonly().share("scroll_0"); // c00000-3 scroll? c00004 inverted ? 13 : 10 map(0xc80000, 0xc80005).writeonly().share("scroll_1"); // c80000-3 scrool? c80004 inverted ? 3 : 0 map(0xd00000, 0xd00001).portr("P1"); map(0xd00002, 0xd00003).portr("P2"); - map(0xd80000, 0xd80001).r(this, FUNC(tecmosys_state::eeprom_r)); + map(0xd80000, 0xd80001).r(FUNC(tecmosys_state::eeprom_r)); map(0xe00001, 0xe00001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0xe80000, 0xe80001).w(this, FUNC(tecmosys_state::prot_data_w)); - map(0xf00001, 0xf00001).r(this, FUNC(tecmosys_state::sound_command_pending_r)); - map(0xf80000, 0xf80001).r(this, FUNC(tecmosys_state::prot_data_r)); + map(0xe80000, 0xe80001).w(FUNC(tecmosys_state::prot_data_w)); + map(0xf00001, 0xf00001).r(FUNC(tecmosys_state::sound_command_pending_r)); + map(0xf80000, 0xf80001).r(FUNC(tecmosys_state::prot_data_r)); } @@ -363,10 +363,10 @@ void tecmosys_state::io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw("ymf", FUNC(ymf262_device::read), FUNC(ymf262_device::write)); map(0x10, 0x10).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x20, 0x20).w(this, FUNC(tecmosys_state::oki_bank_w)); - map(0x30, 0x30).w(this, FUNC(tecmosys_state::z80_bank_w)); + map(0x20, 0x20).w(FUNC(tecmosys_state::oki_bank_w)); + map(0x30, 0x30).w(FUNC(tecmosys_state::z80_bank_w)); map(0x40, 0x40).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x50, 0x50).w(this, FUNC(tecmosys_state::sound_nmi_disable_w)); + map(0x50, 0x50).w(FUNC(tecmosys_state::sound_nmi_disable_w)); map(0x60, 0x61).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); } diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp index 71f98852d79..7897b31c8ab 100644 --- a/src/mame/drivers/tecnbras.cpp +++ b/src/mame/drivers/tecnbras.cpp @@ -67,8 +67,8 @@ void tecnbras_state::i80c31_prg(address_map &map) #define DMD_OFFSET 24 //This is a guess. We should verify the real hardware behaviour void tecnbras_state::i80c31_io(address_map &map) { - map(0x0100+DMD_OFFSET, 0x0145+DMD_OFFSET).w(this, FUNC(tecnbras_state::set_x_position_w)); - map(0x06B8, 0x06BC).w(this, FUNC(tecnbras_state::print_column_w)); + map(0x0100+DMD_OFFSET, 0x0145+DMD_OFFSET).w(FUNC(tecnbras_state::set_x_position_w)); + map(0x06B8, 0x06BC).w(FUNC(tecnbras_state::print_column_w)); } WRITE8_MEMBER(tecnbras_state::set_x_position_w) diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index e700f048881..d8d20403dde 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -236,26 +236,26 @@ void tehkanwc_state::main_mem(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(tehkanwc_state::videoram_w)).share("videoram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(tehkanwc_state::colorram_w)).share("colorram"); + map(0xd000, 0xd3ff).ram().w(FUNC(tehkanwc_state::videoram_w)).share("videoram"); + map(0xd400, 0xd7ff).ram().w(FUNC(tehkanwc_state::colorram_w)).share("colorram"); map(0xd800, 0xddff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xde00, 0xdfff).ram().share("share5"); /* unused part of the palette RAM, I think? Gridiron uses it */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(tehkanwc_state::videoram2_w)).share("videoram2"); + map(0xe000, 0xe7ff).ram().w(FUNC(tehkanwc_state::videoram2_w)).share("videoram2"); map(0xe800, 0xebff).ram().share("spriteram"); /* sprites */ - map(0xec00, 0xec01).ram().w(this, FUNC(tehkanwc_state::scroll_x_w)); - map(0xec02, 0xec02).ram().w(this, FUNC(tehkanwc_state::scroll_y_w)); - map(0xf800, 0xf801).rw(this, FUNC(tehkanwc_state::track_0_r), FUNC(tehkanwc_state::track_0_reset_w)); /* track 0 x/y */ - map(0xf802, 0xf802).portr("SYSTEM").w(this, FUNC(tehkanwc_state::gridiron_led0_w)); + map(0xec00, 0xec01).ram().w(FUNC(tehkanwc_state::scroll_x_w)); + map(0xec02, 0xec02).ram().w(FUNC(tehkanwc_state::scroll_y_w)); + map(0xf800, 0xf801).rw(FUNC(tehkanwc_state::track_0_r), FUNC(tehkanwc_state::track_0_reset_w)); /* track 0 x/y */ + map(0xf802, 0xf802).portr("SYSTEM").w(FUNC(tehkanwc_state::gridiron_led0_w)); map(0xf803, 0xf803).portr("P1BUT"); map(0xf806, 0xf806).portr("SYSTEM"); - map(0xf810, 0xf811).rw(this, FUNC(tehkanwc_state::track_1_r), FUNC(tehkanwc_state::track_1_reset_w)); /* track 1 x/y */ - map(0xf812, 0xf812).w(this, FUNC(tehkanwc_state::gridiron_led1_w)); + map(0xf810, 0xf811).rw(FUNC(tehkanwc_state::track_1_r), FUNC(tehkanwc_state::track_1_reset_w)); /* track 1 x/y */ + map(0xf812, 0xf812).w(FUNC(tehkanwc_state::gridiron_led1_w)); map(0xf813, 0xf813).portr("P2BUT"); - map(0xf820, 0xf820).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(this, FUNC(tehkanwc_state::sound_command_w)); /* answer from the sound CPU */ - map(0xf840, 0xf840).portr("DSW2").w(this, FUNC(tehkanwc_state::sub_cpu_halt_w)); + map(0xf820, 0xf820).r(m_soundlatch2, FUNC(generic_latch_8_device::read)).w(FUNC(tehkanwc_state::sound_command_w)); /* answer from the sound CPU */ + map(0xf840, 0xf840).portr("DSW2").w(FUNC(tehkanwc_state::sub_cpu_halt_w)); map(0xf850, 0xf850).portr("DSW3").nopw(); /* ?? writes 0x00 or 0xff */ - map(0xf860, 0xf860).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(tehkanwc_state::flipscreen_x_w)); - map(0xf870, 0xf870).portr("DSW1").w(this, FUNC(tehkanwc_state::flipscreen_y_w)); + map(0xf860, 0xf860).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(tehkanwc_state::flipscreen_x_w)); + map(0xf870, 0xf870).portr("DSW1").w(FUNC(tehkanwc_state::flipscreen_y_w)); } void tehkanwc_state::sub_mem(address_map &map) @@ -263,14 +263,14 @@ void tehkanwc_state::sub_mem(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd3ff).ram().w(this, FUNC(tehkanwc_state::videoram_w)).share("videoram"); - map(0xd400, 0xd7ff).ram().w(this, FUNC(tehkanwc_state::colorram_w)).share("colorram"); + map(0xd000, 0xd3ff).ram().w(FUNC(tehkanwc_state::videoram_w)).share("videoram"); + map(0xd400, 0xd7ff).ram().w(FUNC(tehkanwc_state::colorram_w)).share("colorram"); map(0xd800, 0xddff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xde00, 0xdfff).ram().share("share5"); /* unused part of the palette RAM, I think? Gridiron uses it */ - map(0xe000, 0xe7ff).ram().w(this, FUNC(tehkanwc_state::videoram2_w)).share("videoram2"); + map(0xe000, 0xe7ff).ram().w(FUNC(tehkanwc_state::videoram2_w)).share("videoram2"); map(0xe800, 0xebff).ram().share("spriteram"); /* sprites */ - map(0xec00, 0xec01).ram().w(this, FUNC(tehkanwc_state::scroll_x_w)); - map(0xec02, 0xec02).ram().w(this, FUNC(tehkanwc_state::scroll_y_w)); + map(0xec00, 0xec01).ram().w(FUNC(tehkanwc_state::scroll_x_w)); + map(0xec02, 0xec02).ram().w(FUNC(tehkanwc_state::scroll_y_w)); map(0xf860, 0xf860).r("watchdog", FUNC(watchdog_timer_device::reset_r)); } @@ -278,10 +278,10 @@ void tehkanwc_state::sound_mem(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0x47ff).ram(); - map(0x8001, 0x8001).w(this, FUNC(tehkanwc_state::msm_reset_w));/* MSM51xx reset */ + map(0x8001, 0x8001).w(FUNC(tehkanwc_state::msm_reset_w));/* MSM51xx reset */ map(0x8002, 0x8002).nopw(); /* ?? written in the IRQ handler */ map(0x8003, 0x8003).nopw(); /* ?? written in the NMI handler */ - map(0xc000, 0xc000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(tehkanwc_state::sound_answer_w)); + map(0xc000, 0xc000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(tehkanwc_state::sound_answer_w)); } void tehkanwc_state::sound_port(address_map &map) diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp index 7400754590a..a047d58a773 100644 --- a/src/mame/drivers/tek405x.cpp +++ b/src/mame/drivers/tek405x.cpp @@ -179,7 +179,7 @@ void tek4051_state::tek4051_mem(address_map &map) map(0x8798, 0x879b).rw(MC6820_TAPE_TAG, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x87a8, 0x87ab).rw(MC6820_KB_TAG, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x87b0, 0x87b3).rw(m_gpib_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x87c0, 0x87c0).mirror(0x03).w(this, FUNC(tek4051_state::lbs_w)); + map(0x87c0, 0x87c0).mirror(0x03).w(FUNC(tek4051_state::lbs_w)); // AM_RANGE(0x87c0, 0x87c3) AM_DEVREADWRITE(MC6820_COM_TAG, pia6821_device, read, write) // AM_RANGE(0x87c4, 0x87c5) AM_MIRROR(0x02) AM_DEVREADWRITE(MC6850_TAG, acia6850_device, read, write) // AM_RANGE(0x87c8, 0x87cb) XPC2 @@ -741,7 +741,7 @@ WRITE8_MEMBER( tek4051_state::dio_w ) if (m_talk) { - m_gpib->dio_w(data); + m_gpib->write_dio(data); } } @@ -824,7 +824,7 @@ WRITE_LINE_MEMBER( tek4051_state::talk_w ) if (!m_talk) { - m_gpib->dio_w(0xff); + m_gpib->write_dio(0xff); m_gpib->nrfd_w(1); m_gpib->ndac_w(1); } diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp index bcd10282500..f88fd290bfd 100644 --- a/src/mame/drivers/tek440x.cpp +++ b/src/mame/drivers/tek440x.cpp @@ -156,7 +156,7 @@ void tek440x_state::maincpu_map(address_map &map) map(0x780000, 0x781fff).ram(); // map registers // 782000-783fff: video address registers // 784000-785fff: video control registers - map(0x788000, 0x788000).w("snsnd", FUNC(sn76496_device::write)); + map(0x788000, 0x788000).w("snsnd", FUNC(sn76496_device::command_w)); // 78a000-78bfff: NS32081 FPU map(0x78c000, 0x78c007).rw("aica", FUNC(mos6551_device::read), FUNC(mos6551_device::write)).umask16(0xff00); // 7b1000-7b2fff: diagnostic registers diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp index aded29ea746..4c4f4148cbf 100644 --- a/src/mame/drivers/tempest.cpp +++ b/src/mame/drivers/tempest.cpp @@ -457,9 +457,9 @@ void tempest_state::main_map(address_map &map) map(0x0e00, 0x0e00).portr("DSW2"); map(0x2000, 0x2fff).ram().share("vectorram").region("maincpu", 0x2000); map(0x3000, 0x3fff).rom(); - map(0x4000, 0x4000).w(this, FUNC(tempest_state::tempest_coin_w)); + map(0x4000, 0x4000).w(FUNC(tempest_state::tempest_coin_w)); map(0x4800, 0x4800).w(m_avg, FUNC(avg_tempest_device::go_w)); - map(0x5000, 0x5000).w(this, FUNC(tempest_state::wdclr_w)); + map(0x5000, 0x5000).w(FUNC(tempest_state::wdclr_w)); map(0x5800, 0x5800).w(m_avg, FUNC(avg_tempest_device::reset_w)); map(0x6000, 0x603f).w("earom", FUNC(atari_vg_earom_device::write)); map(0x6040, 0x6040).r(m_mathbox, FUNC(mathbox_device::status_r)).w("earom", FUNC(atari_vg_earom_device::ctrl_w)); @@ -469,9 +469,9 @@ void tempest_state::main_map(address_map &map) map(0x6080, 0x609f).w(m_mathbox, FUNC(mathbox_device::go_w)); map(0x60c0, 0x60cf).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x60d0, 0x60df).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); - map(0x60e0, 0x60e0).w(this, FUNC(tempest_state::tempest_led_w)); + map(0x60e0, 0x60e0).w(FUNC(tempest_state::tempest_led_w)); map(0x9000, 0xdfff).rom(); - map(0xae1f, 0xae1f).r(this, FUNC(tempest_state::rom_ae1f_r)); + map(0xae1f, 0xae1f).r(FUNC(tempest_state::rom_ae1f_r)); map(0xf000, 0xffff).rom(); /* for the reset / interrupt vectors */ } diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp index 12115d36b16..c07c6afc8e8 100644 --- a/src/mame/drivers/terak.cpp +++ b/src/mame/drivers/terak.cpp @@ -76,8 +76,8 @@ void terak_state::mem_map(address_map &map) // octal map(0173000, 0173177).rom(); // ROM - map(0177000, 0177001).rw(this, FUNC(terak_state::terak_fdc_status_r), FUNC(terak_state::terak_fdc_command_w)); - map(0177002, 0177003).rw(this, FUNC(terak_state::terak_fdc_data_r), FUNC(terak_state::terak_fdc_data_w)); + map(0177000, 0177001).rw(FUNC(terak_state::terak_fdc_status_r), FUNC(terak_state::terak_fdc_command_w)); + map(0177002, 0177003).rw(FUNC(terak_state::terak_fdc_data_r), FUNC(terak_state::terak_fdc_data_w)); } /* Input ports */ diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index 2d6453c895f..e3eae302fe1 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -109,19 +109,19 @@ void terracre_state::terracre_map(address_map &map) map(0x000000, 0x01ffff).rom(); map(0x020000, 0x0201ff).ram().share("spriteram"); map(0x020200, 0x021fff).ram(); - map(0x022000, 0x022fff).w(this, FUNC(terracre_state::amazon_background_w)).share("bg_videoram"); + map(0x022000, 0x022fff).w(FUNC(terracre_state::amazon_background_w)).share("bg_videoram"); map(0x023000, 0x023fff).ram(); map(0x024000, 0x024001).portr("P1"); map(0x024002, 0x024003).portr("P2"); map(0x024004, 0x024005).portr("SYSTEM"); map(0x024006, 0x024007).portr("DSW"); - map(0x026000, 0x026001).w(this, FUNC(terracre_state::amazon_flipscreen_w)); /* flip screen & coin counters */ - map(0x026002, 0x026003).w(this, FUNC(terracre_state::amazon_scrollx_w)); - map(0x026004, 0x026005).nopr().w(this, FUNC(terracre_state::amazon_scrolly_w)); + map(0x026000, 0x026001).w(FUNC(terracre_state::amazon_flipscreen_w)); /* flip screen & coin counters */ + map(0x026002, 0x026003).w(FUNC(terracre_state::amazon_scrollx_w)); + map(0x026004, 0x026005).nopr().w(FUNC(terracre_state::amazon_scrolly_w)); map(0x02600a, 0x02600b).noprw(); // video related - map(0x02600c, 0x02600d).w(this, FUNC(terracre_state::amazon_sound_w)); + map(0x02600c, 0x02600d).w(FUNC(terracre_state::amazon_sound_w)); map(0x02600e, 0x02600f).noprw(); // video related - map(0x028000, 0x0287ff).ram().w(this, FUNC(terracre_state::amazon_foreground_w)).share("fg_videoram"); + map(0x028000, 0x0287ff).ram().w(FUNC(terracre_state::amazon_foreground_w)).share("fg_videoram"); } void terracre_state::amazon_base_map(address_map &map) @@ -129,18 +129,18 @@ void terracre_state::amazon_base_map(address_map &map) map(0x000000, 0x01ffff).rom(); map(0x040000, 0x0401ff).ram().share("spriteram"); map(0x040200, 0x040fff).ram(); - map(0x042000, 0x042fff).w(this, FUNC(terracre_state::amazon_background_w)).share("bg_videoram"); + map(0x042000, 0x042fff).w(FUNC(terracre_state::amazon_background_w)).share("bg_videoram"); map(0x044000, 0x044001).portr("IN0"); map(0x044002, 0x044003).portr("IN1"); map(0x044004, 0x044005).portr("IN2"); map(0x044006, 0x044007).portr("IN3"); - map(0x046000, 0x046001).w(this, FUNC(terracre_state::amazon_flipscreen_w)); /* flip screen & coin counters */ - map(0x046002, 0x046003).w(this, FUNC(terracre_state::amazon_scrollx_w)); - map(0x046004, 0x046005).nopr().w(this, FUNC(terracre_state::amazon_scrolly_w)); + map(0x046000, 0x046001).w(FUNC(terracre_state::amazon_flipscreen_w)); /* flip screen & coin counters */ + map(0x046002, 0x046003).w(FUNC(terracre_state::amazon_scrollx_w)); + map(0x046004, 0x046005).nopr().w(FUNC(terracre_state::amazon_scrolly_w)); map(0x04600a, 0x04600b).noprw(); // video related - map(0x04600c, 0x04600d).w(this, FUNC(terracre_state::amazon_sound_w)); + map(0x04600c, 0x04600d).w(FUNC(terracre_state::amazon_sound_w)); map(0x04600e, 0x04600f).noprw(); // video related - map(0x050000, 0x050fff).ram().w(this, FUNC(terracre_state::amazon_foreground_w)).share("fg_videoram"); + map(0x050000, 0x050fff).ram().w(FUNC(terracre_state::amazon_foreground_w)).share("fg_videoram"); map(0x070000, 0x070003).noprw(); // protection (nop for bootlegs) } @@ -162,9 +162,9 @@ void terracre_state::sound_3526_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).w("ymsnd", FUNC(ym3526_device::write)); - map(0x02, 0x02).w("dac1", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w("dac2", FUNC(dac_byte_interface::write)); - map(0x04, 0x04).r(this, FUNC(terracre_state::soundlatch_clear_r)); + map(0x02, 0x02).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w("dac2", FUNC(dac_byte_interface::data_w)); + map(0x04, 0x04).r(FUNC(terracre_state::soundlatch_clear_r)); map(0x06, 0x06).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } @@ -172,9 +172,9 @@ void terracre_state::sound_2203_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).w("ym1", FUNC(ym2203_device::write)); - map(0x02, 0x02).w("dac1", FUNC(dac_byte_interface::write)); - map(0x03, 0x03).w("dac2", FUNC(dac_byte_interface::write)); - map(0x04, 0x04).r(this, FUNC(terracre_state::soundlatch_clear_r)); + map(0x02, 0x02).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x03, 0x03).w("dac2", FUNC(dac_byte_interface::data_w)); + map(0x04, 0x04).r(FUNC(terracre_state::soundlatch_clear_r)); map(0x06, 0x06).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index 384e75eef34..ec710c272b1 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -307,27 +307,27 @@ void tetrisp2_state::tetrisp2_map(address_map &map) map(0x100000, 0x103fff).ram().share("spriteram"); // Object RAM map(0x104000, 0x107fff).ram(); // Spare Object RAM map(0x108000, 0x10ffff).ram(); // Work RAM - map(0x200000, 0x23ffff).rw(this, FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); - map(0x300000, 0x31ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette - map(0x400000, 0x403fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground - map(0x404000, 0x407fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background + map(0x200000, 0x23ffff).rw(FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); + map(0x300000, 0x31ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette + map(0x400000, 0x403fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground + map(0x404000, 0x407fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background map(0x408000, 0x409fff).ram(); // ??? map(0x500000, 0x50ffff).ram(); // Line - map(0x600000, 0x60ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation - map(0x650000, 0x651fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_rot_w)); // Rotation (mirror) + map(0x600000, 0x60ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation + map(0x650000, 0x651fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_rot_w)); // Rotation (mirror) map(0x800000, 0x800003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // Sound - map(0x900000, 0x903fff).r(this, FUNC(tetrisp2_state::tetrisp2_nvram_r)).w(this, FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM - map(0x904000, 0x907fff).r(this, FUNC(tetrisp2_state::tetrisp2_nvram_r)).w(this, FUNC(tetrisp2_state::tetrisp2_nvram_w)); // NVRAM (mirror) - map(0xb00000, 0xb00001).w(this, FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter + map(0x900000, 0x903fff).r(FUNC(tetrisp2_state::tetrisp2_nvram_r)).w(FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM + map(0x904000, 0x907fff).r(FUNC(tetrisp2_state::tetrisp2_nvram_r)).w(FUNC(tetrisp2_state::tetrisp2_nvram_w)); // NVRAM (mirror) + map(0xb00000, 0xb00001).w(FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter map(0xb20000, 0xb20001).nopw(); // ??? map(0xb40000, 0xb4000b).writeonly().share("scroll_fg"); // Foreground Scrolling map(0xb40010, 0xb4001b).writeonly().share("scroll_bg"); // Background Scrolling map(0xb4003e, 0xb4003f).nopw(); // scr_size map(0xb60000, 0xb6002f).writeonly().share("rotregs"); // Rotation Registers - map(0xba0000, 0xba001f).w(this, FUNC(tetrisp2_state::tetrisp2_systemregs_w)); // system param + map(0xba0000, 0xba001f).w(FUNC(tetrisp2_state::tetrisp2_systemregs_w)); // system param map(0xbe0000, 0xbe0001).nopr(); // INT-level1 dummy read map(0xbe0002, 0xbe0003).portr("PLAYERS"); // Inputs - map(0xbe0004, 0xbe0005).r(this, FUNC(tetrisp2_state::tetrisp2_ip_1_word_r)); // Inputs & protection + map(0xbe0004, 0xbe0005).r(FUNC(tetrisp2_state::tetrisp2_ip_1_word_r)); // Inputs & protection map(0xbe0008, 0xbe0009).portr("DSW"); // Inputs map(0xbe000a, 0xbe000b).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // Watchdog } @@ -363,23 +363,23 @@ void tetrisp2_state::nndmseal_map(address_map &map) map(0x100000, 0x103fff).ram().share("spriteram"); // Object RAM map(0x104000, 0x107fff).ram(); // Spare Object RAM map(0x108000, 0x10ffff).ram(); // Work RAM - map(0x200000, 0x23ffff).rw(this, FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); - map(0x300000, 0x31ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette - map(0x400000, 0x403fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground - map(0x404000, 0x407fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background + map(0x200000, 0x23ffff).rw(FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); + map(0x300000, 0x31ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette + map(0x400000, 0x403fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground + map(0x404000, 0x407fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background map(0x408000, 0x409fff).ram(); // ??? map(0x500000, 0x50ffff).ram(); // Line - map(0x600000, 0x60ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation - map(0x650000, 0x651fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_rot_w)); // Rotation (mirror) + map(0x600000, 0x60ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation + map(0x650000, 0x651fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_rot_w)); // Rotation (mirror) map(0x800000, 0x800003).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); // Sound - map(0x900000, 0x903fff).rw(this, FUNC(tetrisp2_state::tetrisp2_nvram_r), FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM + map(0x900000, 0x903fff).rw(FUNC(tetrisp2_state::tetrisp2_nvram_r), FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM - map(0xb00000, 0xb00001).w(this, FUNC(tetrisp2_state::nndmseal_coincounter_w)); // Coin Counter - map(0xb20000, 0xb20001).w(this, FUNC(tetrisp2_state::nndmseal_b20000_w)); // ??? + map(0xb00000, 0xb00001).w(FUNC(tetrisp2_state::nndmseal_coincounter_w)); // Coin Counter + map(0xb20000, 0xb20001).w(FUNC(tetrisp2_state::nndmseal_b20000_w)); // ??? map(0xb40000, 0xb4000b).writeonly().share("scroll_fg"); // Foreground Scrolling map(0xb40010, 0xb4001b).writeonly().share("scroll_bg"); // Background Scrolling @@ -387,9 +387,9 @@ void tetrisp2_state::nndmseal_map(address_map &map) map(0xb60000, 0xb6002f).writeonly().share("rotregs"); // Rotation Registers - map(0xb80000, 0xb80001).w(this, FUNC(tetrisp2_state::nndmseal_sound_bank_w)); + map(0xb80000, 0xb80001).w(FUNC(tetrisp2_state::nndmseal_sound_bank_w)); - map(0xba0000, 0xba001f).w(this, FUNC(tetrisp2_state::rockn_systemregs_w)); // system param + map(0xba0000, 0xba001f).w(FUNC(tetrisp2_state::rockn_systemregs_w)); // system param map(0xbe0000, 0xbe0001).nopr(); // INT-level1 dummy read map(0xbe0002, 0xbe0003).portr("BUTTONS"); // Inputs @@ -407,25 +407,25 @@ void tetrisp2_state::rockn1_map(address_map &map) map(0x100000, 0x103fff).ram().share("spriteram"); // Object RAM map(0x104000, 0x107fff).ram(); // Spare Object RAM map(0x108000, 0x10ffff).ram(); // Work RAM - map(0x200000, 0x23ffff).rw(this, FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); - map(0x300000, 0x31ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette - map(0x400000, 0x403fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground - map(0x404000, 0x407fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background + map(0x200000, 0x23ffff).rw(FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); + map(0x300000, 0x31ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette + map(0x400000, 0x403fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground + map(0x404000, 0x407fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background map(0x408000, 0x409fff).ram(); // ??? map(0x500000, 0x50ffff).ram(); // Line - map(0x600000, 0x60ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation - map(0x900000, 0x903fff).r(this, FUNC(tetrisp2_state::rockn_nvram_r)).w(this, FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM - map(0xa30000, 0xa30001).rw(this, FUNC(tetrisp2_state::rockn_soundvolume_r), FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume + map(0x600000, 0x60ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation + map(0x900000, 0x903fff).r(FUNC(tetrisp2_state::rockn_nvram_r)).w(FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM + map(0xa30000, 0xa30001).rw(FUNC(tetrisp2_state::rockn_soundvolume_r), FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume map(0xa40000, 0xa40003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // Sound - map(0xa44000, 0xa44001).rw(this, FUNC(tetrisp2_state::rockn_adpcmbank_r), FUNC(tetrisp2_state::rockn_adpcmbank_w)); // Sound Bank + map(0xa44000, 0xa44001).rw(FUNC(tetrisp2_state::rockn_adpcmbank_r), FUNC(tetrisp2_state::rockn_adpcmbank_w)); // Sound Bank map(0xa48000, 0xa48001).noprw(); // YMZ280 Reset - map(0xb00000, 0xb00001).w(this, FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter + map(0xb00000, 0xb00001).w(FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter map(0xb20000, 0xb20001).noprw(); // ??? map(0xb40000, 0xb4000b).writeonly().share("scroll_fg"); // Foreground Scrolling map(0xb40010, 0xb4001b).writeonly().share("scroll_bg"); // Background Scrolling map(0xb4003e, 0xb4003f).nopw(); // scr_size map(0xb60000, 0xb6002f).writeonly().share("rotregs"); // Rotation Registers - map(0xba0000, 0xba001f).w(this, FUNC(tetrisp2_state::rockn_systemregs_w)); // system param + map(0xba0000, 0xba001f).w(FUNC(tetrisp2_state::rockn_systemregs_w)); // system param map(0xbe0000, 0xbe0001).nopr(); // INT-level1 dummy read map(0xbe0002, 0xbe0003).portr("PLAYERS"); // Inputs map(0xbe0004, 0xbe0005).portr("SYSTEM"); // Inputs @@ -440,25 +440,25 @@ void tetrisp2_state::rockn2_map(address_map &map) map(0x100000, 0x103fff).ram().share("spriteram"); // Object RAM map(0x104000, 0x107fff).ram(); // Spare Object RAM map(0x108000, 0x10ffff).ram(); // Work RAM - map(0x200000, 0x23ffff).rw(this, FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); - map(0x300000, 0x31ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette + map(0x200000, 0x23ffff).rw(FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); + map(0x300000, 0x31ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette map(0x500000, 0x50ffff).ram(); // Line - map(0x600000, 0x60ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation - map(0x800000, 0x803fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground - map(0x804000, 0x807fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background + map(0x600000, 0x60ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation + map(0x800000, 0x803fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground + map(0x804000, 0x807fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background map(0x808000, 0x809fff).ram(); // ??? - map(0x900000, 0x903fff).r(this, FUNC(tetrisp2_state::rockn_nvram_r)).w(this, FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM - map(0xa30000, 0xa30001).rw(this, FUNC(tetrisp2_state::rockn_soundvolume_r), FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume + map(0x900000, 0x903fff).r(FUNC(tetrisp2_state::rockn_nvram_r)).w(FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM + map(0xa30000, 0xa30001).rw(FUNC(tetrisp2_state::rockn_soundvolume_r), FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume map(0xa40000, 0xa40003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // Sound - map(0xa44000, 0xa44001).rw(this, FUNC(tetrisp2_state::rockn_adpcmbank_r), FUNC(tetrisp2_state::rockn2_adpcmbank_w)); // Sound Bank + map(0xa44000, 0xa44001).rw(FUNC(tetrisp2_state::rockn_adpcmbank_r), FUNC(tetrisp2_state::rockn2_adpcmbank_w)); // Sound Bank map(0xa48000, 0xa48001).nopw(); // YMZ280 Reset - map(0xb00000, 0xb00001).w(this, FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter + map(0xb00000, 0xb00001).w(FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter map(0xb20000, 0xb20001).nopw(); // ??? map(0xb40000, 0xb4000b).writeonly().share("scroll_fg"); // Foreground Scrolling map(0xb40010, 0xb4001b).writeonly().share("scroll_bg"); // Background Scrolling map(0xb4003e, 0xb4003f).nopw(); // scr_size map(0xb60000, 0xb6002f).writeonly().share("rotregs"); // Rotation Registers - map(0xba0000, 0xba001f).w(this, FUNC(tetrisp2_state::rockn_systemregs_w)); // system param + map(0xba0000, 0xba001f).w(FUNC(tetrisp2_state::rockn_systemregs_w)); // system param map(0xbe0000, 0xbe0001).nopr(); // INT-level1 dummy read map(0xbe0002, 0xbe0003).portr("PLAYERS"); // Inputs map(0xbe0004, 0xbe0005).portr("SYSTEM"); // Inputs @@ -473,26 +473,26 @@ void tetrisp2_state::rocknms_main_map(address_map &map) map(0x100000, 0x103fff).ram().share("spriteram"); // Object RAM map(0x104000, 0x107fff).ram(); // Spare Object RAM map(0x108000, 0x10ffff).ram(); // Work RAM - map(0x200000, 0x23ffff).rw(this, FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); - map(0x300000, 0x31ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette + map(0x200000, 0x23ffff).rw(FUNC(tetrisp2_state::tetrisp2_priority_r), FUNC(tetrisp2_state::tetrisp2_priority_w)); + map(0x300000, 0x31ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_palette_w)).share("paletteram"); // Palette // map(0x500000, 0x50ffff).ram(); // Line - map(0x600000, 0x60ffff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation - map(0x800000, 0x803fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground - map(0x804000, 0x807fff).ram().w(this, FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background + map(0x600000, 0x60ffff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation + map(0x800000, 0x803fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground + map(0x804000, 0x807fff).ram().w(FUNC(tetrisp2_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background // map(0x808000, 0x809fff).ram(); // ??? - map(0x900000, 0x903fff).r(this, FUNC(tetrisp2_state::rockn_nvram_r)).w(this, FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM - map(0xa30000, 0xa30001).rw(this, FUNC(tetrisp2_state::rockn_soundvolume_r), FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume + map(0x900000, 0x903fff).r(FUNC(tetrisp2_state::rockn_nvram_r)).w(FUNC(tetrisp2_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM + map(0xa30000, 0xa30001).rw(FUNC(tetrisp2_state::rockn_soundvolume_r), FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume map(0xa40000, 0xa40003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); // Sound - map(0xa44000, 0xa44001).rw(this, FUNC(tetrisp2_state::rockn_adpcmbank_r), FUNC(tetrisp2_state::rockn_adpcmbank_w)); // Sound Bank + map(0xa44000, 0xa44001).rw(FUNC(tetrisp2_state::rockn_adpcmbank_r), FUNC(tetrisp2_state::rockn_adpcmbank_w)); // Sound Bank map(0xa48000, 0xa48001).nopw(); // YMZ280 Reset - map(0xa00000, 0xa00001).w(this, FUNC(tetrisp2_state::rocknms_main2sub_w)); // MAIN -> SUB Communication - map(0xb00000, 0xb00001).w(this, FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter + map(0xa00000, 0xa00001).w(FUNC(tetrisp2_state::rocknms_main2sub_w)); // MAIN -> SUB Communication + map(0xb00000, 0xb00001).w(FUNC(tetrisp2_state::tetrisp2_coincounter_w)); // Coin Counter map(0xb20000, 0xb20001).nopw(); // ??? map(0xb40000, 0xb4000b).writeonly().share("scroll_fg"); // Foreground Scrolling map(0xb40010, 0xb4001b).writeonly().share("scroll_bg"); // Background Scrolling map(0xb4003e, 0xb4003f).nopw(); // scr_size map(0xb60000, 0xb6002f).writeonly().share("rotregs"); // Rotation Registers - map(0xba0000, 0xba001f).w(this, FUNC(tetrisp2_state::rockn_systemregs_w)); // system param + map(0xba0000, 0xba001f).w(FUNC(tetrisp2_state::rockn_systemregs_w)); // system param map(0xbe0000, 0xbe0001).nopr(); // INT-level1 dummy read map(0xbe0002, 0xbe0003).portr("PLAYERS"); map(0xbe0004, 0xbe0005).portr("SYSTEM"); // Inputs @@ -507,27 +507,27 @@ void tetrisp2_state::rocknms_sub_map(address_map &map) map(0x100000, 0x103fff).ram().share("spriteram2"); // Object RAM map(0x104000, 0x107fff).ram(); // Spare Object RAM map(0x108000, 0x10ffff).ram(); // Work RAM - map(0x200000, 0x23ffff).ram().w(this, FUNC(tetrisp2_state::rocknms_sub_priority_w)).share("sub_priority"); // Priority - map(0x300000, 0x31ffff).ram().w(this, FUNC(tetrisp2_state::rocknms_sub_palette_w)).share("sub_paletteram"); // Palette + map(0x200000, 0x23ffff).ram().w(FUNC(tetrisp2_state::rocknms_sub_priority_w)).share("sub_priority"); // Priority + map(0x300000, 0x31ffff).ram().w(FUNC(tetrisp2_state::rocknms_sub_palette_w)).share("sub_paletteram"); // Palette // map(0x500000, 0x50ffff).ram(); // Line - map(0x600000, 0x60ffff).ram().w(this, FUNC(tetrisp2_state::rocknms_sub_vram_rot_w)).share("sub_vram_rot"); // Rotation - map(0x800000, 0x803fff).ram().w(this, FUNC(tetrisp2_state::rocknms_sub_vram_fg_w)).share("sub_vram_fg"); // Foreground - map(0x804000, 0x807fff).ram().w(this, FUNC(tetrisp2_state::rocknms_sub_vram_bg_w)).share("sub_vram_bg"); // Background + map(0x600000, 0x60ffff).ram().w(FUNC(tetrisp2_state::rocknms_sub_vram_rot_w)).share("sub_vram_rot"); // Rotation + map(0x800000, 0x803fff).ram().w(FUNC(tetrisp2_state::rocknms_sub_vram_fg_w)).share("sub_vram_fg"); // Foreground + map(0x804000, 0x807fff).ram().w(FUNC(tetrisp2_state::rocknms_sub_vram_bg_w)).share("sub_vram_bg"); // Background // map(0x808000, 0x809fff).ram(); // ??? map(0x900000, 0x907fff).ram(); // NVRAM - map(0xa30000, 0xa30001).w(this, FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume + map(0xa30000, 0xa30001).w(FUNC(tetrisp2_state::rockn_soundvolume_w)); // Sound Volume map(0xa40000, 0xa40003).w("ymz", FUNC(ymz280b_device::write)).umask16(0x00ff); // Sound - map(0xa44000, 0xa44001).w(this, FUNC(tetrisp2_state::rockn_adpcmbank_w)); // Sound Bank + map(0xa44000, 0xa44001).w(FUNC(tetrisp2_state::rockn_adpcmbank_w)); // Sound Bank map(0xa48000, 0xa48001).nopw(); // YMZ280 Reset - map(0xb00000, 0xb00001).w(this, FUNC(tetrisp2_state::rocknms_sub2main_w)); // MAIN <- SUB Communication + map(0xb00000, 0xb00001).w(FUNC(tetrisp2_state::rocknms_sub2main_w)); // MAIN <- SUB Communication map(0xb20000, 0xb20001).nopw(); // ??? map(0xb40000, 0xb4000b).writeonly().share("sub_scroll_fg"); // Foreground Scrolling map(0xb40010, 0xb4001b).writeonly().share("sub_scroll_bg"); // Background Scrolling map(0xb4003e, 0xb4003f).nopw(); // scr_size map(0xb60000, 0xb6002f).writeonly().share("sub_rotregs"); // Rotation Registers - map(0xba0000, 0xba001f).w(this, FUNC(tetrisp2_state::rocknms_sub_systemregs_w)); // system param + map(0xba0000, 0xba001f).w(FUNC(tetrisp2_state::rocknms_sub_systemregs_w)); // system param // map(0xbe0000, 0xbe0001).nopr(); // INT-level1 dummy read - map(0xbe0002, 0xbe0003).rw(this, FUNC(tetrisp2_state::rocknms_main2sub_r), FUNC(tetrisp2_state::rocknms_sub2main_w)); // MAIN <-> SUB Communication + map(0xbe0002, 0xbe0003).rw(FUNC(tetrisp2_state::rocknms_main2sub_r), FUNC(tetrisp2_state::rocknms_sub2main_w)); // MAIN <-> SUB Communication map(0xbe000a, 0xbe000b).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // Watchdog } @@ -655,36 +655,36 @@ void stepstag_state::stepstag_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x100000, 0x103fff).ram().share("spriteram"); // Object RAM map(0x108000, 0x10ffff).ram(); // Work RAM - map(0x200000, 0x23ffff).rw(this, FUNC(stepstag_state::tetrisp2_priority_r), FUNC(stepstag_state::tetrisp2_priority_w)); - map(0x300000, 0x31ffff).ram().w(this, FUNC(stepstag_state::tetrisp2_palette_w)).share("paletteram"); // Palette - map(0x400000, 0x403fff).ram().w(this, FUNC(stepstag_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground - map(0x404000, 0x407fff).ram().w(this, FUNC(stepstag_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background + map(0x200000, 0x23ffff).rw(FUNC(stepstag_state::tetrisp2_priority_r), FUNC(stepstag_state::tetrisp2_priority_w)); + map(0x300000, 0x31ffff).ram().w(FUNC(stepstag_state::tetrisp2_palette_w)).share("paletteram"); // Palette + map(0x400000, 0x403fff).ram().w(FUNC(stepstag_state::tetrisp2_vram_fg_w)).share("vram_fg"); // Foreground + map(0x404000, 0x407fff).ram().w(FUNC(stepstag_state::tetrisp2_vram_bg_w)).share("vram_bg"); // Background // map(0x408000, 0x409fff).ram(); // ??? map(0x500000, 0x50ffff).ram(); // Line - map(0x600000, 0x60ffff).ram().w(this, FUNC(stepstag_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation - map(0x900000, 0x903fff).rw(this, FUNC(stepstag_state::rockn_nvram_r), FUNC(stepstag_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM -// map(0x904000, 0x907fff).rw(this, FUNC(stepstag_state::rockn_nvram_r), FUNC(stepstag_state::tetrisp2_nvram_w); // NVRAM (mirror) - map(0xa00000, 0xa00001).nopr().w(this, FUNC(stepstag_state::stepstag_neon_w)); // Neon?? - map(0xa10000, 0xa10001).portr("RHYTHM").w(this, FUNC(stepstag_state::stepstag_step_leds_w)); // I/O - map(0xa20000, 0xa20001).nopr().w(this, FUNC(stepstag_state::stepstag_button_leds_w)); // I/O - map(0xa30000, 0xa30001).rw(this, FUNC(stepstag_state::rockn_soundvolume_r), FUNC(stepstag_state::rockn_soundvolume_w)); // Sound Volume - map(0xa42000, 0xa42001).r(this, FUNC(stepstag_state::stepstag_pc2main_r)); + map(0x600000, 0x60ffff).ram().w(FUNC(stepstag_state::tetrisp2_vram_rot_w)).share("vram_rot"); // Rotation + map(0x900000, 0x903fff).rw(FUNC(stepstag_state::rockn_nvram_r), FUNC(stepstag_state::tetrisp2_nvram_w)).share("nvram"); // NVRAM +// map(0x904000, 0x907fff).rw(FUNC(stepstag_state::rockn_nvram_r), FUNC(stepstag_state::tetrisp2_nvram_w); // NVRAM (mirror) + map(0xa00000, 0xa00001).nopr().w(FUNC(stepstag_state::stepstag_neon_w)); // Neon?? + map(0xa10000, 0xa10001).portr("RHYTHM").w(FUNC(stepstag_state::stepstag_step_leds_w)); // I/O + map(0xa20000, 0xa20001).nopr().w(FUNC(stepstag_state::stepstag_button_leds_w)); // I/O + map(0xa30000, 0xa30001).rw(FUNC(stepstag_state::rockn_soundvolume_r), FUNC(stepstag_state::rockn_soundvolume_w)); // Sound Volume + map(0xa42000, 0xa42001).r(FUNC(stepstag_state::stepstag_pc2main_r)); map(0xa44000, 0xa44001).nopr(); // watchdog - map(0xa48000, 0xa48001).w(this, FUNC(stepstag_state::stepstag_main2pc_w)); // PC Comm + map(0xa48000, 0xa48001).w(FUNC(stepstag_state::stepstag_main2pc_w)); // PC Comm // map(0xa4c000, 0xa4c001).nopw(); // PC? - map(0xa50000, 0xa50001).r(m_soundlatch, FUNC(generic_latch_16_device::read)).w(this, FUNC(stepstag_state::stepstag_soundlatch_word_w)); + map(0xa50000, 0xa50001).r(m_soundlatch, FUNC(generic_latch_16_device::read)).w(FUNC(stepstag_state::stepstag_soundlatch_word_w)); map(0xa60000, 0xa60003).w("ymz", FUNC(ymz280b_device::write)).umask16(0x00ff); // Sound - map(0xb00000, 0xb00001).w(this, FUNC(stepstag_state::stepstag_b00000_w)); // init xilinx uploading?? - map(0xb20000, 0xb20001).w(this, FUNC(stepstag_state::stepstag_b20000_w)); // 98343 interface board xilinx uploading? + map(0xb00000, 0xb00001).w(FUNC(stepstag_state::stepstag_b00000_w)); // init xilinx uploading?? + map(0xb20000, 0xb20001).w(FUNC(stepstag_state::stepstag_b20000_w)); // 98343 interface board xilinx uploading? map(0xb40000, 0xb4000b).writeonly().share("scroll_fg"); // Foreground Scrolling map(0xb40010, 0xb4001b).writeonly().share("scroll_bg"); // Background Scrolling map(0xb4003e, 0xb4003f).ram(); // scr_size map(0xb60000, 0xb6002f).writeonly().share("rotregs"); // Rotation Registers - map(0xba0000, 0xba001f).w(this, FUNC(stepstag_state::rockn_systemregs_w)); // System param + map(0xba0000, 0xba001f).w(FUNC(stepstag_state::rockn_systemregs_w)); // System param map(0xbe0000, 0xbe0001).nopr(); // INT-level1 dummy read map(0xbe0002, 0xbe0003).portr("BUTTONS"); // Inputs - map(0xbe0004, 0xbe0005).r(this, FUNC(stepstag_state::stepstag_coins_r)); // Inputs & protection + map(0xbe0004, 0xbe0005).r(FUNC(stepstag_state::stepstag_coins_r)); // Inputs & protection map(0xbe0008, 0xbe0009).portr("DSW"); // Inputs map(0xbe000a, 0xbe000b).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); // Watchdog } @@ -696,11 +696,11 @@ void stepstag_state::stepstag_sub_map(address_map &map) map(0x200000, 0x20ffff).ram(); // scrambled palettes? - map(0x300000, 0x33ffff).ram() /* .w(this, FUNC(stepstag_sub_map::stepstag_palette_w))*/ .share("paletteram1"); + map(0x300000, 0x33ffff).ram() /* .w(FUNC(stepstag_sub_map::stepstag_palette_w))*/ .share("paletteram1"); - map(0x400000, 0x43ffff).ram() /* .w(this, FUNC(stepstag_sub_map::stepstag_palette_w))*/ .share("paletteram2"); + map(0x400000, 0x43ffff).ram() /* .w(FUNC(stepstag_sub_map::stepstag_palette_w))*/ .share("paletteram2"); - map(0x500000, 0x53ffff).ram() /* .w(this, FUNC(stepstag_sub_map::stepstag_palette_w))*/ .share("paletteram3"); + map(0x500000, 0x53ffff).ram() /* .w(FUNC(stepstag_sub_map::stepstag_palette_w))*/ .share("paletteram3"); // rgb brightness? map(0x700000, 0x700001).nopw(); // 0-f @@ -728,10 +728,10 @@ void stepstag_state::stepstag_sub_map(address_map &map) map(0xb00000, 0xb00001).rw(m_soundlatch, FUNC(generic_latch_16_device::read), FUNC(generic_latch_16_device::write)); - map(0xc00000, 0xc00001).r(this, FUNC(stepstag_state::unknown_read_0xc00000)).nopw(); //?? + map(0xc00000, 0xc00001).r(FUNC(stepstag_state::unknown_read_0xc00000)).nopw(); //?? map(0xd00000, 0xd00001).nopr(); // watchdog map(0xf00000, 0xf00001).nopw(); //?? - map(0xffff00, 0xffff01).r(this, FUNC(stepstag_state::unknown_read_0xffff00)); + map(0xffff00, 0xffff01).r(FUNC(stepstag_state::unknown_read_0xffff00)); } diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp index 200fb59381f..20c7d79bf4e 100644 --- a/src/mame/drivers/tgtpanic.cpp +++ b/src/mame/drivers/tgtpanic.cpp @@ -111,7 +111,7 @@ void tgtpanic_state::prg_map(address_map &map) void tgtpanic_state::io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("IN0").w(this, FUNC(tgtpanic_state::color_w)); + map(0x00, 0x00).portr("IN0").w(FUNC(tgtpanic_state::color_w)); map(0x01, 0x01).portr("IN1"); } diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index af2239ea416..3843f0055be 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -629,20 +629,20 @@ void thayers_state::thayers_map(address_map &map) void thayers_state::thayers_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x07).rw(this, FUNC(thayers_state::ssi263_register_r), FUNC(thayers_state::ssi263_register_w)); - map(0x20, 0x20).w(this, FUNC(thayers_state::control_w)); - map(0x40, 0x40).rw(this, FUNC(thayers_state::irqstate_r), FUNC(thayers_state::control2_w)); - map(0x80, 0x80).rw(this, FUNC(thayers_state::cop_data_r), FUNC(thayers_state::cop_data_w)); - map(0xa0, 0xa0).w(this, FUNC(thayers_state::timer_int_ack_w)); - map(0xc0, 0xc0).w(this, FUNC(thayers_state::data_rdy_int_ack_w)); - map(0xf0, 0xf0).r(this, FUNC(thayers_state::laserdsc_data_r)); - map(0xf1, 0xf1).r(this, FUNC(thayers_state::dsw_b_r)); + map(0x00, 0x07).rw(FUNC(thayers_state::ssi263_register_r), FUNC(thayers_state::ssi263_register_w)); + map(0x20, 0x20).w(FUNC(thayers_state::control_w)); + map(0x40, 0x40).rw(FUNC(thayers_state::irqstate_r), FUNC(thayers_state::control2_w)); + map(0x80, 0x80).rw(FUNC(thayers_state::cop_data_r), FUNC(thayers_state::cop_data_w)); + map(0xa0, 0xa0).w(FUNC(thayers_state::timer_int_ack_w)); + map(0xc0, 0xc0).w(FUNC(thayers_state::data_rdy_int_ack_w)); + map(0xf0, 0xf0).r(FUNC(thayers_state::laserdsc_data_r)); + map(0xf1, 0xf1).r(FUNC(thayers_state::dsw_b_r)); map(0xf2, 0xf2).portr("DSWA"); - map(0xf3, 0xf3).w(this, FUNC(thayers_state::intrq_w)); - map(0xf4, 0xf4).w(this, FUNC(thayers_state::laserdsc_data_w)); - map(0xf5, 0xf5).w(this, FUNC(thayers_state::laserdsc_control_w)); - map(0xf6, 0xf6).w(this, FUNC(thayers_state::den1_w)); - map(0xf7, 0xf7).w(this, FUNC(thayers_state::den2_w)); + map(0xf3, 0xf3).w(FUNC(thayers_state::intrq_w)); + map(0xf4, 0xf4).w(FUNC(thayers_state::laserdsc_data_w)); + map(0xf5, 0xf5).w(FUNC(thayers_state::laserdsc_control_w)); + map(0xf6, 0xf6).w(FUNC(thayers_state::den1_w)); + map(0xf7, 0xf7).w(FUNC(thayers_state::den2_w)); } /* Input Ports */ diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index a6b02735515..9ea496b28aa 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -284,16 +284,16 @@ void thedealr_state::thedealr(address_map &map) map(0x2000, 0x2000).ram(); // w ff at boot (after clearing commram) - map(0x2400, 0x2400).r(this, FUNC(thedealr_state::irq_ack_r)); // r = irq ack. - map(0x2400, 0x2400).w(this, FUNC(thedealr_state::unk_w)); // w = ? + map(0x2400, 0x2400).r(FUNC(thedealr_state::irq_ack_r)); // r = irq ack. + map(0x2400, 0x2400).w(FUNC(thedealr_state::unk_w)); // w = ? map(0x2800, 0x2800).portr("COINS").nopw(); // rw map(0x2801, 0x2801).portr("DSW4"); map(0x2c00, 0x2c00).portr("DSW3"); - map(0x3400, 0x3400).rw(this, FUNC(thedealr_state::iox_r), FUNC(thedealr_state::iox_w)); - map(0x3401, 0x3401).r(this, FUNC(thedealr_state::iox_status_r)); + map(0x3400, 0x3400).rw(FUNC(thedealr_state::iox_r), FUNC(thedealr_state::iox_w)); + map(0x3401, 0x3401).r(FUNC(thedealr_state::iox_status_r)); map(0x3000, 0x3000).ram(); // rw, comm in test mode map(0x3001, 0x3001).ram(); // rw, "" diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp index 142d5f06395..62699a0b103 100644 --- a/src/mame/drivers/thedeep.cpp +++ b/src/mame/drivers/thedeep.cpp @@ -154,18 +154,18 @@ void thedeep_state::main_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); // ROM (banked) map(0xc000, 0xcfff).ram(); map(0xd000, 0xdfff).ram(); // RAM (MCU data copied here) - map(0xe000, 0xe000).rw(this, FUNC(thedeep_state::protection_r), FUNC(thedeep_state::protection_w)); // To MCU - map(0xe004, 0xe004).rw(this, FUNC(thedeep_state::e004_r), FUNC(thedeep_state::nmi_w)); // + map(0xe000, 0xe000).rw(FUNC(thedeep_state::protection_r), FUNC(thedeep_state::protection_w)); // To MCU + map(0xe004, 0xe004).rw(FUNC(thedeep_state::e004_r), FUNC(thedeep_state::nmi_w)); // map(0xe008, 0xe008).portr("e008"); // P1 (Inputs) map(0xe009, 0xe009).portr("e009"); // P2 map(0xe00a, 0xe00a).portr("e00a"); // DSW1 map(0xe00b, 0xe00b).portr("e00b"); // DSW2 map(0xe00c, 0xe00c).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // To Sound CPU - map(0xe100, 0xe100).w(this, FUNC(thedeep_state::e100_w)); // ? + map(0xe100, 0xe100).w(FUNC(thedeep_state::e100_w)); // ? map(0xe210, 0xe213).writeonly().share("scroll"); // Scroll map(0xe400, 0xe7ff).ram().share("spriteram"); // Sprites - map(0xe800, 0xefff).ram().w(this, FUNC(thedeep_state::vram_1_w)).share("vram_1"); // Text Layer - map(0xf000, 0xf7ff).ram().w(this, FUNC(thedeep_state::vram_0_w)).share("vram_0"); // Background Layer + map(0xe800, 0xefff).ram().w(FUNC(thedeep_state::vram_1_w)).share("vram_1"); // Text Layer + map(0xf000, 0xf7ff).ram().w(FUNC(thedeep_state::vram_0_w)).share("vram_0"); // Background Layer map(0xf800, 0xf83f).ram().share("scroll2"); // Column Scroll map(0xf840, 0xffff).ram(); } diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp index dcbf7ae3a22..d419c1266ba 100644 --- a/src/mame/drivers/thepit.cpp +++ b/src/mame/drivers/thepit.cpp @@ -210,12 +210,12 @@ void thepit_state::thepit_main_map(address_map &map) { map(0x0000, 0x4fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).mirror(0x0400).ram().w(this, FUNC(thepit_state::colorram_w)).share("colorram"); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(thepit_state::videoram_w)).share("videoram"); + map(0x8800, 0x8bff).mirror(0x0400).ram().w(FUNC(thepit_state::colorram_w)).share("colorram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(thepit_state::videoram_w)).share("videoram"); map(0x9800, 0x983f).mirror(0x0700).ram().share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x98ff).ram(); - map(0xa000, 0xa000).r(this, FUNC(thepit_state::input_port_0_r)).nopw(); // Not hooked up according to the schematics + map(0xa000, 0xa000).r(FUNC(thepit_state::input_port_0_r)).nopw(); // Not hooked up according to the schematics map(0xa800, 0xa800).portr("IN1"); map(0xb000, 0xb000).portr("DSW"); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -226,12 +226,12 @@ void thepit_state::desertdan_main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8800, 0x8bff).mirror(0x0400).ram().w(this, FUNC(thepit_state::colorram_w)).share("colorram"); - map(0x9000, 0x93ff).mirror(0x0400).ram().w(this, FUNC(thepit_state::videoram_w)).share("videoram"); + map(0x8800, 0x8bff).mirror(0x0400).ram().w(FUNC(thepit_state::colorram_w)).share("colorram"); + map(0x9000, 0x93ff).mirror(0x0400).ram().w(FUNC(thepit_state::videoram_w)).share("videoram"); map(0x9800, 0x983f).mirror(0x0700).ram().share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x98ff).ram(); - map(0xa000, 0xa000).r(this, FUNC(thepit_state::input_port_0_r)).nopw(); // Not hooked up according to the schematics + map(0xa000, 0xa000).r(FUNC(thepit_state::input_port_0_r)).nopw(); // Not hooked up according to the schematics map(0xa800, 0xa800).portr("IN1"); map(0xb000, 0xb000).portr("DSW"); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -242,13 +242,13 @@ void thepit_state::intrepid_main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x8c00, 0x8fff).r(this, FUNC(thepit_state::intrepid_colorram_mirror_r)).w(this, FUNC(thepit_state::colorram_w)); /* mirror for intrepi2 */ - map(0x9000, 0x93ff).ram().w(this, FUNC(thepit_state::videoram_w)).share("videoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(thepit_state::colorram_w)).share("colorram"); + map(0x8c00, 0x8fff).r(FUNC(thepit_state::intrepid_colorram_mirror_r)).w(FUNC(thepit_state::colorram_w)); /* mirror for intrepi2 */ + map(0x9000, 0x93ff).ram().w(FUNC(thepit_state::videoram_w)).share("videoram"); + map(0x9400, 0x97ff).ram().w(FUNC(thepit_state::colorram_w)).share("colorram"); map(0x9800, 0x983f).mirror(0x0700).ram().share("attributesram"); map(0x9840, 0x985f).ram().share("spriteram"); map(0x9860, 0x98ff).ram(); - map(0xa000, 0xa000).r(this, FUNC(thepit_state::input_port_0_r)); + map(0xa000, 0xa000).r(FUNC(thepit_state::input_port_0_r)); map(0xa800, 0xa800).portr("IN1"); map(0xb000, 0xb000).portr("DSW"); map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp index 4bc9d25f839..4b27c7b583e 100644 --- a/src/mame/drivers/thief.cpp +++ b/src/mame/drivers/thief.cpp @@ -137,20 +137,20 @@ void thief_state::sharkatt_main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); /* 2114 */ - map(0xc000, 0xdfff).rw(this, FUNC(thief_state::thief_videoram_r), FUNC(thief_state::thief_videoram_w)); /* 4116 */ + map(0xc000, 0xdfff).rw(FUNC(thief_state::thief_videoram_r), FUNC(thief_state::thief_videoram_w)); /* 4116 */ } void thief_state::thief_main_map(address_map &map) { - map(0x0000, 0x0000).w(this, FUNC(thief_state::thief_blit_w)); + map(0x0000, 0x0000).w(FUNC(thief_state::thief_blit_w)); map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); /* 2114 */ map(0xa000, 0xafff).rom(); /* NATO Defense diagnostic ROM */ - map(0xc000, 0xdfff).rw(this, FUNC(thief_state::thief_videoram_r), FUNC(thief_state::thief_videoram_w)); /* 4116 */ - map(0xe000, 0xe008).rw(this, FUNC(thief_state::thief_coprocessor_r), FUNC(thief_state::thief_coprocessor_w)); + map(0xc000, 0xdfff).rw(FUNC(thief_state::thief_videoram_r), FUNC(thief_state::thief_videoram_w)); /* 4116 */ + map(0xe000, 0xe008).rw(FUNC(thief_state::thief_coprocessor_r), FUNC(thief_state::thief_coprocessor_w)); map(0xe010, 0xe02f).rom(); - map(0xe080, 0xe0bf).rw(this, FUNC(thief_state::thief_context_ram_r), FUNC(thief_state::thief_context_ram_w)); - map(0xe0c0, 0xe0c0).w(this, FUNC(thief_state::thief_context_bank_w)); + map(0xe080, 0xe0bf).rw(FUNC(thief_state::thief_context_ram_r), FUNC(thief_state::thief_context_ram_w)); + map(0xe0c0, 0xe0c0).w(FUNC(thief_state::thief_context_bank_w)); } @@ -158,15 +158,15 @@ void thief_state::io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).nopw(); /* watchdog */ - map(0x10, 0x10).w(this, FUNC(thief_state::thief_video_control_w)); + map(0x10, 0x10).w(FUNC(thief_state::thief_video_control_w)); map(0x30, 0x33).mirror(0x0c).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x40, 0x41).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x41, 0x41).r("ay1", FUNC(ay8910_device::data_r)); map(0x42, 0x43).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x43, 0x43).r("ay2", FUNC(ay8910_device::data_r)); - map(0x50, 0x50).w(this, FUNC(thief_state::thief_color_plane_w)); + map(0x50, 0x50).w(FUNC(thief_state::thief_color_plane_w)); map(0x60, 0x6f).rw(m_tms, FUNC(tms9927_device::read), FUNC(tms9927_device::write)); - map(0x70, 0x7f).w(this, FUNC(thief_state::thief_color_map_w)); + map(0x70, 0x7f).w(FUNC(thief_state::thief_color_map_w)); } diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index de90724f246..43ce446b633 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -312,20 +312,20 @@ They can run the same software and accept the same devices and extensions. void thomson_state::to7(address_map &map) { - map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(this, FUNC(thomson_state::to7_cartridge_w)); /* 4 * 16 KB */ - map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to7_vram_w)); + map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(FUNC(thomson_state::to7_cartridge_w)); /* 4 * 16 KB */ + map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to7_vram_w)); map(0x6000, 0x7fff).bankrw(THOM_BASE_BANK); /* 1 * 8 KB */ map(0x8000, 0xdfff).bankrw(THOM_RAM_BANK); /* 16 or 24 KB (for extension) */ map(0xe000, 0xe7bf).bankr(THOM_FLOP_BANK); map(0xe7c0, 0xe7c7).rw(m_mc6846, FUNC(mc6846_device::read), FUNC(mc6846_device::write)); map(0xe7c8, 0xe7cb).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xe7cc, 0xe7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7d0, 0xe7df).rw(this, FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); + map(0xe7d0, 0xe7df).rw(FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); map(0xe7e0, 0xe7e3).rw("to7_io:pia_2", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xe7e8, 0xe7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); - map(0xe7f2, 0xe7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); + map(0xe7f2, 0xe7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xe7f8, 0xe7fb).rw("pia_3", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7fe, 0xe7ff).rw(this, FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); + map(0xe7fe, 0xe7ff).rw(FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); map(0xe800, 0xffff).rom(); /* system bios */ /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -825,21 +825,21 @@ In arabic mode, Ctrl+E / Ctrl+X to start / stop typing in-line latin. void thomson_state::to770(address_map &map) { - map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(this, FUNC(thomson_state::to7_cartridge_w)); /* 4 * 16 KB */ - map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to770_vram_w)); + map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(FUNC(thomson_state::to7_cartridge_w)); /* 4 * 16 KB */ + map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to770_vram_w)); map(0x6000, 0x9fff).bankrw(THOM_BASE_BANK); /* 16 KB */ map(0xa000, 0xdfff).bankrw(THOM_RAM_BANK); /* 6 * 16 KB */ map(0xe000, 0xe7bf).bankr(THOM_FLOP_BANK); map(0xe7c0, 0xe7c7).rw(m_mc6846, FUNC(mc6846_device::read), FUNC(mc6846_device::write)); map(0xe7c8, 0xe7cb).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xe7cc, 0xe7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7d0, 0xe7df).rw(this, FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); + map(0xe7d0, 0xe7df).rw(FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); map(0xe7e0, 0xe7e3).rw("to7_io:pia_2", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7e4, 0xe7e7).rw(this, FUNC(thomson_state::to770_gatearray_r), FUNC(thomson_state::to770_gatearray_w)); + map(0xe7e4, 0xe7e7).rw(FUNC(thomson_state::to770_gatearray_r), FUNC(thomson_state::to770_gatearray_w)); map(0xe7e8, 0xe7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); - map(0xe7f2, 0xe7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); + map(0xe7f2, 0xe7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xe7f8, 0xe7fb).rw("pia_3", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7fe, 0xe7ff).rw(this, FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); + map(0xe7fe, 0xe7ff).rw(FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); map(0xe800, 0xffff).rom(); /* system bios */ /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -1027,19 +1027,19 @@ Differences include: void thomson_state::mo5(address_map &map) { - map(0x0000, 0x1fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to770_vram_w)); + map(0x0000, 0x1fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to770_vram_w)); map(0x2000, 0x9fff).bankrw(THOM_BASE_BANK); map(0xa000, 0xa7bf).bankr(THOM_FLOP_BANK); map(0xa7c0, 0xa7c3).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xa7cb, 0xa7cb).w(this, FUNC(thomson_state::mo5_ext_w)); + map(0xa7cb, 0xa7cb).w(FUNC(thomson_state::mo5_ext_w)); map(0xa7cc, 0xa7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xa7d0, 0xa7df).rw(this, FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); + map(0xa7d0, 0xa7df).rw(FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); map(0xa7e0, 0xa7e3).rw("to7_io:pia_2", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xa7e4, 0xa7e7).rw(this, FUNC(thomson_state::mo5_gatearray_r), FUNC(thomson_state::mo5_gatearray_w)); + map(0xa7e4, 0xa7e7).rw(FUNC(thomson_state::mo5_gatearray_r), FUNC(thomson_state::mo5_gatearray_w)); map(0xa7e8, 0xa7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); - map(0xa7f2, 0xa7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); + map(0xa7f2, 0xa7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xa7fe, 0xa7ff).rw(m_mea8000, FUNC(mea8000_device::read), FUNC(mea8000_device::write)); - map(0xb000, 0xefff).bankr(THOM_CART_BANK).w(this, FUNC(thomson_state::mo5_cartridge_w)); + map(0xb000, 0xefff).bankr(THOM_CART_BANK).w(FUNC(thomson_state::mo5_cartridge_w)); map(0xf000, 0xffff).rom(); /* system bios */ /* 0x10000 - 0x1ffff: 16 KB integrated BASIC / 64 KB external cartridge */ @@ -1141,7 +1141,7 @@ MACHINE_CONFIG_START(thomson_state::mo5) MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, mo5_sys_porta_in)) MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, mo5_sys_portb_in)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo5_sys_porta_out)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(*this, thomson_state, mo5_set_cassette_motor)) MCFG_PIA_CB2_HANDLER(NOOP) MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>)) // WARNING: differs from TO7 ! @@ -1251,23 +1251,23 @@ It was replaced quickly with the improved TO9+. void thomson_state::to9(address_map &map) { - map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(this, FUNC(thomson_state::to9_cartridge_w));/* 4 * 16 KB */ - map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to770_vram_w)); + map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(FUNC(thomson_state::to9_cartridge_w));/* 4 * 16 KB */ + map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to770_vram_w)); map(0x6000, 0x9fff).bankrw(THOM_BASE_BANK); /* 16 KB */ map(0xa000, 0xdfff).bankrw(THOM_RAM_BANK); /* 10 * 16 KB */ map(0xe000, 0xe7bf).bankr(THOM_FLOP_BANK); map(0xe7c0, 0xe7c7).rw(m_mc6846, FUNC(mc6846_device::read), FUNC(mc6846_device::write)); map(0xe7c8, 0xe7cb).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xe7cc, 0xe7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7d0, 0xe7d9).rw(this, FUNC(thomson_state::to9_floppy_r), FUNC(thomson_state::to9_floppy_w)); - map(0xe7da, 0xe7dd).rw(this, FUNC(thomson_state::to9_vreg_r), FUNC(thomson_state::to9_vreg_w)); - map(0xe7de, 0xe7df).rw(this, FUNC(thomson_state::to9_kbd_r), FUNC(thomson_state::to9_kbd_w)); - map(0xe7e4, 0xe7e7).rw(this, FUNC(thomson_state::to9_gatearray_r), FUNC(thomson_state::to9_gatearray_w)); + map(0xe7d0, 0xe7d9).rw(FUNC(thomson_state::to9_floppy_r), FUNC(thomson_state::to9_floppy_w)); + map(0xe7da, 0xe7dd).rw(FUNC(thomson_state::to9_vreg_r), FUNC(thomson_state::to9_vreg_w)); + map(0xe7de, 0xe7df).rw(FUNC(thomson_state::to9_kbd_r), FUNC(thomson_state::to9_kbd_w)); + map(0xe7e4, 0xe7e7).rw(FUNC(thomson_state::to9_gatearray_r), FUNC(thomson_state::to9_gatearray_w)); map(0xe7e8, 0xe7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); /* AM_RANGE ( 0xe7f0, 0xe7f7 ) AM_READWRITE(to9_ieee_r, to9_ieee_w ) */ - map(0xe7f2, 0xe7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); + map(0xe7f2, 0xe7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xe7f8, 0xe7fb).rw("pia_3", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7fe, 0xe7ff).rw(this, FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); + map(0xe7fe, 0xe7ff).rw(FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); map(0xe800, 0xffff).rom(); /* system bios */ /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -1581,24 +1581,24 @@ The TO8D is simply a TO8 with an integrated 3"1/2 floppy drive. void thomson_state::to8(address_map &map) { - map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(this, FUNC(thomson_state::to8_cartridge_w)); /* 4 * 16 KB */ - map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to770_vram_w)); - map(0x6000, 0x7fff).bankr(TO8_SYS_LO).w(this, FUNC(thomson_state::to8_sys_lo_w)); - map(0x8000, 0x9fff).bankr(TO8_SYS_HI).w(this, FUNC(thomson_state::to8_sys_hi_w)); - map(0xa000, 0xbfff).bankr(TO8_DATA_LO).w(this, FUNC(thomson_state::to8_data_lo_w)); - map(0xc000, 0xdfff).bankr(TO8_DATA_HI).w(this, FUNC(thomson_state::to8_data_hi_w)); + map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(FUNC(thomson_state::to8_cartridge_w)); /* 4 * 16 KB */ + map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to770_vram_w)); + map(0x6000, 0x7fff).bankr(TO8_SYS_LO).w(FUNC(thomson_state::to8_sys_lo_w)); + map(0x8000, 0x9fff).bankr(TO8_SYS_HI).w(FUNC(thomson_state::to8_sys_hi_w)); + map(0xa000, 0xbfff).bankr(TO8_DATA_LO).w(FUNC(thomson_state::to8_data_lo_w)); + map(0xc000, 0xdfff).bankr(TO8_DATA_HI).w(FUNC(thomson_state::to8_data_hi_w)); map(0xe000, 0xe7bf).bankr(THOM_FLOP_BANK); /* 2 * 2 KB */ map(0xe7c0, 0xe7c7).rw(m_mc6846, FUNC(mc6846_device::read), FUNC(mc6846_device::write)); map(0xe7c8, 0xe7cb).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xe7cc, 0xe7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7d0, 0xe7d9).rw(this, FUNC(thomson_state::to8_floppy_r), FUNC(thomson_state::to8_floppy_w)); - map(0xe7da, 0xe7dd).rw(this, FUNC(thomson_state::to8_vreg_r), FUNC(thomson_state::to8_vreg_w)); - map(0xe7e4, 0xe7e7).rw(this, FUNC(thomson_state::to8_gatearray_r), FUNC(thomson_state::to8_gatearray_w)); + map(0xe7d0, 0xe7d9).rw(FUNC(thomson_state::to8_floppy_r), FUNC(thomson_state::to8_floppy_w)); + map(0xe7da, 0xe7dd).rw(FUNC(thomson_state::to8_vreg_r), FUNC(thomson_state::to8_vreg_w)); + map(0xe7e4, 0xe7e7).rw(FUNC(thomson_state::to8_gatearray_r), FUNC(thomson_state::to8_gatearray_w)); map(0xe7e8, 0xe7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); /* AM_RANGE ( 0xe7f0, 0xe7f7 ) AM_READWRITE(to9_ieee_r, to9_ieee_w ) */ - map(0xe7f2, 0xe7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); + map(0xe7f2, 0xe7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xe7f8, 0xe7fb).rw("pia_3", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7fe, 0xe7ff).rw(this, FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); + map(0xe7fe, 0xe7ff).rw(FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); map(0xe800, 0xffff).bankr(TO8_BIOS_BANK); /* 2 * 6 KB */ /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -1795,25 +1795,25 @@ The differences with the TO8 are: void thomson_state::to9p(address_map &map) { - map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(this, FUNC(thomson_state::to8_cartridge_w)); /* 4 * 16 KB */ - map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to770_vram_w)); - map(0x6000, 0x7fff).bankr(TO8_SYS_LO).w(this, FUNC(thomson_state::to8_sys_lo_w)); - map(0x8000, 0x9fff).bankr(TO8_SYS_HI).w(this, FUNC(thomson_state::to8_sys_hi_w)); - map(0xa000, 0xbfff).bankr(TO8_DATA_LO).w(this, FUNC(thomson_state::to8_data_lo_w)); - map(0xc000, 0xdfff).bankr(TO8_DATA_HI).w(this, FUNC(thomson_state::to8_data_hi_w)); + map(0x0000, 0x3fff).bankr(THOM_CART_BANK).w(FUNC(thomson_state::to8_cartridge_w)); /* 4 * 16 KB */ + map(0x4000, 0x5fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to770_vram_w)); + map(0x6000, 0x7fff).bankr(TO8_SYS_LO).w(FUNC(thomson_state::to8_sys_lo_w)); + map(0x8000, 0x9fff).bankr(TO8_SYS_HI).w(FUNC(thomson_state::to8_sys_hi_w)); + map(0xa000, 0xbfff).bankr(TO8_DATA_LO).w(FUNC(thomson_state::to8_data_lo_w)); + map(0xc000, 0xdfff).bankr(TO8_DATA_HI).w(FUNC(thomson_state::to8_data_hi_w)); map(0xe000, 0xe7bf).bankr(THOM_FLOP_BANK); /* 2 * 2 KB */ map(0xe7c0, 0xe7c7).rw(m_mc6846, FUNC(mc6846_device::read), FUNC(mc6846_device::write)); map(0xe7c8, 0xe7cb).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xe7cc, 0xe7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7d0, 0xe7d9).rw(this, FUNC(thomson_state::to8_floppy_r), FUNC(thomson_state::to8_floppy_w)); - map(0xe7da, 0xe7dd).rw(this, FUNC(thomson_state::to8_vreg_r), FUNC(thomson_state::to8_vreg_w)); - map(0xe7de, 0xe7df).rw(this, FUNC(thomson_state::to9_kbd_r), FUNC(thomson_state::to9_kbd_w)); - map(0xe7e4, 0xe7e7).rw(this, FUNC(thomson_state::to8_gatearray_r), FUNC(thomson_state::to8_gatearray_w)); + map(0xe7d0, 0xe7d9).rw(FUNC(thomson_state::to8_floppy_r), FUNC(thomson_state::to8_floppy_w)); + map(0xe7da, 0xe7dd).rw(FUNC(thomson_state::to8_vreg_r), FUNC(thomson_state::to8_vreg_w)); + map(0xe7de, 0xe7df).rw(FUNC(thomson_state::to9_kbd_r), FUNC(thomson_state::to9_kbd_w)); + map(0xe7e4, 0xe7e7).rw(FUNC(thomson_state::to8_gatearray_r), FUNC(thomson_state::to8_gatearray_w)); map(0xe7e8, 0xe7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); /* AM_RANGE ( 0xe7f0, 0xe7f7 ) AM_READWRITE(to9_ieee_r, to9_ieee_w ) */ - map(0xe7f2, 0xe7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); + map(0xe7f2, 0xe7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xe7f8, 0xe7fb).rw("pia_3", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xe7fe, 0xe7ff).rw(this, FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); + map(0xe7fe, 0xe7ff).rw(FUNC(thomson_state::to7_modem_mea8000_r), FUNC(thomson_state::to7_modem_mea8000_w)); map(0xe800, 0xffff).bankr(TO8_BIOS_BANK); /* 2 * 6 KB */ /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -1976,24 +1976,24 @@ a PC XT. void thomson_state::mo6(address_map &map) { - map(0x0000, 0x1fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to770_vram_w)); - map(0x2000, 0x3fff).bankr(TO8_SYS_LO).w(this, FUNC(thomson_state::to8_sys_lo_w)); - map(0x4000, 0x5fff).bankr(TO8_SYS_HI).w(this, FUNC(thomson_state::to8_sys_hi_w)); - map(0x6000, 0x7fff).bankr(TO8_DATA_LO).w(this, FUNC(thomson_state::to8_data_lo_w)); - map(0x8000, 0x9fff).bankr(TO8_DATA_HI).w(this, FUNC(thomson_state::to8_data_hi_w)); + map(0x0000, 0x1fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to770_vram_w)); + map(0x2000, 0x3fff).bankr(TO8_SYS_LO).w(FUNC(thomson_state::to8_sys_lo_w)); + map(0x4000, 0x5fff).bankr(TO8_SYS_HI).w(FUNC(thomson_state::to8_sys_hi_w)); + map(0x6000, 0x7fff).bankr(TO8_DATA_LO).w(FUNC(thomson_state::to8_data_lo_w)); + map(0x8000, 0x9fff).bankr(TO8_DATA_HI).w(FUNC(thomson_state::to8_data_hi_w)); map(0xa000, 0xa7bf).bankr(THOM_FLOP_BANK); map(0xa7c0, 0xa7c3).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xa7cb, 0xa7cb).w(this, FUNC(thomson_state::mo6_ext_w)); + map(0xa7cb, 0xa7cb).w(FUNC(thomson_state::mo6_ext_w)); map(0xa7cc, 0xa7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xa7d0, 0xa7d9).rw(this, FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); - map(0xa7da, 0xa7dd).rw(this, FUNC(thomson_state::mo6_vreg_r), FUNC(thomson_state::mo6_vreg_w)); - map(0xa7e4, 0xa7e7).rw(this, FUNC(thomson_state::mo6_gatearray_r), FUNC(thomson_state::mo6_gatearray_w)); + map(0xa7d0, 0xa7d9).rw(FUNC(thomson_state::to7_floppy_r), FUNC(thomson_state::to7_floppy_w)); + map(0xa7da, 0xa7dd).rw(FUNC(thomson_state::mo6_vreg_r), FUNC(thomson_state::mo6_vreg_w)); + map(0xa7e4, 0xa7e7).rw(FUNC(thomson_state::mo6_gatearray_r), FUNC(thomson_state::mo6_gatearray_w)); map(0xa7e8, 0xa7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); -/* map(0xa7f0, 0xa7f7).rw(this, FUNC(thomson_state::to9_ieee_r), FUNC(homson_state::to9_ieee_w));*/ - map(0xa7f2, 0xa7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); +/* map(0xa7f0, 0xa7f7).rw(FUNC(thomson_state::to9_ieee_r), FUNC(homson_state::to9_ieee_w));*/ + map(0xa7f2, 0xa7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xa7fe, 0xa7ff).rw(m_mea8000, FUNC(mea8000_device::read), FUNC(mea8000_device::write)); - map(0xb000, 0xbfff).bankr(MO6_CART_LO).w(this, FUNC(thomson_state::mo6_cartridge_w)); - map(0xc000, 0xefff).bankr(MO6_CART_HI).w(this, FUNC(thomson_state::mo6_cartridge_w)); + map(0xb000, 0xbfff).bankr(MO6_CART_LO).w(FUNC(thomson_state::mo6_cartridge_w)); + map(0xc000, 0xefff).bankr(MO6_CART_HI).w(FUNC(thomson_state::mo6_cartridge_w)); map(0xf000, 0xffff).bankr(TO8_BIOS_BANK); /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -2240,7 +2240,7 @@ MACHINE_CONFIG_START(thomson_state::mo6) MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, mo6_sys_porta_in)) MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, mo6_sys_portb_in)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo6_sys_porta_out)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(*this, thomson_state, mo5_set_cassette_motor)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, mo6_sys_cb2_out)) MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>)) // differs from TO @@ -2330,28 +2330,28 @@ Here are the differences between the MO6 and MO5NR: void thomson_state::mo5nr(address_map &map) { - map(0x0000, 0x1fff).bankr(THOM_VRAM_BANK).w(this, FUNC(thomson_state::to770_vram_w)); - map(0x2000, 0x3fff).bankr(TO8_SYS_LO).w(this, FUNC(thomson_state::to8_sys_lo_w)); - map(0x4000, 0x5fff).bankr(TO8_SYS_HI).w(this, FUNC(thomson_state::to8_sys_hi_w)); - map(0x6000, 0x7fff).bankr(TO8_DATA_LO).w(this, FUNC(thomson_state::to8_data_lo_w)); - map(0x8000, 0x9fff).bankr(TO8_DATA_HI).w(this, FUNC(thomson_state::to8_data_hi_w)); + map(0x0000, 0x1fff).bankr(THOM_VRAM_BANK).w(FUNC(thomson_state::to770_vram_w)); + map(0x2000, 0x3fff).bankr(TO8_SYS_LO).w(FUNC(thomson_state::to8_sys_lo_w)); + map(0x4000, 0x5fff).bankr(TO8_SYS_HI).w(FUNC(thomson_state::to8_sys_hi_w)); + map(0x6000, 0x7fff).bankr(TO8_DATA_LO).w(FUNC(thomson_state::to8_data_lo_w)); + map(0x8000, 0x9fff).bankr(TO8_DATA_HI).w(FUNC(thomson_state::to8_data_hi_w)); map(0xa000, 0xa7bf).bankr(THOM_FLOP_BANK); map(0xa7c0, 0xa7c3).rw("pia_0", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xa7cb, 0xa7cb).w(this, FUNC(thomson_state::mo6_ext_w)); + map(0xa7cb, 0xa7cb).w(FUNC(thomson_state::mo6_ext_w)); map(0xa7cc, 0xa7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); - map(0xa7d0, 0xa7d9).rw(this, FUNC(thomson_state::mo5nr_net_r), FUNC(thomson_state::mo5nr_net_w)); - map(0xa7da, 0xa7dd).rw(this, FUNC(thomson_state::mo6_vreg_r), FUNC(thomson_state::mo6_vreg_w)); - map(0xa7e1, 0xa7e1).r("cent_data_in", FUNC(input_buffer_device::read)); - map(0xa7e1, 0xa7e1).w(m_cent_data_out, FUNC(output_latch_device::write)); - map(0xa7e3, 0xa7e3).rw(this, FUNC(thomson_state::mo5nr_prn_r), FUNC(thomson_state::mo5nr_prn_w)); - map(0xa7e4, 0xa7e7).rw(this, FUNC(thomson_state::mo6_gatearray_r), FUNC(thomson_state::mo6_gatearray_w)); + map(0xa7d0, 0xa7d9).rw(FUNC(thomson_state::mo5nr_net_r), FUNC(thomson_state::mo5nr_net_w)); + map(0xa7da, 0xa7dd).rw(FUNC(thomson_state::mo6_vreg_r), FUNC(thomson_state::mo6_vreg_w)); + map(0xa7e1, 0xa7e1).r("cent_data_in", FUNC(input_buffer_device::bus_r)); + map(0xa7e1, 0xa7e1).w(m_cent_data_out, FUNC(output_latch_device::bus_w)); + map(0xa7e3, 0xa7e3).rw(FUNC(thomson_state::mo5nr_prn_r), FUNC(thomson_state::mo5nr_prn_w)); + map(0xa7e4, 0xa7e7).rw(FUNC(thomson_state::mo6_gatearray_r), FUNC(thomson_state::mo6_gatearray_w)); map(0xa7e8, 0xa7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); -/* map(0xa7f0, 0xa7f7).rw(this, FUNC(thomson_state::to9_ieee_r), FUNC(homson_state::to9_ieee_w));*/ - map(0xa7f2, 0xa7f3).rw(this, FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); +/* map(0xa7f0, 0xa7f7).rw(FUNC(thomson_state::to9_ieee_r), FUNC(homson_state::to9_ieee_w));*/ + map(0xa7f2, 0xa7f3).rw(FUNC(thomson_state::to7_midi_r), FUNC(thomson_state::to7_midi_w)); map(0xa7f8, 0xa7fb).rw("pia_3", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt)); map(0xa7fe, 0xa7ff).rw(m_mea8000, FUNC(mea8000_device::read), FUNC(mea8000_device::write)); - map(0xb000, 0xbfff).bankr(MO6_CART_LO).w(this, FUNC(thomson_state::mo6_cartridge_w)); - map(0xc000, 0xefff).bankr(MO6_CART_HI).w(this, FUNC(thomson_state::mo6_cartridge_w)); + map(0xb000, 0xbfff).bankr(MO6_CART_LO).w(FUNC(thomson_state::mo6_cartridge_w)); + map(0xc000, 0xefff).bankr(MO6_CART_HI).w(FUNC(thomson_state::mo6_cartridge_w)); map(0xf000, 0xffff).bankr(TO8_BIOS_BANK); /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */ @@ -2510,7 +2510,7 @@ MACHINE_CONFIG_START(thomson_state::mo5nr) MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, mo6_sys_porta_in)) MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, mo5nr_sys_portb_in)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo5nr_sys_porta_out)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(*this, thomson_state, mo5_set_cassette_motor)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, mo6_sys_cb2_out)) MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>)) // differs from TO diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index 7b94e59ca85..3207c88a6ab 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -118,14 +118,14 @@ READ8_MEMBER(thoop2_state::shareram_r) void thoop2_state::mcu_hostmem_map(address_map &map) { - map(0x8000, 0xffff).rw(this, FUNC(thoop2_state::shareram_r), FUNC(thoop2_state::shareram_w)); // confirmed that 0x8000 - 0xffff is a window into 68k shared RAM + map(0x8000, 0xffff).rw(FUNC(thoop2_state::shareram_r), FUNC(thoop2_state::shareram_w)); // confirmed that 0x8000 - 0xffff is a window into 68k shared RAM } void thoop2_state::thoop2_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x100000, 0x101fff).ram().w(this, FUNC(thoop2_state::vram_w)).share("videoram"); /* Video RAM */ + map(0x100000, 0x101fff).ram().w(FUNC(thoop2_state::vram_w)).share("videoram"); /* Video RAM */ map(0x108000, 0x108007).writeonly().share("vregs"); /* Video Registers */ map(0x10800c, 0x10800d).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); /* INT 6 ACK/Watchdog timer */ map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");/* Palette */ @@ -139,7 +139,7 @@ void thoop2_state::thoop2_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_outlatch->write_d0(space, offset >> 3, data, mem_mask); }); - map(0x70000d, 0x70000d).w(this, FUNC(thoop2_state::OKIM6295_bankswitch_w)); /* OKI6295 bankswitch */ + map(0x70000d, 0x70000d).w(FUNC(thoop2_state::OKIM6295_bankswitch_w)); /* OKI6295 bankswitch */ map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 data register */ map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ map(0xfe8000, 0xfeffff).ram().share("shareram"); /* Work RAM (shared with D5002FP) */ diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp index f3a40a73ef9..2d8d231716f 100644 --- a/src/mame/drivers/thunderj.cpp +++ b/src/mame/drivers/thunderj.cpp @@ -116,10 +116,10 @@ void thunderj_state::main_map(address_map &map) map(0x1f0000, 0x1fffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x260000, 0x26000f).portr("260000"); map(0x260010, 0x260011).portr("260010"); - map(0x260012, 0x260013).r(this, FUNC(thunderj_state::special_port2_r)); + map(0x260012, 0x260013).r(FUNC(thunderj_state::special_port2_r)); map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_ii_device::main_response_r)); map(0x2e0000, 0x2e0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x360010, 0x360011).w(this, FUNC(thunderj_state::latch_w)); + map(0x360010, 0x360011).w(FUNC(thunderj_state::latch_w)); map(0x360020, 0x360021).w(m_jsa, FUNC(atari_jsa_ii_device::sound_reset_w)); map(0x360031, 0x360031).w(m_jsa, FUNC(atari_jsa_ii_device::main_command_w)); map(0x3e0000, 0x3e0fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); @@ -149,9 +149,9 @@ void thunderj_state::extra_map(address_map &map) map(0x160000, 0x16ffff).ram().share("share1"); map(0x260000, 0x26000f).portr("260000"); map(0x260010, 0x260011).portr("260010"); - map(0x260012, 0x260013).r(this, FUNC(thunderj_state::special_port2_r)); + map(0x260012, 0x260013).r(FUNC(thunderj_state::special_port2_r)); map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_ii_device::main_response_r)); - map(0x360010, 0x360011).w(this, FUNC(thunderj_state::latch_w)); + map(0x360010, 0x360011).w(FUNC(thunderj_state::latch_w)); map(0x360020, 0x360021).w(m_jsa, FUNC(atari_jsa_ii_device::sound_reset_w)); map(0x360031, 0x360031).w(m_jsa, FUNC(atari_jsa_ii_device::main_command_w)); } diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp index 6235e01cefa..4c08fdb4375 100644 --- a/src/mame/drivers/thunderx.cpp +++ b/src/mame/drivers/thunderx.cpp @@ -404,11 +404,11 @@ WRITE8_MEMBER(thunderx_state::k052109_051960_w) void thunderx_state::scontra_map(address_map &map) { - map(0x0000, 0x3fff).rw(this, FUNC(thunderx_state::k052109_051960_r), FUNC(thunderx_state::k052109_051960_w)); /* video RAM + sprite RAM */ + map(0x0000, 0x3fff).rw(FUNC(thunderx_state::k052109_051960_r), FUNC(thunderx_state::k052109_051960_w)); /* video RAM + sprite RAM */ - map(0x1f80, 0x1f80).w(this, FUNC(thunderx_state::scontra_bankswitch_w)); /* bankswitch control + coin counters */ + map(0x1f80, 0x1f80).w(FUNC(thunderx_state::scontra_bankswitch_w)); /* bankswitch control + coin counters */ map(0x1f84, 0x1f84).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x1f88, 0x1f88).w(this, FUNC(thunderx_state::sh_irqtrigger_w)); /* cause interrupt on audio CPU */ + map(0x1f88, 0x1f88).w(FUNC(thunderx_state::sh_irqtrigger_w)); /* cause interrupt on audio CPU */ map(0x1f8c, 0x1f8c).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x1f90, 0x1f90).portr("SYSTEM"); map(0x1f91, 0x1f91).portr("P1"); @@ -416,7 +416,7 @@ void thunderx_state::scontra_map(address_map &map) map(0x1f93, 0x1f93).portr("DSW3"); map(0x1f94, 0x1f94).portr("DSW1"); map(0x1f95, 0x1f95).portr("DSW2"); - map(0x1f98, 0x1f98).rw(this, FUNC(thunderx_state::_1f98_r), FUNC(thunderx_state::scontra_1f98_w)); + map(0x1f98, 0x1f98).rw(FUNC(thunderx_state::_1f98_r), FUNC(thunderx_state::scontra_1f98_w)); map(0x4000, 0x57ff).ram(); map(0x5800, 0x5fff).m(m_bank5800, FUNC(address_map_bank_device::amap8)); /* palette + work RAM + PMC */ @@ -427,14 +427,14 @@ void thunderx_state::scontra_map(address_map &map) void thunderx_state::thunderx_map(address_map &map) { scontra_map(map); - map(0x1f80, 0x1f80).w(this, FUNC(thunderx_state::thunderx_videobank_w)); - map(0x1f98, 0x1f98).rw(this, FUNC(thunderx_state::_1f98_r), FUNC(thunderx_state::thunderx_1f98_w)); /* registers */ + map(0x1f80, 0x1f80).w(FUNC(thunderx_state::thunderx_videobank_w)); + map(0x1f98, 0x1f98).rw(FUNC(thunderx_state::_1f98_r), FUNC(thunderx_state::thunderx_1f98_w)); /* registers */ } void thunderx_state::gbusters_map(address_map &map) { scontra_map(map); - map(0x1f80, 0x1f80).w(this, FUNC(thunderx_state::gbusters_videobank_w)); + map(0x1f80, 0x1f80).w(FUNC(thunderx_state::gbusters_videobank_w)); } @@ -448,7 +448,7 @@ void thunderx_state::thunderx_bank5800_map(address_map &map) { map(0x0000, 0x07ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x0800, 0x0fff).ram(); - map(0x1000, 0x17ff).rw(this, FUNC(thunderx_state::pmc_r), FUNC(thunderx_state::pmc_w)).share("pmcram"); + map(0x1000, 0x17ff).rw(FUNC(thunderx_state::pmc_r), FUNC(thunderx_state::pmc_w)).share("pmcram"); } @@ -464,7 +464,7 @@ void thunderx_state::scontra_sound_map(address_map &map) { thunderx_sound_map(map); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); - map(0xf000, 0xf000).w(this, FUNC(thunderx_state::k007232_bankswitch_w)); + map(0xf000, 0xf000).w(FUNC(thunderx_state::k007232_bankswitch_w)); } /*************************************************************************** diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp index d3d77b39c4f..3fa08da46fd 100644 --- a/src/mame/drivers/ti85.cpp +++ b/src/mame/drivers/ti85.cpp @@ -215,36 +215,36 @@ TI-86 ports: void ti85_state::ti81_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).rw(this, FUNC(ti85_state::ti85_port_0000_r), FUNC(ti85_state::ti85_port_0000_w)); - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).rw(this, FUNC(ti85_state::ti85_port_0002_r), FUNC(ti85_state::ti85_port_0002_w)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); - map(0x0005, 0x0005).rw(this, FUNC(ti85_state::ti85_port_0005_r), FUNC(ti85_state::ti85_port_0005_w)); - map(0x0007, 0x0007).w(this, FUNC(ti85_state::ti81_port_0007_w)); + map(0x0000, 0x0000).rw(FUNC(ti85_state::ti85_port_0000_r), FUNC(ti85_state::ti85_port_0000_w)); + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).rw(FUNC(ti85_state::ti85_port_0002_r), FUNC(ti85_state::ti85_port_0002_w)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); + map(0x0005, 0x0005).rw(FUNC(ti85_state::ti85_port_0005_r), FUNC(ti85_state::ti85_port_0005_w)); + map(0x0007, 0x0007).w(FUNC(ti85_state::ti81_port_0007_w)); } void ti85_state::ti85_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).rw(this, FUNC(ti85_state::ti85_port_0000_r), FUNC(ti85_state::ti85_port_0000_w)); - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).rw(this, FUNC(ti85_state::ti85_port_0002_r), FUNC(ti85_state::ti85_port_0002_w)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); - map(0x0005, 0x0005).rw(this, FUNC(ti85_state::ti85_port_0005_r), FUNC(ti85_state::ti85_port_0005_w)); - map(0x0006, 0x0006).rw(this, FUNC(ti85_state::ti85_port_0006_r), FUNC(ti85_state::ti85_port_0006_w)); - map(0x0007, 0x0007).rw(this, FUNC(ti85_state::ti8x_serial_r), FUNC(ti85_state::ti8x_serial_w)); + map(0x0000, 0x0000).rw(FUNC(ti85_state::ti85_port_0000_r), FUNC(ti85_state::ti85_port_0000_w)); + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).rw(FUNC(ti85_state::ti85_port_0002_r), FUNC(ti85_state::ti85_port_0002_w)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); + map(0x0005, 0x0005).rw(FUNC(ti85_state::ti85_port_0005_r), FUNC(ti85_state::ti85_port_0005_w)); + map(0x0006, 0x0006).rw(FUNC(ti85_state::ti85_port_0006_r), FUNC(ti85_state::ti85_port_0006_w)); + map(0x0007, 0x0007).rw(FUNC(ti85_state::ti8x_serial_r), FUNC(ti85_state::ti8x_serial_w)); } void ti85_state::ti82_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).rw(this, FUNC(ti85_state::ti8x_serial_r), FUNC(ti85_state::ti8x_serial_w)); - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).rw(this, FUNC(ti85_state::ti82_port_0002_r), FUNC(ti85_state::ti82_port_0002_w)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); + map(0x0000, 0x0000).rw(FUNC(ti85_state::ti8x_serial_r), FUNC(ti85_state::ti8x_serial_w)); + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).rw(FUNC(ti85_state::ti82_port_0002_r), FUNC(ti85_state::ti82_port_0002_w)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); map(0x0010, 0x0010).rw("t6a04", FUNC(t6a04_device::control_read), FUNC(t6a04_device::control_write)); map(0x0011, 0x0011).rw("t6a04", FUNC(t6a04_device::data_read), FUNC(t6a04_device::data_write)); } @@ -252,10 +252,10 @@ void ti85_state::ti82_io(address_map &map) void ti85_state::ti81v2_io(address_map &map) { map.global_mask(0xff); - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).rw(this, FUNC(ti85_state::ti82_port_0002_r), FUNC(ti85_state::ti82_port_0002_w)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).rw(FUNC(ti85_state::ti82_port_0002_r), FUNC(ti85_state::ti82_port_0002_w)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); map(0x0010, 0x0010).rw("t6a04", FUNC(t6a04_device::control_read), FUNC(t6a04_device::control_write)); map(0x0011, 0x0011).rw("t6a04", FUNC(t6a04_device::data_read), FUNC(t6a04_device::data_write)); } @@ -263,11 +263,11 @@ void ti85_state::ti81v2_io(address_map &map) void ti85_state::ti83_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).rw(this, FUNC(ti85_state::ti83_port_0000_r), FUNC(ti85_state::ti83_port_0000_w)); //TODO - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).rw(this, FUNC(ti85_state::ti83_port_0002_r), FUNC(ti85_state::ti83_port_0002_w)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti83_port_0003_r), FUNC(ti85_state::ti83_port_0003_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); + map(0x0000, 0x0000).rw(FUNC(ti85_state::ti83_port_0000_r), FUNC(ti85_state::ti83_port_0000_w)); //TODO + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).rw(FUNC(ti85_state::ti83_port_0002_r), FUNC(ti85_state::ti83_port_0002_w)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti83_port_0003_r), FUNC(ti85_state::ti83_port_0003_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti85_port_0004_r), FUNC(ti85_state::ti85_port_0004_w)); map(0x0010, 0x0010).rw("t6a04", FUNC(t6a04_device::control_read), FUNC(t6a04_device::control_write)); map(0x0011, 0x0011).rw("t6a04", FUNC(t6a04_device::data_read), FUNC(t6a04_device::data_write)); map(0x0014, 0x0014).portr("BATTERY"); @@ -276,13 +276,13 @@ void ti85_state::ti83_io(address_map &map) void ti85_state::ti83p_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).rw(this, FUNC(ti85_state::ti8x_plus_serial_r), FUNC(ti85_state::ti8x_plus_serial_w)); - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).r(this, FUNC(ti85_state::ti83p_port_0002_r)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti83_port_0003_r), FUNC(ti85_state::ti83p_int_mask_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti83p_port_0004_r), FUNC(ti85_state::ti83p_port_0004_w)); - map(0x0006, 0x0006).rw(this, FUNC(ti85_state::ti86_port_0005_r), FUNC(ti85_state::ti83p_port_0006_w)); - map(0x0007, 0x0007).rw(this, FUNC(ti85_state::ti86_port_0006_r), FUNC(ti85_state::ti83p_port_0007_w)); + map(0x0000, 0x0000).rw(FUNC(ti85_state::ti8x_plus_serial_r), FUNC(ti85_state::ti8x_plus_serial_w)); + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).r(FUNC(ti85_state::ti83p_port_0002_r)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti83_port_0003_r), FUNC(ti85_state::ti83p_int_mask_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti83p_port_0004_r), FUNC(ti85_state::ti83p_port_0004_w)); + map(0x0006, 0x0006).rw(FUNC(ti85_state::ti86_port_0005_r), FUNC(ti85_state::ti83p_port_0006_w)); + map(0x0007, 0x0007).rw(FUNC(ti85_state::ti86_port_0006_r), FUNC(ti85_state::ti83p_port_0007_w)); map(0x0010, 0x0010).rw("t6a04", FUNC(t6a04_device::control_read), FUNC(t6a04_device::control_write)); map(0x0011, 0x0011).rw("t6a04", FUNC(t6a04_device::data_read), FUNC(t6a04_device::data_write)); // AM_RANGE(0x0014, 0x0014) AM_WRITE(ti83p_port_0014_w ) @@ -291,49 +291,49 @@ void ti85_state::ti83p_io(address_map &map) void ti85_state::ti83pse_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).rw(this, FUNC(ti85_state::ti8x_plus_serial_r), FUNC(ti85_state::ti8x_plus_serial_w)); - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).rw(this, FUNC(ti85_state::ti83pse_port_0002_r), FUNC(ti85_state::ti83pse_int_ack_w)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti83_port_0003_r), FUNC(ti85_state::ti83p_int_mask_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti83p_port_0004_r), FUNC(ti85_state::ti83pse_port_0004_w)); - map(0x0005, 0x0005).rw(this, FUNC(ti85_state::ti83pse_port_0005_r), FUNC(ti85_state::ti83pse_port_0005_w)); - map(0x0006, 0x0006).rw(this, FUNC(ti85_state::ti86_port_0005_r), FUNC(ti85_state::ti83pse_port_0006_w)); - map(0x0007, 0x0007).rw(this, FUNC(ti85_state::ti86_port_0006_r), FUNC(ti85_state::ti83pse_port_0007_w)); - map(0x0009, 0x0009).r(this, FUNC(ti85_state::ti83pse_port_0009_r)); + map(0x0000, 0x0000).rw(FUNC(ti85_state::ti8x_plus_serial_r), FUNC(ti85_state::ti8x_plus_serial_w)); + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).rw(FUNC(ti85_state::ti83pse_port_0002_r), FUNC(ti85_state::ti83pse_int_ack_w)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti83_port_0003_r), FUNC(ti85_state::ti83p_int_mask_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti83p_port_0004_r), FUNC(ti85_state::ti83pse_port_0004_w)); + map(0x0005, 0x0005).rw(FUNC(ti85_state::ti83pse_port_0005_r), FUNC(ti85_state::ti83pse_port_0005_w)); + map(0x0006, 0x0006).rw(FUNC(ti85_state::ti86_port_0005_r), FUNC(ti85_state::ti83pse_port_0006_w)); + map(0x0007, 0x0007).rw(FUNC(ti85_state::ti86_port_0006_r), FUNC(ti85_state::ti83pse_port_0007_w)); + map(0x0009, 0x0009).r(FUNC(ti85_state::ti83pse_port_0009_r)); map(0x0010, 0x0010).rw("t6a04", FUNC(t6a04_device::control_read), FUNC(t6a04_device::control_write)); map(0x0011, 0x0011).rw("t6a04", FUNC(t6a04_device::data_read), FUNC(t6a04_device::data_write)); map(0x0012, 0x0012).rw("t6a04", FUNC(t6a04_device::control_read), FUNC(t6a04_device::control_write)); map(0x0013, 0x0013).rw("t6a04", FUNC(t6a04_device::data_read), FUNC(t6a04_device::data_write)); - map(0x0014, 0x0014).w(this, FUNC(ti85_state::ti83p_port_0014_w)); - map(0x0015, 0x0015).r(this, FUNC(ti85_state::ti83pse_port_0015_r)); - map(0x0020, 0x0020).rw(this, FUNC(ti85_state::ti83pse_port_0020_r), FUNC(ti85_state::ti83pse_port_0020_w)); - map(0x0021, 0x0021).rw(this, FUNC(ti85_state::ti83pse_port_0021_r), FUNC(ti85_state::ti83pse_port_0021_w)); - - map(0x0030, 0x0030).rw(this, FUNC(ti85_state::ti83pse_ctimer1_setup_r), FUNC(ti85_state::ti83pse_ctimer1_setup_w)); - map(0x0031, 0x0031).rw(this, FUNC(ti85_state::ti83pse_ctimer1_loop_r), FUNC(ti85_state::ti83pse_ctimer1_loop_w)); - map(0x0032, 0x0032).rw(this, FUNC(ti85_state::ti83pse_ctimer1_count_r), FUNC(ti85_state::ti83pse_ctimer1_count_w)); - map(0x0033, 0x0033).rw(this, FUNC(ti85_state::ti83pse_ctimer2_setup_r), FUNC(ti85_state::ti83pse_ctimer2_setup_w)); - map(0x0034, 0x0034).rw(this, FUNC(ti85_state::ti83pse_ctimer2_loop_r), FUNC(ti85_state::ti83pse_ctimer2_loop_w)); - map(0x0035, 0x0035).rw(this, FUNC(ti85_state::ti83pse_ctimer2_count_r), FUNC(ti85_state::ti83pse_ctimer2_count_w)); - map(0x0036, 0x0036).rw(this, FUNC(ti85_state::ti83pse_ctimer3_setup_r), FUNC(ti85_state::ti83pse_ctimer3_setup_w)); - map(0x0037, 0x0037).rw(this, FUNC(ti85_state::ti83pse_ctimer3_loop_r), FUNC(ti85_state::ti83pse_ctimer3_loop_w)); - map(0x0038, 0x0038).rw(this, FUNC(ti85_state::ti83pse_ctimer3_count_r), FUNC(ti85_state::ti83pse_ctimer3_count_w)); - - map(0x0055, 0x0055).r(this, FUNC(ti85_state::ti84pse_port_0055_r)); - map(0x0056, 0x0056).r(this, FUNC(ti85_state::ti84pse_port_0056_r)); + map(0x0014, 0x0014).w(FUNC(ti85_state::ti83p_port_0014_w)); + map(0x0015, 0x0015).r(FUNC(ti85_state::ti83pse_port_0015_r)); + map(0x0020, 0x0020).rw(FUNC(ti85_state::ti83pse_port_0020_r), FUNC(ti85_state::ti83pse_port_0020_w)); + map(0x0021, 0x0021).rw(FUNC(ti85_state::ti83pse_port_0021_r), FUNC(ti85_state::ti83pse_port_0021_w)); + + map(0x0030, 0x0030).rw(FUNC(ti85_state::ti83pse_ctimer1_setup_r), FUNC(ti85_state::ti83pse_ctimer1_setup_w)); + map(0x0031, 0x0031).rw(FUNC(ti85_state::ti83pse_ctimer1_loop_r), FUNC(ti85_state::ti83pse_ctimer1_loop_w)); + map(0x0032, 0x0032).rw(FUNC(ti85_state::ti83pse_ctimer1_count_r), FUNC(ti85_state::ti83pse_ctimer1_count_w)); + map(0x0033, 0x0033).rw(FUNC(ti85_state::ti83pse_ctimer2_setup_r), FUNC(ti85_state::ti83pse_ctimer2_setup_w)); + map(0x0034, 0x0034).rw(FUNC(ti85_state::ti83pse_ctimer2_loop_r), FUNC(ti85_state::ti83pse_ctimer2_loop_w)); + map(0x0035, 0x0035).rw(FUNC(ti85_state::ti83pse_ctimer2_count_r), FUNC(ti85_state::ti83pse_ctimer2_count_w)); + map(0x0036, 0x0036).rw(FUNC(ti85_state::ti83pse_ctimer3_setup_r), FUNC(ti85_state::ti83pse_ctimer3_setup_w)); + map(0x0037, 0x0037).rw(FUNC(ti85_state::ti83pse_ctimer3_loop_r), FUNC(ti85_state::ti83pse_ctimer3_loop_w)); + map(0x0038, 0x0038).rw(FUNC(ti85_state::ti83pse_ctimer3_count_r), FUNC(ti85_state::ti83pse_ctimer3_count_w)); + + map(0x0055, 0x0055).r(FUNC(ti85_state::ti84pse_port_0055_r)); + map(0x0056, 0x0056).r(FUNC(ti85_state::ti84pse_port_0056_r)); } void ti85_state::ti86_io(address_map &map) { map.global_mask(0xff); - map(0x0000, 0x0000).rw(this, FUNC(ti85_state::ti85_port_0000_r), FUNC(ti85_state::ti85_port_0000_w)); - map(0x0001, 0x0001).rw(this, FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); - map(0x0002, 0x0002).rw(this, FUNC(ti85_state::ti85_port_0002_r), FUNC(ti85_state::ti85_port_0002_w)); - map(0x0003, 0x0003).rw(this, FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); - map(0x0004, 0x0004).rw(this, FUNC(ti85_state::ti85_port_0006_r), FUNC(ti85_state::ti85_port_0006_w)); - map(0x0005, 0x0005).rw(this, FUNC(ti85_state::ti86_port_0005_r), FUNC(ti85_state::ti86_port_0005_w)); - map(0x0006, 0x0006).rw(this, FUNC(ti85_state::ti86_port_0006_r), FUNC(ti85_state::ti86_port_0006_w)); - map(0x0007, 0x0007).rw(this, FUNC(ti85_state::ti8x_serial_r), FUNC(ti85_state::ti8x_serial_w)); + map(0x0000, 0x0000).rw(FUNC(ti85_state::ti85_port_0000_r), FUNC(ti85_state::ti85_port_0000_w)); + map(0x0001, 0x0001).rw(FUNC(ti85_state::ti8x_keypad_r), FUNC(ti85_state::ti8x_keypad_w)); + map(0x0002, 0x0002).rw(FUNC(ti85_state::ti85_port_0002_r), FUNC(ti85_state::ti85_port_0002_w)); + map(0x0003, 0x0003).rw(FUNC(ti85_state::ti85_port_0003_r), FUNC(ti85_state::ti85_port_0003_w)); + map(0x0004, 0x0004).rw(FUNC(ti85_state::ti85_port_0006_r), FUNC(ti85_state::ti85_port_0006_w)); + map(0x0005, 0x0005).rw(FUNC(ti85_state::ti86_port_0005_r), FUNC(ti85_state::ti86_port_0005_w)); + map(0x0006, 0x0006).rw(FUNC(ti85_state::ti86_port_0006_r), FUNC(ti85_state::ti86_port_0006_w)); + map(0x0007, 0x0007).rw(FUNC(ti85_state::ti8x_serial_r), FUNC(ti85_state::ti8x_serial_w)); } /* memory w/r functions */ @@ -375,8 +375,8 @@ void ti85_state::ti83p_banked_mem(address_map &map) void ti85_state::ti83p_asic_mem(address_map &map) { map(0x0000, 0x3fff).rw(m_membank1, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); - map(0x4000, 0x7fff).w(m_membank2, FUNC(address_map_bank_device::write8)).r(this, FUNC(ti85_state::ti83p_membank2_r)); - map(0x8000, 0xbfff).w(m_membank3, FUNC(address_map_bank_device::write8)).r(this, FUNC(ti85_state::ti83p_membank3_r)); + map(0x4000, 0x7fff).w(m_membank2, FUNC(address_map_bank_device::write8)).r(FUNC(ti85_state::ti83p_membank2_r)); + map(0x8000, 0xbfff).w(m_membank3, FUNC(address_map_bank_device::write8)).r(FUNC(ti85_state::ti83p_membank3_r)); map(0xc000, 0xffff).rw(m_membank4, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8)); } diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp index 873dd063fc9..aa8702e6a3d 100644 --- a/src/mame/drivers/ti89.cpp +++ b/src/mame/drivers/ti89.cpp @@ -148,14 +148,14 @@ WRITE16_MEMBER ( ti68k_state::flash_w ) { // verification if it is flash memory if (m_flash_mem) - m_flash->write(offset, data); + m_flash->write(space, offset, data); } READ16_MEMBER ( ti68k_state::flash_r ) { if (m_flash_mem) { - return m_flash->read(offset); + return m_flash->read(space, offset); } else { @@ -201,7 +201,7 @@ void ti68k_state::ti92_mem(address_map &map) map.unmap_value_high(); map(0x000000, 0x0fffff).ram().share("nvram"); map(0x200000, 0x5fffff).unmaprw(); // ROM - map(0x600000, 0x6fffff).rw(this, FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); + map(0x600000, 0x6fffff).rw(FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); } @@ -209,10 +209,10 @@ void ti68k_state::ti89_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x0fffff).ram().share("nvram"); - map(0x200000, 0x3fffff).rw(this, FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); + map(0x200000, 0x3fffff).rw(FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); map(0x400000, 0x5fffff).noprw(); - map(0x600000, 0x6fffff).rw(this, FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); - map(0x700000, 0x7fffff).rw(this, FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); + map(0x600000, 0x6fffff).rw(FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); + map(0x700000, 0x7fffff).rw(FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); } @@ -221,9 +221,9 @@ void ti68k_state::ti92p_mem(address_map &map) map.unmap_value_high(); map(0x000000, 0x0fffff).ram().share("nvram"); map(0x200000, 0x3fffff).noprw(); - map(0x400000, 0x5fffff).rw(this, FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); - map(0x600000, 0x6fffff).rw(this, FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); - map(0x700000, 0x7fffff).rw(this, FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); + map(0x400000, 0x5fffff).rw(FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); + map(0x600000, 0x6fffff).rw(FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); + map(0x700000, 0x7fffff).rw(FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); } @@ -231,9 +231,9 @@ void ti68k_state::v200_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x0fffff).ram().share("nvram"); - map(0x200000, 0x5fffff).rw(this, FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); - map(0x600000, 0x6fffff).rw(this, FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); - map(0x700000, 0x70ffff).rw(this, FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); + map(0x200000, 0x5fffff).rw(FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); + map(0x600000, 0x6fffff).rw(FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); + map(0x700000, 0x70ffff).rw(FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); } @@ -241,9 +241,9 @@ void ti68k_state::ti89t_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x0fffff).ram().mirror(0x200000).share("nvram"); - map(0x600000, 0x6fffff).rw(this, FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); - map(0x700000, 0x70ffff).rw(this, FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); - map(0x800000, 0xbfffff).rw(this, FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); + map(0x600000, 0x6fffff).rw(FUNC(ti68k_state::ti68k_io_r), FUNC(ti68k_state::ti68k_io_w)); + map(0x700000, 0x70ffff).rw(FUNC(ti68k_state::ti68k_io2_r), FUNC(ti68k_state::ti68k_io2_w)); + map(0x800000, 0xbfffff).rw(FUNC(ti68k_state::flash_r), FUNC(ti68k_state::flash_w)); map(0xc00000, 0xffffff).noprw(); } diff --git a/src/mame/drivers/ti990_10.cpp b/src/mame/drivers/ti990_10.cpp index 942a2acfa53..c05437ce1d9 100644 --- a/src/mame/drivers/ti990_10.cpp +++ b/src/mame/drivers/ti990_10.cpp @@ -302,10 +302,10 @@ void ti990_10_state::ti990_10_io(address_map &map) map(0x80, 0x8f).w(m_terminal, FUNC(vdt911_device::cru_w)); map(0x1fa, 0x1fb).noprw(); // AM_READ(ti990_10_mapper_cru_r) map(0x1fc, 0x1fd).noprw(); // AM_READ(ti990_10_eir_cru_r) - map(0x1fe, 0x1ff).r(this, FUNC(ti990_10_state::ti990_panel_read)); + map(0x1fe, 0x1ff).r(FUNC(ti990_10_state::ti990_panel_read)); map(0xfd0, 0xfdf).noprw(); // AM_WRITE(ti990_10_mapper_cru_w) map(0xfe0, 0xfef).noprw(); // AM_WRITE(ti990_10_eir_cru_w) - map(0xff0, 0xfff).w(this, FUNC(ti990_10_state::ti990_panel_write)); + map(0xff0, 0xfff).w(FUNC(ti990_10_state::ti990_panel_write)); } diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp index 6b21c5def9a..4a419223ba4 100644 --- a/src/mame/drivers/ti990_4.cpp +++ b/src/mame/drivers/ti990_4.cpp @@ -252,8 +252,8 @@ void ti990_4_state::cru_map(address_map &map) map(0x08, 0x0b).r(m_fd800, FUNC(fd800_legacy_device::cru_r)); map(0x40, 0x5f).w(m_fd800, FUNC(fd800_legacy_device::cru_w)); - map(0x1fe, 0x1ff).r(this, FUNC(ti990_4_state::panel_read)); - map(0xff0, 0xfff).w(this, FUNC(ti990_4_state::panel_write)); + map(0x1fe, 0x1ff).r(FUNC(ti990_4_state::panel_read)); + map(0xff0, 0xfff).w(FUNC(ti990_4_state::panel_write)); } void ti990_4_state::cru_map_v(address_map &map) @@ -264,8 +264,8 @@ void ti990_4_state::cru_map_v(address_map &map) map(0x08, 0x0b).r(m_fd800, FUNC(fd800_legacy_device::cru_r)); map(0x40, 0x5f).w(m_fd800, FUNC(fd800_legacy_device::cru_w)); - map(0x1fe, 0x1ff).r(this, FUNC(ti990_4_state::panel_read)); - map(0xff0, 0xfff).w(this, FUNC(ti990_4_state::panel_write)); + map(0x1fe, 0x1ff).r(FUNC(ti990_4_state::panel_read)); + map(0xff0, 0xfff).w(FUNC(ti990_4_state::panel_write)); } diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index 9ec508cc5b2..43eaa7ba890 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -281,7 +281,7 @@ void ti99_2_state::memmap(address_map &map) // 3 or 4 ROMs of 8 KiB. The 32K version has two ROMs mapped into 4000-5fff // Part of the ROM is accessed by the video controller for the // character definitions (1c00-1fff) - map(0x0000, 0xffff).rw(this, FUNC(ti99_2_state::mem_read), FUNC(ti99_2_state::mem_write)); + map(0x0000, 0xffff).rw(FUNC(ti99_2_state::mem_read), FUNC(ti99_2_state::mem_write)); } /* @@ -297,7 +297,7 @@ void ti99_2_state::crumap(address_map &map) // Mirror of CPU-internal flags (1ee0-1efe). Don't read. Write is OK. map(0x01ee, 0x01ef).nopr(); - map(0x0f70, 0x0f7f).w(this, FUNC(ti99_2_state::intflag_write)); + map(0x0f70, 0x0f7f).w(FUNC(ti99_2_state::intflag_write)); } /* diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp index 2727490c85d..1c577218d99 100644 --- a/src/mame/drivers/ti99_4p.cpp +++ b/src/mame/drivers/ti99_4p.cpp @@ -291,15 +291,15 @@ enum void ti99_4p_state::memmap(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(ti99_4p_state::memread), FUNC(ti99_4p_state::memwrite)).setoffset(this, FUNC(ti99_4p_state::setoffset)); + map(0x0000, 0xffff).rw(FUNC(ti99_4p_state::memread), FUNC(ti99_4p_state::memwrite)).setoffset(FUNC(ti99_4p_state::setoffset)); } void ti99_4p_state::cru_map(address_map &map) { - map(0x0000, 0x01ff).r(this, FUNC(ti99_4p_state::cruread)); + map(0x0000, 0x01ff).r(FUNC(ti99_4p_state::cruread)); map(0x0000, 0x003f).r(m_tms9901, FUNC(tms9901_device::read)); - map(0x0000, 0x0fff).w(this, FUNC(ti99_4p_state::cruwrite)); + map(0x0000, 0x0fff).w(FUNC(ti99_4p_state::cruwrite)); map(0x0000, 0x01ff).w(m_tms9901, FUNC(tms9901_device::write)); } diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index f9561b7a6c7..b20c87c8fd5 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -253,10 +253,10 @@ void ti99_4x_state::memmap(address_map &map) */ void ti99_4x_state::cru_map(address_map &map) { - map(0x0000, 0x01ff).r(this, FUNC(ti99_4x_state::cruread)); + map(0x0000, 0x01ff).r(FUNC(ti99_4x_state::cruread)); map(0x0000, 0x0003).mirror(0x003c).r(m_tms9901, FUNC(tms9901_device::read)); - map(0x0000, 0x0fff).w(this, FUNC(ti99_4x_state::cruwrite)); + map(0x0000, 0x0fff).w(FUNC(ti99_4x_state::cruwrite)); map(0x0000, 0x001f).mirror(0x01e0).w(m_tms9901, FUNC(tms9901_device::write)); } diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp index 1b49497785f..f45dbb0b894 100644 --- a/src/mame/drivers/ti99_8.cpp +++ b/src/mame/drivers/ti99_8.cpp @@ -309,10 +309,10 @@ void ti99_8_state::memmap(address_map &map) void ti99_8_state::crumap(address_map &map) { - map(0x0000, 0x02ff).r(this, FUNC(ti99_8_state::cruread)); + map(0x0000, 0x02ff).r(FUNC(ti99_8_state::cruread)); map(0x0000, 0x0003).r(m_tms9901, FUNC(tms9901_device::read)); - map(0x0000, 0x17ff).w(this, FUNC(ti99_8_state::cruwrite)); + map(0x0000, 0x17ff).w(FUNC(ti99_8_state::cruwrite)); map(0x0000, 0x001f).w(m_tms9901, FUNC(tms9901_device::write)); } diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp index 43ac507d597..1340c8ee84b 100644 --- a/src/mame/drivers/tiamc1.cpp +++ b/src/mame/drivers/tiamc1.cpp @@ -153,7 +153,7 @@ WRITE_LINE_MEMBER(tiamc1_state::pit8253_2_w) void tiamc1_state::tiamc1_map(address_map &map) { - map(0xb000, 0xb7ff).w(this, FUNC(tiamc1_state::tiamc1_videoram_w)); + map(0xb000, 0xb7ff).w(FUNC(tiamc1_state::tiamc1_videoram_w)); map(0x0000, 0xdfff).rom(); map(0xe000, 0xffff).ram(); } @@ -162,21 +162,21 @@ void tiamc1_state::kotrybolov_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xcfff).ram(); - map(0xf000, 0xf3ff).w(this, FUNC(tiamc1_state::kot_videoram_w)); + map(0xf000, 0xf3ff).w(FUNC(tiamc1_state::kot_videoram_w)); } void tiamc1_state::tiamc1_io_map(address_map &map) { map.global_mask(0xff); - map(0x40, 0x4f).w(this, FUNC(tiamc1_state::tiamc1_sprite_y_w)); /* sprites Y */ - map(0x50, 0x5f).w(this, FUNC(tiamc1_state::tiamc1_sprite_x_w)); /* sprites X */ - map(0x60, 0x6f).w(this, FUNC(tiamc1_state::tiamc1_sprite_n_w)); /* sprites # */ - map(0x70, 0x7f).w(this, FUNC(tiamc1_state::tiamc1_sprite_a_w)); /* sprites attributes */ - map(0xa0, 0xaf).w(this, FUNC(tiamc1_state::tiamc1_palette_w)); /* color ram */ - map(0xbc, 0xbc).w(this, FUNC(tiamc1_state::tiamc1_bg_vshift_w));/* background V scroll */ - map(0xbd, 0xbd).w(this, FUNC(tiamc1_state::tiamc1_bg_hshift_w));/* background H scroll */ - map(0xbe, 0xbe).w(this, FUNC(tiamc1_state::tiamc1_bankswitch_w)); /* VRAM selector */ - map(0xbf, 0xbf).w(this, FUNC(tiamc1_state::tiamc1_bg_bplctrl_w)); /* charset control */ + map(0x40, 0x4f).w(FUNC(tiamc1_state::tiamc1_sprite_y_w)); /* sprites Y */ + map(0x50, 0x5f).w(FUNC(tiamc1_state::tiamc1_sprite_x_w)); /* sprites X */ + map(0x60, 0x6f).w(FUNC(tiamc1_state::tiamc1_sprite_n_w)); /* sprites # */ + map(0x70, 0x7f).w(FUNC(tiamc1_state::tiamc1_sprite_a_w)); /* sprites attributes */ + map(0xa0, 0xaf).w(FUNC(tiamc1_state::tiamc1_palette_w)); /* color ram */ + map(0xbc, 0xbc).w(FUNC(tiamc1_state::tiamc1_bg_vshift_w));/* background V scroll */ + map(0xbd, 0xbd).w(FUNC(tiamc1_state::tiamc1_bg_hshift_w));/* background H scroll */ + map(0xbe, 0xbe).w(FUNC(tiamc1_state::tiamc1_bankswitch_w)); /* VRAM selector */ + map(0xbf, 0xbf).w(FUNC(tiamc1_state::tiamc1_bg_bplctrl_w)); /* charset control */ map(0xc0, 0xc3).w("2x8253", FUNC(tiamc1_sound_device::tiamc1_timer0_w)); /* timer 0 */ map(0xd0, 0xd3).rw("kr580vv55a", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* input ports + coin counters & lockout */ map(0xd4, 0xd7).w("2x8253", FUNC(tiamc1_sound_device::tiamc1_timer1_w)); /* timer 1 */ @@ -186,14 +186,14 @@ void tiamc1_state::tiamc1_io_map(address_map &map) void tiamc1_state::kotrybolov_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x0f).w(this, FUNC(tiamc1_state::tiamc1_sprite_y_w)); // sprites Y - map(0x10, 0x1f).w(this, FUNC(tiamc1_state::tiamc1_sprite_x_w)); // sprites X - map(0x20, 0x2f).w(this, FUNC(tiamc1_state::tiamc1_sprite_n_w)); // sprites # - map(0x30, 0x3f).w(this, FUNC(tiamc1_state::tiamc1_sprite_a_w)); // sprites attributes - map(0xe0, 0xef).w(this, FUNC(tiamc1_state::tiamc1_palette_w)); // color ram - map(0xf0, 0xf0).w(this, FUNC(tiamc1_state::tiamc1_bg_vshift_w)); // background V scroll - map(0xf4, 0xf4).w(this, FUNC(tiamc1_state::tiamc1_bg_hshift_w)); // background H scroll - map(0xf8, 0xf8).w(this, FUNC(tiamc1_state::kot_bankswitch_w)); // character rom offset + map(0x00, 0x0f).w(FUNC(tiamc1_state::tiamc1_sprite_y_w)); // sprites Y + map(0x10, 0x1f).w(FUNC(tiamc1_state::tiamc1_sprite_x_w)); // sprites X + map(0x20, 0x2f).w(FUNC(tiamc1_state::tiamc1_sprite_n_w)); // sprites # + map(0x30, 0x3f).w(FUNC(tiamc1_state::tiamc1_sprite_a_w)); // sprites attributes + map(0xe0, 0xef).w(FUNC(tiamc1_state::tiamc1_palette_w)); // color ram + map(0xf0, 0xf0).w(FUNC(tiamc1_state::tiamc1_bg_vshift_w)); // background V scroll + map(0xf4, 0xf4).w(FUNC(tiamc1_state::tiamc1_bg_hshift_w)); // background H scroll + map(0xf8, 0xf8).w(FUNC(tiamc1_state::kot_bankswitch_w)); // character rom offset map(0xc0, 0xc3).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0xd0, 0xd3).rw("kr580vv55a", FUNC(i8255_device::read), FUNC(i8255_device::write)); /* input ports + coin counters & lockout */ } diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index c9b4f632e0b..d786575d926 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -450,7 +450,7 @@ void tickee_state::tickee_map(address_map &map) map(0x04200000, 0x0420001f).w("ym1", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x04200100, 0x0420010f).r("ym2", FUNC(ay8910_device::data_r)).umask16(0x00ff); map(0x04200100, 0x0420011f).w("ym2", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); - map(0x04400000, 0x0440007f).w(this, FUNC(tickee_state::tickee_control_w)).share("control"); + map(0x04400000, 0x0440007f).w(FUNC(tickee_state::tickee_control_w)).share("control"); map(0x04400040, 0x0440004f).portr("IN2"); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xc0000240, 0xc000025f).nopw(); /* seems to be a bug in their code */ @@ -469,7 +469,7 @@ void tickee_state::ghoshunt_map(address_map &map) map(0x04300000, 0x0430001f).w("ym1", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x04300100, 0x0430010f).r("ym2", FUNC(ay8910_device::data_r)).umask16(0x00ff); map(0x04300100, 0x0430011f).w("ym2", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); - map(0x04500000, 0x0450007f).w(this, FUNC(tickee_state::tickee_control_w)).share("control"); + map(0x04500000, 0x0450007f).w(FUNC(tickee_state::tickee_control_w)).share("control"); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xc0000240, 0xc000025f).nopw(); /* seems to be a bug in their code */ map(0xff000000, 0xffffffff).rom().region("user1", 0); @@ -485,7 +485,7 @@ void tickee_state::mouseatk_map(address_map &map) map(0x04200000, 0x0420000f).r("ym", FUNC(ay8910_device::data_r)).umask16(0x00ff); map(0x04200000, 0x0420000f).w("ym", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x04200100, 0x0420010f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); - map(0x04400000, 0x0440007f).w(this, FUNC(tickee_state::tickee_control_w)).share("control"); + map(0x04400000, 0x0440007f).w(FUNC(tickee_state::tickee_control_w)).share("control"); map(0x04400040, 0x0440004f).portr("IN2"); // ? map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xc0000240, 0xc000025f).nopw(); /* seems to be a bug in their code */ @@ -497,14 +497,14 @@ void tickee_state::mouseatk_map(address_map &map) void tickee_state::rapidfir_map(address_map &map) { map(0x00000000, 0x007fffff).ram().share("vram"); - map(0x02000000, 0x027fffff).rw(this, FUNC(tickee_state::rapidfir_transparent_r), FUNC(tickee_state::rapidfir_transparent_w)); + map(0x02000000, 0x027fffff).rw(FUNC(tickee_state::rapidfir_transparent_r), FUNC(tickee_state::rapidfir_transparent_w)); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); - map(0xfc000000, 0xfc00000f).r(this, FUNC(tickee_state::rapidfir_gun1_r)); - map(0xfc000100, 0xfc00010f).r(this, FUNC(tickee_state::rapidfir_gun2_r)); - map(0xfc000400, 0xfc00040f).r(this, FUNC(tickee_state::ffff_r)); + map(0xfc000000, 0xfc00000f).r(FUNC(tickee_state::rapidfir_gun1_r)); + map(0xfc000100, 0xfc00010f).r(FUNC(tickee_state::rapidfir_gun2_r)); + map(0xfc000400, 0xfc00040f).r(FUNC(tickee_state::ffff_r)); map(0xfc000500, 0xfc00050f).noprw(); - map(0xfc000600, 0xfc00060f).w(this, FUNC(tickee_state::rapidfir_control_w)); - map(0xfc000700, 0xfc00070f).w(this, FUNC(tickee_state::sound_bank_w)); + map(0xfc000600, 0xfc00060f).w(FUNC(tickee_state::rapidfir_control_w)); + map(0xfc000700, 0xfc00070f).w(FUNC(tickee_state::sound_bank_w)); map(0xfc000800, 0xfc00080f).portr("IN0"); map(0xfc000900, 0xfc00090f).portr("IN1"); map(0xfc000a00, 0xfc000a0f).portr("IN2"); @@ -514,7 +514,7 @@ void tickee_state::rapidfir_map(address_map &map) map(0xfc100000, 0xfc1000ff).mirror(0x80000).rw(m_tlc34076, FUNC(tlc34076_device::read), FUNC(tlc34076_device::write)).umask16(0x00ff); map(0xfc200000, 0xfc207fff).ram().share("nvram"); map(0xfc300000, 0xfc30000f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); - map(0xfc400010, 0xfc40001f).rw(this, FUNC(tickee_state::ff7f_r), FUNC(tickee_state::ff7f_w)); + map(0xfc400010, 0xfc40001f).rw(FUNC(tickee_state::ff7f_r), FUNC(tickee_state::ff7f_w)); map(0xfe000000, 0xffffffff).rom().region("user1", 0); } diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index ba2c6561526..db37dbb7a55 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -117,12 +117,12 @@ void tigeroad_state::main_map(address_map &map) map(0xfe0800, 0xfe0cff).ram().share("spriteram"); map(0xfe0d00, 0xfe1807).ram(); /* still part of OBJ RAM */ - map(0xfe4000, 0xfe4001).portr("P1_P2").w(this, FUNC(tigeroad_state::tigeroad_videoctrl_w)); /* char bank, coin counters, + ? */ - map(0xfe4002, 0xfe4003).portr("SYSTEM").w(this, FUNC(tigeroad_state::tigeroad_soundcmd_w)); /* AM_WRITE(tigeroad_soundcmd_w) is replaced in init for for f1dream protection */ + map(0xfe4000, 0xfe4001).portr("P1_P2").w(FUNC(tigeroad_state::tigeroad_videoctrl_w)); /* char bank, coin counters, + ? */ + map(0xfe4002, 0xfe4003).portr("SYSTEM").w(FUNC(tigeroad_state::tigeroad_soundcmd_w)); /* AM_WRITE(tigeroad_soundcmd_w) is replaced in init for for f1dream protection */ map(0xfe4004, 0xfe4005).portr("DSW"); - map(0xfe8000, 0xfe8003).w(this, FUNC(tigeroad_state::tigeroad_scroll_w)); + map(0xfe8000, 0xfe8003).w(FUNC(tigeroad_state::tigeroad_scroll_w)); map(0xfe800e, 0xfe800f).writeonly(); /* fe800e = watchdog or IRQ acknowledge */ - map(0xfec000, 0xfec7ff).ram().w(this, FUNC(tigeroad_state::tigeroad_videoram_w)).share("videoram"); + map(0xfec000, 0xfec7ff).ram().w(FUNC(tigeroad_state::tigeroad_videoram_w)).share("videoram"); map(0xff8000, 0xff87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xffc000, 0xffffff).ram().share("ram16"); @@ -143,12 +143,12 @@ WRITE8_MEMBER(f1dream_state::mcu_shared_w) void f1dream_state::f1dream_map(address_map &map) { main_map(map); - map(0xfe4002, 0xfe4003).portr("SYSTEM").w(this, FUNC(f1dream_state::blktiger_to_mcu_w)); + map(0xfe4002, 0xfe4003).portr("SYSTEM").w(FUNC(f1dream_state::blktiger_to_mcu_w)); } void f1dream_state::f1dream_mcu_io(address_map &map) { - map(0x7f0, 0x7ff).rw(this, FUNC(f1dream_state::mcu_shared_r), FUNC(f1dream_state::mcu_shared_w)); + map(0x7f0, 0x7ff).rw(FUNC(f1dream_state::mcu_shared_r), FUNC(f1dream_state::mcu_shared_w)); } @@ -156,24 +156,24 @@ void pushman_state::pushman_map(address_map &map) { main_map(map); - map(0x060000, 0x060007).r(this, FUNC(pushman_state::mcu_comm_r)); - map(0x060000, 0x060003).w(this, FUNC(pushman_state::pushman_mcu_comm_w)); + map(0x060000, 0x060007).r(FUNC(pushman_state::mcu_comm_r)); + map(0x060000, 0x060003).w(FUNC(pushman_state::pushman_mcu_comm_w)); } void pushman_state::bballs_map(address_map &map) { map.global_mask(0xfffff); map(0x00000, 0x3ffff).rom(); - map(0x60000, 0x60007).r(this, FUNC(pushman_state::mcu_comm_r)); - map(0x60000, 0x60001).w(this, FUNC(pushman_state::bballs_mcu_comm_w)); + map(0x60000, 0x60007).r(FUNC(pushman_state::mcu_comm_r)); + map(0x60000, 0x60001).w(FUNC(pushman_state::bballs_mcu_comm_w)); // are these mirror addresses or does this PCB have a different addressing? map(0xe0800, 0xe17ff).ram().share("spriteram"); - map(0xe4000, 0xe4001).portr("P1_P2").w(this, FUNC(pushman_state::tigeroad_videoctrl_w)); - map(0xe4002, 0xe4003).portr("SYSTEM").w(this, FUNC(pushman_state::tigeroad_soundcmd_w)); + map(0xe4000, 0xe4001).portr("P1_P2").w(FUNC(pushman_state::tigeroad_videoctrl_w)); + map(0xe4002, 0xe4003).portr("SYSTEM").w(FUNC(pushman_state::tigeroad_soundcmd_w)); map(0xe4004, 0xe4005).portr("DSW"); - map(0xe8000, 0xe8003).w(this, FUNC(pushman_state::tigeroad_scroll_w)); + map(0xe8000, 0xe8003).w(FUNC(pushman_state::tigeroad_scroll_w)); map(0xe800e, 0xe800f).nopw(); /* ? */ - map(0xec000, 0xec7ff).ram().w(this, FUNC(pushman_state::tigeroad_videoram_w)).share("videoram"); + map(0xec000, 0xec7ff).ram().w(FUNC(pushman_state::tigeroad_videoram_w)).share("videoram"); map(0xf8000, 0xf87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfc000, 0xfffff).ram().share("ram16"); @@ -205,7 +205,7 @@ void tigeroad_state::sample_port_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch2", FUNC(generic_latch_8_device::read)); - map(0x01, 0x01).w(this, FUNC(tigeroad_state::msm5205_w)); + map(0x01, 0x01).w(FUNC(tigeroad_state::msm5205_w)); } /* Pushman / Bouncing Balls */ diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp index bfcd590a86d..0c899db228e 100644 --- a/src/mame/drivers/tiki100.cpp +++ b/src/mame/drivers/tiki100.cpp @@ -296,13 +296,13 @@ WRITE8_MEMBER( tiki100_state::system_w ) void tiki100_state::tiki100_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(tiki100_state::mrq_r), FUNC(tiki100_state::mrq_w)); + map(0x0000, 0xffff).rw(FUNC(tiki100_state::mrq_r), FUNC(tiki100_state::mrq_w)); } void tiki100_state::tiki100_io(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(tiki100_state::iorq_r), FUNC(tiki100_state::iorq_w)); + map(0x0000, 0xffff).rw(FUNC(tiki100_state::iorq_r), FUNC(tiki100_state::iorq_w)); } /* Input Ports */ @@ -735,8 +735,8 @@ MACHINE_CONFIG_START(tiki100_state::tiki100) MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 8_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_Z80PIO_IN_PA_CB(READ8("cent_data_in", input_buffer_device, read)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_IN_PA_CB(READ8("cent_data_in", input_buffer_device, bus_r)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, tiki100_state, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, tiki100_state, pio_pb_w)) diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp index 0fecfe16f8b..ca64a957426 100644 --- a/src/mame/drivers/timelimt.cpp +++ b/src/mame/drivers/timelimt.cpp @@ -52,8 +52,8 @@ void timelimt_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); /* rom */ map(0x8000, 0x87ff).ram(); /* ram */ - map(0x8800, 0x8bff).ram().w(this, FUNC(timelimt_state::videoram_w)).share("videoram"); /* video ram */ - map(0x9000, 0x97ff).ram().w(this, FUNC(timelimt_state::bg_videoram_w)).share("bg_videoram");/* background ram */ + map(0x8800, 0x8bff).ram().w(FUNC(timelimt_state::videoram_w)).share("videoram"); /* video ram */ + map(0x9000, 0x97ff).ram().w(FUNC(timelimt_state::bg_videoram_w)).share("bg_videoram");/* background ram */ map(0x9800, 0x98ff).ram().share("spriteram"); /* sprite ram */ map(0xa000, 0xa000).portr("INPUTS"); map(0xa800, 0xa800).portr("SYSTEM"); @@ -61,9 +61,9 @@ void timelimt_state::main_map(address_map &map) map(0xb000, 0xb007).w("mainlatch", FUNC(ls259_device::write_d0)); map(0xb800, 0xb800).w("soundlatch", FUNC(generic_latch_8_device::write)); /* sound write */ map(0xb800, 0xb800).nopr(); /* NMI ack? */ - map(0xc800, 0xc800).w(this, FUNC(timelimt_state::scroll_x_lsb_w)); - map(0xc801, 0xc801).w(this, FUNC(timelimt_state::scroll_x_msb_w)); - map(0xc802, 0xc802).w(this, FUNC(timelimt_state::scroll_y_w)); + map(0xc800, 0xc800).w(FUNC(timelimt_state::scroll_x_lsb_w)); + map(0xc801, 0xc801).w(FUNC(timelimt_state::scroll_x_msb_w)); + map(0xc802, 0xc802).w(FUNC(timelimt_state::scroll_y_w)); map(0xc803, 0xc803).nopw(); /* ???? bit 0 used only */ map(0xc804, 0xc804).nopw(); /* ???? not used */ } diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index 9239fec90bc..d8babbc723e 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -133,12 +133,12 @@ void timeplt_state::timeplt_main_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x5fff).rom(); - map(0xa000, 0xa3ff).ram().w(this, FUNC(timeplt_state::colorram_w)).share("colorram"); - map(0xa400, 0xa7ff).ram().w(this, FUNC(timeplt_state::videoram_w)).share("videoram"); + map(0xa000, 0xa3ff).ram().w(FUNC(timeplt_state::colorram_w)).share("colorram"); + map(0xa400, 0xa7ff).ram().w(FUNC(timeplt_state::videoram_w)).share("videoram"); map(0xa800, 0xafff).ram(); map(0xb000, 0xb0ff).mirror(0x0b00).ram().share("spriteram"); map(0xb400, 0xb4ff).mirror(0x0b00).ram().share("spriteram2"); - map(0xc000, 0xc000).mirror(0x0cff).r(this, FUNC(timeplt_state::scanline_r)).w("timeplt_audio", FUNC(timeplt_audio_device::sound_data_w)); + map(0xc000, 0xc000).mirror(0x0cff).r(FUNC(timeplt_state::scanline_r)).w("timeplt_audio", FUNC(timeplt_audio_device::sound_data_w)); map(0xc200, 0xc200).mirror(0x0cff).portr("DSW1").w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xc300, 0xc300).mirror(0x0c9f).portr("IN0"); map(0xc300, 0xc30f).lw8("mainlatch_w", @@ -153,7 +153,7 @@ void timeplt_state::timeplt_main_map(address_map &map) void timeplt_state::psurge_main_map(address_map &map) { timeplt_main_map(map); - map(0x6004, 0x6004).r(this, FUNC(timeplt_state::psurge_protection_r)); + map(0x6004, 0x6004).r(FUNC(timeplt_state::psurge_protection_r)); } void timeplt_state::chkun_main_map(address_map &map) diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index d5d1b78716f..b28a8fe25dd 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -527,11 +527,11 @@ void spectrum_state::ts2068_update_memory() void spectrum_state::ts2068_io(address_map &map) { - map(0xf4, 0xf4).rw(this, FUNC(spectrum_state::ts2068_port_f4_r), FUNC(spectrum_state::ts2068_port_f4_w)).mirror(0xff00); + map(0xf4, 0xf4).rw(FUNC(spectrum_state::ts2068_port_f4_r), FUNC(spectrum_state::ts2068_port_f4_w)).mirror(0xff00); map(0xf5, 0xf5).w("ay8912", FUNC(ay8910_device::address_w)).mirror(0xff00); map(0xf6, 0xf6).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)).mirror(0xff00); - map(0xfe, 0xfe).rw(this, FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xff00); - map(0xff, 0xff).rw(this, FUNC(spectrum_state::ts2068_port_ff_r), FUNC(spectrum_state::ts2068_port_ff_w)).mirror(0xff00); + map(0xfe, 0xfe).rw(FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xff00); + map(0xff, 0xff).rw(FUNC(spectrum_state::ts2068_port_ff_r), FUNC(spectrum_state::ts2068_port_ff_w)).mirror(0xff00); } void spectrum_state::ts2068_mem(address_map &map) @@ -573,8 +573,8 @@ WRITE8_MEMBER( spectrum_state::tc2048_port_ff_w ) void spectrum_state::tc2048_io(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); - map(0xff, 0xff).rw(this, FUNC(spectrum_state::ts2068_port_ff_r), FUNC(spectrum_state::tc2048_port_ff_w)).mirror(0xff00); + map(0x00, 0x00).rw(FUNC(spectrum_state::spectrum_port_fe_r), FUNC(spectrum_state::spectrum_port_fe_w)).select(0xfffe); + map(0xff, 0xff).rw(FUNC(spectrum_state::ts2068_port_ff_r), FUNC(spectrum_state::tc2048_port_ff_w)).mirror(0xff00); } void spectrum_state::tc2048_mem(address_map &map) diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp index 04493fa9743..b0388847059 100644 --- a/src/mame/drivers/tk2000.cpp +++ b/src/mame/drivers/tk2000.cpp @@ -455,16 +455,16 @@ WRITE8_MEMBER(tk2000_state::ram_w) void tk2000_state::apple2_map(address_map &map) { - map(0x0000, 0xbfff).rw(this, FUNC(tk2000_state::ram_r), FUNC(tk2000_state::ram_w)); - map(0xc000, 0xc07f).rw(this, FUNC(tk2000_state::c000_r), FUNC(tk2000_state::c000_w)); - map(0xc080, 0xc0ff).rw(this, FUNC(tk2000_state::c080_r), FUNC(tk2000_state::c080_w)); + map(0x0000, 0xbfff).rw(FUNC(tk2000_state::ram_r), FUNC(tk2000_state::ram_w)); + map(0xc000, 0xc07f).rw(FUNC(tk2000_state::c000_r), FUNC(tk2000_state::c000_w)); + map(0xc080, 0xc0ff).rw(FUNC(tk2000_state::c080_r), FUNC(tk2000_state::c080_w)); map(0xc100, 0xffff).m(m_upperbank, FUNC(address_map_bank_device::amap8)); } void tk2000_state::inhbank_map(address_map &map) { map(0x0000, 0x3eff).rom().region("maincpu", 0x100); - map(0x4000, 0x7eff).rw(this, FUNC(tk2000_state::c100_r), FUNC(tk2000_state::c100_w)); + map(0x4000, 0x7eff).rw(FUNC(tk2000_state::c100_r), FUNC(tk2000_state::c100_w)); } /*************************************************************************** diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp index 53a9734a41e..a769d067324 100644 --- a/src/mame/drivers/tk80.cpp +++ b/src/mame/drivers/tk80.cpp @@ -127,7 +127,7 @@ void tk80_state::tk80_mem(address_map &map) map(0x0000, 0x02ff).rom(); map(0x0300, 0x03ff).ram(); // EEPROM map(0x8000, 0x83f7).ram(); // RAM - map(0x83f8, 0x83ff).ram().rw(this, FUNC(tk80_state::display_r), FUNC(tk80_state::display_w)); + map(0x83f8, 0x83ff).ram().rw(FUNC(tk80_state::display_r), FUNC(tk80_state::display_w)); } void tk80_state::tk85_mem(address_map &map) @@ -136,7 +136,7 @@ void tk80_state::tk85_mem(address_map &map) map.global_mask(0x87ff); // A10-14 not connected map(0x0000, 0x07ff).rom(); map(0x8000, 0x83f7).ram(); - map(0x83f8, 0x83ff).ram().rw(this, FUNC(tk80_state::display_r), FUNC(tk80_state::display_w)); + map(0x83f8, 0x83ff).ram().rw(FUNC(tk80_state::display_r), FUNC(tk80_state::display_w)); } void tk80_state::ics8080_mem(address_map &map) @@ -145,7 +145,7 @@ void tk80_state::ics8080_mem(address_map &map) //ADDRESS_MAP_GLOBAL_MASK(0x87ff) // A10-14 not connected map(0x0000, 0x1fff).rom(); map(0x8000, 0x83f7).ram(); - map(0x83f8, 0x83ff).ram().rw(this, FUNC(tk80_state::display_r), FUNC(tk80_state::display_w)); + map(0x83f8, 0x83ff).ram().rw(FUNC(tk80_state::display_r), FUNC(tk80_state::display_w)); map(0x8400, 0x8fff).ram(); } diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp index 2850d0fda9d..2fc5d6ebbbf 100644 --- a/src/mame/drivers/tk80bs.cpp +++ b/src/mame/drivers/tk80bs.cpp @@ -114,7 +114,7 @@ void tk80bs_state::tk80bs_mem(address_map &map) map(0x0000, 0x07ff).rom(); // AM_RANGE(0x0c00, 0x7bff) AM_ROM // ext map(0x7df8, 0x7df9).noprw(); // i8251 sio - map(0x7dfc, 0x7dff).rw(this, FUNC(tk80bs_state::ppi_custom_r), FUNC(tk80bs_state::ppi_custom_w)); + map(0x7dfc, 0x7dff).rw(FUNC(tk80bs_state::ppi_custom_r), FUNC(tk80bs_state::ppi_custom_w)); map(0x7e00, 0x7fff).ram().share("videoram"); // video ram map(0x8000, 0xcfff).ram(); // RAM map(0xd000, 0xefff).rom(); // BASIC diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index dadd0573d33..94c5193e0a6 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -589,9 +589,9 @@ READ8_MEMBER( tm990189_state::video_vdp_r ) it. */ if (offset & 2) - reply = m_tms9918->register_read(space, 0); + reply = m_tms9918->register_read(); else - reply = m_tms9918->vram_read(space, 0); + reply = m_tms9918->vram_read(); if (!(offset & 1)) m_bogus_read_save = reply; @@ -606,9 +606,9 @@ WRITE8_MEMBER( tm990189_state::video_vdp_w ) if (offset & 1) { if (offset & 2) - m_tms9918->register_write(space, 0, data); + m_tms9918->register_write(data); else - m_tms9918->vram_write(space, 0, data); + m_tms9918->vram_write(data); } } @@ -749,9 +749,9 @@ void tm990189_state::tm990_189_v_memmap(address_map &map) map(0x0800, 0x0fff).rom(); /* extra ROM - application programs with unibug, remaining 2kb of program for university basic */ map(0x1000, 0x17ff).rom().nopw(); /* video board ROM 1 */ - map(0x1800, 0x1fff).rom().w(this, FUNC(tm990189_state::video_joy_w)); /* video board ROM 2 and joystick write port*/ - map(0x2000, 0x27ff).r(this, FUNC(tm990189_state::video_vdp_r)).nopw(); /* video board tms9918 read ports (bogus) */ - map(0x2800, 0x2fff).rw(this, FUNC(tm990189_state::video_joy_r), FUNC(tm990189_state::video_vdp_w)); /* video board joystick read port and tms9918 write ports */ + map(0x1800, 0x1fff).rom().w(FUNC(tm990189_state::video_joy_w)); /* video board ROM 2 and joystick write port*/ + map(0x2000, 0x27ff).r(FUNC(tm990189_state::video_vdp_r)).nopw(); /* video board tms9918 read ports (bogus) */ + map(0x2800, 0x2fff).rw(FUNC(tm990189_state::video_joy_r), FUNC(tm990189_state::video_vdp_w)); /* video board joystick read port and tms9918 write ports */ map(0x3000, 0x3fff).rom(); /* main ROM - unibug or university basic */ } diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp index f0f26eb8a9e..7522d0d3c5f 100644 --- a/src/mame/drivers/tmaster.cpp +++ b/src/mame/drivers/tmaster.cpp @@ -262,7 +262,7 @@ void tmaster_state::tmaster_map(address_map &map) map(0x000000, 0x1fffff).rom(); map(0x200000, 0x27ffff).ram(); map(0x280000, 0x28ffef).ram().share("nvram"); - map(0x28fff0, 0x28ffff).rw(this, FUNC(tmaster_state::rtc_r), FUNC(tmaster_state::rtc_w)); + map(0x28fff0, 0x28ffff).rw(FUNC(tmaster_state::rtc_r), FUNC(tmaster_state::rtc_w)); map(0x300010, 0x300011).portr("COIN"); diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index 3bdffa298ae..1733a079ca4 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -261,8 +261,8 @@ void tmc1800_state::tmc1800_map(address_map &map) void tmc1800_state::tmc1800_io_map(address_map &map) { - map(0x01, 0x01).rw(this, FUNC(tmc1800_state::dispon_r), FUNC(tmc1800_state::dispoff_w)); - map(0x02, 0x02).w(this, FUNC(tmc1800_state::keylatch_w)); + map(0x01, 0x01).rw(FUNC(tmc1800_state::dispon_r), FUNC(tmc1800_state::dispoff_w)); + map(0x02, 0x02).w(FUNC(tmc1800_state::keylatch_w)); } // OSCOM 1000B @@ -275,7 +275,7 @@ void osc1000b_state::osc1000b_map(address_map &map) void osc1000b_state::osc1000b_io_map(address_map &map) { - map(0x02, 0x02).w(this, FUNC(osc1000b_state::keylatch_w)); + map(0x02, 0x02).w(FUNC(osc1000b_state::keylatch_w)); } // Telmac 2000 @@ -291,8 +291,8 @@ void tmc2000_state::tmc2000_io_map(address_map &map) { map.unmap_value_high(); map(0x01, 0x01).rw(m_cti, FUNC(cdp1864_device::dispon_r), FUNC(cdp1864_device::step_bgcolor_w)); - map(0x02, 0x02).w(this, FUNC(tmc2000_state::keylatch_w)); - map(0x04, 0x04).r(m_cti, FUNC(cdp1864_device::dispoff_r)).w(this, FUNC(tmc2000_state::bankswitch_w)); + map(0x02, 0x02).w(FUNC(tmc2000_state::keylatch_w)); + map(0x04, 0x04).r(m_cti, FUNC(cdp1864_device::dispoff_r)).w(FUNC(tmc2000_state::bankswitch_w)); } // OSCOM Nano @@ -306,8 +306,8 @@ void nano_state::nano_map(address_map &map) void nano_state::nano_io_map(address_map &map) { map(0x01, 0x01).rw(m_cti, FUNC(cdp1864_device::dispon_r), FUNC(cdp1864_device::step_bgcolor_w)); - map(0x02, 0x02).w(this, FUNC(nano_state::keylatch_w)); - map(0x04, 0x04).r(m_cti, FUNC(cdp1864_device::dispoff_r)).w(this, FUNC(nano_state::bankswitch_w)); + map(0x02, 0x02).w(FUNC(nano_state::keylatch_w)); + map(0x04, 0x04).r(m_cti, FUNC(cdp1864_device::dispoff_r)).w(FUNC(nano_state::bankswitch_w)); } /* Input Ports */ diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp index 1e518b8ee9a..dc8d15c18d2 100644 --- a/src/mame/drivers/tmc2000e.cpp +++ b/src/mame/drivers/tmc2000e.cpp @@ -93,11 +93,11 @@ void tmc2000e_state::tmc2000e_io_map(address_map &map) { map(0x01, 0x01).w(m_cti, FUNC(cdp1864_device::tone_latch_w)); map(0x02, 0x02).w(m_cti, FUNC(cdp1864_device::step_bgcolor_w)); - map(0x03, 0x03).rw(this, FUNC(tmc2000e_state::ascii_keyboard_r), FUNC(tmc2000e_state::keyboard_latch_w)); - map(0x04, 0x04).rw(this, FUNC(tmc2000e_state::io_r), FUNC(tmc2000e_state::io_w)); - map(0x05, 0x05).rw(this, FUNC(tmc2000e_state::vismac_r), FUNC(tmc2000e_state::vismac_w)); - map(0x06, 0x06).rw(this, FUNC(tmc2000e_state::floppy_r), FUNC(tmc2000e_state::floppy_w)); - map(0x07, 0x07).portr("DSW0").w(this, FUNC(tmc2000e_state::io_select_w)); + map(0x03, 0x03).rw(FUNC(tmc2000e_state::ascii_keyboard_r), FUNC(tmc2000e_state::keyboard_latch_w)); + map(0x04, 0x04).rw(FUNC(tmc2000e_state::io_r), FUNC(tmc2000e_state::io_w)); + map(0x05, 0x05).rw(FUNC(tmc2000e_state::vismac_r), FUNC(tmc2000e_state::vismac_w)); + map(0x06, 0x06).rw(FUNC(tmc2000e_state::floppy_r), FUNC(tmc2000e_state::floppy_w)); + map(0x07, 0x07).portr("DSW0").w(FUNC(tmc2000e_state::io_select_w)); } /* Input Ports */ diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp index 1ce8b9eeed6..70f1a342ac5 100644 --- a/src/mame/drivers/tmc600.cpp +++ b/src/mame/drivers/tmc600.cpp @@ -133,9 +133,9 @@ void tmc600_state::tmc600_io_map(address_map &map) { map(0x03, 0x03).w(m_bwio, FUNC(cdp1852_device::write)); map(0x04, 0x04).w(CDP1852_TMC700_TAG, FUNC(cdp1852_device::write)); - map(0x05, 0x05).rw(this, FUNC(tmc600_state::rtc_r), FUNC(tmc600_state::vismac_data_w)); + map(0x05, 0x05).rw(FUNC(tmc600_state::rtc_r), FUNC(tmc600_state::vismac_data_w)); // AM_RANGE(0x06, 0x06) AM_WRITE(floppy_w) - map(0x07, 0x07).w(this, FUNC(tmc600_state::vismac_register_w)); + map(0x07, 0x07).w(FUNC(tmc600_state::vismac_register_w)); } /* Input Ports */ diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index 01415f5c0b4..43aee19bcfd 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -695,7 +695,7 @@ WRITE32_MEMBER(tmmjprd_state::brt_2_w) void tmmjprd_state::tmmjprd_map(address_map &map) { map(0x000000, 0x1fffff).rom(); - map(0x200010, 0x200013).r(this, FUNC(tmmjprd_state::randomtmmjprds)); // gfx chip status? + map(0x200010, 0x200013).r(FUNC(tmmjprd_state::randomtmmjprds)); // gfx chip status? /* check these are used .. */ // AM_RANGE(0x200010, 0x200013) AM_WRITEONLY AM_SHARE("viewregs0") map(0x200100, 0x200117).writeonly().share("tilemap_regs.0"); // tilemap regs1 @@ -704,8 +704,8 @@ void tmmjprd_state::tmmjprd_map(address_map &map) map(0x200160, 0x200177).writeonly().share("tilemap_regs.3"); // tilemap regs4 map(0x200200, 0x20021b).writeonly().share("spriteregs"); // sprregs? // AM_RANGE(0x200300, 0x200303) AM_WRITE(rombank_w) // used during rom testing, rombank/area select + something else? - map(0x20040c, 0x20040f).w(this, FUNC(tmmjprd_state::brt_1_w)); - map(0x200410, 0x200413).w(this, FUNC(tmmjprd_state::brt_2_w)); + map(0x20040c, 0x20040f).w(FUNC(tmmjprd_state::brt_1_w)); + map(0x200410, 0x200413).w(FUNC(tmmjprd_state::brt_2_w)); // AM_RANGE(0x200500, 0x200503) AM_WRITEONLY AM_SHARE("viewregs7") // AM_RANGE(0x200700, 0x20070f) AM_WRITE(blitter_w) AM_SHARE("blitterregs") // AM_RANGE(0x200800, 0x20080f) AM_WRITEONLY AM_SHARE("viewregs9") // never changes? @@ -713,15 +713,15 @@ void tmmjprd_state::tmmjprd_map(address_map &map) /* hmm */ // AM_RANGE(0x279700, 0x279713) AM_WRITEONLY AM_SHARE("viewregs10") /* tilemaps */ - map(0x280000, 0x283fff).rw(this, FUNC(tmmjprd_state::tilemap0_r), FUNC(tmmjprd_state::tilemap0_w)); - map(0x284000, 0x287fff).rw(this, FUNC(tmmjprd_state::tilemap1_r), FUNC(tmmjprd_state::tilemap1_w)); - map(0x288000, 0x28bfff).rw(this, FUNC(tmmjprd_state::tilemap2_r), FUNC(tmmjprd_state::tilemap2_w)); - map(0x28c000, 0x28ffff).rw(this, FUNC(tmmjprd_state::tilemap3_r), FUNC(tmmjprd_state::tilemap3_w)); + map(0x280000, 0x283fff).rw(FUNC(tmmjprd_state::tilemap0_r), FUNC(tmmjprd_state::tilemap0_w)); + map(0x284000, 0x287fff).rw(FUNC(tmmjprd_state::tilemap1_r), FUNC(tmmjprd_state::tilemap1_w)); + map(0x288000, 0x28bfff).rw(FUNC(tmmjprd_state::tilemap2_r), FUNC(tmmjprd_state::tilemap2_w)); + map(0x28c000, 0x28ffff).rw(FUNC(tmmjprd_state::tilemap3_r), FUNC(tmmjprd_state::tilemap3_w)); /* ?? is palette ram shared with sprites in this case or just a different map */ map(0x290000, 0x29bfff).ram().share("spriteram"); map(0x29c000, 0x29ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); - map(0x400000, 0x400003).r(this, FUNC(tmmjprd_state::mux_r)).w(this, FUNC(tmmjprd_state::eeprom_write)); + map(0x400000, 0x400003).r(FUNC(tmmjprd_state::mux_r)).w(FUNC(tmmjprd_state::eeprom_write)); map(0xf00000, 0xffffff).ram(); } diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index d9618cee85f..81def07bb35 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -475,16 +475,16 @@ void tmnt_state::cuebrick_main_map(address_map &map) map(0x040000, 0x043fff).ram(); /* main RAM */ map(0x060000, 0x063fff).ram(); /* main RAM */ map(0x080000, 0x080fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); - map(0x0a0000, 0x0a0001).portr("COINS").w(this, FUNC(tmnt_state::tmnt_0a0000_w)); + map(0x0a0000, 0x0a0001).portr("COINS").w(FUNC(tmnt_state::tmnt_0a0000_w)); map(0x0a0002, 0x0a0003).portr("P1"); map(0x0a0004, 0x0a0005).portr("P2"); map(0x0a0010, 0x0a0011).portr("DSW2").w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x0a0012, 0x0a0013).portr("DSW1"); map(0x0a0018, 0x0a0019).portr("DSW3"); map(0x0b0000, 0x0b03ff).bankrw("nvrambank"); - map(0x0b0400, 0x0b0400).w(this, FUNC(tmnt_state::cuebrick_nvbank_w)); + map(0x0b0400, 0x0b0400).w(FUNC(tmnt_state::cuebrick_nvbank_w)); map(0x0c0000, 0x0c0003).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0xff00); - map(0x100000, 0x107fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); + map(0x100000, 0x107fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); map(0x140000, 0x140007).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); map(0x140400, 0x1407ff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); } @@ -496,7 +496,7 @@ void tmnt_state::mia_main_map(address_map &map) map(0x040000, 0x043fff).ram(); /* main RAM */ map(0x060000, 0x063fff).ram(); /* main RAM */ map(0x080000, 0x080fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); - map(0x0a0000, 0x0a0001).portr("COINS").w(this, FUNC(tmnt_state::tmnt_0a0000_w)); + map(0x0a0000, 0x0a0001).portr("COINS").w(FUNC(tmnt_state::tmnt_0a0000_w)); map(0x0a0002, 0x0a0003).portr("P1"); map(0x0a0004, 0x0a0005).portr("P2"); map(0x0a0009, 0x0a0009).w("soundlatch", FUNC(generic_latch_8_device::write)); @@ -504,9 +504,9 @@ void tmnt_state::mia_main_map(address_map &map) map(0x0a0012, 0x0a0013).portr("DSW2"); map(0x0a0018, 0x0a0019).portr("DSW3"); #if 0 - map(0x0c0000, 0x0c0001).w(this, FUNC(tmnt_state::tmnt_priority_w)); + map(0x0c0000, 0x0c0001).w(FUNC(tmnt_state::tmnt_priority_w)); #endif - map(0x100000, 0x107fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); + map(0x100000, 0x107fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); // AM_RANGE(0x10e800, 0x10e801) AM_WRITENOP ??? map(0x140000, 0x140007).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); map(0x140400, 0x1407ff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); @@ -518,7 +518,7 @@ void tmnt_state::tmnt_main_map(address_map &map) map(0x000000, 0x05ffff).rom(); map(0x060000, 0x063fff).ram(); /* main RAM */ map(0x080000, 0x080fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); - map(0x0a0000, 0x0a0001).portr("COINS").w(this, FUNC(tmnt_state::tmnt_0a0000_w)); + map(0x0a0000, 0x0a0001).portr("COINS").w(FUNC(tmnt_state::tmnt_0a0000_w)); map(0x0a0002, 0x0a0003).portr("P1"); map(0x0a0004, 0x0a0005).portr("P2"); map(0x0a0006, 0x0a0007).portr("P3"); @@ -527,8 +527,8 @@ void tmnt_state::tmnt_main_map(address_map &map) map(0x0a0012, 0x0a0013).portr("DSW2"); map(0x0a0014, 0x0a0015).portr("P4"); map(0x0a0018, 0x0a0019).portr("DSW3"); - map(0x0c0000, 0x0c0001).w(this, FUNC(tmnt_state::tmnt_priority_w)); - map(0x100000, 0x107fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); + map(0x0c0000, 0x0c0001).w(FUNC(tmnt_state::tmnt_priority_w)); + map(0x100000, 0x107fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); // AM_RANGE(0x10e800, 0x10e801) AM_WRITENOP ??? map(0x140000, 0x140007).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); map(0x140400, 0x1407ff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); @@ -544,14 +544,14 @@ void tmnt_state::punkshot_main_map(address_map &map) map(0x0a0002, 0x0a0003).portr("COINS/DSW3"); map(0x0a0004, 0x0a0005).portr("P3/P4"); map(0x0a0006, 0x0a0007).portr("P1/P2"); - map(0x0a0020, 0x0a0021).w(this, FUNC(tmnt_state::punkshot_0a0020_w)); + map(0x0a0020, 0x0a0021).w(FUNC(tmnt_state::punkshot_0a0020_w)); map(0x0a0040, 0x0a0043).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); map(0x0a0060, 0x0a007f).w(m_k053251, FUNC(k053251_device::lsb_w)); map(0x0a0080, 0x0a0081).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x100000, 0x107fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::punkshot_k052109_word_noA12_w)); + map(0x100000, 0x107fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::punkshot_k052109_word_noA12_w)); map(0x110000, 0x110007).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); map(0x110400, 0x1107ff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); - map(0xfffffc, 0xffffff).r(this, FUNC(tmnt_state::punkshot_kludge_r)); + map(0xfffffc, 0xffffff).r(FUNC(tmnt_state::punkshot_kludge_r)); } void tmnt_state::lgtnfght_main_map(address_map &map) @@ -565,13 +565,13 @@ void tmnt_state::lgtnfght_main_map(address_map &map) map(0x0a0006, 0x0a0007).portr("DSW1"); map(0x0a0008, 0x0a0009).portr("DSW2"); map(0x0a0010, 0x0a0011).portr("DSW3"); - map(0x0a0018, 0x0a0019).w(this, FUNC(tmnt_state::lgtnfght_0a0018_w)); + map(0x0a0018, 0x0a0019).w(FUNC(tmnt_state::lgtnfght_0a0018_w)); map(0x0a0020, 0x0a0023).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); map(0x0a0028, 0x0a0029).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x0b0000, 0x0b3fff).rw(this, FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); - map(0x0c0000, 0x0c001f).rw(this, FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); + map(0x0b0000, 0x0b3fff).rw(FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); + map(0x0c0000, 0x0c001f).rw(FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); map(0x0e0000, 0x0e001f).w(m_k053251, FUNC(k053251_device::lsb_w)); - map(0x100000, 0x107fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); + map(0x100000, 0x107fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); } WRITE16_MEMBER(tmnt_state::ssriders_soundkludge_w) @@ -585,19 +585,19 @@ void tmnt_state::blswhstl_main_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x180000, 0x183fff).rw(m_k052109, FUNC(k052109_device::word_r), FUNC(k052109_device::word_w)); map(0x204000, 0x207fff).ram(); /* main RAM */ - map(0x300000, 0x303fff).rw(this, FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); + map(0x300000, 0x303fff).rw(FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x50003f).rw(m_k054000, FUNC(k054000_device::lsb_r), FUNC(k054000_device::lsb_w)); - map(0x680000, 0x68001f).rw(this, FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); + map(0x680000, 0x68001f).rw(FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); map(0x700000, 0x700001).portr("P1"); map(0x700002, 0x700003).portr("P2"); - map(0x700004, 0x700005).r(this, FUNC(tmnt_state::blswhstl_coin_r)); + map(0x700004, 0x700005).r(FUNC(tmnt_state::blswhstl_coin_r)); map(0x700006, 0x700007).portr("EEPROM"); - map(0x700200, 0x700201).w(this, FUNC(tmnt_state::blswhstl_eeprom_w)); - map(0x700300, 0x700301).w(this, FUNC(tmnt_state::blswhstl_700300_w)); + map(0x700200, 0x700201).w(FUNC(tmnt_state::blswhstl_eeprom_w)); + map(0x700300, 0x700301).w(FUNC(tmnt_state::blswhstl_700300_w)); map(0x700400, 0x700401).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); map(0x780600, 0x780603).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); - map(0x780604, 0x780605).w(this, FUNC(tmnt_state::ssriders_soundkludge_w)); + map(0x780604, 0x780605).w(FUNC(tmnt_state::ssriders_soundkludge_w)); map(0x780700, 0x78071f).w(m_k053251, FUNC(k053251_device::lsb_w)); } @@ -626,10 +626,10 @@ void tmnt_state::glfgreat_main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x100000, 0x103fff).ram(); /* main RAM */ - map(0x104000, 0x107fff).rw(this, FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); + map(0x104000, 0x107fff).rw(FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); map(0x108000, 0x108fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x10c000, 0x10cfff).rw(m_k053936, FUNC(k053936_device::linectrl_r), FUNC(k053936_device::linectrl_w)); /* 053936? */ - map(0x110000, 0x11001f).w(this, FUNC(tmnt_state::k053244_word_noA1_w)); /* duplicate! */ + map(0x110000, 0x11001f).w(FUNC(tmnt_state::k053244_word_noA1_w)); /* duplicate! */ map(0x114000, 0x11401f).rw(m_k053245, FUNC(k05324x_device::k053244_lsb_r), FUNC(k05324x_device::k053244_lsb_w)); /* duplicate! */ map(0x118000, 0x11801f).w(m_k053936, FUNC(k053936_device::ctrl_w)); map(0x11c000, 0x11c01f).w(m_k053251, FUNC(k053251_device::msb_w)); @@ -637,22 +637,22 @@ void tmnt_state::glfgreat_main_map(address_map &map) map(0x120002, 0x120003).portr("P3/P4"); map(0x120004, 0x120005).portr("COINS/DSW3"); map(0x120006, 0x120007).portr("DSW1/DSW2"); - map(0x121000, 0x121001).r(this, FUNC(tmnt_state::glfgreat_ball_r)); /* returns the color of the center pixel of the roz layer */ - map(0x122000, 0x122001).w(this, FUNC(tmnt_state::glfgreat_122000_w)); + map(0x121000, 0x121001).r(FUNC(tmnt_state::glfgreat_ball_r)); /* returns the color of the center pixel of the roz layer */ + map(0x122000, 0x122001).w(FUNC(tmnt_state::glfgreat_122000_w)); map(0x124000, 0x124001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x125000, 0x125003).r(m_k053260, FUNC(k053260_device::main_read)).umask16(0xff00).w(this, FUNC(tmnt_state::glfgreat_sound_w)).umask16(0xff00); - map(0x200000, 0x207fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); - map(0x300000, 0x3fffff).r(this, FUNC(tmnt_state::glfgreat_rom_r)); + map(0x125000, 0x125003).r(m_k053260, FUNC(k053260_device::main_read)).umask16(0xff00).w(FUNC(tmnt_state::glfgreat_sound_w)).umask16(0xff00); + map(0x200000, 0x207fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); + map(0x300000, 0x3fffff).r(FUNC(tmnt_state::glfgreat_rom_r)); } void tmnt_state::prmrsocr_main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); /* main RAM */ - map(0x104000, 0x107fff).rw(this, FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); + map(0x104000, 0x107fff).rw(FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); map(0x108000, 0x108fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x10c000, 0x10cfff).rw(m_k053936, FUNC(k053936_device::linectrl_r), FUNC(k053936_device::linectrl_w)); - map(0x110000, 0x11001f).w(this, FUNC(tmnt_state::k053244_word_noA1_w)); /* duplicate! */ + map(0x110000, 0x11001f).w(FUNC(tmnt_state::k053244_word_noA1_w)); /* duplicate! */ map(0x114000, 0x11401f).rw(m_k053245, FUNC(k05324x_device::k053244_lsb_r), FUNC(k05324x_device::k053244_lsb_w)); /* duplicate! */ map(0x118000, 0x11801f).w(m_k053936, FUNC(k053936_device::ctrl_w)); map(0x11c000, 0x11c01f).w(m_k053251, FUNC(k053251_device::msb_w)); @@ -661,11 +661,11 @@ void tmnt_state::prmrsocr_main_map(address_map &map) map(0x12100d, 0x12100d).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x12100f, 0x12100f).w("soundlatch2", FUNC(generic_latch_8_device::write)); map(0x121015, 0x121015).r("soundlatch3", FUNC(generic_latch_8_device::read)); - map(0x122000, 0x122001).w(this, FUNC(tmnt_state::prmrsocr_eeprom_w)); /* EEPROM + video control */ - map(0x123000, 0x123001).w(this, FUNC(tmnt_state::prmrsocr_sound_irq_w)); - map(0x200000, 0x207fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); + map(0x122000, 0x122001).w(FUNC(tmnt_state::prmrsocr_eeprom_w)); /* EEPROM + video control */ + map(0x123000, 0x123001).w(FUNC(tmnt_state::prmrsocr_sound_irq_w)); + map(0x200000, 0x207fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); map(0x280000, 0x280001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x300000, 0x33ffff).r(this, FUNC(tmnt_state::prmrsocr_rom_r)); + map(0x300000, 0x33ffff).r(FUNC(tmnt_state::prmrsocr_rom_r)); } @@ -910,22 +910,22 @@ void tmnt_state::tmnt2_main_map(address_map &map) map(0x000000, 0x0fffff).rom().share("tmnt2_rom"); map(0x104000, 0x107fff).ram().share("sunset_104000"); /* main RAM */ map(0x140000, 0x140fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x180000, 0x183fff).ram().w(this, FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); // k053245_scattered_word_r + map(0x180000, 0x183fff).ram().w(FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); // k053245_scattered_word_r map(0x1c0000, 0x1c0001).portr("P1"); map(0x1c0002, 0x1c0003).portr("P2"); map(0x1c0004, 0x1c0005).portr("P3"); map(0x1c0006, 0x1c0007).portr("P4"); map(0x1c0100, 0x1c0101).portr("COINS"); - map(0x1c0102, 0x1c0103).r(this, FUNC(tmnt_state::ssriders_eeprom_r)); - map(0x1c0200, 0x1c0201).w(this, FUNC(tmnt_state::ssriders_eeprom_w)); /* EEPROM and gfx control */ - map(0x1c0300, 0x1c0301).w(this, FUNC(tmnt_state::ssriders_1c0300_w)); + map(0x1c0102, 0x1c0103).r(FUNC(tmnt_state::ssriders_eeprom_r)); + map(0x1c0200, 0x1c0201).w(FUNC(tmnt_state::ssriders_eeprom_w)); /* EEPROM and gfx control */ + map(0x1c0300, 0x1c0301).w(FUNC(tmnt_state::ssriders_1c0300_w)); map(0x1c0400, 0x1c0401).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); map(0x1c0500, 0x1c057f).ram(); /* TMNT2 only (1J) unknown, mostly MCU blit offsets */ // AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) /* protection device */ - map(0x1c0800, 0x1c081f).w(this, FUNC(tmnt_state::tmnt2_1c0800_w)).share("tmnt2_1c0800"); /* protection device */ - map(0x5a0000, 0x5a001f).rw(this, FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); + map(0x1c0800, 0x1c081f).w(FUNC(tmnt_state::tmnt2_1c0800_w)).share("tmnt2_1c0800"); /* protection device */ + map(0x5a0000, 0x5a001f).rw(FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); map(0x5c0600, 0x5c0603).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); - map(0x5c0604, 0x5c0605).w(this, FUNC(tmnt_state::ssriders_soundkludge_w)); + map(0x5c0604, 0x5c0605).w(FUNC(tmnt_state::ssriders_soundkludge_w)); map(0x5c0700, 0x5c071f).w(m_k053251, FUNC(k053251_device::lsb_w)); map(0x600000, 0x603fff).rw(m_k052109, FUNC(k052109_device::word_r), FUNC(k052109_device::word_w)); } @@ -935,22 +935,22 @@ void tmnt_state::ssriders_main_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x104000, 0x107fff).ram(); /* main RAM */ map(0x140000, 0x140fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x180000, 0x183fff).rw(this, FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); + map(0x180000, 0x183fff).rw(FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); map(0x1c0000, 0x1c0001).portr("P1"); map(0x1c0002, 0x1c0003).portr("P2"); map(0x1c0004, 0x1c0005).portr("P3"); map(0x1c0006, 0x1c0007).portr("P4"); map(0x1c0100, 0x1c0101).portr("COINS"); - map(0x1c0102, 0x1c0103).r(this, FUNC(tmnt_state::ssriders_eeprom_r)); - map(0x1c0200, 0x1c0201).w(this, FUNC(tmnt_state::ssriders_eeprom_w)); /* EEPROM and gfx control */ - map(0x1c0300, 0x1c0301).w(this, FUNC(tmnt_state::ssriders_1c0300_w)); + map(0x1c0102, 0x1c0103).r(FUNC(tmnt_state::ssriders_eeprom_r)); + map(0x1c0200, 0x1c0201).w(FUNC(tmnt_state::ssriders_eeprom_w)); /* EEPROM and gfx control */ + map(0x1c0300, 0x1c0301).w(FUNC(tmnt_state::ssriders_1c0300_w)); map(0x1c0400, 0x1c0401).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); map(0x1c0500, 0x1c057f).ram(); /* TMNT2 only (1J) unknown */ - map(0x1c0800, 0x1c0801).r(this, FUNC(tmnt_state::ssriders_protection_r)); - map(0x1c0800, 0x1c0803).w(this, FUNC(tmnt_state::ssriders_protection_w)); - map(0x5a0000, 0x5a001f).rw(this, FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); + map(0x1c0800, 0x1c0801).r(FUNC(tmnt_state::ssriders_protection_r)); + map(0x1c0800, 0x1c0803).w(FUNC(tmnt_state::ssriders_protection_w)); + map(0x5a0000, 0x5a001f).rw(FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); map(0x5c0600, 0x5c0603).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); - map(0x5c0604, 0x5c0605).w(this, FUNC(tmnt_state::ssriders_soundkludge_w)); + map(0x5c0604, 0x5c0605).w(FUNC(tmnt_state::ssriders_soundkludge_w)); map(0x5c0700, 0x5c071f).w(m_k053251, FUNC(k053251_device::lsb_w)); map(0x600000, 0x603fff).rw(m_k052109, FUNC(k052109_device::word_r), FUNC(k052109_device::word_w)); } @@ -961,11 +961,11 @@ void tmnt_state::sunsetbl_main_map(address_map &map) map(0x104000, 0x107fff).ram(); /* main RAM */ map(0x14c000, 0x14cfff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x14e700, 0x14e71f).w(m_k053251, FUNC(k053251_device::lsb_w)); - map(0x180000, 0x183fff).rw(this, FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); + map(0x180000, 0x183fff).rw(FUNC(tmnt_state::k053245_scattered_word_r), FUNC(tmnt_state::k053245_scattered_word_w)).share("spriteram"); map(0x184000, 0x18ffff).ram(); - map(0x1c0300, 0x1c0301).w(this, FUNC(tmnt_state::ssriders_1c0300_w)); + map(0x1c0300, 0x1c0301).w(FUNC(tmnt_state::ssriders_1c0300_w)); map(0x1c0400, 0x1c0401).nopw(); - map(0x5a0000, 0x5a001f).rw(this, FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); + map(0x5a0000, 0x5a001f).rw(FUNC(tmnt_state::k053244_word_noA1_r), FUNC(tmnt_state::k053244_word_noA1_w)); map(0x600000, 0x603fff).rw(m_k052109, FUNC(k052109_device::word_r), FUNC(k052109_device::word_w)); map(0x604020, 0x60402f).nopw(); /* written every frame */ map(0x604200, 0x604201).nopw(); /* watchdog */ @@ -974,9 +974,9 @@ void tmnt_state::sunsetbl_main_map(address_map &map) map(0xc00002, 0xc00003).portr("P2"); map(0xc00004, 0xc00005).portr("P3"); map(0xc00006, 0xc00007).portr("P4"); - map(0xc00200, 0xc00201).w(this, FUNC(tmnt_state::ssriders_eeprom_w)); /* EEPROM and gfx control */ + map(0xc00200, 0xc00201).w(FUNC(tmnt_state::ssriders_eeprom_w)); /* EEPROM and gfx control */ map(0xc00404, 0xc00405).portr("COINS"); - map(0xc00406, 0xc00407).r(this, FUNC(tmnt_state::sunsetbl_eeprom_r)); + map(0xc00406, 0xc00407).r(FUNC(tmnt_state::sunsetbl_eeprom_r)); map(0xc00601, 0xc00601).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x75d288, 0x75d289).nopr(); // read repeatedly in some test menus (PC=181f2) } @@ -990,11 +990,11 @@ void tmnt_state::thndrx2_main_map(address_map &map) map(0x300000, 0x30001f).w(m_k053251, FUNC(k053251_device::lsb_w)); map(0x400000, 0x400003).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); map(0x500000, 0x50003f).rw(m_k054000, FUNC(k054000_device::lsb_r), FUNC(k054000_device::lsb_w)); - map(0x500100, 0x500101).w(this, FUNC(tmnt_state::thndrx2_eeprom_w)); + map(0x500100, 0x500101).w(FUNC(tmnt_state::thndrx2_eeprom_w)); map(0x500200, 0x500201).portr("P1/COINS"); - map(0x500202, 0x500203).r(this, FUNC(tmnt_state::thndrx2_eeprom_r)); + map(0x500202, 0x500203).r(FUNC(tmnt_state::thndrx2_eeprom_r)); map(0x500300, 0x500301).nopw(); /* watchdog reset? irq enable? */ - map(0x600000, 0x607fff).rw(this, FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); + map(0x600000, 0x607fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); map(0x700000, 0x700007).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); map(0x700400, 0x7007ff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); } @@ -1014,13 +1014,13 @@ void tmnt_state::tmnt_audio_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).rw(this, FUNC(tmnt_state::tmnt_sres_r), FUNC(tmnt_state::tmnt_sres_w)); /* title music & UPD7759C reset */ + map(0x9000, 0x9000).rw(FUNC(tmnt_state::tmnt_sres_r), FUNC(tmnt_state::tmnt_sres_w)); /* title music & UPD7759C reset */ map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xd000, 0xd000).w(m_upd7759, FUNC(upd7759_device::port_w)); - map(0xe000, 0xe000).w(this, FUNC(tmnt_state::tmnt_upd_start_w)); - map(0xf000, 0xf000).r(this, FUNC(tmnt_state::tmnt_upd_busy_r)); + map(0xe000, 0xe000).w(FUNC(tmnt_state::tmnt_upd_start_w)); + map(0xf000, 0xf000).r(FUNC(tmnt_state::tmnt_upd_busy_r)); } @@ -1029,7 +1029,7 @@ void tmnt_state::punkshot_audio_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xfa00, 0xfa00).w(this, FUNC(tmnt_state::sound_arm_nmi_w)); + map(0xfa00, 0xfa00).w(FUNC(tmnt_state::sound_arm_nmi_w)); map(0xfc00, 0xfc2f).rw(m_k053260, FUNC(k053260_device::read), FUNC(k053260_device::write)); } @@ -1048,7 +1048,7 @@ void tmnt_state::glfgreat_audio_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf82f).rw(m_k053260, FUNC(k053260_device::read), FUNC(k053260_device::write)); - map(0xfa00, 0xfa00).w(this, FUNC(tmnt_state::sound_arm_nmi_w)); + map(0xfa00, 0xfa00).w(FUNC(tmnt_state::sound_arm_nmi_w)); } @@ -1058,7 +1058,7 @@ void tmnt_state::ssriders_audio_map(address_map &map) map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xfa00, 0xfa2f).rw(m_k053260, FUNC(k053260_device::read), FUNC(k053260_device::write)); - map(0xfc00, 0xfc00).w(this, FUNC(tmnt_state::sound_arm_nmi_w)); + map(0xfc00, 0xfc00).w(FUNC(tmnt_state::sound_arm_nmi_w)); } @@ -1067,7 +1067,7 @@ void tmnt_state::thndrx2_audio_map(address_map &map) map(0x0000, 0xefff).rom(); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf801).mirror(0x0010).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xfa00, 0xfa00).w(this, FUNC(tmnt_state::sound_arm_nmi_w)); + map(0xfa00, 0xfa00).w(FUNC(tmnt_state::sound_arm_nmi_w)); map(0xfc00, 0xfc2f).rw(m_k053260, FUNC(k053260_device::read), FUNC(k053260_device::write)); } @@ -1088,11 +1088,11 @@ void tmnt_state::prmrsocr_audio_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xdfff).ram(); map(0xe000, 0xe0ff).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)); - map(0xe100, 0xe12f).rw(this, FUNC(tmnt_state::k054539_ctrl_r), FUNC(tmnt_state::k054539_ctrl_w)); + map(0xe100, 0xe12f).rw(FUNC(tmnt_state::k054539_ctrl_r), FUNC(tmnt_state::k054539_ctrl_w)); map(0xf000, 0xf000).w("soundlatch3", FUNC(generic_latch_8_device::write)); map(0xf002, 0xf002).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xf003, 0xf003).r("soundlatch2", FUNC(generic_latch_8_device::read)); - map(0xf800, 0xf800).w(this, FUNC(tmnt_state::prmrsocr_audio_bankswitch_w)); + map(0xf800, 0xf800).w(FUNC(tmnt_state::prmrsocr_audio_bankswitch_w)); } diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp index bdae17e3420..a7e6e0f96c6 100644 --- a/src/mame/drivers/tmspoker.cpp +++ b/src/mame/drivers/tmspoker.cpp @@ -332,7 +332,7 @@ void tmspoker_state::tmspoker_map(address_map &map) map(0x0000, 0x0fff).bankr("bank1"); map(0x2800, 0x2800).nopr().w("crtc", FUNC(mc6845_device::address_w)); map(0x2801, 0x2801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x3000, 0x33ff).ram().w(this, FUNC(tmspoker_state::tmspoker_videoram_w)).share("videoram"); + map(0x3000, 0x33ff).ram().w(FUNC(tmspoker_state::tmspoker_videoram_w)).share("videoram"); map(0x3800, 0x3fff).ram(); //NVRAM? map(0x2000, 0x20ff).ram(); //color RAM? } @@ -346,7 +346,7 @@ READ8_MEMBER(tmspoker_state::unk_r) void tmspoker_state::tmspoker_cru_map(address_map &map) { - map(0x0000, 0x07ff).r(this, FUNC(tmspoker_state::unk_r)); + map(0x0000, 0x07ff).r(FUNC(tmspoker_state::unk_r)); } /* I/O byte R/W diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index 8ac6afbdc03..a3d1962ac35 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -730,7 +730,7 @@ void tnzs_base_state::main_map(address_map &map) map(0xf000, 0xf2ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r8), FUNC(seta001_device::spriteylow_w8)); map(0xf300, 0xf303).mirror(0xfc).w(m_seta001, FUNC(seta001_device::spritectrl_w8)); /* control registers (0x80 mirror used by Arkanoid 2) */ map(0xf400, 0xf400).w(m_seta001, FUNC(seta001_device::spritebgflag_w8)); /* enable / disable background transparency */ - map(0xf600, 0xf600).nopr().w(this, FUNC(tnzs_base_state::ramrom_bankswitch_w)); + map(0xf600, 0xf600).nopr().w(FUNC(tnzs_base_state::ramrom_bankswitch_w)); map(0xf800, 0xfbff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); } @@ -752,7 +752,7 @@ void tnzsb_state::tnzsb_main_map(address_map &map) map(0xf000, 0xf2ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r8), FUNC(seta001_device::spriteylow_w8)); map(0xf300, 0xf303).mirror(0xfc).w(m_seta001, FUNC(seta001_device::spritectrl_w8)); /* control registers (0x80 mirror used by Arkanoid 2) */ map(0xf400, 0xf400).w(m_seta001, FUNC(seta001_device::spritebgflag_w8)); /* enable / disable background transparency */ - map(0xf600, 0xf600).w(this, FUNC(tnzsb_state::ramrom_bankswitch_w)); + map(0xf600, 0xf600).w(FUNC(tnzsb_state::ramrom_bankswitch_w)); /* kabukiz still writes here but it's not used (it's paletteram in type1 map) */ map(0xf800, 0xfbff).nopw(); } @@ -761,7 +761,7 @@ void tnzs_base_state::base_sub_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("subbank"); - map(0xa000, 0xa000).w(this, FUNC(tnzs_base_state::bankswitch1_w)); + map(0xa000, 0xa000).w(FUNC(tnzs_base_state::bankswitch1_w)); map(0xb000, 0xb001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xd000, 0xdfff).ram(); map(0xe000, 0xefff).ram().share("share1"); @@ -770,9 +770,9 @@ void tnzs_base_state::base_sub_map(address_map &map) void tnzs_mcu_state::tnzs_sub_map(address_map &map) { base_sub_map(map); - map(0xc000, 0xc001).rw(this, FUNC(tnzs_mcu_state::mcu_r), FUNC(tnzs_mcu_state::mcu_w)); /* not present in insectx */ - map(0xa000, 0xa000).w(this, FUNC(tnzs_mcu_state::bankswitch1_w)); - map(0xf000, 0xf003).r(this, FUNC(tnzs_mcu_state::analog_r)); /* paddles in arkanoid2/plumppop. The ports are */ + map(0xc000, 0xc001).rw(FUNC(tnzs_mcu_state::mcu_r), FUNC(tnzs_mcu_state::mcu_w)); /* not present in insectx */ + map(0xa000, 0xa000).w(FUNC(tnzs_mcu_state::bankswitch1_w)); + map(0xf000, 0xf003).r(FUNC(tnzs_mcu_state::analog_r)); /* paddles in arkanoid2/plumppop. The ports are */ /* read but not used by the other games, and are not read at */ /* all by insectx. */ } @@ -780,7 +780,7 @@ void tnzs_mcu_state::tnzs_sub_map(address_map &map) void arknoid2_state::arknoid2_sub_map(address_map &map) { tnzs_sub_map(map); - map(0xc000, 0xc001).rw(this, FUNC(arknoid2_state::mcu_r), FUNC(arknoid2_state::mcu_w)); + map(0xc000, 0xc001).rw(FUNC(arknoid2_state::mcu_r), FUNC(arknoid2_state::mcu_w)); } void kageki_state::kageki_sub_map(address_map &map) @@ -805,10 +805,10 @@ void tnzsb_state::tnzsb_base_sub_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("subbank"); - map(0xa000, 0xa000).w(this, FUNC(tnzsb_state::bankswitch1_w)); + map(0xa000, 0xa000).w(FUNC(tnzsb_state::bankswitch1_w)); map(0xb002, 0xb002).portr("DSWA"); map(0xb003, 0xb003).portr("DSWB"); - map(0xb004, 0xb004).w(this, FUNC(tnzsb_state::sound_command_w)); + map(0xb004, 0xb004).w(FUNC(tnzsb_state::sound_command_w)); map(0xc000, 0xc000).portr("IN0"); map(0xc001, 0xc001).portr("IN1"); map(0xc002, 0xc002).portr("IN2"); @@ -858,7 +858,7 @@ void jpopnics_state::jpopnics_main_map(address_map &map) map(0xf000, 0xf2ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r8), FUNC(seta001_device::spriteylow_w8)); map(0xf300, 0xf303).mirror(0xfc).w(m_seta001, FUNC(seta001_device::spritectrl_w8)); /* control registers (0x80 mirror used by Arkanoid 2) */ map(0xf400, 0xf400).w(m_seta001, FUNC(seta001_device::spritebgflag_w8)); /* enable / disable background transparency */ - map(0xf600, 0xf600).nopr().w(this, FUNC(jpopnics_state::ramrom_bankswitch_w)); + map(0xf600, 0xf600).nopr().w(FUNC(jpopnics_state::ramrom_bankswitch_w)); map(0xf800, 0xffff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); } @@ -867,7 +867,7 @@ void jpopnics_state::jpopnics_sub_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).bankr("subbank"); - map(0xa000, 0xa000).w(this, FUNC(jpopnics_state::subbankswitch_w)); + map(0xa000, 0xa000).w(FUNC(jpopnics_state::subbankswitch_w)); map(0xb000, 0xb001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xc000, 0xc000).portr("IN1"); map(0xc001, 0xc001).portr("IN2"); @@ -1707,7 +1707,7 @@ MACHINE_CONFIG_START(kabukiz_state::kabukiz) /* sound hardware */ MCFG_DEVICE_MODIFY("ymsnd") MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, kabukiz_state, sound_bank_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index 26c29eb323e..bd70faecd6b 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -624,43 +624,43 @@ void toaplan1_rallybik_state::rallybik_main_map(address_map &map) map(0x040000, 0x07ffff).rom(); map(0x080000, 0x083fff).ram(); map(0x0c0000, 0x0c0fff).ram().share("spriteram"); - map(0x100000, 0x100001).w(this, FUNC(toaplan1_rallybik_state::toaplan1_bcu_flipscreen_w)); - map(0x100002, 0x100003).rw(this, FUNC(toaplan1_rallybik_state::toaplan1_tileram_offs_r), FUNC(toaplan1_rallybik_state::toaplan1_tileram_offs_w)); - map(0x100004, 0x100007).rw(this, FUNC(toaplan1_rallybik_state::rallybik_tileram16_r), FUNC(toaplan1_rallybik_state::toaplan1_tileram16_w)); - map(0x100010, 0x10001f).rw(this, FUNC(toaplan1_rallybik_state::toaplan1_scroll_regs_r), FUNC(toaplan1_rallybik_state::toaplan1_scroll_regs_w)); + map(0x100000, 0x100001).w(FUNC(toaplan1_rallybik_state::toaplan1_bcu_flipscreen_w)); + map(0x100002, 0x100003).rw(FUNC(toaplan1_rallybik_state::toaplan1_tileram_offs_r), FUNC(toaplan1_rallybik_state::toaplan1_tileram_offs_w)); + map(0x100004, 0x100007).rw(FUNC(toaplan1_rallybik_state::rallybik_tileram16_r), FUNC(toaplan1_rallybik_state::toaplan1_tileram16_w)); + map(0x100010, 0x10001f).rw(FUNC(toaplan1_rallybik_state::toaplan1_scroll_regs_r), FUNC(toaplan1_rallybik_state::toaplan1_scroll_regs_w)); map(0x140000, 0x140001).portr("VBLANK"); // AM_RANGE(0x140000, 0x140001) AM_WRITE(?? video frame related ??) - map(0x140002, 0x140003).w(this, FUNC(toaplan1_rallybik_state::toaplan1_intenable_w)); - map(0x140008, 0x14000f).w(this, FUNC(toaplan1_rallybik_state::toaplan1_bcu_control_w)); - map(0x144000, 0x1447ff).ram().w(this, FUNC(toaplan1_rallybik_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x146000, 0x1467ff).ram().w(this, FUNC(toaplan1_rallybik_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x180000, 0x180fff).rw(this, FUNC(toaplan1_rallybik_state::toaplan1_shared_r), FUNC(toaplan1_rallybik_state::toaplan1_shared_w)); - map(0x1c0000, 0x1c0003).w(this, FUNC(toaplan1_rallybik_state::toaplan1_tile_offsets_w)); - map(0x1c8000, 0x1c8001).w(this, FUNC(toaplan1_rallybik_state::toaplan1_reset_sound_w)); + map(0x140002, 0x140003).w(FUNC(toaplan1_rallybik_state::toaplan1_intenable_w)); + map(0x140008, 0x14000f).w(FUNC(toaplan1_rallybik_state::toaplan1_bcu_control_w)); + map(0x144000, 0x1447ff).ram().w(FUNC(toaplan1_rallybik_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x146000, 0x1467ff).ram().w(FUNC(toaplan1_rallybik_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x180000, 0x180fff).rw(FUNC(toaplan1_rallybik_state::toaplan1_shared_r), FUNC(toaplan1_rallybik_state::toaplan1_shared_w)); + map(0x1c0000, 0x1c0003).w(FUNC(toaplan1_rallybik_state::toaplan1_tile_offsets_w)); + map(0x1c8000, 0x1c8001).w(FUNC(toaplan1_rallybik_state::toaplan1_reset_sound_w)); } void toaplan1_state::truxton_main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x080000, 0x083fff).ram(); - map(0x0c0000, 0x0c0001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); - map(0x0c0002, 0x0c0003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0x0c0004, 0x0c0005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0x0c0006, 0x0c0007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); - map(0x100000, 0x100001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x100002, 0x100003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x100004, 0x100007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x100010, 0x10001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0x0c0000, 0x0c0001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0x0c0002, 0x0c0003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0x0c0004, 0x0c0005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0x0c0006, 0x0c0007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x100000, 0x100001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x100002, 0x100003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x100004, 0x100007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x100010, 0x10001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); map(0x140000, 0x140001).portr("VBLANK"); // AM_RANGE(0x140000, 0x140001) AM_WRITE(?? video frame related ??) - map(0x140002, 0x140003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x140008, 0x14000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x144000, 0x1447ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x146000, 0x1467ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x180000, 0x180fff).rw(this, FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); - map(0x1c0000, 0x1c0003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0x1c0006, 0x1c0007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); - map(0x1d0000, 0x1d0001).w(this, FUNC(toaplan1_state::toaplan1_reset_sound_w)); + map(0x140002, 0x140003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x140008, 0x14000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x144000, 0x1447ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x146000, 0x1467ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x180000, 0x180fff).rw(FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); + map(0x1c0000, 0x1c0003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0x1c0006, 0x1c0007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0x1d0000, 0x1d0001).w(FUNC(toaplan1_state::toaplan1_reset_sound_w)); } void toaplan1_state::hellfire_main_map(address_map &map) @@ -669,22 +669,22 @@ void toaplan1_state::hellfire_main_map(address_map &map) map(0x040000, 0x047fff).ram(); map(0x080000, 0x080001).portr("VBLANK"); // AM_RANGE(0x080000, 0x080001) AM_WRITE(?? video frame related ??) - map(0x080002, 0x080003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x080008, 0x08000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x084000, 0x0847ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x086000, 0x0867ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x0c0000, 0x0c0fff).rw(this, FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); - map(0x100000, 0x100001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x100002, 0x100003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x100004, 0x100007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x100010, 0x10001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); - map(0x140000, 0x140001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); - map(0x140002, 0x140003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0x140004, 0x140005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0x140006, 0x140007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); - map(0x180000, 0x180003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0x180006, 0x180007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); - map(0x180008, 0x180009).w(this, FUNC(toaplan1_state::toaplan1_reset_sound_w)); + map(0x080002, 0x080003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x080008, 0x08000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x084000, 0x0847ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x086000, 0x0867ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x0c0000, 0x0c0fff).rw(FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); + map(0x100000, 0x100001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x100002, 0x100003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x100004, 0x100007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x100010, 0x10001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0x140000, 0x140001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0x140002, 0x140003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0x140004, 0x140005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0x140006, 0x140007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x180000, 0x180003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0x180006, 0x180007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0x180008, 0x180009).w(FUNC(toaplan1_state::toaplan1_reset_sound_w)); } void toaplan1_state::zerowing_main_map(address_map &map) @@ -692,23 +692,23 @@ void toaplan1_state::zerowing_main_map(address_map &map) map(0x000000, 0x00ffff).rom(); map(0x040000, 0x07ffff).rom(); map(0x080000, 0x087fff).ram(); - map(0x0c0000, 0x0c0003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0x0c0006, 0x0c0007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0x0c0000, 0x0c0003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0x0c0006, 0x0c0007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); map(0x400000, 0x400001).portr("VBLANK"); // AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??) - map(0x400002, 0x400003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x400008, 0x40000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x440000, 0x440fff).rw(this, FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); - map(0x480000, 0x480001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x480002, 0x480003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x480004, 0x480007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x480010, 0x48001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); - map(0x4c0000, 0x4c0001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); - map(0x4c0002, 0x4c0003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0x4c0004, 0x4c0005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0x4c0006, 0x4c0007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x400002, 0x400003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x400008, 0x40000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x440000, 0x440fff).rw(FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); + map(0x480000, 0x480001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x480002, 0x480003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x480004, 0x480007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x480010, 0x48001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0x4c0000, 0x4c0001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0x4c0002, 0x4c0003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0x4c0004, 0x4c0005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0x4c0006, 0x4c0007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); } void toaplan1_state::demonwld_main_map(address_map &map) @@ -716,79 +716,79 @@ void toaplan1_state::demonwld_main_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x400000, 0x400001).portr("VBLANK"); // AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??) - map(0x400002, 0x400003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x400008, 0x40000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x600000, 0x600fff).rw(this, FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); - map(0x800000, 0x800001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x800002, 0x800003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x800004, 0x800007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x800010, 0x80001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); - map(0xa00000, 0xa00001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); - map(0xa00002, 0xa00003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0xa00004, 0xa00005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0xa00006, 0xa00007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x400002, 0x400003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x400008, 0x40000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x600000, 0x600fff).rw(FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); + map(0x800000, 0x800001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x800002, 0x800003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x800004, 0x800007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x800010, 0x80001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0xa00000, 0xa00001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0xa00002, 0xa00003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0xa00004, 0xa00005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0xa00006, 0xa00007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); map(0xc00000, 0xc03fff).ram(); - map(0xe00000, 0xe00003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0xe00006, 0xe00007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); - map(0xe00008, 0xe00009).w(this, FUNC(toaplan1_state::toaplan1_reset_sound_w)); - map(0xe0000a, 0xe0000b).w(this, FUNC(toaplan1_state::demonwld_dsp_ctrl_w)); /* DSP Comms control */ + map(0xe00000, 0xe00003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0xe00006, 0xe00007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0xe00008, 0xe00009).w(FUNC(toaplan1_state::toaplan1_reset_sound_w)); + map(0xe0000a, 0xe0000b).w(FUNC(toaplan1_state::demonwld_dsp_ctrl_w)); /* DSP Comms control */ } void toaplan1_state::samesame_main_map(address_map &map) { map(0x000000, 0x00ffff).rom(); map(0x040000, 0x07ffff).rom(); - map(0x080000, 0x080003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0x080006, 0x080007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0x080000, 0x080003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0x080006, 0x080007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); map(0x0c0000, 0x0c3fff).ram(); /* Frame done at $c1ada */ map(0x100000, 0x100001).portr("VBLANK"); // AM_RANGE(0x100000, 0x100001) AM_WRITE(?? video frame related ??) - map(0x100002, 0x100003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x100008, 0x10000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x104000, 0x1047ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x106000, 0x1067ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x100002, 0x100003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x100008, 0x10000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x104000, 0x1047ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x106000, 0x1067ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); map(0x140000, 0x140001).portr("P1"); map(0x140002, 0x140003).portr("P2"); map(0x140004, 0x140005).portr("DSWA"); map(0x140006, 0x140007).portr("DSWB"); map(0x140008, 0x140009).portr("SYSTEM"); - map(0x14000a, 0x14000b).r(this, FUNC(toaplan1_state::samesame_port_6_word_r)); /* Territory, and MCU ready */ - map(0x14000c, 0x14000d).w(this, FUNC(toaplan1_state::samesame_coin_w)); /* Coin counter/lockout */ - map(0x14000e, 0x14000f).w(this, FUNC(toaplan1_state::samesame_mcu_w)); /* Commands sent to HD647180 */ - map(0x180000, 0x180001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x180002, 0x180003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x180004, 0x180007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x180010, 0x18001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); - map(0x1c0000, 0x1c0001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0x14000a, 0x14000b).r(FUNC(toaplan1_state::samesame_port_6_word_r)); /* Territory, and MCU ready */ + map(0x14000c, 0x14000d).w(FUNC(toaplan1_state::samesame_coin_w)); /* Coin counter/lockout */ + map(0x14000e, 0x14000f).w(FUNC(toaplan1_state::samesame_mcu_w)); /* Commands sent to HD647180 */ + map(0x180000, 0x180001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x180002, 0x180003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x180004, 0x180007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x180010, 0x18001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0x1c0000, 0x1c0001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); // AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(?? disable sprite refresh ??) - map(0x1c0002, 0x1c0003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0x1c0004, 0x1c0005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0x1c0006, 0x1c0007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x1c0002, 0x1c0003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0x1c0004, 0x1c0005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0x1c0006, 0x1c0007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); } void toaplan1_state::outzone_main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); - map(0x100002, 0x100003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0x100004, 0x100005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0x100006, 0x100007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); - map(0x140000, 0x140fff).rw(this, FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); - map(0x200000, 0x200001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x200002, 0x200003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x200004, 0x200007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x200010, 0x20001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0x100000, 0x100001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0x100002, 0x100003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0x100004, 0x100005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0x100006, 0x100007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x140000, 0x140fff).rw(FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); + map(0x200000, 0x200001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x200002, 0x200003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x200004, 0x200007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x200010, 0x20001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); map(0x240000, 0x243fff).ram(); map(0x300000, 0x300001).portr("VBLANK"); // AM_RANGE(0x300000, 0x300001) AM_WRITE(?? video frame related ??) - map(0x300002, 0x300003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x300008, 0x30000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x304000, 0x3047ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x306000, 0x3067ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x340000, 0x340003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0x340006, 0x340007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0x300002, 0x300003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x300008, 0x30000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x304000, 0x3047ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x306000, 0x3067ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x340000, 0x340003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0x340006, 0x340007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); } void toaplan1_state::outzonecv_main_map(address_map &map) @@ -796,46 +796,46 @@ void toaplan1_state::outzonecv_main_map(address_map &map) map(0x000000, 0x03ffff).rom(); // AM_RANGE(0x040000, 0x07ffff) AM_ROM map(0x080000, 0x087fff).ram(); - map(0x0c0000, 0x0c0003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0x0c0006, 0x0c0007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0x0c0000, 0x0c0003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0x0c0006, 0x0c0007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); map(0x400000, 0x400001).portr("VBLANK"); // AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??) - map(0x400002, 0x400003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x400008, 0x40000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x440000, 0x440fff).rw(this, FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); - map(0x480000, 0x480001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x480002, 0x480003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x480004, 0x480007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x480010, 0x48001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); - map(0x4c0000, 0x4c0001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); - map(0x4c0002, 0x4c0003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0x4c0004, 0x4c0005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0x4c0006, 0x4c0007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x400002, 0x400003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x400008, 0x40000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x440000, 0x440fff).rw(FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); + map(0x480000, 0x480001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x480002, 0x480003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x480004, 0x480007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x480010, 0x48001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0x4c0000, 0x4c0001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0x4c0002, 0x4c0003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0x4c0004, 0x4c0005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0x4c0006, 0x4c0007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); } void toaplan1_state::vimana_main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x080000, 0x080003).w(this, FUNC(toaplan1_state::toaplan1_tile_offsets_w)); - map(0x080006, 0x080007).w(this, FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); - map(0x0c0000, 0x0c0001).r(this, FUNC(toaplan1_state::toaplan1_frame_done_r)); - map(0x0c0002, 0x0c0003).rw(this, FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); - map(0x0c0004, 0x0c0005).rw(this, FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); - map(0x0c0006, 0x0c0007).rw(this, FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); + map(0x080000, 0x080003).w(FUNC(toaplan1_state::toaplan1_tile_offsets_w)); + map(0x080006, 0x080007).w(FUNC(toaplan1_state::toaplan1_fcu_flipscreen_w)); + map(0x0c0000, 0x0c0001).r(FUNC(toaplan1_state::toaplan1_frame_done_r)); + map(0x0c0002, 0x0c0003).rw(FUNC(toaplan1_state::toaplan1_spriteram_offs_r), FUNC(toaplan1_state::toaplan1_spriteram_offs_w)); + map(0x0c0004, 0x0c0005).rw(FUNC(toaplan1_state::toaplan1_spriteram16_r), FUNC(toaplan1_state::toaplan1_spriteram16_w)); + map(0x0c0006, 0x0c0007).rw(FUNC(toaplan1_state::toaplan1_spritesizeram16_r), FUNC(toaplan1_state::toaplan1_spritesizeram16_w)); map(0x400000, 0x400001).portr("VBLANK"); // AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??) - map(0x400002, 0x400003).w(this, FUNC(toaplan1_state::toaplan1_intenable_w)); - map(0x400008, 0x40000f).w(this, FUNC(toaplan1_state::toaplan1_bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(this, FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(this, FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); - map(0x440000, 0x4407ff).rw(this, FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); /* inputs, coins and sound handled by 647180 MCU via this space */ + map(0x400002, 0x400003).w(FUNC(toaplan1_state::toaplan1_intenable_w)); + map(0x400008, 0x40000f).w(FUNC(toaplan1_state::toaplan1_bcu_control_w)); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::toaplan1_bgpalette_w)).share("bgpalette"); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::toaplan1_fgpalette_w)).share("fgpalette"); + map(0x440000, 0x4407ff).rw(FUNC(toaplan1_state::toaplan1_shared_r), FUNC(toaplan1_state::toaplan1_shared_w)); /* inputs, coins and sound handled by 647180 MCU via this space */ map(0x480000, 0x487fff).ram(); - map(0x4c0000, 0x4c0001).w(this, FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); - map(0x4c0002, 0x4c0003).rw(this, FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); - map(0x4c0004, 0x4c0007).rw(this, FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); - map(0x4c0010, 0x4c001f).rw(this, FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); + map(0x4c0000, 0x4c0001).w(FUNC(toaplan1_state::toaplan1_bcu_flipscreen_w)); + map(0x4c0002, 0x4c0003).rw(FUNC(toaplan1_state::toaplan1_tileram_offs_r), FUNC(toaplan1_state::toaplan1_tileram_offs_w)); + map(0x4c0004, 0x4c0007).rw(FUNC(toaplan1_state::toaplan1_tileram16_r), FUNC(toaplan1_state::toaplan1_tileram16_w)); + map(0x4c0010, 0x4c001f).rw(FUNC(toaplan1_state::toaplan1_scroll_regs_r), FUNC(toaplan1_state::toaplan1_scroll_regs_w)); } @@ -865,7 +865,7 @@ void toaplan1_state::truxton_sound_io_map(address_map &map) map(0x00, 0x00).portr("P1"); map(0x10, 0x10).portr("P2"); map(0x20, 0x20).portr("SYSTEM"); - map(0x30, 0x30).w(this, FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ + map(0x30, 0x30).w(FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ map(0x40, 0x40).portr("DSWA"); map(0x50, 0x50).portr("DSWB"); map(0x60, 0x61).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); @@ -878,7 +878,7 @@ void toaplan1_state::hellfire_sound_io_map(address_map &map) map(0x00, 0x00).portr("DSWA"); map(0x10, 0x10).portr("DSWB"); map(0x20, 0x20).portr("TJUMP"); - map(0x30, 0x30).w(this, FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ + map(0x30, 0x30).w(FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ map(0x40, 0x40).portr("P1"); map(0x50, 0x50).portr("P2"); map(0x60, 0x60).portr("SYSTEM"); @@ -894,7 +894,7 @@ void toaplan1_state::zerowing_sound_io_map(address_map &map) map(0x28, 0x28).portr("DSWB"); map(0x80, 0x80).portr("SYSTEM"); map(0x88, 0x88).portr("TJUMP"); - map(0xa0, 0xa0).w(this, FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ + map(0xa0, 0xa0).w(FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ map(0xa8, 0xa9).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); } @@ -903,7 +903,7 @@ void toaplan1_state::demonwld_sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x20, 0x20).portr("TJUMP"); - map(0x40, 0x40).w(this, FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ + map(0x40, 0x40).w(FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ map(0x60, 0x60).portr("SYSTEM"); map(0x80, 0x80).portr("P1"); map(0xa0, 0xa0).portr("DSWB"); @@ -915,7 +915,7 @@ void toaplan1_state::outzone_sound_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x01).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); - map(0x04, 0x04).w(this, FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ + map(0x04, 0x04).w(FUNC(toaplan1_state::toaplan1_coin_w)); /* Coin counter/lockout */ map(0x08, 0x08).portr("DSWA"); map(0x0c, 0x0c).portr("DSWB"); map(0x10, 0x10).portr("SYSTEM"); @@ -936,9 +936,9 @@ void toaplan1_state::DSP_program_map(address_map &map) void toaplan1_state::DSP_io_map(address_map &map) { - map(0, 0).w(this, FUNC(toaplan1_state::demonwld_dsp_addrsel_w)); - map(1, 1).rw(this, FUNC(toaplan1_state::demonwld_dsp_r), FUNC(toaplan1_state::demonwld_dsp_w)); - map(3, 3).w(this, FUNC(toaplan1_state::demonwld_dsp_bio_w)); + map(0, 0).w(FUNC(toaplan1_state::demonwld_dsp_addrsel_w)); + map(1, 1).rw(FUNC(toaplan1_state::demonwld_dsp_r), FUNC(toaplan1_state::demonwld_dsp_w)); + map(3, 3).w(FUNC(toaplan1_state::demonwld_dsp_bio_w)); } @@ -960,13 +960,13 @@ void toaplan1_state::vimana_hd647180_io_map(address_map &map) map(0x33, 0x33).nopw(); // IL (int vector low) register map(0x36, 0x36).nopw(); // refresh control register for RFSH pin // 53: disable reg for port A - map(0x60, 0x60).r(this, FUNC(toaplan1_state::vimana_dswb_invert_r)); // read/write port A; note these inputs seem to be inverted, unlike the DSWA ones. + map(0x60, 0x60).r(FUNC(toaplan1_state::vimana_dswb_invert_r)); // read/write port A; note these inputs seem to be inverted, unlike the DSWA ones. // 61: read/write port B // 62: read/write port C // 63: read/write port D // 64: read/write port E // 65: read/write port F - map(0x66, 0x66).r(this, FUNC(toaplan1_state::vimana_tjump_invert_r)); // read/write port G, bits 7 and 6 ALWAYS read as 1 due to port G being just 6 bits; note these inputs seem to be inverted, unlike the DSWA ones. + map(0x66, 0x66).r(FUNC(toaplan1_state::vimana_tjump_invert_r)); // read/write port G, bits 7 and 6 ALWAYS read as 1 due to port G being just 6 bits; note these inputs seem to be inverted, unlike the DSWA ones. // 70: ddr for port A map(0x71, 0x71).nopw(); // ddr for port B map(0x72, 0x72).nopw(); // ddr for port C @@ -977,7 +977,7 @@ void toaplan1_state::vimana_hd647180_io_map(address_map &map) map(0x81, 0x81).portr("P2"); map(0x82, 0x82).portr("DSWA"); map(0x83, 0x83).portr("SYSTEM"); - map(0x84, 0x84).w(this, FUNC(toaplan1_state::toaplan1_coin_w)); // Coin counter/lockout // needs verify + map(0x84, 0x84).w(FUNC(toaplan1_state::toaplan1_coin_w)); // Coin counter/lockout // needs verify map(0x87, 0x87).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); map(0x8f, 0x8f).rw("ymsnd", FUNC(ym3812_device::read_port_r), FUNC(ym3812_device::write_port_w)); } @@ -1025,9 +1025,9 @@ void toaplan1_state::samesame_hd647180_io_map(address_map &map) { map.global_mask(0xff); - map(0x63, 0x63).r(this, FUNC(toaplan1_state::samesame_cmdavailable_r)); - map(0xa0, 0xa0).r(this, FUNC(toaplan1_state::samesame_soundlatch_r)); - map(0xb0, 0xb0).w(this, FUNC(toaplan1_state::samesame_sound_done_w)); + map(0x63, 0x63).r(FUNC(toaplan1_state::samesame_cmdavailable_r)); + map(0xa0, 0xa0).r(FUNC(toaplan1_state::samesame_soundlatch_r)); + map(0xb0, 0xb0).w(FUNC(toaplan1_state::samesame_sound_done_w)); map(0x80, 0x80).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); map(0x81, 0x81).rw("ymsnd", FUNC(ym3812_device::read_port_r), FUNC(ym3812_device::write_port_w)); diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index a432f35b88a..dcd658edd85 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -851,7 +851,7 @@ void toaplan2_state::tekipaki_68k_mem(address_map &map) map(0x180010, 0x180011).portr("DSWB"); map(0x180020, 0x180021).portr("SYS"); map(0x180030, 0x180031).portr("JMPR"); // CPU 2 busy and Region Jumper block - map(0x180040, 0x180041).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x180040, 0x180041).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x180050, 0x180051).portr("IN1"); map(0x180060, 0x180061).portr("IN2"); map(0x180071, 0x180071).w(m_soundlatch, FUNC(generic_latch_8_device::write)); @@ -862,13 +862,13 @@ void toaplan2_state::tekipaki_68k_mem(address_map &map) void toaplan2_state::ghox_68k_mem(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x040000, 0x040001).r(this, FUNC(toaplan2_state::ghox_p2_h_analog_r)); + map(0x040000, 0x040001).r(FUNC(toaplan2_state::ghox_p2_h_analog_r)); map(0x080000, 0x083fff).ram(); map(0x0c0000, 0x0c0fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x100000, 0x100001).r(this, FUNC(toaplan2_state::ghox_p1_h_analog_r)); + map(0x100000, 0x100001).r(FUNC(toaplan2_state::ghox_p1_h_analog_r)); map(0x140000, 0x14000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); - map(0x180000, 0x180fff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); - map(0x181000, 0x181001).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x180000, 0x180fff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x181000, 0x181001).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x18100c, 0x18100d).portr("JMPR"); } @@ -880,12 +880,12 @@ void toaplan2_state::dogyuun_68k_mem(address_map &map) map(0x200010, 0x200011).portr("IN1"); map(0x200014, 0x200015).portr("IN2"); map(0x200018, 0x200019).portr("SYS"); - map(0x20001c, 0x20001d).w(this, FUNC(toaplan2_state::toaplan2_v25_coin_word_w)); // Coin count/lock + v25 reset line - map(0x210000, 0x21ffff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x20001c, 0x20001d).w(FUNC(toaplan2_state::toaplan2_v25_coin_word_w)); // Coin count/lock + v25 reset line + map(0x210000, 0x21ffff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x50000d).rw(m_vdp[1], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); // test bit 8 + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); // test bit 8 } @@ -893,14 +893,14 @@ void toaplan2_state::kbash_68k_mem(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); - map(0x200000, 0x200fff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x200000, 0x200fff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); map(0x208010, 0x208011).portr("IN1"); map(0x208014, 0x208015).portr("IN2"); map(0x208018, 0x208019).portr("SYS"); - map(0x20801c, 0x20801d).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x20801c, 0x20801d).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); // test bit 8 + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); // test bit 8 } @@ -919,8 +919,8 @@ void toaplan2_state::kbash2_68k_mem(address_map &map) map(0x200018, 0x200019).portr("SYS"); map(0x200021, 0x200021).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x200025, 0x200025).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x200029, 0x200029).w(this, FUNC(toaplan2_state::oki_bankswitch_w<0>)); - map(0x20002c, 0x20002d).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x200029, 0x200029).w(FUNC(toaplan2_state::oki_bankswitch_w<0>)); + map(0x20002c, 0x20002d).r(FUNC(toaplan2_state::video_count_r)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); } @@ -932,12 +932,12 @@ void toaplan2_state::truxton2_68k_mem(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x200000, 0x20000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x300000, 0x300fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x400000, 0x401fff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); + map(0x400000, 0x401fff).ram().w(FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); map(0x402000, 0x402fff).ram().share("tx_lineselect"); - map(0x403000, 0x4031ff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); + map(0x403000, 0x4031ff).ram().w(FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); map(0x403200, 0x403fff).ram(); - map(0x500000, 0x50ffff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_gfxram16_w)).share("tx_gfxram16"); - map(0x600000, 0x600001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x500000, 0x50ffff).ram().w(FUNC(toaplan2_state::toaplan2_tx_gfxram16_w)).share("tx_gfxram16"); + map(0x600000, 0x600001).r(FUNC(toaplan2_state::video_count_r)); map(0x700000, 0x700001).portr("DSWA"); map(0x700002, 0x700003).portr("DSWB"); map(0x700004, 0x700005).portr("JMPR"); @@ -946,7 +946,7 @@ void toaplan2_state::truxton2_68k_mem(address_map &map) map(0x70000a, 0x70000b).portr("SYS"); map(0x700011, 0x700011).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x700014, 0x700017).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); - map(0x70001e, 0x70001f).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x70001e, 0x70001f).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); } @@ -956,8 +956,8 @@ void toaplan2_state::pipibibs_68k_mem(address_map &map) map(0x080000, 0x082fff).ram(); map(0x0c0000, 0x0c0fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x140000, 0x14000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); - map(0x190000, 0x190fff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); - map(0x19c01c, 0x19c01d).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x190000, 0x190fff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x19c01c, 0x19c01d).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x19c020, 0x19c021).portr("DSWA"); map(0x19c024, 0x19c025).portr("DSWB"); map(0x19c028, 0x19c029).portr("JMPR"); @@ -978,9 +978,9 @@ void toaplan2_state::pipibibi_bootleg_68k_mem(address_map &map) // AM_RANGE(0x13f000, 0x13f001) AM_WRITENOP // ??? map(0x180000, 0x182fff).rw(m_vdp[0], FUNC(gp9001vdp_device::pipibibi_bootleg_videoram16_r), FUNC(gp9001vdp_device::pipibibi_bootleg_videoram16_w)); // TileRAM map(0x188000, 0x18800f).w(m_vdp[0], FUNC(gp9001vdp_device::pipibibi_bootleg_scroll_w)); - map(0x190002, 0x190003).r(this, FUNC(toaplan2_state::shared_ram_r)); // Z80 ready ? - map(0x190010, 0x190011).w(this, FUNC(toaplan2_state::shared_ram_w)); // Z80 task to perform - map(0x19c01c, 0x19c01d).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x190002, 0x190003).r(FUNC(toaplan2_state::shared_ram_r)); // Z80 ready ? + map(0x190010, 0x190011).w(FUNC(toaplan2_state::shared_ram_w)); // Z80 task to perform + map(0x19c01c, 0x19c01d).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x19c020, 0x19c021).portr("DSWA"); map(0x19c024, 0x19c025).portr("DSWB"); map(0x19c028, 0x19c029).portr("JMPR"); @@ -998,16 +998,16 @@ void toaplan2_state::fixeight_68k_mem(address_map &map) map(0x200004, 0x200005).portr("IN2"); map(0x200008, 0x200009).portr("IN3"); map(0x200010, 0x200011).portr("SYS"); - map(0x20001c, 0x20001d).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); - map(0x280000, 0x28ffff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x20001c, 0x20001d).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x280000, 0x28ffff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x500000, 0x501fff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); + map(0x500000, 0x501fff).ram().w(FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); map(0x502000, 0x5021ff).ram().share("tx_lineselect"); - map(0x503000, 0x5031ff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); - map(0x600000, 0x60ffff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_gfxram16_w)).share("tx_gfxram16"); - map(0x700000, 0x700001).w(this, FUNC(toaplan2_state::fixeight_subcpu_ctrl_w)); - map(0x800000, 0x800001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x503000, 0x5031ff).ram().w(FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); + map(0x600000, 0x60ffff).ram().w(FUNC(toaplan2_state::toaplan2_tx_gfxram16_w)).share("tx_gfxram16"); + map(0x700000, 0x700001).w(FUNC(toaplan2_state::fixeight_subcpu_ctrl_w)); + map(0x800000, 0x800001).r(FUNC(toaplan2_state::video_count_r)); } @@ -1020,13 +1020,13 @@ void toaplan2_state::fixeightbl_68k_mem(address_map &map) map(0x200008, 0x200009).portr("IN3"); map(0x20000c, 0x20000d).portr("DSWB"); map(0x200010, 0x200011).portr("SYS"); - map(0x200015, 0x200015).w(this, FUNC(toaplan2_state::fixeightbl_oki_bankswitch_w)); // Sound banking. Code at $4084c, $5070 + map(0x200015, 0x200015).w(FUNC(toaplan2_state::fixeightbl_oki_bankswitch_w)); // Sound banking. Code at $4084c, $5070 map(0x200019, 0x200019).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x20001c, 0x20001d).portr("DSWA"); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x500000, 0x501fff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x500000, 0x501fff).ram().w(FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); map(0x800000, 0x87ffff).rom().region("maincpu", 0x80000); } @@ -1039,11 +1039,11 @@ void toaplan2_state::vfive_68k_mem(address_map &map) map(0x200010, 0x200011).portr("IN1"); map(0x200014, 0x200015).portr("IN2"); map(0x200018, 0x200019).portr("SYS"); - map(0x20001c, 0x20001d).w(this, FUNC(toaplan2_state::toaplan2_v25_coin_word_w)); // Coin count/lock + v25 reset line - map(0x210000, 0x21ffff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x20001c, 0x20001d).w(FUNC(toaplan2_state::toaplan2_v25_coin_word_w)); // Coin count/lock + v25 reset line + map(0x210000, 0x21ffff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); } @@ -1054,12 +1054,12 @@ void toaplan2_state::batsugun_68k_mem(address_map &map) map(0x200010, 0x200011).portr("IN1"); map(0x200014, 0x200015).portr("IN2"); map(0x200018, 0x200019).portr("SYS"); - map(0x20001c, 0x20001d).w(this, FUNC(toaplan2_state::toaplan2_v25_coin_word_w)); // Coin count/lock + v25 reset line - map(0x210000, 0x21ffff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x20001c, 0x20001d).w(FUNC(toaplan2_state::toaplan2_v25_coin_word_w)); // Coin count/lock + v25 reset line + map(0x210000, 0x21ffff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x50000d).rw(m_vdp[1], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); } void toaplan2_state::pwrkick_68k_mem(address_map &map) @@ -1073,16 +1073,16 @@ void toaplan2_state::pwrkick_68k_mem(address_map &map) map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x600001, 0x600001).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); map(0x700004, 0x700005).portr("DSWA"); map(0x700008, 0x700009).portr("DSWB"); map(0x70000c, 0x70000d).portr("IN1"); map(0x700014, 0x700015).portr("IN2"); map(0x700018, 0x700019).portr("DSWC"); map(0x70001c, 0x70001d).portr("SYS"); - map(0x700031, 0x700031).w(this, FUNC(toaplan2_state::oki_bankswitch_w<0>)); - map(0x700035, 0x700035).w(this, FUNC(toaplan2_state::pwrkick_coin_w)); - map(0x700039, 0x700039).w(this, FUNC(toaplan2_state::pwrkick_coin_lockout_w)); + map(0x700031, 0x700031).w(FUNC(toaplan2_state::oki_bankswitch_w<0>)); + map(0x700035, 0x700035).w(FUNC(toaplan2_state::pwrkick_coin_w)); + map(0x700039, 0x700039).w(FUNC(toaplan2_state::pwrkick_coin_lockout_w)); } void toaplan2_state::othldrby_68k_mem(address_map &map) @@ -1096,14 +1096,14 @@ void toaplan2_state::othldrby_68k_mem(address_map &map) map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x600001, 0x600001).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); map(0x700004, 0x700005).portr("DSWA"); map(0x700008, 0x700009).portr("DSWB"); map(0x70000c, 0x70000d).portr("IN1"); map(0x700010, 0x700011).portr("IN2"); map(0x70001c, 0x70001d).portr("SYS"); - map(0x700031, 0x700031).w(this, FUNC(toaplan2_state::oki_bankswitch_w<0>)); - map(0x700034, 0x700035).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x700031, 0x700031).w(FUNC(toaplan2_state::oki_bankswitch_w<0>)); + map(0x700034, 0x700035).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); } @@ -1132,7 +1132,7 @@ void toaplan2_state::enmadaio_68k_mem(address_map &map) map(0x400000, 0x400003).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); map(0x500001, 0x500001).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x700000, 0x700001).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x700000, 0x700001).r(FUNC(toaplan2_state::video_count_r)); map(0x700004, 0x700005).portr("DSWA"); map(0x70000c, 0x70000d).portr("MISC2"); @@ -1141,7 +1141,7 @@ void toaplan2_state::enmadaio_68k_mem(address_map &map) map(0x700018, 0x700019).portr("SYS"); map(0x70001c, 0x70001d).portr("UNK"); //AM_READ_PORT("SYS") - map(0x700020, 0x700021).w(this, FUNC(toaplan2_state::enmadaio_oki_bank_w)); // oki bank + map(0x700020, 0x700021).w(FUNC(toaplan2_state::enmadaio_oki_bank_w)); // oki bank map(0x700028, 0x700029).nopw(); map(0x70003c, 0x70003d).nopw(); @@ -1164,8 +1164,8 @@ void toaplan2_state::snowbro2_68k_mem(address_map &map) map(0x700014, 0x700015).portr("IN3"); map(0x700018, 0x700019).portr("IN4"); map(0x70001c, 0x70001d).portr("SYS"); - map(0x700031, 0x700031).w(this, FUNC(toaplan2_state::oki_bankswitch_w<0>)); - map(0x700034, 0x700035).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x700031, 0x700031).w(FUNC(toaplan2_state::oki_bankswitch_w<0>)); + map(0x700034, 0x700035).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); } @@ -1173,21 +1173,21 @@ void toaplan2_state::mahoudai_68k_mem(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x10ffff).ram(); - map(0x218000, 0x21bfff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); - map(0x21c01c, 0x21c01d).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x218000, 0x21bfff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x21c01c, 0x21c01d).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x21c020, 0x21c021).portr("IN1"); map(0x21c024, 0x21c025).portr("IN2"); map(0x21c028, 0x21c029).portr("SYS"); map(0x21c02c, 0x21c02d).portr("DSWA"); map(0x21c030, 0x21c031).portr("DSWB"); map(0x21c034, 0x21c035).portr("JMPR"); - map(0x21c03c, 0x21c03d).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x21c03c, 0x21c03d).r(FUNC(toaplan2_state::video_count_r)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x401000, 0x4017ff).ram(); // Unused palette RAM - map(0x500000, 0x501fff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); + map(0x500000, 0x501fff).ram().w(FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); map(0x502000, 0x502fff).ram().share("tx_lineselect"); - map(0x503000, 0x5031ff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); + map(0x503000, 0x5031ff).ram().w(FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); map(0x503200, 0x503fff).ram(); } @@ -1196,22 +1196,22 @@ void toaplan2_state::shippumd_68k_mem(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x100000, 0x10ffff).ram(); - map(0x218000, 0x21bfff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x218000, 0x21bfff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); // AM_RANGE(0x21c008, 0x21c009) AM_WRITENOP // ??? - map(0x21c01c, 0x21c01d).w(this, FUNC(toaplan2_state::shippumd_coin_word_w)); // Coin count/lock + oki bankswitch + map(0x21c01c, 0x21c01d).w(FUNC(toaplan2_state::shippumd_coin_word_w)); // Coin count/lock + oki bankswitch map(0x21c020, 0x21c021).portr("IN1"); map(0x21c024, 0x21c025).portr("IN2"); map(0x21c028, 0x21c029).portr("SYS"); map(0x21c02c, 0x21c02d).portr("DSWA"); map(0x21c030, 0x21c031).portr("DSWB"); map(0x21c034, 0x21c035).portr("JMPR"); - map(0x21c03c, 0x21c03d).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x21c03c, 0x21c03d).r(FUNC(toaplan2_state::video_count_r)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x401000, 0x4017ff).ram(); // Unused palette RAM - map(0x500000, 0x501fff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); + map(0x500000, 0x501fff).ram().w(FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); map(0x502000, 0x502fff).ram().share("tx_lineselect"); - map(0x503000, 0x5031ff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); + map(0x503000, 0x5031ff).ram().w(FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); map(0x503200, 0x503fff).ram(); } @@ -1220,20 +1220,20 @@ void toaplan2_state::bgaregga_68k_mem(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x100000, 0x10ffff).ram(); - map(0x218000, 0x21bfff).rw(this, FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); - map(0x21c01c, 0x21c01d).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x218000, 0x21bfff).rw(FUNC(toaplan2_state::shared_ram_r), FUNC(toaplan2_state::shared_ram_w)); + map(0x21c01c, 0x21c01d).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x21c020, 0x21c021).portr("IN1"); map(0x21c024, 0x21c025).portr("IN2"); map(0x21c028, 0x21c029).portr("SYS"); map(0x21c02c, 0x21c02d).portr("DSWA"); map(0x21c030, 0x21c031).portr("DSWB"); map(0x21c034, 0x21c035).portr("JMPR"); - map(0x21c03c, 0x21c03d).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x21c03c, 0x21c03d).r(FUNC(toaplan2_state::video_count_r)); map(0x300000, 0x30000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_r), FUNC(gp9001vdp_device::gp9001_vdp_w)); map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x500000, 0x501fff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); + map(0x500000, 0x501fff).ram().w(FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); map(0x502000, 0x502fff).ram().share("tx_lineselect"); - map(0x503000, 0x5031ff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); + map(0x503000, 0x5031ff).ram().w(FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); map(0x503200, 0x503fff).ram(); map(0x600001, 0x600001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -1241,12 +1241,12 @@ void toaplan2_state::bgaregga_68k_mem(address_map &map) void toaplan2_state::batrider_dma_mem(address_map &map) { - map(0x0000, 0x1fff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); + map(0x0000, 0x1fff).ram().w(FUNC(toaplan2_state::toaplan2_tx_videoram_w)).share("tx_videoram"); map(0x2000, 0x2fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x3000, 0x31ff).ram().share("tx_lineselect"); - map(0x3200, 0x33ff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); + map(0x3200, 0x33ff).ram().w(FUNC(toaplan2_state::toaplan2_tx_linescroll_w)).share("tx_linescroll"); map(0x3400, 0x7fff).ram(); - map(0x8000, 0xffff).ram().w(this, FUNC(toaplan2_state::toaplan2_tx_gfxram16_w)).share("tx_gfxram16"); + map(0x8000, 0xffff).ram().w(FUNC(toaplan2_state::toaplan2_tx_gfxram16_w)).share("tx_gfxram16"); } @@ -1256,24 +1256,24 @@ void toaplan2_state::batrider_68k_mem(address_map &map) // actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA map(0x200000, 0x207fff).ram().share("mainram16"); map(0x208000, 0x20ffff).ram(); - map(0x300000, 0x37ffff).r(this, FUNC(toaplan2_state::batrider_z80rom_r)); + map(0x300000, 0x37ffff).r(FUNC(toaplan2_state::batrider_z80rom_r)); map(0x400000, 0x40000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_alt_r), FUNC(gp9001vdp_device::gp9001_vdp_alt_w)); map(0x500000, 0x500001).portr("IN"); map(0x500002, 0x500003).portr("SYS-DSW"); map(0x500004, 0x500005).portr("DSW"); - map(0x500006, 0x500007).r(this, FUNC(toaplan2_state::video_count_r)); + map(0x500006, 0x500007).r(FUNC(toaplan2_state::video_count_r)); map(0x500009, 0x500009).r("soundlatch3", FUNC(generic_latch_8_device::read)); map(0x50000b, 0x50000b).r("soundlatch4", FUNC(generic_latch_8_device::read)); - map(0x50000c, 0x50000d).r(this, FUNC(toaplan2_state::batrider_z80_busack_r)); - map(0x500010, 0x500011).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); - map(0x500021, 0x500021).w(this, FUNC(toaplan2_state::batrider_soundlatch_w)); - map(0x500023, 0x500023).w(this, FUNC(toaplan2_state::batrider_soundlatch2_w)); - map(0x500024, 0x500025).w(this, FUNC(toaplan2_state::batrider_unknown_sound_w)); - map(0x500026, 0x500027).w(this, FUNC(toaplan2_state::batrider_clear_sndirq_w)); - map(0x500061, 0x500061).w(this, FUNC(toaplan2_state::batrider_z80_busreq_w)); - map(0x500080, 0x500081).w(this, FUNC(toaplan2_state::batrider_textdata_dma_w)); - map(0x500082, 0x500083).w(this, FUNC(toaplan2_state::batrider_pal_text_dma_w)); - map(0x5000c0, 0x5000cf).w(this, FUNC(toaplan2_state::batrider_objectbank_w)).umask16(0x00ff); + map(0x50000c, 0x50000d).r(FUNC(toaplan2_state::batrider_z80_busack_r)); + map(0x500010, 0x500011).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x500021, 0x500021).w(FUNC(toaplan2_state::batrider_soundlatch_w)); + map(0x500023, 0x500023).w(FUNC(toaplan2_state::batrider_soundlatch2_w)); + map(0x500024, 0x500025).w(FUNC(toaplan2_state::batrider_unknown_sound_w)); + map(0x500026, 0x500027).w(FUNC(toaplan2_state::batrider_clear_sndirq_w)); + map(0x500061, 0x500061).w(FUNC(toaplan2_state::batrider_z80_busreq_w)); + map(0x500080, 0x500081).w(FUNC(toaplan2_state::batrider_textdata_dma_w)); + map(0x500082, 0x500083).w(FUNC(toaplan2_state::batrider_pal_text_dma_w)); + map(0x5000c0, 0x5000cf).w(FUNC(toaplan2_state::batrider_objectbank_w)).umask16(0x00ff); } @@ -1283,24 +1283,24 @@ void toaplan2_state::bbakraid_68k_mem(address_map &map) // actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA map(0x200000, 0x207fff).ram().share("mainram16"); map(0x208000, 0x20ffff).ram(); - map(0x300000, 0x33ffff).r(this, FUNC(toaplan2_state::batrider_z80rom_r)); + map(0x300000, 0x33ffff).r(FUNC(toaplan2_state::batrider_z80rom_r)); map(0x400000, 0x40000d).rw(m_vdp[0], FUNC(gp9001vdp_device::gp9001_vdp_alt_r), FUNC(gp9001vdp_device::gp9001_vdp_alt_w)); map(0x500000, 0x500001).portr("IN"); map(0x500002, 0x500003).portr("SYS-DSW"); map(0x500004, 0x500005).portr("DSW"); - map(0x500006, 0x500007).r(this, FUNC(toaplan2_state::video_count_r)); - map(0x500008, 0x500009).w(this, FUNC(toaplan2_state::toaplan2_coin_word_w)); + map(0x500006, 0x500007).r(FUNC(toaplan2_state::video_count_r)); + map(0x500008, 0x500009).w(FUNC(toaplan2_state::toaplan2_coin_word_w)); map(0x500011, 0x500011).r("soundlatch3", FUNC(generic_latch_8_device::read)); map(0x500013, 0x500013).r("soundlatch4", FUNC(generic_latch_8_device::read)); - map(0x500015, 0x500015).w(this, FUNC(toaplan2_state::batrider_soundlatch_w)); - map(0x500017, 0x500017).w(this, FUNC(toaplan2_state::batrider_soundlatch2_w)); - map(0x500018, 0x500019).r(this, FUNC(toaplan2_state::bbakraid_eeprom_r)); - map(0x50001a, 0x50001b).w(this, FUNC(toaplan2_state::batrider_unknown_sound_w)); - map(0x50001c, 0x50001d).w(this, FUNC(toaplan2_state::batrider_clear_sndirq_w)); - map(0x50001e, 0x50001f).w(this, FUNC(toaplan2_state::bbakraid_eeprom_w)); - map(0x500080, 0x500081).w(this, FUNC(toaplan2_state::batrider_textdata_dma_w)); - map(0x500082, 0x500083).w(this, FUNC(toaplan2_state::batrider_pal_text_dma_w)); - map(0x5000c0, 0x5000cf).w(this, FUNC(toaplan2_state::batrider_objectbank_w)).umask16(0x00ff); + map(0x500015, 0x500015).w(FUNC(toaplan2_state::batrider_soundlatch_w)); + map(0x500017, 0x500017).w(FUNC(toaplan2_state::batrider_soundlatch2_w)); + map(0x500018, 0x500019).r(FUNC(toaplan2_state::bbakraid_eeprom_r)); + map(0x50001a, 0x50001b).w(FUNC(toaplan2_state::batrider_unknown_sound_w)); + map(0x50001c, 0x50001d).w(FUNC(toaplan2_state::batrider_clear_sndirq_w)); + map(0x50001e, 0x50001f).w(FUNC(toaplan2_state::bbakraid_eeprom_w)); + map(0x500080, 0x500081).w(FUNC(toaplan2_state::batrider_textdata_dma_w)); + map(0x500082, 0x500083).w(FUNC(toaplan2_state::batrider_pal_text_dma_w)); + map(0x5000c0, 0x5000cf).w(FUNC(toaplan2_state::batrider_objectbank_w)).umask16(0x00ff); } @@ -1319,7 +1319,7 @@ void toaplan2_state::raizing_sound_z80_mem(address_map &map) map(0xc000, 0xdfff).ram().share("shared_ram"); map(0xe000, 0xe001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xe004, 0xe004).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xe00e, 0xe00e).w(this, FUNC(toaplan2_state::toaplan2_coin_w)); + map(0xe00e, 0xe00e).w(FUNC(toaplan2_state::toaplan2_coin_w)); } @@ -1330,11 +1330,11 @@ void toaplan2_state::bgaregga_sound_z80_mem(address_map &map) map(0xc000, 0xdfff).ram().share("shared_ram"); map(0xe000, 0xe001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xe004, 0xe004).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xe006, 0xe008).w(this, FUNC(toaplan2_state::raizing_oki_bankswitch_w)); - map(0xe00a, 0xe00a).w(this, FUNC(toaplan2_state::raizing_z80_bankswitch_w)); + map(0xe006, 0xe008).w(FUNC(toaplan2_state::raizing_oki_bankswitch_w)); + map(0xe00a, 0xe00a).w(FUNC(toaplan2_state::raizing_z80_bankswitch_w)); map(0xe00c, 0xe00c).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); map(0xe01c, 0xe01c).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xe01d, 0xe01d).r(this, FUNC(toaplan2_state::bgaregga_E01D_r)); + map(0xe01d, 0xe01d).r(FUNC(toaplan2_state::bgaregga_E01D_r)); } @@ -1351,15 +1351,15 @@ void toaplan2_state::batrider_sound_z80_port(address_map &map) map.global_mask(0xff); map(0x40, 0x40).w("soundlatch3", FUNC(generic_latch_8_device::write)); map(0x42, 0x42).w("soundlatch4", FUNC(generic_latch_8_device::write)); - map(0x44, 0x44).w(this, FUNC(toaplan2_state::batrider_sndirq_w)); - map(0x46, 0x46).w(this, FUNC(toaplan2_state::batrider_clear_nmi_w)); + map(0x44, 0x44).w(FUNC(toaplan2_state::batrider_sndirq_w)); + map(0x46, 0x46).w(FUNC(toaplan2_state::batrider_clear_nmi_w)); map(0x48, 0x48).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x4a, 0x4a).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0x80, 0x81).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x82, 0x82).rw(m_oki[0], FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x84, 0x84).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x88, 0x88).w(this, FUNC(toaplan2_state::raizing_z80_bankswitch_w)); - map(0xc0, 0xc6).w(this, FUNC(toaplan2_state::raizing_oki_bankswitch_w)); + map(0x88, 0x88).w(FUNC(toaplan2_state::raizing_z80_bankswitch_w)); + map(0xc0, 0xc6).w(FUNC(toaplan2_state::raizing_oki_bankswitch_w)); } @@ -1375,8 +1375,8 @@ void toaplan2_state::bbakraid_sound_z80_port(address_map &map) map.global_mask(0xff); map(0x40, 0x40).w("soundlatch3", FUNC(generic_latch_8_device::write)); map(0x42, 0x42).w("soundlatch4", FUNC(generic_latch_8_device::write)); - map(0x44, 0x44).w(this, FUNC(toaplan2_state::batrider_sndirq_w)); - map(0x46, 0x46).w(this, FUNC(toaplan2_state::batrider_clear_nmi_w)); + map(0x44, 0x44).w(FUNC(toaplan2_state::batrider_sndirq_w)); + map(0x46, 0x46).w(FUNC(toaplan2_state::batrider_clear_nmi_w)); map(0x48, 0x48).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x4a, 0x4a).r(m_soundlatch2, FUNC(generic_latch_8_device::read)); map(0x80, 0x81).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); @@ -1447,7 +1447,7 @@ void toaplan2_state::hd647180_io_map(address_map &map) { map.global_mask(0xff); - map(0x60, 0x60).r(this, FUNC(toaplan2_state::tekipaki_cmdavailable_r)); + map(0x60, 0x60).r(FUNC(toaplan2_state::tekipaki_cmdavailable_r)); map(0x84, 0x84).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x82, 0x82).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index 82077a4fb92..0eb56e19618 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -148,11 +148,11 @@ void toki_state::toki_map(address_map &map) map(0x060000, 0x06d7ff).ram(); map(0x06d800, 0x06dfff).ram().share("spriteram"); map(0x06e000, 0x06e7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x06e800, 0x06efff).ram().w(this, FUNC(toki_state::background1_videoram_w)).share("bg1_vram"); - map(0x06f000, 0x06f7ff).ram().w(this, FUNC(toki_state::background2_videoram_w)).share("bg2_vram"); - map(0x06f800, 0x06ffff).ram().w(this, FUNC(toki_state::foreground_videoram_w)).share("videoram"); + map(0x06e800, 0x06efff).ram().w(FUNC(toki_state::background1_videoram_w)).share("bg1_vram"); + map(0x06f000, 0x06f7ff).ram().w(FUNC(toki_state::background2_videoram_w)).share("bg2_vram"); + map(0x06f800, 0x06ffff).ram().w(FUNC(toki_state::foreground_videoram_w)).share("videoram"); map(0x080000, 0x08000d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff); - map(0x0a0000, 0x0a005f).w(this, FUNC(toki_state::toki_control_w)).share("scrollram"); + map(0x0a0000, 0x0a005f).w(FUNC(toki_state::toki_control_w)).share("scrollram"); map(0x0c0000, 0x0c0001).portr("DSW"); map(0x0c0002, 0x0c0003).portr("INPUTS"); map(0x0c0004, 0x0c0005).portr("SYSTEM"); @@ -164,20 +164,20 @@ void toki_state::tokib_map(address_map &map) map(0x000000, 0x05ffff).rom(); map(0x060000, 0x06dfff).ram(); map(0x06e000, 0x06e7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x06e800, 0x06efff).ram().w(this, FUNC(toki_state::background1_videoram_w)).share("bg1_vram"); - map(0x06f000, 0x06f7ff).ram().w(this, FUNC(toki_state::background2_videoram_w)).share("bg2_vram"); - map(0x06f800, 0x06ffff).ram().w(this, FUNC(toki_state::foreground_videoram_w)).share("videoram"); + map(0x06e800, 0x06efff).ram().w(FUNC(toki_state::background1_videoram_w)).share("bg1_vram"); + map(0x06f000, 0x06f7ff).ram().w(FUNC(toki_state::background2_videoram_w)).share("bg2_vram"); + map(0x06f800, 0x06ffff).ram().w(FUNC(toki_state::foreground_videoram_w)).share("videoram"); map(0x071000, 0x071001).nopw(); /* sprite related? seems another scroll register */ /* gets written the same value as 75000a (bg2 scrollx) */ map(0x071804, 0x071807).nopw(); /* sprite related, always 01be0100 */ map(0x07180e, 0x071e45).writeonly().share("spriteram"); map(0x072000, 0x072001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); /* probably */ - map(0x075000, 0x075001).w(this, FUNC(toki_state::tokib_soundcommand_w)); + map(0x075000, 0x075001).w(FUNC(toki_state::tokib_soundcommand_w)); map(0x075004, 0x07500b).writeonly().share("scrollram"); map(0x0c0000, 0x0c0001).portr("DSW"); map(0x0c0002, 0x0c0003).portr("INPUTS"); map(0x0c0004, 0x0c0005).portr("SYSTEM"); - map(0x0c000e, 0x0c000f).r(this, FUNC(toki_state::pip_r)); /* sound related, if we return 0 the code writes */ + map(0x0c000e, 0x0c000f).r(FUNC(toki_state::pip_r)); /* sound related, if we return 0 the code writes */ /* the sound command quickly followed by 0 and the */ /* sound CPU often misses the command. */ } @@ -211,7 +211,7 @@ void toki_state::toki_audio_opcodes_map(address_map &map) void toki_state::jujuba_audio_map(address_map &map) { - map(0x0000, 0x1fff).r(this, FUNC(toki_state::jujuba_z80_data_decrypt)); + map(0x0000, 0x1fff).r(FUNC(toki_state::jujuba_z80_data_decrypt)); map(0x2000, 0x27ff).ram(); map(0x4000, 0x4000).w(m_seibu_sound, FUNC(seibu_sound_device::pending_w)); map(0x4001, 0x4001).w(m_seibu_sound, FUNC(seibu_sound_device::irq_clear_w)); @@ -243,8 +243,8 @@ void toki_state::tokib_audio_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xe000, 0xe000).w(this, FUNC(toki_state::tokib_adpcm_control_w)); /* MSM5205 + ROM bank */ - map(0xe400, 0xe400).w(this, FUNC(toki_state::tokib_adpcm_data_w)); + map(0xe000, 0xe000).w(FUNC(toki_state::tokib_adpcm_control_w)); /* MSM5205 + ROM bank */ + map(0xe400, 0xe400).w(FUNC(toki_state::tokib_adpcm_data_w)); map(0xec00, 0xec01).mirror(0x0008).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf800).r(m_soundlatch, FUNC(generic_latch_8_device::read)); diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp index 02df72c2f62..769feb5748a 100644 --- a/src/mame/drivers/tomcat.cpp +++ b/src/mame/drivers/tomcat.cpp @@ -229,17 +229,17 @@ WRITE8_MEMBER(tomcat_state::tomcat_nvram_w) void tomcat_state::tomcat_map(address_map &map) { map(0x000000, 0x00ffff).rom(); - map(0x402001, 0x402001).r("adc", FUNC(adc0808_device::data_r)).w(this, FUNC(tomcat_state::adcon_w)); - map(0x404000, 0x404001).r(this, FUNC(tomcat_state::tomcat_inputs_r)).w("avg", FUNC(avg_tomcat_device::go_word_w)); + map(0x402001, 0x402001).r("adc", FUNC(adc0808_device::data_r)).w(FUNC(tomcat_state::adcon_w)); + map(0x404000, 0x404001).r(FUNC(tomcat_state::tomcat_inputs_r)).w("avg", FUNC(avg_tomcat_device::go_word_w)); map(0x406000, 0x406001).w("avg", FUNC(avg_tomcat_device::reset_word_w)); - map(0x408000, 0x408001).r(this, FUNC(tomcat_state::tomcat_inputs2_r)).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x40a000, 0x40a001).rw(this, FUNC(tomcat_state::tomcat_320bio_r), FUNC(tomcat_state::tomcat_irqclr_w)); - map(0x40e000, 0x40e01f).w(this, FUNC(tomcat_state::main_latch_w)); + map(0x408000, 0x408001).r(FUNC(tomcat_state::tomcat_inputs2_r)).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); + map(0x40a000, 0x40a001).rw(FUNC(tomcat_state::tomcat_320bio_r), FUNC(tomcat_state::tomcat_irqclr_w)); + map(0x40e000, 0x40e01f).w(FUNC(tomcat_state::main_latch_w)); map(0x800000, 0x803fff).ram().share("vectorram"); map(0xffa000, 0xffbfff).ram().share("shared_ram"); map(0xffc000, 0xffcfff).ram(); map(0xffd000, 0xffdfff).rw("m48t02", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0xff00); - map(0xffd000, 0xffdfff).rw(this, FUNC(tomcat_state::tomcat_nvram_r), FUNC(tomcat_state::tomcat_nvram_w)).umask16(0x00ff); + map(0xffd000, 0xffdfff).rw(FUNC(tomcat_state::tomcat_nvram_r), FUNC(tomcat_state::tomcat_nvram_w)).umask16(0x00ff); } void tomcat_state::dsp_map(address_map &map) @@ -266,7 +266,7 @@ void tomcat_state::sound_map(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2000, 0x2001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x3000, 0x30df).w(this, FUNC(tomcat_state::soundlatches_w)); + map(0x3000, 0x30df).w(FUNC(tomcat_state::soundlatches_w)); map(0x30e0, 0x30e0).noprw(); // COINRD Inputs: D7 = Coin L, D6 = Coin R, D5 = SOUNDFLAG map(0x5000, 0x507f).ram(); // 6532 ram map(0x5080, 0x509f).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write)); diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp index f020a6fba41..c94e7aabad7 100644 --- a/src/mame/drivers/tonton.cpp +++ b/src/mame/drivers/tonton.cpp @@ -99,9 +99,9 @@ void tonton_state::tonton_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("IN0"); - map(0x00, 0x00).w(this, FUNC(tonton_state::tonton_outport_w)); + map(0x00, 0x00).w(FUNC(tonton_state::tonton_outport_w)); map(0x01, 0x01).portr("IN1"); - map(0x01, 0x01).w(this, FUNC(tonton_state::hopper_w)); + map(0x01, 0x01).w(FUNC(tonton_state::hopper_w)); map(0x02, 0x02).portr("DSW1"); map(0x03, 0x03).portr("DSW2"); map(0x88, 0x8b).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp index e5ab53aebea..167da4736be 100644 --- a/src/mame/drivers/toobin.cpp +++ b/src/mame/drivers/toobin.cpp @@ -94,18 +94,18 @@ void toobin_state::main_map(address_map &map) map(0xc00000, 0xc07fff).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); map(0xc08000, 0xc097ff).mirror(0x046000).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); map(0xc09800, 0xc09fff).mirror(0x046000).ram().share("mob"); - map(0xc10000, 0xc107ff).mirror(0x047800).ram().w(this, FUNC(toobin_state::paletteram_w)).share("paletteram"); + map(0xc10000, 0xc107ff).mirror(0x047800).ram().w(FUNC(toobin_state::paletteram_w)).share("paletteram"); map(0x826000, 0x826001).mirror(0x4500fe).nopr(); /* who knows? read at controls time */ map(0x828000, 0x828001).mirror(0x4500fe).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x828101, 0x828101).mirror(0x4500fe).w(m_jsa, FUNC(atari_jsa_i_device::main_command_w)); - map(0x828300, 0x828301).mirror(0x45003e).w(this, FUNC(toobin_state::intensity_w)); - map(0x828340, 0x828341).mirror(0x45003e).w(this, FUNC(toobin_state::interrupt_scan_w)).share("interrupt_scan"); - map(0x828380, 0x828381).mirror(0x45003e).ram().w(this, FUNC(toobin_state::slip_w)).share("mob:slip"); - map(0x8283c0, 0x8283c1).mirror(0x45003e).w(this, FUNC(toobin_state::scanline_int_ack_w)); + map(0x828300, 0x828301).mirror(0x45003e).w(FUNC(toobin_state::intensity_w)); + map(0x828340, 0x828341).mirror(0x45003e).w(FUNC(toobin_state::interrupt_scan_w)).share("interrupt_scan"); + map(0x828380, 0x828381).mirror(0x45003e).ram().w(FUNC(toobin_state::slip_w)).share("mob:slip"); + map(0x8283c0, 0x8283c1).mirror(0x45003e).w(FUNC(toobin_state::scanline_int_ack_w)); map(0x828400, 0x828401).mirror(0x4500fe).w(m_jsa, FUNC(atari_jsa_i_device::sound_reset_w)); map(0x828500, 0x828501).mirror(0x4500fe).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); - map(0x828600, 0x828601).mirror(0x4500fe).w(this, FUNC(toobin_state::xscroll_w)).share("xscroll"); - map(0x828700, 0x828701).mirror(0x4500fe).w(this, FUNC(toobin_state::yscroll_w)).share("yscroll"); + map(0x828600, 0x828601).mirror(0x4500fe).w(FUNC(toobin_state::xscroll_w)).share("xscroll"); + map(0x828700, 0x828701).mirror(0x4500fe).w(FUNC(toobin_state::yscroll_w)).share("yscroll"); map(0x828800, 0x828801).mirror(0x4507fe).portr("FF8800"); map(0x829000, 0x829001).mirror(0x4507fe).portr("FF9000"); map(0x829801, 0x829801).mirror(0x4507fe).r(m_jsa, FUNC(atari_jsa_i_device::main_response_r)); diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index ca8e0a0de00..e7d77300d30 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -377,7 +377,7 @@ void topspeed_state::cpua_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x400000, 0x40ffff).ram().share("sharedram"); map(0x500000, 0x503fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x600002, 0x600003).w(this, FUNC(topspeed_state::cpua_ctrl_w)); + map(0x600002, 0x600003).w(FUNC(topspeed_state::cpua_ctrl_w)); map(0x7e0000, 0x7e0001).nopr(); map(0x7e0001, 0x7e0001).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0x7e0003, 0x7e0003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); @@ -400,9 +400,9 @@ void topspeed_state::cpub_map(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x400000, 0x40ffff).ram().share("sharedram"); - map(0x880001, 0x880001).r(this, FUNC(topspeed_state::input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); + map(0x880001, 0x880001).r(FUNC(topspeed_state::input_bypass_r)).w(m_tc0040ioc, FUNC(tc0040ioc_device::portreg_w)).umask16(0x00ff); map(0x880003, 0x880003).rw(m_tc0040ioc, FUNC(tc0040ioc_device::port_r), FUNC(tc0040ioc_device::port_w)); - map(0x900000, 0x9003ff).rw(this, FUNC(topspeed_state::motor_r), FUNC(topspeed_state::motor_w)); + map(0x900000, 0x9003ff).rw(FUNC(topspeed_state::motor_r), FUNC(topspeed_state::motor_w)); } @@ -416,8 +416,8 @@ void topspeed_state::z80_prg(address_map &map) map(0x9000, 0x9001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xa000, 0xa000).w("ciu", FUNC(pc060ha_device::slave_port_w)); map(0xa001, 0xa001).rw("ciu", FUNC(pc060ha_device::slave_comm_r), FUNC(pc060ha_device::slave_comm_w)); - map(0xb000, 0xcfff).w(this, FUNC(topspeed_state::msm5205_command_w)); - map(0xd000, 0xdfff).w(this, FUNC(topspeed_state::volume_w)); + map(0xb000, 0xcfff).w(FUNC(topspeed_state::msm5205_command_w)); + map(0xd000, 0xdfff).w(FUNC(topspeed_state::volume_w)); } void topspeed_state::z80_io(address_map &map) diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index f5b816ec4a7..139b861c278 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -323,8 +323,8 @@ void toratora_state::main_map(address_map &map) map(0x8000, 0x9fff).ram().share("videoram"); map(0xa000, 0xf047).noprw(); map(0xf048, 0xf049).noprw(); - map(0xf04a, 0xf04a).w(this, FUNC(toratora_state::clear_tv_w)); /* the read is mark *LEDEN, but not used */ - map(0xf04b, 0xf04b).rw(this, FUNC(toratora_state::timer_r), FUNC(toratora_state::clear_timer_w)); + map(0xf04a, 0xf04a).w(FUNC(toratora_state::clear_tv_w)); /* the read is mark *LEDEN, but not used */ + map(0xf04b, 0xf04b).rw(FUNC(toratora_state::timer_r), FUNC(toratora_state::clear_timer_w)); map(0xf04c, 0xf09f).noprw(); map(0xf0a0, 0xf0a3).rw(m_pia_u1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xf0a4, 0xf0a7).rw(m_pia_u2, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp index 243bb95521d..cdddc1c37bf 100644 --- a/src/mame/drivers/tosh1000.cpp +++ b/src/mame/drivers/tosh1000.cpp @@ -239,8 +239,8 @@ void tosh1000_state::tosh1000_io(address_map &map) { map.unmap_value_high(); map(0x0000, 0x00ff).m("mb", FUNC(ibm5160_mb_device::map)); - map(0x00c0, 0x00c3).rw(this, FUNC(tosh1000_state::bram_r), FUNC(tosh1000_state::bram_w)); - map(0x00c8, 0x00c8).w(this, FUNC(tosh1000_state::romdos_bank_w)); // ROM-DOS page select [p. B-15] + map(0x00c0, 0x00c3).rw(FUNC(tosh1000_state::bram_r), FUNC(tosh1000_state::bram_w)); + map(0x00c8, 0x00c8).w(FUNC(tosh1000_state::romdos_bank_w)); // ROM-DOS page select [p. B-15] map(0x02c0, 0x02df).rw("rtc", FUNC(tc8521_device::read), FUNC(tc8521_device::write)); } diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 479fb6c34fb..80e7ef84333 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -341,7 +341,7 @@ void tourvision_state::pce_mem(address_map &map) map(0x1FE400, 0x1FE7FF).rw(m_huc6260, FUNC(huc6260_device::read), FUNC(huc6260_device::write)); map(0x1FE800, 0x1FEBFF).rw("c6280", FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w)); map(0x1FEC00, 0x1FEFFF).rw(m_maincpu, FUNC(h6280_device::timer_r), FUNC(h6280_device::timer_w)); - map(0x1FF000, 0x1FF3FF).rw(this, FUNC(tourvision_state::pce_joystick_r), FUNC(tourvision_state::pce_joystick_w)); + map(0x1FF000, 0x1FF3FF).rw(FUNC(tourvision_state::pce_joystick_r), FUNC(tourvision_state::pce_joystick_w)); map(0x1FF400, 0x1FF7FF).rw(m_maincpu, FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w)); } @@ -364,7 +364,7 @@ void tourvision_state::tourvision_8085_map(address_map &map) map(0xa000, 0xa000).portr("DSW2"); map(0xb000, 0xb000).nopr(); // unknown (must NOT be == 0x03 ? code at 0x1154) map(0xc000, 0xc000).portr("SYSTEM"); - map(0xd000, 0xd000).w(this, FUNC(tourvision_state::tourvision_8085_d000_w)); + map(0xd000, 0xd000).w(FUNC(tourvision_state::tourvision_8085_d000_w)); map(0xe000, 0xe1ff).ram(); map(0xf000, 0xf000).nopr(); // protection or internal counter ? there is sometimes some data in BIOS0 which is replaced by 0xff in BIOS1 } diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp index 98e97c944ed..2102596f92b 100644 --- a/src/mame/drivers/toypop.cpp +++ b/src/mame/drivers/toypop.cpp @@ -364,9 +364,9 @@ void namcos16_state::namcos16_master_base_map(address_map &map) // 0x6000 - 0x7fff i/o specific, guessing PAL controlled. - map(0x8000, 0x8fff).w(this, FUNC(namcos16_state::slave_halt_ctrl_w)); - map(0x9000, 0x9fff).w(this, FUNC(namcos16_state::sound_halt_ctrl_w)); - map(0xa000, 0xa001).w(this, FUNC(namcos16_state::pal_bank_w)); + map(0x8000, 0x8fff).w(FUNC(namcos16_state::slave_halt_ctrl_w)); + map(0x9000, 0x9fff).w(FUNC(namcos16_state::sound_halt_ctrl_w)); + map(0xa000, 0xa001).w(FUNC(namcos16_state::pal_bank_w)); map(0x8000, 0xffff).rom().region("master_rom", 0); } @@ -377,7 +377,7 @@ void namcos16_state::master_liblrabl_map(address_map &map) map(0x6800, 0x680f).rw(m_namco58xx, FUNC(namco58xx_device::read), FUNC(namco58xx_device::write)); map(0x6810, 0x681f).rw(m_namco56xx_1, FUNC(namco56xx_device::read), FUNC(namco56xx_device::write)); map(0x6820, 0x682f).rw(m_namco56xx_2, FUNC(namco56xx_device::read), FUNC(namco56xx_device::write)); - map(0x7000, 0x7fff).nopr().w(this, FUNC(namcos16_state::irq_ctrl_w)); + map(0x7000, 0x7fff).nopr().w(FUNC(namcos16_state::irq_ctrl_w)); } void namcos16_state::master_toypop_map(address_map &map) @@ -387,17 +387,17 @@ void namcos16_state::master_toypop_map(address_map &map) map(0x6010, 0x601f).rw(m_namco56xx_1, FUNC(namco56xx_device::read), FUNC(namco56xx_device::write)); map(0x6020, 0x602f).rw(m_namco56xx_2, FUNC(namco56xx_device::read), FUNC(namco56xx_device::write)); map(0x6800, 0x6bff).rw(m_namco15xx, FUNC(namco_15xx_device::sharedram_r), FUNC(namco_15xx_device::sharedram_w)); - map(0x7000, 0x7000).rw(this, FUNC(namcos16_state::irq_enable_r), FUNC(namcos16_state::irq_disable_w)); + map(0x7000, 0x7000).rw(FUNC(namcos16_state::irq_enable_r), FUNC(namcos16_state::irq_disable_w)); } void namcos16_state::slave_map(address_map &map) { map(0x000000, 0x007fff).rom().region("slave_rom", 0); map(0x080000, 0x0bffff).ram(); - map(0x100000, 0x100fff).rw(this, FUNC(namcos16_state::slave_shared_r), FUNC(namcos16_state::slave_shared_w)).umask16(0x00ff); - map(0x180000, 0x187fff).rw(this, FUNC(namcos16_state::bg_rmw_r), FUNC(namcos16_state::bg_rmw_w)); + map(0x100000, 0x100fff).rw(FUNC(namcos16_state::slave_shared_r), FUNC(namcos16_state::slave_shared_w)).umask16(0x00ff); + map(0x180000, 0x187fff).rw(FUNC(namcos16_state::bg_rmw_r), FUNC(namcos16_state::bg_rmw_w)); map(0x190000, 0x1dffff).ram().share("bgvram"); - map(0x300000, 0x3fffff).w(this, FUNC(namcos16_state::slave_irq_enable_w)); + map(0x300000, 0x3fffff).w(FUNC(namcos16_state::slave_irq_enable_w)); } void namcos16_state::sound_map(address_map &map) diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp index 2a3e273add5..efd400c41b8 100644 --- a/src/mame/drivers/tp84.cpp +++ b/src/mame/drivers/tp84.cpp @@ -180,7 +180,7 @@ void tp84_state::tp84_cpu1_map(address_map &map) map(0x2860, 0x2860).portr("DSW1"); map(0x3000, 0x3000).portr("DSW2"); map(0x3000, 0x3007).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x3800, 0x3800).w(this, FUNC(tp84_state::tp84_sh_irqtrigger_w)); + map(0x3800, 0x3800).w(FUNC(tp84_state::tp84_sh_irqtrigger_w)); map(0x3a00, 0x3a00).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x3c00, 0x3c00).writeonly().share("scroll_x"); map(0x3e00, 0x3e00).writeonly().share("scroll_y"); @@ -206,7 +206,7 @@ void tp84_state::tp84b_cpu1_map(address_map &map) map(0x1a60, 0x1a60).portr("DSW1"); map(0x1c00, 0x1c00).portr("DSW2"); map(0x1c00, 0x1c07).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x1e00, 0x1e00).w(this, FUNC(tp84_state::tp84_sh_irqtrigger_w)); + map(0x1e00, 0x1e00).w(FUNC(tp84_state::tp84_sh_irqtrigger_w)); map(0x1e80, 0x1e80).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x1f00, 0x1f00).writeonly().share("scroll_x"); map(0x1f80, 0x1f80).writeonly().share("scroll_y"); @@ -225,10 +225,10 @@ WRITE8_MEMBER(tp84_state::sub_irq_mask_w) void tp84_state::cpu2_map(address_map &map) { // AM_RANGE(0x0000, 0x0000) AM_RAM /* Watch dog ?*/ - map(0x2000, 0x2000).r(this, FUNC(tp84_state::tp84_scanline_r)); /* beam position */ - map(0x4000, 0x4000).w(this, FUNC(tp84_state::sub_irq_mask_w)); + map(0x2000, 0x2000).r(FUNC(tp84_state::tp84_scanline_r)); /* beam position */ + map(0x4000, 0x4000).w(FUNC(tp84_state::sub_irq_mask_w)); map(0x6000, 0x679f).ram(); - map(0x67a0, 0x67ff).ram().w(this, FUNC(tp84_state::tp84_spriteram_w)).share("spriteram"); + map(0x67a0, 0x67ff).ram().w(FUNC(tp84_state::tp84_spriteram_w)).share("spriteram"); map(0x8000, 0x87ff).ram().share("share1"); map(0xe000, 0xffff).rom(); } @@ -239,12 +239,12 @@ void tp84_state::audio_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x43ff).ram(); map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x8000, 0x8000).r(this, FUNC(tp84_state::tp84_sh_timer_r)); - map(0xa000, 0xa1ff).w(this, FUNC(tp84_state::tp84_filter_w)); + map(0x8000, 0x8000).r(FUNC(tp84_state::tp84_sh_timer_r)); + map(0xa000, 0xa1ff).w(FUNC(tp84_state::tp84_filter_w)); map(0xc000, 0xc000).nopw(); - map(0xc001, 0xc001).w("y2404_1", FUNC(y2404_device::write)); - map(0xc003, 0xc003).w("y2404_2", FUNC(y2404_device::write)); - map(0xc004, 0xc004).w("y2404_3", FUNC(y2404_device::write)); + map(0xc001, 0xc001).w("y2404_1", FUNC(y2404_device::command_w)); + map(0xc003, 0xc003).w("y2404_2", FUNC(y2404_device::command_w)); + map(0xc004, 0xc004).w("y2404_3", FUNC(y2404_device::command_w)); } diff --git a/src/mame/drivers/tr175.cpp b/src/mame/drivers/tr175.cpp index c8c2628a9a7..f5e3f78351c 100644 --- a/src/mame/drivers/tr175.cpp +++ b/src/mame/drivers/tr175.cpp @@ -59,9 +59,9 @@ void tr175_state::mem_map(address_map &map) map(0xffe000, 0xffe01f).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write)).umask16(0xff00); map(0xffe400, 0xffe40f).rw("avdc", FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0xff00); map(0xffe800, 0xffe805).unmaprw(); //AM_DEVREADWRITE8("pai", um82c11_device, read, write, 0xff00) - map(0xffec01, 0xffec01).w(this, FUNC(tr175_state::ffec01_w)); - map(0xfff000, 0xfff000).w(this, FUNC(tr175_state::fff000_w)); - map(0xfff400, 0xfff400).r(this, FUNC(tr175_state::fff400_r)); + map(0xffec01, 0xffec01).w(FUNC(tr175_state::ffec01_w)); + map(0xfff000, 0xfff000).w(FUNC(tr175_state::fff000_w)); + map(0xfff400, 0xfff400).r(FUNC(tr175_state::fff400_r)); map(0xfffc01, 0xfffc01).w("ramdac", FUNC(ramdac_device::index_w)); map(0xfffc03, 0xfffc03).w("ramdac", FUNC(ramdac_device::pal_w)); map(0xfffc05, 0xfffc05).w("ramdac", FUNC(ramdac_device::mask_w)); diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index a0b63353ba8..e808c9ae14f 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -248,8 +248,8 @@ void trackfld_state::main_map(address_map &map) map(0x1c40, 0x1c5f).ram().share(m_scroll2); map(0x1c60, 0x1fff).ram(); map(0x2800, 0x2fff).ram().share("nvram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); - map(0x3800, 0x3fff).ram().w(this, FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); + map(0x3000, 0x37ff).ram().w(FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); + map(0x3800, 0x3fff).ram().w(FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); map(0x6000, 0xffff).rom(); } @@ -278,9 +278,9 @@ WRITE8_MEMBER(trackfld_state::trackfld_VLM5030_control_w) void trackfld_state::yieartf_map(address_map &map) { - map(0x0000, 0x0000).r(this, FUNC(trackfld_state::trackfld_speech_r)).w(this, FUNC(trackfld_state::konami_SN76496_latch_w)); - map(0x0001, 0x0001).w(this, FUNC(trackfld_state::konami_SN76496_w)); - map(0x0002, 0x0002).w(this, FUNC(trackfld_state::trackfld_VLM5030_control_w)); + map(0x0000, 0x0000).r(FUNC(trackfld_state::trackfld_speech_r)).w(FUNC(trackfld_state::konami_SN76496_latch_w)); + map(0x0001, 0x0001).w(FUNC(trackfld_state::konami_SN76496_w)); + map(0x0002, 0x0002).w(FUNC(trackfld_state::trackfld_VLM5030_control_w)); map(0x0003, 0x0003).w(m_vlm, FUNC(vlm5030_device::data_w)); map(0x1000, 0x1000).mirror(0x007f).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* AFE */ map(0x1080, 0x1087).mirror(0x0078).w("mainlatch", FUNC(ls259_device::write_d0)); @@ -298,8 +298,8 @@ void trackfld_state::yieartf_map(address_map &map) map(0x1c40, 0x1c5f).ram().share(m_scroll2); map(0x1c60, 0x1fff).ram(); map(0x2800, 0x2fff).ram().share("nvram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); - map(0x3800, 0x3fff).ram().w(this, FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); + map(0x3000, 0x37ff).ram().w(FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); + map(0x3800, 0x3fff).ram().w(FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); map(0x6000, 0xffff).rom(); } @@ -323,8 +323,8 @@ void trackfld_state::reaktor_map(address_map &map) map(0x9c60, 0x9fff).ram(); map(0xa800, 0xabff).ram(); map(0xac00, 0xafff).ram().share("nvram"); - map(0xb000, 0xb7ff).ram().w(this, FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); - map(0xb800, 0xbfff).ram().w(this, FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); + map(0xb000, 0xb7ff).ram().w(FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); + map(0xb800, 0xbfff).ram().w(FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); } /* Reaktor reads / writes some I/O ports, no idea what they're connected to, if anything */ @@ -356,8 +356,8 @@ void trackfld_state::mastkin_map(address_map &map) map(0x2000, 0x27ff).ram(); // initialized at POST map(0x2800, 0x2bff).ram(); map(0x2c00, 0x2fff).ram().share("nvram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); - map(0x3800, 0x3fff).ram().w(this, FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); + map(0x3000, 0x37ff).ram().w(FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); + map(0x3800, 0x3fff).ram().w(FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); map(0x6000, 0xffff).rom(); } @@ -380,9 +380,9 @@ void trackfld_state::wizzquiz_map(address_map &map) map(0x1c60, 0x1fff).ram(); map(0x2800, 0x2bff).ram(); map(0x2c00, 0x2fff).ram().share("nvram"); - map(0x3000, 0x37ff).ram().w(this, FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); - map(0x3800, 0x3fff).ram().w(this, FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); - map(0xc000, 0xc000).w(this, FUNC(trackfld_state::questions_bank_w)); + map(0x3000, 0x37ff).ram().w(FUNC(trackfld_state::trackfld_videoram_w)).share(m_videoram); + map(0x3800, 0x3fff).ram().w(FUNC(trackfld_state::trackfld_colorram_w)).share(m_colorram); + map(0xc000, 0xc000).w(FUNC(trackfld_state::questions_bank_w)); map(0x6000, 0xdfff).bankr("bank1"); map(0xe000, 0xffff).rom(); } @@ -400,9 +400,9 @@ void trackfld_state::sound_map(address_map &map) map(0x4000, 0x43ff).mirror(0x1c00).ram(); map(0x6000, 0x6000).mirror(0x1fff).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x8000, 0x8000).mirror(0x1fff).r(m_soundbrd, FUNC(trackfld_audio_device::trackfld_sh_timer_r)); - map(0xa000, 0xa000).mirror(0x1fff).w(this, FUNC(trackfld_state::konami_SN76496_latch_w)); - map(0xc000, 0xc000).mirror(0x1fff).r(this, FUNC(trackfld_state::trackfld_SN76496_r)).w(this, FUNC(trackfld_state::konami_SN76496_w)); - map(0xe000, 0xe000).mirror(0x1ff8).w(m_dac, FUNC(dac_byte_interface::write)); + map(0xa000, 0xa000).mirror(0x1fff).w(FUNC(trackfld_state::konami_SN76496_latch_w)); + map(0xc000, 0xc000).mirror(0x1fff).r(FUNC(trackfld_state::trackfld_SN76496_r)).w(FUNC(trackfld_state::konami_SN76496_w)); + map(0xe000, 0xe000).mirror(0x1ff8).w(m_dac, FUNC(dac_byte_interface::data_w)); map(0xe001, 0xe001).mirror(0x1ff8).noprw(); /* watch dog ?; reaktor reads here */ map(0xe002, 0xe002).mirror(0x1ff8).r(m_soundbrd, FUNC(trackfld_audio_device::trackfld_speech_r)); map(0xe003, 0xe003).mirror(0x1c78).select(0x0380).w(m_soundbrd, FUNC(trackfld_audio_device::trackfld_sound_w)); @@ -415,9 +415,9 @@ void trackfld_state::hyprolyb_sound_map(address_map &map) map(0x4000, 0x43ff).mirror(0x1c00).ram(); map(0x6000, 0x6000).mirror(0x1fff).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0x8000, 0x8000).mirror(0x1fff).r(m_soundbrd, FUNC(trackfld_audio_device::trackfld_sh_timer_r)); - map(0xa000, 0xa000).mirror(0x1fff).w(this, FUNC(trackfld_state::konami_SN76496_latch_w)); - map(0xc000, 0xc000).mirror(0x1fff).r(this, FUNC(trackfld_state::trackfld_SN76496_r)).w(this, FUNC(trackfld_state::konami_SN76496_w)); - map(0xe000, 0xe000).mirror(0x1ff8).w(m_dac, FUNC(dac_byte_interface::write)); + map(0xa000, 0xa000).mirror(0x1fff).w(FUNC(trackfld_state::konami_SN76496_latch_w)); + map(0xc000, 0xc000).mirror(0x1fff).r(FUNC(trackfld_state::trackfld_SN76496_r)).w(FUNC(trackfld_state::konami_SN76496_w)); + map(0xe000, 0xe000).mirror(0x1ff8).w(m_dac, FUNC(dac_byte_interface::data_w)); map(0xe001, 0xe001).mirror(0x1ff8).noprw(); /* watch dog ?; reaktor reads here */ map(0xe002, 0xe002).mirror(0x1ff8).r("hyprolyb_adpcm", FUNC(hyprolyb_adpcm_device::busy_r)); map(0xe003, 0xe003).mirror(0x1ff8).nopw(); diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp index 8e44d6944de..e1d20b131ac 100644 --- a/src/mame/drivers/travrusa.cpp +++ b/src/mame/drivers/travrusa.cpp @@ -61,12 +61,12 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines) void travrusa_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8fff).ram().w(this, FUNC(travrusa_state::travrusa_videoram_w)).share("videoram"); - map(0x9000, 0x9000).w(this, FUNC(travrusa_state::travrusa_scroll_x_low_w)); - map(0xa000, 0xa000).w(this, FUNC(travrusa_state::travrusa_scroll_x_high_w)); + map(0x8000, 0x8fff).ram().w(FUNC(travrusa_state::travrusa_videoram_w)).share("videoram"); + map(0x9000, 0x9000).w(FUNC(travrusa_state::travrusa_scroll_x_low_w)); + map(0xa000, 0xa000).w(FUNC(travrusa_state::travrusa_scroll_x_high_w)); map(0xc800, 0xc9ff).writeonly().share("spriteram"); map(0xd000, 0xd000).w("irem_audio", FUNC(irem_audio_device::cmd_w)); - map(0xd001, 0xd001).w(this, FUNC(travrusa_state::travrusa_flipscreen_w)); /* + coin counters - not written by shtrider */ + map(0xd001, 0xd001).w(FUNC(travrusa_state::travrusa_flipscreen_w)); /* + coin counters - not written by shtrider */ map(0xd000, 0xd000).portr("SYSTEM"); /* IN0 */ map(0xd001, 0xd001).portr("P1"); /* IN1 */ map(0xd002, 0xd002).portr("P2"); /* IN2 */ diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp index 99dcb00aa19..0500ec690bb 100644 --- a/src/mame/drivers/tricep.cpp +++ b/src/mame/drivers/tricep.cpp @@ -63,8 +63,8 @@ void tricep_state::tricep_mem(address_map &map) map.unmap_value_high(); map(0x00000000, 0x0007ffff).ram().share("p_ram"); map(0x00fd0000, 0x00fd1fff).rom().region("user1", 0); - map(0x00ff0028, 0x00ff002b).rw(this, FUNC(tricep_state::pci_r), FUNC(tricep_state::pci_w)).umask16(0xffff); - map(0x00ff002f, 0x00ff002f).w(this, FUNC(tricep_state::pci_mux_w)); + map(0x00ff0028, 0x00ff002b).rw(FUNC(tricep_state::pci_r), FUNC(tricep_state::pci_w)).umask16(0xffff); + map(0x00ff002f, 0x00ff002f).w(FUNC(tricep_state::pci_mux_w)); } /* Input ports */ diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp index 1933ff5d280..e43b4a078b0 100644 --- a/src/mame/drivers/triforce.cpp +++ b/src/mame/drivers/triforce.cpp @@ -487,8 +487,8 @@ WRITE64_MEMBER(triforce_state::gc_exi_w) void triforce_state::gc_map(address_map &map) { map(0x00000000, 0x017fffff).ram(); - map(0x0c003000, 0x0c003fff).rw(this, FUNC(triforce_state::gc_pi_r), FUNC(triforce_state::gc_pi_w)); - map(0x0c006800, 0x0c0068ff).rw(this, FUNC(triforce_state::gc_exi_r), FUNC(triforce_state::gc_exi_w)); + map(0x0c003000, 0x0c003fff).rw(FUNC(triforce_state::gc_pi_r), FUNC(triforce_state::gc_pi_w)); + map(0x0c006800, 0x0c0068ff).rw(FUNC(triforce_state::gc_exi_r), FUNC(triforce_state::gc_exi_w)); map(0xfff00000, 0xffffffff).rom().region("maincpu", 0).share("share2"); /* Program ROM */ } diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp index 8303799a973..a4b23ec9b03 100644 --- a/src/mame/drivers/triplhnt.cpp +++ b/src/mame/drivers/triplhnt.cpp @@ -133,10 +133,10 @@ void triplhnt_state::triplhnt_map(address_map &map) map(0x0c08, 0x0c08).portr("0C08"); map(0x0c09, 0x0c09).portr("0C09"); map(0x0c0a, 0x0c0a).portr("0C0A"); - map(0x0c0b, 0x0c0b).r(this, FUNC(triplhnt_state::input_port_4_r)); - map(0x0c10, 0x0c1f).r(this, FUNC(triplhnt_state::da_latch_r)); - map(0x0c20, 0x0c2f).r(this, FUNC(triplhnt_state::cmos_r)).share("nvram"); - map(0x0c30, 0x0c3f).r(this, FUNC(triplhnt_state::misc_r)).w(m_latch, FUNC(f9334_device::write_a0)); + map(0x0c0b, 0x0c0b).r(FUNC(triplhnt_state::input_port_4_r)); + map(0x0c10, 0x0c1f).r(FUNC(triplhnt_state::da_latch_r)); + map(0x0c20, 0x0c2f).r(FUNC(triplhnt_state::cmos_r)).share("nvram"); + map(0x0c30, 0x0c3f).r(FUNC(triplhnt_state::misc_r)).w(m_latch, FUNC(f9334_device::write_a0)); map(0x0c40, 0x0c40).portr("0C40"); map(0x0c48, 0x0c48).portr("0C48"); map(0x7000, 0x7fff).rom(); /* program */ diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index 9e07ebf31a7..53fd2467eeb 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -148,8 +148,8 @@ There don't seem to be any JV1 boot disks for Model III/4. void trs80_state::trs80_map(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x3800, 0x38ff).r(this, FUNC(trs80_state::trs80_keyboard_r)); - map(0x3c00, 0x3fff).rw(this, FUNC(trs80_state::trs80_videoram_r), FUNC(trs80_state::trs80_videoram_w)).share("videoram"); + map(0x3800, 0x38ff).r(FUNC(trs80_state::trs80_keyboard_r)); + map(0x3c00, 0x3fff).rw(FUNC(trs80_state::trs80_videoram_r), FUNC(trs80_state::trs80_videoram_w)).share("videoram"); map(0x4000, 0x7fff).ram(); } @@ -157,24 +157,24 @@ void trs80_state::trs80_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xff, 0xff).rw(this, FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); + map(0xff, 0xff).rw(FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); } void trs80_state::model1_map(address_map &map) { map(0x0000, 0x377f).rom(); // sys80,ht1080 needs up to 375F - map(0x37de, 0x37de).rw(this, FUNC(trs80_state::sys80_f9_r), FUNC(trs80_state::sys80_f8_w)); + map(0x37de, 0x37de).rw(FUNC(trs80_state::sys80_f9_r), FUNC(trs80_state::sys80_f8_w)); map(0x37df, 0x37df).rw("uart", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0x37e0, 0x37e3).rw(this, FUNC(trs80_state::trs80_irq_status_r), FUNC(trs80_state::trs80_motor_w)); - map(0x37e4, 0x37e7).w(this, FUNC(trs80_state::trs80_cassunit_w)); - map(0x37e8, 0x37eb).rw(this, FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); - map(0x37ec, 0x37ec).r(this, FUNC(trs80_state::trs80_wd179x_r)); + map(0x37e0, 0x37e3).rw(FUNC(trs80_state::trs80_irq_status_r), FUNC(trs80_state::trs80_motor_w)); + map(0x37e4, 0x37e7).w(FUNC(trs80_state::trs80_cassunit_w)); + map(0x37e8, 0x37eb).rw(FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); + map(0x37ec, 0x37ec).r(FUNC(trs80_state::trs80_wd179x_r)); map(0x37ec, 0x37ec).w(m_fdc, FUNC(fd1793_device::cmd_w)); map(0x37ed, 0x37ed).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w)); map(0x37ee, 0x37ee).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w)); map(0x37ef, 0x37ef).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w)); - map(0x3800, 0x38ff).mirror(0x300).r(this, FUNC(trs80_state::trs80_keyboard_r)); - map(0x3c00, 0x3fff).rw(this, FUNC(trs80_state::trs80_videoram_r), FUNC(trs80_state::trs80_videoram_w)).share("videoram"); + map(0x3800, 0x38ff).mirror(0x300).r(FUNC(trs80_state::trs80_keyboard_r)); + map(0x3c00, 0x3fff).rw(FUNC(trs80_state::trs80_videoram_r), FUNC(trs80_state::trs80_videoram_w)).share("videoram"); map(0x4000, 0xffff).ram(); } @@ -182,18 +182,18 @@ void trs80_state::model1_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xff, 0xff).rw(this, FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); + map(0xff, 0xff).rw(FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); } void trs80_state::sys80_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xf8, 0xf8).r("uart", FUNC(ay31015_device::receive)).w(this, FUNC(trs80_state::sys80_f8_w)); - map(0xf9, 0xf9).r(this, FUNC(trs80_state::sys80_f9_r)).w("uart", FUNC(ay31015_device::transmit)); - map(0xfd, 0xfd).rw(this, FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); - map(0xfe, 0xfe).w(this, FUNC(trs80_state::sys80_fe_w)); - map(0xff, 0xff).rw(this, FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); + map(0xf8, 0xf8).r("uart", FUNC(ay31015_device::receive)).w(FUNC(trs80_state::sys80_f8_w)); + map(0xf9, 0xf9).r(FUNC(trs80_state::sys80_f9_r)).w("uart", FUNC(ay31015_device::transmit)); + map(0xfd, 0xfd).rw(FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); + map(0xfe, 0xfe).w(FUNC(trs80_state::sys80_fe_w)); + map(0xff, 0xff).rw(FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); } void trs80_state::lnw80_map(address_map &map) @@ -205,12 +205,12 @@ void trs80_state::lnw80_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xe8, 0xe8).rw(this, FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); + map(0xe8, 0xe8).rw(FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); map(0xe9, 0xe9).portr("E9"); - map(0xea, 0xea).rw(this, FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); + map(0xea, 0xea).rw(FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); map(0xeb, 0xeb).rw("uart", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xfe, 0xfe).rw(this, FUNC(trs80_state::lnw80_fe_r), FUNC(trs80_state::lnw80_fe_w)); - map(0xff, 0xff).rw(this, FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); + map(0xfe, 0xfe).rw(FUNC(trs80_state::lnw80_fe_r), FUNC(trs80_state::lnw80_fe_w)); + map(0xff, 0xff).rw(FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); } void trs80_state::model3_map(address_map &map) @@ -221,77 +221,77 @@ void trs80_state::model3_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xe0, 0xe3).rw(this, FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); - map(0xe4, 0xe4).rw(this, FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); - map(0xe8, 0xe8).rw(this, FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); - map(0xe9, 0xe9).portr("E9").w(this, FUNC(trs80_state::trs80m4_e9_w)); - map(0xea, 0xea).rw(this, FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); + map(0xe0, 0xe3).rw(FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); + map(0xe4, 0xe4).rw(FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); + map(0xe8, 0xe8).rw(FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); + map(0xe9, 0xe9).portr("E9").w(FUNC(trs80_state::trs80m4_e9_w)); + map(0xea, 0xea).rw(FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); map(0xeb, 0xeb).rw("uart", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xec, 0xef).rw(this, FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); - map(0xf0, 0xf0).r(this, FUNC(trs80_state::trs80_wd179x_r)); + map(0xec, 0xef).rw(FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); + map(0xf0, 0xf0).r(FUNC(trs80_state::trs80_wd179x_r)); map(0xf0, 0xf0).w(m_fdc, FUNC(fd1793_device::cmd_w)); map(0xf1, 0xf1).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w)); map(0xf2, 0xf2).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w)); map(0xf3, 0xf3).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w)); - map(0xf4, 0xf4).w(this, FUNC(trs80_state::trs80m4_f4_w)); - map(0xf8, 0xfb).rw(this, FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); - map(0xfc, 0xff).rw(this, FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); + map(0xf4, 0xf4).w(FUNC(trs80_state::trs80m4_f4_w)); + map(0xf8, 0xfb).rw(FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); + map(0xfc, 0xff).rw(FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); } void trs80_state::model4_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x84, 0x87).w(this, FUNC(trs80_state::trs80m4_84_w)); - map(0x88, 0x89).w(this, FUNC(trs80_state::trs80m4_88_w)); - map(0x90, 0x93).w(this, FUNC(trs80_state::trs80m4_90_w)); - map(0xe0, 0xe3).rw(this, FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); - map(0xe4, 0xe4).rw(this, FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); - map(0xe8, 0xe8).rw(this, FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); - map(0xe9, 0xe9).portr("E9").w(this, FUNC(trs80_state::trs80m4_e9_w)); - map(0xea, 0xea).rw(this, FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); + map(0x84, 0x87).w(FUNC(trs80_state::trs80m4_84_w)); + map(0x88, 0x89).w(FUNC(trs80_state::trs80m4_88_w)); + map(0x90, 0x93).w(FUNC(trs80_state::trs80m4_90_w)); + map(0xe0, 0xe3).rw(FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); + map(0xe4, 0xe4).rw(FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); + map(0xe8, 0xe8).rw(FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); + map(0xe9, 0xe9).portr("E9").w(FUNC(trs80_state::trs80m4_e9_w)); + map(0xea, 0xea).rw(FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); map(0xeb, 0xeb).rw("uart", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xec, 0xef).rw(this, FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); - map(0xf0, 0xf0).r(this, FUNC(trs80_state::trs80_wd179x_r)); + map(0xec, 0xef).rw(FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); + map(0xf0, 0xf0).r(FUNC(trs80_state::trs80_wd179x_r)); map(0xf0, 0xf0).w(m_fdc, FUNC(fd1793_device::cmd_w)); map(0xf1, 0xf1).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w)); map(0xf2, 0xf2).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w)); map(0xf3, 0xf3).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w)); - map(0xf4, 0xf4).w(this, FUNC(trs80_state::trs80m4_f4_w)); - map(0xf8, 0xfb).rw(this, FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); - map(0xfc, 0xff).rw(this, FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); + map(0xf4, 0xf4).w(FUNC(trs80_state::trs80m4_f4_w)); + map(0xf8, 0xfb).rw(FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); + map(0xfc, 0xff).rw(FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); } void trs80_state::model4p_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0x84, 0x87).w(this, FUNC(trs80_state::trs80m4_84_w)); - map(0x88, 0x89).w(this, FUNC(trs80_state::trs80m4_88_w)); - map(0x90, 0x93).w(this, FUNC(trs80_state::trs80m4_90_w)); - map(0x9c, 0x9f).w(this, FUNC(trs80_state::trs80m4p_9c_w)); - map(0xe0, 0xe3).rw(this, FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); - map(0xe4, 0xe4).rw(this, FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); - map(0xe8, 0xe8).rw(this, FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); - map(0xe9, 0xe9).portr("E9").w(this, FUNC(trs80_state::trs80m4_e9_w)); - map(0xea, 0xea).rw(this, FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); + map(0x84, 0x87).w(FUNC(trs80_state::trs80m4_84_w)); + map(0x88, 0x89).w(FUNC(trs80_state::trs80m4_88_w)); + map(0x90, 0x93).w(FUNC(trs80_state::trs80m4_90_w)); + map(0x9c, 0x9f).w(FUNC(trs80_state::trs80m4p_9c_w)); + map(0xe0, 0xe3).rw(FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); + map(0xe4, 0xe4).rw(FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); + map(0xe8, 0xe8).rw(FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); + map(0xe9, 0xe9).portr("E9").w(FUNC(trs80_state::trs80m4_e9_w)); + map(0xea, 0xea).rw(FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); map(0xeb, 0xeb).rw("uart", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xec, 0xef).rw(this, FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); - map(0xf0, 0xf0).r(this, FUNC(trs80_state::trs80_wd179x_r)); + map(0xec, 0xef).rw(FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); + map(0xf0, 0xf0).r(FUNC(trs80_state::trs80_wd179x_r)); map(0xf0, 0xf0).w(m_fdc, FUNC(fd1793_device::cmd_w)); map(0xf1, 0xf1).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w)); map(0xf2, 0xf2).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w)); map(0xf3, 0xf3).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w)); - map(0xf4, 0xf4).w(this, FUNC(trs80_state::trs80m4_f4_w)); - map(0xf8, 0xfb).rw(this, FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); - map(0xfc, 0xff).rw(this, FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); + map(0xf4, 0xf4).w(FUNC(trs80_state::trs80m4_f4_w)); + map(0xf8, 0xfb).rw(FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); + map(0xfc, 0xff).rw(FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); } void trs80_state::meritum_map(address_map &map) { map(0x0000, 0x37ff).rom(); - map(0x3800, 0x38ff).mirror(0x300).r(this, FUNC(trs80_state::trs80_keyboard_r)); - map(0x3c00, 0x3fff).rw(this, FUNC(trs80_state::trs80_videoram_r), FUNC(trs80_state::trs80_videoram_w)).share("videoram"); + map(0x3800, 0x38ff).mirror(0x300).r(FUNC(trs80_state::trs80_keyboard_r)); + map(0x3c00, 0x3fff).rw(FUNC(trs80_state::trs80_videoram_r), FUNC(trs80_state::trs80_videoram_w)).share("videoram"); map(0x4000, 0xffff).ram(); } @@ -304,37 +304,37 @@ void trs80_state::meritum_io(address_map &map) // The disk input expects values that are different to the usual, // eg. port F0 should be 5, port F2 should have bit 3 set. //AM_RANGE(0x03, 0x03) unknown - map(0xf0, 0xf0).r(this, FUNC(trs80_state::trs80_wd179x_r)); + map(0xf0, 0xf0).r(FUNC(trs80_state::trs80_wd179x_r)); map(0xf0, 0xf0).w(m_fdc, FUNC(fd1793_device::cmd_w)); map(0xf1, 0xf1).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w)); map(0xf2, 0xf2).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w)); map(0xf3, 0xf3).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w)); - map(0xf4, 0xf4).w(this, FUNC(trs80_state::trs80m4_f4_w)); - map(0xf8, 0xfb).rw(this, FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); + map(0xf4, 0xf4).w(FUNC(trs80_state::trs80m4_f4_w)); + map(0xf8, 0xfb).rw(FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); //AM_RANGE(0xfc, 0xfd) unknown - map(0xff, 0xff).rw(this, FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); + map(0xff, 0xff).rw(FUNC(trs80_state::trs80_ff_r), FUNC(trs80_state::trs80_ff_w)); } void trs80_state::cp500_io(address_map &map) { map.global_mask(0xff); map.unmap_value_high(); - map(0xe0, 0xe3).rw(this, FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); - map(0xe4, 0xe4).rw(this, FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); - map(0xe8, 0xe8).rw(this, FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); - map(0xe9, 0xe9).portr("E9").w(this, FUNC(trs80_state::trs80m4_e9_w)); - map(0xea, 0xea).rw(this, FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); + map(0xe0, 0xe3).rw(FUNC(trs80_state::trs80m4_e0_r), FUNC(trs80_state::trs80m4_e0_w)); + map(0xe4, 0xe4).rw(FUNC(trs80_state::trs80m4_e4_r), FUNC(trs80_state::trs80m4_e4_w)); + map(0xe8, 0xe8).rw(FUNC(trs80_state::trs80m4_e8_r), FUNC(trs80_state::trs80m4_e8_w)); + map(0xe9, 0xe9).portr("E9").w(FUNC(trs80_state::trs80m4_e9_w)); + map(0xea, 0xea).rw(FUNC(trs80_state::trs80m4_ea_r), FUNC(trs80_state::trs80m4_ea_w)); map(0xeb, 0xeb).rw("uart", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xec, 0xef).rw(this, FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); - map(0xf0, 0xf0).r(this, FUNC(trs80_state::trs80_wd179x_r)); + map(0xec, 0xef).rw(FUNC(trs80_state::trs80m4_ec_r), FUNC(trs80_state::trs80m4_ec_w)); + map(0xf0, 0xf0).r(FUNC(trs80_state::trs80_wd179x_r)); map(0xf0, 0xf0).w(m_fdc, FUNC(fd1793_device::cmd_w)); map(0xf1, 0xf1).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w)); map(0xf2, 0xf2).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w)); map(0xf3, 0xf3).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w)); - map(0xf4, 0xf4).w(this, FUNC(trs80_state::trs80m4_f4_w)); - map(0xf4, 0xf7).r(this, FUNC(trs80_state::cp500_a11_flipflop_toggle)); - map(0xf8, 0xfb).rw(this, FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); - map(0xfc, 0xff).rw(this, FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); + map(0xf4, 0xf4).w(FUNC(trs80_state::trs80m4_f4_w)); + map(0xf4, 0xf7).r(FUNC(trs80_state::cp500_a11_flipflop_toggle)); + map(0xf8, 0xfb).rw(FUNC(trs80_state::trs80_printer_r), FUNC(trs80_state::trs80_printer_w)); + map(0xfc, 0xff).rw(FUNC(trs80_state::trs80m4_ff_r), FUNC(trs80_state::trs80m4_ff_w)); } /************************************************************************** diff --git a/src/mame/drivers/trs80dt1.cpp b/src/mame/drivers/trs80dt1.cpp index 1b6e796d086..e76f234ae24 100644 --- a/src/mame/drivers/trs80dt1.cpp +++ b/src/mame/drivers/trs80dt1.cpp @@ -146,7 +146,7 @@ WRITE8_MEMBER( trs80dt1_state::port3_w ) void trs80dt1_state::prg_map(address_map &map) { map(0x0000, 0x0fff).rom(); - map(0x2000, 0x27ff).r(this, FUNC(trs80dt1_state::dma_r)); + map(0x2000, 0x27ff).r(FUNC(trs80dt1_state::dma_r)); } void trs80dt1_state::io_map(address_map &map) @@ -154,9 +154,9 @@ void trs80dt1_state::io_map(address_map &map) map.global_mask(0xbfff); // A14 not used map(0xa000, 0xa7ff).ram().share("videoram"); map(0xa800, 0xa83f).mirror(0x3c0).rw(m_nvram, FUNC(x2210_device::read), FUNC(x2210_device::write)); // X2210 - map(0xac00, 0xafff).r(this, FUNC(trs80dt1_state::key_r)); + map(0xac00, 0xafff).r(FUNC(trs80dt1_state::key_r)); map(0xb000, 0xb3ff).portr("X9"); // also reads some RS232 inputs - map(0xb400, 0xb7ff).w(this, FUNC(trs80dt1_state::store_w)); + map(0xb400, 0xb7ff).w(FUNC(trs80dt1_state::store_w)); map(0xbc00, 0xbc01).mirror(0x3fe).rw(m_crtc, FUNC(i8275_device::read), FUNC(i8275_device::write)); // i8276 } diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index 0893ffbbb61..4e85e98b262 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -321,7 +321,7 @@ WRITE8_MEMBER( trs80m16_state::ual_w ) void trs80m2_state::z80_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(trs80m2_state::read), FUNC(trs80m2_state::write)); + map(0x0000, 0xffff).rw(FUNC(trs80m2_state::read), FUNC(trs80m2_state::write)); } @@ -333,16 +333,16 @@ void trs80m2_state::z80_io(address_map &map) { map.global_mask(0xff); map(0xe0, 0xe3).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0xe4, 0xe7).rw(this, FUNC(trs80m2_state::fdc_r), FUNC(trs80m2_state::fdc_w)); - map(0xef, 0xef).w(this, FUNC(trs80m2_state::drvslt_w)); + map(0xe4, 0xe7).rw(FUNC(trs80m2_state::fdc_r), FUNC(trs80m2_state::fdc_w)); + map(0xef, 0xef).w(FUNC(trs80m2_state::drvslt_w)); map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0xf4, 0xf7).rw(Z80SIO_TAG, FUNC(z80sio0_device::cd_ba_r), FUNC(z80sio0_device::cd_ba_w)); - map(0xf8, 0xf8).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); - map(0xf9, 0xf9).w(this, FUNC(trs80m2_state::rom_enable_w)); - map(0xfc, 0xfc).r(this, FUNC(trs80m2_state::keyboard_r)).w(m_crtc, FUNC(mc6845_device::address_w)); + map(0xf8, 0xf8).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0xf9, 0xf9).w(FUNC(trs80m2_state::rom_enable_w)); + map(0xfc, 0xfc).r(FUNC(trs80m2_state::keyboard_r)).w(m_crtc, FUNC(mc6845_device::address_w)); map(0xfd, 0xfd).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0xfe, 0xfe).r(this, FUNC(trs80m2_state::rtc_r)); - map(0xff, 0xff).rw(this, FUNC(trs80m2_state::nmi_r), FUNC(trs80m2_state::nmi_w)); + map(0xfe, 0xfe).r(FUNC(trs80m2_state::rtc_r)); + map(0xff, 0xff).rw(FUNC(trs80m2_state::nmi_r), FUNC(trs80m2_state::nmi_w)); } @@ -353,8 +353,8 @@ void trs80m2_state::z80_io(address_map &map) void trs80m16_state::m16_z80_io(address_map &map) { z80_io(map); - map(0xde, 0xde).w(this, FUNC(trs80m16_state::tcl_w)); - map(0xdf, 0xdf).w(this, FUNC(trs80m16_state::ual_w)); + map(0xde, 0xde).w(FUNC(trs80m16_state::tcl_w)); + map(0xdf, 0xdf).w(FUNC(trs80m16_state::ual_w)); } @@ -760,7 +760,7 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, trs80m2_state, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, trs80m2_state, pio_pa_w)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, trs80m2_state, strobe_w)) MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 8_MHz_XTAL / 2) @@ -850,7 +850,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, trs80m2_state, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, trs80m2_state, pio_pa_w)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, trs80m2_state, strobe_w)) MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 8_MHz_XTAL / 2) diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp index d9c20f51bc2..0bdee51cc87 100644 --- a/src/mame/drivers/trucocl.cpp +++ b/src/mame/drivers/trucocl.cpp @@ -95,12 +95,12 @@ WRITE8_MEMBER(trucocl_state::audio_dac_w) void trucocl_state::main_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x4000, 0x43ff).ram().w(this, FUNC(trucocl_state::trucocl_videoram_w)).share("videoram"); - map(0x4400, 0x47ff).ram().w(this, FUNC(trucocl_state::trucocl_colorram_w)).share("colorram"); + map(0x4000, 0x43ff).ram().w(FUNC(trucocl_state::trucocl_videoram_w)).share("videoram"); + map(0x4400, 0x47ff).ram().w(FUNC(trucocl_state::trucocl_colorram_w)).share("colorram"); map(0x4c00, 0x4fff).ram(); - map(0x5000, 0x5000).w(this, FUNC(trucocl_state::irq_enable_w)); + map(0x5000, 0x5000).w(FUNC(trucocl_state::irq_enable_w)); map(0x5000, 0x503f).portr("IN0"); - map(0x5080, 0x5080).w(this, FUNC(trucocl_state::audio_dac_w)); + map(0x5080, 0x5080).w(FUNC(trucocl_state::audio_dac_w)); map(0x50c0, 0x50c0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp index f9e0eab8b74..135ca6efac8 100644 --- a/src/mame/drivers/trvmadns.cpp +++ b/src/mame/drivers/trvmadns.cpp @@ -261,12 +261,12 @@ void trvmadns_state::cpu_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).bankr("bank1"); map(0x7000, 0x7fff).bankr("bank2"); - map(0x6000, 0x7fff).w(this, FUNC(trvmadns_state::trvmadns_gfxram_w)).share("gfxram"); + map(0x6000, 0x7fff).w(FUNC(trvmadns_state::trvmadns_gfxram_w)).share("gfxram"); map(0x8000, 0x87ff).ram(); - map(0xa000, 0xa7ff).ram().w(this, FUNC(trvmadns_state::trvmadns_tileram_w)).share("tileram"); - map(0xc000, 0xc01f).ram().w(this, FUNC(trvmadns_state::trvmadns_palette_w)).share("paletteram"); - map(0xe000, 0xe000).w(this, FUNC(trvmadns_state::w2));//NOP - map(0xe004, 0xe004).w(this, FUNC(trvmadns_state::w3));//NOP + map(0xa000, 0xa7ff).ram().w(FUNC(trvmadns_state::trvmadns_tileram_w)).share("tileram"); + map(0xc000, 0xc01f).ram().w(FUNC(trvmadns_state::trvmadns_palette_w)).share("paletteram"); + map(0xe000, 0xe000).w(FUNC(trvmadns_state::w2));//NOP + map(0xe004, 0xe004).w(FUNC(trvmadns_state::w3));//NOP } void trvmadns_state::io_map(address_map &map) @@ -274,7 +274,7 @@ void trvmadns_state::io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x01).w("aysnd", FUNC(ay8910_device::address_data_w)); map(0x02, 0x02).portr("IN0"); - map(0x80, 0x80).w(this, FUNC(trvmadns_state::trvmadns_banking_w)); + map(0x80, 0x80).w(FUNC(trvmadns_state::trvmadns_banking_w)); } static INPUT_PORTS_START( trvmadns ) diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp index 97c221dd06d..6cad05b5f61 100644 --- a/src/mame/drivers/trvquest.cpp +++ b/src/mame/drivers/trvquest.cpp @@ -71,7 +71,7 @@ void gameplan_state::cpu_map(address_map &map) map(0x3830, 0x3831).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x3840, 0x3841).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x3850, 0x3850).nopr(); //watchdog_reset_r ? - map(0x8000, 0x9fff).r(this, FUNC(gameplan_state::trvquest_question_r)); + map(0x8000, 0x9fff).r(FUNC(gameplan_state::trvquest_question_r)); map(0xa000, 0xa000).writeonly().share("trvquest_q"); map(0xa000, 0xa000).nopr(); // bogus read from the game code when reads question roms map(0xb000, 0xffff).rom(); diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp index a3d423a22d4..ebab1a7767b 100644 --- a/src/mame/drivers/tryout.cpp +++ b/src/mame/drivers/tryout.cpp @@ -59,22 +59,22 @@ WRITE8_MEMBER(tryout_state::bankswitch_w) void tryout_state::main_cpu(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x1000, 0x17ff).ram().w(this, FUNC(tryout_state::videoram_w)).share("videoram"); + map(0x1000, 0x17ff).ram().w(FUNC(tryout_state::videoram_w)).share("videoram"); map(0x2000, 0x3fff).bankr("bank1"); map(0x4000, 0xbfff).rom(); map(0xc800, 0xc87f).ram().share("spriteram"); map(0xcc00, 0xcc7f).ram().share("spriteram2"); - map(0xd000, 0xd7ff).rw(this, FUNC(tryout_state::vram_r), FUNC(tryout_state::vram_w)); + map(0xd000, 0xd7ff).rw(FUNC(tryout_state::vram_r), FUNC(tryout_state::vram_w)); map(0xe000, 0xe000).portr("DSW"); map(0xe001, 0xe001).portr("P1"); map(0xe002, 0xe002).portr("P2"); map(0xe003, 0xe003).portr("SYSTEM"); - map(0xe301, 0xe301).w(this, FUNC(tryout_state::flipscreen_w)); - map(0xe302, 0xe302).w(this, FUNC(tryout_state::bankswitch_w)); - map(0xe401, 0xe401).w(this, FUNC(tryout_state::vram_bankswitch_w)); + map(0xe301, 0xe301).w(FUNC(tryout_state::flipscreen_w)); + map(0xe302, 0xe302).w(FUNC(tryout_state::bankswitch_w)); + map(0xe401, 0xe401).w(FUNC(tryout_state::vram_bankswitch_w)); map(0xe402, 0xe404).writeonly().share("gfx_control"); - map(0xe414, 0xe414).w(this, FUNC(tryout_state::sound_w)); - map(0xe417, 0xe417).w(this, FUNC(tryout_state::nmi_ack_w)); + map(0xe414, 0xe414).w(FUNC(tryout_state::sound_w)); + map(0xe417, 0xe417).w(FUNC(tryout_state::nmi_ack_w)); map(0xfff0, 0xffff).rom().region("maincpu", 0xbff0); /* reset vectors */ } @@ -83,7 +83,7 @@ void tryout_state::sound_cpu(address_map &map) map(0x0000, 0x07ff).ram(); map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xd000, 0xd000).w(this, FUNC(tryout_state::sound_irq_ack_w)); + map(0xd000, 0xd000).w(FUNC(tryout_state::sound_irq_ack_w)); map(0xc000, 0xffff).rom(); } diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index 1ca2fd62428..565db23ad6f 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -76,28 +76,28 @@ void ts802_state::ts802_io(address_map &map) { //ADDRESS_MAP_UNMAP_HIGH map.global_mask(0xff); - map(0x00, 0x03).r(this, FUNC(ts802_state::port00_r)); // DIP switches + map(0x00, 0x03).r(FUNC(ts802_state::port00_r)); // DIP switches // 04 - written once after OS boot to bank in RAM from 0000-3FFF instead of ROM. 4000-FFFF is always RAM. - map(0x04, 0x07).w(this, FUNC(ts802_state::port04_w)); + map(0x04, 0x07).w(FUNC(ts802_state::port04_w)); // 08-0B: Z80 CTC map(0x08, 0x0b).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // 0C-0F: Z80 SIO #1 //AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("dart1", z80dart_device, ba_cd_r, ba_cd_w) - map(0x0c, 0x0c).r(this, FUNC(ts802_state::port0c_r)); - map(0x0d, 0x0d).r(this, FUNC(ts802_state::port0d_r)).w(m_terminal, FUNC(generic_terminal_device::write)); - map(0x0e, 0x0e).r(this, FUNC(ts802_state::port0e_r)); - map(0x0f, 0x0f).r(this, FUNC(ts802_state::port0f_r)); + map(0x0c, 0x0c).r(FUNC(ts802_state::port0c_r)); + map(0x0d, 0x0d).r(FUNC(ts802_state::port0d_r)).w(m_terminal, FUNC(generic_terminal_device::write)); + map(0x0e, 0x0e).r(FUNC(ts802_state::port0e_r)); + map(0x0f, 0x0f).r(FUNC(ts802_state::port0f_r)); // 10: Z80 DMA - map(0x10, 0x13).rw("dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); + map(0x10, 0x13).rw("dma", FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); // 14-17: WD 1793 map(0x14, 0x17).rw("fdc", FUNC(fd1793_device::read), FUNC(fd1793_device::write)); // 18: floppy misc. - map(0x18, 0x1c).w(this, FUNC(ts802_state::port18_w)); + map(0x18, 0x1c).w(FUNC(ts802_state::port18_w)); // 20-23: Z80 SIO #2 map(0x20, 0x23).rw("dart2", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); // 48-4F: WD1000 harddisk controller // 80: LEDs - map(0x80, 0x80).w(this, FUNC(ts802_state::port80_w)); + map(0x80, 0x80).w(FUNC(ts802_state::port80_w)); } diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 7da58bb1246..8cab2a573b6 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -137,15 +137,15 @@ void ts803_state::ts803_io(address_map &map) map.global_mask(0xff); map.unmap_value_high(); map(0x00, 0x0f).portr("DSW"); - map(0x10, 0x1f).rw(this, FUNC(ts803_state::port10_r), FUNC(ts803_state::port10_w)); + map(0x10, 0x1f).rw(FUNC(ts803_state::port10_r), FUNC(ts803_state::port10_w)); map(0x20, 0x2f).rw("sti", FUNC(z80sti_device::read), FUNC(z80sti_device::write)); map(0x30, 0x33).rw("dart", FUNC(z80dart_device::cd_ba_r), FUNC(z80dart_device::cd_ba_w)); map(0x80, 0x83).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); - map(0x90, 0x9f).rw(this, FUNC(ts803_state::disk_0_control_r), FUNC(ts803_state::disk_0_control_w)); - map(0xa0, 0xbf).rw(this, FUNC(ts803_state::porta0_r), FUNC(ts803_state::porta0_w)); + map(0x90, 0x9f).rw(FUNC(ts803_state::disk_0_control_r), FUNC(ts803_state::disk_0_control_w)); + map(0xa0, 0xbf).rw(FUNC(ts803_state::porta0_r), FUNC(ts803_state::porta0_w)); map(0xc0, 0xc0).rw("crtc", FUNC(sy6545_1_device::status_r), FUNC(sy6545_1_device::address_w)); map(0xc2, 0xc2).rw("crtc", FUNC(sy6545_1_device::register_r), FUNC(sy6545_1_device::register_w)); - map(0xc4, 0xc4).w(this, FUNC(ts803_state::crtc_controlreg_w)); + map(0xc4, 0xc4).w(FUNC(ts803_state::crtc_controlreg_w)); } /* Input ports */ diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp index 1aa9bf9dcf5..38fa978d5ee 100644 --- a/src/mame/drivers/ts816.cpp +++ b/src/mame/drivers/ts816.cpp @@ -85,21 +85,21 @@ void ts816_state::ts816_io(address_map &map) map(0x40, 0x43).rw("sio4", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); // SIO 4 for user 7 & 8 map(0x48, 0x4b).rw("sio8", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); // SIO 8 for user 15 & 16 //AM_RANGE(0x50, 0x53) // SIO 0 for RS232 1 and part of tape interface - map(0x50, 0x50).r(this, FUNC(ts816_state::keyin_r)).w(m_terminal, FUNC(generic_terminal_device::write)); - map(0x52, 0x52).r(this, FUNC(ts816_state::status_r)); + map(0x50, 0x50).r(FUNC(ts816_state::keyin_r)).w(m_terminal, FUNC(generic_terminal_device::write)); + map(0x52, 0x52).r(FUNC(ts816_state::status_r)); map(0x58, 0x5b).rw("sio9", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); // SIO 9 for RS232 2 & 3 map(0x60, 0x60).portr("DSW"); - map(0x68, 0x68).w(this, FUNC(ts816_state::port68_w)); // set 2nd bank latch - map(0x70, 0x78).w(this, FUNC(ts816_state::port78_w)); // reset 2nd bank latch (manual can't decide between 70 and 78, so we take both) + map(0x68, 0x68).w(FUNC(ts816_state::port68_w)); // set 2nd bank latch + map(0x70, 0x78).w(FUNC(ts816_state::port78_w)); // reset 2nd bank latch (manual can't decide between 70 and 78, so we take both) map(0x80, 0x83).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // CTC 1 (ch 0 baud A) - map(0x90, 0x93).rw("dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // DMA + map(0x90, 0x93).rw("dma", FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); // DMA map(0xA0, 0xA0); // WDC status / command map(0xA1, 0xA1); // WDC data map(0xB0, 0xB0).noprw(); // undocumented, written to at @0707 and @0710 map(0xC0, 0xC3).rw("ctc2", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // CTC 2 (ch 0 baud B, ch 1 baud C) map(0xD0, 0xD3).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0xE0, 0xE0).w(this, FUNC(ts816_state::porte0_w)); // set ENDRAM memory banking - map(0xF0, 0xF0).w(this, FUNC(ts816_state::portf0_w)); // reset ENDRAM memory banking + map(0xE0, 0xE0).w(FUNC(ts816_state::porte0_w)); // set ENDRAM memory banking + map(0xF0, 0xF0).w(FUNC(ts816_state::portf0_w)); // reset ENDRAM memory banking } diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index e01943368e4..9e635360c4e 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -150,25 +150,25 @@ void tsamurai_state::main_map(address_map &map) map(0xc000, 0xcfff).ram(); /* protection? - there are writes as well...*/ - map(0xd803, 0xd803).r(this, FUNC(tsamurai_state::tsamurai_unknown_d803_r)); - map(0xd806, 0xd806).r(this, FUNC(tsamurai_state::unknown_d806_r)); - map(0xd900, 0xd900).r(this, FUNC(tsamurai_state::unknown_d900_r)); - map(0xd938, 0xd938).r(this, FUNC(tsamurai_state::unknown_d938_r)); + map(0xd803, 0xd803).r(FUNC(tsamurai_state::tsamurai_unknown_d803_r)); + map(0xd806, 0xd806).r(FUNC(tsamurai_state::unknown_d806_r)); + map(0xd900, 0xd900).r(FUNC(tsamurai_state::unknown_d900_r)); + map(0xd938, 0xd938).r(FUNC(tsamurai_state::unknown_d938_r)); - map(0xe000, 0xe3ff).ram().w(this, FUNC(tsamurai_state::fg_videoram_w)).share("videoram"); - map(0xe400, 0xe43f).ram().w(this, FUNC(tsamurai_state::fg_colorram_w)).share("colorram"); + map(0xe000, 0xe3ff).ram().w(FUNC(tsamurai_state::fg_videoram_w)).share("videoram"); + map(0xe400, 0xe43f).ram().w(FUNC(tsamurai_state::fg_colorram_w)).share("colorram"); map(0xe440, 0xe7ff).ram(); - map(0xe800, 0xefff).ram().w(this, FUNC(tsamurai_state::bg_videoram_w)).share("bg_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(tsamurai_state::bg_videoram_w)).share("bg_videoram"); map(0xf000, 0xf3ff).ram().share("spriteram"); map(0xf400, 0xf400).nopw(); - map(0xf401, 0xf401).w(this, FUNC(tsamurai_state::sound_command1_w)); - map(0xf402, 0xf402).w(this, FUNC(tsamurai_state::sound_command2_w)); + map(0xf401, 0xf401).w(FUNC(tsamurai_state::sound_command1_w)); + map(0xf402, 0xf402).w(FUNC(tsamurai_state::sound_command2_w)); map(0xf800, 0xf800).portr("P1"); - map(0xf801, 0xf801).portr("P2").w(this, FUNC(tsamurai_state::bgcolor_w)); - map(0xf802, 0xf802).portr("SYSTEM").w(this, FUNC(tsamurai_state::scrolly_w)); - map(0xf803, 0xf803).w(this, FUNC(tsamurai_state::scrollx_w)); + map(0xf801, 0xf801).portr("P2").w(FUNC(tsamurai_state::bgcolor_w)); + map(0xf802, 0xf802).portr("SYSTEM").w(FUNC(tsamurai_state::scrolly_w)); + map(0xf803, 0xf803).w(FUNC(tsamurai_state::scrollx_w)); map(0xf804, 0xf804).portr("DSW1"); map(0xf805, 0xf805).portr("DSW2"); @@ -181,26 +181,26 @@ void tsamurai_state::m660_map(address_map &map) map(0xc000, 0xcfff).ram(); /* protection? - there are writes as well...*/ - map(0xd803, 0xd803).r(this, FUNC(tsamurai_state::m660_unknown_d803_r)); - map(0xd806, 0xd806).r(this, FUNC(tsamurai_state::unknown_d806_r)); - map(0xd900, 0xd900).r(this, FUNC(tsamurai_state::unknown_d900_r)); - map(0xd938, 0xd938).r(this, FUNC(tsamurai_state::unknown_d938_r)); + map(0xd803, 0xd803).r(FUNC(tsamurai_state::m660_unknown_d803_r)); + map(0xd806, 0xd806).r(FUNC(tsamurai_state::unknown_d806_r)); + map(0xd900, 0xd900).r(FUNC(tsamurai_state::unknown_d900_r)); + map(0xd938, 0xd938).r(FUNC(tsamurai_state::unknown_d938_r)); - map(0xe000, 0xe3ff).ram().w(this, FUNC(tsamurai_state::fg_videoram_w)).share("videoram"); - map(0xe400, 0xe43f).ram().w(this, FUNC(tsamurai_state::fg_colorram_w)).share("colorram"); + map(0xe000, 0xe3ff).ram().w(FUNC(tsamurai_state::fg_videoram_w)).share("videoram"); + map(0xe400, 0xe43f).ram().w(FUNC(tsamurai_state::fg_colorram_w)).share("colorram"); map(0xe440, 0xe7ff).ram(); - map(0xe800, 0xefff).ram().w(this, FUNC(tsamurai_state::bg_videoram_w)).share("bg_videoram"); + map(0xe800, 0xefff).ram().w(FUNC(tsamurai_state::bg_videoram_w)).share("bg_videoram"); map(0xf000, 0xf3ff).ram().share("spriteram"); map(0xf400, 0xf400).nopw();/* This is always written with F401, F402 & F403 data */ - map(0xf401, 0xf401).w(this, FUNC(tsamurai_state::m660_sound_command3_w)); - map(0xf402, 0xf402).w(this, FUNC(tsamurai_state::sound_command2_w)); - map(0xf403, 0xf403).w(this, FUNC(tsamurai_state::sound_command1_w)); + map(0xf401, 0xf401).w(FUNC(tsamurai_state::m660_sound_command3_w)); + map(0xf402, 0xf402).w(FUNC(tsamurai_state::sound_command2_w)); + map(0xf403, 0xf403).w(FUNC(tsamurai_state::sound_command1_w)); map(0xf800, 0xf800).portr("P1"); - map(0xf801, 0xf801).portr("P2").w(this, FUNC(tsamurai_state::bgcolor_w)); - map(0xf802, 0xf802).portr("SYSTEM").w(this, FUNC(tsamurai_state::scrolly_w)); - map(0xf803, 0xf803).w(this, FUNC(tsamurai_state::scrollx_w)); + map(0xf801, 0xf801).portr("P2").w(FUNC(tsamurai_state::bgcolor_w)); + map(0xf802, 0xf802).portr("SYSTEM").w(FUNC(tsamurai_state::scrolly_w)); + map(0xf803, 0xf803).w(FUNC(tsamurai_state::scrollx_w)); map(0xf804, 0xf804).portr("DSW1"); map(0xf805, 0xf805).portr("DSW2"); @@ -246,9 +246,9 @@ READ8_MEMBER(tsamurai_state::m660_sound_command3_r) void tsamurai_state::sound1_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x6000, 0x6000).r(this, FUNC(tsamurai_state::sound_command1_r)); + map(0x6000, 0x6000).r(FUNC(tsamurai_state::sound_command1_r)); map(0x6001, 0x6001).nopw(); /* ? - probably clear IRQ */ - map(0x6002, 0x6002).w("dac1", FUNC(dac_byte_interface::write)); + map(0x6002, 0x6002).w("dac1", FUNC(dac_byte_interface::data_w)); map(0x7f00, 0x7fff).ram(); } @@ -257,9 +257,9 @@ void tsamurai_state::sound1_map(address_map &map) void tsamurai_state::sound2_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0x6000, 0x6000).r(this, FUNC(tsamurai_state::sound_command2_r)); + map(0x6000, 0x6000).r(FUNC(tsamurai_state::sound_command2_r)); map(0x6001, 0x6001).nopw(); /* ? - probably clear IRQ */ - map(0x6002, 0x6002).w("dac2", FUNC(dac_byte_interface::write)); + map(0x6002, 0x6002).w("dac2", FUNC(dac_byte_interface::data_w)); map(0x7f00, 0x7fff).ram(); } @@ -268,9 +268,9 @@ void tsamurai_state::sound2_map(address_map &map) void tsamurai_state::sound1_m660_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0xc000, 0xc000).r(this, FUNC(tsamurai_state::sound_command1_r)); + map(0xc000, 0xc000).r(FUNC(tsamurai_state::sound_command1_r)); map(0xc001, 0xc001).nopw(); /* ? - probably clear IRQ */ - map(0xc002, 0xc002).w("dac1", FUNC(dac_byte_interface::write)); + map(0xc002, 0xc002).w("dac1", FUNC(dac_byte_interface::data_w)); map(0x8000, 0x87ff).ram(); } @@ -279,9 +279,9 @@ void tsamurai_state::sound1_m660_map(address_map &map) void tsamurai_state::sound2_m660_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0xc000, 0xc000).r(this, FUNC(tsamurai_state::sound_command2_r)); + map(0xc000, 0xc000).r(FUNC(tsamurai_state::sound_command2_r)); map(0xc001, 0xc001).nopw(); /* ? - probably clear IRQ */ - map(0xc002, 0xc002).w("dac2", FUNC(dac_byte_interface::write)); + map(0xc002, 0xc002).w("dac2", FUNC(dac_byte_interface::data_w)); map(0x8000, 0x87ff).ram(); } @@ -290,7 +290,7 @@ void tsamurai_state::sound2_m660_map(address_map &map) void tsamurai_state::sound3_m660_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xc000, 0xc000).r(this, FUNC(tsamurai_state::m660_sound_command3_r)); + map(0xc000, 0xc000).r(FUNC(tsamurai_state::m660_sound_command3_r)); map(0xc001, 0xc001).nopw(); /* ? - probably clear IRQ */ map(0x8000, 0x87ff).ram(); map(0xfffc, 0xffff).ram(); /* CPU writes here - music data */ @@ -349,15 +349,15 @@ void tsamurai_state::vsgongf_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xa003, 0xa003).readonly(); - map(0xa006, 0xa006).r(this, FUNC(tsamurai_state::vsgongf_a006_r)); /* protection */ - map(0xa100, 0xa100).r(this, FUNC(tsamurai_state::vsgongf_a100_r)); /* protection */ + map(0xa006, 0xa006).r(FUNC(tsamurai_state::vsgongf_a006_r)); /* protection */ + map(0xa100, 0xa100).r(FUNC(tsamurai_state::vsgongf_a100_r)); /* protection */ map(0xc000, 0xc7ff).ram(); /* work ram */ - map(0xe000, 0xe3ff).ram().w(this, FUNC(tsamurai_state::fg_videoram_w)).share("videoram"); + map(0xe000, 0xe3ff).ram().w(FUNC(tsamurai_state::fg_videoram_w)).share("videoram"); map(0xe400, 0xe43f).ram().share("spriteram"); map(0xe440, 0xe47b).ram(); - map(0xe800, 0xe800).w(this, FUNC(tsamurai_state::vsgongf_sound_command_w)); + map(0xe800, 0xe800).w(FUNC(tsamurai_state::vsgongf_sound_command_w)); map(0xec00, 0xec06).writeonly(); - map(0xf000, 0xf000).w(this, FUNC(tsamurai_state::vsgongf_color_w)); + map(0xf000, 0xf000).w(FUNC(tsamurai_state::vsgongf_color_w)); map(0xf400, 0xf400).writeonly(); /* vreg? always 0 */ map(0xf800, 0xf800).portr("P1"); map(0xf801, 0xf801).portr("P2"); @@ -374,8 +374,8 @@ void tsamurai_state::sound_vsgongf_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x6000, 0x63ff).ram(); /* work RAM */ - map(0x8000, 0x8000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(tsamurai_state::vsgongf_sound_nmi_enable_w)); /* NMI enable */ - map(0xa000, 0xa000).w("dac", FUNC(dac_byte_interface::write)); + map(0x8000, 0x8000).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(tsamurai_state::vsgongf_sound_nmi_enable_w)); /* NMI enable */ + map(0xa000, 0xa000).w("dac", FUNC(dac_byte_interface::data_w)); } /*******************************************************************************/ diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp index 283cc43dbbe..aa0da41fb73 100644 --- a/src/mame/drivers/tsispch.cpp +++ b/src/mame/drivers/tsispch.cpp @@ -310,10 +310,10 @@ void tsispch_state::i8086_mem(address_map &map) map(0x03000, 0x03000).mirror(0x341FC).rw("i8251a_u15", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x03002, 0x03002).mirror(0x341FC).rw("i8251a_u15", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x03200, 0x03203).mirror(0x341FC).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); // AMD P8259 PIC @ U5 (reads as 04 and 7c, upper byte is open bus) - map(0x03400, 0x03400).mirror(0x341FE).r(this, FUNC(tsispch_state::dsw_r)); // verified, read from dipswitch s4 - map(0x03401, 0x03401).mirror(0x341FE).w(this, FUNC(tsispch_state::peripheral_w)); // verified, write to the 4 leds, plus 4 control bits - map(0x03600, 0x03601).mirror(0x341FC).rw(this, FUNC(tsispch_state::dsp_data_r), FUNC(tsispch_state::dsp_data_w)); // verified; UPD77P20 data reg r/w - map(0x03602, 0x03603).mirror(0x341FC).rw(this, FUNC(tsispch_state::dsp_status_r), FUNC(tsispch_state::dsp_status_w)); // verified; UPD77P20 status reg r + map(0x03400, 0x03400).mirror(0x341FE).r(FUNC(tsispch_state::dsw_r)); // verified, read from dipswitch s4 + map(0x03401, 0x03401).mirror(0x341FE).w(FUNC(tsispch_state::peripheral_w)); // verified, write to the 4 leds, plus 4 control bits + map(0x03600, 0x03601).mirror(0x341FC).rw(FUNC(tsispch_state::dsp_data_r), FUNC(tsispch_state::dsp_data_w)); // verified; UPD77P20 data reg r/w + map(0x03602, 0x03603).mirror(0x341FC).rw(FUNC(tsispch_state::dsp_status_r), FUNC(tsispch_state::dsp_status_w)); // verified; UPD77P20 status reg r map(0xc0000, 0xfffff).rom(); // verified } diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp index 9d4c85fd112..c0674e47da2 100644 --- a/src/mame/drivers/ttchamp.cpp +++ b/src/mame/drivers/ttchamp.cpp @@ -504,7 +504,7 @@ WRITE16_MEMBER(ttchamp_state::mem_w) void ttchamp_state::ttchamp_map(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(ttchamp_state::mem_r), FUNC(ttchamp_state::mem_w)); + map(0x00000, 0xfffff).rw(FUNC(ttchamp_state::mem_r), FUNC(ttchamp_state::mem_w)); } /* Re-use same parameters as before (one-shot) */ @@ -554,19 +554,19 @@ void ttchamp_state::ttchamp_io(address_map &map) map(0x0006, 0x0006).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x0018, 0x0019).r(this, FUNC(ttchamp_state::blit_start_r)); // read before using bus write offset as blit parameters - map(0x001e, 0x001f).r(this, FUNC(ttchamp_state::port1e_r)); // read before some blit operations (but not all) + map(0x0018, 0x0019).r(FUNC(ttchamp_state::blit_start_r)); // read before using bus write offset as blit parameters + map(0x001e, 0x001f).r(FUNC(ttchamp_state::port1e_r)); // read before some blit operations (but not all) - map(0x0008, 0x0009).w(this, FUNC(ttchamp_state::paldat_w)); - map(0x000a, 0x000b).w(this, FUNC(ttchamp_state::paloff_w)); // bit 0x8000 sometimes gets set, why? + map(0x0008, 0x0009).w(FUNC(ttchamp_state::paldat_w)); + map(0x000a, 0x000b).w(FUNC(ttchamp_state::paloff_w)); // bit 0x8000 sometimes gets set, why? - map(0x0010, 0x0011).w(this, FUNC(ttchamp_state::port10_w)); + map(0x0010, 0x0011).w(FUNC(ttchamp_state::port10_w)); - map(0x0020, 0x0021).w(this, FUNC(ttchamp_state::port20_w)); + map(0x0020, 0x0021).w(FUNC(ttchamp_state::port20_w)); - map(0x0034, 0x0035).rw(this, FUNC(ttchamp_state::pic_r), FUNC(ttchamp_state::pic_w)); + map(0x0034, 0x0035).rw(FUNC(ttchamp_state::pic_r), FUNC(ttchamp_state::pic_w)); - map(0x0062, 0x0063).w(this, FUNC(ttchamp_state::port62_w)); + map(0x0062, 0x0063).w(FUNC(ttchamp_state::port62_w)); } diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index e79836157d7..136c69d973e 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -135,7 +135,7 @@ void tubep_state::tubep_main_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0xa000, 0xa7ff).ram(); - map(0xc000, 0xc7ff).w(this, FUNC(tubep_state::tubep_textram_w)).share("textram"); /* RAM on GFX PCB @B13 */ + map(0xc000, 0xc7ff).w(FUNC(tubep_state::tubep_textram_w)).share("textram"); /* RAM on GFX PCB @B13 */ map(0xe000, 0xe7ff).writeonly().share("share1"); map(0xe800, 0xebff).writeonly().share("backgroundram"); /* row of 8 x 2147 RAMs on main PCB */ } @@ -165,9 +165,9 @@ void tubep_state::tubep_main_portmap(address_map &map) map(0xc0, 0xc0).portr("P2"); map(0xd0, 0xd0).portr("P1"); - map(0x80, 0x80).w(this, FUNC(tubep_state::main_cpu_irq_line_clear_w)); + map(0x80, 0x80).w(FUNC(tubep_state::main_cpu_irq_line_clear_w)); map(0xb0, 0xb7).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xd0, 0xd0).w(this, FUNC(tubep_state::tubep_soundlatch_w)); + map(0xd0, 0xd0).w(FUNC(tubep_state::tubep_soundlatch_w)); } @@ -189,8 +189,8 @@ WRITE8_MEMBER(tubep_state::second_cpu_irq_line_clear_w) void tubep_state::tubep_second_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xa000, 0xa000).w(this, FUNC(tubep_state::tubep_background_a000_w)); - map(0xc000, 0xc000).w(this, FUNC(tubep_state::tubep_background_c000_w)); + map(0xa000, 0xa000).w(FUNC(tubep_state::tubep_background_a000_w)); + map(0xc000, 0xc000).w(FUNC(tubep_state::tubep_background_c000_w)); map(0xe000, 0xe7ff).ram().share("share1"); /* 6116 #1 */ map(0xe800, 0xebff).writeonly().share("backgroundram"); /* row of 8 x 2147 RAMs on main PCB */ map(0xf000, 0xf3ff).writeonly().share("sprite_color"); /* sprites color lookup table */ @@ -201,7 +201,7 @@ void tubep_state::tubep_second_map(address_map &map) void tubep_state::tubep_second_portmap(address_map &map) { map.global_mask(0xff); - map(0x7f, 0x7f).w(this, FUNC(tubep_state::second_cpu_irq_line_clear_w)); + map(0x7f, 0x7f).w(FUNC(tubep_state::second_cpu_irq_line_clear_w)); } @@ -231,7 +231,7 @@ WRITE8_MEMBER(tubep_state::tubep_sound_unknown) void tubep_state::tubep_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); - map(0xd000, 0xd000).r(this, FUNC(tubep_state::tubep_sound_irq_ack)); + map(0xd000, 0xd000).r(FUNC(tubep_state::tubep_sound_irq_ack)); map(0xe000, 0xe7ff).ram(); /* 6116 #3 */ } @@ -242,8 +242,8 @@ void tubep_state::tubep_sound_portmap(address_map &map) map(0x00, 0x01).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x02, 0x03).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x04, 0x05).w("ay3", FUNC(ay8910_device::address_data_w)); - map(0x06, 0x06).r(this, FUNC(tubep_state::tubep_soundlatch_r)); - map(0x07, 0x07).w(this, FUNC(tubep_state::tubep_sound_unknown)); + map(0x06, 0x06).r(FUNC(tubep_state::tubep_soundlatch_r)); + map(0x07, 0x07).w(FUNC(tubep_state::tubep_sound_unknown)); } @@ -372,7 +372,7 @@ void tubep_state::nsc_map(address_map &map) { map(0x0000, 0x03ff).ram().share("sprite_color"); map(0x0800, 0x0fff).ram().share("share2"); - map(0x2000, 0x2009).w(this, FUNC(tubep_state::tubep_sprite_control_w)); + map(0x2000, 0x2009).w(FUNC(tubep_state::tubep_sprite_control_w)); map(0x200a, 0x200b).nopw(); /* not used by the games - perhaps designed for debugging */ map(0xc000, 0xffff).rom(); } @@ -389,7 +389,7 @@ void tubep_state::rjammer_main_map(address_map &map) { map(0x0000, 0x9fff).rom(); map(0xa000, 0xa7ff).ram(); /* MB8416 SRAM on daughterboard on main PCB (there are two SRAMs, this is the one on the left) */ - map(0xc000, 0xc7ff).w(this, FUNC(tubep_state::tubep_textram_w)).share("textram");/* RAM on GFX PCB @B13 */ + map(0xc000, 0xc7ff).w(FUNC(tubep_state::tubep_textram_w)).share("textram");/* RAM on GFX PCB @B13 */ map(0xe000, 0xe7ff).ram().share("share1"); /* MB8416 SRAM on daughterboard (the one on the right) */ } @@ -405,7 +405,7 @@ void tubep_state::rjammer_main_portmap(address_map &map) map(0xc0, 0xc0).portr("P2"); map(0xd0, 0xd7).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xe0, 0xe0).w(this, FUNC(tubep_state::main_cpu_irq_line_clear_w)); /* clear IRQ interrupt */ + map(0xe0, 0xe0).w(FUNC(tubep_state::main_cpu_irq_line_clear_w)); /* clear IRQ interrupt */ map(0xf0, 0xf0).w("soundlatch", FUNC(generic_latch_8_device::write)); } @@ -423,8 +423,8 @@ void tubep_state::rjammer_second_map(address_map &map) void tubep_state::rjammer_second_portmap(address_map &map) { map.global_mask(0xff); - map(0xb0, 0xb0).w(this, FUNC(tubep_state::rjammer_background_page_w)); - map(0xd0, 0xd0).w(this, FUNC(tubep_state::rjammer_background_LS377_w)); + map(0xb0, 0xb0).w(FUNC(tubep_state::rjammer_background_page_w)); + map(0xd0, 0xd0).w(FUNC(tubep_state::rjammer_background_LS377_w)); } @@ -584,13 +584,13 @@ void tubep_state::rjammer_sound_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x10, 0x10).w(this, FUNC(tubep_state::rjammer_voice_startstop_w)); - map(0x18, 0x18).w(this, FUNC(tubep_state::rjammer_voice_frequency_select_w)); - map(0x80, 0x80).w(this, FUNC(tubep_state::rjammer_voice_input_w)); + map(0x10, 0x10).w(FUNC(tubep_state::rjammer_voice_startstop_w)); + map(0x18, 0x18).w(FUNC(tubep_state::rjammer_voice_frequency_select_w)); + map(0x80, 0x80).w(FUNC(tubep_state::rjammer_voice_input_w)); map(0x90, 0x91).w("ay1", FUNC(ay8910_device::address_data_w)); map(0x92, 0x93).w("ay2", FUNC(ay8910_device::address_data_w)); map(0x94, 0x95).w("ay3", FUNC(ay8910_device::address_data_w)); - map(0x96, 0x96).w(this, FUNC(tubep_state::rjammer_voice_intensity_control_w)); + map(0x96, 0x96).w(FUNC(tubep_state::rjammer_voice_intensity_control_w)); } diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index 49d5d01a260..5f7e3c7cf93 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -238,12 +238,12 @@ void tugboat_state::main_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x01ff).ram().share("ram"); map(0x1060, 0x1061).w("aysnd", FUNC(ay8910_device::address_data_w)); - map(0x10a0, 0x10a1).w(this, FUNC(tugboat_state::hd46505_0_w)); /* scrolling is performed changing the start_addr register (0C/0D) */ - map(0x10c0, 0x10c1).w(this, FUNC(tugboat_state::hd46505_1_w)); + map(0x10a0, 0x10a1).w(FUNC(tugboat_state::hd46505_0_w)); /* scrolling is performed changing the start_addr register (0C/0D) */ + map(0x10c0, 0x10c1).w(FUNC(tugboat_state::hd46505_1_w)); map(0x11e4, 0x11e7).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x11e8, 0x11eb).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); //AM_RANGE(0x1700, 0x1fff) AM_RAM - map(0x18e0, 0x18ef).w(this, FUNC(tugboat_state::score_w)); + map(0x18e0, 0x18ef).w(FUNC(tugboat_state::score_w)); map(0x2000, 0x2fff).ram(); /* tilemap RAM */ map(0x4000, 0x7fff).rom(); } diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index 48c79922795..5ad93534425 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -634,17 +634,17 @@ void tumbleb_state::tumblepopb_main_map(address_map &map) #if TUMBLEP_HACK map(0x000000, 0x07ffff).writeonly(); /* To write levels modifications */ #endif - map(0x100000, 0x100001).rw(this, FUNC(tumbleb_state::tumblepb_prot_r), FUNC(tumbleb_state::tumblepb_oki_w)); + map(0x100000, 0x100001).rw(FUNC(tumbleb_state::tumblepb_prot_r), FUNC(tumbleb_state::tumblepb_oki_w)); map(0x120000, 0x123fff).ram().share("mainram"); map(0x140000, 0x1407ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x160000, 0x1607ff).ram().share("spriteram"); /* Bootleg sprite buffer */ map(0x160800, 0x160807).writeonly(); /* writes past the end of spriteram */ - map(0x180000, 0x18000f).r(this, FUNC(tumbleb_state::tumblepopb_controls_r)); + map(0x180000, 0x18000f).r(FUNC(tumbleb_state::tumblepopb_controls_r)); map(0x18000c, 0x18000d).nopw(); map(0x1a0000, 0x1a07ff).ram(); - map(0x300000, 0x30000f).w(this, FUNC(tumbleb_state::tumblepb_control_0_w)); - map(0x320000, 0x320fff).w(this, FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); - map(0x322000, 0x322fff).w(this, FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); + map(0x300000, 0x30000f).w(FUNC(tumbleb_state::tumblepb_control_0_w)); + map(0x320000, 0x320fff).w(FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); + map(0x322000, 0x322fff).w(FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); map(0x340000, 0x3401ff).nopw(); /* Unused row scroll */ map(0x340400, 0x34047f).nopw(); /* Unused col scroll */ map(0x342000, 0x3421ff).nopw(); @@ -662,12 +662,12 @@ void tumbleb_state::fncywld_main_map(address_map &map) map(0x140000, 0x140fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x160000, 0x1607ff).ram().share("spriteram"); /* sprites */ map(0x160800, 0x16080f).writeonly(); /* goes slightly past the end of spriteram? */ - map(0x180000, 0x18000f).r(this, FUNC(tumbleb_state::tumblepopb_controls_r)); + map(0x180000, 0x18000f).r(FUNC(tumbleb_state::tumblepopb_controls_r)); map(0x18000c, 0x18000d).nopw(); map(0x1a0000, 0x1a07ff).ram(); - map(0x300000, 0x30000f).w(this, FUNC(tumbleb_state::tumblepb_control_0_w)); - map(0x320000, 0x321fff).ram().w(this, FUNC(tumbleb_state::fncywld_pf1_data_w)).share("pf1_data"); - map(0x322000, 0x323fff).ram().w(this, FUNC(tumbleb_state::fncywld_pf2_data_w)).share("pf2_data"); + map(0x300000, 0x30000f).w(FUNC(tumbleb_state::tumblepb_control_0_w)); + map(0x320000, 0x321fff).ram().w(FUNC(tumbleb_state::fncywld_pf1_data_w)).share("pf1_data"); + map(0x322000, 0x323fff).ram().w(FUNC(tumbleb_state::fncywld_pf2_data_w)).share("pf2_data"); map(0x340000, 0x3401ff).nopw(); /* Unused row scroll */ map(0x340400, 0x34047f).nopw(); /* Unused col scroll */ map(0x342000, 0x3421ff).nopw(); @@ -684,18 +684,18 @@ READ16_MEMBER(tumbleb_state::semibase_unknown_r) void tumbleb_state::htchctch_main_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x10000f).r(this, FUNC(tumbleb_state::semibase_unknown_r)); - map(0x100000, 0x100001).w(this, FUNC(tumbleb_state::semicom_soundcmd_w)); - map(0x100002, 0x100003).w(this, FUNC(tumbleb_state::bcstory_tilebank_w)); + map(0x100000, 0x10000f).r(FUNC(tumbleb_state::semibase_unknown_r)); + map(0x100000, 0x100001).w(FUNC(tumbleb_state::semicom_soundcmd_w)); + map(0x100002, 0x100003).w(FUNC(tumbleb_state::bcstory_tilebank_w)); map(0x120000, 0x123fff).ram().share("mainram"); map(0x140000, 0x1407ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x160000, 0x160fff).ram().share("spriteram"); /* Bootleg sprite buffer */ - map(0x180000, 0x18000f).r(this, FUNC(tumbleb_state::tumblepopb_controls_r)); + map(0x180000, 0x18000f).r(FUNC(tumbleb_state::tumblepopb_controls_r)); map(0x18000c, 0x18000d).nopw(); map(0x1a0000, 0x1a0fff).ram(); - map(0x300000, 0x30000f).w(this, FUNC(tumbleb_state::tumblepb_control_0_w)); - map(0x320000, 0x321fff).w(this, FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); - map(0x322000, 0x322fff).w(this, FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); + map(0x300000, 0x30000f).w(FUNC(tumbleb_state::tumblepb_control_0_w)); + map(0x320000, 0x321fff).w(FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); + map(0x322000, 0x322fff).w(FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); map(0x323000, 0x331fff).noprw(); // metal saver writes there when clearing the above tilemaps, flaw in the program routine map(0x341000, 0x342fff).ram(); // Extra ram? } @@ -713,13 +713,13 @@ void tumbleb_state::suprtrio_main_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x700000, 0x700fff).ram().share("spriteram"); map(0xa00000, 0xa0000f).ram().share("control"); - map(0xa20000, 0xa20fff).ram().w(this, FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); - map(0xa22000, 0xa22fff).ram().w(this, FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); + map(0xa20000, 0xa20fff).ram().w(FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); + map(0xa22000, 0xa22fff).ram().w(FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); map(0xcf0000, 0xcf05ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xe00000, 0xe00001).portr("PLAYERS").w(this, FUNC(tumbleb_state::suprtrio_tilebank_w)); + map(0xe00000, 0xe00001).portr("PLAYERS").w(FUNC(tumbleb_state::suprtrio_tilebank_w)); map(0xe40000, 0xe40001).portr("SYSTEM"); map(0xe80002, 0xe80003).portr("DSW"); - map(0xec0000, 0xec0001).w(this, FUNC(tumbleb_state::semicom_soundcmd_w)); + map(0xec0000, 0xec0001).w(FUNC(tumbleb_state::semicom_soundcmd_w)); map(0xf00000, 0xf07fff).ram(); } @@ -730,11 +730,11 @@ void tumbleb_state::pangpang_main_map(address_map &map) map(0x140000, 0x1407ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x160000, 0x1607ff).ram().share("spriteram"); /* Bootleg sprite buffer */ map(0x160800, 0x160807).writeonly(); // writes past the end of spriteram - map(0x180000, 0x18000f).r(this, FUNC(tumbleb_state::tumblepopb_controls_r)); + map(0x180000, 0x18000f).r(FUNC(tumbleb_state::tumblepopb_controls_r)); map(0x1a0000, 0x1a07ff).ram(); - map(0x300000, 0x30000f).w(this, FUNC(tumbleb_state::tumblepb_control_0_w)); - map(0x320000, 0x321fff).ram().w(this, FUNC(tumbleb_state::pangpang_pf1_data_w)).share("pf1_data"); - map(0x340000, 0x341fff).ram().w(this, FUNC(tumbleb_state::pangpang_pf2_data_w)).share("pf2_data"); + map(0x300000, 0x30000f).w(FUNC(tumbleb_state::tumblepb_control_0_w)); + map(0x320000, 0x321fff).ram().w(FUNC(tumbleb_state::pangpang_pf1_data_w)).share("pf1_data"); + map(0x340000, 0x341fff).ram().w(FUNC(tumbleb_state::pangpang_pf2_data_w)).share("pf2_data"); } @@ -766,7 +766,7 @@ void tumbleb_state::semicom_sound_map(address_map &map) map(0xf002, 0xf002).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); //AM_RANGE(0xf006, 0xf006) ?? map(0xf008, 0xf008).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xf00e, 0xf00e).w(this, FUNC(tumbleb_state::oki_sound_bank_w)); + map(0xf00e, 0xf00e).w(FUNC(tumbleb_state::oki_sound_bank_w)); } void tumbleb_state::suprtrio_sound_map(address_map &map) @@ -776,7 +776,7 @@ void tumbleb_state::suprtrio_sound_map(address_map &map) map(0xf002, 0xf002).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); //AM_RANGE(0xf006, 0xf006) ?? map(0xf008, 0xf008).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xf00e, 0xf00e).w(this, FUNC(tumbleb_state::oki_sound_bank_w)); + map(0xf00e, 0xf00e).w(FUNC(tumbleb_state::oki_sound_bank_w)); } /* Jump Kids */ @@ -784,17 +784,17 @@ void tumbleb_state::suprtrio_sound_map(address_map &map) void tumbleb_state::jumpkids_main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100001).w(this, FUNC(tumbleb_state::jumpkids_sound_w)); + map(0x100000, 0x100001).w(FUNC(tumbleb_state::jumpkids_sound_w)); map(0x120000, 0x123fff).ram().share("mainram"); map(0x140000, 0x1407ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x160000, 0x1607ff).ram().share("spriteram"); /* Bootleg sprite buffer */ map(0x160800, 0x160807).writeonly(); /* writes past the end of spriteram */ - map(0x180000, 0x18000f).r(this, FUNC(tumbleb_state::tumblepopb_controls_r)); + map(0x180000, 0x18000f).r(FUNC(tumbleb_state::tumblepopb_controls_r)); map(0x18000c, 0x18000d).nopw(); map(0x1a0000, 0x1a07ff).ram(); - map(0x300000, 0x30000f).w(this, FUNC(tumbleb_state::tumblepb_control_0_w)); - map(0x320000, 0x320fff).w(this, FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); - map(0x322000, 0x322fff).w(this, FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); + map(0x300000, 0x30000f).w(FUNC(tumbleb_state::tumblepb_control_0_w)); + map(0x320000, 0x320fff).w(FUNC(tumbleb_state::tumblepb_pf1_data_w)).share("pf1_data"); + map(0x322000, 0x322fff).w(FUNC(tumbleb_state::tumblepb_pf2_data_w)).share("pf2_data"); map(0x340000, 0x3401ff).nopw(); /* Unused row scroll */ map(0x340400, 0x34047f).nopw(); /* Unused col scroll */ map(0x342000, 0x3421ff).nopw(); @@ -814,7 +814,7 @@ void tumbleb_state::jumpkids_sound_map(address_map &map) { map(0x0000, 0x0fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(tumbleb_state::jumpkids_oki_bank_w)); + map(0x9000, 0x9000).w(FUNC(tumbleb_state::jumpkids_oki_bank_w)); map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp index a8595c3d64c..9bfa8649e67 100644 --- a/src/mame/drivers/tunhunt.cpp +++ b/src/mame/drivers/tunhunt.cpp @@ -140,11 +140,11 @@ void tunhunt_state::main_map(address_map &map) map(0x1800, 0x1800).writeonly(); /* SHEL0H */ map(0x1a00, 0x1a00).writeonly(); /* SHEL1H */ map(0x1c00, 0x1c00).writeonly(); /* MOBJV */ - map(0x1e00, 0x1eff).w(this, FUNC(tunhunt_state::videoram_w)).share("videoram"); /* ALPHA */ + map(0x1e00, 0x1eff).w(FUNC(tunhunt_state::videoram_w)).share("videoram"); /* ALPHA */ map(0x2000, 0x2000).nopw(); /* watchdog */ - map(0x2000, 0x2007).r(this, FUNC(tunhunt_state::button_r)); + map(0x2000, 0x2007).r(FUNC(tunhunt_state::button_r)); map(0x2400, 0x2400).nopw(); /* INT ACK */ - map(0x2800, 0x2800).w(this, FUNC(tunhunt_state::control_w)); + map(0x2800, 0x2800).w(FUNC(tunhunt_state::control_w)); map(0x2c00, 0x2fff).writeonly().share("spriteram"); map(0x3000, 0x300f).rw("pokey1", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x4000, 0x400f).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write)); diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp index 81c95edb4c6..ca10b5ab48e 100644 --- a/src/mame/drivers/turbo.cpp +++ b/src/mame/drivers/turbo.cpp @@ -502,12 +502,12 @@ WRITE8_MEMBER(turbo_state::spriteram_w) void turbo_state::turbo_map(address_map &map) { map(0x0000, 0x5fff).rom(); - map(0xa000, 0xa0ff).mirror(0x0700).rw(this, FUNC(turbo_state::spriteram_r), FUNC(turbo_state::spriteram_w)); + map(0xa000, 0xa0ff).mirror(0x0700).rw(FUNC(turbo_state::spriteram_r), FUNC(turbo_state::spriteram_w)); map(0xa800, 0xa807).mirror(0x07f8).w("outlatch", FUNC(ls259_device::write_d0)); map(0xb000, 0xb3ff).mirror(0x0400).ram().share("spritepos"); - map(0xb800, 0xbfff).w(this, FUNC(turbo_state::turbo_analog_reset_w)); - map(0xe000, 0xe7ff).ram().w(this, FUNC(turbo_state::turbo_videoram_w)).share("videoram"); - map(0xe800, 0xefff).w(this, FUNC(turbo_state::turbo_collision_clear_w)); + map(0xb800, 0xbfff).w(FUNC(turbo_state::turbo_analog_reset_w)); + map(0xe000, 0xe7ff).ram().w(FUNC(turbo_state::turbo_videoram_w)).share("videoram"); + map(0xe800, 0xefff).w(FUNC(turbo_state::turbo_collision_clear_w)); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf803).mirror(0x00fc).rw(m_i8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf900, 0xf903).mirror(0x00fc).rw(m_i8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -515,7 +515,7 @@ void turbo_state::turbo_map(address_map &map) map(0xfb00, 0xfb03).mirror(0x00fc).rw(m_i8255_3, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xfc00, 0xfc01).mirror(0x00fe).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write)); map(0xfd00, 0xfdff).portr("INPUT"); - map(0xfe00, 0xfeff).r(this, FUNC(turbo_state::turbo_collision_r)); + map(0xfe00, 0xfeff).r(FUNC(turbo_state::turbo_collision_r)); } @@ -537,7 +537,7 @@ void turbo_state::subroc3d_map(address_map &map) map(0xa803, 0xa803).mirror(0x07fc).portr("DSW3"); // INPUT 253 map(0xb000, 0xb7ff).ram(); // SCRATCH map(0xb800, 0xbfff); // HANDLE CL - map(0xe000, 0xe7ff).ram().w(this, FUNC(turbo_state::turbo_videoram_w)).share("videoram"); // FIX PAGE + map(0xe000, 0xe7ff).ram().w(FUNC(turbo_state::turbo_videoram_w)).share("videoram"); // FIX PAGE map(0xe800, 0xe803).mirror(0x07fc).rw(m_i8255_0, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf000, 0xf003).mirror(0x07fc).rw(m_i8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xf800, 0xf801).mirror(0x07fe).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write)); @@ -554,16 +554,16 @@ void turbo_state::subroc3d_map(address_map &map) void turbo_state::buckrog_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xc000, 0xc7ff).ram().w(this, FUNC(turbo_state::turbo_videoram_w)).share("videoram"); // FIX PAGE - map(0xc800, 0xc803).mirror(0x07fc).r(m_i8255_0, FUNC(i8255_device::read)).w(this, FUNC(turbo_state::buckrog_i8255_0_w)); // 8255 + map(0xc000, 0xc7ff).ram().w(FUNC(turbo_state::turbo_videoram_w)).share("videoram"); // FIX PAGE + map(0xc800, 0xc803).mirror(0x07fc).r(m_i8255_0, FUNC(i8255_device::read)).w(FUNC(turbo_state::buckrog_i8255_0_w)); // 8255 map(0xd000, 0xd003).mirror(0x07fc).rw(m_i8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); // 8255 map(0xd800, 0xd801).mirror(0x07fe).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write)); map(0xe000, 0xe3ff).ram().share("spritepos"); // CONT RAM map(0xe400, 0xe7ff).ram().share("spriteram"); // CONT RAM map(0xe800, 0xe800).mirror(0x07fc).portr("IN0"); // INPUT map(0xe801, 0xe801).mirror(0x07fc).portr("IN1"); - map(0xe802, 0xe802).mirror(0x07fc).r(this, FUNC(turbo_state::buckrog_port_2_r)); - map(0xe803, 0xe803).mirror(0x07fc).r(this, FUNC(turbo_state::buckrog_port_3_r)); + map(0xe802, 0xe802).mirror(0x07fc).r(FUNC(turbo_state::buckrog_port_2_r)); + map(0xe803, 0xe803).mirror(0x07fc).r(FUNC(turbo_state::buckrog_port_3_r)); map(0xf000, 0xf000); map(0xf800, 0xffff).ram(); // SCRATCH } @@ -576,7 +576,7 @@ void turbo_state::decrypted_opcodes_map(address_map &map) void turbo_state::buckrog_cpu2_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x0000, 0xdfff).w(this, FUNC(turbo_state::buckrog_bitmap_w)); + map(0x0000, 0xdfff).w(FUNC(turbo_state::buckrog_bitmap_w)); map(0xe000, 0xe7ff).mirror(0x1800).ram(); } @@ -584,7 +584,7 @@ void turbo_state::buckrog_cpu2_map(address_map &map) void turbo_state::buckrog_cpu2_portmap(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).r(this, FUNC(turbo_state::buckrog_cpu2_command_r)); + map(0x00, 0xff).r(FUNC(turbo_state::buckrog_cpu2_command_r)); } diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp index ecc5eda19ee..25940a3ef3c 100644 --- a/src/mame/drivers/turrett.cpp +++ b/src/mame/drivers/turrett.cpp @@ -93,11 +93,11 @@ void turrett_state::cpu_map(address_map &map) map(0x02000050, 0x02000053).ram(); map(0x02000060, 0x02000063).ram(); map(0x02000070, 0x02000073).ram(); // TODO: What are these? - map(0x04000000, 0x0400000f).w(this, FUNC(turrett_state::dma_w)); - map(0x04000100, 0x04000103).rw(this, FUNC(turrett_state::int_r), FUNC(turrett_state::int_w)); + map(0x04000000, 0x0400000f).w(FUNC(turrett_state::dma_w)); + map(0x04000100, 0x04000103).rw(FUNC(turrett_state::int_r), FUNC(turrett_state::int_w)); map(0x04000200, 0x040003ff).rw("ttsound", FUNC(turrett_device::read), FUNC(turrett_device::write)); - map(0x08000000, 0x0800000f).rw(this, FUNC(turrett_state::video_r), FUNC(turrett_state::video_w)); - map(0x08000200, 0x080003ff).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); + map(0x08000000, 0x0800000f).rw(FUNC(turrett_state::video_r), FUNC(turrett_state::video_w)); + map(0x08000200, 0x080003ff).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); map(0x1fc00000, 0x1fdfffff).rom().region("maincpu", 0); } diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp index 9487e9e500c..31e1bed4726 100644 --- a/src/mame/drivers/tutankhm.cpp +++ b/src/mame/drivers/tutankhm.cpp @@ -142,8 +142,8 @@ void tutankhm_state::main_map(address_map &map) map(0x81c0, 0x81c0).mirror(0x000f).portr("IN2"); /* IN2: Player 2 I/O */ map(0x81e0, 0x81e0).mirror(0x000f).portr("DSW1"); /* DSW1 (inverted bits) */ map(0x8200, 0x8207).mirror(0x00f8).nopr().w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x8300, 0x8300).mirror(0x00ff).w(this, FUNC(tutankhm_state::tutankhm_bankselect_w)); - map(0x8600, 0x8600).mirror(0x00ff).w(this, FUNC(tutankhm_state::sound_on_w)); + map(0x8300, 0x8300).mirror(0x00ff).w(FUNC(tutankhm_state::tutankhm_bankselect_w)); + map(0x8600, 0x8600).mirror(0x00ff).w(FUNC(tutankhm_state::sound_on_w)); map(0x8700, 0x8700).mirror(0x00ff).w(m_timeplt_audio, FUNC(timeplt_audio_device::sound_data_w)); map(0x8800, 0x8fff).ram(); map(0x9000, 0x9fff).bankr("bank1"); diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp index e6bb9cd47ba..ee681e1d762 100644 --- a/src/mame/drivers/tutor.cpp +++ b/src/mame/drivers/tutor.cpp @@ -491,7 +491,7 @@ WRITE8_MEMBER( tutor_state::tutor_printer_w ) { case 0x10: /* data */ - m_cent_data_out->write(space, 0, data); + m_cent_data_out->write(data); break; case 0x40: @@ -558,14 +558,14 @@ void tutor_state::tutor_memmap(address_map &map) map(0x8000, 0xbfff).bankr("bank2").nopw(); map(0xc000, 0xdfff).noprw(); /*free for expansion, or cartridge ROM?*/ - map(0xe000, 0xe000).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); /*VDP data*/ - map(0xe002, 0xe002).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write));/*VDP status*/ - map(0xe100, 0xe1ff).rw(this, FUNC(tutor_state::tutor_mapper_r), FUNC(tutor_state::tutor_mapper_w)); /*cartridge mapper*/ - map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::write)); /*sound chip*/ - map(0xe800, 0xe8ff).rw(this, FUNC(tutor_state::tutor_printer_r), FUNC(tutor_state::tutor_printer_w)); /*printer*/ - map(0xee00, 0xeeff).nopr().w(this, FUNC(tutor_state::tutor_cassette_w)); /*cassette interface*/ + map(0xe000, 0xe000).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); /*VDP data*/ + map(0xe002, 0xe002).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w));/*VDP status*/ + map(0xe100, 0xe1ff).rw(FUNC(tutor_state::tutor_mapper_r), FUNC(tutor_state::tutor_mapper_w)); /*cartridge mapper*/ + map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::command_w)); /*sound chip*/ + map(0xe800, 0xe8ff).rw(FUNC(tutor_state::tutor_printer_r), FUNC(tutor_state::tutor_printer_w)); /*printer*/ + map(0xee00, 0xeeff).nopr().w(FUNC(tutor_state::tutor_cassette_w)); /*cassette interface*/ - map(0xf000, 0xffff).r(this, FUNC(tutor_state::tutor_highmem_r)).nopw(); /*free for expansion (and internal processor RAM)*/ + map(0xf000, 0xffff).r(FUNC(tutor_state::tutor_highmem_r)).nopw(); /*free for expansion (and internal processor RAM)*/ } void tutor_state::pyuutajr_mem(address_map &map) @@ -575,16 +575,16 @@ void tutor_state::pyuutajr_mem(address_map &map) map(0x8000, 0xbfff).bankr("bank2").nopw(); map(0xc000, 0xdfff).noprw(); /*free for expansion, or cartridge ROM?*/ - map(0xe000, 0xe000).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write)); /*VDP data*/ - map(0xe002, 0xe002).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write));/*VDP status*/ - map(0xe100, 0xe1ff).rw(this, FUNC(tutor_state::tutor_mapper_r), FUNC(tutor_state::tutor_mapper_w)); /*cartridge mapper*/ - map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::write)); /*sound chip*/ + map(0xe000, 0xe000).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w)); /*VDP data*/ + map(0xe002, 0xe002).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w));/*VDP status*/ + map(0xe100, 0xe1ff).rw(FUNC(tutor_state::tutor_mapper_r), FUNC(tutor_state::tutor_mapper_w)); /*cartridge mapper*/ + map(0xe200, 0xe200).w("sn76489a", FUNC(sn76489a_device::command_w)); /*sound chip*/ map(0xe800, 0xe800).portr("LINE0"); map(0xea00, 0xea00).portr("LINE1"); map(0xec00, 0xec00).portr("LINE2"); map(0xee00, 0xee00).portr("LINE3"); - map(0xf000, 0xffff).r(this, FUNC(tutor_state::tutor_highmem_r)).nopw(); /*free for expansion (and internal processor RAM)*/ + map(0xf000, 0xffff).r(FUNC(tutor_state::tutor_highmem_r)).nopw(); /*free for expansion (and internal processor RAM)*/ } /* @@ -599,8 +599,8 @@ void tutor_state::pyuutajr_mem(address_map &map) void tutor_state::tutor_io(address_map &map) { - map(0xec0, 0xec7).r(this, FUNC(tutor_state::key_r)); /*keyboard interface*/ - map(0xed0, 0xed0).r(this, FUNC(tutor_state::tutor_cassette_r)); /*cassette interface*/ + map(0xec0, 0xec7).r(FUNC(tutor_state::key_r)); /*keyboard interface*/ + map(0xed0, 0xed0).r(FUNC(tutor_state::tutor_cassette_r)); /*cassette interface*/ } /* tutor keyboard: 56 keys diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp index fa0a6db019e..54e9ea5a7e7 100644 --- a/src/mame/drivers/tv910.cpp +++ b/src/mame/drivers/tv910.cpp @@ -108,15 +108,15 @@ void tv910_state::tv910_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x03ff).ram(); map(0x4000, 0x47ff).ram().share("vram"); // VRAM - map(0x8010, 0x801f).r(this, FUNC(tv910_state::charset_r)); + map(0x8010, 0x801f).r(FUNC(tv910_state::charset_r)); map(0x8020, 0x8020).rw(m_crtc, FUNC(r6545_1_device::status_r), FUNC(r6545_1_device::address_w)); map(0x8021, 0x8021).rw(m_crtc, FUNC(r6545_1_device::register_r), FUNC(r6545_1_device::register_w)); map(0x8030, 0x8033).rw(ACIA_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); - map(0x8040, 0x804f).w(this, FUNC(tv910_state::vbl_ack_w)); - map(0x8050, 0x805f).w(this, FUNC(tv910_state::nmi_ack_w)); - map(0x8060, 0x806f).r(this, FUNC(tv910_state::kbd_ascii_r)); - map(0x8070, 0x807f).r(this, FUNC(tv910_state::kbd_flags_r)); - map(0x9000, 0x9000).w(this, FUNC(tv910_state::control_w)); + map(0x8040, 0x804f).w(FUNC(tv910_state::vbl_ack_w)); + map(0x8050, 0x805f).w(FUNC(tv910_state::nmi_ack_w)); + map(0x8060, 0x806f).r(FUNC(tv910_state::kbd_ascii_r)); + map(0x8070, 0x807f).r(FUNC(tv910_state::kbd_flags_r)); + map(0x9000, 0x9000).w(FUNC(tv910_state::control_w)); map(0x9001, 0x9001).portr("DSW1"); map(0x9002, 0x9002).portr("DSW2"); map(0xf000, 0xffff).rom().region("maincpu", 0); diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp index 3716275e8f6..e529798cc1d 100644 --- a/src/mame/drivers/tv912.cpp +++ b/src/mame/drivers/tv912.cpp @@ -365,12 +365,12 @@ void tv912_state::io_map(address_map &map) void tv912_state::bank_map(address_map &map) { map(0x000, 0x0ff).mirror(0x300).ram(); - map(0x400, 0x403).mirror(0x3c0).select(0x030).rw(this, FUNC(tv912_state::crtc_r), FUNC(tv912_state::crtc_w)); + map(0x400, 0x403).mirror(0x3c0).select(0x030).rw(FUNC(tv912_state::crtc_r), FUNC(tv912_state::crtc_w)); map(0x404, 0x404).mirror(0x3f3).r(m_uart, FUNC(ay51013_device::receive)); - map(0x408, 0x40b).mirror(0x3f0).r(this, FUNC(tv912_state::uart_status_r)); + map(0x408, 0x40b).mirror(0x3f0).r(FUNC(tv912_state::uart_status_r)); map(0x408, 0x408).mirror(0x3f3).w(m_uart, FUNC(ay51013_device::transmit)); - map(0x40c, 0x40f).mirror(0x3f0).r(this, FUNC(tv912_state::keyboard_r)); - map(0x40c, 0x40c).mirror(0x3f3).w(this, FUNC(tv912_state::output_40c)); + map(0x40c, 0x40f).mirror(0x3f0).r(FUNC(tv912_state::keyboard_r)); + map(0x40c, 0x40c).mirror(0x3f3).w(FUNC(tv912_state::output_40c)); map(0x800, 0xfff).bankrw("dispram"); } diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp index 688c0d490f7..345dc286972 100644 --- a/src/mame/drivers/tv950.cpp +++ b/src/mame/drivers/tv950.cpp @@ -99,7 +99,7 @@ void tv950_state::tv950_mem(address_map &map) map(0x2000, 0x3fff).ram().share("vram"); // VRAM map(0x8100, 0x8100).rw(m_crtc, FUNC(r6545_1_device::status_r), FUNC(r6545_1_device::address_w)); map(0x8101, 0x8101).rw(m_crtc, FUNC(r6545_1_device::register_r), FUNC(r6545_1_device::register_w)); - map(0x9000, 0x9000).w(this, FUNC(tv950_state::row_addr_w)); + map(0x9000, 0x9000).w(FUNC(tv950_state::row_addr_w)); map(0x9300, 0x9303).rw(ACIA1_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x9500, 0x9503).rw(ACIA2_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x9900, 0x9903).rw(ACIA3_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write)); diff --git a/src/mame/drivers/tv955.cpp b/src/mame/drivers/tv955.cpp index 8462f216fc7..5765a1771b0 100644 --- a/src/mame/drivers/tv955.cpp +++ b/src/mame/drivers/tv955.cpp @@ -68,7 +68,7 @@ void tv955_state::mem_map(address_map &map) { // verified from maintenance manual (131968-00-C) map(0x0000, 0x07ff).mirror(0x0800).ram().share("nvram"); - map(0x1100, 0x1100).mirror(0x00ff).w(this, FUNC(tv955_state::control_latch_w)); + map(0x1100, 0x1100).mirror(0x00ff).w(FUNC(tv955_state::control_latch_w)); map(0x1200, 0x1203).mirror(0x00fc).rw("keybuart", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x1400, 0x1403).mirror(0x00fc).rw("printuart", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x1800, 0x1803).mirror(0x00fc).rw("hostuart", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); diff --git a/src/mame/drivers/tv965.cpp b/src/mame/drivers/tv965.cpp index cb1840817ee..1d486003fa2 100644 --- a/src/mame/drivers/tv965.cpp +++ b/src/mame/drivers/tv965.cpp @@ -51,7 +51,7 @@ void tv965_state::mem_map(address_map &map) { map(0x00000, 0x01fff).ram().share("nvram"); map(0x02000, 0x02007).rw("crtc", FUNC(scn2672_device::read), FUNC(scn2672_device::write)); - map(0x04000, 0x04000).r(this, FUNC(tv965_state::ga_hack_r)); + map(0x04000, 0x04000).r(FUNC(tv965_state::ga_hack_r)); map(0x06200, 0x06203).rw("acia1", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x06400, 0x06403).rw("acia2", FUNC(mos6551_device::read), FUNC(mos6551_device::write)); map(0x08000, 0x09fff).ram().mirror(0x2000).share("charram"); diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp index 7d79e466f9f..e6e199b6f55 100644 --- a/src/mame/drivers/tv990.cpp +++ b/src/mame/drivers/tv990.cpp @@ -315,11 +315,11 @@ void tv990_state::tv990_mem(address_map &map) map(0x000000, 0x03ffff).rom().region("maincpu", 0); map(0x060000, 0x06ffff).ram().share("vram"); // character/attribute RAM map(0x080000, 0x087fff).ram().share("fontram"); // font RAM - map(0x090000, 0x0900ff).rw(this, FUNC(tv990_state::tvi1111_r), FUNC(tv990_state::tvi1111_w)); + map(0x090000, 0x0900ff).rw(FUNC(tv990_state::tvi1111_r), FUNC(tv990_state::tvi1111_w)); map(0x0a0000, 0x0a000f).rw(m_uart0, FUNC(ns16450_device::ins8250_r), FUNC(ns16450_device::ins8250_w)).umask16(0x00ff); map(0x0a0010, 0x0a001f).rw(UART1_TAG, FUNC(ns16450_device::ins8250_r), FUNC(ns16450_device::ins8250_w)).umask16(0x00ff); map(0x0a0028, 0x0a002d).rw(LPT_TAG, FUNC(pc_lpt_device::read), FUNC(pc_lpt_device::write)).umask16(0x00ff); - map(0x0b0000, 0x0b0003).rw(this, FUNC(tv990_state::kbdc_r), FUNC(tv990_state::kbdc_w)).umask16(0x00ff); + map(0x0b0000, 0x0b0003).rw(FUNC(tv990_state::kbdc_r), FUNC(tv990_state::kbdc_w)).umask16(0x00ff); map(0x0c0000, 0x0c7fff).ram().share("nvram");// work RAM } diff --git a/src/mame/drivers/tvboy.cpp b/src/mame/drivers/tvboy.cpp index bb37b5857cc..d30b96a3f63 100644 --- a/src/mame/drivers/tvboy.cpp +++ b/src/mame/drivers/tvboy.cpp @@ -71,7 +71,7 @@ void tvboy_state::tvboy_mem(address_map &map) #else map(0x0280, 0x029f).mirror(0x0d00).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write)); #endif - map(0x1000, 0x1fff).w(this, FUNC(tvboy_state::bank_write)); + map(0x1000, 0x1fff).w(FUNC(tvboy_state::bank_write)); map(0x1000, 0x1fff).bankr("crom"); } diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index 8d603cf8eb9..7c89f51d82f 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -365,24 +365,24 @@ void tvc_state::tvc_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(tvc_state::border_color_w)); - map(0x01, 0x01).w("cent_data_out", FUNC(output_latch_device::write)); - map(0x02, 0x02).w(this, FUNC(tvc_state::bank_w)); - map(0x03, 0x03).w(this, FUNC(tvc_state::keyboard_w)); - map(0x04, 0x06).w(this, FUNC(tvc_state::sound_w)); - map(0x07, 0x07).w(this, FUNC(tvc_state::flipflop_w)); - map(0x0f, 0x0f).w(this, FUNC(tvc_state::vram_bank_w)); + map(0x00, 0x00).w(FUNC(tvc_state::border_color_w)); + map(0x01, 0x01).w("cent_data_out", FUNC(output_latch_device::bus_w)); + map(0x02, 0x02).w(FUNC(tvc_state::bank_w)); + map(0x03, 0x03).w(FUNC(tvc_state::keyboard_w)); + map(0x04, 0x06).w(FUNC(tvc_state::sound_w)); + map(0x07, 0x07).w(FUNC(tvc_state::flipflop_w)); + map(0x0f, 0x0f).w(FUNC(tvc_state::vram_bank_w)); map(0x10, 0x1f).rw("exp1", FUNC(tvcexp_slot_device::io_read), FUNC(tvcexp_slot_device::io_write)); map(0x20, 0x2f).rw("exp2", FUNC(tvcexp_slot_device::io_read), FUNC(tvcexp_slot_device::io_write)); map(0x30, 0x3f).rw("exp3", FUNC(tvcexp_slot_device::io_read), FUNC(tvcexp_slot_device::io_write)); map(0x40, 0x4f).rw("exp4", FUNC(tvcexp_slot_device::io_read), FUNC(tvcexp_slot_device::io_write)); - map(0x50, 0x50).w(this, FUNC(tvc_state::cassette_w)); - map(0x58, 0x58).r(this, FUNC(tvc_state::keyboard_r)); - map(0x59, 0x59).r(this, FUNC(tvc_state::int_state_r)); - map(0x5a, 0x5a).r(this, FUNC(tvc_state::exp_id_r)); - map(0x5b, 0x5b).r(this, FUNC(tvc_state::_5b_r)); - map(0x58, 0x5b).w(this, FUNC(tvc_state::expint_ack_w)); - map(0x60, 0x63).w(this, FUNC(tvc_state::palette_w)); + map(0x50, 0x50).w(FUNC(tvc_state::cassette_w)); + map(0x58, 0x58).r(FUNC(tvc_state::keyboard_r)); + map(0x59, 0x59).r(FUNC(tvc_state::int_state_r)); + map(0x5a, 0x5a).r(FUNC(tvc_state::exp_id_r)); + map(0x5b, 0x5b).r(FUNC(tvc_state::_5b_r)); + map(0x58, 0x5b).w(FUNC(tvc_state::expint_ack_w)); + map(0x60, 0x63).w(FUNC(tvc_state::palette_w)); map(0x70, 0x70).w("crtc", FUNC(mc6845_device::address_w)); map(0x71, 0x71).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); } diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index 0d6da76e01c..d12c2001495 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -164,13 +164,13 @@ void twin16_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); - map(0x9000, 0x9000).w(this, FUNC(twin16_state::upd_reset_w)); + map(0x9000, 0x9000).w(FUNC(twin16_state::upd_reset_w)); map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read)); map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write)); map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xd000, 0xd000).w(m_upd7759, FUNC(upd7759_device::port_w)); - map(0xe000, 0xe000).w(this, FUNC(twin16_state::upd_start_w)); - map(0xf000, 0xf000).r(this, FUNC(twin16_state::upd_busy_r)); // miaj writes 0 to it + map(0xe000, 0xe000).w(FUNC(twin16_state::upd_start_w)); + map(0xf000, 0xf000).r(FUNC(twin16_state::upd_busy_r)); // miaj writes 0 to it } void twin16_state::main_map(address_map &map) @@ -181,7 +181,7 @@ void twin16_state::main_map(address_map &map) map(0x060000, 0x063fff).ram(); map(0x080000, 0x080fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); map(0x081000, 0x081fff).nopw(); - map(0x0a0000, 0x0a0001).portr("SYSTEM").w(this, FUNC(twin16_state::CPUA_register_w)); + map(0x0a0000, 0x0a0001).portr("SYSTEM").w(FUNC(twin16_state::CPUA_register_w)); map(0x0a0002, 0x0a0003).portr("P1"); map(0x0a0004, 0x0a0005).portr("P2"); map(0x0a0006, 0x0a0007).portr("P3"); @@ -189,12 +189,12 @@ void twin16_state::main_map(address_map &map) map(0x0a0010, 0x0a0011).portr("DSW2").w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x0a0012, 0x0a0013).portr("DSW1"); map(0x0a0018, 0x0a0019).portr("DSW3"); - map(0x0c0000, 0x0c000f).w(this, FUNC(twin16_state::video_register_w)); - map(0x0c000e, 0x0c000f).r(this, FUNC(twin16_state::sprite_status_r)); - map(0x100000, 0x103fff).ram().w(this, FUNC(twin16_state::fixram_w)).share("fixram"); + map(0x0c0000, 0x0c000f).w(FUNC(twin16_state::video_register_w)); + map(0x0c000e, 0x0c000f).r(FUNC(twin16_state::sprite_status_r)); + map(0x100000, 0x103fff).ram().w(FUNC(twin16_state::fixram_w)).share("fixram"); // AM_RANGE(0x104000, 0x105fff) AM_NOP // miaj - map(0x120000, 0x121fff).ram().w(this, FUNC(twin16_state::videoram0_w)).share("videoram.0"); - map(0x122000, 0x123fff).ram().w(this, FUNC(twin16_state::videoram1_w)).share("videoram.1"); + map(0x120000, 0x121fff).ram().w(FUNC(twin16_state::videoram0_w)).share("videoram.0"); + map(0x122000, 0x123fff).ram().w(FUNC(twin16_state::videoram1_w)).share("videoram.1"); map(0x140000, 0x143fff).ram().share("spriteram"); } @@ -205,11 +205,11 @@ void twin16_state::sub_map(address_map &map) // AM_RANGE(0x044000, 0x04ffff) AM_NOP // miaj map(0x060000, 0x063fff).ram(); map(0x080000, 0x09ffff).rom().region("data", 0); - map(0x0a0000, 0x0a0001).w(this, FUNC(twin16_state::CPUB_register_w)); + map(0x0a0000, 0x0a0001).w(FUNC(twin16_state::CPUB_register_w)); map(0x400000, 0x403fff).ram().share("spriteram"); - map(0x480000, 0x481fff).ram().w(this, FUNC(twin16_state::videoram0_w)).share("videoram.0"); - map(0x482000, 0x483fff).ram().w(this, FUNC(twin16_state::videoram1_w)).share("videoram.1"); - map(0x500000, 0x53ffff).ram().w(this, FUNC(twin16_state::zipram_w)).share("zipram"); + map(0x480000, 0x481fff).ram().w(FUNC(twin16_state::videoram0_w)).share("videoram.0"); + map(0x482000, 0x483fff).ram().w(FUNC(twin16_state::videoram1_w)).share("videoram.1"); + map(0x500000, 0x53ffff).ram().w(FUNC(twin16_state::zipram_w)).share("zipram"); map(0x600000, 0x6fffff).rom().region("gfxrom", 0); map(0x700000, 0x77ffff).bankr("gfxrombank"); map(0x780000, 0x79ffff).ram().share("sprite_gfx_ram"); @@ -221,19 +221,19 @@ void fround_state::fround_map(address_map &map) map(0x040000, 0x043fff).ram().share("comram"); map(0x060000, 0x063fff).ram(); map(0x080000, 0x080fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette"); - map(0x0a0000, 0x0a0001).portr("SYSTEM").w(this, FUNC(fround_state::fround_CPU_register_w)); + map(0x0a0000, 0x0a0001).portr("SYSTEM").w(FUNC(fround_state::fround_CPU_register_w)); map(0x0a0002, 0x0a0003).portr("P1"); map(0x0a0004, 0x0a0005).portr("P2"); map(0x0a0009, 0x0a0009).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x0a0010, 0x0a0011).portr("DSW2").w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x0a0012, 0x0a0013).portr("DSW1"); map(0x0a0018, 0x0a0019).portr("DSW3"); - map(0x0c0000, 0x0c000f).w(this, FUNC(fround_state::video_register_w)); - map(0x0c000e, 0x0c000f).r(this, FUNC(fround_state::sprite_status_r)); - map(0x0e0000, 0x0e0001).w(this, FUNC(fround_state::gfx_bank_w)); - map(0x100000, 0x103fff).ram().w(this, FUNC(fround_state::fixram_w)).share("fixram"); - map(0x120000, 0x121fff).ram().w(this, FUNC(fround_state::videoram0_w)).share("videoram.0"); - map(0x122000, 0x123fff).ram().w(this, FUNC(fround_state::videoram1_w)).share("videoram.1"); + map(0x0c0000, 0x0c000f).w(FUNC(fround_state::video_register_w)); + map(0x0c000e, 0x0c000f).r(FUNC(fround_state::sprite_status_r)); + map(0x0e0000, 0x0e0001).w(FUNC(fround_state::gfx_bank_w)); + map(0x100000, 0x103fff).ram().w(FUNC(fround_state::fixram_w)).share("fixram"); + map(0x120000, 0x121fff).ram().w(FUNC(fround_state::videoram0_w)).share("videoram.0"); + map(0x122000, 0x123fff).ram().w(FUNC(fround_state::videoram1_w)).share("videoram.1"); map(0x140000, 0x143fff).ram().share("spriteram"); map(0x500000, 0x5fffff).rom().region("tiles", 0); map(0x600000, 0x6fffff).rom().region("gfxrom", 0); diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp index 97679afc645..e9939ecc67a 100644 --- a/src/mame/drivers/twincobr.cpp +++ b/src/mame/drivers/twincobr.cpp @@ -401,13 +401,13 @@ void twincobr_state::main_program_map(address_map &map) map(0x050000, 0x050dff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x060001, 0x060001).w("crtc", FUNC(mc6845_device::address_w)); map(0x060003, 0x060003).w("crtc", FUNC(mc6845_device::register_w)); - map(0x070000, 0x070003).w(this, FUNC(twincobr_state::twincobr_txscroll_w)); /* text layer scroll */ - map(0x070004, 0x070005).w(this, FUNC(twincobr_state::twincobr_txoffs_w)); /* offset in text video RAM */ - map(0x072000, 0x072003).w(this, FUNC(twincobr_state::twincobr_bgscroll_w)); /* bg layer scroll */ - map(0x072004, 0x072005).w(this, FUNC(twincobr_state::twincobr_bgoffs_w)); /* offset in bg video RAM */ - map(0x074000, 0x074003).w(this, FUNC(twincobr_state::twincobr_fgscroll_w)); /* fg layer scroll */ - map(0x074004, 0x074005).w(this, FUNC(twincobr_state::twincobr_fgoffs_w)); /* offset in fg video RAM */ - map(0x076000, 0x076003).w(this, FUNC(twincobr_state::twincobr_exscroll_w)); /* Spare layer scroll */ + map(0x070000, 0x070003).w(FUNC(twincobr_state::twincobr_txscroll_w)); /* text layer scroll */ + map(0x070004, 0x070005).w(FUNC(twincobr_state::twincobr_txoffs_w)); /* offset in text video RAM */ + map(0x072000, 0x072003).w(FUNC(twincobr_state::twincobr_bgscroll_w)); /* bg layer scroll */ + map(0x072004, 0x072005).w(FUNC(twincobr_state::twincobr_bgoffs_w)); /* offset in bg video RAM */ + map(0x074000, 0x074003).w(FUNC(twincobr_state::twincobr_fgscroll_w)); /* fg layer scroll */ + map(0x074004, 0x074005).w(FUNC(twincobr_state::twincobr_fgoffs_w)); /* offset in fg video RAM */ + map(0x076000, 0x076003).w(FUNC(twincobr_state::twincobr_exscroll_w)); /* Spare layer scroll */ map(0x078000, 0x078001).portr("DSWA"); map(0x078002, 0x078003).portr("DSWB"); map(0x078004, 0x078005).portr("P1"); @@ -415,10 +415,10 @@ void twincobr_state::main_program_map(address_map &map) map(0x078008, 0x078009).portr("VBLANK"); /* V-Blank & FShark Coin/Start */ map(0x07800b, 0x07800b).w("coinlatch", FUNC(ls259_device::write_nibble_d0)); /* Flying Shark DSP Comms & coin stuff */ map(0x07800d, 0x07800d).w("mainlatch", FUNC(ls259_device::write_nibble_d0)); /* Twin Cobra DSP Comms & system control */ - map(0x07a000, 0x07afff).rw(this, FUNC(twincobr_state::twincobr_sharedram_r), FUNC(twincobr_state::twincobr_sharedram_w)); /* 16-bit on 68000 side, 8-bit on Z80 side */ - map(0x07e000, 0x07e001).rw(this, FUNC(twincobr_state::twincobr_txram_r), FUNC(twincobr_state::twincobr_txram_w)); /* data for text video RAM */ - map(0x07e002, 0x07e003).rw(this, FUNC(twincobr_state::twincobr_bgram_r), FUNC(twincobr_state::twincobr_bgram_w)); /* data for bg video RAM */ - map(0x07e004, 0x07e005).rw(this, FUNC(twincobr_state::twincobr_fgram_r), FUNC(twincobr_state::twincobr_fgram_w)); /* data for fg video RAM */ + map(0x07a000, 0x07afff).rw(FUNC(twincobr_state::twincobr_sharedram_r), FUNC(twincobr_state::twincobr_sharedram_w)); /* 16-bit on 68000 side, 8-bit on Z80 side */ + map(0x07e000, 0x07e001).rw(FUNC(twincobr_state::twincobr_txram_r), FUNC(twincobr_state::twincobr_txram_w)); /* data for text video RAM */ + map(0x07e002, 0x07e003).rw(FUNC(twincobr_state::twincobr_bgram_r), FUNC(twincobr_state::twincobr_bgram_w)); /* data for bg video RAM */ + map(0x07e004, 0x07e005).rw(FUNC(twincobr_state::twincobr_fgram_r), FUNC(twincobr_state::twincobr_fgram_w)); /* data for fg video RAM */ } @@ -452,10 +452,10 @@ void twincobr_state::DSP_program_map(address_map &map) void twincobr_state::DSP_io_map(address_map &map) { - map(0, 0).w(this, FUNC(twincobr_state::twincobr_dsp_addrsel_w)); - map(1, 1).rw(this, FUNC(twincobr_state::twincobr_dsp_r), FUNC(twincobr_state::twincobr_dsp_w)); - map(2, 2).rw(this, FUNC(twincobr_state::fsharkbt_dsp_r), FUNC(twincobr_state::fsharkbt_dsp_w)); - map(3, 3).w(this, FUNC(twincobr_state::twincobr_dsp_bio_w)); + map(0, 0).w(FUNC(twincobr_state::twincobr_dsp_addrsel_w)); + map(1, 1).rw(FUNC(twincobr_state::twincobr_dsp_r), FUNC(twincobr_state::twincobr_dsp_w)); + map(2, 2).rw(FUNC(twincobr_state::fsharkbt_dsp_r), FUNC(twincobr_state::fsharkbt_dsp_w)); + map(3, 3).w(FUNC(twincobr_state::twincobr_dsp_bio_w)); } diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index b21c39bef4b..ad2de065565 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -816,22 +816,22 @@ READ8_MEMBER(twinkle_state::shared_psx_r) void twinkle_state::main_map(address_map &map) { - map(0x1f000000, 0x1f0007ff).rw(this, FUNC(twinkle_state::shared_psx_r), FUNC(twinkle_state::shared_psx_w)).umask32(0x00ff00ff); + map(0x1f000000, 0x1f0007ff).rw(FUNC(twinkle_state::shared_psx_r), FUNC(twinkle_state::shared_psx_w)).umask32(0x00ff00ff); map(0x1f200000, 0x1f20001f).rw(m_am53cf96, FUNC(am53cf96_device::read), FUNC(am53cf96_device::write)).umask32(0x00ff00ff); map(0x1f20a01c, 0x1f20a01f).nopw(); /* scsi? */ map(0x1f210000, 0x1f2107ff).rw("fdc37c665gt", FUNC(fdc37c665gt_device::read), FUNC(fdc37c665gt_device::write)).umask32(0x00ff00ff); map(0x1f218000, 0x1f218000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* LTC1232 */ - map(0x1f220000, 0x1f220003).w(this, FUNC(twinkle_state::twinkle_io_w)).umask32(0x00ff00ff); - map(0x1f220004, 0x1f220007).r(this, FUNC(twinkle_state::twinkle_io_r)).umask32(0x00ff00ff); - map(0x1f230000, 0x1f230001).w(this, FUNC(twinkle_state::led_w)); + map(0x1f220000, 0x1f220003).w(FUNC(twinkle_state::twinkle_io_w)).umask32(0x00ff00ff); + map(0x1f220004, 0x1f220007).r(FUNC(twinkle_state::twinkle_io_r)).umask32(0x00ff00ff); + map(0x1f230000, 0x1f230001).w(FUNC(twinkle_state::led_w)); map(0x1f240000, 0x1f240003).portr("IN6"); - map(0x1f250000, 0x1f250001).w(this, FUNC(twinkle_state::key_led_w)); - map(0x1f260000, 0x1f260001).w(this, FUNC(twinkle_state::serial_w)); + map(0x1f250000, 0x1f250001).w(FUNC(twinkle_state::key_led_w)); + map(0x1f260000, 0x1f260001).w(FUNC(twinkle_state::serial_w)); map(0x1f270000, 0x1f270003).portw("OUTSEC"); map(0x1f280000, 0x1f280003).portr("INSEC"); map(0x1f290000, 0x1f29007f).rw("rtc", FUNC(rtc65271_device::rtc_r), FUNC(rtc65271_device::rtc_w)).umask32(0x00ff00ff); map(0x1f2a0000, 0x1f2a007f).rw("rtc", FUNC(rtc65271_device::xram_r), FUNC(rtc65271_device::xram_w)).umask32(0x00ff00ff); - map(0x1f2b0000, 0x1f2b00ff).w(this, FUNC(twinkle_state::twinkle_output_w)); + map(0x1f2b0000, 0x1f2b00ff).w(FUNC(twinkle_state::twinkle_output_w)); } /* SPU board */ @@ -969,17 +969,17 @@ void twinkle_state::sound_map(address_map &map) map(0x000000, 0x07ffff).rom(); map(0x100000, 0x13ffff).ram(); map(0x200000, 0x200001).portr("SPU_DSW"); - map(0x220000, 0x220001).w(this, FUNC(twinkle_state::spu_led_w)); - map(0x230000, 0x230003).w(this, FUNC(twinkle_state::twinkle_spu_ctrl_w)); - map(0x240000, 0x240003).w(this, FUNC(twinkle_state::spu_ata_dma_low_w)).nopr(); - map(0x250000, 0x250003).w(this, FUNC(twinkle_state::spu_ata_dma_high_w)).nopr(); - map(0x260000, 0x260001).w(this, FUNC(twinkle_state::spu_wavebank_w)).nopr(); - map(0x280000, 0x280fff).rw(this, FUNC(twinkle_state::shared_68k_r), FUNC(twinkle_state::shared_68k_w)); - map(0x300000, 0x30000f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); + map(0x220000, 0x220001).w(FUNC(twinkle_state::spu_led_w)); + map(0x230000, 0x230003).w(FUNC(twinkle_state::twinkle_spu_ctrl_w)); + map(0x240000, 0x240003).w(FUNC(twinkle_state::spu_ata_dma_low_w)).nopr(); + map(0x250000, 0x250003).w(FUNC(twinkle_state::spu_ata_dma_high_w)).nopr(); + map(0x260000, 0x260001).w(FUNC(twinkle_state::spu_wavebank_w)).nopr(); + map(0x280000, 0x280fff).rw(FUNC(twinkle_state::shared_68k_r), FUNC(twinkle_state::shared_68k_w)); + map(0x300000, 0x30000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // 34000E = ??? map(0x34000e, 0x34000f).nopw(); map(0x400000, 0x400fff).rw("rfsnd", FUNC(rf5c400_device::rf5c400_r), FUNC(rf5c400_device::rf5c400_w)); - map(0x800000, 0xffffff).rw(this, FUNC(twinkle_state::twinkle_waveram_r), FUNC(twinkle_state::twinkle_waveram_w)); + map(0x800000, 0xffffff).rw(FUNC(twinkle_state::twinkle_waveram_r), FUNC(twinkle_state::twinkle_waveram_w)); } void twinkle_state::rf5c400_map(address_map &map) diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp index f88e25dbe4e..28a670fe152 100644 --- a/src/mame/drivers/twins.cpp +++ b/src/mame/drivers/twins.cpp @@ -284,16 +284,16 @@ WRITE16_MEMBER(twins_state::spider_blitter_w) void twins_state::twins_map(address_map &map) { - map(0x00000, 0xfffff).rw(this, FUNC(twins_state::spider_blitter_r), FUNC(twins_state::spider_blitter_w)); + map(0x00000, 0xfffff).rw(FUNC(twins_state::spider_blitter_r), FUNC(twins_state::spider_blitter_w)); } void twins_state::twins_io(address_map &map) { map(0x0000, 0x0003).w("aysnd", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x0002, 0x0002).r("aysnd", FUNC(ay8910_device::data_r)); - map(0x0004, 0x0005).rw(this, FUNC(twins_state::twins_port4_r), FUNC(twins_state::twins_port4_w)); - map(0x0006, 0x0007).w(this, FUNC(twins_state::twins_pal_w)).share("paletteram"); - map(0x000e, 0x000f).w(this, FUNC(twins_state::porte_paloff0_w)); + map(0x0004, 0x0005).rw(FUNC(twins_state::twins_port4_r), FUNC(twins_state::twins_port4_w)); + map(0x0006, 0x0007).w(FUNC(twins_state::twins_pal_w)).share("paletteram"); + map(0x000e, 0x000f).w(FUNC(twins_state::porte_paloff0_w)); } void twins_state::video_start() @@ -426,7 +426,7 @@ void twins_state::twinsa_io(address_map &map) map(0x0004, 0x0004).rw("ramdac", FUNC(ramdac_device::pal_r), FUNC(ramdac_device::pal_w)); map(0x0008, 0x0008).w("aysnd", FUNC(ay8910_device::address_w)); map(0x0010, 0x0010).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); - map(0x0018, 0x0019).r(this, FUNC(twins_state::twins_port4_r)).w(this, FUNC(twins_state::twins_port4_w)); + map(0x0018, 0x0019).r(FUNC(twins_state::twins_port4_r)).w(FUNC(twins_state::twins_port4_w)); } @@ -547,14 +547,14 @@ void twins_state::spider_io(address_map &map) { map(0x0000, 0x0003).w("aysnd", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x0002, 0x0002).r("aysnd", FUNC(ay8910_device::data_r)); - map(0x0004, 0x0005).rw(this, FUNC(twins_state::twins_port4_r), FUNC(twins_state::twins_port4_w)); - map(0x0008, 0x0009).w(this, FUNC(twins_state::spider_pal_w)).share("paletteram"); - map(0x0010, 0x0011).w(this, FUNC(twins_state::spider_paloff0_w)); - - map(0x0018, 0x0019).r(this, FUNC(twins_state::spider_port_18_r)); - map(0x001a, 0x001b).w(this, FUNC(twins_state::spider_port_1a_w)); - map(0x001c, 0x001d).w(this, FUNC(twins_state::spider_port_1c_w)); - map(0x001e, 0x001f).r(this, FUNC(twins_state::spider_port_1e_r)); + map(0x0004, 0x0005).rw(FUNC(twins_state::twins_port4_r), FUNC(twins_state::twins_port4_w)); + map(0x0008, 0x0009).w(FUNC(twins_state::spider_pal_w)).share("paletteram"); + map(0x0010, 0x0011).w(FUNC(twins_state::spider_paloff0_w)); + + map(0x0018, 0x0019).r(FUNC(twins_state::spider_port_18_r)); + map(0x001a, 0x001b).w(FUNC(twins_state::spider_port_1a_w)); + map(0x001c, 0x001d).w(FUNC(twins_state::spider_port_1c_w)); + map(0x001e, 0x001f).r(FUNC(twins_state::spider_port_1e_r)); } diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index be17514e840..25ea3d720df 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -83,14 +83,14 @@ void tx1_state::tx1_main(address_map &map) map(0x00000, 0x00fff).mirror(0x1000).ram(); map(0x02000, 0x02fff).mirror(0x1000).ram(); map(0x04000, 0x04fff).mirror(0x1000).ram().share("nvram"); - map(0x06000, 0x06fff).rw(this, FUNC(tx1_state::tx1_crtc_r), FUNC(tx1_state::tx1_crtc_w)); + map(0x06000, 0x06fff).rw(FUNC(tx1_state::tx1_crtc_r), FUNC(tx1_state::tx1_crtc_w)); map(0x08000, 0x09fff).ram().share("vram"); map(0x0a000, 0x0afff).ram().share("rcram"); map(0x0b000, 0x0b001).rw(m_sound, FUNC(tx1_sound_device::dipswitches_r), FUNC(tx1_sound_device::z80_busreq_w)); - map(0x0c000, 0x0c001).w(this, FUNC(tx1_state::tx1_scolst_w)); - map(0x0d000, 0x0d003).w(this, FUNC(tx1_state::tx1_slincs_w)); - map(0x0e000, 0x0e001).w(this, FUNC(tx1_state::tx1_slock_w)); - map(0x0f000, 0x0f001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)).w(this, FUNC(tx1_state::resume_math_w)); + map(0x0c000, 0x0c001).w(FUNC(tx1_state::tx1_scolst_w)); + map(0x0d000, 0x0d003).w(FUNC(tx1_state::tx1_slincs_w)); + map(0x0e000, 0x0e001).w(FUNC(tx1_state::tx1_slock_w)); + map(0x0f000, 0x0f001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)).w(FUNC(tx1_state::resume_math_w)); map(0x10000, 0x1ffff).rw(m_sound, FUNC(tx1_sound_device::z80_shared_r), FUNC(tx1_sound_device::z80_shared_w)); map(0x20000, 0x2ffff).mirror(0xd0000).rom(); } @@ -98,15 +98,15 @@ void tx1_state::tx1_main(address_map &map) void tx1_state::tx1_math(address_map &map) { map(0x00000, 0x007ff).ram().share("math_ram"); - map(0x00800, 0x00fff).rw(this, FUNC(tx1_state::tx1_spcs_ram_r), FUNC(tx1_state::tx1_spcs_ram_w)); + map(0x00800, 0x00fff).rw(FUNC(tx1_state::tx1_spcs_ram_r), FUNC(tx1_state::tx1_spcs_ram_w)); map(0x01000, 0x01fff).ram().share("rcram"); map(0x02000, 0x022ff).ram().share("objram"); - map(0x02400, 0x027ff).w(this, FUNC(tx1_state::tx1_bankcs_w)); - map(0x02800, 0x02bff).w(this, FUNC(tx1_state::halt_math_w)); - map(0x02C00, 0x02fff).w(this, FUNC(tx1_state::tx1_flgcs_w)); - map(0x03000, 0x03fff).rw(this, FUNC(tx1_state::tx1_math_r), FUNC(tx1_state::tx1_math_w)); + map(0x02400, 0x027ff).w(FUNC(tx1_state::tx1_bankcs_w)); + map(0x02800, 0x02bff).w(FUNC(tx1_state::halt_math_w)); + map(0x02C00, 0x02fff).w(FUNC(tx1_state::tx1_flgcs_w)); + map(0x03000, 0x03fff).rw(FUNC(tx1_state::tx1_math_r), FUNC(tx1_state::tx1_math_w)); map(0x04000, 0x07fff).mirror(0xf8000).rom(); - map(0x05000, 0x07fff).r(this, FUNC(tx1_state::tx1_spcs_rom_r)); + map(0x05000, 0x07fff).r(FUNC(tx1_state::tx1_spcs_rom_r)); } @@ -120,14 +120,14 @@ void tx1_state::tx1_math(address_map &map) void tx1_state::buggyboy_main(address_map &map) { map(0x00000, 0x03fff).ram().share("nvram"); - map(0x04000, 0x04fff).rw(this, FUNC(tx1_state::tx1_crtc_r), FUNC(tx1_state::tx1_crtc_w)); + map(0x04000, 0x04fff).rw(FUNC(tx1_state::tx1_crtc_r), FUNC(tx1_state::tx1_crtc_w)); map(0x08000, 0x09fff).ram().share("vram"); map(0x0a000, 0x0afff).ram().share("rcram"); map(0x0b000, 0x0b001).rw(m_sound, FUNC(tx1_sound_device::dipswitches_r), FUNC(tx1_sound_device::z80_busreq_w)); - map(0x0c000, 0x0c001).w(this, FUNC(tx1_state::buggyboy_scolst_w)); - map(0x0d000, 0x0d003).w(this, FUNC(tx1_state::tx1_slincs_w)); - map(0x0e000, 0x0e001).w(this, FUNC(tx1_state::buggyboy_sky_w)); - map(0x0f000, 0x0f003).r("watchdog", FUNC(watchdog_timer_device::reset16_r)).w(this, FUNC(tx1_state::resume_math_w)); + map(0x0c000, 0x0c001).w(FUNC(tx1_state::buggyboy_scolst_w)); + map(0x0d000, 0x0d003).w(FUNC(tx1_state::tx1_slincs_w)); + map(0x0e000, 0x0e001).w(FUNC(tx1_state::buggyboy_sky_w)); + map(0x0f000, 0x0f003).r("watchdog", FUNC(watchdog_timer_device::reset16_r)).w(FUNC(tx1_state::resume_math_w)); map(0x10000, 0x1ffff).rw(m_sound, FUNC(tx1_sound_device::z80_shared_r), FUNC(tx1_sound_device::z80_shared_w)); map(0x20000, 0x2ffff).rom(); map(0xf0000, 0xfffff).rom(); @@ -136,14 +136,14 @@ void tx1_state::buggyboy_main(address_map &map) void tx1_state::buggybjr_main(address_map &map) { map(0x00000, 0x03fff).ram().share("nvram"); - map(0x04000, 0x04fff).rw(this, FUNC(tx1_state::tx1_crtc_r), FUNC(tx1_state::tx1_crtc_w)); + map(0x04000, 0x04fff).rw(FUNC(tx1_state::tx1_crtc_r), FUNC(tx1_state::tx1_crtc_w)); map(0x08000, 0x08fff).ram().share("vram"); map(0x0a000, 0x0afff).ram().share("rcram"); map(0x0b000, 0x0b001).rw(m_sound, FUNC(tx1_sound_device::dipswitches_r), FUNC(tx1_sound_device::z80_busreq_w)); - map(0x0c000, 0x0c001).w(this, FUNC(tx1_state::buggyboy_scolst_w)); - map(0x0d000, 0x0d003).w(this, FUNC(tx1_state::tx1_slincs_w)); - map(0x0e000, 0x0e001).w(this, FUNC(tx1_state::buggyboy_sky_w)); - map(0x0f000, 0x0f003).r("watchdog", FUNC(watchdog_timer_device::reset16_r)).w(this, FUNC(tx1_state::resume_math_w)); + map(0x0c000, 0x0c001).w(FUNC(tx1_state::buggyboy_scolst_w)); + map(0x0d000, 0x0d003).w(FUNC(tx1_state::tx1_slincs_w)); + map(0x0e000, 0x0e001).w(FUNC(tx1_state::buggyboy_sky_w)); + map(0x0f000, 0x0f003).r("watchdog", FUNC(watchdog_timer_device::reset16_r)).w(FUNC(tx1_state::resume_math_w)); map(0x10000, 0x1ffff).rw(m_sound, FUNC(tx1_sound_device::z80_shared_r), FUNC(tx1_sound_device::z80_shared_w)); map(0x20000, 0x2ffff).rom(); map(0xf0000, 0xfffff).rom(); @@ -152,13 +152,13 @@ void tx1_state::buggybjr_main(address_map &map) void tx1_state::buggyboy_math(address_map &map) { map(0x00000, 0x007ff).ram().share("math_ram"); - map(0x00800, 0x00fff).rw(this, FUNC(tx1_state::buggyboy_spcs_ram_r), FUNC(tx1_state::buggyboy_spcs_ram_w)); + map(0x00800, 0x00fff).rw(FUNC(tx1_state::buggyboy_spcs_ram_r), FUNC(tx1_state::buggyboy_spcs_ram_w)); map(0x01000, 0x01fff).ram().share("rcram"); map(0x02000, 0x022ff).ram().share("objram"); - map(0x02400, 0x024ff).w(this, FUNC(tx1_state::buggyboy_gas_w)); - map(0x03000, 0x03fff).rw(this, FUNC(tx1_state::buggyboy_math_r), FUNC(tx1_state::buggyboy_math_w)); + map(0x02400, 0x024ff).w(FUNC(tx1_state::buggyboy_gas_w)); + map(0x03000, 0x03fff).rw(FUNC(tx1_state::buggyboy_math_r), FUNC(tx1_state::buggyboy_math_w)); map(0x04000, 0x07fff).mirror(0xf8000).rom(); - map(0x05000, 0x07fff).r(this, FUNC(tx1_state::buggyboy_spcs_rom_r)); + map(0x05000, 0x07fff).r(FUNC(tx1_state::buggyboy_spcs_rom_r)); } /************************************* diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp index 115346972da..af72f8d715d 100644 --- a/src/mame/drivers/uapce.cpp +++ b/src/mame/drivers/uapce.cpp @@ -247,10 +247,10 @@ void uapce_state::z80_map(address_map &map) { map(0x0000, 0x07FF).rom(); map(0x0800, 0x0FFF).ram(); - map(0x1000, 0x17FF).w(this, FUNC(uapce_state::jamma_if_control_latch_w)); - map(0x1800, 0x1FFF).r(this, FUNC(uapce_state::jamma_if_read_dsw)); + map(0x1000, 0x17FF).w(FUNC(uapce_state::jamma_if_control_latch_w)); + map(0x1800, 0x1FFF).r(FUNC(uapce_state::jamma_if_read_dsw)); map(0x2000, 0x27FF).portr("COIN"); - map(0x2800, 0x2FFF).r(this, FUNC(uapce_state::jamma_if_control_latch_r)); + map(0x2800, 0x2FFF).r(FUNC(uapce_state::jamma_if_control_latch_r)); } @@ -295,7 +295,7 @@ void uapce_state::pce_mem(address_map &map) map(0x1FE400, 0x1FE7FF).rw(m_huc6260, FUNC(huc6260_device::read), FUNC(huc6260_device::write)); map(0x1FE800, 0x1FEBFF).rw("c6280", FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w)); map(0x1FEC00, 0x1FEFFF).rw(m_maincpu, FUNC(h6280_device::timer_r), FUNC(h6280_device::timer_w)); - map(0x1FF000, 0x1FF3FF).rw(this, FUNC(uapce_state::pce_joystick_r), FUNC(uapce_state::pce_joystick_w)); + map(0x1FF000, 0x1FF3FF).rw(FUNC(uapce_state::pce_joystick_r), FUNC(uapce_state::pce_joystick_w)); map(0x1FF400, 0x1FF7FF).rw(m_maincpu, FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w)); } diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp index cdc7fd6b6d5..c2152bbacb0 100644 --- a/src/mame/drivers/ultraman.cpp +++ b/src/mame/drivers/ultraman.cpp @@ -38,7 +38,7 @@ void ultraman_state::main_map(address_map &map) map(0x1c0004, 0x1c0005).portr("P2"); map(0x1c0006, 0x1c0007).portr("DSW1"); map(0x1c0008, 0x1c0009).portr("DSW2"); - map(0x1c0018, 0x1c0019).w(this, FUNC(ultraman_state::ultraman_gfxctrl_w)); /* counters + gfx ctrl */ + map(0x1c0018, 0x1c0019).w(FUNC(ultraman_state::ultraman_gfxctrl_w)); /* counters + gfx ctrl */ map(0x1c0021, 0x1c0021).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x1c0029, 0x1c0029).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); map(0x1c0030, 0x1c0031).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); @@ -57,7 +57,7 @@ void ultraman_state::sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).ram(); map(0xc000, 0xc000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0xd000, 0xd000).w(this, FUNC(ultraman_state::sound_nmi_enable_w)); + map(0xd000, 0xd000).w(FUNC(ultraman_state::sound_nmi_enable_w)); map(0xe000, 0xe000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* M6295 */ map(0xf000, 0xf001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); /* YM2151 */ } diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp index 463310c6aa8..4f4c99ed9a5 100644 --- a/src/mame/drivers/ultratnk.cpp +++ b/src/mame/drivers/ultratnk.cpp @@ -157,21 +157,21 @@ void ultratnk_state::ultratnk_cpu_map(address_map &map) map.global_mask(0x3fff); map(0x0000, 0x007f).mirror(0x700).ram(); - map(0x0080, 0x00ff).mirror(0x700).rw(this, FUNC(ultratnk_state::wram_r), FUNC(ultratnk_state::wram_w)); - map(0x0800, 0x0bff).mirror(0x400).ram().w(this, FUNC(ultratnk_state::video_ram_w)).share("videoram"); + map(0x0080, 0x00ff).mirror(0x700).rw(FUNC(ultratnk_state::wram_r), FUNC(ultratnk_state::wram_w)); + map(0x0800, 0x0bff).mirror(0x400).ram().w(FUNC(ultratnk_state::video_ram_w)).share("videoram"); map(0x1000, 0x17ff).portr("IN0"); map(0x1800, 0x1fff).portr("IN1"); - map(0x2000, 0x2007).mirror(0x718).r(this, FUNC(ultratnk_state::analog_r)); - map(0x2020, 0x2027).mirror(0x718).r(this, FUNC(ultratnk_state::coin_r)); - map(0x2040, 0x2047).mirror(0x718).r(this, FUNC(ultratnk_state::collision_r)); - map(0x2060, 0x2063).mirror(0x71c).r(this, FUNC(ultratnk_state::options_r)); + map(0x2000, 0x2007).mirror(0x718).r(FUNC(ultratnk_state::analog_r)); + map(0x2020, 0x2027).mirror(0x718).r(FUNC(ultratnk_state::coin_r)); + map(0x2040, 0x2047).mirror(0x718).r(FUNC(ultratnk_state::collision_r)); + map(0x2060, 0x2063).mirror(0x71c).r(FUNC(ultratnk_state::options_r)); - map(0x2000, 0x2000).mirror(0x71f).w(this, FUNC(ultratnk_state::attract_w)); - map(0x2020, 0x2027).mirror(0x718).w(this, FUNC(ultratnk_state::collision_reset_w)); - map(0x2040, 0x2041).mirror(0x718).w(this, FUNC(ultratnk_state::da_latch_w)); - map(0x2042, 0x2043).mirror(0x718).w(this, FUNC(ultratnk_state::explosion_w)); + map(0x2000, 0x2000).mirror(0x71f).w(FUNC(ultratnk_state::attract_w)); + map(0x2020, 0x2027).mirror(0x718).w(FUNC(ultratnk_state::collision_reset_w)); + map(0x2040, 0x2041).mirror(0x718).w(FUNC(ultratnk_state::da_latch_w)); + map(0x2042, 0x2043).mirror(0x718).w(FUNC(ultratnk_state::explosion_w)); map(0x2044, 0x2045).mirror(0x718).w(m_watchdog, FUNC(watchdog_timer_device::reset_w)); map(0x2060, 0x206f).mirror(0x710).w("latch", FUNC(f9334_device::write_a0)); diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp index 78f6859ede6..ca9e148ba43 100644 --- a/src/mame/drivers/ultrsprt.cpp +++ b/src/mame/drivers/ultrsprt.cpp @@ -151,12 +151,12 @@ READ16_MEMBER(ultrsprt_state::upd2_r) void ultrsprt_state::ultrsprt_map(address_map &map) { map(0x00000000, 0x0007ffff).bankrw("vram"); - map(0x70000000, 0x70000000).rw(this, FUNC(ultrsprt_state::eeprom_r), FUNC(ultrsprt_state::eeprom_w)); - map(0x70000020, 0x70000023).r(this, FUNC(ultrsprt_state::upd1_r)); - map(0x70000040, 0x70000043).r(this, FUNC(ultrsprt_state::upd2_r)); + map(0x70000000, 0x70000000).rw(FUNC(ultrsprt_state::eeprom_r), FUNC(ultrsprt_state::eeprom_w)); + map(0x70000020, 0x70000023).r(FUNC(ultrsprt_state::upd1_r)); + map(0x70000040, 0x70000043).r(FUNC(ultrsprt_state::upd2_r)); map(0x70000080, 0x7000008f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)); map(0x700000c0, 0x700000cf).nopw(); // Written following DMA interrupt - unused int ack? - map(0x700000e0, 0x700000e3).w(this, FUNC(ultrsprt_state::int_ack_w)); + map(0x700000e0, 0x700000e3).w(FUNC(ultrsprt_state::int_ack_w)); map(0x7f000000, 0x7f01ffff).ram().share("workram"); map(0x7f700000, 0x7f703fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0x7f800000, 0x7f9fffff).mirror(0x00600000).rom().region("program", 0); diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp index 742b02e33b3..94e69cda6b1 100644 --- a/src/mame/drivers/umipoker.cpp +++ b/src/mame/drivers/umipoker.cpp @@ -344,39 +344,39 @@ void umipoker_state::umipoker_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x400000, 0x403fff).ram().share("nvram"); map(0x600000, 0x6007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0x800000, 0x801fff).ram().w(this, FUNC(umipoker_state::umipoker_vram_0_w)).share("vra0"); - map(0x802000, 0x803fff).ram().w(this, FUNC(umipoker_state::umipoker_vram_1_w)).share("vra1"); - map(0x804000, 0x805fff).ram().w(this, FUNC(umipoker_state::umipoker_vram_2_w)).share("vra2"); - map(0x806000, 0x807fff).ram().w(this, FUNC(umipoker_state::umipoker_vram_3_w)).share("vra3"); - map(0xc00000, 0xc0ffff).r(this, FUNC(umipoker_state::z80_rom_readback_r)).umask16(0x00ff); - map(0xc1f000, 0xc1ffff).rw(this, FUNC(umipoker_state::z80_shared_ram_r), FUNC(umipoker_state::z80_shared_ram_w)).umask16(0x00ff); + map(0x800000, 0x801fff).ram().w(FUNC(umipoker_state::umipoker_vram_0_w)).share("vra0"); + map(0x802000, 0x803fff).ram().w(FUNC(umipoker_state::umipoker_vram_1_w)).share("vra1"); + map(0x804000, 0x805fff).ram().w(FUNC(umipoker_state::umipoker_vram_2_w)).share("vra2"); + map(0x806000, 0x807fff).ram().w(FUNC(umipoker_state::umipoker_vram_3_w)).share("vra3"); + map(0xc00000, 0xc0ffff).r(FUNC(umipoker_state::z80_rom_readback_r)).umask16(0x00ff); + map(0xc1f000, 0xc1ffff).rw(FUNC(umipoker_state::z80_shared_ram_r), FUNC(umipoker_state::z80_shared_ram_w)).umask16(0x00ff); map(0xe00000, 0xe00001).portr("IN0"); map(0xe00004, 0xe00005).portr("IN1"); // unused? map(0xe00008, 0xe00009).portr("IN2"); - map(0xe00010, 0xe00011).w(this, FUNC(umipoker_state::umi_counters_w)); + map(0xe00010, 0xe00011).w(FUNC(umipoker_state::umi_counters_w)); // AM_RANGE(0xe0000c, 0xe0000d) AM_WRITE(lamps_w) -----> lamps only for saiyukip. // AM_RANGE(0xe00010, 0xe00011) AM_WRITE(counters_w) --> coin counters for both games. map(0xe00014, 0xe00015).portr("DSW1-2"); map(0xe00018, 0xe00019).portr("DSW3-4"); - map(0xe00020, 0xe00021).w(this, FUNC(umipoker_state::umipoker_scrolly_0_w)); - map(0xe00022, 0xe00023).w(this, FUNC(umipoker_state::umipoker_irq_ack_w)); - map(0xe00026, 0xe00027).w(this, FUNC(umipoker_state::umipoker_scrolly_2_w)); - map(0xe0002a, 0xe0002b).w(this, FUNC(umipoker_state::umipoker_scrolly_1_w)); + map(0xe00020, 0xe00021).w(FUNC(umipoker_state::umipoker_scrolly_0_w)); + map(0xe00022, 0xe00023).w(FUNC(umipoker_state::umipoker_irq_ack_w)); + map(0xe00026, 0xe00027).w(FUNC(umipoker_state::umipoker_scrolly_2_w)); + map(0xe0002a, 0xe0002b).w(FUNC(umipoker_state::umipoker_scrolly_1_w)); map(0xe0002c, 0xe0002d).nopw(); // unknown meaning, bit 0 goes from 0 -> 1 on IRQ service routine - map(0xe0002e, 0xe0002f).w(this, FUNC(umipoker_state::umipoker_scrolly_3_w)); + map(0xe0002e, 0xe0002f).w(FUNC(umipoker_state::umipoker_scrolly_3_w)); } void saiyukip_state::saiyukip_map(address_map &map) { umipoker_map(map); - map(0xe0000c, 0xe0000d).w(this, FUNC(saiyukip_state::lamps_w)); - map(0xe00010, 0xe00011).w(this, FUNC(saiyukip_state::saiyu_counters_w)); + map(0xe0000c, 0xe0000d).w(FUNC(saiyukip_state::lamps_w)); + map(0xe00010, 0xe00011).w(FUNC(saiyukip_state::saiyu_counters_w)); } void umipoker_state::umipoker_audio_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xf800, 0xffff).rw(this, FUNC(umipoker_state::z80_shared_ram_r), FUNC(umipoker_state::z80_shared_ram_w)).share("z80_wram"); + map(0xf800, 0xffff).rw(FUNC(umipoker_state::z80_shared_ram_r), FUNC(umipoker_state::z80_shared_ram_w)).share("z80_wram"); } void umipoker_state::umipoker_audio_io_map(address_map &map) diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp index 33aeb62c5d0..fea6f46fe19 100644 --- a/src/mame/drivers/undrfire.cpp +++ b/src/mame/drivers/undrfire.cpp @@ -346,7 +346,7 @@ void undrfire_state::undrfire_map(address_map &map) map(0x300000, 0x303fff).ram().share("spriteram"); // AM_RANGE(0x304000, 0x304003) AM_RAM // debugging - doesn't change ??? // AM_RANGE(0x304400, 0x304403) AM_RAM // debugging - doesn't change ??? - map(0x400000, 0x400003).w(this, FUNC(undrfire_state::motor_control_w)); /* gun vibration */ + map(0x400000, 0x400003).w(FUNC(undrfire_state::motor_control_w)); /* gun vibration */ map(0x500000, 0x500007).rw("tc0510nio", FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)); map(0x600000, 0x600007).noprw(); // space for ADC0809, not fitted on pcb map(0x700000, 0x7007ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); @@ -356,8 +356,8 @@ void undrfire_state::undrfire_map(address_map &map) map(0x920000, 0x92000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_long_r), FUNC(tc0100scn_device::ctrl_long_w)); map(0xa00000, 0xa0ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0xb00000, 0xb003ff).ram(); /* single bytes, blending ??? */ - map(0xd00000, 0xd00003).w(this, FUNC(undrfire_state::rotate_control_w)); /* perhaps port based rotate control? */ - map(0xf00000, 0xf00007).r(this, FUNC(undrfire_state::undrfire_lightgun_r)); /* stick coords read at $11b2-bc */ + map(0xd00000, 0xd00003).w(FUNC(undrfire_state::rotate_control_w)); /* perhaps port based rotate control? */ + map(0xf00000, 0xf00007).r(FUNC(undrfire_state::undrfire_lightgun_r)); /* stick coords read at $11b2-bc */ } @@ -366,7 +366,7 @@ void undrfire_state::cbombers_cpua_map(address_map &map) map(0x000000, 0x1fffff).rom(); map(0x200000, 0x21ffff).ram(); map(0x300000, 0x303fff).ram().share("spriteram"); - map(0x400000, 0x400003).w(this, FUNC(undrfire_state::cbombers_cpua_ctrl_w)); + map(0x400000, 0x400003).w(FUNC(undrfire_state::cbombers_cpua_ctrl_w)); map(0x500000, 0x500007).rw("tc0510nio", FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)); map(0x600000, 0x600007).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask32(0xffffffff); map(0x700000, 0x7007ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); @@ -377,7 +377,7 @@ void undrfire_state::cbombers_cpua_map(address_map &map) map(0xa00000, 0xa0ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); map(0xb00000, 0xb0000f).ram(); /* ? */ map(0xc00000, 0xc00007).ram(); /* LAN controller? */ - map(0xd00000, 0xd00003).w(this, FUNC(undrfire_state::rotate_control_w)); /* perhaps port based rotate control? */ + map(0xd00000, 0xd00003).w(FUNC(undrfire_state::rotate_control_w)); /* perhaps port based rotate control? */ map(0xe00000, 0xe0ffff).ram().share("shared_ram"); } @@ -386,7 +386,7 @@ void undrfire_state::cbombers_cpub_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x400000, 0x40ffff).ram(); /* local ram */ // AM_RANGE(0x600000, 0x60ffff) AM_DEVWRITE("tc0480scp", tc0480scp_device, word_w) /* Only written upon errors */ - map(0x800000, 0x80ffff).rw(this, FUNC(undrfire_state::shared_ram_r), FUNC(undrfire_state::shared_ram_w)); + map(0x800000, 0x80ffff).rw(FUNC(undrfire_state::shared_ram_r), FUNC(undrfire_state::shared_ram_w)); // AM_RANGE(0xa00000, 0xa001ff) AM_RAM /* Extra road control?? */ } diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp index 9071776262a..6d64c035e47 100644 --- a/src/mame/drivers/unichamp.cpp +++ b/src/mame/drivers/unichamp.cpp @@ -109,8 +109,8 @@ PALETTE_INIT_MEMBER(unichamp_state, unichamp) void unichamp_state::unichamp_mem(address_map &map) { map.global_mask(0x1FFF); //B13/B14/B15 are grounded! - map(0x0000, 0x00FF).rw(this, FUNC(unichamp_state::unichamp_gicram_r), FUNC(unichamp_state::unichamp_gicram_w)).umask16(0x00ff); - map(0x0100, 0x07FF).rw(this, FUNC(unichamp_state::unichamp_trapl_r), FUNC(unichamp_state::unichamp_trapl_w)); + map(0x0000, 0x00FF).rw(FUNC(unichamp_state::unichamp_gicram_r), FUNC(unichamp_state::unichamp_gicram_w)).umask16(0x00ff); + map(0x0100, 0x07FF).rw(FUNC(unichamp_state::unichamp_trapl_r), FUNC(unichamp_state::unichamp_trapl_w)); map(0x0800, 0x0FFF).rom().region("maincpu", 0); // Carts and EXE ROM, 10-bits wide } diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp index d821a699180..e6b4e3a1dd2 100644 --- a/src/mame/drivers/unico.cpp +++ b/src/mame/drivers/unico.cpp @@ -65,16 +65,16 @@ void unico_state::burglarx_map(address_map &map) map(0x80001a, 0x80001b).portr("DSW1"); map(0x80001c, 0x80001d).portr("DSW2"); map(0x800030, 0x800031).nopw(); // ? 0 - map(0x80010c, 0x800121).rw(this, FUNC(unico_state::unico_scroll_r), FUNC(unico_state::unico_scroll_w)); // Scroll + map(0x80010c, 0x800121).rw(FUNC(unico_state::unico_scroll_r), FUNC(unico_state::unico_scroll_w)); // Scroll map(0x800189, 0x800189).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x80018a, 0x80018a).w("ymsnd", FUNC(ym3812_device::write_port_w)); map(0x80018c, 0x80018c).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); - map(0x80018e, 0x80018f).w(this, FUNC(unico_state::burglarx_sound_bank_w)); // + map(0x80018e, 0x80018f).w(FUNC(unico_state::burglarx_sound_bank_w)); // map(0x8001e0, 0x8001e1).nopw(); // IRQ Ack - map(0x904000, 0x90ffff).rw(this, FUNC(unico_state::unico_vram_r), FUNC(unico_state::unico_vram_w)); // Layers 1, 2, 0 + map(0x904000, 0x90ffff).rw(FUNC(unico_state::unico_vram_r), FUNC(unico_state::unico_vram_w)); // Layers 1, 2, 0 map(0x920000, 0x923fff).ram(); // ? 0 - map(0x930000, 0x9307ff).rw(this, FUNC(unico_state::unico_spriteram_r), FUNC(unico_state::unico_spriteram_w)); // Sprites - map(0x940000, 0x947fff).ram().w(this, FUNC(unico_state::unico_palette_w)).share("paletteram"); // Palette + map(0x930000, 0x9307ff).rw(FUNC(unico_state::unico_spriteram_r), FUNC(unico_state::unico_spriteram_w)); // Sprites + map(0x940000, 0x947fff).ram().w(FUNC(unico_state::unico_palette_w)).share("paletteram"); // Palette } @@ -150,20 +150,20 @@ void zeropnt_state::zeropnt_map(address_map &map) map(0x800018, 0x800019).portr("INPUTS"); map(0x80001a, 0x80001b).portr("DSW1"); map(0x80001c, 0x80001d).portr("DSW2"); - map(0x80010c, 0x800121).rw(this, FUNC(zeropnt_state::unico_scroll_r), FUNC(zeropnt_state::unico_scroll_w)); // Scroll - map(0x800170, 0x800171).r(this, FUNC(zeropnt_state::unico_guny_0_msb_r)); // Light Guns - map(0x800174, 0x800175).r(this, FUNC(zeropnt_state::unico_gunx_0_msb_r)); // - map(0x800178, 0x800179).r(this, FUNC(zeropnt_state::unico_guny_1_msb_r)); // - map(0x80017c, 0x80017d).r(this, FUNC(zeropnt_state::unico_gunx_1_msb_r)); // + map(0x80010c, 0x800121).rw(FUNC(zeropnt_state::unico_scroll_r), FUNC(zeropnt_state::unico_scroll_w)); // Scroll + map(0x800170, 0x800171).r(FUNC(zeropnt_state::unico_guny_0_msb_r)); // Light Guns + map(0x800174, 0x800175).r(FUNC(zeropnt_state::unico_gunx_0_msb_r)); // + map(0x800178, 0x800179).r(FUNC(zeropnt_state::unico_guny_1_msb_r)); // + map(0x80017c, 0x80017d).r(FUNC(zeropnt_state::unico_gunx_1_msb_r)); // map(0x800189, 0x800189).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x80018a, 0x80018a).w("ymsnd", FUNC(ym3812_device::write_port_w)); map(0x80018c, 0x80018c).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w)); - map(0x80018e, 0x80018f).w(this, FUNC(zeropnt_state::zeropnt_sound_bank_w)); // + map(0x80018e, 0x80018f).w(FUNC(zeropnt_state::zeropnt_sound_bank_w)); // map(0x8001e0, 0x8001e1).writeonly(); // ? IRQ Ack - map(0x904000, 0x90ffff).rw(this, FUNC(zeropnt_state::unico_vram_r), FUNC(zeropnt_state::unico_vram_w)); // Layers 1, 2, 0 + map(0x904000, 0x90ffff).rw(FUNC(zeropnt_state::unico_vram_r), FUNC(zeropnt_state::unico_vram_w)); // Layers 1, 2, 0 map(0x920000, 0x923fff).ram(); // ? 0 - map(0x930000, 0x9307ff).rw(this, FUNC(zeropnt_state::unico_spriteram_r), FUNC(zeropnt_state::unico_spriteram_w)); // Sprites - map(0x940000, 0x947fff).ram().w(this, FUNC(zeropnt_state::unico_palette_w)).share("paletteram"); // Palette + map(0x930000, 0x9307ff).rw(FUNC(zeropnt_state::unico_spriteram_r), FUNC(zeropnt_state::unico_spriteram_w)); // Sprites + map(0x940000, 0x947fff).ram().w(FUNC(zeropnt_state::unico_palette_w)).share("paletteram"); // Palette } @@ -222,22 +222,22 @@ void zeropnt2_state::zeropnt2_map(address_map &map) map(0x800025, 0x800025).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x800028, 0x80002f).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask32(0x00ff0000); // map(0x800031, 0x800031).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // - map(0x800034, 0x800037).w(this, FUNC(zeropnt2_state::zeropnt2_sound_bank_w)); // - map(0x800038, 0x80003b).w(this, FUNC(zeropnt2_state::zeropnt2_leds_w)); // ? - map(0x80010c, 0x800123).rw(this, FUNC(zeropnt2_state::unico_scroll_r), FUNC(zeropnt2_state::unico_scroll_w)); // Scroll - map(0x800140, 0x800143).r(this, FUNC(zeropnt2_state::zeropnt2_guny_0_msb_r)); // Light Guns - map(0x800144, 0x800147).r(this, FUNC(zeropnt2_state::zeropnt2_gunx_0_msb_r)); // - map(0x800148, 0x80014b).r(this, FUNC(zeropnt2_state::zeropnt2_guny_1_msb_r)); // - map(0x80014c, 0x80014f).r(this, FUNC(zeropnt2_state::zeropnt2_gunx_1_msb_r)); // + map(0x800034, 0x800037).w(FUNC(zeropnt2_state::zeropnt2_sound_bank_w)); // + map(0x800038, 0x80003b).w(FUNC(zeropnt2_state::zeropnt2_leds_w)); // ? + map(0x80010c, 0x800123).rw(FUNC(zeropnt2_state::unico_scroll_r), FUNC(zeropnt2_state::unico_scroll_w)); // Scroll + map(0x800140, 0x800143).r(FUNC(zeropnt2_state::zeropnt2_guny_0_msb_r)); // Light Guns + map(0x800144, 0x800147).r(FUNC(zeropnt2_state::zeropnt2_gunx_0_msb_r)); // + map(0x800148, 0x80014b).r(FUNC(zeropnt2_state::zeropnt2_guny_1_msb_r)); // + map(0x80014c, 0x80014f).r(FUNC(zeropnt2_state::zeropnt2_gunx_1_msb_r)); // map(0x800150, 0x800153).portr("DSW1"); map(0x800154, 0x800157).portr("DSW2"); map(0x80015c, 0x80015f).portr("BUTTONS"); map(0x8001e0, 0x8001e3).nopw(); // ? IRQ Ack - map(0x8001f0, 0x8001f3).w(this, FUNC(zeropnt2_state::zeropnt2_eeprom_w)); // EEPROM - map(0x904000, 0x90ffff).rw(this, FUNC(zeropnt2_state::unico_vram_r), FUNC(zeropnt2_state::unico_vram_w)); // Layers 1, 2, 0 + map(0x8001f0, 0x8001f3).w(FUNC(zeropnt2_state::zeropnt2_eeprom_w)); // EEPROM + map(0x904000, 0x90ffff).rw(FUNC(zeropnt2_state::unico_vram_r), FUNC(zeropnt2_state::unico_vram_w)); // Layers 1, 2, 0 map(0x920000, 0x923fff).ram(); // ? 0 - map(0x930000, 0x9307ff).rw(this, FUNC(zeropnt2_state::unico_spriteram_r), FUNC(zeropnt2_state::unico_spriteram_w)); // Sprites - map(0x940000, 0x947fff).ram().w(this, FUNC(zeropnt2_state::unico_palette32_w)).share("paletteram"); // Palette + map(0x930000, 0x9307ff).rw(FUNC(zeropnt2_state::unico_spriteram_r), FUNC(zeropnt2_state::unico_spriteram_w)); // Sprites + map(0x940000, 0x947fff).ram().w(FUNC(zeropnt2_state::unico_palette32_w)).share("paletteram"); // Palette map(0xfe0000, 0xffffff).ram(); // RAM } diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp index bc772d7e75e..a5671f330dd 100644 --- a/src/mame/drivers/unior.cpp +++ b/src/mame/drivers/unior.cpp @@ -97,7 +97,7 @@ void unior_state::unior_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0xf7ff).ram(); - map(0xf800, 0xffff).rom().w(this, FUNC(unior_state::vram_w)); // main video + map(0xf800, 0xffff).rom().w(FUNC(unior_state::vram_w)); // main video } void unior_state::unior_io(address_map &map) @@ -107,7 +107,7 @@ void unior_state::unior_io(address_map &map) map(0x30, 0x38).rw(m_dma, FUNC(i8257_device::read), FUNC(i8257_device::write)); // dma data map(0x3c, 0x3f).rw("ppi0", FUNC(i8255_device::read), FUNC(i8255_device::write)); // cassette player control map(0x4c, 0x4f).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x50, 0x50).w(this, FUNC(unior_state::scroll_w)); + map(0x50, 0x50).w(FUNC(unior_state::scroll_w)); map(0x60, 0x61).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)); map(0xdc, 0xdf).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)); map(0xec, 0xec).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index dbe8490dcf4..ffe7c5223ed 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -193,8 +193,8 @@ void univac_state::mem_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x4fff).rom().region("roms", 0); - map(0x8000, 0xbfff).rw(this, FUNC(univac_state::bank_r), FUNC(univac_state::bank_w)); - map(0xc000, 0xffff).ram().w(this, FUNC(univac_state::ram_w)).share("videoram"); + map(0x8000, 0xbfff).rw(FUNC(univac_state::bank_r), FUNC(univac_state::bank_w)); + map(0xc000, 0xffff).ram().w(FUNC(univac_state::ram_w)).share("videoram"); } void univac_state::io_map(address_map &map) @@ -203,10 +203,10 @@ void univac_state::io_map(address_map &map) map.unmap_value_high(); map(0x00, 0x03).rw(m_uart, FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); map(0x20, 0x23).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x43, 0x43).w(this, FUNC(univac_state::port43_w)); - map(0x80, 0xbf).ram().w(this, FUNC(univac_state::nvram_w)).share("nvram"); - map(0xc4, 0xc4).w(this, FUNC(univac_state::portc4_w)); - map(0xe6, 0xe6).w(this, FUNC(univac_state::porte6_w)); + map(0x43, 0x43).w(FUNC(univac_state::port43_w)); + map(0x80, 0xbf).ram().w(FUNC(univac_state::nvram_w)).share("nvram"); + map(0xc4, 0xc4).w(FUNC(univac_state::portc4_w)); + map(0xe6, 0xe6).w(FUNC(univac_state::porte6_w)); } /* Input ports */ diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp index c08b0e42d88..3da09076980 100644 --- a/src/mame/drivers/unixpc.cpp +++ b/src/mame/drivers/unixpc.cpp @@ -283,18 +283,18 @@ void unixpc_state::unixpc_mem(address_map &map) map(0x000000, 0x3fffff).m(m_ramrombank, FUNC(address_map_bank_device::amap16)); map(0x400000, 0x4007ff).ram().share("mapram"); map(0x420000, 0x427fff).ram().share("videoram"); - map(0x460000, 0x460001).rw(this, FUNC(unixpc_state::diskdma_size_r), FUNC(unixpc_state::diskdma_size_w)); - map(0x470000, 0x470001).r(this, FUNC(unixpc_state::line_printer_r)); - map(0x480000, 0x480001).w(this, FUNC(unixpc_state::rtc_w)); - map(0x4a0000, 0x4a0001).w(this, FUNC(unixpc_state::misc_control_w)); - map(0x4d0000, 0x4d7fff).w(this, FUNC(unixpc_state::diskdma_ptr_w)); - map(0x4e0000, 0x4e0001).w(this, FUNC(unixpc_state::disk_control_w)); + map(0x460000, 0x460001).rw(FUNC(unixpc_state::diskdma_size_r), FUNC(unixpc_state::diskdma_size_w)); + map(0x470000, 0x470001).r(FUNC(unixpc_state::line_printer_r)); + map(0x480000, 0x480001).w(FUNC(unixpc_state::rtc_w)); + map(0x4a0000, 0x4a0001).w(FUNC(unixpc_state::misc_control_w)); + map(0x4d0000, 0x4d7fff).w(FUNC(unixpc_state::diskdma_ptr_w)); + map(0x4e0000, 0x4e0001).w(FUNC(unixpc_state::disk_control_w)); map(0xe10000, 0xe10007).rw(m_wd2797, FUNC(wd_fdc_device_base::read), FUNC(wd_fdc_device_base::write)).umask16(0x00ff); - map(0xe30000, 0xe30001).r(this, FUNC(unixpc_state::rtc_r)); - map(0xe40000, 0xe40001).w(this, FUNC(unixpc_state::error_enable_w)); - map(0xe41000, 0xe41001).w(this, FUNC(unixpc_state::parity_enable_w)); - map(0xe42000, 0xe42001).w(this, FUNC(unixpc_state::bpplus_w)); - map(0xe43000, 0xe43001).w(this, FUNC(unixpc_state::romlmap_w)); + map(0xe30000, 0xe30001).r(FUNC(unixpc_state::rtc_r)); + map(0xe40000, 0xe40001).w(FUNC(unixpc_state::error_enable_w)); + map(0xe41000, 0xe41001).w(FUNC(unixpc_state::parity_enable_w)); + map(0xe42000, 0xe42001).w(FUNC(unixpc_state::bpplus_w)); + map(0xe43000, 0xe43001).w(FUNC(unixpc_state::romlmap_w)); map(0x800000, 0x803fff).mirror(0x7fc000).rom().region("bootrom", 0); // e70000 / e70002 = keyboard 6850 status/control and Rx data / Tx data } @@ -302,7 +302,7 @@ void unixpc_state::unixpc_mem(address_map &map) void unixpc_state::ramrombank_map(address_map &map) { map(0x000000, 0x3fffff).rom().region("bootrom", 0); - map(0x400000, 0x7fffff).rw(this, FUNC(unixpc_state::ram_mmu_r), FUNC(unixpc_state::ram_mmu_w)); + map(0x400000, 0x7fffff).rw(FUNC(unixpc_state::ram_mmu_r), FUNC(unixpc_state::ram_mmu_w)); } /*************************************************************************** diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index 16e3fc52e83..cccb2af0480 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -103,7 +103,7 @@ void horse_state::horse_map(address_map &map) map(0x0000, 0x37ff).rom(); map(0x4000, 0x40ff).rw("i8155", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); map(0x6000, 0x7fff).ram().share("vram"); - map(0x8000, 0x87ff).mirror(0x0800).rw(this, FUNC(horse_state::colorram_r), FUNC(horse_state::colorram_w)); + map(0x8000, 0x87ff).mirror(0x0800).rw(FUNC(horse_state::colorram_r), FUNC(horse_state::colorram_w)); } void horse_state::horse_io_map(address_map &map) diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp index 77fd7cf336b..8e03fe75d51 100644 --- a/src/mame/drivers/upscope.cpp +++ b/src/mame/drivers/upscope.cpp @@ -218,12 +218,12 @@ void upscope_state::a500_mem(address_map &map) { map.unmap_value_high(); map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16)); - map(0xa00000, 0xbfffff).rw(this, FUNC(upscope_state::cia_r), FUNC(upscope_state::cia_w)); - map(0xc00000, 0xd7ffff).rw(this, FUNC(upscope_state::custom_chip_r), FUNC(upscope_state::custom_chip_w)); + map(0xa00000, 0xbfffff).rw(FUNC(upscope_state::cia_r), FUNC(upscope_state::cia_w)); + map(0xc00000, 0xd7ffff).rw(FUNC(upscope_state::custom_chip_r), FUNC(upscope_state::custom_chip_w)); map(0xd80000, 0xddffff).noprw(); - map(0xde0000, 0xdeffff).rw(this, FUNC(upscope_state::custom_chip_r), FUNC(upscope_state::custom_chip_w)); - map(0xdf0000, 0xdfffff).rw(this, FUNC(upscope_state::custom_chip_r), FUNC(upscope_state::custom_chip_w)); - map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(upscope_state::rom_mirror_r)); + map(0xde0000, 0xdeffff).rw(FUNC(upscope_state::custom_chip_r), FUNC(upscope_state::custom_chip_w)); + map(0xdf0000, 0xdfffff).rw(FUNC(upscope_state::custom_chip_r), FUNC(upscope_state::custom_chip_w)); + map(0xe00000, 0xe7ffff).nopw().r(FUNC(upscope_state::rom_mirror_r)); map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices) map(0xf80000, 0xffffff).rom().region("kickstart", 0); } diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp index 838b010cb1c..07b090db15e 100644 --- a/src/mame/drivers/usgames.cpp +++ b/src/mame/drivers/usgames.cpp @@ -68,16 +68,16 @@ void usgames_state::usgames_map(address_map &map) map(0x0000, 0x1fff).ram().share("nvram"); map(0x2000, 0x2000).portr("DSW"); map(0x2010, 0x2010).portr("INPUTS"); - map(0x2020, 0x2020).w(this, FUNC(usgames_state::lamps1_w)); - map(0x2030, 0x2030).w(this, FUNC(usgames_state::lamps2_w)); + map(0x2020, 0x2020).w(FUNC(usgames_state::lamps1_w)); + map(0x2030, 0x2030).w(FUNC(usgames_state::lamps2_w)); map(0x2040, 0x2040).w("crtc", FUNC(mc6845_device::address_w)); map(0x2041, 0x2041).portr("UNK1"); map(0x2041, 0x2041).w("crtc", FUNC(mc6845_device::register_w)); - map(0x2060, 0x2060).w(this, FUNC(usgames_state::rombank_w)); + map(0x2060, 0x2060).w(FUNC(usgames_state::rombank_w)); map(0x2070, 0x2070).portr("UNK2"); map(0x2400, 0x2401).w("aysnd", FUNC(ay8912_device::address_data_w)); - map(0x2800, 0x2fff).ram().w(this, FUNC(usgames_state::charram_w)).share("charram"); - map(0x3000, 0x3fff).ram().w(this, FUNC(usgames_state::videoram_w)).share("videoram"); + map(0x2800, 0x2fff).ram().w(FUNC(usgames_state::charram_w)).share("charram"); + map(0x3000, 0x3fff).ram().w(FUNC(usgames_state::videoram_w)).share("videoram"); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom(); } @@ -89,15 +89,15 @@ void usgames_state::usg185_map(address_map &map) map(0x2000, 0x2001).w("aysnd", FUNC(ay8912_device::address_data_w)); map(0x2400, 0x2400).portr("DSW"); map(0x2410, 0x2410).portr("INPUTS"); - map(0x2420, 0x2420).w(this, FUNC(usgames_state::lamps1_w)); - map(0x2430, 0x2430).w(this, FUNC(usgames_state::lamps2_w)); + map(0x2420, 0x2420).w(FUNC(usgames_state::lamps1_w)); + map(0x2430, 0x2430).w(FUNC(usgames_state::lamps2_w)); map(0x2440, 0x2440).w("crtc", FUNC(mc6845_device::address_w)); map(0x2441, 0x2441).portr("UNK1"); map(0x2441, 0x2441).w("crtc", FUNC(mc6845_device::register_w)); - map(0x2460, 0x2460).w(this, FUNC(usgames_state::rombank_w)); + map(0x2460, 0x2460).w(FUNC(usgames_state::rombank_w)); map(0x2470, 0x2470).portr("UNK2"); - map(0x2800, 0x2fff).ram().w(this, FUNC(usgames_state::charram_w)).share("charram"); - map(0x3000, 0x3fff).ram().w(this, FUNC(usgames_state::videoram_w)).share("videoram"); + map(0x2800, 0x2fff).ram().w(FUNC(usgames_state::charram_w)).share("charram"); + map(0x3000, 0x3fff).ram().w(FUNC(usgames_state::videoram_w)).share("videoram"); map(0x4000, 0x7fff).bankr("bank1"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index ac1a43070f7..20d9b27bb99 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -43,7 +43,7 @@ void ut88_state::ut88mini_mem(address_map &map) map.unmap_value_high(); map(0x0000, 0x03ff).rom(); // System ROM map(0xc000, 0xc3ff).ram(); // RAM - map(0x9000, 0x9fff).w(this, FUNC(ut88_state::ut88mini_write_led)); // 7seg LED + map(0x9000, 0x9fff).w(FUNC(ut88_state::ut88mini_write_led)); // 7seg LED } void ut88_state::ut88_mem(address_map &map) @@ -58,14 +58,14 @@ void ut88_state::ut88_mem(address_map &map) void ut88_state::ut88mini_io(address_map &map) { - map(0xA0, 0xA0).r(this, FUNC(ut88_state::ut88mini_keyboard_r)); - map(0xA1, 0xA1).r(this, FUNC(ut88_state::ut88_tape_r)); + map(0xA0, 0xA0).r(FUNC(ut88_state::ut88mini_keyboard_r)); + map(0xA1, 0xA1).r(FUNC(ut88_state::ut88_tape_r)); } void ut88_state::ut88_io(address_map &map) { - map(0x04, 0x07).rw(this, FUNC(ut88_state::ut88_keyboard_r), FUNC(ut88_state::ut88_keyboard_w)); - map(0xA1, 0xA1).rw(this, FUNC(ut88_state::ut88_tape_r), FUNC(ut88_state::ut88_sound_w)); + map(0x04, 0x07).rw(FUNC(ut88_state::ut88_keyboard_r), FUNC(ut88_state::ut88_keyboard_w)); + map(0xA1, 0xA1).rw(FUNC(ut88_state::ut88_tape_r), FUNC(ut88_state::ut88_sound_w)); } /* Input ports */ diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp index 68fd89dd4a2..d5c7478fd9b 100644 --- a/src/mame/drivers/uzebox.cpp +++ b/src/mame/drivers/uzebox.cpp @@ -211,10 +211,10 @@ void uzebox_state::uzebox_data_map(address_map &map) void uzebox_state::uzebox_io_map(address_map &map) { - map(AVR8_REG_A, AVR8_REG_A).rw(this, FUNC(uzebox_state::port_a_r), FUNC(uzebox_state::port_a_w)); - map(AVR8_REG_B, AVR8_REG_B).rw(this, FUNC(uzebox_state::port_b_r), FUNC(uzebox_state::port_b_w)); - map(AVR8_REG_C, AVR8_REG_C).rw(this, FUNC(uzebox_state::port_c_r), FUNC(uzebox_state::port_c_w)); - map(AVR8_REG_D, AVR8_REG_D).rw(this, FUNC(uzebox_state::port_d_r), FUNC(uzebox_state::port_d_w)); + map(AVR8_REG_A, AVR8_REG_A).rw(FUNC(uzebox_state::port_a_r), FUNC(uzebox_state::port_a_w)); + map(AVR8_REG_B, AVR8_REG_B).rw(FUNC(uzebox_state::port_b_r), FUNC(uzebox_state::port_b_w)); + map(AVR8_REG_C, AVR8_REG_C).rw(FUNC(uzebox_state::port_c_r), FUNC(uzebox_state::port_c_w)); + map(AVR8_REG_D, AVR8_REG_D).rw(FUNC(uzebox_state::port_d_r), FUNC(uzebox_state::port_d_w)); } /****************************************************\ diff --git a/src/mame/drivers/v100.cpp b/src/mame/drivers/v100.cpp index d8ca16fc1a5..d40be503c1d 100644 --- a/src/mame/drivers/v100.cpp +++ b/src/mame/drivers/v100.cpp @@ -157,8 +157,8 @@ void v100_state::machine_start() template WRITE8_MEMBER(v100_state::brg_w) { - m_brg[N]->str_w(data & 0x0f); - m_brg[N]->stt_w(data >> 4); + m_brg[N]->write_str(data & 0x0f); + m_brg[N]->write_stt(data >> 4); } READ8_MEMBER(v100_state::earom_r) @@ -225,17 +225,17 @@ void v100_state::io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x0f).w(m_vtac, FUNC(crt5037_device::write)); - map(0x10, 0x10).w(this, FUNC(v100_state::brg_w<0>)); + map(0x10, 0x10).w(FUNC(v100_state::brg_w<0>)); map(0x12, 0x12).rw("usart1", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x13, 0x13).rw("usart1", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x14, 0x14).rw("usart2", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x15, 0x15).rw("usart2", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x16, 0x16).w(this, FUNC(v100_state::brg_w<1>)); - map(0x20, 0x20).r(this, FUNC(v100_state::earom_r)); - map(0x30, 0x30).w(this, FUNC(v100_state::port30_w)); - map(0x40, 0x40).rw(this, FUNC(v100_state::keyboard_r), FUNC(v100_state::key_row_w)); - map(0x48, 0x48).w(this, FUNC(v100_state::port48_w)); - map(0x60, 0x60).w(this, FUNC(v100_state::picu_w)); + map(0x16, 0x16).w(FUNC(v100_state::brg_w<1>)); + map(0x20, 0x20).r(FUNC(v100_state::earom_r)); + map(0x30, 0x30).w(FUNC(v100_state::port30_w)); + map(0x40, 0x40).rw(FUNC(v100_state::keyboard_r), FUNC(v100_state::key_row_w)); + map(0x48, 0x48).w(FUNC(v100_state::port48_w)); + map(0x60, 0x60).w(FUNC(v100_state::picu_w)); map(0x70, 0x73).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); } diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index bb6d62bc553..af1ffc0cbd6 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -483,30 +483,30 @@ void v1050_state::v1050_io(address_map &map) map(0x84, 0x87).rw(m_ppi_disp, FUNC(i8255_device::read), FUNC(i8255_device::write)); // AM_RANGE(0x88, 0x88) AM_DEVREADWRITE(I8251A_KB_TAG, i8251_device, data_r, data_w) // AM_RANGE(0x89, 0x89) AM_DEVREADWRITE(I8251A_KB_TAG, i8251_device, status_r, control_w) - map(0x88, 0x88).r(this, FUNC(v1050_state::kb_data_r)).w(m_uart_kb, FUNC(i8251_device::data_w)); - map(0x89, 0x89).r(this, FUNC(v1050_state::kb_status_r)).w(m_uart_kb, FUNC(i8251_device::control_w)); + map(0x88, 0x88).r(FUNC(v1050_state::kb_data_r)).w(m_uart_kb, FUNC(i8251_device::data_w)); + map(0x89, 0x89).r(FUNC(v1050_state::kb_status_r)).w(m_uart_kb, FUNC(i8251_device::control_w)); map(0x8c, 0x8c).rw(m_uart_sio, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x8d, 0x8d).rw(m_uart_sio, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x90, 0x93).rw(I8255A_MISC_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x94, 0x97).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write)); map(0x9c, 0x9f).rw(I8255A_RTC_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa0, 0xa0).rw(this, FUNC(v1050_state::vint_clr_r), FUNC(v1050_state::vint_clr_w)); - map(0xb0, 0xb0).rw(this, FUNC(v1050_state::dint_clr_r), FUNC(v1050_state::dint_clr_w)); - map(0xc0, 0xc0).w(this, FUNC(v1050_state::v1050_i8214_w)); - map(0xd0, 0xd0).w(this, FUNC(v1050_state::bank_w)); - map(0xe0, 0xe0).w(this, FUNC(v1050_state::sasi_data_w)).r(m_sasi_data_in, FUNC(input_buffer_device::read)); - map(0xe1, 0xe1).r(m_sasi_ctrl_in, FUNC(input_buffer_device::read)).w(this, FUNC(v1050_state::sasi_ctrl_w)); + map(0xa0, 0xa0).rw(FUNC(v1050_state::vint_clr_r), FUNC(v1050_state::vint_clr_w)); + map(0xb0, 0xb0).rw(FUNC(v1050_state::dint_clr_r), FUNC(v1050_state::dint_clr_w)); + map(0xc0, 0xc0).w(FUNC(v1050_state::v1050_i8214_w)); + map(0xd0, 0xd0).w(FUNC(v1050_state::bank_w)); + map(0xe0, 0xe0).w(FUNC(v1050_state::sasi_data_w)).r(m_sasi_data_in, FUNC(input_buffer_device::bus_r)); + map(0xe1, 0xe1).r(m_sasi_ctrl_in, FUNC(input_buffer_device::bus_r)).w(FUNC(v1050_state::sasi_ctrl_w)); } void v1050_state::v1050_crt_mem(address_map &map) { - map(0x0000, 0x7fff).rw(this, FUNC(v1050_state::videoram_r), FUNC(v1050_state::videoram_w)).share("video_ram"); + map(0x0000, 0x7fff).rw(FUNC(v1050_state::videoram_r), FUNC(v1050_state::videoram_w)).share("video_ram"); map(0x8000, 0x8000).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x8001, 0x8001).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); map(0x9000, 0x9003).rw(m_ppi_6502, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa000, 0xa000).rw(this, FUNC(v1050_state::attr_r), FUNC(v1050_state::attr_w)); - map(0xb000, 0xb000).w(this, FUNC(v1050_state::dint_w)); - map(0xc000, 0xc000).w(this, FUNC(v1050_state::dvint_clr_w)); + map(0xa000, 0xa000).rw(FUNC(v1050_state::attr_r), FUNC(v1050_state::attr_w)); + map(0xb000, 0xb000).w(FUNC(v1050_state::dint_w)); + map(0xc000, 0xc000).w(FUNC(v1050_state::dvint_clr_w)); map(0xe000, 0xffff).rom(); } @@ -1060,7 +1060,7 @@ MACHINE_CONFIG_START(v1050_state::v1050) MCFG_DEVICE_ADD(I8255A_MISC_TAG, I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, v1050_state, misc_ppi_pa_w)) - MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTC_CB(READ8(*this, v1050_state,misc_ppi_pc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, v1050_state,misc_ppi_pc_w)) diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index 2747457df2c..7bb6b306ac2 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -117,9 +117,9 @@ void v6809_state::v6809_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0xefff).ram(); - map(0xf000, 0xf000).mirror(0xfe).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(v6809_state::v6809_address_w)); - map(0xf001, 0xf001).mirror(0xfe).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(v6809_state::v6809_register_w)); - map(0xf200, 0xf200).mirror(0xff).w(this, FUNC(v6809_state::videoram_w)); + map(0xf000, 0xf000).mirror(0xfe).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(v6809_state::v6809_address_w)); + map(0xf001, 0xf001).mirror(0xfe).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(v6809_state::v6809_register_w)); + map(0xf200, 0xf200).mirror(0xff).w(FUNC(v6809_state::videoram_w)); map(0xf500, 0xf501).mirror(0x36).rw("acia0", FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // modem map(0xf508, 0xf509).mirror(0x36).rw("acia1", FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // printer map(0xf600, 0xf603).mirror(0x3c).rw(m_fdc, FUNC(mb8876_device::read), FUNC(mb8876_device::write)); diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index e0a3fc4017f..97aedf0ed38 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -532,92 +532,92 @@ void vamphalf_state::vamphalf_io(address_map &map) map(0x0c3, 0x0c3).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x140, 0x143).w("ymsnd", FUNC(ym2151_device::register_w)).umask16(0x00ff); map(0x147, 0x147).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::data_w)); - map(0x1c0, 0x1c3).r(this, FUNC(vamphalf_state::eeprom_r)); - map(0x240, 0x243).w(this, FUNC(vamphalf_state::flipscreen_w)); + map(0x1c0, 0x1c3).r(FUNC(vamphalf_state::eeprom_r)); + map(0x240, 0x243).w(FUNC(vamphalf_state::flipscreen_w)); map(0x600, 0x603).portr("SYSTEM"); map(0x604, 0x607).portr("P1_P2"); - map(0x608, 0x60b).w(this, FUNC(vamphalf_state::eeprom_w)); + map(0x608, 0x60b).w(FUNC(vamphalf_state::eeprom_w)); } void vamphalf_qdsp_state::misncrft_io(address_map &map) { - map(0x100, 0x103).w(this, FUNC(vamphalf_state::flipscreen_w)); + map(0x100, 0x103).w(FUNC(vamphalf_state::flipscreen_w)); map(0x200, 0x203).portr("P1_P2"); map(0x240, 0x243).portr("SYSTEM"); - map(0x3c0, 0x3c3).w(this, FUNC(vamphalf_state::eeprom_w)); + map(0x3c0, 0x3c3).w(FUNC(vamphalf_state::eeprom_w)); map(0x400, 0x403).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff).cswidth(16); - map(0x580, 0x583).r(this, FUNC(vamphalf_state::eeprom_r)); + map(0x580, 0x583).r(FUNC(vamphalf_state::eeprom_r)); } void vamphalf_state::coolmini_io(address_map &map) { - map(0x200, 0x203).w(this, FUNC(vamphalf_state::flipscreen_w)); + map(0x200, 0x203).w(FUNC(vamphalf_state::flipscreen_w)); map(0x300, 0x303).portr("SYSTEM"); map(0x304, 0x307).portr("P1_P2"); - map(0x308, 0x30b).w(this, FUNC(vamphalf_state::eeprom_w)); + map(0x308, 0x30b).w(FUNC(vamphalf_state::eeprom_w)); map(0x4c0, 0x4c1).noprw(); // return 0, when oki chip is read / written map(0x4c3, 0x4c3).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x540, 0x543).w("ymsnd", FUNC(ym2151_device::register_w)).umask16(0x00ff); map(0x544, 0x547).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::data_w)).umask16(0x00ff); - map(0x7c0, 0x7c3).r(this, FUNC(vamphalf_state::eeprom_r)); + map(0x7c0, 0x7c3).r(FUNC(vamphalf_state::eeprom_r)); } void vamphalf_state::mrkicker_io(address_map &map) { - map(0x002, 0x003).w(this, FUNC(vamphalf_state::mrkicker_oki_bank_w)); + map(0x002, 0x003).w(FUNC(vamphalf_state::mrkicker_oki_bank_w)); coolmini_io(map); } void vamphalf_state::suplup_io(address_map &map) { - map(0x020, 0x023).w(this, FUNC(vamphalf_state::eeprom_w)); + map(0x020, 0x023).w(FUNC(vamphalf_state::eeprom_w)); map(0x040, 0x043).portr("P1_P2"); map(0x060, 0x063).portr("SYSTEM"); map(0x080, 0x081).noprw(); // return 0, when oki chip is read / written map(0x083, 0x083).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0c0, 0x0c3).w("ymsnd", FUNC(ym2151_device::register_w)).umask16(0x00ff); map(0x0c4, 0x0c7).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::data_w)).umask16(0x00ff); - map(0x100, 0x103).r(this, FUNC(vamphalf_state::eeprom_r)); + map(0x100, 0x103).r(FUNC(vamphalf_state::eeprom_r)); } void vamphalf_qdsp_state::wyvernwg_io(address_map &map) { - map(0x1800, 0x1803).rw(this, FUNC(vamphalf_qdsp_state::wyvernwg_prot_r), FUNC(vamphalf_qdsp_state::wyvernwg_prot_w)); - map(0x2000, 0x2003).w(this, FUNC(vamphalf_state::flipscreen32_w)); + map(0x1800, 0x1803).rw(FUNC(vamphalf_qdsp_state::wyvernwg_prot_r), FUNC(vamphalf_qdsp_state::wyvernwg_prot_w)); + map(0x2000, 0x2003).w(FUNC(vamphalf_state::flipscreen32_w)); map(0x2800, 0x2803).portr("P1_P2"); map(0x3000, 0x3003).portr("SYSTEM"); map(0x5400, 0x5403).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask32(0x000000ff).cswidth(32); - map(0x7000, 0x7003).w(this, FUNC(vamphalf_state::eeprom32_w)); - map(0x7c00, 0x7c03).r(this, FUNC(vamphalf_state::eeprom32_r)); + map(0x7000, 0x7003).w(FUNC(vamphalf_state::eeprom32_w)); + map(0x7c00, 0x7c03).r(FUNC(vamphalf_state::eeprom32_r)); } void vamphalf_nvram_state::finalgdr_io(address_map &map) { - map(0x2400, 0x2403).r(this, FUNC(vamphalf_nvram_state::finalgdr_prot_r)); - map(0x2800, 0x2803).w(this, FUNC(vamphalf_nvram_state::finalgdr_backupram_bank_w)); - map(0x2c00, 0x2dff).rw(this, FUNC(vamphalf_nvram_state::finalgdr_backupram_r), FUNC(vamphalf_nvram_state::finalgdr_backupram_w)); + map(0x2400, 0x2403).r(FUNC(vamphalf_nvram_state::finalgdr_prot_r)); + map(0x2800, 0x2803).w(FUNC(vamphalf_nvram_state::finalgdr_backupram_bank_w)); + map(0x2c00, 0x2dff).rw(FUNC(vamphalf_nvram_state::finalgdr_backupram_r), FUNC(vamphalf_nvram_state::finalgdr_backupram_w)); map(0x3000, 0x3007).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask32(0x0000ff00); map(0x3800, 0x3803).portr("P1_P2"); map(0x3402, 0x3402).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x3c00, 0x3c03).portr("SYSTEM"); - map(0x4400, 0x4403).r(this, FUNC(vamphalf_state::eeprom32_r)); + map(0x4400, 0x4403).r(FUNC(vamphalf_state::eeprom32_r)); map(0x6000, 0x6003).nopr(); //? - map(0x6000, 0x6003).w(this, FUNC(vamphalf_nvram_state::finalgdr_eeprom_w)); - map(0x6040, 0x6043).w(this, FUNC(vamphalf_nvram_state::finalgdr_prot_w)); + map(0x6000, 0x6003).w(FUNC(vamphalf_nvram_state::finalgdr_eeprom_w)); + map(0x6040, 0x6043).w(FUNC(vamphalf_nvram_state::finalgdr_prot_w)); //AM_RANGE(0x6080, 0x6083) AM_WRITE(flipscreen32_w) //? - map(0x6060, 0x6063).w(this, FUNC(vamphalf_nvram_state::finalgdr_prize_w)); - map(0x60a0, 0x60a3).w(this, FUNC(vamphalf_nvram_state::finalgdr_oki_bank_w)); + map(0x6060, 0x6063).w(FUNC(vamphalf_nvram_state::finalgdr_prize_w)); + map(0x60a0, 0x60a3).w(FUNC(vamphalf_nvram_state::finalgdr_oki_bank_w)); } void vamphalf_nvram_state::mrkickera_io(address_map &map) { - map(0x2400, 0x2403).r(this, FUNC(vamphalf_state::eeprom32_r)); + map(0x2400, 0x2403).r(FUNC(vamphalf_state::eeprom32_r)); map(0x4000, 0x4003).nopr(); //? - map(0x4000, 0x4003).w(this, FUNC(vamphalf_nvram_state::finalgdr_eeprom_w)); - map(0x4040, 0x4043).w(this, FUNC(vamphalf_nvram_state::finalgdr_prot_w)); + map(0x4000, 0x4003).w(FUNC(vamphalf_nvram_state::finalgdr_eeprom_w)); + map(0x4040, 0x4043).w(FUNC(vamphalf_nvram_state::finalgdr_prot_w)); map(0x4084, 0x4087).nopw(); //? - map(0x40a0, 0x40a3).w(this, FUNC(vamphalf_nvram_state::finalgdr_oki_bank_w)); - map(0x6400, 0x6403).r(this, FUNC(vamphalf_nvram_state::finalgdr_prot_r)); + map(0x40a0, 0x40a3).w(FUNC(vamphalf_nvram_state::finalgdr_oki_bank_w)); + map(0x6400, 0x6403).r(FUNC(vamphalf_nvram_state::finalgdr_prot_r)); map(0x7000, 0x7007).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask32(0x0000ff00); map(0x7402, 0x7402).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x7800, 0x7803).portr("P1_P2"); @@ -629,8 +629,8 @@ void vamphalf_state::jmpbreak_io(address_map &map) map(0x0c0, 0x0c3).noprw(); // ? map(0x100, 0x103).nopw(); // ? map(0x240, 0x243).portr("P1_P2"); - map(0x280, 0x283).w(this, FUNC(vamphalf_state::eeprom_w)); - map(0x2c0, 0x2c3).r(this, FUNC(vamphalf_state::eeprom_r)); + map(0x280, 0x283).w(FUNC(vamphalf_state::eeprom_w)); + map(0x2c0, 0x2c3).r(FUNC(vamphalf_state::eeprom_r)); map(0x440, 0x441).noprw(); // return 0, when oki chip is read / written map(0x443, 0x443).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x540, 0x543).portr("SYSTEM"); @@ -640,14 +640,14 @@ void vamphalf_state::jmpbreak_io(address_map &map) void vamphalf_state::worldadv_io(address_map &map) { - map(0x180, 0x183).w(this, FUNC(vamphalf_state::eeprom_w)); + map(0x180, 0x183).w(FUNC(vamphalf_state::eeprom_w)); map(0x280, 0x283).portr("P1_P2"); map(0x340, 0x343).portr("SYSTEM"); map(0x640, 0x641).noprw(); // return 0, when oki chip is read / written map(0x643, 0x643).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x700, 0x703).w("ymsnd", FUNC(ym2151_device::register_w)).umask16(0x00ff); map(0x704, 0x707).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::data_w)).umask16(0x00ff); - map(0x780, 0x783).r(this, FUNC(vamphalf_state::eeprom_r)); + map(0x780, 0x783).r(FUNC(vamphalf_state::eeprom_r)); } void vamphalf_state::mrdig_io(address_map &map) @@ -656,9 +656,9 @@ void vamphalf_state::mrdig_io(address_map &map) map(0x083, 0x083).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0c0, 0x0c3).w("ymsnd", FUNC(ym2151_device::register_w)).umask16(0x00ff); map(0x0c4, 0x0c7).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::data_w)).umask16(0x00ff); - map(0x180, 0x183).r(this, FUNC(vamphalf_state::eeprom_r)); + map(0x180, 0x183).r(FUNC(vamphalf_state::eeprom_r)); map(0x280, 0x283).portr("SYSTEM"); - map(0x3c0, 0x3c3).w(this, FUNC(vamphalf_state::eeprom_w)); + map(0x3c0, 0x3c3).w(FUNC(vamphalf_state::eeprom_w)); map(0x500, 0x503).portr("P1_P2"); } @@ -674,24 +674,24 @@ void vamphalf_state::aoh_map(address_map &map) void vamphalf_state::aoh_io(address_map &map) { - map(0x0480, 0x0483).w(this, FUNC(vamphalf_state::eeprom32_w)); + map(0x0480, 0x0483).w(FUNC(vamphalf_state::eeprom32_w)); map(0x0622, 0x0622).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0662, 0x0662).rw("oki_1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0640, 0x0647).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask32(0x0000ff00); - map(0x0680, 0x0683).w(this, FUNC(vamphalf_state::aoh_oki_bank_w)); + map(0x0680, 0x0683).w(FUNC(vamphalf_state::aoh_oki_bank_w)); } void vamphalf_state::boonggab_io(address_map &map) { - map(0x0c0, 0x0c3).r(this, FUNC(vamphalf_state::eeprom_r)); + map(0x0c0, 0x0c3).r(FUNC(vamphalf_state::eeprom_r)); map(0x200, 0x203).noprw(); // seems unused - map(0x300, 0x303).w(this, FUNC(vamphalf_state::flipscreen_w)); + map(0x300, 0x303).w(FUNC(vamphalf_state::flipscreen_w)); map(0x400, 0x403).portr("SYSTEM"); map(0x404, 0x407).portr("P1_P2"); - map(0x408, 0x40b).w(this, FUNC(vamphalf_state::eeprom_w)); - map(0x410, 0x413).w(this, FUNC(vamphalf_state::boonggab_prize_w)); - map(0x414, 0x41b).w(this, FUNC(vamphalf_state::boonggab_lamps_w)); - map(0x600, 0x603).w(this, FUNC(vamphalf_state::boonggab_oki_bank_w)); + map(0x408, 0x40b).w(FUNC(vamphalf_state::eeprom_w)); + map(0x410, 0x413).w(FUNC(vamphalf_state::boonggab_prize_w)); + map(0x414, 0x41b).w(FUNC(vamphalf_state::boonggab_lamps_w)); + map(0x600, 0x603).w(FUNC(vamphalf_state::boonggab_oki_bank_w)); map(0x700, 0x701).noprw(); // return 0, when oki chip is read / written map(0x702, 0x703).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask32(0x000000ff); map(0x743, 0x743).w("ymsnd", FUNC(ym2151_device::register_w)); diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index ca28824e7c3..0edc8e45efb 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -49,7 +49,7 @@ void vaportra_state::main_map(address_map &map) map(0x100000, 0x100001).portr("PLAYERS"); map(0x100002, 0x100003).portr("COINS"); map(0x100004, 0x100005).portr("DSW"); - map(0x100000, 0x100003).w(this, FUNC(vaportra_state::priority_w)); + map(0x100000, 0x100003).w(FUNC(vaportra_state::priority_w)); map(0x100007, 0x100007).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x200000, 0x201fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x202000, 0x203fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); @@ -57,9 +57,9 @@ void vaportra_state::main_map(address_map &map) map(0x280000, 0x281fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w)); map(0x282000, 0x283fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w)); map(0x2c0000, 0x2c000f).w(m_deco_tilegen[0], FUNC(deco16ic_device::pf_control_w)); - map(0x300000, 0x3009ff).ram().w(this, FUNC(vaportra_state::palette_w)).share("palette"); - map(0x304000, 0x3049ff).ram().w(this, FUNC(vaportra_state::palette_ext_w)).share("palette_ext"); - map(0x308001, 0x308001).rw(this, FUNC(vaportra_state::irq6_ack_r), FUNC(vaportra_state::irq6_ack_w)); + map(0x300000, 0x3009ff).ram().w(FUNC(vaportra_state::palette_w)).share("palette"); + map(0x304000, 0x3049ff).ram().w(FUNC(vaportra_state::palette_ext_w)).share("palette_ext"); + map(0x308001, 0x308001).rw(FUNC(vaportra_state::irq6_ack_r), FUNC(vaportra_state::irq6_ack_w)); map(0x30c000, 0x30c001).w(m_spriteram, FUNC(buffered_spriteram16_device::write)); map(0x318000, 0x3187ff).mirror(0xce0000).ram().share("spriteram"); map(0xffc000, 0xffffff).ram(); diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp index 8cc1d946496..79bd42bef2b 100644 --- a/src/mame/drivers/vastar.cpp +++ b/src/mame/drivers/vastar.cpp @@ -143,10 +143,10 @@ WRITE_LINE_MEMBER(vastar_state::nmi_mask_w) void vastar_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x8fff).ram().w(this, FUNC(vastar_state::bg2videoram_w)).share("bg2videoram").mirror(0x2000); - map(0x9000, 0x9fff).ram().w(this, FUNC(vastar_state::bg1videoram_w)).share("bg1videoram").mirror(0x2000); + map(0x8000, 0x8fff).ram().w(FUNC(vastar_state::bg2videoram_w)).share("bg2videoram").mirror(0x2000); + map(0x9000, 0x9fff).ram().w(FUNC(vastar_state::bg1videoram_w)).share("bg1videoram").mirror(0x2000); map(0xc000, 0xc000).writeonly().share("sprite_priority"); /* sprite/BG priority */ - map(0xc400, 0xcfff).ram().w(this, FUNC(vastar_state::fgvideoram_w)).share("fgvideoram"); // fg videoram + sprites + map(0xc400, 0xcfff).ram().w(FUNC(vastar_state::fgvideoram_w)).share("fgvideoram"); // fg videoram + sprites map(0xe000, 0xe000).rw("watchdog", FUNC(watchdog_timer_device::reset_r), FUNC(watchdog_timer_device::reset_w)); map(0xf000, 0xf7ff).ram().share("sharedram"); } diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp index 336ae44fe55..e1b25cbdcb1 100644 --- a/src/mame/drivers/vax11.cpp +++ b/src/mame/drivers/vax11.cpp @@ -124,10 +124,10 @@ void vax11_state::vax11_mem(address_map &map) map(0xfe78, 0xfe7b).rw("rx01", FUNC(rx01_device::read), FUNC(rx01_device::write)); - map(0xff70, 0xff71).r(this, FUNC(vax11_state::term_rx_status_r)); - map(0xff72, 0xff73).r(this, FUNC(vax11_state::term_r)); - map(0xff74, 0xff75).r(this, FUNC(vax11_state::term_tx_status_r)); - map(0xff76, 0xff77).w(this, FUNC(vax11_state::term_w)); + map(0xff70, 0xff71).r(FUNC(vax11_state::term_rx_status_r)); + map(0xff72, 0xff73).r(FUNC(vax11_state::term_r)); + map(0xff74, 0xff75).r(FUNC(vax11_state::term_tx_status_r)); + map(0xff76, 0xff77).w(FUNC(vax11_state::term_w)); } /* Input ports */ diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp index 67c1322689e..d8091935d56 100644 --- a/src/mame/drivers/vball.cpp +++ b/src/mame/drivers/vball.cpp @@ -208,14 +208,14 @@ void vball_state::main_map(address_map &map) map(0x1004, 0x1004).portr("DSW2"); map(0x1005, 0x1005).portr("P3"); map(0x1006, 0x1006).portr("P4"); - map(0x1008, 0x1008).w(this, FUNC(vball_state::scrollx_hi_w)); - map(0x1009, 0x1009).w(this, FUNC(vball_state::bankswitch_w)); - map(0x100a, 0x100b).w(this, FUNC(vball_state::irq_ack_w)); /* is there a scanline counter here? */ - map(0x100c, 0x100c).w(this, FUNC(vball_state::scrollx_lo_w)); + map(0x1008, 0x1008).w(FUNC(vball_state::scrollx_hi_w)); + map(0x1009, 0x1009).w(FUNC(vball_state::bankswitch_w)); + map(0x100a, 0x100b).w(FUNC(vball_state::irq_ack_w)); /* is there a scanline counter here? */ + map(0x100c, 0x100c).w(FUNC(vball_state::scrollx_lo_w)); map(0x100d, 0x100d).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x100e, 0x100e).writeonly().share("scrolly_lo"); - map(0x2000, 0x2fff).w(this, FUNC(vball_state::videoram_w)).share("videoram"); - map(0x3000, 0x3fff).w(this, FUNC(vball_state::attrib_w)).share("attribram"); + map(0x2000, 0x2fff).w(FUNC(vball_state::videoram_w)).share("videoram"); + map(0x3000, 0x3fff).w(FUNC(vball_state::attrib_w)).share("attribram"); map(0x4000, 0x7fff).bankr("mainbank"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp index 23b40511633..1d529232361 100644 --- a/src/mame/drivers/vboy.cpp +++ b/src/mame/drivers/vboy.cpp @@ -1097,27 +1097,27 @@ WRITE8_MEMBER( vboy_state::rfb1_w ) { m_r_frame_1[offset] = data; } void vboy_state::vboy_mem(address_map &map) { map.global_mask(0x07ffffff); - map(0x00000000, 0x00005fff).rw(this, FUNC(vboy_state::lfb0_r), FUNC(vboy_state::lfb0_w)); // L frame buffer 0 - map(0x00006000, 0x00007fff).rw(this, FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 - map(0x00008000, 0x0000dfff).rw(this, FUNC(vboy_state::lfb1_r), FUNC(vboy_state::lfb1_w)); // L frame buffer 1 - map(0x0000e000, 0x0000ffff).rw(this, FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 - map(0x00010000, 0x00015fff).rw(this, FUNC(vboy_state::rfb0_r), FUNC(vboy_state::rfb0_w)); // R frame buffer 0 - map(0x00016000, 0x00017fff).rw(this, FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 - map(0x00018000, 0x0001dfff).rw(this, FUNC(vboy_state::rfb1_r), FUNC(vboy_state::rfb1_w)); // R frame buffer 1 - map(0x0001e000, 0x0001ffff).rw(this, FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 + map(0x00000000, 0x00005fff).rw(FUNC(vboy_state::lfb0_r), FUNC(vboy_state::lfb0_w)); // L frame buffer 0 + map(0x00006000, 0x00007fff).rw(FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 + map(0x00008000, 0x0000dfff).rw(FUNC(vboy_state::lfb1_r), FUNC(vboy_state::lfb1_w)); // L frame buffer 1 + map(0x0000e000, 0x0000ffff).rw(FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 + map(0x00010000, 0x00015fff).rw(FUNC(vboy_state::rfb0_r), FUNC(vboy_state::rfb0_w)); // R frame buffer 0 + map(0x00016000, 0x00017fff).rw(FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 + map(0x00018000, 0x0001dfff).rw(FUNC(vboy_state::rfb1_r), FUNC(vboy_state::rfb1_w)); // R frame buffer 1 + map(0x0001e000, 0x0001ffff).rw(FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 - map(0x00020000, 0x0003ffff).rw(this, FUNC(vboy_state::vboy_bgmap_r), FUNC(vboy_state::vboy_bgmap_w)); // VIPC memory + map(0x00020000, 0x0003ffff).rw(FUNC(vboy_state::vboy_bgmap_r), FUNC(vboy_state::vboy_bgmap_w)); // VIPC memory //AM_RANGE( 0x00040000, 0x0005ffff ) AM_RAM // VIPC - map(0x0005f800, 0x0005f87f).rw(this, FUNC(vboy_state::vip_r), FUNC(vboy_state::vip_w)); + map(0x0005f800, 0x0005f87f).rw(FUNC(vboy_state::vip_r), FUNC(vboy_state::vip_w)); - map(0x00078000, 0x00079fff).rw(this, FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 mirror - map(0x0007a000, 0x0007bfff).rw(this, FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 mirror - map(0x0007c000, 0x0007dfff).rw(this, FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 mirror - map(0x0007e000, 0x0007ffff).rw(this, FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 mirror + map(0x00078000, 0x00079fff).rw(FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 mirror + map(0x0007a000, 0x0007bfff).rw(FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 mirror + map(0x0007c000, 0x0007dfff).rw(FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 mirror + map(0x0007e000, 0x0007ffff).rw(FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 mirror map(0x01000000, 0x010005ff).rw("vbsnd", FUNC(vboysnd_device::read), FUNC(vboysnd_device::write)); - map(0x02000000, 0x0200002b).mirror(0x0ffff00).rw(this, FUNC(vboy_state::io_r), FUNC(vboy_state::io_w)); // Hardware control registers mask 0xff + map(0x02000000, 0x0200002b).mirror(0x0ffff00).rw(FUNC(vboy_state::io_r), FUNC(vboy_state::io_w)); // Hardware control registers mask 0xff //AM_RANGE( 0x04000000, 0x04ffffff ) // Expansion area map(0x05000000, 0x0500ffff).mirror(0x0ff0000).ram().share("wram");// Main RAM - 64K mask 0xffff map(0x06000000, 0x06003fff).rw(m_cart, FUNC(vboy_cart_slot_device::read_eeprom), FUNC(vboy_cart_slot_device::write_eeprom)); // Cart RAM - 8K NVRAM @@ -1128,26 +1128,26 @@ void vboy_state::vboy_io(address_map &map) { map.global_mask(0x07ffffff); map(0x00000000, 0x00005fff).ram().share("l_frame_0"); // L frame buffer 0 - map(0x00006000, 0x00007fff).rw(this, FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 + map(0x00006000, 0x00007fff).rw(FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 map(0x00008000, 0x0000dfff).ram().share("l_frame_1"); // L frame buffer 1 - map(0x0000e000, 0x0000ffff).rw(this, FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 + map(0x0000e000, 0x0000ffff).rw(FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 map(0x00010000, 0x00015fff).ram().share("r_frame_0"); // R frame buffer 0 - map(0x00016000, 0x00017fff).rw(this, FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 + map(0x00016000, 0x00017fff).rw(FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 map(0x00018000, 0x0001dfff).ram().share("r_frame_1"); // R frame buffer 1 - map(0x0001e000, 0x0001ffff).rw(this, FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 + map(0x0001e000, 0x0001ffff).rw(FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 - map(0x00020000, 0x0003ffff).rw(this, FUNC(vboy_state::vboy_bgmap_r), FUNC(vboy_state::vboy_bgmap_w)); // VIPC memory + map(0x00020000, 0x0003ffff).rw(FUNC(vboy_state::vboy_bgmap_r), FUNC(vboy_state::vboy_bgmap_w)); // VIPC memory //AM_RANGE( 0x00040000, 0x0005ffff ) AM_RAM // VIPC - map(0x0005f800, 0x0005f87f).rw(this, FUNC(vboy_state::vip_r), FUNC(vboy_state::vip_w)); + map(0x0005f800, 0x0005f87f).rw(FUNC(vboy_state::vip_r), FUNC(vboy_state::vip_w)); - map(0x00078000, 0x00079fff).rw(this, FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 mirror - map(0x0007a000, 0x0007bfff).rw(this, FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 mirror - map(0x0007c000, 0x0007dfff).rw(this, FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 mirror - map(0x0007e000, 0x0007ffff).rw(this, FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 mirror + map(0x00078000, 0x00079fff).rw(FUNC(vboy_state::font0_r), FUNC(vboy_state::font0_w)); // Font 0-511 mirror + map(0x0007a000, 0x0007bfff).rw(FUNC(vboy_state::font1_r), FUNC(vboy_state::font1_w)); // Font 512-1023 mirror + map(0x0007c000, 0x0007dfff).rw(FUNC(vboy_state::font2_r), FUNC(vboy_state::font2_w)); // Font 1024-1535 mirror + map(0x0007e000, 0x0007ffff).rw(FUNC(vboy_state::font3_r), FUNC(vboy_state::font3_w)); // Font 1536-2047 mirror map(0x01000000, 0x010005ff).rw("vbsnd", FUNC(vboysnd_device::read), FUNC(vboysnd_device::write)); - map(0x02000000, 0x0200002b).mirror(0x0ffff00).rw(this, FUNC(vboy_state::io_r), FUNC(vboy_state::io_w)); // Hardware control registers mask 0xff + map(0x02000000, 0x0200002b).mirror(0x0ffff00).rw(FUNC(vboy_state::io_r), FUNC(vboy_state::io_w)); // Hardware control registers mask 0xff // AM_RANGE( 0x04000000, 0x04ffffff ) // Expansion area map(0x05000000, 0x0500ffff).mirror(0x0ff0000).ram().share("wram"); // Main RAM - 64K mask 0xffff map(0x06000000, 0x06003fff).noprw(); // Cart RAM - 8K NVRAM ? diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index aeaa2da1e83..8dc0794b607 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -189,8 +189,8 @@ void vc4000_state::vc4000_mem(address_map &map) map.unmap_value_high(); map.global_mask(0x1fff); map(0x0000, 0x07ff).rom(); - map(0x1680, 0x16ff).rw(this, FUNC(vc4000_state::vc4000_key_r), FUNC(vc4000_state::vc4000_sound_ctl)).mirror(0x0800); - map(0x1700, 0x17ff).rw(this, FUNC(vc4000_state::vc4000_video_r), FUNC(vc4000_state::vc4000_video_w)).mirror(0x0800); + map(0x1680, 0x16ff).rw(FUNC(vc4000_state::vc4000_key_r), FUNC(vc4000_state::vc4000_sound_ctl)).mirror(0x0800); + map(0x1700, 0x17ff).rw(FUNC(vc4000_state::vc4000_video_r), FUNC(vc4000_state::vc4000_video_w)).mirror(0x0800); } void vc4000_state::elektor_mem(address_map &map) @@ -199,9 +199,9 @@ void vc4000_state::elektor_mem(address_map &map) map.global_mask(0x1fff); map(0x0000, 0x07ff).rom(); map(0x0800, 0x15ff).ram(); - map(0x1980, 0x19ff).mirror(0x400).rw(this, FUNC(vc4000_state::elektor_cass_r), FUNC(vc4000_state::elektor_cass_w)); - map(0x1680, 0x168f).mirror(0x800).rw(this, FUNC(vc4000_state::vc4000_key_r), FUNC(vc4000_state::vc4000_sound_ctl)); - map(0x1700, 0x17ff).mirror(0x800).rw(this, FUNC(vc4000_state::vc4000_video_r), FUNC(vc4000_state::vc4000_video_w)); + map(0x1980, 0x19ff).mirror(0x400).rw(FUNC(vc4000_state::elektor_cass_r), FUNC(vc4000_state::elektor_cass_w)); + map(0x1680, 0x168f).mirror(0x800).rw(FUNC(vc4000_state::vc4000_key_r), FUNC(vc4000_state::vc4000_sound_ctl)); + map(0x1700, 0x17ff).mirror(0x800).rw(FUNC(vc4000_state::vc4000_video_r), FUNC(vc4000_state::vc4000_video_w)); } static INPUT_PORTS_START( vc4000 ) diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp index 01369bac338..82387f50ebc 100644 --- a/src/mame/drivers/vcombat.cpp +++ b/src/mame/drivers/vcombat.cpp @@ -366,28 +366,28 @@ void vcombat_state::main_map(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x200000, 0x20ffff).ram(); - map(0x300000, 0x30ffff).w(this, FUNC(vcombat_state::main_video_write)); + map(0x300000, 0x30ffff).w(FUNC(vcombat_state::main_video_write)); map(0x400000, 0x43ffff).ram().share("vid_0_ram"); /* First i860 shared RAM */ map(0x440000, 0x440003).ram().share("share6"); /* M0->P0 i860 #1 com 1 */ map(0x480000, 0x480003).ram().share("share7"); /* M0<-P0 i860 #1 com 2 */ - map(0x4c0000, 0x4c0003).w(this, FUNC(vcombat_state::wiggle_i860p0_pins_w)); /* i860 #1 stop/start/reset */ + map(0x4c0000, 0x4c0003).w(FUNC(vcombat_state::wiggle_i860p0_pins_w)); /* i860 #1 stop/start/reset */ map(0x500000, 0x53ffff).ram().share("vid_1_ram"); /* Second i860 shared RAM */ map(0x540000, 0x540003).ram().share("share8"); /* M0->P1 i860 #2 com 1 */ map(0x580000, 0x580003).ram().share("share9"); /* M0<-P1 i860 #2 com 2 */ - map(0x5c0000, 0x5c0003).w(this, FUNC(vcombat_state::wiggle_i860p1_pins_w)); /* i860 #2 stop/start/reset */ + map(0x5c0000, 0x5c0003).w(FUNC(vcombat_state::wiggle_i860p1_pins_w)); /* i860 #2 stop/start/reset */ - map(0x600000, 0x600001).r(this, FUNC(vcombat_state::control_1_r)); /* IN0 port */ + map(0x600000, 0x600001).r(FUNC(vcombat_state::control_1_r)); /* IN0 port */ map(0x600004, 0x600005).ram().share("share5"); /* M0<-M1 */ - map(0x600008, 0x600009).r(this, FUNC(vcombat_state::control_2_r)); /* IN1 port */ + map(0x600008, 0x600009).r(FUNC(vcombat_state::control_2_r)); /* IN1 port */ map(0x60001c, 0x60001d).noprw(); - map(0x60000c, 0x60000d).w(this, FUNC(vcombat_state::crtc_w)); + map(0x60000c, 0x60000d).w(FUNC(vcombat_state::crtc_w)); map(0x600010, 0x600011).ram().share("fb_control"); map(0x700000, 0x7007ff).ram().share("nvram"); - map(0x701000, 0x701001).r(this, FUNC(vcombat_state::main_irqiack_r)); - map(0x702000, 0x702001).r(this, FUNC(vcombat_state::control_3_r)); + map(0x701000, 0x701001).r(FUNC(vcombat_state::main_irqiack_r)); + map(0x702000, 0x702001).r(FUNC(vcombat_state::control_3_r)); map(0x705000, 0x705001).ram().share("share4"); /* M1->M0 */ //AM_RANGE(0x703000, 0x703001) /* Headset rotation axis? */ @@ -400,7 +400,7 @@ void vcombat_state::main_map(address_map &map) /* The first i860 - middle board */ void vcombat_state::vid_0_map(address_map &map) { - map(0x00000000, 0x0001ffff).ram().w(this, FUNC(vcombat_state::v0_fb_w)); /* Shared framebuffer - half of the bits lost to 32-bit bus */ + map(0x00000000, 0x0001ffff).ram().w(FUNC(vcombat_state::v0_fb_w)); /* Shared framebuffer - half of the bits lost to 32-bit bus */ map(0x20000000, 0x20000007).ram().share("share6"); /* M0<-P0 com 1 (0x440000 in 68k-land) */ map(0x40000000, 0x401fffff).rom().region("gfx", 0); map(0x80000000, 0x80000007).ram().share("share7"); /* M0->P0 com 2 (0x480000 in 68k-land) */ @@ -412,7 +412,7 @@ void vcombat_state::vid_0_map(address_map &map) /* The second i860 - top board */ void vcombat_state::vid_1_map(address_map &map) { - map(0x00000000, 0x0001ffff).ram().w(this, FUNC(vcombat_state::v1_fb_w)); /* Half of the bits lost to 32-bit bus */ + map(0x00000000, 0x0001ffff).ram().w(FUNC(vcombat_state::v1_fb_w)); /* Half of the bits lost to 32-bit bus */ map(0x20000000, 0x20000007).ram().share("share8"); /* M0->P1 com 1 (0x540000 in 68k-land) */ map(0x40000000, 0x401fffff).rom().region("gfx", 0); map(0x80000000, 0x80000007).ram().share("share9"); /* M0<-P1 com 2 (0x580000 in 68k-land) */ @@ -426,8 +426,8 @@ void vcombat_state::sound_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x080000, 0x08ffff).ram(); - map(0x0c0000, 0x0c0001).w(this, FUNC(vcombat_state::vcombat_dac_w)); - map(0x140000, 0x140001).r(this, FUNC(vcombat_state::sound_resetmain_r)); /* Ping M0's reset line */ + map(0x0c0000, 0x0c0001).w(FUNC(vcombat_state::vcombat_dac_w)); + map(0x140000, 0x140001).r(FUNC(vcombat_state::sound_resetmain_r)); /* Ping M0's reset line */ map(0x180000, 0x180001).ram().share("share4"); /* M1<-M0 */ map(0x1c0000, 0x1c0001).ram().share("share5"); /* M1->M0 */ map(0x200000, 0x37ffff).rom().region("samples", 0); diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp index 7b25e4985ef..d55f58269f5 100644 --- a/src/mame/drivers/vcs80.cpp +++ b/src/mame/drivers/vcs80.cpp @@ -73,13 +73,13 @@ void vcs80_state::vcs80_bd_mem(address_map &map) void vcs80_state::vcs80_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(vcs80_state::mem_r), FUNC(vcs80_state::mem_w)); + map(0x0000, 0xffff).rw(FUNC(vcs80_state::mem_r), FUNC(vcs80_state::mem_w)); } void vcs80_state::vcs80_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(vcs80_state::io_r), FUNC(vcs80_state::io_w)); + map(0x00, 0xff).rw(FUNC(vcs80_state::io_r), FUNC(vcs80_state::io_w)); } /* Input Ports */ diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp index e51f1186fd2..45b07f45512 100644 --- a/src/mame/drivers/vd.cpp +++ b/src/mame/drivers/vd.cpp @@ -76,17 +76,17 @@ void vd_state::vd_io(address_map &map) map(0x03, 0x03).portr("X3"); map(0x04, 0x04).portr("X4"); map(0x05, 0x05).portr("X5"); - map(0x20, 0x27).w(this, FUNC(vd_state::lamp_w)); - map(0x28, 0x28).w(this, FUNC(vd_state::sol_w)); - map(0x40, 0x44).w(this, FUNC(vd_state::disp_w)); + map(0x20, 0x27).w(FUNC(vd_state::lamp_w)); + map(0x28, 0x28).w(FUNC(vd_state::sol_w)); + map(0x40, 0x44).w(FUNC(vd_state::disp_w)); map(0x60, 0x60).w("ay1", FUNC(ay8910_device::address_w)); map(0x61, 0x61).r("ay1", FUNC(ay8910_device::data_r)); map(0x62, 0x62).w("ay1", FUNC(ay8910_device::data_w)); map(0x80, 0x80).w("ay2", FUNC(ay8910_device::address_w)); map(0x81, 0x81).r("ay2", FUNC(ay8910_device::data_r)); // probably never read map(0x82, 0x82).w("ay2", FUNC(ay8910_device::data_w)); - map(0xa0, 0xa0).r(this, FUNC(vd_state::ack_r)); - map(0xc0, 0xc0).w(this, FUNC(vd_state::col_w)); + map(0xa0, 0xa0).r(FUNC(vd_state::ack_r)); + map(0xc0, 0xc0).w(FUNC(vd_state::col_w)); } static INPUT_PORTS_START( break86 ) diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp index 55c9014f00c..d5ce63bad30 100644 --- a/src/mame/drivers/vector06.cpp +++ b/src/mame/drivers/vector06.cpp @@ -48,14 +48,14 @@ void vector06_state::vector06_io(address_map &map) map(0x00, 0x03).lrw8("ppi8255_rw", [this](address_space &space, offs_t offset, u8 mem_mask) -> u8 { return m_ppi8255->read(space, offset^3, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_ppi8255->write(space, offset^3, data, mem_mask); }); map(0x04, 0x07).lrw8("ppi8255_2_rw", [this](address_space &space, offs_t offset, u8 mem_mask) -> u8 { return m_ppi8255_2->read(space, offset^3, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_ppi8255_2->write(space, offset^3, data, mem_mask); }); map(0x08, 0x0b).lrw8("pit8253_rw", [this](address_space &space, offs_t offset, u8 mem_mask) -> u8 { return m_pit8253->read(space, offset^3, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_pit8253->write(space, offset^3, data, mem_mask); }); - map(0x0c, 0x0c).w(this, FUNC(vector06_state::vector06_color_set)); - map(0x10, 0x10).w(this, FUNC(vector06_state::vector06_ramdisk_w)); + map(0x0c, 0x0c).w(FUNC(vector06_state::vector06_color_set)); + map(0x10, 0x10).w(FUNC(vector06_state::vector06_ramdisk_w)); map(0x14, 0x15).rw(m_ay, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_address_w)); map(0x18, 0x18).rw(m_fdc, FUNC(kr1818vg93_device::data_r), FUNC(kr1818vg93_device::data_w)); map(0x19, 0x19).rw(m_fdc, FUNC(kr1818vg93_device::sector_r), FUNC(kr1818vg93_device::sector_w)); map(0x1a, 0x1a).rw(m_fdc, FUNC(kr1818vg93_device::track_r), FUNC(kr1818vg93_device::track_w)); map(0x1b, 0x1b).rw(m_fdc, FUNC(kr1818vg93_device::status_r), FUNC(kr1818vg93_device::cmd_w)); - map(0x1c, 0x1c).w(this, FUNC(vector06_state::vector06_disc_w)); + map(0x1c, 0x1c).w(FUNC(vector06_state::vector06_disc_w)); } /* Input ports */ diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp index 6336f6929cb..e5944eea796 100644 --- a/src/mame/drivers/vectrex.cpp +++ b/src/mame/drivers/vectrex.cpp @@ -28,7 +28,7 @@ void vectrex_state::vectrex_map(address_map &map) { map(0x0000, 0x7fff).noprw(); // cart area, handled at machine_start map(0xc800, 0xcbff).ram().mirror(0x0400).share("gce_vectorram"); - map(0xd000, 0xd7ff).rw(this, FUNC(vectrex_state::vectrex_via_r), FUNC(vectrex_state::vectrex_via_w)); + map(0xd000, 0xd7ff).rw(FUNC(vectrex_state::vectrex_via_r), FUNC(vectrex_state::vectrex_via_w)); map(0xe000, 0xffff).rom().region("maincpu", 0); } @@ -199,9 +199,9 @@ void raaspec_state::raaspec_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram().share("nvram"); - map(0xa000, 0xa000).w(this, FUNC(raaspec_state::raaspec_led_w)); + map(0xa000, 0xa000).w(FUNC(raaspec_state::raaspec_led_w)); map(0xc800, 0xcbff).ram().mirror(0x0400).share("gce_vectorram"); - map(0xd000, 0xd7ff).rw(this, FUNC(raaspec_state::vectrex_via_r), FUNC(raaspec_state::vectrex_via_w)); + map(0xd000, 0xd7ff).rw(FUNC(raaspec_state::vectrex_via_r), FUNC(raaspec_state::vectrex_via_w)); map(0xe000, 0xffff).rom(); } diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp index eded77fb00f..2d3af2fd870 100644 --- a/src/mame/drivers/vega.cpp +++ b/src/mame/drivers/vega.cpp @@ -396,7 +396,7 @@ void vega_state::vega_map(address_map &map) void vega_state::vega_io_map(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(vega_state::extern_r), FUNC(vega_state::extern_w)); + map(0x00, 0xff).rw(FUNC(vega_state::extern_r), FUNC(vega_state::extern_w)); } diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index 9a99410c2bf..74e5821fa88 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -105,13 +105,13 @@ READ32_MEMBER(vegaeo_state::vegaeo_custom_read) void vegaeo_state::vega_map(address_map &map) { map(0x00000000, 0x001fffff).ram(); - map(0x80000000, 0x80013fff).rw(this, FUNC(vegaeo_state::vram_r), FUNC(vegaeo_state::vram_w)); + map(0x80000000, 0x80013fff).rw(FUNC(vegaeo_state::vram_r), FUNC(vegaeo_state::vram_w)); map(0xfc000000, 0xfc0000ff).rw("at28c16", FUNC(at28c16_device::read), FUNC(at28c16_device::write)).umask32(0x000000ff); map(0xfc200000, 0xfc2003ff).rw("palette", FUNC(palette_device::read16), FUNC(palette_device::write16)).umask32(0x0000ffff).share("palette"); map(0xfc400000, 0xfc40005b).nopw(); // crt registers ? map(0xfc600000, 0xfc600003).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask32(0x000000ff).cswidth(32); - map(0xfca00000, 0xfca00003).w(this, FUNC(vegaeo_state::vega_misc_w)); - map(0xfcc00000, 0xfcc00003).r(this, FUNC(vegaeo_state::vegaeo_custom_read)); + map(0xfca00000, 0xfca00003).w(FUNC(vegaeo_state::vega_misc_w)); + map(0xfcc00000, 0xfcc00003).r(FUNC(vegaeo_state::vegaeo_custom_read)); map(0xfce00000, 0xfce00003).portr("P1_P2"); map(0xfd000000, 0xfeffffff).rom().region("maindata", 0); map(0xfff80000, 0xffffffff).rom().region("maincpu", 0); diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 72ab18ea926..eab9280c945 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -1669,31 +1669,31 @@ INPUT_PORTS_END *************************************/ void vegas_state::vegas_cs2_map(address_map &map) { - map(0x00000000, 0x00007003).rw(this, FUNC(vegas_state::sio_r), FUNC(vegas_state::sio_w)); + map(0x00000000, 0x00007003).rw(FUNC(vegas_state::sio_r), FUNC(vegas_state::sio_w)); } void vegas_state::vegas_cs3_map(address_map &map) { - map(0x00000000, 0x00000003).rw(this, FUNC(vegas_state::analog_port_r), FUNC(vegas_state::analog_port_w)); + map(0x00000000, 0x00000003).rw(FUNC(vegas_state::analog_port_r), FUNC(vegas_state::analog_port_w)); //AM_RANGE(0x00001000, 0x00001003) AM_READWRITE(lcd_r, lcd_w) } void vegas_state::vegas_cs4_map(address_map &map) { - map(0x00000000, 0x00007fff).rw(this, FUNC(vegas_state::timekeeper_r), FUNC(vegas_state::timekeeper_w)); + map(0x00000000, 0x00007fff).rw(FUNC(vegas_state::timekeeper_r), FUNC(vegas_state::timekeeper_w)); } void vegas_state::vegas_cs5_map(address_map &map) { - map(0x00000000, 0x00000003).rw(this, FUNC(vegas_state::cpu_io_r), FUNC(vegas_state::cpu_io_w)); - map(0x00100000, 0x001fffff).r(this, FUNC(vegas_state::unknown_r)); + map(0x00000000, 0x00000003).rw(FUNC(vegas_state::cpu_io_r), FUNC(vegas_state::cpu_io_w)); + map(0x00100000, 0x001fffff).r(FUNC(vegas_state::unknown_r)); } void vegas_state::vegas_cs6_map(address_map &map) { map(0x00000000, 0x0000003f).rw(m_ioasic, FUNC(midway_ioasic_device::packed_r), FUNC(midway_ioasic_device::packed_w)); - map(0x00001000, 0x00001003).w(this, FUNC(vegas_state::asic_fifo_w)); - map(0x00003000, 0x00003003).w(this, FUNC(vegas_state::dcs3_fifo_full_w)); // if (m_dcs_idma_cs != 0) + map(0x00001000, 0x00001003).w(FUNC(vegas_state::asic_fifo_w)); + map(0x00003000, 0x00003003).w(FUNC(vegas_state::dcs3_fifo_full_w)); // if (m_dcs_idma_cs != 0) map(0x00005000, 0x00005003).w(m_dcs, FUNC(dcs_audio_device::dsio_idma_addr_w)); // if (m_dcs_idma_cs == 6) map(0x00007000, 0x00007003).rw(m_dcs, FUNC(dcs_audio_device::dsio_idma_data_r), FUNC(dcs_audio_device::dsio_idma_data_w)); // if (m_dcs_idma_cs == 6) } @@ -1701,7 +1701,7 @@ void vegas_state::vegas_cs6_map(address_map &map) void vegas_state::vegas_cs7_map(address_map &map) { //AM_RANGE(0x00000000, 0x00000003) AM_READWRITE8(nss_r, nss_w, 0xffffffff) - map(0x00001000, 0x0000100f).rw(this, FUNC(vegas_state::ethernet_r), FUNC(vegas_state::ethernet_w)); + map(0x00001000, 0x0000100f).rw(FUNC(vegas_state::ethernet_r), FUNC(vegas_state::ethernet_w)); map(0x00005000, 0x00005003).w(m_dcs, FUNC(dcs_audio_device::dsio_idma_addr_w)); // if (m_dcs_idma_cs == 7) map(0x00007000, 0x00007003).rw(m_dcs, FUNC(dcs_audio_device::dsio_idma_data_r), FUNC(dcs_audio_device::dsio_idma_data_w)); // if (m_dcs_idma_cs == 7) } @@ -1710,8 +1710,8 @@ void vegas_state::vegas_cs8_map(address_map &map) { map(0x01000000, 0x0100001f).rw(m_uart1, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)).umask32(0x000000ff); // Serial ttyS01 (TL16C552 CS0) map(0x01400000, 0x0140001f).rw(m_uart2, FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w)).umask32(0x000000ff); // Serial ttyS02 (TL16C552 CS1) - map(0x01800000, 0x0180001f).rw(this, FUNC(vegas_state::parallel_r), FUNC(vegas_state::parallel_w)).umask32(0x000000ff); // Parallel UART (TL16C552 CS2) - map(0x01c00000, 0x01c00000).w(this, FUNC(vegas_state::mpsreset_w)); // MPS Reset + map(0x01800000, 0x0180001f).rw(FUNC(vegas_state::parallel_r), FUNC(vegas_state::parallel_w)).umask32(0x000000ff); // Parallel UART (TL16C552 CS2) + map(0x01c00000, 0x01c00000).w(FUNC(vegas_state::mpsreset_w)); // MPS Reset } /************************************* diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index 398b73e811b..53c57a76007 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -217,9 +217,9 @@ void vendetta_state::main_map(address_map &map) map(0x5fc3, 0x5fc3).portr("P4"); map(0x5fd0, 0x5fd0).portr("EEPROM"); map(0x5fd1, 0x5fd1).portr("SERVICE"); - map(0x5fe0, 0x5fe0).w(this, FUNC(vendetta_state::_5fe0_w)); - map(0x5fe2, 0x5fe2).w(this, FUNC(vendetta_state::eeprom_w)); - map(0x5fe4, 0x5fe4).rw(this, FUNC(vendetta_state::z80_irq_r), FUNC(vendetta_state::z80_irq_w)); + map(0x5fe0, 0x5fe0).w(FUNC(vendetta_state::_5fe0_w)); + map(0x5fe2, 0x5fe2).w(FUNC(vendetta_state::eeprom_w)); + map(0x5fe4, 0x5fe4).rw(FUNC(vendetta_state::z80_irq_r), FUNC(vendetta_state::z80_irq_w)); map(0x5fe6, 0x5fe7).rw("k053260", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)); map(0x5fe8, 0x5fe9).r(m_k053246, FUNC(k053247_device::k053246_r)); map(0x5fea, 0x5fea).r("watchdog", FUNC(watchdog_timer_device::reset_r)); @@ -244,9 +244,9 @@ void vendetta_state::esckids_map(address_map &map) map(0x3fa0, 0x3fa7).w(m_k053246, FUNC(k053247_device::k053246_w)); // 053246 (Sprite) map(0x3fb0, 0x3fbf).w(m_k053251, FUNC(k053251_device::write)); // 053251 (Priority Encoder) map(0x3fc0, 0x3fcf).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)); // Not Emulated (053252 ???) - map(0x3fd0, 0x3fd0).w(this, FUNC(vendetta_state::_5fe0_w)); // Coin Counter, 052109 RMRD, 053246 OBJCHA - map(0x3fd2, 0x3fd2).w(this, FUNC(vendetta_state::eeprom_w)); // EEPROM, Video banking - map(0x3fd4, 0x3fd4).rw(this, FUNC(vendetta_state::z80_irq_r), FUNC(vendetta_state::z80_irq_w)); // Sound + map(0x3fd0, 0x3fd0).w(FUNC(vendetta_state::_5fe0_w)); // Coin Counter, 052109 RMRD, 053246 OBJCHA + map(0x3fd2, 0x3fd2).w(FUNC(vendetta_state::eeprom_w)); // EEPROM, Video banking + map(0x3fd4, 0x3fd4).rw(FUNC(vendetta_state::z80_irq_r), FUNC(vendetta_state::z80_irq_w)); // Sound map(0x3fd6, 0x3fd7).rw("k053260", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)); // Sound map(0x3fd8, 0x3fd9).r(m_k053246, FUNC(k053247_device::k053246_r)); // 053246 (Sprite) map(0x3fda, 0x3fda).nopw(); // Not Emulated (Watchdog ???) @@ -263,7 +263,7 @@ void vendetta_state::videobank0_map(address_map &map) void vendetta_state::videobank1_map(address_map &map) { - map(0x0000, 0x0fff).rw(this, FUNC(vendetta_state::K052109_r), FUNC(vendetta_state::K052109_w)); + map(0x0000, 0x0fff).rw(FUNC(vendetta_state::K052109_r), FUNC(vendetta_state::K052109_w)); map(0x1000, 0x1fff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); } @@ -272,7 +272,7 @@ void vendetta_state::sound_map(address_map &map) map(0x0000, 0xefff).rom(); map(0xf000, 0xf7ff).ram(); map(0xf800, 0xf801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xfa00, 0xfa00).w(this, FUNC(vendetta_state::z80_arm_nmi_w)); + map(0xfa00, 0xfa00).w(FUNC(vendetta_state::z80_arm_nmi_w)); map(0xfc00, 0xfc2f).rw("k053260", FUNC(k053260_device::read), FUNC(k053260_device::write)); } diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp index ed97be3ae51..04668c18a7d 100644 --- a/src/mame/drivers/vertigo.cpp +++ b/src/mame/drivers/vertigo.cpp @@ -36,14 +36,14 @@ void vertigo_state::vertigo_map(address_map &map) map(0x000000, 0x000007).rom(); map(0x000008, 0x001fff).ram().mirror(0x010000); map(0x002000, 0x003fff).ram().share("vectorram"); - map(0x004000, 0x00400f).r(this, FUNC(vertigo_state::vertigo_io_convert)).mirror(0x001000); + map(0x004000, 0x00400f).r(FUNC(vertigo_state::vertigo_io_convert)).mirror(0x001000); map(0x004010, 0x00401f).r(m_adc, FUNC(adc0808_device::data_r)).mirror(0x001000); - map(0x004020, 0x00402f).r(this, FUNC(vertigo_state::vertigo_coin_r)).mirror(0x001000); + map(0x004020, 0x00402f).r(FUNC(vertigo_state::vertigo_coin_r)).mirror(0x001000); map(0x004030, 0x00403f).portr("GIO").mirror(0x001000); - map(0x004040, 0x00404f).r(this, FUNC(vertigo_state::vertigo_sio_r)).mirror(0x001000); - map(0x004050, 0x00405f).w(this, FUNC(vertigo_state::vertigo_audio_w)).mirror(0x001000); - map(0x004060, 0x00406f).w(this, FUNC(vertigo_state::vertigo_motor_w)).mirror(0x001000); - map(0x004070, 0x00407f).w(this, FUNC(vertigo_state::vertigo_wsot_w)).mirror(0x001000); + map(0x004040, 0x00404f).r(FUNC(vertigo_state::vertigo_sio_r)).mirror(0x001000); + map(0x004050, 0x00405f).w(FUNC(vertigo_state::vertigo_audio_w)).mirror(0x001000); + map(0x004060, 0x00406f).w(FUNC(vertigo_state::vertigo_motor_w)).mirror(0x001000); + map(0x004070, 0x00407f).w(FUNC(vertigo_state::vertigo_wsot_w)).mirror(0x001000); map(0x006000, 0x006007).rw("pit", FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask16(0x00ff); map(0x007000, 0x0073ff).ram().share("nvram"); map(0x800000, 0x81ffff).rom(); diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp index a2fb64eda89..30c6500f21c 100644 --- a/src/mame/drivers/vg5k.cpp +++ b/src/mame/drivers/vg5k.cpp @@ -177,8 +177,8 @@ void vg5k_state::vg5k_io(address_map &map) map(0x08, 0x08).portr("JOY1"); /* printer */ - map(0x10, 0x10).r(this, FUNC(vg5k_state::printer_r)); - map(0x11, 0x11).w(this, FUNC(vg5k_state::printer_w)); + map(0x10, 0x10).r(FUNC(vg5k_state::printer_r)); + map(0x11, 0x11).w(FUNC(vg5k_state::printer_w)); /* keyboard */ map(0x80, 0x80).portr("ROW1"); @@ -191,11 +191,11 @@ void vg5k_state::vg5k_io(address_map &map) map(0x87, 0x87).portr("ROW8"); /* EF9345 */ - map(0x8f, 0x8f).w(this, FUNC(vg5k_state::ef9345_offset_w)); - map(0xcf, 0xcf).rw(this, FUNC(vg5k_state::ef9345_io_r), FUNC(vg5k_state::ef9345_io_w)); + map(0x8f, 0x8f).w(FUNC(vg5k_state::ef9345_offset_w)); + map(0xcf, 0xcf).rw(FUNC(vg5k_state::ef9345_io_r), FUNC(vg5k_state::ef9345_io_w)); /* cassette */ - map(0xaf, 0xaf).rw(this, FUNC(vg5k_state::cassette_r), FUNC(vg5k_state::cassette_w)); + map(0xaf, 0xaf).rw(FUNC(vg5k_state::cassette_r), FUNC(vg5k_state::cassette_w)); } /* Input ports */ diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 73ae6889098..dfcd736dabb 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -1700,7 +1700,7 @@ INPUT_PORTS_END void vgmplay_state::file_map(address_map &map) { - map(0x00000000, 0xffffffff).r(this, FUNC(vgmplay_state::file_r)); + map(0x00000000, 0xffffffff).r(FUNC(vgmplay_state::file_r)); } void vgmplay_state::soundchips16_map(address_map &map) @@ -1710,7 +1710,7 @@ void vgmplay_state::soundchips16_map(address_map &map) void vgmplay_state::soundchips_map(address_map &map) { - map(vgmplay_device::REG_SIZE, vgmplay_device::REG_SIZE+3).r(this, FUNC(vgmplay_state::file_size_r)); + map(vgmplay_device::REG_SIZE, vgmplay_device::REG_SIZE+3).r(FUNC(vgmplay_state::file_size_r)); map(vgmplay_device::A_YM2612, vgmplay_device::A_YM2612+3).w(m_ym2612, FUNC(ym2612_device::write)); map(vgmplay_device::A_YM2151, vgmplay_device::A_YM2151+1).w(m_ym2151, FUNC(ym2151_device::write)); map(vgmplay_device::A_YM2413, vgmplay_device::A_YM2413+1).w(m_ym2413, FUNC(ym2413_device::write)); @@ -1723,18 +1723,18 @@ void vgmplay_state::soundchips_map(address_map &map) map(vgmplay_device::A_AY8910B, vgmplay_device::A_AY8910B).w("ay8910b", FUNC(ay8910_device::data_w)); map(vgmplay_device::A_AY8910B+1, vgmplay_device::A_AY8910B+1).w("ay8910b", FUNC(ay8910_device::address_w)); // AM_RANGE(vgmplay_device::A_SN76496+0, vgmplay_device::A_SN76496+0) AM_DEVWRITE ("sn76496", sn76496_device, stereo_w) - map(vgmplay_device::A_SN76496+1, vgmplay_device::A_SN76496+1).w(m_sn76496, FUNC(sn76496_device::write)); + map(vgmplay_device::A_SN76496+1, vgmplay_device::A_SN76496+1).w(m_sn76496, FUNC(sn76496_device::command_w)); map(vgmplay_device::A_K053260, vgmplay_device::A_K053260+0x2f).w(m_k053260, FUNC(k053260_device::write)); map(vgmplay_device::A_C6280, vgmplay_device::A_C6280+0xf).w(m_c6280, FUNC(c6280_device::c6280_w)); map(vgmplay_device::A_OKIM6295A, vgmplay_device::A_OKIM6295A).w("okim6295a", FUNC(okim6295_device::write)); - map(vgmplay_device::A_OKIM6295A+0x8, vgmplay_device::A_OKIM6295A+0xb).w(this, FUNC(vgmplay_state::okim6295_clock_w<0>)); - map(vgmplay_device::A_OKIM6295A+0xc, vgmplay_device::A_OKIM6295A+0xc).w(this, FUNC(vgmplay_state::okim6295_pin7_w<0>)); + map(vgmplay_device::A_OKIM6295A+0x8, vgmplay_device::A_OKIM6295A+0xb).w(FUNC(vgmplay_state::okim6295_clock_w<0>)); + map(vgmplay_device::A_OKIM6295A+0xc, vgmplay_device::A_OKIM6295A+0xc).w(FUNC(vgmplay_state::okim6295_pin7_w<0>)); map(vgmplay_device::A_OKIM6295A+0xe, vgmplay_device::A_OKIM6295A+0xe).w("vgmplay", FUNC(vgmplay_device::okim6295_nmk112_enable_w<0>)); map(vgmplay_device::A_OKIM6295A+0xf, vgmplay_device::A_OKIM6295A+0xf).w("vgmplay", FUNC(vgmplay_device::okim6295_bank_w<0>)); map(vgmplay_device::A_OKIM6295A+0x10, vgmplay_device::A_OKIM6295A+0x13).w("vgmplay", FUNC(vgmplay_device::okim6295_nmk112_bank_w<0>)); map(vgmplay_device::A_OKIM6295B, vgmplay_device::A_OKIM6295B).w("okim6295b", FUNC(okim6295_device::write)); - map(vgmplay_device::A_OKIM6295B+0x8, vgmplay_device::A_OKIM6295B+0xb).w(this, FUNC(vgmplay_state::okim6295_clock_w<1>)); - map(vgmplay_device::A_OKIM6295B+0xc, vgmplay_device::A_OKIM6295B+0xc).w(this, FUNC(vgmplay_state::okim6295_pin7_w<1>)); + map(vgmplay_device::A_OKIM6295B+0x8, vgmplay_device::A_OKIM6295B+0xb).w(FUNC(vgmplay_state::okim6295_clock_w<1>)); + map(vgmplay_device::A_OKIM6295B+0xc, vgmplay_device::A_OKIM6295B+0xc).w(FUNC(vgmplay_state::okim6295_pin7_w<1>)); map(vgmplay_device::A_OKIM6295B+0xe, vgmplay_device::A_OKIM6295B+0xe).w("vgmplay", FUNC(vgmplay_device::okim6295_nmk112_enable_w<1>)); map(vgmplay_device::A_OKIM6295B+0xf, vgmplay_device::A_OKIM6295B+0xf).w("vgmplay", FUNC(vgmplay_device::okim6295_bank_w<1>)); map(vgmplay_device::A_OKIM6295B+0x10, vgmplay_device::A_OKIM6295B+0x13).w("vgmplay", FUNC(vgmplay_device::okim6295_nmk112_bank_w<1>)); @@ -1757,7 +1757,7 @@ void vgmplay_state::soundchips_map(address_map &map) map(vgmplay_device::A_K054539A, vgmplay_device::A_K054539A+0x22f).w("k054539a", FUNC(k054539_device::write)); map(vgmplay_device::A_K054539B, vgmplay_device::A_K054539B+0x22f).w("k054539b", FUNC(k054539_device::write)); map(vgmplay_device::A_QSOUND, vgmplay_device::A_QSOUND+0x2).w(m_qsound, FUNC(qsound_device::qsound_w)); - map(vgmplay_device::A_K051649, vgmplay_device::A_K051649+0xf).w(this, FUNC(vgmplay_state::scc_w)); + map(vgmplay_device::A_K051649, vgmplay_device::A_K051649+0xf).w(FUNC(vgmplay_state::scc_w)); } void vgmplay_state::segapcm_map(address_map &map) diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp index 270c3fb5a84..2feee1721ed 100644 --- a/src/mame/drivers/vic10.cpp +++ b/src/mame/drivers/vic10.cpp @@ -247,7 +247,7 @@ READ8_MEMBER( vic10_state::vic_colorram_r ) void vic10_state::vic10_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(vic10_state::read), FUNC(vic10_state::write)); + map(0x0000, 0xffff).rw(FUNC(vic10_state::read), FUNC(vic10_state::write)); } @@ -257,7 +257,7 @@ void vic10_state::vic10_mem(address_map &map) void vic10_state::vic_videoram_map(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(vic10_state::vic_videoram_r)); + map(0x0000, 0x3fff).r(FUNC(vic10_state::vic_videoram_r)); } @@ -267,7 +267,7 @@ void vic10_state::vic_videoram_map(address_map &map) void vic10_state::vic_colorram_map(address_map &map) { - map(0x000, 0x3ff).r(this, FUNC(vic10_state::vic_colorram_r)); + map(0x000, 0x3ff).r(FUNC(vic10_state::vic_colorram_r)); } diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index 07afa322f30..0c83e666695 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -361,7 +361,7 @@ READ8_MEMBER( vic20_state::vic_videoram_r ) void vic20_state::vic20_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(vic20_state::read), FUNC(vic20_state::write)); + map(0x0000, 0xffff).rw(FUNC(vic20_state::read), FUNC(vic20_state::write)); } @@ -371,7 +371,7 @@ void vic20_state::vic20_mem(address_map &map) void vic20_state::vic_videoram_map(address_map &map) { - map(0x0000, 0x3fff).r(this, FUNC(vic20_state::vic_videoram_r)); + map(0x0000, 0x3fff).r(FUNC(vic20_state::vic_videoram_r)); } diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index 590aa85c4cc..a7f1795717b 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -291,9 +291,9 @@ WRITE8_MEMBER(vicdual_state::depthch_io_w) void vicdual_state::depthch_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x4000).rom(); - map(0x8000, 0x83ff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0x8000, 0x83ff).mirror(0x7000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0x8400, 0x87ff).mirror(0x7000).ram(); - map(0x8800, 0x8fff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0x8800, 0x8fff).mirror(0x7000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } @@ -303,7 +303,7 @@ void vicdual_state::depthch_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x0f).rw(this, FUNC(vicdual_state::depthch_io_r), FUNC(vicdual_state::depthch_io_w)); + map(0x00, 0x0f).rw(FUNC(vicdual_state::depthch_io_r), FUNC(vicdual_state::depthch_io_w)); } @@ -377,9 +377,9 @@ void vicdual_state::safari_map(address_map &map) map(0x0000, 0x3fff).rom(); map(0x4000, 0x7fff).noprw(); /* unused */ map(0x8000, 0x8fff).mirror(0x3000).ram(); - map(0xc000, 0xc3ff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0xc000, 0xc3ff).mirror(0x3000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0xc400, 0xc7ff).mirror(0x3000).ram(); - map(0xc800, 0xcfff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0xc800, 0xcfff).mirror(0x3000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } @@ -389,7 +389,7 @@ void vicdual_state::safari_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x0f).rw(this, FUNC(vicdual_state::safari_io_r), FUNC(vicdual_state::safari_io_w)); + map(0x00, 0x0f).rw(FUNC(vicdual_state::safari_io_r), FUNC(vicdual_state::safari_io_w)); } @@ -461,9 +461,9 @@ WRITE8_MEMBER(vicdual_state::frogs_io_w) void vicdual_state::frogs_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x4000).rom(); - map(0x8000, 0x83ff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0x8000, 0x83ff).mirror(0x7000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0x8400, 0x87ff).mirror(0x7000).ram(); - map(0x8800, 0x8fff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0x8800, 0x8fff).mirror(0x7000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } @@ -473,7 +473,7 @@ void vicdual_state::frogs_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x0f).rw(this, FUNC(vicdual_state::frogs_io_r), FUNC(vicdual_state::frogs_io_w)); + map(0x00, 0x0f).rw(FUNC(vicdual_state::frogs_io_r), FUNC(vicdual_state::frogs_io_w)); } @@ -589,9 +589,9 @@ void vicdual_state::headon_map(address_map &map) { map(0x0000, 0x1fff).mirror(0x6000).rom(); map(0x8000, 0xbfff).noprw(); /* unused */ - map(0xc000, 0xc3ff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0xc000, 0xc3ff).mirror(0x3000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0xc400, 0xc7ff).mirror(0x3000).ram(); - map(0xc800, 0xcfff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0xc800, 0xcfff).mirror(0x3000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } @@ -601,7 +601,7 @@ void vicdual_state::headon_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x0f).rw(this, FUNC(vicdual_state::headon_io_r), FUNC(vicdual_state::headon_io_w)); + map(0x00, 0x0f).rw(FUNC(vicdual_state::headon_io_r), FUNC(vicdual_state::headon_io_w)); } @@ -611,7 +611,7 @@ void vicdual_state::sspaceat_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x0f).rw(this, FUNC(vicdual_state::sspaceat_io_r), FUNC(vicdual_state::headon_io_w)); + map(0x00, 0x0f).rw(FUNC(vicdual_state::sspaceat_io_r), FUNC(vicdual_state::headon_io_w)); } @@ -861,16 +861,16 @@ void vicdual_state::headon2_map(address_map &map) { map(0x0000, 0x1fff).mirror(0x6000).rom(); /* AM_RANGE(0x8000, 0x80ff) AM_MIRROR(0x3f00) */ /* schematics show this as battery backed RAM, but doesn't appear to be used */ - map(0xc000, 0xc3ff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0xc000, 0xc3ff).mirror(0x3000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0xc400, 0xc7ff).mirror(0x3000).ram(); - map(0xc800, 0xcfff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0xc800, 0xcfff).mirror(0x3000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } void vicdual_state::headon2_io_map(address_map &map) { map.global_mask(0x1f); - map(0x00, 0x1f).rw(this, FUNC(vicdual_state::headon2_io_r), FUNC(vicdual_state::headon2_io_w)); + map(0x00, 0x1f).rw(FUNC(vicdual_state::headon2_io_r), FUNC(vicdual_state::headon2_io_w)); } @@ -880,7 +880,7 @@ void vicdual_state::digger_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x1f).rw(this, FUNC(vicdual_state::headon2_io_r), FUNC(vicdual_state::digger_io_w)); + map(0x00, 0x1f).rw(FUNC(vicdual_state::headon2_io_r), FUNC(vicdual_state::digger_io_w)); } @@ -1173,17 +1173,17 @@ WRITE8_MEMBER(vicdual_state::headonn_io_w) void vicdual_state::vicdual_dualgame_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x4000).rom(); - map(0x8000, 0x83ff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0x8000, 0x83ff).mirror(0x7000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0x8400, 0x87ff).mirror(0x7000).ram(); - map(0x8800, 0x8fff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0x8800, 0x8fff).mirror(0x7000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } void vicdual_state::carhntds_dualgame_map(address_map &map) { map(0x0000, 0x7fff).rom(); // also has part of a rom mapped at 0x4000 - map(0x8000, 0x83ff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0x8000, 0x83ff).mirror(0x7000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0x8400, 0x87ff).mirror(0x7000).ram(); - map(0x8800, 0x8fff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0x8800, 0x8fff).mirror(0x7000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } void vicdual_state::invho2_io_map(address_map &map) @@ -1197,7 +1197,7 @@ void vicdual_state::invho2_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::invho2_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::invho2_io_w)); } @@ -1212,7 +1212,7 @@ void vicdual_state::invds_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::invds_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::invds_io_w)); } void vicdual_state::carhntds_io_map(address_map &map) @@ -1226,7 +1226,7 @@ void vicdual_state::carhntds_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::carhntds_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::carhntds_io_w)); } void vicdual_state::sspacaho_io_map(address_map &map) @@ -1240,7 +1240,7 @@ void vicdual_state::sspacaho_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::sspacaho_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::sspacaho_io_w)); } @@ -1255,7 +1255,7 @@ void vicdual_state::tranqgun_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x0f).w(this, FUNC(vicdual_state::tranqgun_io_w)); + map(0x00, 0x0f).w(FUNC(vicdual_state::tranqgun_io_w)); } @@ -1270,7 +1270,7 @@ void vicdual_state::spacetrk_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::spacetrk_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::spacetrk_io_w)); } @@ -1285,7 +1285,7 @@ void vicdual_state::carnival_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::carnival_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::carnival_io_w)); } @@ -1300,7 +1300,7 @@ void vicdual_state::brdrline_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x0f).w(this, FUNC(vicdual_state::brdrline_io_w)); + map(0x00, 0x0f).w(FUNC(vicdual_state::brdrline_io_w)); } @@ -1315,7 +1315,7 @@ void vicdual_state::pulsar_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::pulsar_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::pulsar_io_w)); } @@ -1330,7 +1330,7 @@ void vicdual_state::heiankyo_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x0f).w(this, FUNC(vicdual_state::heiankyo_io_w)); + map(0x00, 0x0f).w(FUNC(vicdual_state::heiankyo_io_w)); } @@ -1345,7 +1345,7 @@ void vicdual_state::alphaho_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::alphaho_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::alphaho_io_w)); } @@ -1360,7 +1360,7 @@ void vicdual_state::headonn_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::headonn_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::headonn_io_w)); } @@ -2275,10 +2275,10 @@ WRITE8_MEMBER(vicdual_state::samurai_io_w) /* dual game hardware */ void vicdual_state::samurai_map(address_map &map) { - map(0x0000, 0x3fff).mirror(0x4000).rom().w(this, FUNC(vicdual_state::samurai_protection_w)); - map(0x8000, 0x83ff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0x0000, 0x3fff).mirror(0x4000).rom().w(FUNC(vicdual_state::samurai_protection_w)); + map(0x8000, 0x83ff).mirror(0x7000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0x8400, 0x87ff).mirror(0x7000).ram(); - map(0x8800, 0x8fff).mirror(0x7000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0x8800, 0x8fff).mirror(0x7000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } @@ -2293,7 +2293,7 @@ void vicdual_state::samurai_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can write to multiple locations at once */ - map(0x00, 0x7f).w(this, FUNC(vicdual_state::samurai_io_w)); + map(0x00, 0x7f).w(FUNC(vicdual_state::samurai_io_w)); } @@ -2409,9 +2409,9 @@ void nsub_state::nsub_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x4000).rom(); map(0x8000, 0xbfff).noprw(); /* unused */ - map(0xc000, 0xc3ff).mirror(0x3000).ram().w(this, FUNC(nsub_state::videoram_w)).share("videoram"); + map(0xc000, 0xc3ff).mirror(0x3000).ram().w(FUNC(nsub_state::videoram_w)).share("videoram"); map(0xc400, 0xc7ff).mirror(0x3000).ram(); - map(0xc800, 0xcfff).mirror(0x3000).ram().w(this, FUNC(nsub_state::characterram_w)).share("characterram"); + map(0xc800, 0xcfff).mirror(0x3000).ram().w(FUNC(nsub_state::characterram_w)).share("characterram"); } @@ -2421,7 +2421,7 @@ void nsub_state::nsub_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x0f).rw(this, FUNC(nsub_state::nsub_io_r), FUNC(nsub_state::nsub_io_w)); + map(0x00, 0x0f).rw(FUNC(nsub_state::nsub_io_r), FUNC(nsub_state::nsub_io_w)); } @@ -2599,9 +2599,9 @@ void vicdual_state::invinco_map(address_map &map) { map(0x0000, 0x3fff).mirror(0x4000).rom(); map(0x8000, 0xbfff).noprw(); /* unused */ - map(0xc000, 0xc3ff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::videoram_w)).share("videoram"); + map(0xc000, 0xc3ff).mirror(0x3000).ram().w(FUNC(vicdual_state::videoram_w)).share("videoram"); map(0xc400, 0xc7ff).mirror(0x3000).ram(); - map(0xc800, 0xcfff).mirror(0x3000).ram().w(this, FUNC(vicdual_state::characterram_w)).share("characterram"); + map(0xc800, 0xcfff).mirror(0x3000).ram().w(FUNC(vicdual_state::characterram_w)).share("characterram"); } @@ -2611,7 +2611,7 @@ void vicdual_state::invinco_io_map(address_map &map) /* no decoder, just logic gates, so in theory the game can read/write from multiple locations at once */ - map(0x00, 0x0f).rw(this, FUNC(vicdual_state::invinco_io_r), FUNC(vicdual_state::invinco_io_w)); + map(0x00, 0x0f).rw(FUNC(vicdual_state::invinco_io_r), FUNC(vicdual_state::invinco_io_w)); } diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp index 81d1a019bb2..8238e701551 100644 --- a/src/mame/drivers/victor9k.cpp +++ b/src/mame/drivers/victor9k.cpp @@ -395,7 +395,7 @@ WRITE8_MEMBER( victor9k_state::via1_pa_w ) m_centronics->write_data7(BIT(data, 7)); // IEEE-488 - m_ieee488->dio_w(data); + m_ieee488->write_dio(data); } DECLARE_WRITE_LINE_MEMBER( victor9k_state::write_nfrd ) diff --git a/src/mame/drivers/victory.cpp b/src/mame/drivers/victory.cpp index 29b23667952..65072484fce 100644 --- a/src/mame/drivers/victory.cpp +++ b/src/mame/drivers/victory.cpp @@ -129,9 +129,9 @@ WRITE8_MEMBER(victory_state::lamp_control_w) void victory_state::main_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xc0ff).r(this, FUNC(victory_state::video_control_r)); - map(0xc100, 0xc1ff).w(this, FUNC(victory_state::video_control_w)); - map(0xc200, 0xc3ff).w(this, FUNC(victory_state::paletteram_w)); + map(0xc000, 0xc0ff).r(FUNC(victory_state::video_control_r)); + map(0xc100, 0xc1ff).w(FUNC(victory_state::video_control_w)); + map(0xc200, 0xc3ff).w(FUNC(victory_state::paletteram_w)); map(0xc400, 0xc7ff).ram().share("videoram"); map(0xc800, 0xdfff).ram().share("charram"); map(0xe000, 0xefff).ram(); @@ -148,7 +148,7 @@ void victory_state::main_io_map(address_map &map) map(0x04, 0x04).mirror(0x03).portr("SW1"); map(0x08, 0x0b).rw("pio1", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x0c, 0x0f).rw("pio2", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x10, 0x10).mirror(0x03).w(this, FUNC(victory_state::lamp_control_w)); + map(0x10, 0x10).mirror(0x03).w(FUNC(victory_state::lamp_control_w)); map(0x14, 0xff).noprw(); } diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp index 44b9ac49aa4..916bcb75c2a 100644 --- a/src/mame/drivers/vidbrain.cpp +++ b/src/mame/drivers/vidbrain.cpp @@ -245,9 +245,9 @@ void vidbrain_state::vidbrain_mem(address_map &map) void vidbrain_state::vidbrain_io(address_map &map) { - map(0x00, 0x00).w(this, FUNC(vidbrain_state::keyboard_w)); - map(0x01, 0x01).rw(this, FUNC(vidbrain_state::keyboard_r), FUNC(vidbrain_state::sound_w)); - map(0x0c, 0x0f).w(this, FUNC(vidbrain_state::f3853_w)); + map(0x00, 0x00).w(FUNC(vidbrain_state::keyboard_w)); + map(0x01, 0x01).rw(FUNC(vidbrain_state::keyboard_r), FUNC(vidbrain_state::sound_w)); + map(0x0c, 0x0f).w(FUNC(vidbrain_state::f3853_w)); // AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(F3853_TAG, f3853_device, read, write) } diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 5e8c66b2e4f..28a3c619cae 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -222,13 +222,13 @@ WRITE8_MEMBER(videopin_state::note_dvsr_w) void videopin_state::main_map(address_map &map) { map(0x0000, 0x01ff).ram(); - map(0x0200, 0x07ff).ram().w(this, FUNC(videopin_state::video_ram_w)).share("video_ram"); - map(0x0800, 0x0800).r(this, FUNC(videopin_state::misc_r)).w(this, FUNC(videopin_state::note_dvsr_w)); - map(0x0801, 0x0801).w(this, FUNC(videopin_state::led_w)); + map(0x0200, 0x07ff).ram().w(FUNC(videopin_state::video_ram_w)).share("video_ram"); + map(0x0800, 0x0800).r(FUNC(videopin_state::misc_r)).w(FUNC(videopin_state::note_dvsr_w)); + map(0x0801, 0x0801).w(FUNC(videopin_state::led_w)); map(0x0802, 0x0802).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x0804, 0x0804).w(this, FUNC(videopin_state::ball_w)); - map(0x0805, 0x0805).w(this, FUNC(videopin_state::out1_w)); - map(0x0806, 0x0806).w(this, FUNC(videopin_state::out2_w)); + map(0x0804, 0x0804).w(FUNC(videopin_state::ball_w)); + map(0x0805, 0x0805).w(FUNC(videopin_state::out1_w)); + map(0x0806, 0x0806).w(FUNC(videopin_state::out2_w)); map(0x1000, 0x1000).portr("IN0"); map(0x1800, 0x1800).portr("DSW"); map(0x2000, 0x3fff).rom(); diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index 93c2f3edd59..398a4e2f0f5 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -958,7 +958,7 @@ void videopkr_state::i8039_map(address_map &map) void videopkr_state::i8039_io_port(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(videopkr_state::videopkr_io_r), FUNC(videopkr_state::videopkr_io_w)); + map(0x00, 0xff).rw(FUNC(videopkr_state::videopkr_io_r), FUNC(videopkr_state::videopkr_io_w)); } void videopkr_state::i8751_map(address_map &map) @@ -983,7 +983,7 @@ void videopkr_state::i8039_sound_mem(address_map &map) void videopkr_state::i8039_sound_port(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(videopkr_state::sound_io_r), FUNC(videopkr_state::sound_io_w)); + map(0x00, 0xff).rw(FUNC(videopkr_state::sound_io_r), FUNC(videopkr_state::sound_io_w)); } @@ -1252,7 +1252,7 @@ MACHINE_CONFIG_START(videopkr_state::videopkr) MCFG_DEVICE_ADD("soundcpu", I8039, SOUND_CLOCK) MCFG_DEVICE_PROGRAM_MAP(i8039_sound_mem) MCFG_DEVICE_IO_MAP(i8039_sound_port) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, videopkr_state, sound_p2_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, videopkr_state, sound_p2_w)) @@ -1325,7 +1325,7 @@ MACHINE_CONFIG_START(videopkr_state::babypkr) MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, videopkr_state, baby_sound_p0_r)) MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, videopkr_state, baby_sound_p0_w)) MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, videopkr_state, baby_sound_p1_r)) - MCFG_MCS51_PORT_P2_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS51_PORT_P2_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, videopkr_state, baby_sound_p3_w)) /* video hardware */ diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 88d2060ae60..4decd1a4cf3 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -79,7 +79,7 @@ void vigilant_state::vigilant_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); /* Fallthrough */ map(0x0000, 0x7fff).rom(); map(0xc020, 0xc0df).ram().share("spriteram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(vigilant_state::paletteram_w)).share("paletteram"); + map(0xc800, 0xcfff).ram().w(FUNC(vigilant_state::paletteram_w)).share("paletteram"); map(0xd000, 0xdfff).ram().share("videoram"); map(0xe000, 0xefff).ram(); } @@ -88,13 +88,13 @@ void vigilant_state::vigilant_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("IN0").w("soundlatch", FUNC(generic_latch_8_device::write)); /* SD */ - map(0x01, 0x01).portr("IN1").w(this, FUNC(vigilant_state::vigilant_out2_w)); /* OUT2 */ + map(0x01, 0x01).portr("IN1").w(FUNC(vigilant_state::vigilant_out2_w)); /* OUT2 */ map(0x02, 0x02).portr("IN2"); map(0x03, 0x03).portr("DSW1"); - map(0x04, 0x04).portr("DSW2").w(this, FUNC(vigilant_state::bank_select_w)); /* PBANK */ - map(0x80, 0x81).w(this, FUNC(vigilant_state::vigilant_horiz_scroll_w)); /* HSPL, HSPH */ - map(0x82, 0x83).w(this, FUNC(vigilant_state::vigilant_rear_horiz_scroll_w)); /* RHSPL, RHSPH */ - map(0x84, 0x84).w(this, FUNC(vigilant_state::vigilant_rear_color_w)); /* RCOD */ + map(0x04, 0x04).portr("DSW2").w(FUNC(vigilant_state::bank_select_w)); /* PBANK */ + map(0x80, 0x81).w(FUNC(vigilant_state::vigilant_horiz_scroll_w)); /* HSPL, HSPH */ + map(0x82, 0x83).w(FUNC(vigilant_state::vigilant_rear_horiz_scroll_w)); /* RHSPL, RHSPH */ + map(0x84, 0x84).w(FUNC(vigilant_state::vigilant_rear_color_w)); /* RCOD */ } void vigilant_state::kikcubic_map(address_map &map) @@ -102,7 +102,7 @@ void vigilant_state::kikcubic_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); /* Fallthrough */ map(0x0000, 0x7fff).rom(); map(0xc000, 0xc0ff).ram().share("spriteram"); - map(0xc800, 0xcaff).ram().w(this, FUNC(vigilant_state::paletteram_w)).share("paletteram"); + map(0xc800, 0xcaff).ram().w(FUNC(vigilant_state::paletteram_w)).share("paletteram"); map(0xd000, 0xdfff).ram().share("videoram"); map(0xe000, 0xffff).ram(); } @@ -110,11 +110,11 @@ void vigilant_state::kikcubic_map(address_map &map) void vigilant_state::kikcubic_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("DSW1").w(this, FUNC(vigilant_state::kikcubic_coin_w)); /* also flip screen, and...? */ + map(0x00, 0x00).portr("DSW1").w(FUNC(vigilant_state::kikcubic_coin_w)); /* also flip screen, and...? */ map(0x01, 0x01).portr("DSW2"); map(0x02, 0x02).portr("IN0"); map(0x03, 0x03).portr("IN1"); - map(0x04, 0x04).portr("IN2").w(this, FUNC(vigilant_state::bank_select_w)); + map(0x04, 0x04).portr("IN2").w(FUNC(vigilant_state::bank_select_w)); map(0x06, 0x06).w("soundlatch", FUNC(generic_latch_8_device::write)); // AM_RANGE(0x07, 0x07) AM_WRITENOP /* ?? */ } diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index 982136b61b6..672af25eff0 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -1020,12 +1020,12 @@ void spg2xx_game_state::vii_mem(address_map &map) map(0x000000, 0x3fffff).bankr("cart"); map(0x000000, 0x0027ff).ram().share("p_ram"); - map(0x002800, 0x0028ff).rw(this, FUNC(spg2xx_game_state::video_r), FUNC(spg2xx_game_state::video_w)); + map(0x002800, 0x0028ff).rw(FUNC(spg2xx_game_state::video_r), FUNC(spg2xx_game_state::video_w)); map(0x002900, 0x002aff).ram().share("p_rowscroll"); map(0x002b00, 0x002bff).ram().share("p_palette"); map(0x002c00, 0x002fff).ram().share("p_spriteram"); - map(0x003000, 0x0037ff).rw(this, FUNC(spg2xx_game_state::audio_r), FUNC(spg2xx_game_state::audio_w)); - map(0x003d00, 0x003eff).rw(this, FUNC(spg2xx_game_state::io_r), FUNC(spg2xx_game_state::io_w)); + map(0x003000, 0x0037ff).rw(FUNC(spg2xx_game_state::audio_r), FUNC(spg2xx_game_state::audio_w)); + map(0x003d00, 0x003eff).rw(FUNC(spg2xx_game_state::io_r), FUNC(spg2xx_game_state::io_w)); } static INPUT_PORTS_START( vii ) diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp index 7a4b78e1ff7..cdfdd1c85b0 100644 --- a/src/mame/drivers/vindictr.cpp +++ b/src/mame/drivers/vindictr.cpp @@ -78,15 +78,15 @@ void vindictr_state::main_map(address_map &map) map(0x0e0000, 0x0e0fff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x1f0000, 0x1fffff).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x260000, 0x26000f).portr("260000"); - map(0x260010, 0x26001f).r(this, FUNC(vindictr_state::port1_r)); + map(0x260010, 0x26001f).r(FUNC(vindictr_state::port1_r)); map(0x260020, 0x26002f).portr("260020"); map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_i_device::main_response_r)); map(0x2e0000, 0x2e0001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x360000, 0x360001).w(this, FUNC(vindictr_state::scanline_int_ack_w)); + map(0x360000, 0x360001).w(FUNC(vindictr_state::scanline_int_ack_w)); map(0x360010, 0x360011).nopw(); map(0x360020, 0x360021).w(m_jsa, FUNC(atari_jsa_i_device::sound_reset_w)); map(0x360031, 0x360031).w(m_jsa, FUNC(atari_jsa_i_device::main_command_w)); - map(0x3e0000, 0x3e0fff).ram().w(this, FUNC(vindictr_state::vindictr_paletteram_w)).share("paletteram"); + map(0x3e0000, 0x3e0fff).ram().w(FUNC(vindictr_state::vindictr_paletteram_w)).share("paletteram"); map(0x3f0000, 0x3f1fff).mirror(0x8000).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); map(0x3f2000, 0x3f3fff).mirror(0x8000).ram().share("mob"); map(0x3f4000, 0x3f4f7f).mirror(0x8000).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index db1ea1862a6..3a6ffe8385a 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -375,7 +375,7 @@ WRITE8_MEMBER( vip_state::io_w ) void vip_state::vip_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(vip_state::read), FUNC(vip_state::write)); + map(0x0000, 0xffff).rw(FUNC(vip_state::read), FUNC(vip_state::write)); } @@ -386,7 +386,7 @@ void vip_state::vip_mem(address_map &map) void vip_state::vip_io(address_map &map) { map.unmap_value_high(); - map(0x00, 0x07).rw(this, FUNC(vip_state::io_r), FUNC(vip_state::io_w)); + map(0x00, 0x07).rw(FUNC(vip_state::io_r), FUNC(vip_state::io_w)); } diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index 664eeeb6902..a8a733b7ca0 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -2077,28 +2077,28 @@ void viper_state::viper_map(address_map &map) { // ADDRESS_MAP_UNMAP_HIGH map(0x00000000, 0x00ffffff).mirror(0x1000000).ram().share("workram"); - map(0x80000000, 0x800fffff).rw(this, FUNC(viper_state::epic_r), FUNC(viper_state::epic_w)); - map(0x82000000, 0x83ffffff).rw(this, FUNC(viper_state::voodoo3_r), FUNC(viper_state::voodoo3_w)); - map(0x84000000, 0x85ffffff).rw(this, FUNC(viper_state::voodoo3_lfb_r), FUNC(viper_state::voodoo3_lfb_w)); - map(0xfe800000, 0xfe8000ff).rw(this, FUNC(viper_state::voodoo3_io_r), FUNC(viper_state::voodoo3_io_w)); - map(0xfec00000, 0xfedfffff).rw(this, FUNC(viper_state::pci_config_addr_r), FUNC(viper_state::pci_config_addr_w)); - map(0xfee00000, 0xfeefffff).rw(this, FUNC(viper_state::pci_config_data_r), FUNC(viper_state::pci_config_data_w)); + map(0x80000000, 0x800fffff).rw(FUNC(viper_state::epic_r), FUNC(viper_state::epic_w)); + map(0x82000000, 0x83ffffff).rw(FUNC(viper_state::voodoo3_r), FUNC(viper_state::voodoo3_w)); + map(0x84000000, 0x85ffffff).rw(FUNC(viper_state::voodoo3_lfb_r), FUNC(viper_state::voodoo3_lfb_w)); + map(0xfe800000, 0xfe8000ff).rw(FUNC(viper_state::voodoo3_io_r), FUNC(viper_state::voodoo3_io_w)); + map(0xfec00000, 0xfedfffff).rw(FUNC(viper_state::pci_config_addr_r), FUNC(viper_state::pci_config_addr_w)); + map(0xfee00000, 0xfeefffff).rw(FUNC(viper_state::pci_config_data_r), FUNC(viper_state::pci_config_data_w)); // 0xff000000, 0xff000fff - cf_card_data_r/w (installed in DRIVER_INIT(vipercf)) // 0xff200000, 0xff200fff - cf_card_r/w (installed in DRIVER_INIT(vipercf)) // 0xff300000, 0xff300fff - ata_r/w (installed in DRIVER_INIT(viperhd)) // AM_RANGE(0xff400xxx, 0xff400xxx) ppp2nd sense device - map(0xffe00000, 0xffe00007).r(this, FUNC(viper_state::e00000_r)); - map(0xffe00008, 0xffe0000f).rw(this, FUNC(viper_state::e00008_r), FUNC(viper_state::e00008_w)); + map(0xffe00000, 0xffe00007).r(FUNC(viper_state::e00000_r)); + map(0xffe00008, 0xffe0000f).rw(FUNC(viper_state::e00008_r), FUNC(viper_state::e00008_w)); map(0xffe08000, 0xffe08007).noprw(); - map(0xffe10000, 0xffe10007).r(this, FUNC(viper_state::input_r)); + map(0xffe10000, 0xffe10007).r(FUNC(viper_state::input_r)); map(0xffe28000, 0xffe28007).nopw(); // ppp2nd lamps map(0xffe30000, 0xffe31fff).rw("m48t58", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); map(0xffe40000, 0xffe4000f).noprw(); - map(0xffe50000, 0xffe50007).w(this, FUNC(viper_state::unk2_w)); + map(0xffe50000, 0xffe50007).w(FUNC(viper_state::unk2_w)); map(0xffe60000, 0xffe60007).noprw(); - map(0xffe70000, 0xffe7000f).rw(this, FUNC(viper_state::e70000_r), FUNC(viper_state::e70000_w)); - map(0xffe80000, 0xffe80007).w(this, FUNC(viper_state::unk1a_w)); - map(0xffe88000, 0xffe88007).w(this, FUNC(viper_state::unk1b_w)); + map(0xffe70000, 0xffe7000f).rw(FUNC(viper_state::e70000_r), FUNC(viper_state::e70000_w)); + map(0xffe80000, 0xffe80007).w(FUNC(viper_state::unk1a_w)); + map(0xffe88000, 0xffe88007).w(FUNC(viper_state::unk1b_w)); map(0xffe98000, 0xffe98007).noprw(); map(0xffe9a000, 0xffe9bfff).ram(); // World Combat uses this map(0xfff00000, 0xfff3ffff).rom().region("user1", 0); // Boot ROM diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index 728462ccb51..a36d12b9fdb 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -844,18 +844,18 @@ void vis_state::at16_io(address_map &map) map.unmap_value_high(); map(0x0000, 0x001f).rw("mb:dma8237_1", FUNC(am9517a_device::read), FUNC(am9517a_device::write)); map(0x0020, 0x003f).rw(m_pic1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0x0026, 0x0027).rw(this, FUNC(vis_state::unk_r), FUNC(vis_state::unk_w)); + map(0x0026, 0x0027).rw(FUNC(vis_state::unk_r), FUNC(vis_state::unk_w)); map(0x0040, 0x005f).rw("mb:pit8254", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); map(0x0060, 0x0065).rw("kbdc", FUNC(kbdc8042_device::data_r), FUNC(kbdc8042_device::data_w)); - map(0x006a, 0x006a).r(this, FUNC(vis_state::unk2_r)); + map(0x006a, 0x006a).r(FUNC(vis_state::unk2_r)); map(0x0080, 0x009f).rw("mb", FUNC(at_mb_device::page8_r), FUNC(at_mb_device::page8_w)); - map(0x0092, 0x0092).rw(this, FUNC(vis_state::sysctl_r), FUNC(vis_state::sysctl_w)); + map(0x0092, 0x0092).rw(FUNC(vis_state::sysctl_r), FUNC(vis_state::sysctl_w)); map(0x00a0, 0x00bf).rw(m_pic2, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0x00c0, 0x00df).rw("mb:dma8237_2", FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask16(0x00ff); map(0x00e0, 0x00e1).noprw(); - map(0x023c, 0x023f).rw(this, FUNC(vis_state::unk1_r), FUNC(vis_state::unk1_w)); - map(0x0268, 0x026f).rw(this, FUNC(vis_state::pad_r), FUNC(vis_state::pad_w)); - map(0x031a, 0x031a).r(this, FUNC(vis_state::unk3_r)); + map(0x023c, 0x023f).rw(FUNC(vis_state::unk1_r), FUNC(vis_state::unk1_w)); + map(0x0268, 0x026f).rw(FUNC(vis_state::pad_r), FUNC(vis_state::pad_w)); + map(0x031a, 0x031a).r(FUNC(vis_state::unk3_r)); } static void vis_cards(device_slot_interface &device) diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 8462e307fa5..e5ca1dc0066 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -271,8 +271,8 @@ void vixen_state::vixen_mem(address_map &map) void vixen_state::bios_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xefff).r(this, FUNC(vixen_state::opram_r)); - map(0xf000, 0xffff).r(this, FUNC(vixen_state::oprom_r)); + map(0x0000, 0xefff).r(FUNC(vixen_state::opram_r)); + map(0xf000, 0xffff).r(FUNC(vixen_state::oprom_r)); } @@ -285,16 +285,16 @@ void vixen_state::vixen_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x03).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); - map(0x04, 0x04).mirror(0x03).rw(this, FUNC(vixen_state::status_r), FUNC(vixen_state::cmd_w)); + map(0x04, 0x04).mirror(0x03).rw(FUNC(vixen_state::status_r), FUNC(vixen_state::cmd_w)); map(0x08, 0x08).mirror(0x01).rw(P8155H_TAG, FUNC(i8155_device::read), FUNC(i8155_device::write)); map(0x0c, 0x0d).w(P8155H_TAG, FUNC(i8155_device::ale_w)); map(0x10, 0x10).mirror(0x07).r(m_ieee488, FUNC(ieee488_device::dio_r)); - map(0x18, 0x18).mirror(0x07).r(this, FUNC(vixen_state::ieee488_r)); + map(0x18, 0x18).mirror(0x07).r(FUNC(vixen_state::ieee488_r)); map(0x20, 0x21).mirror(0x04).w(m_io_i8155, FUNC(i8155_device::ale_w)); map(0x28, 0x28).mirror(0x05).rw(m_io_i8155, FUNC(i8155_device::read), FUNC(i8155_device::write)); map(0x30, 0x30).mirror(0x06).rw(m_usart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x31, 0x31).mirror(0x06).rw(m_usart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x38, 0x38).mirror(0x07).r(this, FUNC(vixen_state::port3_r)); + map(0x38, 0x38).mirror(0x07).r(FUNC(vixen_state::port3_r)); // AM_RANGE(0xf0, 0xff) Hard Disk? } diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp index db665cb7fb0..719d5682649 100644 --- a/src/mame/drivers/vk100.cpp +++ b/src/mame/drivers/vk100.cpp @@ -619,8 +619,8 @@ WRITE8_MEMBER(vk100_state::KBDW) */ WRITE8_MEMBER(vk100_state::BAUD) { - m_dbrg->str_w(data & 0x0f); - m_dbrg->stt_w(data >> 4); + m_dbrg->write_str(data & 0x0f); + m_dbrg->write_stt(data >> 4); } /* port 0x40-0x47: "SYSTAT A"; various status bits, poorly documented in the tech manual @@ -691,7 +691,7 @@ void vk100_state::vk100_mem(address_map &map) { map.unmap_value_high(); map(0x0000, 0x6fff).rom(); - map(0x7000, 0x700f).mirror(0x0ff0).r(this, FUNC(vk100_state::vk100_keyboard_column_r)); + map(0x7000, 0x700f).mirror(0x0ff0).r(FUNC(vk100_state::vk100_keyboard_column_r)); map(0x8000, 0xbfff).ram(); } @@ -743,23 +743,23 @@ void vk100_state::vk100_io(address_map &map) map(0x00, 0x00).mirror(0xBE).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x01, 0x01).mirror(0xBE).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); // Comments are from page 118 (5-14) of http://web.archive.org/web/20091015205827/http://www.computer.museum.uq.edu.au/pdf/EK-VK100-TM-001%20VK100%20Technical%20Manual.pdf - map(0x40, 0x41).mirror(0x98).w(this, FUNC(vk100_state::vgLD_X)); //LD X LO + HI 12 bits - map(0x42, 0x43).mirror(0x98).w(this, FUNC(vk100_state::vgLD_Y)); //LD Y LO + HI 12 bits - map(0x44, 0x44).mirror(0x98).w(this, FUNC(vk100_state::vgERR)); //LD ERR ('error' in bresenham algorithm) - map(0x45, 0x45).mirror(0x98).w(this, FUNC(vk100_state::vgSOPS)); //LD SOPS (screen options (plus uart dest)) - map(0x46, 0x46).mirror(0x98).w(this, FUNC(vk100_state::vgPAT)); //LD PAT (pattern register) - map(0x47, 0x47).mirror(0x98).w(this, FUNC(vk100_state::vgPMUL)); //LD PMUL (pattern multiplier) - map(0x60, 0x63).mirror(0x80).w(this, FUNC(vk100_state::vgREG)); //LD DU, DVM, DIR, WOPS (register file) - map(0x64, 0x67).mirror(0x80).w(this, FUNC(vk100_state::vgEX)); //EX MOV, DOT, VEC, ER - map(0x68, 0x68).mirror(0x83).w(this, FUNC(vk100_state::KBDW)); //KBDW (probably AM_MIRROR(0x03)) - map(0x6C, 0x6C).mirror(0x83).w(this, FUNC(vk100_state::BAUD)); //LD BAUD (baud rate clock divider setting for i8251 tx and rx clocks) (probably AM_MIRROR(0x03)) + map(0x40, 0x41).mirror(0x98).w(FUNC(vk100_state::vgLD_X)); //LD X LO + HI 12 bits + map(0x42, 0x43).mirror(0x98).w(FUNC(vk100_state::vgLD_Y)); //LD Y LO + HI 12 bits + map(0x44, 0x44).mirror(0x98).w(FUNC(vk100_state::vgERR)); //LD ERR ('error' in bresenham algorithm) + map(0x45, 0x45).mirror(0x98).w(FUNC(vk100_state::vgSOPS)); //LD SOPS (screen options (plus uart dest)) + map(0x46, 0x46).mirror(0x98).w(FUNC(vk100_state::vgPAT)); //LD PAT (pattern register) + map(0x47, 0x47).mirror(0x98).w(FUNC(vk100_state::vgPMUL)); //LD PMUL (pattern multiplier) + map(0x60, 0x63).mirror(0x80).w(FUNC(vk100_state::vgREG)); //LD DU, DVM, DIR, WOPS (register file) + map(0x64, 0x67).mirror(0x80).w(FUNC(vk100_state::vgEX)); //EX MOV, DOT, VEC, ER + map(0x68, 0x68).mirror(0x83).w(FUNC(vk100_state::KBDW)); //KBDW (probably AM_MIRROR(0x03)) + map(0x6C, 0x6C).mirror(0x83).w(FUNC(vk100_state::BAUD)); //LD BAUD (baud rate clock divider setting for i8251 tx and rx clocks) (probably AM_MIRROR(0x03)) map(0x70, 0x70).mirror(0x82).w(m_uart, FUNC(i8251_device::data_w)); //LD COMD (i8251 data reg) map(0x71, 0x71).mirror(0x82).w(m_uart, FUNC(i8251_device::control_w)); //LD COM (i8251 control reg) //AM_RANGE (0x74, 0x74) AM_MIRROR(0x83) AM_WRITE(unknown_74) //AM_RANGE (0x78, 0x78) AM_MIRROR(0x83) AM_WRITE(kbdw) //KBDW ?(mirror?) //AM_RANGE (0x7C, 0x7C) AM_MIRROR(0x83) AM_WRITE(unknown_7C) - map(0x40, 0x47).mirror(0x80).r(this, FUNC(vk100_state::SYSTAT_A)); // SYSTAT A (state machine done and last 4 bits of vram, as well as dipswitches) - map(0x48, 0x48).mirror(0x87/*0x80*/).r(this, FUNC(vk100_state::SYSTAT_B)); // SYSTAT B (uart stuff) + map(0x40, 0x47).mirror(0x80).r(FUNC(vk100_state::SYSTAT_A)); // SYSTAT A (state machine done and last 4 bits of vram, as well as dipswitches) + map(0x48, 0x48).mirror(0x87/*0x80*/).r(FUNC(vk100_state::SYSTAT_B)); // SYSTAT B (uart stuff) map(0x50, 0x50).mirror(0x86).r(m_uart, FUNC(i8251_device::data_r)); // UART O map(0x51, 0x51).mirror(0x86).r(m_uart, FUNC(i8251_device::status_r)); // UAR //AM_RANGE (0x58, 0x58) AM_MIRROR(0x87) AM_READ(unknown_58) diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp index 9b84ef57280..3fd0748b736 100644 --- a/src/mame/drivers/vlc.cpp +++ b/src/mame/drivers/vlc.cpp @@ -507,17 +507,17 @@ void nevada_state::nevada_map(address_map &map) map(0x00010000, 0x00021fff).ram().share("backup"); map(0x00900001, 0x00900001).w("crtc", FUNC(mc6845_device::address_w)); map(0x00908001, 0x00908001).w("crtc", FUNC(mc6845_device::register_w)); - map(0x00a00000, 0x00a00001).rw(this, FUNC(nevada_state::io_board_r), FUNC(nevada_state::io_board_w)); - map(0x00a08000, 0x00a08001).w(this, FUNC(nevada_state::io_board_x)); + map(0x00a00000, 0x00a00001).rw(FUNC(nevada_state::io_board_r), FUNC(nevada_state::io_board_w)); + map(0x00a08000, 0x00a08001).w(FUNC(nevada_state::io_board_x)); map(0x00a10000, 0x00a10001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x00a20001, 0x00a20001).w("aysnd", FUNC(ay8910_device::address_w)); map(0x00a28001, 0x00a28001).w("aysnd", FUNC(ay8910_device::data_w)); - map(0x00a30000, 0x00a30001).select(0xf0).rw(this, FUNC(nevada_state::rtc_r), FUNC(nevada_state::rtc_w)).umask16(0x00ff); - map(0x00a40000, 0x00a40001).rw(this, FUNC(nevada_state::nevada_sec_r), FUNC(nevada_state::nevada_sec_w)); - map(0x00b00000, 0x00b03fff).ram().w(this, FUNC(nevada_state::vram_w)).share("vram"); - map(0x00b10000, 0x00b10001).select(0xf0).rw(this, FUNC(nevada_state::duart_r<1>), FUNC(nevada_state::duart_w<1>)).umask16(0x00ff); // Lower byte - map(0x00b20000, 0x00b20001).select(0xf0).rw(this, FUNC(nevada_state::duart_r<2>), FUNC(nevada_state::duart_w<2>)).umask16(0x00ff); // Lower byte - map(0x00e00000, 0x00e00001).select(0xf0).rw(this, FUNC(nevada_state::duart_r<0>), FUNC(nevada_state::duart_w<0>)).umask16(0xff00); // Upper byte + map(0x00a30000, 0x00a30001).select(0xf0).rw(FUNC(nevada_state::rtc_r), FUNC(nevada_state::rtc_w)).umask16(0x00ff); + map(0x00a40000, 0x00a40001).rw(FUNC(nevada_state::nevada_sec_r), FUNC(nevada_state::nevada_sec_w)); + map(0x00b00000, 0x00b03fff).ram().w(FUNC(nevada_state::vram_w)).share("vram"); + map(0x00b10000, 0x00b10001).select(0xf0).rw(FUNC(nevada_state::duart_r<1>), FUNC(nevada_state::duart_w<1>)).umask16(0x00ff); // Lower byte + map(0x00b20000, 0x00b20001).select(0xf0).rw(FUNC(nevada_state::duart_r<2>), FUNC(nevada_state::duart_w<2>)).umask16(0x00ff); // Lower byte + map(0x00e00000, 0x00e00001).select(0xf0).rw(FUNC(nevada_state::duart_r<0>), FUNC(nevada_state::duart_w<0>)).umask16(0xff00); // Upper byte map(0x00fa0000, 0x00fbffff).ram(); // not used map(0x00fc0000, 0x00ffffff).rom(); // ROM ext + ROM boot } diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp index d87c6549d0a..7d7f443dfd0 100644 --- a/src/mame/drivers/volfied.cpp +++ b/src/mame/drivers/volfied.cpp @@ -72,11 +72,11 @@ void volfied_state::main_map(address_map &map) map(0x080000, 0x0fffff).rom(); /* tiles */ map(0x100000, 0x103fff).ram(); /* main */ map(0x200000, 0x203fff).rw(m_pc090oj, FUNC(pc090oj_device::word_r), FUNC(pc090oj_device::word_w)); - map(0x400000, 0x47ffff).rw(this, FUNC(volfied_state::video_ram_r), FUNC(volfied_state::video_ram_w)); + map(0x400000, 0x47ffff).rw(FUNC(volfied_state::video_ram_r), FUNC(volfied_state::video_ram_w)); map(0x500000, 0x503fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x600000, 0x600001).w(this, FUNC(volfied_state::video_mask_w)); - map(0x700000, 0x700001).w(this, FUNC(volfied_state::sprite_ctrl_w)); - map(0xd00000, 0xd00001).rw(this, FUNC(volfied_state::video_ctrl_r), FUNC(volfied_state::video_ctrl_w)); + map(0x600000, 0x600001).w(FUNC(volfied_state::video_mask_w)); + map(0x700000, 0x700001).w(FUNC(volfied_state::sprite_ctrl_w)); + map(0xd00000, 0xd00001).rw(FUNC(volfied_state::video_ctrl_r), FUNC(volfied_state::video_ctrl_w)); map(0xe00001, 0xe00001).w("ciu", FUNC(pc060ha_device::master_port_w)); map(0xe00003, 0xe00003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w)); map(0xf00000, 0xf007ff).rw(m_cchip, FUNC(taito_cchip_device::mem68_r), FUNC(taito_cchip_device::mem68_w)).umask16(0x00ff); diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp index 6f0e4d28a57..4afee96d8b8 100644 --- a/src/mame/drivers/voyager.cpp +++ b/src/mame/drivers/voyager.cpp @@ -255,7 +255,7 @@ void voyager_state::voyager_map(address_map &map) //GRULL-AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK("bank1") //GRULL AM_RANGE(0x000f0000, 0x000fffff) AM_WRITE(bios_ram_w) map(0x000e0000, 0x000fffff).bankr("bank1"); - map(0x000e0000, 0x000fffff).w(this, FUNC(voyager_state::bios_ram_w)); + map(0x000e0000, 0x000fffff).w(FUNC(voyager_state::bios_ram_w)); map(0x00100000, 0x03ffffff).ram(); // 64MB map(0x04000000, 0x28ffffff).noprw(); //AM_RANGE(0x04000000, 0x040001ff) AM_RAM @@ -276,7 +276,7 @@ void voyager_state::voyager_io(address_map &map) //AM_RANGE(0x00e8, 0x00eb) AM_NOP map(0x00e8, 0x00ef).noprw(); //AMI BIOS write to this ports as delays between I/O ports operations sending al value -> NEWIODELAY map(0x0170, 0x0177).noprw(); //To debug - map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); + map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::cs0_r), FUNC(ide_controller_device::cs0_w)); map(0x0200, 0x021f).noprw(); //To debug map(0x0260, 0x026f).noprw(); //To debug map(0x0278, 0x027b).nopw();//AM_WRITE(pnp_config_w) @@ -294,7 +294,7 @@ void voyager_state::voyager_io(address_map &map) map(0x0378, 0x037f).noprw(); //To debug // AM_RANGE(0x0300, 0x03af) AM_NOP // AM_RANGE(0x03b0, 0x03df) AM_NOP - map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::read_cs1), FUNC(ide_controller_device::write_cs1)); + map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w)); map(0x03f8, 0x03ff).noprw(); // To debug Serial Port COM1: map(0x0a78, 0x0a7b).nopw();//AM_WRITE(pnp_data_w) map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp index 3a95fdfc5d5..9eea9fcb08e 100644 --- a/src/mame/drivers/vp101.cpp +++ b/src/mame/drivers/vp101.cpp @@ -314,18 +314,18 @@ WRITE32_MEMBER(vp10x_state::tty_w) // set breakpoint at bfc01430 to catch when void vp10x_state::main_map(address_map &map) { map(0x00000000, 0x07ffffff).ram().share("mainram"); - map(0x14000000, 0x14000003).r(this, FUNC(vp10x_state::test_r)); - map(0x1c000000, 0x1c000003).w(this, FUNC(vp10x_state::tty_w)); // RSS OS code uses this one - map(0x1c000014, 0x1c000017).r(this, FUNC(vp10x_state::tty_ready_r)); - map(0x1c400000, 0x1c400003).w(this, FUNC(vp10x_state::tty_w)); // boot ROM code uses this one - map(0x1c400014, 0x1c400017).r(this, FUNC(vp10x_state::tty_ready_r)); + map(0x14000000, 0x14000003).r(FUNC(vp10x_state::test_r)); + map(0x1c000000, 0x1c000003).w(FUNC(vp10x_state::tty_w)); // RSS OS code uses this one + map(0x1c000014, 0x1c000017).r(FUNC(vp10x_state::tty_ready_r)); + map(0x1c400000, 0x1c400003).w(FUNC(vp10x_state::tty_w)); // boot ROM code uses this one + map(0x1c400014, 0x1c400017).r(FUNC(vp10x_state::tty_ready_r)); map(0x1ca0000c, 0x1ca0000f).portr("IN0"); - map(0x1ca00010, 0x1ca00013).r(this, FUNC(vp10x_state::test_r)); // bits here cause various test mode stuff + map(0x1ca00010, 0x1ca00013).r(FUNC(vp10x_state::test_r)); // bits here cause various test mode stuff map(0x1cf00000, 0x1cf00003).noprw().nopr(); - map(0x1d000030, 0x1d000033).w(this, FUNC(vp10x_state::dmaaddr_w)); // ATA DMA destination address - map(0x1d000040, 0x1d00005f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)).umask32(0x0000ffff); - map(0x1d000060, 0x1d00007f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)).umask32(0x0000ffff); - map(0x1f200000, 0x1f200003).rw(this, FUNC(vp10x_state::pic_r), FUNC(vp10x_state::pic_w)); + map(0x1d000030, 0x1d000033).w(FUNC(vp10x_state::dmaaddr_w)); // ATA DMA destination address + map(0x1d000040, 0x1d00005f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)).umask32(0x0000ffff); + map(0x1d000060, 0x1d00007f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)).umask32(0x0000ffff); + map(0x1f200000, 0x1f200003).rw(FUNC(vp10x_state::pic_r), FUNC(vp10x_state::pic_w)); map(0x1f807000, 0x1f807fff).ram().share("nvram"); map(0x1fc00000, 0x1fffffff).rom().region("maincpu", 0); } @@ -333,18 +333,18 @@ void vp10x_state::main_map(address_map &map) void vp10x_state::vp50_map(address_map &map) { map(0x00000000, 0x03ffffff).ram().share("mainram"); - map(0x1f000010, 0x1f00001f).rw(m_ata, FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); - map(0x1f000020, 0x1f00002f).rw(m_ata, FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); + map(0x1f000010, 0x1f00001f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); + map(0x1f000020, 0x1f00002f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); map(0x1f400000, 0x1f400003).noprw(); // FPGA bitstream download? map(0x1f400800, 0x1f400bff).ram().share("nvram"); map(0x1fc00000, 0x1fffffff).rom().region("maincpu", 0); // TX4925 peripherals - map(0xff1ff40c, 0xff1ff40f).r(this, FUNC(vp10x_state::tty_4925_rdy_r)); - map(0xff1ff41c, 0xff1ff41f).w(this, FUNC(vp10x_state::tty_w)); + map(0xff1ff40c, 0xff1ff40f).r(FUNC(vp10x_state::tty_4925_rdy_r)); + map(0xff1ff41c, 0xff1ff41f).w(FUNC(vp10x_state::tty_w)); map(0xff1ff500, 0xff1ff503).noprw(); - map(0xff1ff814, 0xff1ff817).r(this, FUNC(vp10x_state::spi_status_r)); - map(0xff1ff818, 0xff1ff81b).rw(this, FUNC(vp10x_state::spi_r), FUNC(vp10x_state::spi_w)); + map(0xff1ff814, 0xff1ff817).r(FUNC(vp10x_state::spi_status_r)); + map(0xff1ff818, 0xff1ff81b).rw(FUNC(vp10x_state::spi_r), FUNC(vp10x_state::spi_w)); } static INPUT_PORTS_START( vp101 ) diff --git a/src/mame/drivers/vp415.cpp b/src/mame/drivers/vp415.cpp index 2a69d2d6819..8bc039dc66c 100644 --- a/src/mame/drivers/vp415.cpp +++ b/src/mame/drivers/vp415.cpp @@ -198,8 +198,8 @@ void vp415_state::z80_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x0f).rw(SCSI_TAG, FUNC(ncr5385_device::read), FUNC(ncr5385_device::write)); // 0x20, 0x21: Connected to A0 + D0..D7 of SLAVE i8041 - map(0x34, 0x34).w(this, FUNC(vp415_state::sel34_w)); - map(0x37, 0x37).r(this, FUNC(vp415_state::sel37_r)); + map(0x34, 0x34).w(FUNC(vp415_state::sel34_w)); + map(0x37, 0x37).r(FUNC(vp415_state::sel37_r)); } void vp415_state::datamcu_program_map(address_map &map) @@ -336,7 +336,7 @@ void vp415_state::ctrl_program_map(address_map &map) void vp415_state::ctrl_io_map(address_map &map) { map(0x0000, 0x1fff).ram().share(CTRLRAM_TAG); - map(0xe000, 0xffff).rw(this, FUNC(vp415_state::ctrl_regs_r), FUNC(vp415_state::ctrl_regs_w)).mask(0x1e00); + map(0xe000, 0xffff).rw(FUNC(vp415_state::ctrl_regs_r), FUNC(vp415_state::ctrl_regs_w)).mask(0x1e00); } void vp415_state::ctrlmcu_program_map(address_map &map) diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp index f157a580fad..550a7ff9e59 100644 --- a/src/mame/drivers/vpoker.cpp +++ b/src/mame/drivers/vpoker.cpp @@ -187,7 +187,7 @@ void vpoker_state::main_map(address_map &map) map.global_mask(0x3fff); map(0x0000, 0x01ff).ram(); /* vpoker has 0x100, 5acespkr has 0x200 */ map(0x0400, 0x0407).rw("6840ptm", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); - map(0x0800, 0x0807).r(this, FUNC(vpoker_state::blitter_r)).w(this, FUNC(vpoker_state::blitter_w)); + map(0x0800, 0x0807).r(FUNC(vpoker_state::blitter_r)).w(FUNC(vpoker_state::blitter_w)); map(0x2000, 0x3fff).rom(); } diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp index 1234fed2828..95ed53cda8d 100644 --- a/src/mame/drivers/vroulet.cpp +++ b/src/mame/drivers/vroulet.cpp @@ -155,10 +155,10 @@ void vroulet_state::vroulet_map(address_map &map) map(0x0000, 0x5fff).rom(); map(0x6000, 0x67ff).ram().share("nvram"); map(0x8000, 0x8000).noprw(); - map(0x9000, 0x93ff).ram().w(this, FUNC(vroulet_state::videoram_w)).share("videoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(vroulet_state::colorram_w)).share("colorram"); + map(0x9000, 0x93ff).ram().w(FUNC(vroulet_state::videoram_w)).share("videoram"); + map(0x9400, 0x97ff).ram().w(FUNC(vroulet_state::colorram_w)).share("colorram"); map(0xa000, 0xa001).ram().share("ball"); - map(0xb000, 0xb0ff).w(this, FUNC(vroulet_state::paletteram_w)).share("paletteram"); + map(0xb000, 0xb0ff).w(FUNC(vroulet_state::paletteram_w)).share("paletteram"); map(0xc000, 0xc000).noprw(); } diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index 822cad5d655..5e91db88423 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -200,10 +200,10 @@ void vsnes_state::vsnes_cpu1_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x1800).ram().share("work_ram"); map(0x2000, 0x3fff).rw(m_ppu1, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(vsnes_state::sprite_dma_0_w)); - map(0x4016, 0x4016).rw(this, FUNC(vsnes_state::vsnes_in0_r), FUNC(vsnes_state::vsnes_in0_w)); - map(0x4017, 0x4017).r(this, FUNC(vsnes_state::vsnes_in1_r)); /* IN1 - input port 2 / PSG second control register */ - map(0x4020, 0x4020).rw(this, FUNC(vsnes_state::vsnes_coin_counter_r), FUNC(vsnes_state::vsnes_coin_counter_w)); + map(0x4014, 0x4014).w(FUNC(vsnes_state::sprite_dma_0_w)); + map(0x4016, 0x4016).rw(FUNC(vsnes_state::vsnes_in0_r), FUNC(vsnes_state::vsnes_in0_w)); + map(0x4017, 0x4017).r(FUNC(vsnes_state::vsnes_in1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x4020, 0x4020).rw(FUNC(vsnes_state::vsnes_coin_counter_r), FUNC(vsnes_state::vsnes_coin_counter_w)); map(0x6000, 0x7fff).bankrw("extra1"); map(0x8000, 0xffff).rom(); } @@ -212,10 +212,10 @@ void vsnes_state::vsnes_cpu2_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x1800).ram().share("work_ram_1"); map(0x2000, 0x3fff).rw(m_ppu2, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4014, 0x4014).w(this, FUNC(vsnes_state::sprite_dma_1_w)); - map(0x4016, 0x4016).rw(this, FUNC(vsnes_state::vsnes_in0_1_r), FUNC(vsnes_state::vsnes_in0_1_w)); - map(0x4017, 0x4017).r(this, FUNC(vsnes_state::vsnes_in1_1_r)); /* IN1 - input port 2 / PSG second control register */ - map(0x4020, 0x4020).w(this, FUNC(vsnes_state::vsnes_coin_counter_1_w)); + map(0x4014, 0x4014).w(FUNC(vsnes_state::sprite_dma_1_w)); + map(0x4016, 0x4016).rw(FUNC(vsnes_state::vsnes_in0_1_r), FUNC(vsnes_state::vsnes_in0_1_w)); + map(0x4017, 0x4017).r(FUNC(vsnes_state::vsnes_in1_1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x4020, 0x4020).w(FUNC(vsnes_state::vsnes_coin_counter_1_w)); map(0x6000, 0x7fff).bankrw("extra2"); map(0x8000, 0xffff).rom(); } @@ -251,11 +251,11 @@ void vsnes_state::vsnes_cpu1_bootleg_map(address_map &map) { map(0x0000, 0x07ff).mirror(0x1800).ram().share("work_ram"); map(0x2000, 0x3fff).rw(m_ppu1, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); - map(0x4000, 0x4017).w(this, FUNC(vsnes_state::bootleg_sound_write)); - map(0x4014, 0x4014).w(this, FUNC(vsnes_state::sprite_dma_0_w)); - map(0x4016, 0x4016).rw(this, FUNC(vsnes_state::vsnes_in0_r), FUNC(vsnes_state::vsnes_in0_w)); - map(0x4017, 0x4017).r(this, FUNC(vsnes_state::vsnes_in1_r)); /* IN1 - input port 2 / PSG second control register */ - map(0x4020, 0x4020).rw(this, FUNC(vsnes_state::vsnes_coin_counter_r), FUNC(vsnes_state::vsnes_coin_counter_w)); + map(0x4000, 0x4017).w(FUNC(vsnes_state::bootleg_sound_write)); + map(0x4014, 0x4014).w(FUNC(vsnes_state::sprite_dma_0_w)); + map(0x4016, 0x4016).rw(FUNC(vsnes_state::vsnes_in0_r), FUNC(vsnes_state::vsnes_in0_w)); + map(0x4017, 0x4017).r(FUNC(vsnes_state::vsnes_in1_r)); /* IN1 - input port 2 / PSG second control register */ + map(0x4020, 0x4020).rw(FUNC(vsnes_state::vsnes_coin_counter_r), FUNC(vsnes_state::vsnes_coin_counter_w)); map(0x6000, 0x7fff).bankrw("extra1"); map(0x8000, 0xffff).rom(); } @@ -270,15 +270,15 @@ void vsnes_state::vsnes_bootleg_z80_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x4000, 0x4000).r(this, FUNC(vsnes_state::vsnes_bootleg_z80_data_r)); // read in IRQ & NMI + map(0x4000, 0x4000).r(FUNC(vsnes_state::vsnes_bootleg_z80_data_r)); // read in IRQ & NMI - map(0x6000, 0x6000).r(this, FUNC(vsnes_state::vsnes_bootleg_z80_latch_r)); // read in NMI, not explicitly stored (purpose? maybe clear IRQ ?) - map(0x6001, 0x6001).r(this, FUNC(vsnes_state::vsnes_bootleg_z80_address_r)); // ^ + map(0x6000, 0x6000).r(FUNC(vsnes_state::vsnes_bootleg_z80_latch_r)); // read in NMI, not explicitly stored (purpose? maybe clear IRQ ?) + map(0x6001, 0x6001).r(FUNC(vsnes_state::vsnes_bootleg_z80_address_r)); // ^ - map(0x60FA, 0x60FA).w("sn1", FUNC(sn76489_device::write)); - map(0x60F9, 0x60F9).w("sn2", FUNC(sn76489_device::write)); - map(0x60FF, 0x60FF).w("sn3", FUNC(sn76489_device::write)); + map(0x60FA, 0x60FA).w("sn1", FUNC(sn76489_device::command_w)); + map(0x60F9, 0x60F9).w("sn2", FUNC(sn76489_device::command_w)); + map(0x60FF, 0x60FF).w("sn3", FUNC(sn76489_device::command_w)); } diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index e6bba96d9e6..597ae48d4cd 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -163,8 +163,8 @@ READ8_MEMBER(vt100_state::flags_r) WRITE8_MEMBER(vt100_state::baud_rate_w) { - m_dbrg->str_w(data & 0x0f); - m_dbrg->stt_w(data >> 4); + m_dbrg->write_str(data & 0x0f); + m_dbrg->write_stt(data >> 4); } READ8_MEMBER(vt100_state::modem_r) @@ -201,15 +201,15 @@ void vt100_state::vt100_io(address_map &map) map(0x00, 0x00).rw("pusart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x01, 0x01).rw("pusart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); // 0x02 Baud rate generator - map(0x02, 0x02).w(this, FUNC(vt100_state::baud_rate_w)); + map(0x02, 0x02).w(FUNC(vt100_state::baud_rate_w)); // 0x22 Modem buffer - map(0x22, 0x22).r(this, FUNC(vt100_state::modem_r)); + map(0x22, 0x22).r(FUNC(vt100_state::modem_r)); // 0x42 Flags buffer - map(0x42, 0x42).r(this, FUNC(vt100_state::flags_r)); + map(0x42, 0x42).r(FUNC(vt100_state::flags_r)); // 0x42 Brightness D/A latch map(0x42, 0x42).w(m_crtc, FUNC(vt100_video_device::brightness_w)); // 0x62 NVR latch - map(0x62, 0x62).w(this, FUNC(vt100_state::nvr_latch_w)); + map(0x62, 0x62).w(FUNC(vt100_state::nvr_latch_w)); // 0x82 Keyboard UART data map(0x82, 0x82).rw("kbduart", FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); // 0xA2 Video processor DC012 @@ -233,8 +233,8 @@ WRITE8_MEMBER(vt100_state::printer_w) void vt100_state::vt102_io(address_map &map) { vt100_io(map); - map(0x03, 0x03).select(0x1c).r(this, FUNC(vt100_state::printer_r)); - map(0x23, 0x23).select(0x1c).w (this, FUNC(vt100_state::printer_w)); + map(0x03, 0x03).select(0x1c).r(FUNC(vt100_state::printer_r)); + map(0x23, 0x23).select(0x1c).w(FUNC(vt100_state::printer_w)); } /* Input ports */ diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index 49d1ca1a450..fa308d20c55 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -553,29 +553,29 @@ void vt240_state::bank_map(address_map &map) void vt240_state::vt240_mem(address_map &map) { map.unmap_value_high(); - map(0000000, 0167777).rw(this, FUNC(vt240_state::mem_r), FUNC(vt240_state::mem_w)); - map(0170000, 0170037).rw(this, FUNC(vt240_state::mem_map_cs_r), FUNC(vt240_state::mem_map_cs_w)).umask16(0x00ff); - map(0170040, 0170040).w(this, FUNC(vt240_state::mem_map_sel_w)); - map(0170100, 0170100).r(this, FUNC(vt240_state::ctrl_r)); - map(0170140, 0170140).rw(this, FUNC(vt240_state::nvr_store_r), FUNC(vt240_state::nvr_store_w)); + map(0000000, 0167777).rw(FUNC(vt240_state::mem_r), FUNC(vt240_state::mem_w)); + map(0170000, 0170037).rw(FUNC(vt240_state::mem_map_cs_r), FUNC(vt240_state::mem_map_cs_w)).umask16(0x00ff); + map(0170040, 0170040).w(FUNC(vt240_state::mem_map_sel_w)); + map(0170100, 0170100).r(FUNC(vt240_state::ctrl_r)); + map(0170140, 0170140).rw(FUNC(vt240_state::nvr_store_r), FUNC(vt240_state::nvr_store_w)); map(0171000, 0171003).rw(m_i8251, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)).umask16(0x00ff); map(0171004, 0171007).rw(m_i8251, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)).umask16(0x00ff); - map(0172000, 0172077).rw(this, FUNC(vt240_state::duart_r), FUNC(vt240_state::duart_w)).umask16(0x00ff); + map(0172000, 0172077).rw(FUNC(vt240_state::duart_r), FUNC(vt240_state::duart_w)).umask16(0x00ff); map(0173000, 0173003).r(m_hgdc, FUNC(upd7220_device::read)).umask16(0x00ff); - map(0173040, 0173077).r(this, FUNC(vt240_state::vom_r)).umask16(0x00ff); - map(0173140, 0173140).r(this, FUNC(vt240_state::char_buf_r)); + map(0173040, 0173077).r(FUNC(vt240_state::vom_r)).umask16(0x00ff); + map(0173140, 0173140).r(FUNC(vt240_state::char_buf_r)); map(0174000, 0174003).w(m_hgdc, FUNC(upd7220_device::write)).umask16(0x00ff); - map(0174040, 0174077).w(this, FUNC(vt240_state::vom_w)).umask16(0x00ff); - map(0174140, 0174140).w(this, FUNC(vt240_state::char_buf_w)); - map(0174400, 0174400).w(this, FUNC(vt240_state::patmult_w)); - map(0174440, 0174440).w(this, FUNC(vt240_state::mask_w)); - map(0174500, 0174500).w(this, FUNC(vt240_state::vpat_w)); - map(0174540, 0174540).w(this, FUNC(vt240_state::lu_w)); - map(0174600, 0174600).w(this, FUNC(vt240_state::reg0_w)); - map(0174640, 0174640).w(this, FUNC(vt240_state::reg1_w)); - map(0174700, 0174700).w(this, FUNC(vt240_state::hbscrl_w)); - map(0174740, 0174740).w(this, FUNC(vt240_state::lbscrl_w)); - map(0175000, 0175005).rw(this, FUNC(vt240_state::i8085_comm_r), FUNC(vt240_state::i8085_comm_w)).umask16(0x00ff); + map(0174040, 0174077).w(FUNC(vt240_state::vom_w)).umask16(0x00ff); + map(0174140, 0174140).w(FUNC(vt240_state::char_buf_w)); + map(0174400, 0174400).w(FUNC(vt240_state::patmult_w)); + map(0174440, 0174440).w(FUNC(vt240_state::mask_w)); + map(0174500, 0174500).w(FUNC(vt240_state::vpat_w)); + map(0174540, 0174540).w(FUNC(vt240_state::lu_w)); + map(0174600, 0174600).w(FUNC(vt240_state::reg0_w)); + map(0174640, 0174640).w(FUNC(vt240_state::reg1_w)); + map(0174700, 0174700).w(FUNC(vt240_state::hbscrl_w)); + map(0174740, 0174740).w(FUNC(vt240_state::lbscrl_w)); + map(0175000, 0175005).rw(FUNC(vt240_state::i8085_comm_r), FUNC(vt240_state::i8085_comm_w)).umask16(0x00ff); map(0176000, 0176777).rw(m_nvram, FUNC(x2212_device::read), FUNC(x2212_device::write)).umask16(0x00ff); // 017700x System comm logic } @@ -594,22 +594,22 @@ void vt240_state::vt240_char_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); - map(0x10, 0x1f).rw(this, FUNC(vt240_state::vom_r), FUNC(vt240_state::vom_w)); - map(0x20, 0x20).rw(this, FUNC(vt240_state::t11_comm_r), FUNC(vt240_state::t11_comm_w)); - map(0x30, 0x30).rw(this, FUNC(vt240_state::char_buf_r), FUNC(vt240_state::char_buf_w)); - map(0x80, 0x80).w(this, FUNC(vt240_state::patmult_w)); - map(0x90, 0x90).w(this, FUNC(vt240_state::mask_w)); - map(0xa0, 0xa0).w(this, FUNC(vt240_state::vpat_w)); - map(0xb0, 0xb0).w(this, FUNC(vt240_state::lu_w)); - map(0xc0, 0xc0).w(this, FUNC(vt240_state::reg0_w)); - map(0xd0, 0xd0).w(this, FUNC(vt240_state::reg1_w)); - map(0xe0, 0xe0).w(this, FUNC(vt240_state::hbscrl_w)); - map(0xf0, 0xf0).w(this, FUNC(vt240_state::lbscrl_w)); + map(0x10, 0x1f).rw(FUNC(vt240_state::vom_r), FUNC(vt240_state::vom_w)); + map(0x20, 0x20).rw(FUNC(vt240_state::t11_comm_r), FUNC(vt240_state::t11_comm_w)); + map(0x30, 0x30).rw(FUNC(vt240_state::char_buf_r), FUNC(vt240_state::char_buf_w)); + map(0x80, 0x80).w(FUNC(vt240_state::patmult_w)); + map(0x90, 0x90).w(FUNC(vt240_state::mask_w)); + map(0xa0, 0xa0).w(FUNC(vt240_state::vpat_w)); + map(0xb0, 0xb0).w(FUNC(vt240_state::lu_w)); + map(0xc0, 0xc0).w(FUNC(vt240_state::reg0_w)); + map(0xd0, 0xd0).w(FUNC(vt240_state::reg1_w)); + map(0xe0, 0xe0).w(FUNC(vt240_state::hbscrl_w)); + map(0xf0, 0xf0).w(FUNC(vt240_state::lbscrl_w)); } void vt240_state::upd7220_map(address_map &map) { - map(0x00000, 0x3ffff).rw(this, FUNC(vt240_state::vram_r), FUNC(vt240_state::vram_w)).share("vram"); + map(0x00000, 0x3ffff).rw(FUNC(vt240_state::vram_r), FUNC(vt240_state::vram_w)).share("vram"); } diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp index b3812dc5c6c..cf4fadf049b 100644 --- a/src/mame/drivers/vt520.cpp +++ b/src/mame/drivers/vt520.cpp @@ -57,7 +57,7 @@ READ8_MEMBER( vt520_state::vt520_some_r ) void vt520_state::vt520_io(address_map &map) { map.unmap_value_high(); - map(0x7ffb, 0x7ffb).r(this, FUNC(vt520_state::vt520_some_r)); + map(0x7ffb, 0x7ffb).r(FUNC(vt520_state::vt520_some_r)); } /* Input ports */ diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp index 8d88829c975..c0b464fa213 100644 --- a/src/mame/drivers/vtech1.cpp +++ b/src/mame/drivers/vtech1.cpp @@ -306,7 +306,7 @@ void vtech1_state::init_vtech1h() void vtech1_state::laser110_mem(address_map &map) { map(0x0000, 0x3fff).rom(); // basic rom - map(0x6800, 0x6fff).rw(this, FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w)); + map(0x6800, 0x6fff).rw(FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w)); map(0x7000, 0x77ff).ram().share("videoram"); // 6847 map(0x7800, 0x7fff).ram(); // 2k user ram } @@ -314,7 +314,7 @@ void vtech1_state::laser110_mem(address_map &map) void vtech1_state::laser210_mem(address_map &map) { map(0x0000, 0x3fff).rom(); // basic rom - map(0x6800, 0x6fff).rw(this, FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w)); + map(0x6800, 0x6fff).rw(FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w)); map(0x7000, 0x77ff).ram().share("videoram"); // 6847 map(0x7800, 0x8fff).ram(); // 6k user ram } @@ -322,7 +322,7 @@ void vtech1_state::laser210_mem(address_map &map) void vtech1_state::laser310_mem(address_map &map) { map(0x0000, 0x3fff).rom(); // basic rom - map(0x6800, 0x6fff).rw(this, FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w)); + map(0x6800, 0x6fff).rw(FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w)); map(0x7000, 0x77ff).ram().share("videoram"); // 6847 map(0x7800, 0xb7ff).ram(); // 16k user ram } @@ -330,13 +330,13 @@ void vtech1_state::laser310_mem(address_map &map) void vtech1_state::vtech1_io(address_map &map) { map.global_mask(0xff); - map(0x40, 0x4f).r(this, FUNC(vtech1_state::vtech1_lightpen_r)); + map(0x40, 0x4f).r(FUNC(vtech1_state::vtech1_lightpen_r)); } void vtech1_state::vtech1_shrg_io(address_map &map) { vtech1_io(map); - map(0xd0, 0xdf).w(this, FUNC(vtech1_state::vtech1_video_bank_w)); + map(0xd0, 0xdf).w(FUNC(vtech1_state::vtech1_video_bank_w)); } diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp index a6e044ee83f..591818858ac 100644 --- a/src/mame/drivers/vtech2.cpp +++ b/src/mame/drivers/vtech2.cpp @@ -90,10 +90,10 @@ void vtech2_state::vtech2_mem(address_map &map) void vtech2_state::vtech2_io(address_map &map) { map.global_mask(0xff); - map(0x10, 0x1f).rw(this, FUNC(vtech2_state::laser_fdc_r), FUNC(vtech2_state::laser_fdc_w)); - map(0x40, 0x43).w(this, FUNC(vtech2_state::laser_bank_select_w)); - map(0x44, 0x44).w(this, FUNC(vtech2_state::laser_bg_mode_w)); - map(0x45, 0x45).w(this, FUNC(vtech2_state::laser_two_color_w)); + map(0x10, 0x1f).rw(FUNC(vtech2_state::laser_fdc_r), FUNC(vtech2_state::laser_fdc_w)); + map(0x40, 0x43).w(FUNC(vtech2_state::laser_bank_select_w)); + map(0x44, 0x44).w(FUNC(vtech2_state::laser_bg_mode_w)); + map(0x45, 0x45).w(FUNC(vtech2_state::laser_two_color_w)); } /* 2008-05 FP: diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp index abe8168a0a0..f0f4be6443d 100644 --- a/src/mame/drivers/vulgus.cpp +++ b/src/mame/drivers/vulgus.cpp @@ -69,12 +69,12 @@ void vulgus_state::main_map(address_map &map) map(0xc800, 0xc800).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0xc801, 0xc801).nopw(); // ? map(0xc802, 0xc803).ram().share("scroll_low"); - map(0xc804, 0xc804).w(this, FUNC(vulgus_state::c804_w)); - map(0xc805, 0xc805).w(this, FUNC(vulgus_state::palette_bank_w)); + map(0xc804, 0xc804).w(FUNC(vulgus_state::c804_w)); + map(0xc805, 0xc805).w(FUNC(vulgus_state::palette_bank_w)); map(0xc902, 0xc903).ram().share("scroll_high"); map(0xcc00, 0xcc7f).ram().share("spriteram"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(vulgus_state::fgvideoram_w)).share("fgvideoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(vulgus_state::bgvideoram_w)).share("bgvideoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(vulgus_state::fgvideoram_w)).share("fgvideoram"); + map(0xd800, 0xdfff).ram().w(FUNC(vulgus_state::bgvideoram_w)).share("bgvideoram"); map(0xe000, 0xefff).ram(); } diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index f95c135a59d..b918a23cb94 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -263,13 +263,13 @@ WRITE_LINE_MEMBER(wackygtr_state::adpcm_int) void wackygtr_state::program_map(address_map &map) { - map(0x0200, 0x0200).nopr().w(this, FUNC(wackygtr_state::irq_ack_w)); - map(0x0400, 0x0400).nopr().w(this, FUNC(wackygtr_state::firq_ack_w)); - map(0x0600, 0x0600).w(this, FUNC(wackygtr_state::disp_w<0>)); - map(0x0800, 0x0800).w(this, FUNC(wackygtr_state::disp_w<1>)); - map(0x0a00, 0x0a00).w(this, FUNC(wackygtr_state::disp_w<2>)); - map(0x0c00, 0x0c00).w(this, FUNC(wackygtr_state::disp_w<3>)); - map(0x0e00, 0x0e00).w(this, FUNC(wackygtr_state::sample_ctrl_w)); + map(0x0200, 0x0200).nopr().w(FUNC(wackygtr_state::irq_ack_w)); + map(0x0400, 0x0400).nopr().w(FUNC(wackygtr_state::firq_ack_w)); + map(0x0600, 0x0600).w(FUNC(wackygtr_state::disp_w<0>)); + map(0x0800, 0x0800).w(FUNC(wackygtr_state::disp_w<1>)); + map(0x0a00, 0x0a00).w(FUNC(wackygtr_state::disp_w<2>)); + map(0x0c00, 0x0c00).w(FUNC(wackygtr_state::disp_w<3>)); + map(0x0e00, 0x0e00).w(FUNC(wackygtr_state::sample_ctrl_w)); map(0x1000, 0x1001).w("ymsnd", FUNC(ym2413_device::write)); diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index b6b38a5e6ba..c42fcc15522 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -288,7 +288,7 @@ WRITE8_MEMBER(wallc_state::unkitpkr_out2_w) void wallc_state::wallc_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(wallc_state::videoram_w)).mirror(0xc00).share("videoram"); /* 2114, 2114 */ + map(0x8000, 0x83ff).ram().w(FUNC(wallc_state::videoram_w)).mirror(0xc00).share("videoram"); /* 2114, 2114 */ map(0xa000, 0xa3ff).ram(); /* 2114, 2114 */ map(0xb000, 0xb000).portr("DSW1"); @@ -297,7 +297,7 @@ void wallc_state::wallc_map(address_map &map) map(0xb600, 0xb600).portr("DSW2"); map(0xb000, 0xb000).nopw(); - map(0xb100, 0xb100).w(this, FUNC(wallc_state::wallc_coin_counter_w)); + map(0xb100, 0xb100).w(FUNC(wallc_state::wallc_coin_counter_w)); map(0xb200, 0xb200).nopw(); map(0xb500, 0xb500).w("aysnd", FUNC(ay8912_device::address_w)); map(0xb600, 0xb600).w("aysnd", FUNC(ay8912_device::data_w)); @@ -306,7 +306,7 @@ void wallc_state::wallc_map(address_map &map) void wallc_state::unkitpkr_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x83ff).ram().w(this, FUNC(wallc_state::videoram_w)).mirror(0xc00).share("videoram"); /* 2114, 2114 */ + map(0x8000, 0x83ff).ram().w(FUNC(wallc_state::videoram_w)).mirror(0xc00).share("videoram"); /* 2114, 2114 */ map(0xa000, 0xa3ff).ram(); /* 2114, 2114 */ map(0xb000, 0xb000).portr("DSW1"); @@ -315,9 +315,9 @@ void wallc_state::unkitpkr_map(address_map &map) map(0xb300, 0xb300).portr("IN3"); map(0xb500, 0xb5ff).nopr(); // read by memory test routine. left over from some other game - map(0xb000, 0xb000).w(this, FUNC(wallc_state::unkitpkr_out0_w)); - map(0xb100, 0xb100).w(this, FUNC(wallc_state::unkitpkr_out1_w)); - map(0xb200, 0xb200).w(this, FUNC(wallc_state::unkitpkr_out2_w)); + map(0xb000, 0xb000).w(FUNC(wallc_state::unkitpkr_out0_w)); + map(0xb100, 0xb100).w(FUNC(wallc_state::unkitpkr_out1_w)); + map(0xb200, 0xb200).w(FUNC(wallc_state::unkitpkr_out2_w)); map(0xb500, 0xb500).w("aysnd", FUNC(ay8912_device::address_w)); map(0xb600, 0xb600).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); // Port A = DSW } diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp index 52080188033..ab5aaad10bd 100644 --- a/src/mame/drivers/wangpc.cpp +++ b/src/mame/drivers/wangpc.cpp @@ -747,18 +747,18 @@ void wangpc_state::wangpc_mem(address_map &map) void wangpc_state::wangpc_io(address_map &map) { map.unmap_value_high(); - map(0x1000, 0x1000).w(this, FUNC(wangpc_state::fdc_ctrl_w)); - map(0x1004, 0x1004).rw(this, FUNC(wangpc_state::deselect_drive1_r), FUNC(wangpc_state::deselect_drive1_w)); - map(0x1006, 0x1006).rw(this, FUNC(wangpc_state::select_drive1_r), FUNC(wangpc_state::select_drive1_w)); - map(0x1008, 0x1008).rw(this, FUNC(wangpc_state::deselect_drive2_r), FUNC(wangpc_state::deselect_drive2_w)); - map(0x100a, 0x100a).rw(this, FUNC(wangpc_state::select_drive2_r), FUNC(wangpc_state::select_drive2_w)); - map(0x100c, 0x100c).rw(this, FUNC(wangpc_state::motor1_off_r), FUNC(wangpc_state::motor1_off_w)); - map(0x100e, 0x100e).rw(this, FUNC(wangpc_state::motor1_on_r), FUNC(wangpc_state::motor1_on_w)); - map(0x1010, 0x1010).rw(this, FUNC(wangpc_state::motor2_off_r), FUNC(wangpc_state::motor2_off_w)); - map(0x1012, 0x1012).rw(this, FUNC(wangpc_state::motor2_on_r), FUNC(wangpc_state::motor2_on_w)); + map(0x1000, 0x1000).w(FUNC(wangpc_state::fdc_ctrl_w)); + map(0x1004, 0x1004).rw(FUNC(wangpc_state::deselect_drive1_r), FUNC(wangpc_state::deselect_drive1_w)); + map(0x1006, 0x1006).rw(FUNC(wangpc_state::select_drive1_r), FUNC(wangpc_state::select_drive1_w)); + map(0x1008, 0x1008).rw(FUNC(wangpc_state::deselect_drive2_r), FUNC(wangpc_state::deselect_drive2_w)); + map(0x100a, 0x100a).rw(FUNC(wangpc_state::select_drive2_r), FUNC(wangpc_state::select_drive2_w)); + map(0x100c, 0x100c).rw(FUNC(wangpc_state::motor1_off_r), FUNC(wangpc_state::motor1_off_w)); + map(0x100e, 0x100e).rw(FUNC(wangpc_state::motor1_on_r), FUNC(wangpc_state::motor1_on_w)); + map(0x1010, 0x1010).rw(FUNC(wangpc_state::motor2_off_r), FUNC(wangpc_state::motor2_off_w)); + map(0x1012, 0x1012).rw(FUNC(wangpc_state::motor2_on_r), FUNC(wangpc_state::motor2_on_w)); map(0x1014, 0x1017).m(m_fdc, FUNC(upd765a_device::map)).umask16(0x00ff); - map(0x1018, 0x1018).mirror(0x0002).rw(this, FUNC(wangpc_state::fdc_reset_r), FUNC(wangpc_state::fdc_reset_w)); - map(0x101c, 0x101c).mirror(0x0002).rw(this, FUNC(wangpc_state::fdc_tc_r), FUNC(wangpc_state::fdc_tc_w)); + map(0x1018, 0x1018).mirror(0x0002).rw(FUNC(wangpc_state::fdc_reset_r), FUNC(wangpc_state::fdc_reset_w)); + map(0x101c, 0x101c).mirror(0x0002).rw(FUNC(wangpc_state::fdc_tc_r), FUNC(wangpc_state::fdc_tc_w)); map(0x1020, 0x1027).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); map(0x1028, 0x1029); //AM_WRITE(?) map(0x1040, 0x1047).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff); @@ -766,16 +766,16 @@ void wangpc_state::wangpc_io(address_map &map) map(0x1080, 0x1087).r(m_epci, FUNC(mc2661_device::read)).umask16(0x00ff); map(0x1088, 0x108f).w(m_epci, FUNC(mc2661_device::write)).umask16(0x00ff); map(0x10a0, 0x10bf).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask16(0x00ff); - map(0x10c2, 0x10c7).w(this, FUNC(wangpc_state::dma_page_w)).umask16(0x00ff); - map(0x10e0, 0x10e0).rw(this, FUNC(wangpc_state::status_r), FUNC(wangpc_state::timer0_irq_clr_w)); - map(0x10e2, 0x10e2).rw(this, FUNC(wangpc_state::timer2_irq_clr_r), FUNC(wangpc_state::nmi_mask_w)); - map(0x10e4, 0x10e4).rw(this, FUNC(wangpc_state::led_on_r), FUNC(wangpc_state::fpu_mask_w)); - map(0x10e6, 0x10e6).rw(this, FUNC(wangpc_state::dma_eop_clr_r), FUNC(wangpc_state::uart_tbre_clr_w)); - map(0x10e8, 0x10e8).rw(this, FUNC(wangpc_state::uart_r), FUNC(wangpc_state::uart_w)); - map(0x10ea, 0x10ea).rw(this, FUNC(wangpc_state::centronics_r), FUNC(wangpc_state::centronics_w)); - map(0x10ec, 0x10ec).rw(this, FUNC(wangpc_state::busy_clr_r), FUNC(wangpc_state::acknlg_clr_w)); - map(0x10ee, 0x10ee).rw(this, FUNC(wangpc_state::led_off_r), FUNC(wangpc_state::parity_nmi_clr_w)); - map(0x10fe, 0x10fe).r(this, FUNC(wangpc_state::option_id_r)); + map(0x10c2, 0x10c7).w(FUNC(wangpc_state::dma_page_w)).umask16(0x00ff); + map(0x10e0, 0x10e0).rw(FUNC(wangpc_state::status_r), FUNC(wangpc_state::timer0_irq_clr_w)); + map(0x10e2, 0x10e2).rw(FUNC(wangpc_state::timer2_irq_clr_r), FUNC(wangpc_state::nmi_mask_w)); + map(0x10e4, 0x10e4).rw(FUNC(wangpc_state::led_on_r), FUNC(wangpc_state::fpu_mask_w)); + map(0x10e6, 0x10e6).rw(FUNC(wangpc_state::dma_eop_clr_r), FUNC(wangpc_state::uart_tbre_clr_w)); + map(0x10e8, 0x10e8).rw(FUNC(wangpc_state::uart_r), FUNC(wangpc_state::uart_w)); + map(0x10ea, 0x10ea).rw(FUNC(wangpc_state::centronics_r), FUNC(wangpc_state::centronics_w)); + map(0x10ec, 0x10ec).rw(FUNC(wangpc_state::busy_clr_r), FUNC(wangpc_state::acknlg_clr_w)); + map(0x10ee, 0x10ee).rw(FUNC(wangpc_state::led_off_r), FUNC(wangpc_state::parity_nmi_clr_w)); + map(0x10fe, 0x10fe).r(FUNC(wangpc_state::option_id_r)); map(0x1100, 0x1fff).rw(m_bus, FUNC(wangpcbus_device::sad_r), FUNC(wangpcbus_device::sad_w)); } diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index 4ac08f52c56..771fa4eeb72 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -177,7 +177,7 @@ void wardner_state::main_program_map(address_map &map) { map(0x0000, 0x6fff).rom(); map(0x7000, 0x7fff).ram(); - map(0x8000, 0x8fff).w(this, FUNC(wardner_state::wardner_sprite_w)); // AM_SHARE("spriteram8") + map(0x8000, 0x8fff).w(FUNC(wardner_state::wardner_sprite_w)); // AM_SHARE("spriteram8") map(0xa000, 0xafff).w(m_palette, FUNC(palette_device::write8)); // AM_SHARE("palette") map(0xc000, 0xc7ff).writeonly().share("sharedram"); map(0x8000, 0xffff).r(m_membank, FUNC(address_map_bank_device::read8)); @@ -187,7 +187,7 @@ void wardner_state::main_program_map(address_map &map) // Can't use AM_RANGE(0x00000, 0x3ffff) for ROM because the shared pointers get messed up somehow void wardner_state::main_bank_map(address_map &map) { - map(0x00000, 0x00fff).r(this, FUNC(wardner_state::wardner_sprite_r)).share("spriteram8"); + map(0x00000, 0x00fff).r(FUNC(wardner_state::wardner_sprite_r)).share("spriteram8"); map(0x01000, 0x01fff).rom().region("maincpu", 0x1000); map(0x02000, 0x02fff).readonly().share("palette"); map(0x03000, 0x03fff).rom().region("maincpu", 0x3000); @@ -200,13 +200,13 @@ void wardner_state::main_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x00).w("crtc", FUNC(mc6845_device::address_w)); map(0x02, 0x02).w("crtc", FUNC(mc6845_device::register_w)); - map(0x10, 0x13).w(this, FUNC(wardner_state::wardner_txscroll_w)); /* scroll text layer */ - map(0x14, 0x15).w(this, FUNC(wardner_state::wardner_txlayer_w)); /* offset in text video RAM */ - map(0x20, 0x23).w(this, FUNC(wardner_state::wardner_bgscroll_w)); /* scroll bg layer */ - map(0x24, 0x25).w(this, FUNC(wardner_state::wardner_bglayer_w)); /* offset in bg video RAM */ - map(0x30, 0x33).w(this, FUNC(wardner_state::wardner_fgscroll_w)); /* scroll fg layer */ - map(0x34, 0x35).w(this, FUNC(wardner_state::wardner_fglayer_w)); /* offset in fg video RAM */ - map(0x40, 0x43).w(this, FUNC(wardner_state::wardner_exscroll_w)); /* scroll extra layer (not used) */ + map(0x10, 0x13).w(FUNC(wardner_state::wardner_txscroll_w)); /* scroll text layer */ + map(0x14, 0x15).w(FUNC(wardner_state::wardner_txlayer_w)); /* offset in text video RAM */ + map(0x20, 0x23).w(FUNC(wardner_state::wardner_bgscroll_w)); /* scroll bg layer */ + map(0x24, 0x25).w(FUNC(wardner_state::wardner_bglayer_w)); /* offset in bg video RAM */ + map(0x30, 0x33).w(FUNC(wardner_state::wardner_fgscroll_w)); /* scroll fg layer */ + map(0x34, 0x35).w(FUNC(wardner_state::wardner_fglayer_w)); /* offset in fg video RAM */ + map(0x40, 0x43).w(FUNC(wardner_state::wardner_exscroll_w)); /* scroll extra layer (not used) */ map(0x50, 0x50).portr("DSWA"); map(0x52, 0x52).portr("DSWB"); map(0x54, 0x54).portr("P1"); @@ -214,8 +214,8 @@ void wardner_state::main_io_map(address_map &map) map(0x58, 0x58).portr("SYSTEM"); map(0x5a, 0x5a).w("coinlatch", FUNC(ls259_device::write_nibble_d0)); map(0x5c, 0x5c).w("mainlatch", FUNC(ls259_device::write_nibble_d0)); - map(0x60, 0x65).rw(this, FUNC(wardner_state::wardner_videoram_r), FUNC(wardner_state::wardner_videoram_w)); - map(0x70, 0x70).w(this, FUNC(wardner_state::wardner_bank_w)); + map(0x60, 0x65).rw(FUNC(wardner_state::wardner_videoram_r), FUNC(wardner_state::wardner_videoram_w)); + map(0x70, 0x70).w(FUNC(wardner_state::wardner_bank_w)); } @@ -247,9 +247,9 @@ void wardner_state::DSP_program_map(address_map &map) void wardner_state::DSP_io_map(address_map &map) { - map(0x00, 0x00).w(this, FUNC(wardner_state::wardner_dsp_addrsel_w)); - map(0x01, 0x01).rw(this, FUNC(wardner_state::wardner_dsp_r), FUNC(wardner_state::wardner_dsp_w)); - map(0x03, 0x03).w(this, FUNC(wardner_state::twincobr_dsp_bio_w)); + map(0x00, 0x00).w(FUNC(wardner_state::wardner_dsp_addrsel_w)); + map(0x01, 0x01).rw(FUNC(wardner_state::wardner_dsp_r), FUNC(wardner_state::wardner_dsp_w)); + map(0x03, 0x03).w(FUNC(wardner_state::twincobr_dsp_bio_w)); } diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp index ddd90430b32..c6aacb10207 100644 --- a/src/mame/drivers/warpsped.cpp +++ b/src/mame/drivers/warpsped.cpp @@ -236,7 +236,7 @@ uint32_t warpspeed_state::screen_update(screen_device &screen, bitmap_ind16 &bit void warpspeed_state::warpspeed_map(address_map &map) { map(0x0000, 0x0dff).rom(); - map(0x1800, 0x1bff).ram().w(this, FUNC(warpspeed_state::vidram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(warpspeed_state::vidram_w)).share("videoram"); map(0x1c00, 0x1cff).ram().share("workram"); } @@ -247,7 +247,7 @@ void warpspeed_state::warpspeed_io_map(address_map &map) map(0x01, 0x01).portr("IN1"); map(0x02, 0x02).portr("DSW"); map(0x03, 0x03).portr("IN2"); - map(0x00, 0x27).w(this, FUNC(warpspeed_state::hardware_w)); + map(0x00, 0x27).w(FUNC(warpspeed_state::hardware_w)); } static INPUT_PORTS_START( warpspeed ) diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp index 97585d47c62..4c4d65ede23 100644 --- a/src/mame/drivers/warpwarp.cpp +++ b/src/mame/drivers/warpwarp.cpp @@ -286,18 +286,18 @@ WRITE8_MEMBER(warpwarp_state::warpwarp_out0_w) void warpwarp_state::geebee_map(address_map &map) { map(0x0000, 0x1fff).rom(); - map(0x2000, 0x23ff).mirror(0x400).ram().w(this, FUNC(warpwarp_state::geebee_videoram_w)).share("geebee_videoram"); // mirror used by kaitei due to a bug + map(0x2000, 0x23ff).mirror(0x400).ram().w(FUNC(warpwarp_state::geebee_videoram_w)).share("geebee_videoram"); // mirror used by kaitei due to a bug map(0x3000, 0x37ff).rom().region("gfx1", 0); // 3000-33ff in geebee map(0x4000, 0x40ff).ram(); - map(0x5000, 0x53ff).r(this, FUNC(warpwarp_state::geebee_in_r)); - map(0x6000, 0x6fff).w(this, FUNC(warpwarp_state::geebee_out6_w)); + map(0x5000, 0x53ff).r(FUNC(warpwarp_state::geebee_in_r)); + map(0x6000, 0x6fff).w(FUNC(warpwarp_state::geebee_out6_w)); map(0x7000, 0x7007).mirror(0x0ff8).w("latch", FUNC(ls259_device::write_d0)); } void warpwarp_state::geebee_port_map(address_map &map) { - map(0x50, 0x53).r(this, FUNC(warpwarp_state::geebee_in_r)); - map(0x60, 0x6f).w(this, FUNC(warpwarp_state::geebee_out6_w)); + map(0x50, 0x53).r(FUNC(warpwarp_state::geebee_in_r)); + map(0x60, 0x6f).w(FUNC(warpwarp_state::geebee_out6_w)); map(0x70, 0x77).mirror(0x08).w("latch", FUNC(ls259_device::write_d0)); } @@ -306,11 +306,11 @@ void warpwarp_state::bombbee_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x4000, 0x47ff).ram().w(this, FUNC(warpwarp_state::warpwarp_videoram_w)).share("videoram"); + map(0x4000, 0x47ff).ram().w(FUNC(warpwarp_state::warpwarp_videoram_w)).share("videoram"); map(0x4800, 0x4fff).rom().region("gfx1", 0); - map(0x6000, 0x600f).rw(this, FUNC(warpwarp_state::warpwarp_sw_r), FUNC(warpwarp_state::warpwarp_out0_w)); - map(0x6010, 0x601f).r(this, FUNC(warpwarp_state::warpwarp_vol_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music1_w)); - map(0x6020, 0x602f).r(this, FUNC(warpwarp_state::warpwarp_dsw1_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music2_w)); + map(0x6000, 0x600f).rw(FUNC(warpwarp_state::warpwarp_sw_r), FUNC(warpwarp_state::warpwarp_out0_w)); + map(0x6010, 0x601f).r(FUNC(warpwarp_state::warpwarp_vol_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music1_w)); + map(0x6020, 0x602f).r(FUNC(warpwarp_state::warpwarp_dsw1_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music2_w)); map(0x6030, 0x6037).mirror(0x0008).w("latch", FUNC(ls259_device::write_d0)); } @@ -318,11 +318,11 @@ void warpwarp_state::warpwarp_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x8000, 0x83ff).ram(); - map(0x4000, 0x47ff).ram().w(this, FUNC(warpwarp_state::warpwarp_videoram_w)).share("videoram"); + map(0x4000, 0x47ff).ram().w(FUNC(warpwarp_state::warpwarp_videoram_w)).share("videoram"); map(0x4800, 0x4fff).rom().region("gfx1", 0); - map(0xc000, 0xc00f).rw(this, FUNC(warpwarp_state::warpwarp_sw_r), FUNC(warpwarp_state::warpwarp_out0_w)); - map(0xc010, 0xc01f).r(this, FUNC(warpwarp_state::warpwarp_vol_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music1_w)); - map(0xc020, 0xc02f).r(this, FUNC(warpwarp_state::warpwarp_dsw1_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music2_w)); + map(0xc000, 0xc00f).rw(FUNC(warpwarp_state::warpwarp_sw_r), FUNC(warpwarp_state::warpwarp_out0_w)); + map(0xc010, 0xc01f).r(FUNC(warpwarp_state::warpwarp_vol_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music1_w)); + map(0xc020, 0xc02f).r(FUNC(warpwarp_state::warpwarp_dsw1_r)).w(m_warpwarp_sound, FUNC(warpwarp_sound_device::music2_w)); map(0xc030, 0xc037).mirror(0x0008).w("latch", FUNC(ls259_device::write_d0)); } diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp index 62bbccdd3ce..c17913044e3 100644 --- a/src/mame/drivers/warriorb.cpp +++ b/src/mame/drivers/warriorb.cpp @@ -227,7 +227,7 @@ void warriorb_state::darius2d_map(address_map &map) { map(0x000000, 0x0fffff).rom(); map(0x100000, 0x10ffff).ram(); /* main ram */ - map(0x200000, 0x213fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(warriorb_state::tc0100scn_dual_screen_w)); /* tilemaps (all screens) */ + map(0x200000, 0x213fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(warriorb_state::tc0100scn_dual_screen_w)); /* tilemaps (all screens) */ map(0x214000, 0x2141ff).nopw(); /* error in screen clearing code ? */ map(0x220000, 0x22000f).rw("tc0100scn_1", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x240000, 0x253fff).rw("tc0100scn_2", FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps (2nd screen) */ @@ -237,14 +237,14 @@ void warriorb_state::darius2d_map(address_map &map) map(0x600000, 0x6013ff).ram().share("spriteram"); map(0x800000, 0x80000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff); // AM_RANGE(0x820000, 0x820001) AM_WRITENOP // ??? - map(0x830000, 0x830003).rw(this, FUNC(warriorb_state::sound_r), FUNC(warriorb_state::sound_w)); + map(0x830000, 0x830003).rw(FUNC(warriorb_state::sound_r), FUNC(warriorb_state::sound_w)); } void warriorb_state::warriorb_map(address_map &map) { map(0x000000, 0x1fffff).rom(); map(0x200000, 0x213fff).ram(); - map(0x300000, 0x313fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(warriorb_state::tc0100scn_dual_screen_w)); /* tilemaps (all screens) */ + map(0x300000, 0x313fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(warriorb_state::tc0100scn_dual_screen_w)); /* tilemaps (all screens) */ map(0x320000, 0x32000f).rw("tc0100scn_1", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x340000, 0x353fff).rw("tc0100scn_2", FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps (2nd screen) */ map(0x360000, 0x36000f).rw("tc0100scn_2", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -253,7 +253,7 @@ void warriorb_state::warriorb_map(address_map &map) map(0x600000, 0x6013ff).ram().share("spriteram"); map(0x800000, 0x80000f).rw(m_tc0510nio, FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)).umask16(0x00ff); // AM_RANGE(0x820000, 0x820001) AM_WRITENOP // ? uses bits 0,2,3 - map(0x830000, 0x830003).rw(this, FUNC(warriorb_state::sound_r), FUNC(warriorb_state::sound_w)); + map(0x830000, 0x830003).rw(FUNC(warriorb_state::sound_r), FUNC(warriorb_state::sound_w)); } /***************************************************************************/ @@ -266,11 +266,11 @@ void warriorb_state::z80_sound_map(address_map &map) map(0xe000, 0xe003).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); map(0xe200, 0xe200).nopr().w(m_tc0140syt, FUNC(tc0140syt_device::slave_port_w)); map(0xe201, 0xe201).rw(m_tc0140syt, FUNC(tc0140syt_device::slave_comm_r), FUNC(tc0140syt_device::slave_comm_w)); - map(0xe400, 0xe403).w(this, FUNC(warriorb_state::pancontrol_w)); /* pan */ + map(0xe400, 0xe403).w(FUNC(warriorb_state::pancontrol_w)); /* pan */ map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(warriorb_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(warriorb_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp index 494636bccc3..dac413fd090 100644 --- a/src/mame/drivers/wc90.cpp +++ b/src/mame/drivers/wc90.cpp @@ -79,11 +79,11 @@ void wc90_state::wc90_map_1(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).ram(); /* Main RAM */ - map(0xa000, 0xafff).ram().w(this, FUNC(wc90_state::fgvideoram_w)).share("fgvideoram"); /* fg video ram */ + map(0xa000, 0xafff).ram().w(FUNC(wc90_state::fgvideoram_w)).share("fgvideoram"); /* fg video ram */ map(0xb000, 0xbfff).ram(); - map(0xc000, 0xcfff).ram().w(this, FUNC(wc90_state::bgvideoram_w)).share("bgvideoram"); + map(0xc000, 0xcfff).ram().w(FUNC(wc90_state::bgvideoram_w)).share("bgvideoram"); map(0xd000, 0xdfff).ram(); - map(0xe000, 0xefff).ram().w(this, FUNC(wc90_state::txvideoram_w)).share("txvideoram"); /* tx video ram */ + map(0xe000, 0xefff).ram().w(FUNC(wc90_state::txvideoram_w)).share("txvideoram"); /* tx video ram */ map(0xf000, 0xf7ff).bankr("mainbank"); map(0xf800, 0xfbff).ram().share("share1"); map(0xfc00, 0xfc00).portr("P1"); @@ -105,7 +105,7 @@ void wc90_state::wc90_map_1(address_map &map) map(0xfc47, 0xfc47).writeonly().share("scroll2xhi"); map(0xfcc0, 0xfcc0).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xfcd0, 0xfcd0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0xfce0, 0xfce0).w(this, FUNC(wc90_state::bankswitch_w)); + map(0xfce0, 0xfce0).w(FUNC(wc90_state::bankswitch_w)); } void wc90_state::wc90_map_2(address_map &map) @@ -117,7 +117,7 @@ void wc90_state::wc90_map_2(address_map &map) map(0xe000, 0xe7ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xf000, 0xf7ff).bankr("subbank"); map(0xf800, 0xfbff).ram().share("share1"); - map(0xfc00, 0xfc00).w(this, FUNC(wc90_state::bankswitch1_w)); + map(0xfc00, 0xfc00).w(FUNC(wc90_state::bankswitch1_w)); map(0xfc01, 0xfc01).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index 110f54721d5..562975f15dd 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -144,13 +144,13 @@ void wc90b_state::wc90b_map1(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x9fff).ram(); /* Main RAM */ - map(0xa000, 0xafff).ram().w(this, FUNC(wc90b_state::fgvideoram_w)).share("fgvideoram"); - map(0xc000, 0xcfff).ram().w(this, FUNC(wc90b_state::bgvideoram_w)).share("bgvideoram"); - map(0xe000, 0xefff).ram().w(this, FUNC(wc90b_state::txvideoram_w)).share("txvideoram"); + map(0xa000, 0xafff).ram().w(FUNC(wc90b_state::fgvideoram_w)).share("fgvideoram"); + map(0xc000, 0xcfff).ram().w(FUNC(wc90b_state::bgvideoram_w)).share("bgvideoram"); + map(0xe000, 0xefff).ram().w(FUNC(wc90b_state::txvideoram_w)).share("txvideoram"); map(0xf000, 0xf7ff).bankr("mainbank"); map(0xf800, 0xfbff).ram().share("share1"); - map(0xfc00, 0xfc00).w(this, FUNC(wc90b_state::bankswitch_w)); - map(0xfd00, 0xfd00).w(this, FUNC(wc90b_state::sound_command_w)); + map(0xfc00, 0xfc00).w(FUNC(wc90b_state::bankswitch_w)); + map(0xfd00, 0xfd00).w(FUNC(wc90b_state::sound_command_w)); map(0xfd04, 0xfd04).writeonly().share("scroll1y"); map(0xfd06, 0xfd06).writeonly().share("scroll1x"); map(0xfd08, 0xfd08).writeonly().share("scroll2y"); @@ -160,7 +160,7 @@ void wc90b_state::wc90b_map1(address_map &map) map(0xfd02, 0xfd02).portr("P2"); map(0xfd06, 0xfd06).portr("DSW1"); map(0xfd08, 0xfd08).portr("DSW2"); - map(0xfd0c, 0xfd0c).r(this, FUNC(wc90b_state::master_irq_ack_r)); + map(0xfd0c, 0xfd0c).r(FUNC(wc90b_state::master_irq_ack_r)); } void wc90b_state::wc90b_map2(address_map &map) @@ -173,16 +173,16 @@ void wc90b_state::wc90b_map2(address_map &map) map(0xe800, 0xefff).rom(); map(0xf000, 0xf7ff).bankr("subbank"); map(0xf800, 0xfbff).ram().share("share1"); - map(0xfc00, 0xfc00).w(this, FUNC(wc90b_state::bankswitch1_w)); - map(0xfd0c, 0xfd0c).w(this, FUNC(wc90b_state::slave_irq_ack_w)); + map(0xfc00, 0xfc00).w(FUNC(wc90b_state::bankswitch1_w)); + map(0xfd0c, 0xfd0c).w(FUNC(wc90b_state::slave_irq_ack_w)); } void wc90b_state::sound_cpu(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("audiobank"); - map(0xe000, 0xe000).w(this, FUNC(wc90b_state::adpcm_control_w)); - map(0xe400, 0xe400).w(this, FUNC(wc90b_state::adpcm_data_w)); + map(0xe000, 0xe000).w(FUNC(wc90b_state::adpcm_control_w)); + map(0xe400, 0xe400).w(FUNC(wc90b_state::adpcm_data_w)); map(0xe800, 0xe801).rw("ymsnd1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xec00, 0xec01).rw("ymsnd2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf000, 0xf7ff).ram(); diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index ca577f2f5f1..44f8505c532 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -513,25 +513,25 @@ void wecleman_state::wecleman_map(address_map &map) { map(0x000000, 0x03ffff).rom(); // ROM (03c000-03ffff used as RAM sometimes!) map(0x040000, 0x043fff).ram(); // RAM - map(0x040494, 0x040495).w(this, FUNC(wecleman_state::wecleman_videostatus_w)).share("videostatus"); // cloud blending control (HACK) - map(0x060000, 0x060005).w(this, FUNC(wecleman_state::wecleman_protection_w)).share("protection_ram"); - map(0x060006, 0x060007).r(this, FUNC(wecleman_state::wecleman_protection_r)); // MCU read - map(0x080000, 0x080011).ram().w(this, FUNC(wecleman_state::blitter_w)).share("blitter_regs"); // Blitter - map(0x100000, 0x103fff).ram().w(this, FUNC(wecleman_state::wecleman_pageram_w)).share("pageram"); // Background Layers - map(0x108000, 0x108fff).ram().w(this, FUNC(wecleman_state::wecleman_txtram_w)).share("txtram"); // Text Layer - map(0x110000, 0x110fff).ram().w(this, FUNC(wecleman_state::wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w)).share("paletteram"); + map(0x040494, 0x040495).w(FUNC(wecleman_state::wecleman_videostatus_w)).share("videostatus"); // cloud blending control (HACK) + map(0x060000, 0x060005).w(FUNC(wecleman_state::wecleman_protection_w)).share("protection_ram"); + map(0x060006, 0x060007).r(FUNC(wecleman_state::wecleman_protection_r)); // MCU read + map(0x080000, 0x080011).ram().w(FUNC(wecleman_state::blitter_w)).share("blitter_regs"); // Blitter + map(0x100000, 0x103fff).ram().w(FUNC(wecleman_state::wecleman_pageram_w)).share("pageram"); // Background Layers + map(0x108000, 0x108fff).ram().w(FUNC(wecleman_state::wecleman_txtram_w)).share("txtram"); // Text Layer + map(0x110000, 0x110fff).ram().w(FUNC(wecleman_state::wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w)).share("paletteram"); map(0x124000, 0x127fff).ram().share("share1"); // Shared with main CPU map(0x130000, 0x130fff).ram().share("spriteram"); // Sprites map(0x140001, 0x140001).w("soundlatch", FUNC(generic_latch_8_device::write)); // To sound CPU - map(0x140002, 0x140003).w(this, FUNC(wecleman_state::selected_ip_w)); // Selects accelerator / wheel / .. - map(0x140004, 0x140005).w(this, FUNC(wecleman_state::irqctrl_w)); // Main CPU controls the other CPUs + map(0x140002, 0x140003).w(FUNC(wecleman_state::selected_ip_w)); // Selects accelerator / wheel / .. + map(0x140004, 0x140005).w(FUNC(wecleman_state::irqctrl_w)); // Main CPU controls the other CPUs map(0x140006, 0x140007).nopw(); // Watchdog reset map(0x140010, 0x140011).portr("IN0"); // Coins + brake + gear map(0x140012, 0x140013).portr("IN1"); // ?? map(0x140014, 0x140015).portr("DSWA"); // DSW 2 map(0x140016, 0x140017).portr("DSWB"); // DSW 1 map(0x140020, 0x140021).writeonly(); // Paired with writes to $140003 - map(0x140020, 0x140021).r(this, FUNC(wecleman_state::selected_ip_r)); // Accelerator or Wheel or .. + map(0x140020, 0x140021).r(FUNC(wecleman_state::selected_ip_r)); // Accelerator or Wheel or .. map(0x140030, 0x140031).nopw(); // toggles between 0 & 1 on hitting bumps and crashes (vibration?) } @@ -547,23 +547,23 @@ void wecleman_state::hotchase_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x040000, 0x041fff).ram(); // RAM map(0x060000, 0x063fff).ram(); // RAM - map(0x080000, 0x080011).ram().w(this, FUNC(wecleman_state::blitter_w)).share("blitter_regs"); // Blitter + map(0x080000, 0x080011).ram().w(FUNC(wecleman_state::blitter_w)).share("blitter_regs"); // Blitter map(0x100000, 0x100fff).rw("k051316_1", FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); // Background map(0x101000, 0x10101f).w("k051316_1", FUNC(k051316_device::ctrl_w)).umask16(0x00ff); // Background Ctrl map(0x102000, 0x102fff).rw("k051316_2", FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); // Foreground map(0x103000, 0x10301f).w("k051316_2", FUNC(k051316_device::ctrl_w)).umask16(0x00ff); // Foreground Ctrl - map(0x110000, 0x111fff).ram().w(this, FUNC(wecleman_state::hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w)).share("paletteram"); + map(0x110000, 0x111fff).ram().w(FUNC(wecleman_state::hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w)).share("paletteram"); map(0x120000, 0x123fff).ram().share("share1"); // Shared with sub CPU map(0x130000, 0x130fff).ram().share("spriteram"); // Sprites map(0x140001, 0x140001).w("soundlatch", FUNC(generic_latch_8_device::write)); // To sound CPU - map(0x140002, 0x140003).w(this, FUNC(wecleman_state::selected_ip_w)); // Selects accelerator / wheel / - map(0x140004, 0x140005).w(this, FUNC(wecleman_state::irqctrl_w)); // Main CPU controls the other CPUs + map(0x140002, 0x140003).w(FUNC(wecleman_state::selected_ip_w)); // Selects accelerator / wheel / + map(0x140004, 0x140005).w(FUNC(wecleman_state::irqctrl_w)); // Main CPU controls the other CPUs map(0x140006, 0x140007).nopr(); // Watchdog reset map(0x140010, 0x140011).portr("IN0"); // Coins + brake + gear map(0x140012, 0x140013).portr("IN1"); // ?? bit 4 from sound cpu map(0x140014, 0x140015).portr("DSW2"); // DSW 2 map(0x140016, 0x140017).portr("DSW1"); // DSW 1 - map(0x140020, 0x140021).r(this, FUNC(wecleman_state::selected_ip_r)).nopw(); // Paired with writes to $140003 + map(0x140020, 0x140021).r(FUNC(wecleman_state::selected_ip_r)).nopw(); // Paired with writes to $140003 map(0x140022, 0x140023).nopr(); // read and written at $601c0, unknown purpose map(0x140030, 0x140031).nopw(); // signal to cabinet vibration motors? } @@ -642,13 +642,13 @@ void wecleman_state::wecleman_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x83ff).ram(); map(0x8500, 0x8500).nopw(); // increased with speed (global volume)? - map(0x9000, 0x9000).r(this, FUNC(wecleman_state::multiply_r)); // 007452: Protection - map(0x9000, 0x9001).w(this, FUNC(wecleman_state::multiply_w)); // 007452: Protection + map(0x9000, 0x9000).r(FUNC(wecleman_state::multiply_r)); // 007452: Protection + map(0x9000, 0x9001).w(FUNC(wecleman_state::multiply_w)); // 007452: Protection map(0x9006, 0x9006).nopw(); // 007452: ? map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read)); // From main CPU map(0xb000, 0xb00d).rw("k007232_1", FUNC(k007232_device::read), FUNC(k007232_device::write)); // K007232 (Reading offset 5/b triggers the sample) map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xf000, 0xf000).w(this, FUNC(wecleman_state::wecleman_K00723216_bank_w)); // Samples banking + map(0xf000, 0xf000).w(FUNC(wecleman_state::wecleman_K00723216_bank_w)); // Samples banking } @@ -725,13 +725,13 @@ WRITE8_MEMBER(wecleman_state::hotchase_k007232_w) void wecleman_state::hotchase_sound_map(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x1000, 0x100d).rw(this, FUNC(wecleman_state::hotchase_k007232_r<0>), FUNC(wecleman_state::hotchase_k007232_w<0>)); // 3 x K007232 - map(0x2000, 0x200d).rw(this, FUNC(wecleman_state::hotchase_k007232_r<1>), FUNC(wecleman_state::hotchase_k007232_w<1>)); - map(0x3000, 0x300d).rw(this, FUNC(wecleman_state::hotchase_k007232_r<2>), FUNC(wecleman_state::hotchase_k007232_w<2>)); - map(0x4000, 0x4007).w(this, FUNC(wecleman_state::hotchase_sound_control_w)); // Sound volume, banking, etc. + map(0x1000, 0x100d).rw(FUNC(wecleman_state::hotchase_k007232_r<0>), FUNC(wecleman_state::hotchase_k007232_w<0>)); // 3 x K007232 + map(0x2000, 0x200d).rw(FUNC(wecleman_state::hotchase_k007232_r<1>), FUNC(wecleman_state::hotchase_k007232_w<1>)); + map(0x3000, 0x300d).rw(FUNC(wecleman_state::hotchase_k007232_r<2>), FUNC(wecleman_state::hotchase_k007232_w<2>)); + map(0x4000, 0x4007).w(FUNC(wecleman_state::hotchase_sound_control_w)); // Sound volume, banking, etc. map(0x5000, 0x5000).nopw(); // 0 at start of IRQ service, 1 at end (irq mask?) map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); // From main CPU (Read on IRQ) - map(0x7000, 0x7000).w(this, FUNC(wecleman_state::hotchase_sound_hs_w)); // ACK signal to main CPU + map(0x7000, 0x7000).w(FUNC(wecleman_state::hotchase_sound_hs_w)); // ACK signal to main CPU map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp index 04e3c555f65..4fd9ff77a58 100644 --- a/src/mame/drivers/welltris.cpp +++ b/src/mame/drivers/welltris.cpp @@ -339,14 +339,14 @@ void welltris_state::main_map(address_map &map) map(0x800000, 0x81ffff).ram().share("pixelram"); /* Graph_1 & 2*/ map(0xff8000, 0xffbfff).ram(); /* work */ map(0xffc000, 0xffc3ff).ram().share("spriteram"); /* Sprite */ - map(0xffd000, 0xffdfff).ram().w(this, FUNC(welltris_state::charvideoram_w)).share("charvideoram"); /* Char */ + map(0xffd000, 0xffdfff).ram().w(FUNC(welltris_state::charvideoram_w)).share("charvideoram"); /* Char */ map(0xffe000, 0xffefff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); /* Palette */ map(0xfff000, 0xfff001).portr("P1"); /* Bottom Controls */ - map(0xfff000, 0xfff001).w(this, FUNC(welltris_state::palette_bank_w)); + map(0xfff000, 0xfff001).w(FUNC(welltris_state::palette_bank_w)); map(0xfff002, 0xfff003).portr("P2"); /* Top Controls */ - map(0xfff002, 0xfff003).w(this, FUNC(welltris_state::gfxbank_w)); + map(0xfff002, 0xfff003).w(FUNC(welltris_state::gfxbank_w)); map(0xfff004, 0xfff005).portr("P3"); /* Left Side Ctrls */ - map(0xfff004, 0xfff007).w(this, FUNC(welltris_state::scrollreg_w)); + map(0xfff004, 0xfff007).w(FUNC(welltris_state::scrollreg_w)); map(0xfff006, 0xfff007).portr("P4"); /* Right Side Ctrls */ map(0xfff008, 0xfff009).portr("SYSTEM"); /* Bit 5 Tested at start of irq 1 */ map(0xfff009, 0xfff009).w(m_soundlatch, FUNC(generic_latch_8_device::write)); @@ -366,7 +366,7 @@ void welltris_state::sound_map(address_map &map) void welltris_state::sound_port_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(welltris_state::sound_bankswitch_w)); + map(0x00, 0x00).w(FUNC(welltris_state::sound_bankswitch_w)); map(0x08, 0x0b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); map(0x10, 0x10).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x18, 0x18).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp index 5e3e61e2210..3994fbfd3e2 100644 --- a/src/mame/drivers/wgp.cpp +++ b/src/mame/drivers/wgp.cpp @@ -615,17 +615,17 @@ void wgp_state::main_map(address_map &map) map(0x100000, 0x10ffff).ram(); /* main CPUA ram */ map(0x140000, 0x143fff).ram().share("sharedram"); map(0x180000, 0x18000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0xff00); - map(0x1c0000, 0x1c0001).w(this, FUNC(wgp_state::cpua_ctrl_w)); - map(0x200000, 0x20000f).rw(this, FUNC(wgp_state::adinput_r), FUNC(wgp_state::adinput_w)); + map(0x1c0000, 0x1c0001).w(FUNC(wgp_state::cpua_ctrl_w)); + map(0x200000, 0x20000f).rw(FUNC(wgp_state::adinput_r), FUNC(wgp_state::adinput_w)); map(0x300000, 0x30ffff).rw(m_tc0100scn, FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps */ map(0x320000, 0x32000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x400000, 0x40bfff).ram().share("spritemap"); /* sprite tilemaps */ map(0x40c000, 0x40dfff).ram().share("spriteram"); /* sprite ram */ map(0x40fff0, 0x40fff1).nopw(); /* ?? (writes 0x8000 and 0 alternately - Wgp2 just 0) */ map(0x500000, 0x501fff).ram(); /* unknown/unused */ - map(0x502000, 0x517fff).ram().w(this, FUNC(wgp_state::pivram_word_w)).share("pivram"); /* piv tilemaps */ - map(0x520000, 0x52001f).ram().w(this, FUNC(wgp_state::piv_ctrl_word_w)).share("piv_ctrlram"); - map(0x600000, 0x600003).w(this, FUNC(wgp_state::rotate_port_w)); /* rotation control ? */ + map(0x502000, 0x517fff).ram().w(FUNC(wgp_state::pivram_word_w)).share("pivram"); /* piv tilemaps */ + map(0x520000, 0x52001f).ram().w(FUNC(wgp_state::piv_ctrl_word_w)).share("piv_ctrlram"); + map(0x600000, 0x600003).w(FUNC(wgp_state::rotate_port_w)); /* rotation control ? */ map(0x700000, 0x701fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); } @@ -638,7 +638,7 @@ void wgp_state::cpu2_map(address_map &map) map(0x200003, 0x200003).rw(m_tc0140syt, FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); // AM_RANGE(0x380000, 0x383fff) AM_READONLY // LAN RAM // AM_RANGE(0x380000, 0x383fff) AM_WRITEONLY // LAN RAM - map(0x380000, 0x380001).r(this, FUNC(wgp_state::lan_status_r)); // ?? + map(0x380000, 0x380001).r(FUNC(wgp_state::lan_status_r)); // ?? // a lan input area is read somewhere above the status // (make the status return 0 and log)... } @@ -658,7 +658,7 @@ void wgp_state::z80_sound_map(address_map &map) map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(wgp_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(wgp_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index 582cdf031b1..92c61d54a82 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -584,15 +584,15 @@ void wheelfir_state::wheelfir_main(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x200000, 0x20ffff).ram(); - map(0x700000, 0x70001f).w(this, FUNC(wheelfir_state::wheelfir_blit_w)); + map(0x700000, 0x70001f).w(FUNC(wheelfir_state::wheelfir_blit_w)); map(0x720001, 0x720001).w("ramdac", FUNC(ramdac_device::index_w)); map(0x720003, 0x720003).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x720005, 0x720005).w("ramdac", FUNC(ramdac_device::mask_w)); // word write? map(0x740000, 0x740001).w("soundlatch", FUNC(generic_latch_16_device::write)); - map(0x760000, 0x760001).w(this, FUNC(wheelfir_state::coin_cnt_w)); + map(0x760000, 0x760001).w(FUNC(wheelfir_state::coin_cnt_w)); map(0x780000, 0x78000f).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask16(0x00ff); - map(0x7a0000, 0x7a0001).w(this, FUNC(wheelfir_state::wheelfir_scanline_cnt_w)); - map(0x7c0000, 0x7c0001).rw(this, FUNC(wheelfir_state::wheelfir_7c0000_r), FUNC(wheelfir_state::wheelfir_7c0000_w)); + map(0x7a0000, 0x7a0001).w(FUNC(wheelfir_state::wheelfir_scanline_cnt_w)); + map(0x7c0000, 0x7c0001).rw(FUNC(wheelfir_state::wheelfir_7c0000_r), FUNC(wheelfir_state::wheelfir_7c0000_w)); map(0x7e0000, 0x7e0001).portr("P1"); map(0x7e0002, 0x7e0003).portr("P2"); } @@ -605,8 +605,8 @@ void wheelfir_state::wheelfir_sub(address_map &map) map(0x780000, 0x780001).r("soundlatch", FUNC(generic_latch_16_device::read)); - map(0x700000, 0x700001).w("ldac", FUNC(dac_word_interface::write)); - map(0x740000, 0x740001).w("rdac", FUNC(dac_word_interface::write)); + map(0x700000, 0x700001).w("ldac", FUNC(dac_word_interface::data_w)); + map(0x740000, 0x740001).w("rdac", FUNC(dac_word_interface::data_w)); } diff --git a/src/mame/drivers/whitestar.cpp b/src/mame/drivers/whitestar.cpp index 967d0fa44c8..1e762a9dc40 100644 --- a/src/mame/drivers/whitestar.cpp +++ b/src/mame/drivers/whitestar.cpp @@ -72,10 +72,10 @@ void whitestar_state::whitestar_map(address_map &map) map(0x0000, 0x1fff).ram(); map(0x3000, 0x3000).portr("DEDICATED"); map(0x3100, 0x3100).portr("DSW0"); - map(0x3200, 0x3200).w(this, FUNC(whitestar_state::bank_w)); - map(0x3300, 0x3300).w(this, FUNC(whitestar_state::switch_w)); - map(0x3400, 0x3400).r(this, FUNC(whitestar_state::switch_r)); - map(0x3600, 0x3600).w(this, FUNC(whitestar_state::dmddata_w)); + map(0x3200, 0x3200).w(FUNC(whitestar_state::bank_w)); + map(0x3300, 0x3300).w(FUNC(whitestar_state::switch_w)); + map(0x3400, 0x3400).r(FUNC(whitestar_state::switch_r)); + map(0x3600, 0x3600).w(FUNC(whitestar_state::dmddata_w)); map(0x3601, 0x3601).rw(m_decodmd, FUNC(decodmd_type2_device::ctrl_r), FUNC(decodmd_type2_device::ctrl_w)); map(0x3700, 0x3700).r(m_decodmd, FUNC(decodmd_type2_device::busy_r)); map(0x3800, 0x3800).w(DECOBSMT_TAG, FUNC(decobsmt_device::bsmt_comms_w)); diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index 0f5d055adfb..e05b898c116 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -169,9 +169,9 @@ void wicat_state::wicat_mem(address_map &map) map(0x000000, 0x001fff).rom().region("c2", 0x0000); map(0x020000, 0x1fffff).ram(); map(0x200000, 0x2fffff).ram(); - map(0x300000, 0xdfffff).rw(this, FUNC(wicat_state::invalid_r), FUNC(wicat_state::invalid_w)); + map(0x300000, 0xdfffff).rw(FUNC(wicat_state::invalid_r), FUNC(wicat_state::invalid_w)); map(0xeff800, 0xeffbff).ram(); // memory mapping SRAM, used during boot sequence for storing various data (TODO) - map(0xeffc00, 0xeffc01).rw(this, FUNC(wicat_state::memmap_r), FUNC(wicat_state::memmap_w)); + map(0xeffc00, 0xeffc01).rw(FUNC(wicat_state::memmap_r), FUNC(wicat_state::memmap_w)); map(0xf00000, 0xf00007).rw(m_uart0, FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0xff00); // UARTs map(0xf00008, 0xf0000f).rw(m_uart1, FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0xff00); map(0xf00010, 0xf00017).rw(m_uart2, FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0xff00); @@ -179,12 +179,12 @@ void wicat_state::wicat_mem(address_map &map) map(0xf00020, 0xf00027).rw(m_uart4, FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0xff00); map(0xf00028, 0xf0002f).rw(m_uart5, FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0xff00); map(0xf00030, 0xf00037).rw(m_uart6, FUNC(mc2661_device::read), FUNC(mc2661_device::write)).umask16(0xff00); - map(0xf00040, 0xf0005f).rw(this, FUNC(wicat_state::via_r), FUNC(wicat_state::via_w)); + map(0xf00040, 0xf0005f).rw(FUNC(wicat_state::via_r), FUNC(wicat_state::via_w)); map(0xf00060, 0xf0007f).rw(m_rtc, FUNC(mm58274c_device::read), FUNC(mm58274c_device::write)).umask16(0xff00); map(0xf000d0, 0xf000d0).w("ledlatch", FUNC(ls259_device::write_nibble_d3)); - map(0xf00180, 0xf0018f).rw(this, FUNC(wicat_state::hdc_r), FUNC(wicat_state::hdc_w)); // WD1000 - map(0xf00190, 0xf0019f).rw(this, FUNC(wicat_state::fdc_r), FUNC(wicat_state::fdc_w)); // FD1795 - map(0xf00f00, 0xf00fff).rw(this, FUNC(wicat_state::invalid_r), FUNC(wicat_state::invalid_w)); + map(0xf00180, 0xf0018f).rw(FUNC(wicat_state::hdc_r), FUNC(wicat_state::hdc_w)); // WD1000 + map(0xf00190, 0xf0019f).rw(FUNC(wicat_state::fdc_r), FUNC(wicat_state::fdc_w)); // FD1795 + map(0xf00f00, 0xf00fff).rw(FUNC(wicat_state::invalid_r), FUNC(wicat_state::invalid_w)); } void wicat_state::wicat_video_mem(address_map &map) @@ -196,16 +196,16 @@ void wicat_state::wicat_video_mem(address_map &map) void wicat_state::wicat_video_io(address_map &map) { // these are largely wild guesses... - map(0x0000, 0x0003).rw(this, FUNC(wicat_state::video_timer_r), FUNC(wicat_state::video_timer_w)); // some sort of timer? - map(0x0100, 0x0107).rw(this, FUNC(wicat_state::video_uart0_r), FUNC(wicat_state::video_uart0_w)); // INS2651 UART #1 - map(0x0200, 0x0207).rw(this, FUNC(wicat_state::video_uart1_r), FUNC(wicat_state::video_uart1_w)); // INS2651 UART #2 - map(0x0304, 0x0304).r(this, FUNC(wicat_state::video_status_r)); - map(0x0400, 0x047f).rw(this, FUNC(wicat_state::videosram_r), FUNC(wicat_state::videosram_w)); // XD2210 4-bit NOVRAM - map(0x0500, 0x0500).w(this, FUNC(wicat_state::videosram_recall_w)); - map(0x0600, 0x0600).w(this, FUNC(wicat_state::videosram_store_w)); - map(0x0800, 0x080f).rw(this, FUNC(wicat_state::video_ctrl_r), FUNC(wicat_state::video_ctrl_w)); - map(0x0a00, 0x0a1f).rw(this, FUNC(wicat_state::video_dma_r), FUNC(wicat_state::video_dma_w)); // AM9517A DMA - map(0x0b00, 0x0b03).rw(this, FUNC(wicat_state::video_r), FUNC(wicat_state::video_w)); // i8275 CRTC + map(0x0000, 0x0003).rw(FUNC(wicat_state::video_timer_r), FUNC(wicat_state::video_timer_w)); // some sort of timer? + map(0x0100, 0x0107).rw(FUNC(wicat_state::video_uart0_r), FUNC(wicat_state::video_uart0_w)); // INS2651 UART #1 + map(0x0200, 0x0207).rw(FUNC(wicat_state::video_uart1_r), FUNC(wicat_state::video_uart1_w)); // INS2651 UART #2 + map(0x0304, 0x0304).r(FUNC(wicat_state::video_status_r)); + map(0x0400, 0x047f).rw(FUNC(wicat_state::videosram_r), FUNC(wicat_state::videosram_w)); // XD2210 4-bit NOVRAM + map(0x0500, 0x0500).w(FUNC(wicat_state::videosram_recall_w)); + map(0x0600, 0x0600).w(FUNC(wicat_state::videosram_store_w)); + map(0x0800, 0x080f).rw(FUNC(wicat_state::video_ctrl_r), FUNC(wicat_state::video_ctrl_w)); + map(0x0a00, 0x0a1f).rw(FUNC(wicat_state::video_dma_r), FUNC(wicat_state::video_dma_w)); // AM9517A DMA + map(0x0b00, 0x0b03).rw(FUNC(wicat_state::video_r), FUNC(wicat_state::video_w)); // i8275 CRTC map(0x0e00, 0x0eff).ram(); map(0x4000, 0x5fff).ram().share("vram"); // video RAM? map(0x8000, 0x8fff).rom().region("g2char", 0x0000); diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp index 5eb9485668d..ecff547d02e 100644 --- a/src/mame/drivers/wico.cpp +++ b/src/mame/drivers/wico.cpp @@ -95,22 +95,22 @@ private: void wico_state::hcpu_map(address_map &map) { map(0x0000, 0x07ff).ram().share("sharedram"); - map(0x1fe0, 0x1fe0).w(this, FUNC(wico_state::muxld_w)); + map(0x1fe0, 0x1fe0).w(FUNC(wico_state::muxld_w)); //AM_RANGE(0x1fe1, 0x1fe1) AM_WRITE(store_w) - map(0x1fe2, 0x1fe2).w(this, FUNC(wico_state::muxen_w)); + map(0x1fe2, 0x1fe2).w(FUNC(wico_state::muxen_w)); //AM_RANGE(0x1fe3, 0x1fe3) AM_WRITE(csols_w) map(0x1fe4, 0x1fe4).noprw(); - map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::write)); - map(0x1fe6, 0x1fe6).w(this, FUNC(wico_state::wdogcl_w)); - map(0x1fe7, 0x1fe7).w(this, FUNC(wico_state::zcres_w)); - map(0x1fe8, 0x1fe8).w(this, FUNC(wico_state::dled0_w)); - map(0x1fe9, 0x1fe9).w(this, FUNC(wico_state::dled1_w)); - map(0x1fea, 0x1fea).r(this, FUNC(wico_state::gentmrcl_r)); - map(0x1feb, 0x1feb).r(this, FUNC(wico_state::lampst_r)); + map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::command_w)); + map(0x1fe6, 0x1fe6).w(FUNC(wico_state::wdogcl_w)); + map(0x1fe7, 0x1fe7).w(FUNC(wico_state::zcres_w)); + map(0x1fe8, 0x1fe8).w(FUNC(wico_state::dled0_w)); + map(0x1fe9, 0x1fe9).w(FUNC(wico_state::dled1_w)); + map(0x1fea, 0x1fea).r(FUNC(wico_state::gentmrcl_r)); + map(0x1feb, 0x1feb).r(FUNC(wico_state::lampst_r)); //AM_RANGE(0x1fec, 0x1fec) AM_READ(sast_r) //AM_RANGE(0x1fed, 0x1fed) AM_READ(solst1_r) //AM_RANGE(0x1fee, 0x1fee) AM_READ(solst0_r) - map(0x1fef, 0x1fef).r(this, FUNC(wico_state::switch_r)); + map(0x1fef, 0x1fef).r(FUNC(wico_state::switch_r)); map(0xf000, 0xffff).rom(); } @@ -120,15 +120,15 @@ void wico_state::ccpu_map(address_map &map) map(0x0000, 0x07ff).ram().share("sharedram"); // 2128 2k RAM //AM_RANGE(0x1fe0, 0x1fe0) AM_WRITE(muxld_w) // to display module //AM_RANGE(0x1fe1, 0x1fe1) AM_WRITE(store_w) // enable save to nvram - map(0x1fe2, 0x1fe2).w(this, FUNC(wico_state::muxen_w)); // digit to display on diagnostic LED; d0=L will disable main displays - map(0x1fe3, 0x1fe3).w(this, FUNC(wico_state::csols_w)); // solenoid column - map(0x1fe4, 0x1fe4).w(this, FUNC(wico_state::msols_w)); // solenoid row - map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::write)); - map(0x1fe6, 0x1fe6).w(this, FUNC(wico_state::wdogcl_w)); // watchdog clear - map(0x1fe7, 0x1fe7).w(this, FUNC(wico_state::zcres_w)); // enable IRQ on hcpu - map(0x1fe8, 0x1fe8).w(this, FUNC(wico_state::dled0_w)); // turn off diagnostic LED - map(0x1fe9, 0x1fe9).w(this, FUNC(wico_state::dled1_w)); // turn on diagnostic LED - map(0x1fea, 0x1fea).r(this, FUNC(wico_state::gentmrcl_r)); // enable IRQ on ccpu + map(0x1fe2, 0x1fe2).w(FUNC(wico_state::muxen_w)); // digit to display on diagnostic LED; d0=L will disable main displays + map(0x1fe3, 0x1fe3).w(FUNC(wico_state::csols_w)); // solenoid column + map(0x1fe4, 0x1fe4).w(FUNC(wico_state::msols_w)); // solenoid row + map(0x1fe5, 0x1fe5).w("sn76494", FUNC(sn76494_device::command_w)); + map(0x1fe6, 0x1fe6).w(FUNC(wico_state::wdogcl_w)); // watchdog clear + map(0x1fe7, 0x1fe7).w(FUNC(wico_state::zcres_w)); // enable IRQ on hcpu + map(0x1fe8, 0x1fe8).w(FUNC(wico_state::dled0_w)); // turn off diagnostic LED + map(0x1fe9, 0x1fe9).w(FUNC(wico_state::dled1_w)); // turn on diagnostic LED + map(0x1fea, 0x1fea).r(FUNC(wico_state::gentmrcl_r)); // enable IRQ on ccpu //AM_RANGE(0x1feb, 0x1feb) AM_READ(lampst_r) // lamps? //AM_RANGE(0x1fec, 0x1fec) AM_READ(sast_r) // a pwron pulse to d0 L->H //AM_RANGE(0x1fed, 0x1fed) AM_READ(solst1_r) // switches diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp index 54f166940b9..cde58e4636c 100644 --- a/src/mame/drivers/wildpkr.cpp +++ b/src/mame/drivers/wildpkr.cpp @@ -282,7 +282,7 @@ WRITE16_MEMBER(wildpkr_state::out1_w) WRITE8_MEMBER(wildpkr_state::dac_w) { - m_dac->write(space, 0, data); + m_dac->write(data); } WRITE16_MEMBER(wildpkr_state::clock_start_w) @@ -313,8 +313,8 @@ void wildpkr_state::wildpkr_map(address_map &map) map(0x800000, 0x800001).rw("acrtc", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w)); map(0x800002, 0x800003).rw("acrtc", FUNC(hd63484_device::data16_r), FUNC(hd63484_device::data16_w)); map(0x800080, 0x80009f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); - map(0x800180, 0x800180).r(this, FUNC(wildpkr_state::unknown_read8)); - map(0x800181, 0x800181).w(this, FUNC(wildpkr_state::unknown_write8)); + map(0x800180, 0x800180).r(FUNC(wildpkr_state::unknown_read8)); + map(0x800181, 0x800181).w(FUNC(wildpkr_state::unknown_write8)); map(0x800200, 0x800200).w("ramdac", FUNC(ramdac_device::index_w)); map(0x800202, 0x800202).w("ramdac", FUNC(ramdac_device::pal_w)); map(0x800204, 0x800204).w("ramdac", FUNC(ramdac_device::mask_w)); @@ -328,21 +328,21 @@ void wildpkr_state::tabpkr_map(address_map &map) { map(0x000000, 0x2fffff).rom(); map(0x300000, 0x303fff).ram(); - map(0x400000, 0x400fff).ram().w(this, FUNC(wildpkr_state::nvram_w)).share("nvram"); + map(0x400000, 0x400fff).ram().w(FUNC(wildpkr_state::nvram_w)).share("nvram"); map(0x500000, 0x500001).rw("acrtc", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w)); map(0x500002, 0x500003).rw("acrtc", FUNC(hd63484_device::data16_r), FUNC(hd63484_device::data16_w)); map(0x500021, 0x500021).rw("ramdac", FUNC(ramdac_device::index_r), FUNC(ramdac_device::index_w)); map(0x500023, 0x500023).rw("ramdac", FUNC(ramdac_device::pal_r), FUNC(ramdac_device::pal_w)); map(0x500025, 0x500025).rw("ramdac", FUNC(ramdac_device::mask_r), FUNC(ramdac_device::mask_w)); map(0x500040, 0x50005f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff); - map(0x500060, 0x500061).rw(this, FUNC(wildpkr_state::id_serial_r), FUNC(wildpkr_state::id_serial_w)); - map(0x600000, 0x600001).portr("IN0").w(this, FUNC(wildpkr_state::out0_w)); - map(0x600002, 0x600003).portr("IN1").w(this, FUNC(wildpkr_state::out1_w)); + map(0x500060, 0x500061).rw(FUNC(wildpkr_state::id_serial_r), FUNC(wildpkr_state::id_serial_w)); + map(0x600000, 0x600001).portr("IN0").w(FUNC(wildpkr_state::out0_w)); + map(0x600002, 0x600003).portr("IN1").w(FUNC(wildpkr_state::out1_w)); map(0x600004, 0x600005).portr("IN2"); - map(0x600004, 0x600004).w(this, FUNC(wildpkr_state::dac_w)); - map(0x700000, 0x700001).w(this, FUNC(wildpkr_state::clock_start_w)); - map(0x700002, 0x700003).w(this, FUNC(wildpkr_state::clock_rate_w)); - map(0x700004, 0x700007).w(this, FUNC(wildpkr_state::unknown_trigger_w)); + map(0x600004, 0x600004).w(FUNC(wildpkr_state::dac_w)); + map(0x700000, 0x700001).w(FUNC(wildpkr_state::clock_start_w)); + map(0x700002, 0x700003).w(FUNC(wildpkr_state::clock_rate_w)); + map(0x700004, 0x700007).w(FUNC(wildpkr_state::unknown_trigger_w)); map(0x70000a, 0x70000b).nopw(); // only writes 0 at POST } diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp index 5c985329791..1013a49d18b 100644 --- a/src/mame/drivers/williams.cpp +++ b/src/mame/drivers/williams.cpp @@ -525,7 +525,7 @@ void williams_state::defender_map(address_map &map) { map(0x0000, 0xbfff).ram().share("videoram"); map(0xc000, 0xcfff).m(m_bankc000, FUNC(address_map_bank_device::amap8)); - map(0xd000, 0xdfff).w(this, FUNC(williams_state::defender_bank_select_w)); + map(0xd000, 0xdfff).w(FUNC(williams_state::defender_bank_select_w)); map(0xd000, 0xffff).rom(); } @@ -533,10 +533,10 @@ void williams_state::defender_map(address_map &map) void williams_state::defender_bankc000_map(address_map &map) { map(0x0000, 0x000f).mirror(0x03e0).writeonly().share("paletteram"); - map(0x03ff, 0x03ff).w(this, FUNC(williams_state::williams_watchdog_reset_w)); - map(0x0010, 0x001f).mirror(0x03e0).w(this, FUNC(williams_state::defender_video_control_w)); - map(0x0400, 0x04ff).mirror(0x0300).ram().w(this, FUNC(williams_state::williams_cmos_w)).share("nvram"); - map(0x0800, 0x0bff).r(this, FUNC(williams_state::williams_video_counter_r)); + map(0x03ff, 0x03ff).w(FUNC(williams_state::williams_watchdog_reset_w)); + map(0x0010, 0x001f).mirror(0x03e0).w(FUNC(williams_state::defender_video_control_w)); + map(0x0400, 0x04ff).mirror(0x0300).ram().w(FUNC(williams_state::williams_cmos_w)).share("nvram"); + map(0x0800, 0x0bff).r(FUNC(williams_state::williams_video_counter_r)); map(0x0c00, 0x0c03).mirror(0x03e0).rw(m_pia_1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x0c04, 0x0c07).mirror(0x03e0).rw(m_pia_0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x1000, 0x9fff).rom().region("maincpu", 0x10000); @@ -558,11 +558,11 @@ void williams_state::williams_map(address_map &map) map(0xc000, 0xc00f).mirror(0x03f0).writeonly().share("paletteram"); map(0xc804, 0xc807).mirror(0x00f0).rw(m_pia_0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xc80c, 0xc80f).mirror(0x00f0).rw(m_pia_1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0xc900, 0xc9ff).w(this, FUNC(williams_state::williams_vram_select_w)); - map(0xca00, 0xca07).mirror(0x00f8).w(this, FUNC(williams_state::williams_blitter_w)); - map(0xcb00, 0xcbff).r(this, FUNC(williams_state::williams_video_counter_r)); - map(0xcbff, 0xcbff).w(this, FUNC(williams_state::williams_watchdog_reset_w)); - map(0xcc00, 0xcfff).ram().w(this, FUNC(williams_state::williams_cmos_w)).share("nvram"); + map(0xc900, 0xc9ff).w(FUNC(williams_state::williams_vram_select_w)); + map(0xca00, 0xca07).mirror(0x00f8).w(FUNC(williams_state::williams_blitter_w)); + map(0xcb00, 0xcbff).r(FUNC(williams_state::williams_video_counter_r)); + map(0xcbff, 0xcbff).w(FUNC(williams_state::williams_watchdog_reset_w)); + map(0xcc00, 0xcfff).ram().w(FUNC(williams_state::williams_cmos_w)).share("nvram"); map(0xd000, 0xffff).rom(); } @@ -581,11 +581,11 @@ void williams_state::sinistar_map(address_map &map) map(0xc000, 0xc00f).mirror(0x03f0).writeonly().share("paletteram"); map(0xc804, 0xc807).mirror(0x00f0).rw(m_pia_0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xc80c, 0xc80f).mirror(0x00f0).rw(m_pia_1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0xc900, 0xc9ff).w(this, FUNC(williams_state::sinistar_vram_select_w)); - map(0xca00, 0xca07).mirror(0x00f8).w(this, FUNC(williams_state::williams_blitter_w)); - map(0xcb00, 0xcbff).r(this, FUNC(williams_state::williams_video_counter_r)); - map(0xcbff, 0xcbff).w(this, FUNC(williams_state::williams_watchdog_reset_w)); - map(0xcc00, 0xcfff).ram().w(this, FUNC(williams_state::williams_cmos_w)).share("nvram"); + map(0xc900, 0xc9ff).w(FUNC(williams_state::sinistar_vram_select_w)); + map(0xca00, 0xca07).mirror(0x00f8).w(FUNC(williams_state::williams_blitter_w)); + map(0xcb00, 0xcbff).r(FUNC(williams_state::williams_video_counter_r)); + map(0xcbff, 0xcbff).w(FUNC(williams_state::williams_watchdog_reset_w)); + map(0xcc00, 0xcfff).ram().w(FUNC(williams_state::williams_cmos_w)).share("nvram"); map(0xd000, 0xdfff).ram(); map(0xe000, 0xffff).rom(); } @@ -609,14 +609,14 @@ void blaster_state::blaster_map(address_map &map) map(0xc000, 0xc00f).mirror(0x03f0).writeonly().share("paletteram"); map(0xc804, 0xc807).mirror(0x00f0).rw(m_pia_0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xc80c, 0xc80f).mirror(0x00f0).rw(m_pia_1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0xc900, 0xc93f).w(this, FUNC(blaster_state::blaster_vram_select_w)); - map(0xc940, 0xc97f).w(this, FUNC(blaster_state::blaster_remap_select_w)); - map(0xc980, 0xc9bf).w(this, FUNC(blaster_state::blaster_bank_select_w)); - map(0xc9c0, 0xc9ff).w(this, FUNC(blaster_state::blaster_video_control_w)); - map(0xca00, 0xca07).mirror(0x00f8).w(this, FUNC(blaster_state::williams_blitter_w)); - map(0xcb00, 0xcbff).r(this, FUNC(blaster_state::williams_video_counter_r)); - map(0xcbff, 0xcbff).w(this, FUNC(blaster_state::williams_watchdog_reset_w)); - map(0xcc00, 0xcfff).ram().w(this, FUNC(blaster_state::williams_cmos_w)).share("nvram"); + map(0xc900, 0xc93f).w(FUNC(blaster_state::blaster_vram_select_w)); + map(0xc940, 0xc97f).w(FUNC(blaster_state::blaster_remap_select_w)); + map(0xc980, 0xc9bf).w(FUNC(blaster_state::blaster_bank_select_w)); + map(0xc9c0, 0xc9ff).w(FUNC(blaster_state::blaster_video_control_w)); + map(0xca00, 0xca07).mirror(0x00f8).w(FUNC(blaster_state::williams_blitter_w)); + map(0xcb00, 0xcbff).r(FUNC(blaster_state::williams_video_counter_r)); + map(0xcbff, 0xcbff).w(FUNC(blaster_state::williams_watchdog_reset_w)); + map(0xcc00, 0xcfff).ram().w(FUNC(blaster_state::williams_cmos_w)).share("nvram"); map(0xd000, 0xffff).rom(); } @@ -633,27 +633,27 @@ void williams2_state::williams2_common_map(address_map &map) map(0x0000, 0xbfff).ram().share("videoram"); map(0x0000, 0x7fff).bankr("bank1"); map(0x8000, 0x87ff).m(m_bank8000, FUNC(address_map_bank_device::amap8)); - map(0xc000, 0xc7ff).ram().w(this, FUNC(williams2_state::williams2_tileram_w)).share("williams2_tile"); - map(0xc800, 0xc87f).w(this, FUNC(williams2_state::williams2_bank_select_w)); - map(0xc880, 0xc887).mirror(0x0078).w(this, FUNC(williams2_state::williams_blitter_w)); - map(0xc900, 0xc97f).w(this, FUNC(williams2_state::williams2_watchdog_reset_w)); + map(0xc000, 0xc7ff).ram().w(FUNC(williams2_state::williams2_tileram_w)).share("williams2_tile"); + map(0xc800, 0xc87f).w(FUNC(williams2_state::williams2_bank_select_w)); + map(0xc880, 0xc887).mirror(0x0078).w(FUNC(williams2_state::williams_blitter_w)); + map(0xc900, 0xc97f).w(FUNC(williams2_state::williams2_watchdog_reset_w)); map(0xc980, 0xc983).mirror(0x0070).rw(m_pia_1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xc984, 0xc987).mirror(0x0070).rw(m_pia_0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0xc98c, 0xc98f).mirror(0x0070).w(this, FUNC(williams2_state::williams2_7segment_w)); - map(0xcb00, 0xcb1f).w(this, FUNC(williams2_state::williams2_fg_select_w)); - map(0xcb20, 0xcb3f).w(this, FUNC(williams2_state::williams2_bg_select_w)); - map(0xcb40, 0xcb5f).w(this, FUNC(williams2_state::williams2_xscroll_low_w)); - map(0xcb60, 0xcb7f).w(this, FUNC(williams2_state::williams2_xscroll_high_w)); - map(0xcb80, 0xcb9f).w(this, FUNC(williams2_state::defender_video_control_w)); - map(0xcba0, 0xcbbf).w(this, FUNC(williams2_state::williams2_blit_window_enable_w)); - map(0xcbe0, 0xcbef).r(this, FUNC(williams2_state::williams_video_counter_r)); - map(0xcc00, 0xcfff).ram().w(this, FUNC(williams2_state::williams_cmos_w)).share("nvram"); + map(0xc98c, 0xc98f).mirror(0x0070).w(FUNC(williams2_state::williams2_7segment_w)); + map(0xcb00, 0xcb1f).w(FUNC(williams2_state::williams2_fg_select_w)); + map(0xcb20, 0xcb3f).w(FUNC(williams2_state::williams2_bg_select_w)); + map(0xcb40, 0xcb5f).w(FUNC(williams2_state::williams2_xscroll_low_w)); + map(0xcb60, 0xcb7f).w(FUNC(williams2_state::williams2_xscroll_high_w)); + map(0xcb80, 0xcb9f).w(FUNC(williams2_state::defender_video_control_w)); + map(0xcba0, 0xcbbf).w(FUNC(williams2_state::williams2_blit_window_enable_w)); + map(0xcbe0, 0xcbef).r(FUNC(williams2_state::williams_video_counter_r)); + map(0xcc00, 0xcfff).ram().w(FUNC(williams2_state::williams_cmos_w)).share("nvram"); } void williams2_state::williams2_bank8000_map(address_map &map) { map(0x0000, 0x07ff).bankrw("vram8000"); - map(0x0800, 0x0fff).ram().w(this, FUNC(williams2_state::williams2_paletteram_w)).share("paletteram"); + map(0x0800, 0x0fff).ram().w(FUNC(williams2_state::williams2_paletteram_w)).share("paletteram"); } @@ -1508,7 +1508,7 @@ MACHINE_CONFIG_START(williams_state::williams) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state, williams_main_irq)) MCFG_DEVICE_ADD("pia_2", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) MACHINE_CONFIG_END @@ -1696,10 +1696,10 @@ MACHINE_CONFIG_START(blaster_state::blaster) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, blaster_state, blaster_snd_cmd_w)) MCFG_DEVICE_MODIFY("pia_2") - MCFG_PIA_WRITEPA_HANDLER(WRITE8("ldac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("ldac", dac_byte_interface, data_w)) MCFG_DEVICE_ADD("pia_2b", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("rdac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("rdac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, blaster_state,williams_snd_irq_b)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, blaster_state,williams_snd_irq_b)) @@ -1777,7 +1777,7 @@ MACHINE_CONFIG_START(williams2_state::williams2) MCFG_DEVICE_ADD("pia_2", PIA6821, 0) MCFG_PIA_WRITEPA_HANDLER(WRITE8("pia_1", pia6821_device, portb_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_CA2_HANDLER(WRITELINE("pia_1", pia6821_device, cb1_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index 0952d07e566..41a5b7d044d 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -161,7 +161,7 @@ void wink_state::wink_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0x9000, 0x97ff).ram().share("nvram"); - map(0xa000, 0xa3ff).ram().w(this, FUNC(wink_state::bgram_w)).share("videoram"); + map(0xa000, 0xa3ff).ram().w(FUNC(wink_state::bgram_w)).share("videoram"); } @@ -196,17 +196,17 @@ void wink_state::wink_io(address_map &map) map(0x00, 0x1f).ram().w("palette", FUNC(palette_device::write8)).share("palette"); //0x10-0x1f is likely to be something else map(0x20, 0x27).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x40, 0x40).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0x60, 0x60).w(this, FUNC(wink_state::sound_irq_w)); - map(0x80, 0x80).r(this, FUNC(wink_state::analog_port_r)); - map(0xa0, 0xa0).r(this, FUNC(wink_state::player_inputs_r)); + map(0x60, 0x60).w(FUNC(wink_state::sound_irq_w)); + map(0x80, 0x80).r(FUNC(wink_state::analog_port_r)); + map(0xa0, 0xa0).r(FUNC(wink_state::player_inputs_r)); map(0xa4, 0xa4).portr("DSW1"); //dipswitch bank2 map(0xa8, 0xa8).portr("DSW2"); //dipswitch bank1 // AM_RANGE(0xac, 0xac) AM_WRITENOP //protection - loads video xor unit (written only once at startup) map(0xb0, 0xb0).portr("DSW3"); //unused inputs map(0xb4, 0xb4).portr("DSW4"); //dipswitch bank3 - map(0xc0, 0xdf).w(this, FUNC(wink_state::prot_w)); //load load protection-buffer from upper address bus + map(0xc0, 0xdf).w(FUNC(wink_state::prot_w)); //load load protection-buffer from upper address bus map(0xc3, 0xc3).nopr(); //watchdog? - map(0xe0, 0xff).r(this, FUNC(wink_state::prot_r)); //load math unit from buffer & lower address-bus + map(0xe0, 0xff).r(FUNC(wink_state::prot_r)); //load math unit from buffer & lower address-bus } void wink_state::wink_sound_map(address_map &map) diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp index a66155545fc..63bfd7ae992 100644 --- a/src/mame/drivers/wiping.cpp +++ b/src/mame/drivers/wiping.cpp @@ -88,7 +88,7 @@ void wiping_state::main_map(address_map &map) map(0x9000, 0x93ff).ram().share("share1"); map(0x9800, 0x9bff).ram().share("share2"); map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0xa800, 0xa807).r(this, FUNC(wiping_state::ports_r)); + map(0xa800, 0xa807).r(FUNC(wiping_state::ports_r)); map(0xb000, 0xb7ff).ram(); map(0xb800, 0xb800).w("watchdog", FUNC(watchdog_timer_device::reset_w)); } diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index ba09586058a..bae056c0fd6 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -574,10 +574,10 @@ void witch_state::common_map(address_map &map) map(0xa004, 0xa007).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xa00c, 0xa00c).portr("SERVICE"); // stats / reset map(0xa00e, 0xa00e).portr("COINS"); // coins/attendant keys - map(0xc000, 0xc3ff).ram().w(this, FUNC(witch_state::gfx0_vram_w)).share("gfx0_vram"); - map(0xc400, 0xc7ff).ram().w(this, FUNC(witch_state::gfx0_cram_w)).share("gfx0_cram"); - map(0xc800, 0xcbff).rw(this, FUNC(witch_state::gfx1_vram_r), FUNC(witch_state::gfx1_vram_w)).share("gfx1_vram"); - map(0xcc00, 0xcfff).rw(this, FUNC(witch_state::gfx1_cram_r), FUNC(witch_state::gfx1_cram_w)).share("gfx1_cram"); + map(0xc000, 0xc3ff).ram().w(FUNC(witch_state::gfx0_vram_w)).share("gfx0_vram"); + map(0xc400, 0xc7ff).ram().w(FUNC(witch_state::gfx0_cram_w)).share("gfx0_cram"); + map(0xc800, 0xcbff).rw(FUNC(witch_state::gfx1_vram_r), FUNC(witch_state::gfx1_vram_w)).share("gfx1_vram"); + map(0xcc00, 0xcfff).rw(FUNC(witch_state::gfx1_cram_r), FUNC(witch_state::gfx1_cram_w)).share("gfx1_cram"); } /************************************ @@ -605,7 +605,7 @@ void witch_state::witch_main_map(address_map &map) witch_common_map(map); map(0x0000, UNBANKED_SIZE-1).rom(); map(UNBANKED_SIZE, 0x7fff).bankr("mainbank"); - map(0xa008, 0xa008).w(this, FUNC(witch_state::main_write_a008)); + map(0xa008, 0xa008).w(FUNC(witch_state::main_write_a008)); } @@ -613,7 +613,7 @@ void witch_state::witch_sub_map(address_map &map) { witch_common_map(map); map(0x0000, 0x7fff).rom(); - map(0xa008, 0xa008).w(this, FUNC(witch_state::sub_write_a008)); + map(0xa008, 0xa008).w(FUNC(witch_state::sub_write_a008)); } /************************************ @@ -628,7 +628,7 @@ void keirinou_state::keirinou_common_map(address_map &map) map(0x8000, 0x8001).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0x8002, 0x8003).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); map(0xd000, 0xd7ff).ram().share("sprite_ram"); - map(0xd800, 0xd9ff).ram().w(this, FUNC(keirinou_state::palette_w)).share("paletteram"); + map(0xd800, 0xd9ff).ram().w(FUNC(keirinou_state::palette_w)).share("paletteram"); map(0xe000, 0xe7ff).ram(); map(0xe800, 0xefff).ram().share("nvram"); // shared with sub } @@ -637,14 +637,14 @@ void keirinou_state::keirinou_main_map(address_map &map) { keirinou_common_map(map); map(0x0000, 0x7fff).rom(); - map(0xa008, 0xa008).w(this, FUNC(witch_state::main_write_a008)); + map(0xa008, 0xa008).w(FUNC(witch_state::main_write_a008)); } void keirinou_state::keirinou_sub_map(address_map &map) { keirinou_common_map(map); map(0x0000, 0x7fff).rom(); - map(0xa008, 0xa008).w(this, FUNC(witch_state::sub_write_a008)); + map(0xa008, 0xa008).w(FUNC(witch_state::sub_write_a008)); } static INPUT_PORTS_START( witch ) diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp index cdea7eb121a..dbcb1e54a59 100644 --- a/src/mame/drivers/wiz.cpp +++ b/src/mame/drivers/wiz.cpp @@ -322,16 +322,16 @@ void wiz_state::kungfut_main_map(address_map &map) map(0xe800, 0xe83f).ram().share("attrram"); map(0xe840, 0xe85f).ram().share("spriteram"); map(0xf000, 0xf000).portr("DSW0"); - map(0xf001, 0xf001).w(this, FUNC(wiz_state::wiz_main_nmi_mask_w)); - map(0xf002, 0xf003).w(this, FUNC(wiz_state::wiz_palette_bank_w)); - map(0xf004, 0xf005).w(this, FUNC(wiz_state::wiz_char_bank_w)); - map(0xf006, 0xf006).w(this, FUNC(wiz_state::wiz_flipx_w)); - map(0xf007, 0xf007).w(this, FUNC(wiz_state::wiz_flipy_w)); + map(0xf001, 0xf001).w(FUNC(wiz_state::wiz_main_nmi_mask_w)); + map(0xf002, 0xf003).w(FUNC(wiz_state::wiz_palette_bank_w)); + map(0xf004, 0xf005).w(FUNC(wiz_state::wiz_char_bank_w)); + map(0xf006, 0xf006).w(FUNC(wiz_state::wiz_flipx_w)); + map(0xf007, 0xf007).w(FUNC(wiz_state::wiz_flipy_w)); map(0xf008, 0xf008).portr("DSW1"); map(0xf010, 0xf010).portr("IN0"); map(0xf018, 0xf018).portr("IN1"); map(0xf800, 0xf800).w("soundlatch", FUNC(generic_latch_8_device::write)); - map(0xf818, 0xf818).w(this, FUNC(wiz_state::wiz_bgcolor_w)); + map(0xf818, 0xf818).w(FUNC(wiz_state::wiz_bgcolor_w)); } void wiz_state::decrypted_opcodes_map(address_map &map) @@ -342,9 +342,9 @@ void wiz_state::decrypted_opcodes_map(address_map &map) void wiz_state::wiz_main_map(address_map &map) { kungfut_main_map(map); - map(0xc800, 0xc801).w(this, FUNC(wiz_state::wiz_coin_counter_w)); - map(0xd400, 0xd400).r(this, FUNC(wiz_state::wiz_protection_r)); - map(0xf000, 0xf000).w(this, FUNC(wiz_state::wiz_sprite_bank_w)); + map(0xc800, 0xc801).w(FUNC(wiz_state::wiz_coin_counter_w)); + map(0xd400, 0xd400).r(FUNC(wiz_state::wiz_protection_r)); + map(0xf000, 0xf000).w(FUNC(wiz_state::wiz_sprite_bank_w)); } void wiz_state::stinger_main_map(address_map &map) @@ -352,8 +352,8 @@ void wiz_state::stinger_main_map(address_map &map) kungfut_main_map(map); // AM_RANGE(0xf008, 0xf00f) AM_WRITENOP // ? map(0xf800, 0xf800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); - map(0xf808, 0xf808).w(this, FUNC(wiz_state::stinger_explosion_w)); - map(0xf80a, 0xf80a).w(this, FUNC(wiz_state::stinger_shot_w)); + map(0xf808, 0xf808).w(FUNC(wiz_state::stinger_explosion_w)); + map(0xf80a, 0xf80a).w(FUNC(wiz_state::stinger_shot_w)); } @@ -373,7 +373,7 @@ void wiz_state::kungfut_sound_map(address_map &map) map(0x4000, 0x4001).w("8910.3", FUNC(ay8910_device::address_data_w)); map(0x5000, 0x5001).w("8910.1", FUNC(ay8910_device::address_data_w)); map(0x6000, 0x6001).w("8910.2", FUNC(ay8910_device::address_data_w)); - map(0x7000, 0x7000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(this, FUNC(wiz_state::wiz_sound_nmi_mask_w)); + map(0x7000, 0x7000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(FUNC(wiz_state::wiz_sound_nmi_mask_w)); } void wiz_state::stinger_sound_map(address_map &map) @@ -381,7 +381,7 @@ void wiz_state::stinger_sound_map(address_map &map) map.global_mask(0x7fff); map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x3000, 0x3000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(this, FUNC(wiz_state::wiz_sound_nmi_mask_w)); + map(0x3000, 0x3000).r("soundlatch", FUNC(generic_latch_8_device::read)).w(FUNC(wiz_state::wiz_sound_nmi_mask_w)); map(0x4000, 0x4000).nopw(); // ? map(0x5000, 0x5001).w("8910.1", FUNC(ay8910_device::address_data_w)); map(0x6000, 0x6001).w("8910.2", FUNC(ay8910_device::address_data_w)); diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp index 034c80ea155..46e19d27ed3 100644 --- a/src/mame/drivers/wmg.cpp +++ b/src/mame/drivers/wmg.cpp @@ -128,7 +128,7 @@ void wmg_state::wmg_cpu1(address_map &map) map(0x9000, 0xbfff).ram(); map(0xc000, 0xcfff).bankr("bank7"); map(0xd000, 0xffff).bankr("bank5"); - map(0xd000, 0xd000).w(this, FUNC(wmg_state::wmg_d000_w)); + map(0xd000, 0xd000).w(FUNC(wmg_state::wmg_d000_w)); } void wmg_state::wmg_cpu2(address_map &map) @@ -538,7 +538,7 @@ MACHINE_CONFIG_START(wmg_state::wmg) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state, williams_main_irq)) MCFG_DEVICE_ADD("pia_2", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp index d922e7a765d..d09d0075d41 100644 --- a/src/mame/drivers/wms.cpp +++ b/src/mame/drivers/wms.cpp @@ -136,7 +136,7 @@ READ8_MEMBER(wms_state::test_r) void wms_state::wms_io(address_map &map) { - map(0x1207, 0x1207).r(this, FUNC(wms_state::test_r)); + map(0x1207, 0x1207).r(FUNC(wms_state::test_r)); } diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index 98ba5d0d435..fc12eb1f081 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -133,35 +133,35 @@ void wolfpack_state::main_map(address_map &map) map(0x0000, 0x00ff).ram().mirror(0x100); map(0x1000, 0x1000).portr("INPUTS"); map(0x1000, 0x10ff).writeonly().share("alpha_num_ram"); - map(0x2000, 0x2000).r(this, FUNC(wolfpack_state::misc_r)); - map(0x2000, 0x2000).w(this, FUNC(wolfpack_state::high_explo_w)); - map(0x2001, 0x2001).w(this, FUNC(wolfpack_state::sonar_ping_w)); - map(0x2002, 0x2002).w(this, FUNC(wolfpack_state::sirlat_w)); - map(0x2003, 0x2003).w(this, FUNC(wolfpack_state::pt_sound_w)); - map(0x2004, 0x2004).w(this, FUNC(wolfpack_state::start_speech_w)); - map(0x2005, 0x2005).w(this, FUNC(wolfpack_state::launch_torpedo_w)); - map(0x2006, 0x2006).w(this, FUNC(wolfpack_state::low_explo_w)); - map(0x2007, 0x2007).w(this, FUNC(wolfpack_state::screw_cont_w)); - map(0x2008, 0x2008).w(this, FUNC(wolfpack_state::video_invert_w)); - map(0x2009, 0x2009).w(this, FUNC(wolfpack_state::ship_reflect_w)); - map(0x200a, 0x200a).w(this, FUNC(wolfpack_state::lamp_flash_w)); - map(0x200c, 0x200c).w(this, FUNC(wolfpack_state::credit_w)); - map(0x200d, 0x200d).w(this, FUNC(wolfpack_state::attract_w)); - map(0x200e, 0x200e).w(this, FUNC(wolfpack_state::pt_pos_select_w)); - map(0x200f, 0x200f).w(this, FUNC(wolfpack_state::warning_light_w)); + map(0x2000, 0x2000).r(FUNC(wolfpack_state::misc_r)); + map(0x2000, 0x2000).w(FUNC(wolfpack_state::high_explo_w)); + map(0x2001, 0x2001).w(FUNC(wolfpack_state::sonar_ping_w)); + map(0x2002, 0x2002).w(FUNC(wolfpack_state::sirlat_w)); + map(0x2003, 0x2003).w(FUNC(wolfpack_state::pt_sound_w)); + map(0x2004, 0x2004).w(FUNC(wolfpack_state::start_speech_w)); + map(0x2005, 0x2005).w(FUNC(wolfpack_state::launch_torpedo_w)); + map(0x2006, 0x2006).w(FUNC(wolfpack_state::low_explo_w)); + map(0x2007, 0x2007).w(FUNC(wolfpack_state::screw_cont_w)); + map(0x2008, 0x2008).w(FUNC(wolfpack_state::video_invert_w)); + map(0x2009, 0x2009).w(FUNC(wolfpack_state::ship_reflect_w)); + map(0x200a, 0x200a).w(FUNC(wolfpack_state::lamp_flash_w)); + map(0x200c, 0x200c).w(FUNC(wolfpack_state::credit_w)); + map(0x200d, 0x200d).w(FUNC(wolfpack_state::attract_w)); + map(0x200e, 0x200e).w(FUNC(wolfpack_state::pt_pos_select_w)); + map(0x200f, 0x200f).w(FUNC(wolfpack_state::warning_light_w)); map(0x3000, 0x3000).portr("DSW"); - map(0x3000, 0x3000).w(this, FUNC(wolfpack_state::audamp_w)); - map(0x3001, 0x3001).w(this, FUNC(wolfpack_state::pt_horz_w)); - map(0x3003, 0x3003).w(this, FUNC(wolfpack_state::pt_pic_w)); - map(0x3004, 0x3004).w(this, FUNC(wolfpack_state::word_w)); - map(0x3007, 0x3007).w(this, FUNC(wolfpack_state::coldetres_w)); - map(0x4000, 0x4000).w(this, FUNC(wolfpack_state::ship_h_w)); - map(0x4001, 0x4001).w(this, FUNC(wolfpack_state::torpedo_pic_w)); - map(0x4002, 0x4002).w(this, FUNC(wolfpack_state::ship_size_w)); - map(0x4003, 0x4003).w(this, FUNC(wolfpack_state::ship_h_precess_w)); - map(0x4004, 0x4004).w(this, FUNC(wolfpack_state::ship_pic_w)); - map(0x4005, 0x4005).w(this, FUNC(wolfpack_state::torpedo_h_w)); - map(0x4006, 0x4006).w(this, FUNC(wolfpack_state::torpedo_v_w)); + map(0x3000, 0x3000).w(FUNC(wolfpack_state::audamp_w)); + map(0x3001, 0x3001).w(FUNC(wolfpack_state::pt_horz_w)); + map(0x3003, 0x3003).w(FUNC(wolfpack_state::pt_pic_w)); + map(0x3004, 0x3004).w(FUNC(wolfpack_state::word_w)); + map(0x3007, 0x3007).w(FUNC(wolfpack_state::coldetres_w)); + map(0x4000, 0x4000).w(FUNC(wolfpack_state::ship_h_w)); + map(0x4001, 0x4001).w(FUNC(wolfpack_state::torpedo_pic_w)); + map(0x4002, 0x4002).w(FUNC(wolfpack_state::ship_size_w)); + map(0x4003, 0x4003).w(FUNC(wolfpack_state::ship_h_precess_w)); + map(0x4004, 0x4004).w(FUNC(wolfpack_state::ship_pic_w)); + map(0x4005, 0x4005).w(FUNC(wolfpack_state::torpedo_h_w)); + map(0x4006, 0x4006).w(FUNC(wolfpack_state::torpedo_v_w)); map(0x5000, 0x5fff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x7000, 0x7fff).rom(); map(0x9000, 0x9000).nopr(); /* debugger ROM location? */ diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp index 0db2b20213b..559533fef95 100644 --- a/src/mame/drivers/wpc_95.cpp +++ b/src/mame/drivers/wpc_95.cpp @@ -132,8 +132,8 @@ void wpc_95_state::wpc_95_map(address_map &map) map(0x3fb8, 0x3fbf).m("dmd", FUNC(wpc_dmd_device::registers)); - map(0x3fdc, 0x3fdc).rw(this, FUNC(wpc_95_state::dcs_data_r), FUNC(wpc_95_state::dcs_data_w)); - map(0x3fdd, 0x3fdd).rw(this, FUNC(wpc_95_state::dcs_ctrl_r), FUNC(wpc_95_state::dcs_reset_w)); + map(0x3fdc, 0x3fdc).rw(FUNC(wpc_95_state::dcs_data_r), FUNC(wpc_95_state::dcs_data_w)); + map(0x3fdd, 0x3fdd).rw(FUNC(wpc_95_state::dcs_ctrl_r), FUNC(wpc_95_state::dcs_reset_w)); map(0x3fe0, 0x3fe3).w(out, FUNC(wpc_out_device::out_w)); map(0x3fe4, 0x3fe4).nopr().w(lamp, FUNC(wpc_lamp_device::row_w)); @@ -148,13 +148,13 @@ void wpc_95_state::wpc_95_map(address_map &map) map(0x3fef, 0x3fef).portr("FLIPPERS"); map(0x3ff2, 0x3ff2).w(out, FUNC(wpc_out_device::led_w)); - map(0x3ff3, 0x3ff3).nopr().w(this, FUNC(wpc_95_state::irq_ack_w)); + map(0x3ff3, 0x3ff3).nopr().w(FUNC(wpc_95_state::irq_ack_w)); map(0x3ff4, 0x3ff7).m("shift", FUNC(wpc_shift_device::registers)); - map(0x3ff8, 0x3ff8).r(this, FUNC(wpc_95_state::firq_src_r)).nopw(); // ack? - map(0x3ffa, 0x3ffb).r(this, FUNC(wpc_95_state::rtc_r)); - map(0x3ffc, 0x3ffc).w(this, FUNC(wpc_95_state::bank_w)); + map(0x3ff8, 0x3ff8).r(FUNC(wpc_95_state::firq_src_r)).nopw(); // ack? + map(0x3ffa, 0x3ffb).r(FUNC(wpc_95_state::rtc_r)); + map(0x3ffc, 0x3ffc).w(FUNC(wpc_95_state::bank_w)); map(0x3ffd, 0x3ffe).noprw(); // memory protection stuff? - map(0x3fff, 0x3fff).rw(this, FUNC(wpc_95_state::zc_r), FUNC(wpc_95_state::watchdog_w)); + map(0x3fff, 0x3fff).rw(FUNC(wpc_95_state::zc_r), FUNC(wpc_95_state::watchdog_w)); map(0x4000, 0x7fff).bankr("rombank"); map(0x8000, 0xffff).rom().region("maincpu", 0xf8000); } diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index 73cd8e4fd77..8386c1b4ad3 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -76,7 +76,7 @@ private: void wpc_an_state::wpc_an_map(address_map &map) { - map(0x0000, 0x2fff).rw(this, FUNC(wpc_an_state::ram_r), FUNC(wpc_an_state::ram_w)); + map(0x0000, 0x2fff).rw(FUNC(wpc_an_state::ram_r), FUNC(wpc_an_state::ram_w)); map(0x3000, 0x3faf).ram(); map(0x3fb0, 0x3fff).rw(m_wpc, FUNC(wpc_device::read), FUNC(wpc_device::write)); // WPC device map(0x4000, 0x7fff).bankr("cpubank"); diff --git a/src/mame/drivers/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp index 2fe9dad95e5..f43c9b0eb15 100644 --- a/src/mame/drivers/wpc_dcs.cpp +++ b/src/mame/drivers/wpc_dcs.cpp @@ -88,8 +88,8 @@ void wpc_dcs_state::wpc_dcs_map(address_map &map) map(0x3fd4, 0x3fd4).portr("FLIPPERS").w(out, FUNC(wpc_out_device::out4_w)); - map(0x3fdc, 0x3fdc).rw(this, FUNC(wpc_dcs_state::dcs_data_r), FUNC(wpc_dcs_state::dcs_data_w)); - map(0x3fdd, 0x3fdd).rw(this, FUNC(wpc_dcs_state::dcs_ctrl_r), FUNC(wpc_dcs_state::dcs_reset_w)); + map(0x3fdc, 0x3fdc).rw(FUNC(wpc_dcs_state::dcs_data_r), FUNC(wpc_dcs_state::dcs_data_w)); + map(0x3fdd, 0x3fdd).rw(FUNC(wpc_dcs_state::dcs_ctrl_r), FUNC(wpc_dcs_state::dcs_reset_w)); map(0x3fe0, 0x3fe3).w(out, FUNC(wpc_out_device::out_w)); map(0x3fe4, 0x3fe4).nopr().w(lamp, FUNC(wpc_lamp_device::row_w)); @@ -97,17 +97,17 @@ void wpc_dcs_state::wpc_dcs_map(address_map &map) map(0x3fe6, 0x3fe6).w(out, FUNC(wpc_out_device::gi_w)); map(0x3fe7, 0x3fe7).portr("DSW"); map(0x3fe8, 0x3fe8).portr("DOOR"); - map(0x3fe9, 0x3fe9).r(this, FUNC(wpc_dcs_state::switches_r)); - map(0x3fea, 0x3fea).w(this, FUNC(wpc_dcs_state::switches_w)); + map(0x3fe9, 0x3fe9).r(FUNC(wpc_dcs_state::switches_r)); + map(0x3fea, 0x3fea).w(FUNC(wpc_dcs_state::switches_w)); map(0x3ff2, 0x3ff2).w(out, FUNC(wpc_out_device::led_w)); - map(0x3ff3, 0x3ff3).nopr().w(this, FUNC(wpc_dcs_state::irq_ack_w)); + map(0x3ff3, 0x3ff3).nopr().w(FUNC(wpc_dcs_state::irq_ack_w)); map(0x3ff4, 0x3ff7).m("shift", FUNC(wpc_shift_device::registers)); - map(0x3ff8, 0x3ff8).r(this, FUNC(wpc_dcs_state::firq_src_r)).nopw(); // ack? - map(0x3ffa, 0x3ffb).r(this, FUNC(wpc_dcs_state::rtc_r)); - map(0x3ffc, 0x3ffc).w(this, FUNC(wpc_dcs_state::bank_w)); + map(0x3ff8, 0x3ff8).r(FUNC(wpc_dcs_state::firq_src_r)).nopw(); // ack? + map(0x3ffa, 0x3ffb).r(FUNC(wpc_dcs_state::rtc_r)); + map(0x3ffc, 0x3ffc).w(FUNC(wpc_dcs_state::bank_w)); map(0x3ffd, 0x3ffe).noprw(); // memory protection stuff? - map(0x3fff, 0x3fff).rw(this, FUNC(wpc_dcs_state::zc_r), FUNC(wpc_dcs_state::watchdog_w)); + map(0x3fff, 0x3fff).rw(FUNC(wpc_dcs_state::zc_r), FUNC(wpc_dcs_state::watchdog_w)); map(0x4000, 0x7fff).bankr("rombank"); map(0x8000, 0xffff).rom().region("maincpu", 0x78000); } diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp index 2636d64bea8..a2833b5c4e7 100644 --- a/src/mame/drivers/wpc_dot.cpp +++ b/src/mame/drivers/wpc_dot.cpp @@ -11,7 +11,7 @@ void wpc_dot_state::wpc_dot_map(address_map &map) { - map(0x0000, 0x2fff).rw(this, FUNC(wpc_dot_state::ram_r), FUNC(wpc_dot_state::ram_w)); + map(0x0000, 0x2fff).rw(FUNC(wpc_dot_state::ram_r), FUNC(wpc_dot_state::ram_w)); map(0x3000, 0x31ff).bankrw("dmdbank1"); map(0x3200, 0x33ff).bankrw("dmdbank2"); map(0x3400, 0x35ff).bankrw("dmdbank3"); diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp index 1a9b8f4a812..aa2e2c86ac1 100644 --- a/src/mame/drivers/wpc_flip1.cpp +++ b/src/mame/drivers/wpc_flip1.cpp @@ -11,7 +11,7 @@ void wpc_flip1_state::wpc_flip1_map(address_map &map) { - map(0x0000, 0x2fff).rw(this, FUNC(wpc_flip1_state::ram_r), FUNC(wpc_flip1_state::ram_w)); + map(0x0000, 0x2fff).rw(FUNC(wpc_flip1_state::ram_r), FUNC(wpc_flip1_state::ram_w)); map(0x3000, 0x31ff).bankrw("dmdbank1"); map(0x3200, 0x33ff).bankrw("dmdbank2"); map(0x3400, 0x35ff).bankrw("dmdbank3"); diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp index c1fe1aacb56..d6ac9a7dbf0 100644 --- a/src/mame/drivers/wpc_flip2.cpp +++ b/src/mame/drivers/wpc_flip2.cpp @@ -11,7 +11,7 @@ void wpc_flip2_state::wpc_flip2_map(address_map &map) { - map(0x0000, 0x2fff).rw(this, FUNC(wpc_flip2_state::ram_r), FUNC(wpc_flip2_state::ram_w)); + map(0x0000, 0x2fff).rw(FUNC(wpc_flip2_state::ram_r), FUNC(wpc_flip2_state::ram_w)); map(0x3000, 0x31ff).bankrw("dmdbank1"); map(0x3200, 0x33ff).bankrw("dmdbank2"); map(0x3400, 0x35ff).bankrw("dmdbank3"); diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp index 4aa396a9e74..9614fe16dfc 100644 --- a/src/mame/drivers/wpc_s.cpp +++ b/src/mame/drivers/wpc_s.cpp @@ -114,8 +114,8 @@ void wpc_s_state::wpc_s_map(address_map &map) map(0x3fd4, 0x3fd4).portr("FLIPPERS").w(out, FUNC(wpc_out_device::out4_w)); - map(0x3fdc, 0x3fdc).rw(this, FUNC(wpc_s_state::dcs_data_r), FUNC(wpc_s_state::dcs_data_w)); - map(0x3fdd, 0x3fdd).rw(this, FUNC(wpc_s_state::dcs_ctrl_r), FUNC(wpc_s_state::dcs_reset_w)); + map(0x3fdc, 0x3fdc).rw(FUNC(wpc_s_state::dcs_data_r), FUNC(wpc_s_state::dcs_data_w)); + map(0x3fdd, 0x3fdd).rw(FUNC(wpc_s_state::dcs_ctrl_r), FUNC(wpc_s_state::dcs_reset_w)); map(0x3fe0, 0x3fe3).w(out, FUNC(wpc_out_device::out_w)); map(0x3fe4, 0x3fe4).nopr().w(lamp, FUNC(wpc_lamp_device::row_w)); @@ -127,13 +127,13 @@ void wpc_s_state::wpc_s_map(address_map &map) map(0x3fea, 0x3fea).w(pic, FUNC(wpc_pic_device::write)); map(0x3ff2, 0x3ff2).w(out, FUNC(wpc_out_device::led_w)); - map(0x3ff3, 0x3ff3).nopr().w(this, FUNC(wpc_s_state::irq_ack_w)); + map(0x3ff3, 0x3ff3).nopr().w(FUNC(wpc_s_state::irq_ack_w)); map(0x3ff4, 0x3ff7).m("shift", FUNC(wpc_shift_device::registers)); - map(0x3ff8, 0x3ff8).r(this, FUNC(wpc_s_state::firq_src_r)).nopw(); // ack? - map(0x3ffa, 0x3ffb).r(this, FUNC(wpc_s_state::rtc_r)); - map(0x3ffc, 0x3ffc).w(this, FUNC(wpc_s_state::bank_w)); + map(0x3ff8, 0x3ff8).r(FUNC(wpc_s_state::firq_src_r)).nopw(); // ack? + map(0x3ffa, 0x3ffb).r(FUNC(wpc_s_state::rtc_r)); + map(0x3ffc, 0x3ffc).w(FUNC(wpc_s_state::bank_w)); map(0x3ffd, 0x3ffe).noprw(); // memory protection stuff? - map(0x3fff, 0x3fff).rw(this, FUNC(wpc_s_state::zc_r), FUNC(wpc_s_state::watchdog_w)); + map(0x3fff, 0x3fff).rw(FUNC(wpc_s_state::zc_r), FUNC(wpc_s_state::watchdog_w)); map(0x4000, 0x7fff).bankr("rombank"); map(0x8000, 0xffff).rom().region("maincpu", 0x78000); diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp index d798ee5641d..e6d7650645f 100644 --- a/src/mame/drivers/wrally.cpp +++ b/src/mame/drivers/wrally.cpp @@ -140,14 +140,14 @@ The PCB has a layout that can either use the 4 rom set of I7, I9, I11 & I13 or l void wrally_state::mcu_hostmem_map(address_map &map) { - map(0x0000, 0xffff).mask(0x3fff).rw(this, FUNC(wrally_state::shareram_r), FUNC(wrally_state::shareram_w)); // shared RAM with the main CPU + map(0x0000, 0xffff).mask(0x3fff).rw(FUNC(wrally_state::shareram_r), FUNC(wrally_state::shareram_w)); // shared RAM with the main CPU } void wrally_state::wrally_map(address_map &map) { map(0x000000, 0x0fffff).rom(); /* ROM */ - map(0x100000, 0x103fff).ram().w(this, FUNC(wrally_state::vram_w)).share("videoram"); /* encrypted Video RAM */ + map(0x100000, 0x103fff).ram().w(FUNC(wrally_state::vram_w)).share("videoram"); /* encrypted Video RAM */ map(0x108000, 0x108007).ram().share("vregs"); /* Video Registers */ map(0x10800c, 0x10800d).nopw(); /* CLR INT Video */ map(0x200000, 0x203fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); /* Palette */ @@ -160,7 +160,7 @@ void wrally_state::wrally_map(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_outlatch->write_d0(space, offset >> 3, data, mem_mask); }); - map(0x70000c, 0x70000d).w(this, FUNC(wrally_state::okim6295_bankswitch_w)); /* OKI6295 bankswitch */ + map(0x70000c, 0x70000d).w(FUNC(wrally_state::okim6295_bankswitch_w)); /* OKI6295 bankswitch */ map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status/data register */ map(0xfec000, 0xfeffff).ram().share("shareram"); /* Work RAM (shared with DS5002FP) */ } diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index 9711f01b462..2b4b1f49770 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -47,19 +47,19 @@ void wswan_state::wswan_mem(address_map &map) map(0x00000, 0x03fff).rw(m_vdp, FUNC(wswan_video_device::vram_r), FUNC(wswan_video_device::vram_w)); // 16kb RAM / 4 colour tiles map(0x04000, 0x0ffff).noprw(); // nothing //AM_RANGE(0x10000, 0xeffff) // cart range, setup at machine_start - map(0xf0000, 0xfffff).r(this, FUNC(wswan_state::bios_r)); + map(0xf0000, 0xfffff).r(FUNC(wswan_state::bios_r)); } void wscolor_state::wscolor_mem(address_map &map) { map(0x00000, 0x0ffff).rw("vdp", FUNC(wswan_video_device::vram_r), FUNC(wswan_video_device::vram_w)); // 16kb RAM / 4 colour tiles, 16 colour tiles + palettes //AM_RANGE(0x10000, 0xeffff) // cart range, setup at machine_start - map(0xf0000, 0xfffff).r(this, FUNC(wscolor_state::bios_r)); + map(0xf0000, 0xfffff).r(FUNC(wscolor_state::bios_r)); } void wswan_state::wswan_io(address_map &map) { - map(0x00, 0xff).rw(this, FUNC(wswan_state::port_r), FUNC(wswan_state::port_w)); // I/O ports + map(0x00, 0xff).rw(FUNC(wswan_state::port_r), FUNC(wswan_state::port_w)); // I/O ports } static INPUT_PORTS_START( wswan ) diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index 46ff4ece461..ca9c1e0e56f 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -177,19 +177,19 @@ static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK / 4; void wwfsstar_state::main_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x080000, 0x080fff).ram().w(this, FUNC(wwfsstar_state::fg0_videoram_w)).share("fg0_videoram"); /* FG0 Ram */ - map(0x0c0000, 0x0c0fff).ram().w(this, FUNC(wwfsstar_state::bg0_videoram_w)).share("bg0_videoram"); /* BG0 Ram */ + map(0x080000, 0x080fff).ram().w(FUNC(wwfsstar_state::fg0_videoram_w)).share("fg0_videoram"); /* FG0 Ram */ + map(0x0c0000, 0x0c0fff).ram().w(FUNC(wwfsstar_state::bg0_videoram_w)).share("bg0_videoram"); /* BG0 Ram */ map(0x100000, 0x1003ff).ram().share("spriteram"); /* SPR Ram */ map(0x140000, 0x140fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x180000, 0x180003).w(this, FUNC(wwfsstar_state::irqack_w)); + map(0x180000, 0x180003).w(FUNC(wwfsstar_state::irqack_w)); map(0x180000, 0x180001).portr("DSW1"); map(0x180002, 0x180003).portr("DSW2"); map(0x180004, 0x180005).portr("P1"); - map(0x180004, 0x180007).w(this, FUNC(wwfsstar_state::scroll_w)); + map(0x180004, 0x180007).w(FUNC(wwfsstar_state::scroll_w)); map(0x180006, 0x180007).portr("P2"); map(0x180008, 0x180009).portr("SYSTEM"); map(0x180009, 0x180009).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x18000a, 0x18000b).w(this, FUNC(wwfsstar_state::flipscreen_w)); + map(0x18000a, 0x18000b).w(FUNC(wwfsstar_state::flipscreen_w)); map(0x1c0000, 0x1c3fff).ram(); /* Work Ram */ } diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index c3659af2ffb..82ba07e31f2 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -46,8 +46,8 @@ TODO: class wyvernf0_state : public driver_device { public: - wyvernf0_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + wyvernf0_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bgram(*this,"bgram"), m_fgram(*this,"fgram"), m_scrollram(*this,"scrollram"), @@ -57,7 +57,8 @@ public: m_mcu(*this, "mcu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } // memory pointers required_shared_ptr m_bgram; @@ -394,17 +395,17 @@ void wyvernf0_state::wyvernf0_map(address_map &map) map(0xa000, 0xbfff).bankr("rombank"); - map(0xc000, 0xc7ff).ram().w(this, FUNC(wyvernf0_state::fgram_w)).share("fgram"); - map(0xc800, 0xcfff).ram().w(this, FUNC(wyvernf0_state::bgram_w)).share("bgram"); + map(0xc000, 0xc7ff).ram().w(FUNC(wyvernf0_state::fgram_w)).share("fgram"); + map(0xc800, 0xcfff).ram().w(FUNC(wyvernf0_state::bgram_w)).share("bgram"); map(0xd000, 0xd000).nopw(); // d000 write (02) - map(0xd100, 0xd100).w(this, FUNC(wyvernf0_state::rambank_w)); - map(0xd200, 0xd200).w(this, FUNC(wyvernf0_state::rombank_w)); + map(0xd100, 0xd100).w(FUNC(wyvernf0_state::rambank_w)); + map(0xd200, 0xd200).w(FUNC(wyvernf0_state::rombank_w)); map(0xd300, 0xd303).ram().share("scrollram"); - map(0xd400, 0xd400).rw(this, FUNC(wyvernf0_state::fake_mcu_r), FUNC(wyvernf0_state::fake_mcu_w)); - map(0xd401, 0xd401).r(this, FUNC(wyvernf0_state::fake_status_r)); + map(0xd400, 0xd400).rw(FUNC(wyvernf0_state::fake_mcu_r), FUNC(wyvernf0_state::fake_mcu_w)); + map(0xd401, 0xd401).r(FUNC(wyvernf0_state::fake_status_r)); map(0xd500, 0xd5ff).ram().share("spriteram"); @@ -417,7 +418,7 @@ void wyvernf0_state::wyvernf0_map(address_map &map) map(0xd606, 0xd606).portr("JOY2"); map(0xd607, 0xd607).portr("FIRE2"); - map(0xd610, 0xd610).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(wyvernf0_state::sound_command_w)); + map(0xd610, 0xd610).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(wyvernf0_state::sound_command_w)); // d613 write (FF -> 00 at boot) map(0xd800, 0xdbff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); @@ -436,9 +437,9 @@ void wyvernf0_state::sound_map(address_map &map) // cb00 write // cc00 write map(0xd000, 0xd000).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write)); - map(0xd200, 0xd200).w(this, FUNC(wyvernf0_state::nmi_enable_w)); - map(0xd400, 0xd400).w(this, FUNC(wyvernf0_state::nmi_disable_w)); - map(0xd600, 0xd600).w("dac", FUNC(dac_byte_interface::write)); + map(0xd200, 0xd200).w(FUNC(wyvernf0_state::nmi_enable_w)); + map(0xd400, 0xd400).w(FUNC(wyvernf0_state::nmi_disable_w)); + map(0xd600, 0xd600).w("dac", FUNC(dac_byte_interface::data_w)); map(0xe000, 0xefff).rom(); // space for diagnostics ROM } diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index 06a5322b1cd..f606feb4adc 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1235,7 +1235,7 @@ void x07_state::x07_io(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); - map(0x00, 0xff).rw(this, FUNC(x07_state::x07_io_r), FUNC(x07_state::x07_io_w)); + map(0x00, 0xff).rw(FUNC(x07_state::x07_io_r), FUNC(x07_state::x07_io_w)); } /* Input ports */ diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index afd230a7660..99a55ca3626 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -1323,22 +1323,22 @@ void x1_state::x1_io_banks_common(address_map &map) { map.unmap_value_high(); - map(0x0e00, 0x0e02).w(this, FUNC(x1_state::x1_rom_w)); - map(0x0e03, 0x0e03).r(this, FUNC(x1_state::x1_rom_r)); + map(0x0e00, 0x0e02).w(FUNC(x1_state::x1_rom_w)); + map(0x0e03, 0x0e03).r(FUNC(x1_state::x1_rom_r)); - map(0x0ff8, 0x0fff).rw(this, FUNC(x1_state::x1_fdc_r), FUNC(x1_state::x1_fdc_w)); + map(0x0ff8, 0x0fff).rw(FUNC(x1_state::x1_fdc_r), FUNC(x1_state::x1_fdc_w)); - map(0x1300, 0x1300).mirror(0x00ff).w(this, FUNC(x1_state::x1_pri_w)); - map(0x1400, 0x17ff).rw(this, FUNC(x1_state::x1_pcg_r), FUNC(x1_state::x1_pcg_w)); + map(0x1300, 0x1300).mirror(0x00ff).w(FUNC(x1_state::x1_pri_w)); + map(0x1400, 0x17ff).rw(FUNC(x1_state::x1_pcg_r), FUNC(x1_state::x1_pcg_w)); - map(0x1800, 0x1801).w(this, FUNC(x1_state::x1_6845_w)); + map(0x1800, 0x1801).w(FUNC(x1_state::x1_6845_w)); - map(0x1900, 0x1900).mirror(0x00ff).rw(this, FUNC(x1_state::x1_sub_io_r), FUNC(x1_state::x1_sub_io_w)); + map(0x1900, 0x1900).mirror(0x00ff).rw(FUNC(x1_state::x1_sub_io_r), FUNC(x1_state::x1_sub_io_w)); map(0x1a00, 0x1a03).mirror(0x00fc).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x1b00, 0x1b00).mirror(0x00ff).rw("ay", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w)); map(0x1c00, 0x1c00).mirror(0x00ff).w("ay", FUNC(ay8910_device::address_w)); - map(0x1d00, 0x1d00).mirror(0x00ff).w(this, FUNC(x1_state::x1_rom_bank_1_w)); - map(0x1e00, 0x1e00).mirror(0x00ff).w(this, FUNC(x1_state::x1_rom_bank_0_w)); + map(0x1d00, 0x1d00).mirror(0x00ff).w(FUNC(x1_state::x1_rom_bank_1_w)); + map(0x1e00, 0x1e00).mirror(0x00ff).w(FUNC(x1_state::x1_rom_bank_0_w)); map(0x1fa0, 0x1fa3).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x1fa8, 0x1fab).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); @@ -1347,7 +1347,7 @@ void x1_state::x1_io_banks_common(address_map &map) map(0x4000, 0xffff).bankrw("bitmapbank"); - map(0x10000, 0x1ffff).rw(this, FUNC(x1_state::x1_ex_gfxram_r), FUNC(x1_state::x1_ex_gfxram_w)); + map(0x10000, 0x1ffff).rw(FUNC(x1_state::x1_ex_gfxram_r), FUNC(x1_state::x1_ex_gfxram_w)); } @@ -1357,9 +1357,9 @@ void x1_state::x1_io_banks(address_map &map) // AM_RANGE(0x0700, 0x0701) TODO: user could install ym2151 on plain X1 too - map(0x1000, 0x1000).mirror(0x00ff).w(this, FUNC(x1_state::x1_pal_b_w)); - map(0x1100, 0x1100).mirror(0x00ff).w(this, FUNC(x1_state::x1_pal_r_w)); - map(0x1200, 0x1200).mirror(0x00ff).w(this, FUNC(x1_state::x1_pal_g_w)); + map(0x1000, 0x1000).mirror(0x00ff).w(FUNC(x1_state::x1_pal_b_w)); + map(0x1100, 0x1100).mirror(0x00ff).w(FUNC(x1_state::x1_pal_r_w)); + map(0x1200, 0x1200).mirror(0x00ff).w(FUNC(x1_state::x1_pal_g_w)); map(0x3000, 0x37ff).mirror(0x0800).ram().share("tvram"); // Ys checks if it's a x1/x1turbo machine by checking if this area is a mirror } @@ -1371,39 +1371,39 @@ void x1_state::x1turbo_io_banks(address_map &map) // a * at the end states devices used on plain X1 too - map(0x0700, 0x0701).r(this, FUNC(x1_state::ym_r)).w("ym", FUNC(ym2151_device::write)); + map(0x0700, 0x0701).r(FUNC(x1_state::ym_r)).w("ym", FUNC(ym2151_device::write)); // 0x704 is FM sound detection port on X1 turboZ map(0x0704, 0x0707).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0x0800, 0x0800).w(this, FUNC(x1_state::color_board_w)); // * - map(0x0801, 0x0801).r(this, FUNC(x1_state::color_board_r)); // * - map(0x0802, 0x0802).w(this, FUNC(x1_state::color_board_2_w)); // * - map(0x0803, 0x0803).r(this, FUNC(x1_state::color_board_2_r)); // * - map(0x0a00, 0x0a07).rw(this, FUNC(x1_state::stereo_board_r), FUNC(x1_state::stereo_board_w)); // * - map(0x0b00, 0x0b00).rw(this, FUNC(x1_state::x1turbo_bank_r), FUNC(x1_state::x1turbo_bank_w)); - map(0x0c00, 0x0cff).rw(this, FUNC(x1_state::rs232_r), FUNC(x1_state::rs232_w)); // * - map(0x0d00, 0x0dff).rw(this, FUNC(x1_state::x1_emm_r), FUNC(x1_state::x1_emm_w)); // * - map(0x0e80, 0x0e81).r(this, FUNC(x1_state::x1_kanji_r)); - map(0x0e80, 0x0e83).w(this, FUNC(x1_state::x1_kanji_w)); - map(0x0fd0, 0x0fd3).rw(this, FUNC(x1_state::sasi_r), FUNC(x1_state::sasi_w)); // * - map(0x0fe8, 0x0fef).rw(this, FUNC(x1_state::fdd8_r), FUNC(x1_state::fdd8_w)); // * - - map(0x1000, 0x12ff).w(this, FUNC(x1_state::x1turboz_4096_palette_w)); - - map(0x1f80, 0x1f80).mirror(0x000f).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); + map(0x0800, 0x0800).w(FUNC(x1_state::color_board_w)); // * + map(0x0801, 0x0801).r(FUNC(x1_state::color_board_r)); // * + map(0x0802, 0x0802).w(FUNC(x1_state::color_board_2_w)); // * + map(0x0803, 0x0803).r(FUNC(x1_state::color_board_2_r)); // * + map(0x0a00, 0x0a07).rw(FUNC(x1_state::stereo_board_r), FUNC(x1_state::stereo_board_w)); // * + map(0x0b00, 0x0b00).rw(FUNC(x1_state::x1turbo_bank_r), FUNC(x1_state::x1turbo_bank_w)); + map(0x0c00, 0x0cff).rw(FUNC(x1_state::rs232_r), FUNC(x1_state::rs232_w)); // * + map(0x0d00, 0x0dff).rw(FUNC(x1_state::x1_emm_r), FUNC(x1_state::x1_emm_w)); // * + map(0x0e80, 0x0e81).r(FUNC(x1_state::x1_kanji_r)); + map(0x0e80, 0x0e83).w(FUNC(x1_state::x1_kanji_w)); + map(0x0fd0, 0x0fd3).rw(FUNC(x1_state::sasi_r), FUNC(x1_state::sasi_w)); // * + map(0x0fe8, 0x0fef).rw(FUNC(x1_state::fdd8_r), FUNC(x1_state::fdd8_w)); // * + + map(0x1000, 0x12ff).w(FUNC(x1_state::x1turboz_4096_palette_w)); + + map(0x1f80, 0x1f80).mirror(0x000f).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); map(0x1f90, 0x1f93).rw("sio", FUNC(z80sio0_device::ba_cd_r), FUNC(z80sio0_device::ba_cd_w)); - map(0x1f98, 0x1f9f).rw(this, FUNC(x1_state::ext_sio_ctc_r), FUNC(x1_state::ext_sio_ctc_w)); - map(0x1fb0, 0x1fb0).rw(this, FUNC(x1_state::x1turbo_pal_r), FUNC(x1_state::x1turbo_pal_w)); // Z only! - map(0x1fb8, 0x1fbf).rw(this, FUNC(x1_state::x1turbo_txpal_r), FUNC(x1_state::x1turbo_txpal_w)); // Z only! - map(0x1fc0, 0x1fc0).rw(this, FUNC(x1_state::x1turbo_txdisp_r), FUNC(x1_state::x1turbo_txdisp_w)); // Z only! - map(0x1fc1, 0x1fc1).w(this, FUNC(x1_state::z_img_cap_w)); // Z only! - map(0x1fc2, 0x1fc2).w(this, FUNC(x1_state::z_mosaic_w)); // Z only! - map(0x1fc3, 0x1fc3).w(this, FUNC(x1_state::z_chroma_key_w)); // Z only! - map(0x1fc4, 0x1fc4).w(this, FUNC(x1_state::z_extra_scroll_w)); // Z only! - map(0x1fc5, 0x1fc5).rw(this, FUNC(x1_state::x1turbo_gfxpal_r), FUNC(x1_state::x1turbo_gfxpal_w)); // Z only! + map(0x1f98, 0x1f9f).rw(FUNC(x1_state::ext_sio_ctc_r), FUNC(x1_state::ext_sio_ctc_w)); + map(0x1fb0, 0x1fb0).rw(FUNC(x1_state::x1turbo_pal_r), FUNC(x1_state::x1turbo_pal_w)); // Z only! + map(0x1fb8, 0x1fbf).rw(FUNC(x1_state::x1turbo_txpal_r), FUNC(x1_state::x1turbo_txpal_w)); // Z only! + map(0x1fc0, 0x1fc0).rw(FUNC(x1_state::x1turbo_txdisp_r), FUNC(x1_state::x1turbo_txdisp_w)); // Z only! + map(0x1fc1, 0x1fc1).w(FUNC(x1_state::z_img_cap_w)); // Z only! + map(0x1fc2, 0x1fc2).w(FUNC(x1_state::z_mosaic_w)); // Z only! + map(0x1fc3, 0x1fc3).w(FUNC(x1_state::z_chroma_key_w)); // Z only! + map(0x1fc4, 0x1fc4).w(FUNC(x1_state::z_extra_scroll_w)); // Z only! + map(0x1fc5, 0x1fc5).rw(FUNC(x1_state::x1turbo_gfxpal_r), FUNC(x1_state::x1turbo_gfxpal_w)); // Z only! // AM_RANGE(0x1fd0, 0x1fdf) AM_READ(x1_scrn_r) // Z only! - map(0x1fd0, 0x1fd0).mirror(0x000f).w(this, FUNC(x1_state::x1_scrn_w)); - map(0x1fe0, 0x1fe0).rw(this, FUNC(x1_state::x1turboz_blackclip_r), FUNC(x1_state::x1turbo_blackclip_w)); + map(0x1fd0, 0x1fd0).mirror(0x000f).w(FUNC(x1_state::x1_scrn_w)); + map(0x1fe0, 0x1fe0).rw(FUNC(x1_state::x1turboz_blackclip_r), FUNC(x1_state::x1turbo_blackclip_w)); map(0x1ff0, 0x1ff0).portr("X1TURBO_DSW"); map(0x3000, 0x37ff).ram().share("tvram"); @@ -1413,12 +1413,12 @@ void x1_state::x1turbo_io_banks(address_map &map) void x1_state::x1_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(x1_state::x1_mem_r), FUNC(x1_state::x1_mem_w)); + map(0x0000, 0xffff).rw(FUNC(x1_state::x1_mem_r), FUNC(x1_state::x1_mem_w)); } void x1_state::x1turbo_mem(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(x1_state::x1turbo_mem_r), FUNC(x1_state::x1turbo_mem_w)); + map(0x0000, 0xffff).rw(FUNC(x1_state::x1turbo_mem_r), FUNC(x1_state::x1turbo_mem_w)); } void x1_state::x1_io(address_map &map) diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index d6db2855d3a..510f965e214 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -55,7 +55,7 @@ uint32_t x1twin_state::screen_update_x1pce(screen_device &screen, bitmap_rgb32 & void x1twin_state::x1_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0xffff).rw(this, FUNC(x1twin_state::x1_mem_r), FUNC(x1twin_state::x1_mem_w)); + map(0x0000, 0xffff).rw(FUNC(x1twin_state::x1_mem_r), FUNC(x1twin_state::x1_mem_w)); } void x1twin_state::x1_io(address_map &map) @@ -69,17 +69,17 @@ void x1twin_state::pce_mem(address_map &map) { map(0x000000, 0x09FFFF).rom(); map(0x1F0000, 0x1F1FFF).ram().mirror(0x6000); - map(0x1FE000, 0x1FE3FF).rw(this, FUNC(x1twin_state::vdc_r), FUNC(x1twin_state::vdc_w)); - map(0x1FE400, 0x1FE7FF).rw(this, FUNC(x1twin_state::vce_r), FUNC(x1twin_state::vce_w)); + map(0x1FE000, 0x1FE3FF).rw(FUNC(x1twin_state::vdc_r), FUNC(x1twin_state::vdc_w)); + map(0x1FE400, 0x1FE7FF).rw(FUNC(x1twin_state::vce_r), FUNC(x1twin_state::vce_w)); map(0x1FE800, 0x1FEBFF).rw("c6280", FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w)); - map(0x1FEC00, 0x1FEFFF).rw(this, FUNC(x1twin_state::h6280_timer_r), FUNC(x1twin_state::h6280_timer_w)); - map(0x1FF000, 0x1FF3FF).rw(this, FUNC(x1twin_state::pce_joystick_r), FUNC(x1twin_state::pce_joystick_w)); + map(0x1FEC00, 0x1FEFFF).rw(FUNC(x1twin_state::h6280_timer_r), FUNC(x1twin_state::h6280_timer_w)); + map(0x1FF000, 0x1FF3FF).rw(FUNC(x1twin_state::pce_joystick_r), FUNC(x1twin_state::pce_joystick_w)); map(0x1FF400, 0x1FF7FF).rw("maincpu", FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w)); } void x1twin_state::pce_io(address_map &map) { - map(0x00, 0x03).rw(this, FUNC(x1twin_state::vdc_r), FUNC(x1twin_state::vdc_w)); + map(0x00, 0x03).rw(FUNC(x1twin_state::vdc_r), FUNC(x1twin_state::vdc_w)); } #endif diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 24588fbf150..92bc015be40 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1121,77 +1121,77 @@ WRITE_LINE_MEMBER(x68k_state::x68k_scsi_drq) void x68k_state::x68k_map(address_map &map) { - map(0x000000, 0xbffffb).rw(this, FUNC(x68k_state::x68k_emptyram_r), FUNC(x68k_state::x68k_emptyram_w)); - map(0xbffffc, 0xbfffff).rw(this, FUNC(x68k_state::x68k_rom0_r), FUNC(x68k_state::x68k_rom0_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(x68k_state::x68k_gvram_r), FUNC(x68k_state::x68k_gvram_w)); - map(0xe00000, 0xe7ffff).rw(this, FUNC(x68k_state::x68k_tvram_r), FUNC(x68k_state::x68k_tvram_w)); - map(0xe80000, 0xe81fff).rw(this, FUNC(x68k_state::x68k_crtc_r), FUNC(x68k_state::x68k_crtc_w)); + map(0x000000, 0xbffffb).rw(FUNC(x68k_state::x68k_emptyram_r), FUNC(x68k_state::x68k_emptyram_w)); + map(0xbffffc, 0xbfffff).rw(FUNC(x68k_state::x68k_rom0_r), FUNC(x68k_state::x68k_rom0_w)); + map(0xc00000, 0xdfffff).rw(FUNC(x68k_state::x68k_gvram_r), FUNC(x68k_state::x68k_gvram_w)); + map(0xe00000, 0xe7ffff).rw(FUNC(x68k_state::x68k_tvram_r), FUNC(x68k_state::x68k_tvram_w)); + map(0xe80000, 0xe81fff).rw(FUNC(x68k_state::x68k_crtc_r), FUNC(x68k_state::x68k_crtc_w)); map(0xe82000, 0xe821ff).rw(m_gfxpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("gfxpalette"); map(0xe82200, 0xe823ff).rw(m_pcgpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("pcgpalette"); - map(0xe82400, 0xe83fff).rw(this, FUNC(x68k_state::x68k_vid_r), FUNC(x68k_state::x68k_vid_w)); + map(0xe82400, 0xe83fff).rw(FUNC(x68k_state::x68k_vid_r), FUNC(x68k_state::x68k_vid_w)); map(0xe84000, 0xe85fff).rw(m_hd63450, FUNC(hd63450_device::read), FUNC(hd63450_device::write)); - map(0xe86000, 0xe87fff).rw(this, FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_areaset_w)); + map(0xe86000, 0xe87fff).rw(FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_areaset_w)); map(0xe88000, 0xe89fff).rw(m_mfpdev, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff); map(0xe8a000, 0xe8bfff).rw(m_rtc, FUNC(rp5c15_device::read), FUNC(rp5c15_device::write)).umask16(0x00ff); // AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w) - map(0xe8e000, 0xe8ffff).rw(this, FUNC(x68k_state::x68k_sysport_r), FUNC(x68k_state::x68k_sysport_w)); + map(0xe8e000, 0xe8ffff).rw(FUNC(x68k_state::x68k_sysport_r), FUNC(x68k_state::x68k_sysport_w)); map(0xe90000, 0xe91fff).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); map(0xe92001, 0xe92001).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::ctrl_w)); map(0xe92003, 0xe92003).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::data_w)); map(0xe94000, 0xe94003).m(m_upd72065, FUNC(upd72065_device::map)).umask16(0x00ff); - map(0xe94004, 0xe94007).rw(this, FUNC(x68k_state::x68k_fdc_r), FUNC(x68k_state::x68k_fdc_w)); + map(0xe94004, 0xe94007).rw(FUNC(x68k_state::x68k_fdc_r), FUNC(x68k_state::x68k_fdc_w)); map(0xe96000, 0xe9601f).rw("x68k_hdc", FUNC(x68k_hdc_image_device::hdc_r), FUNC(x68k_hdc_image_device::hdc_w)); - map(0xe98000, 0xe99fff).rw(this, FUNC(x68k_state::x68k_scc_r), FUNC(x68k_state::x68k_scc_w)); - map(0xe9a000, 0xe9bfff).rw(this, FUNC(x68k_state::x68k_ppi_r), FUNC(x68k_state::x68k_ppi_w)); - map(0xe9c000, 0xe9dfff).rw(this, FUNC(x68k_state::x68k_ioc_r), FUNC(x68k_state::x68k_ioc_w)); - map(0xe9e000, 0xe9e3ff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // FPU (Optional) - map(0xea0000, 0xea1fff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // external SCSI ROM and controller - map(0xeafa00, 0xeafa1f).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); - map(0xeafa80, 0xeafa89).rw(this, FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_enh_areaset_w)); - map(0xeb0000, 0xeb7fff).rw(this, FUNC(x68k_state::x68k_spritereg_r), FUNC(x68k_state::x68k_spritereg_w)); - map(0xeb8000, 0xebffff).rw(this, FUNC(x68k_state::x68k_spriteram_r), FUNC(x68k_state::x68k_spriteram_w)); - map(0xece000, 0xece3ff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // User I/O - map(0xed0000, 0xed3fff).rw(this, FUNC(x68k_state::x68k_sram_r), FUNC(x68k_state::x68k_sram_w)); + map(0xe98000, 0xe99fff).rw(FUNC(x68k_state::x68k_scc_r), FUNC(x68k_state::x68k_scc_w)); + map(0xe9a000, 0xe9bfff).rw(FUNC(x68k_state::x68k_ppi_r), FUNC(x68k_state::x68k_ppi_w)); + map(0xe9c000, 0xe9dfff).rw(FUNC(x68k_state::x68k_ioc_r), FUNC(x68k_state::x68k_ioc_w)); + map(0xe9e000, 0xe9e3ff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // FPU (Optional) + map(0xea0000, 0xea1fff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // external SCSI ROM and controller + map(0xeafa00, 0xeafa1f).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); + map(0xeafa80, 0xeafa89).rw(FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_enh_areaset_w)); + map(0xeb0000, 0xeb7fff).rw(FUNC(x68k_state::x68k_spritereg_r), FUNC(x68k_state::x68k_spritereg_w)); + map(0xeb8000, 0xebffff).rw(FUNC(x68k_state::x68k_spriteram_r), FUNC(x68k_state::x68k_spriteram_w)); + map(0xece000, 0xece3ff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // User I/O + map(0xed0000, 0xed3fff).rw(FUNC(x68k_state::x68k_sram_r), FUNC(x68k_state::x68k_sram_w)); map(0xed4000, 0xefffff).noprw(); map(0xf00000, 0xfbffff).rom(); - map(0xfc0000, 0xfdffff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // internal SCSI ROM + map(0xfc0000, 0xfdffff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // internal SCSI ROM map(0xfe0000, 0xffffff).rom(); } void x68k_state::x68kxvi_map(address_map &map) { - map(0x000000, 0xbffffb).rw(this, FUNC(x68k_state::x68k_emptyram_r), FUNC(x68k_state::x68k_emptyram_w)); - map(0xbffffc, 0xbfffff).rw(this, FUNC(x68k_state::x68k_rom0_r), FUNC(x68k_state::x68k_rom0_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(x68k_state::x68k_gvram_r), FUNC(x68k_state::x68k_gvram_w)); - map(0xe00000, 0xe7ffff).rw(this, FUNC(x68k_state::x68k_tvram_r), FUNC(x68k_state::x68k_tvram_w)); - map(0xe80000, 0xe81fff).rw(this, FUNC(x68k_state::x68k_crtc_r), FUNC(x68k_state::x68k_crtc_w)); + map(0x000000, 0xbffffb).rw(FUNC(x68k_state::x68k_emptyram_r), FUNC(x68k_state::x68k_emptyram_w)); + map(0xbffffc, 0xbfffff).rw(FUNC(x68k_state::x68k_rom0_r), FUNC(x68k_state::x68k_rom0_w)); + map(0xc00000, 0xdfffff).rw(FUNC(x68k_state::x68k_gvram_r), FUNC(x68k_state::x68k_gvram_w)); + map(0xe00000, 0xe7ffff).rw(FUNC(x68k_state::x68k_tvram_r), FUNC(x68k_state::x68k_tvram_w)); + map(0xe80000, 0xe81fff).rw(FUNC(x68k_state::x68k_crtc_r), FUNC(x68k_state::x68k_crtc_w)); map(0xe82000, 0xe821ff).rw(m_gfxpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("gfxpalette"); map(0xe82200, 0xe823ff).rw(m_pcgpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("pcgpalette"); - map(0xe82400, 0xe83fff).rw(this, FUNC(x68k_state::x68k_vid_r), FUNC(x68k_state::x68k_vid_w)); + map(0xe82400, 0xe83fff).rw(FUNC(x68k_state::x68k_vid_r), FUNC(x68k_state::x68k_vid_w)); map(0xe84000, 0xe85fff).rw(m_hd63450, FUNC(hd63450_device::read), FUNC(hd63450_device::write)); - map(0xe86000, 0xe87fff).rw(this, FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_areaset_w)); + map(0xe86000, 0xe87fff).rw(FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_areaset_w)); map(0xe88000, 0xe89fff).rw(m_mfpdev, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff); map(0xe8a000, 0xe8bfff).rw(m_rtc, FUNC(rp5c15_device::read), FUNC(rp5c15_device::write)).umask16(0x00ff); // AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w) - map(0xe8e000, 0xe8ffff).rw(this, FUNC(x68k_state::x68k_sysport_r), FUNC(x68k_state::x68k_sysport_w)); + map(0xe8e000, 0xe8ffff).rw(FUNC(x68k_state::x68k_sysport_r), FUNC(x68k_state::x68k_sysport_w)); map(0xe90000, 0xe91fff).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask16(0x00ff); map(0xe92001, 0xe92001).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::ctrl_w)); map(0xe92003, 0xe92003).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::data_w)); map(0xe94000, 0xe94003).m(m_upd72065, FUNC(upd72065_device::map)).umask16(0x00ff); - map(0xe94004, 0xe94007).rw(this, FUNC(x68k_state::x68k_fdc_r), FUNC(x68k_state::x68k_fdc_w)); + map(0xe94004, 0xe94007).rw(FUNC(x68k_state::x68k_fdc_r), FUNC(x68k_state::x68k_fdc_w)); // AM_RANGE(0xe96000, 0xe9601f) AM_DEVREADWRITE("x68k_hdc", x68k_hdc_image_device, hdc_r, hdc_w) map(0xe96020, 0xe9603f).rw("mb89352", FUNC(mb89352_device::mb89352_r), FUNC(mb89352_device::mb89352_w)).umask16(0x00ff); - map(0xe98000, 0xe99fff).rw(this, FUNC(x68k_state::x68k_scc_r), FUNC(x68k_state::x68k_scc_w)); - map(0xe9a000, 0xe9bfff).rw(this, FUNC(x68k_state::x68k_ppi_r), FUNC(x68k_state::x68k_ppi_w)); - map(0xe9c000, 0xe9dfff).rw(this, FUNC(x68k_state::x68k_ioc_r), FUNC(x68k_state::x68k_ioc_w)); - map(0xe9e000, 0xe9e3ff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // FPU (Optional) - map(0xea0000, 0xea1fff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // external SCSI ROM and controller - map(0xeafa00, 0xeafa1f).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); - map(0xeafa80, 0xeafa89).rw(this, FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_enh_areaset_w)); - map(0xeb0000, 0xeb7fff).rw(this, FUNC(x68k_state::x68k_spritereg_r), FUNC(x68k_state::x68k_spritereg_w)); - map(0xeb8000, 0xebffff).rw(this, FUNC(x68k_state::x68k_spriteram_r), FUNC(x68k_state::x68k_spriteram_w)); - map(0xece000, 0xece3ff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // User I/O - map(0xed0000, 0xed3fff).rw(this, FUNC(x68k_state::x68k_sram_r), FUNC(x68k_state::x68k_sram_w)); + map(0xe98000, 0xe99fff).rw(FUNC(x68k_state::x68k_scc_r), FUNC(x68k_state::x68k_scc_w)); + map(0xe9a000, 0xe9bfff).rw(FUNC(x68k_state::x68k_ppi_r), FUNC(x68k_state::x68k_ppi_w)); + map(0xe9c000, 0xe9dfff).rw(FUNC(x68k_state::x68k_ioc_r), FUNC(x68k_state::x68k_ioc_w)); + map(0xe9e000, 0xe9e3ff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // FPU (Optional) + map(0xea0000, 0xea1fff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // external SCSI ROM and controller + map(0xeafa00, 0xeafa1f).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); + map(0xeafa80, 0xeafa89).rw(FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_enh_areaset_w)); + map(0xeb0000, 0xeb7fff).rw(FUNC(x68k_state::x68k_spritereg_r), FUNC(x68k_state::x68k_spritereg_w)); + map(0xeb8000, 0xebffff).rw(FUNC(x68k_state::x68k_spriteram_r), FUNC(x68k_state::x68k_spriteram_w)); + map(0xece000, 0xece3ff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // User I/O + map(0xed0000, 0xed3fff).rw(FUNC(x68k_state::x68k_sram_r), FUNC(x68k_state::x68k_sram_w)); map(0xed4000, 0xefffff).noprw(); map(0xf00000, 0xfbffff).rom(); map(0xfc0000, 0xfdffff).rom(); // internal SCSI ROM @@ -1201,37 +1201,37 @@ void x68k_state::x68kxvi_map(address_map &map) void x68k_state::x68030_map(address_map &map) { map.global_mask(0x00ffffff); // Still only has 24-bit address space - map(0x000000, 0xbffffb).rw(this, FUNC(x68k_state::x68k_emptyram_r), FUNC(x68k_state::x68k_emptyram_w)); - map(0xbffffc, 0xbfffff).rw(this, FUNC(x68k_state::x68k_rom0_r), FUNC(x68k_state::x68k_rom0_w)); - map(0xc00000, 0xdfffff).rw(this, FUNC(x68k_state::x68k_gvram_r), FUNC(x68k_state::x68k_gvram_w)); - map(0xe00000, 0xe7ffff).rw(this, FUNC(x68k_state::x68k_tvram_r), FUNC(x68k_state::x68k_tvram_w)); - map(0xe80000, 0xe81fff).rw(this, FUNC(x68k_state::x68k_crtc_r), FUNC(x68k_state::x68k_crtc_w)); + map(0x000000, 0xbffffb).rw(FUNC(x68k_state::x68k_emptyram_r), FUNC(x68k_state::x68k_emptyram_w)); + map(0xbffffc, 0xbfffff).rw(FUNC(x68k_state::x68k_rom0_r), FUNC(x68k_state::x68k_rom0_w)); + map(0xc00000, 0xdfffff).rw(FUNC(x68k_state::x68k_gvram_r), FUNC(x68k_state::x68k_gvram_w)); + map(0xe00000, 0xe7ffff).rw(FUNC(x68k_state::x68k_tvram_r), FUNC(x68k_state::x68k_tvram_w)); + map(0xe80000, 0xe81fff).rw(FUNC(x68k_state::x68k_crtc_r), FUNC(x68k_state::x68k_crtc_w)); map(0xe82000, 0xe821ff).rw(m_gfxpalette, FUNC(palette_device::read32), FUNC(palette_device::write32)).share("gfxpalette"); map(0xe82200, 0xe823ff).rw(m_pcgpalette, FUNC(palette_device::read32), FUNC(palette_device::write32)).share("pcgpalette"); - map(0xe82400, 0xe83fff).rw(this, FUNC(x68k_state::x68k_vid_r), FUNC(x68k_state::x68k_vid_w)); + map(0xe82400, 0xe83fff).rw(FUNC(x68k_state::x68k_vid_r), FUNC(x68k_state::x68k_vid_w)); map(0xe84000, 0xe85fff).rw(m_hd63450, FUNC(hd63450_device::read), FUNC(hd63450_device::write)); - map(0xe86000, 0xe87fff).rw(this, FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_areaset_w)); + map(0xe86000, 0xe87fff).rw(FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_areaset_w)); map(0xe88000, 0xe89fff).rw(m_mfpdev, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask32(0x00ff00ff); map(0xe8a000, 0xe8bfff).rw(m_rtc, FUNC(rp5c15_device::read), FUNC(rp5c15_device::write)).umask32(0x00ff00ff); // AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w) - map(0xe8e000, 0xe8ffff).rw(this, FUNC(x68k_state::x68k_sysport_r), FUNC(x68k_state::x68k_sysport_w)); + map(0xe8e000, 0xe8ffff).rw(FUNC(x68k_state::x68k_sysport_r), FUNC(x68k_state::x68k_sysport_w)); map(0xe90000, 0xe91fff).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write)).umask32(0x00ff00ff); - map(0xe92000, 0xe92003).r(m_okim6258, FUNC(okim6258_device::status_r)).umask32(0x00ff00ff).w(this, FUNC(x68k_state::x68030_adpcm_w)).umask32(0x00ff00ff); + map(0xe92000, 0xe92003).r(m_okim6258, FUNC(okim6258_device::status_r)).umask32(0x00ff00ff).w(FUNC(x68k_state::x68030_adpcm_w)).umask32(0x00ff00ff); map(0xe94000, 0xe94003).m(m_upd72065, FUNC(upd72065_device::map)).umask32(0x00ff00ff); - map(0xe94004, 0xe94007).rw(this, FUNC(x68k_state::x68k_fdc_r), FUNC(x68k_state::x68k_fdc_w)); + map(0xe94004, 0xe94007).rw(FUNC(x68k_state::x68k_fdc_r), FUNC(x68k_state::x68k_fdc_w)); // AM_RANGE(0xe96000, 0xe9601f) AM_DEVREADWRITE16("x68k_hdc", x68k_hdc_image_device, hdc_r, hdc_w, 0xffffffff) map(0xe96020, 0xe9603f).rw("mb89352", FUNC(mb89352_device::mb89352_r), FUNC(mb89352_device::mb89352_w)).umask32(0x00ff00ff); - map(0xe98000, 0xe99fff).rw(this, FUNC(x68k_state::x68k_scc_r), FUNC(x68k_state::x68k_scc_w)); - map(0xe9a000, 0xe9bfff).rw(this, FUNC(x68k_state::x68k_ppi_r), FUNC(x68k_state::x68k_ppi_w)); - map(0xe9c000, 0xe9dfff).rw(this, FUNC(x68k_state::x68k_ioc_r), FUNC(x68k_state::x68k_ioc_w)); - map(0xe9e000, 0xe9e3ff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // FPU (Optional) + map(0xe98000, 0xe99fff).rw(FUNC(x68k_state::x68k_scc_r), FUNC(x68k_state::x68k_scc_w)); + map(0xe9a000, 0xe9bfff).rw(FUNC(x68k_state::x68k_ppi_r), FUNC(x68k_state::x68k_ppi_w)); + map(0xe9c000, 0xe9dfff).rw(FUNC(x68k_state::x68k_ioc_r), FUNC(x68k_state::x68k_ioc_w)); + map(0xe9e000, 0xe9e3ff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // FPU (Optional) map(0xea0000, 0xea1fff).noprw();//AM_READWRITE16(x68k_exp_r, x68k_exp_w,0xffffffff) // external SCSI ROM and controller - map(0xeafa00, 0xeafa1f).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); - map(0xeafa80, 0xeafa8b).rw(this, FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_enh_areaset_w)); - map(0xeb0000, 0xeb7fff).rw(this, FUNC(x68k_state::x68k_spritereg_r), FUNC(x68k_state::x68k_spritereg_w)); - map(0xeb8000, 0xebffff).rw(this, FUNC(x68k_state::x68k_spriteram_r), FUNC(x68k_state::x68k_spriteram_w)); - map(0xece000, 0xece3ff).rw(this, FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // User I/O - map(0xed0000, 0xed3fff).rw(this, FUNC(x68k_state::x68k_sram_r), FUNC(x68k_state::x68k_sram_w)); + map(0xeafa00, 0xeafa1f).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); + map(0xeafa80, 0xeafa8b).rw(FUNC(x68k_state::x68k_areaset_r), FUNC(x68k_state::x68k_enh_areaset_w)); + map(0xeb0000, 0xeb7fff).rw(FUNC(x68k_state::x68k_spritereg_r), FUNC(x68k_state::x68k_spritereg_w)); + map(0xeb8000, 0xebffff).rw(FUNC(x68k_state::x68k_spriteram_r), FUNC(x68k_state::x68k_spriteram_w)); + map(0xece000, 0xece3ff).rw(FUNC(x68k_state::x68k_exp_r), FUNC(x68k_state::x68k_exp_w)); // User I/O + map(0xed0000, 0xed3fff).rw(FUNC(x68k_state::x68k_sram_r), FUNC(x68k_state::x68k_sram_w)); map(0xed4000, 0xefffff).noprw(); map(0xf00000, 0xfbffff).rom(); map(0xfc0000, 0xfdffff).rom(); // internal SCSI ROM diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp index 2175e47ab1d..b7daa797d0f 100644 --- a/src/mame/drivers/xain.cpp +++ b/src/mame/drivers/xain.cpp @@ -304,23 +304,23 @@ template WRITE8_MEMBER(xain_state::scrolly_w) void xain_state::bootleg_map(address_map &map) { map(0x0000, 0x1fff).ram().share("share1"); - map(0x2000, 0x27ff).ram().w(this, FUNC(xain_state::charram_w)).share(m_charram); - map(0x2800, 0x2fff).ram().w(this, FUNC(xain_state::bgram_w<1>)).share(m_bgram[1]); - map(0x3000, 0x37ff).ram().w(this, FUNC(xain_state::bgram_w<0>)).share(m_bgram[0]); + map(0x2000, 0x27ff).ram().w(FUNC(xain_state::charram_w)).share(m_charram); + map(0x2800, 0x2fff).ram().w(FUNC(xain_state::bgram_w<1>)).share(m_bgram[1]); + map(0x3000, 0x37ff).ram().w(FUNC(xain_state::bgram_w<0>)).share(m_bgram[0]); map(0x3800, 0x397f).ram().share(m_spriteram); map(0x3a00, 0x3a00).portr("P1"); - map(0x3a00, 0x3a01).w(this, FUNC(xain_state::scrollx_w<1>)); + map(0x3a00, 0x3a01).w(FUNC(xain_state::scrollx_w<1>)); map(0x3a01, 0x3a01).portr("P2"); map(0x3a02, 0x3a02).portr("DSW0"); - map(0x3a02, 0x3a03).w(this, FUNC(xain_state::scrolly_w<1>)); + map(0x3a02, 0x3a03).w(FUNC(xain_state::scrolly_w<1>)); map(0x3a03, 0x3a03).portr("DSW1"); - map(0x3a04, 0x3a05).w(this, FUNC(xain_state::scrollx_w<0>)); + map(0x3a04, 0x3a05).w(FUNC(xain_state::scrollx_w<0>)); map(0x3a05, 0x3a05).portr("VBLANK"); - map(0x3a06, 0x3a07).w(this, FUNC(xain_state::scrolly_w<0>)); + map(0x3a06, 0x3a07).w(FUNC(xain_state::scrolly_w<0>)); map(0x3a08, 0x3a08).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x3a09, 0x3a0c).w(this, FUNC(xain_state::main_irq_w)); - map(0x3a0d, 0x3a0d).w(this, FUNC(xain_state::flipscreen_w)); - map(0x3a0f, 0x3a0f).w(this, FUNC(xain_state::cpuA_bankswitch_w)); + map(0x3a09, 0x3a0c).w(FUNC(xain_state::main_irq_w)); + map(0x3a0d, 0x3a0d).w(FUNC(xain_state::flipscreen_w)); + map(0x3a0f, 0x3a0f).w(FUNC(xain_state::cpuA_bankswitch_w)); map(0x3c00, 0x3dff).w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x3e00, 0x3fff).w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext"); map(0x4000, 0x7fff).bankr(m_rom_banks[0]); @@ -331,16 +331,16 @@ void xain_state::main_map(address_map &map) { bootleg_map(map); map(0x3a04, 0x3a04).r(m_mcu, FUNC(taito68705_mcu_device::data_r)); - map(0x3a06, 0x3a06).r(this, FUNC(xain_state::mcu_comm_reset_r)); + map(0x3a06, 0x3a06).r(FUNC(xain_state::mcu_comm_reset_r)); map(0x3a0e, 0x3a0e).w(m_mcu, FUNC(taito68705_mcu_device::data_w)); } void xain_state::cpu_map_B(address_map &map) { map(0x0000, 0x1fff).ram().share("share1"); - map(0x2000, 0x2000).w(this, FUNC(xain_state::irqA_assert_w)); - map(0x2800, 0x2800).w(this, FUNC(xain_state::irqB_clear_w)); - map(0x3000, 0x3000).w(this, FUNC(xain_state::cpuB_bankswitch_w)); + map(0x2000, 0x2000).w(FUNC(xain_state::irqA_assert_w)); + map(0x2800, 0x2800).w(FUNC(xain_state::irqB_clear_w)); + map(0x3000, 0x3000).w(FUNC(xain_state::cpuB_bankswitch_w)); map(0x4000, 0x7fff).bankr(m_rom_banks[1]); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index a8dfd9f3828..e6a446b0d7a 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -279,8 +279,8 @@ WRITE8_MEMBER(xavix_state::main2_w) void xavix_state::xavix_map(address_map &map) { - map(0x000000, 0x7fffff).rw(this, FUNC(xavix_state::main_r), FUNC(xavix_state::main_w)); - map(0x800000, 0xffffff).rw(this, FUNC(xavix_state::main2_r), FUNC(xavix_state::main2_w)); + map(0x000000, 0x7fffff).rw(FUNC(xavix_state::main_r), FUNC(xavix_state::main_w)); + map(0x800000, 0xffffff).rw(FUNC(xavix_state::main2_r), FUNC(xavix_state::main2_w)); } void xavix_state::xavix_lowbus_map(address_map &map) @@ -290,7 +290,7 @@ void xavix_state::xavix_lowbus_map(address_map &map) // this might not be a real area, the tilemap base register gets set to 0x40 in monster truck service mode, and expects a fixed layout. // As that would point at this address maybe said layout is being read from here, or maybe it's just a magic tilemap register value that doesn't read address space at all. - map(0x4000, 0x41ff).r(this, FUNC(xavix_state::xavix_4000_r)); + map(0x4000, 0x41ff).r(FUNC(xavix_state::xavix_4000_r)); // 6xxx ranges are the video hardware // appears to be 256 sprites @@ -306,105 +306,105 @@ void xavix_state::xavix_lowbus_map(address_map &map) map(0x6900, 0x69ff).ram().share("palram2"); // startup (taitons1) map(0x6a00, 0x6a1f).ram().share("spr_attra"); // test mode, pass flag 0x20 - map(0x6fc0, 0x6fc0).w(this, FUNC(xavix_state::xavix_6fc0_w)); // startup (maybe this is a mirror of tmap1_regs_w) + map(0x6fc0, 0x6fc0).w(FUNC(xavix_state::xavix_6fc0_w)); // startup (maybe this is a mirror of tmap1_regs_w) - map(0x6fc8, 0x6fcf).w(this, FUNC(xavix_state::tmap1_regs_w)); // video registers + map(0x6fc8, 0x6fcf).w(FUNC(xavix_state::tmap1_regs_w)); // video registers - map(0x6fd0, 0x6fd7).rw(this, FUNC(xavix_state::tmap2_regs_r), FUNC(xavix_state::tmap2_regs_w)); - map(0x6fd8, 0x6fd8).w(this, FUNC(xavix_state::xavix_6fd8_w)); // startup (mirror of tmap2_regs_w?) + map(0x6fd0, 0x6fd7).rw(FUNC(xavix_state::tmap2_regs_r), FUNC(xavix_state::tmap2_regs_w)); + map(0x6fd8, 0x6fd8).w(FUNC(xavix_state::xavix_6fd8_w)); // startup (mirror of tmap2_regs_w?) - map(0x6fe0, 0x6fe0).rw(this, FUNC(xavix_state::vid_dma_trigger_r), FUNC(xavix_state::vid_dma_trigger_w)); // after writing to 6fe1/6fe2 and 6fe5/6fe6 rad_mtrk writes 0x43/0x44 here then polls on 0x40 (see function call at c273) write values are hardcoded, similar code at 18401 - map(0x6fe1, 0x6fe2).w(this, FUNC(xavix_state::vid_dma_params_1_w)); - map(0x6fe5, 0x6fe6).w(this, FUNC(xavix_state::vid_dma_params_2_w)); + map(0x6fe0, 0x6fe0).rw(FUNC(xavix_state::vid_dma_trigger_r), FUNC(xavix_state::vid_dma_trigger_w)); // after writing to 6fe1/6fe2 and 6fe5/6fe6 rad_mtrk writes 0x43/0x44 here then polls on 0x40 (see function call at c273) write values are hardcoded, similar code at 18401 + map(0x6fe1, 0x6fe2).w(FUNC(xavix_state::vid_dma_params_1_w)); + map(0x6fe5, 0x6fe6).w(FUNC(xavix_state::vid_dma_params_2_w)); // function in rad_mtrk at 0184b7 uses this - map(0x6fe8, 0x6fe8).rw(this, FUNC(xavix_state::xavix_6fe8_r), FUNC(xavix_state::xavix_6fe8_w)); // r/w tested - map(0x6fe9, 0x6fe9).rw(this, FUNC(xavix_state::xavix_6fe9_r), FUNC(xavix_state::xavix_6fe9_w)); // r/w tested - map(0x6fea, 0x6fea).w(this, FUNC(xavix_state::xavix_6fea_w)); + map(0x6fe8, 0x6fe8).rw(FUNC(xavix_state::xavix_6fe8_r), FUNC(xavix_state::xavix_6fe8_w)); // r/w tested + map(0x6fe9, 0x6fe9).rw(FUNC(xavix_state::xavix_6fe9_r), FUNC(xavix_state::xavix_6fe9_w)); // r/w tested + map(0x6fea, 0x6fea).w(FUNC(xavix_state::xavix_6fea_w)); - map(0x6ff0, 0x6ff0).rw(this, FUNC(xavix_state::xavix_6ff0_r), FUNC(xavix_state::xavix_6ff0_w)); // r/w tested - map(0x6ff1, 0x6ff1).w(this, FUNC(xavix_state::xavix_6ff1_w)); // startup - cleared in interrupt 0 - map(0x6ff2, 0x6ff2).w(this, FUNC(xavix_state::xavix_6ff2_w)); // set to 07 after clearing above things in interrupt 0 + map(0x6ff0, 0x6ff0).rw(FUNC(xavix_state::xavix_6ff0_r), FUNC(xavix_state::xavix_6ff0_w)); // r/w tested + map(0x6ff1, 0x6ff1).w(FUNC(xavix_state::xavix_6ff1_w)); // startup - cleared in interrupt 0 + map(0x6ff2, 0x6ff2).w(FUNC(xavix_state::xavix_6ff2_w)); // set to 07 after clearing above things in interrupt 0 - map(0x6ff8, 0x6ff8).rw(this, FUNC(xavix_state::xavix_6ff8_r), FUNC(xavix_state::xavix_6ff8_w)); // always seems to be a read/store or read/modify/store - map(0x6ff9, 0x6ff9).r(this, FUNC(xavix_state::pal_ntsc_r)); - map(0x6ffa, 0x6ffa).w(this, FUNC(xavix_state::xavix_6ffa_w)); - map(0x6ffb, 0x6ffb).w(this, FUNC(xavix_state::xavix_6ffb_w)); // increases / decreases when you jump in snowboard, maybe raster irq pos or part of a clipping window? + map(0x6ff8, 0x6ff8).rw(FUNC(xavix_state::xavix_6ff8_r), FUNC(xavix_state::xavix_6ff8_w)); // always seems to be a read/store or read/modify/store + map(0x6ff9, 0x6ff9).r(FUNC(xavix_state::pal_ntsc_r)); + map(0x6ffa, 0x6ffa).w(FUNC(xavix_state::xavix_6ffa_w)); + map(0x6ffb, 0x6ffb).w(FUNC(xavix_state::xavix_6ffb_w)); // increases / decreases when you jump in snowboard, maybe raster irq pos or part of a clipping window? // 7xxx ranges system controller? - map(0x75f0, 0x75f0).rw(this, FUNC(xavix_state::xavix_75f0_r), FUNC(xavix_state::xavix_75f0_w)); // r/w tested read/written 8 times in a row - map(0x75f1, 0x75f1).rw(this, FUNC(xavix_state::xavix_75f1_r), FUNC(xavix_state::xavix_75f1_w)); // r/w tested read/written 8 times in a row + map(0x75f0, 0x75f0).rw(FUNC(xavix_state::xavix_75f0_r), FUNC(xavix_state::xavix_75f0_w)); // r/w tested read/written 8 times in a row + map(0x75f1, 0x75f1).rw(FUNC(xavix_state::xavix_75f1_r), FUNC(xavix_state::xavix_75f1_w)); // r/w tested read/written 8 times in a row map(0x75f3, 0x75f3).ram(); - map(0x75f4, 0x75f4).r(this, FUNC(xavix_state::xavix_75f4_r)); // related to 75f0 (read after writing there - rad_mtrk) - map(0x75f5, 0x75f5).r(this, FUNC(xavix_state::xavix_75f5_r)); // related to 75f1 (read after writing there - rad_mtrk) + map(0x75f4, 0x75f4).r(FUNC(xavix_state::xavix_75f4_r)); // related to 75f0 (read after writing there - rad_mtrk) + map(0x75f5, 0x75f5).r(FUNC(xavix_state::xavix_75f5_r)); // related to 75f1 (read after writing there - rad_mtrk) // taitons1 after 75f7/75f8 - map(0x75f6, 0x75f6).rw(this, FUNC(xavix_state::xavix_75f6_r), FUNC(xavix_state::xavix_75f6_w)); // r/w tested + map(0x75f6, 0x75f6).rw(FUNC(xavix_state::xavix_75f6_r), FUNC(xavix_state::xavix_75f6_w)); // r/w tested // taitons1 written as a pair - map(0x75f7, 0x75f7).w(this, FUNC(xavix_state::xavix_75f7_w)); - map(0x75f8, 0x75f8).rw(this, FUNC(xavix_state::xavix_75f8_r), FUNC(xavix_state::xavix_75f8_w)); // r/w tested + map(0x75f7, 0x75f7).w(FUNC(xavix_state::xavix_75f7_w)); + map(0x75f8, 0x75f8).rw(FUNC(xavix_state::xavix_75f8_r), FUNC(xavix_state::xavix_75f8_w)); // r/w tested // taitons1 written after 75f6, then read - map(0x75f9, 0x75f9).rw(this, FUNC(xavix_state::xavix_75f9_r), FUNC(xavix_state::xavix_75f9_w)); + map(0x75f9, 0x75f9).rw(FUNC(xavix_state::xavix_75f9_r), FUNC(xavix_state::xavix_75f9_w)); // at another time - map(0x75fa, 0x75fa).rw(this, FUNC(xavix_state::xavix_75fa_r), FUNC(xavix_state::xavix_75fa_w)); // r/w tested - map(0x75fb, 0x75fb).rw(this, FUNC(xavix_state::xavix_75fb_r), FUNC(xavix_state::xavix_75fb_w)); // r/w tested - map(0x75fc, 0x75fc).rw(this, FUNC(xavix_state::xavix_75fc_r), FUNC(xavix_state::xavix_75fc_w)); // r/w tested - map(0x75fd, 0x75fd).rw(this, FUNC(xavix_state::xavix_75fd_r), FUNC(xavix_state::xavix_75fd_w)); // r/w tested - map(0x75fe, 0x75fe).w(this, FUNC(xavix_state::xavix_75fe_w)); + map(0x75fa, 0x75fa).rw(FUNC(xavix_state::xavix_75fa_r), FUNC(xavix_state::xavix_75fa_w)); // r/w tested + map(0x75fb, 0x75fb).rw(FUNC(xavix_state::xavix_75fb_r), FUNC(xavix_state::xavix_75fb_w)); // r/w tested + map(0x75fc, 0x75fc).rw(FUNC(xavix_state::xavix_75fc_r), FUNC(xavix_state::xavix_75fc_w)); // r/w tested + map(0x75fd, 0x75fd).rw(FUNC(xavix_state::xavix_75fd_r), FUNC(xavix_state::xavix_75fd_w)); // r/w tested + map(0x75fe, 0x75fe).w(FUNC(xavix_state::xavix_75fe_w)); // taitons1 written other 75xx operations - map(0x75ff, 0x75ff).w(this, FUNC(xavix_state::xavix_75ff_w)); + map(0x75ff, 0x75ff).w(FUNC(xavix_state::xavix_75ff_w)); - map(0x7810, 0x7810).w(this, FUNC(xavix_state::xavix_7810_w)); // startup + map(0x7810, 0x7810).w(FUNC(xavix_state::xavix_7810_w)); // startup - map(0x7900, 0x7900).w(this, FUNC(xavix_state::xavix_7900_w)); - map(0x7901, 0x7901).w(this, FUNC(xavix_state::xavix_7901_w)); - map(0x7902, 0x7902).w(this, FUNC(xavix_state::xavix_7902_w)); + map(0x7900, 0x7900).w(FUNC(xavix_state::xavix_7900_w)); + map(0x7901, 0x7901).w(FUNC(xavix_state::xavix_7901_w)); + map(0x7902, 0x7902).w(FUNC(xavix_state::xavix_7902_w)); // DMA trigger for below (written after the others) waits on status of bit 1 in a loop - map(0x7980, 0x7980).rw(this, FUNC(xavix_state::dma_trigger_r), FUNC(xavix_state::dma_trigger_w)); + map(0x7980, 0x7980).rw(FUNC(xavix_state::dma_trigger_r), FUNC(xavix_state::dma_trigger_w)); // DMA source - map(0x7981, 0x7981).w(this, FUNC(xavix_state::rom_dmasrc_lo_w)); - map(0x7982, 0x7982).w(this, FUNC(xavix_state::rom_dmasrc_md_w)); - map(0x7983, 0x7983).w(this, FUNC(xavix_state::rom_dmasrc_hi_w)); + map(0x7981, 0x7981).w(FUNC(xavix_state::rom_dmasrc_lo_w)); + map(0x7982, 0x7982).w(FUNC(xavix_state::rom_dmasrc_md_w)); + map(0x7983, 0x7983).w(FUNC(xavix_state::rom_dmasrc_hi_w)); // DMA dest - map(0x7984, 0x7984).w(this, FUNC(xavix_state::rom_dmadst_lo_w)); - map(0x7985, 0x7985).w(this, FUNC(xavix_state::rom_dmadst_hi_w)); + map(0x7984, 0x7984).w(FUNC(xavix_state::rom_dmadst_lo_w)); + map(0x7985, 0x7985).w(FUNC(xavix_state::rom_dmadst_hi_w)); // DMA length - map(0x7986, 0x7986).w(this, FUNC(xavix_state::rom_dmalen_lo_w)); - map(0x7987, 0x7987).w(this, FUNC(xavix_state::rom_dmalen_hi_w)); + map(0x7986, 0x7986).w(FUNC(xavix_state::rom_dmalen_lo_w)); + map(0x7987, 0x7987).w(FUNC(xavix_state::rom_dmalen_hi_w)); // GPIO stuff - map(0x7a00, 0x7a00).rw(this, FUNC(xavix_state::xavix_io_0_r),FUNC(xavix_state::xavix_7a00_w)); - map(0x7a01, 0x7a01).rw(this, FUNC(xavix_state::xavix_io_1_r),FUNC(xavix_state::xavix_7a01_w)); // startup (taitons1) - map(0x7a02, 0x7a02).rw(this, FUNC(xavix_state::xavix_7a02_r),FUNC(xavix_state::xavix_7a02_w)); // startup, gets set to 20, 7a00 is then also written with 20 - map(0x7a03, 0x7a03).rw(this, FUNC(xavix_state::xavix_7a03_r),FUNC(xavix_state::xavix_7a03_w)); // startup (gets set to 84 which is the same as the bits checked on 7a01, possible port direction register?) + map(0x7a00, 0x7a00).rw(FUNC(xavix_state::xavix_io_0_r),FUNC(xavix_state::xavix_7a00_w)); + map(0x7a01, 0x7a01).rw(FUNC(xavix_state::xavix_io_1_r),FUNC(xavix_state::xavix_7a01_w)); // startup (taitons1) + map(0x7a02, 0x7a02).rw(FUNC(xavix_state::xavix_7a02_r),FUNC(xavix_state::xavix_7a02_w)); // startup, gets set to 20, 7a00 is then also written with 20 + map(0x7a03, 0x7a03).rw(FUNC(xavix_state::xavix_7a03_r),FUNC(xavix_state::xavix_7a03_w)); // startup (gets set to 84 which is the same as the bits checked on 7a01, possible port direction register?) - map(0x7a80, 0x7a80).w(this, FUNC(xavix_state::xavix_7a80_w)); // still IO? ADC related? + map(0x7a80, 0x7a80).w(FUNC(xavix_state::xavix_7a80_w)); // still IO? ADC related? - map(0x7b00, 0x7b00).w(this, FUNC(xavix_state::xavix_7b00_w)); // rad_snow (not often) + map(0x7b00, 0x7b00).w(FUNC(xavix_state::xavix_7b00_w)); // rad_snow (not often) - map(0x7b80, 0x7b80).rw(this, FUNC(xavix_state::xavix_7b80_r), FUNC(xavix_state::xavix_7b80_w)); // rad_snow (not often) - map(0x7b81, 0x7b81).w(this, FUNC(xavix_state::xavix_7b81_w)); // written (often, m_trck, analog related?) + map(0x7b80, 0x7b80).rw(FUNC(xavix_state::xavix_7b80_r), FUNC(xavix_state::xavix_7b80_w)); // rad_snow (not often) + map(0x7b81, 0x7b81).w(FUNC(xavix_state::xavix_7b81_w)); // written (often, m_trck, analog related?) - map(0x7c00, 0x7c00).w(this, FUNC(xavix_state::xavix_7c00_w)); - map(0x7c01, 0x7c01).rw(this, FUNC(xavix_state::xavix_7c01_r), FUNC(xavix_state::xavix_7c01_w)); // r/w tested - map(0x7c02, 0x7c02).w(this, FUNC(xavix_state::xavix_7c02_w)); + map(0x7c00, 0x7c00).w(FUNC(xavix_state::xavix_7c00_w)); + map(0x7c01, 0x7c01).rw(FUNC(xavix_state::xavix_7c01_r), FUNC(xavix_state::xavix_7c01_w)); // r/w tested + map(0x7c02, 0x7c02).w(FUNC(xavix_state::xavix_7c02_w)); // this is a multiplication chip - map(0x7ff2, 0x7ff4).w(this, FUNC(xavix_state::mult_param_w)); - map(0x7ff5, 0x7ff6).rw(this, FUNC(xavix_state::mult_r), FUNC(xavix_state::mult_w)); + map(0x7ff2, 0x7ff4).w(FUNC(xavix_state::mult_param_w)); + map(0x7ff5, 0x7ff6).rw(FUNC(xavix_state::mult_r), FUNC(xavix_state::mult_w)); // maybe irq enable, written after below - map(0x7ff9, 0x7ff9).w(this, FUNC(xavix_state::irq_enable_w)); // interrupt related, but probalby not a simple 'enable' otherwise interrupts happen before we're ready for them. + map(0x7ff9, 0x7ff9).w(FUNC(xavix_state::irq_enable_w)); // interrupt related, but probalby not a simple 'enable' otherwise interrupts happen before we're ready for them. // an IRQ vector (nmi?) - map(0x7ffa, 0x7ffa).w(this, FUNC(xavix_state::irq_vector0_lo_w)); - map(0x7ffb, 0x7ffb).w(this, FUNC(xavix_state::irq_vector0_hi_w)); + map(0x7ffa, 0x7ffa).w(FUNC(xavix_state::irq_vector0_lo_w)); + map(0x7ffb, 0x7ffb).w(FUNC(xavix_state::irq_vector0_hi_w)); - map(0x7ffc, 0x7ffc).rw(this, FUNC(xavix_state::irq_source_r), FUNC(xavix_state::irq_source_w)); + map(0x7ffc, 0x7ffc).rw(FUNC(xavix_state::irq_source_r), FUNC(xavix_state::irq_source_w)); // an IRQ vector (irq?) - map(0x7ffe, 0x7ffe).w(this, FUNC(xavix_state::irq_vector1_lo_w)); - map(0x7fff, 0x7fff).w(this, FUNC(xavix_state::irq_vector1_hi_w)); + map(0x7ffe, 0x7ffe).w(FUNC(xavix_state::irq_vector1_lo_w)); + map(0x7fff, 0x7fff).w(FUNC(xavix_state::irq_vector1_hi_w)); } static INPUT_PORTS_START( xavix ) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index 629d118ca6a..0eac26ca43e 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -178,8 +178,8 @@ void xerox820_state::xerox820_io(address_map &map) map(0x04, 0x07).mirror(0xff00).rw(m_sio, FUNC(z80sio0_device::ba_cd_r), FUNC(z80sio0_device::ba_cd_w)); map(0x08, 0x0b).mirror(0xff00).rw(Z80PIO_GP_TAG, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); map(0x0c, 0x0c).mirror(0xff03).w(COM8116_TAG, FUNC(com8116_device::stt_w)); - map(0x10, 0x13).mirror(0xff00).rw(this, FUNC(xerox820_state::fdc_r), FUNC(xerox820_state::fdc_w)); - map(0x14, 0x14).mirror(0x0003).select(0xff00).w(this, FUNC(xerox820_state::scroll_w)); + map(0x10, 0x13).mirror(0xff00).rw(FUNC(xerox820_state::fdc_r), FUNC(xerox820_state::fdc_w)); + map(0x14, 0x14).mirror(0x0003).select(0xff00).w(FUNC(xerox820_state::scroll_w)); map(0x18, 0x1b).mirror(0xff00).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0x1c, 0x1f).mirror(0xff00).rw(m_kbpio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); } @@ -194,11 +194,11 @@ void xerox820ii_state::xerox820ii_mem(address_map &map) void xerox820ii_state::xerox820ii_io(address_map &map) { xerox820_io(map); - map(0x28, 0x29).mirror(0xff00).w(this, FUNC(xerox820ii_state::bell_w)); - map(0x30, 0x31).mirror(0xff00).w(this, FUNC(xerox820ii_state::slden_w)); - map(0x34, 0x35).mirror(0xff00).w(this, FUNC(xerox820ii_state::chrom_w)); - map(0x36, 0x36).mirror(0xff00).w(this, FUNC(xerox820ii_state::lowlite_w)); - map(0x68, 0x69).mirror(0xff00).w(this, FUNC(xerox820ii_state::sync_w)); + map(0x28, 0x29).mirror(0xff00).w(FUNC(xerox820ii_state::bell_w)); + map(0x30, 0x31).mirror(0xff00).w(FUNC(xerox820ii_state::slden_w)); + map(0x34, 0x35).mirror(0xff00).w(FUNC(xerox820ii_state::chrom_w)); + map(0x36, 0x36).mirror(0xff00).w(FUNC(xerox820ii_state::lowlite_w)); + map(0x68, 0x69).mirror(0xff00).w(FUNC(xerox820ii_state::sync_w)); } void xerox820ii_state::xerox168_mem(address_map &map) @@ -711,10 +711,10 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) MCFG_DEVICE_ADD(Z80PIO_RD_TAG, Z80PIO, 20_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_Z80PIO_IN_PA_CB(READ8("sasi_data_in", input_buffer_device, read)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8("sasi_data_out", output_latch_device, write)) + MCFG_Z80PIO_IN_PA_CB(READ8("sasi_data_in", input_buffer_device, bus_r)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8("sasi_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, xerox820ii_state, rdpio_pardy_w)) - MCFG_Z80PIO_IN_PB_CB(READ8("sasi_ctrl_in", input_buffer_device, read)) + MCFG_Z80PIO_IN_PB_CB(READ8("sasi_ctrl_in", input_buffer_device, bus_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, xerox820ii_state, rdpio_pb_w)) MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 16_MHz_XTAL / 4) diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp index 53b5c956ed4..6b5f2fcee3e 100644 --- a/src/mame/drivers/xexex.cpp +++ b/src/mame/drivers/xexex.cpp @@ -343,11 +343,11 @@ void xexex_state::main_map(address_map &map) map(0x080000, 0x08ffff).ram().share("workram"); // work RAM #if XE_SKIPIDLE - map(0x080014, 0x080015).r(this, FUNC(xexex_state::xexex_waitskip_r)); // helps sound CPU by giving back control as early as possible + map(0x080014, 0x080015).r(FUNC(xexex_state::xexex_waitskip_r)); // helps sound CPU by giving back control as early as possible #endif map(0x090000, 0x097fff).ram().share("spriteram"); // K053247 sprite RAM - map(0x098000, 0x09ffff).rw(this, FUNC(xexex_state::spriteram_mirror_r), FUNC(xexex_state::spriteram_mirror_w)); // K053247 sprite RAM mirror read + map(0x098000, 0x09ffff).rw(FUNC(xexex_state::spriteram_mirror_r), FUNC(xexex_state::spriteram_mirror_w)); // K053247 sprite RAM mirror read map(0x0c0000, 0x0c003f).w(m_k056832, FUNC(k056832_device::word_w)); // VACSET (K054157) map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_word_w)); // OBJSET1 map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_word_r)); // Passthrough to sprite roms @@ -356,14 +356,14 @@ void xexex_state::main_map(address_map &map) map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); // CLTC map(0x0cc000, 0x0cc01f).w(m_k053251, FUNC(k053251_device::lsb_w)); // priority encoder // AM_RANGE(0x0d0000, 0x0d001f) AM_DEVREADWRITE8("k053252", k053252_device, read, write, 0x00ff) // CCU - map(0x0d4000, 0x0d4001).w(this, FUNC(xexex_state::sound_irq_w)); + map(0x0d4000, 0x0d4001).w(FUNC(xexex_state::sound_irq_w)); map(0x0d6000, 0x0d601f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x0d8000, 0x0d8007).w(m_k056832, FUNC(k056832_device::b_word_w)); // VSCCS regs map(0x0da000, 0x0da001).portr("P1"); map(0x0da002, 0x0da003).portr("P2"); map(0x0dc000, 0x0dc001).portr("SYSTEM"); map(0x0dc002, 0x0dc003).portr("EEPROM"); - map(0x0de000, 0x0de001).rw(this, FUNC(xexex_state::control2_r), FUNC(xexex_state::control2_w)); + map(0x0de000, 0x0de001).rw(FUNC(xexex_state::control2_r), FUNC(xexex_state::control2_w)); map(0x100000, 0x17ffff).rom(); map(0x180000, 0x181fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); map(0x182000, 0x183fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); @@ -390,7 +390,7 @@ void xexex_state::sound_map(address_map &map) map(0xe000, 0xe22f).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)); map(0xec00, 0xec01).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map)); - map(0xf800, 0xf800).w(this, FUNC(xexex_state::sound_bankswitch_w)); + map(0xf800, 0xf800).w(FUNC(xexex_state::sound_bankswitch_w)); } diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index beed0af6d52..2cf9fd4dd83 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -84,7 +84,7 @@ void xmen_state::main_map(address_map &map) map(0x100000, 0x100fff).rw(m_k053246, FUNC(k053247_device::k053247_word_r), FUNC(k053247_device::k053247_word_w)); map(0x101000, 0x101fff).ram(); map(0x104000, 0x104fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x108000, 0x108001).w(this, FUNC(xmen_state::eeprom_w)); + map(0x108000, 0x108001).w(FUNC(xmen_state::eeprom_w)); map(0x108020, 0x108027).w(m_k053246, FUNC(k053247_device::k053246_word_w)); map(0x108040, 0x10805f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x108060, 0x10807f).w(m_k053251, FUNC(k053251_device::lsb_w)); @@ -94,7 +94,7 @@ void xmen_state::main_map(address_map &map) map(0x10a00c, 0x10a00d).r(m_k053246, FUNC(k053247_device::k053246_word_r)); map(0x110000, 0x113fff).ram(); /* main RAM */ map(0x18c000, 0x197fff).rw(m_k052109, FUNC(k052109_device::lsb_r), FUNC(k052109_device::lsb_w)); - map(0x18fa00, 0x18fa01).w(this, FUNC(xmen_state::xmen_18fa00_w)); + map(0x18fa00, 0x18fa01).w(FUNC(xmen_state::xmen_18fa00_w)); } void xmen_state::sound_map(address_map &map) @@ -105,7 +105,7 @@ void xmen_state::sound_map(address_map &map) map(0xe000, 0xe22f).rw(m_k054539, FUNC(k054539_device::read), FUNC(k054539_device::write)); map(0xe800, 0xe801).mirror(0x0400).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0xf000, 0xf003).m(m_k054321, FUNC(k054321_device::sound_map)); - map(0xf800, 0xf800).w(this, FUNC(xmen_state::sound_bankswitch_w)); + map(0xf800, 0xf800).w(FUNC(xmen_state::sound_bankswitch_w)); } @@ -118,7 +118,7 @@ void xmen_state::_6p_main_map(address_map &map) map(0x102000, 0x102fff).ram().share("spriteramright"); /* sprites (screen 2) */ map(0x103000, 0x103fff).ram(); /* 6p - a buffer? */ map(0x104000, 0x104fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x108000, 0x108001).w(this, FUNC(xmen_state::eeprom_w)); + map(0x108000, 0x108001).w(FUNC(xmen_state::eeprom_w)); map(0x108020, 0x108027).w(m_k053246, FUNC(k053247_device::k053246_word_w)); /* sprites */ map(0x108040, 0x10805f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x108060, 0x10807f).w(m_k053251, FUNC(k053251_device::lsb_w)); @@ -130,7 +130,7 @@ void xmen_state::_6p_main_map(address_map &map) map(0x110000, 0x113fff).ram(); /* main RAM */ /* map(0x18c000, 0x197fff).w("k052109", FUNC(k052109_device:lsb_w)).share("tilemapleft"); */ map(0x18c000, 0x197fff).ram().share("tilemapleft"); /* left tilemap (p1,p2,p3 counters) */ - map(0x18fa00, 0x18fa01).w(this, FUNC(xmen_state::xmen_18fa00_w)); + map(0x18fa00, 0x18fa01).w(FUNC(xmen_state::xmen_18fa00_w)); /* map(0x1ac000, 0x1af7ff).readonly(); map(0x1ac000, 0x1af7ff).writeonly(); diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp index c13d67305d3..4860610e51f 100644 --- a/src/mame/drivers/xor100.cpp +++ b/src/mame/drivers/xor100.cpp @@ -159,8 +159,8 @@ READ8_MEMBER( xor100_state::prom_disable_r ) WRITE8_MEMBER( xor100_state::baud_w ) { - m_dbrg->str_w(data & 0x0f); - m_dbrg->stt_w(data >> 4); + m_dbrg->write_str(data & 0x0f); + m_dbrg->write_stt(data >> 4); } READ8_MEMBER( xor100_state::fdc_r ) @@ -277,14 +277,14 @@ void xor100_state::xor100_io(address_map &map) map(0x02, 0x02).rw(m_uart_b, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x03, 0x03).rw(m_uart_b, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x04, 0x07).rw(I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0x08, 0x08).w(this, FUNC(xor100_state::mmu_w)); - map(0x09, 0x09).w(this, FUNC(xor100_state::prom_toggle_w)); - map(0x0a, 0x0a).r(this, FUNC(xor100_state::prom_disable_r)); - map(0x0b, 0x0b).portr("DSW0").w(this, FUNC(xor100_state::baud_w)); + map(0x08, 0x08).w(FUNC(xor100_state::mmu_w)); + map(0x09, 0x09).w(FUNC(xor100_state::prom_toggle_w)); + map(0x0a, 0x0a).r(FUNC(xor100_state::prom_disable_r)); + map(0x0b, 0x0b).portr("DSW0").w(FUNC(xor100_state::baud_w)); map(0x0c, 0x0f).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0xf8, 0xfb).rw(this, FUNC(xor100_state::fdc_r), FUNC(xor100_state::fdc_w)); - map(0xfc, 0xfc).rw(this, FUNC(xor100_state::fdc_wait_r), FUNC(xor100_state::fdc_dcont_w)); - map(0xfd, 0xfd).w(this, FUNC(xor100_state::fdc_dsel_w)); + map(0xf8, 0xfb).rw(FUNC(xor100_state::fdc_r), FUNC(xor100_state::fdc_w)); + map(0xfc, 0xfc).rw(FUNC(xor100_state::fdc_wait_r), FUNC(xor100_state::fdc_dcont_w)); + map(0xfd, 0xfd).w(FUNC(xor100_state::fdc_dsel_w)); } /* Input Ports */ @@ -541,7 +541,7 @@ MACHINE_CONFIG_START(xor100_state::xor100) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_B_TAG, i8251_device, write_rxc)) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_I8255_OUT_PORTB_CB(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) MCFG_I8255_IN_PORTC_CB(READ8(*this, xor100_state, i8255_pc_r)) diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp index 514577c69a7..921f8b6c4a7 100644 --- a/src/mame/drivers/xorworld.cpp +++ b/src/mame/drivers/xorworld.cpp @@ -69,10 +69,10 @@ void xorworld_state::xorworld_map(address_map &map) map(0x600000, 0x600001).portr("DSW"); map(0x800000, 0x800003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff); map(0xa00000, 0xa0000f).w("mainlatch", FUNC(ls259_device::write_d0)).umask16(0x00ff); - map(0xffc000, 0xffc7ff).ram().w(this, FUNC(xorworld_state::videoram_w)).share("videoram"); + map(0xffc000, 0xffc7ff).ram().w(FUNC(xorworld_state::videoram_w)).share("videoram"); map(0xffc800, 0xffc87f).ram().share("spriteram"); - map(0xffc880, 0xffc881).w(this, FUNC(xorworld_state::irq2_ack_w)).nopr(); - map(0xffc882, 0xffc883).w(this, FUNC(xorworld_state::irq6_ack_w)).nopr(); + map(0xffc880, 0xffc881).w(FUNC(xorworld_state::irq2_ack_w)).nopr(); + map(0xffc882, 0xffc883).w(FUNC(xorworld_state::irq6_ack_w)).nopr(); map(0xffc884, 0xffffff).ram(); } diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp index d6d64b5cbaf..9aeb374c189 100644 --- a/src/mame/drivers/xtheball.cpp +++ b/src/mame/drivers/xtheball.cpp @@ -195,7 +195,7 @@ void xtheball_state::main_map(address_map &map) map(0x03040000, 0x0304007f).w("latch1", FUNC(hc259_device::write_d0)).umask16(0x00ff); map(0x03040080, 0x0304008f).portr("DSW"); map(0x03040080, 0x030400ff).w("latch2", FUNC(hc259_device::write_d0)).umask16(0x00ff); - map(0x03040100, 0x0304010f).r(this, FUNC(xtheball_state::analogx_r)); + map(0x03040100, 0x0304010f).r(FUNC(xtheball_state::analogx_r)); map(0x03040110, 0x0304011f).portr("COIN1"); map(0x03040130, 0x0304013f).portr("SERVICE2"); map(0x03040140, 0x0304014f).portr("COIN3"); @@ -203,8 +203,8 @@ void xtheball_state::main_map(address_map &map) map(0x03040160, 0x0304016f).portr("SERVICE"); map(0x03040170, 0x0304017f).portr("SERVICE1"); map(0x03040100, 0x0304017f).w("latch3", FUNC(hc259_device::write_d0)).umask16(0x00ff); - map(0x03040180, 0x0304018f).r(this, FUNC(xtheball_state::analogy_watchdog_r)).nopw(); - map(0x03060000, 0x0306000f).w("dac", FUNC(dac_byte_interface::write)).umask16(0xff00); + map(0x03040180, 0x0304018f).r(FUNC(xtheball_state::analogy_watchdog_r)).nopw(); + map(0x03060000, 0x0306000f).w("dac", FUNC(dac_byte_interface::data_w)).umask16(0xff00); map(0x04000000, 0x057fffff).rom().region("user2", 0); map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xfff80000, 0xffffffff).rom().region("user1", 0); diff --git a/src/mame/drivers/xtom3d.cpp b/src/mame/drivers/xtom3d.cpp index a15b5c3e1f2..dd2571f482e 100644 --- a/src/mame/drivers/xtom3d.cpp +++ b/src/mame/drivers/xtom3d.cpp @@ -355,13 +355,13 @@ void xtom3d_state::xtom3d_map(address_map &map) { map(0x00000000, 0x0009ffff).ram(); map(0x000a0000, 0x000bffff).rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w)); - map(0x000c0000, 0x000c3fff).bankr("video_bank1").w(this, FUNC(xtom3d_state::isa_ram1_w)); - map(0x000c4000, 0x000c7fff).bankr("video_bank2").w(this, FUNC(xtom3d_state::isa_ram2_w)); - map(0x000e0000, 0x000e3fff).bankr("bios_ext1").w(this, FUNC(xtom3d_state::bios_ext1_ram_w)); - map(0x000e4000, 0x000e7fff).bankr("bios_ext2").w(this, FUNC(xtom3d_state::bios_ext2_ram_w)); - map(0x000e8000, 0x000ebfff).bankr("bios_ext3").w(this, FUNC(xtom3d_state::bios_ext3_ram_w)); - map(0x000ec000, 0x000effff).bankr("bios_ext4").w(this, FUNC(xtom3d_state::bios_ext4_ram_w)); - map(0x000f0000, 0x000fffff).bankr("bios_bank").w(this, FUNC(xtom3d_state::bios_ram_w)); + map(0x000c0000, 0x000c3fff).bankr("video_bank1").w(FUNC(xtom3d_state::isa_ram1_w)); + map(0x000c4000, 0x000c7fff).bankr("video_bank2").w(FUNC(xtom3d_state::isa_ram2_w)); + map(0x000e0000, 0x000e3fff).bankr("bios_ext1").w(FUNC(xtom3d_state::bios_ext1_ram_w)); + map(0x000e4000, 0x000e7fff).bankr("bios_ext2").w(FUNC(xtom3d_state::bios_ext2_ram_w)); + map(0x000e8000, 0x000ebfff).bankr("bios_ext3").w(FUNC(xtom3d_state::bios_ext3_ram_w)); + map(0x000ec000, 0x000effff).bankr("bios_ext4").w(FUNC(xtom3d_state::bios_ext4_ram_w)); + map(0x000f0000, 0x000fffff).bankr("bios_bank").w(FUNC(xtom3d_state::bios_ram_w)); map(0x00100000, 0x01ffffff).ram(); map(0xfffe0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ } diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp index 22d6fc01770..f59785e2c71 100644 --- a/src/mame/drivers/xxmissio.cpp +++ b/src/mame/drivers/xxmissio.cpp @@ -103,11 +103,11 @@ void xxmissio_state::map1(address_map &map) map(0xa000, 0xa000).portr("P1"); map(0xa001, 0xa001).portr("P2"); map(0xa002, 0xa002).portr("STATUS"); - map(0xa002, 0xa002).w(this, FUNC(xxmissio_state::status_m_w)); - map(0xa003, 0xa003).w(this, FUNC(xxmissio_state::flipscreen_w)); + map(0xa002, 0xa002).w(FUNC(xxmissio_state::status_m_w)); + map(0xa003, 0xa003).w(FUNC(xxmissio_state::flipscreen_w)); map(0xc000, 0xc7ff).ram().share("fgram"); - map(0xc800, 0xcfff).rw(this, FUNC(xxmissio_state::bgram_r), FUNC(xxmissio_state::bgram_w)).share("bgram"); + map(0xc800, 0xcfff).rw(FUNC(xxmissio_state::bgram_r), FUNC(xxmissio_state::bgram_w)).share("bgram"); map(0xd000, 0xd7ff).ram().share("spriteram"); map(0xd800, 0xdaff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); @@ -124,16 +124,16 @@ void xxmissio_state::map2(address_map &map) map(0x8000, 0x8001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0x8002, 0x8003).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); - map(0x8006, 0x8006).w(this, FUNC(xxmissio_state::bank_sel_w)); + map(0x8006, 0x8006).w(FUNC(xxmissio_state::bank_sel_w)); map(0xa000, 0xa000).portr("P1"); map(0xa001, 0xa001).portr("P2"); map(0xa002, 0xa002).portr("STATUS"); - map(0xa002, 0xa002).w(this, FUNC(xxmissio_state::status_s_w)); - map(0xa003, 0xa003).w(this, FUNC(xxmissio_state::flipscreen_w)); + map(0xa002, 0xa002).w(FUNC(xxmissio_state::status_s_w)); + map(0xa003, 0xa003).w(FUNC(xxmissio_state::flipscreen_w)); map(0xc000, 0xc7ff).share("fgram").ram(); - map(0xc800, 0xcfff).share("bgram").rw(this, FUNC(xxmissio_state::bgram_r), FUNC(xxmissio_state::bgram_w)); + map(0xc800, 0xcfff).share("bgram").rw(FUNC(xxmissio_state::bgram_r), FUNC(xxmissio_state::bgram_w)); map(0xd000, 0xd7ff).share("spriteram").ram(); map(0xd800, 0xdaff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp index 9fdda2fbc70..7b6b4752f96 100644 --- a/src/mame/drivers/xybots.cpp +++ b/src/mame/drivers/xybots.cpp @@ -78,11 +78,11 @@ void xybots_state::main_map(address_map &map) map(0x805000, 0x805fff).mirror(0x7f8000).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); map(0x806000, 0x8060ff).mirror(0x7f8000).r(m_jsa, FUNC(atari_jsa_i_device::main_response_r)).umask16(0x00ff); map(0x806100, 0x8061ff).mirror(0x7f8000).portr("FFE100"); - map(0x806200, 0x8062ff).mirror(0x7f8000).r(this, FUNC(xybots_state::special_port1_r)); + map(0x806200, 0x8062ff).mirror(0x7f8000).r(FUNC(xybots_state::special_port1_r)); map(0x806800, 0x8068ff).mirror(0x7f8000).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x806900, 0x8069ff).mirror(0x7f8000).w(m_jsa, FUNC(atari_jsa_i_device::main_command_w)).umask16(0x00ff); map(0x806a00, 0x806aff).mirror(0x7f8000).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x806b00, 0x806bff).mirror(0x7f8000).w(this, FUNC(xybots_state::video_int_ack_w)); + map(0x806b00, 0x806bff).mirror(0x7f8000).w(FUNC(xybots_state::video_int_ack_w)); map(0x806e00, 0x806eff).mirror(0x7f8000).w(m_jsa, FUNC(atari_jsa_i_device::sound_reset_w)); } diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index f8d43a9b88b..6ccec9f0c35 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -166,18 +166,18 @@ void xyonix_state::main_map(address_map &map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xdfff).ram(); - map(0xe000, 0xffff).ram().w(this, FUNC(xyonix_state::vidram_w)).share("vidram"); + map(0xe000, 0xffff).ram().w(FUNC(xyonix_state::vidram_w)).share("vidram"); } void xyonix_state::port_map(address_map &map) { map.global_mask(0xff); - map(0x20, 0x20).nopr().w("sn1", FUNC(sn76496_device::write)); /* SN76496 ready signal */ - map(0x21, 0x21).nopr().w("sn2", FUNC(sn76496_device::write)); - map(0x40, 0x40).w(this, FUNC(xyonix_state::nmiack_w)); - map(0x50, 0x50).w(this, FUNC(xyonix_state::irqack_w)); + map(0x20, 0x20).nopr().w("sn1", FUNC(sn76496_device::command_w)); /* SN76496 ready signal */ + map(0x21, 0x21).nopr().w("sn2", FUNC(sn76496_device::command_w)); + map(0x40, 0x40).w(FUNC(xyonix_state::nmiack_w)); + map(0x50, 0x50).w(FUNC(xyonix_state::irqack_w)); map(0x60, 0x61).nopw(); /* mc6845 */ - map(0xe0, 0xe0).rw(this, FUNC(xyonix_state::io_r), FUNC(xyonix_state::io_w)); + map(0xe0, 0xe0).rw(FUNC(xyonix_state::io_r), FUNC(xyonix_state::io_w)); } /* Inputs Ports **************************************************************/ diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp index 1e7a31b4562..08cd29734d2 100644 --- a/src/mame/drivers/yiear.cpp +++ b/src/mame/drivers/yiear.cpp @@ -138,11 +138,11 @@ INTERRUPT_GEN_MEMBER(yiear_state::yiear_nmi_interrupt) void yiear_state::main_map(address_map &map) { - map(0x0000, 0x0000).r(this, FUNC(yiear_state::yiear_speech_r)); - map(0x4000, 0x4000).w(this, FUNC(yiear_state::yiear_control_w)); - map(0x4800, 0x4800).w(this, FUNC(yiear_state::konami_SN76496_latch_w)); - map(0x4900, 0x4900).w(this, FUNC(yiear_state::konami_SN76496_w)); - map(0x4a00, 0x4a00).w(this, FUNC(yiear_state::yiear_VLM5030_control_w)); + map(0x0000, 0x0000).r(FUNC(yiear_state::yiear_speech_r)); + map(0x4000, 0x4000).w(FUNC(yiear_state::yiear_control_w)); + map(0x4800, 0x4800).w(FUNC(yiear_state::konami_SN76496_latch_w)); + map(0x4900, 0x4900).w(FUNC(yiear_state::konami_SN76496_w)); + map(0x4a00, 0x4a00).w(FUNC(yiear_state::yiear_VLM5030_control_w)); map(0x4b00, 0x4b00).w(m_vlm, FUNC(vlm5030_device::data_w)); map(0x4c00, 0x4c00).portr("DSW2"); map(0x4d00, 0x4d00).portr("DSW3"); @@ -154,7 +154,7 @@ void yiear_state::main_map(address_map &map) map(0x5000, 0x5fff).ram(); map(0x5000, 0x502f).ram().share("spriteram"); map(0x5400, 0x542f).ram().share("spriteram2"); - map(0x5800, 0x5fff).w(this, FUNC(yiear_state::yiear_videoram_w)).share("videoram"); + map(0x5800, 0x5fff).w(FUNC(yiear_state::yiear_videoram_w)).share("videoram"); map(0x8000, 0xffff).rom(); } diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp index c19eeae50d1..75912e9ebff 100644 --- a/src/mame/drivers/ymmu100.cpp +++ b/src/mame/drivers/ymmu100.cpp @@ -272,7 +272,7 @@ void mu100_state::mu100_map(address_map &map) { map(0x000000, 0x1fffff).rom().region("maincpu", 0); map(0x200000, 0x21ffff).ram(); // 128K work RAM - map(0x400000, 0x401fff).rw(this, FUNC(mu100_state::snd_r), FUNC(mu100_state::snd_w)); + map(0x400000, 0x401fff).rw(FUNC(mu100_state::snd_r), FUNC(mu100_state::snd_w)); } READ16_MEMBER(mu100_state::snd_r) @@ -421,19 +421,19 @@ WRITE16_MEMBER(mu100_state::pg_w) void mu100_state::mu100_iomap(address_map &map) { - map(h8_device::PORT_1, h8_device::PORT_1).rw(this, FUNC(mu100_state::p1_r), FUNC(mu100_state::p1_w)); - map(h8_device::PORT_2, h8_device::PORT_2).w(this, FUNC(mu100_state::p2_w)); - map(h8_device::PORT_3, h8_device::PORT_3).w(this, FUNC(mu100_state::p3_w)); - map(h8_device::PORT_5, h8_device::PORT_5).w(this, FUNC(mu100_state::p5_w)); - map(h8_device::PORT_6, h8_device::PORT_6).rw(this, FUNC(mu100_state::p6_r), FUNC(mu100_state::p6_w)); - map(h8_device::PORT_A, h8_device::PORT_A).rw(this, FUNC(mu100_state::pa_r), FUNC(mu100_state::pa_w)); - map(h8_device::PORT_F, h8_device::PORT_F).w(this, FUNC(mu100_state::pf_w)); - map(h8_device::PORT_G, h8_device::PORT_G).w(this, FUNC(mu100_state::pg_w)); - map(h8_device::ADC_0, h8_device::ADC_0).r(this, FUNC(mu100_state::adc0_r)); - map(h8_device::ADC_2, h8_device::ADC_2).r(this, FUNC(mu100_state::adc2_r)); - map(h8_device::ADC_4, h8_device::ADC_4).r(this, FUNC(mu100_state::adc4_r)); - map(h8_device::ADC_6, h8_device::ADC_6).r(this, FUNC(mu100_state::adc6_r)); - map(h8_device::ADC_7, h8_device::ADC_7).r(this, FUNC(mu100_state::adc7_r)); + map(h8_device::PORT_1, h8_device::PORT_1).rw(FUNC(mu100_state::p1_r), FUNC(mu100_state::p1_w)); + map(h8_device::PORT_2, h8_device::PORT_2).w(FUNC(mu100_state::p2_w)); + map(h8_device::PORT_3, h8_device::PORT_3).w(FUNC(mu100_state::p3_w)); + map(h8_device::PORT_5, h8_device::PORT_5).w(FUNC(mu100_state::p5_w)); + map(h8_device::PORT_6, h8_device::PORT_6).rw(FUNC(mu100_state::p6_r), FUNC(mu100_state::p6_w)); + map(h8_device::PORT_A, h8_device::PORT_A).rw(FUNC(mu100_state::pa_r), FUNC(mu100_state::pa_w)); + map(h8_device::PORT_F, h8_device::PORT_F).w(FUNC(mu100_state::pf_w)); + map(h8_device::PORT_G, h8_device::PORT_G).w(FUNC(mu100_state::pg_w)); + map(h8_device::ADC_0, h8_device::ADC_0).r(FUNC(mu100_state::adc0_r)); + map(h8_device::ADC_2, h8_device::ADC_2).r(FUNC(mu100_state::adc2_r)); + map(h8_device::ADC_4, h8_device::ADC_4).r(FUNC(mu100_state::adc4_r)); + map(h8_device::ADC_6, h8_device::ADC_6).r(FUNC(mu100_state::adc6_r)); + map(h8_device::ADC_7, h8_device::ADC_7).r(FUNC(mu100_state::adc7_r)); } MACHINE_CONFIG_START(mu100_state::mu100) diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp index 38a269f0e82..c5b697b4447 100644 --- a/src/mame/drivers/yunsun16.cpp +++ b/src/mame/drivers/yunsun16.cpp @@ -125,12 +125,12 @@ void yunsun16_state::main_map(address_map &map) map(0x80010c, 0x80010f).ram().share("scrollram_1"); // Scrolling map(0x800114, 0x800117).ram().share("scrollram_0"); // Scrolling map(0x800154, 0x800155).ram().share("priorityram"); // Priority - map(0x800181, 0x800181).w(this, FUNC(yunsun16_state::sound_bank_w)); // Sound + map(0x800181, 0x800181).w(FUNC(yunsun16_state::sound_bank_w)); // Sound map(0x800189, 0x800189).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Sound map(0x8001fe, 0x8001ff).nopw(); // ? 0 (during int) map(0x900000, 0x903fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette - map(0x908000, 0x90bfff).ram().w(this, FUNC(yunsun16_state::vram_1_w)).share("vram_1"); // Layer 1 - map(0x90c000, 0x90ffff).ram().w(this, FUNC(yunsun16_state::vram_0_w)).share("vram_0"); // Layer 0 + map(0x908000, 0x90bfff).ram().w(FUNC(yunsun16_state::vram_1_w)).share("vram_1"); // Layer 1 + map(0x90c000, 0x90ffff).ram().w(FUNC(yunsun16_state::vram_0_w)).share("vram_0"); // Layer 0 map(0x910000, 0x910fff).ram().share("spriteram"); // Sprites map(0xff0000, 0xffffff).ram(); } diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp index 3f787976f8b..89513172fe7 100644 --- a/src/mame/drivers/yunsung8.cpp +++ b/src/mame/drivers/yunsung8.cpp @@ -73,9 +73,9 @@ WRITE8_MEMBER(yunsung8_state::main_irq_ack_w) void yunsung8_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x0001, 0x0001).w(this, FUNC(yunsung8_state::bankswitch_w)); // ROM Bank (again?) + map(0x0001, 0x0001).w(FUNC(yunsung8_state::bankswitch_w)); // ROM Bank (again?) map(0x8000, 0xbfff).bankr("mainbank"); // Banked ROM - map(0xc000, 0xdfff).rw(this, FUNC(yunsung8_state::videoram_r), FUNC(yunsung8_state::videoram_w)); // Video RAM (Banked) + map(0xc000, 0xdfff).rw(FUNC(yunsung8_state::videoram_r), FUNC(yunsung8_state::videoram_w)); // Video RAM (Banked) map(0xe000, 0xffff).ram(); } @@ -83,13 +83,13 @@ void yunsung8_state::main_map(address_map &map) void yunsung8_state::port_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("SYSTEM").w(this, FUNC(yunsung8_state::videobank_w)); // video RAM bank - map(0x01, 0x01).portr("P1").w(this, FUNC(yunsung8_state::bankswitch_w)); // ROM Bank + Layers Enable + map(0x00, 0x00).portr("SYSTEM").w(FUNC(yunsung8_state::videobank_w)); // video RAM bank + map(0x01, 0x01).portr("P1").w(FUNC(yunsung8_state::bankswitch_w)); // ROM Bank + Layers Enable map(0x02, 0x02).portr("P2").w("soundlatch", FUNC(generic_latch_8_device::write)); // To Sound CPU map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x06, 0x06).w(this, FUNC(yunsung8_state::flipscreen_w)); // Flip Screen - map(0x07, 0x07).w(this, FUNC(yunsung8_state::main_irq_ack_w)); + map(0x06, 0x06).w(FUNC(yunsung8_state::flipscreen_w)); // Flip Screen + map(0x07, 0x07).w(FUNC(yunsung8_state::main_irq_ack_w)); } @@ -118,7 +118,7 @@ void yunsung8_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("soundbank"); // Banked ROM - map(0xe000, 0xe000).w(this, FUNC(yunsung8_state::sound_bankswitch_w)); // ROM Bank + map(0xe000, 0xe000).w(FUNC(yunsung8_state::sound_bankswitch_w)); // ROM Bank map(0xe400, 0xe400).w(m_adpcm_select, FUNC(ls157_device::ba_w)); map(0xec00, 0xec01).w("ymsnd", FUNC(ym3812_device::write)); map(0xf000, 0xf7ff).ram(); diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp index 428cad62a85..cdd6060ac80 100644 --- a/src/mame/drivers/z100.cpp +++ b/src/mame/drivers/z100.cpp @@ -313,7 +313,7 @@ void z100_state::z100_mem(address_map &map) map.unmap_value_high(); map(0x00000, 0x3ffff).ram(); // 128*2 KB RAM // AM_RANGE(0xb0000,0xbffff) AM_ROM // expansion ROM - map(0xc0000, 0xeffff).rw(this, FUNC(z100_state::z100_vram_r), FUNC(z100_state::z100_vram_w)); // Blue / Red / Green + map(0xc0000, 0xeffff).rw(FUNC(z100_state::z100_vram_r), FUNC(z100_state::z100_vram_w)); // Blue / Red / Green // AM_RANGE(0xf0000,0xf0fff) // network card (NET-100) // AM_RANGE(0xf4000,0xf7fff) // MTRET-100 Firmware I expansion ROM // AM_RANGE(0xf8000,0xfbfff) // MTRET-100 Firmware II expansion ROM check ID 0x4550 @@ -399,14 +399,14 @@ void z100_state::z100_io(address_map &map) // AM_RANGE (0xac, 0xad) Z-217 secondary disk controller (winchester) // AM_RANGE (0xae, 0xaf) Z-217 primary disk controller (winchester) map(0xb0, 0xb3).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); - map(0xb4, 0xb4).w(this, FUNC(z100_state::floppy_select_w)); - map(0xb5, 0xb5).w(this, FUNC(z100_state::floppy_motor_w)); + map(0xb4, 0xb4).w(FUNC(z100_state::floppy_select_w)); + map(0xb5, 0xb5).w(FUNC(z100_state::floppy_motor_w)); // z-207 secondary disk controller (wd1797) // AM_RANGE (0xcd, 0xce) ET-100 CRT Controller // AM_RANGE (0xd4, 0xd7) ET-100 Trainer Parallel I/O map(0xd8, 0xdb).rw(m_pia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); //video board - map(0xdc, 0xdc).w(this, FUNC(z100_state::z100_6845_address_w)); - map(0xdd, 0xdd).w(this, FUNC(z100_state::z100_6845_data_w)); + map(0xdc, 0xdc).w(FUNC(z100_state::z100_6845_address_w)); + map(0xdd, 0xdd).w(FUNC(z100_state::z100_6845_data_w)); // AM_RANGE (0xde, 0xde) light pen map(0xe0, 0xe3).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); //main board // AM_RANGE (0xe4, 0xe7) 8253 PIT @@ -414,8 +414,8 @@ void z100_state::z100_io(address_map &map) // AM_RANGE (0xec, 0xef) Second 2661-2 serial port (modem) map(0xf0, 0xf1).rw(m_pics, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); map(0xf2, 0xf3).rw(m_picm, FUNC(pic8259_device::read), FUNC(pic8259_device::write)); - map(0xf4, 0xf4).r(this, FUNC(z100_state::keyb_data_r)); // -> 8041 MCU - map(0xf5, 0xf5).rw(this, FUNC(z100_state::keyb_status_r), FUNC(z100_state::keyb_command_w)); + map(0xf4, 0xf4).r(FUNC(z100_state::keyb_data_r)); // -> 8041 MCU + map(0xf5, 0xf5).rw(FUNC(z100_state::keyb_status_r), FUNC(z100_state::keyb_command_w)); // AM_RANGE (0xf6, 0xf6) expansion ROM is present (bit 0, active low) // AM_RANGE (0xfb, 0xfb) timer irq status // AM_RANGE (0xfc, 0xfc) memory latch diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index add896b01f9..e07170dc05a 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -104,7 +104,7 @@ void z1013_state::z1013_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("z80pio", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); - map(0x08, 0x08).w(this, FUNC(z1013_state::z1013_keyboard_w)); + map(0x08, 0x08).w(FUNC(z1013_state::z1013_keyboard_w)); } /* Input ports */ diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp index be3f27610ce..a678a42b08d 100644 --- a/src/mame/drivers/z80dev.cpp +++ b/src/mame/drivers/z80dev.cpp @@ -84,9 +84,9 @@ void z80dev_state::io_map(address_map &map) map(0x21, 0x21).portr("LINE1"); map(0x22, 0x22).portr("LINE2"); map(0x23, 0x23).portr("LINE3"); - map(0x20, 0x25).w(this, FUNC(z80dev_state::display_w)); + map(0x20, 0x25).w(FUNC(z80dev_state::display_w)); - map(0x13, 0x13).r(this, FUNC(z80dev_state::test_r)); + map(0x13, 0x13).r(FUNC(z80dev_state::test_r)); } /* Input ports */ diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index 4a176128d49..0c56e03ebe9 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -143,18 +143,18 @@ void z80ne_state::z80ne_io(address_map &map) { map.global_mask(0xff); map(0xee, 0xee).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xef, 0xef).rw(this, FUNC(z80ne_state::lx385_ctrl_r), FUNC(z80ne_state::lx385_ctrl_w)); - map(0xf0, 0xff).rw(this, FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w)); + map(0xef, 0xef).rw(FUNC(z80ne_state::lx385_ctrl_r), FUNC(z80ne_state::lx385_ctrl_w)); + map(0xf0, 0xff).rw(FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w)); } void z80ne_state::z80net_io(address_map &map) { map.global_mask(0xff); - map(0xea, 0xea).r(this, FUNC(z80ne_state::lx387_data_r)); - map(0xeb, 0xeb).r(this, FUNC(z80ne_state::lx388_read_field_sync)); + map(0xea, 0xea).r(FUNC(z80ne_state::lx387_data_r)); + map(0xeb, 0xeb).r(FUNC(z80ne_state::lx388_read_field_sync)); map(0xee, 0xee).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xef, 0xef).rw(this, FUNC(z80ne_state::lx385_ctrl_r), FUNC(z80ne_state::lx385_ctrl_w)); - map(0xf0, 0xff).rw(this, FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w)); + map(0xef, 0xef).rw(FUNC(z80ne_state::lx385_ctrl_r), FUNC(z80ne_state::lx385_ctrl_w)); + map(0xf0, 0xff).rw(FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w)); } void z80netf_state::z80netf_mem(address_map &map) @@ -174,12 +174,12 @@ void z80netf_state::z80netf_mem(address_map &map) void z80netf_state::z80netf_io(address_map &map) { map.global_mask(0xff); - map(0xd0, 0xd7).rw(this, FUNC(z80netf_state::lx390_fdc_r), FUNC(z80netf_state::lx390_fdc_w)); - map(0xea, 0xea).r(this, FUNC(z80netf_state::lx387_data_r)); - map(0xeb, 0xeb).r(this, FUNC(z80netf_state::lx388_read_field_sync)); + map(0xd0, 0xd7).rw(FUNC(z80netf_state::lx390_fdc_r), FUNC(z80netf_state::lx390_fdc_w)); + map(0xea, 0xea).r(FUNC(z80netf_state::lx387_data_r)); + map(0xeb, 0xeb).r(FUNC(z80netf_state::lx388_read_field_sync)); map(0xee, 0xee).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xef, 0xef).rw(this, FUNC(z80netf_state::lx385_ctrl_r), FUNC(z80netf_state::lx385_ctrl_w)); - map(0xf0, 0xff).rw(this, FUNC(z80netf_state::lx383_r), FUNC(z80netf_state::lx383_w)); + map(0xef, 0xef).rw(FUNC(z80netf_state::lx385_ctrl_r), FUNC(z80netf_state::lx385_ctrl_w)); + map(0xf0, 0xff).rw(FUNC(z80netf_state::lx383_r), FUNC(z80netf_state::lx383_w)); } diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp index 63d17defdd8..8b524777454 100644 --- a/src/mame/drivers/zac2650.cpp +++ b/src/mame/drivers/zac2650.cpp @@ -28,15 +28,15 @@ void zac2650_state::main_map(address_map &map) { map(0x0000, 0x17ff).rom(); - map(0x1800, 0x1bff).ram().w(this, FUNC(zac2650_state::tinvader_videoram_w)).share("videoram"); + map(0x1800, 0x1bff).ram().w(FUNC(zac2650_state::tinvader_videoram_w)).share("videoram"); map(0x1c00, 0x1cff).ram(); map(0x1d00, 0x1dff).ram(); - map(0x1e80, 0x1e80).r(this, FUNC(zac2650_state::tinvader_port_0_r)).w(this, FUNC(zac2650_state::tinvader_sound_w)); + map(0x1e80, 0x1e80).r(FUNC(zac2650_state::tinvader_port_0_r)).w(FUNC(zac2650_state::tinvader_sound_w)); map(0x1e81, 0x1e81).portr("1E81"); map(0x1e82, 0x1e82).portr("1E82"); map(0x1e85, 0x1e85).portr("1E85"); /* Dodgem Only */ map(0x1e86, 0x1e86).portr("1E86").nopw(); /* Dodgem Only */ - map(0x1f00, 0x1fff).rw(this, FUNC(zac2650_state::zac_s2636_r), FUNC(zac2650_state::zac_s2636_w)).share("s2636_0_ram"); + map(0x1f00, 0x1fff).rw(FUNC(zac2650_state::zac_s2636_r), FUNC(zac2650_state::zac_s2636_w)).share("s2636_0_ram"); } static INPUT_PORTS_START( tinvader ) diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp index 2db7b01044f..f874d5b36ae 100644 --- a/src/mame/drivers/zac_1.cpp +++ b/src/mame/drivers/zac_1.cpp @@ -78,7 +78,7 @@ void zac_1_state::zac_1_map(address_map &map) { map.global_mask(0x1fff); map(0x0000, 0x13ff).rom(); - map(0x1400, 0x17ff).w(this, FUNC(zac_1_state::reset_int_w)); + map(0x1400, 0x17ff).w(FUNC(zac_1_state::reset_int_w)); map(0x1800, 0x18ff).mirror(0x300).ram().share("ram"); map(0x1c00, 0x1fff).rom(); } @@ -91,7 +91,7 @@ void zac_1_state::zac_1_io(address_map &map) void zac_1_state::zac_1_data(address_map &map) { map.unmap_value_high(); - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(zac_1_state::ctrl_r), FUNC(zac_1_state::ctrl_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(zac_1_state::ctrl_r), FUNC(zac_1_state::ctrl_w)); } static INPUT_PORTS_START( zac_1 ) @@ -293,8 +293,8 @@ void zac_1_state::locomotp_io(address_map &map) void zac_1_state::locomotp_data(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(zac_1_state::ctrl_r), FUNC(zac_1_state::ctrl_w)); - map(S2650_DATA_PORT, S2650_DATA_PORT).r(this, FUNC(zac_1_state::reset_int_r)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(zac_1_state::ctrl_r), FUNC(zac_1_state::ctrl_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).r(FUNC(zac_1_state::reset_int_r)); } READ8_MEMBER( zac_1_state::reset_int_r ) diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp index 6144ab74ba5..888a45b72fb 100644 --- a/src/mame/drivers/zac_2.cpp +++ b/src/mame/drivers/zac_2.cpp @@ -68,8 +68,8 @@ void zac_2_state::zac_2_io(address_map &map) void zac_2_state::zac_2_data(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(zac_2_state::ctrl_r), FUNC(zac_2_state::ctrl_w)); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(zac_2_state::data_r), FUNC(zac_2_state::data_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(FUNC(zac_2_state::ctrl_r), FUNC(zac_2_state::ctrl_w)); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(zac_2_state::data_r), FUNC(zac_2_state::data_w)); } static INPUT_PORTS_START( zac_2 ) diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp index 95cfefb850d..62e73978191 100644 --- a/src/mame/drivers/zac_proto.cpp +++ b/src/mame/drivers/zac_proto.cpp @@ -60,10 +60,10 @@ void zac_proto_state::zac_proto_map(address_map &map) map(0x0e05, 0x0e05).portr("PL5"); map(0x0e06, 0x0e06).portr("PL6"); map(0x0e07, 0x0e07).portr("PL7"); - map(0x0e00, 0x0e01).w(this, FUNC(zac_proto_state::out0_w)); - map(0x0e02, 0x0e06).w(this, FUNC(zac_proto_state::digit_w)); - map(0x0e07, 0x0e08).w(this, FUNC(zac_proto_state::sound_w)); - map(0x0e09, 0x0e16).w(this, FUNC(zac_proto_state::out1_w)); + map(0x0e00, 0x0e01).w(FUNC(zac_proto_state::out0_w)); + map(0x0e02, 0x0e06).w(FUNC(zac_proto_state::digit_w)); + map(0x0e07, 0x0e08).w(FUNC(zac_proto_state::sound_w)); + map(0x0e09, 0x0e16).w(FUNC(zac_proto_state::out1_w)); map(0x1400, 0x1bff).rom(); } diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp index 0fe660aca14..bb61ad69e7a 100644 --- a/src/mame/drivers/zaccaria.cpp +++ b/src/mame/drivers/zaccaria.cpp @@ -149,13 +149,13 @@ void zaccaria_state::main_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x63ff).readonly(); - map(0x6400, 0x6407).r(this, FUNC(zaccaria_state::prot1_r)); - map(0x6000, 0x67ff).w(this, FUNC(zaccaria_state::videoram_w)).share("videoram"); /* 6400-67ff is 4 bits wide */ - map(0x6800, 0x683f).w(this, FUNC(zaccaria_state::attributes_w)).share("attributesram"); + map(0x6400, 0x6407).r(FUNC(zaccaria_state::prot1_r)); + map(0x6000, 0x67ff).w(FUNC(zaccaria_state::videoram_w)).share("videoram"); /* 6400-67ff is 4 bits wide */ + map(0x6800, 0x683f).w(FUNC(zaccaria_state::attributes_w)).share("attributesram"); map(0x6840, 0x685f).ram().share("spriteram"); map(0x6881, 0x68c0).ram().share("spriteram2"); - map(0x6c00, 0x6c07).mirror(0x81f8).r(this, FUNC(zaccaria_state::prot2_r)).w("mainlatch", FUNC(ls259_device::write_d0)); - map(0x6e00, 0x6e00).mirror(0x81f8).r(this, FUNC(zaccaria_state::dsw_r)).w(m_audiopcb, FUNC(zac1b11142_audio_device::hs_w)); + map(0x6c00, 0x6c07).mirror(0x81f8).r(FUNC(zaccaria_state::prot2_r)).w("mainlatch", FUNC(ls259_device::write_d0)); + map(0x6e00, 0x6e00).mirror(0x81f8).r(FUNC(zaccaria_state::dsw_r)).w(m_audiopcb, FUNC(zac1b11142_audio_device::hs_w)); map(0x7000, 0x77ff).ram(); map(0x7800, 0x7803).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x7c00, 0x7c00).r("watchdog", FUNC(watchdog_timer_device::reset_r)); diff --git a/src/mame/drivers/zapcomputer.cpp b/src/mame/drivers/zapcomputer.cpp index a91e6540d37..89c45b25a12 100644 --- a/src/mame/drivers/zapcomputer.cpp +++ b/src/mame/drivers/zapcomputer.cpp @@ -119,8 +119,8 @@ void zapcomp_state::zapcomp_mem(address_map &map) void zapcomp_state::zapcomp_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(zapcomp_state::keyboard_r)); - map(0x05, 0x07).w(this, FUNC(zapcomp_state::display_7seg_w)); + map(0x00, 0x00).r(FUNC(zapcomp_state::keyboard_r)); + map(0x05, 0x07).w(FUNC(zapcomp_state::display_7seg_w)); } static INPUT_PORTS_START( zapcomp ) diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp index 08d95ebc9ff..b8eac767bb0 100644 --- a/src/mame/drivers/zaurus.cpp +++ b/src/mame/drivers/zaurus.cpp @@ -1715,9 +1715,9 @@ WRITE32_MEMBER(zaurus_state::pxa255_rtc_w) void zaurus_state::zaurus_map(address_map &map) { map(0x00000000, 0x001fffff).ram().region("firmware", 0); - map(0x40900000, 0x4090000f).rw(this, FUNC(zaurus_state::pxa255_rtc_r), FUNC(zaurus_state::pxa255_rtc_w)); - map(0x40a00000, 0x40a0001f).rw(this, FUNC(zaurus_state::pxa255_ostimer_r), FUNC(zaurus_state::pxa255_ostimer_w)); - map(0x40d00000, 0x40d00017).rw(this, FUNC(zaurus_state::pxa255_intc_r), FUNC(zaurus_state::pxa255_intc_w)); + map(0x40900000, 0x4090000f).rw(FUNC(zaurus_state::pxa255_rtc_r), FUNC(zaurus_state::pxa255_rtc_w)); + map(0x40a00000, 0x40a0001f).rw(FUNC(zaurus_state::pxa255_ostimer_r), FUNC(zaurus_state::pxa255_ostimer_w)); + map(0x40d00000, 0x40d00017).rw(FUNC(zaurus_state::pxa255_intc_r), FUNC(zaurus_state::pxa255_intc_w)); map(0xa0000000, 0xa07fffff).ram().share("ram"); } diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index 844ad297c31..2ed0cdbc535 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -440,7 +440,7 @@ void zaxxon_state::zaxxon_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); - map(0x8000, 0x83ff).mirror(0x1c00).ram().w(this, FUNC(zaxxon_state::zaxxon_videoram_w)).share("videoram"); + map(0x8000, 0x83ff).mirror(0x1c00).ram().w(FUNC(zaxxon_state::zaxxon_videoram_w)).share("videoram"); map(0xa000, 0xa0ff).mirror(0x1f00).ram().share("spriteram"); map(0xc000, 0xc000).mirror(0x18fc).portr("SW00"); map(0xc001, 0xc001).mirror(0x18fc).portr("SW01"); @@ -449,7 +449,7 @@ void zaxxon_state::zaxxon_map(address_map &map) map(0xc100, 0xc100).mirror(0x18ff).portr("SW100"); map(0xc000, 0xc007).mirror(0x18f8).w("mainlatch1", FUNC(ls259_device::write_d0)); map(0xe03c, 0xe03f).mirror(0x1f00).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xe0f0, 0xe0f3).mirror(0x1f00).select(0x0008).w(this, FUNC(zaxxon_state::zaxxon_control_w)); + map(0xe0f0, 0xe0f3).mirror(0x1f00).select(0x0008).w(FUNC(zaxxon_state::zaxxon_control_w)); } void zaxxon_state::decrypted_opcodes_map(address_map &map) @@ -462,7 +462,7 @@ void zaxxon_state::ixion_map(address_map &map) { map(0x0000, 0x5fff).rom(); map(0x6000, 0x6fff).ram(); - map(0x8000, 0x83ff).mirror(0x1c00).ram().w(this, FUNC(zaxxon_state::zaxxon_videoram_w)).share("videoram"); + map(0x8000, 0x83ff).mirror(0x1c00).ram().w(FUNC(zaxxon_state::zaxxon_videoram_w)).share("videoram"); map(0xa000, 0xa0ff).mirror(0x1f00).ram().share("spriteram"); map(0xc000, 0xc000).mirror(0x18fc).portr("SW00"); map(0xc001, 0xc001).mirror(0x18fc).portr("SW01"); @@ -471,7 +471,7 @@ void zaxxon_state::ixion_map(address_map &map) map(0xc100, 0xc100).mirror(0x18ff).portr("SW100"); map(0xc000, 0xc007).mirror(0x18f8).w("mainlatch1", FUNC(ls259_device::write_d0)); map(0xe03c, 0xe03c).mirror(0x1f00).rw("usbsnd", FUNC(usb_sound_device::status_r), FUNC(usb_sound_device::data_w)); - map(0xe0f0, 0xe0f3).mirror(0x1f00).select(0x0008).w(this, FUNC(zaxxon_state::zaxxon_control_w)); + map(0xe0f0, 0xe0f3).mirror(0x1f00).select(0x0008).w(FUNC(zaxxon_state::zaxxon_control_w)); } @@ -480,8 +480,8 @@ void zaxxon_state::congo_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0xa000, 0xa3ff).mirror(0x1800).ram().w(this, FUNC(zaxxon_state::zaxxon_videoram_w)).share("videoram"); - map(0xa400, 0xa7ff).mirror(0x1800).ram().w(this, FUNC(zaxxon_state::congo_colorram_w)).share("colorram"); + map(0xa000, 0xa3ff).mirror(0x1800).ram().w(FUNC(zaxxon_state::zaxxon_videoram_w)).share("videoram"); + map(0xa400, 0xa7ff).mirror(0x1800).ram().w(FUNC(zaxxon_state::congo_colorram_w)).share("colorram"); map(0xc000, 0xc000).mirror(0x1fc4).portr("SW00"); map(0xc001, 0xc001).mirror(0x1fc4).portr("SW01"); map(0xc002, 0xc002).mirror(0x1fc4).portr("DSW02"); @@ -489,8 +489,8 @@ void zaxxon_state::congo_map(address_map &map) map(0xc008, 0xc008).mirror(0x1fc7).portr("SW100"); map(0xc018, 0xc01f).mirror(0x1fc0).w("mainlatch1", FUNC(ls259_device::write_d0)); map(0xc020, 0xc027).mirror(0x1fc0).w("mainlatch2", FUNC(ls259_device::write_d0)); - map(0xc028, 0xc029).mirror(0x1fc4).w(this, FUNC(zaxxon_state::bg_position_w)); - map(0xc030, 0xc033).mirror(0x1fc4).w(this, FUNC(zaxxon_state::congo_sprite_custom_w)); + map(0xc028, 0xc029).mirror(0x1fc4).w(FUNC(zaxxon_state::bg_position_w)); + map(0xc030, 0xc033).mirror(0x1fc4).w(FUNC(zaxxon_state::congo_sprite_custom_w)); map(0xc038, 0xc03f).mirror(0x1fc0).w("soundlatch", FUNC(generic_latch_8_device::write)); } @@ -500,9 +500,9 @@ void zaxxon_state::congo_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x47ff).mirror(0x1800).ram(); - map(0x6000, 0x6000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::write)); + map(0x6000, 0x6000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::command_w)); map(0x8000, 0x8003).mirror(0x1ffc).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); - map(0xa000, 0xa000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::write)); + map(0xa000, 0xa000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::command_w)); } diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp index b2ef34d5802..8f6f7c912fd 100644 --- a/src/mame/drivers/zerozone.cpp +++ b/src/mame/drivers/zerozone.cpp @@ -56,11 +56,11 @@ void zerozone_state::main_map(address_map &map) map(0x080002, 0x080003).portr("INPUTS"); map(0x080008, 0x080009).portr("DSWB"); map(0x08000a, 0x08000b).portr("DSWA"); - map(0x084000, 0x084001).w(this, FUNC(zerozone_state::sound_w)); + map(0x084000, 0x084001).w(FUNC(zerozone_state::sound_w)); map(0x088000, 0x0881ff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); map(0x098000, 0x098001).ram(); /* Watchdog? */ - map(0x09ce00, 0x09ffff).ram().w(this, FUNC(zerozone_state::tilemap_w)).share("videoram"); - map(0x0b4000, 0x0b4001).w(this, FUNC(zerozone_state::tilebank_w)); + map(0x09ce00, 0x09ffff).ram().w(FUNC(zerozone_state::tilemap_w)).share("videoram"); + map(0x0b4000, 0x0b4001).w(FUNC(zerozone_state::tilebank_w)); map(0x0c0000, 0x0cffff).ram(); map(0x0f8000, 0x0f87ff).ram(); /* Never read from */ } diff --git a/src/mame/drivers/zexall.cpp b/src/mame/drivers/zexall.cpp index 720b667f44e..5cef690759c 100644 --- a/src/mame/drivers/zexall.cpp +++ b/src/mame/drivers/zexall.cpp @@ -139,9 +139,9 @@ WRITE8_MEMBER( zexall_state::output_data_w ) void zexall_state::z80_mem(address_map &map) { map(0x0000, 0xffff).ram().share("main_ram"); - map(0xfffd, 0xfffd).rw(this, FUNC(zexall_state::output_ack_r), FUNC(zexall_state::output_ack_w)); - map(0xfffe, 0xfffe).rw(this, FUNC(zexall_state::output_req_r), FUNC(zexall_state::output_req_w)); - map(0xffff, 0xffff).rw(this, FUNC(zexall_state::output_data_r), FUNC(zexall_state::output_data_w)); + map(0xfffd, 0xfffd).rw(FUNC(zexall_state::output_ack_r), FUNC(zexall_state::output_ack_w)); + map(0xfffe, 0xfffe).rw(FUNC(zexall_state::output_req_r), FUNC(zexall_state::output_req_w)); + map(0xffff, 0xffff).rw(FUNC(zexall_state::output_data_r), FUNC(zexall_state::output_data_w)); } diff --git a/src/mame/drivers/zms8085.cpp b/src/mame/drivers/zms8085.cpp index 3c3f848a173..a518ad00253 100644 --- a/src/mame/drivers/zms8085.cpp +++ b/src/mame/drivers/zms8085.cpp @@ -95,9 +95,9 @@ void zms8085_state::mem_map(address_map &map) void zms8085_state::io_map(address_map &map) { - map(0x61, 0x61).r(this, FUNC(zms8085_state::special_r)).w(m_uart, FUNC(ay51013_device::transmit)); + map(0x61, 0x61).r(FUNC(zms8085_state::special_r)).w(m_uart, FUNC(ay51013_device::transmit)); map(0x62, 0x62).r(m_uart, FUNC(ay51013_device::receive)); - map(0x63, 0x63).r(this, FUNC(zms8085_state::uart_status_r)); + map(0x63, 0x63).r(FUNC(zms8085_state::uart_status_r)); map(0x68, 0x68).nopw(); } diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 5f341aca5d0..e5168c86aa0 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -365,14 +365,14 @@ void zn_state::zn_map(address_map &map) map(0x1fa00300, 0x1fa00303).portr("SYSTEM"); map(0x1fa10000, 0x1fa10003).portr("P3"); map(0x1fa10100, 0x1fa10103).portr("P4"); - map(0x1fa10200, 0x1fa10200).r(this, FUNC(zn_state::boardconfig_r)); - map(0x1fa10300, 0x1fa10300).rw(this, FUNC(zn_state::znsecsel_r), FUNC(zn_state::znsecsel_w)); - map(0x1fa20000, 0x1fa20000).w(this, FUNC(zn_state::coin_w)); + map(0x1fa10200, 0x1fa10200).r(FUNC(zn_state::boardconfig_r)); + map(0x1fa10300, 0x1fa10300).rw(FUNC(zn_state::znsecsel_r), FUNC(zn_state::znsecsel_w)); + map(0x1fa20000, 0x1fa20000).w(FUNC(zn_state::coin_w)); map(0x1fa30000, 0x1fa30003).noprw(); /* ?? */ map(0x1fa40000, 0x1fa40003).nopr(); /* ?? */ map(0x1fa60000, 0x1fa60003).nopr(); /* ?? */ map(0x1faf0000, 0x1faf07ff).rw("at28c16", FUNC(at28c16_device::read), FUNC(at28c16_device::write)); /* eeprom */ - map(0x1fb20000, 0x1fb20007).r(this, FUNC(zn_state::unknown_r)); + map(0x1fb20000, 0x1fb20007).r(FUNC(zn_state::unknown_r)); } MACHINE_CONFIG_START(zn_state::zn1_1mb_vram) @@ -606,9 +606,9 @@ void zn_state::coh1000c_map(address_map &map) map(0x1f000000, 0x1f3fffff).rom().region("bankedroms", 0); map(0x1f400000, 0x1f7fffff).bankr("rombank1"); - map(0x1fb00000, 0x1fb00000).w(this, FUNC(zn_state::bank_coh1000c_w)); - map(0x1fb40010, 0x1fb40011).r(this, FUNC(zn_state::capcom_kickharness_r)); - map(0x1fb40020, 0x1fb40021).r(this, FUNC(zn_state::capcom_kickharness_r)); + map(0x1fb00000, 0x1fb00000).w(FUNC(zn_state::bank_coh1000c_w)); + map(0x1fb40010, 0x1fb40011).r(FUNC(zn_state::capcom_kickharness_r)); + map(0x1fb40020, 0x1fb40021).r(FUNC(zn_state::capcom_kickharness_r)); map(0x1fb80000, 0x1fbfffff).rom().region("countryrom", 0); map(0x1fb60000, 0x1fb60000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } @@ -636,7 +636,7 @@ void zn_state::qsound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("soundbank"); /* banked (contains music data) */ map(0xd000, 0xd002).w("qsound", FUNC(qsound_device::qsound_w)); - map(0xd003, 0xd003).w(this, FUNC(zn_state::qsound_bankswitch_w)); + map(0xd003, 0xd003).w(FUNC(zn_state::qsound_bankswitch_w)); map(0xd007, 0xd007).r("qsound", FUNC(qsound_device::qsound_r)); map(0xf000, 0xffff).ram(); } @@ -1095,7 +1095,7 @@ void zn_state::coh1000ta_map(address_map &map) zn_map(map); map(0x1f000000, 0x1f7fffff).bankr("rombank1"); - map(0x1fb40000, 0x1fb40000).w(this, FUNC(zn_state::bank_coh1000t_w)); + map(0x1fb40000, 0x1fb40000).w(FUNC(zn_state::bank_coh1000t_w)); map(0x1fb80000, 0x1fb80000).w("tc0140syt", FUNC(tc0140syt_device::master_port_w)); map(0x1fb80002, 0x1fb80002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); } @@ -1128,7 +1128,7 @@ void zn_state::fx1a_sound_map(address_map &map) map(0xe400, 0xe403).nopw(); /* pan */ map(0xee00, 0xee00).noprw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(zn_state::fx1a_sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(zn_state::fx1a_sound_bankswitch_w)); } @@ -1171,8 +1171,8 @@ void zn_state::coh1000tb_map(address_map &map) { zn_map(map); map(0x1f000000, 0x1f7fffff).bankr("rombank1"); - map(0x1fb00000, 0x1fb003ff).rw(this, FUNC(zn_state::fx1b_fram_r), FUNC(zn_state::fx1b_fram_w)).umask32(0x00ff00ff); - map(0x1fb40000, 0x1fb40000).w(this, FUNC(zn_state::bank_coh1000t_w)); + map(0x1fb00000, 0x1fb003ff).rw(FUNC(zn_state::fx1b_fram_r), FUNC(zn_state::fx1b_fram_w)).umask32(0x00ff00ff); + map(0x1fb40000, 0x1fb40000).w(FUNC(zn_state::bank_coh1000t_w)); map(0x1fb80000, 0x1fb80001).w(m_zoom, FUNC(taito_zoom_device::reg_data_w)); map(0x1fb80002, 0x1fb80003).w(m_zoom, FUNC(taito_zoom_device::reg_address_w)); map(0x1fba0000, 0x1fba0001).w(m_zoom, FUNC(taito_zoom_device::sound_irq_w)); @@ -1454,8 +1454,8 @@ void zn_state::coh1000w_map(address_map &map) map(0x1f000000, 0x1f1fffff).rom().region("roms", 0); map(0x1f000000, 0x1f000003).nopw(); map(0x1f7e8000, 0x1f7e8003).noprw(); - map(0x1f7e4000, 0x1f7e4fff).rw(this, FUNC(zn_state::vt83c461_16_r), FUNC(zn_state::vt83c461_16_w)); - map(0x1f7f4000, 0x1f7f4fff).rw(this, FUNC(zn_state::vt83c461_32_r), FUNC(zn_state::vt83c461_32_w)); + map(0x1f7e4000, 0x1f7e4fff).rw(FUNC(zn_state::vt83c461_16_r), FUNC(zn_state::vt83c461_16_w)); + map(0x1f7f4000, 0x1f7f4fff).rw(FUNC(zn_state::vt83c461_32_r), FUNC(zn_state::vt83c461_32_w)); } MACHINE_CONFIG_START(zn_state::coh1000w) @@ -1637,9 +1637,9 @@ void zn_state::coh1002e_map(address_map &map) zn_map(map); map(0x1f000000, 0x1f7fffff).bankr("rombank1"); - map(0x1fa10300, 0x1fa10300).w(this, FUNC(zn_state::coh1002e_bank_w)); + map(0x1fa10300, 0x1fa10300).w(FUNC(zn_state::coh1002e_bank_w)); map(0x1fb00000, 0x1fb00000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x1fb00004, 0x1fb00004).w(this, FUNC(zn_state::coh1002e_sound_irq_w)); + map(0x1fb00004, 0x1fb00004).w(FUNC(zn_state::coh1002e_sound_irq_w)); } MACHINE_START_MEMBER(zn_state,coh1002e) @@ -1814,8 +1814,8 @@ void zn_state::bam2_map(address_map &map) map(0x1f000000, 0x1f3fffff).rom().region("bankedroms", 0); map(0x1f400000, 0x1f7fffff).bankr("rombank1"); - map(0x1fa20000, 0x1fa20001).r(this, FUNC(zn_state::bam2_unk_r)); - map(0x1fb00000, 0x1fb00007).rw(this, FUNC(zn_state::bam2_mcu_r), FUNC(zn_state::bam2_mcu_w)); + map(0x1fa20000, 0x1fa20001).r(FUNC(zn_state::bam2_unk_r)); + map(0x1fb00000, 0x1fb00007).rw(FUNC(zn_state::bam2_mcu_r), FUNC(zn_state::bam2_mcu_w)); } void zn_state::init_bam2() @@ -2122,8 +2122,8 @@ WRITE8_MEMBER(zn_state::nbajamex_backup_w) void zn_state::coh1000a_map(address_map &map) { zn_map(map); - map(0x1fbfff00, 0x1fbfff03).w(this, FUNC(zn_state::acpsx_00_w)); - map(0x1fbfff12, 0x1fbfff13).w(this, FUNC(zn_state::acpsx_10_w)); + map(0x1fbfff00, 0x1fbfff03).w(FUNC(zn_state::acpsx_00_w)); + map(0x1fbfff12, 0x1fbfff13).w(FUNC(zn_state::acpsx_10_w)); } void zn_state::nbajamex_map(address_map &map) @@ -2131,15 +2131,15 @@ void zn_state::nbajamex_map(address_map &map) coh1000a_map(map); map(0x1f000000, 0x1f7fffff).m(m_nbajamex_bankmap, FUNC(address_map_bank_device::amap32)); - map(0x1fbfff00, 0x1fbfff07).w(this, FUNC(zn_state::nbajamex_bank_w)); - map(0x1fbfff08, 0x1fbfff09).r(this, FUNC(zn_state::nbajamex_08_r)); - map(0x1fbfff80, 0x1fbfff81).rw(this, FUNC(zn_state::nbajamex_80_r), FUNC(zn_state::nbajamex_80_w)); + map(0x1fbfff00, 0x1fbfff07).w(FUNC(zn_state::nbajamex_bank_w)); + map(0x1fbfff08, 0x1fbfff09).r(FUNC(zn_state::nbajamex_08_r)); + map(0x1fbfff80, 0x1fbfff81).rw(FUNC(zn_state::nbajamex_80_r), FUNC(zn_state::nbajamex_80_w)); } void zn_state::nbajamex_bank_map(address_map &map) { map(0x000000, 0x1fffff).mirror(0x800000).bankr("rombank1"); - map(0x200000, 0x207fff).mirror(0x800000).w(this, FUNC(zn_state::nbajamex_backup_w)); + map(0x200000, 0x207fff).mirror(0x800000).w(FUNC(zn_state::nbajamex_backup_w)); map(0x200000, 0x207fff).bankr("sram"); map(0xa00000, 0xffffff).bankr("rombank2"); } @@ -2179,8 +2179,8 @@ void zn_state::jdredd_map(address_map &map) coh1000a_map(map); map(0x1f000000, 0x1f1fffff).rom().region("roms", 0); - map(0x1fbfff80, 0x1fbfff8f).rw("ata", FUNC(ata_interface_device::read_cs1), FUNC(ata_interface_device::write_cs1)); - map(0x1fbfff90, 0x1fbfff9f).rw("ata", FUNC(ata_interface_device::read_cs0), FUNC(ata_interface_device::write_cs0)); + map(0x1fbfff80, 0x1fbfff8f).rw("ata", FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); + map(0x1fbfff90, 0x1fbfff9f).rw("ata", FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); } MACHINE_CONFIG_START(zn_state::coh1000a) @@ -2355,7 +2355,7 @@ void zn_state::coh1001l_map(address_map &map) map(0x1f000000, 0x1f7fffff).bankr("rombank1"); map(0x1fb00000, 0x1fb00001).w(m_soundlatch16, FUNC(generic_latch_16_device::write)); - map(0x1fb00002, 0x1fb00002).w(this, FUNC(zn_state::coh1001l_bank_w)); + map(0x1fb00002, 0x1fb00002).w(FUNC(zn_state::coh1001l_bank_w)); } MACHINE_START_MEMBER(zn_state,coh1001l) @@ -2371,7 +2371,7 @@ MACHINE_RESET_MEMBER(zn_state,coh1001l) void zn_state::atlus_snd_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100001).r(m_soundlatch16, FUNC(generic_latch_16_device::read)).w(this, FUNC(zn_state::coh1001l_sound_unk_w)); + map(0x100000, 0x100001).r(m_soundlatch16, FUNC(generic_latch_16_device::read)).w(FUNC(zn_state::coh1001l_sound_unk_w)); map(0x200000, 0x200003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0x00ff); map(0x700000, 0x70ffff).ram(); } @@ -2420,7 +2420,7 @@ void zn_state::coh1002v_map(address_map &map) zn_map(map); map(0x1f000000, 0x1f27ffff).rom().region("fixedroms", 0); map(0x1fb00000, 0x1fbfffff).bankr("rombank1"); - map(0x1fb00000, 0x1fb00000).w(this, FUNC(zn_state::coh1002v_bank_w)); + map(0x1fb00000, 0x1fb00000).w(FUNC(zn_state::coh1002v_bank_w)); } MACHINE_START_MEMBER(zn_state,coh1002v) @@ -2610,7 +2610,7 @@ void zn_state::coh1002m_map(address_map &map) { zn_map(map); map(0x1f000000, 0x1f7fffff).bankr("rombank1"); - map(0x1fb00006, 0x1fb00006).w(this, FUNC(zn_state::coh1002m_bank_w)); + map(0x1fb00006, 0x1fb00006).w(FUNC(zn_state::coh1002m_bank_w)); } MACHINE_START_MEMBER(zn_state,coh1002m) @@ -2643,7 +2643,7 @@ void zn_state::coh1002msnd_map(address_map &map) coh1002m_map(map); map(0x1fb00000, 0x1fb00000).r("cbaj_fifo2", FUNC(fifo7200_device::data_byte_r)); map(0x1fb00000, 0x1fb00000).w("cbaj_fifo1", FUNC(fifo7200_device::data_byte_w)); - map(0x1fb00003, 0x1fb00003).r(this, FUNC(zn_state::cbaj_sound_main_status_r)); + map(0x1fb00003, 0x1fb00003).r(FUNC(zn_state::cbaj_sound_main_status_r)); } READ8_MEMBER(zn_state::cbaj_sound_z80_status_r) @@ -2664,7 +2664,7 @@ void zn_state::cbaj_z80_port_map(address_map &map) map(0x84, 0x85).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); map(0x90, 0x90).r("cbaj_fifo1", FUNC(fifo7200_device::data_byte_r)); map(0x90, 0x90).w("cbaj_fifo2", FUNC(fifo7200_device::data_byte_w)); - map(0x91, 0x91).r(this, FUNC(zn_state::cbaj_sound_z80_status_r)); + map(0x91, 0x91).r(FUNC(zn_state::cbaj_sound_z80_status_r)); } void zn_state::coh1002ml_link_map(address_map &map) diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp index 308d4ff5a29..e967caf61e5 100644 --- a/src/mame/drivers/zodiack.cpp +++ b/src/mame/drivers/zodiack.cpp @@ -151,20 +151,20 @@ void zodiack_state::main_map(address_map &map) { map(0x0000, 0x4fff).rom(); map(0x5800, 0x5fff).ram(); - map(0x6081, 0x6081).portr("DSW0").w(this, FUNC(zodiack_state::control_w)); + map(0x6081, 0x6081).portr("DSW0").w(FUNC(zodiack_state::control_w)); map(0x6082, 0x6082).portr("DSW1"); map(0x6083, 0x6083).portr("IN0"); map(0x6084, 0x6084).portr("IN1"); - map(0x6090, 0x6090).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(this, FUNC(zodiack_state::master_soundlatch_w)); + map(0x6090, 0x6090).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(zodiack_state::master_soundlatch_w)); map(0x7000, 0x7000).nopr().w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* NOP??? */ - map(0x7100, 0x7100).w(this, FUNC(zodiack_state::nmi_mask_w)); - map(0x7200, 0x7200).w(this, FUNC(zodiack_state::flipscreen_w)); - map(0x9000, 0x903f).ram().w(this, FUNC(zodiack_state::attributes_w)).share("attributeram"); + map(0x7100, 0x7100).w(FUNC(zodiack_state::nmi_mask_w)); + map(0x7200, 0x7200).w(FUNC(zodiack_state::flipscreen_w)); + map(0x9000, 0x903f).ram().w(FUNC(zodiack_state::attributes_w)).share("attributeram"); map(0x9040, 0x905f).ram().share("spriteram"); map(0x9060, 0x907f).ram().share("bulletsram"); map(0x9080, 0x93ff).ram(); - map(0xa000, 0xa3ff).ram().w(this, FUNC(zodiack_state::videoram_w)).share("videoram"); - map(0xb000, 0xb3ff).ram().w(this, FUNC(zodiack_state::videoram2_w)).share("videoram_2"); + map(0xa000, 0xa3ff).ram().w(FUNC(zodiack_state::videoram_w)).share("videoram"); + map(0xb000, 0xb3ff).ram().w(FUNC(zodiack_state::videoram2_w)).share("videoram_2"); map(0xc000, 0xcfff).rom(); } @@ -172,7 +172,7 @@ void zodiack_state::sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x23ff).ram(); - map(0x4000, 0x4000).w(this, FUNC(zodiack_state::sound_nmi_enable_w)); + map(0x4000, 0x4000).w(FUNC(zodiack_state::sound_nmi_enable_w)); map(0x6000, 0x6000).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write)); } diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 3b9d6d032a9..888c3594317 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -82,8 +82,8 @@ void zorba_state::zorba_io(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("pit", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); - map(0x04, 0x04).rw(this, FUNC(zorba_state::rom_r), FUNC(zorba_state::rom_w)); - map(0x05, 0x05).rw(this, FUNC(zorba_state::ram_r), FUNC(zorba_state::ram_w)); + map(0x04, 0x04).rw(FUNC(zorba_state::rom_r), FUNC(zorba_state::rom_w)); + map(0x05, 0x05).rw(FUNC(zorba_state::ram_r), FUNC(zorba_state::ram_w)); map(0x10, 0x11).rw(m_crtc, FUNC(i8275_device::read), FUNC(i8275_device::write)); map(0x20, 0x20).rw(m_uart0, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x21, 0x21).rw(m_uart0, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); @@ -91,8 +91,8 @@ void zorba_state::zorba_io(address_map &map) map(0x23, 0x23).rw(m_uart1, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0x24, 0x24).rw(m_uart2, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); map(0x25, 0x25).rw(m_uart2, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0x26, 0x26).w(this, FUNC(zorba_state::intmask_w)); - map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); + map(0x26, 0x26).w(FUNC(zorba_state::intmask_w)); + map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); map(0x40, 0x43).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); map(0x50, 0x53).rw(m_pia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x60, 0x63).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); @@ -192,7 +192,7 @@ MACHINE_CONFIG_START(zorba_state::zorba) // port B - parallel interface MCFG_DEVICE_ADD(m_pia0, PIA6821, 0) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, zorba_state, pia0_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("parprndata", output_latch_device, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("parprndata", output_latch_device, bus_w)) MCFG_PIA_CB2_HANDLER(WRITELINE("parprn", centronics_device, write_strobe)) // IEEE488 interface diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 96cf06c2ba4..804c4dcecdc 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -479,14 +479,14 @@ void zr107_state::zr107_map(address_map &map) map(0x00000000, 0x000fffff).ram().share("workram"); /* Work RAM */ map(0x74000000, 0x74003fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); map(0x74020000, 0x7402003f).rw(m_k056832, FUNC(k056832_device::long_r), FUNC(k056832_device::long_w)); - map(0x74060000, 0x7406003f).rw(this, FUNC(zr107_state::ccu_r), FUNC(zr107_state::ccu_w)); - map(0x74080000, 0x74081fff).ram().w(this, FUNC(zr107_state::paletteram32_w)).share("paletteram"); + map(0x74060000, 0x7406003f).rw(FUNC(zr107_state::ccu_r), FUNC(zr107_state::ccu_w)); + map(0x74080000, 0x74081fff).ram().w(FUNC(zr107_state::paletteram32_w)).share("paletteram"); map(0x740a0000, 0x740a3fff).r(m_k056832, FUNC(k056832_device::rom_long_r)); map(0x78000000, 0x7800ffff).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_r_ppc), FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); /* 21N 21K 23N 23K */ map(0x78010000, 0x7801ffff).w(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); map(0x78040000, 0x7804000f).rw(m_k001006_1, FUNC(k001006_device::read), FUNC(k001006_device::write)); map(0x780c0000, 0x780c0007).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_comm_r_ppc), FUNC(konppc_device::cgboard_dsp_comm_w_ppc)); - map(0x7e000000, 0x7e003fff).rw(this, FUNC(zr107_state::sysreg_r), FUNC(zr107_state::sysreg_w)); + map(0x7e000000, 0x7e003fff).rw(FUNC(zr107_state::sysreg_r), FUNC(zr107_state::sysreg_w)); map(0x7e008000, 0x7e009fff).rw("k056230", FUNC(k056230_device::read), FUNC(k056230_device::write)); /* LANC registers */ map(0x7e00a000, 0x7e00bfff).rw("k056230", FUNC(k056230_device::lanc_ram_r), FUNC(k056230_device::lanc_ram_w)); /* LANC Buffer RAM (27E) */ map(0x7e00c000, 0x7e00c00f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)); @@ -506,7 +506,7 @@ void zr107_state::jetwave_map(address_map &map) { map(0x00000000, 0x000fffff).ram(); /* Work RAM */ map(0x74000000, 0x740000ff).rw(m_k001604, FUNC(k001604_device::reg_r), FUNC(k001604_device::reg_w)); - map(0x74010000, 0x7401ffff).ram().w(this, FUNC(zr107_state::jetwave_palette_w)).share("paletteram"); + map(0x74010000, 0x7401ffff).ram().w(FUNC(zr107_state::jetwave_palette_w)).share("paletteram"); map(0x74020000, 0x7403ffff).rw(m_k001604, FUNC(k001604_device::tile_r), FUNC(k001604_device::tile_w)); map(0x74040000, 0x7407ffff).rw(m_k001604, FUNC(k001604_device::char_r), FUNC(k001604_device::char_w)); map(0x78000000, 0x7800ffff).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_r_ppc), FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); /* 21N 21K 23N 23K */ @@ -514,7 +514,7 @@ void zr107_state::jetwave_map(address_map &map) map(0x78040000, 0x7804000f).rw(m_k001006_1, FUNC(k001006_device::read), FUNC(k001006_device::write)); map(0x78080000, 0x7808000f).rw(m_k001006_2, FUNC(k001006_device::read), FUNC(k001006_device::write)); map(0x780c0000, 0x780c0007).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_comm_r_ppc), FUNC(konppc_device::cgboard_dsp_comm_w_ppc)); - map(0x7e000000, 0x7e003fff).rw(this, FUNC(zr107_state::sysreg_r), FUNC(zr107_state::sysreg_w)); + map(0x7e000000, 0x7e003fff).rw(FUNC(zr107_state::sysreg_r), FUNC(zr107_state::sysreg_w)); map(0x7e008000, 0x7e009fff).rw("k056230", FUNC(k056230_device::read), FUNC(k056230_device::write)); /* LANC registers */ map(0x7e00a000, 0x7e00bfff).rw("k056230", FUNC(k056230_device::lanc_ram_r), FUNC(k056230_device::lanc_ram_w)); /* LANC Buffer RAM (27E) */ map(0x7e00c000, 0x7e00c00f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)); @@ -545,7 +545,7 @@ void zr107_state::sound_memmap(address_map &map) map(0x200000, 0x2004ff).rw("k054539_1", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0xff00); map(0x200000, 0x2004ff).rw("k054539_2", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); map(0x400000, 0x40001f).rw(m_k056800, FUNC(k056800_device::sound_r), FUNC(k056800_device::sound_w)).umask16(0x00ff); - map(0x500000, 0x500001).w(this, FUNC(zr107_state::sound_ctrl_w)); + map(0x500000, 0x500001).w(FUNC(zr107_state::sound_ctrl_w)); map(0x580000, 0x580001).nopw(); // 'NRES' - D2: K056602 /RESET } @@ -570,7 +570,7 @@ WRITE32_MEMBER(zr107_state::dsp_dataram_w) void zr107_state::sharc_map(address_map &map) { map(0x400000, 0x41ffff).rw(m_konppc, FUNC(konppc_device::cgboard_0_shared_sharc_r), FUNC(konppc_device::cgboard_0_shared_sharc_w)); - map(0x500000, 0x5fffff).rw(this, FUNC(zr107_state::dsp_dataram_r), FUNC(zr107_state::dsp_dataram_w)); + map(0x500000, 0x5fffff).rw(FUNC(zr107_state::dsp_dataram_r), FUNC(zr107_state::dsp_dataram_w)); map(0x600000, 0x6fffff).rw(m_k001005, FUNC(k001005_device::read), FUNC(k001005_device::write)); map(0x700000, 0x7000ff).rw(m_konppc, FUNC(konppc_device::cgboard_0_comm_sharc_r), FUNC(konppc_device::cgboard_0_comm_sharc_w)); } diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index f4c389930d2..8d531d1bea5 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -118,11 +118,11 @@ void zrt80_state::io_map(address_map &map) map(0x00, 0x07).rw(m_8250, FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); map(0x08, 0x08).w(m_crtc, FUNC(mc6845_device::address_w)); map(0x09, 0x09).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); - map(0x10, 0x17).r(this, FUNC(zrt80_state::zrt80_10_r)); + map(0x10, 0x17).r(FUNC(zrt80_state::zrt80_10_r)); map(0x18, 0x1F).portr("DIPSW2"); map(0x20, 0x27).portr("DIPSW3"); - map(0x30, 0x37).w(this, FUNC(zrt80_state::zrt80_30_w)); - map(0x38, 0x3F).w(this, FUNC(zrt80_state::zrt80_38_w)); + map(0x30, 0x37).w(FUNC(zrt80_state::zrt80_30_w)); + map(0x38, 0x3F).w(FUNC(zrt80_state::zrt80_38_w)); } /* Input ports */ diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp index cd5782a773c..baabb1a2c21 100644 --- a/src/mame/drivers/zwackery.cpp +++ b/src/mame/drivers/zwackery.cpp @@ -108,13 +108,13 @@ void zwackery_state::zwackery_map(address_map &map) map(0x000000, 0x037fff).rom(); map(0x080000, 0x080fff).ram(); map(0x084000, 0x084fff).ram(); - map(0x100000, 0x10000f).r(this, FUNC(zwackery_state::ptm_r)).umask16(0xff00).w(m_ptm, FUNC(ptm6840_device::write)).umask16(0xff00); + map(0x100000, 0x10000f).r(FUNC(zwackery_state::ptm_r)).umask16(0xff00).w(m_ptm, FUNC(ptm6840_device::write)).umask16(0xff00); map(0x104000, 0x104007).rw(m_pia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0xff00); map(0x108000, 0x108007).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0x00ff); map(0x10c000, 0x10c007).rw(m_pia2, FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0x00ff); - map(0x800000, 0x800fff).ram().w(this, FUNC(zwackery_state::videoram_w)).share("videoram"); + map(0x800000, 0x800fff).ram().w(FUNC(zwackery_state::videoram_w)).share("videoram"); map(0x802000, 0x803fff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0xc00000, 0xc00fff).rw(this, FUNC(zwackery_state::spriteram_r), FUNC(zwackery_state::spriteram_w)).umask16(0x00ff); + map(0xc00000, 0xc00fff).rw(FUNC(zwackery_state::spriteram_r), FUNC(zwackery_state::spriteram_w)).umask16(0x00ff); } diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp index 0ba2f0f5187..09c18e00f05 100644 --- a/src/mame/drivers/zx.cpp +++ b/src/mame/drivers/zx.cpp @@ -65,28 +65,28 @@ void zx_state::zx81_map(address_map &map) void zx_state::ula_map(address_map &map) { - map(0x0000, 0x7fff).r(this, FUNC(zx_state::ula_low_r)); - map(0x8000, 0xffff).r(this, FUNC(zx_state::ula_high_r)); + map(0x0000, 0x7fff).r(FUNC(zx_state::ula_low_r)); + map(0x8000, 0xffff).r(FUNC(zx_state::ula_high_r)); } void zx_state::zx80_io_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(zx_state::zx80_io_r), FUNC(zx_state::zx80_io_w)); + map(0x0000, 0xffff).rw(FUNC(zx_state::zx80_io_r), FUNC(zx_state::zx80_io_w)); } void zx_state::zx81_io_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(zx_state::zx81_io_r), FUNC(zx_state::zx81_io_w)); + map(0x0000, 0xffff).rw(FUNC(zx_state::zx81_io_r), FUNC(zx_state::zx81_io_w)); } void zx_state::pc8300_io_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(zx_state::pc8300_io_r), FUNC(zx_state::zx81_io_w)); + map(0x0000, 0xffff).rw(FUNC(zx_state::pc8300_io_r), FUNC(zx_state::zx81_io_w)); } void zx_state::pow3000_io_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(zx_state::pow3000_io_r), FUNC(zx_state::zx81_io_w)); + map(0x0000, 0xffff).rw(FUNC(zx_state::pow3000_io_r), FUNC(zx_state::zx81_io_w)); } -- cgit v1.2.3