summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Ivan Vangelista <mesgnet@yahoo.it>2019-10-10 18:02:58 +0200
committerGravatarGravatar Ivan Vangelista <mesgnet@yahoo.it>2019-10-10 18:02:58 +0200
commit52d873062c8025915d55b15547edc66de0f17492 (patch) (github)
tree36e8fc32838356c2399441d49b412402de523beb
parentcc9b9974375947a1769689e74594f2b5d1aa56b9 (diff)
downloadmame-52d873062c8025915d55b15547edc66de0f17492.tar.bz2
mame-52d873062c8025915d55b15547edc66de0f17492.zip
(nw) removed every remaining AM_ macro I could find in comments, but one in emu\memarray.h cause I didn't want to cause a full recompile for this (nw)
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp16
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp2
-rw-r--r--src/devices/bus/ecbbus/grip.cpp24
-rw-r--r--src/devices/bus/einstein/pipe/tk02.cpp2
-rw-r--r--src/devices/bus/interpro/sr/gt.cpp12
-rw-r--r--src/devices/bus/isa/sb16.cpp12
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp2
-rw-r--r--src/devices/bus/megadrive/svp.cpp4
-rw-r--r--src/devices/bus/vme/vme_fcisio.cpp2
-rw-r--r--src/devices/bus/vme/vme_fcscsi.cpp2
-rw-r--r--src/devices/bus/vme/vme_hcpu30.cpp2
-rw-r--r--src/devices/bus/vme/vme_mvme350.cpp4
-rw-r--r--src/devices/bus/wangpc/rtc.cpp24
-rw-r--r--src/devices/cpu/alto2/alto2cpu.cpp4
-rw-r--r--src/devices/cpu/dsp56156/dsp56156.cpp2
-rw-r--r--src/devices/cpu/h8/h83337.cpp4
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp2
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp2
-rw-r--r--src/devices/cpu/sh/sh2.cpp6
-rw-r--r--src/devices/cpu/sh/sh7604_bus.cpp2
-rw-r--r--src/devices/cpu/sh/sh7604_wdt.cpp8
-rw-r--r--src/devices/cpu/tlcs90/tlcs90.cpp4
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp4
-rw-r--r--src/devices/machine/atmel_arm_aic.h2
-rw-r--r--src/devices/machine/i80130.cpp6
-rw-r--r--src/devices/machine/mb8421.cpp2
-rw-r--r--src/devices/machine/mos6530n.h2
-rw-r--r--src/devices/machine/nvram.cpp2
-rw-r--r--src/devices/machine/sega_scu.cpp22
-rw-r--r--src/devices/machine/smpc.cpp2
-rw-r--r--src/devices/video/imagetek_i4100.cpp2
-rw-r--r--src/devices/video/mb90082.cpp4
-rw-r--r--src/devices/video/ppu2c0x.cpp2
-rw-r--r--src/emu/addrmap.cpp2
-rw-r--r--src/mame/audio/flower.cpp2
-rw-r--r--src/mame/drivers/20pacgal.cpp4
-rw-r--r--src/mame/drivers/40love.cpp2
-rw-r--r--src/mame/drivers/4enlinea.cpp4
-rw-r--r--src/mame/drivers/4enraya.cpp2
-rw-r--r--src/mame/drivers/4roses.cpp4
-rw-r--r--src/mame/drivers/8080bw.cpp6
-rw-r--r--src/mame/drivers/a5105.cpp4
-rw-r--r--src/mame/drivers/acesp.cpp4
-rw-r--r--src/mame/drivers/airraid.cpp13
-rw-r--r--src/mame/drivers/akaiax80.cpp6
-rw-r--r--src/mame/drivers/alesis.cpp2
-rw-r--r--src/mame/drivers/alesis_qs.cpp2
-rw-r--r--src/mame/drivers/alpha68k_n.cpp10
-rw-r--r--src/mame/drivers/alphatpx.cpp8
-rw-r--r--src/mame/drivers/alphatro.cpp2
-rw-r--r--src/mame/drivers/altair.cpp2
-rw-r--r--src/mame/drivers/altos486.cpp8
-rw-r--r--src/mame/drivers/altos5.cpp2
-rw-r--r--src/mame/drivers/amaticmg.cpp12
-rw-r--r--src/mame/drivers/amico2k.cpp2
-rw-r--r--src/mame/drivers/ampoker2.cpp2
-rw-r--r--src/mame/drivers/amspdwy.cpp4
-rw-r--r--src/mame/drivers/anes.cpp4
-rw-r--r--src/mame/drivers/apc.cpp12
-rw-r--r--src/mame/drivers/apogee.cpp2
-rw-r--r--src/mame/drivers/apollo.cpp28
-rw-r--r--src/mame/drivers/apple2e.cpp4
-rw-r--r--src/mame/drivers/applix.cpp2
-rw-r--r--src/mame/drivers/apricotf.cpp2
-rw-r--r--src/mame/drivers/aquarius.cpp2
-rw-r--r--src/mame/drivers/argox.cpp2
-rw-r--r--src/mame/drivers/armedf.cpp10
-rw-r--r--src/mame/drivers/arsystems.cpp2
-rw-r--r--src/mame/drivers/artmagic.cpp2
-rw-r--r--src/mame/drivers/astrohome.cpp2
-rw-r--r--src/mame/drivers/atarig1.cpp2
-rw-r--r--src/mame/drivers/atarist.cpp76
-rw-r--r--src/mame/drivers/atlantis.cpp24
-rw-r--r--src/mame/drivers/atom.cpp4
-rw-r--r--src/mame/drivers/atvtrack.cpp2
-rw-r--r--src/mame/drivers/avt.cpp2
-rw-r--r--src/mame/drivers/badlandsbl.cpp2
-rw-r--r--src/mame/drivers/bagman.cpp2
-rw-r--r--src/mame/drivers/basic52.cpp10
-rw-r--r--src/mame/drivers/bebox.cpp2
-rw-r--r--src/mame/drivers/beezer.cpp4
-rw-r--r--src/mame/drivers/besta.cpp14
-rw-r--r--src/mame/drivers/bfcobra.cpp10
-rw-r--r--src/mame/drivers/bfm_sc2.cpp2
-rw-r--r--src/mame/drivers/bigbord2.cpp2
-rw-r--r--src/mame/drivers/bigstrkb.cpp2
-rw-r--r--src/mame/drivers/bingoman.cpp2
-rw-r--r--src/mame/drivers/bingor.cpp2
-rw-r--r--src/mame/drivers/bitgraph.cpp2
-rw-r--r--src/mame/drivers/bking.cpp4
-rw-r--r--src/mame/drivers/bloodbro.cpp2
-rw-r--r--src/mame/drivers/bmjr.cpp8
-rw-r--r--src/mame/drivers/bml3.cpp12
-rw-r--r--src/mame/drivers/bpmmicro.cpp2
-rw-r--r--src/mame/drivers/buggychl.cpp6
-rw-r--r--src/mame/drivers/buster.cpp2
-rw-r--r--src/mame/drivers/by35.cpp4
-rw-r--r--src/mame/drivers/c65.cpp2
-rw-r--r--src/mame/drivers/calchase.cpp4
-rw-r--r--src/mame/drivers/calcune.cpp2
-rw-r--r--src/mame/drivers/camplynx.cpp8
-rw-r--r--src/mame/drivers/candela.cpp2
-rw-r--r--src/mame/drivers/capr1.cpp8
-rw-r--r--src/mame/drivers/casloopy.cpp4
-rw-r--r--src/mame/drivers/cclimber.cpp2
-rw-r--r--src/mame/drivers/cd2650.cpp2
-rw-r--r--src/mame/drivers/cdi.cpp24
-rw-r--r--src/mame/drivers/cesclass.cpp4
-rw-r--r--src/mame/drivers/cfx9850.cpp6
-rw-r--r--src/mame/drivers/cgc7900.cpp36
-rw-r--r--src/mame/drivers/champbas.cpp2
-rw-r--r--src/mame/drivers/chessmst.cpp2
-rw-r--r--src/mame/drivers/chinagat.cpp16
-rw-r--r--src/mame/drivers/chsuper.cpp2
-rw-r--r--src/mame/drivers/clayshoo.cpp6
-rw-r--r--src/mame/drivers/cmi.cpp8
-rw-r--r--src/mame/drivers/cmmb.cpp2
-rw-r--r--src/mame/drivers/cntsteer.cpp2
-rw-r--r--src/mame/drivers/cobra.cpp2
-rw-r--r--src/mame/drivers/codata.cpp6
-rw-r--r--src/mame/drivers/coinmstr.cpp2
-rw-r--r--src/mame/drivers/coinmvga.cpp32
-rw-r--r--src/mame/drivers/combatsc.cpp2
-rw-r--r--src/mame/drivers/concept.cpp2
-rw-r--r--src/mame/drivers/cosmicos.cpp6
-rw-r--r--src/mame/drivers/crgolf.cpp2
-rw-r--r--src/mame/drivers/crvision.cpp4
-rw-r--r--src/mame/drivers/cswat.cpp4
-rw-r--r--src/mame/drivers/cupidon.cpp7
-rw-r--r--src/mame/drivers/cv1k.cpp4
-rw-r--r--src/mame/drivers/cybiko.cpp2
-rw-r--r--src/mame/drivers/cyclemb.cpp10
-rw-r--r--src/mame/drivers/d9final.cpp4
-rw-r--r--src/mame/drivers/dai.cpp2
-rw-r--r--src/mame/drivers/daruma.cpp4
-rw-r--r--src/mame/drivers/dblewing.cpp2
-rw-r--r--src/mame/drivers/dbox.cpp4
-rw-r--r--src/mame/drivers/dccons.cpp12
-rw-r--r--src/mame/drivers/ddenlovr.cpp20
-rw-r--r--src/mame/drivers/deco_ld.cpp2
-rw-r--r--src/mame/drivers/dectalk.cpp2
-rw-r--r--src/mame/drivers/deshoros.cpp8
-rw-r--r--src/mame/drivers/dg680.cpp4
-rw-r--r--src/mame/drivers/digel804.cpp22
-rw-r--r--src/mame/drivers/dim68k.cpp2
-rw-r--r--src/mame/drivers/diverboy.cpp8
-rw-r--r--src/mame/drivers/dlair2.cpp10
-rw-r--r--src/mame/drivers/dm7000.cpp2
-rw-r--r--src/mame/drivers/dmax8000.cpp6
-rw-r--r--src/mame/drivers/dps1.cpp8
-rw-r--r--src/mame/drivers/dreambal.cpp2
-rw-r--r--src/mame/drivers/dsb46.cpp10
-rw-r--r--src/mame/drivers/dunhuang.cpp2
-rw-r--r--src/mame/drivers/dynax.cpp52
-rw-r--r--src/mame/drivers/ec184x.cpp2
-rw-r--r--src/mame/drivers/ecoinf2.cpp4
-rw-r--r--src/mame/drivers/ecoinfr.cpp2
-rw-r--r--src/mame/drivers/elan_eu3a05.cpp3
-rw-r--r--src/mame/drivers/ep64.cpp2
-rw-r--r--src/mame/drivers/eprom.cpp2
-rw-r--r--src/mame/drivers/eurocom2.cpp2
-rw-r--r--src/mame/drivers/exp85.cpp2
-rw-r--r--src/mame/drivers/exterm.cpp2
-rw-r--r--src/mame/drivers/fastfred.cpp2
-rw-r--r--src/mame/drivers/fastinvaders.cpp8
-rw-r--r--src/mame/drivers/fc100.cpp4
-rw-r--r--src/mame/drivers/fccpu30.cpp10
-rw-r--r--src/mame/drivers/fcrash.cpp12
-rw-r--r--src/mame/drivers/feversoc.cpp2
-rw-r--r--src/mame/drivers/finalizr.cpp2
-rw-r--r--src/mame/drivers/fitfight.cpp2
-rw-r--r--src/mame/drivers/flstory.cpp14
-rw-r--r--src/mame/drivers/fm7.cpp10
-rw-r--r--src/mame/drivers/fmtowns.cpp6
-rw-r--r--src/mame/drivers/force68k.cpp6
-rw-r--r--src/mame/drivers/forte2.cpp4
-rw-r--r--src/mame/drivers/fortecar.cpp2
-rw-r--r--src/mame/drivers/fp1100.cpp4
-rw-r--r--src/mame/drivers/fresh.cpp25
-rw-r--r--src/mame/drivers/funkball.cpp6
-rw-r--r--src/mame/drivers/gaelco.cpp12
-rw-r--r--src/mame/drivers/gaelco2.cpp2
-rw-r--r--src/mame/drivers/gaiden.cpp10
-rw-r--r--src/mame/drivers/gal3.cpp32
-rw-r--r--src/mame/drivers/galaxian.cpp33
-rw-r--r--src/mame/drivers/galaxold.cpp28
-rw-r--r--src/mame/drivers/gambl186.cpp4
-rw-r--r--src/mame/drivers/gameking.cpp4
-rw-r--r--src/mame/drivers/gamepock.cpp2
-rw-r--r--src/mame/drivers/gamtor.cpp6
-rw-r--r--src/mame/drivers/gaplus.cpp2
-rw-r--r--src/mame/drivers/gba.cpp2
-rw-r--r--src/mame/drivers/geniusiq.cpp4
-rw-r--r--src/mame/drivers/gimix.cpp6
-rw-r--r--src/mame/drivers/gladiatr.cpp4
-rw-r--r--src/mame/drivers/glass.cpp4
-rw-r--r--src/mame/drivers/gmaster.cpp2
-rw-r--r--src/mame/drivers/go2000.cpp6
-rw-r--r--src/mame/drivers/gokidetor.cpp2
-rw-r--r--src/mame/drivers/goldnpkr.cpp6
-rw-r--r--src/mame/drivers/goldstar.cpp2
-rw-r--r--src/mame/drivers/good.cpp2
-rw-r--r--src/mame/drivers/gottlieb.cpp4
-rw-r--r--src/mame/drivers/gpworld.cpp4
-rw-r--r--src/mame/drivers/gridcomp.cpp4
-rw-r--r--src/mame/drivers/gsword.cpp2
-rw-r--r--src/mame/drivers/gts80a.cpp12
-rw-r--r--src/mame/drivers/gunpey.cpp6
-rw-r--r--src/mame/drivers/h89.cpp14
-rw-r--r--src/mame/drivers/hideseek.cpp2
-rw-r--r--src/mame/drivers/highvdeo.cpp8
-rw-r--r--src/mame/drivers/hitpoker.cpp2
-rw-r--r--src/mame/drivers/hk68v10.cpp4
-rw-r--r--src/mame/drivers/hotstuff.cpp2
-rw-r--r--src/mame/drivers/hp9k.cpp2
-rw-r--r--src/mame/drivers/ht68k.cpp4
-rw-r--r--src/mame/drivers/huebler.cpp6
-rw-r--r--src/mame/drivers/hvyunit.cpp4
-rw-r--r--src/mame/drivers/hyhoo.cpp4
-rw-r--r--src/mame/drivers/i7000.cpp32
-rw-r--r--src/mame/drivers/ibm3153.cpp4
-rw-r--r--src/mame/drivers/icatel.cpp2
-rw-r--r--src/mame/drivers/if800.cpp2
-rw-r--r--src/mame/drivers/igs017.cpp2
-rw-r--r--src/mame/drivers/imolagp.cpp2
-rw-r--r--src/mame/drivers/instantm.cpp18
-rw-r--r--src/mame/drivers/interact.cpp4
-rw-r--r--src/mame/drivers/intrscti.cpp4
-rw-r--r--src/mame/drivers/intv.cpp2
-rw-r--r--src/mame/drivers/inufuku.cpp4
-rw-r--r--src/mame/drivers/isbc.cpp2
-rw-r--r--src/mame/drivers/isbc8010.cpp4
-rw-r--r--src/mame/drivers/istellar.cpp10
-rw-r--r--src/mame/drivers/itech32.cpp4
-rw-r--r--src/mame/drivers/jangou.cpp4
-rw-r--r--src/mame/drivers/jclub2.cpp38
-rw-r--r--src/mame/drivers/jokrwild.cpp2
-rw-r--r--src/mame/drivers/joystand.cpp4
-rw-r--r--src/mame/drivers/jpmimpct.cpp24
-rw-r--r--src/mame/drivers/jpmmps.cpp12
-rw-r--r--src/mame/drivers/jpms80.cpp4
-rw-r--r--src/mame/drivers/jupiter.cpp24
-rw-r--r--src/mame/drivers/jvh.cpp50
-rw-r--r--src/mame/drivers/kaneko16.cpp4
-rw-r--r--src/mame/drivers/kingdrby.cpp2
-rw-r--r--src/mame/drivers/kingpin.cpp12
-rw-r--r--src/mame/drivers/kyocera.cpp14
-rw-r--r--src/mame/drivers/lbeach.cpp8
-rw-r--r--src/mame/drivers/leapster.cpp2
-rw-r--r--src/mame/drivers/lethalj.cpp2
-rw-r--r--src/mame/drivers/lgp.cpp6
-rw-r--r--src/mame/drivers/liberate.cpp2
-rw-r--r--src/mame/drivers/liberatr.cpp2
-rw-r--r--src/mame/drivers/ltd.cpp2
-rw-r--r--src/mame/drivers/luckgrln.cpp5
-rw-r--r--src/mame/drivers/lvcards.cpp2
-rw-r--r--src/mame/drivers/lwriter.cpp2
-rw-r--r--src/mame/drivers/m5.cpp6
-rw-r--r--src/mame/drivers/m72.cpp4
-rw-r--r--src/mame/drivers/m79152pc.cpp2
-rw-r--r--src/mame/drivers/m90.cpp4
-rw-r--r--src/mame/drivers/macs.cpp20
-rw-r--r--src/mame/drivers/magic10.cpp4
-rw-r--r--src/mame/drivers/magicard.cpp4
-rw-r--r--src/mame/drivers/magictg.cpp2
-rw-r--r--src/mame/drivers/maygay1b.cpp6
-rw-r--r--src/mame/drivers/mazerbla.cpp2
-rw-r--r--src/mame/drivers/mbee.cpp8
-rw-r--r--src/mame/drivers/mcatadv.cpp4
-rw-r--r--src/mame/drivers/megasys1.cpp6
-rw-r--r--src/mame/drivers/megatech.cpp2
-rw-r--r--src/mame/drivers/mephisto_modular.cpp18
-rw-r--r--src/mame/drivers/mephistp.cpp2
-rw-r--r--src/mame/drivers/metlclsh.cpp4
-rw-r--r--src/mame/drivers/meyc8080.cpp2
-rw-r--r--src/mame/drivers/mgames.cpp2
-rw-r--r--src/mame/drivers/mgavegas.cpp4
-rw-r--r--src/mame/drivers/mhavoc.cpp4
-rw-r--r--src/mame/drivers/micral.cpp2
-rw-r--r--src/mame/drivers/microdec.cpp20
-rw-r--r--src/mame/drivers/midtunit.cpp2
-rw-r--r--src/mame/drivers/midvunit.cpp2
-rw-r--r--src/mame/drivers/mini2440.cpp2
-rw-r--r--src/mame/drivers/miniforce.cpp10
-rw-r--r--src/mame/drivers/mirax.cpp2
-rw-r--r--src/mame/drivers/missb2.cpp2
-rw-r--r--src/mame/drivers/mk90.cpp14
-rw-r--r--src/mame/drivers/model2.cpp24
-rw-r--r--src/mame/drivers/molecular.cpp2
-rw-r--r--src/mame/drivers/monty.cpp4
-rw-r--r--src/mame/drivers/mpu4dealem.cpp2
-rw-r--r--src/mame/drivers/mpu4vid.cpp22
-rw-r--r--src/mame/drivers/ms32.cpp32
-rw-r--r--src/mame/drivers/msisaac.cpp8
-rw-r--r--src/mame/drivers/mstation.cpp2
-rw-r--r--src/mame/drivers/multfish.cpp4
-rw-r--r--src/mame/drivers/multi8.cpp6
-rw-r--r--src/mame/drivers/murogmbl.cpp2
-rw-r--r--src/mame/drivers/mvme147.cpp10
-rw-r--r--src/mame/drivers/myb3k.cpp2
-rw-r--r--src/mame/drivers/myvision.cpp2
-rw-r--r--src/mame/drivers/mz2000.cpp2
-rw-r--r--src/mame/drivers/mz2500.cpp14
-rw-r--r--src/mame/drivers/mz3500.cpp18
-rw-r--r--src/mame/drivers/mz6500.cpp40
-rw-r--r--src/mame/drivers/mzr8105.cpp4
-rw-r--r--src/mame/drivers/namcos23.cpp2
-rw-r--r--src/mame/drivers/nanos.cpp4
-rw-r--r--src/mame/drivers/naomi.cpp26
-rw-r--r--src/mame/drivers/nbmj8688.cpp34
-rw-r--r--src/mame/drivers/nbmj8891.cpp36
-rw-r--r--src/mame/drivers/nbmj8991.cpp12
-rw-r--r--src/mame/drivers/neogeocd.cpp2
-rw-r--r--src/mame/drivers/neoprint.cpp26
-rw-r--r--src/mame/drivers/next.cpp32
-rw-r--r--src/mame/drivers/ngen.cpp14
-rw-r--r--src/mame/drivers/nmk16.cpp12
-rw-r--r--src/mame/drivers/norautp.cpp10
-rw-r--r--src/mame/drivers/notetaker.cpp4
-rw-r--r--src/mame/drivers/ob68k1a.cpp4
-rw-r--r--src/mame/drivers/okean240.cpp20
-rw-r--r--src/mame/drivers/olyboss.cpp4
-rw-r--r--src/mame/drivers/ondra.cpp4
-rw-r--r--src/mame/drivers/othunder.cpp2
-rw-r--r--src/mame/drivers/p8k.cpp14
-rw-r--r--src/mame/drivers/pacman.cpp18
-rw-r--r--src/mame/drivers/pandoras.cpp2
-rw-r--r--src/mame/drivers/paso1600.cpp2
-rw-r--r--src/mame/drivers/pastelg.cpp2
-rw-r--r--src/mame/drivers/pb1000.cpp4
-rw-r--r--src/mame/drivers/pc100.cpp2
-rw-r--r--src/mame/drivers/pc1512.cpp2
-rw-r--r--src/mame/drivers/pc6001.cpp32
-rw-r--r--src/mame/drivers/pc8001.cpp78
-rw-r--r--src/mame/drivers/pc8401a.cpp16
-rw-r--r--src/mame/drivers/pc8801.cpp22
-rw-r--r--src/mame/drivers/pc88va.cpp74
-rw-r--r--src/mame/drivers/pc9801.cpp76
-rw-r--r--src/mame/drivers/pcd.cpp2
-rw-r--r--src/mame/drivers/pcfx.cpp4
-rw-r--r--src/mame/drivers/pcm.cpp6
-rw-r--r--src/mame/drivers/pcxt.cpp2
-rw-r--r--src/mame/drivers/pda600.cpp6
-rw-r--r--src/mame/drivers/pegasus.cpp4
-rw-r--r--src/mame/drivers/pencil2.cpp2
-rw-r--r--src/mame/drivers/pgm2.cpp18
-rw-r--r--src/mame/drivers/photoply.cpp8
-rw-r--r--src/mame/drivers/picno.cpp2
-rw-r--r--src/mame/drivers/pinkiri8.cpp4
-rw-r--r--src/mame/drivers/pipbug.cpp2
-rw-r--r--src/mame/drivers/pirates.cpp8
-rw-r--r--src/mame/drivers/pitnrun.cpp6
-rw-r--r--src/mame/drivers/pktgaldx.cpp2
-rw-r--r--src/mame/drivers/playmark.cpp8
-rw-r--r--src/mame/drivers/poisk1.cpp2
-rw-r--r--src/mame/drivers/pokechmp.cpp2
-rw-r--r--src/mame/drivers/popobear.cpp8
-rw-r--r--src/mame/drivers/proconn.cpp2
-rw-r--r--src/mame/drivers/prof80.cpp16
-rw-r--r--src/mame/drivers/progolf.cpp2
-rw-r--r--src/mame/drivers/puckpkmn.cpp6
-rw-r--r--src/mame/drivers/pv1000.cpp2
-rw-r--r--src/mame/drivers/pv2000.cpp4
-rw-r--r--src/mame/drivers/pv9234.cpp14
-rw-r--r--src/mame/drivers/px8.cpp6
-rw-r--r--src/mame/drivers/quakeat.cpp10
-rw-r--r--src/mame/drivers/r9751.cpp4
-rw-r--r--src/mame/drivers/radio86.cpp6
-rw-r--r--src/mame/drivers/rainbow.cpp6
-rw-r--r--src/mame/drivers/rbmk.cpp2
-rw-r--r--src/mame/drivers/rc759.cpp16
-rw-r--r--src/mame/drivers/riscpc.cpp18
-rw-r--r--src/mame/drivers/rm380z.cpp24
-rw-r--r--src/mame/drivers/royalmah.cpp4
-rw-r--r--src/mame/drivers/rx78.cpp6
-rw-r--r--src/mame/drivers/sage2.cpp12
-rw-r--r--src/mame/drivers/samcoupe.cpp8
-rw-r--r--src/mame/drivers/sapi1.cpp6
-rw-r--r--src/mame/drivers/saturn.cpp8
-rw-r--r--src/mame/drivers/savquest.cpp4
-rw-r--r--src/mame/drivers/scobra.cpp4
-rw-r--r--src/mame/drivers/scopus.cpp2
-rw-r--r--src/mame/drivers/scramble.cpp2
-rw-r--r--src/mame/drivers/scyclone.cpp4
-rw-r--r--src/mame/drivers/seattlecmp.cpp6
-rw-r--r--src/mame/drivers/segag80v.cpp2
-rw-r--r--src/mame/drivers/segas32.cpp2
-rw-r--r--src/mame/drivers/segasp.cpp12
-rw-r--r--src/mame/drivers/segaufo.cpp4
-rw-r--r--src/mame/drivers/segaxbd.cpp2
-rw-r--r--src/mame/drivers/segaybd.cpp2
-rw-r--r--src/mame/drivers/seibuspi.cpp4
-rw-r--r--src/mame/drivers/seicupbl.cpp2
-rw-r--r--src/mame/drivers/selz80.cpp2
-rw-r--r--src/mame/drivers/sengokmj.cpp6
-rw-r--r--src/mame/drivers/senjyo.cpp10
-rw-r--r--src/mame/drivers/seta.cpp20
-rw-r--r--src/mame/drivers/seta2.cpp6
-rw-r--r--src/mame/drivers/sf.cpp4
-rw-r--r--src/mame/drivers/sfcbox.cpp10
-rw-r--r--src/mame/drivers/sigmab52.cpp2
-rw-r--r--src/mame/drivers/sigmab98.cpp6
-rw-r--r--src/mame/drivers/skimaxx.cpp6
-rw-r--r--src/mame/drivers/skyfox.cpp4
-rw-r--r--src/mame/drivers/sm1800.cpp6
-rw-r--r--src/mame/drivers/sms_bootleg.cpp6
-rw-r--r--src/mame/drivers/snes.cpp4
-rw-r--r--src/mame/drivers/snk.cpp4
-rw-r--r--src/mame/drivers/snowbros.cpp8
-rw-r--r--src/mame/drivers/spdodgeb.cpp8
-rw-r--r--src/mame/drivers/speglsht.cpp20
-rw-r--r--src/mame/drivers/spirit76.cpp2
-rw-r--r--src/mame/drivers/spoker.cpp4
-rw-r--r--src/mame/drivers/spool99.cpp2
-rw-r--r--src/mame/drivers/spyhuntertec.cpp4
-rw-r--r--src/mame/drivers/srmp5.cpp8
-rw-r--r--src/mame/drivers/srmp6.cpp10
-rw-r--r--src/mame/drivers/ssingles.cpp12
-rw-r--r--src/mame/drivers/ssozumo.cpp2
-rw-r--r--src/mame/drivers/ssv.cpp46
-rw-r--r--src/mame/drivers/st_mp200.cpp4
-rw-r--r--src/mame/drivers/stactics.cpp2
-rw-r--r--src/mame/drivers/stv.cpp4
-rw-r--r--src/mame/drivers/subhuntr.cpp4
-rw-r--r--src/mame/drivers/subs.cpp2
-rw-r--r--src/mame/drivers/subsino.cpp24
-rw-r--r--src/mame/drivers/summit.cpp6
-rw-r--r--src/mame/drivers/sun2.cpp10
-rw-r--r--src/mame/drivers/suna8.cpp2
-rw-r--r--src/mame/drivers/super6.cpp4
-rw-r--r--src/mame/drivers/supercrd.cpp6
-rw-r--r--src/mame/drivers/superqix.cpp4
-rw-r--r--src/mame/drivers/sv8000.cpp2
-rw-r--r--src/mame/drivers/symbolics.cpp10
-rw-r--r--src/mame/drivers/sys9002.cpp4
-rw-r--r--src/mame/drivers/taito_f2.cpp16
-rw-r--r--src/mame/drivers/taito_l.cpp2
-rw-r--r--src/mame/drivers/taitowlf.cpp2
-rw-r--r--src/mame/drivers/tandy2k.cpp6
-rw-r--r--src/mame/drivers/tankbust.cpp2
-rw-r--r--src/mame/drivers/targeth.cpp4
-rw-r--r--src/mame/drivers/taxidriv.cpp2
-rw-r--r--src/mame/drivers/tbowl.cpp14
-rw-r--r--src/mame/drivers/tdv2324.cpp22
-rw-r--r--src/mame/drivers/tec1.cpp4
-rw-r--r--src/mame/drivers/tecmosys.cpp2
-rw-r--r--src/mame/drivers/tek405x.cpp10
-rw-r--r--src/mame/drivers/tg100.cpp2
-rw-r--r--src/mame/drivers/thomson.cpp6
-rw-r--r--src/mame/drivers/thoop2.cpp4
-rw-r--r--src/mame/drivers/ti85.cpp2
-rw-r--r--src/mame/drivers/ti990_10.cpp8
-rw-r--r--src/mame/drivers/tigeroad.cpp2
-rw-r--r--src/mame/drivers/tim011.cpp6
-rw-r--r--src/mame/drivers/tk80.cpp2
-rw-r--r--src/mame/drivers/tk80bs.cpp2
-rw-r--r--src/mame/drivers/tmc600.cpp2
-rw-r--r--src/mame/drivers/tmmjprd.cpp10
-rw-r--r--src/mame/drivers/tmnt.cpp6
-rw-r--r--src/mame/drivers/tp84.cpp2
-rw-r--r--src/mame/drivers/tr175.cpp2
-rw-r--r--src/mame/drivers/trackfld.cpp6
-rw-r--r--src/mame/drivers/trs80dt1.cpp2
-rw-r--r--src/mame/drivers/trs80m2.cpp8
-rw-r--r--src/mame/drivers/ts802.cpp4
-rw-r--r--src/mame/drivers/ts816.cpp2
-rw-r--r--src/mame/drivers/tugboat.cpp2
-rw-r--r--src/mame/drivers/tumbleb.cpp4
-rw-r--r--src/mame/drivers/twin16.cpp6
-rw-r--r--src/mame/drivers/umipoker.cpp4
-rw-r--r--src/mame/drivers/undrfire.cpp4
-rw-r--r--src/mame/drivers/vboy.cpp12
-rw-r--r--src/mame/drivers/vcombat.cpp4
-rw-r--r--src/mame/drivers/vegas.cpp4
-rw-r--r--src/mame/drivers/vicdual.cpp2
-rw-r--r--src/mame/drivers/vigilant.cpp2
-rw-r--r--src/mame/drivers/viper.cpp4
-rw-r--r--src/mame/drivers/vixen.cpp2
-rw-r--r--src/mame/drivers/vk100.cpp20
-rw-r--r--src/mame/drivers/voyager.cpp36
-rw-r--r--src/mame/drivers/vt100.cpp2
-rw-r--r--src/mame/drivers/wangpc.cpp2
-rw-r--r--src/mame/drivers/warriorb.cpp4
-rw-r--r--src/mame/drivers/wico.cpp24
-rw-r--r--src/mame/drivers/wink.cpp2
-rw-r--r--src/mame/drivers/wiz.cpp2
-rw-r--r--src/mame/drivers/x1.cpp4
-rw-r--r--src/mame/drivers/x68k.cpp6
-rw-r--r--src/mame/drivers/xexex.cpp2
-rw-r--r--src/mame/drivers/z100.cpp38
-rw-r--r--src/mame/drivers/zn.cpp2
-rw-r--r--src/mame/drivers/zsbc3.cpp2
-rw-r--r--src/mame/machine/6883sam.cpp2
-rw-r--r--src/mame/machine/decopincpu.cpp4
-rw-r--r--src/mame/machine/gaelco2.cpp4
-rw-r--r--src/mame/machine/hng64_net.cpp22
-rw-r--r--src/mame/machine/megacd.cpp8
-rw-r--r--src/mame/machine/megadriv.cpp2
-rw-r--r--src/mame/machine/mpu4.cpp2
-rw-r--r--src/mame/machine/namco_c139.cpp6
-rw-r--r--src/mame/machine/nmk004.cpp2
-rw-r--r--src/mame/machine/taitocchip.cpp2
-rw-r--r--src/mame/machine/wangpckb.cpp2
-rw-r--r--src/mame/machine/wrally.cpp4
-rw-r--r--src/mame/video/legionna.cpp8
505 files changed, 1871 insertions, 1875 deletions
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 925014ac803..af5d0e7f213 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -698,14 +698,14 @@ void c1541_base_t::c1541pd_mem(address_map &map)
void c1541_prologic_dos_classic_t::c1541pdc_mem(address_map &map)
{
map(0x0000, 0xffff).rw(FUNC(c1541_prologic_dos_classic_t::read), FUNC(c1541_prologic_dos_classic_t::write));
-/* AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
- AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via6522_device, read, write)
- AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x8800, 0x9fff) AM_RAM
- AM_RANGE(0xa000, 0xb7ff) AM_ROM AM_REGION(M6502_TAG, 0x0000)
- AM_RANGE(0xb800, 0xb80f) AM_READWRITE(pia_r, pia_w)
- AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION(M6502_TAG, 0x2000)*/
+/* map(0x0000, 0x07ff).mirror(0x6000).ram().share("share1");
+ map(0x1800, 0x180f).mirror(0x63f0).rw(M6522_0_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x1c00, 0x1c0f).mirror(0x63f0).rw(M6522_1_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x8000, 0x87ff).ram().share("share1");
+ map(0x8800, 0x9fff).ram();
+ map(0xa000, 0xb7ff).rom().region(M6502_TAG, 0x0000);
+ map(0xb800, 0xb80f).rw(FUNC(c1541_prologic_dos_classic_t::pia_r), FUNC(c1541_prologic_dos_classic_t::pia_w));
+ map(0xf000, 0xffff).rom().region(M6502_TAG, 0x2000);*/
}
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index c3a9ddd2ab2..fe03bb93d34 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -39,7 +39,7 @@ const tiny_rom_entry *nec_p72_device::device_rom_region() const
void nec_p72_device::p72_mem(address_map &map)
{
map(0x000000, 0x0fffff).rom(); /* 1Mbyte firmware */
- //AM_RANGE(0x100000, 0x1fffff) AM_RAM /* 1Mbyte external RAM */ /* TODO might be 2x1Mbit */
+ //map(0x100000, 0x1fffff).ram(); /* 1Mbyte external RAM */ /* TODO might be 2x1Mbit */
// [RH] 29 August 2016: Commented out because the NEC V33 only has 20 address lines, and
// the V40 has more, but we don't have an NEC V40 implemented yet.
}
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 6312a32547f..f7abc75aac5 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -140,12 +140,12 @@ void ecb_grip21_device::grip_io(address_map &map)
{
map.global_mask(0xff);
map(0x00, 0x00).rw(FUNC(ecb_grip21_device::cxstb_r), FUNC(ecb_grip21_device::cxstb_w));
-// AM_RANGE(0x10, 0x10) AM_WRITE(ccon_w)
+// map(0x10, 0x10).w(FUNC(ecb_grip21_device::ccon_w));
map(0x11, 0x11).w(FUNC(ecb_grip21_device::vol0_w));
-// AM_RANGE(0x12, 0x12) AM_WRITE(rts_w)
+// map(0x12, 0x12).w(FUNC(ecb_grip21_device::rts_w));
map(0x13, 0x13).w(FUNC(ecb_grip21_device::page_w));
-// AM_RANGE(0x14, 0x14) AM_WRITE(cc1_w)
-// AM_RANGE(0x15, 0x15) AM_WRITE(cc2_w)
+// map(0x14, 0x14).w(FUNC(ecb_grip21_device::cc1_w));
+// map(0x15, 0x15).w(FUNC(ecb_grip21_device::cc2_w));
map(0x16, 0x16).w(FUNC(ecb_grip21_device::flash_w));
map(0x17, 0x17).w(FUNC(ecb_grip21_device::vol1_w));
map(0x20, 0x2f).rw(m_sti, FUNC(z80sti_device::read), FUNC(z80sti_device::write));
@@ -156,14 +156,14 @@ void ecb_grip21_device::grip_io(address_map &map)
map(0x53, 0x53).r(MC6845_TAG, FUNC(mc6845_device::register_r));
map(0x60, 0x60).w("cent_data_out", FUNC(output_latch_device::bus_w));
map(0x70, 0x73).rw(I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
-// AM_RANGE(0x80, 0x80) AM_WRITE(bl2out_w)
-// AM_RANGE(0x90, 0x90) AM_WRITE(gr2out_w)
-// AM_RANGE(0xa0, 0xa0) AM_WRITE(rd2out_w)
-// AM_RANGE(0xb0, 0xb0) AM_WRITE(clrg2_w)
-// AM_RANGE(0xc0, 0xc0) AM_WRITE(bluout_w)
-// AM_RANGE(0xd0, 0xd0) AM_WRITE(grnout_w)
-// AM_RANGE(0xe0, 0xe0) AM_WRITE(redout_w)
-// AM_RANGE(0xf0, 0xf0) AM_WRITE(clrg1_w)
+// map(0x80, 0x80).w(FUNC(ecb_grip21_device::bl2out_w));
+// map(0x90, 0x90).w(FUNC(ecb_grip21_device::gr2out_w));
+// map(0xa0, 0xa0).w(FUNC(ecb_grip21_device::rd2out_w));
+// map(0xb0, 0xb0).w(FUNC(ecb_grip21_device::clrg2_w));
+// map(0xc0, 0xc0).w(FUNC(ecb_grip21_device::bluout_w));
+// map(0xd0, 0xd0).w(FUNC(ecb_grip21_device::grnout_w));
+// map(0xe0, 0xe0).w(FUNC(ecb_grip21_device::redout_w));
+// map(0xf0, 0xf0).w(FUNC(ecb_grip21_device::clrg1_w));
}
diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp
index 311c3099011..0564a5eaaad 100644
--- a/src/devices/bus/einstein/pipe/tk02.cpp
+++ b/src/devices/bus/einstein/pipe/tk02.cpp
@@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(TK02_80COL, tk02_device, "tk02", "TK02 80 Column Monochrome U
void tk02_device::map(address_map &map)
{
-// AM_RANGE(0x00, 0x07) AM_SELECT(0xff00) AM_READWRITE(ram_r, ram_w) // no AM_SELECT (or AM_MASK) support here
+// map(0x00, 0x07).select(0xff00).rw(FUNC(tk02_device::ram_r), FUNC(tk02_device::ram_w)); // no select() (or mask()) support here
map(0x08, 0x08).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::address_w));
map(0x09, 0x09).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::register_w));
map(0x0c, 0x0c).mirror(0xff00).r(FUNC(tk02_device::status_r));
diff --git a/src/devices/bus/interpro/sr/gt.cpp b/src/devices/bus/interpro/sr/gt.cpp
index d3a7d99d2c7..7f598144fd1 100644
--- a/src/devices/bus/interpro/sr/gt.cpp
+++ b/src/devices/bus/interpro/sr/gt.cpp
@@ -182,18 +182,18 @@ void gt_device_base::map(address_map &map)
map(0x16c, 0x16f).w(FUNC(gt_device_base::ri_control_w)); // mask 1ff?
- //AM_RANGE(0x174, 0x177) AM_READWRITE(ri_xfer_r, ri_xfer_w)
- //AM_RANGE(0x178, 0x17b) AM_READWRITE(ri_xfer_r, ri_xfer_w)
+ //map(0x174, 0x177).rw(FUNC(gt_device_base::ri_xfer_r), FUNC(gt_device_base::ri_xfer_w));
+ //map(0x178, 0x17b).rw(FUNC(gt_device_base::ri_xfer_r), FUNC(gt_device_base::ri_xfer_w));
map(0x17c, 0x17f).w(FUNC(gt_device_base::ri_xfer_w));
map(0x1a4, 0x1ab).w(FUNC(gt_device_base::bsga_float_w));
map(0x1b0, 0x1b3).nopr(); //?
- //AM_RANGE(0x1c0, 0x1c3)
- //AM_RANGE(0x1c4, 0x1c7)
- //AM_RANGE(0x1c8, 0x1cb)
- //AM_RANGE(0x1cc, 0x1cf) // write32 - float conversion control (inhibit/enable overflow detection?)
+ //map(0x1c0, 0x1c3)
+ //map(0x1c4, 0x1c7)
+ //map(0x1c8, 0x1cb)
+ //map(0x1cc, 0x1cf) // write32 - float conversion control (inhibit/enable overflow detection?)
/*
* Don't know where/how these fifos come into play yet:
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index 6bce4b4198c..f48cda320da 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -376,12 +376,12 @@ ROM_END
void sb16_lle_device::sb16_io(address_map &map)
{
map(0x0000, 0x0000).mirror(0xff00).rw(FUNC(sb16_lle_device::dsp_data_r), FUNC(sb16_lle_device::dsp_data_w));
-// AM_RANGE(0x0001, 0x0001) // MIDI related?
-// AM_RANGE(0x0002, 0x0002)
+// map(0x0001, 0x0001) // MIDI related?
+// map(0x0002, 0x0002)
map(0x0004, 0x0004).mirror(0xff00).rw(FUNC(sb16_lle_device::mode_r), FUNC(sb16_lle_device::mode_w));
map(0x0005, 0x0005).mirror(0xff00).rw(FUNC(sb16_lle_device::dac_ctrl_r), FUNC(sb16_lle_device::dac_ctrl_w));
map(0x0006, 0x0006).mirror(0xff00).r(FUNC(sb16_lle_device::dma_stat_r));
-// AM_RANGE(0x0007, 0x0007) // unknown
+// map(0x0007, 0x0007) // unknown
map(0x0008, 0x0008).mirror(0xff00).rw(FUNC(sb16_lle_device::ctrl8_r), FUNC(sb16_lle_device::ctrl8_w));
map(0x0009, 0x0009).mirror(0xff00).w(FUNC(sb16_lle_device::rate_w));
map(0x000A, 0x000A).mirror(0xff00).r(FUNC(sb16_lle_device::dma8_cnt_lo_r));
@@ -399,9 +399,9 @@ void sb16_lle_device::sb16_io(address_map &map)
map(0x001B, 0x001B).mirror(0xff00).r(FUNC(sb16_lle_device::adc_data_r));
map(0x001D, 0x001D).mirror(0xff00).w(FUNC(sb16_lle_device::dma8_w));
map(0x001F, 0x001F).mirror(0xff00).r(FUNC(sb16_lle_device::dma8_r));
-// AM_RANGE(0x0080, 0x0080) // ASP comms
-// AM_RANGE(0x0081, 0x0081)
-// AM_RANGE(0x0082, 0x0082)
+// map(0x0080, 0x0080) // ASP comms
+// map(0x0081, 0x0081)
+// map(0x0082, 0x0082)
}
const tiny_rom_entry *sb16_lle_device::device_rom_region() const
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index b23a0dbe454..71ea8dfbe25 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -98,7 +98,7 @@ void stereo_fx_device::stereo_fx_io(address_map &map)
map(0xFF00, 0xFF00).w(FUNC(stereo_fx_device::port00_w));
map(0xFF10, 0xFF10).w("rdac", FUNC(dac_byte_interface::data_w));
map(0xFF20, 0xFF20).w(FUNC(stereo_fx_device::port20_w));
- //AM_RANGE(0xFF30, 0xFF30) AM_WRITE() // used only on reset and undocumented cmd 0xc4
+ //map(0xFF30, 0xFF30).w(FUNC(stereo_fx_device::)); // used only on reset and undocumented cmd 0xc4
map(0xFF40, 0xFF40).rw(FUNC(stereo_fx_device::dev_dsp_data_r), FUNC(stereo_fx_device::dev_dsp_data_w));
map(0xFF50, 0xFF50).w(FUNC(stereo_fx_device::raise_drq_w));
map(0xFF60, 0xFF60).w(FUNC(stereo_fx_device::dev_host_irq_w));
diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp
index fe4ae33536e..2070b27a9b7 100644
--- a/src/devices/bus/megadrive/svp.cpp
+++ b/src/devices/bus/megadrive/svp.cpp
@@ -320,8 +320,8 @@ INPUT_PORTS_END
void md_rom_svp_device::md_svp_ssp_map(address_map &map)
{
-// AM_RANGE(0x0000, 0x03ff) AM_READ(rom_read1)
-// AM_RANGE(0x0400, 0xffff) AM_READ(rom_read2)
+// map(0x0000, 0x03ff).r(FUNC(md_rom_svp_device::rom_read1));
+// map(0x0400, 0xffff).r(FUNC(md_rom_svp_device::rom_read2));
map(0x0000, 0x03ff).bankr("iram_svp");
map(0x0400, 0xffff).bankr("cart_svp");
}
diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp
index 711231b7901..ff13b51fd07 100644
--- a/src/devices/bus/vme/vme_fcisio.cpp
+++ b/src/devices/bus/vme/vme_fcisio.cpp
@@ -172,7 +172,7 @@ void vme_fcisio1_card_device::fcisio1_mem(address_map &map)
map(0xe60000, 0xe601ff).rw("duscc3", FUNC(duscc68562_device::read), FUNC(duscc68562_device::write)).umask16(0x00ff);
map(0xe80000, 0xe80dff).rw("pit", FUNC(pit68230_device::read), FUNC(pit68230_device::write)).umask16(0x00ff);
map(0xf00000, 0xf7ffff).rom(); /* System EPROM Area 32Kb DEBUGGER supplied */
-// AM_RANGE (0xc40000, 0xc800ff) AM_READWRITE8 (not_implemented_r, not_implemented_w, 0xffff) /* Dummy mapping af address area to display message */
+// map(0xc40000, 0xc800ff).rw(FUNC(vme_fcisio1_card_device::not_implemented_r), FUNC(vme_fcisio1_card_device::not_implemented_w)); /* Dummy mapping af address area to display message */
}
/* ROM definitions */
diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp
index 7c76080caea..47fcd376ce2 100644
--- a/src/devices/bus/vme/vme_fcscsi.cpp
+++ b/src/devices/bus/vme/vme_fcscsi.cpp
@@ -193,7 +193,7 @@ void vme_fcscsi1_card_device::fcscsi1_mem(address_map &map)
map(0x002000, 0x01ffff).ram(); /* Dual Ported RAM */
map(0xe00000, 0xe7ffff).rom(); /* System EPROM Area 32Kb DEBUGGER supplied */
map(0xd00000, 0xd0003f).rw("pit", FUNC(pit68230_device::read), FUNC(pit68230_device::write)).umask16(0x00ff);
-// AM_RANGE (0xc40000, 0xc4001f) AM_DEVREADWRITE8("scsi", ncr5386_device, read, write, 0x00ff) /* SCSI Controller interface - device support not yet available*/
+// map(0xc40000, 0xc4001f).rw("scsi", FUNC(ncr5386_device::read), FUNC(ncr5386_device::write)).umask16(0x00ff); /* SCSI Controller interface - device support not yet available*/
map(0xc40000, 0xc4001f).rw(FUNC(vme_fcscsi1_card_device::scsi_r), FUNC(vme_fcscsi1_card_device::scsi_w)).umask16(0x00ff);
map(0xc80000, 0xc800ff).rw("mc68450", FUNC(hd63450_device::read), FUNC(hd63450_device::write)); /* DMA Controller interface */
map(0xcc0000, 0xcc0007).rw("fdc", FUNC(wd1772_device::read), FUNC(wd1772_device::write)).umask16(0x00ff); /* Floppy Controller interface */
diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp
index 57994820f7c..c101c53fbe4 100644
--- a/src/devices/bus/vme/vme_hcpu30.cpp
+++ b/src/devices/bus/vme/vme_hcpu30.cpp
@@ -58,7 +58,7 @@ void vme_hcpu30_card_device::hcpu30_mem(address_map &map)
map(0x00000000, 0x00000007).ram().w(FUNC(vme_hcpu30_card_device::bootvect_w)); /* After first write we act as RAM */
map(0x00000000, 0x00000007).rom().r(FUNC(vme_hcpu30_card_device::bootvect_r)); /* ROM mirror just during reset */
map(0x00000008, 0x001fffff).ram(); // local bus DRAM, 4MB
- map(0x00200000, 0x00201fff).ram(); // AM_SHARE("iocpu")
+ map(0x00200000, 0x00201fff).ram(); // .share("iocpu");
map(0xff000000, 0xff007fff).rom().mirror(0x8000).region("user1", 0);
map(0xff020000, 0xff027fff).ram().mirror(0x8000); // SRAM 32KB
map(0xffff8000, 0xffff8fff).unmaprw(); // shared memory with iocpu
diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp
index b433620b6fe..7241680c4cc 100644
--- a/src/devices/bus/vme/vme_mvme350.cpp
+++ b/src/devices/bus/vme/vme_mvme350.cpp
@@ -175,8 +175,8 @@ void vme_mvme350_card_device::mvme350_mem(address_map &map)
map(0x060000, 0x06001f).ram(); /* Area is cleared on start */
map(0x080000, 0x080035).rw("pit", FUNC(pit68230_device::read), FUNC(pit68230_device::write)).umask16(0x00ff); /* PIT ?*/
#endif
-//AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */
-//AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */
+//map(0x100000, 0xfeffff).rw(FUNC(vme_mvme350_card_device::vme_a24_r), FUNC(vme_mvme350_card_device::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) - not verified */
+//map(0xff0000, 0xffffff).rw(FUNC(vme_mvme350_card_device::vme_a16_r), FUNC(vme_mvme350_card_device::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) - not verified */
}
ROM_START( mvme350 )
diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp
index 4512939003f..21e395d031b 100644
--- a/src/devices/bus/wangpc/rtc.cpp
+++ b/src/devices/bus/wangpc/rtc.cpp
@@ -73,19 +73,19 @@ void wangpc_rtc_device::wangpc_rtc_io(address_map &map)
map(0x00, 0x03).rw(m_sio, FUNC(z80sio0_device::cd_ba_r), FUNC(z80sio0_device::cd_ba_w));
map(0x10, 0x1f).rw(AM9517A_TAG, FUNC(am9517a_device::read), FUNC(am9517a_device::write));
map(0x20, 0x23).rw(m_ctc0, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
- map(0x30, 0x30); //AM_WRITE(clear_char_w)
- map(0x31, 0x31); //AM_WRITE(set_char_w)
- map(0x40, 0x40).portr("SW1"); //AM_WRITE(control_w)
- map(0x44, 0x44); //AM_READ(i8086_status_r) AM_WRITE(reset_w)
- map(0x48, 0x48); //AM_WRITE(dte_ready_w)
- map(0x4c, 0x4c); //AM_READWRITE(8232_acu_r, 8232_acu_w)
- map(0x50, 0x50); //AM_READ(outbound_data_r)
- map(0x51, 0x52); //AM_WRITE(status_w)
- map(0x54, 0x54); //AM_WRITE(enable_inbound_data_w)
- map(0x51, 0x52); //AM_WRITE(inbound_data_w)
+ map(0x30, 0x30); //.w(FUNC(wangpc_rtc_device::clear_char_w));
+ map(0x31, 0x31); //.w(FUNC(wangpc_rtc_device::set_char_w));
+ map(0x40, 0x40).portr("SW1"); //.w(FUNC(wangpc_rtc_device::control_w));
+ map(0x44, 0x44); //.rw(FUNC(wangpc_rtc_device::i8086_status_r), FUNC(wangpc_rtc_device::reset_w));
+ map(0x48, 0x48); //.w(FUNC(wangpc_rtc_device::dte_ready_w));
+ map(0x4c, 0x4c); //.rw(FUNC(wangpc_rtc_device::8232_acu_r), FUNC(wangpc_rtc_device::8232_acu_w));
+ map(0x50, 0x50); //.r(FUNC(wangpc_rtc_device::outbound_data_r));
+ map(0x51, 0x52); //.w(FUNC(wangpc_rtc_device::status_w));
+ map(0x54, 0x54); //.w(FUNC(wangpc_rtc_device::enable_inbound_data_w));
+ map(0x51, 0x52); //.w(FUNC(wangpc_rtc_device::inbound_data_w));
map(0x60, 0x63).rw(m_ctc1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
- map(0x70, 0x70); //AM_READWRITE(led_toggle_r, odd_parity_w)
- map(0x71, 0x71); //AM_WRITE(even_parity_w)
+ map(0x70, 0x70); //.rw(FUNC(wangpc_rtc_device::led_toggle_r), FUNC(wangpc_rtc_device::odd_parity_w));
+ map(0x71, 0x71); //.w(FUNC(wangpc_rtc_device::even_parity_w));
}
diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp
index 5b7f58e0aca..57ed58ddc03 100644
--- a/src/devices/cpu/alto2/alto2cpu.cpp
+++ b/src/devices/cpu/alto2/alto2cpu.cpp
@@ -95,10 +95,10 @@ void alto2_cpu_device::iomem_map(address_map &map)
map(0177205, 0177233).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // UNUSED RANGE
map(0177234, 0177237).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // { Experimental cursor control }
map(0177240, 0177257).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // { Alto-II debugger }
-// AM_RANGE(0177244, 0177247) AM_READWRITE( noop_r, noop_w ) // { Graphics keyboard }
+// map(0177244, 0177247).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // { Graphics keyboard }
map(0177260, 0177377).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // UNUSED RANGE
// page 0377
-// AM_RANGE(0177400, 0177405) AM_READWRITE( noop_r, noop_w ) // { Maxc2 maintenance interface }
+// map(0177400, 0177405).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // { Maxc2 maintenance interface }
map(0177400, 0177400).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // { Alto DLS input }
map(0177401, 0177417).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // UNUSED RANGE
map(0177420, 0177420).rw(FUNC(alto2_cpu_device::noop_r), FUNC(alto2_cpu_device::noop_w)); // { "" }
diff --git a/src/devices/cpu/dsp56156/dsp56156.cpp b/src/devices/cpu/dsp56156/dsp56156.cpp
index a308e5329bc..b6c5b4fd672 100644
--- a/src/devices/cpu/dsp56156/dsp56156.cpp
+++ b/src/devices/cpu/dsp56156/dsp56156.cpp
@@ -112,7 +112,7 @@ enum
void dsp56156_device::dsp56156_program_map(address_map &map)
{
map(0x0000, 0x07ff).ram().share("dsk56156_program_ram"); /* 1-5 */
-// AM_RANGE(0x2f00,0x2fff) AM_ROM /* 1-5 PROM reserved memory. Is this the right spot for it? */
+// map(0x2f00, 0x2fff).rom(); /* 1-5 PROM reserved memory. Is this the right spot for it? */
}
void dsp56156_device::dsp56156_x_data_map(address_map &map)
diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp
index 554242297d0..b3a386835f3 100644
--- a/src/devices/cpu/h8/h83337.cpp
+++ b/src/devices/cpu/h8/h83337.cpp
@@ -61,9 +61,9 @@ void h83337_device::map(address_map &map)
map(0xff90, 0xff90).rw("timer16:0", FUNC(h8_timer16_channel_device::tier_r), FUNC(h8_timer16_channel_device::tier_w));
map(0xff91, 0xff91).rw("timer16:0", FUNC(h8_timer16_channel_device::tsr_r), FUNC(h8_timer16_channel_device::tsr_w));
map(0xff92, 0xff93).rw("timer16:0", FUNC(h8_timer16_channel_device::tcnt_r), FUNC(h8_timer16_channel_device::tcnt_w));
-// AM_RANGE(0xff94, 0xff95) AM_DEVREADWRITE( "timer16:0", h8_timer16_channel_device, ocr_r, ocr_w )
+// map(0xff94, 0xff95).rw("timer16:0", FUNC(h8_timer16_channel_device::ocr_r, FUNC(h8_timer16_channel_device:ocr_w));
map(0xff96, 0xff96).rw("timer16:0", FUNC(h8_timer16_channel_device::tcr_r), FUNC(h8_timer16_channel_device::tcr_w));
-// AM_RANGE(0xff96, 0xff97) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tocr_r, tocr_w, 0x00ff)
+// map(0xff97, 0xff97).rw("timer16:0", FUNC(h8_timer16_channel_device::tocr_r, FUNC(h8_timer16_channel_device:tocr_w));
map(0xff98, 0xff9f).r("timer16:0", FUNC(h8_timer16_channel_device::tgr_r));
map(0xffa8, 0xffa9).rw("watchdog", FUNC(h8_watchdog_device::wd_r), FUNC(h8_watchdog_device::wd_w));
diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp
index 6bfbc2edc98..0eb94cd52f3 100644
--- a/src/devices/cpu/m6502/n2a03.cpp
+++ b/src/devices/cpu/m6502/n2a03.cpp
@@ -43,7 +43,7 @@ WRITE8_MEMBER(n2a03_device::psg1_4017_w)
void n2a03_device::n2a03_map(address_map &map)
{
map(0x4000, 0x4013).rw("nesapu", FUNC(nesapu_device::read), FUNC(nesapu_device::write));
- map(0x4014, 0x4014).r(FUNC(n2a03_device::psg1_4014_r)); // AM_WRITE(sprite_dma_0_w)
+ map(0x4014, 0x4014).r(FUNC(n2a03_device::psg1_4014_r)); // .w(FUNC(nesapu_device::sprite_dma_0_w));
map(0x4015, 0x4015).rw(FUNC(n2a03_device::psg1_4015_r), FUNC(n2a03_device::psg1_4015_w)); /* PSG status / first control register */
//map(0x4016, 0x4016).rw(FUNC(n2a03_device::vsnes_in0_r), FUNC(n2a03_device::vsnes_in0_w));
map(0x4017, 0x4017) /*.r(FUNC(n2a03_device::vsnes_in1_r))*/ .w(FUNC(n2a03_device::psg1_4017_w));
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index 21f64953a45..11e497fe391 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -776,7 +776,7 @@ uint8_t mcs51_cpu_device::r_psw() { return SFR_A(ADDR_PSW); }
assume that most hardware will use port 2 for 8bit access as well.
On configurations where 8 bit access in conjunction with other ports is used,
- it is up to the driver to use AM_MIRROR to mask out the high level address and
+ it is up to the driver to use mirror() to mask out the high level address and
provide it's own mapping.
*/
diff --git a/src/devices/cpu/sh/sh2.cpp b/src/devices/cpu/sh/sh2.cpp
index c0fab41f9b0..8feb977bbec 100644
--- a/src/devices/cpu/sh/sh2.cpp
+++ b/src/devices/cpu/sh/sh2.cpp
@@ -129,7 +129,7 @@ void sh2_device::sh7604_map(address_map &map)
map(0x40000000, 0xbfffffff).r(FUNC(sh2_device::sh2_internal_a5));
// TODO: cps3boot breaks with this enabled. Needs callback
-// AM_RANGE(0xc0000000, 0xc0000fff) AM_RAM // cache data array
+// map(0xc0000000, 0xc0000fff).ram(); // cache data array
// map(0xe0000000, 0xe00001ff).mirror(0x1ffffe00).rw(FUNC(sh2_device::sh7604_r), FUNC(sh2_device::sh7604_w));
// TODO: internal map takes way too much resources if mirrored with 0x1ffffe00
@@ -223,8 +223,8 @@ void sh2a_device::sh7021_map(address_map &map)
map(0x05ffff48, 0x05ffff49).rw(FUNC(sh2a_device::dmaor_r), FUNC(sh2a_device::dmaor_w));
map(0x05ffff4a, 0x05ffff4b).rw(FUNC(sh2a_device::dma_tcr0_r), FUNC(sh2a_device::dma_tcr0_w));
map(0x05ffff4e, 0x05ffff4f).rw(FUNC(sh2a_device::dma_chcr0_r), FUNC(sh2a_device::dma_chcr0_w));
-// AM_RANGE(0x07000000, 0x070003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
-// AM_RANGE(0x0f000000, 0x0f0003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
+// map(0x07000000, 0x070003ff).ram().share("oram"); // on-chip RAM, actually at 0xf000000 (1 kb)
+// map(0x0f000000, 0x0f0003ff).ram().share("oram"); // on-chip RAM, actually at 0xf000000 (1 kb)
}
void sh1_device::sh7032_map(address_map &map)
diff --git a/src/devices/cpu/sh/sh7604_bus.cpp b/src/devices/cpu/sh/sh7604_bus.cpp
index 4a98ab6130a..6175fd9a5b2 100644
--- a/src/devices/cpu/sh/sh7604_bus.cpp
+++ b/src/devices/cpu/sh/sh7604_bus.cpp
@@ -102,7 +102,7 @@ void sh7604_bus_device::bus_regs(address_map &map)
map(0x08, 0x09).rw(FUNC(sh7604_bus_device::refresh_timer_status_r), FUNC(sh7604_bus_device::refresh_timer_control_w));
map(0x0a, 0x0b).rw(FUNC(sh7604_bus_device::refresh_timer_counter_r), FUNC(sh7604_bus_device::refresh_timer_counter_w));
map(0x0c, 0x0d).rw(FUNC(sh7604_bus_device::refresh_timer_constant_r), FUNC(sh7604_bus_device::refresh_timer_constant_w));
-// AM_RANGE(0x0e, 0x0f) unmapped, mirror?
+// map(0x0e, 0x0f) unmapped, mirror?
}
//-------------------------------------------------
diff --git a/src/devices/cpu/sh/sh7604_wdt.cpp b/src/devices/cpu/sh/sh7604_wdt.cpp
index 6dbd27dc3ce..f18ca8ad501 100644
--- a/src/devices/cpu/sh/sh7604_wdt.cpp
+++ b/src/devices/cpu/sh/sh7604_wdt.cpp
@@ -29,10 +29,10 @@ DEFINE_DEVICE_TYPE(SH7604_WDT, sh7604_wdt_device, "sh7604wdt", "SH7604 Watchdog
void sh7604_wdt_device::wdt_regs(address_map &map)
{
-// AM_RANGE(0x00, 0x00) timer control/status
-// AM_RANGE(0x01, 0x01) timer counter
-// AM_RANGE(0x02, 0x02) write only, reset control register
-// AM_RANGE(0x03, 0x03) read status register, write reset status register
+// map(0x00, 0x00) timer control/status
+// map(0x01, 0x01) timer counter
+// map(0x02, 0x02) write only, reset control register
+// map(0x03, 0x03) read status register, write reset status register
}
//-------------------------------------------------
diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp
index 3bacad6c144..81c28407bd7 100644
--- a/src/devices/cpu/tlcs90/tlcs90.cpp
+++ b/src/devices/cpu/tlcs90/tlcs90.cpp
@@ -50,7 +50,7 @@ void tlcs90_device::tmp90840_mem(address_map &map)
void tlcs90_device::tmp90841_mem(address_map &map)
{
-// AM_RANGE( 0x0000, 0x1fff ) AM_ROM // rom-less
+// map(0x0000, 0x1fff).rom(); // rom-less
map(0xfec0, 0xffbf).ram(); // 256b RAM (internal)
map(T90_IOBASE, T90_IOBASE+47).rw(FUNC(tlcs90_device::t90_internal_registers_r), FUNC(tlcs90_device::t90_internal_registers_w));
}
@@ -64,7 +64,7 @@ void tlcs90_device::tmp91640_mem(address_map &map)
void tlcs90_device::tmp91641_mem(address_map &map)
{
-// AM_RANGE( 0x0000, 0x3fff ) AM_ROM // rom-less
+// map(0x0000, 0x3fff).rom(); // rom-less
map(0xfdc0, 0xffbf).ram(); // 512b RAM (internal)
map(T90_IOBASE, T90_IOBASE+47).rw(FUNC(tlcs90_device::t90_internal_registers_r), FUNC(tlcs90_device::t90_internal_registers_w));
}
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index d1a1c566f83..ebcc1d216e5 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -57,7 +57,7 @@ DEFINE_DEVICE_TYPE(TMS32053, tms32053_device, "tms32053", "Texas Instruments TMS
void tms32051_device::tms32051_internal_pgm(address_map &map)
{
-// AM_RANGE(0x0000, 0x1fff) AM_ROM // ROM TODO: is off-chip if MP/_MC = 0
+// map(0x0000, 0x1fff).rom(); // ROM TODO: is off-chip if MP/_MC = 0
map(0x2000, 0x23ff).ram().share("saram"); // SARAM TODO: is off-chip if RAM bit = 0
map(0xfe00, 0xffff).ram().share("daram_b0"); // DARAM B0 TODO: is off-chip if CNF = 0
}
@@ -101,7 +101,7 @@ device_memory_interface::space_config_vector tms32051_device::memory_space_confi
void tms32053_device::tms32053_internal_pgm(address_map &map)
{
-// AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM TODO: is off-chip if MP/_MC = 0
+// map(0x0000, 0x3fff).rom(); // ROM TODO: is off-chip if MP/_MC = 0
map(0x4000, 0x4bff).ram().share("saram"); // SARAM TODO: is off-chip if RAM bit = 0
map(0xfe00, 0xffff).ram().share("daram_b0"); // DARAM B0 TODO: is off-chip if CNF = 0
}
diff --git a/src/devices/machine/atmel_arm_aic.h b/src/devices/machine/atmel_arm_aic.h
index 5c766e8319e..0e9e2fcdd21 100644
--- a/src/devices/machine/atmel_arm_aic.h
+++ b/src/devices/machine/atmel_arm_aic.h
@@ -60,7 +60,7 @@ private:
DECLARE_READ32_MEMBER(aic_imr_r) { return m_irqs_enabled; };
DECLARE_READ32_MEMBER(aic_ffsr_r) { return m_fast_irqs; };
- // can't use AM_RAM and AM_SHARE in device submaps
+ // can't use ram() and share() in device submaps
DECLARE_READ32_MEMBER(aic_smr_r) { return m_aic_smr[offset]; };
DECLARE_READ32_MEMBER(aic_svr_r) { return m_aic_svr[offset]; };
DECLARE_WRITE32_MEMBER(aic_smr_w) { COMBINE_DATA(&m_aic_smr[offset]); };
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index 7242e783592..ac27c755020 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -21,14 +21,14 @@ DEFINE_DEVICE_TYPE(I80130, i80130_device, "i80130", "I80130")
void i80130_device::rom_map(address_map &map)
{
- //AM_RANGE(0x0000, 0x3fff) AM_ROM AM_REGION("rom", 0)
+ //map(0x0000, 0x3fff).rom().region("rom", 0);
}
void i80130_device::io_map(address_map &map)
{
map(0x00, 0x0f).rw(FUNC(i80130_device::io_r), FUNC(i80130_device::io_w));
- //AM_RANGE(0x00, 0x01) AM_MIRROR(0x2) AM_DEVREADWRITE8("pic", pic8259_device, read, write, 0x00ff)
- //AM_RANGE(0x08, 0x0f) AM_DEVREADWRITE8("pit", pit8254_device, read, write, 0x00ff)
+ //map(0x00, 0x01).mirror(0x2).rw("pic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff);
+ //map(0x08, 0x0f).rw("pit", FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask16(0x00ff);
}
READ16_MEMBER( i80130_device::io_r )
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp
index e6344843f92..087c84d8595 100644
--- a/src/devices/machine/mb8421.cpp
+++ b/src/devices/machine/mb8421.cpp
@@ -5,7 +5,7 @@
Fujitsu MB8421/22/31/32-90/-90L/-90LL/-12/-12L/-12LL
CMOS 16K-bit (2KB) dual-port SRAM
- MB84x2 lacks interrupt pins, it's basically as simple as AM_RAM AM_SHARE("x")
+ MB84x2 lacks interrupt pins, it's basically as simple as ram().share("x")
MB843x is same as MB842x, except that it supports slave mode for 16-bit or
32-bit expansion. It makes sure there are no clashes with the _BUSY pin.
diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h
index 0042a73e429..5de5bba9338 100644
--- a/src/devices/machine/mos6530n.h
+++ b/src/devices/machine/mos6530n.h
@@ -224,7 +224,7 @@ public:
virtual void ram_map(address_map &map);
virtual void io_map(address_map &map);
- // is there a better way to access the memory map when not using AM_DEVICE?
+ // is there a better way to access the memory map when not using m()?
DECLARE_READ8_MEMBER(io_r);
DECLARE_WRITE8_MEMBER(io_w);
diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp
index b2949c1e837..6d7c2302ae8 100644
--- a/src/devices/machine/nvram.cpp
+++ b/src/devices/machine/nvram.cpp
@@ -134,7 +134,7 @@ void nvram_device::determine_final_base()
{
memory_share *share = owner()->memshare(tag());
if (share == nullptr)
- throw emu_fatalerror("NVRAM device '%s' has no corresponding AM_SHARE region", tag());
+ throw emu_fatalerror("NVRAM device '%s' has no corresponding share() region", tag());
m_base = share->ptr();
m_length = share->bytes();
}
diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp
index 54b46c57114..468a0b686a5 100644
--- a/src/devices/machine/sega_scu.cpp
+++ b/src/devices/machine/sega_scu.cpp
@@ -109,12 +109,12 @@ DEFINE_DEVICE_TYPE(SEGA_SCU, sega_scu_device, "sega_scu", "Sega System Control U
// LIVE DEVICE
//**************************************************************************
-//AM_RANGE(0x0000, 0x0003) src
-//AM_RANGE(0x0004, 0x0007) dst
-//AM_RANGE(0x0008, 0x000b) size
-//AM_RANGE(0x000c, 0x000f) src/dst add values
-//AM_RANGE(0x0010, 0x0013) DMA enable
-//AM_RANGE(0x0014, 0x0017) DMA start factor
+//map(0x0000, 0x0003) src
+//map(0x0004, 0x0007) dst
+//map(0x0008, 0x000b) size
+//map(0x000c, 0x000f) src/dst add values
+//map(0x0010, 0x0013) DMA enable
+//map(0x0014, 0x0017) DMA start factor
void sega_scu_device::regs_map(address_map &map)
{
@@ -123,7 +123,7 @@ void sega_scu_device::regs_map(address_map &map)
map(0x0040, 0x0057).rw(FUNC(sega_scu_device::dma_lv2_r), FUNC(sega_scu_device::dma_lv2_w));
// Super Major League and Shin Megami Tensei - Akuma Zensho reads from there (undocumented), DMA status mirror?
map(0x005c, 0x005f).r(FUNC(sega_scu_device::dma_status_r));
-// AM_RANGE(0x0060, 0x0063) AM_WRITE(dma_force_stop_w)
+// map(0x0060, 0x0063).w(FUNC(sega_scu_device::dma_force_stop_w));
map(0x007c, 0x007f).r(FUNC(sega_scu_device::dma_status_r));
map(0x0080, 0x0083).rw(m_scudsp, FUNC(scudsp_cpu_device::program_control_r), FUNC(scudsp_cpu_device::program_control_w));
map(0x0084, 0x0087).w(m_scudsp, FUNC(scudsp_cpu_device::program_w));
@@ -134,10 +134,10 @@ void sega_scu_device::regs_map(address_map &map)
map(0x009a, 0x009b).w(FUNC(sega_scu_device::t1_mode_w));
map(0x00a0, 0x00a3).rw(FUNC(sega_scu_device::irq_mask_r), FUNC(sega_scu_device::irq_mask_w));
map(0x00a4, 0x00a7).rw(FUNC(sega_scu_device::irq_status_r), FUNC(sega_scu_device::irq_status_w));
-// AM_RANGE(0x00a8, 0x00ab) AM_WRITE(abus_irqack_w)
-// AM_RANGE(0x00b0, 0x00b7) AM_READWRITE(abus_set_r,abus_set_w)
-// AM_RANGE(0x00b8, 0x00bb) AM_READWRITE(abus_refresh_r,abus_refresh_w)
-// AM_RANGE(0x00c4, 0x00c7) AM_READWRITE(sdram_r,sdram_w)
+// map(0x00a8, 0x00ab).w(FUNC(sega_scu_device::abus_irqack_w));
+// map(0x00b0, 0x00b7).rw(FUNC(sega_scu_device::abus_set_r), FUNC(sega_scu_device::abus_set_w));
+// map(0x00b8, 0x00bb).rw(FUNC(sega_scu_device::abus_refresh_r), FUNC(sega_scu_device::abus_refresh_w));
+// map(0x00c4, 0x00c7).rw(FUNC(sega_scu_device::sdram_r), FUNC(sega_scu_device::sdram_w));
map(0x00c8, 0x00cb).r(FUNC(sega_scu_device::version_r));
}
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index c62e65e1703..440f8e06f78 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -180,7 +180,7 @@ DEFINE_DEVICE_TYPE(SMPC_HLE, smpc_hle_device, "smpc_hle", "Sega Saturn SMPC HLE
// "uplift_submaps unhandled case: range straddling slots."
void smpc_hle_device::smpc_regs(address_map &map)
{
-// ADDRESS_MAP_UNMAP_HIGH
+// map.unmap_value_high();
map(0x00, 0x0d).w(FUNC(smpc_hle_device::ireg_w));
map(0x1f, 0x1f).w(FUNC(smpc_hle_device::command_register_w));
map(0x20, 0x5f).r(FUNC(smpc_hle_device::oreg_r));
diff --git a/src/devices/video/imagetek_i4100.cpp b/src/devices/video/imagetek_i4100.cpp
index 1bb7c5fde56..e9ea5322c2a 100644
--- a/src/devices/video/imagetek_i4100.cpp
+++ b/src/devices/video/imagetek_i4100.cpp
@@ -196,7 +196,7 @@ void imagetek_i4220_device::v2_map(address_map &map)
// repeated here in Puzzlet compatibility mode
map(0x78800, 0x78801).rw(FUNC(imagetek_i4220_device::sprite_count_r), FUNC(imagetek_i4220_device::sprite_count_w));
// ... this one breaks Blazing Tornado tho
-// AM_RANGE(0x78802, 0x78803) AM_READWRITE(sprite_priority_r, sprite_priority_w)
+// map(0x78802, 0x78803).rw(FUNC(imagetek_i4220_device::sprite_priority_r), FUNC(imagetek_i4220_device::sprite_priority_w));
map(0x78804, 0x78805).rw(FUNC(imagetek_i4220_device::sprite_yoffset_r), FUNC(imagetek_i4220_device::sprite_yoffset_w));
map(0x78806, 0x78807).rw(FUNC(imagetek_i4220_device::sprite_xoffset_r), FUNC(imagetek_i4220_device::sprite_xoffset_w));
map(0x78808, 0x78809).rw(FUNC(imagetek_i4220_device::sprite_color_code_r), FUNC(imagetek_i4220_device::sprite_color_code_w));
diff --git a/src/devices/video/mb90082.cpp b/src/devices/video/mb90082.cpp
index 957669fb48b..8744011bc31 100644
--- a/src/devices/video/mb90082.cpp
+++ b/src/devices/video/mb90082.cpp
@@ -29,8 +29,8 @@ void mb90082_device::mb90082_vram(address_map &map)
{
map(0x0000, 0x023f).ram(); // main screen vram
map(0x0400, 0x063f).ram(); // main screen attr
-// AM_RANGE(0x0800, 0x0a3f) AM_RAM // sub screen vram
-// AM_RANGE(0x0c00, 0x0e3f) AM_RAM // sub screen attr
+// map(0x0800, 0x0a3f).ram(); // sub screen vram
+// map(0x0c00, 0x0e3f).ram(); // sub screen attr
}
}
diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp
index c4ac3898b4d..f0b20856c57 100644
--- a/src/devices/video/ppu2c0x.cpp
+++ b/src/devices/video/ppu2c0x.cpp
@@ -93,7 +93,7 @@ void ppu2c0x_device::ppu2c0x(address_map &map)
{
map(0x0000, 0x3eff).ram();
map(0x3f00, 0x3fff).rw(FUNC(ppu2c0x_device::palette_read), FUNC(ppu2c0x_device::palette_write));
-// AM_RANGE(0x0000, 0x3fff) AM_RAM
+// map(0x0000, 0x3fff).ram();
}
}
diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp
index 968b32e85c6..eca9457e76e 100644
--- a/src/emu/addrmap.cpp
+++ b/src/emu/addrmap.cpp
@@ -1111,7 +1111,7 @@ void address_map::map_validity_check(validity_checker &valid, int spacenum) cons
{
// address map entries that reference regions but are NOPs are pointless
if (entry.m_read.m_type == AMH_NONE && entry.m_write.m_type == AMH_NONE)
- osd_printf_error("%s space references memory region %s, but is AM_NOP\n", spaceconfig.m_name, entry.m_region);
+ osd_printf_error("%s space references memory region %s, but is noprw()\n", spaceconfig.m_name, entry.m_region);
// make sure we can resolve the full path to the region
bool found = false;
diff --git a/src/mame/audio/flower.cpp b/src/mame/audio/flower.cpp
index 1d6edf5b2a0..081971131e1 100644
--- a/src/mame/audio/flower.cpp
+++ b/src/mame/audio/flower.cpp
@@ -23,7 +23,7 @@
// device type definition
DEFINE_DEVICE_TYPE(FLOWER_CUSTOM, flower_sound_device, "flower_sound", "Flower Custom Sound")
-// TODO: AM_SELECT unsupported by DEVICE_ADDRESS_MAP, so we need a trampoline here
+// TODO: select() unsupported by DEVICE_ADDRESS_MAP, so we need a trampoline here
void flower_sound_device::regs_map(address_map &map)
{
map(0x00, 0x03).select(0x38).w(FUNC(flower_sound_device::frequency_w));
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index 2212b6bf57d..3cab84c4a2a 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -250,11 +250,11 @@ void _25pacman_state::_25pacman_io_map(address_map &map)
map(0x80, 0x80).w("watchdog", FUNC(watchdog_timer_device::reset_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(0x84, 0x84).noprw(); /* ?? */
map(0x85, 0x86).writeonly().share("stars_seed"); /* stars: rng seed (lo/hi) */
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(0x88, 0x88).w(FUNC(_25pacman_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");
diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp
index 65f1a29217a..5b370d8ea4a 100644
--- a/src/mame/drivers/40love.cpp
+++ b/src/mame/drivers/40love.cpp
@@ -350,7 +350,7 @@ void fortyl_state::_40love_map(address_map &map)
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(0xbf00, 0xbfff) writes here when zooms-in/out, left-over or pixel line clearance?
map(0xc000, 0xffff).rw(FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w)); /* banked pixel layer */
}
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index 050d44bf2e7..a07d92002b1 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -379,7 +379,7 @@ READ8_MEMBER(_4enlinea_state::serial_r)
void _4enlinea_state::main_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
-// AM_RANGE(0x8000, 0xbfff) AM_RAM // CGA VRAM
+// map(0x8000, 0xbfff).ram(); // CGA VRAM
map(0xc000, 0xdfff).ram();
map(0xe000, 0xe001).r(FUNC(_4enlinea_state::serial_r));
@@ -389,7 +389,7 @@ void _4enlinea_state::main_portmap(address_map &map)
{
map.global_mask(0x3ff);
-// AM_RANGE(0x3d4, 0x3df) CGA regs
+// map(0x3d4, 0x3df) CGA regs
map(0x3bf, 0x3bf).nopw(); // CGA mode control, TODO
}
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index 793ec6a0960..fd29b3d0492 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -280,7 +280,7 @@ void unk_gambl_state::unkpacg_main_portmap(address_map &map)
map(0x00, 0x00).portr("DSW1");
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2");
-// AM_RANGE(0x03, 0x03) AM_WRITE("out_w") // to investigate...
+// map(0x03, 0x03).w(FUNC(unk_gambl_state::out_w)); // to investigate...
map(0x17, 0x17).w(m_ay, FUNC(ay8910_device::data_w));
map(0x27, 0x27).r(m_ay, FUNC(ay8910_device::data_r));
map(0x37, 0x37).w(m_ay, FUNC(ay8910_device::address_w));
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index 9b9c28fec82..391cf24948f 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -238,7 +238,7 @@ private:
void _4roses_state::_4roses_map(address_map &map)
{
- map(0x0000, 0x07ff).ram(); // AM_SHARE("nvram")
+ map(0x0000, 0x07ff).ram(); // .share("nvram");
map(0x0c00, 0x0c00).r("ay8910", FUNC(ay8910_device::data_r));
map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w));
map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w));
@@ -290,7 +290,7 @@ void _4roses_state::_4roses_opcodes_map(address_map &map)
void rugby_state::rugby_map(address_map &map)
{
- map(0x0000, 0x07ff).ram(); // AM_SHARE("nvram")
+ map(0x0000, 0x07ff).ram(); // .share("nvram");
map(0x0c00, 0x0c00).r("ay8910", FUNC(ay8910_device::data_r));
map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w));
map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w));
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index 5664e870c96..73d06ff1c8f 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -3218,12 +3218,12 @@ READ8_MEMBER(_8080bw_state::claybust_gun_hi_r)
void _8080bw_state::claybust_io_map(address_map &map)
{
- //AM_RANGE(0x00, 0x00) AM_WRITENOP // ?
+ //map(0x00, 0x00).nopw(); // ?
map(0x01, 0x01).portr("IN1").w(m_mb14241, FUNC(mb14241_device::shift_count_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(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); //.nopw(); // port3 write looks sound-related
map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
- //AM_RANGE(0x05, 0x05) AM_WRITENOP // ?
+ //map(0x05, 0x05).nopw(); // ?
map(0x06, 0x06).r(FUNC(_8080bw_state::claybust_gun_hi_r));
}
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index ec5bb1cf8ff..18c25eb6daf 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -388,10 +388,10 @@ void a5105_state::a5105_io(address_map &map)
map(0x98, 0x99).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write));
map(0x9c, 0x9c).w(FUNC(a5105_state::pcg_val_w));
-// AM_RANGE(0x9d, 0x9d) crtc area (ff-based), palette routes here
+// map(0x9d, 0x9d) crtc area (ff-based), palette routes here
map(0x9e, 0x9e).w(FUNC(a5105_state::pcg_addr_w));
-// AM_RANGE(0xa0, 0xa1) ay8910?
+// map(0xa0, 0xa1) ay8910?
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));
diff --git a/src/mame/drivers/acesp.cpp b/src/mame/drivers/acesp.cpp
index 01584aaba1b..ddf28e958c9 100644
--- a/src/mame/drivers/acesp.cpp
+++ b/src/mame/drivers/acesp.cpp
@@ -76,8 +76,8 @@ void ace_sp_state::ace_sp_map(address_map &map)
#if 0
void ace_sp_state::ace_sp_portmap(address_map &map)
{
- //AM_RANGE(0x02, 0x02) // misc
- //AM_RANGE(0x05, 0x06) // AYs
+ //map(0x02, 0x02) // misc
+ //map(0x05, 0x06) // AYs
}
#endif
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index c929bb7a1f5..f8ca047b6fa 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -258,19 +258,18 @@ void airraid_state::airraid_map(address_map &map)
map(0xc003, 0xc003).portr("DSW2");
map(0xc004, 0xc004).portr("DSW1");
map(0xc500, 0xc500).w(FUNC(airraid_state::cshooter_c500_w));
-// AM_RANGE(0xc600, 0xc600) AM_WRITE(cshooter_c600_w) // see notes
+// map(0xc600, 0xc600).w(FUNC(airraid_state::cshooter_c600_w)); // see notes
map(0xc700, 0xc700).w(FUNC(airraid_state::cshooter_c700_w));
-// AM_RANGE(0xc801, 0xc801) AM_WRITE(cshooter_c801_w) // see notes
+// map(0xc801, 0xc801).w(FUNC(airraid_state::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(0xdc10, 0xdc10).ram();
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
-
+// map(0xdc19, 0xdc19).ram();
+// map(0xdc1e, 0xdc1e).ram();
+// map(0xdc1f, 0xdc1f).ram();
map(0xde00, 0xde0f).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w));
map(0xe000, 0xfdff).ram().share("mainram");
map(0xfe00, 0xffff).ram().share("sprite_ram");
diff --git a/src/mame/drivers/akaiax80.cpp b/src/mame/drivers/akaiax80.cpp
index 7d26b54139c..623421b9e25 100644
--- a/src/mame/drivers/akaiax80.cpp
+++ b/src/mame/drivers/akaiax80.cpp
@@ -84,9 +84,9 @@ void ax80_state::ax80_map(address_map &map)
map(0x1060, 0x1060).mirror(0x000e).rw("kdc", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w)); // IC11
map(0x1061, 0x1061).mirror(0x000e).rw("kdc", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w)); // IC11
map(0x1070, 0x1073).mirror(0x000c).rw(PPI1_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); // IC10
- //AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0dfe) AM_DEVREADWRITE(PPI0_TAG, i8255_device, read, write) // IC9 - A9 connects to A1-pin
- //AM_RANGE(0x2200, 0x2201) AM_MIRROR(0x0dfe) AM_DEVREADWRITE(PPI0_TAG, i8255_device, read, write) // IC9 - A9 connects to A1-pin
- //AM_RANGE(0x3000, 0x3fff) // steers audio to the various voice channels
+ //map(0x2000, 0x2001).mirror(0x0dfe).rw(PPI0_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); // IC9 - A9 connects to A1-pin
+ //map(0x2200, 0x2201).mirror(0x0dfe).rw(PPI0_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); // IC9 - A9 connects to A1-pin
+ //map(0x3000, 0x3fff) // steers audio to the various voice channels
map(0x4000, 0x5fff).mirror(0x2000).rom().region("maincpu", 0x1000); // external program EPROM
map(0x8000, 0x87ff).mirror(0x3800).ram();
map(0xc000, 0xc7ff).mirror(0x3800).ram();
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index f0784a972e9..5c73c5a4343 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -143,7 +143,7 @@ void alesis_state::sr16_mem(address_map &map)
void alesis_state::sr16_io(address_map &map)
{
- //ADDRESS_MAP_UNMAP_HIGH
+ //map.unmap_value_high();
map(0x0000, 0x0000).mirror(0xff).w("dm3ag", FUNC(alesis_dm3ag_device::write));
map(0x0200, 0x0200).mirror(0xff).w(FUNC(alesis_state::sr16_lcd_w));
map(0x0300, 0x0300).mirror(0xff).w(FUNC(alesis_state::kb_matrix_w));
diff --git a/src/mame/drivers/alesis_qs.cpp b/src/mame/drivers/alesis_qs.cpp
index 09c55100e4e..7542b5202bb 100644
--- a/src/mame/drivers/alesis_qs.cpp
+++ b/src/mame/drivers/alesis_qs.cpp
@@ -47,7 +47,7 @@ INPUT_PORTS_END
void qs_state::qs7_prog_map(address_map &map)
{
- //ADDRESS_MAP_GLOBAL_MASK(0x3ffff)
+ //map.global_mask(0x3ffff);
map(0x00000, 0x3ffff).rom();
}
diff --git a/src/mame/drivers/alpha68k_n.cpp b/src/mame/drivers/alpha68k_n.cpp
index 2a09a07f63b..b997ec5943c 100644
--- a/src/mame/drivers/alpha68k_n.cpp
+++ b/src/mame/drivers/alpha68k_n.cpp
@@ -339,11 +339,11 @@ void alpha68k_N_state::sound_map(address_map &map)
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
- AM_RANGE(0xe008, 0xe008) AM_WRITENOP // NMI: 00
- AM_RANGE(0xe00a, 0xe00a) AM_WRITENOP // RST38: 20
- AM_RANGE(0xe00c, 0xe00c) AM_WRITENOP // RST30: 00 on entry
- AM_RANGE(0xe00e, 0xe00e) AM_WRITENOP // RST30: 00,02,ff on exit(0x1d88)
+ map(0xe006, 0xe006).nopw(); // NMI: diminishing saw-tooth
+ map(0xe008, 0xe008).nopw(); // NMI: 00
+ map(0xe00a, 0xe00a).nopw(); // RST38: 20
+ map(0xe00c, 0xe00c).nopw(); // RST30: 00 on entry
+ map(0xe00e, 0xe00e).nopw(); // RST30: 00,02,ff on exit(0x1d88)
*/
}
diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp
index fe26a145e40..5bca9bff64f 100644
--- a/src/mame/drivers/alphatpx.cpp
+++ b/src/mame/drivers/alphatpx.cpp
@@ -308,13 +308,13 @@ void alphatp_34_state::alphatp3_map(address_map &map)
void alphatp_34_state::alphatp3_io(address_map &map)
{
map.unmap_value_high();
- //AM_RANGE(0x00, 0x00) AM_READ // unknown
+ //map(0x00, 0x00).r(FUNC(alphatp_34_state::)); // unknown
map(0x04, 0x05).rw("uart", FUNC(i8251_device::read), FUNC(i8251_device::write));
map(0x08, 0x09).rw(FUNC(alphatp_34_state::comm88_r), FUNC(alphatp_34_state::comm88_w));
map(0x10, 0x11).rw(m_kbdmcu, FUNC(i8041a_device::upi41_master_r), FUNC(i8041a_device::upi41_master_w));
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(0x42, 0x42).w(FUNC(alphatp_34_state::)); // unknown
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));
@@ -329,11 +329,11 @@ void alphatp_34_state::alphatp30_8088_map(address_map &map)
void alphatp_34_state::alphatp30_8088_io(address_map &map)
{
- //AM_RANGE(0x008a, 0x008a) AM_READ // unknown
+ //map(0x008a, 0x008a).r(FUNC(alphatp_34_state::)); // unknown
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(0xfb00, 0xfb0f).w(FUNC(alphatp_34_state::)); // 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(FUNC(alphatp_34_state::comm85_r), FUNC(alphatp_34_state::comm85_w));
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index ccd92fdb623..bedb42e9593 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -448,7 +448,7 @@ void alphatro_state::alphatro_io(address_map &map)
// 8257 DMAC
map(0x60, 0x68).rw(m_dmac, FUNC(i8257_device::read), FUNC(i8257_device::write));
// 8259 PIT
- //AM_RANGE(0x70, 0x72) AM_DEVREADWRITE("
+ //map(0x70, 0x72).r(FUNC(alphatro_state::)).w(FUNC(alphatro_state::));
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/altair.cpp b/src/mame/drivers/altair.cpp
index 4a1f9022b49..7516502342d 100644
--- a/src/mame/drivers/altair.cpp
+++ b/src/mame/drivers/altair.cpp
@@ -68,7 +68,7 @@ void altair_state::io_map(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
- // TODO: Remove AM_MIRROR() and use SIO address S0-S7
+ // TODO: Remove mirror() and use SIO address S0-S7
map(0x00, 0x01).mirror(0x10).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write));
}
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index fa115fe4ae8..57eaf43019b 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -122,14 +122,14 @@ void altos486_state::altos486_z80_mem(address_map &map)
map.unmap_value_high();
map(0x0000, 0x0fff).rom().region("iocpu", 0);
map(0x2000, 0x27ff).ram();
- //AM_RANGE(0x8000, 0xffff) AM_READWRITE(z80_shared_r, z80_shared_w)
+ //map(0x8000, 0xffff).rw(FUNC(altos486_state::z80_shared_r), FUNC(altos486_state::z80_shared_w)):
}
void altos486_state::altos486_z80_io(address_map &map)
{
- //AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("sio0", z80sio0_device, read, write)
- //AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("sio1", z80sio0_device, read, write)
- //AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("sio2", z80sio0_device, read, write)
+ //map(0x00, 0x03).rw("sio0", FUNC(z80sio0_device::read), FUNC(z80sio0_device::write));
+ //map(0x04, 0x07).rw("sio1", FUNC(z80sio0_device::read), FUNC(z80sio0_device::write));
+ //map(0x08, 0x0b).rw("sio2", FUNC(z80sio0_device::read), FUNC(z80sio0_device::write));
}
void altos486_state::altos486(machine_config &config)
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 5cca61da543..88224c6a38c 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -110,7 +110,7 @@ void altos5_state::io_map(address_map &map)
map(0x10, 0x13).rw("pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
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(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/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index 8cbe200e47f..0c6fc0048ed 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -680,7 +680,7 @@ WRITE8_MEMBER( amaticmg_state::unk80_w )
void amaticmg_state::amaticmg_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0x9fff).ram(); // AM_SHARE("nvram")
+ map(0x8000, 0x9fff).ram(); // .share("nvram");
map(0xa000, 0xafff).ram().share("vram");
map(0xb000, 0xbfff).ram().share("attr");
map(0xc000, 0xffff).bankr("bank1");
@@ -696,14 +696,14 @@ void amaticmg_state::amaticmg_portmap(address_map &map)
map(0x61, 0x61).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
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)
+// map(0x00, 0x00).w("dac1", FUNC(dac_byte_interface::data_w));
+// map(0x00, 0x00).w("dac2", FUNC(dac_byte_interface::data_w));
}
void amaticmg_state::amaticmg2_portmap(address_map &map)
{
map.global_mask(0xff);
-// ADDRESS_MAP_UNMAP_HIGH
+// map.unmap_value_high();
map(0x00, 0x03).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x20, 0x23).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x40, 0x41).w("ymsnd", FUNC(ym3812_device::write));
@@ -719,14 +719,14 @@ void amaticmg_state::amaticmg2_portmap(address_map &map)
void amaticmg_state::amaticmg4_portmap(address_map &map)
{
map.global_mask(0xff);
-// ADDRESS_MAP_UNMAP_HIGH
+// map.unmap_value_high();
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, 0x0b).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x50, 0x51).w("ymsnd", FUNC(ym3812_device::write));
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(0xc0, 0xc0).w(FUNC(amaticmg_state::rombank_w));
map(0xe6, 0xe6).w(FUNC(amaticmg_state::nmi_mask_w));
}
diff --git a/src/mame/drivers/amico2k.cpp b/src/mame/drivers/amico2k.cpp
index cf3874d260c..86cd2db920c 100644
--- a/src/mame/drivers/amico2k.cpp
+++ b/src/mame/drivers/amico2k.cpp
@@ -71,7 +71,7 @@ void amico2k_state::amico2k_mem(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x03ff).ram();
-// AM_RANGE(0x0400, 0x07ff) AM_RAM // optional expansion RAM
+// map(0x0400, 0x07ff).ram(); // optional expansion RAM
map(0xfb00, 0xfcff).rom();
map(0xfd00, 0xfd03).rw("i8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0xfe00, 0xffff).rom();
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 4bd0e3570f7..c216303d114 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -634,7 +634,7 @@ void ampoker2_state::io_map(address_map &map)
map(0x15, 0x15).portr("IN5");
map(0x16, 0x16).portr("IN6");
map(0x17, 0x17).portr("IN7");
-// AM_RANGE(0x21, 0x21) AM_WRITENOP /* undocumented, write 0x1a after each reset */
+// map(0x21, 0x21).nopw(); /* undocumented, write 0x1a after each reset */
map(0x30, 0x30).w(FUNC(ampoker2_state::port30_w)); /* see write handlers */
map(0x31, 0x31).w(FUNC(ampoker2_state::port31_w)); /* see write handlers */
map(0x32, 0x32).w(FUNC(ampoker2_state::port32_w)); /* see write handlers */
diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp
index 373b1e92627..fa1d73b987d 100644
--- a/src/mame/drivers/amspdwy.cpp
+++ b/src/mame/drivers/amspdwy.cpp
@@ -78,7 +78,7 @@ void amspdwy_state::amspdwy_map(address_map &map)
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).nopw(); // ?
map(0xa000, 0xa000).portr("DSW1");
map(0xa400, 0xa400).portr("DSW2").w(FUNC(amspdwy_state::amspdwy_flipscreen_w));
map(0xa800, 0xa800).r(FUNC(amspdwy_state::amspdwy_wheel_0_r));
@@ -107,7 +107,7 @@ void amspdwy_state::amspdwy_portmap(address_map &map)
void amspdwy_state::amspdwy_sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
-// AM_RANGE(0x8000, 0x8000) AM_WRITENOP // ? writes 0 at start
+// map(0x8000, 0x8000).nopw(); // ? writes 0 at start
map(0x9000, 0x9000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
map(0xa000, 0xa001).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0xc000, 0xdfff).ram();
diff --git a/src/mame/drivers/anes.cpp b/src/mame/drivers/anes.cpp
index 44a6d42b748..19211d7a5fc 100644
--- a/src/mame/drivers/anes.cpp
+++ b/src/mame/drivers/anes.cpp
@@ -92,14 +92,14 @@ 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(FUNC(anes_state::blit_trigger_w));
-// AM_RANGE(0x0b, 0x0b) AM_WRITE(blit_mode_w)
+// map(0x0b, 0x0b).w(FUNC(anes_state::blit_mode_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");
map(0x14, 0x15).nopr(); // mux read
map(0x16, 0x16).portr("IN0").nopw();
-// AM_RANGE(0xfe, 0xfe) banking? unknown ROM range
+// map(0xfe, 0xfe) banking? unknown ROM range
}
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index eb506700d2a..f689d4c3657 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -489,16 +489,16 @@ void apc_state::apc_map(address_map &map)
{
map(0x00000, 0x9ffff).ram();
map(0xa0000, 0xa0fff).ram().share("cmos");
-// AM_RANGE(0xa1000, 0xbffff) mirror CMOS
-// AM_RANGE(0xc0000, 0xcffff) standard character ROM
+// map(0xa1000, 0xbffff) mirror CMOS
+// map(0xc0000, 0xcffff) standard character ROM
map(0xd8000, 0xd9fff).ram().region("aux_pcg", 0); // AUX character RAM
-// AM_RANGE(0xe0000, 0xeffff) Special Character RAM
+// map(0xe0000, 0xeffff) Special Character RAM
map(0xfe000, 0xfffff).rom().region("ipl", 0);
}
void apc_state::apc_io(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// map.global_mask(0xff);
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(FUNC(apc_state::apc_port_28_r), FUNC(apc_state::apc_port_28_w)); // i8259 (even) / pit8253 (odd)
@@ -514,8 +514,8 @@ void apc_state::apc_io(address_map &map)
// 0x5b, Power Off
// 0x5e APU status/command
map(0x60, 0x60).rw(m_sound, FUNC(upd1771c_device::read), FUNC(upd1771c_device::write));
-// AM_RANGE(0x68, 0x6f) i8255 , ODA printer port (A: status (R) B: data (W) C: command (W))
-// 0x70, 0x76 AM_DEVREADWRITE8("upd7220_btm", upd7220_device, read, write, 0x00ff)
+// map(0x68, 0x6f) i8255 , ODA printer port (A: status (R) B: data (W) C: command (W))
+// map(0x70, 0x76).rw("upd7220_btm", FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask16(0x00ff);
// 0x71, 0x77 IDA Controller
// 0x80, 0x90 Communication Adapter
// 0xf0, 0xf6 ASOP Controller
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index 9518192e2cb..d07816386a9 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -56,7 +56,7 @@ void apogee_state::apogee_mem(address_map &map)
map(0x1000, 0xebff).ram(); // RAM
map(0xec00, 0xec03).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).mirror(0x00fc);
map(0xed00, 0xed03).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
- //AM_RANGE( 0xee00, 0xee03 ) AM_DEVREADWRITE("ppi8255_2", i8255_device, read, write) AM_MIRROR(0x00fc)
+ //map(0xee00, 0xee03).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
map(0xef00, 0xef01).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x00fe); // video
map(0xf000, 0xf0ff).w(m_dma8257, FUNC(i8257_device::write)); // DMA
map(0xf000, 0xffff).rom(); // System ROM
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index 425711d4c62..71f5ca64697 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -699,7 +699,7 @@ void apollo_state::dn3500_map(address_map &map)
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(); /* 8MB RAM */
map(DN3500_RAM_BASE, DN3500_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share(RAM_TAG);
map(0x05d800, 0x05dc07).rw(m_graphics, FUNC(apollo_graphics_15i::apollo_mcr_r), FUNC(apollo_graphics_15i::apollo_mcr_w));
@@ -708,11 +708,11 @@ void apollo_state::dn3500_map(address_map &map)
map(0x05e800, 0x05ec07).rw(m_graphics, FUNC(apollo_graphics_15i::apollo_ccr_r), FUNC(apollo_graphics_15i::apollo_ccr_w));
map(0x0a0000, 0x0bffff).rw(m_graphics, FUNC(apollo_graphics_15i::apollo_cgm_r), FUNC(apollo_graphics_15i::apollo_cgm_w));
-// AM_RANGE(0x03020000, 0x0303ffff) Cache Tag Store (DN4500 only)
-// AM_RANGE(0x04000000, 0x0400ffff) Cache Tag Data (DN4500 only)
-// AM_RANGE(0x0e000000, 0x0fffffff) FPA address space
+// map(0x03020000, 0x0303ffff) Cache Tag Store (DN4500 only)
+// map(0x04000000, 0x0400ffff) Cache Tag Data (DN4500 only)
+// map(0x0e000000, 0x0fffffff) FPA address space
-// AM_RANGE(0xf8000000, 0xffffffff) AM_READWRITE(apollo_f8_r, apollo_f8_w)
+// map(0xf8000000, 0xffffffff).rw(FUNC(apollo_state::apollo_f8_r), FUNC(apollo_state::apollo_f8_w));
}
void apollo_state::dsp3500_map(address_map &map)
@@ -745,7 +745,7 @@ void apollo_state::dsp3500_map(address_map &map)
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)
+// map(0xf8000000, 0xffffffff).rw(FUNC(apollo_state::apollo_f8_r), FUNC(apollo_state::apollo_f8_w));
}
void apollo_state::dn3000_map(address_map &map)
@@ -771,7 +771,7 @@ void apollo_state::dn3000_map(address_map &map)
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(); /* 8MB RAM */
map(DN3000_RAM_BASE, DN3000_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share(RAM_TAG);
map(0x05d800, 0x05dc07).rw(m_graphics, FUNC(apollo_graphics_15i::apollo_mcr_r), FUNC(apollo_graphics_15i::apollo_mcr_w));
@@ -805,7 +805,7 @@ void apollo_state::dsp3000_map(address_map &map)
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(); /* 8MB RAM */
map(DN3000_RAM_BASE, DN3000_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share(RAM_TAG);
}
@@ -841,7 +841,7 @@ void apollo_state::dn5500_map(address_map &map)
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(); /* 8MB RAM */
map(DN5500_RAM_BASE, DN5500_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share(RAM_TAG);
map(0x05d800, 0x05dc07).rw(m_graphics, FUNC(apollo_graphics_15i::apollo_mcr_r), FUNC(apollo_graphics_15i::apollo_mcr_w));
@@ -850,12 +850,12 @@ void apollo_state::dn5500_map(address_map &map)
map(0x05e800, 0x05ec07).rw(m_graphics, FUNC(apollo_graphics_15i::apollo_ccr_r), FUNC(apollo_graphics_15i::apollo_ccr_w));
map(0x0a0000, 0x0bffff).rw(m_graphics, FUNC(apollo_graphics_15i::apollo_cgm_r), FUNC(apollo_graphics_15i::apollo_cgm_w));
-// AM_RANGE(0x03020000, 0x0303ffff) Cache Tag Store (DN4500 only)
-// AM_RANGE(0x04000000, 0x0400ffff) Cache Tag Data (DN4500 only)
+// map(0x03020000, 0x0303ffff) Cache Tag Store (DN4500 only)
+// map(0x04000000, 0x0400ffff) Cache Tag Data (DN4500 only)
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
+// map(0x0e000000, 0x0fffffff) FPA address space
-// AM_RANGE(0xf8000000, 0xffffffff) AM_READWRITE(apollo_f8_r, apollo_f8_w)
+// map(0xf8000000, 0xffffffff).rw(FUNC(apollo_state::apollo_f8_r), FUNC(apollo_state::apollo_f8_w));
}
void apollo_state::dsp5500_map(address_map &map)
@@ -891,7 +891,7 @@ void apollo_state::dsp5500_map(address_map &map)
map(DN5500_RAM_BASE, DN5500_RAM_END).ram().w(FUNC(apollo_state::ram_with_parity_w)).share(RAM_TAG);
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)
+// map(0xf8000000, 0xffffffff).rw(FUNC(apollo_state::apollo_f8_r), FUNC(apollo_state::apollo_f8_w));
}
/***************************************************************************
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index b70bbfc61a4..31240a2fdb4 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -2909,8 +2909,8 @@ void apple2e_state::laser128_map(address_map &map)
map(0x4000, 0xbfff).m(m_4000bank, FUNC(address_map_bank_device::amap8));
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(0xc098, 0xc09b).rw(m_acia1, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+// map(0xc0a8, 0xc0ab).rw(m_acia2, FUNC(mos6551_device::read), FUNC(mos6551_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));
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index bd6cfe83eef..8140bb64cfb 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -473,7 +473,7 @@ void applix_state::applix_mem(address_map &map)
map(0x700180, 0x700180).mirror(0x7c).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)).cswidth(16);
map(0x700182, 0x700182).mirror(0x7c).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)).cswidth(16);
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(0xffffc2, 0xffffc3).rw(FUNC(applix_state::fdc_int_r) , FUNC(applix_state::fdc_int_w)); // optional
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
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index 93ec038ba5d..76b7c7ee1ea 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -278,7 +278,7 @@ void f1_state::act_f1_io(address_map &map)
map(0x0020, 0x0027).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).umask16(0x00ff);
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
+// map(0x01e0, 0x01ff) winchester
}
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index f0912c2cd3f..fddd71c9a5d 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -219,7 +219,7 @@ void aquarius_state::aquarius_mem(address_map &map)
void aquarius_state::aquarius_io(address_map &map)
{
-// AM_RANGE(0x7e, 0x7f) AM_MIRROR(0xff00) AM_READWRITE(modem_r, modem_w)
+// map(0x7e, 0x7f).mirror(0xff00).rw(FUNC(aquarius_state::modem_r), FUNC(aquarius_state::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(FUNC(aquarius_state::cassette_r), FUNC(aquarius_state::cassette_w));
diff --git a/src/mame/drivers/argox.cpp b/src/mame/drivers/argox.cpp
index 964895d77a8..560dfaacf1c 100644
--- a/src/mame/drivers/argox.cpp
+++ b/src/mame/drivers/argox.cpp
@@ -68,7 +68,7 @@ void os214_state::os214_prg_map(address_map &map)
void os214_state::os214_io_map(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// map.global_mask(0xff);
}
void os214_state::os214(machine_config &config)
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index def555a6651..6f266ad8704 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -431,7 +431,7 @@ void armedf_state::common_map(address_map &map)
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(0x07c000, 0x07c001).w(FUNC(armedf_state::terraf_io_w)); handled in DRIVER_INIT
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));
@@ -451,9 +451,9 @@ void armedf_state::kozure_map(address_map &map)
common_map(map);
map(0x060000, 0x060fff).ram().share("spriteram");
map(0x061000, 0x063fff).ram();
-// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(kozure_io_w)
-// AM_RANGE(0x0c0000, 0x0c0001) AM_WRITENOP /* watchdog? */
-// AM_RANGE(0xffd000, 0xffd001) AM_WRITENOP /* passes crc ROM information to MCU, I guess */
+// map(0x07c000, 0x07c001).w(FUNC(armedf_state::kozure_io_w));
+// map(0x0c0000, 0x0c0001).nopw(); /* watchdog? */
+// map(0xffd000, 0xffd001).nopw(); /* passes crc ROM information to MCU, I guess */
}
void armedf_state::cclimbr2_map(address_map &map)
@@ -471,7 +471,7 @@ void armedf_state::cclimbr2_map(address_map &map)
map(0x078002, 0x078003).portr("P2");
map(0x078004, 0x078005).portr("DSW1");
map(0x078006, 0x078007).portr("DSW2");
-// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(io_w)
+// map(0x07c000, 0x07c001).w(FUNC(armedf_state::io_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));
diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp
index 3dc38a177c9..41608be4f40 100644
--- a/src/mame/drivers/arsystems.cpp
+++ b/src/mame/drivers/arsystems.cpp
@@ -232,7 +232,7 @@ void arcadia_amiga_state::argh_map(address_map &map)
{
a500_mem(map);
map(0x800000, 0x97ffff).bankr("bank2").region("user3", 0);
-// AM_RANGE(0x980000, 0x9fefff) AM_ROM AM_REGION("user3", 0)
+// map(0x980000, 0x9fefff).rom().region("user3", 0);
map(0x9ff000, 0x9fffff).ram().share("nvram");
map(0xf00000, 0xf7ffff).rom().region("user3", 0);
}
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index 17f2081eb28..2e6d00a40d5 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -452,7 +452,7 @@ void artmagic_state::shtstar_map(address_map &map)
map(0x200000, 0x27ffff).ram();
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, 0x300001).nopr(); //.portr("300000");
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));
diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp
index b4e49c93224..87921cc4ba6 100644
--- a/src/mame/drivers/astrohome.cpp
+++ b/src/mame/drivers/astrohome.cpp
@@ -70,7 +70,7 @@ void astrocde_home_state::astrocade_mem(address_map &map)
map(0x0000, 0x0fff).rom().w(FUNC(astrocde_home_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)
+ //map(0x5000, 0xffff).rw("exp", FUNC(astrocade_exp_device::read), FUNC(astrocade_exp_device::write));
}
diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp
index e2208708c98..7fef9366911 100644
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@@ -191,7 +191,7 @@ void atarig1_state::main_map(address_map &map)
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(0xfe0000, 0xfe7fff).r(FUNC(atarig1_state::from_r));*/
map(0xfe8000, 0xfe89ff).ram().w("palette", FUNC(palette_device::write16)).share("palette");
map(0xff0000, 0xff0fff).ram().share("rle");
map(0xff1000, 0xff1fff).ram();
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index e9245d092ee..ed3f4e723a1 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -1233,7 +1233,7 @@ void st_state::st_map(address_map &map)
map(0x000008, 0x1fffff).ram();
map(0x200000, 0x3fffff).ram();
map(0x400000, 0xf9ffff).rw(FUNC(st_state::berr_r), FUNC(st_state::berr_w));
- //AM_RANGE(0xfa0000, 0xfbffff) // mapped by the cartslot
+ //map(0xfa0000, 0xfbffff) // mapped by the cartslot
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);
@@ -1348,47 +1348,47 @@ void stbook_state::stbook_map(address_map &map)
{
map(0x000000, 0x1fffff).ram();
map(0x200000, 0x3fffff).ram();
-// AM_RANGE(0xd40000, 0xd7ffff) AM_ROM
+// map(0xd40000, 0xd7ffff).rom();
map(0xe00000, 0xe3ffff).rom().region(M68000_TAG, 0);
-// AM_RANGE(0xe80000, 0xebffff) AM_ROM
-// AM_RANGE(0xfa0000, 0xfbffff) AM_ROM // cartridge
+// map(0xe80000, 0xebffff).rom();
+// map(0xfa0000, 0xfbffff).rom(); // cartridge
map(0xfc0000, 0xfeffff).rom().region(M68000_TAG, 0);
-/* AM_RANGE(0xf00000, 0xf1ffff) AM_READWRITE(stbook_ide_r, stbook_ide_w)
- AM_RANGE(0xff8000, 0xff8001) AM_READWRITE(stbook_mmu_r, stbook_mmu_w)
- AM_RANGE(0xff8200, 0xff8203) AM_READWRITE(stbook_shifter_base_r, stbook_shifter_base_w)
- AM_RANGE(0xff8204, 0xff8209) AM_READWRITE(stbook_shifter_counter_r, stbook_shifter_counter_w)
- AM_RANGE(0xff820a, 0xff820b) AM_READWRITE8(stbook_shifter_sync_r, stbook_shifter_sync_w, 0xff00)
- AM_RANGE(0xff820c, 0xff820d) AM_READWRITE(stbook_shifter_base_low_r, stbook_shifter_base_low_w)
- AM_RANGE(0xff820e, 0xff820f) AM_READWRITE(stbook_shifter_lineofs_r, stbook_shifter_lineofs_w)
- AM_RANGE(0xff8240, 0xff8241) AM_READWRITE(stbook_shifter_palette_r, stbook_shifter_palette_w)
- AM_RANGE(0xff8260, 0xff8261) AM_READWRITE8(stbook_shifter_mode_r, stbook_shifter_mode_w, 0xff00)
- AM_RANGE(0xff8264, 0xff8265) AM_READWRITE(stbook_shifter_pixelofs_r, stbook_shifter_pixelofs_w)
- AM_RANGE(0xff827e, 0xff827f) AM_WRITE(lcd_control_w)*/
+/* map(0xf00000, 0xf1ffff).rw(FUNC(stbook_state::stbook_ide_r), FUNC(stbook_state::stbook_ide_w));
+ map(0xff8000, 0xff8001).rw(FUNC(stbook_state::stbook_mmu_r), FUNC(stbook_state::stbook_mmu_w));
+ map(0xff8200, 0xff8203).rw(FUNC(stbook_state::stbook_shifter_base_r), FUNC(stbook_state::stbook_shifter_base_w));
+ map(0xff8204, 0xff8209).rw(FUNC(stbook_state::stbook_shifter_counter_r), FUNC(stbook_state::stbook_shifter_counter_w));
+ map(0xff820a, 0xff820a).rw(FUNC(stbook_state::stbook_shifter_sync_r), FUNC(stbook_state::stbook_shifter_sync_w));
+ map(0xff820c, 0xff820d).rw(FUNC(stbook_state::stbook_shifter_base_low_r), FUNC(stbook_state::stbook_shifter_base_low_w));
+ map(0xff820e, 0xff820f).rw(FUNC(stbook_state::stbook_shifter_lineofs_r), FUNC(stbook_state::stbook_shifter_lineofs_w));
+ map(0xff8240, 0xff8241).rw(FUNC(stbook_state::stbook_shifter_palette_r), FUNC(stbook_state::stbook_shifter_palette_w));
+ map(0xff8260, 0xff8260).rw(FUNC(stbook_state::stbook_shifter_mode_r), FUNC(stbook_state::stbook_shifter_mode_w));
+ map(0xff8264, 0xff8265).rw(FUNC(stbook_state::stbook_shifter_pixelofs_r), FUNC(stbook_state::stbook_shifter_pixelofs_w));
+ map(0xff827e, 0xff827f).w(FUNC(stbook_state::lcd_control_w));*/
map(0xff8800, 0xff8800).rw(YM3439_TAG, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w));
map(0xff8802, 0xff8802).w(YM3439_TAG, FUNC(ay8910_device::data_w));
-/* AM_RANGE(0xff8900, 0xff8901) AM_READWRITE8(sound_dma_control_r, sound_dma_control_w, 0x00ff)
- AM_RANGE(0xff8902, 0xff8907) AM_READWRITE8(sound_dma_base_r, sound_dma_base_w, 0x00ff)
- AM_RANGE(0xff8908, 0xff890d) AM_READ8(sound_dma_counter_r, 0x00ff)
- AM_RANGE(0xff890e, 0xff8913) AM_READWRITE8(sound_dma_end_r, sound_dma_end_w, 0x00ff)
- AM_RANGE(0xff8920, 0xff8921) AM_READWRITE8(sound_mode_r, sound_mode_w, 0x00ff)
- AM_RANGE(0xff8922, 0xff8923) AM_READWRITE(microwire_data_r, microwire_data_w)
- AM_RANGE(0xff8924, 0xff8925) AM_READWRITE(microwire_mask_r, microwire_mask_w)
- AM_RANGE(0xff8a00, 0xff8a1f) AM_READWRITE(blitter_halftone_r, blitter_halftone_w)
- AM_RANGE(0xff8a20, 0xff8a21) AM_READWRITE(blitter_src_inc_x_r, blitter_src_inc_x_w)
- AM_RANGE(0xff8a22, 0xff8a23) AM_READWRITE(blitter_src_inc_y_r, blitter_src_inc_y_w)
- AM_RANGE(0xff8a24, 0xff8a27) AM_READWRITE(blitter_src_r, blitter_src_w)
- AM_RANGE(0xff8a28, 0xff8a2d) AM_READWRITE(blitter_end_mask_r, blitter_end_mask_w)
- AM_RANGE(0xff8a2e, 0xff8a2f) AM_READWRITE(blitter_dst_inc_x_r, blitter_dst_inc_x_w)
- AM_RANGE(0xff8a30, 0xff8a31) AM_READWRITE(blitter_dst_inc_y_r, blitter_dst_inc_y_w)
- AM_RANGE(0xff8a32, 0xff8a35) AM_READWRITE(blitter_dst_r, blitter_dst_w)
- AM_RANGE(0xff8a36, 0xff8a37) AM_READWRITE(blitter_count_x_r, blitter_count_x_w)
- AM_RANGE(0xff8a38, 0xff8a39) AM_READWRITE(blitter_count_y_r, blitter_count_y_w)
- AM_RANGE(0xff8a3a, 0xff8a3b) AM_READWRITE(blitter_op_r, blitter_op_w)
- AM_RANGE(0xff8a3c, 0xff8a3d) AM_READWRITE(blitter_ctrl_r, blitter_ctrl_w)
- AM_RANGE(0xff9200, 0xff9201) AM_READ(config_r)
- AM_RANGE(0xff9202, 0xff9203) AM_READWRITE(lcd_contrast_r, lcd_contrast_w)
- AM_RANGE(0xff9210, 0xff9211) AM_READWRITE(power_r, power_w)
- AM_RANGE(0xff9214, 0xff9215) AM_READWRITE(reference_r, reference_w)*/
+/* map(0xff8901, 0xff8901).rw(FUNC(stbook_state::sound_dma_control_r), FUNC(stbook_state::sound_dma_control_w));
+ map(0xff8902, 0xff8907).rw(FUNC(stbook_state::sound_dma_base_r), FUNC(stbook_state::sound_dma_base_w)).umask16(0x00ff);
+ map(0xff8908, 0xff890d).r(FUNC(stbook_state::sound_dma_counter_r)).umask16(0x00ff);
+ map(0xff890e, 0xff8913).rw(FUNC(stbook_state::sound_dma_end_r), FUNC(stbook_state::sound_dma_end_w)).umask16(0x00ff);
+ map(0xff8921, 0xff8921).rw(FUNC(stbook_state::sound_mode_r), FUNC(stbook_state::sound_mode_w));
+ map(0xff8922, 0xff8923).rw(FUNC(stbook_state::microwire_data_r), FUNC(stbook_state::microwire_data_w));
+ map(0xff8924, 0xff8925).rw(FUNC(stbook_state::microwire_mask_r), FUNC(stbook_state::microwire_mask_w));
+ map(0xff8a00, 0xff8a1f).rw(FUNC(stbook_state::blitter_halftone_r), FUNC(stbook_state::blitter_halftone_w));
+ map(0xff8a20, 0xff8a21).rw(FUNC(stbook_state::blitter_src_inc_x_r), FUNC(stbook_state::blitter_src_inc_x_w));
+ map(0xff8a22, 0xff8a23).rw(FUNC(stbook_state::blitter_src_inc_y_r), FUNC(stbook_state::blitter_src_inc_y_w));
+ map(0xff8a24, 0xff8a27).rw(FUNC(stbook_state::blitter_src_r), FUNC(stbook_state::blitter_src_w));
+ map(0xff8a28, 0xff8a2d).rw(FUNC(stbook_state::blitter_end_mask_r), FUNC(stbook_state::blitter_end_mask_w));
+ map(0xff8a2e, 0xff8a2f).rw(FUNC(stbook_state::blitter_dst_inc_x_r), FUNC(stbook_state::blitter_dst_inc_x_w));
+ map(0xff8a30, 0xff8a31).rw(FUNC(stbook_state::blitter_dst_inc_y_r), FUNC(stbook_state::blitter_dst_inc_y_w));
+ map(0xff8a32, 0xff8a35).rw(FUNC(stbook_state::blitter_dst_r), FUNC(stbook_state::blitter_dst_w));
+ map(0xff8a36, 0xff8a37).rw(FUNC(stbook_state::blitter_count_x_r), FUNC(stbook_state::blitter_count_x_w));
+ map(0xff8a38, 0xff8a39).rw(FUNC(stbook_state::blitter_count_y_r), FUNC(stbook_state::blitter_count_y_w));
+ map(0xff8a3a, 0xff8a3b).rw(FUNC(stbook_state::blitter_op_r), FUNC(stbook_state::blitter_op_w));
+ map(0xff8a3c, 0xff8a3d).rw(FUNC(stbook_state::blitter_ctrl_r), FUNC(stbook_state::blitter_ctrl_w));
+ map(0xff9200, 0xff9201).r(FUNC(stbook_state::config_r));
+ map(0xff9202, 0xff9203).rw(FUNC(stbook_state::lcd_contrast_r), FUNC(stbook_state::lcd_contrast_w));
+ map(0xff9210, 0xff9211).rw(FUNC(stbook_state::power_r), FUNC(stbook_state::power_w));
+ map(0xff9214, 0xff9215).rw(FUNC(stbook_state::reference_r), FUNC(stbook_state::reference_w));*/
}
#endif
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index fb91a2a6a6f..3e8c3fc5f8d 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -674,16 +674,16 @@ 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(FUNC(atlantis_state::cmos_r), FUNC(atlantis_state::cmos_w)).umask32(0x000000ff);
- //AM_RANGE(0x00080000, 0x000?0000) AM_READWRITE8(zeus debug)
+ //map(0x00080000, 0x000?0000).rw(FUNC(atlantis_state::zeus debug_r), FUNC(atlantis_state::zeus debug_w));
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(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
- //AM_RANGE(0x00f00000, 0x00f00003) AM_NOP // Trackball ctrl
+ //map(0x00d80000, 0x00d80003).rw(FUNC(atlantis_state::status_leds_r, FUNC(atlantis_state::status_leds_w));
+ //map(0x00e00000, 0x00e00003).rw(FUNC(atlantis_state::cmos_protect_r, FUNC(atlantis_state::cmos_protect_w));
+ //map(0x00e80000, 0x00e80003).noprw(); // Watchdog
+ //map(0x00f00000, 0x00f00003).noprw(); // Trackball ctrl
}
void atlantis_state::map1(address_map &map)
@@ -693,14 +693,14 @@ void atlantis_state::map1(address_map &map)
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(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(0x00880000, 0x00880003) // AUX Output Initial write 0000fff0, follow by sequence ffef, ffdf, ffbf, fff7. Row Select?
+ //map(0x00900000, 0x00900003) // AUX Input Read once before each sequence write to 0x00880000. Code checks bits 0,1,2. Keypad?
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
- //AM_RANGE(0x00c00000, 0x00c00003) // Trackball Pins 16 bits
+ //map(0x00a80000, 0x00a80003) // Trackball Chan 0 16 bits
+ //map(0x00b00000, 0x00b00003) // Trackball Chan 1 16 bits
+ //map(0x00b80000, 0x00b80003) // Trackball Error 16 bits
+ //map(0x00c00000, 0x00c00003) // Trackball Pins 16 bits
}
void atlantis_state::map2(address_map &map)
@@ -710,7 +710,7 @@ void atlantis_state::map2(address_map &map)
void atlantis_state::map3(address_map &map)
{
- //AM_RANGE(0x000000, 0xffffff) ROMBUS
+ //map(0x000000, 0xffffff) ROMBUS
}
/*************************************
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index b07c5aa858b..b1b30cd94dc 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -258,8 +258,8 @@ void atom_state::atom_mem(address_map &map)
map(0x9800, 0x9fff).ram();
// map(0xa000, 0xafff) // mapped by the cartslot
map(0xb000, 0xb003).mirror(0x3fc).rw(INS8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
-// map(0xb400, 0xb403) AM_DEVREADWRITE(MC6854_TAG, mc6854_device, read, write)
-// map(0xb404, 0xb404) AM_READ_PORT("ECONET")
+// map(0xb400, 0xb403).rw(MC6854_TAG, FUNC(mc6854_device::read), FUNC(mc6854_device::write));
+// map(0xb404, 0xb404).portr("ECONET");
map(0xb800, 0xb80f).mirror(0x3f0).m(R6522_TAG, FUNC(via6522_device::map));
map(0xc000, 0xffff).rom().region(SY6502_TAG, 0);
}
diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp
index 9ee4449a795..8d87e89a3b4 100644
--- a/src/mame/drivers/atvtrack.cpp
+++ b/src/mame/drivers/atvtrack.cpp
@@ -518,7 +518,7 @@ void atvtrack_state::atvtrack_main_map(address_map &map)
{
map(0x00000000, 0x000003ff).ram().share("sharedmem");
map(0x00020000, 0x00020007).rw(FUNC(atvtrack_state::control_r), FUNC(atvtrack_state::control_w)); // control registers
-// AM_RANGE(0x00020040, 0x0002007f) // audio DAC buffer
+// map(0x00020040, 0x0002007f) // audio DAC buffer
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));
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 06ec55e013b..c3fe2892b01 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -649,7 +649,7 @@ void avt_state::avt_map(address_map &map)
{
map(0x0000, 0x5fff).rom();
map(0x6000, 0x7fff).ram();
- map(0x8000, 0x9fff).ram(); // AM_SHARE("nvram")
+ map(0x8000, 0x9fff).ram(); // .share("nvram");
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");
}
diff --git a/src/mame/drivers/badlandsbl.cpp b/src/mame/drivers/badlandsbl.cpp
index fc49343a059..be96a7e9e69 100644
--- a/src/mame/drivers/badlandsbl.cpp
+++ b/src/mame/drivers/badlandsbl.cpp
@@ -111,7 +111,7 @@ void badlandsbl_state::bootleg_map(address_map &map)
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(0xfe0000, 0xfe1fff).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0xfe2000, 0xfe3fff).w(FUNC(badlandsbl_state::video_int_ack_w));
map(0xfe0000, 0xfe0001).nopw();
diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp
index b2f59c77be2..6022a34ff25 100644
--- a/src/mame/drivers/bagman.cpp
+++ b/src/mame/drivers/bagman.cpp
@@ -170,7 +170,7 @@ void bagman_state::main_portmap(address_map &map)
map.global_mask(0xff);
map(0x08, 0x09).w("aysnd", FUNC(ay8910_device::address_data_w));
map(0x0c, 0x0c).r("aysnd", FUNC(ay8910_device::data_r));
- //AM_RANGE(0x56, 0x56) AM_WRITENOP
+ //map(0x56, 0x56).nopw();
}
diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp
index 8a5fe9778fc..907cf613ab2 100644
--- a/src/mame/drivers/basic52.cpp
+++ b/src/mame/drivers/basic52.cpp
@@ -67,9 +67,9 @@ void basic52_state::basic52_mem(address_map &map)
map.unmap_value_high();
map(0x0000, 0x1fff).rom();
map(0x2000, 0x7fff).ram();
- //AM_RANGE(0x8000, 0x9fff) AM_ROM // EPROM
- //AM_RANGE(0xc000, 0xdfff) // Expansion block
- //AM_RANGE(0xe000, 0xffff) // Expansion block
+ //map(0x8000, 0x9fff).rom(); // EPROM
+ //map(0xc000, 0xdfff) // Expansion block
+ //map(0xe000, 0xffff) // Expansion block
}
void basic52_state::basic52_io(address_map &map)
@@ -78,8 +78,8 @@ void basic52_state::basic52_io(address_map &map)
map(0x0000, 0x7fff).ram();
map(0x8000, 0x9fff).rom(); // EPROM
map(0xa000, 0xa003).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write)); // PPI-8255
- //AM_RANGE(0xc000, 0xdfff) // Expansion block
- //AM_RANGE(0xe000, 0xffff) // Expansion block
+ //map(0xc000, 0xdfff) // Expansion block
+ //map(0xe000, 0xffff) // Expansion block
}
/* Input ports */
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index 300ef895742..d3056de6ed1 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -59,7 +59,7 @@ void bebox_state::main_mem(address_map &map)
map(0x800003F8, 0x800003FF).rw("ns16550_0", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_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(0x800042E8, 0x800042EF).w("cirrus", FUNC(cirrus_device::cirrus_42E8_w));
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));
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index 950bd9f2a94..24a1811668f 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -175,8 +175,8 @@ void beezer_state::sound_map(address_map &map)
map(0x1000, 0x1007).mirror(0x07f8).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));
map(0x1800, 0x180f).mirror(0x07f0).m(m_via_audio, FUNC(via6522_device::map));
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(0xa000, 0xbfff).rom(); // 2d (can be ram, unpopulated)
+// map(0xc000, 0xdfff).rom(); // 4d (unpopulated)
map(0xe000, 0xffff).rom().region("audiocpu", 0); // 6d
}
diff --git a/src/mame/drivers/besta.cpp b/src/mame/drivers/besta.cpp
index 0e427c0c51b..f9a31c0c7e3 100644
--- a/src/mame/drivers/besta.cpp
+++ b/src/mame/drivers/besta.cpp
@@ -84,18 +84,18 @@ void besta_state::kbd_put(u8 data)
void besta_state::besta_mem(address_map &map)
{
map(0x00000000, 0x001fffff).ram().share("p_ram"); // local bus DRAM, 4MB
-// AM_RANGE(0x08010000, 0x08011fff) AM_RAM // unknown -- accessed by cp31dssp
-// AM_RANGE(0xfca03500, 0xfca0350f) AM_READWRITE8(iscsi_reg_r, iscsi_reg_w, 0xffffffff)
+// map(0x08010000, 0x08011fff).ram(); // unknown -- accessed by cp31dssp
+// map(0xfca03500, 0xfca0350f).rw(FUNC(besta_state::iscsi_reg_r), FUNC(besta_state::iscsi_reg_w));
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("mpcc", FUNC(mpcc68561_t::reg_r), FUNC(mpcc68561_t::reg_w));
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
-// AM_RANGE(0xff800a00, 0xff800xxx) // 62421 RTC
+// map(0xff800400, 0xff800xxx) // ??? -- shows up in cp31dssp log
+// map(0xff800800, 0xff800xxx) // 68153 BIM
+// map(0xff800a00, 0xff800xxx) // 62421 RTC
map(0xff800c00, 0xff800c37).rw(m_pit1, FUNC(pit68230_device::read), FUNC(pit68230_device::write));
-// AM_RANGE(0xff800e00, 0xff800xxx) // PIT3?
+// map(0xff800e00, 0xff800xxx) // PIT3?
}
/* Input ports */
diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp
index dc846dc64f1..f7d172f221b 100644
--- a/src/mame/drivers/bfcobra.cpp
+++ b/src/mame/drivers/bfcobra.cpp
@@ -1409,15 +1409,15 @@ void bfcobra_state::m6809_prog_map(address_map &map)
map(0x2200, 0x2200).ram(); // W 'F'
map(0x2600, 0x2600).rw(FUNC(bfcobra_state::meter_r), FUNC(bfcobra_state::meter_w));
map(0x2800, 0x2800).ram(); // W
- 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(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));
map(0x3406, 0x3407).rw(m_acia6850_2, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
-// AM_RANGE(0x3408, 0x3408) AM_NOP
-// AM_RANGE(0x340A, 0x340A) AM_NOP
-// AM_RANGE(0x3600, 0x3600) AM_NOP
+// map(0x3408, 0x3408).noprw();
+// map(0x340a, 0x340a).noprw();
+// map(0x3600, 0x3600).noprw();
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_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index b560834104c..aaf7b61d546 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -1566,7 +1566,7 @@ void bfm_sc2_state::sc2_basemap(address_map &map)
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(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(0x2F00, 0x2F00).w(FUNC(bfm_sc2_state::vfd2_data_w)); /* vfd2 data (not usually connected!)*/
map(0x3FFE, 0x3FFE).r(FUNC(bfm_sc2_state::direct_input_r));
map(0x3FFF, 0x3FFF).r(FUNC(bfm_sc2_state::coin_input_r));
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 0c49250c480..990c6ee47b8 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -348,7 +348,7 @@ void bigbord2_state::bigbord2_io(address_map &map)
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(0xd8, 0xdb).rw(FUNC(bigbord2_state::portd8_r), FUNC(bigbord2_state::portd8_w)); // various external data ports; DB = centronics printer
map(0xd9, 0xd9).w("outlatch1", FUNC(ls259_device::write_nibble_d3)); // u96
map(0xdc, 0xdc).mirror(2).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)); // u30
map(0xdd, 0xdd).mirror(2).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp
index a74d01c7885..8c272e9f746 100644
--- a/src/mame/drivers/bigstrkb.cpp
+++ b/src/mame/drivers/bigstrkb.cpp
@@ -42,7 +42,7 @@ lev 7 : 0x7c : 0000 05be - xxx
void bigstrkb_state::bigstrkb_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
-// AM_RANGE(0x0c0000, 0x0cffff) AM_READWRITE_LEGACY(megasys1_vregs_C_r, megasys1_vregs_C_w) AM_SHARE("megasys1_vregs")
+// map(0x0c0000, 0x0cffff).rw(FUNC(bigstrkb_state::megasys1_vregs_C_r), FUNC(bigstrkb_state::megasys1_vregs_C_w)).share("megasys1_vregs");
map(0x0C2004, 0x0C2005).nopw();
map(0x0C200C, 0x0C200d).nopw();
diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp
index db3196dd5fb..7cfab73cafe 100644
--- a/src/mame/drivers/bingoman.cpp
+++ b/src/mame/drivers/bingoman.cpp
@@ -289,7 +289,7 @@ void bingoman_state::bingoman_prg_map(address_map &map)
void bingoman_state::bingoman_io_map(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// map.global_mask(0xff);
}
static INPUT_PORTS_START( bingoman )
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index 1d2250d21ca..0c9388407cf 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -731,7 +731,7 @@ void bingor_state::vip2000_map(address_map &map)
map(0x00000, 0x0ffff).ram();
map(0x40000, 0x4ffff).ram().share("blit_ram");
map(0x40300, 0x4031f).w(m_palette, FUNC(palette_device::write16)); //wrong
- //AM_RANGE(0x50000, 0x5ffff) AM_ROM AM_REGION("gfx", 0)
+ //map(0x50000, 0x5ffff).rom().region("gfx", 0);
map(0x60000, 0x60003).w("ymz", FUNC(ymz284_device::address_data_w)).umask16(0x00ff);
map(0x80000, 0xeffff).rw("flash", FUNC(intelfsh16_device::read), FUNC(intelfsh16_device::write));
map(0xf0000, 0xfffff).rom().region("boot_prg", 0);
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp
index 9646fe623ca..f73298577fe 100644
--- a/src/mame/drivers/bitgraph.cpp
+++ b/src/mame/drivers/bitgraph.cpp
@@ -202,7 +202,7 @@ void bitgraph_state::bitgraphb_mem(address_map &map)
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(0x010030, 0x010037).r(FUNC(bitgraph_state::ppu_read)).umask16(0x00ff);
map(0x010038, 0x01003f).w(FUNC(bitgraph_state::ppu_write)).umask16(0x00ff);
map(0x380000, 0x3fffff).ram();
}
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index 7243c7be871..8eaa3814e21 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -103,7 +103,7 @@ void bking_state::bking_io_map(address_map &map)
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(0x0c, 0x0c).w(FUNC(bking_state::bking_eport2_w)); this is not shown to be connected anywhere
map(0x0d, 0x0d).w(FUNC(bking_state::bking_hitclr_w));
map(0x07, 0x1f).r(FUNC(bking_state::bking_pos_r));
}
@@ -123,7 +123,7 @@ void bking_state::bking3_io_map(address_map &map)
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(0x0c, 0x0c).w(FUNC(bking_state::bking_eport2_w)); this is not shown to be connected anywhere
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));
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index e61c15023a6..de5993ef4b8 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -163,7 +163,7 @@ void bloodbro_state::common_map(address_map &map)
map(0x08e800, 0x08f7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x08f800, 0x08ffff).ram();
map(0x0a0000, 0x0a000d).rw(m_seibu_sound, FUNC(seibu_sound_device::main_r), FUNC(seibu_sound_device::main_w)).umask16(0x00ff);
-// AM_RANGE(0x0c0000, 0x0c007f) AM_RAM AM_SHARE("scroll")
+// map(0x0c0000, 0x0c007f).ram().share("scroll");
map(0x0c0080, 0x0c0081).nopw(); // ??? IRQ Ack VBL?
map(0x0c00c0, 0x0c00c1).nopw(); // ??? watchdog?
map(0x0c0100, 0x0c0101).nopw(); // ??? written once
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index 23112b137f1..8ab2e88400f 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -173,9 +173,9 @@ void bmjr_state::bmjr_mem(address_map &map)
map(0x0000, 0xafff).ram().share("wram");
map(0xb000, 0xdfff).rom();
map(0xe000, 0xe7ff).rom();
-// 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(0xe890, 0xe890) W MP-1710 tile color
+// map(0xe891, 0xe891) W MP-1710 background color
+// map(0xe892, 0xe892) W MP-1710 monochrome / color setting
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
@@ -184,7 +184,7 @@ void bmjr_state::bmjr_mem(address_map &map)
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(0xefe0, 0xefe0) W screen mode
map(0xf000, 0xffff).rom();
}
diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp
index 765e87dbc44..a1405f3e7e7 100644
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@@ -381,11 +381,11 @@ void bml3_state::bml3_mem(address_map &map)
// TIMER - System timer enable
map(0xffca, 0xffca).r(FUNC(bml3_state::firq_status_r)); // timer irq
// LPFLG - Light pen interrupt
-// AM_RANGE(0xffcb, 0xffcb)
+// map(0xffcb, 0xffcb)
// MODE_SEL - Graphics mode select
map(0xffd0, 0xffd0).w(FUNC(bml3_state::hres_reg_w));
// TRACE - Trace counter
-// AM_RANGE(0xffd1, 0xffd1)
+// map(0xffd1, 0xffd1)
// REMOTE - Remote relay control for cassette - bit 7
map(0xffd2, 0xffd2).w(FUNC(bml3_state::relay_w));
// MUSIC_SEL - Music select: toggle audio output level when rising
@@ -396,14 +396,14 @@ void bml3_state::bml3_mem(address_map &map)
map(0xffd5, 0xffd5).noprw();
// INTERLACE_SEL - Interlaced video mode (manual has "INTERACE SEL"!)
map(0xffd6, 0xffd6).w(FUNC(bml3_state::vres_reg_w));
-// AM_RANGE(0xffd7, 0xffd7) baud select
+// map(0xffd7, 0xffd7) baud select
// C_REG_SEL - Attribute register (character/video mode and colours)
map(0xffd8, 0xffd8).rw(FUNC(bml3_state::vram_attr_r), FUNC(bml3_state::vram_attr_w));
// KB - Keyboard mode register, interrupt control, keyboard LEDs
map(0xffe0, 0xffe0).rw(FUNC(bml3_state::keyboard_r), FUNC(bml3_state::keyboard_w));
-// AM_RANGE(0xffe8, 0xffe8) bank register
-// AM_RANGE(0xffe9, 0xffe9) IG mode register
-// AM_RANGE(0xffea, 0xffea) IG enable register
+// map(0xffe8, 0xffe8) bank register
+// map(0xffe9, 0xffe9) IG mode register
+// map(0xffea, 0xffea) IG enable register
map(0xa000, 0xfeff).rom().region("maincpu", 0xa000);
map(0xfff0, 0xffff).rom().region("maincpu", 0xfff0);
map(0xa000, 0xbfff).w(FUNC(bml3_state::a000_w));
diff --git a/src/mame/drivers/bpmmicro.cpp b/src/mame/drivers/bpmmicro.cpp
index 9fca813f82f..99d2a10b39e 100644
--- a/src/mame/drivers/bpmmicro.cpp
+++ b/src/mame/drivers/bpmmicro.cpp
@@ -342,7 +342,7 @@ void bpmmicro_state::i286_mem(address_map &map)
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(0xfe0000, 0xffffff).rom().region("bios", 0); //?
map(0xfffff0, 0xffffff).rom().region("bios", 0x1fff0); //?
}
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index 6cb0ebf2783..4582ac261de 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -223,11 +223,11 @@ void buggychl_state::buggychl_map(address_map &map)
map(0xd603, 0xd603).mirror(0x00e4).portr("IN0"); /* player inputs */
map(0xd608, 0xd608).mirror(0x00e4).portr("WHEEL");
map(0xd609, 0xd609).mirror(0x00e4).portr("IN1"); /* coin + accelerator */
-// AM_RANGE(0xd60a, 0xd60a) AM_MIRROR(0x00e4) // other inputs, not used?
-// AM_RANGE(0xd60b, 0xd60b) AM_MIRROR(0x00e4) // other inputs, not used?
+// map(0xd60a, 0xd60a).mirror(0x00e4); // other inputs, not used?
+// map(0xd60b, 0xd60b).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(FUNC(buggychl_state::sound_status_main_r));
-// AM_RANGE(0xd613, 0xd613) AM_MIRROR(0x00e4) AM_WRITE(sound_reset_w)
+// map(0xd613, 0xd613).mirror(0x00e4).w(FUNC(buggychl_state::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");
map(0xd820, 0xd83f).ram(); // TODO
diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp
index bb77b383db7..c929a4fcc0f 100644
--- a/src/mame/drivers/buster.cpp
+++ b/src/mame/drivers/buster.cpp
@@ -83,7 +83,7 @@ WRITE8_MEMBER(buster_state::coin_output_w)
void buster_state::mainmap(address_map &map)
{
- map(0x0000, 0x3fff).rom();// AM_SHARE("rom")
+ map(0x0000, 0x3fff).rom();// .share("rom");
map(0x4000, 0x47ff).ram().share("wram");
map(0x5000, 0x5fff).ram().share("vram");
map(0x6000, 0x6000).w("crtc", FUNC(mc6845_device::address_w));
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index 29d765c531b..a6b37f6d5d3 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -236,13 +236,13 @@ void by35_state::by35_map(address_map &map)
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(FUNC(by35_state::nibble_nvram_r), FUNC(by35_state::nibble_nvram_w)).share("nvram");
- map(0x1000, 0x7fff).rom(); // AM_REGION("roms", 0 )
+ map(0x1000, 0x7fff).rom(); // .region("roms", 0 );
}
void by35_state::nuovo_map(address_map &map)
{
map(0x0000, 0x07ff).ram().share("nvram");
-// AM_RANGE(0x0000, 0x007f) AM_RAM // Schematics infer that the M6802 internal RAM is disabled.
+// map(0x0000, 0x007f).ram(); // Schematics infer that the M6802 internal RAM is disabled.
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(0x1000, 0xffff).rom();
diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp
index 69d0e552db1..d826c3f1828 100644
--- a/src/mame/drivers/c65.cpp
+++ b/src/mame/drivers/c65.cpp
@@ -499,7 +499,7 @@ void c65_state::c65_map(address_map &map)
// 0x0d440, 0x0d4*f Left SID
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)
+ //map(0x0d703, 0x0d703).r(FUNC(c65_state::DMAgic_r));
// 0x0d800, 0x0d8** Color matrix
map(0x0d800, 0x0dfff).rw(FUNC(c65_state::CIASelect_r), FUNC(c65_state::CIASelect_w)).share("cram");
// 0x0dc00, 0x0dc** CIA-1
diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp
index 0e844b1bae8..4a53a9e4ecf 100644
--- a/src/mame/drivers/calchase.cpp
+++ b/src/mame/drivers/calchase.cpp
@@ -429,7 +429,7 @@ void calchase_state::calchase_io(address_map &map)
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)
+ map(0x0278, 0x027b).nopw();//.w(FUNC(calchase_state::pnp_config_w));
map(0x0280, 0x0287).noprw(); //To debug
map(0x02a0, 0x02a7).noprw(); //To debug
map(0x02c0, 0x02c7).noprw(); //To debug
@@ -446,7 +446,7 @@ void calchase_state::calchase_io(address_map &map)
// map(0x03b0, 0x03df).noprw();
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(0x0a78, 0x0a7b).nopw();//.w(FUNC(calchase_state::pnp_data_w));
map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write));
map(0x42e8, 0x43ef).noprw(); //To debug
map(0x43c4, 0x43cb).rw("vga", FUNC(trident_vga_device::port_43c6_r), FUNC(trident_vga_device::port_43c6_w)); // Trident Memory and Video Clock register
diff --git a/src/mame/drivers/calcune.cpp b/src/mame/drivers/calcune.cpp
index 99015786c43..5697e051c79 100644
--- a/src/mame/drivers/calcune.cpp
+++ b/src/mame/drivers/calcune.cpp
@@ -123,7 +123,7 @@ void calcune_state::calcune_map(address_map &map)
map(0x710000, 0x710001).portr("710000");
map(0x720000, 0x720001).portr("720000");
-// AM_RANGE(0x730000, 0x730001) possible Z80 control?
+// map(0x730000, 0x730001) possible Z80 control?
map(0x760000, 0x760003).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)).umask16(0xff00);
map(0x770000, 0x770001).w(FUNC(calcune_state::cal_770000_w));
diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp
index 68fbeb949e6..1376514a64b 100644
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@@ -525,10 +525,10 @@ void camplynx_state::lynx128k_io(address_map &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(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(0x007a, 0x007b).mirror(0xff80).r(FUNC(camplynx_state::lynx128k_joysticks_r));
+// map(0x007c, 0x007c).mirror(0xff80).r(FUNC(camplynx_state::lynx128k_printer_r));
+// map(0x007d, 0x007d).mirror(0xff80).w(FUNC(camplynx_state::lynx128k_printer_init_w)); // this is rw
+// map(0x007e, 0x007e).mirror(0xff80).w(FUNC(camplynx_state::lynx128k_printer_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");
diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp
index b909195754d..0b38881a307 100644
--- a/src/mame/drivers/candela.cpp
+++ b/src/mame/drivers/candela.cpp
@@ -643,7 +643,7 @@ void can09_state::can09_map(address_map &map)
* Port A=0x18 B=0x00
* Port A=0x10 B=
*/
-// AM_RANGE(0x0000, 0x7fff) AM_RAM
+// map(0x0000, 0x7fff).ram();
map(0x0000, 0x7fff).ram().bankrw("bank1");
map(0xe000, 0xffff).rom().region("roms", 0);
map(0xe020, 0xe020).w(m_crtc, FUNC(hd6845s_device::address_w));
diff --git a/src/mame/drivers/capr1.cpp b/src/mame/drivers/capr1.cpp
index 820b951d612..4b47bdb8063 100644
--- a/src/mame/drivers/capr1.cpp
+++ b/src/mame/drivers/capr1.cpp
@@ -73,10 +73,10 @@ void capr1_state::cspin2_map(address_map &map)
map(0xa000, 0xa00f).rw("te7750", FUNC(te7750_device::read), FUNC(te7750_device::write));
map(0xc000, 0xc001).rw("ym", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
map(0xc004, 0xc004).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
-// AM_RANGE(0xc008, 0xc009) AM_DEVWRITE("fifo1", m66300_device, write)
-// AM_RANGE(0xc00c, 0xc00d) AM_DEVWRITE("fifo2", m66300_device, write)
-// AM_RANGE(0xe000, 0xe001) AM_WRITENOP
-// AM_RANGE(0xe002, 0xe004) AM_WRITENOP
+// map(0xc008, 0xc009).w("fifo1", FUNC(m66300_device::write));
+// map(0xc00c, 0xc00d).w("fifo2", FUNC(m66300_device::write));
+// map(0xe000, 0xe001).nopw();
+// map(0xe002, 0xe004).nopw();
}
diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp
index 00d23c5d65e..e189a822b63 100644
--- a/src/mame/drivers/casloopy.cpp
+++ b/src/mame/drivers/casloopy.cpp
@@ -435,8 +435,8 @@ void casloopy_state::casloopy_map(address_map &map)
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(0x05ffff00, 0x05ffffff).rw(FUNC(casloopy_state::sh7021_r), FUNC(casloopy_state::sh7021_w));
+// map(0x05ffff00, 0x05ffffff) - SH7021 internal i/o
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");
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 95bbcfdef1d..229a04fe52c 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -353,7 +353,7 @@ void cclimber_state::cannonb_map(address_map &map)
map(0x6000, 0x6bff).ram();
map(0x8000, 0x83ff).ram();
map(0x8800, 0x88ff).nopr().writeonly().share("bigspriteram"); /* must not return what's written (game will reset after coin insert if it returns 0xff)*/
-// AM_RANGE(0x8900, 0x8bff) AM_WRITEONLY /* not used, but initialized */
+// map(0x8900, 0x8bff).writeonly(); /* not used, but initialized */
map(0x9000, 0x93ff).mirror(0x0400).ram().share("videoram");
/* 9800-9bff and 9c00-9fff share the same RAM, interleaved */
/* (9800-981f for scroll, 9c20-9c3f for color RAM, and so on) */
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index b36edb1d821..af87e1fea82 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -155,7 +155,7 @@ void cd2650_state::cd2650_mem(address_map &map)
void cd2650_state::cd2650_io(address_map &map)
{
map.unmap_value_high();
- //AM_RANGE(0x80, 0x84) disk i/o
+ //map(0x80, 0x84) disk i/o
}
void cd2650_state::cd2650_data(address_map &map)
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index ca366f623aa..2eb58076b7d 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -85,16 +85,16 @@ void cdi_state::cdimono2_mem(address_map &map)
#if ENABLE_UART_PRINTING
map(0x00301400, 0x00301403).r(m_maincpu, FUNC(scc68070_device::uart_loopback_enable));
#endif
- //AM_RANGE(0x00300000, 0x00303bff) AM_DEVREADWRITE("cdic", cdicdic_device, ram_r, ram_w)
- //AM_RANGE(0x00303c00, 0x00303fff) AM_DEVREADWRITE("cdic", cdicdic_device, regs_r, regs_w)
- //AM_RANGE(0x00310000, 0x00317fff) AM_DEVREADWRITE("slave", cdislave_device, slave_r, slave_w)
- //AM_RANGE(0x00318000, 0x0031ffff) AM_NOP
+ //map(0x00300000, 0x00303bff).rw("cdic", FUNC(cdicdic_device::ram_r), FUNC(cdicdic_device::ram_w));
+ //map(0x00303c00, 0x00303fff).rw("cdic", FUNC(cdicdic_device::regs_r), FUNC(cdicdic_device::regs_w));
+ //map(0x00310000, 0x00317fff).rw("slave", FUNC(cdislave_device::slave_r), FUNC(cdicdic_device::slave_w));
+ //map(0x00318000, 0x0031ffff).noprw();
map(0x00320000, 0x00323fff).rw("mk48t08", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0xff00); /* nvram (only low bytes used) */
map(0x00400000, 0x0047ffff).rom().region("maincpu", 0);
map(0x004fffe0, 0x004fffff).rw(m_mcd212, FUNC(mcd212_device::regs_r), FUNC(mcd212_device::regs_w));
- //AM_RANGE(0x00500000, 0x0057ffff) AM_RAM
+ //map(0x00500000, 0x0057ffff).ram();
map(0x00500000, 0x00ffffff).noprw();
- //AM_RANGE(0x00e00000, 0x00efffff) AM_RAM // DVC
+ //map(0x00e00000, 0x00efffff).ram(); // DVC
}
void cdi_state::cdi910_mem(address_map &map)
@@ -106,15 +106,15 @@ void cdi_state::cdi910_mem(address_map &map)
#if ENABLE_UART_PRINTING
map(0x00301400, 0x00301403).r(m_maincpu, FUNC(scc68070_device::uart_loopback_enable));
#endif
-// AM_RANGE(0x00300000, 0x00303bff) AM_DEVREADWRITE("cdic", cdicdic_device, ram_r, ram_w)
-// AM_RANGE(0x00303c00, 0x00303fff) AM_DEVREADWRITE("cdic", cdicdic_device, regs_r, regs_w)
-// AM_RANGE(0x00310000, 0x00317fff) AM_DEVREADWRITE("slave_hle", cdislave_device, slave_r, slave_w)
-// AM_RANGE(0x00318000, 0x0031ffff) AM_NOP
+// map(0x00300000, 0x00303bff).rw("cdic", FUNC(cdicdic_device::ram_r), FUNC(cdicdic_device::ram_w));
+// map(0x00303c00, 0x00303fff).rw("cdic", FUNC(cdicdic_device::regs_r), FUNC(cdicdic_device::regs_w));
+// map(0x00310000, 0x00317fff).rw("slave_hle", FUNC(cdislave_device::slave_r), FUNC(cdicdic_device::slave_w));
+// map(0x00318000, 0x0031ffff).noprw();
map(0x00320000, 0x00323fff).rw("mk48t08", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)).umask16(0xff00); /* nvram (only low bytes used) */
map(0x004fffe0, 0x004fffff).rw(m_mcd212, FUNC(mcd212_device::regs_r), FUNC(mcd212_device::regs_w));
-// AM_RANGE(0x00500000, 0x0057ffff) AM_RAM
+// map(0x00500000, 0x0057ffff).ram();
map(0x00500000, 0x00ffffff).noprw();
-// AM_RANGE(0x00e00000, 0x00efffff) AM_RAM // DVC
+// map(0x00e00000, 0x00efffff).ram(); // DVC
}
diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp
index a8633d13ae7..a05edec6db7 100644
--- a/src/mame/drivers/cesclass.cpp
+++ b/src/mame/drivers/cesclass.cpp
@@ -136,13 +136,13 @@ void cesclassic_state::cesclassic_map(address_map &map)
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(FUNC(cesclassic_state::outputs_w));
-// AM_RANGE(0x640000, 0x640001) AM_WRITENOP
+// map(0x640000, 0x640001).nopw();
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 ...
map(0x900101, 0x900101).w(m_oki, FUNC(okim6295_device::write));
-// AM_RANGE(0x904000, 0x904001) AM_WRITENOP //some kind of serial
+// map(0x904000, 0x904001).nopw(); //some kind of serial
}
static INPUT_PORTS_START( cesclassic )
diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp
index f26d3485f92..9d40a746014 100644
--- a/src/mame/drivers/cfx9850.cpp
+++ b/src/mame/drivers/cfx9850.cpp
@@ -72,12 +72,12 @@ void cfx9850_state::cfx9850_mem(address_map &map)
{
map(0x000000, 0x007fff).rom();
map(0x080000, 0x0807ff).ram().share("video_ram");
-// AM_RANGE( 0x100000, 0x10ffff ) // some memory mapped i/o???
-// AM_RANGE( 0x110000, 0x11ffff ) // some memory mapped i/o???
+// map(0x100000, 0x10ffff) // some memory mapped i/o???
+// map(0x110000, 0x11ffff) // some memory mapped i/o???
map(0x200000, 0x27ffff).rom().region("bios", 0);
map(0x400000, 0x407fff).mirror(0x008000).ram();
map(0x600000, 0x6007ff).mirror(0xf800).ram().share("display_ram");
-// AM_RANGE( 0xe10000, 0xe1ffff ) // some memory mapped i/o???
+// map(0xe10000, 0xe1ffff) // some memory mapped i/o???
}
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index 42d216ff821..e7febbdd3a6 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -330,7 +330,7 @@ void cgc7900_state::cgc7900_mem(address_map &map)
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(FUNC(cgc7900_state::color_status_w));
-// AM_RANGE(0xe20000, 0xe23fff) Raster Processor
+// map(0xe20000, 0xe23fff) Raster Processor
map(0xe30000, 0xe303ff).ram().share("clut_ram");
map(0xe38000, 0xe3bfff).ram().share("overlay_ram");
map(0xe40000, 0xe40001).ram().share("roll_bitmap");
@@ -346,37 +346,37 @@ void cgc7900_state::cgc7900_mem(address_map &map)
map(0xe40018, 0xe40019).ram().share("color_status_bg");
map(0xe4001a, 0xe4001b).ram().share("roll_overlay");
map(0xe4001c, 0xe40fff).ram();
-// AM_RANGE(0xefc440, 0xefc441) HVG Load X
-// AM_RANGE(0xefc442, 0xefc443) HVG Load Y
-// AM_RANGE(0xefc444, 0xefc445) HVG Load dX
-// AM_RANGE(0xefc446, 0xefc447) HVG Load dY
-// AM_RANGE(0xefc448, 0xefc449) HVG Load Pixel Color
-// AM_RANGE(0xefc44a, 0xefc44b) HVG Load Trip
+// map(0xefc440, 0xefc441) HVG Load X
+// map(0xefc442, 0xefc443) HVG Load Y
+// map(0xefc444, 0xefc445) HVG Load dX
+// map(0xefc446, 0xefc447) HVG Load dY
+// map(0xefc448, 0xefc449) HVG Load Pixel Color
+// map(0xefc44a, 0xefc44b) HVG Load Trip
map(0xff8000, 0xff8003).rw(m_i8251_0, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff);
map(0xff8040, 0xff8043).rw(m_i8251_1, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff);
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(0xff80c6, 0xff80c7) Joystick X axis
+// map(0xff80ca, 0xff80cb) Joystick Y axis
+// map(0xff80cc, 0xff80cd) Joystick Z axis
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(K1135A_TAG, FUNC(com8116_device::stt_str_w));
map(0xff81c0, 0xff81ff).rw(MM58167_TAG, FUNC(mm58167_device::read), FUNC(mm58167_device::write)).umask16(0x00ff);
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(0xff8240, 0xff8241) Light Pen enable
+// map(0xff8242, 0xff8243) Light Pen X value
+// map(0xff8244, 0xff8245) Light Pen Y value
+// map(0xff8246, 0xff8247) Buffer memory parity check
+// map(0xff8248, 0xff8249) Buffer memory parity set/reset
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));
// DDMA option board
-// AM_RANGE(0xff8500, 0xff8501) Disk DMA Command Register
-// AM_RANGE(0xff8502, 0xff8503) Disk DMA Address Register
-// AM_RANGE(0xff8507, 0xff8507) Disk DMA Control/Status Register
+// map(0xff8500, 0xff8501) Disk DMA Command Register
+// map(0xff8502, 0xff8503) Disk DMA Address Register
+// map(0xff8507, 0xff8507) Disk DMA Control/Status Register
}
/*-------------------------------------------------
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index 03218b93243..fdd72fad564 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -280,7 +280,7 @@ void exctsccr_state::exctsccr_sound_map(address_map &map)
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 // ?
+// map(0xc00f, 0xc00f).nopw(); // ?
}
void exctsccr_state::exctsccr_sound_io_map(address_map &map)
diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp
index 68080cec60b..01078062789 100644
--- a/src/mame/drivers/chessmst.cpp
+++ b/src/mame/drivers/chessmst.cpp
@@ -109,7 +109,7 @@ void chessmst_state::chessmst_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
- //AM_RANGE(0x00, 0x03) AM_MIRROR(0xf0) read/write in both, not used by the software
+ //map(0x00, 0x03).mirror(0xf0); read/write in both, not used by the software
map(0x04, 0x07).mirror(0xf0).rw(m_pio[0], FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x08, 0x0b).mirror(0xf0).rw(m_pio[1], FUNC(z80pio_device::read), FUNC(z80pio_device::write));
}
diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp
index 16f20f2b54c..398d4578ec9 100644
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@@ -545,8 +545,8 @@ void chinagat_state::sub_map(address_map &map)
map(0x0000, 0x1fff).ram().share("share1");
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(0x2a2b, 0x2a2b).nopr(); /* What lives here? */
+// map(0x2a30, 0x2a30).nopr(); /* What lives here? */
map(0x4000, 0x7fff).bankr("bank4");
map(0x8000, 0xffff).rom();
}
@@ -568,14 +568,14 @@ void chinagat_state::ym2203c_sound_map(address_map &map)
// but only on the title screen....
map(0x8800, 0x8801).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
-// AM_RANGE(0x8802, 0x8802) AM_DEVREADWRITE("oki", okim6295_device, read, write)
-// AM_RANGE(0x8803, 0x8803) AM_DEVWRITE("oki", okim6295_device, write)
+// map(0x8802, 0x8802).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
+// map(0x8803, 0x8803).w("oki", FUNC(okim6295_device::write));
map(0x8804, 0x8805).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
-// AM_RANGE(0x8804, 0x8804) AM_WRITEONLY
-// AM_RANGE(0x8805, 0x8805) AM_WRITEONLY
+// map(0x8804, 0x8804).writeonly();
+// map(0x8805, 0x8805).writeonly();
-// AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write)
-// AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_device, read, write)
+// map(0x8800, 0x8801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
+// 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/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index 21c3b30c983..f8873b3f705 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -220,7 +220,7 @@ void chsuper_state::chsuper_prg_map(address_map &map)
map(0xfb000, 0xfbfff).ram().share("nvram");
}
-// AM_RANGE(0xaff8, 0xaff8) AM_DEVWRITE_MODERN("oki", okim6295_device, write)
+// map(0xaff8, 0xaff8).w("oki", FUNC(okim6295_device::write));
void chsuper_state::chsuper_portmap(address_map &map)
{
diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp
index 3c571d811a0..7ee439fb337 100644
--- a/src/mame/drivers/clayshoo.cpp
+++ b/src/mame/drivers/clayshoo.cpp
@@ -238,9 +238,9 @@ void clayshoo_state::main_io_map(address_map &map)
map(0x00, 0x00).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x20, 0x23).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x30, 0x33).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));
-// AM_RANGE(0x40, 0x43) AM_NOP // 8253 for sound?
-// AM_RANGE(0x50, 0x50) AM_NOP // ?
-// AM_RANGE(0x60, 0x60) AM_NOP // ?
+// map(0x40, 0x43).noprw(); // 8253 for sound?
+// map(0x50, 0x50).noprw(); // ?
+// map(0x60, 0x60).noprw(); // ?
}
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index 0f4721e5b63..8b93be1abaf 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -785,9 +785,9 @@ void cmi_state::midicpu_map(address_map &map)
{
map(0x000000, 0x003fff).rom();
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
+// map(0x060000, 0x06001f) TIMERS
+// map(0x060050, 0x06005f) ACIA
+// map(0x060070, 0x06007f) SMPTE
map(0x080000, 0x083fff).ram();
}
@@ -1287,7 +1287,7 @@ WRITE8_MEMBER( cmi_state::i8214_cpu2_w )
m_i8214[1]->b_w(data & 0x7);
}
-// TODO: replace with AM_SHARE
+// TODO: replace with share()
READ8_MEMBER( cmi_state::shared_ram_r )
{
return m_shared_ram[offset];
diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp
index 07281110b3c..d5012ea9385 100644
--- a/src/mame/drivers/cmmb.cpp
+++ b/src/mame/drivers/cmmb.cpp
@@ -212,7 +212,7 @@ WRITE8_MEMBER(cmmb_state::cmmb_output_w)
void cmmb_state::cmmb_map(address_map &map)
{
map(0x0000, 0x0fff).ram(); /* zero page address */
-// AM_RANGE(0x13c0, 0x13ff) AM_RAM //spriteram
+// map(0x13c0, 0x13ff).ram(); //spriteram
map(0x1000, 0x1fff).ram().share("videoram");
map(0x2000, 0x9fff).m(m_bnk2000, FUNC(address_map_bank_device::amap8));
map(0xa000, 0xafff).ram();
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp
index 757a89c2995..a41be7a573d 100644
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@@ -685,7 +685,7 @@ INTERRUPT_GEN_MEMBER(cntsteer_state::sound_interrupt)
void cntsteer_state::sound_map(address_map &map)
{
map(0x0000, 0x01ff).ram();
-// AM_RANGE(0x1000, 0x1000) AM_WRITE(nmiack_w)
+// map(0x1000, 0x1000).w(FUNC(cntsteer_state::nmiack_w));
map(0x2000, 0x2000).w("ay1", FUNC(ym2149_device::data_w));
map(0x4000, 0x4000).w("ay1", FUNC(ym2149_device::address_w));
map(0x6000, 0x6000).w("ay2", FUNC(ym2149_device::data_w));
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 55df9351774..b2f4331b15a 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -2042,7 +2042,7 @@ void cobra_state::cobra_sub_map(address_map &map)
{
map(0x00000000, 0x003fffff).ram().share("sub_ram"); // Main RAM
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(0x78000000, 0x780000ff).noprw(); // SCSI controller (unused)
map(0x78040000, 0x7804ffff).rw("rfsnd", FUNC(rf5c400_device::rf5c400_r), FUNC(rf5c400_device::rf5c400_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));
diff --git a/src/mame/drivers/codata.cpp b/src/mame/drivers/codata.cpp
index 8aad36ec7b1..eeddd6b044f 100644
--- a/src/mame/drivers/codata.cpp
+++ b/src/mame/drivers/codata.cpp
@@ -43,9 +43,9 @@ void codata_state::mem_map(address_map &map)
map(0x600000, 0x600007).mirror(0x1ffff8).rw("uart", FUNC(upd7201_new_device::ba_cd_r), FUNC(upd7201_new_device::ba_cd_w)).umask16(0xff00);
map(0x800000, 0x800003).mirror(0x1ffffc).rw("timer", FUNC(am9513_device::read16), FUNC(am9513_device::write16));
map(0xe00000, 0xe00001).mirror(0x1ffffe).portr("INPUT");
- //AM_RANGE(0xa00000, 0xbfffff) page map (rw)
- //AM_RANGE(0xc00000, 0xdfffff) segment map (rw), context register (r)
- //AM_RANGE(0xe00000, 0xffffff) context register (w), 16-bit parallel input port (r)
+ //map(0xa00000, 0xbfffff) page map (rw)
+ //map(0xc00000, 0xdfffff) segment map (rw), context register (r)
+ //map(0xe00000, 0xffffff) context register (w), 16-bit parallel input port (r)
}
/* Input ports */
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index ced82d97625..98780b94b88 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -501,7 +501,7 @@ E0-E1 CRTC
map(0xc8, 0xcb).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); /* confirmed */
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(0xc0, 0xc1).r(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/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index 3c3e47934dc..3b0bac5b32f 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -321,11 +321,11 @@ void coinmvga_state::coinmvga_map(address_map &map)
map(0x000000, 0x07ffff).rom();
map(0x080000, 0x0fffff).rom().region("maincpu", 0); //maybe not
-// AM_RANGE(0x0a0000, 0x0fffff) AM_RAM
-// AM_RANGE(0x100000, 0x1fffff) AM_RAM //colorama
+// map(0x0a0000, 0x0fffff).ram();
+// map(0x100000, 0x1fffff).ram(); //colorama
map(0x210000, 0x21ffff).ram().share("vram");
-// AM_RANGE(0x40746e, 0x40746f) AM_READ(test_r) AM_WRITENOP //touch screen related, colorama
-// AM_RANGE(0x403afa, 0x403afb) AM_READ(test_r) AM_WRITENOP //touch screen related, cmrltv75
+// map(0x40746e, 0x40746f).r(FUNC(coinmvga_state::test_r)).nopw(); //touch screen related, colorama
+// map(0x403afa, 0x403afb).r(FUNC(coinmvga_state::test_r)).nopw(); //touch screen related, cmrltv75
map(0x400000, 0x40ffff).ram();
map(0x600000, 0x600000).w("ramdac", FUNC(ramdac_device::index_w));
@@ -347,20 +347,20 @@ void coinmvga_state::coinmvga_map(address_map &map)
void coinmvga_state::coinmvga_io_map(address_map &map)
{
/* Digital I/O ports (ports 4-B are valid on 16-bit H8/3xx) */
-// AM_RANGE(h8_device::PORT_4, h8_device::PORT_4)
-// AM_RANGE(h8_device::PORT_5, h8_device::PORT_5)
-// AM_RANGE(h8_device::PORT_6, h8_device::PORT_6)
-// AM_RANGE(h8_device::PORT_7, h8_device::PORT_7) <---- 0006 RW colorama
-// AM_RANGE(h8_device::PORT_8, h8_device::PORT_8)
-// AM_RANGE(h8_device::PORT_9, h8_device::PORT_9)
-// AM_RANGE(h8_device::PORT_A, h8_device::PORT_A)
-// AM_RANGE(h8_device::PORT_B, h8_device::PORT_B)
+// map(h8_device::PORT_4, h8_device::PORT_4)
+// map(h8_device::PORT_5, h8_device::PORT_5)
+// map(h8_device::PORT_6, h8_device::PORT_6)
+// map(h8_device::PORT_7, h8_device::PORT_7) <---- 0006 RW colorama
+// map(h8_device::PORT_8, h8_device::PORT_8)
+// map(h8_device::PORT_9, h8_device::PORT_9)
+// map(h8_device::PORT_A, h8_device::PORT_A)
+// map(h8_device::PORT_B, h8_device::PORT_B)
/* Analog Inputs */
-// AM_RANGE(h8_device::ADC_0, h8_device::ADC_0)
-// AM_RANGE(h8_device::ADC_1, h8_device::ADC_1)
-// AM_RANGE(h8_device::ADC_2, h8_device::ADC_2)
-// AM_RANGE(h8_device::ADC_3, h8_device::ADC_3)
+// map(h8_device::ADC_0, h8_device::ADC_0)
+// map(h8_device::ADC_1, h8_device::ADC_1)
+// map(h8_device::ADC_2, h8_device::ADC_2)
+// map(h8_device::ADC_3, h8_device::ADC_3)
}
/* unknown writes (cmrltv75):
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index 460f09786a4..f3ab95696d3 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -351,7 +351,7 @@ void combatsc_state::combatsc_map(address_map &map)
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(0x0060, 0x00ff).writeonly(); /* RAM */
map(0x0200, 0x0201).rw(FUNC(combatsc_state::protection_r), FUNC(combatsc_state::protection_w));
map(0x0206, 0x0206).w(FUNC(combatsc_state::protection_clock_w));
diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp
index 46cbcf20e24..ebd7edca544 100644
--- a/src/mame/drivers/concept.cpp
+++ b/src/mame/drivers/concept.cpp
@@ -52,7 +52,7 @@ void concept_state::concept_memmap(address_map &map)
map(0x020000, 0x021fff).rom().region("macsbug", 0x0); /* macsbugs ROM (optional) */
map(0x030000, 0x03ffff).rw(FUNC(concept_state::io_r), FUNC(concept_state::io_w)).umask16(0x00ff); /* I/O space */
- map(0x080000, 0x0fffff).ram().share("videoram");/* AM_RAMBANK(2) */ /* DRAM */
+ map(0x080000, 0x0fffff).ram().share("videoram"); /* .bankrw(2); */ /* DRAM */
}
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index e8b470cb272..5fb6eb70d9d 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -191,11 +191,11 @@ void cosmicos_state::cosmicos_mem(address_map &map)
void cosmicos_state::cosmicos_io(address_map &map)
{
-// AM_RANGE(0x00, 0x00)
+// map(0x00, 0x00)
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(0x03, 0x03)
+// map(0x04, 0x04)
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));
diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp
index 9d9d2fc0f86..b6d7be43ad6 100644
--- a/src/mame/drivers/crgolf.cpp
+++ b/src/mame/drivers/crgolf.cpp
@@ -334,7 +334,7 @@ void crgolf_state::mastrglf_io(address_map &map)
{
map.global_mask(0xff);
map(0x00, 0x07).w("mainlatch", FUNC(ls259_device::write_d0));
-// AM_RANGE(0x20, 0x20) AM_WRITE(rom_bank_select_w)
+// map(0x20, 0x20).w(FUNC(crgolf_state::rom_bank_select_w));
map(0x40, 0x40).w("soundlatch1", FUNC(generic_latch_8_device::write));
map(0xa0, 0xa0).r("soundlatch2", FUNC(generic_latch_8_device::read));
}
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index 7eb9b1c8ee4..8f97937de0a 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -150,11 +150,11 @@ void crvision_state::crvision_map(address_map &map)
map(0x3000, 0x3001).mirror(0x0ffe).w(TMS9929_TAG, FUNC(tms9928a_device::write));
map(0x4000, 0x7fff).bankr(BANK_ROM2);
map(0x8000, 0xbfff).bankr(BANK_ROM1);
-// AM_RANGE(0xc000, 0xe7ff) AM_RAMBANK(3)
+// map(0xc000, 0xe7ff).bankrw(3);
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(0xe802, 0xf7ff).bankrw(4);
map(0xf800, 0xffff).rom().region(M6502_TAG, 0);
}
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index de0127175ae..3624c96a493 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -143,13 +143,13 @@ void cswat_state::cswat_map(address_map &map)
{
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(0x1800, 0x1800).nopr(); // ? reads here after writing to $4000
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(0x4000, 0x4009).noprw(); // ?
map(0x8000, 0xffff).rom();
}
diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp
index d6c776f615b..0acd7f3938c 100644
--- a/src/mame/drivers/cupidon.cpp
+++ b/src/mame/drivers/cupidon.cpp
@@ -88,14 +88,13 @@ void cupidon_state::cupidon_map(address_map &map)
map(0x1800000, 0x1800003).r(FUNC(cupidon_state::cupidon_return_ffffffff));
map(0x2000074, 0x2000077).ram(); // port
-// AM_RANGE(0x2000040, 0x200004f) AM_RAM
-
+// map(0x2000040, 0x200004f).ram();
// might just be 4mb of VRAM
map(0x3000000, 0x33bffff).ram();
map(0x33c0000, 0x33fffff).ram().share("gfxram"); // seems to upload graphics to here, tiles etc. if you skip the loop after the romtest in funnyfm
-// AM_RANGE(0x3400000, 0x3400fff) AM_RAM
-// AM_RANGE(0x3F80000, 0x3F80003) AM_RAM
+// map(0x3400000, 0x3400fff).ram();
+// map(0x3F80000, 0x3F80003).ram();
map(0x3FF0400, 0x3FF0403).ram(); // register? gangrose likes to read this?
}
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index e7d197a60b4..3b6c65b0de8 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -349,7 +349,7 @@ void cv1k_state::cv1k_map(address_map &map)
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(FUNC(cv1k_state::serial_rtc_eeprom_r), FUNC(cv1k_state::serial_rtc_eeprom_w));
-// AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset
+// map(0x18000000, 0x18000057) // blitter, installed on reset
map(0xf0000000, 0xf0ffffff).ram(); // mem mapped cache (sh3 internal?)
}
@@ -360,7 +360,7 @@ void cv1k_state::cv1k_d_map(address_map &map)
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(FUNC(cv1k_state::serial_rtc_eeprom_r), FUNC(cv1k_state::serial_rtc_eeprom_w));
-// AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset
+// map(0x18000000, 0x18000057) // blitter, installed on reset
map(0xf0000000, 0xf0ffffff).ram(); // mem mapped cache (sh3 internal?)
}
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index 88d9ab50770..3d964f31ff0 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -63,7 +63,7 @@ void cybiko_state::cybikov1_mem(address_map &map)
{
map(0x000000, 0x007fff).rom();
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 )
+// map(0xe00000, 0xe07fff).r(FUNC(cybiko_state::cybikov1_key_r));
}
/*
diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp
index 45a625d8ca5..8ef064b01c2 100644
--- a/src/mame/drivers/cyclemb.cpp
+++ b/src/mame/drivers/cyclemb.cpp
@@ -592,9 +592,9 @@ void cyclemb_state::cyclemb_map(address_map &map)
void cyclemb_state::cyclemb_io(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// map.global_mask(0xff);
map(0xc000, 0xc000).w(FUNC(cyclemb_state::cyclemb_bankswitch_w));
- //AM_RANGE(0xc020, 0xc020) AM_WRITENOP // ?
+ //map(0xc020, 0xc020).nopw(); // ?
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
}
@@ -602,11 +602,11 @@ void cyclemb_state::cyclemb_io(address_map &map)
void cyclemb_state::skydest_io(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// map.global_mask(0xff);
map(0xc000, 0xc000).w(FUNC(cyclemb_state::cyclemb_bankswitch_w));
- //AM_RANGE(0xc020, 0xc020) AM_WRITENOP // ?
+ //map(0xc020, 0xc020).nopw(); // ?
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(0xc0a0, 0xc0a0).nopw(); // ?
map(0xc0bf, 0xc0bf).w(FUNC(cyclemb_state::cyclemb_flip_w)); //flip screen
}
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index 419556358d4..41fb3d33b0e 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -141,14 +141,14 @@ void d9final_state::d9final_map(address_map &map)
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(0xf000, 0xf007).r(FUNC(d9final_state::prot_latch_r)); //.rw("essnd", FUNC(es8712_device::read), FUNC(es8712_device::write));
map(0xf800, 0xf80f).rw("rtc", FUNC(rtc62421_device::read), FUNC(rtc62421_device::write));
}
void d9final_state::d9final_io(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0x00, 0x00) AM_WRITENOP //bit 0: irq enable? screen enable?
+// map(0x00, 0x00).nopw(); //bit 0: irq enable? screen enable?
map(0x00, 0x00).portr("DSWA");
map(0x20, 0x20).portr("DSWB");
map(0x40, 0x40).portr("DSWC");
diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp
index 954d3977b65..cf083900922 100644
--- a/src/mame/drivers/dai.cpp
+++ b/src/mame/drivers/dai.cpp
@@ -80,7 +80,7 @@ void dai_state::dai_mem(address_map &map)
map(0xf000, 0xf7ff).w(FUNC(dai_state::dai_stack_interrupt_circuit_w));
map(0xf800, 0xf8ff).ram();
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(0xfc00, 0xfcff).rw(FUNC(dai_state::dai_pit_r), FUNC(dai_state::dai_pit_w)); // .rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::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/daruma.cpp b/src/mame/drivers/daruma.cpp
index 1ac8fd665f1..7b053ca0a35 100644
--- a/src/mame/drivers/daruma.cpp
+++ b/src/mame/drivers/daruma.cpp
@@ -94,8 +94,8 @@ void daruma_state::mem_io(address_map &map)
{
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(0x2000, 0x2000).w(FUNC(daruma_state:dev2_w));
+// map(0x3000, 0x3000).w(FUNC(daruma_state:dev3_w));
map(0x4000, 0x4000).r(FUNC(daruma_state::dev4_r));
map(0x8000, 0xffff).ram(); /* 32K CMOS SRAM (HYUNDAY hy62256a) */
}
diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp
index 9e5f17590aa..5dbd3d027a1 100644
--- a/src/mame/drivers/dblewing.cpp
+++ b/src/mame/drivers/dblewing.cpp
@@ -184,7 +184,7 @@ void dblewing_state::dblewing_map(address_map &map)
map(0x104000, 0x104fff).ram().share("pf1_rowscroll");
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, 0x2807ff).rw("ioprot104", FUNC(deco104_device::dblewing_prot_r), FUNC(deco104_device::dblewing_prot_w)).share("prot16ram");
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 */
diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp
index 51d635b7da4..79876900be8 100644
--- a/src/mame/drivers/dbox.cpp
+++ b/src/mame/drivers/dbox.cpp
@@ -586,11 +586,11 @@ void dbox_state::dbox_map(address_map &map)
// CS2 - CS demux
// 0000009a Address mask CS2 00000050, 00007fff (ffffffff) - Mask: 00007f00 FCM:0f DD:3 PS: External DSACK response
// 000000a2 Base address CS2 00000054, 00700003 (ffffffff) - Base: 00700000 BFC:00 WP:0 FTE:0 NCS:1 Valid: Yes
- //AM_RANGE(0x700000, 0x77ffff)
+ //map(0x700000, 0x77ffff)
// CS3 - 8 bit devices
// 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(0x780000, 0x7807ff)
map(0x780100, 0x7801ff).w(FUNC(dbox_state::sda5708_reset));
map(0x780600, 0x7806ff).w(FUNC(dbox_state::sda5708_clk));
// CS1 - RAM area
diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp
index c227091bd22..bc4a4d9d014 100644
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@@ -380,7 +380,7 @@ WRITE8_MEMBER(dc_cons_state::dc_flash_w)
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(0x00200000, 0x0021ffff).rom().region("dcflash", 0);//.rw(FUNC(dc_cons_state::dc_flash_r), FUNC(dc_cons_state::dc_flash_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::cs1_r), FUNC(ata_interface_device::cs1_w)).umask64(0x0000ffff0000ffff);
@@ -393,11 +393,11 @@ void dc_cons_state::dc_map(address_map &map)
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(FUNC(dc_cons_state::soundram_r), FUNC(dc_cons_state::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
+// map(0x01000000, 0x01ffffff) G2 Ext Device #1
+// map(0x02700000, 0x02707fff) AICA reg mirror
+// map(0x02800000, 0x02ffffff) AICA wave mem mirror
-// AM_RANGE(0x03000000, 0x03ffffff) G2 Ext Device #2
+// map(0x03000000, 0x03ffffff) G2 Ext Device #2
/* Area 1 */
map(0x04000000, 0x04ffffff).ram().share("dc_texture_ram"); // texture memory 64 bit access
@@ -418,7 +418,7 @@ void dc_cons_state::dc_map(address_map &map)
map(0x12800000, 0x12ffffff).w(m_powervr2, FUNC(powervr2_device::ta_fifo_yuv_w));
map(0x13000000, 0x137fffff).w(m_powervr2, FUNC(powervr2_device::ta_texture_directpath1_w)).mirror(0x00800000); // access to texture / framebuffer memory (either 32-bit or 64-bit area depending on SB_LMMODE1 register - cannot be written directly, only through dma / store queue
-// AM_RANGE(0x14000000, 0x17ffffff) G2 Ext Device #3
+// map(0x14000000, 0x17ffffff) G2 Ext Device #3
map(0x8c000000, 0x8cffffff).ram().share("dc_ram"); // another RAM mirror
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index 3f5f3bc44a2..848056549a1 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -1945,7 +1945,7 @@ void ddenlovr_state::quiz365_map(address_map &map)
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(0x201000, 0x2017ff).writeonly(); // ?
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
@@ -1999,7 +1999,7 @@ void ddenlovr_state::ddenlovj_map(address_map &map)
map(0x000000, 0x07ffff).rom(); // ROM
map(0x200000, 0x2003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff);
-// map(0x201000, 0x2017ff) AM_WRITEONLY // ? B0 on startup, then 00
+// map(0x201000, 0x2017ff).writeonly(); // ? B0 on startup, then 00
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);
@@ -2058,7 +2058,7 @@ void ddenlovr_state::ddenlovrk_map(address_map &map)
map(0x200000, 0x200001).rw(FUNC(ddenlovr_state::ddenlovrk_protection2_r), FUNC(ddenlovr_state::ddenlovrk_protection2_w)).share("protection2");
map(0xd00000, 0xd003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff);
-// map(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00
+// map(0xd01000, 0xd017ff).ram(); // ? B0 on startup, then 00
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);
@@ -2094,7 +2094,7 @@ void ddenlovr_state::ddenlovr_map(address_map &map)
map(0x300001, 0x300001).w(FUNC(ddenlovr_state::ddenlovr_oki_bank_w));
map(0xd00000, 0xd003ff).w(FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff);
-// map(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00
+// map(0xd01000, 0xd017ff).ram(); // ? B0 on startup, then 00
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);
@@ -2824,14 +2824,14 @@ void ddenlovr_state::kotbinyo_portmap(address_map &map)
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, 0xb2).r(FUNC(ddenlovr_state::hanakanz_keyb_r));
map(0xb1, 0xb1).portr("KEYB0");
map(0xb2, 0xb2).portr("KEYB1");
map(0xb3, 0xb3).w(FUNC(ddenlovr_state::hanakanz_coincounter_w));
-// map(0xb4, 0xb4) AM_WRITE(hanakanz_keyb_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) AM_DEVREADWRITE("rtc", msm6242_device, read, write)
+// map(0xe0, 0xef).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write));
}
@@ -2849,14 +2849,14 @@ void ddenlovr_state::kotbinsp_portmap(address_map &map)
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).r(FUNC(ddenlovr_state::hanakanz_keyb_r));
map(0x91, 0x91).portr("KEYB0");
map(0x92, 0x92).portr("KEYB1");
map(0x93, 0x93).w(FUNC(ddenlovr_state::hanakanz_coincounter_w));
-// map(0x94, 0x94) AM_WRITE(hanakanz_keyb_w)
+// map(0x94, 0x94).w(FUNC(ddenlovr_state::hanakanz_keyb_w));
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)
+// map(0xe0, 0xef).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write));
}
diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp
index f8adb56d08d..eaf854cb359 100644
--- a/src/mame/drivers/deco_ld.cpp
+++ b/src/mame/drivers/deco_ld.cpp
@@ -278,7 +278,7 @@ void deco_ld_state::rblaster_map(address_map &map)
map(0x1003, 0x1003).portr("IN1");
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, 0x1007).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write));
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");
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index 1f406494e97..976fe06f711 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -816,7 +816,7 @@ void dectalk_state::tms32010_io(address_map &map)
{
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?
+ //map(8, 8) //the newer firmware seems to want something mapped here?
}
/******************************************************************************
diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp
index d492632ee0e..74c5f932b71 100644
--- a/src/mame/drivers/deshoros.cpp
+++ b/src/mame/drivers/deshoros.cpp
@@ -182,12 +182,12 @@ void destiny_state::main_map(address_map &map)
map(0x9003, 0x9003).portr("KEY1");
map(0x9004, 0x9004).portr("KEY2");
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(0x9006, 0x9006).noprw(); // printer motor on
+// map(0x9007, 0x9007).noprw(); // printer data
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(0x900d, 0x900d).noprw(); // printer motor off
+// map(0x900e, 0x900e).noprw(); // printer motor jam reset
map(0xc000, 0xffff).rom();
}
diff --git a/src/mame/drivers/dg680.cpp b/src/mame/drivers/dg680.cpp
index 1e1386505bb..8a5ac909e96 100644
--- a/src/mame/drivers/dg680.cpp
+++ b/src/mame/drivers/dg680.cpp
@@ -191,9 +191,9 @@ void dg680_state::dg680_io(address_map &map)
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(FUNC(dg680_state::port08_r), FUNC(dg680_state::port08_w)); //SWP Control and Status
- //AM_RANGE(0x09,0x09) parallel input port
+ //map(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)
+ //map(0x0c,0x0d).rw("am9519", FUNC(am9519_device::read), FUNC(am9519_device::write));
}
void dg680_state::machine_reset()
diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp
index d117ce82dd3..e554c15e58f 100644
--- a/src/mame/drivers/digel804.cpp
+++ b/src/mame/drivers/digel804.cpp
@@ -473,10 +473,10 @@ void digel804_state::z80_mem_804_1_4(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x3fff).rom(); // 3f in mapper = rom J3
- //AM_RANGE(0x4000, 0x5fff) AM_RAM AM_SHARE("main_ram") // 6f in mapper = RAM D43 (6164)
- //AM_RANGE(0x6000, 0x7fff) AM_RAM AM_SHARE("main_ram") // 77 in mapper = RAM D44 (6164)
- //AM_RANGE(0x8000, 0x9fff) AM_RAM AM_SHARE("main_ram") // 7b in mapper = RAM D45 (6164)
- //AM_RANGE(0xa000, 0xbfff) AM_RAM AM_SHARE("main_ram") // 7d in mapper = RAM D46 (6164)
+ //map(0x4000, 0x5fff).ram().share("main_ram"); // 6f in mapper = RAM D43 (6164)
+ //map(0x6000, 0x7fff).ram().share("main_ram"); // 77 in mapper = RAM D44 (6164)
+ //map(0x8000, 0x9fff).ram().share("main_ram"); // 7b in mapper = RAM D45 (6164)
+ //map(0xa000, 0xbfff).ram().share("main_ram"); // 7d in mapper = RAM D46 (6164)
map(0x4000, 0xbfff).bankrw("bankedram");
// c000-cfff is open bus in mapper, 7f
map(0xd000, 0xd7ff).ram(); // 7e in mapper = RAM P3 (6116)
@@ -489,13 +489,13 @@ void ep804_state::z80_mem_804_1_2(address_map &map)
map.unmap_value_high();
map(0x0000, 0x1fff).rom(); // 3f in mapper = rom D41
map(0x2000, 0x3fff).rom(); // 5f in mapper = rom D42
- //AM_RANGE(0x4000, 0x5fff) AM_RAM AM_SHARE("main_ram") // 6f in mapper = RAM D43 (6164)
- //AM_RANGE(0x6000, 0x7fff) AM_RAM AM_SHARE("main_ram") // 77 in mapper = RAM D44 (6164)
- //AM_RANGE(0x8000, 0x9fff) AM_RAM AM_SHARE("main_ram") // 7b in mapper = RAM D45 (6164)
- //AM_RANGE(0xa000, 0xbfff) AM_RAM AM_SHARE("main_ram") // 7d in mapper = RAM D46 (6164)
+ //map(0x4000, 0x5fff).ram().share("main_ram"); // 6f in mapper = RAM D43 (6164)
+ //map(0x6000, 0x7fff).ram().share("main_ram"); // 77 in mapper = RAM D44 (6164)
+ //map(0x8000, 0x9fff).ram().share("main_ram"); // 7b in mapper = RAM D45 (6164)
+ //map(0xa000, 0xbfff).ram().share("main_ram"); // 7d in mapper = RAM D46 (6164)
map(0x4000, 0xbfff).bankrw("bankedram");
// c000-cfff is open bus in mapper, 7f
- //AM_RANGE(0xc000, 0xc7ff) AM_RAM // hack for now to test, since sometimes it writes to c3ff
+ //map(0xc000, 0xc7ff).ram(); // hack for now to test, since sometimes it writes to c3ff
map(0xd000, 0xd7ff).ram(); // 7e in mapper = RAM D47 (6116)
// d800-ffff is open bus in mapper, 7f
}
@@ -525,7 +525,7 @@ void digel804_state::z80_io_1_4(address_map &map)
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
+ //map(0x80,0x87).mirror(0x38).shift(-1).rw("acia", FUNC(mos6551_device::read, FUNC(mos6551_device::write)); // this doesn't work since we lack a shift() command
}
@@ -553,7 +553,7 @@ void ep804_state::z80_io_1_2(address_map &map)
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
+ //map(0x80,0x87).mirror(0x38).shift(-1).rw("acia", FUNC(mos6551_device::read, FUNC(mos6551_device::write)); // this doesn't work since we lack a shift() command
}
diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp
index dc02ca984c6..eb0f6b87f43 100644
--- a/src/mame/drivers/dim68k.cpp
+++ b/src/mame/drivers/dim68k.cpp
@@ -213,7 +213,7 @@ void dim68k_state::dim68k_mem(address_map &map)
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(FUNC(dim68k_state::dim68k_fdc_r), FUNC(dim68k_state::dim68k_fdc_w));
- //AM_RANGE(0x00ffd400, 0x00ffd403) emulation trap control
+ //map(0x00ffd400, 0x00ffd403) emulation trap control
map(0x00ffd800, 0x00ffd801).w(FUNC(dim68k_state::dim68k_printer_strobe_w));
map(0x00ffdc00, 0x00ffdc01).w(FUNC(dim68k_state::dim68k_banksw_w));
}
diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp
index 304cacca37e..3d0376188af 100644
--- a/src/mame/drivers/diverboy.cpp
+++ b/src/mame/drivers/diverboy.cpp
@@ -175,12 +175,12 @@ void diverboy_state::diverboy_map(address_map &map)
map(0x180000, 0x180001).portr("P1_P2");
map(0x180002, 0x180003).portr("DSW");
map(0x180008, 0x180009).portr("COINS");
-// AM_RANGE(0x18000a, 0x18000b) AM_READNOP
-// AM_RANGE(0x18000c, 0x18000d) AM_WRITENOP
+// map(0x18000a, 0x18000b).nopr();
+// map(0x18000c, 0x18000d).nopw();
map(0x320000, 0x3207ff).writeonly(); /* ?? */
map(0x322000, 0x3227ff).writeonly(); /* ?? */
-// AM_RANGE(0x340000, 0x340001) AM_WRITENOP
-// AM_RANGE(0x340002, 0x340003) AM_WRITENOP
+// map(0x340000, 0x340001).nopw();
+// map(0x340002, 0x340003).nopw();
}
void diverboy_state::snd_map(address_map &map)
diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp
index daf30d47ebb..0a06a7eff18 100644
--- a/src/mame/drivers/dlair2.cpp
+++ b/src/mame/drivers/dlair2.cpp
@@ -86,11 +86,11 @@ void dlair2_state::dlair2_map(address_map &map)
void dlair2_state::dlair2_io(address_map &map)
{
-// AM_RANGE(0x020, 0x020) ICR
-// AM_RANGE(0x042, 0x043) sound related
-// AM_RANGE(0x061, 0x061) sound related
-// AM_RANGE(0x200, 0x203) i/o, coin, eeprom
-// AM_RANGE(0x2f8, 0x2ff) COM2
+// map(0x020, 0x020) ICR
+// map(0x042, 0x043) sound related
+// map(0x061, 0x061) sound related
+// map(0x200, 0x203) i/o, coin, eeprom
+// map(0x2f8, 0x2ff) COM2
}
static INPUT_PORTS_START( dlair2 )
diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp
index 4bde5a8ea1e..a7fdf980de0 100644
--- a/src/mame/drivers/dm7000.cpp
+++ b/src/mame/drivers/dm7000.cpp
@@ -244,7 +244,7 @@ void dm7000_state::dm7000_mem(address_map &map)
map(0x7f800000, 0x7ffdffff).rom().region("user2", 0);
map(0x7ffe0000, 0x7fffffff).rom().region("user1", 0);
- //AM_RANGE(0xfffe0000, 0xffffffff) AM_ROM AM_REGION("user1",0)
+ //map(0xfffe0000, 0xffffffff).rom().region("user1",0);
}
/* Input ports */
diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp
index 5e029f6ab63..564b3685bd1 100644
--- a/src/mame/drivers/dmax8000.cpp
+++ b/src/mame/drivers/dmax8000.cpp
@@ -117,11 +117,11 @@ void dmax8000_state::dmax8000_io(address_map &map)
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(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(0x18, 0x19).mirror(2).rw("am9511", FUNC(am9512_device::read), FUNC(am9512_device::write)); // optional numeric coprocessor
+ //map(0x1c, 0x1d).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(FUNC(dmax8000_state::port40_w)); // memory bank control
- //AM_RANGE(0x60, 0x67) // optional IEEE488 GPIB
+ //map(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/dps1.cpp b/src/mame/drivers/dps1.cpp
index 370c1673fa8..123a7ec0efa 100644
--- a/src/mame/drivers/dps1.cpp
+++ b/src/mame/drivers/dps1.cpp
@@ -84,14 +84,14 @@ void dps1_state::io_map(address_map &map)
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
- // AM_RANGE(0x10, 0x11) // interrupt response
+ // map(0x04, 0x07).rw("uart2", FUNC(mc2661_device::read), FUNC(mc2661_device::write)); // S2651
+ // map(0x08, 0x0b) parallel ports
+ // map(0x10, 0x11) // interrupt response
map(0x14, 0x14).rw("am9519a", FUNC(am9519_device::data_r), FUNC(am9519_device::data_w));
map(0x15, 0x15).rw("am9519a", FUNC(am9519_device::stat_r), FUNC(am9519_device::cmd_w));
map(0x16, 0x16).rw("am9519b", FUNC(am9519_device::data_r), FUNC(am9519_device::data_w));
map(0x17, 0x17).rw("am9519b", FUNC(am9519_device::stat_r), FUNC(am9519_device::cmd_w));
- // AM_RANGE(0x18, 0x1f) control lines 0 to 7
+ // map(0x18, 0x1f) control lines 0 to 7
map(0xe0, 0xe3).noprw(); //unknown device
}
diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp
index 8e248ffce42..5d00c431368 100644
--- a/src/mame/drivers/dreambal.cpp
+++ b/src/mame/drivers/dreambal.cpp
@@ -116,7 +116,7 @@ WRITE16_MEMBER( dreambal_state::dreambal_protection_region_0_104_w )
void dreambal_state::dreambal_map(address_map &map)
{
-//ADDRESS_MAP_UNMAP_HIGH
+//map.unmap_value_high();
map(0x000000, 0x07ffff).rom();
map(0x100000, 0x100fff).rw(m_deco_tilegen, FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x101000, 0x101fff).ram();
diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp
index e70cfd0cf46..1f2261409f2 100644
--- a/src/mame/drivers/dsb46.cpp
+++ b/src/mame/drivers/dsb46.cpp
@@ -69,11 +69,11 @@ void dsb46_state::dsb46_io(address_map &map)
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(FUNC(dsb46_state::port1a_w));
- //AM_RANGE(0x10, 0x10) disk related
- //AM_RANGE(0x14, 0x14) ?? (read after CTC1 TRG3)
- //AM_RANGE(0x18, 0x18) ??
- //AM_RANGE(0x1c, 0x1c) disk data
- //AM_RANGE(0x1d, 0x1d) disk status (FF = no fdc)
+ //map(0x10, 0x10) disk related
+ //map(0x14, 0x14) ?? (read after CTC1 TRG3)
+ //map(0x18, 0x18) ??
+ //map(0x1c, 0x1c) disk data
+ //map(0x1d, 0x1d) disk status (FF = no fdc)
}
static INPUT_PORTS_START( dsb46 )
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index 765ce20c49e..3740b7a78eb 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -499,7 +499,7 @@ void dunhuang_state::dunhuang_io_map(address_map &map)
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(0x0011, 0x0011) ?
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));
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index 0bc9895b13e..e66d3b58acf 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -507,8 +507,8 @@ void dynax_state::hanamai_io_map(address_map &map)
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(0x7c, 0x7c).nopw(); // CRT Controller
+// map(0x7d, 0x7d).nopw(); //
map(0x7e, 0x7e).w(FUNC(dynax_state::dynax_blit_romregion_w)); // Blitter ROM bank
}
@@ -517,8 +517,8 @@ void dynax_state::hnoridur_io_map(address_map &map)
{
map.global_mask(0xff);
map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
-// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
-// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
+// map(0x10, 0x10).nopw(); // CRT Controller
+// map(0x11, 0x11).nopw(); // 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
@@ -599,8 +599,8 @@ void dynax_state::hjingi_io_map(address_map &map)
map.global_mask(0xff);
map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
-// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
-// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
+// map(0x10, 0x10).nopw(); // CRT Controller
+// map(0x11, 0x11).nopw(); // CRT Controller
map(0x20, 0x20).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
map(0x21, 0x21).portr("COINS"); // Coins
@@ -755,8 +755,8 @@ void dynax_state::mcnpshnt_io_map(address_map &map)
{
map.global_mask(0xff);
map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
-// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
-// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
+// map(0x10, 0x10).nopw(); // CRT Controller
+// map(0x11, 0x11).nopw(); // 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
@@ -791,8 +791,8 @@ void dynax_state::sprtmtch_io_map(address_map &map)
map.global_mask(0xff);
map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_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(0x12, 0x12).nopw(); // CRT Controller
+// map(0x13, 0x13).nopw(); // CRT Controller
map(0x20, 0x20).portr("P1"); // P1
map(0x21, 0x21).portr("P2"); // P2
map(0x22, 0x22).portr("COINS"); // Coins
@@ -819,8 +819,8 @@ void dynax_state::mjfriday_io_map(address_map &map)
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(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
-// AM_RANGE( 0x50, 0x50 ) AM_WRITENOP // CRT Controller
-// AM_RANGE( 0x51, 0x51 ) AM_WRITENOP // CRT Controller
+// map(0x50, 0x50).nopw(); // CRT Controller
+// map(0x51, 0x51).nopw(); // CRT Controller
map(0x60, 0x60).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
map(0x61, 0x61).portr("COINS"); // Coins
map(0x62, 0x62).r(FUNC(dynax_state::hanamai_keyboard_1_r)); // P2
@@ -828,7 +828,7 @@ void dynax_state::mjfriday_io_map(address_map &map)
map(0x64, 0x64).portr("DSW0"); // DSW
map(0x67, 0x67).portr("DSW1"); // DSW
map(0x70, 0x71).w("ym2413", FUNC(ym2413_device::write)); //
-// AM_RANGE( 0x80, 0x80 ) AM_WRITENOP // IRQ ack?
+// map(0x80, 0x80).nopw(); // IRQ ack?
}
@@ -847,7 +847,7 @@ void dynax_state::nanajign_io_map(address_map &map)
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(0x20, 0x21).nopw(); // CRT Controller
map(0x31, 0x37).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_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));
@@ -890,7 +890,7 @@ WRITE8_MEMBER(dynax_state::jantouki_rombank_w)
void dynax_state::jantouki_io_map(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE( 0x40, 0x41 ) AM_WRITENOP // CRT Controller
+// map(0x40, 0x41).nopw(); // CRT Controller
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(FUNC(dynax_state::jantouki_soundlatch_ack_r)); // Soundlatch status
@@ -968,13 +968,13 @@ void dynax_state::mjelctrn_io_map(address_map &map)
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(0x20, 0x20).nopw(); // CRT Controller
+// map(0x21, 0x21).nopw(); // CRT Controller
map(0x40, 0x47).w("outlatch", FUNC(ls259_device::write_d0));
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(0x64, 0x64).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X
+// map(0x66, 0x66).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(0x80, 0x80).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
map(0x81, 0x81).portr("COINS"); // Coins
@@ -1006,8 +1006,8 @@ void dynax_state::mjembase_io_map(address_map &map)
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(0x40, 0x40).nopw(); // CRT Controller
+// map(0x41, 0x41).nopw(); // CRT Controller
map(0x61, 0x67).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x80, 0x87).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa0, 0xa0).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select
@@ -1320,8 +1320,8 @@ void dynax_state::gekisha_banked_map(address_map &map)
map(0x10010, 0x10017).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0x10020, 0x10021).w(FUNC(dynax_state::gekisha_hopper_w));
map(0x10041, 0x10047).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
-// AM_RANGE( 0x10050, 0x10050 ) AM_WRITENOP // CRT Controller
-// AM_RANGE( 0x10051, 0x10051 ) AM_WRITENOP // CRT Controller
+// map(0x10050, 0x10050).nopw(); // CRT Controller
+// map(0x10051, 0x10051).nopw(); // CRT Controller
map(0x10060, 0x10060).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
map(0x10061, 0x10061).portr("COINS"); // Coins
map(0x10062, 0x10062).r(FUNC(dynax_state::gekisha_keyboard_1_r)); // P2
@@ -1356,13 +1356,13 @@ void dynax_state::cdracula_io_map(address_map &map)
map(0x01, 0x07).w(m_blitter, FUNC(cdracula_blitter_device::regs_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
-// AM_RANGE( 0x13, 0x13 ) AM_WRITENOP // CRT Controller
+// map(0x12, 0x12).nopw(); // CRT Controller
+// map(0x13, 0x13).nopw(); // CRT Controller
map(0x20, 0x20).portr("P1"); // P1
map(0x21, 0x21).portr("P2"); // P2
map(0x22, 0x22).portr("COINS"); // Coins
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(0x31, 0x31).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select
map(0x32, 0x32).w(m_blitter, FUNC(cdracula_blitter_device::pen_w)); // Destination Pen
map(0x33, 0x33).w(m_blitter, FUNC(cdracula_blitter_device::flags_w)); // Flags + Do Blit
map(0x34, 0x34).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits)
diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp
index c2b47e8c307..9befe291f09 100644
--- a/src/mame/drivers/ec184x.cpp
+++ b/src/mame/drivers/ec184x.cpp
@@ -229,7 +229,7 @@ void ec184x_state::ec1847_io(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x00ff).m("mb", FUNC(ibm5160_mb_device::map));
-// AM_RANGE(0x0210, 0x021f) AM_RAM // internal (non-standard?) bus extender
+// map(0x0210, 0x021f).ram(); // internal (non-standard?) bus extender
}
diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp
index 462c370f26f..866b7e507f6 100644
--- a/src/mame/drivers/ecoinf2.cpp
+++ b/src/mame/drivers/ecoinf2.cpp
@@ -245,10 +245,10 @@ void ecoinf2_state::oxo_portmap(address_map &map)
map(0x48, 0x4b).rw("ic22_inpt", FUNC(i8255_device::read), FUNC(i8255_device::write)); //*
map(0x4c, 0x4f).rw("ic23_reel", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x50, 0x53).rw("ic13_leds", FUNC(i8255_device::read), FUNC(i8255_device::write)); //*
-// AM_RANGE(0x54, 0x57) AM_DEVREADWRITE("ic25_dips", i8255_device, read, write) // is this an 8255, or a mirrored byte read?
+// map(0x54, 0x57).rw("ic25_dips", FUNC(i8255_device::read), FUNC(i8255_device::write)); // is this an 8255, or a mirrored byte read?
-// AM_RANGE(0x5c, 0x5c) AM_WRITE(ox_port5c_out_w)
+// map(0x5c, 0x5c).w(FUNC(ecoinf2_state::ox_port5c_out_w));
}
diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp
index 51081e9667f..f15158b1563 100644
--- a/src/mame/drivers/ecoinfr.cpp
+++ b/src/mame/drivers/ecoinfr.cpp
@@ -502,7 +502,7 @@ void ecoinfr_state::portmap(address_map &map)
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(0x0e, 0x0e).w(FUNC(ecoinfr_state::ec_port0e_out_w));
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
diff --git a/src/mame/drivers/elan_eu3a05.cpp b/src/mame/drivers/elan_eu3a05.cpp
index 8cd87632152..953b77f9402 100644
--- a/src/mame/drivers/elan_eu3a05.cpp
+++ b/src/mame/drivers/elan_eu3a05.cpp
@@ -960,8 +960,7 @@ void radica_eu3a05_state::radicasi_map(address_map &map)
map(0x50a9, 0x50a9).rw(FUNC(radica_eu3a05_state::radicasi_50a9_r), FUNC(radica_eu3a05_state::radicasi_50a9_w));
- //AM_RANGE(0x5000, 0x50ff) AM_RAM
-
+ //map(0x5000, 0x50ff).ram();
map(0x6000, 0xdfff).m(m_bank, FUNC(address_map_bank_device::amap8));
map(0xe000, 0xffff).rom().region("maincpu", 0x3f8000);
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index 0e4fa76c27e..c1f6b97bd3a 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -391,7 +391,7 @@ void ep64_state::ep64_io(address_map &map)
void ep64_state::dave_64k_mem(address_map &map)
{
map(0x000000, 0x007fff).rom().region(Z80_TAG, 0);
- //AM_RANGE(0x010000, 0x01ffff) // mapped by the cartslot
+ //map(0x010000, 0x01ffff) // mapped by the cartslot
map(0x3f0000, 0x3fffff).m(m_nick, FUNC(nick_device::vram_map));
}
diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp
index 9fe13a92230..612a9831165 100644
--- a/src/mame/drivers/eprom.cpp
+++ b/src/mame/drivers/eprom.cpp
@@ -178,7 +178,7 @@ void eprom_state::guts_map(address_map &map)
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(FUNC(eprom_state::video_int_ack_w));
-// AM_RANGE(0x360010, 0x360011) AM_WRITE(eprom_latch_w)
+// map(0x360010, 0x360011).w(FUNC(eprom_state::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));
map(0x3e0000, 0x3e0fff).ram().share("paletteram");
diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp
index a4dcc042ae1..92f78e9340b 100644
--- a/src/mame/drivers/eurocom2.cpp
+++ b/src/mame/drivers/eurocom2.cpp
@@ -350,7 +350,7 @@ void waveterm_state::waveterm_map(address_map &map)
map(0xfd08, 0xfd0f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));
map(0xfd10, 0xfd17).unmaprw();
map(0xfd18, 0xfd18).r(FUNC(waveterm_state::waveterm_adc)); // AD558 ADC
-// AM_RANGE(0xfd20, 0xfd20) AM_READ(waveterm_dac) // ZN432 DAC ??
+// map(0xfd20, 0xfd20).r(FUNC(waveterm_state::waveterm_dac)); // ZN432 DAC ??
}
static INPUT_PORTS_START(eurocom2)
diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp
index 18abb29a2a3..58b30641f3b 100644
--- a/src/mame/drivers/exp85.cpp
+++ b/src/mame/drivers/exp85.cpp
@@ -54,7 +54,7 @@ void exp85_state::exp85_io(address_map &map)
map.global_mask(0xff);
map(0xf0, 0xf3).rw(I8355_TAG, FUNC(i8355_device::io_r), FUNC(i8355_device::io_w));
map(0xf8, 0xfd).rw(I8155_TAG, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w));
-// AM_RANGE(0xfe, 0xff) AM_DEVREADWRITE(I8279_TAG, i8279_r, i8279_w)
+// map(0xfe, 0xff).rw(I8279_TAG, FUNC(i8279_device::read), FUNC(i8279_device::write));
}
/* Input Ports */
diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp
index 08498e86355..efec37848dc 100644
--- a/src/mame/drivers/exterm.cpp
+++ b/src/mame/drivers/exterm.cpp
@@ -277,7 +277,7 @@ void exterm_state::sound_master_map(address_map &map)
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(FUNC(exterm_state::sound_nmi_to_slave_r));
-/* AM_RANGE(0x7800, 0x7fff) unknown - to S4-13 */
+// map(0x7800, 0x7fff) unknown - to S4-13
map(0x8000, 0xffff).rom();
map(0xa000, 0xbfff).w(FUNC(exterm_state::sound_control_w));
}
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index 025d9027b1a..87902cc0505 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -219,7 +219,7 @@ void fastfred_state::jumpcoas_map(address_map &map)
map(0xe802, 0xe802).portr("BUTTONS");
map(0xe803, 0xe803).portr("JOYS");
map(0xf000, 0xf007).mirror(0x07f8).w(m_outlatch, FUNC(ls259_device::write_d0));
- //AM_RANGE(0xf800, 0xf800) AM_DEVREAD("watchdog", watchdog_timer_device, reset_r) // Why doesn't this work???
+ //map(0xf800, 0xf800).r("watchdog", FUNC(watchdog_timer_device::reset_r)); // Why doesn't this work???
map(0xf800, 0xf801).nopr().w("ay8910.1", FUNC(ay8910_device::address_data_w));
}
diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp
index a0c4ce5096a..be476450b7a 100644
--- a/src/mame/drivers/fastinvaders.cpp
+++ b/src/mame/drivers/fastinvaders.cpp
@@ -499,7 +499,7 @@ WRITE8_MEMBER(fastinvaders_state::memory_write_byte)
void fastinvaders_state::fastinvaders_map(address_map &map)
{
- //AM_RANGE(0x0000, 0x1fff) AM_ROM AM_MIRROR(0x8000)
+ //map(0x0000, 0x1fff).rom(); .mirror(0x8000);
map(0x0000, 0x27ff).rom().mirror(0x8000);
map(0x2800, 0x2fff).ram().mirror(0x8000).share("videoram");
map(0x3000, 0x33ff).ram().mirror(0x8000);
@@ -518,7 +518,7 @@ void fastinvaders_state::fastinvaders_6845_io(address_map &map)
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(FUNC(fastinvaders_state::io_40_w)); //ds4 //latch
- //AM_RANGE(0x50, 0x50) AM_READ(io_50_r) //ds5 //latch
+ //map(0x50, 0x50).r(FUNC(fastinvaders_state::io_50_r));//ds5 //latch
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 ?????
@@ -539,11 +539,11 @@ 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(FUNC(fastinvaders_state::io_40_w)); //ds4 //latch
- //AM_RANGE(0x50, 0x50) AM_READ(io_50_r) //ds5 //latch
+ //map(0x50, 0x50).r(FUNC(fastinvaders_state::io_50_r));//latch
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(0x80, 0x80).w(FUNC(fastinvaders_state::io_80_w));//ds8 ????
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
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index 93a6a63be50..4630e1645a3 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -124,7 +124,7 @@ void fc100_state::fc100_mem(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x5fff).rom().region("roms", 0);
- //AM_RANGE(0x6000, 0x6fff) // mapped by the cartslot
+ //map(0x6000, 0x6fff) // mapped by the cartslot
map(0x7800, 0x7fff).bankr("bankr").bankw("bankw"); // Banked RAM/ROM
map(0x8000, 0xbfff).ram(); // expansion ram pack - if omitted you get a 'Pages?' prompt at boot
map(0xc000, 0xffff).ram().share("videoram");
@@ -135,7 +135,7 @@ void fc100_state::fc100_io(address_map &map)
map.unmap_value_high();
map.global_mask(0xff);
map(0x00, 0x0F).r(FUNC(fc100_state::port00_r));
- // AM_RANGE(0x10, 0x10) AM_WRITE(port10_w) // vdg, unknown effects
+ // map(0x10, 0x10).w(FUNC(fc100_state::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));
diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp
index f99b8e9421d..b7f2197872e 100644
--- a/src/mame/drivers/fccpu30.cpp
+++ b/src/mame/drivers/fccpu30.cpp
@@ -335,24 +335,24 @@ void cpu30_state::cpu30_mem(address_map &map)
map.unmap_value_high();
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(0x00000008, 0x003fffff).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));
map(0xff800e00, 0xff800fff).rw(m_pit2, FUNC(pit68230_device::read), FUNC(pit68230_device::write));
map(0xff802000, 0xff8021ff).rw(m_dusccterm, FUNC(duscc68562_device::read), FUNC(duscc68562_device::write)); /* Port 1&2 - Dual serial port DUSCC */
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("scsi", FUNC(mb87033_device::read), FUNC(mb87033_device::write)); /* TODO: implement MB87344 SCSI 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("fdc", FUNC(wd37c65c_device::read), FUNC(wd37c65c_device::write)); /* TODO: implement WD3/C65C fdc controller */
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);
- //AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */
- //AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */
+ //map(0x100000, 0xfeffff).rw(FUNC(cpu30_state::vme_a24_r), FUNC(cpu30_state::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) - not verified */
+ //map(0xff0000, 0xffffff).rw(FUNC(cpu30_state::vme_a16_r), FUNC(cpu30_state::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) - not verified */
}
/* Input ports */
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index 7578184f269..96c973de10f 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -745,10 +745,10 @@ void cps_state::knightsb_map(address_map &map)
map(0x800004, 0x800005).nopw(); // writes 0000 here
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(0x800030, 0x800037).nopw(); //.w(FUNC(cps_state::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(0x800180, 0x800181).nopw(); //.w(FUNC(cps_state::cps1_soundlatch2_w)); /* Sound timer fade */
map(0x880000, 0x880001).nopw(); // unknown
map(0x900000, 0x93ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram");
map(0x980000, 0x98002f).w(FUNC(cps_state::knightsb_layer_w));
@@ -850,7 +850,7 @@ void cps_state::sf2mdt_map(address_map &map)
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(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(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram");
@@ -866,7 +866,7 @@ void cps_state::sf2b_map(address_map &map)
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(0x800030, 0x800031).w(FUNC(cps_state::cps1_coinctrl_w));
map(0x800100, 0x80013f).ram().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(0x900000, 0x92ffff).ram().w(FUNC(cps_state::cps1_gfxram_w)).share("gfxram");
@@ -910,13 +910,13 @@ void cps_state::wofabl_map(address_map &map)
void cps_state::slampic_map(address_map &map)
{
map(0x000000, 0x3fffff).rom();
- map(0x800006, 0x800007).nopw(); //AM_WRITE(cps1_soundlatch2_w)
+ map(0x800006, 0x800007).nopw(); //.w(FUNC(cps_state::cps1_soundlatch2_w));
map(0x800000, 0x800007).portr("IN1"); /* Player input ports */
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(0x880000, 0x880001).nopw(); //.w(FUNC(cps_state::cps1_soundlatch_w)); /* Sound command */
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 */
diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp
index e74e7820788..a570be10869 100644
--- a/src/mame/drivers/feversoc.cpp
+++ b/src/mame/drivers/feversoc.cpp
@@ -209,7 +209,7 @@ void feversoc_state::feversoc_map(address_map &map)
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(0x06010000, 0x0601007f).rw("obj", FUNC(seibu_encrypted_sprite_device::read), FUNC(seibu_encrypted_sprite_device::write));
map(0x06010060, 0x06010063).nopw(); // sprite buffering
map(0x06018000, 0x06019fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette");
}
diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp
index 7ad2e0eae59..0e94cf52187 100644
--- a/src/mame/drivers/finalizr.cpp
+++ b/src/mame/drivers/finalizr.cpp
@@ -108,7 +108,7 @@ void finalizr_state::main_map(address_map &map)
map(0x0001, 0x0001).writeonly().share("scroll");
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(0x0020, 0x003f).writeonly().share("scroll");
map(0x0800, 0x0800).portr("DSW3");
map(0x0808, 0x0808).portr("DSW2");
map(0x0810, 0x0810).portr("SYSTEM");
diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp
index c89e2725519..0566ca682ec 100644
--- a/src/mame/drivers/fitfight.cpp
+++ b/src/mame/drivers/fitfight.cpp
@@ -152,7 +152,7 @@ void fitfight_state::fitfight_main_map(address_map &map)
// @0x000036bc/?: 0xF0FD when inserting coin
// @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).r(FUNC(fitfight_state::xxxx)); /* see init */
map(0x700000, 0x700001).w(FUNC(fitfight_state::fitfight_700000_w)).share("fof_700000");
// kept at 0xe07900/0xe04c56
diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp
index 1f885f91c68..aaef422b2b8 100644
--- a/src/mame/drivers/flstory.cpp
+++ b/src/mame/drivers/flstory.cpp
@@ -70,7 +70,7 @@ void flstory_state::flstory_map(address_map &map)
map(0xd000, 0xd000).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w));
map(0xd805, 0xd805).r(FUNC(flstory_state::flstory_mcu_status_r));
-// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
+// map(0xda00, 0xda00).writeonly();
map(0xdcc0, 0xdcff).ram(); /* unknown */
map(0xdf03, 0xdf03).w(FUNC(flstory_state::flstory_gfxctrl_w));
}
@@ -78,9 +78,9 @@ void flstory_state::flstory_map(address_map &map)
void flstory_state::onna34ro_map(address_map &map)
{
base_map(map);
-// AM_RANGE(0xd000, 0xd000) AM_DEVREADWRITE("bmcu", taito68705_mcu_device, data_r, data_w)
-// AM_RANGE(0xd805, 0xd805) AM_READ(flstory_mcu_status_r)
-// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
+// map(0xd000, 0xd000).rw("bmcu", FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w));
+// map(0xd805, 0xd805).r(FUNC(flstory_state::flstory_mcu_status_r));
+// map(0xda00, 0xda00).writeonly();
map(0xdcc0, 0xdcff).ram(); /* unknown */
map(0xdf03, 0xdf03).w(FUNC(flstory_state::flstory_gfxctrl_w));
}
@@ -106,7 +106,7 @@ void flstory_state::victnine_map(address_map &map)
map(0xd805, 0xd805).portr("EXTRA_P1"); /* also mcu */
map(0xd807, 0xd807).portr("EXTRA_P2");
-// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
+// map(0xda00, 0xda00).writeonly();
map(0xdce0, 0xdce0).rw(FUNC(flstory_state::victnine_gfxctrl_r), FUNC(flstory_state::victnine_gfxctrl_w));
map(0xdce1, 0xdce1).nopw(); /* unknown */
}
@@ -118,9 +118,9 @@ void flstory_state::rumba_map(address_map &map)
map(0xd805, 0xd805).r(FUNC(flstory_state::flstory_mcu_status_r));
map(0xd807, 0xd807).portr("EXTRA_P2");
-// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
+// map(0xda00, 0xda00).writeonly();
map(0xdce0, 0xdce0).rw(FUNC(flstory_state::victnine_gfxctrl_r), FUNC(flstory_state::victnine_gfxctrl_w));
-// AM_RANGE(0xdce1, 0xdce1) AM_WRITENOP /* unknown */
+// map(0xdce1, 0xdce1).nopw(); /* unknown */
}
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index dc6b256e815..9c44273965a 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -1555,7 +1555,7 @@ void fm7_state::fm11_sub_mem(address_map &map)
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(0xafe4, 0xafe4).rw(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
@@ -1599,15 +1599,15 @@ void fm7_state::fm16_io(address_map &map)
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(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));
-// AM_RANGE(0xfd10,0xfd17) AM_READ8(fm7_unknown_r,0xffff)
+// 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));
-// AM_RANGE(0xfd24,0xfd36) AM_READ8(fm7_unknown_r,0xffff)
+// 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));
-// AM_RANGE(0xfd40,0xfdff) AM_READ8(fm7_unknown_r,0xffff)
+// map(0xfd40, 0xfdff).r(FUNC(fm7_state::fm7_unknown_r));
}
void fm7_state::fm16_sub_mem(address_map &map)
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index 5b57ecc183a..5abecfac4ef 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -2235,7 +2235,7 @@ void towns_state::ux_mem(address_map &map)
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(0x00680000, 0x0087ffff).rom().region("user",0x280000); // EX ROM
map(0x00a00000, 0x00a7ffff).rw(FUNC(towns_state::towns_gfx_high_r), FUNC(towns_state::towns_gfx_high_w)).mirror(0x180000); // VRAM
map(0x00b00000, 0x00b7ffff).rw(FUNC(towns_state::towns_gfx_packed_r), FUNC(towns_state::towns_gfx_packed_w)).mirror(0x80000); // VRAM
map(0x00c00000, 0x00c1ffff).rw(FUNC(towns_state::towns_spriteram_r), FUNC(towns_state::towns_spriteram_w)); // Sprite RAM
@@ -2299,7 +2299,7 @@ void towns_state::towns_io(address_map &map)
// CMOS
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)
+ //map(0x41fc,0x41ff).r(FUNC(towns_state::towns_41ff_r)).umask32(0xff000000);
// CRTC / Video (again)
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));
@@ -2363,7 +2363,7 @@ void towns_state::towns16_io(address_map &map)
// CMOS
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)
+ //map(0x41fc,0x41ff).r(FUNC(towns_state::towns_41ff_r)).umask32(0xff000000);
// CRTC / Video (again)
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));
diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp
index b39eced31f0..1002f3d9eae 100644
--- a/src/mame/drivers/force68k.cpp
+++ b/src/mame/drivers/force68k.cpp
@@ -231,16 +231,16 @@ void force68k_state::force68k_mem(address_map &map)
map.unmap_value_high();
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(0x020000, 0x07ffff).ram(); /* Additional DRAM CPU-1D */
map(0x080000, 0x083fff).rom(); /* System EPROM Area 16Kb DEBUGGER supplied as default on CPU-1B/D */
map(0x084000, 0x09ffff).rom(); /* System EPROM Area 112Kb additional space for System ROM */
-//AM_RANGE (0x0a0000, 0x0bffff) AM_ROM /* User EPROM/SRAM Area, max 128Kb mapped by a cartslot */
+// map(0x0a0000, 0x0bffff).rom(); /* User EPROM/SRAM Area, max 128Kb mapped by a cartslot */
map(0x0c0040, 0x0c0043).rw(m_aciahost, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff);
map(0x0c0080, 0x0c0083).rw(m_aciaterm, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0xff00);
map(0x0c0100, 0x0c0103).rw(m_aciaremt, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff);
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(0x0e0200, 0x0e0380).rw(FUNC(force68k_state::fpu_r), FUNC(force68k_state::fpu_w)); /* optional FPCP 68881 FPU interface */
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) */
}
diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp
index 68a74089f7a..95ba1f28fa6 100644
--- a/src/mame/drivers/forte2.cpp
+++ b/src/mame/drivers/forte2.cpp
@@ -84,8 +84,8 @@ void forte2_state::io_mem(address_map &map)
map(0x98, 0x99).rw("tms9928a", FUNC(tms9928a_device::read), FUNC(tms9928a_device::write));
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.
-// AM_RANGE(0xa9, 0xab) AM_NOP // Since this arcade board doesn't have one, those ports should be unmapped.
+// map(0xa8, 0xa8).ram(); // Ports a8-ab are originally for communicating with the i8255 PPI on MSX.
+// map(0xa9, 0xab).noprw(); // Since this arcade board doesn't have one, those ports should be unmapped.
}
static INPUT_PORTS_START( pesadelo )
diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp
index b523dc3c73c..04166a54623 100644
--- a/src/mame/drivers/fortecar.cpp
+++ b/src/mame/drivers/fortecar.cpp
@@ -558,7 +558,7 @@ void fortecar_state::fortecar_ports(address_map &map)
map(0x40, 0x40).r("aysnd", FUNC(ay8910_device::data_r));
map(0x40, 0x41).w("aysnd", FUNC(ay8910_device::address_data_w));
map(0x60, 0x63).rw("fcppi0", FUNC(i8255_device::read), FUNC(i8255_device::write));//M5L8255AP
-// AM_RANGE(0x80, 0x81) //8251A UART
+// map(0x80, 0x81) //8251A UART
map(0xa0, 0xa0).rw("rtc", FUNC(v3021_device::read), FUNC(v3021_device::write));
map(0xa1, 0xa1).portr("DSW");
}
diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp
index 5ae43e54d2a..383830afd78 100644
--- a/src/mame/drivers/fp1100.cpp
+++ b/src/mame/drivers/fp1100.cpp
@@ -227,7 +227,7 @@ void fp1100_state::main_map(address_map &map)
void fp1100_state::io_map(address_map &map)
{
map.unmap_value_high();
- //AM_RANGE(0x0000, 0xfeff) slot memory area
+ //map(0x0000, 0xfeff) slot memory area
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));
@@ -290,7 +290,7 @@ void fp1100_state::sub_map(address_map &map)
map(0xe001, 0xe001).mirror(0x3fe).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_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(0xec00, 0xefff) "Acknowledge of INT0" is coded in but isn't currently executed
map(0xf000, 0xf3ff).w(FUNC(fp1100_state::colour_control_w));
map(0xf400, 0xff7f).rom().region("sub_ipl", 0x2400);
}
diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp
index df20525425a..0dc19ad686b 100644
--- a/src/mame/drivers/fresh.cpp
+++ b/src/mame/drivers/fresh.cpp
@@ -183,19 +183,18 @@ void fresh_state::fresh_map(address_map &map)
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(0xc70000, 0xc70001).ram();
+// map(0xc70002, 0xc70003).ram();
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(0xc72000, 0xc72001).ram();
+// map(0xc72002, 0xc72003).ram();
+// map(0xc73000, 0xc73001).ram();
+// map(0xc73002, 0xc73003).ram();
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
-
+// map(0xc77000, 0xc77001).ram();
+// map(0xc77002, 0xc77003).ram();
// written together
map(0xc40000, 0xc417ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
@@ -205,12 +204,12 @@ void fresh_state::fresh_map(address_map &map)
map(0xd10001, 0xd10001).w("ymsnd", FUNC(ym2413_device::data_port_w));
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(0xd40000, 0xd40001).portr("IN0"); //.nopw(); // checks for 0x10
+// map(0xd40002, 0xd40003).nopw();
map(0xd70000, 0xd70001).portr("IN1"); // checks for 0x10, dead loop if fail
- map(0xe00000, 0xe00001).portr("DSW0"); //AM_WRITENOP
- map(0xe20000, 0xe20001).portr("DSW1"); //AM_WRITENOP
+ map(0xe00000, 0xe00001).portr("DSW0"); //.nopw();
+ map(0xe20000, 0xe20001).portr("DSW1"); //.nopw();
map(0xe40000, 0xe40001).portr("DSW2");
map(0xe60000, 0xe60001).portr("DSW3");
map(0xe80000, 0xe80001).portr("IN6");
diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp
index 6c546a9aed1..95bd5f603bf 100644
--- a/src/mame/drivers/funkball.cpp
+++ b/src/mame/drivers/funkball.cpp
@@ -327,7 +327,7 @@ void funkball_state::funkball_map(address_map &map)
map(0x000fc000, 0x000fffff).bankr("bios_bank4");
map(0x000e0000, 0x000fffff).w(FUNC(funkball_state::bios_ram_w));
map(0x00100000, 0x07ffffff).ram();
-// AM_RANGE(0x08000000, 0x0fffffff) AM_NOP
+// map(0x08000000, 0x0fffffff).noprw();
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));
@@ -338,7 +338,7 @@ void funkball_state::flashbank_map(address_map &map)
{
map(0x00000000, 0x003fffff).rw("u29", FUNC(intel_28f320j5_device::read), FUNC(intel_28f320j5_device::write)); // needed to boot
map(0x00400000, 0x007fffff).rw("u30", FUNC(intel_28f320j5_device::read), FUNC(intel_28f320j5_device::write)); // i assume it maps directly after
-// AM_RANGE(0x02000000, 0x023fffff) AM_DEVREADWRITE16("u3", intel_28f320j5_device, read, write, 0xffffffff ) // sound program, don't think it matters where we map it, might not even be visible in this space
+// map(0x02000000, 0x023fffff).rw("u3", FUNC(intel_28f320j5_device::read), FUNC(intel_28f320j5_device::write)); // sound program, don't think it matters where we map it, might not even be visible in this space
/* it checks for 64MBit chips at 0x80000000 the way things are set up, they must return an intel Flash ID of 0x15 */
}
@@ -356,7 +356,7 @@ void funkball_state::funkball_io(address_map &map)
map(0x0360, 0x0363).w(FUNC(funkball_state::flash_w));
-// AM_RANGE(0x0320, 0x0323) AM_READ(test_r)
+// map(0x0320, 0x0323).r(FUNC(funkball_state::test_r));
map(0x0360, 0x036f).r(FUNC(funkball_state::in_r)); // inputs
}
diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp
index a446c48c437..3f257652ef3 100644
--- a/src/mame/drivers/gaelco.cpp
+++ b/src/mame/drivers/gaelco.cpp
@@ -109,7 +109,7 @@ void gaelco_state::bigkarnk_map(address_map &map)
map(0x100000, 0x101fff).ram().w(FUNC(gaelco_state::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 */
+// 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 */
map(0x440000, 0x440fff).ram().share("spriteram"); /* Sprite RAM */
map(0x700000, 0x700001).portr("DSW1");
@@ -126,7 +126,7 @@ void gaelco_state::bigkarnk_snd_map(address_map &map)
{
map(0x0000, 0x07ff).ram(); /* RAM */
map(0x0800, 0x0801).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 */
-// AM_RANGE(0x0900, 0x0900) AM_WRITENOP /* enable sound output? */
+// map(0x0900, 0x0900).nopw(); /* enable sound output? */
map(0x0a00, 0x0a01).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); /* YM3812 */
map(0x0b00, 0x0b00).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* Sound latch */
map(0x0c00, 0xffff).rom(); /* ROM */
@@ -138,7 +138,7 @@ void gaelco_state::maniacsq_map(address_map &map)
map(0x100000, 0x101fff).ram().w(FUNC(gaelco_state::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 */
+// 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 */
map(0x440000, 0x440fff).ram().share("spriteram"); /* Sprite RAM */
map(0x700000, 0x700001).portr("DSW2");
@@ -156,7 +156,7 @@ void gaelco_state::squash_map(address_map &map)
map(0x100000, 0x101fff).ram().w(FUNC(gaelco_state::vram_encrypted_w)).share("videoram"); /* Video RAM */
map(0x102000, 0x103fff).ram().w(FUNC(gaelco_state::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(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 */
map(0x440000, 0x440fff).ram().share("spriteram"); /* Sprite RAM */
map(0x700000, 0x700001).portr("DSW2");
@@ -175,7 +175,7 @@ void gaelco_state::thoop_map(address_map &map)
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(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 */
map(0x440000, 0x440fff).ram().share("spriteram"); /* Sprite RAM */
map(0x700000, 0x700001).portr("DSW2");
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( biomtoy )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:4,3")
+ PORT_DIPNAME( 0x30, 0x30, "Lives in Reserve" ) PORT_DIPLOCATION("SW2:4,3") // Test mode doesn't show the value of the lives given, but of the ones after you die the first time
PORT_DIPSETTING( 0x20, "0" )
PORT_DIPSETTING( 0x10, "1" )
PORT_DIPSETTING( 0x30, "2" )
diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index 13974ef8cbb..d1b8397cb1b 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -686,7 +686,7 @@ void gaelco2_state::play2000_map(address_map &map)
map(0x218000, 0x218003).ram(); /* Written to, but unused? */
map(0x218004, 0x218009).ram().w(FUNC(gaelco2_state::vregs_w)).share("vregs"); /* Video Registers */
map(0x21800a, 0x218fff).ram(); /* Written to, but unused? */
- // AM_RANGE(0x843100, 0x84315e) ?
+ // map(0x843100, 0x84315e) ?
map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */
map(0xfe8000, 0xfeffff).ram().share("shareram"); /* Work RAM */
}
diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp
index 2b53ab82554..32a2ac463bd 100644
--- a/src/mame/drivers/gaiden.cpp
+++ b/src/mame/drivers/gaiden.cpp
@@ -946,19 +946,19 @@ void gaiden_state::mastninj_map(address_map &map)
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
+// map(0x078800, 0x079fff).ram();
map(0x07a000, 0x07a001).portr("SYSTEM");
map(0x07a002, 0x07a003).portr("P1_P2");
map(0x07a004, 0x07a005).portr("DSW");
-// AM_RANGE(0x07a104, 0x07a105) AM_WRITE(gaiden_txscrolly_w)
-// AM_RANGE(0x07a10c, 0x07a10d) AM_WRITE(gaiden_txscrollx_w)
+// map(0x07a104, 0x07a105).w(FUNC(gaiden_state::gaiden_txscrolly_w));
+// map(0x07a10c, 0x07a10d).w(FUNC(gaiden_state::gaiden_txscrollx_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(0x07a806, 0x07a807).nopw();
+// map(0x07a808, 0x07a809).w(FUNC(gaiden_state::gaiden_flip_w));
map(0x07a00e, 0x07a00e).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0x07e000, 0x07e000).w(FUNC(gaiden_state::drgnbowl_irq_ack_w));
}
diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp
index 0248d00eb97..36ef19dbc85 100644
--- a/src/mame/drivers/gal3.cpp
+++ b/src/mame/drivers/gal3.cpp
@@ -333,7 +333,7 @@ void gal3_state::cpu_mst_map(address_map &map)
{
map(0x00000000, 0x001fffff).rom();
map(0x20000000, 0x20001fff).ram().share("nvmem"); //NVRAM
-/// AM_RANGE(0x40000000, 0x4000ffff) AM_WRITE() //
+/// map(0x40000000, 0x4000ffff).w(FUNC(gal3_state::)); //
map(0x44000000, 0x44000003).portr("DSW_CPU_mst");
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
@@ -341,21 +341,21 @@ void gal3_state::cpu_mst_map(address_map &map)
map(0x60000000, 0x60007fff).ram().share("share1"); //CRAM
map(0x60010000, 0x60017fff).ram().share("share1"); //Mirror
map(0x80000000, 0x8007ffff).ram(); //512K Local RAM
-/// AM_RANGE(0xc0000000, 0xc000000b) AM_WRITENOP //upload?
+/// map(0xc0000000, 0xc000000b).nopw(); //upload?
map(0xc000000c, 0xc000000f).nopr(); //irq2 ack
-/// AM_RANGE(0xd8000000, 0xd800000f) AM_RAM // protection or 68681?
+/// map(0xd8000000, 0xd800000f).ram(); // protection or 68681?
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)
{
map(0x00000000, 0x0007ffff).rom();
-/// AM_RANGE(0x40000000, 0x4000ffff) AM_WRITE() //
+/// map(0x40000000, 0x4000ffff).w(FUNC(gal3_state::)); //
map(0x44000000, 0x44000003).portr("DSW_CPU_slv");
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()
+/// map(0x50000000, 0x50000003).rw(FUNC(gal3_state::), FUNC(gal3_state::));
+/// map(0x54000000, 0x54000003).rw(FUNC(gal3_state::), FUNC(gal3_state::));
map(0x60000000, 0x60007fff).ram().share("share1");
map(0x60010000, 0x60017fff).ram().share("share1");
map(0x80000000, 0x8007ffff).ram(); //512K Local RAM
@@ -392,7 +392,7 @@ void gal3_state::rs_cpu_map(address_map &map)
map(0x000000, 0x03ffff).rom();
map(0x100000, 0x10ffff).ram(); //64K working RAM
-/// AM_RANGE(0x180000, 0x183fff) AM_RAM //Nvram
+/// map(0x180000, 0x183fff).ram(); //Nvram
map(0x1c0000, 0x1c0001).ram(); //148?
map(0x1c2000, 0x1c2001).ram(); //?
@@ -449,24 +449,24 @@ void gal3_state::rs_cpu_map(address_map &map)
map(0xc00000, 0xc0000f).ram(); //?
map(0xc40000, 0xc43fff).ram(); //8 bit
-/// AM_RANGE(0xc44000, 0xffffff) AM_RAM /////////////
+/// map(0xc44000, 0xffffff).ram(); /////////////
}
void gal3_state::sound_cpu_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
map(0x080000, 0x08ffff).ram();
-/// AM_RANGE(0x0c0000, 0x0cffff) AM_RAM //00, 20, 30, 40, 50
-/// AM_RANGE(0x100000, 0x10000f) AM_RAM
+/// map(0x0c0000, 0x0cffff).ram(); //00, 20, 30, 40, 50
+/// map(0x100000, 0x10000f).ram();
map(0x110000, 0x113fff).ram();
-/// AM_RANGE(0x120000, 0x120003) AM_RAM //2ieme byte
-/// AM_RANGE(0x200000, 0x20017f) AM_RAM //C140
+/// map(0x120000, 0x120003).ram(); //2ieme byte
+/// map(0x200000, 0x20017f).ram(); //C140
map(0x200000, 0x2037ff).rw(m_c140_16a, FUNC(c140_device::c140_r), FUNC(c140_device::c140_w)).umask16(0x00ff); //C140///////////
-/// AM_RANGE(0x201000, 0x20117f) AM_RAM //C140
-/// AM_RANGE(0x202000, 0x20217f) AM_RAM //C140
-/// AM_RANGE(0x203000, 0x20317f) AM_RAM //C140
+/// map(0x201000, 0x20117f).ram(); //C140
+/// map(0x202000, 0x20217f).ram(); //C140
+/// map(0x203000, 0x20317f).ram(); //C140
map(0x204000, 0x2047ff).rw(m_c140_16g, FUNC(c140_device::c140_r), FUNC(c140_device::c140_w)).umask16(0x00ff); //C140
-/// AM_RANGE(0x090000, 0xffffff) AM_RAM
+/// map(0x090000, 0xffffff).ram();
}
void gal3_state::psn_b1_cpu_map(address_map &map)
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index b8cda8fd62b..d4731c61128 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -1570,15 +1570,15 @@ void galaxian_state::galaxian_map_base(address_map &map)
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(0x6004, 0x6007).mirror(0x07f8).w("cust", FUNC(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(0x6800, 0x6807).mirror(0x07f8).w("cust", FUNC(galaxian_sound_device::sound_w));
map(0x7000, 0x7000).mirror(0x07ff).portr("IN2");
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).w("cust", FUNC(galaxian_sound_device::pitch_w));
map(0x7800, 0x7800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r));
}
@@ -1627,15 +1627,15 @@ void galaxian_state::mooncrst_map_base(address_map &map)
map(0xa000, 0xa000).mirror(0x07ff).portr("IN0");
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(0xa004, 0xa007).mirror(0x07f8).w("cust", FUNC(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(0xa800, 0xa807).mirror(0x07f8).w("cust", FUNC(galaxian_sound_device::sound_w));
map(0xb000, 0xb000).mirror(0x07ff).portr("IN2");
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).w("cust", FUNC(galaxian_sound_device::pitch_w));
map(0xb800, 0xb800).mirror(0x07ff).r("watchdog", FUNC(watchdog_timer_device::reset_r));
}
@@ -1712,8 +1712,8 @@ void galaxian_state::fantastc_map(address_map &map)
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(); // ?
-// AM_RANGE(0xb800, 0xb800) AM_WRITENOP // ?
-// AM_RANGE(0xfff8, 0xffff) AM_WRITENOP // timefgtr, sound related?
+// map(0xb800, 0xb800).nopw(); // ?
+// map(0xfff8, 0xffff).nopw(); // timefgtr, sound related?
}
void galaxian_state::zigzag_map(address_map &map)
@@ -1850,10 +1850,9 @@ void galaxian_state::spactrai_map(address_map &map)
map(0x1600, 0x4fff).rom();
// cleared on startup
-// AM_RANGE(0x6000, 0x60ff) AM_RAM
-// AM_RANGE(0x6800, 0x68ff) AM_RAM
-// AM_RANGE(0x7000, 0x70ff) AM_RAM
-
+// map(0x6000, 0x60ff).ram();
+// map(0x6800, 0x68ff).ram();
+// map(0x7000, 0x70ff).ram();
// standard galaxian mapping?
map(0x6004, 0x6007).mirror(0x07f8).w("cust", FUNC(galaxian_sound_device::lfo_freq_w));
map(0x6800, 0x6807).mirror(0x07f8).w("cust", FUNC(galaxian_sound_device::sound_w));
@@ -1905,11 +1904,11 @@ void galaxian_state::anteatergg_map(address_map &map)
map(0x4000, 0x4fff).ram();
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(0x4000, 0x43ff).mirror(0x0400).ram();
map(0x6000, 0x6000).mirror(0x07ff).portr("IN0");
-// AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x07f8) AM_WRITE(start_lamp_w)
-// AM_RANGE(0x6002, 0x6002) AM_MIRROR(0x07f8) AM_WRITE(coin_lock_w)
-// AM_RANGE(0x6003, 0x6003) AM_MIRROR(0x07f8) AM_WRITE(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));
map(0x6800, 0x6800).mirror(0x07ff).portr("IN1");
map(0x7000, 0x7000).mirror(0x07ff).portr("IN2");
map(0x7001, 0x7001).mirror(0x07f8).w(FUNC(galaxian_state::irq_enable_w));
@@ -2165,7 +2164,7 @@ void galaxian_state::fourplay_map(address_map &map)
map(0x7000,0x7000).portr("IN2");
map(0x7800,0x7fff).r("watchdog",FUNC(watchdog_timer_device::reset_r));
map(0x6000,0x6001).w(FUNC(galaxian_state::start_lamp_w));
- map(0x6002,0x6002).nopw(); // AM_WRITE(coin_lock_w)
+ map(0x6002,0x6002).nopw(); // .w(FUNC(galaxian_state::coin_lock_w));
map(0x6003,0x6003).w(FUNC(galaxian_state::coin_count_0_w));
map(0x6004,0x6007).w("cust",FUNC(galaxian_sound_device::lfo_freq_w));
map(0x6800,0x6807).w("cust",FUNC(galaxian_sound_device::sound_w));
diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp
index bdb42e3f42c..933fb5a4374 100644
--- a/src/mame/drivers/galaxold.cpp
+++ b/src/mame/drivers/galaxold.cpp
@@ -303,8 +303,8 @@ void galaxold_state::ckongmc_map(address_map &map)
map(0x9880, 0x98ff).ram();
map(0xa000, 0xa000).portr("IN0");
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(0xa002, 0xa002).w(FUNC(galaxold_state::galaxold_coin_lockout_w)); /* not written */
+// map(0xa003, 0xa003).w(FUNC(galaxold_state::galaxold_coin_counter_w)); /* not written */
map(0xa004, 0xa007).w("cust", FUNC(galaxian_sound_device::lfo_freq_w)); /* GUESS */
map(0xa800, 0xa800).portr("IN1");
map(0xa800, 0xa802).w("cust", FUNC(galaxian_sound_device::background_enable_w)); /* GUESS */
@@ -313,7 +313,7 @@ void galaxold_state::ckongmc_map(address_map &map)
map(0xa806, 0xa807).w("cust", FUNC(galaxian_sound_device::vol_w)); /* GUESS */
map(0xb000, 0xb000).portr("DSW");
map(0xb001, 0xb001).w(FUNC(galaxold_state::galaxold_nmi_enable_w));
- map(0xb004, 0xb004).nopw(); /* AM_WRITE(galaxold_stars_enable_w) */
+ map(0xb004, 0xb004).nopw(); /* .w(FUNC(galaxold_state::galaxold_stars_enable_w)); */
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 */
@@ -422,7 +422,7 @@ void galaxold_state::scrambler_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").w(FUNC(galaxold_state::galaxold_nmi_enable_w));
-// AM_RANGE(0x7001, 0x7001)
+// map(0x7001, 0x7001)
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));
@@ -430,7 +430,7 @@ void galaxold_state::scrambler_map(address_map &map)
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(0x8102, 0x8102).r(FUNC(galaxold_state::scramblb_protection_1_r));
map(0x8202, 0x8202).r(FUNC(galaxold_state::scrambler_protection_2_r));
}
@@ -491,12 +491,12 @@ void galaxold_state::_4in1_map(address_map &map)
map(0x5880, 0x58ff).ram();
map(0x6000, 0x6000).portr("IN0");
map(0x6000, 0x6001).w(FUNC(galaxold_state::galaxold_leds_w));
-// AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxold_coin_lockout_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));
-// AM_RANGE(0x6803, 0x6803) AM_WRITE(galaxian_noise_enable_w) /* not hooked up? */
+// map(0x6803, 0x6803).w(FUNC(galaxold_state::galaxian_noise_enable_w)); /* not hooked up? */
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");
@@ -545,16 +545,16 @@ void galaxold_state::dkongjrm_map(address_map &map)
map(0x98c0, 0x98ff).writeonly().share("spriteram2");
map(0xa000, 0xa0ff).portr("IN0");
map(0xa003, 0xa003).w(FUNC(galaxold_state::galaxold_coin_counter_w));
- //AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w)
+ //map(0xa004, 0xa007).w(FUNC(galaxold_state::galaxian_lfo_freq_w));
map(0xa800, 0xa8ff).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));
- //AM_RANGE(0xa805, 0xa805) AM_WRITE(galaxian)
+ //map(0xa805, 0xa805).w(FUNC(galaxold_state::galaxian));
map(0xa806, 0xa807).w("cust", FUNC(galaxian_sound_device::vol_w));
map(0xb000, 0xb0ff).portr("DSW");
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(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));
@@ -768,8 +768,8 @@ void galaxold_state::racknrol_map(address_map &map)
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(0x1700, 0x1700).mirror(0x6000).r(FUNC(galaxold_state::trvchlng_question_r));
+// map(0x1701, 0x1703).mirror(0x6000).w(FUNC(galaxold_state::trvchlng_question_w));
map(0x1800, 0x1bff).mirror(0x6000).w(FUNC(galaxold_state::galaxold_videoram_w)).share("videoram");
map(0x1c00, 0x1fff).mirror(0x6000).ram();
map(0x2000, 0x2fff).rom();
@@ -780,8 +780,8 @@ void galaxold_state::racknrol_map(address_map &map)
void galaxold_state::racknrol_io(address_map &map)
{
map(0x1d, 0x1d).w("snsnd", FUNC(sn76489a_device::write));
-// AM_RANGE(0x1e, 0x1e) AM_WRITENOP
-// AM_RANGE(0x1f, 0x1f) AM_WRITENOP
+// map(0x1e, 0x1e).nopw();
+// map(0x1f, 0x1f).nopw();
map(0x20, 0x3f).w(FUNC(galaxold_state::racknrol_tiles_bank_w)).share("racknrol_tbank");
}
diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp
index 96c7bd1b3fa..6b58d9247f0 100644
--- a/src/mame/drivers/gambl186.cpp
+++ b/src/mame/drivers/gambl186.cpp
@@ -380,11 +380,11 @@ void gambl186_state::gambl186_io(address_map &map)
map(0x0502, 0x0503).portr("IN1");
map(0x0504, 0x0505).portr("IN2"); // Seems to writes more upd7759 params in MSB...
- //AM_RANGE(0x0500, 0x050f) AM_READ(unk_r)
+ //map(0x0500, 0x050f).r(FUNC(gambl186_state::unk_r));
map(0x0580, 0x0581).portr("DSW1");
map(0x0582, 0x0583).portr("JOY");
map(0x0584, 0x0585).portr("DSW0").nopw(); // Watchdog: bit 8
-// AM_RANGE(0x0600, 0x0603) AM_WRITENOP // lamps
+// map(0x0600, 0x0603).nopw(); // lamps
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/gameking.cpp b/src/mame/drivers/gameking.cpp
index 43ac943b3dd..65b222801b2 100644
--- a/src/mame/drivers/gameking.cpp
+++ b/src/mame/drivers/gameking.cpp
@@ -162,9 +162,9 @@ void gameking_state::gameking_mem(address_map &map)
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
+// map(0x1000, 0x1fff).ram(); // sthero writes to $19xx
-// AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("bank3000")
+// map(0x3000, 0x3fff).bankr("bank3000");
map(0x4000, 0x7fff).bankr("bank4000");
map(0x8000, 0xffaf).bankr("bank8000");
map(0xffb0, 0xffff).bankr("bankboot"); // cpu seems to read from 8000 bank, and for exceptions ignore bank
diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp
index 3b25f8a5094..b659cd265bb 100644
--- a/src/mame/drivers/gamepock.cpp
+++ b/src/mame/drivers/gamepock.cpp
@@ -19,7 +19,7 @@ void gamepock_state::gamepock_mem(address_map &map)
map.unmap_value_high();
map(0x0000, 0x0fff).rom();
map(0x1000, 0x3fff).noprw();
- //AM_RANGE(0x4000,0xbfff) AM_ROM // mapped by the cartslot
+ //map(0x4000,0xbfff).rom(); // mapped by the cartslot
map(0xc000, 0xc7ff).mirror(0x0800).ram();
}
diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp
index 02800959be0..02a31fad0fd 100644
--- a/src/mame/drivers/gamtor.cpp
+++ b/src/mame/drivers/gamtor.cpp
@@ -67,14 +67,14 @@ void gaminator_state::gaminator_map(address_map &map)
map(0x20000000, 0x2003ffff).ram();
/* standard VGA */
- //AM_RANGE(0x40000000, 0x40000fff) AM_RAM // regs
+ //map(0x40000000, 0x40000fff).ram(); // regs
map(0x400003b0, 0x400003bf).rw("vga", FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w));
map(0x400003c0, 0x400003cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w));
map(0x400003d0, 0x400003df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w));
map(0x44000000, 0x4401ffff).rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w)); // VRAM
-// AM_RANGE(0x44000000, 0x44007fff) AM_RAM AM_SHARE("tmapram1") // puts strings here, looks almost like a tilemap, but where are the tiles?
-// AM_RANGE(0x440a0000, 0x440a1fff) AM_RAM AM_SHARE("tmapram2") // beetlem (like above, mirror?)
+// map(0x44000000, 0x44007fff).ram().share("tmapram1"); // puts strings here, looks almost like a tilemap, but where are the tiles?
+// map(0x440a0000, 0x440a1fff).ram().share("tmapram2"); // beetlem (like above, mirror?)
map(0xe0000000, 0xe00001ff).ram(); // nvram?
map(0xf0000000, 0xf00003ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::dev_r), FUNC(mcf5206e_peripheral_device::dev_w)); // technically this can be moved with MBAR
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index 38aa479c683..b575d8737ab 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -298,7 +298,7 @@ void gaplus_base_state::cpu2_map(address_map &map)
{
map(0x0000, 0x07ff).ram().w(FUNC(gaplus_base_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(0x500f, 0x500f).nopw(); /* ??? written 256 times on startup */
map(0x6000, 0x6fff).w(FUNC(gaplus_base_state::irq_2_ctrl_w)); /* IRQ 2 control */
map(0xa000, 0xffff).rom(); /* ROM */
}
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index 68295e016f4..eb8e71d2e7d 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -1250,7 +1250,7 @@ void gba_state::gba_map(address_map &map)
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(0x08000000, 0x0cffffff) // cart ROM + mirrors, mapped here at machine_start if a cart is present
map(0x10000000, 0xffffffff).r(FUNC(gba_state::gba_10000000_r)); // for "Justice League Chronicles" (game bug)
}
diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp
index e9890d6834f..75cd6a9638b 100644
--- a/src/mame/drivers/geniusiq.cpp
+++ b/src/mame/drivers/geniusiq.cpp
@@ -429,8 +429,8 @@ void geniusiq_state::geniusiq_mem(address_map &map)
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(FUNC(geniusiq_state::input_r));
- //AM_RANGE(0x600500, 0x60050f) // read during IRQ 5
- //AM_RANGE(0x600600, 0x600605) // sound ??
+ //map(0x600500, 0x60050f) // read during IRQ 5
+ //map(0x600600, 0x600605) // sound ??
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
diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp
index 8133f7f4cd3..5684ee9186d 100644
--- a/src/mame/drivers/gimix.cpp
+++ b/src/mame/drivers/gimix.cpp
@@ -152,9 +152,9 @@ void gimix_state::gimix_banked_mem(address_map &map)
map(0x00000, 0x0dfff).bankrw("lower_ram");
map(0x0e000, 0x0e001).rw(m_acia1, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
map(0x0e004, 0x0e005).rw(m_acia2, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
- //AM_RANGE(0x0e018, 0x0e01b) AM_READWRITE(fdc_r, fdc_w) // FD1797 FDC (PIO)
+ //map(0x0e018, 0x0e01b).rw(FUNC(gimix_state::fdc_r), FUNC(gimix_state::fdc_w)); // FD1797 FDC (PIO)
map(0x0e100, 0x0e1ff).ram();
- //AM_RANGE(0x0e200, 0x0e20f) // 9511A / 9512 Arithmetic Processor
+ //map(0x0e200, 0x0e20f) // 9511A / 9512 Arithmetic Processor
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();
@@ -164,7 +164,7 @@ void gimix_state::gimix_banked_mem(address_map &map)
map(0x0e800, 0x0efff).ram();
map(0x0f000, 0x0f7ff).bankr("rombank2");
map(0x0f800, 0x0ffff).bankr("rombank1");
- //AM_RANGE(0x10000, 0x1ffff) AM_RAM
+ //map(0x10000, 0x1ffff).ram();
}
void gimix_state::gimix_mem(address_map &map)
diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp
index 54d428a691c..4e10db1e31e 100644
--- a/src/mame/drivers/gladiatr.cpp
+++ b/src/mame/drivers/gladiatr.cpp
@@ -637,9 +637,9 @@ void ppking_state::ppking_cpu3_map(address_map &map)
void ppking_state::ppking_cpu1_io(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// 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(0xc004, 0xc004).noprw(); //.w(FUNC(ppking_state::ppking_irq_patch_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(FUNC(ppking_state::ppking_qxcomu_r)).w(FUNC(ppking_state::ppking_qxcomu_w));
diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp
index 1c4b85ea17f..935c82b1529 100644
--- a/src/mame/drivers/glass.cpp
+++ b/src/mame/drivers/glass.cpp
@@ -24,13 +24,13 @@ Todo:
WRITE8_MEMBER(glass_state::shareram_w)
{
- // why isn't there an AM_SOMETHING macro for this?
+ // why isn't there address map functionality for this?
reinterpret_cast<u8 *>(m_shareram.target())[BYTE_XOR_BE(offset)] = data;
}
READ8_MEMBER(glass_state::shareram_r)
{
- // why isn't there an AM_SOMETHING macro for this?
+ // why isn't there address map functionality for this?
return reinterpret_cast<u8 const *>(m_shareram.target())[BYTE_XOR_BE(offset)];
}
diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp
index f379b2bd0fd..8de7f7992e8 100644
--- a/src/mame/drivers/gmaster.cpp
+++ b/src/mame/drivers/gmaster.cpp
@@ -243,7 +243,7 @@ void gmaster_state::gmaster_mem(address_map &map)
{
map(0x0000, 0x3fff).rom();
map(0x4000, 0x7fff).rw(FUNC(gmaster_state::gmaster_io_r), FUNC(gmaster_state::gmaster_io_w));
- //AM_RANGE(0x8000, 0xfeff) // mapped by the cartslot
+ //map(0x8000, 0xfeff) // mapped by the cartslot
}
diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp
index 588c2b10b1c..6be6e18b51e 100644
--- a/src/mame/drivers/go2000.cpp
+++ b/src/mame/drivers/go2000.cpp
@@ -99,9 +99,9 @@ void go2000_state::go2000_map(address_map &map)
map(0xa00000, 0xa00001).portr("INPUTS");
map(0xa00002, 0xa00003).portr("DSW");
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
+// map(0xe00000, 0xe00001).nopw();
+// map(0xe00010, 0xe00011).nopw();
+// map(0xe00020, 0xe00021).nopw();
}
WRITE8_MEMBER(go2000_state::go2000_pcm_1_bankswitch_w)
diff --git a/src/mame/drivers/gokidetor.cpp b/src/mame/drivers/gokidetor.cpp
index a1683cda21c..c691354d873 100644
--- a/src/mame/drivers/gokidetor.cpp
+++ b/src/mame/drivers/gokidetor.cpp
@@ -99,7 +99,7 @@ void gokidetor_state::main_map(address_map &map)
// d101 = ?output
// d1c0 = ?output
map(0xd800, 0xd80f).rw("te7750", FUNC(te7750_device::read), FUNC(te7750_device::write));
- //AM_RANGE(0xda00, 0xda01) AM_DEVWRITE("pwm", m66240_device, write)
+ //map(0xda00, 0xda01).w("pwm", FUNC(m66240_device::write));
// de00 ?input
// df00 ?input
map(0xe000, 0xe003).nopr(); // ?input
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index d96510b6985..45008ba5ff6 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -2033,7 +2033,7 @@ void goldnpkr_state::wildcard_map(address_map &map)
void goldnpkr_state::wcrdxtnd_map(address_map &map)
{
- map(0x0000, 0x07ff).ram(); //AM_SHARE("nvram") /* battery backed RAM */
+ map(0x0000, 0x07ff).ram(); //.share("nvram"); /* battery backed RAM */
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, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -2069,7 +2069,7 @@ void goldnpkr_state::wildcrdb_map(address_map &map)
void goldnpkr_state::wildcrdb_mcu_map(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0x3fff)
+// map.global_mask(0x3fff);
map(0x0000, 0x0fff).rom();
map(0x1000, 0x2fff).ram();
}
@@ -4914,7 +4914,7 @@ WRITE8_MEMBER(blitz_state::mcu_portc_w)
void blitz_state::megadpkr_map(address_map &map)
{
- map(0x0000, 0x07ff).ram(); //AM_SHARE("nvram") /* battery backed RAM */
+ map(0x0000, 0x07ff).ram(); //.share("nvram"); /* battery backed RAM */
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, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index 119f8da4a90..db2c9186938 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -1307,7 +1307,7 @@ void unkch_state::megaline_map(address_map &map)
/* Reels stuff are there just as placeholder, and obviously in wrong offset */
map(0x0000, 0x9fff).rom();
- map(0xd000, 0xd7ff).ram(); //AM_SHARE("nvram")
+ map(0xd000, 0xd7ff).ram(); //.share("nvram");
map(0xd840, 0xd87f).ram().share("reel1_scroll");
map(0xd880, 0xd8bf).ram().share("reel2_scroll");
diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp
index bab6011a41d..6facf45265c 100644
--- a/src/mame/drivers/good.cpp
+++ b/src/mame/drivers/good.cpp
@@ -123,7 +123,7 @@ void good_state::good_map(address_map &map)
{
map(0x000000, 0x01ffff).rom();
- //AM_RANGE(0x270000, 0x270007) AM_RAM // scroll?
+ //map(0x270000, 0x270007).ram(); // scroll?
map(0x270001, 0x270001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0x280000, 0x280001).portr("IN0");
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 87f168784c1..36e019f721c 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -757,7 +757,7 @@ void gottlieb_state::reactor_map(address_map &map)
map(0x2000, 0x20ff).mirror(0x0f00).writeonly().share("spriteram"); /* FRSEL */
map(0x3000, 0x33ff).mirror(0x0c00).ram().w(FUNC(gottlieb_state::videoram_w)).share("videoram"); /* BRSEL */
map(0x4000, 0x4fff).ram().w(FUNC(gottlieb_state::charram_w)).share("charram"); /* BOJRSEL1 */
-/* AM_RANGE(0x5000, 0x5fff) AM_WRITE() */ /* BOJRSEL2 */
+// map(0x5000, 0x5fff).w(FUNC(gottlieb_state::)); /* BOJRSEL2 */
map(0x6000, 0x601f).mirror(0x0fe0).w(FUNC(gottlieb_state::palette_w)).share("paletteram"); /* COLSEL */
map(0x7000, 0x7000).mirror(0x0ff8).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x7001, 0x7001).mirror(0x0ff8).w(FUNC(gottlieb_state::analog_reset_w)); /* A1J2 interface */
@@ -786,7 +786,7 @@ void gottlieb_state::gottlieb_map(address_map &map)
map(0x5801, 0x5801).mirror(0x07f8).w(FUNC(gottlieb_state::analog_reset_w)); /* A1J2 interface */
map(0x5802, 0x5802).mirror(0x07f8).w(FUNC(gottlieb_state::sound_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(0x5804, 0x5804).mirror(0x07f8).w(FUNC(gottlieb_state::)); /* OP40-47 */
map(0x5800, 0x5800).mirror(0x07f8).portr("DSW");
map(0x5801, 0x5801).mirror(0x07f8).portr("IN1"); /* IP10-17 */
map(0x5802, 0x5802).mirror(0x07f8).portr("IN2"); /* trackball H */
diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp
index 5bafebbd9d9..adabe9b843f 100644
--- a/src/mame/drivers/gpworld.cpp
+++ b/src/mame/drivers/gpworld.cpp
@@ -332,9 +332,9 @@ void gpworld_state::mainmem(address_map &map)
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(FUNC(gpworld_state::ldp_read), FUNC(gpworld_state::ldp_write));
-/* AM_RANGE(0xd801,0xd801) AM_READ(???) */
+/* map(0xd801, 0xd801).r(FUNC(gpworld_state::???)); */
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(0xda01, 0xda01).w(FUNC(gpworld_state::???)); */ /* These inputs are interesting - there are writes and reads all over these addr's */
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));
diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp
index df1ae8f140a..c30c166ee4f 100644
--- a/src/mame/drivers/gridcomp.cpp
+++ b/src/mame/drivers/gridcomp.cpp
@@ -318,9 +318,9 @@ void gridcomp_state::grid1121_map(address_map &map)
{
map.unmap_value_high();
map(0x90000, 0x97fff).unmaprw(); // ?? ROM slot
- map(0x9ff00, 0x9ff0f).unmaprw(); // AM_READ(grid_9ff0_r) // ?? ROM?
+ map(0x9ff00, 0x9ff0f).unmaprw(); // .r(FUNC(gridcomp_state::grid_9ff0_r)); // ?? ROM?
map(0xc0000, 0xcffff).unmaprw(); // ?? ROM slot -- signature expected: 0x4554, 0x5048
- map(0xdfe00, 0xdfe1f).unmaprw(); // AM_DEVREADWRITE8("uart8274", i8274_new_device, ba_cd_r, ba_cd_w, 0x00ff)
+ map(0xdfe00, 0xdfe1f).unmaprw(); // .rw("uart8274", FUNC(i8274_new_device::ba_cd_r), FUNC(i8274_new_device::ba_cd_w)).umask16(0x00ff);
map(0xdfe40, 0xdfe4f).unmaprw(); // ?? diagnostic 8274
map(0xdfe80, 0xdfe83).rw("i7220", FUNC(i7220_device::read), FUNC(i7220_device::write)).umask16(0x00ff);
map(0xdfea0, 0xdfeaf).unmaprw(); // ??
diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp
index 1dae4760d4d..f26dfcf0071 100644
--- a/src/mame/drivers/gsword.cpp
+++ b/src/mame/drivers/gsword.cpp
@@ -641,7 +641,7 @@ void josvolly_state::josvolly_cpu2_map(address_map &map)
/* NEC D8255A with silkscreen removed and replaced with "AA 007" */
map(0x8000, 0x8003).rw("aa_007", FUNC(i8255_device::read), FUNC(i8255_device::write));
-// map(0x6000, 0x6000) AM_WRITE(adpcm_soundcommand_w)
+// map(0x6000, 0x6000).w(FUNC(josvolly_state::adpcm_soundcommand_w));
map(0xA000, 0xA001).rw("mcu2", FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w));
}
diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp
index 7d150b8e492..82838bfe6c6 100644
--- a/src/mame/drivers/gts80a.cpp
+++ b/src/mame/drivers/gts80a.cpp
@@ -453,13 +453,13 @@ void caveman_state::video_map(address_map &map)
void caveman_state::video_io_map(address_map &map)
{
-// AM_RANGE(0x000, 0x002) AM_READWRITE() // 8259 irq controller
-// AM_RANGE(0x100, 0x102) AM_READWRITE() // HD46505
-// AM_RANGE(0x200, 0x200) AM_READWRITE() // 8212 in, ?? out
-// AM_RANGE(0x300, 0x300) AM_READWRITE() // soundlatch (command?) in, ?? out
+// map(0x000, 0x002).rw(FUNC(caveman_state::), FUNC(caveman_state::)); // 8259 irq controller
+// map(0x100, 0x102).rw(FUNC(caveman_state::), FUNC(caveman_state::)); // HD46505
+// map(0x200, 0x200).rw(FUNC(caveman_state::), FUNC(caveman_state::)); // 8212 in, ?? out
+// map(0x300, 0x300).rw(FUNC(caveman_state::), FUNC(caveman_state::)); // soundlatch (command?) in, ?? out
-// AM_RANGE(0x400, 0x400) AM_READ() // joystick inputs
-// AM_RANGE(0x500, 0x506) AM_WRITE() // palette
+// map(0x400, 0x400).r(FUNC(caveman_state::)); // joystick inputs
+// map(0x500, 0x506).w(FUNC(caveman_state::)); // palette
}
diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp
index 81a8280cf08..3bef3057e15 100644
--- a/src/mame/drivers/gunpey.cpp
+++ b/src/mame/drivers/gunpey.cpp
@@ -1087,8 +1087,8 @@ WRITE16_MEMBER(gunpey_state::vregs_addr_w)
void gunpey_state::mem_map(address_map &map)
{
map(0x00000, 0x0ffff).ram().share("wram");
-// AM_RANGE(0x50000, 0x500ff) AM_RAM
-// AM_RANGE(0x50100, 0x502ff) AM_NOP
+// map(0x50000, 0x500ff).ram();
+// map(0x50100, 0x502ff).noprw();
map(0x80000, 0xfffff).rom();
}
@@ -1106,7 +1106,7 @@ void gunpey_state::io_map(address_map &map)
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(0x7ff0, 0x7ff1).ram();
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/h89.cpp b/src/mame/drivers/h89.cpp
index 4a0f34baab4..43851788c4e 100644
--- a/src/mame/drivers/h89.cpp
+++ b/src/mame/drivers/h89.cpp
@@ -69,25 +69,25 @@ void h89_state::h89_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
-// AM_RANGE(0x78, 0x7b) expansion 1 // Options - Cassette I/O (only uses 0x78 - 0x79) Requires MTR-88 ROM
+// map(0x78, 0x7b) expansion 1 // Options - Cassette I/O (only uses 0x78 - 0x79) Requires MTR-88 ROM
// - H37 5-1/4" Soft-sectored Controller MTR-90 ROM
// - H47 Dual 8" Drives - Requires MTR-89 or MTR-90 ROM
// - H67 8" Hard disk + 8" Floppy Drives - MTR-90 ROM
-// AM_RANGE(0x7c, 0x7f) expansion 2 // Options - 5-1/4" Hard-sectored Controller (works with ALL ROMs)
+// map(0x7c, 0x7f) expansion 2 // Options - 5-1/4" Hard-sectored Controller (works with ALL ROMs)
// - H47 Dual 8" Drives - Requires MTR-89 or MTR-90 ROM
// - H67 8" Hard disk + 8" Floppy Drives - MTR-90 ROM
-// AM_RANGE(0xd0, 0xd7) 8250 UART DCE
-// AM_RANGE(0xd8, 0xdf) 8250 UART DTE - MODEM
-// AM_RANGE(0xe0, 0xe7) 8250 UART DCE - LP
+// map(0xd0, 0xd7) 8250 UART DCE
+// map(0xd8, 0xdf) 8250 UART DTE - MODEM
+// map(0xe0, 0xe7) 8250 UART DCE - LP
map(0xe8, 0xef).rw("ins8250", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w)); // 8250 UART console - this
// connects internally to a Terminal board
// that is also used in the H19. Ideally,
// 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(0xf0, 0xf1) // ports defined on the H8 - on the H89, access to these addresses causes a NMI
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
+// map(0xf3, 0xf3) // ports defined on the H8 - on the H89, access to these addresses causes a NMI
}
/* Input ports */
diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp
index 8703174c3c3..f1e124e5f7f 100644
--- a/src/mame/drivers/hideseek.cpp
+++ b/src/mame/drivers/hideseek.cpp
@@ -78,7 +78,7 @@ void hideseek_state::mem_map(address_map &map)
map(0x01000000, 0x01ffffff).ram(); // DRAM
map(0xffff8000, 0xffff87ff).ram(); // HD64F7045F28 i/os
map(0xfffff000, 0xffffffff).ram(); // on-chip RAM
-// AM_RANGE(0x06000000, 0x07ffffff) AM_ROM AM_REGION("blit_data", 0)
+// map(0x06000000, 0x07ffffff).rom().region("blit_data", 0);
}
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index ccce0c6d0c9..8f3ad22c597 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -423,7 +423,7 @@ void highvdeo_state::nyjoker_io(address_map &map)
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(FUNC(highvdeo_state::nyj_write2_w)); // coin and note counter
-// AM_RANGE(0x0006, 0x0007) AM_WRITENOP
+// map(0x0006, 0x0007).nopw();
map(0x0008, 0x0008).w(m_okim6376, FUNC(okim6376_device::write));
map(0x000a, 0x000b).w(FUNC(highvdeo_state::tv_ncf_oki6376_st_w));
map(0x000c, 0x000d).portr("IN0");
@@ -702,7 +702,7 @@ void highvdeo_state::brasil_io(address_map &map)
map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r));
map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r));
map(0x000e, 0x000e).rw(FUNC(highvdeo_state::read2_nmi_clear_r), FUNC(highvdeo_state::nmi_clear_w));
-// AM_RANGE(0xffa2, 0xffa3) AM_WRITE
+// map(0xffa2, 0xffa3).w(FUNC(highvdeo_state::));
}
WRITE16_MEMBER(highvdeo_state::fashion_output_w)
@@ -734,7 +734,7 @@ void highvdeo_state::grancapi_io(address_map &map)
map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r));
map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r));
map(0x000e, 0x000e).rw(FUNC(highvdeo_state::read2_nmi_clear_r), FUNC(highvdeo_state::nmi_clear_w));
-// AM_RANGE(0xffa2, 0xffa3) AM_WRITE
+// map(0xffa2, 0xffa3).w(FUNC(highvdeo_state::));
}
void highvdeo_state::magicbom_io(address_map &map)
@@ -748,7 +748,7 @@ void highvdeo_state::magicbom_io(address_map &map)
map(0x0008, 0x0009).r(FUNC(highvdeo_state::read0_r));
map(0x000a, 0x000b).r(FUNC(highvdeo_state::read1_r));
map(0x000e, 0x000e).rw(FUNC(highvdeo_state::read2_nmi_clear_r), FUNC(highvdeo_state::nmi_clear_w));
-// AM_RANGE(0xffa2, 0xffa3) AM_WRITE
+// map(0xffa2, 0xffa3).w(FUNC(highvdeo_state::));
}
diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp
index 44c1f424543..eea905dede3 100644
--- a/src/mame/drivers/hitpoker.cpp
+++ b/src/mame/drivers/hitpoker.cpp
@@ -236,7 +236,7 @@ void hitpoker_state::hitpoker_map(address_map &map)
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(0xbe00, 0xbeff).r(FUNC(hitpoker_state::test_r));
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));
}
diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp
index 2f5598f22ae..adcdc349a41 100644
--- a/src/mame/drivers/hk68v10.cpp
+++ b/src/mame/drivers/hk68v10.cpp
@@ -235,8 +235,8 @@ void hk68v10_state::hk68v10_mem(address_map &map)
map(0xfea002, 0xfea002).rw(m_sccterm, FUNC(scc8530_device::cb_r), FUNC(scc8530_device::cb_w)); /* Dual serial port Z80-SCC */
map(0xfea004, 0xfea004).rw(m_sccterm, FUNC(scc8530_device::da_r), FUNC(scc8530_device::da_w)); /* Dual serial port Z80-SCC */
map(0xfea006, 0xfea006).rw(m_sccterm, FUNC(scc8530_device::db_r), FUNC(scc8530_device::db_w)); /* Dual serial port Z80-SCC */
- //AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */
- //AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */
+ //map(0x100000, 0xfeffff).rw(FUNC(hk68v10_state::vme_a24_r), FUNC(hk68v10_state::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) - not verified */
+ //map(0xff0000, 0xffffff).rw(FUNC(hk68v10_state::vme_a16_r), FUNC(hk68v10_state::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) - not verified */
}
/* Input ports */
diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp
index f7b13588a06..407e4ab0d6d 100644
--- a/src/mame/drivers/hotstuff.cpp
+++ b/src/mame/drivers/hotstuff.cpp
@@ -81,7 +81,7 @@ uint32_t hotstuff_state::screen_update_hotstuff(screen_device &screen, bitmap_rg
void hotstuff_state::hotstuff_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
- map(0x080000, 0x0fffff).noprw(); //ROM AM_REGION("data", 0)
+ map(0x080000, 0x0fffff).noprw(); //.rom().region("data", 0);
map(0x400000, 0x40ffff).ram();
diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp
index c10eed0913b..4a38eb77ca8 100644
--- a/src/mame/drivers/hp9k.cpp
+++ b/src/mame/drivers/hp9k.cpp
@@ -319,7 +319,7 @@ void hp9k_state::hp9k_mem(address_map &map)
map(0x530000, 0x53ffff).ram(); // graphic memory
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(0x5f0000, 0x5f3fff).rw(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/ht68k.cpp b/src/mame/drivers/ht68k.cpp
index 116c217215a..d54d0674926 100644
--- a/src/mame/drivers/ht68k.cpp
+++ b/src/mame/drivers/ht68k.cpp
@@ -77,8 +77,8 @@ void ht68k_state::ht68k_mem(address_map &map)
{
map.unmap_value_high();
map(0x00000000, 0x0007ffff).ram().share("p_ram"); // 512 KB RAM / ROM at boot
- //AM_RANGE(0x00080000, 0x000fffff) // Expansion
- //AM_RANGE(0x00d80000, 0x00d8ffff) // Printer
+ //map(0x00080000, 0x000fffff) // Expansion
+ //map(0x00d80000, 0x00d8ffff) // Printer
map(0x00e00000, 0x00e00007).mirror(0xfff8).rw(m_fdc, FUNC(wd1770_device::read), FUNC(wd1770_device::write)).umask16(0x00ff); // FDC WD1770
map(0x00e80000, 0x00e800ff).mirror(0xff00).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff);
map(0x00f00000, 0x00f07fff).rom().mirror(0xf8000).region("user1", 0);
diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp
index 4fb261d8fcd..f15cf98e907 100644
--- a/src/mame/drivers/huebler.cpp
+++ b/src/mame/drivers/huebler.cpp
@@ -112,9 +112,9 @@ void amu880_state::amu880_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
-// 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(0x00, 0x00).mirror(0x03).w(FUNC(amu880_state::power_off_w));
+// map(0x04, 0x04).mirror(0x02).w(FUNC(amu880_state::tone_off_w));
+// map(0x05, 0x05).mirror(0x02).w(FUNC(amu880_state::tone_on_w));
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));
diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp
index c1cc2515239..28990353c76 100644
--- a/src/mame/drivers/hvyunit.cpp
+++ b/src/mame/drivers/hvyunit.cpp
@@ -435,8 +435,8 @@ void hvyunit_state::slave_io(address_map &map)
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)
+// map(0x22, 0x22).r(FUNC(hvyunit_state::hu_scrolly_hi_reset)); //22/a2 taken from ram $f065
+// map(0xa2, 0xa2).r(FUNC(hvyunit_state::hu_scrolly_hi_set));
}
diff --git a/src/mame/drivers/hyhoo.cpp b/src/mame/drivers/hyhoo.cpp
index bff847318eb..83ffa054148 100644
--- a/src/mame/drivers/hyhoo.cpp
+++ b/src/mame/drivers/hyhoo.cpp
@@ -43,7 +43,7 @@ void hyhoo_state::hyhoo_map(address_map &map)
void hyhoo_state::hyhoo_io_map(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0x00, 0x00) AM_DEVWRITE("nb1413m3", nb1413m3_device, nmi_clock_w)
+// map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w));
map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r));
map(0x81, 0x81).r("aysnd", FUNC(ay8910_device::data_r));
map(0x82, 0x83).w("aysnd", FUNC(ay8910_device::data_address_w));
@@ -56,7 +56,7 @@ void hyhoo_state::hyhoo_io_map(address_map &map)
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
+// map(0xf0, 0xf0).nopw();
map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
}
diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp
index 4d1b8d0ed8a..92b83714880 100644
--- a/src/mame/drivers/i7000.cpp
+++ b/src/mame/drivers/i7000.cpp
@@ -255,37 +255,37 @@ void i7000_state::i7000_mem(address_map &map)
map(0x0000, 0x0fff).rom().region("boot", 0);
map(0x2000, 0x2fff).ram().share("videoram");
map(0x4000, 0xffff).ram();
-// AM_RANGE(0x4000, 0xbfff) AM_ROM AM_REGION("cardslot", 0)
+// map(0x4000, 0xbfff).rom().region("cardslot", 0);
}
void i7000_state::i7000_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
-// AM_RANGE(0x06, 0x06) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0x08, 0x09) AM_WRITE(i7000_io_?_w) //printer perhaps?
-// AM_RANGE(0x0c, 0x0c) AM_WRITE(i7000_io_?_w) //0x0C and 0x10 may be related to mem page swapping. (self-test "4. PAG")
-// AM_RANGE(0x10, 0x10) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0x14, 0x15) AM_WRITE(i7000_io_?_w)
+// map(0x06, 0x06).w(FUNC(i7000_state::i7000_io_?_w));
+// map(0x08, 0x09).w(FUNC(i7000_state::i7000_io_?_w)); //printer perhaps?
+// map(0x0c, 0x0c).w(FUNC(i7000_state::i7000_io_?_w)); //0x0C and 0x10 may be related to mem page swapping. (self-test "4. PAG")
+// map(0x10, 0x10).w(FUNC(i7000_state::i7000_io_?_w));
+// map(0x14, 0x15).w(FUNC(i7000_state::i7000_io_?_w));
map(0x18, 0x1b).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
-// AM_RANGE(0x1c, 0x1c) AM_WRITE(i7000_io_printer_data_w) //ASCII data
+// map(0x1c, 0x1c).w(FUNC(i7000_state::i7000_io_printer_data_w)); //ASCII data
map(0x1d, 0x1d).portr("DSW");
-// AM_RANGE(0x1e, 0x1e) AM_READWRITE(i7000_io_printer_status_r, i7000_io_?_w)
-// AM_RANGE(0x1f, 0x1f) AM_WRITE(i7000_io_printer_strobe_w) //self-test routine writes 0x08 and 0x09 (it seems that bit 0 is the strobe and bit 3 is an enable signal)
-// AM_RANGE(0x20, 0x21) AM_READWRITE(i7000_io_keyboard_r, i7000_io_keyboard_w)
+// map(0x1e, 0x1e).rw(FUNC(i7000_state::i7000_io_printer_status_r), FUNC(i7000_state::i7000_io_?_w));
+// map(0x1f, 0x1f).w(FUNC(i7000_state::i7000_io_printer_strobe_w)); //self-test routine writes 0x08 and 0x09 (it seems that bit 0 is the strobe and bit 3 is an enable signal)
+// map(0x20, 0x21).rw(FUNC(i7000_state::i7000_io_keyboard_r), FUNC(i7000_state::i7000_io_keyboard_w));
map(0x20, 0x21).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write));
-// AM_RANGE(0x24, 0x24) AM_READ(i7000_io_?_r)
-// AM_RANGE(0x25, 0x25) AM_WRITE(i7000_io_?_w)
+// map(0x24, 0x24).r(FUNC(i7000_state::i7000_io_?_r));
+// map(0x25, 0x25).w(FUNC(i7000_state::i7000_io_?_w));
-// AM_RANGE(0x28, 0x2d) AM_READWRITE(i7000_io_joystick_r, i7000_io_joystick_w)
+// map(0x28, 0x2d).rw(FUNC(i7000_state::i7000_io_joystick_r), FUNC(i7000_state::i7000_io_joystick_w));
-// AM_RANGE(0x3b, 0x3b) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0x66, 0x67) AM_WRITE(i7000_io_?_w)
-// AM_RANGE(0xbb, 0xbb) AM_WRITE(i7000_io_?_w) //may be related to page-swapping...
+// map(0x3b, 0x3b).w(FUNC(i7000_state::i7000_io_?_w));
+// map(0x66, 0x67).w(FUNC(i7000_state::i7000_io_?_w));
+// map(0xbb, 0xbb).w(FUNC(i7000_state::i7000_io_?_w)); //may be related to page-swapping...
}
DEVICE_IMAGE_LOAD_MEMBER(i7000_state::card_load)
diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp
index fb0406395d3..d3d953e51fa 100644
--- a/src/mame/drivers/ibm3153.cpp
+++ b/src/mame/drivers/ibm3153.cpp
@@ -78,8 +78,8 @@ void ibm3153_state::mem_map(address_map &map)
void ibm3153_state::io_map(address_map &map)
{
map(0x0000, 0xffff).ram();
- //ADDRESS_MAP_UNMAP_HIGH
- //ADDRESS_MAP_GLOBAL_MASK(0xff)
+ //map.unmap_value_high();
+ //map.global_mask(0xff);
}
diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp
index c379af15e76..571c32c3fbc 100644
--- a/src/mame/drivers/icatel.cpp
+++ b/src/mame/drivers/icatel.cpp
@@ -99,7 +99,7 @@ void icatel_state::i80c31_io(address_map &map)
void icatel_state::i80c31_data(address_map &map)
{
-// AM_RANGE(0x0056,0x005A) AM_READ(magic_string) /* This is a hack! */
+// map(0x0056,0x005A).r(FUNC(icatel_state::magic_string)); /* This is a hack! */
}
void icatel_state::init_icatel()
diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp
index 48545ba6916..d12dfeabee7 100644
--- a/src/mame/drivers/if800.cpp
+++ b/src/mame/drivers/if800.cpp
@@ -68,7 +68,7 @@ void if800_state::if800_map(address_map &map)
void if800_state::if800_io(address_map &map)
{
map.unmap_value_high();
-// AM_RANGE(0x0640, 0x065f) dma?
+// map(0x0640, 0x065f) dma?
map(0x0660, 0x0663).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask16(0x00ff);
}
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp
index b48b7d4fa4b..0cd875582a4 100644
--- a/src/mame/drivers/igs017.cpp
+++ b/src/mame/drivers/igs017.cpp
@@ -2292,7 +2292,7 @@ void igs017_state::lhzb2a_map(address_map &map)
map(0x00320a, 0x00320b).r(m_igs_incdec, FUNC(igs_incdec_device::val_r));
map(0x500000, 0x503fff).ram();
-// AM_RANGE(0x910000, 0x910003) accesses appear to be from leftover code where the final checks were disabled
+// map(0x910000, 0x910003) accesses appear to be from leftover code where the final checks were disabled
map(0xb00000, 0xb0ffff).rw(m_igs017_igs031, FUNC(igs017_igs031_device::read), FUNC(igs017_igs031_device::write)).umask16(0x00ff);
diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp
index 238eef986a7..6be206e3c60 100644
--- a/src/mame/drivers/imolagp.cpp
+++ b/src/mame/drivers/imolagp.cpp
@@ -352,7 +352,7 @@ void imolagp_state::imolagp_master_map(address_map &map)
map(0x2800, 0x2803).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
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(0x37f7, 0x37f7).noprw();
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");
diff --git a/src/mame/drivers/instantm.cpp b/src/mame/drivers/instantm.cpp
index c2ebed3ca81..6cb6101263d 100644
--- a/src/mame/drivers/instantm.cpp
+++ b/src/mame/drivers/instantm.cpp
@@ -86,15 +86,15 @@ void instantm_state::main_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x4000, 0x47ff).ram();
- map(0x8000, 0x8000); //AM_WRITE
- map(0xc000, 0xc000); //AM_WRITE
- map(0xc400, 0xc400); //AM_WRITE
- map(0xc800, 0xc800); //AM_WRITE
- map(0xcc00, 0xcc00); //AM_WRITE
- map(0xec00, 0xec00); //AM_READ
- map(0xf000, 0xf000); //AM_READ
- map(0xf400, 0xf400); //AM_READ
- map(0xfc00, 0xfc00); //AM_READ
+ map(0x8000, 0x8000); //.w(FUNC(instantm_state::));
+ map(0xc000, 0xc000); //.w(FUNC(instantm_state::));
+ map(0xc400, 0xc400); //.w(FUNC(instantm_state::));
+ map(0xc800, 0xc800); //.w(FUNC(instantm_state::));
+ map(0xcc00, 0xcc00); //.w(FUNC(instantm_state::));
+ map(0xec00, 0xec00); //.r(FUNC(instantm_state::));
+ map(0xf000, 0xf000); //.r(FUNC(instantm_state::));
+ map(0xf400, 0xf400); //.r(FUNC(instantm_state::));
+ map(0xfc00, 0xfc00); //.r(FUNC(instantm_state::));
}
// doesn't use ram
diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp
index 7254e6b8e81..7fd448941c5 100644
--- a/src/mame/drivers/interact.cpp
+++ b/src/mame/drivers/interact.cpp
@@ -89,10 +89,10 @@ void interact_state::interact_mem(address_map &map)
map.unmap_value_high();
/* Main ROM page*/
map(0x0000, 0x3fff).rom(); /*BANK(2)*/
- /* AM_RANGE(0x1000,0x3fff) AM_RAM*/
+// map(0x1000,0x3fff).ram();
/* Hardware address mapping*/
-/* AM_RANGE(0x0800,0x0808) AM_WRITE(switch_bank_w)// Bank management not udsed in BR machine*/
+// map(0x0800,0x0808).w(FUNC(interact_state::switch_bank_w)); // Bank management not udsed in BR machine*/
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*/
diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp
index d72516c95fb..4d2c2e89b10 100644
--- a/src/mame/drivers/intrscti.cpp
+++ b/src/mame/drivers/intrscti.cpp
@@ -109,13 +109,13 @@ void intrscti_state::intrscti_sub_map(address_map &map)
{
map(0x0000, 0x07ff).rom();
map(0x2000, 0x23ff).ram();
-// AM_RANGE(0x0000, 0xffff) AM_WRITENOP
+// map(0x0000, 0xffff).nopw();
}
void intrscti_state::intrscti_sub_io_map(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0x00, 0xff) AM_NOP
+// map(0x00, 0xff).noprw();
}
diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp
index 90a3ac14a61..a1c8e62edac 100644
--- a/src/mame/drivers/intv.cpp
+++ b/src/mame/drivers/intv.cpp
@@ -361,7 +361,7 @@ void intv_state::intvecs_mem(address_map &map)
{
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(0x00e0, 0x00e3).rw(FUNC(intv_state::intv_ecs_uart_r), FUNC(intv_state::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(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);
diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp
index 8215a410db1..afa9dbebeb7 100644
--- a/src/mame/drivers/inufuku.cpp
+++ b/src/mame/drivers/inufuku.cpp
@@ -115,7 +115,7 @@ void inufuku_state::inufuku_map(address_map &map)
{
map(0x000000, 0x0fffff).rom(); // main rom
-// AM_RANGE(0x100000, 0x100007) AM_WRITENOP // ?
+// map(0x100000, 0x100007).nopw(); // ?
map(0x180000, 0x180001).portr("P1");
map(0x180002, 0x180003).portr("P2");
@@ -137,7 +137,7 @@ void inufuku_state::inufuku_map(address_map &map)
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(0x7e0000, 0x7e0001).nopw(); // ?
map(0x800000, 0xbfffff).rom(); // data rom
map(0xfd0000, 0xfdffff).ram(); // work ram
diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp
index 05deca4a0b2..390f2f55ca7 100644
--- a/src/mame/drivers/isbc.cpp
+++ b/src/mame/drivers/isbc.cpp
@@ -206,7 +206,7 @@ void isbc_state::isbc2861_mem(address_map &map)
map.unmap_value_high();
map(0x00000, 0xdffff).ram();
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(0x100000, 0x1fffff).ram(); // FIXME: XENIX doesn't like this, IRMX is okay with it
map(0xff0000, 0xffffff).rom().region("user1", 0);
}
diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp
index d13e49b7fa4..ccb276ddde9 100644
--- a/src/mame/drivers/isbc8010.cpp
+++ b/src/mame/drivers/isbc8010.cpp
@@ -107,8 +107,8 @@ void isbc8010_state::isbc8010_io(address_map &map)
map(0xe4, 0xe7).rw(m_ppi_0, FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0xe8, 0xeb).rw(m_ppi_1, FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0xec, 0xed).mirror(0x02).rw(m_usart, FUNC(i8251_device::read), FUNC(i8251_device::write));
- //AM_RANGE(0xf0, 0xf7) MCS0 - iSBX Multimodule
- //AM_RANGE(0xf8, 0xff) MCS1 - iSBX Multimodule
+ //map(0xf0, 0xf7) MCS0 - iSBX Multimodule
+ //map(0xf8, 0xff) MCS1 - iSBX Multimodule
}
static INPUT_PORTS_START( isbc8010 )
diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp
index a9d4bd4166d..28078e78466 100644
--- a/src/mame/drivers/istellar.cpp
+++ b/src/mame/drivers/istellar.cpp
@@ -163,16 +163,16 @@ void istellar_state::z80_0_io(address_map &map)
map(0x00, 0x00).portr("IN0");
map(0x02, 0x02).portr("DSW1");
map(0x03, 0x03).portr("DSW2");
- /*AM_RANGE(0x04,0x04) AM_WRITE(volatile_palette_write)*/
+/* map(0x04, 0x04).w(FUNC(istellar_state::volatile_palette_write));*/
map(0x05, 0x05).r("latch1", FUNC(generic_latch_8_device::read)).w("latch2", FUNC(generic_latch_8_device::write));
}
void istellar_state::z80_1_io(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).noprw(); /*AM_READWRITE(z80_1_slatch_read,z80_1_slatch_write)*/
- map(0x01, 0x01).noprw(); /*AM_READWRITE(z80_1_nmienable,z80_1_soundwrite_front)*/
- map(0x02, 0x02).noprw(); /*AM_WRITE(z80_1_soundwrite_rear)*/
+ map(0x00, 0x00).noprw(); /*.rw(FUNC(istellar_state::z80_1_slatch_read), FUNC(istellar_state::z80_1_slatch_write));*/
+ map(0x01, 0x01).noprw(); /*.rw(FUNC(istellar_state::z80_1_nmienable), FUNC(istellar_state::z80_1_soundwrite_front));*/
+ map(0x02, 0x02).noprw(); /*.w(FUNC(istellar_state::z80_1_soundwrite_rear));*/
}
void istellar_state::z80_2_io(address_map &map)
@@ -181,7 +181,7 @@ void istellar_state::z80_2_io(address_map &map)
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)*/
+/* map(0x03, 0x03).w(FUNC(istellar_state::z80_2_ldtrans_write));*/
}
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index e96530bacfd..0e8d9c77dad 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -953,7 +953,7 @@ map(0x000c00, 0x007fff).mirror(0x40000).rw(FUNC(itech32_state::test2_r), FUNC(it
map(0x080000, 0x080003).portr("80000");
map(0x082000, 0x082003).portr("82000");
map(0x084001, 0x084001).rw(FUNC(drivedge_state::sound_return_r), FUNC(drivedge_state::sound_data_w));
-// AM_RANGE(0x086000, 0x08623f) AM_RAM -- networking -- first 0x40 bytes = our data, next 0x40*8 bytes = their data, r/w on IRQ2
+// map(0x086000, 0x08623f).ram(); -- networking -- first 0x40 bytes = our data, next 0x40*8 bytes = their data, r/w on IRQ2
map(0x088000, 0x088001).r(FUNC(drivedge_state::steering_r));
map(0x08a000, 0x08a001).r(FUNC(drivedge_state::gas_r));
map(0x08a000, 0x08a003).nopw();
@@ -969,7 +969,7 @@ map(0x000c00, 0x007fff).mirror(0x40000).rw(FUNC(itech32_state::test2_r), FUNC(it
map(0x200000, 0x200003).portr("200000");
map(0x280000, 0x280fff).ram().w(FUNC(drivedge_state::tms1_68k_ram_w)).share("tms1_ram");
map(0x300000, 0x300fff).ram().w(FUNC(drivedge_state::tms2_68k_ram_w)).share("tms2_ram");
- map(0x380000, 0x380003).nopw(); // AM_DEVWRITE("watchdog", watchdog_timer_device, reset16_w)
+ map(0x380000, 0x380003).nopw(); // .w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0x600000, 0x607fff).rom().region("user1", 0).share("main_rom");
}
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp
index e55e2de77df..35a57d77769 100644
--- a/src/mame/drivers/jangou.cpp
+++ b/src/mame/drivers/jangou.cpp
@@ -422,7 +422,7 @@ void jangou_state::nsc_map(address_map &map)
void jangou_state::cntrygrl_cpu0_map(address_map &map)
{
map(0x0000, 0x3fff).rom();
-// AM_RANGE(0xc000, 0xc7ff) AM_RAM
+// map(0xc000, 0xc7ff).ram();
map(0xe000, 0xefff).ram();
}
@@ -437,7 +437,7 @@ void jangou_state::cntrygrl_cpu0_io(address_map &map)
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
-// AM_RANGE(0x31,0x31) AM_WRITE(sound_latch_w)
+// map(0x31, 0x31).w(FUNC(jangou_state::sound_latch_w));
}
/*************************************
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index fbbfde0d7a2..30019b05df8 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -598,9 +598,9 @@ void jclub2o_state::jclub2o_map(address_map &map)
map(0x490000, 0x490003).w(FUNC(jclub2o_state::eeprom_s29290_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
+// map(0x4a0010, 0x4a0013).w(FUNC(jclub2o_map::));
+// map(0x4a0020, 0x4a0023).w(FUNC(jclub2o_map::));
+// map(0x4a0030, 0x4a0033).w(FUNC(jclub2o_map::));
// ST-0016
map(0x4b0000, 0x4b0003).rw(FUNC(jclub2o_state::cmd1_word_r), FUNC(jclub2o_state::cmd1_word_w));
@@ -619,14 +619,14 @@ void jclub2o_state::jclub2o_map(address_map &map)
map(0x580008, 0x58000b).portr("COIN");
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(0x580018, 0x58001b).w(FUNC(jclub2o_map::));
+// map(0x58001c, 0x58001f).w(FUNC(jclub2o_map::));
map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r));
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
+ map(0x580421, 0x580421).r(FUNC(jclub2o_state::console_status_r)); //.w(FUNC(jclub2o_map::));
+// map(0x580440, 0x580443).w(FUNC(jclub2o_map::));
// ST-0020
map(0x600000, 0x67ffff).rw(m_st0020, FUNC(st0020_device::sprram_r), FUNC(st0020_device::sprram_w));
@@ -678,21 +678,21 @@ void jclub2o_state::st0016_mem(address_map &map)
map(0x0000, 0x7fff).rom();
map(0x8000, 0xbfff).bankr("soundbank");
map(0xe800, 0xe8ff).ram();
- //AM_RANGE(0xe900, 0xe9ff) // sound - internal
- //AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w)
+ //map(0xe900, 0xe9ff) // sound - internal
+ //map(0xec00, 0xec1f).rw(FUNC(jclub2o_state::st0016_character_ram_r), FUNC(jclub2o_state::st0016_character_ram_w));
map(0xf000, 0xffff).ram();
}
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(0x00, 0xbf).rw(FUNC(jclub2o_state::st0016_vregs_r), FUNC(jclub2o_state::st0016_vregs_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)
+ //map(0xf0, 0xf0).r(FUNC(jclub2o_state::st0016_dma_r));
}
@@ -737,14 +737,14 @@ void jclub2_state::jclub2_map(address_map &map)
map(0x580008, 0x58000b).portr("COIN");
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(0x580018, 0x58001b).w(FUNC(jclub2_map::));
+// map(0x58001c, 0x58001f).w(FUNC(jclub2_map::));
map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r));
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
+ map(0x580421, 0x580421).r(FUNC(jclub2_state::console_status_r)); //.w(FUNC(jclub2_map::));
+// map(0x580440, 0x580443).w(FUNC(jclub2_map::));
// ST-0032
map(0x800000, 0x87ffff).rw(m_st0020, FUNC(st0020_device::sprram_r), FUNC(st0020_device::sprram_w));
@@ -818,11 +818,11 @@ void darkhors_state::darkhors_map(address_map &map)
map(0x580004, 0x580007).portr("COIN");
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
+// map(0x580010, 0x580013).w(FUNC(darkhors_state::));
+// map(0x580018, 0x58001b).w(FUNC(darkhors_state::));
+// map(0x58001c, 0x58001f).w(FUNC(darkhors_state::));
map(0x580084, 0x580084).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
-// AM_RANGE(0x58008c, 0x58008f) AM_WRITE
+// map(0x58008c, 0x58008f).w(FUNC(darkhors_state::));
map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r));
map(0x580401, 0x580401).rw(FUNC(darkhors_state::console_r), FUNC(darkhors_state::console_w));
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index 56cb3c75da9..bce2a8014f9 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -195,7 +195,7 @@ void jokrwild_state::jokrwild_map(address_map &map)
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
-// AM_RANGE(0x4010, 0x4010) AM_READNOP /* R ???? */
+// map(0x4010, 0x4010).nopr(); /* R ???? */
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");
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index bbb763fd696..9830771e820 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -458,7 +458,7 @@ void joystand_state::joystand_map(address_map &map)
map(0x200010, 0x200011).portr("IN0"); // 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(0x200016, 0x200017) // write $9190 at boot
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)
@@ -473,7 +473,7 @@ void joystand_state::joystand_map(address_map &map)
map(0x60c00c, 0x60c00d).ram().share("enable"); // write
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(0xe00080, 0xe00081) // write (bit 0 = cart? bit 1 = ? bit 3 = ?)
map(0xe00000, 0xe00001).r(FUNC(joystand_state::e00000_r)); // copy slot
map(0xe00020, 0xe00021).r(FUNC(joystand_state::e00020_r)); // master slot
diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp
index 6db9c4aa5f5..20d3f4e0c84 100644
--- a/src/mame/drivers/jpmimpct.cpp
+++ b/src/mame/drivers/jpmimpct.cpp
@@ -629,22 +629,22 @@ void jpmimpct_state::awp68k_program_map(address_map &map)
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(0x004800b0, 0x004800df).r(FUNC(jpmimpct_state::prot_1_r));
+// map(0x004800e0, 0x004800e1).w(FUNC(jpmimpct_state::unk_w));
+// map(0x00480086, 0x006576ff).r(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)
- //AM_RANGE(0x00657602, 0x00bfffff) AM_READ(prot_1_r)
-// AM_RANGE(0x004801e0, 0x004801ff) AM_READWRITE(duart_2_r, duart_2_w)
-// AM_RANGE(0x00c00000, 0x00cfffff) AM_ROM
-// AM_RANGE(0x00d00000, 0x00dfffff) AM_ROM
-// AM_RANGE(0x00e00000, 0x00efffff) AM_ROM
-// AM_RANGE(0x00f00000, 0x00ffffff) AM_ROM
+// map(0x004801dc, 0x004801dd).r(FUNC(jpmimpct_state::unk_r));
+// map(0x004801de, 0x004801df).r(FUNC(jpmimpct_state::unk_r));
+// map(0x00657602, 0x00bfffff).r(FUNC(jpmimpct_state::prot_1_r));
+// map(0x004801e0, 0x004801ff).rw(FUNC(jpmimpct_state::duart_2_r), FUNC(jpmimpct_state::duart_2_w));
+// map(0x00c00000, 0x00cfffff).rom();
+// map(0x00d00000, 0x00dfffff).rom();
+// map(0x00e00000, 0x00efffff).rom();
+// map(0x00f00000, 0x00ffffff).rom();
}
@@ -659,7 +659,7 @@ void jpmimpct_state::tms_program_map(address_map &map)
map(0x00000000, 0x003fffff).mirror(0xf8000000).ram().share("vram");
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, 0x0100003f).mirror(0xf87fffc0).rw(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();
}
diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp
index 3529dd2c6bb..d85260b2da5 100644
--- a/src/mame/drivers/jpmmps.cpp
+++ b/src/mame/drivers/jpmmps.cpp
@@ -187,13 +187,13 @@ void jpmmps_state::jpmmps_io_map(address_map &map)
map.global_mask(0x1ff);
map(0x0000, 0x003f).rw(UART_IC5, FUNC(tms9902_device::cruread), FUNC(tms9902_device::cruwrite));
-// AM_RANGE(0x0040, 0x0041) // power fail
-// AM_RANGE(0x0042, 0x0043) // wd timeout
-// AM_RANGE(0x0044, 0x0045) // invalid access
-// AM_RANGE(0x0046, 0x0047) // clear down
+// map(0x0040, 0x0041) // power fail
+// map(0x0042, 0x0043) // wd timeout
+// map(0x0044, 0x0045) // invalid access
+// map(0x0046, 0x0047) // clear down
-// AM_RANGE(0x004c, 0x004d) // uart4 int
-// AM_RANGE(0x004e, 0x004f) // uart2 int
+// map(0x004c, 0x004d) // uart4 int
+// map(0x004e, 0x004f) // uart2 int
map(0x0080, 0x00bf).rw(UART_IC10, FUNC(tms9902_device::cruread), FUNC(tms9902_device::cruwrite));
map(0x00c0, 0x00cf).w("mainlatch", FUNC(ls259_device::write_d0));
diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp
index 79092705dd5..daba0d7c8ea 100644
--- a/src/mame/drivers/jpms80.cpp
+++ b/src/mame/drivers/jpms80.cpp
@@ -102,7 +102,7 @@ void jpms80_state::jpms80_map(address_map &map)
void jpms80_state::jpms80_io_map(address_map &map)
{
map.global_mask(0x3ff);
-// AM_RANGE(0x0000, 0x001f) // I/O & Optic (in)
+// map(0x0000, 0x001f) // I/O & Optic (in)
map(0x0000, 0x000f).w("outlatch0", FUNC(ls259_device::write_d0));
map(0x0010, 0x001f).w("outlatch1", FUNC(ls259_device::write_d0));
map(0x0020, 0x002f).w("outlatch2", FUNC(ls259_device::write_d0));
@@ -114,7 +114,7 @@ void jpms80_state::jpms80_io_map(address_map &map)
map(0x0080, 0x008f).w("outlatch8", FUNC(ls259_device::write_d0));
map(0x0090, 0x009f).w("outlatch9", FUNC(ls259_device::write_d0));
map(0x00a0, 0x00af).w("outlatch10", FUNC(ls259_device::write_d0));
-// AM_RANGE(0x0380, 0x03bf) // AY
+// map(0x0380, 0x03bf) // AY
map(0x03c0, 0x03ff).rw(m_acc, FUNC(tms9902_device::cruread), FUNC(tms9902_device::cruwrite));
// Lamps, Meters etc. can move around
}
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index 06726da0312..9b13530130b 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -116,21 +116,21 @@ void jupiter2_state::jupiter2_mem(address_map &map)
map(0x0000, 0x7fff).ram();
map(0xc000, 0xcfff).ram(); // Video RAM
map(0xf000, 0xff00).rom().region(MCM6571AP_TAG, 0);
-// AM_RANGE(0xff58, 0xff5c) Cartridge Disk Controller PIA
-// AM_RANGE(0xff60, 0xff76) DMA Controller
-// AM_RANGE(0xff80, 0xff83) Floppy PIA
+// map(0xff58, 0xff5c) Cartridge Disk Controller PIA
+// map(0xff60, 0xff76) DMA Controller
+// map(0xff80, 0xff83) Floppy PIA
map(0xff84, 0xff87).rw(INS1771N1_TAG, FUNC(wd_fdc_device_base::read), FUNC(wd_fdc_device_base::write));
-// AM_RANGE(0xff90, 0xff93) Hytype Parallel Printer PIA
-// AM_RANGE(0xffa0, 0xffa7) Persci Floppy Disk Controller
-// AM_RANGE(0xffb0, 0xffb3) Video PIA
+// map(0xff90, 0xff93) Hytype Parallel Printer PIA
+// map(0xffa0, 0xffa7) Persci Floppy Disk Controller
+// map(0xffb0, 0xffb3) Video PIA
map(0xffc0, 0xffc1).rw(m_acia0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Serial Port 0 ACIA
map(0xffc4, 0xffc5).rw(m_acia1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // Serial Port 1 ACIA
-// AM_RANGE(0xffc8, 0xffc9) Serial Port 2 ACIA
-// AM_RANGE(0xffcc, 0xffcd) Serial Port 3 ACIA
-// AM_RANGE(0xffd0, 0xffd1) Serial Port 4 ACIA / Cassette
-// AM_RANGE(0xffd4, 0xffd5) Serial Port 5 ACIA / EPROM Programmer (2704/2708)
-// AM_RANGE(0xffd8, 0xffd9) Serial Port 6 ACIA / Hardware Breakpoint Registers
-// AM_RANGE(0xffdc, 0xffdd) Serial Port 7 ACIA
+// map(0xffc8, 0xffc9) Serial Port 2 ACIA
+// map(0xffcc, 0xffcd) Serial Port 3 ACIA
+// map(0xffd0, 0xffd1) Serial Port 4 ACIA / Cassette
+// map(0xffd4, 0xffd5) Serial Port 5 ACIA / EPROM Programmer (2704/2708)
+// map(0xffd8, 0xffd9) Serial Port 6 ACIA / Hardware Breakpoint Registers
+// map(0xffdc, 0xffdd) Serial Port 7 ACIA
map(0xfff8, 0xffff).rom().region(MCM6571AP_TAG, 0x0ff8); // vectors
}
diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp
index e481f15d7c5..616fcc8cac7 100644
--- a/src/mame/drivers/jvh.cpp
+++ b/src/mame/drivers/jvh.cpp
@@ -75,31 +75,31 @@ void jvh_state::escape_io(address_map &map)
void jvh_state::movmastr_io(address_map &map)
{
- //AM_RANGE(0x01, 0x02) AM_READ(sw1_r)
- //AM_RANGE(0x03, 0x05) AM_READ(dip_r)
- //AM_RANGE(0x08, 0x09) AM_READ(sw6_r)
- //AM_RANGE(0x00, 0x07) AM_WRITE(out0a2_w)
- //AM_RANGE(0x08, 0x0f) AM_WRITE(out0b2_w)
- //AM_RANGE(0x10, 0x17) AM_WRITE(out1a2_w)
- //AM_RANGE(0x18, 0x1f) AM_WRITE(out1b2_w)
- //AM_RANGE(0x20, 0x27) AM_WRITE(out2a2_w)
- //AM_RANGE(0x28, 0x2f) AM_WRITE(out2b2_w)
- //AM_RANGE(0x30, 0x30) AM_WRITE(out3a2_w)
- //AM_RANGE(0x31, 0x36) AM_WRITE(snd_w)
- //AM_RANGE(0x37, 0x37) AM_WRITE(latch_w)
- //AM_RANGE(0x3e, 0x3e) AM_WRITE(irq_enable)
- //AM_RANGE(0x3f, 0x3f) AM_WRITE(zc_enable)
- //AM_RANGE(0x40, 0x47) AM_WRITE(out4a2_w)
- //AM_RANGE(0x48, 0x4a) AM_WRITE(out4b2_w)
- //AM_RANGE(0x4b, 0x4b) AM_WRITE(enable_w)
- //AM_RANGE(0x4c, 0x4f) AM_WRITE(out4c2_w)
- //AM_RANGE(0x50, 0x55) AM_WRITE(col_w)
- //AM_RANGE(0x57, 0x5a) AM_WRITE(bcd_w)
- //AM_RANGE(0x5b, 0x5f) AM_WRITE(panel_w)
- //AM_RANGE(0x60, 0x67) AM_WRITE(digit_w)
- //AM_RANGE(0x68, 0x6f) AM_WRITE(out6b2_w)
- //AM_RANGE(0x70, 0x74) AM_WRITE(out7a2_w)
- //AM_RANGE(0x75, 0x7f) AM_WRITE(sol_w)
+ //map(0x01, 0x02).r(FUNC(jvh_state::sw1_r));
+ //map(0x03, 0x05).r(FUNC(jvh_state::dip_r));
+ //map(0x08, 0x09).r(FUNC(jvh_state::sw6_r));
+ //map(0x00, 0x07).w(FUNC(jvh_state::out0a2_w));
+ //map(0x08, 0x0f).w(FUNC(jvh_state::out0b2_w));
+ //map(0x10, 0x17).w(FUNC(jvh_state::out1a2_w));
+ //map(0x18, 0x1f).w(FUNC(jvh_state::out1b2_w));
+ //map(0x20, 0x27).w(FUNC(jvh_state::out2a2_w));
+ //map(0x28, 0x2f).w(FUNC(jvh_state::out2b2_w));
+ //map(0x30, 0x30).w(FUNC(jvh_state::out3a2_w));
+ //map(0x31, 0x36).w(FUNC(jvh_state::snd_w));
+ //map(0x37, 0x37).w(FUNC(jvh_state::latch_w));
+ //map(0x3e, 0x3e).w(FUNC(jvh_state::irq_enable));
+ //map(0x3f, 0x3f).w(FUNC(jvh_state::zc_enable));
+ //map(0x40, 0x47).w(FUNC(jvh_state::out4a2_w));
+ //map(0x48, 0x4a).w(FUNC(jvh_state::out4b2_w));
+ //map(0x4b, 0x4b).w(FUNC(jvh_state::enable_w));
+ //map(0x4c, 0x4f).w(FUNC(jvh_state::out4c2_w));
+ //map(0x50, 0x55).w(FUNC(jvh_state::col_w));
+ //map(0x57, 0x5a).w(FUNC(jvh_state::bcd_w));
+ //map(0x5b, 0x5f).w(FUNC(jvh_state::panel_w));
+ //map(0x60, 0x67).w(FUNC(jvh_state::digit_w));
+ //map(0x68, 0x6f).w(FUNC(jvh_state::out6b2_w));
+ //map(0x70, 0x74).w(FUNC(jvh_state::out7a2_w));
+ //map(0x75, 0x7f).w(FUNC(jvh_state::sol_w));
}
void jvh_state::jvh_sub_map(address_map &map)
diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp
index 2b88a78a237..6e6bda21e2c 100644
--- a/src/mame/drivers/kaneko16.cpp
+++ b/src/mame/drivers/kaneko16.cpp
@@ -350,7 +350,7 @@ void kaneko16_state::blazeon_map(address_map &map)
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 ?
-// map(0xe80000, 0xe80001) AM_READNOP // IRQ Ack ?
+// map(0xe80000, 0xe80001).nopr(); // IRQ Ack ?
map(0xec0000, 0xec0001).nopr(); // Lev 4 IRQ Ack ?
}
@@ -546,7 +546,7 @@ void kaneko16_gtmr_state::gtmr2_map(address_map &map)
map(0xa00000, 0xa00001).rw(m_watchdog, FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); // Watchdog
map(0xb00000, 0xb00001).portr("P1");
-// map(0xb00002, 0xb00003) AM_READ_PORT("P2")
+// map(0xb00002, 0xb00003).portr("P2");
map(0xb00002, 0xb00003).r(FUNC(kaneko16_gtmr_state::gtmr2_IN1_r));
map(0xb00004, 0xb00005).portr("SYSTEM");
map(0xb00006, 0xb00007).portr("EXTRA");
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index d07979c4e74..cee9006c6fb 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -475,7 +475,7 @@ void kingdrby_state::slave_1986_map(address_map &map)
map(0x3000, 0x3fff).rom(); //sound rom tested for the post check
map(0x4000, 0x47ff).ram().share("nvram"); //backup ram
map(0x5000, 0x5003).rw(m_ppi[0], FUNC(i8255_device::read), FUNC(i8255_device::write)); /* I/O Ports */
-// AM_RANGE(0x6000, 0x6003) AM_DEVREADWRITE(m_ppi[1], i8255_device, read, write) /* I/O Ports */
+// map(0x6000, 0x6003).rw(m_ppi[1], FUNC(i8255_device::read), FUNC(i8255_device::write)); /* I/O Ports */
map(0x7000, 0x73ff).ram().share("share1");
map(0x7400, 0x74ff).ram().share("spriteram");
map(0x7600, 0x7600).w("crtc", FUNC(mc6845_device::address_w));
diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp
index b0cf004626e..440d040c00c 100644
--- a/src/mame/drivers/kingpin.cpp
+++ b/src/mame/drivers/kingpin.cpp
@@ -93,18 +93,18 @@ void kingpin_state::kingpin_io_map(address_map &map)
map(0x10, 0x13).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x20, 0x21).rw("tms9928a", FUNC(tms9928a_device::read), FUNC(tms9928a_device::write));
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 // ?
- //AM_RANGE(0x70, 0x70) AM_WRITENOP // ?
+ //map(0x30, 0x30).nopw(); // lamps?
+ //map(0x40, 0x40).nopw(); // lamps?
+ //map(0x50, 0x50).nopw(); // ?
+ //map(0x70, 0x70).nopw(); // ?
}
void kingpin_state::kingpin_sound_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x8000, 0x8001).w("aysnd", FUNC(ay8910_device::address_data_w));
- //AM_RANGE(0x8400, 0x8400) AM_READNOP // ?
- //AM_RANGE(0x8401, 0x8401) AM_WRITENOP // ?
+ //map(0x8400, 0x8400).nopr(); // ?
+ //map(0x8401, 0x8401).nopw(); // ?
map(0x8800, 0x8fff).ram();
map(0x9000, 0x9000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
}
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index d3a2c540585..ce927ee9c62 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -564,10 +564,10 @@ void tandy200_state::tandy200_mem(address_map &map)
void kc85_state::kc85_io(address_map &map)
{
map.unmap_value_high();
-// AM_RANGE(0x70, 0x70) AM_MIRROR(0x0f) optional RAM unit
-// AM_RANGE(0x80, 0x80) AM_MIRROR(0x0f) optional I/O controller unit
-// AM_RANGE(0x90, 0x90) AM_MIRROR(0x0f) optional answering telephone unit
-// AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x0f) optional modem
+// map(0x70, 0x70).mirror(0x0f); optional RAM unit
+// map(0x80, 0x80).mirror(0x0f); optional I/O controller unit
+// map(0x90, 0x90).mirror(0x0f); optional answering telephone unit
+// map(0xa0, 0xa0).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(FUNC(kc85_state::uart_status_r), FUNC(kc85_state::uart_ctrl_w));
@@ -584,7 +584,7 @@ void kc85_state::trsm100_io(address_map &map)
void pc8201_state::pc8201_io(address_map &map)
{
map.unmap_value_high();
-// AM_RANGE(0x70, 0x70) AM_MIRROR(0x0f) optional video interface 8255
+// map(0x70, 0x70).mirror(0x0f); optional video interface 8255
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));
@@ -602,7 +602,7 @@ void tandy200_state::tandy200_io(address_map &map)
{
map.unmap_value_high();
map(0x90, 0x9f).rw(m_rtc, FUNC(rp5c01_device::read), FUNC(rp5c01_device::write));
-// AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x0f) AM_DEVWRITE(TCM5089_TAG, write)
+// map(0xa0, 0xa0).mirror(0x0f).w(TCM5089_TAG, FUNC(tcm5089_device::write));
map(0xb0, 0xb7).mirror(0x08).rw(I8155_TAG, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w));
map(0xc0, 0xc1).mirror(0x0e).rw(I8251_TAG, FUNC(i8251_device::read), FUNC(i8251_device::write));
map(0xd0, 0xd0).mirror(0x0f).rw(FUNC(tandy200_state::bank_r), FUNC(tandy200_state::bank_w));
@@ -1497,7 +1497,7 @@ void tandy200_state::tandy200(machine_config &config)
SPEAKER_SOUND(config, m_speaker);
m_speaker->add_route(ALL_OUTPUTS, "mono", 0.25);
-// MCFG_TCM5089_ADD(TCM5089_TAG, XTAL(3'579'545))
+// TCM5089(config, TCM5089_TAG, XTAL(3'579'545));
/* devices */
i8155_device &i8155(I8155(config, I8155_TAG, XTAL(4'915'200)/2));
diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp
index 96cec48d265..ff7d5893bc9 100644
--- a/src/mame/drivers/lbeach.cpp
+++ b/src/mame/drivers/lbeach.cpp
@@ -234,12 +234,12 @@ void lbeach_state::lbeach_map(address_map &map)
map(0x8000, 0x8000).writeonly().share("scroll_y");
map(0x8001, 0x8001).writeonly().share("sprite_x");
map(0x8002, 0x8002).writeonly().share("sprite_code");
-// AM_RANGE(0x8003, 0x8003) AM_WRITENOP // ?
-// AM_RANGE(0x8004, 0x8004) AM_WRITENOP // ?
-// AM_RANGE(0x8005, 0x8005) AM_WRITENOP // ?
+// map(0x8003, 0x8003).nopw(); // ?
+// map(0x8004, 0x8004).nopw(); // ?
+// map(0x8005, 0x8005).nopw(); // ?
map(0x8007, 0x8007).nopw(); // probably watchdog
map(0xa000, 0xa000).portr("IN0");
-// AM_RANGE(0xa003, 0xa003) AM_READNOP // ? tests d7 at game over
+// map(0xa003, 0xa003).nopr(); // ? tests d7 at game over
map(0xc000, 0xcfff).rom();
map(0xf000, 0xffff).rom();
}
diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp
index c5b4cf7bdcc..52cb80e98ea 100644
--- a/src/mame/drivers/leapster.cpp
+++ b/src/mame/drivers/leapster.cpp
@@ -300,7 +300,7 @@ void leapster_state::leapster_map(address_map &map)
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
+// map(0x80000000, 0x807fffff).bankr("cartrom"); // game ROM pointers are all to the 80xxxxxx region, so I assume it maps here - installed if a cart is present
}
void leapster_state::leapster_aux(address_map &map)
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index 2fc6664dc42..2bd14a5c9dc 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -216,7 +216,7 @@ void lethalj_state::lethalj_map(address_map &map)
map(0x04000000, 0x0400000f).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff);
map(0x04000010, 0x0400001f).rw("oki2", FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff);
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(0x04100010, 0x0410001f).nopr(); /* read but never examined */
map(0x04200000, 0x0420001f).nopw(); /* clocks bits through here */
map(0x04300000, 0x0430007f).r(FUNC(lethalj_state::lethalj_gun_r));
map(0x04400000, 0x0440000f).nopw(); /* clocks bits through here */
diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp
index 76b21aa9428..40406511a3f 100644
--- a/src/mame/drivers/lgp.cpp
+++ b/src/mame/drivers/lgp.cpp
@@ -173,7 +173,7 @@ void lgp_state::main_program_map(address_map &map)
map(0xe000, 0xe3ff).ram().share("tile_ram");
map(0xe400, 0xe7ff).ram().share("tile_ctrl_ram");
-// AM_RANGE(0xef00,0xef00) AM_READ_PORT("IN_TEST")
+// map(0xef00, 0xef00).portr("IN_TEST");
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 */
@@ -197,8 +197,8 @@ void lgp_state::sound_program_map(address_map &map)
void lgp_state::main_io_map(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0xfd,0xfd) AM_READ_PORT("IN_TEST")
-// AM_RANGE(0xfe,0xfe) AM_READ_PORT("IN_TEST")
+// map(0xfd,0xfd).portr("IN_TEST");
+// map(0xfe,0xfe).portr("IN_TEST");
}
void lgp_state::sound_io_map(address_map &map)
diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp
index 22f06f39dde..1753bde6cb5 100644
--- a/src/mame/drivers/liberate.cpp
+++ b/src/mame/drivers/liberate.cpp
@@ -298,7 +298,7 @@ void liberate_state::deco16_io_map(address_map &map)
void liberate_state::prosoccr_io_map(address_map &map)
{
map(0x00, 0x00).portr("IN0").w(FUNC(liberate_state::prosoccr_io_bank_w));
- //AM_RANGE(0x01, 0x01) AM_READ_PORT("TILT")
+ //map(0x01, 0x01).portr("TILT");
}
void liberate_state::liberatb_map(address_map &map)
diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp
index 994525ae507..ad85bacf248 100644
--- a/src/mame/drivers/liberatr.cpp
+++ b/src/mame/drivers/liberatr.cpp
@@ -324,7 +324,7 @@ void liberatr_state::liberat2_map(address_map &map)
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 ??? */
+ //map(0x6000, 0x601f).w(FUNC(liberatr_state::pokey1_w)); /* bug ??? */
map(0x6000, 0xbfff).rom();
map(0xfffa, 0xffff).rom();
}
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index 7ca3f4a4eae..d3d2c010dd3 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -114,7 +114,7 @@ void ltd_state::ltd4_map(address_map &map)
map(0x1000, 0x1000).w("aysnd_0", FUNC(ay8910_device::address_w));
map(0x1400, 0x1400).w("aysnd_0", FUNC(ay8910_device::reset_w));
map(0x1800, 0x1800).w("aysnd_1", FUNC(ay8910_device::address_w));
- //AM_RANGE(0x2800, 0x2800) AM_WRITE(auxlamps_w)
+ //map(0x2800, 0x2800).w(FUNC(ltd_state::auxlamps_w));
map(0x3000, 0x3000).w("aysnd_0", FUNC(ay8910_device::data_w));
map(0x3800, 0x3800).w("aysnd_1", FUNC(ay8910_device::data_w));
map(0xc000, 0xdfff).rom().mirror(0x2000).region("roms", 0);
diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp
index 6d9274abd21..541f9446497 100644
--- a/src/mame/drivers/luckgrln.cpp
+++ b/src/mame/drivers/luckgrln.cpp
@@ -318,8 +318,7 @@ void luckgrln_state::mainmap(address_map &map)
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
-
+// map(0x0d200, 0x0d2ff).ram();
map(0x0d800, 0x0dfff).ram(); // nvram
@@ -480,7 +479,7 @@ void luckgrln_state::common_portmap(address_map &map)
map(0x00f8, 0x00f8).portr("DSW2");
map(0x00f9, 0x00f9).portr("DSW3");
map(0x00fa, 0x00fa).portr("DSW4");
- map(0x00fb, 0x00fb).portr("DSW5"); //AM_WRITENOP
+ map(0x00fb, 0x00fb).portr("DSW5"); //.nopw();
map(0x00fc, 0x00fc).nopw();
map(0x00fd, 0x00fd).nopw();
map(0x00fe, 0x00fe).nopw();
diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp
index 8087ba806a6..1ef5e5f099c 100644
--- a/src/mame/drivers/lvcards.cpp
+++ b/src/mame/drivers/lvcards.cpp
@@ -160,7 +160,7 @@ void lvpoker_state::ponttehk_map(address_map &map)
map(0x8400, 0x87ff).ram().w(FUNC(lvpoker_state::colorram_w)).share("colorram");
map(0xa000, 0xa000).portr("IN0");
map(0xa001, 0xa001).portr("IN1").nopw(); // lamps
- map(0xa002, 0xa002).r(FUNC(lvpoker_state::payout_r)).w(FUNC(lvpoker_state::control_port_2a_w));//AM_WRITENOP // ???
+ map(0xa002, 0xa002).r(FUNC(lvpoker_state::payout_r)).w(FUNC(lvpoker_state::control_port_2a_w));//.nopw(); // ???
}
void lvcards_state::lvcards_map(address_map &map)
diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp
index d57bf05e488..8e5b4679bc6 100644
--- a/src/mame/drivers/lwriter.cpp
+++ b/src/mame/drivers/lwriter.cpp
@@ -209,7 +209,7 @@ void lwriter_state::maincpu_map(address_map &map)
map.unmap_value_high();
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(0x300000, 0x3fffff) // open bus?
map(0x400000, 0x5fffff).ram().region("dram", 0).mirror(0x200000); // 2MB DRAM
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
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index de358f074d6..337f86df98b 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -730,7 +730,7 @@ void m5_state::m5_io(address_map &map)
map(0x37, 0x37).mirror(0x08).portr("JOY");
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(0x60, 0x63) SIO
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(FUNC(m5_state::mem64KRX_w)); //64KRD/64KRX paging
@@ -1051,11 +1051,11 @@ void brno_state::brno_io(address_map &map)
map(0x37, 0x37).portr("JOY");
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(0x60, 0x63) // SIO
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(0x70, 0x73).mirror(0x04).rw(I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::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(FUNC(brno_state::fd_r), FUNC(brno_state::fd_w)); // drive select
}
diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp
index b6da15f0d0a..72af22969a8 100644
--- a/src/mame/drivers/m72.cpp
+++ b/src/mame/drivers/m72.cpp
@@ -1018,7 +1018,7 @@ void m72_state::m84_v33_portmap(address_map &map)
map(0x82, 0x83).w(FUNC(m72_state::scrollx_w<0>));
map(0x84, 0x85).w(FUNC(m72_state::scrolly_w<1>));
map(0x86, 0x87).w(FUNC(m72_state::scrollx_w<1>));
-// AM_RANGE(0x8c, 0x8f) AM_WRITENOP /* ??? */
+// map(0x8c, 0x8f).nopw(); /* ??? */
}
@@ -1130,7 +1130,7 @@ void m72_state::rtype2_sound_portmap(address_map &map)
map(0x82, 0x82).w(m_audio, FUNC(m72_audio_device::sample_w));
map(0x83, 0x83).w("soundlatch", FUNC(generic_latch_8_device::acknowledge_w));
map(0x84, 0x84).r(m_audio, FUNC(m72_audio_device::sample_r));
-// AM_RANGE(0x87, 0x87) AM_WRITENOP /* ??? */
+// map(0x87, 0x87).nopw(); /* ??? */
}
void m72_state::poundfor_sound_portmap(address_map &map)
diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp
index a84453b6bec..c002c8dfb1b 100644
--- a/src/mame/drivers/m79152pc.cpp
+++ b/src/mame/drivers/m79152pc.cpp
@@ -142,7 +142,7 @@ void m79152pc_state::mem_map(address_map &map)
void m79152pc_state::io_map(address_map &map)
{
- //ADDRESS_MAP_UNMAP_HIGH
+ //map.unmap_value_high();
map.global_mask(0xff);
map(0x40, 0x43).rw(m_uart, FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w));
map(0x44, 0x47).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp
index 12dbe65962e..238dfaee2d7 100644
--- a/src/mame/drivers/m90.cpp
+++ b/src/mame/drivers/m90.cpp
@@ -126,11 +126,11 @@ void m90_state::dynablsb_main_cpu_io_map(address_map &map)
map(0x00, 0x01).portr("P1_P2");
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).w(FUNC(m90_state::unknown_w)); /* dynablsb: write continuously 0x6000 */
map(0x04, 0x05).portr("DSW");
map(0x06, 0x07).portr("P3_P4");
map(0x80, 0x8f).writeonly().share("video_control");
-// AM_RANGE(0x90, 0x91) AM_WRITE(unknown_w)
+// map(0x90, 0x91).w(FUNC(m90_state::unknown_w));
}
/*****************************************************************************/
diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp
index 6b37f85e11c..5bc2554a204 100644
--- a/src/mame/drivers/macs.cpp
+++ b/src/mame/drivers/macs.cpp
@@ -119,13 +119,13 @@ void macs_state::macs_mem(address_map &map)
{
map(0x0000, 0x7fff).bankr("rombank1");
map(0x8000, 0xbfff).bankr("rombank2");
- //AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
- //AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w)
+ //map(0xc000, 0xcfff).rw(FUNC(macs_state::st0016_sprite_ram_r), FUNC(macs_state::st0016_sprite_ram_w));
+ //map(0xd000, 0xdfff).rw(FUNC(macs_state::st0016_sprite2_ram_r), FUNC(macs_state::st0016_sprite2_ram_w));
map(0xe000, 0xe7ff).ram(); /* work ram ? */
map(0xe800, 0xe87f).ram().share("ram2");
- //AM_RANGE(0xe900, 0xe9ff) // sound - internal
- //AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w)
- //AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w)
+ //map(0xe900, 0xe9ff) // sound - internal
+ //map(0xea00, 0xebff).rw(FUNC(macs_state::st0016_palette_ram_r), FUNC(macs_state::st0016_palette_ram_w));
+ //map(0xec00, 0xec1f).rw(FUNC(macs_state::st0016_character_ram_r), FUNC(macs_state::st0016_character_ram_w));
map(0xf000, 0xf7ff).bankrw("rambank1"); /* common /backup ram ?*/
map(0xf800, 0xffff).bankrw("rambank2"); /* common /backup ram ?*/
}
@@ -205,16 +205,16 @@ WRITE8_MEMBER(macs_state::macs_output_w)
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(0x00, 0xbf).rw(FUNC(macs_state::st0016_vregs_r), FUNC(macs_state::st0016_vregs_w)); /* video/crt regs ? */
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(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(0xe2, 0xe2).w(FUNC(macs_state::st0016_sprite_bank_w));
+ //map(0xe3, 0xe4).w(FUNC(macs_state::st0016_character_bank_w));
+ //map(0xe5, 0xe5).w(FUNC(macs_state::st0016_palette_bank_w));
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)
+ //map(0xf0, 0xf0).rw(FUNC(macs_state::st0016_dma_r));
}
//static GFXDECODE_START( macs )
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index bb144c81a3a..6899800253c 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -405,8 +405,8 @@ void magic10_state::magic102_map(address_map &map)
map(0x500006, 0x500007).nopr(); // gives credits
map(0x50001a, 0x50001b).portr("IN0");
map(0x50001c, 0x50001d).portr("IN1");
-// AM_RANGE(0x500002, 0x50001f) AM_READNOP
-// AM_RANGE(0x500002, 0x50001f) AM_WRITENOP
+// map(0x500002, 0x50001f).nopr();
+// map(0x500002, 0x50001f).nopw();
map(0x600000, 0x603fff).ram();
map(0x700001, 0x700001).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0x700080, 0x700087).ram().share("vregs"); // video registers?
diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp
index 1fc9cdabd72..f7c2ef9c72f 100644
--- a/src/mame/drivers/magicard.cpp
+++ b/src/mame/drivers/magicard.cpp
@@ -755,7 +755,7 @@ WRITE16_MEMBER(magicard_state::philips_66470_w)
void magicard_state::magicard_mem(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
+// map.global_mask(0x1fffff);
map(0x00000000, 0x001ffbff).mirror(0x00200000).ram().share("magicram");
map(0x00600000, 0x007ffbff).ram().share("magicramb");
/* 001ffc00-001ffdff System I/O */
@@ -773,7 +773,7 @@ void magicard_state::magicard_mem(address_map &map)
void magicard_state::hotslots_mem(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
+// map.global_mask(0x1fffff);
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?
diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp
index 49815c6bcd6..e839285a4d3 100644
--- a/src/mame/drivers/magictg.cpp
+++ b/src/mame/drivers/magictg.cpp
@@ -882,7 +882,7 @@ void magictg_state::adsp_program_map(address_map &map)
void magictg_state::adsp_data_map(address_map &map)
{
map.unmap_value_high();
-// AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("databank")
+// map(0x0000, 0x03ff).bankrw("databank");
map(0x0400, 0x3fdf).ram();
map(0x3fe0, 0x3fff).rw(FUNC(magictg_state::adsp_control_r), FUNC(magictg_state::adsp_control_w));
}
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp
index cd519e5a75c..0dad73569c7 100644
--- a/src/mame/drivers/maygay1b.cpp
+++ b/src/mame/drivers/maygay1b.cpp
@@ -440,7 +440,7 @@ void maygay1b_state::m1_memmap(address_map &map)
#else
//8051
map(0x2040, 0x2041).rw("i8279_2", FUNC(i8279_device::read), FUNC(i8279_device::write));
-// AM_RANGE(0x2050, 0x2050)// SCAN on M1B
+// map(0x2050, 0x2050)// SCAN on M1B
#endif
map(0x2070, 0x207f).rw(m_duart68681, FUNC(mc68681_device::read), FUNC(mc68681_device::write));
@@ -526,7 +526,7 @@ void maygay1b_state::m1_nec_memmap(address_map &map)
#else
//8051
map(0x2040, 0x2041).rw("i8279_2", FUNC(i8279_device::read), FUNC(i8279_device::write));
-// AM_RANGE(0x2050, 0x2050)// SCAN on M1B
+// map(0x2050, 0x2050)// SCAN on M1B
#endif
map(0x2070, 0x207f).rw(m_duart68681, FUNC(mc68681_device::read), FUNC(mc68681_device::write));
@@ -856,7 +856,7 @@ void maygay1b_state::init_m1()
{
init_m1common();
- //AM_RANGE(0x2420, 0x2421) AM_WRITE(latch_ch2_w ) // oki
+ //map(0x2420, 0x2421).w(FUNC(maygay1b_state::latch_ch2_w)); // oki
// if there is no OKI region disable writes here, the rom might be missing, so alert user
if (m_oki_region == nullptr) {
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index f7c06af2c77..1f90d1ec58f 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -474,7 +474,7 @@ void mazerbla_state::mazerbla_io_map(address_map &map)
{
map.global_mask(0xff);
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(0x60, 0x60).w(FUNC(mazerbla_state::zpu_bcd_decoder_w)); // r(FUNC(mazerbla_state::) 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?
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index db19860afee..a875a3338ee 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -330,15 +330,15 @@ void mbee_state::mbee256_io(address_map &map)
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(0x0010, 0x0013).mirror(0xff00); Optional SN76489AN audio chip
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(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)
+ // map(0x0058, 0x005f).mirror(0xff00); External options: floppy drive, hard drive and keyboard
+ // map(0x0060, 0x0067).mirror(0xff00); Reserved for file server selection (unused)
+ // map(0x0068, 0x006f).mirror(0xff00); Reserved for 8530 SCC (unused)
}
static INPUT_PORTS_START( oldkb )
diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp
index 86bc18b656e..acdb45ab6d7 100644
--- a/src/mame/drivers/mcatadv.cpp
+++ b/src/mame/drivers/mcatadv.cpp
@@ -182,7 +182,7 @@ void mcatadv_state::mcatadv_map(address_map &map)
map(0x000000, 0x0fffff).rom();
map(0x100000, 0x10ffff).ram();
-// AM_RANGE(0x180018, 0x18001f) AM_READNOP // ?
+// map(0x180018, 0x18001f).nopr(); // ?
map(0x200000, 0x200005).ram().share("scroll1");
map(0x300000, 0x300005).ram().share("scroll2");
@@ -198,7 +198,7 @@ void mcatadv_state::mcatadv_map(address_map &map)
map(0x800000, 0x800001).portr("P1");
map(0x800002, 0x800003).portr("P2");
-// AM_RANGE(0x900000, 0x900001) AM_WRITE(mcat_coin_w) // Lockout / Counter MCAT Only
+// map(0x900000, 0x900001).w(FUNC(mcatadv_state::mcat_coin_w)); // Lockout / Counter MCAT Only
map(0xa00000, 0xa00001).portr("DSW1");
map(0xa00002, 0xa00003).portr("DSW2");
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index 25e0c2d80b9..51b5513be42 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -335,7 +335,7 @@ void megasys1_state::megasys1B_edfbl_map(address_map &map)
map(0x0e0006, 0x0e0007).portr("P2");
map(0x0e0008, 0x0e0009).portr("DSW1");
map(0x0e000a, 0x0e000b).portr("DSW2");
- //AM_RANGE(0x0e000e, 0x0e000f) AM_WRITE(soundlatch_w)
+ //map(0x0e000e, 0x0e000f).w(FUNC(megasys1_state::soundlatch_w));
}
void megasys1_state::megasys1B_monkelf_map(address_map &map)
@@ -410,7 +410,7 @@ void megasys1_state::megasys1D_map(address_map &map)
map(0x000000, 0x03ffff).rom();
map(0x0c2000, 0x0c2005).rw("scroll0", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w));
map(0x0c2008, 0x0c200d).rw("scroll1", FUNC(megasys1_tilemap_device::scroll_r), FUNC(megasys1_tilemap_device::scroll_w));
- map(0x0c2108, 0x0c2109).nopw(); //AM_WRITE(sprite_bank_w)
+ map(0x0c2108, 0x0c2109).nopw(); //.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));
@@ -1771,6 +1771,8 @@ void megasys1_state::p47b(machine_config &config)
config.device_remove("oki1");
+ subdevice<ym2203_device>("ymsnd")->set_clock(7.2_MHz_XTAL / 2);
+
// what's this for? SFX?
//z80_device &extracpu(Z80(config, "extracpu", 7.2_MHz_XTAL / 2)); // divisor not verified
//extracpu.set_addrmap(AS_PROGRAM, &megasys1_state::p47b_extracpu_prg_map);
diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp
index 1a6f6916dd8..c44a116f972 100644
--- a/src/mame/drivers/megatech.cpp
+++ b/src/mame/drivers/megatech.cpp
@@ -538,7 +538,7 @@ void mtech_state::megatech_bios_map(address_map &map)
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(0x7800, 0x7fff).ram(); // ?
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?
}
diff --git a/src/mame/drivers/mephisto_modular.cpp b/src/mame/drivers/mephisto_modular.cpp
index b125ae0e8ac..7c35522585c 100644
--- a/src/mame/drivers/mephisto_modular.cpp
+++ b/src/mame/drivers/mephisto_modular.cpp
@@ -127,9 +127,9 @@ void mmodular_state::van16_mem(address_map &map)
map(0x000000, 0x03ffff).rom();
-// AM_RANGE( 0xe80004, 0xe80005 ) AM_WRITE(write_unknown2 ) // Bavaria sensors
-// AM_RANGE( 0xe80002, 0xe80003 ) AM_READ(read_unknown1 ) // Bavaria sensors
-// AM_RANGE( 0xe80006, 0xe80007 ) AM_READ(read_unknown3 ) // Bavaria sensors
+// map(0xe80004, 0xe80005).w(FUNC(mmodular_state::write_unknown2)); // Bavaria sensors
+// map(0xe80002, 0xe80003).r(FUNC(mmodular_state::read_unknown1)); // Bavaria sensors
+// map(0xe80006, 0xe80007).r(FUNC(mmodular_state::read_unknown3)); // Bavaria sensors
}
void mmodular_state::alm32_mem(address_map &map)
@@ -156,9 +156,9 @@ void mmodular_state::van32_mem(address_map &map)
map(0x00000000, 0x0003ffff).rom();
-// AM_RANGE( 0x98000008, 0x9800000b ) AM_WRITE(write_unknown2 ) // Bavaria sensors
-// AM_RANGE( 0x98000004, 0x98000007 ) AM_READ(read_unknown1 ) // Bavaria sensors
-// AM_RANGE( 0x9800000c, 0x9800000f ) AM_READ(read_unknown3 ) // Bavaria sensors
+// map(0x98000008, 0x9800000b).w(FUNC(mmodular_state::write_unknown2)); // Bavaria sensors
+// map(0x98000004, 0x98000007).r(FUNC(mmodular_state::read_unknown1)); // Bavaria sensors
+// map(0x98000008, 0x9800000b).r(FUNC(mmodular_state::read_unknown3)); // Bavaria sensors
}
void mmodular_state::gen32_mem(address_map &map)
@@ -174,9 +174,9 @@ void mmodular_state::gen32_mem(address_map &map)
map(0xe0000000, 0xe0000000).w("display", FUNC(mephisto_display_modul_device::latch_w));
map(0xe0000010, 0xe0000010).w("display", FUNC(mephisto_display_modul_device::io_w));
-// AM_RANGE( 0xd8000008, 0xd800000b ) AM_WRITE(write_unknown2 ) // Bavaria sensors
-// AM_RANGE( 0xd8000004, 0xd8000007 ) AM_READ(read_unknown1 ) // Bavaria sensors
-// AM_RANGE( 0xd800000c, 0xd800000f ) AM_READ(read_unknown3 ) // Bavaria sensors
+// map(0xd8000008, 0xd800000b).w(FUNC(mmodular_state::write_unknown2)); // Bavaria sensors
+// map(0xd8000004, 0xd8000007).r(FUNC(mmodular_state::read_unknown1)); // Bavaria sensors
+// map(0xd800000c, 0xd800000f).r(FUNC(mmodular_state::read_unknown3)); // Bavaria sensors
map(0x40000000, 0x4007ffff).ram();
map(0x80000000, 0x8003ffff).ram();
diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp
index cad36dc7a8b..54a408e480c 100644
--- a/src/mame/drivers/mephistp.cpp
+++ b/src/mame/drivers/mephistp.cpp
@@ -110,7 +110,7 @@ void mephisto_pinball_state::mephisto_map(address_map &map)
{
map(0x00000, 0x0ffff).rom().region("maincpu", 0);
map(0x10000, 0x107ff).ram().share("nvram");
- map(0x12000, 0x1201f).noprw(); //AM_DEVREADWRITE("muart", i8256_device, read, write)
+ map(0x12000, 0x1201f).noprw(); //.rw("muart", FUNC(i8256_device::read), FUNC(i8256_device::write));
map(0x13000, 0x130ff).rw("ic20", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w));
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));
diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp
index 562318e5257..a997313976e 100644
--- a/src/mame/drivers/metlclsh.cpp
+++ b/src/mame/drivers/metlclsh.cpp
@@ -121,8 +121,8 @@ void metlclsh_state::metlclsh_slave_map(address_map &map)
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(0xe404, 0xe404).nopw(); // ? 0
+// map(0xe410, 0xe410).nopw(); // ? 0 on startup only
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/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp
index 3283f59d41c..dcb1ede5e88 100644
--- a/src/mame/drivers/meyc8080.cpp
+++ b/src/mame/drivers/meyc8080.cpp
@@ -324,7 +324,7 @@ void meyc8080_state::meyc8080_map(address_map &map)
map(0x4000, 0x5fff).ram().share("vram0");
map(0x6000, 0x7fff).ram().share("vram1");
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(0xa000, 0xa0ff).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(FUNC(meyc8080_state::meyc8080_dac_1_w));
map(0xf004, 0xf004).portr("IN1").w(FUNC(meyc8080_state::lights_1_w));
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index 58b0a2406ba..6c11e57e462 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -535,7 +535,7 @@ WRITE8_MEMBER(mgames_state::outport7_w)
void mgames_state::main_map(address_map &map)
{
map(0x0000, 0x2fff).rom();
-// AM_RANGE(0x0158, 0x0158) AM_WRITE (muxed_w)
+// map(0x0158, 0x0158).w(FUNC(mgames_state::muxed_w));
map(0x3800, 0x38ff).ram().share("nvram"); /* NVRAM = 2x SCM5101E */
map(0x4000, 0x47ff).ram().share("video"); /* 4x MM2114N-3 */
map(0x8000, 0x8000).portr("SW1");
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index 741f4ec8ce9..367f4c3dc8b 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -426,8 +426,8 @@ void mgavegas_state::mgavegas_map(address_map &map)
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
+ //map(0xcc00, 0xcc01).rw(FUNC(mgavegas_state::cso3_r), FUNC(mgavegas_state::cso3_w)); // /CSout3 unused
+ //map(0xe000, 0xe003).rw(FUNC(mgavegas_state::r_e0), FUNC(mgavegas_state::w_e0)); // /CSaux unused
}
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp
index 52d51efd330..e4c558188a1 100644
--- a/src/mame/drivers/mhavoc.cpp
+++ b/src/mame/drivers/mhavoc.cpp
@@ -327,8 +327,8 @@ void mhavoc_state::gamma_map(address_map &map)
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(0x5800, 0x5800).w(FUNC(mhavoc_state::mhavocrv_speech_data_w)).mirror(0x06ff); /* TMS5220 data write */
+ //map(0x5900, 0x5900).w(FUNC(mhavoc_state::mhavocrv_speech_strobe_w)).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 */
map(0x8000, 0xbfff).rom().mirror(0x4000); /* Program ROM (16K) */
}
diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp
index 5b016e6576a..9db756816c7 100644
--- a/src/mame/drivers/micral.cpp
+++ b/src/mame/drivers/micral.cpp
@@ -164,7 +164,7 @@ void micral_state::mem_map(address_map &map)
map(0x0000, 0xf7ff).ram();
map(0xf800, 0xfeff).rom();
map(0xff00, 0xffef).ram();
- map(0xfff6, 0xfff7); // AM_WRITENOP // unknown ports
+ map(0xfff6, 0xfff7); // .nopw(); // unknown ports
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));
diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp
index 8b735c55cad..2e2cccb2c39 100644
--- a/src/mame/drivers/microdec.cpp
+++ b/src/mame/drivers/microdec.cpp
@@ -145,16 +145,16 @@ void microdec_state::microdec_io(address_map &map)
map(0xfa, 0xfb).m(m_fdc, FUNC(upd765a_device::map));
map(0xfc, 0xfd).rw("uart1", FUNC(i8251_device::read), FUNC(i8251_device::write));
map(0xfe, 0xff).rw("uart2", FUNC(i8251_device::read), FUNC(i8251_device::write));
- // AM_RANGE(0xf0, 0xf3) 8253 PIT (md3 only) used as a baud rate generator for serial ports
- // AM_RANGE(0xf4, 0xf4) Centronics data
- // AM_RANGE(0xf5, 0xf5) motor check (md1/2)
- // AM_RANGE(0xf5, 0xf5) Centronics status (md3) read bit 3 (ack=1); read bit 4 (busy=1); write bit 7 (stb=0)
- // AM_RANGE(0xf6, 0xf6) rom enable (w=enable; r=disable)
- // AM_RANGE(0xf7, 0xf7) VFO Count set
- // AM_RANGE(0xf8, 0xf8) Motor and Shift control
- // AM_RANGE(0xfa, 0xfb) uPD765C fdc FA=status; FB=data
- // AM_RANGE(0xfc, 0xfd) Serial Port 1 (terminal) FC=data FD=status
- // AM_RANGE(0xfe, 0xff) Serial Port 2 (printer) FE=data FF=status
+ // map(0xf0, 0xf3) 8253 PIT (md3 only) used as a baud rate generator for serial ports
+ // map(0xf4, 0xf4) Centronics data
+ // map(0xf5, 0xf5) motor check (md1/2)
+ // map(0xf5, 0xf5) Centronics status (md3) read bit 3 (ack=1); read bit 4 (busy=1); write bit 7 (stb=0)
+ // map(0xf6, 0xf6) rom enable (w=enable; r=disable)
+ // map(0xf7, 0xf7) VFO Count set
+ // map(0xf8, 0xf8) Motor and Shift control
+ // map(0xfa, 0xfb) uPD765C fdc FA=status; FB=data
+ // map(0xfc, 0xfd) Serial Port 1 (terminal) FC=data FD=status
+ // map(0xfe, 0xff) Serial Port 2 (printer) FE=data FF=status
}
/* Input ports */
diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp
index 4d37fffd7ec..f4470438c32 100644
--- a/src/mame/drivers/midtunit.cpp
+++ b/src/mame/drivers/midtunit.cpp
@@ -58,7 +58,7 @@ void midtunit_state::main_map(address_map &map)
map(0x01800000, 0x0187ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x01a80000, 0x01a800ff).rw(m_video, FUNC(midtunit_video_device::midtunit_dma_r), FUNC(midtunit_video_device::midtunit_dma_w));
map(0x01b00000, 0x01b0001f).w(m_video, FUNC(midtunit_video_device::midtunit_control_w));
-/* AM_RANGE(0x01c00060, 0x01c0007f) AM_WRITE(midtunit_cmos_enable_w) */
+// map(0x01c00060, 0x01c0007f).w(FUNC(midtunit_state::midtunit_cmos_enable_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));
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index 76467a1099b..b8e22302801 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/src/mame/drivers/midvunit.cpp
@@ -651,7 +651,7 @@ void midvunit_state::midvunit_map(address_map &map)
map(0x980082, 0x980083).r(FUNC(midvunit_state::midvunit_dma_trigger_r));
map(0x990000, 0x990000).r(FUNC(midvunit_state::midvunit_intcs_r));
map(0x991030, 0x991030).lr16("991030", [this]() { return uint16_t(m_in1->read()); });
-// AM_RANGE(0x991050, 0x991050) AM_READONLY // seems to be another port
+// map(0x991050, 0x991050).readonly(); // seems to be another port
map(0x991060, 0x991060).r(FUNC(midvunit_state::port0_r));
map(0x992000, 0x992000).lr16("992000", [this]() { return uint16_t(m_dsw->read()); });
map(0x993000, 0x993000).rw(FUNC(midvunit_state::adc_r), FUNC(midvunit_state::adc_w));
diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp
index c118878f43a..c665d7d88bb 100644
--- a/src/mame/drivers/mini2440.cpp
+++ b/src/mame/drivers/mini2440.cpp
@@ -212,7 +212,7 @@ void mini2440_state::machine_reset()
void mini2440_state::mini2440_map(address_map &map)
{
-// AM_RANGE(0x00000000, 0x001fffff) AM_ROM
+// map(0x00000000, 0x001fffff).rom();
map(0x30000000, 0x37ffffff).ram();
}
diff --git a/src/mame/drivers/miniforce.cpp b/src/mame/drivers/miniforce.cpp
index ef55e15c2e7..2c8c6d5ad8e 100644
--- a/src/mame/drivers/miniforce.cpp
+++ b/src/mame/drivers/miniforce.cpp
@@ -147,11 +147,11 @@ void miniforce_state::miniforce_mem(address_map &map)
{
map.unmap_value_high();
/* The ROMs contains an OS9 bootloader. It is position independent but reset vector suggests that it sits flat on adress 0 (zero) */
-// AM_RANGE (0x000000, 0x003fff) AM_ROM AM_REGION("roms", 0x000000) /* System EPROM Area 16Kb OS9 DEBUG - not verified */
-// AM_RANGE (0x004000, 0x01ffff) AM_ROM AM_REGION("roms", 0x004000)/* System EPROM Area 112Kb for System ROM - not verified */
-// AM_RANGE (0x020000, 0x03ffff) AM_RAM /* Not verified */
-// AM_RANGE (0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */
-// AM_RANGE (0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */
+// map(0x000000, 0x003fff).rom().region("roms", 0x000000); /* System EPROM Area 16Kb OS9 DEBUG - not verified */
+// map(0x004000, 0x01ffff).rom().region("roms", 0x004000);/* System EPROM Area 112Kb for System ROM - not verified */
+// map(0x020000, 0x03ffff).ram(); /* Not verified */
+// map(0x100000, 0xfeffff).rw(FUNC(miniforce_state::vme_a24_r), FUNC(miniforce_state::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) - not verified */
+// map(0xff0000, 0xffffff).rw(FUNC(miniforce_state::vme_a16_r), FUNC(miniforce_state::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) - not verified */
}
#endif
diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp
index 8a4f47b3c80..3c420db9e69 100644
--- a/src/mame/drivers/mirax.cpp
+++ b/src/mame/drivers/mirax.cpp
@@ -335,7 +335,7 @@ void mirax_state::mirax_main_map(address_map &map)
map(0xf400, 0xf400).portr("DSW2");
map(0xf500, 0xf507).w("mainlatch", FUNC(ls259_device::write_d0));
map(0xf800, 0xf800).w(FUNC(mirax_state::sound_cmd_w));
-// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack?
+// map(0xf900, 0xf900) //sound cmd mirror? ack?
}
void mirax_state::mirax_sound_map(address_map &map)
diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp
index 99fe7e73234..4cbc681c8db 100644
--- a/src/mame/drivers/missb2.cpp
+++ b/src/mame/drivers/missb2.cpp
@@ -231,7 +231,7 @@ void missb2_state::sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0x8fff).ram();
- map(0x9000, 0x9000).rw(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)); //.mirror(0x0fff); ???
map(0xa000, 0xa001).mirror(0x0ffe).rw("ym3526", 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(FUNC(missb2_state::common_sound_semaphores_r)).w(m_soundnmi, FUNC(input_merger_device::in_set<0>));
diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp
index 68d835d4f08..4a630b01910 100644
--- a/src/mame/drivers/mk90.cpp
+++ b/src/mame/drivers/mk90.cpp
@@ -50,13 +50,13 @@ void mk90_state::mk90_mem(address_map &map)
map(0x0000, 0x3fff).ram(); // RAM
map(0x4000, 0x7fff).rom(); // Extension ROM
map(0x8000, 0xffff).rom(); // Main ROM
-// AM_RANGE(0xe800, 0xe801) LCD address
-// AM_RANGE(0xe802, 0xe803) LCD data
-// AM_RANGE(0xe810, 0xe810) serial bus controller data
-// AM_RANGE(0xe812, 0xe813) serial bus controller transfer rate
-// AM_RANGE(0xe814, 0xe814) serial bus controller control/status
-// AM_RANGE(0xe816, 0xe816) serial bus controller command
-// AM_RANGE(0xea00, 0xea7e) RTC
+// map(0xe800, 0xe801) LCD address
+// map(0xe802, 0xe803) LCD data
+// map(0xe810, 0xe810) serial bus controller data
+// map(0xe812, 0xe813) serial bus controller transfer rate
+// map(0xe814, 0xe814) serial bus controller control/status
+// map(0xe816, 0xe816) serial bus controller command
+// map(0xea00, 0xea7e) RTC
}
/* Input ports */
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index 3ed7aae5fd0..24f46c527f5 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -1115,11 +1115,11 @@ void model2_state::model2_base_mem(address_map &map)
map(0x00500000, 0x005fffff).ram().share("workram");
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
+ //map(0x00800010, 0x00800013).nopw();
+ //map(0x008000b0, 0x008000b3).nopw();
+ //map(0x00804004, 0x0080400f).nopw(); // quiet psikyo games
- //AM_RANGE(0x00880000, 0x00883fff) AM_WRITE(copro_w)
+ //map(0x00880000, 0x00883fff).w(FUNC(model2_state::copro_w));
map(0x00900000, 0x0091ffff).mirror(0x60000).ram().share("bufferram");
@@ -1153,12 +1153,12 @@ void model2_state::model2_base_mem(address_map &map)
map(0x06000000, 0x06ffffff).rom().region("main_data", 0x1000000);
map(0x10000000, 0x101fffff).rw(FUNC(model2_state::render_mode_r), FUNC(model2_state::render_mode_w));
-// AM_RANGE(0x10200000, 0x103fffff) renderer status register
+// map(0x10200000, 0x103fffff) renderer status register
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
+// map(0x10600000, 0x107fffff) polygon data ping
+// map(0x10800000, 0x109fffff) polygon data pong
+// map(0x10a00000, 0x10bfffff) fill memory ping
+// map(0x10c00000, 0x10dfffff) fill memory pong
// format is xGGGGGRRRRRBBBBB (512x400)
map(0x11600000, 0x1167ffff).rw(FUNC(model2_state::fbvram_bankA_r), FUNC(model2_state::fbvram_bankA_w)); // framebuffer A (last bronx title screen)
@@ -1425,8 +1425,8 @@ void model2b_state::model2b_crx_mem(address_map &map)
map(0x00200000, 0x0023ffff).ram();
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(0x00804000, 0x00807fff).rw(FUNC(model2b_state::geo_sharc_fifo_r), FUNC(model2b_state::geo_sharc_fifo_w));
+ //map(0x00840000, 0x00840fff).w(FUNC(model2b_state::geo_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));
@@ -1435,7 +1435,7 @@ void model2b_state::model2b_crx_mem(address_map &map)
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(0x00980008, 0x0098000b).w(FUNC(model2b_state::geo_sharc_ctl1_w));
map(0x009c0000, 0x009cffff).rw(FUNC(model2b_state::model2_serial_r), FUNC(model2b_state::model2_serial_w));
diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp
index 90ad41e69e8..589554a0721 100644
--- a/src/mame/drivers/molecular.cpp
+++ b/src/mame/drivers/molecular.cpp
@@ -187,7 +187,7 @@ void molecula_state::molecula_file_map(address_map &map)
void molecula_state::molecula_file_io(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0x40, 0x43) AM_READWRITE(sio_r,sio_w)
+// map(0x40, 0x43).rw(FUNC(molecula_state::sio_r), FUNC(molecula_state::sio_w));
map(0x72, 0x73).w(FUNC(molecula_state::file_output_w)); // unknown
}
diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp
index a9a6f567dac..abd558008a8 100644
--- a/src/mame/drivers/monty.cpp
+++ b/src/mame/drivers/monty.cpp
@@ -86,14 +86,14 @@ private:
void monty_state::monty_mem(address_map &map)
{
map(0x0000, 0xbfff).rom();
- //AM_RANGE(0x4000, 0x4000) // The main rom checks to see if another program is here on startup
+ //map(0x4000, 0x4000) // The main rom checks to see if another program is here on startup
map(0xf800, 0xffff).ram();
}
void monty_state::mmonty_mem(address_map &map)
{
map(0x0000, 0x3fff).rom();
- //AM_RANGE(0xc000, 0xc000) // The main rom checks to see if another program is here on startup
+ //map(0xc000, 0xc000) // The main rom checks to see if another program is here on startup
map(0x8000, 0xffff).rom();
map(0x7800, 0x7fff).ram();
}
diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp
index 9fe3a61994f..3f43cad3629 100644
--- a/src/mame/drivers/mpu4dealem.cpp
+++ b/src/mame/drivers/mpu4dealem.cpp
@@ -159,7 +159,7 @@ void mpu4dealem_state::dealem_memmap(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));
-/* AM_RANGE(0x08e0, 0x08e7) AM_READWRITE(68681_duart_r,68681_duart_w) */ //Runs hoppers
+/* map(0x08e0, 0x08e7).rw(FUNC(mpu4dealem_state::68681_duart_r), FUNC(mpu4dealem_state::68681_duart_w)); */ //Runs hoppers
map(0x0900, 0x0907).rw(m_6840ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));/* PTM6840 IC2 */
diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp
index 38311f62c20..6f025bbf86e 100644
--- a/src/mame/drivers/mpu4vid.cpp
+++ b/src/mame/drivers/mpu4vid.cpp
@@ -1188,11 +1188,11 @@ void mpu4vid_state::mpu4_68k_map(address_map &map)
{
map(0x000000, 0x7fffff).rom();
map(0x800000, 0x80ffff).ram().share("vid_mainram");
-// map(0x810000, 0x81ffff) AM_RAM /* ? */
+// map(0x810000, 0x81ffff).ram(); /* ? */
map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
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(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */
+// map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::mpu4_vid_unmap_r), FUNC(mpu4vid_state::mpu4_vid_unmap_w));
map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff);
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);
@@ -1202,9 +1202,9 @@ void mpu4vid_state::mpu4_68k_map(address_map &map)
void mpu4vid_state::mpu4oki_68k_map(address_map &map)
{
- map(0x000000, 0x5fffff).rom(); //AM_WRITENOP
+ map(0x000000, 0x5fffff).rom(); //.nopw();
map(0x600000, 0x63ffff).ram(); /* The Mating Game has an extra 256kB RAM on the program card */
-// map(0x640000, 0x7fffff) AM_NOP /* Possible bug, reads and writes here */
+// map(0x640000, 0x7fffff).noprw(); /* Possible bug, reads and writes here */
map(0x800000, 0x80ffff).ram().share("vid_mainram");
map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w));
@@ -1217,7 +1217,7 @@ void mpu4vid_state::mpu4oki_68k_map(address_map &map)
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(FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff);
-// map(0xfff000, 0xffffff) AM_NOP /* Possible bug, reads and writes here */
+// map(0xfff000, 0xffffff).noprw(); /* Possible bug, reads and writes here */
}
void mpu4vid_state::bwbvid_68k_map(address_map &map)
@@ -1228,13 +1228,13 @@ void mpu4vid_state::bwbvid_68k_map(address_map &map)
map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
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(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(0xa00000, 0xa0000f).rw(FUNC(mpu4vid_state::bt471_r), FUNC(mpu4vid_state::bt471_w)); //Some games use this
+// map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::mpu4_vid_unmap_r), FUNC(mpu4vid_state::mpu4_vid_unmap_w));
map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff);
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 ?
+ //map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::bwb_characteriser16_r), FUNC(mpu4vid_state::bwb_characteriser16_w)); //.rw(FUNC(mpu4vid_state::adpcm_r), FUNC(mpu4vid_state::adpcm_w)); CHR ?
}
void mpu4vid_state::bwbvid5_68k_map(address_map &map)
@@ -1245,8 +1245,8 @@ void mpu4vid_state::bwbvid5_68k_map(address_map &map)
map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
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(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(0xa00000, 0xa00003).rw(FUNC(mpu4vid_state::bt471_r), FUNC(mpu4vid_state::bt471_w)).umask16(0x00ff); Some games use this
+// map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::mpu4_vid_unmap_r), FUNC(mpu4vid_state::mpu4_vid_unmap_w));
map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff);
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);
@@ -1254,7 +1254,7 @@ void mpu4vid_state::bwbvid5_68k_map(address_map &map)
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(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 ?
+ map(0xe04000, 0xe0400f).rw(FUNC(mpu4vid_state::bwb_characteriser_r), FUNC(mpu4vid_state::bwb_characteriser_w)).umask16(0x00ff); //.rw(FUNC(mpu4vid_state::adpcm_r), FUNC(mpu4vid_state::adpcm_w)); CHR ?
}
/* TODO: Fix up MPU4 map*/
diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp
index d3c5112b116..ff2ea701a26 100644
--- a/src/mame/drivers/ms32.cpp
+++ b/src/mame/drivers/ms32.cpp
@@ -648,20 +648,20 @@ 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(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(0xc0008000, 0xc01fffff) // mirrors of nvramram, handled above */
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(0xc1188000, 0xc11bffff) // mirrors of priram, handled above */
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(0xc1440000, 0xc145ffff) // mirrors of palram, handled above */
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(0xc2020000, 0xc21fffff) // mirrors of rozram, handled above */
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(0xc2202000, 0xc23fffff) // mirrors of lineram, handled above */
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(0xc2840000, 0xc29fffff) // mirrors of sprram, handled above */
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(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 */
@@ -673,7 +673,7 @@ void ms32_state::ms32_map(address_map &map)
map(0xfce00034, 0xfce00037).nopw(); // irq ack?
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, 0xfce0007f).writeonly().share("ms32_fce00000"); /* registers not ram? */
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 */
@@ -836,14 +836,14 @@ what the operations might be, my maths isn't up to much though...
*/
-// AM_RANGE(0xfce00800, 0xfce0085f) // f1superb, roz #2 control?
-///**/AM_RANGE(0xfd104000, 0xfd105fff) AM_RAM /* f1superb */
-///**/AM_RANGE(0xfd144000, 0xfd145fff) AM_RAM /* f1superb */
-///**/AM_RANGE(0xfd440000, 0xfd47ffff) AM_RAM /* f1superb color */
-///**/AM_RANGE(0xfdc00000, 0xfdc006ff) AM_RAM /* f1superb */
-///**/AM_RANGE(0xfde00000, 0xfde01fff) AM_RAM /* f1superb lineram #2? */
-///**/AM_RANGE(0xfe202000, 0xfe2fffff) AM_RAM /* f1superb vram */
-// AM_RANGE(0xfd0e0000, 0xfd0e0003) AM_READ(ms32_read_inputs3) /* analog controls in f1superb? */
+// map(0xfce00800, 0xfce0085f) // f1superb, roz #2 control?
+///**/map(0xfd104000, 0xfd105fff).ram(); /* f1superb */
+///**/map(0xfd144000, 0xfd145fff).ram(); /* f1superb */
+///**/map(0xfd440000, 0xfd47ffff).ram(); /* f1superb color */
+///**/map(0xfdc00000, 0xfdc006ff).ram(); /* f1superb */
+///**/map(0xfde00000, 0xfde01fff).ram(); /* f1superb lineram #2? */
+///**/map(0xfe202000, 0xfe2fffff).ram(); /* f1superb vram */
+// map(0xfd0e0000, 0xfd0e0003).r(FUNC(ms32_state::ms32_read_inputs3)); /* analog controls in f1superb? */
/*************************************
*
diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp
index 37c029fda7e..e6381222243 100644
--- a/src/mame/drivers/msisaac.cpp
+++ b/src/mame/drivers/msisaac.cpp
@@ -203,15 +203,15 @@ void msisaac_state::msisaac_map(address_map &map)
map(0xf082, 0xf082).portr("DSW3");
map(0xf083, 0xf083).portr("IN0");
map(0xf084, 0xf084).portr("IN1");
-// AM_RANGE(0xf086, 0xf086) AM_READ_PORT("IN2")
+// map(0xf086, 0xf086).portr("IN2");
map(0xf100, 0xf17f).ram().share("spriteram"); //sprites
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)
+// map(0xf801, 0xf801).w(FUNC(msisaac_state::msisaac_bgcolor_w));
+// map(0xfc00, 0xfc00).w(FUNC(msisaac_state::flip_screen_w));
+// map(0xfc03, 0xfc04).w(FUNC(msisaac_state::msisaac_coin_counter_w));
}
WRITE8_MEMBER(msisaac_state::sound_control_0_w)
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index 4dce16f278e..6b94979380b 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -288,7 +288,7 @@ void mstation_state::mstation_io(address_map &map)
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
+ //map(0x2c, 0x2c) printer
}
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index a0e1d5bc07b..829252997f9 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -953,11 +953,11 @@ void igrosoft_gamble_state::igrosoft_gamble_portmap(address_map &map)
/* Write ports not hooked up yet */
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(0x32, 0x32).w(FUNC(igrosoft_gamble_state::igrosoft_gamble_port32_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(0x36, 0x36).w(FUNC(igrosoft_gamble_state::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));
diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp
index dbdeae5d33b..381f6d01bb5 100644
--- a/src/mame/drivers/multi8.cpp
+++ b/src/mame/drivers/multi8.cpp
@@ -348,7 +348,7 @@ void multi8_state::mem_map(address_map &map)
void multi8_state::io_map(address_map &map)
{
-// ADDRESS_MAP_UNMAP_HIGH
+// map.unmap_value_high();
map.global_mask(0xff);
map(0x00, 0x00).r(FUNC(multi8_state::key_input_r)); //keyboard
map(0x01, 0x01).r(FUNC(multi8_state::key_status_r)); //keyboard
@@ -363,8 +363,8 @@ void multi8_state::io_map(address_map &map)
map(0x2c, 0x2d).rw("pic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)); //i8259
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
+// map(0x70, 0x74) //upd765a fdc
+// map(0x78, 0x78) //memory banking
}
/* Input ports */
diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp
index 327cbc5da46..9364d182f7a 100644
--- a/src/mame/drivers/murogmbl.cpp
+++ b/src/mame/drivers/murogmbl.cpp
@@ -176,7 +176,7 @@ void slotunbl_state::slotunbl_map(address_map &map)
map(0x4000, 0x43ff).ram();
map(0x4800, 0x4fff).ram();
map(0x5000, 0x53ff).ram().share("video");
-// AM_RANGE(0x5400, 0x5fff) AM_RAM
+// map(0x5400, 0x5fff).ram();
map(0x6000, 0x6000).portr("IN0");
map(0x6800, 0x6800).portr("DSW");
map(0x7000, 0x7000).portr("IN1");
diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp
index c164c65afdc..d261431a2cc 100644
--- a/src/mame/drivers/mvme147.cpp
+++ b/src/mame/drivers/mvme147.cpp
@@ -241,13 +241,13 @@ void mvme147_state::mvme147_mem(address_map &map)
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 */
+ map(0xff800000, 0xff9fffff).rom().region("roms", 0x800000); //mirror(0x00780000); /* ROM/EEPROM bank 1 - 147bug */
+ map(0xffa00000, 0xffbfffff).rom().region("roms", 0xa00000); //mirror(0x00780000); /* ROM/EEPROM bank 2 - unpopulated */
/* SGS-Thompson M48T18 RAM and clock chip, only 4088 bytes used, and 8 bytes for the RTC, out of 8Kb though */
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(0xfffe1000, 0xfffe100f).rw(FUNC(mvme147_state::pcc32_r), FUNC(mvme147_state::pcc32_w)); /* PCC 32 bits registers - needs U64 cast defined to work */
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 */
@@ -255,8 +255,8 @@ void mvme147_state::mvme147_mem(address_map &map)
map(0xfffe3000, 0xfffe3003).rw(m_sccterm, FUNC(scc85c30_device::ab_dc_r), FUNC(scc85c30_device::ab_dc_w)); /* Port 1&2 - Dual serial port Z80-SCC */
map(0xfffe3800, 0xfffe3803).rw(m_sccterm2, FUNC(scc85c30_device::ab_dc_r), FUNC(scc85c30_device::ab_dc_w)); /* Port 3&4 - Dual serial port Z80-SCC */
- //AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */
- //AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */
+ //map(0x100000, 0xfeffff).rw(FUNC(mvme147_state::vme_a24_r), FUNC(mvme147_state::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) - not verified */
+ //map(0xff0000, 0xffffff).rw(FUNC(mvme147_state::vme_a16_r), FUNC(mvme147_state::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) - not verified */
}
/* Input ports */
diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp
index 0759dead3b3..6eb7264e9bf 100644
--- a/src/mame/drivers/myb3k.cpp
+++ b/src/mame/drivers/myb3k.cpp
@@ -566,7 +566,7 @@ WRITE8_MEMBER( myb3k_state::myb3k_video_mode_w )
void myb3k_state::myb3k_map(address_map &map)
{
map.unmap_value_high();
- //AM_RANGE(0x00000,0x3ffff) AM_RAM // It's either 128Kb or 256Kb RAM installed by machine_start()
+ //map(0x00000,0x3ffff).ram(); // It's either 128Kb or 256Kb RAM installed by machine_start()
map(0x40000, 0x7ffff).noprw();
map(0x80000, 0xcffff).noprw(); // Expansion Unit connected through an ISA8 cable
map(0xd0000, 0xeffff).ram().share("vram"); // Area 6, physical at 30000-3FFFF (128Kb RAM) or 10000-1FFFF (256KB RAM)
diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp
index 27534cd8867..74459784666 100644
--- a/src/mame/drivers/myvision.cpp
+++ b/src/mame/drivers/myvision.cpp
@@ -76,7 +76,7 @@ private:
void myvision_state::myvision_mem(address_map &map)
{
map.unmap_value_high();
- //AM_RANGE(0x0000, 0x5fff) // mapped by the cartslot
+ //map(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));
diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp
index dce21ba2af8..db6980283c0 100644
--- a/src/mame/drivers/mz2000.cpp
+++ b/src/mame/drivers/mz2000.cpp
@@ -424,7 +424,7 @@ void mz2000_state::mz80b_io(address_map &map)
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(FUNC(mz2000_state::timer_w));
-// AM_RANGE(0xf4, 0xf4) AM_WRITE(vram_bank_w)
+// map(0xf4, 0xf4).w(FUNC(mz2000_state::vram_bank_w));
}
void mz2000_state::mz2000_io(address_map &map)
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp
index 3d1f7760ace..e04a521dd53 100644
--- a/src/mame/drivers/mz2500.cpp
+++ b/src/mame/drivers/mz2500.cpp
@@ -1232,17 +1232,17 @@ WRITE8_MEMBER(mz2500_state::mz2500_emm_data_w)
void mz2500_state::mz2500_io(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0x60, 0x63) AM_WRITE(w3100a_w)
-// AM_RANGE(0x63, 0x63) AM_READ(w3100a_r)
-// AM_RANGE(0x98, 0x99) ADPCM, unknown type, custom?
+// map(0x60, 0x63).w(FUNC(mz2500_state::w3100a_w));
+// map(0x63, 0x63).r(FUNC(mz2500_state::w3100a_r));
+// map(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(0xa4, 0xa5).rw(FUNC(mz2500_state::sasi_r), FUNC(mz2500_state::sasi_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(0xb0, 0xb3).rw(FUNC(mz2500_state::sio_r), FUNC(mz2500_state::sio_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();
@@ -1254,7 +1254,7 @@ void mz2500_state::mz2500_io(address_map &map)
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(0xca, 0xca).rw(FUNC(mz2500_state::voice_r), FUNC(mz2500_state::voice_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));
@@ -1268,7 +1268,7 @@ void mz2500_state::mz2500_io(address_map &map)
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)
+// map(0xf8, 0xf9).rw(FUNC(mz2500_state::extrom_r), FUNC(mz2500_state::extrom_w));
}
/* Input ports */
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp
index 6c965638dcc..53de3d3810d 100644
--- a/src/mame/drivers/mz3500.cpp
+++ b/src/mame/drivers/mz3500.cpp
@@ -604,12 +604,12 @@ void mz3500_state::mz3500_master_map(address_map &map)
void mz3500_state::mz3500_master_io(address_map &map)
{
map.global_mask(0xff);
-// ADDRESS_MAP_UNMAP_HIGH
-// AM_RANGE(0xe4, 0xe7) SFD upd765
-// AM_RANGE(0xe8, 0xeb) SFD I/O port and DMAC chip select
-// AM_RANGE(0xec, 0xef) irq signal from slave to master CPU
+// map.unmap_value_high();
+// map(0xe4, 0xe7) SFD upd765
+// map(0xe8, 0xeb) SFD I/O port and DMAC chip select
+// map(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, 0xfb) MFD I/O port
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
@@ -626,9 +626,9 @@ void mz3500_state::mz3500_slave_io(address_map &map)
{
map.global_mask(0xff);
map.unmap_value_high();
-// AM_RANGE(0x00, 0x0f) f/f and irq to master CPU
-// AM_RANGE(0x10, 0x1f) i8251
-// AM_RANGE(0x20, 0x2f) pit8253
+// map(0x00, 0x0f) f/f and irq to master CPU
+// map(0x10, 0x1f) i8251
+// map(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(FUNC(mz3500_state::mz3500_crtc_w));
@@ -800,7 +800,7 @@ void mz3500_state::upd7220_1_map(address_map &map)
void mz3500_state::upd7220_2_map(address_map &map)
{
- map(0x00000, 0x3ffff).ram(); // AM_SHARE("video_ram_2")
+ map(0x00000, 0x3ffff).ram(); // .share("video_ram_2");
}
static void mz3500_floppies(device_slot_interface &device)
diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp
index b26540cd920..6aec9a7b173 100644
--- a/src/mame/drivers/mz6500.cpp
+++ b/src/mame/drivers/mz6500.cpp
@@ -88,7 +88,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(0xa0000,0xbffff) kanji/dictionary ROM
map(0xc0000, 0xeffff).rw(FUNC(mz6500_state::mz6500_vram_r), FUNC(mz6500_state::mz6500_vram_w));
map(0xfc000, 0xfffff).rom().region("ipl", 0);
}
@@ -96,27 +96,27 @@ void mz6500_state::mz6500_map(address_map &map)
void mz6500_state::mz6500_io(address_map &map)
{
map.unmap_value_high();
-// AM_RANGE(0x0000, 0x000f) i8237 dma
-// AM_RANGE(0x0010, 0x001f) i8255
+// map(0x0000, 0x000f) i8237 dma
+// map(0x0010, 0x001f) i8255
map(0x0020, 0x0021).mirror(0xe).m(m_fdc, FUNC(upd765a_device::map));
-// AM_RANGE(0x0030, 0x003f) i8259 master
-// AM_RANGE(0x0040, 0x004f) i8259 slave
-// AM_RANGE(0x0050, 0x0050) segment byte for DMA
-// AM_RANGE(0x0060, 0x0060) system port A
-// AM_RANGE(0x0070, 0x0070) system port C
-// AM_RANGE(0x00cd, 0x00cd) MZ-1R32
+// map(0x0030, 0x003f) i8259 master
+// map(0x0040, 0x004f) i8259 slave
+// map(0x0050, 0x0050) segment byte for DMA
+// map(0x0060, 0x0060) system port A
+// map(0x0070, 0x0070) system port C
+// map(0x00cd, 0x00cd) MZ-1R32
map(0x0100, 0x0103).mirror(0xc).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask16(0x00ff);
-// AM_RANGE(0x0110, 0x011f) video address / data registers (priority)
-// AM_RANGE(0x0120, 0x012f) video registers
-// AM_RANGE(0x0130, 0x013f) video register
-// AM_RANGE(0x0140, 0x015f) palette pens
-// AM_RANGE(0x0200, 0x020f) z80sio
-// AM_RANGE(0x0210, 0x021f) z80ctc
-// AM_RANGE(0x0220, 0x022f) rp5c01
-// AM_RANGE(0x0230, 0x023f) ay-3-8912
-// AM_RANGE(0x0240, 0x0240) z80ctc vector ack
-// AM_RANGE(0x0250, 0x0250) z80sio vector ack
-// AM_RANGE(0x0270, 0x0270) system port B
+// map(0x0110, 0x011f) video address / data registers (priority)
+// map(0x0120, 0x012f) video registers
+// map(0x0130, 0x013f) video register
+// map(0x0140, 0x015f) palette pens
+// map(0x0200, 0x020f) z80sio
+// map(0x0210, 0x021f) z80ctc
+// map(0x0220, 0x022f) rp5c01
+// map(0x0230, 0x023f) ay-3-8912
+// map(0x0240, 0x0240) z80ctc vector ack
+// map(0x0250, 0x0250) z80sio vector ack
+// map(0x0270, 0x0270) system port B
}
/* Input ports */
diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp
index 76d5fb7af3f..55b661bebd6 100644
--- a/src/mame/drivers/mzr8105.cpp
+++ b/src/mame/drivers/mzr8105.cpp
@@ -192,8 +192,8 @@ void mzr8105_state::mzr8105_mem(address_map &map)
map(0x000000, 0x003fff).rom().region("roms", 0x000000); /* System EPROM Area 16Kb OS9 DEBUG - not verified */
map(0x004000, 0x01ffff).rom().region("roms", 0x004000);/* System EPROM Area 112Kb for System ROM - not verified */
map(0x020000, 0x03ffff).ram(); /* Not verified */
-// AM_RANGE (0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */
-// AM_RANGE (0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */
+// map(0x100000, 0xfeffff).rw(FUNC(mzr8105_state::vme_a24_r), FUNC(mzr8105_state::vme_a24_w)); /* VMEbus Rev B addresses (24 bits) - not verified */
+// map(0xff0000, 0xffffff).rw(FUNC(mzr8105_state::vme_a16_r), FUNC(mzr8105_state::vme_a16_w)); /* VMEbus Rev B addresses (16 bits) - not verified */
}
/* Input ports */
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 669dcc50200..8d0d7520309 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -3012,7 +3012,7 @@ void namcos23_state::gmen_sh2_map(address_map &map)
map(0x00000000, 0x0000ffff).ram().share("gmen_sh2_shared");
map(0x00800000, 0x008fffff).rom().region("data", 0xc00000); //c00000 "data" for final furlong 2. 0x1b6bc0 "user1" for gunmen wars
map(0x01800000, 0x0183ffff).ram(); // ???
- //AM_RANGE(0x02800000, 0x02800003) AM_RAM // probably transfer status related, reads/writes after each end of flash transfer, TBD
+ //map(0x02800000, 0x02800003).ram(); // probably transfer status related, reads/writes after each end of flash transfer, TBD
map(0x04000000, 0x043fffff).ram(); // SH-2 main work RAM (SDRAM)
map(0x06000000, 0x06000003).noprw(); // serial port for camera?
}
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index 4e982e40032..02946e1ca25 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -170,10 +170,10 @@ void nanos_state::io_map(address_map &map)
map(0xA4, 0xA7).rw(m_ctc_1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
/* 256-k RAM card I - 64k OS-Memory + 192k-RAM-Floppy */
- //AM_RANGE(0xC0, 0xC7)
+ //map(0xC0, 0xC7)
/* 256-k RAM card II - 64k OS-Memory + 192k-RAM-Floppy */
- //AM_RANGE(0xC8, 0xCF)
+ //map(0xC8, 0xCF)
}
/* Input ports */
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index c41b9ae0c93..e97ed70a585 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -1754,13 +1754,13 @@ void naomi_state::naomi_map(address_map &map)
map(0x13000000, 0x13ffffff).w(m_powervr2, FUNC(powervr2_device::ta_texture_directpath1_w)); // access to texture / framebuffer memory (either 32-bit or 64-bit area depending on SB_LMMODE1 register - cannot be written directly, only through dma / store queue)
/* Area 5 */
- //AM_RANGE(0x14000000, 0x17ffffff) AM_NOP // MPX Ext.
+ //map(0x14000000, 0x17ffffff).noprw(); // MPX Ext.
/* Area 6 */
- //AM_RANGE(0x18000000, 0x1bffffff) AM_NOP // Unassigned
+ //map(0x18000000, 0x1bffffff).noprw(); // Unassigned
/* Area 7 */
- //AM_RANGE(0x1c000000, 0x1fffffff) AM_NOP // SH4 Internal
+ //map(0x1c000000, 0x1fffffff).noprw(); // SH4 Internal
}
/*
@@ -1797,9 +1797,9 @@ void naomi2_state::naomi2_map(address_map &map)
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));
-// AM_RANGE(0x025f6800, 0x025f69ff) AM_READWRITE(dc_sysctrl_r, dc_sysctrl_w ) // second PVR DMA!
-// AM_RANGE(0x025f7c00, 0x025f7cff) AM_DEVREADWRITE32("powervr2", powervr2_device, pvr_ctrl_r, pvr_ctrl_w, 0xffffffffffffffffU)
-// AM_RANGE(0x005f8000, 0x005f9fff) AM_MIRROR(0x02000000) AM_DEVICE32("powervr2", powervr2_device, ta_map, 0xffffffffffffffffU)
+// map(0x025f6800, 0x025f69ff).rw(FUNC(naomi2_state::dc_sysctrl_r), FUNC(naomi2_state::dc_sysctrl_w)); // second PVR DMA!
+// map(0x025f7c00, 0x025f7cff).rw("powervr2", FUNC(powervr2_device::pvr_ctrl_r), FUNC(powervr2_device::pvr_ctrl_w));
+// map(0x005f8000, 0x005f9fff).mirror(0x02000000).m("powervr2", FUNC(powervr2_device::ta_map));
/* Area 1 */
map(0x04000000, 0x04ffffff).ram().share("dc_texture_ram"); // texture memory 64 bit access
@@ -1811,7 +1811,7 @@ void naomi2_state::naomi2_map(address_map &map)
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(0x09000000, 0x09??????) T&L command processing
map(0x0a000000, 0x0bffffff).ram().share("elan_ram"); // T&L chip RAM
/* Area 3 */
@@ -1825,13 +1825,13 @@ void naomi2_state::naomi2_map(address_map &map)
map(0x13000000, 0x13ffffff).w(m_powervr2, FUNC(powervr2_device::ta_texture_directpath1_w)); // access to texture / framebuffer memory (either 32-bit or 64-bit area depending on SB_LMMODE1 register - cannot be written directly, only through dma / store queue)
/* Area 5 */
- //AM_RANGE(0x14000000, 0x17ffffff) AM_NOP // MPX Ext.
+ //map(0x14000000, 0x17ffffff).noprw(); // MPX Ext.
/* Area 6 */
- //AM_RANGE(0x18000000, 0x1bffffff) AM_NOP // Unassigned
+ //map(0x18000000, 0x1bffffff).noprw(); // Unassigned
/* Area 7 */
- //AM_RANGE(0x1c000000, 0x1fffffff) AM_NOP // SH4 Internal
+ //map(0x1c000000, 0x1fffffff).noprw(); // SH4 Internal
}
@@ -1994,13 +1994,13 @@ void atomiswave_state::aw_map(address_map &map)
/* Area 5 */
- //AM_RANGE(0x14000000, 0x17ffffff) AM_NOP // MPX Ext.
+ //map(0x14000000, 0x17ffffff).noprw(); // MPX Ext.
/* Area 6 */
- //AM_RANGE(0x18000000, 0x1bffffff) AM_NOP // Unassigned
+ //map(0x18000000, 0x1bffffff).noprw(); // Unassigned
/* Area 7 */
- //AM_RANGE(0x1c000000, 0x1fffffff) AM_NOP // SH4 Internal
+ //map(0x1c000000, 0x1fffffff).noprw(); // SH4 Internal
}
void atomiswave_state::aw_port(address_map &map)
diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp
index 3d089a3ba75..6b9f898449a 100644
--- a/src/mame/drivers/nbmj8688.cpp
+++ b/src/mame/drivers/nbmj8688.cpp
@@ -166,8 +166,8 @@ void nbmj8688_state::secolove_io_map(address_map &map)
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).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
+// map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w));
}
@@ -197,7 +197,7 @@ WRITE8_MEMBER(nbmj8688_state::barline_output_w)
void nbmj8688_state::barline_io_map(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0x00, 0x7f) AM_DEVREAD("nb1413m3", nb1413m3_device, sndrom_r)
+// map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r));
map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::sndrombank1_w));
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));
@@ -207,7 +207,7 @@ void nbmj8688_state::barline_io_map(address_map &map)
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(0xd0, 0xd0).w("dac", FUNC(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));
@@ -228,9 +228,9 @@ void nbmj8688_state::crystalg_io_map(address_map &map)
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)
+// map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
+// map(0xf0, 0xf0).nopw();
+// map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
}
@@ -292,8 +292,8 @@ void nbmj8688_state::iemoto_io_map(address_map &map)
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).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
+// map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w));
}
@@ -315,8 +315,8 @@ void nbmj8688_state::seiha_io_map(address_map &map)
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).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
+// map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w));
}
@@ -336,8 +336,8 @@ void nbmj8688_state::mjgaiden_io_map(address_map &map)
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).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
+// map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w));
}
@@ -362,8 +362,8 @@ void nbmj8688_state::p16bit_LCD_io_map(address_map &map)
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).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
+// map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w));
}
@@ -407,8 +407,8 @@ void nbmj8688_state::mmsikaku_io_map(address_map &map)
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).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
+// map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
map(0xf0, 0xf0).w(FUNC(nbmj8688_state::scrolly_w));
}
diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp
index 376b129c49e..9bd8cf40530 100644
--- a/src/mame/drivers/nbmj8891.cpp
+++ b/src/mame/drivers/nbmj8891.cpp
@@ -351,7 +351,7 @@ void nbmj8891_state::gionbana_io_map(address_map &map)
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(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //.nopw();
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));
@@ -371,7 +371,7 @@ void nbmj8891_state::mgion_io_map(address_map &map)
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(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //.nopw();
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));
@@ -387,7 +387,7 @@ void nbmj8891_state::omotesnd_io_map(address_map &map)
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(0x50, 0x50).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_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));
@@ -414,10 +414,10 @@ void nbmj8891_state::hanamomo_io_map(address_map &map)
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(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //.nopw();
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(0xe0, 0xe0).nopw();
+ map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); //.nopw();
map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
}
@@ -434,10 +434,10 @@ void nbmj8891_state::msjiken_io_map(address_map &map)
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(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); //.nopw();
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(0xe0, 0xe0).nopw();
+ map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); //.nopw();
map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
}
@@ -456,8 +456,8 @@ void nbmj8891_state::scandal_io_map(address_map &map)
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::data_w));
-// AM_RANGE(0xe0, 0xe0) AM_WRITENOP
- map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); //AM_WRITENOP
+// map(0xe0, 0xe0).nopw();
+ map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); //.nopw();
map(0xf1, 0xf1).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
}
@@ -477,7 +477,7 @@ void nbmj8891_state::scandalm_io_map(address_map &map)
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::data_w));
-// AM_RANGE(0xe0, 0xe0) AM_WRITENOP
+// map(0xe0, 0xe0).nopw();
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));
}
@@ -498,7 +498,7 @@ void nbmj8891_state::bananadr_io_map(address_map &map)
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::data_w));
-// AM_RANGE(0xe0, 0xe0) AM_WRITENOP
+// map(0xe0, 0xe0).nopw();
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));
}
@@ -513,7 +513,7 @@ void nbmj8891_state::lovehous_io_map(address_map &map)
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(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).portr("PORT0-2");
@@ -536,7 +536,7 @@ void nbmj8891_state::maiko_io_map(address_map &map)
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(0xc0, 0xc0).portr("PORT0-2"); //.nopw();
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));
@@ -549,11 +549,11 @@ void nbmj8891_state::taiwanmb_io_map(address_map &map)
map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r));
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)); //AM_WRITENOP // ?
+ 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));
-// AM_RANGE(0xc0, 0xc0) AM_WRITENOP // ?
-// AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
+// map(0xc0, 0xc0).nopw(); // ?
+// map(0xd0, 0xd0).r(FUNC(nbmj8891_state::ff_r)); // irq ack? watchdog?
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));
diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp
index 7718d3c8023..71542e9e8a4 100644
--- a/src/mame/drivers/nbmj8991.cpp
+++ b/src/mame/drivers/nbmj8991.cpp
@@ -176,7 +176,7 @@ void nbmj8991_state::galkoku_io_map(address_map &map)
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::data_w));
-// AM_RANGE(0xe0, 0xe0) AM_WRITENOP
+// map(0xe0, 0xe0).nopw();
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));
}
@@ -192,7 +192,7 @@ void nbmj8991_state::hyouban_io_map(address_map &map)
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::data_w));
-// AM_RANGE(0xe0, 0xe0) AM_WRITENOP
+// map(0xe0, 0xe0).nopw();
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));
}
@@ -204,9 +204,9 @@ void nbmj8991_state::pstadium_io_map(address_map &map)
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));
- map(0xb0, 0xb0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r)); //AM_WRITENOP
+ map(0xb0, 0xb0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r)); //.nopw();
map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r));
-// AM_RANGE(0xd0, 0xd0) AM_WRITENOP
+// map(0xd0, 0xd0).nopw();
map(0xf0, 0xf0).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r), FUNC(nb1413m3_device::outcoin_w));
map(0xf8, 0xf8).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
}
@@ -220,9 +220,9 @@ void nbmj8991_state::av2mj1bb_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::vcrctrl_w));
map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r));
-// AM_RANGE(0xd0, 0xd0) AM_WRITENOP
+// map(0xd0, 0xd0).nopw();
map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r));
-// AM_RANGE(0xf0, 0xf0) AM_WRITENOP
+// map(0xf0, 0xf0).nopw();
map(0xf8, 0xf8).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r));
}
diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp
index 83c9c5019b7..d88fb7b64c5 100644
--- a/src/mame/drivers/neogeocd.cpp
+++ b/src/mame/drivers/neogeocd.cpp
@@ -926,7 +926,7 @@ void ngcd_state::neocd_audio_io_map(address_map &map)
map(0x04, 0x07).mirror(0xff00).rw(m_ym, FUNC(ym2610_device::read), FUNC(ym2610_device::write));
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(0x08, 0x0b).mirror(0x00f0).select(0xff00).r(FUNC(ngcd_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/neoprint.cpp b/src/mame/drivers/neoprint.cpp
index a074b6c05f7..21e490bdd0d 100644
--- a/src/mame/drivers/neoprint.cpp
+++ b/src/mame/drivers/neoprint.cpp
@@ -259,7 +259,7 @@ WRITE8_MEMBER(neoprint_state::audio_result_w)
void neoprint_state::neoprint_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
-/* AM_RANGE(0x100000, 0x17ffff) multi-cart or banking, some writes points here if anything lies there too */
+/* map(0x100000, 0x17ffff) multi-cart or banking, some writes points here if anything lies there too */
map(0x200000, 0x20ffff).ram();
map(0x300000, 0x30ffff).ram().share("nvram");
map(0x400000, 0x43ffff).ram().share("npvidram");
@@ -356,11 +356,11 @@ void neoprint_state::nprsp_map(address_map &map)
void neoprint_state::neoprint_audio_map(address_map &map)
{
- map(0x0000, 0x7fff).rom();//AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_MAIN_BANK)
-// AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 3)
-// AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 2)
-// AM_RANGE(0xe000, 0xefff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 1)
-// AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 0)
+ map(0x0000, 0x7fff).rom();//.bankr(NEOGEO_BANK_AUDIO_CPU_MAIN_BANK);
+// map(0x8000, 0xbfff).bankr(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 3);
+// map(0xc000, 0xdfff).bankr(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 2);
+// map(0xe000, 0xefff).bankr(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 1);
+// map(0xf000, 0xf7ff).bankr(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 0);
map(0xf800, 0xffff).ram();
}
@@ -374,16 +374,16 @@ 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).rw(FUNC(neoprint_state::audio_command_r), FUNC(neoprint_state::audio_cpu_clear_nmi_w));*/ /* may not and NMI clear */
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(0x08, 0x08).mirror(0xff00); /* write - NMI enable / acknowledge? (the data written doesn't matter) */
+// map(0x08, 0x08).select(0xfff0).r(FUNC(neoprint_state::audio_cpu_bank_select_f000_f7ff_r));
+// map(0x09, 0x09).select(0xfff0).r(FUNC(neoprint_state::audio_cpu_bank_select_e000_efff_r));
+// map(0x0a, 0x0a).select(0xfff0).r(FUNC(neoprint_state::audio_cpu_bank_select_c000_dfff_r));
+// map(0x0b, 0x0b).select(0xfff0).r(FUNC(neoprint_state::audio_cpu_bank_select_8000_bfff_r));
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) */
+// map(0x18, 0x18).mirror(0xff00); /* write - NMI disable? (the data written doesn't matter) */
}
static INPUT_PORTS_START( neoprint )
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index 61aeadf52f4..07c9636e756 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -899,38 +899,38 @@ void next_state::next_mem(address_map &map)
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(0x02006010, 0x02006013).mirror(0x300000); memory timing
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(0x0200d800, 0x0200d803).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(0x0200f000, 0x0200f003).mirror(0x300000); printer
+// map(0x02010000, 0x02010003).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(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(0x02018004, 0x02018007).mirror(0x300000); SCC CLK
+// map(0x02018190, 0x02018197).mirror(0x300000); warp 9c DRAM timing
+// map(0x02018198, 0x0201819f).mirror(0x300000); warp 9c VRAM timing
map(0x0201a000, 0x0201a003).mirror(0x300000).r(FUNC(next_state::event_counter_r)); // EVENTC
-// AM_RANGE(0x020c0000, 0x020c0004) AM_MIRROR(0x300000) BMAP
+// map(0x020c0000, 0x020c0004).mirror(0x300000); BMAP
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
-// AM_RANGE(0x0e000000, 0x0e03ffff) video RAM w ceil(A+B) function
-// AM_RANGE(0x0f000000, 0x0f03ffff) video RAM w AB function
-// AM_RANGE(0x10000000, 0x1003ffff) main RAM w A+B-AB function
-// AM_RANGE(0x14000000, 0x1403ffff) main RAM w (1-A)B function
-// AM_RANGE(0x18000000, 0x1803ffff) main RAM w ceil(A+B) function
-// AM_RANGE(0x1c000000, 0x1c03ffff) main RAM w AB function
+// map(0x0c000000, 0x0c03ffff) video RAM w A+B-AB function
+// map(0x0d000000, 0x0d03ffff) video RAM w (1-A)B function
+// map(0x0e000000, 0x0e03ffff) video RAM w ceil(A+B) function
+// map(0x0f000000, 0x0f03ffff) video RAM w AB function
+// map(0x10000000, 0x1003ffff) main RAM w A+B-AB function
+// map(0x14000000, 0x1403ffff) main RAM w (1-A)B function
+// map(0x18000000, 0x1803ffff) main RAM w ceil(A+B) function
+// map(0x1c000000, 0x1c03ffff) main RAM w AB function
}
void next_state::next_0b_m_nofdc_mem(address_map &map)
diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp
index 85c65c2855d..a3bf0d6e4f8 100644
--- a/src/mame/drivers/ngen.cpp
+++ b/src/mame/drivers/ngen.cpp
@@ -874,13 +874,13 @@ void ngen_state::ngen_io(address_map &map)
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
-// AM_RANGE(0x0108, 0x0109) AM_WRITE8(fdc_control_w,0x00ff)
-// AM_RANGE(0x010a, 0x010b) AM_WRITE8(hdc_control_w,0x00ff)
-// AM_RANGE(0x010e, 0x010f) AM_WRITE8(disk_addr_ext,0x00ff) // X-Bus extended address register
-// AM_RANGE(0x0110, 0x0117) AM_DEVREADWRITE8("fdc_timer",pit8253_device,read,write,0x00ff)
+// map(0x0100, 0x0107).rw("fdc", FUNC(wd2797_t::read), FUNC(wd2797_t::write)).umask16(0x00ff); // a guess for now
+// map(0x0108, 0x0108).w(FUNC(ngen_state::fdc_control_w));
+// map(0x010a, 0x010a).w(FUNC(ngen_state::hdc_control_w));
+// map(0x010e, 0x010e).w(FUNC(ngen_state::disk_addr_ext)); // X-Bus extended address register
+// map(0x0110, 0x0117).rw("fdc_timer", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff);
// 0x0120-0x012f - WD1010 Winchester disk controller (unemulated)
-// AM_RANGE(0x0130, 0x0137) AM_DEVREADWRITE8("hdc_timer",pit8253_device,read,write,0x00ff)
+// map(0x0130, 0x0137).rw("hdc_timer", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff);
}
@@ -908,7 +908,7 @@ void ngen_state::ngen386i_mem(address_map &map)
void ngen_state::ngen386_io(address_map &map)
{
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(0xf800, 0xfeff).rw(FUNC(ngen_state::peripheral_r), FUNC(ngen_state::peripheral_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));
}
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index 2c0aa1d27f0..0fc9c61cda5 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -982,11 +982,11 @@ void nmk16_state::tdragon_map(address_map &map)
{
map(0x000000, 0x03ffff).rom();
map(0x044022, 0x044023).nopr(); /* No Idea */
-// AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM /* Work RAM */
-// AM_RANGE(0x0b8000, 0x0b8fff) AM_RAM AM_SHARE("spriteram") /* Sprite RAM */
-// AM_RANGE(0x0b9000, 0x0bdfff) AM_RAM AM_SHARE("mcu_work_ram") /* Work RAM */
-// AM_RANGE(0x0be000, 0x0befff) AM_READWRITE(mcu_shared_r,tdragon_mcu_shared_w) AM_SHARE("mcu_shared_ram") /* Work RAM */
-// AM_RANGE(0x0bf000, 0x0bffff) AM_RAM /* Work RAM */
+// map(0x0b0000, 0x0b7fff).ram(); /* Work RAM */
+// map(0x0b8000, 0x0b8fff).ram().share("spriteram"); /* Sprite RAM */
+// map(0x0b9000, 0x0bdfff).ram().share("mcu_work_ram"); /* Work RAM */
+// map(0x0be000, 0x0befff).rw(FUNC(nmk16_state::mcu_shared_r), FUNC(nmk16_state::tdragon_mcu_shared_w)).share("mcu_shared_ram"); /* Work RAM */
+// map(0x0bf000, 0x0bffff).ram(); /* Work RAM */
map(0x0b0000, 0x0bffff).ram().share("mainram");
map(0x0c0000, 0x0c0001).portr("IN0");
map(0x0c0002, 0x0c0003).portr("IN1");
@@ -1034,7 +1034,7 @@ void nmk16_state::ssmissin_map(address_map &map)
map(0x0c0000, 0x0c0001).portr("IN0");
map(0x0c0004, 0x0c0005).portr("IN1");
map(0x0c0006, 0x0c0007).portr("DSW1");
-// AM_RANGE(0x0c000e, 0x0c000f) AM_READ(??)
+// map(0x0c000e, 0x0c000f).r(FUNC(nmk16_state::??));
map(0x0c0015, 0x0c0015).w(FUNC(nmk16_state::flipscreen_w)); /* Maybe */
map(0x0c0019, 0x0c0019).w(FUNC(nmk16_state::tilebank_w)); /* Tile Bank ? */
map(0x0c001f, 0x0c001f).w(m_soundlatch, FUNC(generic_latch_8_device::write));
diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp
index 140039ab67d..3d055cce2ea 100644
--- a/src/mame/drivers/norautp.cpp
+++ b/src/mame/drivers/norautp.cpp
@@ -845,9 +845,9 @@ void norautp_state::norautp_portmap(address_map &map)
map(0x60, 0x63).mirror(0x1c).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0xa0, 0xa3).mirror(0x1c).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0xc0, 0xc3).mirror(0x3c).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write));
- //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(0xc0, 0xc0).mirror(0x3c).rw(FUNC(norautp_state::vram_data_r), FUNC(norautp_state::vram_data_w));
+ //map(0xc1, 0xc1).mirror(0x3c).w(FUNC(norautp_state::vram_addr_w));
+ //map(0xc2, 0xc2).mirror(0x3c).r(FUNC(norautp_state::test_r));
map(0xef, 0xef).r(FUNC(norautp_state::test2_r));
}
@@ -874,7 +874,7 @@ void norautp_state::nortest1_map(address_map &map)
void norautp_state::norautxp_map(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(~0x4000)
+// map.global_mask(~0x4000);
map.global_mask(0x7fff);
map(0x0000, 0x3fff).rom(); /* need to be checked */
map(0x6000, 0x67ff).ram().share("nvram"); /* HM6116 */
@@ -952,7 +952,7 @@ void norautp_state::ssjkrpkr_map(address_map &map)
void norautp_state::dphltest_map(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */
+// map.global_mask(0x7fff); /* A15 not connected */
map(0x0000, 0x6fff).rom();
map(0x7000, 0x7fff).ram();
map(0x8000, 0x87ff).ram().share("nvram");
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index 26141e200cc..61bd2d3abda 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -731,9 +731,9 @@ 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(0x1000, 0x1001).mirror(0x07fe).rw("debug8255", FUNC(8255_device::read), FUNC(8255_device::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(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
+ //map(0x4000, 0x4001).mirror(0x07fe).w(FUNC(notetaker_state::EmuClearParity_w)); // writes here clear the local 8k-ram parity error register
}
/* Input ports */
diff --git a/src/mame/drivers/ob68k1a.cpp b/src/mame/drivers/ob68k1a.cpp
index b811463076f..4451098abec 100644
--- a/src/mame/drivers/ob68k1a.cpp
+++ b/src/mame/drivers/ob68k1a.cpp
@@ -114,8 +114,8 @@ void ob68k1a_state::ob68k1a_mem(address_map &map)
map(0xffff00, 0xffff03).rw(m_acia0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff);
map(0xffff10, 0xffff10).w(COM8116_TAG, FUNC(com8116_device::str_stt_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(MC6821_0_TAG, FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0x00ff);
+// map(0xffff40, 0xffff47).rw(MC6821_1_TAG, FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0xff00);
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);
}
diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp
index 8ea2f8b31d5..207089c5ae5 100644
--- a/src/mame/drivers/okean240.cpp
+++ b/src/mame/drivers/okean240.cpp
@@ -258,16 +258,16 @@ void okean240_state::okean240a_io(address_map &map)
map(0xa0, 0xa1).rw("uart", FUNC(i8251_device::read), FUNC(i8251_device::write));
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));
- // AM_RANGE(0x00, 0x1f)=ppa00.data
- // AM_RANGE(0x20, 0x23)=dsk.data
- // AM_RANGE(0x24, 0x24)=dsk.wait
- // AM_RANGE(0x25, 0x25)=dskctl.data
- // AM_RANGE(0x40, 0x5f)=ppa40.data
- // AM_RANGE(0x60, 0x7f)=tim.data
- // AM_RANGE(0x80, 0x81)=intctl.data
- // AM_RANGE(0xa0, 0xa1)=comport.data
- // AM_RANGE(0xc0, 0xdf)=ppaC0.data
- // AM_RANGE(0xe0, 0xff)=ppaE0.data
+ // map(0x00, 0x1f)=ppa00.data
+ // map(0x20, 0x23)=dsk.data
+ // map(0x24, 0x24)=dsk.wait
+ // map(0x25, 0x25)=dskctl.data
+ // map(0x40, 0x5f)=ppa40.data
+ // map(0x60, 0x7f)=tim.data
+ // map(0x80, 0x81)=intctl.data
+ // map(0xa0, 0xa1)=comport.data
+ // map(0xc0, 0xdf)=ppaC0.data
+ // map(0xe0, 0xff)=ppaE0.data
}
void okean240_state::okean240t_io(address_map &map)
diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp
index fa4083ba1bb..640725d0485 100644
--- a/src/mame/drivers/olyboss.cpp
+++ b/src/mame/drivers/olyboss.cpp
@@ -175,11 +175,11 @@ void olyboss_state::olyboss_io(address_map &map)
map.unmap_value_high();
map(0x0, 0x8).rw(m_dma, FUNC(i8257_device::read), FUNC(i8257_device::write));
map(0x10, 0x11).m(m_fdc, FUNC(upd765a_device::map));
- //AM_RANGE(0x20, 0x20) //beeper?
+ //map(0x20, 0x20) //beeper?
map(0x30, 0x30).rw(m_uic, FUNC(am9519_device::data_r), FUNC(am9519_device::data_w));
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(0x50, 0x53) COM2651
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(FUNC(olyboss_state::vchrmap_w));
diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp
index 308ffe6c857..4b24420ba71 100644
--- a/src/mame/drivers/ondra.cpp
+++ b/src/mame/drivers/ondra.cpp
@@ -34,8 +34,8 @@ void ondra_state::ondra_io(address_map &map)
map.global_mask(0x0b);
map.unmap_value_high();
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)
+ //map(0x09, 0x09).w(FUNC(ondra_state::ondra_port_09_w);
+ //map(0x0a, 0x0a).w(FUNC(ondra_state::ondra_port_0a_w);
}
/* Input ports */
diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp
index 6a082473be4..1c74e0cb0cf 100644
--- a/src/mame/drivers/othunder.cpp
+++ b/src/mame/drivers/othunder.cpp
@@ -409,7 +409,7 @@ void othunder_state::othunder_map(address_map &map)
map(0x000000, 0x07ffff).rom();
map(0x080000, 0x08ffff).ram();
map(0x090000, 0x09000f).rw(m_tc0220ioc, FUNC(tc0220ioc_device::read), FUNC(tc0220ioc_device::write)).umask16(0x00ff);
-// AM_RANGE(0x09000c, 0x09000d) AM_WRITENOP /* ?? (keeps writing 0x77) */
+// map(0x09000c, 0x09000d).nopw(); /* ?? (keeps writing 0x77) */
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::ram_r), FUNC(tc0100scn_device::ram_w)); /* tilemaps */
map(0x220000, 0x22000f).rw(m_tc0100scn, FUNC(tc0100scn_device::ctrl_r), FUNC(tc0100scn_device::ctrl_w));
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index e5e69c31d75..82b36cb9a9e 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -343,7 +343,7 @@ void p8k_state::p8k_16_datamap(address_map &map)
void p8k_state::p8k_16_iomap(address_map &map)
{
-// AM_RANGE(0x0fef0, 0x0feff) // clock
+// map(0x0fef0, 0x0feff) // clock
map(0x0ff80, 0x0ff87).rw("sio", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)).umask16(0x00ff);
map(0x0ff88, 0x0ff8f).rw("sio1", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)).umask16(0x00ff);
map(0x0ff90, 0x0ff97).rw("pio0", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)).umask16(0x00ff);
@@ -351,13 +351,13 @@ void p8k_state::p8k_16_iomap(address_map &map)
map(0x0ffa0, 0x0ffa7).rw(m_pio2, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)).umask16(0x00ff);
map(0x0ffa8, 0x0ffaf).rw("ctc0", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)).umask16(0x00ff);
map(0x0ffb0, 0x0ffb7).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)).umask16(0x00ff);
-// AM_RANGE(0x0ffc0, 0x0ffc1) // SCR
-// AM_RANGE(0x0ffc8, 0x0ffc9) // SBR
-// AM_RANGE(0x0ffd0, 0x0ffd1) // NBR
-// AM_RANGE(0x0ffd8, 0x0ffd9) // SNVR
+// map(0x0ffc0, 0x0ffc1) // SCR
+// map(0x0ffc8, 0x0ffc9) // SBR
+// map(0x0ffd0, 0x0ffd1) // NBR
+// map(0x0ffd8, 0x0ffd9) // SNVR
map(0x0ffe1, 0x0ffe1).w(m_daisy, FUNC(p8k_16_daisy_device::reti_w));
-// AM_RANGE(0x0fff0, 0x0fff1) // TRPL
-// AM_RANGE(0x0fff8, 0x0fff9) // IF1L
+// map(0x0fff0, 0x0fff1) // TRPL
+// map(0x0fff8, 0x0fff9) // IF1L
}
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index 62ae9a53983..8db2f53d5dc 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -1023,14 +1023,14 @@ void pacman_state::birdiy_map(address_map &map)
map(0x0000, 0x3fff).mirror(0x8000).rom();
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(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(m_mainlatch, FUNC(ls259_device::write_d0));
map(0x5080, 0x509f).mirror(0xaf00).w(m_namco_sound, FUNC(namco_device::pacman_sound_w));
map(0x50a0, 0x50af).mirror(0xaf00).writeonly().share("spriteram2");
-// AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITENOP
-// AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITENOP
+// map(0x5070, 0x507f).mirror(0xaf00).nopw();
+// map(0x5080, 0x5080).mirror(0xaf3f).nopw();
map(0x50c0, 0x50c0).mirror(0xaf3f).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
map(0x5000, 0x5000).mirror(0xaf3f).portr("IN0");
map(0x5040, 0x5040).mirror(0xaf3f).portr("IN1");
@@ -1112,13 +1112,13 @@ void pacman_state::numcrash_map(address_map &map)
map(0x5000, 0x5007).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0x5040, 0x505f).w(m_namco_sound, FUNC(namco_device::pacman_sound_w));
map(0x5060, 0x506f).writeonly().share("spriteram2");
-// AM_RANGE(0x5070, 0x507f) AM_WRITENOP
-// AM_RANGE(0x5080, 0x5080) AM_WRITENOP
+// map(0x5070, 0x507f).nopw();
+// map(0x5080, 0x5080).nopw();
map(0x50c0, 0x50c0).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
map(0x5000, 0x5000).portr("IN0");
map(0x5040, 0x5040).portr("IN1");
map(0x5080, 0x5080).portr("DSW1");
-// AM_RANGE(0x50c0, 0x50c0) AM_READ_PORT("DSW2") // only one DSW on the PCB
+// map(0x50c0, 0x50c0).portr("DSW2"); // only one DSW on the PCB
}
@@ -1158,7 +1158,7 @@ void pacman_state::dremshpr_map(address_map &map)
map(0x4800, 0x4fef).mirror(0xa000).ram();
map(0x4ff0, 0x4fff).mirror(0xa000).ram().share("spriteram");
map(0x5000, 0x5007).mirror(0xaf38).w(m_mainlatch, FUNC(ls259_device::write_d0));
-// AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", namco_device, pacman_sound_w)
+// map(0x5040, 0x505f).mirror(0xaf00).w("namco", FUNC(namco_device::pacman_sound_w));
map(0x5060, 0x506f).mirror(0xaf00).writeonly().share("spriteram2");
map(0x5070, 0x507f).mirror(0xaf00).nopw();
map(0x5080, 0x5080).mirror(0xaf3f).nopw();
@@ -1336,14 +1336,14 @@ void pacman_state::crushs_map(address_map &map)
void pacman_state::pengojpm_map(address_map &map)
{
map(0x0000, 0x0fff).rom();
-// AM_RANGE(0x1000, 0x1fff) // header check for 0x55aa at POST, diagnostic ROM?
+// map(0x1000, 0x1fff) // header check for 0x55aa at POST, diagnostic ROM?
map(0x4000, 0x7fff).rom();
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
+// map(0x8800, 0x8bff).r(FUNC(pacman_state::pacman_read_nop)).nopw();
map(0x8c00, 0x8fef).ram();
map(0x8ff0, 0x8fff).ram().share("spriteram");
map(0x9000, 0x9007).w(m_mainlatch, FUNC(ls259_device::write_d0));
diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp
index ec84687a697..1e1b8090d31 100644
--- a/src/mame/drivers/pandoras.cpp
+++ b/src/mame/drivers/pandoras.cpp
@@ -140,7 +140,7 @@ void pandoras_state::pandoras_slave_map(address_map &map)
map(0x1a02, 0x1a02).portr("P2");
map(0x1a03, 0x1a03).portr("DSW3");
map(0x1c00, 0x1c00).portr("DSW2");
-// AM_RANGE(0x1e00, 0x1e00) AM_READNOP /* ??? seems to be important */
+// map(0x1e00, 0x1e00).nopr(); /* ??? seems to be important */
map(0x8000, 0x8000).w("watchdog", FUNC(watchdog_timer_device::reset_w)); /* watchdog reset */
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 */
diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp
index 1c536d1699f..05c484d7336 100644
--- a/src/mame/drivers/paso1600.cpp
+++ b/src/mame/drivers/paso1600.cpp
@@ -253,7 +253,7 @@ void paso1600_state::paso1600_io(address_map &map)
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
+// map(0x00d8,0x00df) //fdc, unknown type
// other undefined ports: 18, 1C, 92
}
diff --git a/src/mame/drivers/pastelg.cpp b/src/mame/drivers/pastelg.cpp
index 63d678bd9f4..f3f4b7f5e1c 100644
--- a/src/mame/drivers/pastelg.cpp
+++ b/src/mame/drivers/pastelg.cpp
@@ -60,7 +60,7 @@ READ8_MEMBER(pastelg_state::pastelg_irq_ack_r)
void pastelg_state::pastelg_io_map(address_map &map)
{
map.global_mask(0xff);
-// AM_RANGE(0x00, 0x00) AM_WRITENOP
+// map(0x00, 0x00).nopw();
map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r));
map(0x81, 0x81).r("aysnd", FUNC(ay8910_device::data_r));
map(0x82, 0x83).w("aysnd", FUNC(ay8910_device::data_address_w));
diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp
index 71e02d06613..001c41881f4 100644
--- a/src/mame/drivers/pb1000.cpp
+++ b/src/mame/drivers/pb1000.cpp
@@ -86,7 +86,7 @@ void pb1000_state::pb1000_mem(address_map &map)
{
map.unmap_value_low();
map(0x00000, 0x00bff).rom();
- //AM_RANGE( 0x00c00, 0x00c0f ) AM_NOP //I/O
+ //map(0x00c00, 0x00c0f).noprw(); //I/O
map(0x06000, 0x07fff).ram().share("nvram1");
map(0x08000, 0x0ffff).bankr("bank1");
map(0x18000, 0x1ffff).ram().share("nvram2");
@@ -97,7 +97,7 @@ void pb1000_state::pb2000c_mem(address_map &map)
map.unmap_value_low();
map(0x00000, 0x0ffff).bankr("bank1");
map(0x00000, 0x00bff).rom();
- //AM_RANGE( 0x00c00, 0x00c0f ) AM_NOP //I/O
+ //map(0x00c00, 0x00c0f).noprw(); //I/O
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));
diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp
index ef3e1c2aa31..a3653e6738a 100644
--- a/src/mame/drivers/pc100.cpp
+++ b/src/mame/drivers/pc100.cpp
@@ -340,7 +340,7 @@ void pc100_state::pc100_io(address_map &map)
{
map.global_mask(0xff);
map(0x00, 0x03).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); // i8259
-// AM_RANGE(0x04, 0x07) i8237?
+// map(0x04, 0x07) i8237?
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
diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp
index b2eab2cf561..3be30bddb8d 100644
--- a/src/mame/drivers/pc1512.cpp
+++ b/src/mame/drivers/pc1512.cpp
@@ -625,7 +625,7 @@ void pc1512_state::pc1512_io(address_map &map)
// schematic calls for a stock 8086 and the I/O and data lines are multiplexed onto the same bus,
// plus address lines 20-10 are towards the middle of a standard ISA slot. If it turns out that this
// is not in fact accurate to hardware, please add this back in.
- // ADDRESS_MAP_GLOBAL_MASK(0x3ff)
+ // map.global_mask(0x3ff);
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));
diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp
index a357b430de0..73c840dbc4a 100644
--- a/src/mame/drivers/pc6001.cpp
+++ b/src/mame/drivers/pc6001.cpp
@@ -231,7 +231,7 @@ void pc6001_state::pc6001_map(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x3fff).rom().nopw();
-// AM_RANGE(0x4000, 0x5fff) // mapped by the cartslot
+// map(0x4000, 0x5fff) // mapped by the cartslot
map(0x6000, 0x7fff).bankr("bank1");
map(0x8000, 0xffff).ram().share("ram");
}
@@ -718,8 +718,8 @@ void pc6001mk2_state::pc6001mk2_io(address_map &map)
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(0xf4
+// map(0xf5
map(0xf6, 0xf6).w(FUNC(pc6001mk2_state::mk2_timer_adj_w));
map(0xf7, 0xf7).w(FUNC(pc6001mk2_state::mk2_timer_irqv_w));
}
@@ -748,9 +748,9 @@ void pc6601_state::pc6601_io(address_map &map)
pc6001mk2_io(map);
// these are disk related
-// AM_RANGE(0xb1
-// AM_RANGE(0xb2
-// AM_RANGE(0xb3
+// map(0xb1
+// map(0xb2
+// map(0xb3
map(0xd0, 0xdf).rw(FUNC(pc6601_state::fdc_r), FUNC(pc6601_state::fdc_w));
}
@@ -942,14 +942,14 @@ void pc6001sr_state::pc6001sr_io(address_map &map)
map(0xb0, 0xb0).w(FUNC(pc6001sr_state::sr_system_latch_w));
/* these are disk related */
-// AM_RANGE(0xb1
+// map(0xb1
map(0xb2, 0xb2).r(FUNC(pc6001sr_state::hw_rev_r));
-// AM_RANGE(0xb3
+// map(0xb3
map(0xb8, 0xbf).ram().share("irq_vectors");
-// AM_RANGE(0xc0, 0xc0) AM_WRITE(mk2_col_bank_w)
-// AM_RANGE(0xc1, 0xc1) AM_WRITE(mk2_vram_bank_w)
-// AM_RANGE(0xc2, 0xc2) AM_WRITE(opt_bank_w)
+// map(0xc0, 0xc0).w(FUNC(pc6001sr_state::mk2_col_bank_w));
+// map(0xc1, 0xc1).w(FUNC(pc6001sr_state::mk2_vram_bank_w));
+// map(0xc2, 0xc2).w(FUNC(pc6001sr_state::opt_bank_w));
map(0xc8, 0xc8).w(FUNC(pc6001sr_state::sr_mode_w));
map(0xc9, 0xc9).w(FUNC(pc6001sr_state::sr_vram_bank_w));
@@ -960,12 +960,12 @@ void pc6001sr_state::pc6001sr_io(address_map &map)
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(0xf0, 0xf0).rw(FUNC(pc6001sr_state::mk2_bank_r0_r), FUNC(pc6001sr_state::mk2_bank_r0_w));
+// map(0xf1, 0xf1).rw(FUNC(pc6001sr_state::mk2_bank_r1_r), FUNC(pc6001sr_state::mk2_bank_r1_w));
+// map(0xf2, 0xf2).rw(FUNC(pc6001sr_state::mk2_bank_w0_r), FUNC(pc6001sr_state::mk2_bank_w0_w));
map(0xf3, 0xf3).w(FUNC(pc6001sr_state::mk2_0xf3_w));
-// AM_RANGE(0xf4
-// AM_RANGE(0xf5
+// map(0xf4
+// map(0xf5
map(0xf6, 0xf6).w(FUNC(pc6001sr_state::mk2_timer_adj_w));
map(0xf7, 0xf7).w(FUNC(pc6001sr_state::mk2_timer_irqv_w));
}
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index 68b6f0713d1..bbcf9e8b3ed 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -193,30 +193,30 @@ void pc8001_state::pc8001_io(address_map &map)
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
-// AM_RANGE(0x80, 0x80) AM_MIRROR(0x0f) AM_WRITE(pc8011_ext0_w)
-// AM_RANGE(0x90, 0x90) AM_MIRROR(0x0f) AM_WRITE(pc8011_ext1_w)
-// AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x0f) AM_WRITE(pc8011_ext2_w)
-// AM_RANGE(0xb0, 0xb0) AM_READ(pc8011_gpio8_r)
-// AM_RANGE(0xb1, 0xb1) AM_WRITE(pc8011_gpio8_w)
-// AM_RANGE(0xb2, 0xb2) AM_READ(pc8011_gpio4_r)
-// AM_RANGE(0xb3, 0xb3) AM_WRITE(pc8011_gpio4_w)
-// AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE(PC8011_CH1_I8251_TAG, i8251_device, data_r, data_w)
-// AM_RANGE(0xc1, 0xc1) AM_DEVREADWRITE(PC8011_CH1_I8251_TAG, i8251_device, status_r, control_w)
-// AM_RANGE(0xc2, 0xc2) AM_DEVREADWRITE(PC8011_CH2_I8251_TAG, i8251_device, data_r, data_w)
-// AM_RANGE(0xc3, 0xc3) AM_DEVREADWRITE(PC8011_CH2_I8251_TAG, i8251_device, status_r, control_w)
-// AM_RANGE(0xc8, 0xc8) RS-232 output enable?
-// AM_RANGE(0xca, 0xca) RS-232 output disable?
-// AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE(PC8011_IEEE488_I8255A_TAG, i8255_device, read, write)
-// AM_RANGE(0xd8, 0xd8) AM_READ(pc8011_ieee488_control_signal_input_r)
-// AM_RANGE(0xda, 0xda) AM_READ(pc8011_ieee488_bus_address_mode_r)
-// AM_RANGE(0xdc, 0xdc) AM_WRITE(pc8011_ieee488_nrfd_w)
-// AM_RANGE(0xde, 0xde) AM_WRITE(pc8011_ieee488_bus_mode_control_w)
-// AM_RANGE(0xe0, 0xe3) AM_WRITE(expansion_storage_mode_w)
-// AM_RANGE(0xe4, 0xe4) AM_MIRROR(0x01) AM_WRITE(irq_level_w)
-// AM_RANGE(0xe6, 0xe6) AM_WRITE(irq_mask_w)
-// AM_RANGE(0xe7, 0xe7) AM_WRITE(pc8012_memory_mode_w)
-// AM_RANGE(0xe8, 0xfb) unused
+// map(0x70, 0x7f) unused
+// map(0x80, 0x80).mirror(0x0f).w(FUNC(pc8001_state::pc8011_ext0_w));
+// map(0x90, 0x90).mirror(0x0f).w(FUNC(pc8001_state::pc8011_ext1_w));
+// map(0xa0, 0xa0).mirror(0x0f).w(FUNC(pc8001_state::pc8011_ext2_w));
+// map(0xb0, 0xb0).r(FUNC(pc8001_state::pc8011_gpio8_r));
+// map(0xb1, 0xb1).w(FUNC(pc8001_state::pc8011_gpio8_w));
+// map(0xb2, 0xb2).r(FUNC(pc8001_state::pc8011_gpio4_r));
+// map(0xb3, 0xb3).w(FUNC(pc8001_state::pc8011_gpio4_w));
+// map(0xc0, 0xc0).rw(PC8011_CH1_I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
+// map(0xc1, 0xc1).rw(PC8011_CH1_I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
+// map(0xc2, 0xc2).rw(PC8011_CH2_I8251_TAG, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
+// map(0xc3, 0xc3).rw(PC8011_CH2_I8251_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
+// map(0xc8, 0xc8) RS-232 output enable?)
+// map(0xca, 0xca) RS-232 output disable?
+// map(0xd0, 0xd3).rw(PC8011_IEEE488_I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
+// map(0xd8, 0xd8).r(FUNC(pc8001_state::pc8011_ieee488_control_signal_input_r));
+// map(0xda, 0xda).r(FUNC(pc8001_state::pc8011_ieee488_bus_address_mode_r));
+// map(0xdc, 0xdc).w(FUNC(pc8001_state::pc8011_ieee488_nrfd_w));
+// map(0xde, 0xde).w(FUNC(pc8001_state::pc8011_ieee488_bus_mode_control_w));
+// map(0xe0, 0xe3).w(FUNC(pc8001_state::expansion_storage_mode_w));
+// map(0xe4, 0xe4).mirror(0x01).w(FUNC(pc8001_state::irq_level_w));
+// map(0xe6, 0xe6).w(FUNC(pc8001_state::irq_mask_w));
+// map(0xe7, 0xe7).w(FUNC(pc8001_state::pc8012_memory_mode_w));
+// map(0xe8, 0xfb) unused
map(0xfc, 0xff).rw(I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
}
@@ -233,21 +233,21 @@ void pc8001mk2_state::pc8001mk2_io(address_map &map)
pc8001_io(map);
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
-// AM_RANGE(0xe9, 0xe9) kanji_address_hi_w, kanji_data_hi_r
-// AM_RANGE(0xea, 0xea) kanji_readout_start_w
-// AM_RANGE(0xeb, 0xeb) kanji_readout_end_w
-// AM_RANGE(0xf3, 0xf3) DMA type disk unit interface selection port
-// AM_RANGE(0xf4, 0xf4) DMA type 8 inch control
-// AM_RANGE(0xf5, 0xf5) DMA type 8 inch margin control
-// AM_RANGE(0xf6, 0xf6) DMA type 8 inch FDC status
-// AM_RANGE(0xf7, 0xf7) DMA type 8 inch FDC data register
-// AM_RANGE(0xf8, 0xf8) DMA type 5 inch control
-// AM_RANGE(0xf9, 0xf9) DMA type 5 inch margin control
-// AM_RANGE(0xfa, 0xfa) DMA type 5 inch FDC status
-// AM_RANGE(0xfb, 0xfb) DMA type 5 inch FDC data register
+// map(0x5c, 0x5c).w(FUNC(pc8001mk2_state::gram_on_w));
+// map(0x5f, 0x5f).w(FUNC(pc8001mk2_state::gram_off_w));
+// map(0xe8, 0xe8) kanji_address_lo_w, kanji_data_lo_r
+// map(0xe9, 0xe9) kanji_address_hi_w, kanji_data_hi_r
+// map(0xea, 0xea) kanji_readout_start_w
+// map(0xeb, 0xeb) kanji_readout_end_w
+// map(0xf3, 0xf3) DMA type disk unit interface selection port
+// map(0xf4, 0xf4) DMA type 8 inch control
+// map(0xf5, 0xf5) DMA type 8 inch margin control
+// map(0xf6, 0xf6) DMA type 8 inch FDC status
+// map(0xf7, 0xf7) DMA type 8 inch FDC data register
+// map(0xf8, 0xf8) DMA type 5 inch control
+// map(0xf9, 0xf9) DMA type 5 inch margin control
+// map(0xfa, 0xfa) DMA type 5 inch FDC status
+// map(0xfb, 0xfb) DMA type 5 inch FDC data register
}
/* Input Ports */
diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp
index 13a06f1a0a2..13ef80a6f87 100644
--- a/src/mame/drivers/pc8401a.cpp
+++ b/src/mame/drivers/pc8401a.cpp
@@ -363,23 +363,23 @@ void pc8401a_state::pc8500_io(address_map &map)
map(0x10, 0x10).w(FUNC(pc8401a_state::rtc_cmd_w));
map(0x20, 0x21).rw(I8251_TAG, FUNC(i8251_device::read), FUNC(i8251_device::write));
map(0x30, 0x30).rw(FUNC(pc8401a_state::mmr_r), FUNC(pc8401a_state::mmr_w));
-// AM_RANGE(0x31, 0x31)
+// map(0x31, 0x31)
map(0x40, 0x40).rw(FUNC(pc8401a_state::rtc_r), FUNC(pc8401a_state::rtc_ctrl_w));
-// AM_RANGE(0x41, 0x41)
-// AM_RANGE(0x50, 0x51)
+// map(0x41, 0x41)
+// map(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(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(0x80, 0x80) modem status, set to 0xff to boot
+// map(0x8b, 0x8b)
+// map(0x90, 0x93)
+// map(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(FUNC(pc8401a_state::io_rom_addr_w));
map(0xb3, 0xb3).r(FUNC(pc8401a_state::io_rom_data_r));
-// AM_RANGE(0xc8, 0xc8)
+// map(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 75c80ce858b..ec24da9e0ee 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -1577,14 +1577,14 @@ void pc8801_state::pc8801_io(address_map &map)
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(0xa0, 0xa3).noprw(); /* music & network */
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(0xb4, 0xb5).noprw(); /* Video art board */
+// map(0xc1, 0xc1).noprw(); /* (unknown) */
+// map(0xc2, 0xcf).noprw(); /* music */
+// map(0xd0, 0xd7).noprw(); /* music & GP-IB */
+// map(0xd8, 0xd8).noprw(); /* GP-IB */
+// map(0xdc, 0xdf).noprw(); /* MODEM */
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 */
#if USE_PROPER_I8214
@@ -1594,14 +1594,14 @@ void pc8801_state::pc8801_io(address_map &map)
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(0xe7, 0xe7).noprw(); /* Arcus writes here, almost likely to be a mirror of above */
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) */
+// map(0xf3, 0xf3).noprw(); /* DMA floppy (unknown) */
+// map(0xf4, 0xf7).noprw(); /* DMA 5'floppy (may be not released) */
+// map(0xf8, 0xfb).noprw(); /* DMA 8'floppy (unknown) */
map(0xfc, 0xff).rw("d8255_master", FUNC(i8255_device::read), FUNC(i8255_device::write));
}
diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp
index aa590135464..f632a626e8e 100644
--- a/src/mame/drivers/pc88va.cpp
+++ b/src/mame/drivers/pc88va.cpp
@@ -1019,27 +1019,27 @@ READ8_MEMBER(pc88va_state::no_subfdc_r)
void pc88va_state::pc88va_io_map(address_map &map)
{
map(0x0000, 0x000f).r(FUNC(pc88va_state::key_r)); // Keyboard ROW reading
-// AM_RANGE(0x0010, 0x0010) Printer / Calendar Clock Interface
+// map(0x0010, 0x0010) Printer / Calendar Clock Interface
map(0x0020, 0x0021).noprw(); // RS-232C
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(0x0032, 0x0032) (R) ? (W) System Port 2
+// map(0x0034, 0x0034) GVRAM Control Port 1
+// map(0x0035, 0x0035) GVRAM Control Port 2
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
-// AM_RANGE(0x0070, 0x0070) ? (*)
-// AM_RANGE(0x0071, 0x0071) Expansion ROM select (*)
-// AM_RANGE(0x0078, 0x0078) Memory offset increment (*)
-// AM_RANGE(0x0080, 0x0081) HDD related
+// map(0x005c, 0x005c) (R) GVRAM status
+// map(0x005c, 0x005f) (W) GVRAM selection
+// map(0x0070, 0x0070) ? (*)
+// map(0x0071, 0x0071) Expansion ROM select (*)
+// map(0x0078, 0x0078) Memory offset increment (*)
+// map(0x0080, 0x0081) HDD related
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 (*)
-// AM_RANGE(0x00e6, 0x00e6) 8214 IRQ mask (*)
-// AM_RANGE(0x00e8, 0x00e9) ? (*)
-// AM_RANGE(0x00ec, 0x00ed) ? (*)
+// map(0x00bc, 0x00bf) d8255 1
+// map(0x00e2, 0x00e3) Expansion RAM selection (*)
+// map(0x00e4, 0x00e4) 8214 IRQ control (*)
+// map(0x00e6, 0x00e6) 8214 IRQ mask (*)
+// map(0x00e8, 0x00e9) ? (*)
+// map(0x00ec, 0x00ed) ? (*)
#if TEST_SUBFDC
map(0x00fc, 0x00ff).rw("d8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)); // d8255 2, FDD
#else
@@ -1047,49 +1047,49 @@ void pc88va_state::pc88va_io_map(address_map &map)
#endif
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(0x0102, 0x0103) Graphic Screen Control Register
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
-// AM_RANGE(0x0110, 0x0111) Color Code/Plain Mask Register
-// AM_RANGE(0x0124, 0x0125) ? (related to Transparent Color of Graphic Screen 0)
-// 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(0x010a, 0x010b) Picture Mask Mode Register
+// map(0x010c, 0x010d) Color Palette Mode Register
+// map(0x010e, 0x010f) Backdrop Color Register
+// map(0x0110, 0x0111) Color Code/Plain Mask Register
+// map(0x0124, 0x0125) ? (related to Transparent Color of Graphic Screen 0)
+// map(0x0126, 0x0127) ? (related to Transparent Color of Graphic Screen 1)
+// map(0x012e, 0x012f) ? (related to Transparent Color of Text/Sprite)
+// map(0x0130, 0x0137) Picture Mask 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(0x0148, 0x0149) Text control port 1
+// map(0x014c, 0x014f) ? CG Port
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(0x0154, 0x0155) Refresh Register (wait states)
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(0x0158, 0x0159) Interruption Mode Modification
+// map(0x015c, 0x015f) NMI mask port (strobe port)
map(0x0160, 0x016f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)); // DMA Controller
map(0x0184, 0x0187).rw("pic8259_slave", FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff);
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(0x0190, 0x0191) System Port 5
+// map(0x0196, 0x0197) Keyboard sub CPU command port
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(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(0x01c0, 0x01c1) ?
map(0x01c6, 0x01c7).nopw(); // ???
map(0x01c8, 0x01cf).rw("d8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00); //i8255 3 (byte access)
-// AM_RANGE(0x01d0, 0x01d1) Expansion RAM bank selection
+// map(0x01d0, 0x01d1) Expansion RAM bank selection
map(0x0200, 0x021f).ram(); // Frame buffer 0 control parameter
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(FUNC(pc88va_state::palette_ram_w)).share("palram"); // Palette RAM (xBBBBxRRRRxGGGG format)
-// AM_RANGE(0x0500, 0x05ff) GVRAM
-// AM_RANGE(0x1000, 0xfeff) user area (???)
+// map(0x0500, 0x05ff) GVRAM
+// map(0x1000, 0xfeff) user area (???)
map(0xff00, 0xffff).noprw(); // CPU internal use
}
// (*) are specific N88 V1 / V2 ports
@@ -1129,7 +1129,7 @@ void pc88va_state::pc88va_z80_io_map(address_map &map)
{
map.global_mask(0xff);
map(0xf0, 0xf0).w(FUNC(pc88va_state::fdc_irq_vector_w)); // Interrupt Opcode Port
-// AM_RANGE(0xf4, 0xf4) // Drive Control Port
+// map(0xf4, 0xf4) // Drive 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 76144fb92d7..58ca84c67a5 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -672,7 +672,7 @@ void pc9801_state::pc9801_common_io(address_map &map)
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 / <undefined>
map(0x0064, 0x0064).w(FUNC(pc9801_state::vrtc_clear_w));
-// AM_RANGE(0x006c, 0x006f) border color / <undefined>
+// map(0x006c, 0x006f) border color / <undefined>
map(0x0070, 0x007f).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0xff00);
map(0x0070, 0x007f).rw(FUNC(pc9801_state::txt_scrl_r), FUNC(pc9801_state::txt_scrl_w)).umask16(0x00ff); //display registers / i8253 pit
map(0x0090, 0x0090).r(m_fdc_2hd, FUNC(upd765a_device::msr_r));
@@ -1098,7 +1098,7 @@ void pc9801_state::pc9801ux_io(address_map &map)
void pc9801_state::pc9801rs_map(address_map &map)
{
pc9801ux_map(map);
-// AM_RANGE(0x0d8000, 0x0d9fff) AM_ROM AM_REGION("ide",0)
+// map(0x0d8000, 0x0d9fff).rom().region("ide",0);
map(0x0da000, 0x0dbfff).ram(); // ide ram
map(0xee8000, 0xefffff).m(m_ipl, FUNC(address_map_bank_device::amap16));
map(0xfe8000, 0xffffff).m(m_ipl, FUNC(address_map_bank_device::amap16));
@@ -1420,7 +1420,7 @@ void pc9801_state::pc9821_map(address_map &map)
void pc9801_state::pc9821_io(address_map &map)
{
-// ADDRESS_MAP_UNMAP_HIGH // TODO: a read to somewhere makes this to fail at POST
+// map.unmap_value_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(FUNC(pc9801_state::pic_w)).umask32(0x00ff00ff); // i8259 PIC (bit 3 ON slave / master) / i8237 DMA
@@ -1440,36 +1440,36 @@ void pc9801_state::pc9821_io(address_map &map)
map(0x0090, 0x0093).m(m_fdc_2hd, FUNC(upd765a_device::map)).umask32(0x00ff00ff);
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(0x00b0, 0x00b3) PC9861k (serial port?)
+// map(0x00b9, 0x00b9) PC9861k
+// map(0x00bb, 0x00bb) PC9861k
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(FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w));
- // AM_RANGE(0x00d8, 0x00df) AMD98 (sound?) board
+ // map(0x00d8, 0x00df) AMD98 (sound?) board
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 / <undefined>
-// AM_RANGE(0x018c, 0x018f) YM2203 OPN extended ports / <undefined>
+// map(0x0188, 0x018f).rw(FUNC(pc9801_state::pc9801_opn_r), FUNC(pc9801_state::pc9801_opn_w)); //ym2203 opn / <undefined>
+// map(0x018c, 0x018f) YM2203 OPN extended ports / <undefined>
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(0x043d, 0x043d) ROM/RAM bank (NEC)
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(0x04be, 0x04be) FDC "RPM" register
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) <undefined> / EMM SIO registers
+// map(0x08e0, 0x08ea) <undefined> / EMM SIO registers
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
-// AM_RANGE(0x0c13, 0x0c14) EPSON register 1 r
-// AM_RANGE(0x0c24, 0x0c24) cs4231 PCM board register control
-// AM_RANGE(0x0c2b, 0x0c2b) cs4231 PCM board low byte control
-// AM_RANGE(0x0c2d, 0x0c2d) cs4231 PCM board hi byte control
-// AM_RANGE(0x0cc0, 0x0cc7) SCSI interface / <undefined>
-// AM_RANGE(0x0cfc, 0x0cff) PCI bus
+// map(0x09a8, 0x09a8) GDC 31KHz register r/w
+// map(0x0c07, 0x0c07) EPSON register w
+// map(0x0c03, 0x0c03) EPSON register 0 r
+// map(0x0c13, 0x0c14) EPSON register 1 r
+// map(0x0c24, 0x0c24) cs4231 PCM board register control
+// map(0x0c2b, 0x0c2b) cs4231 PCM board low byte control
+// map(0x0c2d, 0x0c2d) cs4231 PCM board hi byte control
+// map(0x0cc0, 0x0cc7) SCSI interface / <undefined>
+// map(0x0cfc, 0x0cff) PCI bus
map(0x1e8c, 0x1e8f).noprw(); // IDE RAM switch
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); // <undefined> / pit mirror ports
@@ -1486,24 +1486,24 @@ void pc9801_state::pc9821_io(address_map &map)
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 / <undefined>
-// AM_RANGE(0xbfdb, 0xbfdb) mouse timing port
-// AM_RANGE(0xc0d0, 0xc0d3) MIDI port, option 0 / <undefined>
-// AM_RANGE(0xc4d0, 0xc4d3) MIDI port, option 1 / <undefined>
-// AM_RANGE(0xc8d0, 0xc8d3) MIDI port, option 2 / <undefined>
-// AM_RANGE(0xccd0, 0xccd3) MIDI port, option 3 / <undefined>
-// AM_RANGE(0xd0d0, 0xd0d3) MIDI port, option 4 / <undefined>
-// AM_RANGE(0xd4d0, 0xd4d3) MIDI port, option 5 / <undefined>
-// AM_RANGE(0xd8d0, 0xd8d3) MIDI port, option 6 / <undefined>
-// AM_RANGE(0xdcd0, 0xdcd3) MIDI port, option 7 / <undefined>
+// map(0xa460, 0xa46f) cs4231 PCM extended port / <undefined>
+// map(0xbfdb, 0xbfdb) mouse timing port
+// map(0xc0d0, 0xc0d3) MIDI port, option 0 / <undefined>
+// map(0xc4d0, 0xc4d3) MIDI port, option 1 / <undefined>
+// map(0xc8d0, 0xc8d3) MIDI port, option 2 / <undefined>
+// map(0xccd0, 0xccd3) MIDI port, option 3 / <undefined>
+// map(0xd0d0, 0xd0d3) MIDI port, option 4 / <undefined>
+// map(0xd4d0, 0xd4d3) MIDI port, option 5 / <undefined>
+// map(0xd8d0, 0xd8d3) MIDI port, option 6 / <undefined>
+// map(0xdcd0, 0xdcd3) MIDI port, option 7 / <undefined>
map(0xe0d0, 0xe0d3).r(FUNC(pc9801_state::midi_r)); // MIDI port, option 8 / <undefined>
-// AM_RANGE(0xe4d0, 0xe4d3) MIDI port, option 9 / <undefined>
-// AM_RANGE(0xe8d0, 0xe8d3) MIDI port, option A / <undefined>
-// AM_RANGE(0xecd0, 0xecd3) MIDI port, option B / <undefined>
-// AM_RANGE(0xf0d0, 0xf0d3) MIDI port, option C / <undefined>
-// AM_RANGE(0xf4d0, 0xf4d3) MIDI port, option D / <undefined>
-// AM_RANGE(0xf8d0, 0xf8d3) MIDI port, option E / <undefined>
-// AM_RANGE(0xfcd0, 0xfcd3) MIDI port, option F / <undefined>
+// map(0xe4d0, 0xe4d3) MIDI port, option 9 / <undefined>
+// map(0xe8d0, 0xe8d3) MIDI port, option A / <undefined>
+// map(0xecd0, 0xecd3) MIDI port, option B / <undefined>
+// map(0xf0d0, 0xf0d3) MIDI port, option C / <undefined>
+// map(0xf4d0, 0xf4d3) MIDI port, option D / <undefined>
+// map(0xf8d0, 0xf8d3) MIDI port, option E / <undefined>
+// map(0xfcd0, 0xfcd3) MIDI port, option F / <undefined>
}
// TODO: identify this, might be an alt way to access SDIP?
diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp
index dce3bd79b43..d45bd67f866 100644
--- a/src/mame/drivers/pcd.cpp
+++ b/src/mame/drivers/pcd.cpp
@@ -437,7 +437,7 @@ void pcd_state::pcd_io(address_map &map)
map(0xf9c0, 0xf9c3).rw(m_usart[0], FUNC(mc2661_device::read), FUNC(mc2661_device::write)); // UARTs
map(0xf9d0, 0xf9d3).rw(m_usart[1], FUNC(mc2661_device::read), FUNC(mc2661_device::write));
map(0xf9e0, 0xf9e3).rw(m_usart[2], FUNC(mc2661_device::read), FUNC(mc2661_device::write));
-// AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select)
+// map(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select)
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));
}
diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp
index 1a40a8a32a7..37d0aa39c12 100644
--- a/src/mame/drivers/pcfx.cpp
+++ b/src/mame/drivers/pcfx.cpp
@@ -99,7 +99,7 @@ WRITE8_MEMBER(pcfx_state::extio_w)
void pcfx_state::pcfx_mem(address_map &map)
{
map(0x00000000, 0x001FFFFF).ram(); /* RAM */
-// AM_RANGE( 0x80000000, 0x807FFFFF ) AM_READWRITE8(extio_r,extio_w,0xffffffff) /* EXTIO */
+// map(0x80000000, 0x807FFFFF).rw(FUNC(pcfx_state::extio_r), FUNC(pcfx_state::extio_w)); /* EXTIO */
map(0xE0000000, 0xE7FFFFFF).noprw(); /* BackUp RAM */
map(0xE8000000, 0xE9FFFFFF).noprw(); /* Extended BackUp RAM */
map(0xF8000000, 0xF8000007).noprw(); /* PIO */
@@ -200,7 +200,7 @@ void pcfx_state::pcfx_io(address_map &map)
map(0x00000C80, 0x00000C83).noprw();
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(0x00600000, 0x006FFFFF).r(FUNC(pcfx_state::scsi_ctrl_r));
map(0x00780000, 0x007FFFFF).rom().region("scsi_rom", 0);
map(0x80500000, 0x805000FF).noprw(); /* HuC6273 */
}
diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp
index b95f14e2166..738d713a819 100644
--- a/src/mame/drivers/pcm.cpp
+++ b/src/mame/drivers/pcm.cpp
@@ -179,9 +179,9 @@ void pcm_state::pcm_io(address_map &map)
map(0x88, 0x8B).rw("sio", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); // SIO
map(0x8C, 0x8F).rw(m_ctc_u, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // user CTC
map(0x90, 0x93).rw(m_pio_u, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); // user PIO
- //AM_RANGE(0x94, 0x97) // bank select
- //AM_RANGE(0x98, 0x9B) // NMI generator
- //AM_RANGE(0x9C, 0x9F) // io ports available to the user
+ //map(0x94, 0x97) // bank select
+ //map(0x98, 0x9B) // NMI generator
+ //map(0x9C, 0x9F) // io ports available to the user
// disk controller?
}
diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp
index 2b2afb7fa88..51ffa944a9d 100644
--- a/src/mame/drivers/pcxt.cpp
+++ b/src/mame/drivers/pcxt.cpp
@@ -399,7 +399,7 @@ void pcxt_state::tetriskr_io(address_map &map)
map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map));
map(0x03c8, 0x03c8).portr("IN0");
map(0x03c9, 0x03c9).portr("IN1");
-// AM_RANGE(0x03ce, 0x03ce) AM_READ_PORT("IN1") //read then discarded?
+// map(0x03ce, 0x03ce).portr("IN1"); //read then discarded?
}
void pcxt_state::bank_map(address_map &map)
diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp
index c6bf7d29a71..31d0054973a 100644
--- a/src/mame/drivers/pda600.cpp
+++ b/src/mame/drivers/pda600.cpp
@@ -91,7 +91,7 @@ void pda600_state::pda600_mem(address_map &map)
{
map.unmap_value_high();
map(0x00000, 0x1ffff).rom();
- //AM_RANGE(0x20000, 0x9ffff) AM_RAM // PCMCIA Card
+ //map(0x20000, 0x9ffff).ram(); // PCMCIA Card
map(0xa0000, 0xa7fff).ram().region("videoram", 0);
map(0xe0000, 0xfffff).ram().region("mainram", 0).share("nvram");
}
@@ -101,9 +101,9 @@ void pda600_state::pda600_io(address_map &map)
map.unmap_value_high();
map.global_mask(0xff);
map(0x00, 0x3f).noprw(); /* Z180 internal registers */
- //AM_RANGE(0x40, 0x7f) AM_NOP /* Z180 internal registers */
+ //map(0x40, 0x7f).noprw(); /* Z180 internal registers */
map(0x80, 0x8f).rw("rtc", FUNC(hd64610_device::read), FUNC(hd64610_device::write));
- //AM_RANGE(0xC0, 0xC1) AM_NOP /* LCD */
+ //map(0xc0, 0xc1).noprw(); /* LCD */
}
/* Input ports */
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index 548bc7c15b3..9abe19518be 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -199,10 +199,10 @@ READ8_MEMBER( pegasus_state::pegasus_protection_r )
void pegasus_state::pegasus_mem(address_map &map)
{
map.unmap_value_high();
- //AM_RANGE(0x0000, 0x2fff) // mapped by the cartslots 1-3
+ //map(0x0000, 0x2fff) // mapped by the cartslots 1-3
map(0xb000, 0xbdff).ram();
map(0xbe00, 0xbfff).ram().share("videoram");
- //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslots 4-5
+ //map(0xc000, 0xdfff) // mapped by the cartslots 4-5
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));
diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp
index f6fe91efb81..9076c588f11 100644
--- a/src/mame/drivers/pencil2.cpp
+++ b/src/mame/drivers/pencil2.cpp
@@ -137,7 +137,7 @@ void pencil2_state::mem_map(address_map &map)
map(0x0000, 0x1fff).rom();
map(0x2000, 0x5fff).nopw(); // stop error log filling up
map(0x6000, 0x67ff).mirror(0x1800).ram();
- //AM_RANGE(0x8000, 0xffff) // mapped by the cartslot
+ //map(0x8000, 0xffff) // mapped by the cartslot
}
void pencil2_state::io_map(address_map &map)
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index 32db3b69231..641ab098576 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -509,7 +509,7 @@ READ32_MEMBER(pgm2_state::pio_pdsr_r)
void pgm2_state::pgm2_map(address_map &map)
{
- map(0x00000000, 0x00003fff).rom(); //AM_REGION("mainrom", 0x00000) // internal ROM
+ map(0x00000000, 0x00003fff).rom(); //.region("mainrom", 0x00000); // internal ROM
map(0x02000000, 0x0200ffff).ram().share("sram"); // 'battery RAM' (in CPU?)
@@ -553,17 +553,17 @@ void pgm2_state::pgm2_map(address_map &map)
map(0x40000000, 0x40000003).r("ymz774", FUNC(ymz774_device::read)).w("ymz774", FUNC(ymz774_device::write));
// internal IGS036 - most of them is standard ATMEL peripherals followed by custom bits
- // AM_RANGE(0xfffa0000, 0xfffa00ff) TC (Timer Counter) not used, mentioned in disabled / unused code
- // AM_RANGE(0xffffec00, 0xffffec7f) SMC (Static Memory Controller)
- // AM_RANGE(0xffffee00, 0xffffee57) MATRIX (Bus Matrix)
+ // map(0xfffa0000, 0xfffa00ff) TC (Timer Counter) not used, mentioned in disabled / unused code
+ // map(0xffffec00, 0xffffec7f) SMC (Static Memory Controller)
+ // map(0xffffee00, 0xffffee57) MATRIX (Bus Matrix)
map(0xfffff000, 0xfffff14b).m(m_arm_aic, FUNC(arm_aic_device::regs_map));
- // AM_RANGE(0xfffff200, 0xfffff247) DBGU (Debug Unit)
- // AM_RANGE(0xfffff400, 0xfffff4af) PIO (Parallel Input Output Controller)
+ // map(0xfffff200, 0xfffff247) DBGU (Debug Unit)
+ // map(0xfffff400, 0xfffff4af) PIO (Parallel Input Output Controller)
map(0xfffff430, 0xfffff437).nopw(); // often
- // AM_RANGE(0xfffffd00, 0xfffffd0b) RSTC (Reset Controller)
- // AM_RANGE(0xfffffd20, 0xfffffd2f) RTTC (Real Time Timer)
+ // map(0xfffffd00, 0xfffffd0b) RSTC (Reset Controller)
+ // map(0xfffffd20, 0xfffffd2f) RTTC (Real Time Timer)
map(0xfffffd28, 0xfffffd2b).r(FUNC(pgm2_state::rtc_r));
- // AM_RANGE(0xfffffd40, 0xfffffd4b) WDTC (Watch Dog Timer)
+ // map(0xfffffd40, 0xfffffd4b) WDTC (Watch Dog Timer)
// custom IGS036 stuff starts here
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
diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp
index 95e4389a113..4dfce5b1a83 100644
--- a/src/mame/drivers/photoply.cpp
+++ b/src/mame/drivers/photoply.cpp
@@ -196,8 +196,8 @@ void photoply_state::photoply_map(address_map &map)
{
map(0x00000000, 0x0009ffff).ram();
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, 0x000c7fff).rom().region("video_bios", 0);
+// map(0x000c8000, 0x000cffff).rom().region("ex_bios", 0);
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);
@@ -213,9 +213,9 @@ void photoply_state::photoply_io(address_map &map)
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(0x0278, 0x027f).ram(); //parallel port 2
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(0x0378, 0x037f).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));
diff --git a/src/mame/drivers/picno.cpp b/src/mame/drivers/picno.cpp
index 035943a0648..8a00432e0d7 100644
--- a/src/mame/drivers/picno.cpp
+++ b/src/mame/drivers/picno.cpp
@@ -60,7 +60,7 @@ void picno_state::mem_map(address_map &map)
void picno_state::io_map(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// map.global_mask(0xff);
}
static INPUT_PORTS_START( picno )
diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp
index 37d8a429b5b..0506ded4247 100644
--- a/src/mame/drivers/pinkiri8.cpp
+++ b/src/mame/drivers/pinkiri8.cpp
@@ -144,8 +144,8 @@ void janshi_vdp_device::map(address_map &map)
map(0xfc3800, 0xfc3fff).ram().share("vram2"); // y pos + unknown
- map(0xff0000, 0xff07ff).ram().share("paletteram"); //AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w)
- map(0xff2000, 0xff27ff).ram().share("paletteram2"); //AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w)
+ map(0xff0000, 0xff07ff).ram().share("paletteram"); //ram().w(FUNC(janshi_vdp_device::paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w));
+ map(0xff2000, 0xff27ff).ram().share("paletteram2"); //ram().w(FUNC(janshi_vdp_device::paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w));
map(0xff6000, 0xff601f).ram().share("crtc_regs");
}
diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp
index 57d63a6350b..dafac58c3e3 100644
--- a/src/mame/drivers/pipbug.cpp
+++ b/src/mame/drivers/pipbug.cpp
@@ -122,7 +122,7 @@ void pipbug_state::pipbug_mem(address_map &map)
void pipbug_state::pipbug_data(address_map &map)
{
-// ADDRESS_MAP_UNMAP_HIGH
+// map.unmap_value_high();
map(S2650_CTRL_PORT, S2650_CTRL_PORT).w(FUNC(pipbug_state::pipbug_ctrl_w));
}
diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp
index 66e86bab16f..4fc64e0a30d 100644
--- a/src/mame/drivers/pirates.cpp
+++ b/src/mame/drivers/pirates.cpp
@@ -159,18 +159,18 @@ void pirates_state::pirates_map(address_map &map)
map(0x100000, 0x10ffff).ram(); // main ram
map(0x300000, 0x300001).portr("INPUTS");
map(0x400000, 0x400001).portr("SYSTEM");
-// AM_RANGE(0x500000, 0x5007ff) AM_RAM
+// map(0x500000, 0x5007ff).ram();
map(0x500000, 0x5007ff).writeonly().share("spriteram");
-// AM_RANGE(0x500800, 0x50080f) AM_WRITENOP
+// map(0x500800, 0x50080f).nopw();
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(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(0x902580, 0x902a7f).ram(); // more of tilemaps ?
map(0x902a80, 0x904187).ram().w(FUNC(pirates_state::bg_tileram_w)).share("bg_tileram");
-// AM_RANGE(0x903c80, 0x904187) AM_RAM // more of tilemaps ?
+// map(0x903c80, 0x904187).ram(); // more of tilemaps ?
map(0xa00001, 0xa00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
}
diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp
index ecf1231ecd0..e60c11f38e2 100644
--- a/src/mame/drivers/pitnrun.cpp
+++ b/src/mame/drivers/pitnrun.cpp
@@ -118,12 +118,12 @@ void pitnrun_state::pitnrun_map(address_map &map)
map(0xb800, 0xb800).portr("INPUTS").w("soundlatch", FUNC(generic_latch_8_device::write));
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(0xc804, 0xc804).w(FUNC(pitnrun_state::mcu_data_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(0xd000, 0xd000).r(FUNC(pitnrun_state::mcu_data_r));
+ //map(0xd800, 0xd800).r(FUNC(pitnrun_state::mcu_status_r));
map(0xf000, 0xf000).r("watchdog", FUNC(watchdog_timer_device::reset_r));
}
diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp
index 81873d4577f..e50b76f09e5 100644
--- a/src/mame/drivers/pktgaldx.cpp
+++ b/src/mame/drivers/pktgaldx.cpp
@@ -173,7 +173,7 @@ void pktgaldx_state::pktgaldb_map(address_map &map)
map(0x150000, 0x15000f).w(m_oki2, FUNC(okim6295_device::write)).umask16(0x00ff);
map(0x150007, 0x150007).r(m_oki2, FUNC(okim6295_device::read));
-// AM_RANGE(0x160000, 0x167fff) AM_RAM
+// map(0x160000, 0x167fff).ram();
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));
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index e3043157202..8d21a17ca9c 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -281,7 +281,7 @@ void playmark_state::bigtwin_main_map(address_map &map)
map(0x70001c, 0x70001d).portr("DSW1");
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(0xe00000, 0xe00001) ?? written on startup
map(0xff0000, 0xffffff).ram();
}
@@ -314,14 +314,14 @@ void playmark_state::wbeachvl_main_map(address_map &map)
map(0x50f000, 0x50ffff).ram().share("rowscroll");
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(0x700000, 0x700001) ?? written on startup
map(0x710010, 0x710011).portr("SYSTEM");
map(0x710012, 0x710013).portr("P1");
map(0x710014, 0x710015).portr("P2");
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(0x71001c, 0x71001d).r(FUNC(playmark_state::playmark_snd_status???));
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();
@@ -370,7 +370,7 @@ void playmark_state::hrdtimes_main_map(address_map &map)
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)
+// map(0x30001e, 0x30001f).w(FUNC(playmark_state::playmark_snd_command_w));
map(0x304000, 0x304001).nopw(); /* watchdog? irq ack? */
}
diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp
index ba363159fa4..76d4d0fbe79 100644
--- a/src/mame/drivers/poisk1.cpp
+++ b/src/mame/drivers/poisk1.cpp
@@ -624,7 +624,7 @@ 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(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!
+ // can't use regular rw(), because THIS IS SPARTA!
// 1st PPI occupies ports 60, 69, 6A and 6B; 2nd PPI -- 68, 61, 62 and 63.
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));
diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp
index 3d56bb32c3a..ff28ce6829d 100644
--- a/src/mame/drivers/pokechmp.cpp
+++ b/src/mame/drivers/pokechmp.cpp
@@ -115,7 +115,7 @@ void pokechmp_state::pokechmp_sound_map(address_map &map)
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 */
+// map(0x3400, 0x3400).r(FUNC(pokechmp_state::pokechmp_adpcm_reset_r)); /* not on here */
map(0x4000, 0x7fff).bankr("bank3");
map(0x8000, 0xffff).rom();
}
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index 7113cf2a8ab..cb0601256e5 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -490,12 +490,12 @@ void popobear_state::popobear_mem(address_map &map)
map(0x480000, 0x48001f).ram().share("vregs");
map(0x480020, 0x480023).ram();
map(0x480028, 0x48002d).ram();
-// 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(0x480020, 0x480021).noprw(); //.rw(FUNC(popobear_state::480020_r) FUNC(popobear_state::480020_w));
+// map(0x480028, 0x480029).noprw(); //.w(FUNC(popobear_state::480028_w));
+// map(0x48002c, 0x48002d).noprw(); //.w(FUNC(popobear_state::48002c_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)
+ map(0x48003a, 0x48003b).ram(); //.rw(FUNC(popobear_state::48003a_r) FUNC(popobear_state::48003a_w));
map(0x480400, 0x4807ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp
index 48146697b7a..2aa1366d7cc 100644
--- a/src/mame/drivers/proconn.cpp
+++ b/src/mame/drivers/proconn.cpp
@@ -159,7 +159,7 @@ void proconn_state::proconn_map(address_map &map)
// r0/r1/r2/r3 and w0/w1/w2/w3 might still be in the wrong order at the moment.
void proconn_state::proconn_portmap(address_map &map)
{
-// ADDRESS_MAP_GLOBAL_MASK(0x3ff)
+// map.global_mask(0x3ff);
// sio (vfd should be connected to it?)
map(0x00ff, 0x00ff).rw(FUNC(proconn_state::sio_r<0>), FUNC(proconn_state::sio_w<0>));
diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp
index 21426bd4a5e..826f8a35665 100644
--- a/src/mame/drivers/prof80.cpp
+++ b/src/mame/drivers/prof80.cpp
@@ -296,14 +296,14 @@ void prof80_state::prof80_mmu(address_map &map)
void prof80_state::prof80_io(address_map &map)
{
map(0x00, 0xd7).mirror(0xff00).rw(m_ecb, FUNC(ecbbus_device::io_r), FUNC(ecbbus_device::io_w));
-// AM_RANGE(0x80, 0x8f) AM_MIRROR(0xff00) AM_DEVREADWRITE(UNIO_Z80STI_TAG, z80sti_device, read, write)
-// AM_RANGE(0x94, 0x95) AM_MIRROR(0xff00) AM_DEVREADWRITE_LEGACY(UNIO_Z80SIO_TAG, z80sio_d_r, z80sio_d_w)
-// AM_RANGE(0x96, 0x97) AM_MIRROR(0xff00) AM_DEVREADWRITE_LEGACY(UNIO_Z80SIO_TAG, z80sio_c_r, z80sio_c_w)
-// AM_RANGE(0x9e, 0x9e) AM_MIRROR(0xff00) AM_WRITE(unio_ctrl_w)
-// AM_RANGE(0x9c, 0x9c) AM_MIRROR(0xff00) AM_DEVWRITE(UNIO_CENTRONICS1_TAG, centronics_device, write)
-// 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(0x80, 0x8f).mirror(0xff00).rw(UNIO_Z80STI_TAG, FUNC(z80sti_device::read), FUNC(z80sti_device::write));
+// map(0x94, 0x95).mirror(0xff00).rw(UNIO_Z80SIO_TAG, FUNC(z80sio_device::z80sio_d_r), FUNC(z80sio_device::z80sio_d_w)); // TODO: these methods don't exist anymore
+// map(0x96, 0x97).mirror(0xff00).rw(UNIO_Z80SIO_TAG, FUNC(z80sio_device::z80sio_c_r), FUNC(z80sio_device::z80sio_c_w)); // TODO: these methods don't exist anymore
+// map(0x9e, 0x9e).mirror(0xff00).w(FUNC(prof80_state::unio_ctrl_w));
+// map(0x9c, 0x9c).mirror(0xff00).w(UNIO_CENTRONICS1_TAG, FUNC(centronics_device::write));
+// map(0x9d, 0x9d).mirror(0xff00).w(UNIO_CENTRONICS1_TAG, FUNC(centronics_device::write));
+// map(0xc0, 0xc0).mirror(0xff00).r(FUNC(prof80_state::gripc_r));
+// map(0xc1, 0xc1).mirror(0xff00).rw(FUNC(prof80_state::gripd_r), FUNC(prof80_state::gripd_w));
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));
diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp
index 92e621b7844..c07a07d0020 100644
--- a/src/mame/drivers/progolf.cpp
+++ b/src/mame/drivers/progolf.cpp
@@ -278,7 +278,7 @@ void progolf_state::main_cpu(address_map &map)
map(0x9800, 0x9800).w("crtc", FUNC(mc6845_device::address_w));
map(0x9801, 0x9801).w("crtc", FUNC(mc6845_device::register_w));
map(0x9a00, 0x9a00).portr("DSW2").w("soundlatch", FUNC(generic_latch_8_device::write));
-// AM_RANGE(0x9e00, 0x9e00) AM_WRITENOP
+// map(0x9e00, 0x9e00).nopw();
map(0xb000, 0xffff).rom();
}
diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp
index 23a81639696..3305d45640c 100644
--- a/src/mame/drivers/puckpkmn.cpp
+++ b/src/mame/drivers/puckpkmn.cpp
@@ -229,11 +229,11 @@ void md_boot_state::puckpkmn_map(address_map &map)
/* Unknown reads/writes: */
map(0xa00000, 0xa00551).nopw(); /* ? */
-// AM_RANGE(0xa10000, 0xa10001) AM_READNOP /* ? once */
+// map(0xa10000, 0xa10001).nopr(); /* ? once */
map(0xa10002, 0xa10005).noprw(); /* ? alternative way of reading inputs ? */
map(0xa11100, 0xa11101).noprw(); /* ? */
-// AM_RANGE(0xa10008, 0xa1000d) AM_WRITENOP /* ? once */
-// AM_RANGE(0xa14000, 0xa14003) AM_WRITENOP /* ? once */
+// map(0xa10008, 0xa1000d).nopw(); /* ? once */
+// map(0xa14000, 0xa14003).nopw(); /* ? once */
map(0xa11200, 0xa11201).nopw(); /* ? */
}
diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp
index 8791a6fadbe..b23aa109511 100644
--- a/src/mame/drivers/pv1000.cpp
+++ b/src/mame/drivers/pv1000.cpp
@@ -184,7 +184,7 @@ private:
void pv1000_state::pv1000_mem(address_map &map)
{
- //AM_RANGE(0x0000, 0x7fff) // mapped by the cartslot
+ //map(0x0000, 0x7fff) // mapped by the cartslot
map(0xb800, 0xbbff).ram().share("videoram");
map(0xbc00, 0xbfff).ram().w(FUNC(pv1000_state::gfxram_w)).region("gfxram", 0);
}
diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp
index 196eaad7022..7ee58f80106 100644
--- a/src/mame/drivers/pv2000.cpp
+++ b/src/mame/drivers/pv2000.cpp
@@ -186,8 +186,8 @@ void pv2000_state::pv2000_map(address_map &map)
map(0x4000, 0x4001).rw("tms9928a", FUNC(tms9928a_device::read), FUNC(tms9928a_device::write));
map(0x7000, 0x7fff).ram();
- //AM_RANGE(0x8000, 0xbfff) ext ram?
- //AM_RANGE(0xc000, 0xffff) // mapped by the cartslot
+ //map(0x8000, 0xbfff) ext ram?
+ //map(0xc000, 0xffff) // mapped by the cartslot
}
diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp
index 39cb02f1cac..ad5f2acc58d 100644
--- a/src/mame/drivers/pv9234.cpp
+++ b/src/mame/drivers/pv9234.cpp
@@ -111,16 +111,16 @@ WRITE32_MEMBER( pv9234_state::debug2_w )
void pv9234_state::pv9234_map(address_map &map)
{
map(0x00000000, 0x0007ffff).rom().region("maincpu", 0); //FLASH ROM!
- // AM_RANGE(0x00000000, 0x00000033) AM_WRITE something
- // AM_RANGE(0x00000044, 0x00000047) AM_WRITE something
- // AM_RANGE(0x00000060, 0x0000006b) AM_WRITE something
- // AM_RANGE(0x00007000, 0x00007003) AM_WRITE something
- // AM_RANGE(0x00008000, 0x00008003) AM_WRITE something
+ // map(0x00000000, 0x00000033).w(FUNC(pv9234_state::)); something
+ // map(0x00000044, 0x00000047).w(FUNC(pv9234_state::));
+ // map(0x00000060, 0x0000006b).w(FUNC(pv9234_state::));
+ // map(0x00007000, 0x00007003).w(FUNC(pv9234_state::));
+ // map(0x00008000, 0x00008003).w(FUNC(pv9234_state::));
map(0x00008014, 0x00008017).w(FUNC(pv9234_state::debug1_w));
- // AM_RANGE(0x00008020, 0x00008027) AM_WRITE something
+ // map(0x00008020, 0x00008027).w(FUNC(pv9234_state::));
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(0x000080d0, 0x000080d3).w(FUNC(pv9234_state::));
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 (!)
map(0xe0000000, 0xe0007fff).mirror(0x0fff8000).ram().share("share1");
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index f7672deb7f6..98288519fa8 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -528,8 +528,8 @@ void px8_state::px8_io(address_map &map)
map.global_mask(0x0f);
map(0x00, 0x07).rw(FUNC(px8_state::gah40m_r), FUNC(px8_state::gah40m_w));
map(0x0c, 0x0d).rw(I8251_TAG, FUNC(i8251_device::read), FUNC(i8251_device::write));
-// AM_RANGE(0x0e, 0x0e) AM_DEVREADWRITE(SED1320_TAG, sed1330_device, status_r, data_w)
-// AM_RANGE(0x0f, 0x0f) AM_DEVREADWRITE(SED1320_TAG, sed1330_device, data_r, command_w)
+// map(0x0e, 0x0e).rw(SED1320_TAG, FUNC(sed1330_device::status_r), FUNC(sed1330_device::data_w));
+// map(0x0f, 0x0f).rw(SED1320_TAG, FUNC(sed1330_device::data_r), FUNC(sed1330_device::command_w));
}
/*-------------------------------------------------
@@ -540,7 +540,7 @@ void px8_state::px8_slave_mem(address_map &map)
{
map.unmap_value_high();
map(0x0020, 0x0023).rw(FUNC(px8_state::gah40s_r), FUNC(px8_state::gah40s_w));
-// AM_RANGE(0x0024, 0x0027) AM_DEVREADWRITE_LEGACY(SED1320_TAG, )
+// map(0x0024, 0x0027).rw(SED1320_TAG, FUNC(sed1330_device::), FUNC(sed1330_device::));
map(0x0028, 0x0028).w(FUNC(px8_state::gah40s_ier_w));
map(0x8000, 0x97ff).ram().share("video_ram");
map(0x9800, 0xefff).noprw();
diff --git a/src/mame/drivers/quakeat.cpp b/src/mame/drivers/quakeat.cpp
index 5b575462c74..5d25a6d132f 100644
--- a/src/mame/drivers/quakeat.cpp
+++ b/src/mame/drivers/quakeat.cpp
@@ -103,13 +103,13 @@ void quakeat_state::quake_io(address_map &map)
{
pcat32_io_common(map);
map(0x00e8, 0x00eb).noprw();
-// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE16("ide", ide_controller_device, read_cs0, write_cs0, 0xffffffff)
+// map(0x01f0, 0x01f7).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0));
map(0x0300, 0x03af).noprw();
map(0x03b0, 0x03df).noprw();
-// AM_RANGE(0x0278, 0x027b) AM_WRITE(pnp_config_w)
-// AM_RANGE(0x03f0, 0x03f7) AM_DEVREADWRITE16("ide", ide_controller_device, read_cs1, write_cs1, 0xffffffff)
-// AM_RANGE(0x0a78, 0x0a7b) AM_WRITE(pnp_data_w)
-// AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_device, read, write)
+// map(0x0278, 0x027b).w(FUNC(quakeat_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(FUNC(quakeat_state::pnp_data_w));
+// map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_device::read), FUNC(pci_bus_device::write));
}
/*************************************************************/
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp
index 0eb7b3a64ba..f58e35fc041 100644
--- a/src/mame/drivers/r9751.cpp
+++ b/src/mame/drivers/r9751.cpp
@@ -940,14 +940,14 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_fff8_w )
void r9751_state::r9751_mem(address_map &map)
{
- //ADDRESS_MAP_UNMAP_HIGH
+ //map.unmap_value_high();
map(0x00000000, 0x00ffffff).ram().share("main_ram"); // 16MB
map(0x08000000, 0x0800ffff).rom().region("prom", 0);
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
+ //map(0xffffff00,0xffffffff).ram(); // Unknown area
}
/******************************************************************************
diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp
index 83fa9259379..bd67ef4d0a7 100644
--- a/src/mame/drivers/radio86.cpp
+++ b/src/mame/drivers/radio86.cpp
@@ -29,7 +29,7 @@ void radio86_state::radio86_mem(address_map &map)
map(0x0000, 0x0fff).bankrw("bank1"); // First bank
map(0x1000, 0x7fff).ram(); // RAM
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(0xa000, 0xa003).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
map(0xc000, 0xc001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
map(0xe000, 0xffff).w(m_dma8257, FUNC(i8257_device::write)); // DMA
map(0xf000, 0xffff).rom(); // System ROM
@@ -79,7 +79,7 @@ void radio86_state::radio86_16_mem(address_map &map)
map(0x1000, 0x3fff).ram(); // RAM
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(0xa000, 0xa003).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
map(0xc000, 0xc001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
map(0xe000, 0xffff).w(m_dma8257, FUNC(i8257_device::write)); // DMA
map(0xf000, 0xffff).rom(); // System ROM
@@ -91,7 +91,7 @@ void radio86_state::mikron2_mem(address_map &map)
map(0x0000, 0x0fff).bankrw("bank1"); // First bank
map(0x1000, 0x7fff).ram(); // RAM
map(0xc000, 0xc003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
- //AM_RANGE( 0xc100, 0xc103 ) AM_DEVREADWRITE_LEGACY("ppi8255_2", i8255a_r, i8255a_w) AM_MIRROR(0x00fc)
+ //map(0xc100, 0xc103).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
map(0xc200, 0xc201).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x00fe); // video
map(0xc300, 0xc3ff).w(m_dma8257, FUNC(i8257_device::write)); // DMA
map(0xf000, 0xffff).rom(); // System ROM
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index c6d98e23321..12004e771ba 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -926,8 +926,8 @@ void rainbow_state::rainbow8088_map(address_map &map)
// 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)
+ // - Address bits 8-12 are ignored (-> mirror()).
+ map(0xed000, 0xed0ff).ram().share("vol_ram"); //.mirror(0x1f00);
map(0xed100, 0xed1ff).ram().share("nvram");
map(0xee000, 0xeffff).ram().share("p_ram");
@@ -1022,7 +1022,7 @@ void rainbow_state::rainbow8088_io(address_map &map)
// ===========================================================
// 0x70 -> 0x7f ***** Option Select 4
// ===========================================================
- // 0x10c -> (MHFU disable register handled by 0x0c + AM_SELECT)
+ // 0x10c -> (MHFU disable register handled by 0x0c + select())
}
void rainbow_state::rainbowz80_mem(address_map &map)
diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp
index b310919023e..21044699b3d 100644
--- a/src/mame/drivers/rbmk.cpp
+++ b/src/mame/drivers/rbmk.cpp
@@ -207,7 +207,7 @@ void rbmk_state::rbspm_mem(address_map &map)
void rbmk_state::mcu_mem(address_map &map)
{
-// AM_RANGE(0x0000, 0x0fff) AM_ROM
+// map(0x0000, 0x0fff).rom();
}
READ8_MEMBER(rbmk_state::mcu_io_r)
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index 92d7077c0bd..27b47c79bf3 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -484,10 +484,10 @@ void rc759_state::rc759_io(address_map &map)
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(FUNC(rc759_state::rtc_r), FUNC(rc759_state::rtc_w));
-// AM_RANGE(0x060, 0x06f) AM_WRITE8(crt_control_w, 0x00ff)
+// map(0x060, 0x06f).w(FUNC(rc759_state::crt_control_w)).umask16(0x00ff);
map(0x070, 0x077).mirror(0x08).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff);
map(0x080, 0x0ff).rw(FUNC(rc759_state::nvram_r), FUNC(rc759_state::nvram_w)).umask16(0x00ff);
-// AM_RANGE(0x100, 0x101) net
+// map(0x100, 0x101) net
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));
@@ -495,16 +495,16 @@ void rc759_state::rc759_io(address_map &map)
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(FUNC(rc759_state::floppy_control_w));
-// AM_RANGE(0x28a, 0x28b) external printer data
-// AM_RANGE(0x28d, 0x28d) external printer control
+// map(0x28a, 0x28b) external printer data
+// map(0x28d, 0x28d) external printer control
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(0x292, 0x293).rw(FUNC(rc759_state::printer_ack_r), FUNC(rc759_state::printer_reserve_w)).umask16(0x00ff);
+// map(0x294, 0x295).w(FUNC(rc759_state::printer_release_w)).umask16(0x00ff);
map(0x300, 0x30f).rw(m_isbx, FUNC(isbx_slot_device::mcs0_r), FUNC(isbx_slot_device::mcs0_w)).umask16(0x00ff);
map(0x310, 0x31f).rw(m_isbx, FUNC(isbx_slot_device::mcs1_r), FUNC(isbx_slot_device::mcs1_w)).umask16(0x00ff);
-// AM_RANGE(0x320, 0x321) isbx dma ack
-// AM_RANGE(0x330, 0x331) isbx tc
+// map(0x320, 0x321) isbx dma ack
+// map(0x330, 0x331) isbx tc
}
diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp
index cc7e8f8a57c..6408695b812 100644
--- a/src/mame/drivers/riscpc.cpp
+++ b/src/mame/drivers/riscpc.cpp
@@ -846,24 +846,24 @@ WRITE32_MEMBER( riscpc_state::a7000_iomd_w )
void riscpc_state::a7000_map(address_map &map)
{
map(0x00000000, 0x003fffff).mirror(0x00800000).rom().region("user1", 0);
-// AM_RANGE(0x01000000, 0x01ffffff) AM_NOP //expansion ROM
+// map(0x01000000, 0x01ffffff).noprw(); //expansion ROM
//
// map(0x02000000, 0x027fffff).mirror(0x00800000).ram(); // VRAM, not installed on A7000 models
// I/O 03000000 - 033fffff
-// AM_RANGE(0x03010000, 0x03011fff) //Super IO
-// AM_RANGE(0x03012000, 0x03029fff) //FDC
-// 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(0x03010000, 0x03011fff) //Super IO
+// map(0x03012000, 0x03029fff) //FDC
+// map(0x0302b000, 0x0302bfff) //Network podule
+// map(0x03040000, 0x0304ffff) //podule space 0,1,2,3
+// map(0x03070000, 0x0307ffff) //podule space 4,5,6,7
map(0x03200000, 0x032001ff).rw(FUNC(riscpc_state::a7000_iomd_r), FUNC(riscpc_state::a7000_iomd_w)); //IOMD Registers //mirrored at 0x03000000-0x1ff?
map(0x03310000, 0x03310003).portr("MOUSE");
map(0x03400000, 0x037fffff).w(FUNC(riscpc_state::a7000_vidc20_w));
-// AM_RANGE(0x08000000, 0x08ffffff) AM_MIRROR(0x07000000) //EASI space
+// map(0x08000000, 0x08ffffff).mirror(0x07000000); //EASI space
map(0x10000000, 0x13ffffff).ram(); //SIMM 0 bank 0
map(0x14000000, 0x17ffffff).ram(); //SIMM 0 bank 1
-// AM_RANGE(0x18000000, 0x18ffffff) AM_MIRROR(0x03000000) AM_RAM //SIMM 1 bank 0
-// AM_RANGE(0x1c000000, 0x1cffffff) AM_MIRROR(0x03000000) AM_RAM //SIMM 1 bank 1
+// map(0x18000000, 0x18ffffff).mirror(0x03000000).ram(); //SIMM 1 bank 0
+// map(0x1c000000, 0x1cffffff).mirror(0x03000000).ram(); //SIMM 1 bank 1
}
void riscpc_state::riscpc_map(address_map &map)
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index 94ee0659acf..eb06ff91f3a 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -201,18 +201,18 @@ void rm380z_state::rm480z_mem(address_map &map)
void rm380z_state::rm480z_io(address_map &map)
{
- //AM_RANGE(0x00, 0x17) AM_RAM // videoram
- //AM_RANGE(0x18, 0x18) AM_MIRROR(0xff00) // control port 0
- //AM_RANGE(0x19, 0x19) AM_MIRROR(0xff00) // control port 1
- //AM_RANGE(0x1a, 0x1a) AM_MIRROR(0xff00) // control port 2
- //AM_RANGE(0x1b, 0x1b) AM_MIRROR(0xff00) // control port 3 (DAC) // option
- //AM_RANGE(0x1d, 0x1d) AM_MIRROR(0xff00) // control port 5 (USERIO) // option
- //AM_RANGE(0x20, 0x23) AM_MIRROR(0xff00) // system CTC - 0=SIO4&cassin, 1=SIO2&cassio, 2=keybd int, 3=50hz int for repeat key
- //AM_RANGE(0x24, 0x27) AM_MIRROR(0xff00) // system SIO - 0=chA network data, 1=chB SIO4 data, 2=ChA control, 3=ChB control
- //AM_RANGE(0x28, 0x29) AM_MIRROR(0xff02) // am9511/am9512 maths chip // option
- //AM_RANGE(0x2c, 0x2f) AM_MIRROR(0xff00) // z80ctc IEEE int, Maths int, RTC, RTC // option
- //AM_RANGE(0x30, 0x37) AM_MIRROR(0xff00) // IEEE chip // option
- //AM_RANGE(0x38, 0x3b) AM_MIRROR(0xff00) // Hi-res graphics option
+ //map(0x00, 0x17).ram(); // videoram
+ //map(0x18, 0x18).mirror(0xff00); // control port 0
+ //map(0x19, 0x19).mirror(0xff00); // control port 1
+ //map(0x1a, 0x1a).mirror(0xff00); // control port 2
+ //map(0x1b, 0x1b).mirror(0xff00); // control port 3 (DAC) // option
+ //map(0x1d, 0x1d).mirror(0xff00); // control port 5 (USERIO) // option
+ //map(0x20, 0x23).mirror(0xff00); // system CTC - 0=SIO4&cassin, 1=SIO2&cassio, 2=keybd int, 3=50hz int for repeat key
+ //map(0x24, 0x27).mirror(0xff00); // system SIO - 0=chA network data, 1=chB SIO4 data, 2=ChA control, 3=ChB control
+ //map(0x28, 0x29).mirror(0xff02); // am9511/am9512 maths chip // option
+ //map(0x2c, 0x2f).mirror(0xff00); // z80ctc IEEE int, Maths int, RTC, RTC // option
+ //map(0x30, 0x37).mirror(0xff00); // IEEE chip // option
+ //map(0x38, 0x3b).mirror(0xff00); // Hi-res graphics option
}
INPUT_PORTS_START( rm380z )
diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp
index c19b7c92852..641a7a29d34 100644
--- a/src/mame/drivers/royalmah.cpp
+++ b/src/mame/drivers/royalmah.cpp
@@ -827,7 +827,7 @@ void royalmah_state::mjderngr_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));
-// AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1")
+// map(0x10, 0x10).portr("DSW1");
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));
@@ -1122,7 +1122,7 @@ void royalmah_state::mjifb_map(address_map &map)
map(0x7000, 0x7fff).ram().share("nvram");
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
+// map(0xc000, 0xffff).rom().writeonly(); This should, but doesn't work
}
READ8_MEMBER(royalmah_state::mjifb_p3_r)
diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp
index c8f1b4f51ac..51c433cab2c 100644
--- a/src/mame/drivers/rx78.cpp
+++ b/src/mame/drivers/rx78.cpp
@@ -278,7 +278,7 @@ void rx78_state::rx78_mem(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x1fff).rom().region("roms", 0);
- //AM_RANGE(0x2000, 0x5fff) // mapped by the cartslot
+ //map(0x2000, 0x5fff) // mapped by the cartslot
map(0x6000, 0xafff).ram(); //ext RAM
map(0xb000, 0xebff).ram();
map(0xec00, 0xffff).rw(FUNC(rx78_state::vram_r), FUNC(rx78_state::vram_w));
@@ -288,8 +288,8 @@ void rx78_state::rx78_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
-// AM_RANGE(0xe2, 0xe2) AM_READNOP AM_WRITENOP //printer
-// AM_RANGE(0xe3, 0xe3) AM_WRITENOP //printer
+// map(0xe2, 0xe2).noprw(); //printer
+// map(0xe3, 0xe3).nopw(); //printer
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));
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index d9da6d92f71..3b703af5967 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -40,7 +40,7 @@ void sage2_state::sage2_mem(address_map &map)
{
map.unmap_value_high();
map(0xffc000, 0xffc007).rw(I8253_1_TAG, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff);
- map(0xffc010, 0xffc01f).noprw(); //AM_DEVREADWRITE8(TMS9914_TAG, tms9914_device, read, write, 0x00ff)
+ map(0xffc010, 0xffc01f).noprw(); //rw(TMS9914_TAG, FUNC(tms9914_device::read), FUNC(tms9914_device::write)).umask16(0x00ff);
map(0xffc020, 0xffc027).rw(I8255A_0_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); // i8255, DIPs + Floppy ctrl port
map(0xffc030, 0xffc033).rw(m_usart1, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff);
map(0xffc040, 0xffc043).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff);
@@ -48,11 +48,11 @@ void sage2_state::sage2_mem(address_map &map)
map(0xffc060, 0xffc067).rw(I8255A_1_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); // i8255, Printer
map(0xffc070, 0xffc073).rw(m_usart0, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff);
map(0xffc080, 0xffc087).mirror(0x78).rw(I8253_0_TAG, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff);
-// AM_RANGE(0xffc400, 0xffc407) AM_DEVREADWRITE8(S2651_0_TAG, s2651_device, read, write, 0x00ff)
-// AM_RANGE(0xffc440, 0xffc447) AM_DEVREADWRITE8(S2651_1_TAG, s2651_device, read, write, 0x00ff)
-// AM_RANGE(0xffc480, 0xffc487) AM_DEVREADWRITE8(S2651_2_TAG, s2651_device, read, write, 0x00ff)
-// AM_RANGE(0xffc4c0, 0xffc4c7) AM_DEVREADWRITE8(S2651_3_TAG, s2651_device, read, write, 0x00ff)
-// AM_RANGE(0xffc500, 0xffc7ff) // Winchester drive ports
+// map(0xffc400, 0xffc407).rw(S2651_0_TAG, FUNC(s2651_device::read), FUNC(s2651_device::write)).umask16(0x00ff);
+// map(0xffc440, 0xffc447).rw(S2651_1_TAG, FUNC(s2651_device::read), FUNC(s2651_device::write)).umask16(0x00ff);
+// map(0xffc480, 0xffc487).rw(S2651_2_TAG, FUNC(s2651_device::read), FUNC(s2651_device::write)).umask16(0x00ff);
+// map(0xffc4c0, 0xffc4c7).rw(S2651_3_TAG, FUNC(s2651_device::read), FUNC(s2651_device::write)).umask16(0x00ff);
+// map(0xffc500, 0xffc7ff) // Winchester drive ports
}
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index 9f6d677dccf..45457852d94 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -291,10 +291,10 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_lpt2_strobe_w)
void samcoupe_state::samcoupe_mem(address_map &map)
{
- 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")
+ map(0x0000, 0x3fff).ram().rw(FUNC(samcoupe_state::sam_bank1_r), FUNC(samcoupe_state::sam_bank1_w)); // .bankrw("bank1");
+ map(0x4000, 0x7fff).ram().rw(FUNC(samcoupe_state::sam_bank2_r), FUNC(samcoupe_state::sam_bank2_w)); // .bankrw("bank2");
+ map(0x8000, 0xbfff).ram().rw(FUNC(samcoupe_state::sam_bank3_r), FUNC(samcoupe_state::sam_bank3_w)); // .bankrw("bank3");
+ map(0xc000, 0xffff).ram().rw(FUNC(samcoupe_state::sam_bank4_r), FUNC(samcoupe_state::sam_bank4_w)); // .bankrw("bank4");
}
void samcoupe_state::samcoupe_io(address_map &map)
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index 20612902b78..930d03bed0f 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -218,9 +218,9 @@ void sapi_state::sapi1_mem(address_map &map)
map(0x1000, 0x1fff).rom(); // Extension ROM
map(0x2000, 0x23ff).ram();
map(0x2400, 0x27ff).rw(FUNC(sapi_state::sapi1_keyboard_r), FUNC(sapi_state::sapi1_keyboard_w)); // PORT 0 - keyboard
- //map(0x2800, 0x2bff) AM_NOP // PORT 1
- //map(0x2c00, 0x2fff) AM_NOP // PORT 2
- //map(0x3000, 0x33ff) AM_NOP // 3214
+ //map(0x2800, 0x2bff).noprw(); // PORT 1
+ //map(0x2c00, 0x2fff).noprw(); // PORT 2
+ //map(0x3000, 0x33ff).noprw(); // 3214
map(0x3800, 0x3fff).ram().share("videoram"); // AND-1 (video RAM)
map(0x4000, 0x7fff).ram(); // REM-1
}
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index b8bd86cd579..e6f6cf5209f 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -530,9 +530,9 @@ void sat_console_state::saturn_mem(address_map &map)
map(0x00200000, 0x002fffff).ram().mirror(0x20100000).share("workram_l");
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(0x02000000, 0x023fffff).rom().mirror(0x20000000); // Cartridge area
+// map(0x02400000, 0x027fffff).ram(); // External Data RAM area
+// map(0x04000000, 0x047fffff).ram(); // External Battery RAM area
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));
@@ -546,7 +546,7 @@ void sat_console_state::saturn_mem(address_map &map)
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(0x05fe0000, 0x05fe00cf).m(m_scu, FUNC(sega_scu_device::regs_map)); //rw(FUNC(sat_console_state::saturn_scu_r), FUNC(sat_console_state::saturn_scu_w));
map(0x06000000, 0x060fffff).ram().mirror(0x21f00000).share("workram_h");
map(0x45000000, 0x46ffffff).nopw();
map(0x60000000, 0x600003ff).nopw(); // cache address array
diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp
index 689ee3c0d73..117eb78457f 100644
--- a/src/mame/drivers/savquest.cpp
+++ b/src/mame/drivers/savquest.cpp
@@ -740,7 +740,7 @@ void savquest_state::savquest_map(address_map &map)
{
map.unmap_value_high();
map(0x00000000, 0x0009ffff).ram();
- 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(0x000a0000, 0x000bffff).rw(FUNC(savquest_state::smram_r), FUNC(savquest_state::smram_w)); //.rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w));
map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0);
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));
@@ -770,7 +770,7 @@ void savquest_state::savquest_io(address_map &map)
map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write));
-// AM_RANGE(0x5000, 0x5007) // routes to port $eb
+// map(0x5000, 0x5007) // routes to port $eb
}
#define AT_KEYB_HELPER(bit, text, key1) \
diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp
index 558ac585863..4916d3d0640 100644
--- a/src/mame/drivers/scobra.cpp
+++ b/src/mame/drivers/scobra.cpp
@@ -310,8 +310,8 @@ void scobra_state::rescuefe_map(address_map &map)
map(0xc220, 0xc223).w(m_ppi8255_1, FUNC(i8255_device::write)); // ^
// addresses below are WRONG, just moved to keep things out the way while the rom mapping is figured out
-// AM_RANGE(0xf802, 0xf802) AM_WRITE(galaxold_coin_counter_w)
-// AM_RANGE(0xf000, 0xf000) AM_DEVREAD("watchdog", watchdog_timer_device, reset_r)
+// map(0xf802, 0xf802).w(FUNC(scobra_state::galaxold_coin_counter_w));
+// map(0xf000, 0xf000).r("watchdog", FUNC(watchdog_timer_device::reset_r));
}
void scobra_state::minefldfe_map(address_map &map)
diff --git a/src/mame/drivers/scopus.cpp b/src/mame/drivers/scopus.cpp
index 97656302875..3333215decc 100644
--- a/src/mame/drivers/scopus.cpp
+++ b/src/mame/drivers/scopus.cpp
@@ -125,7 +125,7 @@ void sagitta180_state::maincpu_map(address_map &map)
{
map.global_mask(0xffff);
map(0x0000, 0x07ff).rom();
-// AM_RANGE(0x0800, 0x17ff) AM_ROM
+// map(0x0800, 0x17ff).rom();
map(0x1800, 0xffff).ram();
}
diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp
index dbb113d83d4..64c8b504994 100644
--- a/src/mame/drivers/scramble.cpp
+++ b/src/mame/drivers/scramble.cpp
@@ -165,7 +165,7 @@ void scramble_state::newsin7_map(address_map &map)
map(0x5080, 0x50ff).ram();
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(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));
diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp
index 66da380809a..0879515e729 100644
--- a/src/mame/drivers/scyclone.cpp
+++ b/src/mame/drivers/scyclone.cpp
@@ -339,8 +339,8 @@ void scyclone_state::scyclone_sub_map(address_map &map)
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(0x3003, 0x3003).w(FUNC(scyclone_state::snd_3003_w)); // writes 02 or 00
+// map(0x3004, 0x3004).w(FUNC(scyclone_state::snd_3004_w)); // always writes 00?
map(0x3005, 0x3005).w(FUNC(scyclone_state::snd_3005_w)); // written at the same time, with the same data as 0x3001
}
diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp
index ce7a1df8e19..d894127ce77 100644
--- a/src/mame/drivers/seattlecmp.cpp
+++ b/src/mame/drivers/seattlecmp.cpp
@@ -78,14 +78,14 @@ void seattle_comp_state::mem_map(address_map &map)
void seattle_comp_state::io_map(address_map &map)
{
- //ADDRESS_MAP_UNMAP_HIGH
+ //map.unmap_value_high();
map.global_mask(0xff);
map(0xf0, 0xf1).rw("pic1", FUNC(pic8259_device::read), FUNC(pic8259_device::write));
map(0xf2, 0xf3).rw("pic2", FUNC(pic8259_device::read), FUNC(pic8259_device::write));
map(0xf4, 0xf5).rw("stc", FUNC(am9513_device::read8), FUNC(am9513_device::write8));
map(0xf6, 0xf7).rw("uart", FUNC(i8251_device::read), FUNC(i8251_device::write));
- //AM_RANGE(0xfc, 0xfd) Parallel data, status, serial DCD
- //AM_RANGE(0xfe, 0xff) Eprom disable bit, read sense switches (bank of 8 dipswitches)
+ //map(0xfc, 0xfd) Parallel data, status, serial DCD
+ //map(0xfe, 0xff) Eprom disable bit, read sense switches (bank of 8 dipswitches)
}
/* Input ports */
diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp
index d7856420afe..3104a986d79 100644
--- a/src/mame/drivers/segag80v.cpp
+++ b/src/mame/drivers/segag80v.cpp
@@ -406,7 +406,7 @@ void segag80v_state::opcodes_map(address_map &map)
void segag80v_state::main_portmap(address_map &map)
{
map.global_mask(0xff);
- map(0xbc, 0xbc); /* AM_READ ??? */
+ map(0xbc, 0xbc); /* .r(FUNC(segag80v_state::)); ??? */
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));
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index fc46d67b8dc..f47903b19b7 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -2419,7 +2419,7 @@ 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, 0xc0005f).mirror(0x0fff80).rw(FUNC(segas32_trackball_state::sonic_custom_io_r), FUNC(segas32_trackball_state::sonic_custom_io_w)).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);
diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp
index 12532ff45c9..db29c66da11 100644
--- a/src/mame/drivers/segasp.cpp
+++ b/src/mame/drivers/segasp.cpp
@@ -206,12 +206,12 @@ void segasp_state::segasp_map(address_map &map)
/* External Device */
map(0x01000000, 0x0100ffff).ram(); // banked access to ROM/NET board address space, mainly backup SRAM and ATA
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(0x01010080, 0x01010087) IRQ pending/reset, ATA control
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
+// map(0x01010180, 0x010101af) custom UART 1
+// map(0x010101c0, 0x010101ef) custom UART 2
/* Area 1 */
map(0x04000000, 0x04ffffff).mirror(0x02000000).ram().share("dc_texture_ram"); // texture memory 64 bit access
@@ -231,13 +231,13 @@ void segasp_state::segasp_map(address_map &map)
map(0x13000000, 0x13ffffff).w(m_powervr2, FUNC(powervr2_device::ta_texture_directpath1_w)); // access to texture / framebuffer memory (either 32-bit or 64-bit area depending on SB_LMMODE1 register - cannot be written directly, only through dma / store queue)
/* Area 5 */
- //AM_RANGE(0x14000000, 0x17ffffff) AM_NOP // MPX Ext.
+ //map(0x14000000, 0x17ffffff).noprw(); // MPX Ext.
/* Area 6 */
- //AM_RANGE(0x18000000, 0x1bffffff) AM_NOP // Unassigned
+ //map(0x18000000, 0x1bffffff).noprw(); // Unassigned
/* Area 7 */
- //AM_RANGE(0x1c000000, 0x1fffffff) AM_NOP // SH4 Internal
+ //map(0x1c000000, 0x1fffffff).noprw(); // SH4 Internal
}
void segasp_state::onchip_port(address_map &map)
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index d1fc9bfcb6e..88546ef468e 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -496,8 +496,8 @@ void ufo_state::ex_ufo21_portmap(address_map &map)
void ufo_state::ex_ufo800_portmap(address_map &map)
{
ufo_portmap(map);
-// AM_RANGE(0x60, 0x67) AM_NOP // unused?
-// AM_RANGE(0x68, 0x68) AM_WRITENOP // ?
+// map(0x60, 0x67).noprw(); // unused?
+// map(0x68, 0x68).nopw(); // ?
}
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index 12b3bf5af56..31068b0b3e4 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -953,7 +953,7 @@ void segaxbd_state::main_map(address_map &map)
map(0x2e8000, 0x2e800f).mirror(0x003ff0).rw("cmptimer_subx", FUNC(sega_315_5250_compare_timer_device::read), FUNC(sega_315_5250_compare_timer_device::write));
map(0x2ec000, 0x2ecfff).mirror(0x001000).ram().share("segaic16road:roadram");
map(0x2ee000, 0x2effff).rw("segaic16road", FUNC(segaic16_road_device::segaic16_road_control_0_r), FUNC(segaic16_road_device::segaic16_road_control_0_w));
-// AM_RANGE(0x2f0000, 0x2f3fff) AM_READWRITE(excs_r, excs_w)
+// map(0x2f0000, 0x2f3fff).rw(FUNC(segaxbd_state::excs_r), FUNC(segaxbd_state::excs_w));
map(0x3f8000, 0x3fbfff).ram().share("backup1");
map(0x3fc000, 0x3fffff).ram().share("backup2");
}
diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp
index fe8fb32b391..f97425e6f00 100644
--- a/src/mame/drivers/segaybd.cpp
+++ b/src/mame/drivers/segaybd.cpp
@@ -591,7 +591,7 @@ void segaybd_state::main_map(address_map &map)
map(0x080000, 0x080007).mirror(0x001ff8).rw("multiplier_main", FUNC(sega_315_5248_multiplier_device::read), FUNC(sega_315_5248_multiplier_device::write));
map(0x082001, 0x082001).mirror(0x001ffe).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0x084000, 0x08401f).mirror(0x001fe0).rw("divider_main", FUNC(sega_315_5249_divider_device::read), FUNC(sega_315_5249_divider_device::write));
-// AM_RANGE(0x086000, 0x087fff) /DEA0
+// map(0x086000, 0x087fff) /DEA0
map(0x0c0000, 0x0cffff).ram().share("shareram");
map(0x100000, 0x10001f).rw("io", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write)).umask16(0x00ff);
map(0x100040, 0x100047).rw("adc", FUNC(msm6253_device::d7_r), FUNC(msm6253_device::address_w)).umask16(0x00ff);
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp
index 1e3e0d4bd74..88d1783a375 100644
--- a/src/mame/drivers/seibuspi.cpp
+++ b/src/mame/drivers/seibuspi.cpp
@@ -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(0x00000500, 0x0000057f).rw("obj", FUNC(sei252_device::read_xor), FUNC(sei252_device::write_xor));
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
@@ -1024,7 +1024,7 @@ void seibuspi_state::sei252_map(address_map &map)
void seibuspi_state::rise_map(address_map &map)
{
- //AM_RANGE(0x00000500, 0x0000057f) AM_DEVREADWRITE16("obj", seibu_encrypted_sprite_device, read, write, 0xffffffff)
+ //map(0x00000500, 0x0000057f).rw("obj", FUNC(seibu_encrypted_sprite_device::read), FUNC(seibu_encrypted_sprite_device::write));
map(0x0000054c, 0x0000054f).nopw(); // RISE10/11 sprite decryption key, see machine/seibuspi.c
map(0x00000562, 0x00000563).w(FUNC(seibuspi_state::sprite_dma_start_w));
}
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index f78135f7d0a..40ac0fcbc89 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -348,7 +348,7 @@ WRITE16_MEMBER(seicupbl_state::layer_disable_w)
void seicupbl_state::cupsocbl_mem(address_map &map)
{
-// AM_IMPORT_FROM( legionna_cop_mem )
+// legionna_cop_mem(map);
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(FUNC(seicupbl_state::layer_disable_w));
diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp
index 9956c917ac0..bb4489dc39d 100644
--- a/src/mame/drivers/selz80.cpp
+++ b/src/mame/drivers/selz80.cpp
@@ -86,7 +86,7 @@ void selz80_state::selz80_mem(address_map &map)
map.unmap_value_high();
map(0x0000, 0x0fff).rom();
map(0x1000, 0x27ff).ram(); // all 3 RAM sockets filled
- // AM_RANGE(0x3000, 0x37ff) AM_ROM // empty socket for ROM
+ // map(0x3000, 0x37ff).rom(); // empty socket for ROM
map(0xa000, 0xffff).rom();
}
diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp
index 4990225bdb9..c154d2bd1dd 100644
--- a/src/mame/drivers/sengokmj.cpp
+++ b/src/mame/drivers/sengokmj.cpp
@@ -415,9 +415,9 @@ void sengokmj_state::sengokmj_io_map(address_map &map)
/*Areas from 8000-804f are for the custom Seibu CRTC.*/
map(0x8000, 0x804f).rw("crtc", FUNC(seibu_crtc_device::read), FUNC(seibu_crtc_device::write));
-// AM_RANGE(0x8080, 0x8081) CRTC extra register?
-// AM_RANGE(0x80c0, 0x80c1) CRTC extra register?
-// AM_RANGE(0x8100, 0x8101) AM_WRITENOP // always 0
+// map(0x8080, 0x8081) CRTC extra register?
+// map(0x80c0, 0x80c1) CRTC extra register?
+// map(0x8100, 0x8101).nopw(); // always 0
map(0x8180, 0x8181).w(FUNC(sengokmj_state::out_w));
map(0x8140, 0x8141).w(FUNC(sengokmj_state::mahjong_panel_w));
map(0xc000, 0xc001).portr("DSW");
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp
index ee43840157f..45283224ee8 100644
--- a/src/mame/drivers/senjyo.cpp
+++ b/src/mame/drivers/senjyo.cpp
@@ -131,22 +131,22 @@ void senjyo_state::senjyo_map(address_map &map)
map(0x9c00, 0x9dff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
map(0x9e00, 0x9e1f).ram().share("fgscroll");
map(0x9e20, 0x9e21).ram().share("scrolly3");
-/* AM_RANGE(0x9e22, 0x9e23) height of the layer (Senjyo only, fixed at 0x380) */
+/* map(0x9e22, 0x9e23) height of the layer (Senjyo only, fixed at 0x380) */
map(0x9e22, 0x9e24).ram();
map(0x9e25, 0x9e25).ram().share("scrollx3");
map(0x9e26, 0x9e26).ram();
map(0x9e27, 0x9e27).ram().share("bgstripesram"); /* controls width of background stripes */
map(0x9e28, 0x9e29).ram().share("scrolly2");
-/* AM_RANGE(0x9e2a, 0x9e2b) height of the layer (Senjyo only, fixed at 0x200) */
+/* map(0x9e2a, 0x9e2b) height of the layer (Senjyo only, fixed at 0x200) */
map(0x9e2a, 0x9e2c).ram();
map(0x9e2d, 0x9e2d).ram().share("scrollx2");
map(0x9e2e, 0x9e2f).ram();
map(0x9e30, 0x9e31).ram().share("scrolly1");
-/* AM_RANGE(0x9e32, 0x9e33) height of the layer (Senjyo only, fixed at 0x100) */
+/* map(0x9e32, 0x9e33) height of the layer (Senjyo only, fixed at 0x100) */
map(0x9e32, 0x9e34).ram();
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(0x9e38, 0x9e38) probably radar y position (Senjyo only, fixed at 0x61) */
+/* map(0x9e3d, 0x9e3d) probably radar x position (Senjyo only, 0x00/0xc0 depending on screen flip) */
map(0x9e36, 0x9e3f).ram();
map(0xa000, 0xa7ff).ram().w(FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram");
map(0xa800, 0xafff).ram().w(FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram");
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index a2292c8729f..d5b9950ef8d 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -117,7 +117,7 @@ TODO:
- Some games: battery backed portion of RAM (e.g. downtown, kiwame, zombraid)
- the zombraid crosshair hack can go if the nvram regions are figured out.
- Some games: programmable timer that generates IRQ. See e.g. gundhara:
- lev 4 is triggerd by writes at d00000-6 and drives the sound.
+ lev 4 is triggered by writes at d00000-6 and drives the sound.
See also msgundam.
- tndrcade: lots of flickering sprites
@@ -488,7 +488,7 @@ Lithium battery x1
Daioh
DAIOH
-Alumer 1993, Sammy license
+Allumer 1993, Sammy license
P0-092A
@@ -670,9 +670,9 @@ CONN1 = 8 pin header for gun connection
68HC000N -16N
-2) Alumer X1-012
-2) Alumer X1-011
-2) Alumer X1-014
+2) Allumer X1-012
+2) Allumer X1-011
+2) Allumer X1-014
X1-010
X1-007
@@ -819,7 +819,7 @@ RST1 : Reset
CN1 : 7-Pin header to drive lights underneath buttons to show what cards are available to play
CN2 : 8-Pin header to drive lights underneath buttons to show what cards are available to play
-CN3 : 5-Pin header connected to aucilliary PCB to drive lights about the cabinet
+CN3 : 5-Pin header connected to auxiliary PCB to drive lights about the cabinet
PAL :FU-011 @ U50
FU-012 @ U51
@@ -3987,10 +3987,10 @@ static INPUT_PORTS_START( blandia )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
- PORT_DIPSETTING( 0x0200, "1" )
- PORT_DIPSETTING( 0x0300, "2" )
- PORT_DIPSETTING( 0x0100, "3" )
- PORT_DIPSETTING( 0x0000, "4" )
+ PORT_DIPSETTING( 0x0200, "1, 1 Round" ) // Test mode shows 1 in both blandia and blandiap
+ PORT_DIPSETTING( 0x0300, "1, 2 Rounds" ) // Test mode shows 0 in blandia, 2 in blandiap (neither match actual behaviour)
+ PORT_DIPSETTING( 0x0100, "2" ) // Test mode shows 2 in blandia, 3 in blandiap (blandiap test mode is wrong)
+ PORT_DIPSETTING( 0x0000, "3" ) // Test mode shows 3 in blandia, 4 in blandiap (blandiap test mode is wrong)
PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:3,4")
PORT_DIPSETTING( 0x0800, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0c00, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index 7812f3ce599..b37d9d97810 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -599,8 +599,8 @@ void staraudi_state::staraudi_map(address_map &map)
map(0x400000, 0x45ffff).rw(FUNC(staraudi_state::tileram_r), FUNC(staraudi_state::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, 0x53ffff).ram(); // Camera RAM (r8g8)
+// map(0x540000, 0x57ffff).ram(); // Camera RAM (00b8)
map(0x500000, 0x57ffff).ram().share("rgbram");
map(0x600001, 0x600001).w(FUNC(staraudi_state::camera_w)); // Camera Outputs
@@ -680,7 +680,7 @@ void seta2_state::telpacfl_map(address_map &map)
map(0xb40000, 0xb4ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette
map(0xb60000, 0xb6003f).ram().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(0xe00000, 0xe00001).w(FUNC(seta2_state::));
map(0xe00010, 0xe0001f).w(FUNC(seta2_state::sound_bank_w)).umask16(0x00ff); // Samples Banks
}
diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp
index ae3f4045808..db9fd9f9721 100644
--- a/src/mame/drivers/sf.cpp
+++ b/src/mame/drivers/sf.cpp
@@ -172,7 +172,7 @@ void sf_state::sfan_map(address_map &map)
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(0xc0001e, 0xc0001f).w(FUNC(sf_state::protection_w));
map(0xff8000, 0xffdfff).ram();
map(0xffe000, 0xffffff).ram().share("objectram");
}
@@ -196,7 +196,7 @@ void sf_state::sfus_map(address_map &map)
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(0xc0001e, 0xc0001f).w(FUNC(sf_state::protection_w));
map(0xff8000, 0xffdfff).ram();
map(0xffe000, 0xffffff).ram().share("objectram");
}
diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp
index 78343d6d016..82bb0cecbbb 100644
--- a/src/mame/drivers/sfcbox.cpp
+++ b/src/mame/drivers/sfcbox.cpp
@@ -294,12 +294,12 @@ void sfcbox_state::sfcbox_io(address_map &map)
map(0x0b, 0x0b).w(m_mb90082, FUNC(mb90082_device::write));
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(0x82, 0x82) // Unknown/unused
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(0x84, 0x84) // Joypad 1, MSB (1st 8 bits) (eg. Bit7=ButtonB, 0=Low=Pressed)
+// map(0x85, 0x85) // Joypad 1, LSB (2nd 8 bits) (eg. Bit0=LSB of ID, 0=Low=One)
+// map(0x86, 0x86) // Joypad 2, MSB (1st 8 bits) (eg. Bit7=ButtonB, 0=Low=Pressed)
+// map(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(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/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp
index a4acab5ce1d..659662240c5 100644
--- a/src/mame/drivers/sigmab52.cpp
+++ b/src/mame/drivers/sigmab52.cpp
@@ -333,7 +333,7 @@ void sigmab52_state::jwildb52_map(address_map &map)
map(0xf760, 0xf760).r(FUNC(sigmab52_state::unk_f760_r));
-// AM_RANGE(0xf770, 0xf77f) Bill validator
+// map(0xf770, 0xf77f) Bill validator
map(0xf780, 0xf780).w(FUNC(sigmab52_state::audiocpu_cmd_irq_w));
map(0xf790, 0xf790).w("soundlatch", FUNC(generic_latch_8_device::write));
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index 3f5ba8cdb67..31ebf1b1e1b 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -837,7 +837,7 @@ 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(FUNC(sigmab98_state::dodghero_regs_r), FUNC(sigmab98_state::dodghero_regs_w));
-// AM_RANGE( 0xa2, 0xa3 )
+// map(0xa2, 0xa3)
map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dodghero_regs2_r), FUNC(sigmab98_state::dodghero_regs2_w));
map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w));
@@ -1035,7 +1035,7 @@ 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(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w));
-// AM_RANGE( 0xa2, 0xa3 )
+// map(0xa2, 0xa3)
map(0xa4, 0xa5).rw(FUNC(sigmab98_state::gegege_regs2_r), FUNC(sigmab98_state::gegege_regs2_w));
map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w));
@@ -1114,7 +1114,7 @@ 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(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w));
- // AM_RANGE( 0xa2, 0xa3 )
+// map(0xa2, 0xa3)
map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dashhero_regs2_r), FUNC(sigmab98_state::dashhero_regs2_w));
map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w));
diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp
index 7ffb8ed5561..df5d09cd941 100644
--- a/src/mame/drivers/skimaxx.cpp
+++ b/src/mame/drivers/skimaxx.cpp
@@ -335,7 +335,7 @@ void skimaxx_state::m68030_1_map(address_map &map)
map(0x00000000, 0x001fffff).rom();
map(0x10000000, 0x10000003).w(FUNC(skimaxx_state::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, 0x10187fff).ram().share("share1");
map(0x10180000, 0x1018ffff).ram().share("share1"); // above 10188000 accessed at level end (game bug?)
map(0x20000000, 0x20000003).nopr(); // watchdog_r?
@@ -374,9 +374,9 @@ void skimaxx_state::m68030_2_map(address_map &map)
map(0x40000000, 0x40000003).w(FUNC(skimaxx_state::fpga_ctrl_w)).share("fpga_ctrl");
map(0x50000000, 0x5007ffff).bankrw("bgrambank"); // background ram allocated here at video_start (skimaxx_bg_buffer_back/front)
-// AM_RANGE(0xfffc0000, 0xfffc7fff) AM_RAM AM_SHARE("share1")
+// map(0xfffc0000, 0xfffc7fff).ram().share("share1");
map(0xfffc0000, 0xfffcffff).ram().share("share1");
-// AM_RANGE(0xfffe0000, 0xffffffff) AM_RAM // I think this is banked with the shared RAM? (see CPU sync routines)
+// map(0xfffe0000, 0xffffffff).ram(); // I think this is banked with the shared RAM? (see CPU sync routines)
map(0xfffe0000, 0xfffeffff).ram().share("share1"); // HACK
// map(0xfffe0010, 0xfffeffff).ram(); // HACK
map(0xffff0000, 0xffffffff).ram();
diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp
index 93d8938768b..84c67c0171f 100644
--- a/src/mame/drivers/skyfox.cpp
+++ b/src/mame/drivers/skyfox.cpp
@@ -74,9 +74,9 @@ void skyfox_state::skyfox_sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0x87ff).ram();
-// AM_RANGE(0x9000, 0x9001) AM_WRITENOP // ??
+// map(0x9000, 0x9001).nopw(); // ??
map(0xa000, 0xa001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
-// AM_RANGE(0xb000, 0xb001) AM_WRITENOP // ??
+// map(0xb000, 0xb001).nopw(); // ??
map(0xc000, 0xc001).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
map(0xb000, 0xb000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
}
diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp
index 5567f5bbbae..221b0636fdd 100644
--- a/src/mame/drivers/sm1800.cpp
+++ b/src/mame/drivers/sm1800.cpp
@@ -62,7 +62,7 @@ void sm1800_state::sm1800_mem(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x07ff).rom();
- //AM_RANGE( 0x0fb0, 0x0fff ) AM_DEVWRITE("i8275", i8275_device, dack_w)
+ //map(0x0fb0, 0x0fff).w("i8275", FUNC(i8275_device::dack_w));
map(0x1000, 0x17ff).ram(); // videoram looks like 1080-17FF, normal ascii
}
@@ -73,8 +73,8 @@ void sm1800_state::sm1800_io(address_map &map)
map(0x3c, 0x3d).rw(m_crtc, FUNC(i8275_device::read), FUNC(i8275_device::write));
map(0x5c, 0x5d).rw(m_uart, FUNC(i8251_device::read), FUNC(i8251_device::write));
map(0x6c, 0x6f).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
- //AM_RANGE( 0x74, 0x74 ) AM_DEVREADWRITE("i8279", i8279_device, status_r, cmd_w)
- //AM_RANGE( 0x75, 0x75 ) AM_DEVREADWRITE("i8279", i8279_device, data_r, data_w)
+ //map(0x74, 0x74).rw("i8279", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w));
+ //map(0x75, 0x75).rw("i8279", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w));
}
/* Input ports */
diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp
index d709f537709..86ece08634c 100644
--- a/src/mame/drivers/sms_bootleg.cpp
+++ b/src/mame/drivers/sms_bootleg.cpp
@@ -240,7 +240,7 @@ void smsbootleg_state::sms_supergame_map(address_map &map)
{
map(0x0000, 0xbfff).rom();
map(0xc000, 0xfff7).ram();
-// AM_RANGE(0xfffc, 0xffff) AM_READWRITE(sms_mapper_r, sms_mapper_w) /* Bankswitch control */
+// map(0xfffc, 0xffff).rw(FUNC(smsbootleg_state::sms_mapper_r), FUNC(smsbootleg_state::sms_mapper_w)); /* Bankswitch control */
}
WRITE8_MEMBER(smsbootleg_state::port08_w)
@@ -259,9 +259,9 @@ void smsbootleg_state::sms_supergame_io(address_map &map)
map.global_mask(0xff);
map.unmap_value_high();
- map(0x04, 0x04).nopr(); //AM_READ_PORT("IN0") // these
+ map(0x04, 0x04).nopr(); //portr("IN0"); // these
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(0x14, 0x14).nopr(); //portr("IN1"); // seem to be from a coinage / timer MCU, changing them direc