summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2018-06-08 01:29:39 +1000
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2018-06-08 01:29:39 +1000
commit93eaa6a4943ade6513257a740fcde97ca9468559 (patch) (github)
tree1340f2160a7064a839b7ca649b2257489cdd3d6d /src/mame/drivers
parentfafafe7050e4d04230656215b840ac53aad081e7 (diff)
downloadmame-93eaa6a4943ade6513257a740fcde97ca9468559.tar.bz2
mame-93eaa6a4943ade6513257a740fcde97ca9468559.zip
as if millions of this pointers suddenly cried out in terror, and were suddenly silenced
* streamline templates in addrmap.h * get rid of overloads on read/write member names - this will become even more important in the near future
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/1942.cpp28
-rw-r--r--src/mame/drivers/1943.cpp12
-rw-r--r--src/mame/drivers/1945kiii.cpp10
-rw-r--r--src/mame/drivers/20pacgal.cpp32
-rw-r--r--src/mame/drivers/24cdjuke.cpp4
-rw-r--r--src/mame/drivers/2mindril.cpp20
-rw-r--r--src/mame/drivers/30test.cpp12
-rw-r--r--src/mame/drivers/39in1.cpp14
-rw-r--r--src/mame/drivers/3do.cpp10
-rw-r--r--src/mame/drivers/3x3puzzl.cpp6
-rw-r--r--src/mame/drivers/4004clk.cpp6
-rw-r--r--src/mame/drivers/40love.cpp38
-rw-r--r--src/mame/drivers/4dpi.cpp6
-rw-r--r--src/mame/drivers/4enlinea.cpp10
-rw-r--r--src/mame/drivers/4enraya.cpp8
-rw-r--r--src/mame/drivers/4roses.cpp12
-rw-r--r--src/mame/drivers/5clown.cpp14
-rw-r--r--src/mame/drivers/8080bw.cpp148
-rw-r--r--src/mame/drivers/88games.cpp12
-rw-r--r--src/mame/drivers/a5105.cpp16
-rw-r--r--src/mame/drivers/a6809.cpp4
-rw-r--r--src/mame/drivers/a7150.cpp8
-rw-r--r--src/mame/drivers/a7800.cpp4
-rw-r--r--src/mame/drivers/aa310.cpp10
-rw-r--r--src/mame/drivers/abc1600.cpp92
-rw-r--r--src/mame/drivers/abc80.cpp4
-rw-r--r--src/mame/drivers/abc80x.cpp26
-rw-r--r--src/mame/drivers/accomm.cpp12
-rw-r--r--src/mame/drivers/ace.cpp30
-rw-r--r--src/mame/drivers/acefruit.cpp10
-rw-r--r--src/mame/drivers/aces1.cpp6
-rw-r--r--src/mame/drivers/acommand.cpp16
-rw-r--r--src/mame/drivers/actfancr.cpp6
-rw-r--r--src/mame/drivers/adam.cpp34
-rw-r--r--src/mame/drivers/adp.cpp4
-rw-r--r--src/mame/drivers/advision.cpp4
-rw-r--r--src/mame/drivers/aeroboto.cpp14
-rw-r--r--src/mame/drivers/aerofgt.cpp188
-rw-r--r--src/mame/drivers/agat.cpp30
-rw-r--r--src/mame/drivers/airbustr.cpp22
-rw-r--r--src/mame/drivers/airraid.cpp6
-rw-r--r--src/mame/drivers/ajax.cpp8
-rw-r--r--src/mame/drivers/albazc.cpp8
-rw-r--r--src/mame/drivers/albazg.cpp8
-rw-r--r--src/mame/drivers/aleck64.cpp4
-rw-r--r--src/mame/drivers/alesis.cpp18
-rw-r--r--src/mame/drivers/alg.cpp14
-rw-r--r--src/mame/drivers/alien.cpp4
-rw-r--r--src/mame/drivers/aliens.cpp6
-rw-r--r--src/mame/drivers/alinvade.cpp6
-rw-r--r--src/mame/drivers/alpha68k.cpp52
-rw-r--r--src/mame/drivers/alphasma.cpp10
-rw-r--r--src/mame/drivers/alphatpx.cpp30
-rw-r--r--src/mame/drivers/alphatro.cpp20
-rw-r--r--src/mame/drivers/altos2.cpp2
-rw-r--r--src/mame/drivers/altos486.cpp4
-rw-r--r--src/mame/drivers/altos5.cpp4
-rw-r--r--src/mame/drivers/altos8600.cpp38
-rw-r--r--src/mame/drivers/amaticmg.cpp14
-rw-r--r--src/mame/drivers/ambush.cpp4
-rw-r--r--src/mame/drivers/amerihok.cpp2
-rw-r--r--src/mame/drivers/amiga.cpp196
-rw-r--r--src/mame/drivers/ampex.cpp18
-rw-r--r--src/mame/drivers/ampoker2.cpp18
-rw-r--r--src/mame/drivers/ampro.cpp4
-rw-r--r--src/mame/drivers/amspdwy.cpp12
-rw-r--r--src/mame/drivers/amstr_pc.cpp10
-rw-r--r--src/mame/drivers/amstrad.cpp2
-rw-r--r--src/mame/drivers/amusco.cpp6
-rw-r--r--src/mame/drivers/amust.cpp2
-rw-r--r--src/mame/drivers/anes.cpp4
-rw-r--r--src/mame/drivers/angelkds.cpp22
-rw-r--r--src/mame/drivers/apc.cpp14
-rw-r--r--src/mame/drivers/apf.cpp4
-rw-r--r--src/mame/drivers/apollo.cpp188
-rw-r--r--src/mame/drivers/apple1.cpp2
-rw-r--r--src/mame/drivers/apple2.cpp28
-rw-r--r--src/mame/drivers/apple2e.cpp124
-rw-r--r--src/mame/drivers/apple2gs.cpp2
-rw-r--r--src/mame/drivers/apple3.cpp2
-rw-r--r--src/mame/drivers/applix.cpp32
-rw-r--r--src/mame/drivers/appoooh.cpp20
-rw-r--r--src/mame/drivers/apricot.cpp18
-rw-r--r--src/mame/drivers/apricotf.cpp34
-rw-r--r--src/mame/drivers/apricotp.cpp16
-rw-r--r--src/mame/drivers/aquarium.cpp12
-rw-r--r--src/mame/drivers/aquarius.cpp14
-rw-r--r--src/mame/drivers/arabian.cpp4
-rw-r--r--src/mame/drivers/arachnid.cpp4
-rw-r--r--src/mame/drivers/arcadecl.cpp4
-rw-r--r--src/mame/drivers/arcadia.cpp2
-rw-r--r--src/mame/drivers/argo.cpp4
-rw-r--r--src/mame/drivers/argus.cpp46
-rw-r--r--src/mame/drivers/aristmk4.cpp42
-rw-r--r--src/mame/drivers/aristmk5.cpp54
-rw-r--r--src/mame/drivers/aristmk6.cpp10
-rw-r--r--src/mame/drivers/arkanoid.cpp26
-rw-r--r--src/mame/drivers/armedf.cpp124
-rw-r--r--src/mame/drivers/arsystems.cpp12
-rw-r--r--src/mame/drivers/artmagic.cpp16
-rw-r--r--src/mame/drivers/ashnojoe.cpp24
-rw-r--r--src/mame/drivers/asst128.cpp6
-rw-r--r--src/mame/drivers/asterix.cpp10
-rw-r--r--src/mame/drivers/asteroid.cpp34
-rw-r--r--src/mame/drivers/astinvad.cpp10
-rw-r--r--src/mame/drivers/astrafr.cpp8
-rw-r--r--src/mame/drivers/astrcorp.cpp44
-rw-r--r--src/mame/drivers/astrocde.cpp88
-rw-r--r--src/mame/drivers/astrof.cpp34
-rw-r--r--src/mame/drivers/astrohome.cpp6
-rw-r--r--src/mame/drivers/asuka.cpp20
-rw-r--r--src/mame/drivers/at.cpp12
-rw-r--r--src/mame/drivers/atari400.cpp21
-rw-r--r--src/mame/drivers/atari_s1.cpp38
-rw-r--r--src/mame/drivers/atari_s2.cpp28
-rw-r--r--src/mame/drivers/atarifb.cpp62
-rw-r--r--src/mame/drivers/atarig1.cpp6
-rw-r--r--src/mame/drivers/atarig42.cpp8
-rw-r--r--src/mame/drivers/atarigt.cpp20
-rw-r--r--src/mame/drivers/atarigx2.cpp12
-rw-r--r--src/mame/drivers/atarist.cpp116
-rw-r--r--src/mame/drivers/atarisy1.cpp20
-rw-r--r--src/mame/drivers/atarisy2.cpp44
-rw-r--r--src/mame/drivers/atarisy4.cpp16
-rw-r--r--src/mame/drivers/atetris.cpp34
-rw-r--r--src/mame/drivers/atlantis.cpp16
-rw-r--r--src/mame/drivers/atm.cpp10
-rw-r--r--src/mame/drivers/atom.cpp10
-rw-r--r--src/mame/drivers/att4425.cpp6
-rw-r--r--src/mame/drivers/attache.cpp22
-rw-r--r--src/mame/drivers/attckufo.cpp4
-rw-r--r--src/mame/drivers/atvtrack.cpp16
-rw-r--r--src/mame/drivers/aussiebyte.cpp40
-rw-r--r--src/mame/drivers/avalnche.cpp4
-rw-r--r--src/mame/drivers/avigo.cpp20
-rw-r--r--src/mame/drivers/avt.cpp8
-rw-r--r--src/mame/drivers/ax20.cpp6
-rw-r--r--src/mame/drivers/aztarac.cpp12
-rw-r--r--src/mame/drivers/b16.cpp10
-rw-r--r--src/mame/drivers/b2m.cpp8
-rw-r--r--src/mame/drivers/backfire.cpp18
-rw-r--r--src/mame/drivers/badlands.cpp12
-rw-r--r--src/mame/drivers/badlandsbl.cpp12
-rw-r--r--src/mame/drivers/bagman.cpp12
-rw-r--r--src/mame/drivers/balsente.cpp34
-rw-r--r--src/mame/drivers/banctec.cpp2
-rw-r--r--src/mame/drivers/bankp.cpp18
-rw-r--r--src/mame/drivers/baraduke.cpp22
-rw-r--r--src/mame/drivers/bartop52.cpp3
-rw-r--r--src/mame/drivers/batman.cpp2
-rw-r--r--src/mame/drivers/battlane.cpp16
-rw-r--r--src/mame/drivers/battlera.cpp8
-rw-r--r--src/mame/drivers/battlex.cpp12
-rw-r--r--src/mame/drivers/battlnts.cpp6
-rw-r--r--src/mame/drivers/bbc.cpp154
-rw-r--r--src/mame/drivers/bbcbc.cpp4
-rw-r--r--src/mame/drivers/bbusters.cpp32
-rw-r--r--src/mame/drivers/bcs3.cpp8
-rw-r--r--src/mame/drivers/beaminv.cpp6
-rw-r--r--src/mame/drivers/beathead.cpp20
-rw-r--r--src/mame/drivers/bebox.cpp26
-rw-r--r--src/mame/drivers/beehive.cpp4
-rw-r--r--src/mame/drivers/beezer.cpp8
-rw-r--r--src/mame/drivers/berzerk.cpp20
-rw-r--r--src/mame/drivers/besta.cpp2
-rw-r--r--src/mame/drivers/bestleag.cpp8
-rw-r--r--src/mame/drivers/bfcobra.cpp16
-rw-r--r--src/mame/drivers/bfm_sc1.cpp38
-rw-r--r--src/mame/drivers/bfm_sc2.cpp82
-rw-r--r--src/mame/drivers/bfm_sc4.cpp6
-rw-r--r--src/mame/drivers/bfm_sc5.cpp8
-rw-r--r--src/mame/drivers/bfm_swp.cpp2
-rw-r--r--src/mame/drivers/bfmsys85.cpp22
-rw-r--r--src/mame/drivers/big10.cpp2
-rw-r--r--src/mame/drivers/bigbord2.cpp8
-rw-r--r--src/mame/drivers/bigevglf.cpp34
-rw-r--r--src/mame/drivers/bigstrkb.cpp6
-rw-r--r--src/mame/drivers/binbug.cpp4
-rw-r--r--src/mame/drivers/bingoc.cpp6
-rw-r--r--src/mame/drivers/bingor.cpp6
-rw-r--r--src/mame/drivers/bionicc.cpp14
-rw-r--r--src/mame/drivers/bishi.cpp8
-rw-r--r--src/mame/drivers/bitgraph.cpp26
-rw-r--r--src/mame/drivers/bk.cpp20
-rw-r--r--src/mame/drivers/bking.cpp66
-rw-r--r--src/mame/drivers/blackt96.cpp10
-rw-r--r--src/mame/drivers/bladestl.cpp8
-rw-r--r--src/mame/drivers/blitz68k.cpp238
-rw-r--r--src/mame/drivers/blktiger.cpp38
-rw-r--r--src/mame/drivers/blmbycar.cpp16
-rw-r--r--src/mame/drivers/blockade.cpp10
-rw-r--r--src/mame/drivers/blockhl.cpp4
-rw-r--r--src/mame/drivers/blockout.cpp20
-rw-r--r--src/mame/drivers/bloodbro.cpp18
-rw-r--r--src/mame/drivers/blstroid.cpp6
-rw-r--r--src/mame/drivers/blueprnt.cpp14
-rw-r--r--src/mame/drivers/bmcbowl.cpp6
-rw-r--r--src/mame/drivers/bmcpokr.cpp40
-rw-r--r--src/mame/drivers/bmjr.cpp16
-rw-r--r--src/mame/drivers/bml3.cpp36
-rw-r--r--src/mame/drivers/bnstars.cpp24
-rw-r--r--src/mame/drivers/bob85.cpp4
-rw-r--r--src/mame/drivers/bogeyman.cpp12
-rw-r--r--src/mame/drivers/bombjack.cpp12
-rw-r--r--src/mame/drivers/boogwing.cpp4
-rw-r--r--src/mame/drivers/bottom9.cpp16
-rw-r--r--src/mame/drivers/bowltry.cpp2
-rw-r--r--src/mame/drivers/boxer.cpp16
-rw-r--r--src/mame/drivers/bpmmicro.cpp14
-rw-r--r--src/mame/drivers/brkthru.cpp16
-rw-r--r--src/mame/drivers/bsktball.cpp8
-rw-r--r--src/mame/drivers/btime.cpp68
-rw-r--r--src/mame/drivers/btoads.cpp32
-rw-r--r--src/mame/drivers/bublbobl.cpp48
-rw-r--r--src/mame/drivers/buggychl.cpp22
-rw-r--r--src/mame/drivers/bullet.cpp38
-rw-r--r--src/mame/drivers/busicom.cpp10
-rw-r--r--src/mame/drivers/buster.cpp2
-rw-r--r--src/mame/drivers/bw12.cpp12
-rw-r--r--src/mame/drivers/bw2.cpp4
-rw-r--r--src/mame/drivers/bwidow.cpp16
-rw-r--r--src/mame/drivers/bwing.cpp24
-rw-r--r--src/mame/drivers/by17.cpp2
-rw-r--r--src/mame/drivers/by35.cpp2
-rw-r--r--src/mame/drivers/by6803.cpp4
-rw-r--r--src/mame/drivers/byvid.cpp30
-rw-r--r--src/mame/drivers/bzone.cpp6
-rw-r--r--src/mame/drivers/c128.cpp10
-rw-r--r--src/mame/drivers/c64.cpp6
-rw-r--r--src/mame/drivers/c65.cpp16
-rw-r--r--src/mame/drivers/c900.cpp4
-rw-r--r--src/mame/drivers/cabal.cpp32
-rw-r--r--src/mame/drivers/cabaret.cpp8
-rw-r--r--src/mame/drivers/calchase.cpp22
-rw-r--r--src/mame/drivers/calcune.cpp6
-rw-r--r--src/mame/drivers/calomega.cpp16
-rw-r--r--src/mame/drivers/calorie.cpp10
-rw-r--r--src/mame/drivers/camplynx.cpp22
-rw-r--r--src/mame/drivers/candela.cpp2
-rw-r--r--src/mame/drivers/canyon.cpp12
-rw-r--r--src/mame/drivers/capbowl.cpp26
-rw-r--r--src/mame/drivers/cardline.cpp10
-rw-r--r--src/mame/drivers/carjmbre.cpp8
-rw-r--r--src/mame/drivers/carpolo.cpp28
-rw-r--r--src/mame/drivers/casloopy.cpp12
-rw-r--r--src/mame/drivers/caswin.cpp14
-rw-r--r--src/mame/drivers/cat.cpp42
-rw-r--r--src/mame/drivers/cave.cpp468
-rw-r--r--src/mame/drivers/cb2001.cpp8
-rw-r--r--src/mame/drivers/cball.cpp6
-rw-r--r--src/mame/drivers/cbasebal.cpp12
-rw-r--r--src/mame/drivers/cbm2.cpp10
-rw-r--r--src/mame/drivers/cbuster.cpp6
-rw-r--r--src/mame/drivers/cc40.cpp14
-rw-r--r--src/mame/drivers/ccastles.cpp22
-rw-r--r--src/mame/drivers/cchance.cpp4
-rw-r--r--src/mame/drivers/cchasm.cpp12
-rw-r--r--src/mame/drivers/cclimber.cpp22
-rw-r--r--src/mame/drivers/ccs2810.cpp12
-rw-r--r--src/mame/drivers/ccs300.cpp2
-rw-r--r--src/mame/drivers/cd2650.cpp2
-rw-r--r--src/mame/drivers/cdc721.cpp8
-rw-r--r--src/mame/drivers/cdi.cpp4
-rw-r--r--src/mame/drivers/cedar_magnet.cpp24
-rw-r--r--src/mame/drivers/centiped.cpp82
-rw-r--r--src/mame/drivers/cesclass.cpp8
-rw-r--r--src/mame/drivers/cgc7900.cpp22
-rw-r--r--src/mame/drivers/cgenie.cpp6
-rw-r--r--src/mame/drivers/chaknpop.cpp12
-rw-r--r--src/mame/drivers/cham24.cpp8
-rw-r--r--src/mame/drivers/champbas.cpp10
-rw-r--r--src/mame/drivers/champbwl.cpp8
-rw-r--r--src/mame/drivers/chanbara.cpp8
-rw-r--r--src/mame/drivers/chance32.cpp10
-rw-r--r--src/mame/drivers/changela.cpp26
-rw-r--r--src/mame/drivers/channelf.cpp8
-rw-r--r--src/mame/drivers/chaos.cpp8
-rw-r--r--src/mame/drivers/cheekyms.cpp4
-rw-r--r--src/mame/drivers/chessmst.cpp2
-rw-r--r--src/mame/drivers/chesstrv.cpp16
-rw-r--r--src/mame/drivers/chexx.cpp8
-rw-r--r--src/mame/drivers/chihiro.cpp2
-rw-r--r--src/mame/drivers/chinagat.cpp16
-rw-r--r--src/mame/drivers/chinsan.cpp6
-rw-r--r--src/mame/drivers/chqflag.cpp16
-rw-r--r--src/mame/drivers/chsuper.cpp8
-rw-r--r--src/mame/drivers/cidelsa.cpp8
-rw-r--r--src/mame/drivers/cinemat.cpp12
-rw-r--r--src/mame/drivers/circus.cpp10
-rw-r--r--src/mame/drivers/circusc.cpp14
-rw-r--r--src/mame/drivers/cischeat.cpp110
-rw-r--r--src/mame/drivers/cit101.cpp8
-rw-r--r--src/mame/drivers/citycon.cpp8
-rw-r--r--src/mame/drivers/ckz80.cpp4
-rw-r--r--src/mame/drivers/clayshoo.cpp2
-rw-r--r--src/mame/drivers/clcd.cpp44
-rw-r--r--src/mame/drivers/cliffhgr.cpp26
-rw-r--r--src/mame/drivers/cloak.cpp18
-rw-r--r--src/mame/drivers/cloud9.cpp16
-rw-r--r--src/mame/drivers/clpoker.cpp2
-rw-r--r--src/mame/drivers/clshroad.cpp6
-rw-r--r--src/mame/drivers/cm1800.cpp2
-rw-r--r--src/mame/drivers/cmi.cpp26
-rw-r--r--src/mame/drivers/cmmb.cpp8
-rw-r--r--src/mame/drivers/cninja.cpp42
-rw-r--r--src/mame/drivers/cntsteer.cpp40
-rw-r--r--src/mame/drivers/cobra.cpp38
-rw-r--r--src/mame/drivers/coco12.cpp2
-rw-r--r--src/mame/drivers/coco3.cpp14
-rw-r--r--src/mame/drivers/cocoloco.cpp8
-rw-r--r--src/mame/drivers/coinmstr.cpp32
-rw-r--r--src/mame/drivers/coleco.cpp14
-rw-r--r--src/mame/drivers/combatsc.cpp36
-rw-r--r--src/mame/drivers/commando.cpp14
-rw-r--r--src/mame/drivers/compc.cpp4
-rw-r--r--src/mame/drivers/compgolf.cpp6
-rw-r--r--src/mame/drivers/compis.cpp18
-rw-r--r--src/mame/drivers/comx35.cpp4
-rw-r--r--src/mame/drivers/concept.cpp2
-rw-r--r--src/mame/drivers/contra.cpp24
-rw-r--r--src/mame/drivers/coolpool.cpp28
-rw-r--r--src/mame/drivers/coolridr.cpp24
-rw-r--r--src/mame/drivers/cop01.cpp24
-rw-r--r--src/mame/drivers/cops.cpp22
-rw-r--r--src/mame/drivers/copsnrob.cpp4
-rw-r--r--src/mame/drivers/corona.cpp80
-rw-r--r--src/mame/drivers/cortex.cpp10
-rw-r--r--src/mame/drivers/cosmic.cpp30
-rw-r--r--src/mame/drivers/cosmicos.cpp12
-rw-r--r--src/mame/drivers/cp1.cpp2
-rw-r--r--src/mame/drivers/cps1.cpp80
-rw-r--r--src/mame/drivers/cps2.cpp48
-rw-r--r--src/mame/drivers/cps3.cpp74
-rw-r--r--src/mame/drivers/craft.cpp2
-rw-r--r--src/mame/drivers/crbaloon.cpp12
-rw-r--r--src/mame/drivers/crgolf.cpp14
-rw-r--r--src/mame/drivers/crimfght.cpp6
-rw-r--r--src/mame/drivers/crospang.cpp32
-rw-r--r--src/mame/drivers/crshrace.cpp10
-rw-r--r--src/mame/drivers/crvision.cpp26
-rw-r--r--src/mame/drivers/crystal.cpp74
-rw-r--r--src/mame/drivers/csplayh5.cpp14
-rw-r--r--src/mame/drivers/cswat.cpp10
-rw-r--r--src/mame/drivers/cubeqst.cpp16
-rw-r--r--src/mame/drivers/cubo.cpp4
-rw-r--r--src/mame/drivers/cultures.cpp8
-rw-r--r--src/mame/drivers/cupidon.cpp2
-rw-r--r--src/mame/drivers/cv1k.cpp10
-rw-r--r--src/mame/drivers/cvicny.cpp6
-rw-r--r--src/mame/drivers/cvs.cpp32
-rw-r--r--src/mame/drivers/cxgz80.cpp4
-rw-r--r--src/mame/drivers/cxhumax.cpp66
-rw-r--r--src/mame/drivers/cyberbal.cpp26
-rw-r--r--src/mame/drivers/cybertnk.cpp18
-rw-r--r--src/mame/drivers/cybiko.cpp34
-rw-r--r--src/mame/drivers/cybstorm.cpp4
-rw-r--r--src/mame/drivers/cyclemb.cpp14
-rw-r--r--src/mame/drivers/cz101.cpp10
-rw-r--r--src/mame/drivers/czk80.cpp6
-rw-r--r--src/mame/drivers/d6809.cpp2
-rw-r--r--src/mame/drivers/d9final.cpp10
-rw-r--r--src/mame/drivers/dacholer.cpp22
-rw-r--r--src/mame/drivers/dai.cpp8
-rw-r--r--src/mame/drivers/dai3wksi.cpp6
-rw-r--r--src/mame/drivers/dambustr.cpp22
-rw-r--r--src/mame/drivers/darius.cpp32
-rw-r--r--src/mame/drivers/darkmist.cpp4
-rw-r--r--src/mame/drivers/darkseal.cpp6
-rw-r--r--src/mame/drivers/daruma.cpp6
-rw-r--r--src/mame/drivers/dassault.cpp12
-rw-r--r--src/mame/drivers/dblcrown.cpp16
-rw-r--r--src/mame/drivers/dblewing.cpp4
-rw-r--r--src/mame/drivers/dbox.cpp8
-rw-r--r--src/mame/drivers/dbz.cpp10
-rw-r--r--src/mame/drivers/dccons.cpp20
-rw-r--r--src/mame/drivers/dcheese.cpp16
-rw-r--r--src/mame/drivers/dcon.cpp12
-rw-r--r--src/mame/drivers/dday.cpp12
-rw-r--r--src/mame/drivers/ddayjlc.cpp26
-rw-r--r--src/mame/drivers/ddealer.cpp6
-rw-r--r--src/mame/drivers/ddenlovr.cpp942
-rw-r--r--src/mame/drivers/ddragon.cpp32
-rw-r--r--src/mame/drivers/ddragon3.cpp56
-rw-r--r--src/mame/drivers/ddribble.cpp16
-rw-r--r--src/mame/drivers/de_2.cpp8
-rw-r--r--src/mame/drivers/deadang.cpp10
-rw-r--r--src/mame/drivers/dec0.cpp48
-rw-r--r--src/mame/drivers/dec8.cpp254
-rw-r--r--src/mame/drivers/deco156.cpp16
-rw-r--r--src/mame/drivers/deco32.cpp202
-rw-r--r--src/mame/drivers/deco_ld.cpp6
-rw-r--r--src/mame/drivers/deco_mlc.cpp42
-rw-r--r--src/mame/drivers/decocass.cpp74
-rw-r--r--src/mame/drivers/dectalk.cpp16
-rw-r--r--src/mame/drivers/decwritr.cpp6
-rw-r--r--src/mame/drivers/deniam.cpp24
-rw-r--r--src/mame/drivers/deshoros.cpp12
-rw-r--r--src/mame/drivers/destroyr.cpp10
-rw-r--r--src/mame/drivers/dfruit.cpp18
-rw-r--r--src/mame/drivers/dgn_beta.cpp6
-rw-r--r--src/mame/drivers/dgpix.cpp10
-rw-r--r--src/mame/drivers/dietgo.cpp2
-rw-r--r--src/mame/drivers/digel804.cpp66
-rw-r--r--src/mame/drivers/dim68k.cpp18
-rw-r--r--src/mame/drivers/discoboy.cpp12
-rw-r--r--src/mame/drivers/divebomb.cpp30
-rw-r--r--src/mame/drivers/diverboy.cpp4
-rw-r--r--src/mame/drivers/djboy.cpp20
-rw-r--r--src/mame/drivers/djmain.cpp40
-rw-r--r--src/mame/drivers/dkong.cpp86
-rw-r--r--src/mame/drivers/dlair.cpp20
-rw-r--r--src/mame/drivers/dm7000.cpp12
-rw-r--r--src/mame/drivers/dmax8000.cpp4
-rw-r--r--src/mame/drivers/dmndrby.cpp6
-rw-r--r--src/mame/drivers/dms5000.cpp4
-rw-r--r--src/mame/drivers/dms86.cpp6
-rw-r--r--src/mame/drivers/dmv.cpp30
-rw-r--r--src/mame/drivers/docastle.cpp52
-rw-r--r--src/mame/drivers/dogfgt.cpp18
-rw-r--r--src/mame/drivers/dolphunk.cpp6
-rw-r--r--src/mame/drivers/dominob.cpp4
-rw-r--r--src/mame/drivers/dooyong.cpp44
-rw-r--r--src/mame/drivers/dorachan.cpp8
-rw-r--r--src/mame/drivers/dotrikun.cpp4
-rw-r--r--src/mame/drivers/dps1.cpp16
-rw-r--r--src/mame/drivers/dragrace.cpp6
-rw-r--r--src/mame/drivers/dreambal.cpp4
-rw-r--r--src/mame/drivers/dreamwld.cpp12
-rw-r--r--src/mame/drivers/drgnmst.cpp14
-rw-r--r--src/mame/drivers/dribling.cpp4
-rw-r--r--src/mame/drivers/drmicro.cpp12
-rw-r--r--src/mame/drivers/drtomy.cpp6
-rw-r--r--src/mame/drivers/drw80pkr.cpp2
-rw-r--r--src/mame/drivers/dsb46.cpp2
-rw-r--r--src/mame/drivers/dual68.cpp2
-rw-r--r--src/mame/drivers/duet16.cpp18
-rw-r--r--src/mame/drivers/dunhuang.cpp38
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp12
-rw-r--r--src/mame/drivers/dwarfd.cpp12
-rw-r--r--src/mame/drivers/dynadice.cpp6
-rw-r--r--src/mame/drivers/dynamoah.cpp2
-rw-r--r--src/mame/drivers/dynax.cpp494
-rw-r--r--src/mame/drivers/dynduke.cpp14
-rw-r--r--src/mame/drivers/e100.cpp2
-rw-r--r--src/mame/drivers/ec184x.cpp2
-rw-r--r--src/mame/drivers/ecoinf3.cpp2
-rw-r--r--src/mame/drivers/ecoinfr.cpp48
-rw-r--r--src/mame/drivers/efdt.cpp2
-rw-r--r--src/mame/drivers/egghunt.cpp12
-rw-r--r--src/mame/drivers/einstein.cpp22
-rw-r--r--src/mame/drivers/electron.cpp14
-rw-r--r--src/mame/drivers/elekscmp.cpp4
-rw-r--r--src/mame/drivers/elf.cpp4
-rw-r--r--src/mame/drivers/elwro800.cpp8
-rw-r--r--src/mame/drivers/embargo.cpp6
-rw-r--r--src/mame/drivers/enigma2.cpp12
-rw-r--r--src/mame/drivers/eolith.cpp10
-rw-r--r--src/mame/drivers/eolith16.cpp4
-rw-r--r--src/mame/drivers/ep64.cpp8
-rw-r--r--src/mame/drivers/epos.cpp6
-rw-r--r--src/mame/drivers/eprom.cpp28
-rw-r--r--src/mame/drivers/equites.cpp34
-rw-r--r--src/mame/drivers/ertictac.cpp14
-rw-r--r--src/mame/drivers/esd16.cpp28
-rw-r--r--src/mame/drivers/esh.cpp8
-rw-r--r--src/mame/drivers/espial.cpp30
-rw-r--r--src/mame/drivers/esq1.cpp8
-rw-r--r--src/mame/drivers/esq5505.cpp24
-rw-r--r--src/mame/drivers/esripsys.cpp28
-rw-r--r--src/mame/drivers/et3400.cpp4
-rw-r--r--src/mame/drivers/eti660.cpp4
-rw-r--r--src/mame/drivers/ettrivia.cpp12
-rw-r--r--src/mame/drivers/eurocom2.cpp6
-rw-r--r--src/mame/drivers/europc.cpp6
-rw-r--r--src/mame/drivers/evmbug.cpp4
-rw-r--r--src/mame/drivers/excali64.cpp16
-rw-r--r--src/mame/drivers/exedexes.cpp12
-rw-r--r--src/mame/drivers/exelv.cpp6
-rw-r--r--src/mame/drivers/exerion.cpp8
-rw-r--r--src/mame/drivers/exidy.cpp22
-rw-r--r--src/mame/drivers/exidy440.cpp22
-rw-r--r--src/mame/drivers/expro02.cpp42
-rw-r--r--src/mame/drivers/exprraid.cpp20
-rw-r--r--src/mame/drivers/exterm.cpp22
-rw-r--r--src/mame/drivers/exzisus.cpp8
-rw-r--r--src/mame/drivers/f-32.cpp2
-rw-r--r--src/mame/drivers/f1gp.cpp46
-rw-r--r--src/mame/drivers/famibox.cpp8
-rw-r--r--src/mame/drivers/fantland.cpp24
-rw-r--r--src/mame/drivers/fanucspmg.cpp22
-rw-r--r--src/mame/drivers/fastfred.cpp22
-rw-r--r--src/mame/drivers/fastinvaders.cpp40
-rw-r--r--src/mame/drivers/fastlane.cpp12
-rw-r--r--src/mame/drivers/fc100.cpp16
-rw-r--r--src/mame/drivers/fccpu30.cpp10
-rw-r--r--src/mame/drivers/fcombat.cpp20
-rw-r--r--src/mame/drivers/fcrash.cpp164
-rw-r--r--src/mame/drivers/feversoc.cpp8
-rw-r--r--src/mame/drivers/fgoal.cpp36
-rw-r--r--src/mame/drivers/fidel6502.cpp72
-rw-r--r--src/mame/drivers/fidel68k.cpp50
-rw-r--r--src/mame/drivers/fidelz80.cpp14
-rw-r--r--src/mame/drivers/finalizr.cpp12
-rw-r--r--src/mame/drivers/fireball.cpp8
-rw-r--r--src/mame/drivers/firebeat.cpp34
-rw-r--r--src/mame/drivers/firefox.cpp26
-rw-r--r--src/mame/drivers/firetrap.cpp34
-rw-r--r--src/mame/drivers/firetrk.cpp66
-rw-r--r--src/mame/drivers/fitfight.cpp16
-rw-r--r--src/mame/drivers/fk1.cpp6
-rw-r--r--src/mame/drivers/flicker.cpp8
-rw-r--r--src/mame/drivers/flipjack.cpp8
-rw-r--r--src/mame/drivers/flkatck.cpp10
-rw-r--r--src/mame/drivers/flower.cpp12
-rw-r--r--src/mame/drivers/flstory.cpp34
-rw-r--r--src/mame/drivers/flyball.cpp20
-rw-r--r--src/mame/drivers/fm7.cpp312
-rw-r--r--src/mame/drivers/fmtowns.cpp144
-rw-r--r--src/mame/drivers/fontwriter.cpp2
-rw-r--r--src/mame/drivers/foodf.cpp6
-rw-r--r--src/mame/drivers/force68k.cpp8
-rw-r--r--src/mame/drivers/forte2.cpp8
-rw-r--r--src/mame/drivers/fp1100.cpp18
-rw-r--r--src/mame/drivers/fp200.cpp2
-rw-r--r--src/mame/drivers/fp6000.cpp14
-rw-r--r--src/mame/drivers/freekick.cpp58
-rw-r--r--src/mame/drivers/fresh.cpp18
-rw-r--r--src/mame/drivers/fromanc2.cpp80
-rw-r--r--src/mame/drivers/fromance.cpp54
-rw-r--r--src/mame/drivers/fruitpc.cpp6
-rw-r--r--src/mame/drivers/ft68m.cpp2
-rw-r--r--src/mame/drivers/funkball.cpp16
-rw-r--r--src/mame/drivers/funkybee.cpp8
-rw-r--r--src/mame/drivers/funkyjet.cpp2
-rw-r--r--src/mame/drivers/funtech.cpp14
-rw-r--r--src/mame/drivers/funworld.cpp46
-rw-r--r--src/mame/drivers/funybubl.cpp10
-rw-r--r--src/mame/drivers/fuukifg2.cpp16
-rw-r--r--src/mame/drivers/fuukifg3.cpp14
-rw-r--r--src/mame/drivers/g627.cpp4
-rw-r--r--src/mame/drivers/gaelco.cpp18
-rw-r--r--src/mame/drivers/gaelco2.cpp50
-rw-r--r--src/mame/drivers/gaelco3d.cpp26
-rw-r--r--src/mame/drivers/gaiden.cpp72
-rw-r--r--src/mame/drivers/gal3.cpp14
-rw-r--r--src/mame/drivers/galaga.cpp40
-rw-r--r--src/mame/drivers/galastrm.cpp6
-rw-r--r--src/mame/drivers/galaxi.cpp32
-rw-r--r--src/mame/drivers/galaxia.cpp10
-rw-r--r--src/mame/drivers/galaxian.cpp402
-rw-r--r--src/mame/drivers/galaxold.cpp338
-rw-r--r--src/mame/drivers/galaxy.cpp8
-rw-r--r--src/mame/drivers/galeb.cpp8
-rw-r--r--src/mame/drivers/galgame.cpp8
-rw-r--r--src/mame/drivers/galgames.cpp20
-rw-r--r--src/mame/drivers/galivan.cpp26
-rw-r--r--src/mame/drivers/galpani2.cpp16
-rw-r--r--src/mame/drivers/galpani3.cpp8
-rw-r--r--src/mame/drivers/galpanic.cpp6
-rw-r--r--src/mame/drivers/galspnbl.cpp2
-rw-r--r--src/mame/drivers/gamate.cpp12
-rw-r--r--src/mame/drivers/gambl186.cpp6
-rw-r--r--src/mame/drivers/gamecom.cpp4
-rw-r--r--src/mame/drivers/gamecstl.cpp10
-rw-r--r--src/mame/drivers/gameking.cpp4
-rw-r--r--src/mame/drivers/gamemasters.cpp8
-rw-r--r--src/mame/drivers/gamtor.cpp2
-rw-r--r--src/mame/drivers/gaplus.cpp18
-rw-r--r--src/mame/drivers/gatron.cpp6
-rw-r--r--src/mame/drivers/gauntlet.cpp10
-rw-r--r--src/mame/drivers/gb.cpp50
-rw-r--r--src/mame/drivers/gba.cpp6
-rw-r--r--src/mame/drivers/gberet.cpp42
-rw-r--r--src/mame/drivers/gcpinbal.cpp14
-rw-r--r--src/mame/drivers/gei.cpp132
-rw-r--r--src/mame/drivers/geneve.cpp4
-rw-r--r--src/mame/drivers/geniusiq.cpp22
-rw-r--r--src/mame/drivers/ggconnie.cpp6
-rw-r--r--src/mame/drivers/ghosteo.cpp2
-rw-r--r--src/mame/drivers/giclassic.cpp6
-rw-r--r--src/mame/drivers/gijoe.cpp4
-rw-r--r--src/mame/drivers/gimix.cpp10
-rw-r--r--src/mame/drivers/ginganin.cpp6
-rw-r--r--src/mame/drivers/gkigt.cpp24
-rw-r--r--src/mame/drivers/gladiatr.cpp44
-rw-r--r--src/mame/drivers/glasgow.cpp26
-rw-r--r--src/mame/drivers/glass.cpp26
-rw-r--r--src/mame/drivers/globalfr.cpp2
-rw-r--r--src/mame/drivers/gluck2.cpp6
-rw-r--r--src/mame/drivers/gmaster.cpp2
-rw-r--r--src/mame/drivers/gng.cpp22
-rw-r--r--src/mame/drivers/go2000.cpp6
-rw-r--r--src/mame/drivers/goal92.cpp16
-rw-r--r--src/mame/drivers/goindol.cpp16
-rw-r--r--src/mame/drivers/goldngam.cpp2
-rw-r--r--src/mame/drivers/goldnpkr.cpp48
-rw-r--r--src/mame/drivers/goldstar.cpp294
-rw-r--r--src/mame/drivers/gomoku.cpp8
-rw-r--r--src/mame/drivers/good.cpp4
-rw-r--r--src/mame/drivers/goodejan.cpp14
-rw-r--r--src/mame/drivers/gotcha.cpp14
-rw-r--r--src/mame/drivers/gottlieb.cpp24
-rw-r--r--src/mame/drivers/gotya.cpp8
-rw-r--r--src/mame/drivers/goupil.cpp2
-rw-r--r--src/mame/drivers/gp2x.cpp14
-rw-r--r--src/mame/drivers/gp32.cpp38
-rw-r--r--src/mame/drivers/gpworld.cpp10
-rw-r--r--src/mame/drivers/gradius3.cpp24
-rw-r--r--src/mame/drivers/grchamp.cpp30
-rw-r--r--src/mame/drivers/gridcomp.cpp4
-rw-r--r--src/mame/drivers/gridlee.cpp8
-rw-r--r--src/mame/drivers/groundfx.cpp4
-rw-r--r--src/mame/drivers/gstream.cpp34
-rw-r--r--src/mame/drivers/gstriker.cpp2
-rw-r--r--src/mame/drivers/gsword.cpp24
-rw-r--r--src/mame/drivers/gticlub.cpp30
-rw-r--r--src/mame/drivers/gts1.cpp2
-rw-r--r--src/mame/drivers/gts3.cpp2
-rw-r--r--src/mame/drivers/gts3a.cpp6
-rw-r--r--src/mame/drivers/guab.cpp2
-rw-r--r--src/mame/drivers/gumbo.cpp12
-rw-r--r--src/mame/drivers/gunbustr.cpp4
-rw-r--r--src/mame/drivers/gundealr.cpp16
-rw-r--r--src/mame/drivers/gunpey.cpp16
-rw-r--r--src/mame/drivers/gunsmoke.cpp10
-rw-r--r--src/mame/drivers/gyruss.cpp10
-rw-r--r--src/mame/drivers/h19.cpp8
-rw-r--r--src/mame/drivers/h8.cpp4
-rw-r--r--src/mame/drivers/h89.cpp2
-rw-r--r--src/mame/drivers/halleys.cpp20
-rw-r--r--src/mame/drivers/hanaawas.cpp10
-rw-r--r--src/mame/drivers/harddriv.cpp102
-rw-r--r--src/mame/drivers/harriet.cpp4
-rw-r--r--src/mame/drivers/hazeltin.cpp12
-rw-r--r--src/mame/drivers/hcastle.cpp18
-rw-r--r--src/mame/drivers/headonb.cpp2
-rw-r--r--src/mame/drivers/hec2hrp.cpp54
-rw-r--r--src/mame/drivers/hexion.cpp20
-rw-r--r--src/mame/drivers/hh_cop400.cpp4
-rw-r--r--src/mame/drivers/higemaru.cpp6
-rw-r--r--src/mame/drivers/highvdeo.cpp120
-rw-r--r--src/mame/drivers/himesiki.cpp8
-rw-r--r--src/mame/drivers/hitme.cpp26
-rw-r--r--src/mame/drivers/hitpoker.cpp16
-rw-r--r--src/mame/drivers/hk68v10.cpp4
-rw-r--r--src/mame/drivers/hnayayoi.cpp48
-rw-r--r--src/mame/drivers/hng64.cpp38
-rw-r--r--src/mame/drivers/holeland.cpp10
-rw-r--r--src/mame/drivers/homedata.cpp72
-rw-r--r--src/mame/drivers/homelab.cpp16
-rw-r--r--src/mame/drivers/homerun.cpp8
-rw-r--r--src/mame/drivers/homez80.cpp2
-rw-r--r--src/mame/drivers/horizon.cpp2
-rw-r--r--src/mame/drivers/hornet.cpp32
-rw-r--r--src/mame/drivers/hotblock.cpp6
-rw-r--r--src/mame/drivers/hp16500.cpp64
-rw-r--r--src/mame/drivers/hp2620.cpp10
-rw-r--r--src/mame/drivers/hp2640.cpp24
-rw-r--r--src/mame/drivers/hp64k.cpp36
-rw-r--r--src/mame/drivers/hp80.cpp26
-rw-r--r--src/mame/drivers/hp9845.cpp6
-rw-r--r--src/mame/drivers/hp9k.cpp18
-rw-r--r--src/mame/drivers/hp9k_3xx.cpp30
-rw-r--r--src/mame/drivers/hp_ipc.cpp14
-rw-r--r--src/mame/drivers/hpz80unk.cpp10
-rw-r--r--src/mame/drivers/ht6000.cpp24
-rw-r--r--src/mame/drivers/huebler.cpp2
-rw-r--r--src/mame/drivers/hunter2.cpp16
-rw-r--r--src/mame/drivers/hvyunit.cpp22
-rw-r--r--src/mame/drivers/hx20.cpp24
-rw-r--r--src/mame/drivers/hyhoo.cpp6
-rw-r--r--src/mame/drivers/hyperscan.cpp2
-rw-r--r--src/mame/drivers/hyperspt.cpp10
-rw-r--r--src/mame/drivers/hyprduel.cpp8
-rw-r--r--src/mame/drivers/ibm6580.cpp10
-rw-r--r--src/mame/drivers/ibmpcjr.cpp8
-rw-r--r--src/mame/drivers/icatel.cpp10
-rw-r--r--src/mame/drivers/icecold.cpp2
-rw-r--r--src/mame/drivers/idsa.cpp6
-rw-r--r--src/mame/drivers/igs009.cpp38
-rw-r--r--src/mame/drivers/igs011.cpp374
-rw-r--r--src/mame/drivers/igs017.cpp30
-rw-r--r--src/mame/drivers/igspoker.cpp42
-rw-r--r--src/mame/drivers/ikki.cpp10
-rw-r--r--src/mame/drivers/imds2.cpp42
-rw-r--r--src/mame/drivers/imolagp.cpp16
-rw-r--r--src/mame/drivers/imsai.cpp10
-rw-r--r--src/mame/drivers/inder.cpp42
-rw-r--r--src/mame/drivers/inderp.cpp2
-rw-r--r--src/mame/drivers/indigo.cpp4
-rw-r--r--src/mame/drivers/indy_indigo2.cpp4
-rw-r--r--src/mame/drivers/instantm.cpp4
-rw-r--r--src/mame/drivers/instruct.cpp18
-rw-r--r--src/mame/drivers/intellec4.cpp18
-rw-r--r--src/mame/drivers/interact.cpp12
-rw-r--r--src/mame/drivers/interpro.cpp20
-rw-r--r--src/mame/drivers/intv.cpp62
-rw-r--r--src/mame/drivers/inufuku.cpp10
-rw-r--r--src/mame/drivers/invqix.cpp14
-rw-r--r--src/mame/drivers/ipds.cpp6
-rw-r--r--src/mame/drivers/iq151.cpp6
-rw-r--r--src/mame/drivers/iqblock.cpp8
-rw-r--r--src/mame/drivers/iris3130.cpp28
-rw-r--r--src/mame/drivers/irisha.cpp2
-rw-r--r--src/mame/drivers/irobot.cpp24
-rw-r--r--src/mame/drivers/ironhors.cpp30
-rw-r--r--src/mame/drivers/isbc.cpp12
-rw-r--r--src/mame/drivers/istellar.cpp4
-rw-r--r--src/mame/drivers/istrebiteli.cpp12
-rw-r--r--src/mame/drivers/itech32.cpp82
-rw-r--r--src/mame/drivers/itech8.cpp66
-rw-r--r--src/mame/drivers/itt3030.cpp10
-rw-r--r--src/mame/drivers/jack.cpp18
-rw-r--r--src/mame/drivers/jackal.cpp12
-rw-r--r--src/mame/drivers/jackie.cpp28
-rw-r--r--src/mame/drivers/jackpool.cpp2
-rw-r--r--src/mame/drivers/jaguar.cpp200
-rw-r--r--src/mame/drivers/jailbrek.cpp14
-rw-r--r--src/mame/drivers/jalmah.cpp38
-rw-r--r--src/mame/drivers/jangou.cpp24
-rw-r--r--src/mame/drivers/jankenmn.cpp2
-rw-r--r--src/mame/drivers/jantotsu.cpp12
-rw-r--r--src/mame/drivers/jchan.cpp10
-rw-r--r--src/mame/drivers/jclub2.cpp62
-rw-r--r--src/mame/drivers/jedi.cpp16
-rw-r--r--src/mame/drivers/jeutel.cpp2
-rw-r--r--src/mame/drivers/joctronic.cpp50
-rw-r--r--src/mame/drivers/jokrwild.cpp6
-rw-r--r--src/mame/drivers/jollyjgr.cpp16
-rw-r--r--src/mame/drivers/jongkyo.cpp10
-rw-r--r--src/mame/drivers/jonos.cpp4
-rw-r--r--src/mame/drivers/joystand.cpp24
-rw-r--r--src/mame/drivers/jp.cpp8
-rw-r--r--src/mame/drivers/jpmimpct.cpp52
-rw-r--r--src/mame/drivers/jpmsys5.cpp16
-rw-r--r--src/mame/drivers/jr100.cpp2
-rw-r--r--src/mame/drivers/jr200.cpp8
-rw-r--r--src/mame/drivers/jrpacman.cpp6
-rw-r--r--src/mame/drivers/jtc.cpp4
-rw-r--r--src/mame/drivers/jubilee.cpp8
-rw-r--r--src/mame/drivers/juicebox.cpp4
-rw-r--r--src/mame/drivers/junofrst.cpp10
-rw-r--r--src/mame/drivers/jupace.cpp20
-rw-r--r--src/mame/drivers/jupiter.cpp6
-rw-r--r--src/mame/drivers/k1003.cpp10
-rw-r--r--src/mame/drivers/k8915.cpp2
-rw-r--r--src/mame/drivers/kaneko16.cpp76
-rw-r--r--src/mame/drivers/kangaroo.cpp6
-rw-r--r--src/mame/drivers/karnov.cpp10
-rw-r--r--src/mame/drivers/kas89.cpp14
-rw-r--r--src/mame/drivers/kaypro.cpp14
-rw-r--r--src/mame/drivers/kc.cpp8
-rw-r--r--src/mame/drivers/kchamp.cpp16
-rw-r--r--src/mame/drivers/kdt6.cpp80
-rw-r--r--src/mame/drivers/kickgoal.cpp12
-rw-r--r--src/mame/drivers/kingdrby.cpp8
-rw-r--r--src/mame/drivers/kingobox.cpp36
-rw-r--r--src/mame/drivers/kingpin.cpp6
-rw-r--r--src/mame/drivers/kinst.cpp6
-rw-r--r--src/mame/drivers/klax.cpp8
-rw-r--r--src/mame/drivers/kncljoe.cpp18
-rw-r--r--src/mame/drivers/koftball.cpp14
-rw-r--r--src/mame/drivers/koikoi.cpp4
-rw-r--r--src/mame/drivers/konamigq.cpp8
-rw-r--r--src/mame/drivers/konamigv.cpp18
-rw-r--r--src/mame/drivers/konamigx.cpp30
-rw-r--r--src/mame/drivers/konamim2.cpp48
-rw-r--r--src/mame/drivers/konblands.cpp22
-rw-r--r--src/mame/drivers/konendev.cpp16
-rw-r--r--src/mame/drivers/konin.cpp2
-rw-r--r--src/mame/drivers/konmedal.cpp28
-rw-r--r--src/mame/drivers/konmedal68k.cpp6
-rw-r--r--src/mame/drivers/kontest.cpp6
-rw-r--r--src/mame/drivers/kopunch.cpp4
-rw-r--r--src/mame/drivers/kron.cpp16
-rw-r--r--src/mame/drivers/ksayakyu.cpp16
-rw-r--r--src/mame/drivers/ksys573.cpp14
-rw-r--r--src/mame/drivers/kungfur.cpp4
-rw-r--r--src/mame/drivers/kurukuru.cpp20
-rw-r--r--src/mame/drivers/kyocera.cpp32
-rw-r--r--src/mame/drivers/kyugo.cpp20
-rw-r--r--src/mame/drivers/labyrunr.cpp6
-rw-r--r--src/mame/drivers/ladybug.cpp20
-rw-r--r--src/mame/drivers/ladyfrog.cpp26
-rw-r--r--src/mame/drivers/laser3k.cpp8
-rw-r--r--src/mame/drivers/laserbas.cpp12
-rw-r--r--src/mame/drivers/laserbat.cpp18
-rw-r--r--src/mame/drivers/lasso.cpp50
-rw-r--r--src/mame/drivers/lastbank.cpp26
-rw-r--r--src/mame/drivers/lastduel.cpp30
-rw-r--r--src/mame/drivers/lastfght.cpp30
-rw-r--r--src/mame/drivers/lazercmd.cpp16
-rw-r--r--src/mame/drivers/lb186.cpp4
-rw-r--r--src/mame/drivers/lbeach.cpp8
-rw-r--r--src/mame/drivers/lcmate2.cpp6
-rw-r--r--src/mame/drivers/leapster.cpp4
-rw-r--r--src/mame/drivers/legionna.cpp76
-rw-r--r--src/mame/drivers/leland.cpp48
-rw-r--r--src/mame/drivers/lemmings.cpp12
-rw-r--r--src/mame/drivers/lethal.cpp12
-rw-r--r--src/mame/drivers/lethalj.cpp4
-rw-r--r--src/mame/drivers/lft.cpp2
-rw-r--r--src/mame/drivers/lgp.cpp2
-rw-r--r--src/mame/drivers/liberate.cpp40
-rw-r--r--src/mame/drivers/liberatr.cpp28
-rw-r--r--src/mame/drivers/limenko.cpp18
-rw-r--r--src/mame/drivers/lisa.cpp6
-rw-r--r--src/mame/drivers/littlerb.cpp4
-rw-r--r--src/mame/drivers/lkage.cpp16
-rw-r--r--src/mame/drivers/llc.cpp4
-rw-r--r--src/mame/drivers/lockon.cpp34
-rw-r--r--src/mame/drivers/lola8a.cpp2
-rw-r--r--src/mame/drivers/looping.cpp12
-rw-r--r--src/mame/drivers/lordgun.cpp42
-rw-r--r--src/mame/drivers/lsasquad.cpp24
-rw-r--r--src/mame/drivers/ltcasino.cpp4
-rw-r--r--src/mame/drivers/ltd.cpp10
-rw-r--r--src/mame/drivers/luckgrln.cpp32
-rw-r--r--src/mame/drivers/lucky74.cpp32
-rw-r--r--src/mame/drivers/luckybal.cpp4
-rw-r--r--src/mame/drivers/lvcards.cpp16
-rw-r--r--src/mame/drivers/lviv.cpp2
-rw-r--r--src/mame/drivers/lwings.cpp64
-rw-r--r--src/mame/drivers/lwriter.cpp6
-rw-r--r--src/mame/drivers/lynx.cpp2
-rw-r--r--src/mame/drivers/m10.cpp26
-rw-r--r--src/mame/drivers/m107.cpp14
-rw-r--r--src/mame/drivers/m14.cpp14
-rw-r--r--src/mame/drivers/m20.cpp4
-rw-r--r--src/mame/drivers/m24.cpp6
-rw-r--r--src/mame/drivers/m5.cpp46
-rw-r--r--src/mame/drivers/m52.cpp28
-rw-r--r--src/mame/drivers/m57.cpp4
-rw-r--r--src/mame/drivers/m58.cpp6
-rw-r--r--src/mame/drivers/m62.cpp122
-rw-r--r--src/mame/drivers/m63.cpp22
-rw-r--r--src/mame/drivers/m72.cpp140
-rw-r--r--src/mame/drivers/m79amb.cpp12
-rw-r--r--src/mame/drivers/m90.cpp14
-rw-r--r--src/mame/drivers/m92.cpp40
-rw-r--r--src/mame/drivers/mac.cpp266
-rw-r--r--src/mame/drivers/mac128.cpp20
-rw-r--r--src/mame/drivers/macpci.cpp6
-rw-r--r--src/mame/drivers/macrossp.cpp16
-rw-r--r--src/mame/drivers/macs.cpp6
-rw-r--r--src/mame/drivers/madalien.cpp10
-rw-r--r--src/mame/drivers/magic10.cpp40
-rw-r--r--src/mame/drivers/magicard.cpp26
-rw-r--r--src/mame/drivers/magicfly.cpp8
-rw-r--r--src/mame/drivers/magictg.cpp18
-rw-r--r--src/mame/drivers/magmax.cpp6
-rw-r--r--src/mame/drivers/magnum.cpp6
-rw-r--r--src/mame/drivers/magtouch.cpp2
-rw-r--r--src/mame/drivers/mainevt.cpp28
-rw-r--r--src/mame/drivers/mainsnk.cpp8
-rw-r--r--src/mame/drivers/majorpkr.cpp24
-rw-r--r--src/mame/drivers/malzak.cpp20
-rw-r--r--src/mame/drivers/mappy.cpp14
-rw-r--r--src/mame/drivers/marineb.cpp10
-rw-r--r--src/mame/drivers/marinedt.cpp18
-rw-r--r--src/mame/drivers/mario.cpp20
-rw-r--r--src/mame/drivers/markham.cpp28
-rw-r--r--src/mame/drivers/mastboy.cpp10
-rw-r--r--src/mame/drivers/mastboyo.cpp6
-rw-r--r--src/mame/drivers/matmania.cpp14
-rw-r--r--src/mame/drivers/maxaflex.cpp3
-rw-r--r--src/mame/drivers/maygay1b.cpp44
-rw-r--r--src/mame/drivers/maygayv1.cpp8
-rw-r--r--src/mame/drivers/mazerbla.cpp32
-rw-r--r--src/mame/drivers/mbc200.cpp2
-rw-r--r--src/mame/drivers/mbc55x.cpp14
-rw-r--r--src/mame/drivers/mbee.cpp152
-rw-r--r--src/mame/drivers/mc10.cpp10
-rw-r--r--src/mame/drivers/mc1000.cpp10
-rw-r--r--src/mame/drivers/mc1502.cpp4
-rw-r--r--src/mame/drivers/mc8030.cpp6
-rw-r--r--src/mame/drivers/mcatadv.cpp10
-rw-r--r--src/mame/drivers/mcb216.cpp2
-rw-r--r--src/mame/drivers/mcr.cpp12
-rw-r--r--src/mame/drivers/mcr3.cpp14
-rw-r--r--src/mame/drivers/mcr68.cpp18
-rw-r--r--src/mame/drivers/meadows.cpp26
-rw-r--r--src/mame/drivers/mediagx.cpp16
-rw-r--r--src/mame/drivers/megadriv_acbl.cpp16
-rw-r--r--src/mame/drivers/megadriv_rad.cpp18
-rw-r--r--src/mame/drivers/megaplay.cpp10
-rw-r--r--src/mame/drivers/megasys1.cpp60
-rw-r--r--src/mame/drivers/megatech.cpp16
-rw-r--r--src/mame/drivers/megazone.cpp4
-rw-r--r--src/mame/drivers/meijinsn.cpp4
-rw-r--r--src/mame/drivers/mephisto.cpp14
-rw-r--r--src/mame/drivers/mephisto_montec.cpp52
-rw-r--r--src/mame/drivers/mephistp.cpp6
-rw-r--r--src/mame/drivers/merit.cpp54
-rw-r--r--src/mame/drivers/meritm.cpp14
-rw-r--r--src/mame/drivers/mermaid.cpp16
-rw-r--r--src/mame/drivers/mes.cpp4
-rw-r--r--src/mame/drivers/metalmx.cpp28
-rw-r--r--src/mame/drivers/metlclsh.cpp20
-rw-r--r--src/mame/drivers/metlfrzr.cpp2
-rw-r--r--src/mame/drivers/metro.cpp184
-rw-r--r--src/mame/drivers/mexico86.cpp8
-rw-r--r--src/mame/drivers/meyc8080.cpp14
-rw-r--r--src/mame/drivers/meyc8088.cpp6
-rw-r--r--src/mame/drivers/mgames.cpp18
-rw-r--r--src/mame/drivers/mgavegas.cpp8
-rw-r--r--src/mame/drivers/mgolf.cpp14
-rw-r--r--src/mame/drivers/mhavoc.cpp40
-rw-r--r--src/mame/drivers/micral.cpp8
-rw-r--r--src/mame/drivers/micro20.cpp2
-rw-r--r--src/mame/drivers/micro3d.cpp36
-rw-r--r--src/mame/drivers/microdec.cpp8
-rw-r--r--src/mame/drivers/microkit.cpp2
-rw-r--r--src/mame/drivers/micronic.cpp22
-rw-r--r--src/mame/drivers/micropin.cpp12
-rw-r--r--src/mame/drivers/microtan.cpp4
-rw-r--r--src/mame/drivers/microterm.cpp2
-rw-r--r--src/mame/drivers/midas.cpp36
-rw-r--r--src/mame/drivers/midqslvr.cpp18
-rw-r--r--src/mame/drivers/midtunit.cpp18
-rw-r--r--src/mame/drivers/midvunit.cpp62
-rw-r--r--src/mame/drivers/midwunit.cpp18
-rw-r--r--src/mame/drivers/midxunit.cpp22
-rw-r--r--src/mame/drivers/midyunit.cpp20
-rw-r--r--src/mame/drivers/midzeus.cpp26
-rw-r--r--src/mame/drivers/mikie.cpp12
-rw-r--r--src/mame/drivers/mikro80.cpp14
-rw-r--r--src/mame/drivers/mikromik.cpp2
-rw-r--r--src/mame/drivers/mikrosha.cpp4
-rw-r--r--src/mame/drivers/mil4000.cpp30
-rw-r--r--src/mame/drivers/miniframe.cpp4
-rw-r--r--src/mame/drivers/minitel_2_rpic.cpp4
-rw-r--r--src/mame/drivers/mirage.cpp8
-rw-r--r--src/mame/drivers/mirax.cpp8
-rw-r--r--src/mame/drivers/missb2.cpp12
-rw-r--r--src/mame/drivers/missile.cpp4
-rw-r--r--src/mame/drivers/mitchell.cpp64
-rw-r--r--src/mame/drivers/mits680b.cpp2
-rw-r--r--src/mame/drivers/mjkjidai.cpp8
-rw-r--r--src/mame/drivers/mjsenpu.cpp12
-rw-r--r--src/mame/drivers/mjsister.cpp12
-rw-r--r--src/mame/drivers/mk1.cpp2
-rw-r--r--src/mame/drivers/mk14.cpp4
-rw-r--r--src/mame/drivers/mlanding.cpp38
-rw-r--r--src/mame/drivers/mmagic.cpp10
-rw-r--r--src/mame/drivers/mmd1.cpp14
-rw-r--r--src/mame/drivers/mmm.cpp4
-rw-r--r--src/mame/drivers/mmodular.cpp2
-rw-r--r--src/mame/drivers/mod8.cpp6
-rw-r--r--src/mame/drivers/model1.cpp30
-rw-r--r--src/mame/drivers/model2.cpp114
-rw-r--r--src/mame/drivers/model3.cpp26
-rw-r--r--src/mame/drivers/modellot.cpp4
-rw-r--r--src/mame/drivers/mogura.cpp6
-rw-r--r--src/mame/drivers/mole.cpp10
-rw-r--r--src/mame/drivers/molecular.cpp10
-rw-r--r--src/mame/drivers/momoko.cpp22
-rw-r--r--src/mame/drivers/monty.cpp8
-rw-r--r--src/mame/drivers/monzagp.cpp2
-rw-r--r--src/mame/drivers/moo.cpp18
-rw-r--r--src/mame/drivers/mosaic.cpp12
-rw-r--r--src/mame/drivers/mouser.cpp2
-rw-r--r--src/mame/drivers/mpf1.cpp2
-rw-r--r--src/mame/drivers/mpu12wbk.cpp4
-rw-r--r--src/mame/drivers/mpu3.cpp6
-rw-r--r--src/mame/drivers/mpu4plasma.cpp4
-rw-r--r--src/mame/drivers/mpu4vid.cpp20
-rw-r--r--src/mame/drivers/mpu5.cpp2
-rw-r--r--src/mame/drivers/mpz80.cpp12
-rw-r--r--src/mame/drivers/mquake.cpp16
-rw-r--r--src/mame/drivers/mrdo.cpp16
-rw-r--r--src/mame/drivers/mrflea.cpp6
-rw-r--r--src/mame/drivers/mrgame.cpp28
-rw-r--r--src/mame/drivers/mrjong.cpp12
-rw-r--r--src/mame/drivers/ms0515.cpp4
-rw-r--r--src/mame/drivers/ms32.cpp42
-rw-r--r--src/mame/drivers/ms6102.cpp6
-rw-r--r--src/mame/drivers/msisaac.cpp36
-rw-r--r--src/mame/drivers/mstation.cpp18
-rw-r--r--src/mame/drivers/msx.cpp50
-rw-r--r--src/mame/drivers/mt735.cpp4
-rw-r--r--src/mame/drivers/mtouchxl.cpp6
-rw-r--r--src/mame/drivers/mtx.cpp30
-rw-r--r--src/mame/drivers/mugsmash.cpp10
-rw-r--r--src/mame/drivers/multfish.cpp92
-rw-r--r--src/mame/drivers/multi16.cpp4
-rw-r--r--src/mame/drivers/multi8.cpp14
-rw-r--r--src/mame/drivers/multigam.cpp46
-rw-r--r--src/mame/drivers/munchmo.cpp8
-rw-r--r--src/mame/drivers/murogem.cpp2
-rw-r--r--src/mame/drivers/murogmbl.cpp4
-rw-r--r--src/mame/drivers/mustache.cpp6
-rw-r--r--src/mame/drivers/mvme147.cpp10
-rw-r--r--src/mame/drivers/mw18w.cpp10
-rw-r--r--src/mame/drivers/mw8080bw.cpp136
-rw-r--r--src/mame/drivers/mwarr.cpp14
-rw-r--r--src/mame/drivers/mwsub.cpp12
-rw-r--r--src/mame/drivers/myb3k.cpp10
-rw-r--r--src/mame/drivers/mycom.cpp8
-rw-r--r--src/mame/drivers/mystston.cpp6
-rw-r--r--src/mame/drivers/mystwarr.cpp78
-rw-r--r--src/mame/drivers/myvision.cpp4
-rw-r--r--src/mame/drivers/mz2000.cpp16
-rw-r--r--src/mame/drivers/mz2500.cpp62
-rw-r--r--src/mame/drivers/mz3500.cpp12
-rw-r--r--src/mame/drivers/mz6500.cpp2
-rw-r--r--src/mame/drivers/mz700.cpp50
-rw-r--r--src/mame/drivers/mz80.cpp2
-rw-r--r--src/mame/drivers/n64.cpp2
-rw-r--r--src/mame/drivers/n8080.cpp12
-rw-r--r--src/mame/drivers/nakajies.cpp28
-rw-r--r--src/mame/drivers/namcofl.cpp42
-rw-r--r--src/mame/drivers/namcona1.cpp34
-rw-r--r--src/mame/drivers/namconb1.cpp62
-rw-r--r--src/mame/drivers/namcond1.cpp10
-rw-r--r--src/mame/drivers/namcos1.cpp28
-rw-r--r--src/mame/drivers/namcos10.cpp32
-rw-r--r--src/mame/drivers/namcos11.cpp12
-rw-r--r--src/mame/drivers/namcos12.cpp56
-rw-r--r--src/mame/drivers/namcos2.cpp66
-rw-r--r--src/mame/drivers/namcos21.cpp122
-rw-r--r--src/mame/drivers/namcos22.cpp120
-rw-r--r--src/mame/drivers/namcos23.cpp72
-rw-r--r--src/mame/drivers/namcos86.cpp98
-rw-r--r--src/mame/drivers/nanos.cpp2
-rw-r--r--src/mame/drivers/naomi.cpp56
-rw-r--r--src/mame/drivers/nascom1.cpp12
-rw-r--r--src/mame/drivers/naughtyb.cpp12
-rw-r--r--src/mame/drivers/nbmj8688.cpp150
-rw-r--r--src/mame/drivers/nbmj8891.cpp184
-rw-r--r--src/mame/drivers/nbmj8900.cpp20
-rw-r--r--src/mame/drivers/nbmj8991.cpp54
-rw-r--r--src/mame/drivers/nbmj9195.cpp330
-rw-r--r--src/mame/drivers/nc.cpp48
-rw-r--r--src/mame/drivers/nds.cpp26
-rw-r--r--src/mame/drivers/nemesis.cpp138
-rw-r--r--src/mame/drivers/neogeo.cpp36
-rw-r--r--src/mame/drivers/neogeocd.cpp16
-rw-r--r--src/mame/drivers/neoprint.cpp22
-rw-r--r--src/mame/drivers/neptunp2.cpp6
-rw-r--r--src/mame/drivers/nes.cpp6
-rw-r--r--src/mame/drivers/nes_vt.cpp88
-rw-r--r--src/mame/drivers/newbrain.cpp4
-rw-r--r--src/mame/drivers/news.cpp6
-rw-r--r--src/mame/drivers/next.cpp32
-rw-r--r--src/mame/drivers/nexus3d.cpp2
-rw-r--r--src/mame/drivers/ngen.cpp8
-rw-r--r--src/mame/drivers/ngp.cpp12
-rw-r--r--src/mame/drivers/nibble.cpp2
-rw-r--r--src/mame/drivers/nightgal.cpp42
-rw-r--r--src/mame/drivers/ninjakd2.cpp82
-rw-r--r--src/mame/drivers/ninjaw.cpp20
-rw-r--r--src/mame/drivers/nitedrvr.cpp12
-rw-r--r--src/mame/drivers/niyanpai.cpp124
-rw-r--r--src/mame/drivers/nmg5.cpp26
-rw-r--r--src/mame/drivers/nmk16.cpp280
-rw-r--r--src/mame/drivers/nokia_3310.cpp12
-rw-r--r--src/mame/drivers/norautp.cpp2
-rw-r--r--src/mame/drivers/notechan.cpp8
-rw-r--r--src/mame/drivers/notetaker.cpp42
-rw-r--r--src/mame/drivers/nova2001.cpp48
-rw-r--r--src/mame/drivers/novag6502.cpp24
-rw-r--r--src/mame/drivers/novag68k.cpp10
-rw-r--r--src/mame/drivers/novagf8.cpp4
-rw-r--r--src/mame/drivers/nsm.cpp14
-rw-r--r--src/mame/drivers/nsmpoker.cpp6
-rw-r--r--src/mame/drivers/nss.cpp22
-rw-r--r--src/mame/drivers/nwk-tr.cpp18
-rw-r--r--src/mame/drivers/nycaptor.cpp118
-rw-r--r--src/mame/drivers/nyny.cpp8
-rw-r--r--src/mame/drivers/ob68k1a.cpp12
-rw-r--r--src/mame/drivers/octopus.cpp16
-rw-r--r--src/mame/drivers/odyssey2.cpp4
-rw-r--r--src/mame/drivers/offtwall.cpp4
-rw-r--r--src/mame/drivers/ohmygod.cpp10
-rw-r--r--src/mame/drivers/ojankohs.cpp60
-rw-r--r--src/mame/drivers/okean240.cpp10
-rw-r--r--src/mame/drivers/olibochu.cpp8
-rw-r--r--src/mame/drivers/olyboss.cpp14
-rw-r--r--src/mame/drivers/omegrace.cpp8
-rw-r--r--src/mame/drivers/ondra.cpp2
-rw-r--r--src/mame/drivers/oneshot.cpp18
-rw-r--r--src/mame/drivers/onetwo.cpp10
-rw-r--r--src/mame/drivers/opwolf.cpp44
-rw-r--r--src/mame/drivers/orao.cpp2
-rw-r--r--src/mame/drivers/orbit.cpp10
-rw-r--r--src/mame/drivers/oric.cpp41
-rw-r--r--src/mame/drivers/orion.cpp22
-rw-r--r--src/mame/drivers/osbexec.cpp8
-rw-r--r--src/mame/drivers/osborne1.cpp14
-rw-r--r--src/mame/drivers/osi.cpp20
-rw-r--r--src/mame/drivers/othello.cpp24
-rw-r--r--src/mame/drivers/othunder.cpp8
-rw-r--r--src/mame/drivers/overdriv.cpp16
-rw-r--r--src/mame/drivers/p2000t.cpp18
-rw-r--r--src/mame/drivers/p8k.cpp4
-rw-r--r--src/mame/drivers/pachifev.cpp12
-rw-r--r--src/mame/drivers/pacland.cpp26
-rw-r--r--src/mame/drivers/pacman.cpp146
-rw-r--r--src/mame/drivers/pandoras.cpp20
-rw-r--r--src/mame/drivers/panicr.cpp10
-rw-r--r--src/mame/drivers/paradise.cpp20
-rw-r--r--src/mame/drivers/paranoia.cpp12
-rw-r--r--src/mame/drivers/parodius.cpp8
-rw-r--r--src/mame/drivers/partner.cpp4
-rw-r--r--src/mame/drivers/pasha2.cpp18
-rw-r--r--src/mame/drivers/paso1600.cpp12
-rw-r--r--src/mame/drivers/pasogo.cpp6
-rw-r--r--src/mame/drivers/pasopia.cpp2
-rw-r--r--src/mame/drivers/pasopia7.cpp10
-rw-r--r--src/mame/drivers/pass.cpp4
-rw-r--r--src/mame/drivers/pastelg.cpp20
-rw-r--r--src/mame/drivers/patapata.cpp6
-rw-r--r--src/mame/drivers/pb1000.cpp2
-rw-r--r--src/mame/drivers/pbaction.cpp20
-rw-r--r--src/mame/drivers/pc.cpp2
-rw-r--r--src/mame/drivers/pc100.cpp18
-rw-r--r--src/mame/drivers/pc1512.cpp28
-rw-r--r--src/mame/drivers/pc2000.cpp22
-rw-r--r--src/mame/drivers/pc4.cpp16
-rw-r--r--src/mame/drivers/pc6001.cpp86
-rw-r--r--src/mame/drivers/pc8001.cpp12
-rw-r--r--src/mame/drivers/pc8401a.cpp14
-rw-r--r--src/mame/drivers/pc8801.cpp80
-rw-r--r--src/mame/drivers/pc88va.cpp40
-rw-r--r--src/mame/drivers/pc9801.cpp152
-rw-r--r--src/mame/drivers/pcat_dyn.cpp6
-rw-r--r--src/mame/drivers/pcat_nit.cpp8
-rw-r--r--src/mame/drivers/pcd.cpp24
-rw-r--r--src/mame/drivers/pce.cpp8
-rw-r--r--src/mame/drivers/pce220.cpp58
-rw-r--r--src/mame/drivers/pcfx.cpp4
-rw-r--r--src/mame/drivers/pcktgal.cpp10
-rw-r--r--src/mame/drivers/pcw.cpp30
-rw-r--r--src/mame/drivers/pcw16.cpp36
-rw-r--r--src/mame/drivers/pcxt.cpp14
-rw-r--r--src/mame/drivers/pdp11.cpp2
-rw-r--r--src/mame/drivers/pecom.cpp6
-rw-r--r--src/mame/drivers/pegasus.cpp4
-rw-r--r--src/mame/drivers/pencil2.cpp18
-rw-r--r--src/mame/drivers/pengadvb.cpp8
-rw-r--r--src/mame/drivers/pengo.cpp8
-rw-r--r--src/mame/drivers/pentagon.cpp10
-rw-r--r--src/mame/drivers/peoplepc.cpp4
-rw-r--r--src/mame/drivers/peplus.cpp18
-rw-r--r--src/mame/drivers/pes.cpp6
-rw-r--r--src/mame/drivers/pet.cpp4
-rw-r--r--src/mame/drivers/peyper.cpp6
-rw-r--r--src/mame/drivers/pg685.cpp30
-rw-r--r--src/mame/drivers/pgm.cpp14
-rw-r--r--src/mame/drivers/pgm2.cpp34
-rw-r--r--src/mame/drivers/phc25.cpp4
-rw-r--r--src/mame/drivers/phoenix.cpp20
-rw-r--r--src/mame/drivers/photon.cpp12
-rw-r--r--src/mame/drivers/photon2.cpp8
-rw-r--r--src/mame/drivers/photoply.cpp12
-rw-r--r--src/mame/drivers/phunsy.cpp4
-rw-r--r--src/mame/drivers/pinball2k.cpp14
-rw-r--r--src/mame/drivers/pingpong.cpp16
-rw-r--r--src/mame/drivers/pinkiri8.cpp10
-rw-r--r--src/mame/drivers/pipbug.cpp2
-rw-r--r--src/mame/drivers/pipedrm.cpp12
-rw-r--r--src/mame/drivers/pipeline.cpp4
-rw-r--r--src/mame/drivers/pirates.cpp8
-rw-r--r--src/mame/drivers/piratesh.cpp8
-rw-r--r--src/mame/drivers/pitnrun.cpp20
-rw-r--r--src/mame/drivers/pk8000.cpp16
-rw-r--r--src/mame/drivers/pkscram.cpp8
-rw-r--r--src/mame/drivers/pktgaldx.cpp16
-rw-r--r--src/mame/drivers/plan80.cpp4
-rw-r--r--src/mame/drivers/play_1.cpp14
-rw-r--r--src/mame/drivers/play_2.cpp12
-rw-r--r--src/mame/drivers/play_3.cpp22
-rw-r--r--src/mame/drivers/playch10.cpp16
-rw-r--r--src/mame/drivers/playmark.cpp76
-rw-r--r--src/mame/drivers/plus4.cpp4
-rw-r--r--src/mame/drivers/pluto5.cpp2
-rw-r--r--src/mame/drivers/plygonet.cpp32
-rw-r--r--src/mame/drivers/pmd85.cpp4
-rw-r--r--src/mame/drivers/pmi80.cpp4
-rw-r--r--src/mame/drivers/pntnpuzl.cpp14
-rw-r--r--src/mame/drivers/pocketc.cpp24
-rw-r--r--src/mame/drivers/pockstat.cpp20
-rw-r--r--src/mame/drivers/pofo.cpp4
-rw-r--r--src/mame/drivers/poisk1.cpp6
-rw-r--r--src/mame/drivers/pokechmp.cpp10
-rw-r--r--src/mame/drivers/pokemini.cpp4
-rw-r--r--src/mame/drivers/poker72.cpp6
-rw-r--r--src/mame/drivers/polepos.cpp32
-rw-r--r--src/mame/drivers/polgar.cpp32
-rw-r--r--src/mame/drivers/policetr.cpp32
-rw-r--r--src/mame/drivers/poly.cpp20
-rw-r--r--src/mame/drivers/poly88.cpp6
-rw-r--r--src/mame/drivers/poly880.cpp2
-rw-r--r--src/mame/drivers/polyplay.cpp4
-rw-r--r--src/mame/drivers/poolshrk.cpp16
-rw-r--r--src/mame/drivers/pooyan.cpp4
-rw-r--r--src/mame/drivers/popeye.cpp12
-rw-r--r--src/mame/drivers/popobear.cpp6
-rw-r--r--src/mame/drivers/popper.cpp20
-rw-r--r--src/mame/drivers/portrait.cpp10
-rw-r--r--src/mame/drivers/powerbal.cpp20
-rw-r--r--src/mame/drivers/powerins.cpp14
-rw-r--r--src/mame/drivers/pp01.cpp4
-rw-r--r--src/mame/drivers/ppmast93.cpp8
-rw-r--r--src/mame/drivers/prehisle.cpp14
-rw-r--r--src/mame/drivers/prestige.cpp18
-rw-r--r--src/mame/drivers/primo.cpp10
-rw-r--r--src/mame/drivers/pro80.cpp6
-rw-r--r--src/mame/drivers/proconn.cpp60
-rw-r--r--src/mame/drivers/prof180x.cpp8
-rw-r--r--src/mame/drivers/prof80.cpp6
-rw-r--r--src/mame/drivers/progolf.cpp12
-rw-r--r--src/mame/drivers/prophet600.cpp14
-rw-r--r--src/mame/drivers/proteus.cpp16
-rw-r--r--src/mame/drivers/psikyo.cpp28
-rw-r--r--src/mame/drivers/psikyo4.cpp16
-rw-r--r--src/mame/drivers/psikyosh.cpp12
-rw-r--r--src/mame/drivers/psion.cpp28
-rw-r--r--src/mame/drivers/psx.cpp2
-rw-r--r--src/mame/drivers/psychic5.cpp36
-rw-r--r--src/mame/drivers/pt68k4.cpp12
-rw-r--r--src/mame/drivers/ptcsol.cpp10
-rw-r--r--src/mame/drivers/pturn.cpp14
-rw-r--r--src/mame/drivers/puckpkmn.cpp10
-rw-r--r--src/mame/drivers/pulsar.cpp6
-rw-r--r--src/mame/drivers/punchout.cpp24
-rw-r--r--src/mame/drivers/pv1000.cpp4
-rw-r--r--src/mame/drivers/pv2000.cpp20
-rw-r--r--src/mame/drivers/pv9234.cpp6
-rw-r--r--src/mame/drivers/pwrview.cpp38
-rw-r--r--src/mame/drivers/px4.cpp42
-rw-r--r--src/mame/drivers/px8.cpp6
-rw-r--r--src/mame/drivers/pyl601.cpp24
-rw-r--r--src/mame/drivers/pzletime.cpp12
-rw-r--r--src/mame/drivers/qdrmfgp.cpp68
-rw-r--r--src/mame/drivers/qix.cpp18
-rw-r--r--src/mame/drivers/ql.cpp4
-rw-r--r--src/mame/drivers/qtsbc.cpp4
-rw-r--r--src/mame/drivers/quantum.cpp6
-rw-r--r--src/mame/drivers/quasar.cpp22
-rw-r--r--src/mame/drivers/queen.cpp12
-rw-r--r--src/mame/drivers/quickpick5.cpp8
-rw-r--r--src/mame/drivers/quizdna.cpp36
-rw-r--r--src/mame/drivers/quizo.cpp6
-rw-r--r--src/mame/drivers/quizpani.cpp6
-rw-r--r--src/mame/drivers/quizpun2.cpp14
-rw-r--r--src/mame/drivers/quizshow.cpp16
-rw-r--r--src/mame/drivers/qvt201.cpp6
-rw-r--r--src/mame/drivers/qx10.cpp14
-rw-r--r--src/mame/drivers/r2dtank.cpp6
-rw-r--r--src/mame/drivers/r2dx_v33.cpp100
-rw-r--r--src/mame/drivers/r9751.cpp8
-rw-r--r--src/mame/drivers/rabbit.cpp16
-rw-r--r--src/mame/drivers/rad_eu3a05.cpp42
-rw-r--r--src/mame/drivers/rad_eu3a14.cpp10
-rw-r--r--src/mame/drivers/radio86.cpp6
-rw-r--r--src/mame/drivers/raiden.cpp20
-rw-r--r--src/mame/drivers/raiden2.cpp74
-rw-r--r--src/mame/drivers/rainbow.cpp408
-rw-r--r--src/mame/drivers/rallyx.cpp14
-rw-r--r--src/mame/drivers/rambo.cpp2
-rw-r--r--src/mame/drivers/rampart.cpp4
-rw-r--r--src/mame/drivers/rastan.cpp10
-rw-r--r--src/mame/drivers/rastersp.cpp20
-rw-r--r--src/mame/drivers/ravens.cpp12
-rw-r--r--src/mame/drivers/rbisland.cpp8
-rw-r--r--src/mame/drivers/rbmk.cpp22
-rw-r--r--src/mame/drivers/rc702.cpp6
-rw-r--r--src/mame/drivers/rc759.cpp24
-rw-r--r--src/mame/drivers/rd110.cpp12
-rw-r--r--src/mame/drivers/re900.cpp8
-rw-r--r--src/mame/drivers/realbrk.cpp22
-rw-r--r--src/mame/drivers/redalert.cpp28
-rw-r--r--src/mame/drivers/redclash.cpp30
-rw-r--r--src/mame/drivers/relief.cpp6
-rw-r--r--src/mame/drivers/renegade.cpp22
-rw-r--r--src/mame/drivers/replicator.cpp2
-rw-r--r--src/mame/drivers/retofinv.cpp24
-rw-r--r--src/mame/drivers/rex6000.cpp26
-rw-r--r--src/mame/drivers/risc2500.cpp8
-rw-r--r--src/mame/drivers/riscpc.cpp4
-rw-r--r--src/mame/drivers/rltennis.cpp8
-rw-r--r--src/mame/drivers/rm380z.cpp12
-rw-r--r--src/mame/drivers/rmhaihai.cpp30
-rw-r--r--src/mame/drivers/rmnimbus.cpp18
-rw-r--r--src/mame/drivers/rmt32.cpp12
-rw-r--r--src/mame/drivers/rockrage.cpp10
-rw-r--r--src/mame/drivers/rocnrope.cpp6
-rw-r--r--src/mame/drivers/rohga.cpp20
-rw-r--r--src/mame/drivers/rollerg.cpp10
-rw-r--r--src/mame/drivers/rollext.cpp4
-rw-r--r--src/mame/drivers/rollrace.cpp16
-rw-r--r--src/mame/drivers/ron.cpp10
-rw-r--r--src/mame/drivers/rotaryf.cpp2
-rw-r--r--src/mame/drivers/roul.cpp8
-rw-r--r--src/mame/drivers/route16.cpp38
-rw-r--r--src/mame/drivers/rowamet.cpp6
-rw-r--r--src/mame/drivers/royalmah.cpp174
-rw-r--r--src/mame/drivers/rpunch.cpp16
-rw-r--r--src/mame/drivers/rt1715.cpp12
-rw-r--r--src/mame/drivers/runaway.cpp12
-rw-r--r--src/mame/drivers/rungun.cpp14
-rw-r--r--src/mame/drivers/rvoice.cpp2
-rw-r--r--src/mame/drivers/rx78.cpp18
-rw-r--r--src/mame/drivers/rz1.cpp6
-rw-r--r--src/mame/drivers/s11.cpp8
-rw-r--r--src/mame/drivers/s11a.cpp10
-rw-r--r--src/mame/drivers/s11b.cpp14
-rw-r--r--src/mame/drivers/s11c.cpp10
-rw-r--r--src/mame/drivers/s3.cpp2
-rw-r--r--src/mame/drivers/s4.cpp2
-rw-r--r--src/mame/drivers/s6.cpp2
-rw-r--r--src/mame/drivers/s6a.cpp2
-rw-r--r--src/mame/drivers/s7.cpp4
-rw-r--r--src/mame/drivers/s8.cpp4
-rw-r--r--src/mame/drivers/s8a.cpp4
-rw-r--r--src/mame/drivers/s9.cpp4
-rw-r--r--src/mame/drivers/sacstate.cpp8
-rw-r--r--src/mame/drivers/safarir.cpp6
-rw-r--r--src/mame/drivers/sage2.cpp2
-rw-r--r--src/mame/drivers/samcoupe.cpp54
-rw-r--r--src/mame/drivers/sandscrp.cpp18
-rw-r--r--src/mame/drivers/sangho.cpp6
-rw-r--r--src/mame/drivers/sanremo.cpp6
-rw-r--r--src/mame/drivers/sapi1.cpp26
-rw-r--r--src/mame/drivers/saturn.cpp24
-rw-r--r--src/mame/drivers/sauro.cpp26
-rw-r--r--src/mame/drivers/savquest.cpp22
-rw-r--r--src/mame/drivers/sbasketb.cpp12
-rw-r--r--src/mame/drivers/sbc6510.cpp2
-rw-r--r--src/mame/drivers/sbowling.cpp10
-rw-r--r--src/mame/drivers/sbrain.cpp12
-rw-r--r--src/mame/drivers/sbrkout.cpp12
-rw-r--r--src/mame/drivers/sbugger.cpp8
-rw-r--r--src/mame/drivers/sc1.cpp2
-rw-r--r--src/mame/drivers/sc2.cpp2
-rw-r--r--src/mame/drivers/scobra.cpp124
-rw-r--r--src/mame/drivers/scorpion.cpp14
-rw-r--r--src/mame/drivers/scotrsht.cpp12
-rw-r--r--src/mame/drivers/scramble.cpp214
-rw-r--r--src/mame/drivers/scregg.cpp18
-rw-r--r--src/mame/drivers/scyclone.cpp30
-rw-r--r--src/mame/drivers/sderby.cpp72
-rw-r--r--src/mame/drivers/sderby2.cpp12
-rw-r--r--src/mame/drivers/seabattl.cpp18
-rw-r--r--src/mame/drivers/seattle.cpp50
-rw-r--r--src/mame/drivers/segac2.cpp8
-rw-r--r--src/mame/drivers/segae.cpp6
-rw-r--r--src/mame/drivers/segag80r.cpp36
-rw-r--r--src/mame/drivers/segag80v.cpp16
-rw-r--r--src/mame/drivers/segahang.cpp14
-rw-r--r--src/mame/drivers/segald.cpp12
-rw-r--r--src/mame/drivers/segam1.cpp4
-rw-r--r--src/mame/drivers/segapico.cpp4
-rw-r--r--src/mame/drivers/segas16a.cpp16
-rw-r--r--src/mame/drivers/segas16b.cpp54
-rw-r--r--src/mame/drivers/segas18.cpp4
-rw-r--r--src/mame/drivers/segas24.cpp54
-rw-r--r--src/mame/drivers/segas32.cpp64
-rw-r--r--src/mame/drivers/segasp.cpp20
-rw-r--r--src/mame/drivers/segaxbd.cpp6
-rw-r--r--src/mame/drivers/segaybd.cpp6
-rw-r--r--src/mame/drivers/seibucats.cpp18
-rw-r--r--src/mame/drivers/seibuspi.cpp70
-rw-r--r--src/mame/drivers/seicross.cpp8
-rw-r--r--src/mame/drivers/seicupbl.cpp12
-rw-r--r--src/mame/drivers/sengokmj.cpp16
-rw-r--r--src/mame/drivers/senjyo.cpp52
-rw-r--r--src/mame/drivers/seta.cpp368
-rw-r--r--src/mame/drivers/seta2.cpp114
-rw-r--r--src/mame/drivers/sf.cpp44
-rw-r--r--src/mame/drivers/sfbonus.cpp20
-rw-r--r--src/mame/drivers/sfcbox.cpp16
-rw-r--r--src/mame/drivers/sfkick.cpp8
-rw-r--r--src/mame/drivers/sg1000.cpp42
-rw-r--r--src/mame/drivers/sg1000a.cpp12
-rw-r--r--src/mame/drivers/shadfrce.cpp28
-rw-r--r--src/mame/drivers/shangha3.cpp32
-rw-r--r--src/mame/drivers/shanghai.cpp4
-rw-r--r--src/mame/drivers/shangkid.cpp26
-rw-r--r--src/mame/drivers/shaolins.cpp14
-rw-r--r--src/mame/drivers/shisen.cpp8
-rw-r--r--src/mame/drivers/shootout.cpp20
-rw-r--r--src/mame/drivers/shougi.cpp2
-rw-r--r--src/mame/drivers/shuuz.cpp4
-rw-r--r--src/mame/drivers/sidearms.cpp44
-rw-r--r--src/mame/drivers/sidepckt.cpp10
-rw-r--r--src/mame/drivers/sigmab52.cpp24
-rw-r--r--src/mame/drivers/sigmab98.cpp166
-rw-r--r--src/mame/drivers/silkroad.cpp12
-rw-r--r--src/mame/drivers/silvmil.cpp20
-rw-r--r--src/mame/drivers/simpl156.cpp50
-rw-r--r--src/mame/drivers/simple_st0016.cpp16
-rw-r--r--src/mame/drivers/simpsons.cpp14
-rw-r--r--src/mame/drivers/skeetsht.cpp8
-rw-r--r--src/mame/drivers/skimaxx.cpp16
-rw-r--r--src/mame/drivers/skullxbo.cpp24
-rw-r--r--src/mame/drivers/skyarmy.cpp4
-rw-r--r--src/mame/drivers/skydiver.cpp6
-rw-r--r--src/mame/drivers/skyfox.cpp2
-rw-r--r--src/mame/drivers/skykid.cpp26
-rw-r--r--src/mame/drivers/skylncr.cpp106
-rw-r--r--src/mame/drivers/skyraid.cpp10
-rw-r--r--src/mame/drivers/slapfght.cpp62
-rw-r--r--src/mame/drivers/slapshot.cpp10
-rw-r--r--src/mame/drivers/slc1.cpp2
-rw-r--r--src/mame/drivers/slicer.cpp8
-rw-r--r--src/mame/drivers/sliver.cpp16
-rw-r--r--src/mame/drivers/slotcarn.cpp2
-rw-r--r--src/mame/drivers/sm7238.cpp6
-rw-r--r--src/mame/drivers/smc777.cpp32
-rw-r--r--src/mame/drivers/sms.cpp96
-rw-r--r--src/mame/drivers/sms_bootleg.cpp6
-rw-r--r--src/mame/drivers/smsmcorp.cpp14
-rw-r--r--src/mame/drivers/snes.cpp2
-rw-r--r--src/mame/drivers/snesb.cpp6
-rw-r--r--src/mame/drivers/snk.cpp622
-rw-r--r--src/mame/drivers/snk6502.cpp66
-rw-r--r--src/mame/drivers/snk68.cpp28
-rw-r--r--src/mame/drivers/snookr10.cpp28
-rw-r--r--src/mame/drivers/snowbros.cpp62
-rw-r--r--src/mame/drivers/socrates.cpp42
-rw-r--r--src/mame/drivers/softbox.cpp10
-rw-r--r--src/mame/drivers/solomon.cpp16
-rw-r--r--src/mame/drivers/sonson.cpp6
-rw-r--r--src/mame/drivers/sorcerer.cpp8
-rw-r--r--src/mame/drivers/sothello.cpp22
-rw-r--r--src/mame/drivers/spacefb.cpp8
-rw-r--r--src/mame/drivers/spaceg.cpp10
-rw-r--r--src/mame/drivers/spartanxtec.cpp8
-rw-r--r--src/mame/drivers/spbactn.cpp28
-rw-r--r--src/mame/drivers/spc1000.cpp10
-rw-r--r--src/mame/drivers/spc1500.cpp4
-rw-r--r--src/mame/drivers/spcforce.cpp10
-rw-r--r--src/mame/drivers/spdodgeb.cpp12
-rw-r--r--src/mame/drivers/spec128.cpp8
-rw-r--r--src/mame/drivers/special.cpp12
-rw-r--r--src/mame/drivers/specpls3.cpp10
-rw-r--r--src/mame/drivers/spectrum.cpp6
-rw-r--r--src/mame/drivers/speedatk.cpp6
-rw-r--r--src/mame/drivers/speedbal.cpp14
-rw-r--r--src/mame/drivers/speedspn.cpp16
-rw-r--r--src/mame/drivers/speglsht.cpp10
-rw-r--r--src/mame/drivers/spinb.cpp34
-rw-r--r--src/mame/drivers/spirit76.cpp4
-rw-r--r--src/mame/drivers/splash.cpp34
-rw-r--r--src/mame/drivers/splus.cpp12
-rw-r--r--src/mame/drivers/spoker.cpp18
-rw-r--r--src/mame/drivers/spool99.cpp24
-rw-r--r--src/mame/drivers/sprcros2.cpp32
-rw-r--r--src/mame/drivers/sprint2.cpp32
-rw-r--r--src/mame/drivers/sprint4.cpp20
-rw-r--r--src/mame/drivers/sprint8.cpp8
-rw-r--r--src/mame/drivers/spy.cpp12
-rw-r--r--src/mame/drivers/spyhuntertec.cpp18
-rw-r--r--src/mame/drivers/squale.cpp10
-rw-r--r--src/mame/drivers/srmp2.cpp46
-rw-r--r--src/mame/drivers/srmp5.cpp32
-rw-r--r--src/mame/drivers/srmp6.cpp10
-rw-r--r--src/mame/drivers/srumbler.cpp10
-rw-r--r--src/mame/drivers/ssfindo.cpp26
-rw-r--r--src/mame/drivers/sshangha.cpp32
-rw-r--r--src/mame/drivers/sshot.cpp6
-rw-r--r--src/mame/drivers/ssingles.cpp16
-rw-r--r--src/mame/drivers/sslam.cpp12
-rw-r--r--src/mame/drivers/ssozumo.cpp18
-rw-r--r--src/mame/drivers/sspeedr.cpp34
-rw-r--r--src/mame/drivers/ssrj.cpp8
-rw-r--r--src/mame/drivers/sstrangr.cpp2
-rw-r--r--src/mame/drivers/ssv.cpp74
-rw-r--r--src/mame/drivers/stactics.cpp12
-rw-r--r--src/mame/drivers/stadhero.cpp4
-rw-r--r--src/mame/drivers/starcrus.cpp24
-rw-r--r--src/mame/drivers/starfire.cpp6
-rw-r--r--src/mame/drivers/stargame.cpp2
-rw-r--r--src/mame/drivers/starshp1.cpp14
-rw-r--r--src/mame/drivers/starwars.cpp22
-rw-r--r--src/mame/drivers/statriv2.cpp4
-rw-r--r--src/mame/drivers/stellafr.cpp4
-rw-r--r--src/mame/drivers/stfight.cpp14
-rw-r--r--src/mame/drivers/stlforce.cpp12
-rw-r--r--src/mame/drivers/stratos.cpp10
-rw-r--r--src/mame/drivers/studio2.cpp10
-rw-r--r--src/mame/drivers/stuntair.cpp12
-rw-r--r--src/mame/drivers/stv.cpp20
-rw-r--r--src/mame/drivers/sub.cpp8
-rw-r--r--src/mame/drivers/subs.cpp10
-rw-r--r--src/mame/drivers/subsino.cpp84
-rw-r--r--src/mame/drivers/subsino2.cpp214
-rw-r--r--src/mame/drivers/summit.cpp2
-rw-r--r--src/mame/drivers/sun2.cpp10
-rw-r--r--src/mame/drivers/sun3.cpp14
-rw-r--r--src/mame/drivers/sun3x.cpp48
-rw-r--r--src/mame/drivers/sun4.cpp18
-rw-r--r--src/mame/drivers/suna16.cpp62
-rw-r--r--src/mame/drivers/suna8.cpp124
-rw-r--r--src/mame/drivers/supbtime.cpp6
-rw-r--r--src/mame/drivers/supdrapo.cpp12
-rw-r--r--src/mame/drivers/supduck.cpp14
-rw-r--r--src/mame/drivers/super6.cpp20
-rw-r--r--src/mame/drivers/super80.cpp56
-rw-r--r--src/mame/drivers/superchs.cpp6
-rw-r--r--src/mame/drivers/supercrd.cpp4
-rw-r--r--src/mame/drivers/superdq.cpp8
-rw-r--r--src/mame/drivers/superqix.cpp22
-rw-r--r--src/mame/drivers/superslave.cpp12
-rw-r--r--src/mame/drivers/supertnk.cpp12
-rw-r--r--src/mame/drivers/superwng.cpp28
-rw-r--r--src/mame/drivers/supracan.cpp14
-rw-r--r--src/mame/drivers/suprgolf.cpp10
-rw-r--r--src/mame/drivers/suprloco.cpp10
-rw-r--r--src/mame/drivers/suprnova.cpp18
-rw-r--r--src/mame/drivers/suprridr.cpp18
-rw-r--r--src/mame/drivers/suprslam.cpp8
-rw-r--r--src/mame/drivers/supstarf.cpp4
-rw-r--r--src/mame/drivers/surpratk.cpp4
-rw-r--r--src/mame/drivers/svi318.cpp22
-rw-r--r--src/mame/drivers/svision.cpp4
-rw-r--r--src/mame/drivers/svmu.cpp14
-rw-r--r--src/mame/drivers/swtpc09.cpp18
-rw-r--r--src/mame/drivers/swyft.cpp12
-rw-r--r--src/mame/drivers/system1.cpp36
-rw-r--r--src/mame/drivers/system16.cpp390
-rw-r--r--src/mame/drivers/tagteam.cpp18
-rw-r--r--src/mame/drivers/tail2nos.cpp8
-rw-r--r--src/mame/drivers/taito.cpp6
-rw-r--r--src/mame/drivers/taito_b.cpp48
-rw-r--r--src/mame/drivers/taito_f2.cpp48
-rw-r--r--src/mame/drivers/taito_f3.cpp54
-rw-r--r--src/mame/drivers/taito_h.cpp4
-rw-r--r--src/mame/drivers/taito_l.cpp48
-rw-r--r--src/mame/drivers/taito_o.cpp2
-rw-r--r--src/mame/drivers/taito_x.cpp18
-rw-r--r--src/mame/drivers/taito_z.cpp74
-rw-r--r--src/mame/drivers/taitoair.cpp54
-rw-r--r--src/mame/drivers/taitogn.cpp28
-rw-r--r--src/mame/drivers/taitojc.cpp50
-rw-r--r--src/mame/drivers/taitopjc.cpp20
-rw-r--r--src/mame/drivers/taitosj.cpp34
-rw-r--r--src/mame/drivers/taitotz.cpp24
-rw-r--r--src/mame/drivers/taitowlf.cpp6
-rw-r--r--src/mame/drivers/tandy1t.cpp24
-rw-r--r--src/mame/drivers/tandy2k.cpp16
-rw-r--r--src/mame/drivers/tank8.cpp20
-rw-r--r--src/mame/drivers/tankbatt.cpp10
-rw-r--r--src/mame/drivers/tankbust.cpp14
-rw-r--r--src/mame/drivers/taotaido.cpp10
-rw-r--r--src/mame/drivers/tapatune.cpp30
-rw-r--r--src/mame/drivers/targeth.cpp8
-rw-r--r--src/mame/drivers/tasman.cpp12
-rw-r--r--src/mame/drivers/tatsumi.cpp66
-rw-r--r--src/mame/drivers/tattack.cpp8
-rw-r--r--src/mame/drivers/tavernie.cpp2
-rw-r--r--src/mame/drivers/tbowl.cpp36
-rw-r--r--src/mame/drivers/tceptor.cpp32
-rw-r--r--src/mame/drivers/tdv2324.cpp4
-rw-r--r--src/mame/drivers/tec1.cpp14
-rw-r--r--src/mame/drivers/techno.cpp20
-rw-r--r--src/mame/drivers/tecmo.cpp78
-rw-r--r--src/mame/drivers/tecmo16.cpp46
-rw-r--r--src/mame/drivers/tecmosys.cpp40
-rw-r--r--src/mame/drivers/tecnbras.cpp4
-rw-r--r--src/mame/drivers/tehkanwc.cpp40
-rw-r--r--src/mame/drivers/tek405x.cpp6
-rw-r--r--src/mame/drivers/tek440x.cpp2
-rw-r--r--src/mame/drivers/tempest.cpp8
-rw-r--r--src/mame/drivers/terak.cpp4
-rw-r--r--src/mame/drivers/terracre.cpp36
-rw-r--r--src/mame/drivers/tetrisp2.cpp172
-rw-r--r--src/mame/drivers/tgtpanic.cpp2
-rw-r--r--src/mame/drivers/thayers.cpp26
-rw-r--r--src/mame/drivers/thedealr.cpp8
-rw-r--r--src/mame/drivers/thedeep.cpp10
-rw-r--r--src/mame/drivers/thepit.cpp20
-rw-r--r--src/mame/drivers/thief.cpp18
-rw-r--r--src/mame/drivers/thomson.cpp160
-rw-r--r--src/mame/drivers/thoop2.cpp6
-rw-r--r--src/mame/drivers/thunderj.cpp8
-rw-r--r--src/mame/drivers/thunderx.cpp18
-rw-r--r--src/mame/drivers/ti85.cpp144
-rw-r--r--src/mame/drivers/ti89.cpp30
-rw-r--r--src/mame/drivers/ti990_10.cpp4
-rw-r--r--src/mame/drivers/ti990_4.cpp8
-rw-r--r--src/mame/drivers/ti99_2.cpp4
-rw-r--r--src/mame/drivers/ti99_4p.cpp6
-rw-r--r--src/mame/drivers/ti99_4x.cpp4
-rw-r--r--src/mame/drivers/ti99_8.cpp4
-rw-r--r--src/mame/drivers/tiamc1.cpp38
-rw-r--r--src/mame/drivers/tickee.cpp20
-rw-r--r--src/mame/drivers/tigeroad.cpp30
-rw-r--r--src/mame/drivers/tiki100.cpp8
-rw-r--r--src/mame/drivers/timelimt.cpp10
-rw-r--r--src/mame/drivers/timeplt.cpp8
-rw-r--r--src/mame/drivers/timex.cpp10
-rw-r--r--src/mame/drivers/tk2000.cpp8
-rw-r--r--src/mame/drivers/tk80.cpp6
-rw-r--r--src/mame/drivers/tk80bs.cpp2
-rw-r--r--src/mame/drivers/tm990189.cpp14
-rw-r--r--src/mame/drivers/tmaster.cpp2
-rw-r--r--src/mame/drivers/tmc1800.cpp14
-rw-r--r--src/mame/drivers/tmc2000e.cpp10
-rw-r--r--src/mame/drivers/tmc600.cpp4
-rw-r--r--src/mame/drivers/tmmjprd.cpp16
-rw-r--r--src/mame/drivers/tmnt.cpp134
-rw-r--r--src/mame/drivers/tmspoker.cpp4
-rw-r--r--src/mame/drivers/tnzs.cpp24
-rw-r--r--src/mame/drivers/toaplan1.cpp302
-rw-r--r--src/mame/drivers/toaplan2.cpp206
-rw-r--r--src/mame/drivers/toki.cpp24
-rw-r--r--src/mame/drivers/tomcat.cpp14
-rw-r--r--src/mame/drivers/tonton.cpp4
-rw-r--r--src/mame/drivers/toobin.cpp14
-rw-r--r--src/mame/drivers/topspeed.cpp10
-rw-r--r--src/mame/drivers/toratora.cpp4
-rw-r--r--src/mame/drivers/tosh1000.cpp4
-rw-r--r--src/mame/drivers/tourvis.cpp4
-rw-r--r--src/mame/drivers/toypop.cpp16
-rw-r--r--src/mame/drivers/tp84.cpp20
-rw-r--r--src/mame/drivers/tr175.cpp6
-rw-r--r--src/mame/drivers/trackfld.cpp40
-rw-r--r--src/mame/drivers/travrusa.cpp8
-rw-r--r--src/mame/drivers/tricep.cpp4
-rw-r--r--src/mame/drivers/triforce.cpp4
-rw-r--r--src/mame/drivers/triplhnt.cpp8
-rw-r--r--src/mame/drivers/trs80.cpp148
-rw-r--r--src/mame/drivers/trs80dt1.cpp6
-rw-r--r--src/mame/drivers/trs80m2.cpp24
-rw-r--r--src/mame/drivers/trucocl.cpp8
-rw-r--r--src/mame/drivers/trvmadns.cpp12
-rw-r--r--src/mame/drivers/trvquest.cpp2
-rw-r--r--src/mame/drivers/tryout.cpp16
-rw-r--r--src/mame/drivers/ts802.cpp18
-rw-r--r--src/mame/drivers/ts803.cpp8
-rw-r--r--src/mame/drivers/ts816.cpp14
-rw-r--r--src/mame/drivers/tsamurai.cpp82
-rw-r--r--src/mame/drivers/tsispch.cpp8
-rw-r--r--src/mame/drivers/ttchamp.cpp18
-rw-r--r--src/mame/drivers/tubep.cpp36
-rw-r--r--src/mame/drivers/tugboat.cpp6
-rw-r--r--src/mame/drivers/tumbleb.cpp64
-rw-r--r--src/mame/drivers/tunhunt.cpp6
-rw-r--r--src/mame/drivers/turbo.cpp24
-rw-r--r--src/mame/drivers/turrett.cpp8
-rw-r--r--src/mame/drivers/tutankhm.cpp4
-rw-r--r--src/mame/drivers/tutor.cpp30
-rw-r--r--src/mame/drivers/tv910.cpp12
-rw-r--r--src/mame/drivers/tv912.cpp8
-rw-r--r--src/mame/drivers/tv950.cpp2
-rw-r--r--src/mame/drivers/tv955.cpp2
-rw-r--r--src/mame/drivers/tv965.cpp2
-rw-r--r--src/mame/drivers/tv990.cpp4
-rw-r--r--src/mame/drivers/tvboy.cpp2
-rw-r--r--src/mame/drivers/tvc.cpp28
-rw-r--r--src/mame/drivers/twin16.cpp40
-rw-r--r--src/mame/drivers/twincobr.cpp30
-rw-r--r--src/mame/drivers/twinkle.cpp30
-rw-r--r--src/mame/drivers/twins.cpp26
-rw-r--r--src/mame/drivers/tx1.cpp50
-rw-r--r--src/mame/drivers/uapce.cpp8
-rw-r--r--src/mame/drivers/ultraman.cpp4
-rw-r--r--src/mame/drivers/ultratnk.cpp20
-rw-r--r--src/mame/drivers/ultrsprt.cpp8
-rw-r--r--src/mame/drivers/umipoker.cpp30
-rw-r--r--src/mame/drivers/undrfire.cpp12
-rw-r--r--src/mame/drivers/unichamp.cpp4
-rw-r--r--src/mame/drivers/unico.cpp50
-rw-r--r--src/mame/drivers/unior.cpp4
-rw-r--r--src/mame/drivers/univac.cpp12
-rw-r--r--src/mame/drivers/unixpc.cpp24
-rw-r--r--src/mame/drivers/unkhorse.cpp2
-rw-r--r--src/mame/drivers/upscope.cpp10
-rw-r--r--src/mame/drivers/usgames.cpp20
-rw-r--r--src/mame/drivers/ut88.cpp10
-rw-r--r--src/mame/drivers/uzebox.cpp8
-rw-r--r--src/mame/drivers/v100.cpp18
-rw-r--r--src/mame/drivers/v1050.cpp26
-rw-r--r--src/mame/drivers/v6809.cpp6
-rw-r--r--src/mame/drivers/vamphalf.cpp86
-rw-r--r--src/mame/drivers/vaportra.cpp8
-rw-r--r--src/mame/drivers/vastar.cpp6
-rw-r--r--src/mame/drivers/vax11.cpp8
-rw-r--r--src/mame/drivers/vball.cpp12
-rw-r--r--src/mame/drivers/vboy.cpp52
-rw-r--r--src/mame/drivers/vc4000.cpp10
-rw-r--r--src/mame/drivers/vcombat.cpp24
-rw-r--r--src/mame/drivers/vcs80.cpp4
-rw-r--r--src/mame/drivers/vd.cpp10
-rw-r--r--src/mame/drivers/vector06.cpp6
-rw-r--r--src/mame/drivers/vectrex.cpp6
-rw-r--r--src/mame/drivers/vega.cpp2
-rw-r--r--src/mame/drivers/vegaeo.cpp6
-rw-r--r--src/mame/drivers/vegas.cpp20
-rw-r--r--src/mame/drivers/vendetta.cpp16
-rw-r--r--src/mame/drivers/vertigo.cpp12
-rw-r--r--src/mame/drivers/vg5k.cpp10
-rw-r--r--src/mame/drivers/vgmplay.cpp16
-rw-r--r--src/mame/drivers/vic10.cpp6
-rw-r--r--src/mame/drivers/vic20.cpp4
-rw-r--r--src/mame/drivers/vicdual.cpp86
-rw-r--r--src/mame/drivers/victor9k.cpp2
-rw-r--r--src/mame/drivers/victory.cpp8
-rw-r--r--src/mame/drivers/vidbrain.cpp6
-rw-r--r--src/mame/drivers/videopin.cpp12
-rw-r--r--src/mame/drivers/videopkr.cpp8
-rw-r--r--src/mame/drivers/vigilant.cpp18
-rw-r--r--src/mame/drivers/vii.cpp6
-rw-r--r--src/mame/drivers/vindictr.cpp6
-rw-r--r--src/mame/drivers/vip.cpp4
-rw-r--r--src/mame/drivers/viper.cpp26
-rw-r--r--src/mame/drivers/vis.cpp12
-rw-r--r--src/mame/drivers/vixen.cpp10
-rw-r--r--src/mame/drivers/vk100.cpp30
-rw-r--r--src/mame/drivers/vlc.cpp16
-rw-r--r--src/mame/drivers/volfied.cpp8
-rw-r--r--src/mame/drivers/voyager.cpp6
-rw-r--r--src/mame/drivers/vp101.cpp32
-rw-r--r--src/mame/drivers/vp415.cpp6
-rw-r--r--src/mame/drivers/vpoker.cpp2
-rw-r--r--src/mame/drivers/vroulet.cpp6
-rw-r--r--src/mame/drivers/vsnes.cpp38
-rw-r--r--src/mame/drivers/vt100.cpp16
-rw-r--r--src/mame/drivers/vt240.cpp62
-rw-r--r--src/mame/drivers/vt520.cpp2
-rw-r--r--src/mame/drivers/vtech1.cpp10
-rw-r--r--src/mame/drivers/vtech2.cpp8
-rw-r--r--src/mame/drivers/vulgus.cpp8
-rw-r--r--src/mame/drivers/wacky_gator.cpp14
-rw-r--r--src/mame/drivers/wallc.cpp12
-rw-r--r--src/mame/drivers/wangpc.cpp42
-rw-r--r--src/mame/drivers/wardner.cpp28
-rw-r--r--src/mame/drivers/warpsped.cpp4
-rw-r--r--src/mame/drivers/warpwarp.cpp26
-rw-r--r--src/mame/drivers/warriorb.cpp12
-rw-r--r--src/mame/drivers/wc90.cpp10
-rw-r--r--src/mame/drivers/wc90b.cpp20
-rw-r--r--src/mame/drivers/wecleman.cpp46
-rw-r--r--src/mame/drivers/welltris.cpp10
-rw-r--r--src/mame/drivers/wgp.cpp14
-rw-r--r--src/mame/drivers/wheelfir.cpp12
-rw-r--r--src/mame/drivers/whitestar.cpp8
-rw-r--r--src/mame/drivers/wicat.cpp32
-rw-r--r--src/mame/drivers/wico.cpp38
-rw-r--r--src/mame/drivers/wildpkr.cpp22
-rw-r--r--src/mame/drivers/williams.cpp82
-rw-r--r--src/mame/drivers/wink.cpp12
-rw-r--r--src/mame/drivers/wiping.cpp2
-rw-r--r--src/mame/drivers/witch.cpp18
-rw-r--r--src/mame/drivers/wiz.cpp26
-rw-r--r--src/mame/drivers/wmg.cpp4
-rw-r--r--src/mame/drivers/wms.cpp2
-rw-r--r--src/mame/drivers/wolfpack.cpp56
-rw-r--r--src/mame/drivers/wpc_95.cpp14
-rw-r--r--src/mame/drivers/wpc_an.cpp2
-rw-r--r--src/mame/drivers/wpc_dcs.cpp18
-rw-r--r--src/mame/drivers/wpc_dot.cpp2
-rw-r--r--src/mame/drivers/wpc_flip1.cpp2
-rw-r--r--src/mame/drivers/wpc_flip2.cpp2
-rw-r--r--src/mame/drivers/wpc_s.cpp14
-rw-r--r--src/mame/drivers/wrally.cpp6
-rw-r--r--src/mame/drivers/wswan.cpp6
-rw-r--r--src/mame/drivers/wwfsstar.cpp10
-rw-r--r--src/mame/drivers/wyvernf0.cpp27
-rw-r--r--src/mame/drivers/x07.cpp2
-rw-r--r--src/mame/drivers/x1.cpp86
-rw-r--r--src/mame/drivers/x1twin.cpp12
-rw-r--r--src/mame/drivers/x68k.cpp122
-rw-r--r--src/mame/drivers/xain.cpp28
-rw-r--r--src/mame/drivers/xavix.cpp130
-rw-r--r--src/mame/drivers/xerox820.cpp20
-rw-r--r--src/mame/drivers/xexex.cpp10
-rw-r--r--src/mame/drivers/xmen.cpp10
-rw-r--r--src/mame/drivers/xor100.cpp20
-rw-r--r--src/mame/drivers/xorworld.cpp6
-rw-r--r--src/mame/drivers/xtheball.cpp6
-rw-r--r--src/mame/drivers/xtom3d.cpp14
-rw-r--r--src/mame/drivers/xxmissio.cpp14
-rw-r--r--src/mame/drivers/xybots.cpp4
-rw-r--r--src/mame/drivers/xyonix.cpp12
-rw-r--r--src/mame/drivers/yiear.cpp12
-rw-r--r--src/mame/drivers/ymmu100.cpp28
-rw-r--r--src/mame/drivers/yunsun16.cpp6
-rw-r--r--src/mame/drivers/yunsung8.cpp14
-rw-r--r--src/mame/drivers/z100.cpp14
-rw-r--r--src/mame/drivers/z1013.cpp2
-rw-r--r--src/mame/drivers/z80dev.cpp4
-rw-r--r--src/mame/drivers/z80ne.cpp22
-rw-r--r--src/mame/drivers/zac2650.cpp6
-rw-r--r--src/mame/drivers/zac_1.cpp8
-rw-r--r--src/mame/drivers/zac_2.cpp4
-rw-r--r--src/mame/drivers/zac_proto.cpp8
-rw-r--r--src/mame/drivers/zaccaria.cpp10
-rw-r--r--src/mame/drivers/zapcomputer.cpp4
-rw-r--r--src/mame/drivers/zaurus.cpp6
-rw-r--r--src/mame/drivers/zaxxon.cpp20
-rw-r--r--src/mame/drivers/zerozone.cpp6
-rw-r--r--src/mame/drivers/zexall.cpp6
-rw-r--r--src/mame/drivers/zms8085.cpp4
-rw-r--r--src/mame/drivers/zn.cpp64
-rw-r--r--src/mame/drivers/zodiack.cpp16
-rw-r--r--src/mame/drivers/zorba.cpp10
-rw-r--r--src/mame/drivers/zr107.cpp14
-rw-r--r--src/mame/drivers/zrt80.cpp6
-rw-r--r--src/mame/drivers/zwackery.cpp6
-rw-r--r--src/mame/drivers/zx.cpp12
1805 files changed, 21897 insertions, 21936 deletions
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index 2a2bf22ac6a..a511a3b4cd0 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -190,13 +190,13 @@ void _1942_state::_1942_map(address_map &map)
map(0xc003, 0xc003).portr("DSWA");
map(0xc004, 0xc004).portr("DSWB");
map(0xc800, 0xc800).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0xc802, 0xc803).w(this, FUNC(_1942_state::_1942_scroll_w));
- map(0xc804, 0xc804).w(this, FUNC(_1942_state::_1942_c804_w));
- map(0xc805, 0xc805).w(this, FUNC(_1942_state::_1942_palette_bank_w));
- map(0xc806, 0xc806).w(this, FUNC(_1942_state::_1942_bankswitch_w));
+ map(0xc802, 0xc803).w(FUNC(_1942_state::_1942_scroll_w));
+ map(0xc804, 0xc804).w(FUNC(_1942_state::_1942_c804_w));
+ map(0xc805, 0xc805).w(FUNC(_1942_state::_1942_palette_bank_w));
+ map(0xc806, 0xc806).w(FUNC(_1942_state::_1942_bankswitch_w));
map(0xcc00, 0xcc7f).ram().share("spriteram");
- map(0xd000, 0xd7ff).ram().w(this, FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram");
- map(0xd800, 0xdbff).ram().w(this, FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram");
+ map(0xd000, 0xd7ff).ram().w(FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram");
+ map(0xd800, 0xdbff).ram().w(FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram");
map(0xe000, 0xefff).ram();
}
@@ -221,22 +221,22 @@ void _1942p_state::_1942p_map(address_map &map)
map(0x0000, 0x7fff).rom();
map(0x8000, 0xbfff).bankr("bank1");
- map(0xd000, 0xd7ff).ram().w(this, FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram");
- map(0xd800, 0xdbff).ram().w(this, FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram");
+ map(0xd000, 0xd7ff).ram().w(FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram");
+ map(0xd800, 0xdbff).ram().w(FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram");
map(0xe000, 0xefff).ram();
map(0xce00, 0xcfff).ram().share("spriteram");
- map(0xdc02, 0xdc03).w(this, FUNC(_1942_state::_1942_scroll_w));
- map(0xc804, 0xc804).w(this, FUNC(_1942_state::_1942_c804_w));
- map(0xc805, 0xc805).w(this, FUNC(_1942_state::_1942_palette_bank_w));
+ map(0xdc02, 0xdc03).w(FUNC(_1942_state::_1942_scroll_w));
+ map(0xc804, 0xc804).w(FUNC(_1942_state::_1942_c804_w));
+ map(0xc805, 0xc805).w(FUNC(_1942_state::_1942_palette_bank_w));
- map(0xf000, 0xf3ff).ram().w(this, FUNC(_1942p_state::_1942p_palette_w)).share("protopal");
+ map(0xf000, 0xf3ff).ram().w(FUNC(_1942p_state::_1942p_palette_w)).share("protopal");
- map(0xf400, 0xf400).w(this, FUNC(_1942_state::_1942_bankswitch_w));
+ map(0xf400, 0xf400).w(FUNC(_1942_state::_1942_bankswitch_w));
map(0xf500, 0xf500).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0xf600, 0xf600).w(this, FUNC(_1942p_state::_1942p_f600_w));
+ map(0xf600, 0xf600).w(FUNC(_1942p_state::_1942p_f600_w));
map(0xf700, 0xf700).portr("DSWA");
map(0xf701, 0xf701).portr("SYSTEM");
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index ac8b48b1161..eab57f8b6c5 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -111,17 +111,17 @@ void _1943_state::c1943_map(address_map &map)
map(0xc002, 0xc002).portr("P2");
map(0xc003, 0xc003).portr("DSWA");
map(0xc004, 0xc004).portr("DSWB");
- map(0xc007, 0xc007).r(this, FUNC(_1943_state::c1943_protection_r));
+ map(0xc007, 0xc007).r(FUNC(_1943_state::c1943_protection_r));
map(0xc800, 0xc800).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0xc804, 0xc804).w(this, FUNC(_1943_state::c1943_c804_w)); // ROM bank switch, screen flip
+ map(0xc804, 0xc804).w(FUNC(_1943_state::c1943_c804_w)); // ROM bank switch, screen flip
map(0xc806, 0xc806).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0xc807, 0xc807).w(this, FUNC(_1943_state::c1943_protection_w));
- map(0xd000, 0xd3ff).ram().w(this, FUNC(_1943_state::c1943_videoram_w)).share("videoram");
- map(0xd400, 0xd7ff).ram().w(this, FUNC(_1943_state::c1943_colorram_w)).share("colorram");
+ map(0xc807, 0xc807).w(FUNC(_1943_state::c1943_protection_w));
+ map(0xd000, 0xd3ff).ram().w(FUNC(_1943_state::c1943_videoram_w)).share("videoram");
+ map(0xd400, 0xd7ff).ram().w(FUNC(_1943_state::c1943_colorram_w)).share("colorram");
map(0xd800, 0xd801).ram().share("scrollx");
map(0xd802, 0xd802).ram().share("scrolly");
map(0xd803, 0xd804).ram().share("bgscrollx");
- map(0xd806, 0xd806).w(this, FUNC(_1943_state::c1943_d806_w)); // sprites, bg1, bg2 enable
+ map(0xd806, 0xd806).w(FUNC(_1943_state::c1943_d806_w)); // sprites, bg1, bg2 enable
map(0xd808, 0xd808).nopw(); // ???
map(0xd868, 0xd868).nopw(); // ???
map(0xd888, 0xd888).nopw(); // ???
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index 8c298bbc52d..ac96e285f3c 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -205,10 +205,10 @@ void k3_state::k3_base_map(address_map &map)
map(0x200000, 0x2003ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x240000, 0x240fff).ram().share("spritera1");
map(0x280000, 0x280fff).ram().share("spritera2");
- map(0x2c0000, 0x2c07ff).ram().w(this, FUNC(k3_state::k3_bgram_w)).share("bgram");
+ map(0x2c0000, 0x2c07ff).ram().w(FUNC(k3_state::k3_bgram_w)).share("bgram");
map(0x2c0800, 0x2c0fff).ram(); // or does k3 have a bigger tilemap? (flagrall is definitely 32x32 tiles)
- map(0x340000, 0x340001).w(this, FUNC(k3_state::k3_scrollx_w));
- map(0x380000, 0x380001).w(this, FUNC(k3_state::k3_scrolly_w));
+ map(0x340000, 0x340001).w(FUNC(k3_state::k3_scrollx_w));
+ map(0x380000, 0x380001).w(FUNC(k3_state::k3_scrolly_w));
map(0x400000, 0x400001).portr("INPUTS");
map(0x440000, 0x440001).portr("SYSTEM");
map(0x480000, 0x480001).portr("DSW");
@@ -218,7 +218,7 @@ void k3_state::k3_map(address_map &map)
{
k3_base_map(map);
- map(0x3c0000, 0x3c0001).w(this, FUNC(k3_state::k3_soundbanks_w));
+ map(0x3c0000, 0x3c0001).w(FUNC(k3_state::k3_soundbanks_w));
map(0x4c0001, 0x4c0001).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).cswidth(16);
map(0x500001, 0x500001).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).cswidth(16);
@@ -230,7 +230,7 @@ void k3_state::flagrall_map(address_map &map)
{
k3_base_map(map);
- map(0x3c0000, 0x3c0001).w(this, FUNC(k3_state::flagrall_soundbanks_w));
+ map(0x3c0000, 0x3c0001).w(FUNC(k3_state::flagrall_soundbanks_w));
map(0x4c0001, 0x4c0001).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
}
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index 15e2cb4d4f6..86b2bfd2189 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -193,10 +193,10 @@ void _25pacman_state::_25pacman_map(address_map &map)
map(0x04000, 0x047ff).ram().share("video_ram");
map(0x04800, 0x05fff).ram();
map(0x06000, 0x06fff).writeonly().share("char_gfx_ram");
- map(0x07000, 0x0717f).w(this, FUNC(_25pacman_state::sprite_ram_w));
+ map(0x07000, 0x0717f).w(FUNC(_25pacman_state::sprite_ram_w));
// AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE(ram_48000_w)
map(0x08000, 0x09fff).nopw();
- map(0x0a000, 0x0bfff).w(this, FUNC(_25pacman_state::sprite_gfx_w));
+ map(0x0a000, 0x0bfff).w(FUNC(_25pacman_state::sprite_gfx_w));
map(0x0c000, 0x0dfff).nopw(); // is this the sound waveforms in a different format?
map(0x0e000, 0x0ffff).nopw();
map(0x1c000, 0x1ffff).nopw();
@@ -215,11 +215,11 @@ void _20pacgal_state::_20pacgal_map(address_map &map)
map(0x45f00, 0x45fff).w("namco", FUNC(namco_cus30_device::namcos1_cus30_w));
map(0x46000, 0x46fff).writeonly().share("char_gfx_ram");
map(0x47100, 0x47100).ram(); /* leftover from original Galaga code */
- map(0x48000, 0x49fff).bankr("bank1").w(this, FUNC(_20pacgal_state::ram_48000_w)); /* this should be a mirror of 08000-09fff */
- map(0x4c000, 0x4dfff).w(this, FUNC(_20pacgal_state::sprite_gfx_w));
- map(0x4e000, 0x4e17f).w(this, FUNC(_20pacgal_state::sprite_ram_w));
+ map(0x48000, 0x49fff).bankr("bank1").w(FUNC(_20pacgal_state::ram_48000_w)); /* this should be a mirror of 08000-09fff */
+ map(0x4c000, 0x4dfff).w(FUNC(_20pacgal_state::sprite_gfx_w));
+ map(0x4e000, 0x4e17f).w(FUNC(_20pacgal_state::sprite_ram_w));
map(0x4e180, 0x4feff).nopw();
- map(0x4ff00, 0x4ffff).w(this, FUNC(_20pacgal_state::sprite_lookup_w));
+ map(0x4ff00, 0x4ffff).w(FUNC(_20pacgal_state::sprite_lookup_w));
}
@@ -243,18 +243,18 @@ void _25pacman_state::_25pacman_io_map(address_map &map)
map(0x81, 0x81).portr("P2");
map(0x82, 0x82).portr("SERVICE");
map(0x80, 0x80).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x81, 0x81).w(this, FUNC(_25pacman_state::timer_pulse_w)); /* ??? pulsed by the timer irq */
- map(0x82, 0x82).w(this, FUNC(_25pacman_state::irqack_w));
+ map(0x81, 0x81).w(FUNC(_25pacman_state::timer_pulse_w)); /* ??? pulsed by the timer irq */
+ map(0x82, 0x82).w(FUNC(_25pacman_state::irqack_w));
// AM_RANGE(0x84, 0x84) AM_NOP /* ?? */
map(0x85, 0x86).writeonly().share("stars_seed"); /* stars: rng seed (lo/hi) */
- map(0x87, 0x87).r(this, FUNC(_25pacman_state::_25pacman_io_87_r)); // not eeprom on this
+ map(0x87, 0x87).r(FUNC(_25pacman_state::_25pacman_io_87_r)); // not eeprom on this
map(0x87, 0x87).nopw();
// AM_RANGE(0x88, 0x88) AM_WRITE(ram_bank_select_w)
- map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::write));
+ map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::data_w));
map(0x8a, 0x8a).writeonly().share("stars_ctrl"); /* stars: bits 3-4 = active set; bit 5 = enable */
map(0x8b, 0x8b).writeonly().share("flip");
map(0x8c, 0x8c).nopw();
- map(0x8f, 0x8f).w(this, FUNC(_25pacman_state::_20pacgal_coin_counter_w));
+ map(0x8f, 0x8f).w(FUNC(_25pacman_state::_20pacgal_coin_counter_w));
}
void _20pacgal_state::_20pacgal_io_map(address_map &map)
@@ -266,16 +266,16 @@ void _20pacgal_state::_20pacgal_io_map(address_map &map)
map(0x81, 0x81).portr("P2");
map(0x82, 0x82).portr("SERVICE");
map(0x80, 0x80).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0x81, 0x81).w(this, FUNC(_20pacgal_state::timer_pulse_w)); /* ??? pulsed by the timer irq */
- map(0x82, 0x82).w(this, FUNC(_20pacgal_state::irqack_w));
+ map(0x81, 0x81).w(FUNC(_20pacgal_state::timer_pulse_w)); /* ??? pulsed by the timer irq */
+ map(0x82, 0x82).w(FUNC(_20pacgal_state::irqack_w));
map(0x84, 0x84).noprw(); /* ?? */
map(0x85, 0x86).writeonly().share("stars_seed"); /* stars: rng seed (lo/hi) */
map(0x87, 0x87).portr("EEPROMIN").portw("EEPROMOUT");
- map(0x88, 0x88).w(this, FUNC(_20pacgal_state::ram_bank_select_w));
- map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::write));
+ map(0x88, 0x88).w(FUNC(_20pacgal_state::ram_bank_select_w));
+ map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::data_w));
map(0x8a, 0x8a).writeonly().share("stars_ctrl"); /* stars: bits 3-4 = active set; bit 5 = enable */
map(0x8b, 0x8b).writeonly().share("flip");
- map(0x8f, 0x8f).w(this, FUNC(_20pacgal_state::_20pacgal_coin_counter_w));
+ map(0x8f, 0x8f).w(FUNC(_20pacgal_state::_20pacgal_coin_counter_w));
}
diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp
index 7f8ea365881..212cb5f9ac9 100644
--- a/src/mame/drivers/24cdjuke.cpp
+++ b/src/mame/drivers/24cdjuke.cpp
@@ -130,7 +130,7 @@ WRITE8_MEMBER(midcoin24cdjuke_state::digit_w)
void midcoin24cdjuke_state::midcoin24cdjuke_map(address_map &map)
{
map(0x0000, 0x3fff).rom();
- map(0x7800, 0x780f).w(this, FUNC(midcoin24cdjuke_state::digit_w));
+ map(0x7800, 0x780f).w(FUNC(midcoin24cdjuke_state::digit_w));
map(0x8000, 0xffff).ram();
}
@@ -141,7 +141,7 @@ void midcoin24cdjuke_state::midcoin24cdjuke_io(address_map &map)
map(0x04, 0x07).rw("ic11", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x08, 0x0b).rw("ic25", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x0c, 0x0c).nopw();
- map(0x10, 0x1f).r(this, FUNC(midcoin24cdjuke_state::unknown_r));
+ map(0x10, 0x1f).r(FUNC(midcoin24cdjuke_state::unknown_r));
}
static INPUT_PORTS_START( midcoin24cdjuke )
diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp
index 9ba004e5938..c62f4038bf0 100644
--- a/src/mame/drivers/2mindril.cpp
+++ b/src/mame/drivers/2mindril.cpp
@@ -199,21 +199,21 @@ void _2mindril_state::drill_map(address_map &map)
map(0x000000, 0x07ffff).rom();
map(0x200000, 0x20ffff).ram();
map(0x300000, 0x3000ff).ram();
- map(0x400000, 0x40ffff).rw(this, FUNC(_2mindril_state::f3_spriteram_r), FUNC(_2mindril_state::f3_spriteram_w));
- map(0x410000, 0x41bfff).rw(this, FUNC(_2mindril_state::f3_pf_data_r), FUNC(_2mindril_state::f3_pf_data_w));
- map(0x41c000, 0x41dfff).rw(this, FUNC(_2mindril_state::f3_videoram_r), FUNC(_2mindril_state::f3_videoram_w));
- map(0x41e000, 0x41ffff).rw(this, FUNC(_2mindril_state::f3_vram_r), FUNC(_2mindril_state::f3_vram_w));
- map(0x420000, 0x42ffff).rw(this, FUNC(_2mindril_state::f3_lineram_r), FUNC(_2mindril_state::f3_lineram_w));
- map(0x430000, 0x43ffff).rw(this, FUNC(_2mindril_state::f3_pivot_r), FUNC(_2mindril_state::f3_pivot_w));
- map(0x460000, 0x46000f).w(this, FUNC(_2mindril_state::f3_control_0_w));
- map(0x460010, 0x46001f).w(this, FUNC(_2mindril_state::f3_control_1_w));
+ map(0x400000, 0x40ffff).rw(FUNC(_2mindril_state::f3_spriteram_r), FUNC(_2mindril_state::f3_spriteram_w));
+ map(0x410000, 0x41bfff).rw(FUNC(_2mindril_state::f3_pf_data_r), FUNC(_2mindril_state::f3_pf_data_w));
+ map(0x41c000, 0x41dfff).rw(FUNC(_2mindril_state::f3_videoram_r), FUNC(_2mindril_state::f3_videoram_w));
+ map(0x41e000, 0x41ffff).rw(FUNC(_2mindril_state::f3_vram_r), FUNC(_2mindril_state::f3_vram_w));
+ map(0x420000, 0x42ffff).rw(FUNC(_2mindril_state::f3_lineram_r), FUNC(_2mindril_state::f3_lineram_w));
+ map(0x430000, 0x43ffff).rw(FUNC(_2mindril_state::f3_pivot_r), FUNC(_2mindril_state::f3_pivot_w));
+ map(0x460000, 0x46000f).w(FUNC(_2mindril_state::f3_control_0_w));
+ map(0x460010, 0x46001f).w(FUNC(_2mindril_state::f3_control_1_w));
map(0x500000, 0x501fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x502022, 0x502023).nopw(); //countinously switches between 0 and 2
map(0x600000, 0x600007).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)).umask16(0x00ff);
- map(0x60000c, 0x60000d).rw(this, FUNC(_2mindril_state::drill_irq_r), FUNC(_2mindril_state::drill_irq_w));
+ map(0x60000c, 0x60000d).rw(FUNC(_2mindril_state::drill_irq_r), FUNC(_2mindril_state::drill_irq_w));
map(0x60000e, 0x60000f).ram(); // unknown purpose, zeroed at start-up and nothing else
map(0x700000, 0x70000f).rw("tc0510nio", FUNC(tc0510nio_device::read), FUNC(tc0510nio_device::write)).umask16(0xff00);
- map(0x800000, 0x800001).w(this, FUNC(_2mindril_state::sensors_w));
+ map(0x800000, 0x800001).w(FUNC(_2mindril_state::sensors_w));
}
static INPUT_PORTS_START( drill )
diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp
index baaf827c39a..9023528e734 100644
--- a/src/mame/drivers/30test.cpp
+++ b/src/mame/drivers/30test.cpp
@@ -157,26 +157,26 @@ void namco_30test_state::namco_30test_map(address_map &map)
{
map(0x0000, 0x003f).ram(); // internal I/O
map(0x0040, 0x007f).ram(); // more internal I/O, HC11 change pending
- map(0x007c, 0x007c).rw(this, FUNC(namco_30test_state::hc11_mux_r), FUNC(namco_30test_state::hc11_mux_w));
- map(0x007e, 0x007e).rw(this, FUNC(namco_30test_state::hc11_okibank_r), FUNC(namco_30test_state::hc11_okibank_w));
+ map(0x007c, 0x007c).rw(FUNC(namco_30test_state::hc11_mux_r), FUNC(namco_30test_state::hc11_mux_w));
+ map(0x007e, 0x007e).rw(FUNC(namco_30test_state::hc11_okibank_r), FUNC(namco_30test_state::hc11_okibank_w));
map(0x0080, 0x037f).ram(); // internal RAM
map(0x0d80, 0x0dbf).ram(); // EEPROM read-back data goes there
map(0x2000, 0x2000).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
/* 0x401e-0x401f: time */
- map(0x4000, 0x401f).w(this, FUNC(namco_30test_state::namco_30test_led_w)); // 7-seg leds
+ map(0x4000, 0x401f).w(FUNC(namco_30test_state::namco_30test_led_w)); // 7-seg leds
/* 0x6000: 1st place 7-seg led */
/* 0x6001: 2nd place 7-seg led */
/* 0x6002: 3rd place 7-seg led */
/* 0x6003: current / last play score */
/* 0x6004: lamps */
- map(0x6000, 0x6003).w(this, FUNC(namco_30test_state::namco_30test_led_rank_w));
- map(0x6004, 0x6004).w(this, FUNC(namco_30test_state::namco_30test_lamps_w));
+ map(0x6000, 0x6003).w(FUNC(namco_30test_state::namco_30test_led_rank_w));
+ map(0x6004, 0x6004).w(FUNC(namco_30test_state::namco_30test_lamps_w));
map(0x8000, 0xffff).rom();
}
void namco_30test_state::namco_30test_io(address_map &map)
{
- map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).r(this, FUNC(namco_30test_state::namco_30test_mux_r));
+ map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).r(FUNC(namco_30test_state::namco_30test_mux_r));
// AM_RANGE(MC68HC11_IO_PORTD,MC68HC11_IO_PORTD) AM_RAM
map(MC68HC11_IO_PORTE, MC68HC11_IO_PORTE).portr("SYSTEM");
}
diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp
index 15ba7da8921..2ad3731991f 100644
--- a/src/mame/drivers/39in1.cpp
+++ b/src/mame/drivers/39in1.cpp
@@ -1465,13 +1465,13 @@ void _39in1_state::_39in1_map(address_map &map)
{
map(0x00000000, 0x0007ffff).rom();
map(0x00400000, 0x005fffff).rom().region("data", 0);
- map(0x04000000, 0x047fffff).rw(this, FUNC(_39in1_state::cpld_r), FUNC(_39in1_state::cpld_w));
- map(0x40000000, 0x400002ff).rw(this, FUNC(_39in1_state::pxa255_dma_r), FUNC(_39in1_state::pxa255_dma_w));
- map(0x40400000, 0x40400083).rw(this, FUNC(_39in1_state::pxa255_i2s_r), FUNC(_39in1_state::pxa255_i2s_w));
- map(0x40a00000, 0x40a0001f).rw(this, FUNC(_39in1_state::pxa255_ostimer_r), FUNC(_39in1_state::pxa255_ostimer_w));
- map(0x40d00000, 0x40d00017).rw(this, FUNC(_39in1_state::pxa255_intc_r), FUNC(_39in1_state::pxa255_intc_w));
- map(0x40e00000, 0x40e0006b).rw(this, FUNC(_39in1_state::pxa255_gpio_r), FUNC(_39in1_state::pxa255_gpio_w));
- map(0x44000000, 0x4400021f).rw(this, FUNC(_39in1_state::pxa255_lcd_r), FUNC(_39in1_state::pxa255_lcd_w));
+ map(0x04000000, 0x047fffff).rw(FUNC(_39in1_state::cpld_r), FUNC(_39in1_state::cpld_w));
+ map(0x40000000, 0x400002ff).rw(FUNC(_39in1_state::pxa255_dma_r), FUNC(_39in1_state::pxa255_dma_w));
+ map(0x40400000, 0x40400083).rw(FUNC(_39in1_state::pxa255_i2s_r), FUNC(_39in1_state::pxa255_i2s_w));
+ map(0x40a00000, 0x40a0001f).rw(FUNC(_39in1_state::pxa255_ostimer_r), FUNC(_39in1_state::pxa255_ostimer_w));
+ map(0x40d00000, 0x40d00017).rw(FUNC(_39in1_state::pxa255_intc_r), FUNC(_39in1_state::pxa255_intc_w));
+ map(0x40e00000, 0x40e0006b).rw(FUNC(_39in1_state::pxa255_gpio_r), FUNC(_39in1_state::pxa255_gpio_w));
+ map(0x44000000, 0x4400021f).rw(FUNC(_39in1_state::pxa255_lcd_r), FUNC(_39in1_state::pxa255_lcd_w));
map(0xa0000000, 0xa07fffff).ram().share("ram");
}
diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp
index 79fd8a698f5..88fbe234c6c 100644
--- a/src/mame/drivers/3do.cpp
+++ b/src/mame/drivers/3do.cpp
@@ -113,11 +113,11 @@ void _3do_state::_3do_mem(address_map &map)
map(0x00200000, 0x003FFFFF).ram().share("vram"); /* VRAM */
map(0x03000000, 0x030FFFFF).bankr("bank2"); /* BIOS */
map(0x03100000, 0x0313FFFF).ram(); /* Brooktree? */
- map(0x03140000, 0x0315FFFF).rw(this, FUNC(_3do_state::_3do_nvarea_r), FUNC(_3do_state::_3do_nvarea_w)).umask32(0x000000ff); /* NVRAM */
- map(0x03180000, 0x031BFFFF).rw(this, FUNC(_3do_state::_3do_slow2_r), FUNC(_3do_state::_3do_slow2_w)); /* Slow bus - additional expansion */
- map(0x03200000, 0x0320FFFF).rw(this, FUNC(_3do_state::_3do_svf_r), FUNC(_3do_state::_3do_svf_w)); /* special vram access1 */
- map(0x03300000, 0x033FFFFF).rw(this, FUNC(_3do_state::_3do_madam_r), FUNC(_3do_state::_3do_madam_w)); /* address decoder */
- map(0x03400000, 0x034FFFFF).rw(this, FUNC(_3do_state::_3do_clio_r), FUNC(_3do_state::_3do_clio_w)); /* io controller */
+ map(0x03140000, 0x0315FFFF).rw(FUNC(_3do_state::_3do_nvarea_r), FUNC(_3do_state::_3do_nvarea_w)).umask32(0x000000ff); /* NVRAM */
+ map(0x03180000, 0x031BFFFF).rw(FUNC(_3do_state::_3do_slow2_r), FUNC(_3do_state::_3do_slow2_w)); /* Slow bus - additional expansion */
+ map(0x03200000, 0x0320FFFF).rw(FUNC(_3do_state::_3do_svf_r), FUNC(_3do_state::_3do_svf_w)); /* special vram access1 */
+ map(0x03300000, 0x033FFFFF).rw(FUNC(_3do_state::_3do_madam_r), FUNC(_3do_state::_3do_madam_w)); /* address decoder */
+ map(0x03400000, 0x034FFFFF).rw(FUNC(_3do_state::_3do_clio_r), FUNC(_3do_state::_3do_clio_w)); /* io controller */
}
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index 12f5455f6a9..7fd86419adb 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -218,13 +218,13 @@ void _3x3puzzle_state::_3x3puzzle_map(address_map &map)
map(0x202000, 0x202fff).ram().share("videoram3");
map(0x280000, 0x280001).portr("VBLANK");
map(0x300000, 0x3005ff).ram().w("palette", FUNC(palette_device::write16)).share("palette");
- map(0x400000, 0x400001).w(this, FUNC(_3x3puzzle_state::tilemap1_scrollx_w));
- map(0x480000, 0x480001).w(this, FUNC(_3x3puzzle_state::tilemap1_scrolly_w));
+ map(0x400000, 0x400001).w(FUNC(_3x3puzzle_state::tilemap1_scrollx_w));
+ map(0x480000, 0x480001).w(FUNC(_3x3puzzle_state::tilemap1_scrolly_w));
map(0x500000, 0x500001).portr("P1");
map(0x580000, 0x580001).portr("SYS");
map(0x600000, 0x600001).portr("DSW01");
map(0x700001, 0x700001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
- map(0x800000, 0x800001).w(this, FUNC(_3x3puzzle_state::gfx_ctrl_w));
+ map(0x800000, 0x800001).w(FUNC(_3x3puzzle_state::gfx_ctrl_w));
map(0x880000, 0x880001).nopr(); // read, but no tested afterwards
}
diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp
index 2fe4e672e3c..a31d15659f2 100644
--- a/src/mame/drivers/4004clk.cpp
+++ b/src/mame/drivers/4004clk.cpp
@@ -103,13 +103,13 @@ void nixieclock_state::_4004clk_rp(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x000f).mirror(0x0700).portr("INPUT");
- map(0x0000, 0x00ef).mirror(0x0700).w(this, FUNC(nixieclock_state::nixie_w));
- map(0x00f0, 0x00ff).mirror(0x0700).w(this, FUNC(nixieclock_state::neon_w));
+ map(0x0000, 0x00ef).mirror(0x0700).w(FUNC(nixieclock_state::nixie_w));
+ map(0x00f0, 0x00ff).mirror(0x0700).w(FUNC(nixieclock_state::neon_w));
}
void nixieclock_state::_4004clk_mp(address_map &map)
{
- map(0x00, 0x00).w("dac", FUNC(dac_bit_interface::write));
+ map(0x00, 0x00).w("dac", FUNC(dac_bit_interface::data_w));
}
/* Input ports */
diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp
index c4f347ea1b4..565b2fdaa4c 100644
--- a/src/mame/drivers/40love.cpp
+++ b/src/mame/drivers/40love.cpp
@@ -331,27 +331,27 @@ void fortyl_state::_40love_map(address_map &map)
map(0x0000, 0x7fff).rom();
map(0x8000, 0x87ff).ram(); /* M5517P on main board */
map(0x8800, 0x8800).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w));
- map(0x8801, 0x8801).rw(this, FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_mcu_w)); //pixel layer related
- map(0x8802, 0x8802).w(this, FUNC(fortyl_state::bank_select_w));
- map(0x8803, 0x8803).rw(this, FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related
+ map(0x8801, 0x8801).rw(FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_mcu_w)); //pixel layer related
+ map(0x8802, 0x8802).w(FUNC(fortyl_state::bank_select_w));
+ map(0x8803, 0x8803).rw(FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related
map(0x8804, 0x8804).r(m_soundlatch2, FUNC(generic_latch_8_device::read));
map(0x8804, 0x8804).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0x8805, 0x8805).r(this, FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //????
+ map(0x8805, 0x8805).r(FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //????
map(0x8807, 0x8807).nopr(); /* unknown */
map(0x8808, 0x8808).portr("DSW3");
map(0x8809, 0x8809).portr("P1");
map(0x880a, 0x880a).portr("SYSTEM");
map(0x880b, 0x880b).portr("P2");
- map(0x880c, 0x880c).portr("DSW1").w(this, FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */
+ map(0x880c, 0x880c).portr("DSW1").w(FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */
map(0x880d, 0x880d).portr("DSW2").nopw(); /* unknown */
- map(0x9000, 0x97ff).rw(this, FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */
+ map(0x9000, 0x97ff).rw(FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */
map(0x9800, 0x983f).ram().share("video_ctrl"); /* video control area */
map(0x9840, 0x987f).ram().share("spriteram"); /* sprites part 1 */
- map(0x9880, 0x98bf).rw(this, FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */
+ map(0x9880, 0x98bf).rw(FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */
map(0x98c0, 0x98ff).ram().share("spriteram2");/* sprites part 2 */
map(0xa000, 0xbfff).bankr("bank1");
//AM_RANGE(0xbf00, 0xbfff) writes here when zooms-in/out, left-over or pixel line clearance?
- map(0xc000, 0xffff).rw(this, FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w)); /* banked pixel layer */
+ map(0xc000, 0xffff).rw(FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w)); /* banked pixel layer */
}
void fortyl_state::undoukai_map(address_map &map)
@@ -360,25 +360,25 @@ void fortyl_state::undoukai_map(address_map &map)
map(0x8000, 0x9fff).bankr("bank1");
map(0xa000, 0xa7ff).ram().share("mcu_ram"); /* M5517P on main board */
map(0xa800, 0xa800).rw(m_bmcu, FUNC(taito68705_mcu_device::data_r), FUNC(taito68705_mcu_device::data_w));
- map(0xa801, 0xa801).rw(this, FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_w)); //pixel layer related
- map(0xa802, 0xa802).w(this, FUNC(fortyl_state::bank_select_w));
- map(0xa803, 0xa803).rw(this, FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related
+ map(0xa801, 0xa801).rw(FUNC(fortyl_state::fortyl_mcu_status_r), FUNC(fortyl_state::pix1_w)); //pixel layer related
+ map(0xa802, 0xa802).w(FUNC(fortyl_state::bank_select_w));
+ map(0xa803, 0xa803).rw(FUNC(fortyl_state::pix2_r), FUNC(fortyl_state::pix2_w)); //pixel layer related
map(0xa804, 0xa804).r(m_soundlatch2, FUNC(generic_latch_8_device::read));
map(0xa804, 0xa804).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0xa805, 0xa805).r(this, FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //????
+ map(0xa805, 0xa805).r(FUNC(fortyl_state::snd_flag_r)).nopw(); /*sound_reset*/ //????
map(0xa807, 0xa807).nopr().nopw(); /* unknown */
map(0xa808, 0xa808).portr("DSW3");
map(0xa809, 0xa809).portr("P1");
map(0xa80a, 0xa80a).portr("SYSTEM");
map(0xa80b, 0xa80b).portr("P2");
- map(0xa80c, 0xa80c).portr("DSW1").w(this, FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */
+ map(0xa80c, 0xa80c).portr("DSW1").w(FUNC(fortyl_state::fortyl_pixram_sel_w)); /* pixram bank select */
map(0xa80d, 0xa80d).portr("DSW2").nopw(); /* unknown */
- map(0xb000, 0xb7ff).rw(this, FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */
+ map(0xb000, 0xb7ff).rw(FUNC(fortyl_state::fortyl_bg_videoram_r), FUNC(fortyl_state::fortyl_bg_videoram_w)).share("videoram"); /* #1 M5517P on video board */
map(0xb800, 0xb83f).ram().share("video_ctrl"); /* video control area */
map(0xb840, 0xb87f).ram().share("spriteram"); /* sprites part 1 */
- map(0xb880, 0xb8bf).rw(this, FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */
+ map(0xb880, 0xb8bf).rw(FUNC(fortyl_state::fortyl_bg_colorram_r), FUNC(fortyl_state::fortyl_bg_colorram_w)).share("colorram"); /* background attributes (2 bytes per line) */
map(0xb8e0, 0xb8ff).ram().share("spriteram2"); /* sprites part 2 */
- map(0xc000, 0xffff).rw(this, FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w));
+ map(0xc000, 0xffff).rw(FUNC(fortyl_state::fortyl_pixram_r), FUNC(fortyl_state::fortyl_pixram_w));
}
WRITE8_MEMBER(fortyl_state::sound_control_0_w)
@@ -429,14 +429,14 @@ void fortyl_state::sound_map(address_map &map)
map(0xc000, 0xc7ff).ram();
map(0xc800, 0xc801).w(m_ay, FUNC(ay8910_device::address_data_w));
map(0xca00, 0xca0d).w(m_msm, FUNC(msm5232_device::write));
- map(0xcc00, 0xcc00).w(this, FUNC(fortyl_state::sound_control_0_w));
- map(0xce00, 0xce00).w(this, FUNC(fortyl_state::sound_control_1_w));
+ map(0xcc00, 0xcc00).w(FUNC(fortyl_state::sound_control_0_w));
+ map(0xce00, 0xce00).w(FUNC(fortyl_state::sound_control_1_w));
map(0xd800, 0xd800).r("soundlatch", FUNC(generic_latch_8_device::read));
map(0xd800, 0xd800).w(m_soundlatch2, FUNC(generic_latch_8_device::write));
map(0xda00, 0xda00).nopr(); // unknown read
map(0xda00, 0xda00).w("soundnmi", FUNC(input_merger_device::in_set<1>)); // enable NMI
map(0xdc00, 0xdc00).w("soundnmi", FUNC(input_merger_device::in_clear<1>)); // disable NMI
- map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::write)); /* signed 8-bit DAC - unknown read */
+ map(0xde00, 0xde00).nopr().w("dac", FUNC(dac_byte_interface::data_w)); /* signed 8-bit DAC - unknown read */
map(0xe000, 0xefff).rom(); /* space for diagnostics ROM */
}
diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp
index d69d50d5f29..d3354aa2ca9 100644
--- a/src/mame/drivers/4dpi.cpp
+++ b/src/mame/drivers/4dpi.cpp
@@ -220,9 +220,9 @@ void sgi_ip6_state::machine_reset()
void sgi_ip6_state::sgi_ip6_map(address_map &map)
{
- map(0x1f880000, 0x1f880003).rw(this, FUNC(sgi_ip6_state::ip6_unk1_r), FUNC(sgi_ip6_state::ip6_unk1_w));
- map(0x1fb00000, 0x1fb00003).rw(this, FUNC(sgi_ip6_state::ip6_unk3_r), FUNC(sgi_ip6_state::ip6_unk3_w));
- map(0x1fbc004c, 0x1fbc004f).rw(this, FUNC(sgi_ip6_state::ip6_unk2_r), FUNC(sgi_ip6_state::ip6_unk2_w));
+ map(0x1f880000, 0x1f880003).rw(FUNC(sgi_ip6_state::ip6_unk1_r), FUNC(sgi_ip6_state::ip6_unk1_w));
+ map(0x1fb00000, 0x1fb00003).rw(FUNC(sgi_ip6_state::ip6_unk3_r), FUNC(sgi_ip6_state::ip6_unk3_w));
+ map(0x1fbc004c, 0x1fbc004f).rw(FUNC(sgi_ip6_state::ip6_unk2_r), FUNC(sgi_ip6_state::ip6_unk2_w));
map(0x1fc00000, 0x1fc3ffff).rom().region("user1", 0);
}
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index 06d2190a9e6..b37fab2bed5 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -356,7 +356,7 @@ void _4enlinea_state::main_map(address_map &map)
// AM_RANGE(0x8000, 0xbfff) AM_RAM // CGA VRAM
map(0xc000, 0xdfff).ram();
- map(0xe000, 0xe001).r(this, FUNC(_4enlinea_state::serial_r));
+ map(0xe000, 0xe001).r(FUNC(_4enlinea_state::serial_r));
}
void _4enlinea_state::main_portmap(address_map &map)
@@ -394,10 +394,10 @@ void _4enlinea_state::audio_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0xf800, 0xfbff).ram();
- map(0xfc24, 0xfc24).r(this, FUNC(_4enlinea_state::hack_r));
- map(0xfc28, 0xfc28).r(this, FUNC(_4enlinea_state::hack_r));
- map(0xfc30, 0xfc31).w(this, FUNC(_4enlinea_state::serial_w));
- map(0xfc32, 0xfc32).rw(this, FUNC(_4enlinea_state::serial_status_r), FUNC(_4enlinea_state::serial_status_w));
+ map(0xfc24, 0xfc24).r(FUNC(_4enlinea_state::hack_r));
+ map(0xfc28, 0xfc28).r(FUNC(_4enlinea_state::hack_r));
+ map(0xfc30, 0xfc31).w(FUNC(_4enlinea_state::serial_w));
+ map(0xfc32, 0xfc32).rw(FUNC(_4enlinea_state::serial_status_r), FUNC(_4enlinea_state::serial_status_w));
map(0xfc48, 0xfc49).rw(m_ay, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w));
}
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index 609e23271b3..64102cf68e1 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -252,7 +252,7 @@ WRITE8_MEMBER(_4enraya_state::fenraya_custom_map_w)
void _4enraya_state::main_map(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(_4enraya_state::fenraya_custom_map_r), FUNC(_4enraya_state::fenraya_custom_map_w));
+ map(0x0000, 0xffff).rw(FUNC(_4enraya_state::fenraya_custom_map_r), FUNC(_4enraya_state::fenraya_custom_map_w));
}
void _4enraya_state::main_portmap(address_map &map)
@@ -261,8 +261,8 @@ void _4enraya_state::main_portmap(address_map &map)
map(0x00, 0x00).portr("DSW");
map(0x01, 0x01).portr("INPUTS");
map(0x02, 0x02).portr("SYSTEM");
- map(0x23, 0x23).w(this, FUNC(_4enraya_state::sound_data_w));
- map(0x33, 0x33).w(this, FUNC(_4enraya_state::sound_control_w));
+ map(0x23, 0x23).w(FUNC(_4enraya_state::sound_data_w));
+ map(0x33, 0x33).w(FUNC(_4enraya_state::sound_control_w));
}
@@ -270,7 +270,7 @@ void unk_gambl_state::unkpacg_main_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x6000, 0x67ff).ram().share("nvram");
- map(0x7000, 0x7fff).w(this, FUNC(_4enraya_state::fenraya_videoram_w));
+ map(0x7000, 0x7fff).w(FUNC(_4enraya_state::fenraya_videoram_w));
map(0x8000, 0x9fff).rom();
}
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index 83c5601084c..7661c6117b8 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -243,8 +243,8 @@ void _4roses_state::_4roses_map(address_map &map)
map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w));
map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w));
map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
- map(0x4000, 0x4fff).ram().w(this, FUNC(_4roses_state::funworld_videoram_w)).share("videoram");
- map(0x5000, 0x5fff).ram().w(this, FUNC(_4roses_state::funworld_colorram_w)).share("colorram");
+ map(0x4000, 0x4fff).ram().w(FUNC(_4roses_state::funworld_videoram_w)).share("videoram");
+ map(0x5000, 0x5fff).ram().w(FUNC(_4roses_state::funworld_colorram_w)).share("colorram");
map(0x6000, 0xffff).rom().region("maincpu", 0x6000);
}
@@ -284,7 +284,7 @@ READ8_MEMBER(_4roses_state::_4roses_opcode_r)
void _4roses_state::_4roses_opcodes_map(address_map &map)
{
- map(0x0000, 0x7fff).r(this, FUNC(_4roses_state::_4roses_opcode_r));
+ map(0x0000, 0x7fff).r(FUNC(_4roses_state::_4roses_opcode_r));
map(0x8000, 0xffff).rom().region("maincpu", 0x8000);
}
@@ -296,8 +296,8 @@ void rugby_state::rugby_map(address_map &map)
map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w));
map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
map(0x2000, 0xffff).rom().region("maincpu", 0x2000);
- map(0x6000, 0x6fff).ram().w(this, FUNC(_4roses_state::funworld_videoram_w)).share("videoram");
- map(0x7000, 0x7fff).ram().w(this, FUNC(_4roses_state::funworld_colorram_w)).share("colorram");
+ map(0x6000, 0x6fff).ram().w(FUNC(_4roses_state::funworld_videoram_w)).share("videoram");
+ map(0x7000, 0x7fff).ram().w(FUNC(_4roses_state::funworld_colorram_w)).share("colorram");
}
READ8_MEMBER(rugby_state::rugby_opcode_r)
@@ -310,7 +310,7 @@ READ8_MEMBER(rugby_state::rugby_opcode_r)
void rugby_state::rugby_opcodes_map(address_map &map)
{
- map(0x0000, 0x7fff).r(this, FUNC(rugby_state::rugby_opcode_r));
+ map(0x0000, 0x7fff).r(FUNC(rugby_state::rugby_opcode_r));
map(0x8000, 0xffff).rom().region("maincpu", 0x8000);
}
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp
index e07c6a41c21..61c99ab4ef6 100644
--- a/src/mame/drivers/5clown.cpp
+++ b/src/mame/drivers/5clown.cpp
@@ -763,12 +763,12 @@ void _5clown_state::fclown_map(address_map &map)
map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x1000, 0x13ff).ram().w(this, FUNC(_5clown_state::fclown_videoram_w)).share("videoram"); /* Init'ed at $2042 */
- map(0x1800, 0x1bff).ram().w(this, FUNC(_5clown_state::fclown_colorram_w)).share("colorram"); /* Init'ed at $2054 */
+ map(0x1000, 0x13ff).ram().w(FUNC(_5clown_state::fclown_videoram_w)).share("videoram"); /* Init'ed at $2042 */
+ map(0x1800, 0x1bff).ram().w(FUNC(_5clown_state::fclown_colorram_w)).share("colorram"); /* Init'ed at $2054 */
map(0x2000, 0x7fff).rom(); /* ROM space */
- map(0xc048, 0xc048).w(this, FUNC(_5clown_state::cpu_c048_w));
- map(0xd800, 0xd800).w(this, FUNC(_5clown_state::cpu_d800_w));
+ map(0xc048, 0xc048).w(FUNC(_5clown_state::cpu_c048_w));
+ map(0xd800, 0xd800).w(FUNC(_5clown_state::cpu_d800_w));
map(0xc400, 0xc400).portr("SW1"); /* DIP Switches bank */
map(0xcc00, 0xcc00).portr("SW2"); /* DIP Switches bank */
@@ -835,11 +835,11 @@ void _5clown_state::fclown_map(address_map &map)
void _5clown_state::fcaudio_map(address_map &map)
{
map(0x0000, 0x07ff).ram();
- map(0x0800, 0x0800).w(this, FUNC(_5clown_state::snd_800_w));
- map(0x0a02, 0x0a02).w(this, FUNC(_5clown_state::snd_a02_w));
+ map(0x0800, 0x0800).w(FUNC(_5clown_state::snd_800_w));
+ map(0x0a02, 0x0a02).w(FUNC(_5clown_state::snd_a02_w));
map(0x0c04, 0x0c04).w("oki6295", FUNC(okim6295_device::write));
map(0x0c06, 0x0c06).r("oki6295", FUNC(okim6295_device::read));
- map(0x0e06, 0x0e06).r(this, FUNC(_5clown_state::snd_e06_r));
+ map(0x0e06, 0x0e06).r(FUNC(_5clown_state::snd_e06_r));
map(0xe000, 0xffff).rom(); /* ROM space */
}
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index 72174600ad8..a1e24e05481 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -374,9 +374,9 @@ void _8080bw_state::invadpt2_io_map(address_map &map)
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -445,9 +445,9 @@ void _8080bw_state::spacerng_io_map(address_map &map)
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::spacerng_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::spacerng_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -472,9 +472,9 @@ void _8080bw_state::spcewars_io_map(address_map &map)
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::spcewars_sh_port_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::spcewars_sh_port_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w));
}
@@ -531,8 +531,8 @@ void _8080bw_state::spcewarla_io_map(address_map &map)
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2");
- map(0x04, 0x04).w(this, FUNC(_8080bw_state::spcewars_sh_port_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w));
+ map(0x04, 0x04).w(FUNC(_8080bw_state::spcewars_sh_port_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w));
map(0x06, 0x06).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
map(0x08, 0x08).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
map(0x0c, 0x0c).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
@@ -565,8 +565,8 @@ void _8080bw_state::astropal_io_map(address_map &map)
map(0x01, 0x01).mirror(0x04).portr("IN1");
map(0x03, 0x03).mirror(0x04).portr("IN3");
- map(0x03, 0x03).w(this, FUNC(_8080bw_state::invaders_audio_1_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invaders_audio_2_w));
+ map(0x03, 0x03).w(FUNC(_8080bw_state::invaders_audio_1_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invaders_audio_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -637,8 +637,8 @@ void _8080bw_state::cosmo_io_map(address_map &map)
map(0x00, 0x00).portr("IN0").nopw();
map(0x01, 0x01).portr("IN1").nopw();
map(0x02, 0x02).portr("IN2").nopw();
- map(0x03, 0x03).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::cosmo_sh_port_2_w));
+ map(0x03, 0x03).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::cosmo_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
map(0x07, 0x07).nopw();
}
@@ -816,8 +816,8 @@ void _8080bw_state::spacecom_map(address_map &map)
void _8080bw_state::spacecom_io_map(address_map &map)
{
map(0x41, 0x41).portr("IN0");
- map(0x42, 0x42).portr("IN1").w(this, FUNC(_8080bw_state::invaders_audio_1_w));
- map(0x44, 0x44).portr("IN2").w(this, FUNC(_8080bw_state::invaders_audio_2_w));
+ map(0x42, 0x42).portr("IN1").w(FUNC(_8080bw_state::invaders_audio_1_w));
+ map(0x44, 0x44).portr("IN2").w(FUNC(_8080bw_state::invaders_audio_2_w));
}
MACHINE_CONFIG_START(_8080bw_state::spacecom)
@@ -872,10 +872,10 @@ void _8080bw_state::invrvnge_io_map(address_map &map)
{
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
- map(0x02, 0x02).r(this, FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invrvnge_sh_port_1_w));
+ map(0x02, 0x02).r(FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invrvnge_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invrvnge_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invrvnge_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -1068,8 +1068,8 @@ void _8080bw_state::starw1_io_map(address_map &map)
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2");
map(0x03, 0x03).nopw(); /* writes 9B at boot */
- map(0x04, 0x04).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w));
+ map(0x04, 0x04).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
map(0x07, 0x07).nopw(); /* writes 89 at boot */
}
@@ -1098,9 +1098,9 @@ void _8080bw_state::lrescue_io_map(address_map &map)
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::lrescue_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::lrescue_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::lrescue_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::lrescue_sh_port_2_w));
}
@@ -1235,13 +1235,13 @@ void _8080bw_state::cosmicmo_io_map(address_map &map)
map.global_mask(0x7);
map(0x00, 0x00).mirror(0x04).portr("IN0");
map(0x01, 0x01).mirror(0x04).portr("IN1");
- map(0x02, 0x02).mirror(0x04).r(this, FUNC(_8080bw_state::invrvnge_02_r));
+ map(0x02, 0x02).mirror(0x04).r(FUNC(_8080bw_state::invrvnge_02_r));
map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r));
map(0x02, 0x02).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).w(this, FUNC(_8080bw_state::invaders_audio_1_w));
+ map(0x03, 0x03).w(FUNC(_8080bw_state::invaders_audio_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::cosmicmo_05_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::cosmicmo_05_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -1357,19 +1357,19 @@ void _8080bw_state::rollingc_map(address_map &map)
map(0x0000, 0x1fff).rom();
map(0x2000, 0x3fff).ram().share("main_ram");
map(0x4000, 0x5fff).rom();
- map(0xa000, 0xbfff).rw(this, FUNC(_8080bw_state::rollingc_scattered_colorram_r), FUNC(_8080bw_state::rollingc_scattered_colorram_w));
- map(0xe000, 0xffff).rw(this, FUNC(_8080bw_state::rollingc_scattered_colorram2_r), FUNC(_8080bw_state::rollingc_scattered_colorram2_w));
+ map(0xa000, 0xbfff).rw(FUNC(_8080bw_state::rollingc_scattered_colorram_r), FUNC(_8080bw_state::rollingc_scattered_colorram_w));
+ map(0xe000, 0xffff).rw(FUNC(_8080bw_state::rollingc_scattered_colorram2_r), FUNC(_8080bw_state::rollingc_scattered_colorram2_w));
}
void _8080bw_state::rollingc_io_map(address_map &map)
{
- map(0x00, 0x00).portr("IN0").w(this, FUNC(_8080bw_state::rollingc_sh_port_w));
+ map(0x00, 0x00).portr("IN0").w(FUNC(_8080bw_state::rollingc_sh_port_w));
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w));
}
@@ -1446,7 +1446,7 @@ void _8080bw_state::schaser_map(address_map &map)
map(0x0000, 0x1fff).rom();
map(0x2000, 0x3fff).ram().share("main_ram");
map(0x4000, 0x5fff).rom();
- map(0xc000, 0xdfff).rw(this, FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w));
+ map(0xc000, 0xdfff).rw(FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w));
}
@@ -1455,9 +1455,9 @@ void _8080bw_state::schaser_io_map(address_map &map)
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::schaser_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::schaser_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::schaser_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::schaser_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -1609,10 +1609,10 @@ void _8080bw_state::schasercv_io_map(address_map &map)
{
map(0x00, 0x00).portr("IN0");
map(0x01, 0x01).portr("IN1");
- map(0x02, 0x02).r(this, FUNC(_8080bw_state::schasercv_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::schasercv_sh_port_1_w));
+ map(0x02, 0x02).r(FUNC(_8080bw_state::schasercv_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::schasercv_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::schasercv_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::schasercv_sh_port_2_w));
//map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -1620,9 +1620,9 @@ void _8080bw_state::crashrd_io_map(address_map &map)
{
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::crashrd_port03_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::crashrd_port03_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::crashrd_port05_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::crashrd_port05_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -1734,7 +1734,7 @@ void _8080bw_state::sflush_map(address_map &map)
map(0x801a, 0x801a).nopw();
map(0x801c, 0x801c).nopw();
map(0x801d, 0x801d).nopw();
- map(0xa000, 0xbfff).rw(this, FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w));
+ map(0xa000, 0xbfff).rw(FUNC(_8080bw_state::schaser_scattered_colorram_r), FUNC(_8080bw_state::schaser_scattered_colorram_w));
map(0xd800, 0xffff).rom();
}
@@ -1817,12 +1817,12 @@ MACHINE_CONFIG_END
void _8080bw_state::lupin3_io_map(address_map &map)
{
- map(0x00, 0x00).portr("IN0").w(this, FUNC(_8080bw_state::lupin3_00_w));
+ map(0x00, 0x00).portr("IN0").w(FUNC(_8080bw_state::lupin3_00_w));
map(0x01, 0x01).portr("IN1");
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::lupin3_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::lupin3_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::lupin3_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::lupin3_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -1983,13 +1983,13 @@ READ8_MEMBER(_8080bw_state::polaris_port00_r)
// Probably an unfinished feature.
void _8080bw_state::polaris_io_map(address_map &map)
{
- map(0x00, 0x00).r(this, FUNC(_8080bw_state::polaris_port00_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
+ map(0x00, 0x00).r(FUNC(_8080bw_state::polaris_port00_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
map(0x01, 0x01).portr("IN1");
- map(0x02, 0x02).portr("IN2").w(this, FUNC(_8080bw_state::polaris_sh_port_1_w));
+ map(0x02, 0x02).portr("IN2").w(FUNC(_8080bw_state::polaris_sh_port_1_w));
map(0x03, 0x03).rw(m_mb14241, FUNC(mb14241_device::shift_result_r), FUNC(mb14241_device::shift_data_w));
- map(0x04, 0x04).w(this, FUNC(_8080bw_state::polaris_sh_port_2_w));
+ map(0x04, 0x04).w(FUNC(_8080bw_state::polaris_sh_port_2_w));
map(0x05, 0x05).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
- map(0x06, 0x06).w(this, FUNC(_8080bw_state::polaris_sh_port_3_w));
+ map(0x06, 0x06).w(FUNC(_8080bw_state::polaris_sh_port_3_w));
}
@@ -2161,11 +2161,11 @@ INPUT_PORTS_END
void _8080bw_state::ballbomb_io_map(address_map &map)
{
map(0x00, 0x00).portr("IN0");
- map(0x01, 0x01).portr("IN1").w(this, FUNC(_8080bw_state::ballbomb_01_w));
+ map(0x01, 0x01).portr("IN1").w(FUNC(_8080bw_state::ballbomb_01_w));
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::ballbomb_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::ballbomb_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::ballbomb_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::ballbomb_sh_port_2_w));
}
@@ -2223,8 +2223,8 @@ void _8080bw_state::yosakdon_io_map(address_map &map)
{
map(0x01, 0x01).portr("IN0");
map(0x02, 0x02).portr("IN1");
- map(0x03, 0x03).w(this, FUNC(_8080bw_state::yosakdon_sh_port_1_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::yosakdon_sh_port_2_w));
+ map(0x03, 0x03).w(FUNC(_8080bw_state::yosakdon_sh_port_1_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::yosakdon_sh_port_2_w));
map(0x06, 0x06).nopw(); /* character numbers */
}
@@ -2405,24 +2405,24 @@ READ8_MEMBER(_8080bw_state::indianbtbr_01_r)
void _8080bw_state::indianbt_io_map(address_map &map)
{
- map(0x00, 0x00).r(this, FUNC(_8080bw_state::indianbt_r));
+ map(0x00, 0x00).r(FUNC(_8080bw_state::indianbt_r));
map(0x01, 0x01).portr("IN1");
- map(0x02, 0x02).r(this, FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::indianbt_sh_port_1_w));
+ map(0x02, 0x02).r(FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::indianbt_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::indianbt_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::indianbt_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
- map(0x07, 0x07).w(this, FUNC(_8080bw_state::indianbt_sh_port_3_w));
+ map(0x07, 0x07).w(FUNC(_8080bw_state::indianbt_sh_port_3_w));
}
void _8080bw_state::indianbtbr_io_map(address_map &map)
{
map(0x00, 0x00).portr("IN0");
- map(0x01, 0x01).r(this, FUNC(_8080bw_state::indianbtbr_01_r));
+ map(0x01, 0x01).r(FUNC(_8080bw_state::indianbtbr_01_r));
map(0x02, 0x02).portr("IN2").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::indianbtbr_sh_port_1_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::indianbtbr_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::indianbtbr_sh_port_2_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::indianbtbr_sh_port_2_w));
map(0x06, 0x06).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
map(0x07, 0x07).nopw();
}
@@ -2492,11 +2492,11 @@ WRITE8_MEMBER(_8080bw_state::steelwkr_sh_port_3_w)
void _8080bw_state::steelwkr_io_map(address_map &map)
{
map(0x01, 0x01).portr("IN1");
- map(0x02, 0x02).r(this, FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(this, FUNC(_8080bw_state::invadpt2_sh_port_1_w));
+ map(0x02, 0x02).r(FUNC(_8080bw_state::invrvnge_02_r)).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
+ map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)).w(FUNC(_8080bw_state::invadpt2_sh_port_1_w));
map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x05, 0x05).w(this, FUNC(_8080bw_state::invadpt2_sh_port_2_w));
- map(0x06, 0x06).w(this, FUNC(_8080bw_state::steelwkr_sh_port_3_w));
+ map(0x05, 0x05).w(FUNC(_8080bw_state::invadpt2_sh_port_2_w));
+ map(0x06, 0x06).w(FUNC(_8080bw_state::steelwkr_sh_port_3_w));
}
static INPUT_PORTS_START( steelwkr )
@@ -2744,9 +2744,9 @@ void _8080bw_state::shuttlei_map(address_map &map)
void _8080bw_state::shuttlei_io_map(address_map &map)
{
map(0xfc, 0xfc).nopw(); /* game writes 0xAA every so often (perhaps when base hit?) */
- map(0xfd, 0xfd).w(this, FUNC(_8080bw_state::shuttlei_sh_port_1_w));
- map(0xfe, 0xfe).portr("DSW").w(this, FUNC(_8080bw_state::shuttlei_sh_port_2_w));
- map(0xff, 0xff).rw(this, FUNC(_8080bw_state::shuttlei_ff_r), FUNC(_8080bw_state::shuttlei_ff_w));
+ map(0xfd, 0xfd).w(FUNC(_8080bw_state::shuttlei_sh_port_1_w));
+ map(0xfe, 0xfe).portr("DSW").w(FUNC(_8080bw_state::shuttlei_sh_port_2_w));
+ map(0xff, 0xff).rw(FUNC(_8080bw_state::shuttlei_ff_r), FUNC(_8080bw_state::shuttlei_ff_w));
}
@@ -2829,11 +2829,11 @@ void _8080bw_state::darthvdr_map(address_map &map)
void _8080bw_state::darthvdr_io_map(address_map &map)
{
map(0x00, 0x00).portr("P1");
- map(0x01, 0x01).r(this, FUNC(_8080bw_state::darthvdr_01_r));
+ map(0x01, 0x01).r(FUNC(_8080bw_state::darthvdr_01_r));
- map(0x00, 0x00).w(this, FUNC(_8080bw_state::darthvdr_00_w)); // flipscreen
+ map(0x00, 0x00).w(FUNC(_8080bw_state::darthvdr_00_w)); // flipscreen
map(0x04, 0x04).nopw();
- map(0x08, 0x08).w(this, FUNC(_8080bw_state::darthvdr_08_w)); // sound
+ map(0x08, 0x08).w(FUNC(_8080bw_state::darthvdr_08_w)); // sound
}
@@ -2920,9 +2920,9 @@ void _8080bw_state::vortex_io_map(address_map &map)
map(0x01, 0x01).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r));
map(0x00, 0x00).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x01, 0x01).w(this, FUNC(_8080bw_state::invaders_audio_1_w));
+ map(0x01, 0x01).w(FUNC(_8080bw_state::invaders_audio_1_w));
map(0x06, 0x06).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
- map(0x07, 0x07).w(this, FUNC(_8080bw_state::invaders_audio_2_w));
+ map(0x07, 0x07).w(FUNC(_8080bw_state::invaders_audio_2_w));
map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
}
@@ -3202,11 +3202,11 @@ void _8080bw_state::claybust_io_map(address_map &map)
{
//AM_RANGE(0x00, 0x00) AM_WRITENOP // ?
map(0x01, 0x01).portr("IN1").w(m_mb14241, FUNC(mb14241_device::shift_count_w));
- map(0x02, 0x02).r(this, FUNC(_8080bw_state::claybust_gun_lo_r)).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
+ map(0x02, 0x02).r(FUNC(_8080bw_state::claybust_gun_lo_r)).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
map(0x03, 0x03).r(m_mb14241, FUNC(mb14241_device::shift_result_r)); //AM_WRITENOP // port3 write looks sound-related
map(0x04, 0x04).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
//AM_RANGE(0x05, 0x05) AM_WRITENOP // ?
- map(0x06, 0x06).r(this, FUNC(_8080bw_state::claybust_gun_hi_r));
+ map(0x06, 0x06).r(FUNC(_8080bw_state::claybust_gun_hi_r));
}
@@ -3488,8 +3488,8 @@ void _8080bw_state::invmulti_map(address_map &map)
map(0x0000, 0x1fff).mirror(0x8000).bankr("bank1");
map(0x2000, 0x3fff).mirror(0x8000).ram().share("main_ram");
map(0x4000, 0x5fff).mirror(0x8000).bankr("bank2");
- map(0x6000, 0x6000).mirror(0x1fff).rw(this, FUNC(_8080bw_state::invmulti_eeprom_r), FUNC(_8080bw_state::invmulti_eeprom_w));
- map(0xe000, 0xe000).mirror(0x1fff).w(this, FUNC(_8080bw_state::invmulti_bank_w));
+ map(0x6000, 0x6000).mirror(0x1fff).rw(FUNC(_8080bw_state::invmulti_eeprom_r), FUNC(_8080bw_state::invmulti_eeprom_w));
+ map(0xe000, 0xe000).mirror(0x1fff).w(FUNC(_8080bw_state::invmulti_bank_w));
}
READ8_MEMBER(_8080bw_state::invmulti_eeprom_r)
diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp
index b6b7997a12c..f9dfde1e34d 100644
--- a/src/mame/drivers/88games.cpp
+++ b/src/mame/drivers/88games.cpp
@@ -128,12 +128,12 @@ void _88games_state::main_map(address_map &map)
map(0x1000, 0x1fff).w("palette", FUNC(palette_device::write8)).share("palette");
map(0x2000, 0x2fff).ram();
map(0x3000, 0x37ff).ram().share("nvram");
- map(0x3800, 0x3fff).rw(this, FUNC(_88games_state::bankedram_r), FUNC(_88games_state::bankedram_w)).share("ram");
- map(0x4000, 0x7fff).rw(this, FUNC(_88games_state::k052109_051960_r), FUNC(_88games_state::k052109_051960_w));
- map(0x5f84, 0x5f84).w(this, FUNC(_88games_state::k88games_5f84_w));
+ map(0x3800, 0x3fff).rw(FUNC(_88games_state::bankedram_r), FUNC(_88games_state::bankedram_w)).share("ram");
+ map(0x4000, 0x7fff).rw(FUNC(_88games_state::k052109_051960_r), FUNC(_88games_state::k052109_051960_w));
+ map(0x5f84, 0x5f84).w(FUNC(_88games_state::k88games_5f84_w));
map(0x5f88, 0x5f88).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x5f8c, 0x5f8c).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0x5f90, 0x5f90).w(this, FUNC(_88games_state::k88games_sh_irqtrigger_w));
+ map(0x5f90, 0x5f90).w(FUNC(_88games_state::k88games_sh_irqtrigger_w));
map(0x5f94, 0x5f94).portr("IN0");
map(0x5f95, 0x5f95).portr("IN1");
map(0x5f96, 0x5f96).portr("IN2");
@@ -147,10 +147,10 @@ void _88games_state::sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0x87ff).ram();
- map(0x9000, 0x9000).w(this, FUNC(_88games_state::speech_msg_w));
+ map(0x9000, 0x9000).w(FUNC(_88games_state::speech_msg_w));
map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read));
map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
- map(0xe000, 0xe000).w(this, FUNC(_88games_state::speech_control_w));
+ map(0xe000, 0xe000).w(FUNC(_88games_state::speech_control_w));
}
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index d77e02c7a8c..79898e4f8df 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -56,7 +56,7 @@ public:
, m_ram(*this, RAM_TAG)
, m_gfxdecode(*this, "gfxdecode")
, m_palette(*this, "palette")
- { }
+ { }
DECLARE_READ8_MEMBER(a5105_memsel_r);
DECLARE_READ8_MEMBER(key_r);
@@ -358,21 +358,21 @@ void a5105_state::a5105_io(address_map &map)
map.unmap_value_high();
map.global_mask(0xff);
map(0x40, 0x41).m(m_fdc, FUNC(upd765a_device::map));
- map(0x48, 0x4f).w(this, FUNC(a5105_state::a5105_upd765_w));
+ map(0x48, 0x4f).w(FUNC(a5105_state::a5105_upd765_w));
map(0x80, 0x83).rw("z80ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x90, 0x93).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x98, 0x99).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write));
- map(0x9c, 0x9c).w(this, FUNC(a5105_state::pcg_val_w));
+ map(0x9c, 0x9c).w(FUNC(a5105_state::pcg_val_w));
// AM_RANGE(0x9d, 0x9d) crtc area (ff-based), palette routes here
- map(0x9e, 0x9e).w(this, FUNC(a5105_state::pcg_addr_w));
+ map(0x9e, 0x9e).w(FUNC(a5105_state::pcg_addr_w));
// AM_RANGE(0xa0, 0xa1) ay8910?
- map(0xa8, 0xa8).rw(this, FUNC(a5105_state::a5105_memsel_r), FUNC(a5105_state::a5105_memsel_w));
- map(0xa9, 0xa9).r(this, FUNC(a5105_state::key_r));
- map(0xaa, 0xaa).rw(this, FUNC(a5105_state::key_mux_r), FUNC(a5105_state::key_mux_w));
- map(0xab, 0xab).w(this, FUNC(a5105_state::a5105_ab_w)); //misc output, see above
+ map(0xa8, 0xa8).rw(FUNC(a5105_state::a5105_memsel_r), FUNC(a5105_state::a5105_memsel_w));
+ map(0xa9, 0xa9).r(FUNC(a5105_state::key_r));
+ map(0xaa, 0xaa).rw(FUNC(a5105_state::key_mux_r), FUNC(a5105_state::key_mux_w));
+ map(0xab, 0xab).w(FUNC(a5105_state::a5105_ab_w)); //misc output, see above
}
/* Input ports */
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index 253b41cf41b..5d25f1bd37d 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -108,8 +108,8 @@ void a6809_state::a6809_mem(address_map &map)
map.unmap_value_high();
map(0x0000, 0x03ff).ram();
map(0x0400, 0x07ff).ram().share("videoram");
- map(0x0800, 0x0800).r(m_crtc, FUNC(mc6845_device::status_r)).w(this, FUNC(a6809_state::a6809_address_w));
- map(0x0801, 0x0801).r(m_crtc, FUNC(mc6845_device::register_r)).w(this, FUNC(a6809_state::a6809_register_w));
+ map(0x0800, 0x0800).r(m_crtc, FUNC(mc6845_device::status_r)).w(FUNC(a6809_state::a6809_address_w));
+ map(0x0801, 0x0801).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(a6809_state::a6809_register_w));
map(0x0900, 0x090f).mirror(0xf0).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
map(0xf000, 0xf7ff); // optional ROM
map(0xf800, 0xffff).rom().region("maincpu", 0);
diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp
index e9687d5f093..b92b8bd587a 100644
--- a/src/mame/drivers/a7150.cpp
+++ b/src/mame/drivers/a7150.cpp
@@ -324,7 +324,7 @@ void a7150_state::a7150_io(address_map &map)
map(0x00d0, 0x00d7).rw(m_pit8253, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff);
map(0x00d8, 0x00d8).rw(m_uart8251, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
map(0x00da, 0x00da).rw(m_uart8251, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
- map(0x0200, 0x0203).rw(this, FUNC(a7150_state::a7150_kgs_r), FUNC(a7150_state::a7150_kgs_w)).umask16(0x00ff); // ABS/KGS board
+ map(0x0200, 0x0203).rw(FUNC(a7150_state::a7150_kgs_r), FUNC(a7150_state::a7150_kgs_w)).umask16(0x00ff); // ABS/KGS board
map(0x0300, 0x031f).unmaprw(); // ASP board #1
map(0x0320, 0x033f).unmaprw(); // ASP board #2
}
@@ -362,7 +362,7 @@ void a7150_state::k7070_cpu_io(address_map &map)
map.global_mask(0xff);
map(0x0000, 0x0003).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x0008, 0x000b).rw(Z80SIO_TAG, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
- map(0x0010, 0x0017).rw(this, FUNC(a7150_state::kgs_host_r), FUNC(a7150_state::kgs_host_w)); // p. 11 of KGS-K7070.pdf
+ map(0x0010, 0x0017).rw(FUNC(a7150_state::kgs_host_r), FUNC(a7150_state::kgs_host_w)); // p. 11 of KGS-K7070.pdf
map(0x0020, 0x0021).noprw(); // address register
map(0x0022, 0x0022).noprw(); // function register (p. 6 of ABG-K7072.pdf)
@@ -481,8 +481,8 @@ MACHINE_CONFIG_START(a7150_state::a7150)
// IFSP port on processor card
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
-// MCFG_I8255_IN_PORTA_CB(READ8("cent_status_in", input_buffer_device, read))
-// MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write))
+// MCFG_I8255_IN_PORTA_CB(READ8("cent_status_in", input_buffer_device, bus_r))
+// MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, bus_w))
MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, a7150_state, ppi_c_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index d2882a62d78..cbca0bd12c0 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -303,7 +303,7 @@ READ8_MEMBER(a7800_state::bios_or_cart_r)
void a7800_state::a7800_mem(address_map &map)
{
- map(0x0000, 0x001f).mirror(0x300).rw(this, FUNC(a7800_state::tia_r), FUNC(a7800_state::tia_w));
+ map(0x0000, 0x001f).mirror(0x300).rw(FUNC(a7800_state::tia_r), FUNC(a7800_state::tia_w));
map(0x0020, 0x003f).mirror(0x300).rw(m_maria, FUNC(atari_maria_device::read), FUNC(atari_maria_device::write));
map(0x0040, 0x00ff).bankrw("zpmirror"); // mirror of 0x2040-0x20ff, for zero page
map(0x0140, 0x01ff).bankrw("spmirror"); // mirror of 0x2140-0x21ff, for stack page
@@ -319,7 +319,7 @@ void a7800_state::a7800_mem(address_map &map)
// and even then with inconsistent and unreliable results.
map(0x4000, 0xffff).w(m_cart, FUNC(a78_cart_slot_device::write_40xx));
map(0x4000, 0xbfff).r(m_cart, FUNC(a78_cart_slot_device::read_40xx));
- map(0xc000, 0xffff).r(this, FUNC(a7800_state::bios_or_cart_r)); // here also the BIOS can be accessed
+ map(0xc000, 0xffff).r(FUNC(a7800_state::bios_or_cart_r)); // here also the BIOS can be accessed
}
diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp
index 7e8e8ff89bf..1baf9417261 100644
--- a/src/mame/drivers/aa310.cpp
+++ b/src/mame/drivers/aa310.cpp
@@ -190,12 +190,12 @@ void aa310_state::machine_reset()
void aa310_state::aa310_mem(address_map &map)
{
- map(0x00000000, 0x01ffffff).rw(this, FUNC(aa310_state::archimedes_memc_logical_r), FUNC(aa310_state::archimedes_memc_logical_w));
+ map(0x00000000, 0x01ffffff).rw(FUNC(aa310_state::archimedes_memc_logical_r), FUNC(aa310_state::archimedes_memc_logical_w));
map(0x02000000, 0x02ffffff).ram().share("physicalram"); /* physical RAM - 16 MB for now, should be 512k for the A310 */
- map(0x03000000, 0x033fffff).rw(this, FUNC(aa310_state::archimedes_ioc_r), FUNC(aa310_state::archimedes_ioc_w));
- map(0x03400000, 0x035fffff).rom().region("extension", 0x000000).w(this, FUNC(aa310_state::archimedes_vidc_w));
- map(0x03600000, 0x037fffff).rom().region("extension", 0x200000).w(this, FUNC(aa310_state::archimedes_memc_w));
- map(0x03800000, 0x03ffffff).rom().region("maincpu", 0).w(this, FUNC(aa310_state::archimedes_memc_page_w));
+ map(0x03000000, 0x033fffff).rw(FUNC(aa310_state::archimedes_ioc_r), FUNC(aa310_state::archimedes_ioc_w));
+ map(0x03400000, 0x035fffff).rom().region("extension", 0x000000).w(FUNC(aa310_state::archimedes_vidc_w));
+ map(0x03600000, 0x037fffff).rom().region("extension", 0x200000).w(FUNC(aa310_state::archimedes_memc_w));
+ map(0x03800000, 0x03ffffff).rom().region("maincpu", 0).w(FUNC(aa310_state::archimedes_memc_page_w));
}
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index d674359a6a3..3e05c8470cd 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -130,10 +130,10 @@ READ8_MEMBER( abc1600_state::bus_r )
// card select pulse
uint8_t cs = (m_cs7 << 7) | ((offset >> 5) & 0x3f);
- m_bus0i->cs_w(cs);
- m_bus0x->cs_w(cs);
- m_bus1->cs_w(cs);
- m_bus2->cs_w(cs);
+ m_bus0i->write_cs(cs);
+ m_bus0x->write_cs(cs);
+ m_bus1->write_cs(cs);
+ m_bus2->write_cs(cs);
// card select b?
m_csb = m_bus2->csb_r();
@@ -210,13 +210,13 @@ READ8_MEMBER( abc1600_state::bus_r )
case INP:
if (m_bus0)
{
- data &= m_bus0i->inp_r();
- data &= m_bus0x->inp_r();
+ data &= m_bus0i->read_inp();
+ data &= m_bus0x->read_inp();
}
else
{
- data &= m_bus1->inp_r();
- data &= m_bus2->inp_r();
+ data &= m_bus1->read_inp();
+ data &= m_bus2->read_inp();
}
if (LOG) logerror("%s INP %02x: %02x\n", machine().describe_context(), cs, data);
@@ -225,13 +225,13 @@ READ8_MEMBER( abc1600_state::bus_r )
case STAT:
if (m_bus0)
{
- data &= m_bus0i->stat_r();
- data &= m_bus0x->stat_r();
+ data &= m_bus0i->read_stat();
+ data &= m_bus0x->read_stat();
}
else
{
- data &= m_bus1->stat_r();
- data &= m_bus2->stat_r();
+ data &= m_bus1->read_stat();
+ data &= m_bus2->read_stat();
}
if (LOG) logerror("%s STAT %02x: %02x\n", machine().describe_context(), cs, data);
@@ -269,10 +269,10 @@ WRITE8_MEMBER( abc1600_state::bus_w )
{
uint8_t cs = (m_cs7 << 7) | ((offset >> 5) & 0x3f);
- m_bus0i->cs_w(cs);
- m_bus0x->cs_w(cs);
- m_bus1->cs_w(cs);
- m_bus2->cs_w(cs);
+ m_bus0i->write_cs(cs);
+ m_bus0x->write_cs(cs);
+ m_bus1->write_cs(cs);
+ m_bus2->write_cs(cs);
switch ((offset >> 1) & 0x07)
{
@@ -281,13 +281,13 @@ WRITE8_MEMBER( abc1600_state::bus_w )
if (m_bus0)
{
- m_bus0i->out_w(data);
- m_bus0x->out_w(data);
+ m_bus0i->write_out(data);
+ m_bus0x->write_out(data);
}
else
{
- m_bus1->out_w(data);
- m_bus2->out_w(data);
+ m_bus1->write_out(data);
+ m_bus2->write_out(data);
}
break;
@@ -296,13 +296,13 @@ WRITE8_MEMBER( abc1600_state::bus_w )
if (m_bus0)
{
- m_bus0i->c1_w(data);
- m_bus0x->c1_w(data);
+ m_bus0i->write_c1(data);
+ m_bus0x->write_c1(data);
}
else
{
- m_bus1->c1_w(data);
- m_bus2->c1_w(data);
+ m_bus1->write_c1(data);
+ m_bus2->write_c1(data);
}
break;
@@ -311,13 +311,13 @@ WRITE8_MEMBER( abc1600_state::bus_w )
if (m_bus0)
{
- m_bus0i->c2_w(data);
- m_bus0x->c2_w(data);
+ m_bus0i->write_c2(data);
+ m_bus0x->write_c2(data);
}
else
{
- m_bus1->c2_w(data);
- m_bus2->c2_w(data);
+ m_bus1->write_c2(data);
+ m_bus2->write_c2(data);
}
break;
@@ -326,13 +326,13 @@ WRITE8_MEMBER( abc1600_state::bus_w )
if (m_bus0)
{
- m_bus0i->c3_w(data);
- m_bus0x->c3_w(data);
+ m_bus0i->write_c3(data);
+ m_bus0x->write_c3(data);
}
else
{
- m_bus1->c3_w(data);
- m_bus2->c3_w(data);
+ m_bus1->write_c3(data);
+ m_bus2->write_c3(data);
}
break;
@@ -341,13 +341,13 @@ WRITE8_MEMBER( abc1600_state::bus_w )
if (m_bus0)
{
- m_bus0i->c4_w(data);
- m_bus0x->c4_w(data);
+ m_bus0i->write_c4(data);
+ m_bus0x->write_c4(data);
}
else
{
- m_bus1->c4_w(data);
- m_bus2->c4_w(data);
+ m_bus1->write_c4(data);
+ m_bus2->write_c4(data);
}
break;
@@ -505,25 +505,25 @@ void abc1600_state::mac_mem(address_map &map)
{
map(0x000000, 0x0fffff).ram();
map(0x100000, 0x17ffff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::vram_map));
- map(0x1fe000, 0x1fefff).rw(this, FUNC(abc1600_state::bus_r), FUNC(abc1600_state::bus_w));
+ map(0x1fe000, 0x1fefff).rw(FUNC(abc1600_state::bus_r), FUNC(abc1600_state::bus_w));
map(0x1ff000, 0x1ff000).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::status_r), FUNC(fd1797_device::cmd_w));
map(0x1ff002, 0x1ff002).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::track_r), FUNC(fd1797_device::track_w));
map(0x1ff004, 0x1ff004).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::sector_r), FUNC(fd1797_device::sector_w));
map(0x1ff006, 0x1ff006).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::data_r), FUNC(fd1797_device::data_w));
map(0x1ff100, 0x1ff101).mirror(0xfe).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::crtc_map));
- map(0x1ff200, 0x1ff207).mirror(0xf8).rw(this, FUNC(abc1600_state::dart_r), FUNC(abc1600_state::dart_w));
- map(0x1ff300, 0x1ff300).mirror(0xff).rw(m_dma0, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
- map(0x1ff400, 0x1ff400).mirror(0xff).rw(m_dma1, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
- map(0x1ff500, 0x1ff500).mirror(0xff).rw(m_dma2, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
- map(0x1ff600, 0x1ff607).mirror(0xf8).rw(this, FUNC(abc1600_state::scc_r), FUNC(abc1600_state::scc_w));
- map(0x1ff700, 0x1ff707).mirror(0xf8).rw(this, FUNC(abc1600_state::cio_r), FUNC(abc1600_state::cio_w));
+ map(0x1ff200, 0x1ff207).mirror(0xf8).rw(FUNC(abc1600_state::dart_r), FUNC(abc1600_state::dart_w));
+ map(0x1ff300, 0x1ff300).mirror(0xff).rw(m_dma0, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x1ff400, 0x1ff400).mirror(0xff).rw(m_dma1, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x1ff500, 0x1ff500).mirror(0xff).rw(m_dma2, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x1ff600, 0x1ff607).mirror(0xf8).rw(FUNC(abc1600_state::scc_r), FUNC(abc1600_state::scc_w));
+ map(0x1ff700, 0x1ff707).mirror(0xf8).rw(FUNC(abc1600_state::cio_r), FUNC(abc1600_state::cio_w));
map(0x1ff800, 0x1ff8ff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::iowr0_map));
map(0x1ff900, 0x1ff9ff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::iowr1_map));
map(0x1ffa00, 0x1ffaff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::iowr2_map));
- map(0x1ffb00, 0x1ffb00).mirror(0x7e).w(this, FUNC(abc1600_state::fw0_w));
- map(0x1ffb01, 0x1ffb01).mirror(0x7e).w(this, FUNC(abc1600_state::fw1_w));
+ map(0x1ffb00, 0x1ffb00).mirror(0x7e).w(FUNC(abc1600_state::fw0_w));
+ map(0x1ffb01, 0x1ffb01).mirror(0x7e).w(FUNC(abc1600_state::fw1_w));
map(0x1ffd00, 0x1ffd07).mirror(0xf8).w(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dmamap_w));
- map(0x1ffe00, 0x1ffe00).mirror(0xff).w(this, FUNC(abc1600_state::spec_contr_reg_w));
+ map(0x1ffe00, 0x1ffe00).mirror(0xff).w(FUNC(abc1600_state::spec_contr_reg_w));
}
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 3b841a84053..07b8368378b 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -180,7 +180,7 @@ WRITE8_MEMBER( abc80_state::csg_w )
void abc80_state::abc80_mem(address_map &map)
{
map.unmap_value_high();
- map(0x0000, 0xffff).rw(this, FUNC(abc80_state::read), FUNC(abc80_state::write));
+ map(0x0000, 0xffff).rw(FUNC(abc80_state::read), FUNC(abc80_state::write));
}
@@ -198,7 +198,7 @@ void abc80_state::abc80_io(address_map &map)
map(0x03, 0x03).w(m_bus, FUNC(abcbus_slot_device::c2_w));
map(0x04, 0x04).w(m_bus, FUNC(abcbus_slot_device::c3_w));
map(0x05, 0x05).w(m_bus, FUNC(abcbus_slot_device::c4_w));
- map(0x06, 0x06).w(this, FUNC(abc80_state::csg_w));
+ map(0x06, 0x06).w(FUNC(abc80_state::csg_w));
map(0x07, 0x07).r(m_bus, FUNC(abcbus_slot_device::rst_r));
map(0x10, 0x13).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt));
}
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index f98d25966c4..cd096321610 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -478,7 +478,7 @@ WRITE8_MEMBER( abc806_state::mao_w )
void abc800_state::abc800_m1(address_map &map)
{
- map(0x0000, 0xffff).r(this, FUNC(abc800_state::m1_r));
+ map(0x0000, 0xffff).r(FUNC(abc800_state::m1_r));
}
@@ -510,9 +510,9 @@ void abc800_state::abc800c_io(address_map &map)
map(0x03, 0x03).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w));
map(0x04, 0x04).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w));
map(0x05, 0x05).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w));
- map(0x05, 0x05).mirror(0x18).r(this, FUNC(abc800_state::pling_r));
- map(0x06, 0x06).mirror(0x18).w(this, FUNC(abc800_state::hrs_w));
- map(0x07, 0x07).mirror(0x18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(this, FUNC(abc800_state::hrc_w));
+ map(0x05, 0x05).mirror(0x18).r(FUNC(abc800_state::pling_r));
+ map(0x06, 0x06).mirror(0x18).w(FUNC(abc800_state::hrs_w));
+ map(0x07, 0x07).mirror(0x18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(FUNC(abc800_state::hrc_w));
map(0x20, 0x23).mirror(0x0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
map(0x40, 0x43).mirror(0x1c).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
map(0x60, 0x63).mirror(0x1c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
@@ -573,7 +573,7 @@ void abc802_state::abc802_io(address_map &map)
map(0x03, 0x03).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w));
map(0x04, 0x04).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w));
map(0x05, 0x05).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w));
- map(0x05, 0x05).mirror(0x18).r(this, FUNC(abc800_state::pling_r));
+ map(0x05, 0x05).mirror(0x18).r(FUNC(abc800_state::pling_r));
map(0x07, 0x07).mirror(0x18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r));
map(0x20, 0x23).mirror(0x0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
map(0x31, 0x31).mirror(0x06).r(m_crtc, FUNC(mc6845_device::register_r));
@@ -590,7 +590,7 @@ void abc802_state::abc802_io(address_map &map)
void abc806_state::abc806_mem(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(abc806_state::read), FUNC(abc806_state::write));
+ map(0x0000, 0xffff).rw(FUNC(abc806_state::read), FUNC(abc806_state::write));
}
@@ -607,15 +607,15 @@ void abc806_state::abc806_io(address_map &map)
map(0x03, 0x03).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w));
map(0x04, 0x04).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w));
map(0x05, 0x05).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w));
- map(0x05, 0x05).mirror(0xff18).r(this, FUNC(abc800_state::pling_r));
- map(0x06, 0x06).mirror(0xff18).w(this, FUNC(abc806_state::hrs_w));
- map(0x07, 0x07).mirror(0xff18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(this, FUNC(abc806_state::hrc_w));
+ map(0x05, 0x05).mirror(0xff18).r(FUNC(abc800_state::pling_r));
+ map(0x06, 0x06).mirror(0xff18).w(FUNC(abc806_state::hrs_w));
+ map(0x07, 0x07).mirror(0xff18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(FUNC(abc806_state::hrc_w));
map(0x20, 0x23).mirror(0xff0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
map(0x31, 0x31).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::register_r));
- map(0x34, 0x34).select(0xff00).rw(this, FUNC(abc806_state::mai_r), FUNC(abc806_state::mao_w));
- map(0x35, 0x35).mirror(0xff00).rw(this, FUNC(abc806_state::ami_r), FUNC(abc806_state::amo_w));
- map(0x36, 0x36).mirror(0xff00).rw(this, FUNC(abc806_state::sti_r), FUNC(abc806_state::sto_w));
- map(0x37, 0x37).select(0xff00).rw(this, FUNC(abc806_state::cli_r), FUNC(abc806_state::sso_w));
+ map(0x34, 0x34).select(0xff00).rw(FUNC(abc806_state::mai_r), FUNC(abc806_state::mao_w));
+ map(0x35, 0x35).mirror(0xff00).rw(FUNC(abc806_state::ami_r), FUNC(abc806_state::amo_w));
+ map(0x36, 0x36).mirror(0xff00).rw(FUNC(abc806_state::sti_r), FUNC(abc806_state::sto_w));
+ map(0x37, 0x37).select(0xff00).rw(FUNC(abc806_state::cli_r), FUNC(abc806_state::sso_w));
map(0x38, 0x38).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::address_w));
map(0x39, 0x39).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::register_w));
map(0x40, 0x43).mirror(0xff1c).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp
index 82fbbaebc35..0d51e96275a 100644
--- a/src/mame/drivers/accomm.cpp
+++ b/src/mame/drivers/accomm.cpp
@@ -637,17 +637,17 @@ WRITE_LINE_MEMBER(accomm_state::econet_clk_w)
void accomm_state::main_map(address_map &map)
{
- map(0x000000, 0x1fffff).rw(this, FUNC(accomm_state::ram_r), FUNC(accomm_state::ram_w)); /* System RAM */
+ map(0x000000, 0x1fffff).rw(FUNC(accomm_state::ram_r), FUNC(accomm_state::ram_w)); /* System RAM */
map(0x200000, 0x3fffff).noprw(); /* External expansion RAM */
map(0x400000, 0x400000).noprw(); /* MODEM */
map(0x410000, 0x410000).ram(); /* Econet ID */
map(0x420000, 0x42000f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* 6522 VIA (printer etc) */
map(0x430000, 0x430001).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); /* 2641 ACIA (RS423) */
- map(0x440000, 0x440000).w(this, FUNC(accomm_state::ch00switch_w)); /* CH00SWITCH */
+ map(0x440000, 0x440000).w(FUNC(accomm_state::ch00switch_w)); /* CH00SWITCH */
map(0x450000, 0x457fff).ram().share("vram"); /* Video RAM */
- map(0x458000, 0x459fff).r(this, FUNC(accomm_state::read_keyboard1)); /* Video ULA */
- map(0x45a000, 0x45bfff).r(this, FUNC(accomm_state::read_keyboard2)); /* Video ULA */
- map(0x45fe00, 0x45feff).rw(this, FUNC(accomm_state::sheila_r), FUNC(accomm_state::sheila_w)); /* Video ULA */
+ map(0x458000, 0x459fff).r(FUNC(accomm_state::read_keyboard1)); /* Video ULA */
+ map(0x45a000, 0x45bfff).r(FUNC(accomm_state::read_keyboard2)); /* Video ULA */
+ map(0x45fe00, 0x45feff).rw(FUNC(accomm_state::sheila_r), FUNC(accomm_state::sheila_w)); /* Video ULA */
map(0x460000, 0x467fff).ram().share("nvram"); /* CMOS RAM */
map(0x470000, 0x47001f).rw(m_adlc, FUNC(mc6854_device::read), FUNC(mc6854_device::write)); /* 68B54 (Econet) */
map(0x480000, 0x7fffff).noprw(); /* Reserved */
@@ -865,7 +865,7 @@ MACHINE_CONFIG_START(accomm_state::accomm)
/* via */
MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(16'000'000) / 16)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
/* acia */
diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp
index d33abfdea4b..3662c46f95b 100644
--- a/src/mame/drivers/ace.cpp
+++ b/src/mame/drivers/ace.cpp
@@ -152,11 +152,11 @@ void aceal_state::main_map(address_map &map)
{
map(0x0000, 0x09ff).rom();
- map(0x2000, 0x20ff).ram().w(this, FUNC(aceal_state::ace_scoreram_w)).share("scoreram"); /* 2x2101 */
+ map(0x2000, 0x20ff).ram().w(FUNC(aceal_state::ace_scoreram_w)).share("scoreram"); /* 2x2101 */
map(0x8300, 0x83ff).ram().share("ram2"); /* 2x2101 */
- map(0x8000, 0x80ff).ram().w(this, FUNC(aceal_state::ace_characterram_w)).share("characterram"); /* 3x3101 (3bits: 0, 1, 2) */
+ map(0x8000, 0x80ff).ram().w(FUNC(aceal_state::ace_characterram_w)).share("characterram"); /* 3x3101 (3bits: 0, 1, 2) */
- map(0xc000, 0xc005).w(this, FUNC(aceal_state::ace_objpos_w));
+ map(0xc000, 0xc005).w(FUNC(aceal_state::ace_objpos_w));
/* players inputs */
map(0xc008, 0xc008).portr("c008");
@@ -170,7 +170,7 @@ void aceal_state::main_map(address_map &map)
map(0xc010, 0xc010).portr("c010");
map(0xc011, 0xc011).portr("c011");
- map(0xc012, 0xc012).r(this, FUNC(aceal_state::unk_r));
+ map(0xc012, 0xc012).r(FUNC(aceal_state::unk_r));
/* vblank */
map(0xc014, 0xc014).portr("c014");
@@ -181,17 +181,17 @@ void aceal_state::main_map(address_map &map)
/* start (must read 1 at least once to make the game run) */
map(0xc016, 0xc016).portr("c016");
- map(0xc017, 0xc017).r(this, FUNC(aceal_state::unk_r));
- map(0xc018, 0xc018).r(this, FUNC(aceal_state::unk_r));
- map(0xc019, 0xc019).r(this, FUNC(aceal_state::unk_r));
-
- map(0xc020, 0xc020).r(this, FUNC(aceal_state::unk_r));
- map(0xc021, 0xc021).r(this, FUNC(aceal_state::unk_r));
- map(0xc022, 0xc022).r(this, FUNC(aceal_state::unk_r));
- map(0xc023, 0xc023).r(this, FUNC(aceal_state::unk_r));
- map(0xc024, 0xc024).r(this, FUNC(aceal_state::unk_r));
- map(0xc025, 0xc025).r(this, FUNC(aceal_state::unk_r));
- map(0xc026, 0xc026).r(this, FUNC(aceal_state::unk_r));
+ map(0xc017, 0xc017).r(FUNC(aceal_state::unk_r));
+ map(0xc018, 0xc018).r(FUNC(aceal_state::unk_r));
+ map(0xc019, 0xc019).r(FUNC(aceal_state::unk_r));
+
+ map(0xc020, 0xc020).r(FUNC(aceal_state::unk_r));
+ map(0xc021, 0xc021).r(FUNC(aceal_state::unk_r));
+ map(0xc022, 0xc022).r(FUNC(aceal_state::unk_r));
+ map(0xc023, 0xc023).r(FUNC(aceal_state::unk_r));
+ map(0xc024, 0xc024).r(FUNC(aceal_state::unk_r));
+ map(0xc025, 0xc025).r(FUNC(aceal_state::unk_r));
+ map(0xc026, 0xc026).r(FUNC(aceal_state::unk_r));
}
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index f7816abf9b0..cd925de66f1 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -337,7 +337,7 @@ void acefruit_state::acefruit_map(address_map &map)
map(0x0000, 0x1fff).rom();
map(0x2000, 0x20ff).ram().share("nvram");
map(0x4000, 0x43ff).ram().share("videoram");
- map(0x4400, 0x47ff).ram().w(this, FUNC(acefruit_state::acefruit_colorram_w)).share("colorram");
+ map(0x4400, 0x47ff).ram().w(FUNC(acefruit_state::acefruit_colorram_w)).share("colorram");
map(0x8000, 0x8000).portr("IN0");
map(0x8001, 0x8001).portr("IN1");
map(0x8002, 0x8002).portr("IN2");
@@ -347,10 +347,10 @@ void acefruit_state::acefruit_map(address_map &map)
map(0x8006, 0x8006).portr("IN6");
map(0x8007, 0x8007).portr("IN7");
map(0x6000, 0x6005).ram().share("spriteram");
- map(0xa000, 0xa001).w(this, FUNC(acefruit_state::acefruit_lamp_w));
- map(0xa002, 0xa003).w(this, FUNC(acefruit_state::acefruit_coin_w));
- map(0xa004, 0xa004).w(this, FUNC(acefruit_state::acefruit_solenoid_w));
- map(0xa005, 0xa006).w(this, FUNC(acefruit_state::acefruit_sound_w));
+ map(0xa000, 0xa001).w(FUNC(acefruit_state::acefruit_lamp_w));
+ map(0xa002, 0xa003).w(FUNC(acefruit_state::acefruit_coin_w));
+ map(0xa004, 0xa004).w(FUNC(acefruit_state::acefruit_solenoid_w));
+ map(0xa005, 0xa006).w(FUNC(acefruit_state::acefruit_sound_w));
map(0xc000, 0xc000).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0xe000, 0xffff).rom();
}
diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp
index 8af29c95354..915c1c38f0e 100644
--- a/src/mame/drivers/aces1.cpp
+++ b/src/mame/drivers/aces1.cpp
@@ -294,14 +294,14 @@ void aces1_state::aces1_map(address_map &map)
map(0xafb0, 0xafb3).rw("ic24", FUNC(i8255_device::read), FUNC(i8255_device::write)); // IC24 - lamps, 7segs
map(0xafd0, 0xafd3).rw("ic25", FUNC(i8255_device::read), FUNC(i8255_device::write)); // IC25 - lamps, meters, reel comms (writes)
map(0xafe0, 0xafe3).rw("ic37", FUNC(i8255_device::read), FUNC(i8255_device::write));// IC37 - doors, coins, reel optics (reads)
- map(0xc000, 0xc000).r(this, FUNC(aces1_state::aces1_unk_r)); // illegal or reset irq?
- map(0xe000, 0xe000).rw(this, FUNC(aces1_state::aces1_nmi_counter_reset_r), FUNC(aces1_state::aces1_nmi_counter_reset_w));
+ map(0xc000, 0xc000).r(FUNC(aces1_state::aces1_unk_r)); // illegal or reset irq?
+ map(0xe000, 0xe000).rw(FUNC(aces1_state::aces1_nmi_counter_reset_r), FUNC(aces1_state::aces1_nmi_counter_reset_w));
}
void aces1_state::aces1_portmap(address_map &map)
{
- map(0x00, 0x00).r(this, FUNC(aces1_state::aces1_unk_port00_r)); // read before enabling interrupts?
+ map(0x00, 0x00).r(FUNC(aces1_state::aces1_unk_port00_r)); // read before enabling interrupts?
}
diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp
index 8987e31531a..5e4bae83d17 100644
--- a/src/mame/drivers/acommand.cpp
+++ b/src/mame/drivers/acommand.cpp
@@ -331,7 +331,7 @@ void acommand_state::acommand_map(address_map &map)
map(0x000000, 0x03ffff).rom();
map(0x082000, 0x082005).w(m_bgtmap, FUNC(megasys1_tilemap_device::scroll_w));
map(0x082100, 0x082105).w(m_txtmap, FUNC(megasys1_tilemap_device::scroll_w));
- map(0x082208, 0x082209).w(this, FUNC(acommand_state::ac_unk2_w));
+ map(0x082208, 0x082209).w(FUNC(acommand_state::ac_unk2_w));
map(0x0a0000, 0x0a3fff).ram().w(m_bgtmap, FUNC(megasys1_tilemap_device::write)).share("bgtmap");
map(0x0b0000, 0x0b3fff).ram().w(m_txtmap, FUNC(megasys1_tilemap_device::write)).share("txtmap");
map(0x0b8000, 0x0bffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
@@ -339,17 +339,17 @@ void acommand_state::acommand_map(address_map &map)
map(0x0f8000, 0x0f8fff).ram().share("spriteram");
map(0x0f9000, 0x0fffff).ram();
- map(0x100001, 0x100001).w(this, FUNC(acommand_state::oki_bank_w));
- map(0x100008, 0x100009).portr("IN0").w(this, FUNC(acommand_state::output_lamps_w));
+ map(0x100001, 0x100001).w(FUNC(acommand_state::oki_bank_w));
+ map(0x100008, 0x100009).portr("IN0").w(FUNC(acommand_state::output_lamps_w));
map(0x100014, 0x100017).rw(m_oki1, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff);
map(0x100018, 0x10001b).rw(m_oki2, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff);
- map(0x100040, 0x100041).rw(this, FUNC(acommand_state::ext_devices_0_r), FUNC(acommand_state::ext_devices_0_w));
- map(0x100044, 0x100045).rw(this, FUNC(acommand_state::ext_devices_1_r), FUNC(acommand_state::ext_devices_1_w));
- map(0x100048, 0x100049).w(this, FUNC(acommand_state::ext_devices_2_w));
+ map(0x100040, 0x100041).rw(FUNC(acommand_state::ext_devices_0_r), FUNC(acommand_state::ext_devices_0_w));
+ map(0x100044, 0x100045).rw(FUNC(acommand_state::ext_devices_1_r), FUNC(acommand_state::ext_devices_1_w));
+ map(0x100048, 0x100049).w(FUNC(acommand_state::ext_devices_2_w));
- map(0x100050, 0x100051).w(this, FUNC(acommand_state::output_7seg0_w));
- map(0x100054, 0x100055).w(this, FUNC(acommand_state::output_7seg1_w));
+ map(0x100050, 0x100051).w(FUNC(acommand_state::output_7seg0_w));
+ map(0x100054, 0x100055).w(FUNC(acommand_state::output_7seg1_w));
map(0x10005c, 0x10005d).portr("DSW");
}
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 08e9c50d3f5..7ab23c343d5 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -77,7 +77,7 @@ void actfancr_state::actfan_map(address_map &map)
map(0x070010, 0x07001f).w(m_tilegen2, FUNC(deco_bac06_device::pf_control1_8bit_swap_w));
map(0x072000, 0x0727ff).rw(m_tilegen2, FUNC(deco_bac06_device::pf_data_8bit_swap_r), FUNC(deco_bac06_device::pf_data_8bit_swap_w));
map(0x100000, 0x1007ff).ram().share("spriteram");
- map(0x110000, 0x110001).w(this, FUNC(actfancr_state::actfancr_buffer_spriteram_w));
+ map(0x110000, 0x110001).w(FUNC(actfancr_state::actfancr_buffer_spriteram_w));
map(0x120000, 0x1205ff).ram().w("palette", FUNC(palette_device::write8)).share("palette");
map(0x130000, 0x130000).portr("P1");
map(0x130001, 0x130001).portr("P2");
@@ -100,12 +100,12 @@ void actfancr_state::triothep_map(address_map &map)
map(0x064000, 0x0647ff).rw(m_tilegen1, FUNC(deco_bac06_device::pf_data_8bit_swap_r), FUNC(deco_bac06_device::pf_data_8bit_swap_w));
map(0x066400, 0x0667ff).rw(m_tilegen1, FUNC(deco_bac06_device::pf_rowscroll_8bit_swap_r), FUNC(deco_bac06_device::pf_rowscroll_8bit_swap_w));
map(0x100000, 0x100000).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0x110000, 0x110001).w(this, FUNC(actfancr_state::actfancr_buffer_spriteram_w));
+ map(0x110000, 0x110001).w(FUNC(actfancr_state::actfancr_buffer_spriteram_w));
map(0x120000, 0x1207ff).ram().share("spriteram");
map(0x130000, 0x1305ff).ram().w("palette", FUNC(palette_device::write8)).share("palette");
map(0x140000, 0x140001).nopr(); /* Value doesn't matter */
map(0x1f0000, 0x1f3fff).ram().share("main_ram"); /* Main ram */
- map(0x1ff000, 0x1ff001).rw(this, FUNC(actfancr_state::triothep_control_r), FUNC(actfancr_state::triothep_control_select_w));
+ map(0x1ff000, 0x1ff001).rw(FUNC(actfancr_state::triothep_control_r), FUNC(actfancr_state::triothep_control_select_w));
map(0x1ff400, 0x1ff403).w(m_maincpu, FUNC(h6280_device::irq_status_w));
}
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index 9a410eeecb7..fccb91c2abe 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -544,24 +544,16 @@ READ8_MEMBER( adam_state::iorq_r )
case 5:
if (BIT(offset, 0))
- {
- data = m_vdc->register_read(space, 0);
- }
+ data = m_vdc->register_read();
else
- {
- data = m_vdc->vram_read(space, 0);
- }
+ data = m_vdc->vram_read();
break;
case 7:
if (BIT(offset, 1))
- {
data = m_joy2->read();
- }
else
- {
data = m_joy1->read();
- }
break;
}
@@ -600,13 +592,9 @@ WRITE8_MEMBER( adam_state::iorq_w )
case 5:
if (BIT(offset, 0))
- {
- m_vdc->register_write(space, 0, data);
- }
+ m_vdc->register_write(data);
else
- {
- m_vdc->vram_write(space, 0, data);
- }
+ m_vdc->vram_write(data);
break;
case 6:
@@ -617,7 +605,7 @@ WRITE8_MEMBER( adam_state::iorq_w )
break;
case 7:
- m_psg->write(space, 0, data);
+ m_psg->write(data);
break;
}
@@ -876,7 +864,7 @@ WRITE8_MEMBER( adam_state::m6801_p4_w )
void adam_state::adam_mem(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(adam_state::mreq_r), FUNC(adam_state::mreq_w));
+ map(0x0000, 0xffff).rw(FUNC(adam_state::mreq_r), FUNC(adam_state::mreq_w));
}
@@ -886,7 +874,7 @@ void adam_state::adam_mem(address_map &map)
void adam_state::adam_io(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(adam_state::iorq_r), FUNC(adam_state::iorq_w));
+ map(0x0000, 0xffff).rw(FUNC(adam_state::iorq_r), FUNC(adam_state::iorq_w));
}
@@ -908,10 +896,10 @@ void adam_state::m6801_mem(address_map &map)
void adam_state::m6801_io(address_map &map)
{
- map(M6801_PORT1, M6801_PORT1).w(this, FUNC(adam_state::m6801_p1_w));
- map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(adam_state::m6801_p2_r), FUNC(adam_state::m6801_p2_w));
- map(M6801_PORT3, M6801_PORT3).rw(this, FUNC(adam_state::m6801_p3_r), FUNC(adam_state::m6801_p3_w));
- map(M6801_PORT4, M6801_PORT4).w(this, FUNC(adam_state::m6801_p4_w));
+ map(M6801_PORT1, M6801_PORT1).w(FUNC(adam_state::m6801_p1_w));
+ map(M6801_PORT2, M6801_PORT2).rw(FUNC(adam_state::m6801_p2_r), FUNC(adam_state::m6801_p2_w));
+ map(M6801_PORT3, M6801_PORT3).rw(FUNC(adam_state::m6801_p3_r), FUNC(adam_state::m6801_p3_w));
+ map(M6801_PORT4, M6801_PORT4).w(FUNC(adam_state::m6801_p4_w));
}
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp
index 757e3969d95..f29fb4fd7d4 100644
--- a/src/mame/drivers/adp.cpp
+++ b/src/mame/drivers/adp.cpp
@@ -309,7 +309,7 @@ void adp_state::skattv_mem(address_map &map)
map(0x000000, 0x0fffff).rom();
map(0x800080, 0x800081).rw("acrtc", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w));
map(0x800082, 0x800083).rw("acrtc", FUNC(hd63484_device::data16_r), FUNC(hd63484_device::data16_w));
- map(0x800100, 0x800101).rw(this, FUNC(adp_state::input_r), FUNC(adp_state::input_w));
+ map(0x800100, 0x800101).rw(FUNC(adp_state::input_r), FUNC(adp_state::input_w));
map(0x800140, 0x800143).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)).umask16(0x00ff); //18b too
map(0x800180, 0x80019f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff);
map(0xffc000, 0xffffff).ram().share("nvram");
@@ -359,7 +359,7 @@ void adp_state::fstation_mem(address_map &map)
map(0x000000, 0x0fffff).rom();
map(0x800080, 0x800081).rw("acrtc", FUNC(hd63484_device::status16_r), FUNC(hd63484_device::address16_w));
map(0x800082, 0x800083).rw("acrtc", FUNC(hd63484_device::data16_r), FUNC(hd63484_device::data16_w));
- map(0x800100, 0x800101).rw(this, FUNC(adp_state::input_r), FUNC(adp_state::input_w));
+ map(0x800100, 0x800101).rw(FUNC(adp_state::input_r), FUNC(adp_state::input_w));
map(0x800140, 0x800143).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)).umask16(0x00ff); //18b too
map(0x800180, 0x80019f).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff);
map(0xfc0000, 0xffffff).ram().share("nvram");
diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp
index 3631d177753..5cd747bce80 100644
--- a/src/mame/drivers/advision.cpp
+++ b/src/mame/drivers/advision.cpp
@@ -39,12 +39,12 @@ READ8_MEMBER( advision_state::rom_r )
void advision_state::program_map(address_map &map)
{
map(0x0000, 0x03ff).bankr("bank1");
- map(0x0400, 0x0fff).r(this, FUNC(advision_state::rom_r));
+ map(0x0400, 0x0fff).r(FUNC(advision_state::rom_r));
}
void advision_state::io_map(address_map &map)
{
- map(0x00, 0xff).rw(this, FUNC(advision_state::ext_ram_r), FUNC(advision_state::ext_ram_w));
+ map(0x00, 0xff).rw(FUNC(advision_state::ext_ram_r), FUNC(advision_state::ext_ram_w));
}
/* Input Ports */
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index ca6bca9d49c..b51b554cec8 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -82,24 +82,24 @@ WRITE8_MEMBER(aeroboto_state::aeroboto_1a2_w)
void aeroboto_state::main_map(address_map &map)
{
map(0x0000, 0x07ff).ram().share("mainram"); // main RAM
- map(0x01a2, 0x01a2).w(this, FUNC(aeroboto_state::aeroboto_1a2_w)); // affects IRQ line (more protection?)
+ map(0x01a2, 0x01a2).w(FUNC(aeroboto_state::aeroboto_1a2_w)); // affects IRQ line (more protection?)
map(0x0800, 0x08ff).ram(); // tile color buffer; copied to 0x2000
map(0x0900, 0x09ff).writeonly(); // a backup of default tile colors
- map(0x1000, 0x17ff).ram().w(this, FUNC(aeroboto_state::aeroboto_videoram_w)).share("videoram"); // tile RAM
+ map(0x1000, 0x17ff).ram().w(FUNC(aeroboto_state::aeroboto_videoram_w)).share("videoram"); // tile RAM
map(0x1800, 0x183f).ram().share("hscroll"); // horizontal scroll regs
map(0x1840, 0x27ff).nopw(); // cleared during custom LSI test
- map(0x2000, 0x20ff).ram().w(this, FUNC(aeroboto_state::aeroboto_tilecolor_w)).share("tilecolor"); // tile color RAM
+ map(0x2000, 0x20ff).ram().w(FUNC(aeroboto_state::aeroboto_tilecolor_w)).share("tilecolor"); // tile color RAM
map(0x2800, 0x28ff).ram().share("spriteram"); // sprite RAM
map(0x2900, 0x2fff).nopw(); // cleared along with sprite RAM
- map(0x2973, 0x2973).r(this, FUNC(aeroboto_state::aeroboto_2973_r)); // protection read
- map(0x3000, 0x3000).rw(this, FUNC(aeroboto_state::aeroboto_in0_r), FUNC(aeroboto_state::aeroboto_3000_w));
+ map(0x2973, 0x2973).r(FUNC(aeroboto_state::aeroboto_2973_r)); // protection read
+ map(0x3000, 0x3000).rw(FUNC(aeroboto_state::aeroboto_in0_r), FUNC(aeroboto_state::aeroboto_3000_w));
map(0x3001, 0x3001).portr("DSW1").w("soundlatch", FUNC(generic_latch_8_device::write));
map(0x3002, 0x3002).portr("DSW2").w("soundlatch2", FUNC(generic_latch_8_device::write));
map(0x3003, 0x3003).writeonly().share("vscroll");
- map(0x3004, 0x3004).r(this, FUNC(aeroboto_state::aeroboto_201_r)).writeonly().share("starx");
+ map(0x3004, 0x3004).r(FUNC(aeroboto_state::aeroboto_201_r)).writeonly().share("starx");
map(0x3005, 0x3005).writeonly().share("stary"); // usable but probably wrong
map(0x3006, 0x3006).writeonly().share("bgcolor");
- map(0x3800, 0x3800).r(this, FUNC(aeroboto_state::aeroboto_irq_ack_r)); // watchdog or IRQ ack
+ map(0x3800, 0x3800).r(FUNC(aeroboto_state::aeroboto_irq_ack_r)); // watchdog or IRQ ack
map(0x4000, 0xffff).rom(); // main ROM
}
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index 645f16eae0a..bc65f9f4d4d 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -152,16 +152,16 @@ void aerofgt_state::pspikes_map(address_map &map)
map(0x000000, 0x03ffff).rom();
map(0x100000, 0x10ffff).ram(); /* work RAM */
map(0x200000, 0x203fff).ram().share("sprlookupram1");
- map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
map(0xffc000, 0xffc3ff).writeonly().share("spriteram");
map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */
map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfff000, 0xfff001).portr("IN0");
- map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w));
+ map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w));
map(0xfff002, 0xfff003).portr("IN1");
- map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w));
- map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0xfff007, 0xfff007).r(this, FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
+ map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w));
+ map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0xfff007, 0xfff007).r(FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
map(0xfff400, 0xfff403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff);
}
@@ -171,16 +171,16 @@ void aerofgt_state::pspikesb_map(address_map &map)
map(0x100000, 0x10ffff).ram(); /* work RAM */
map(0x200000, 0x203fff).ram().share("sprlookupram1");
map(0xc04000, 0xc04001).nopw();
- map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
map(0xffc000, 0xffcbff).ram().share("spriteram");
map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */
- map(0xffd200, 0xffd201).w(this, FUNC(aerofgt_state::pspikesb_gfxbank_w));
+ map(0xffd200, 0xffd201).w(FUNC(aerofgt_state::pspikesb_gfxbank_w));
map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfff000, 0xfff001).portr("IN0");
map(0xfff002, 0xfff003).portr("IN1");
- map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>));
+ map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>));
map(0xfff007, 0xfff007).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
- map(0xfff008, 0xfff009).w(this, FUNC(aerofgt_state::pspikesb_oki_banking_w));
+ map(0xfff008, 0xfff009).w(FUNC(aerofgt_state::pspikesb_oki_banking_w));
map(0xfff400, 0xfff403).nopw(); // GGA access
}
@@ -190,20 +190,20 @@ void aerofgt_state::spikes91_map(address_map &map)
map(0x100000, 0x10ffff).ram(); /* work RAM */
map(0x200000, 0x203fff).ram().share("sprlookupram1");
map(0xc04000, 0xc04001).nopw();
- map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
map(0xffa000, 0xffbfff).ram().share("tx_tilemap_ram");
map(0xffc000, 0xffcfff).ram().share("spriteram");
- //map(0xffd200, 0xffd201).w(this, FUNC(aerofgt_state::pspikesb_gfxbank_w));
+ //map(0xffd200, 0xffd201).w(FUNC(aerofgt_state::pspikesb_gfxbank_w));
map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */
map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfff000, 0xfff001).portr("IN0");
map(0xfff002, 0xfff003).portr("IN1");
- map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w));
- map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>));
+ map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w));
+ map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>));
map(0xfff006, 0xfff007).noprw();
- map(0xfff008, 0xfff009).w(this, FUNC(aerofgt_state::spikes91_lookup_w));
+ map(0xfff008, 0xfff009).w(FUNC(aerofgt_state::spikes91_lookup_w));
}
void aerofgt_state::pspikesc_map(address_map &map)
@@ -211,16 +211,16 @@ void aerofgt_state::pspikesc_map(address_map &map)
map(0x000000, 0x03ffff).rom();
map(0x100000, 0x10ffff).ram(); /* work RAM */
map(0x200000, 0x203fff).ram().share("sprlookupram1");
- map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
map(0xffc000, 0xffcbff).ram().share("spriteram");
map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */
map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfff000, 0xfff001).portr("IN0");
- map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w));
+ map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w));
map(0xfff002, 0xfff003).portr("IN1");
- map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w));
+ map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w));
map(0xfff004, 0xfff005).portr("DSW");
- map(0xfff004, 0xfff005).w(this, FUNC(aerofgt_state::scrolly_w<0>));
+ map(0xfff004, 0xfff005).w(FUNC(aerofgt_state::scrolly_w<0>));
map(0xfff007, 0xfff007).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0xfff400, 0xfff403).nopw(); // GGA access
}
@@ -230,16 +230,16 @@ void aerofgt_state::kickball_map(address_map &map)
map(0x000000, 0x07ffff).rom();
map(0x100000, 0x10ffff).ram(); /* work RAM */
map(0x200000, 0x20ffff).ram().share("sprlookupram1");
- map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
map(0xffc000, 0xffc3ff).writeonly().share("spriteram");
map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */
map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfff000, 0xfff001).portr("IN0");
- map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w));
+ map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w));
map(0xfff002, 0xfff003).portr("IN1");
- map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::kickball_gfxbank_w));
- map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0xfff007, 0xfff007).r(this, FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
+ map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::kickball_gfxbank_w));
+ map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0xfff007, 0xfff007).r(FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
map(0xfff400, 0xfff403).nopw(); // GGA access
}
@@ -247,8 +247,8 @@ void aerofgt_state::karatblz_map(address_map &map)
{
map.global_mask(0xfffff);
map(0x000000, 0x07ffff).rom();
- map(0x080000, 0x081fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x082000, 0x083fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x080000, 0x081fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x082000, 0x083fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0x0a0000, 0x0affff).ram().share("sprlookupram1");
map(0x0b0000, 0x0bffff).ram().share("sprlookupram2");
map(0x0c0000, 0x0cffff).ram(); /* work RAM */
@@ -256,17 +256,17 @@ void aerofgt_state::karatblz_map(address_map &map)
map(0x0fc000, 0x0fc7ff).ram().share("spriteram");
map(0x0fe000, 0x0fe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x0ff000, 0x0ff001).portr("IN0");
- map(0x0ff000, 0x0ff000).w(this, FUNC(aerofgt_state::spinlbrk_flip_screen_w));
+ map(0x0ff000, 0x0ff000).w(FUNC(aerofgt_state::spinlbrk_flip_screen_w));
map(0x0ff002, 0x0ff003).portr("IN1");
- map(0x0ff002, 0x0ff002).w(this, FUNC(aerofgt_state::karatblz_gfxbank_w));
+ map(0x0ff002, 0x0ff002).w(FUNC(aerofgt_state::karatblz_gfxbank_w));
map(0x0ff004, 0x0ff005).portr("IN2");
map(0x0ff006, 0x0ff007).portr("IN3");
map(0x0ff007, 0x0ff007).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0x0ff008, 0x0ff009).portr("DSW").w(this, FUNC(aerofgt_state::scrollx_w<0>));
- map(0x0ff00b, 0x0ff00b).r(this, FUNC(aerofgt_state::pending_command_r));
- map(0x0ff00a, 0x0ff00b).w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0x0ff00c, 0x0ff00d).w(this, FUNC(aerofgt_state::scrollx_w<1>));
- map(0x0ff00e, 0x0ff00f).w(this, FUNC(aerofgt_state::scrolly_w<1>));
+ map(0x0ff008, 0x0ff009).portr("DSW").w(FUNC(aerofgt_state::scrollx_w<0>));
+ map(0x0ff00b, 0x0ff00b).r(FUNC(aerofgt_state::pending_command_r));
+ map(0x0ff00a, 0x0ff00b).w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0x0ff00c, 0x0ff00d).w(FUNC(aerofgt_state::scrollx_w<1>));
+ map(0x0ff00e, 0x0ff00f).w(FUNC(aerofgt_state::scrolly_w<1>));
map(0x0ff400, 0x0ff403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff);
}
@@ -274,8 +274,8 @@ void aerofgt_state::karatblzbl_map(address_map &map)
{
map.global_mask(0xfffff);
map(0x000000, 0x07ffff).rom();
- map(0x080000, 0x081fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x082000, 0x083fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x080000, 0x081fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x082000, 0x083fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0x0a0000, 0x0affff).ram().share("sprlookupram1");
map(0x0b0000, 0x0bffff).ram().share("sprlookupram2");
map(0x0c0000, 0x0cffff).ram(); /* work RAM */
@@ -283,33 +283,33 @@ void aerofgt_state::karatblzbl_map(address_map &map)
map(0x0fc000, 0x0fc7ff).ram().share("spriteram");
map(0x0fe000, 0x0fe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x0ff000, 0x0ff001).portr("IN0");
- map(0x0ff000, 0x0ff000).w(this, FUNC(aerofgt_state::spinlbrk_flip_screen_w));
+ map(0x0ff000, 0x0ff000).w(FUNC(aerofgt_state::spinlbrk_flip_screen_w));
map(0x0ff002, 0x0ff003).portr("IN1");
- map(0x0ff002, 0x0ff002).w(this, FUNC(aerofgt_state::karatblz_gfxbank_w));
+ map(0x0ff002, 0x0ff002).w(FUNC(aerofgt_state::karatblz_gfxbank_w));
map(0x0ff004, 0x0ff005).portr("IN2");
map(0x0ff006, 0x0ff007).portr("IN3");
- map(0x0ff007, 0x0ff007).w(this, FUNC(aerofgt_state::karatblzbl_soundlatch_w));
- map(0x0ff008, 0x0ff009).portr("DSW").w(this, FUNC(aerofgt_state::scrollx_w<0>));
- map(0x0ff00b, 0x0ff00b).r(this, FUNC(aerofgt_state::pending_command_r));
- map(0x0ff00a, 0x0ff00b).w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0x0ff00c, 0x0ff00d).w(this, FUNC(aerofgt_state::scrollx_w<1>));
- map(0x0ff00e, 0x0ff00f).w(this, FUNC(aerofgt_state::scrolly_w<1>));
+ map(0x0ff007, 0x0ff007).w(FUNC(aerofgt_state::karatblzbl_soundlatch_w));
+ map(0x0ff008, 0x0ff009).portr("DSW").w(FUNC(aerofgt_state::scrollx_w<0>));
+ map(0x0ff00b, 0x0ff00b).r(FUNC(aerofgt_state::pending_command_r));
+ map(0x0ff00a, 0x0ff00b).w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0x0ff00c, 0x0ff00d).w(FUNC(aerofgt_state::scrollx_w<1>));
+ map(0x0ff00e, 0x0ff00f).w(FUNC(aerofgt_state::scrolly_w<1>));
map(0x0ff400, 0x0ff403).nopw(); // GGA access
}
void aerofgt_state::spinlbrk_map(address_map &map)
{
map(0x000000, 0x03ffff).rom();
- map(0x080000, 0x080fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x082000, 0x082fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x080000, 0x080fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x082000, 0x082fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0xff8000, 0xffbfff).ram(); /* work RAM */
map(0xffc000, 0xffc7ff).ram().share("spriteram");
map(0xffd000, 0xffd1ff).ram().share("rasterram"); /* bg1 scroll registers */
map(0xffe000, 0xffe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfff000, 0xfff001).portr("IN0");
- map(0xfff000, 0xfff000).w(this, FUNC(aerofgt_state::spinlbrk_flip_screen_w));
- map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::spinlbrk_gfxbank_w));
- map(0xfff002, 0xfff003).portr("IN1").w(this, FUNC(aerofgt_state::scrollx_w<1>));
+ map(0xfff000, 0xfff000).w(FUNC(aerofgt_state::spinlbrk_flip_screen_w));
+ map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::spinlbrk_gfxbank_w));
+ map(0xfff002, 0xfff003).portr("IN1").w(FUNC(aerofgt_state::scrollx_w<1>));
map(0xfff004, 0xfff005).portr("DSW");
map(0xfff007, 0xfff007).w(m_soundlatch, FUNC(generic_latch_8_device::write));
// map(0xfff008, 0xfff009); - read when analog inputs are enabled
@@ -322,8 +322,8 @@ void aerofgt_state::turbofrc_map(address_map &map)
map.global_mask(0xfffff);
map(0x000000, 0x0bffff).rom();
map(0x0c0000, 0x0cffff).ram(); /* work RAM */
- map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1");
map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2");
map(0x0f8000, 0x0fbfff).ram(); /* work RAM */
@@ -331,13 +331,13 @@ void aerofgt_state::turbofrc_map(address_map &map)
map(0x0fd000, 0x0fdfff).ram().share("rasterram"); /* bg1 scroll registers */
map(0x0fe000, 0x0fe7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x0ff000, 0x0ff001).portr("IN0");
- map(0x0ff001, 0x0ff001).w(this, FUNC(aerofgt_state::turbofrc_flip_screen_w));
- map(0x0ff002, 0x0ff003).portr("IN1").w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0x0ff004, 0x0ff005).portr("DSW").w(this, FUNC(aerofgt_state::scrollx_w<1>));
- map(0x0ff007, 0x0ff007).r(this, FUNC(aerofgt_state::pending_command_r));
- map(0x0ff006, 0x0ff007).w(this, FUNC(aerofgt_state::scrolly_w<1>));
+ map(0x0ff001, 0x0ff001).w(FUNC(aerofgt_state::turbofrc_flip_screen_w));
+ map(0x0ff002, 0x0ff003).portr("IN1").w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0x0ff004, 0x0ff005).portr("DSW").w(FUNC(aerofgt_state::scrollx_w<1>));
+ map(0x0ff007, 0x0ff007).r(FUNC(aerofgt_state::pending_command_r));
+ map(0x0ff006, 0x0ff007).w(FUNC(aerofgt_state::scrolly_w<1>));
map(0x0ff008, 0x0ff009).portr("IN2");
- map(0x0ff008, 0x0ff00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w));
+ map(0x0ff008, 0x0ff00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w));
map(0x0ff00c, 0x0ff00d).nopw(); /* related to bg2 (written together with the scroll registers) */
map(0x0ff00e, 0x0ff00e).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0x0ff400, 0x0ff403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff);
@@ -347,21 +347,21 @@ void aerofgt_state::aerofgtb_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
map(0x0c0000, 0x0cffff).ram(); /* work RAM */
- map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1");
map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2");
map(0x0f8000, 0x0fbfff).ram(); /* work RAM */
map(0x0fc000, 0x0fc7ff).ram().share("spriteram");
map(0x0fd000, 0x0fd7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x0fe000, 0x0fe001).portr("IN0");
- map(0x0fe001, 0x0fe001).w(this, FUNC(aerofgt_state::turbofrc_flip_screen_w));
- map(0x0fe002, 0x0fe003).portr("IN1").w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0x0fe004, 0x0fe005).portr("DSW1").w(this, FUNC(aerofgt_state::scrollx_w<1>));
- map(0x0fe007, 0x0fe007).r(this, FUNC(aerofgt_state::pending_command_r));
- map(0x0fe006, 0x0fe007).w(this, FUNC(aerofgt_state::scrolly_w<1>));
+ map(0x0fe001, 0x0fe001).w(FUNC(aerofgt_state::turbofrc_flip_screen_w));
+ map(0x0fe002, 0x0fe003).portr("IN1").w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0x0fe004, 0x0fe005).portr("DSW1").w(FUNC(aerofgt_state::scrollx_w<1>));
+ map(0x0fe007, 0x0fe007).r(FUNC(aerofgt_state::pending_command_r));
+ map(0x0fe006, 0x0fe007).w(FUNC(aerofgt_state::scrolly_w<1>));
map(0x0fe008, 0x0fe009).portr("DSW2");
- map(0x0fe008, 0x0fe00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w));
+ map(0x0fe008, 0x0fe00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w));
map(0x0fe00e, 0x0fe00e).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0x0fe400, 0x0fe403).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff);
map(0x0ff000, 0x0fffff).ram().share("rasterram"); /* used only for the scroll registers */
@@ -374,14 +374,14 @@ void aerofgt_state::aerofgt_map(address_map &map)
map(0x1b0000, 0x1b07ff).ram().share("rasterram"); /* used only for the scroll registers */
map(0x1b0800, 0x1b0801).ram(); /* tracks watchdog state */
map(0x1b0ff0, 0x1b0fff).ram(); /* stack area during boot */
- map(0x1b2000, 0x1b3fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x1b4000, 0x1b5fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x1b2000, 0x1b3fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x1b4000, 0x1b5fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0x1c0000, 0x1c7fff).ram().share("sprlookupram1");
map(0x1d0000, 0x1d1fff).ram().share("spriteram");
map(0xfef000, 0xffefff).ram(); /* work RAM */
- map(0xffff80, 0xffff87).w(this, FUNC(aerofgt_state::aerofgt_gfxbank_w));
- map(0xffff88, 0xffff89).w(this, FUNC(aerofgt_state::scrolly_w<0>)); /* + something else in the top byte */
- map(0xffff90, 0xffff91).w(this, FUNC(aerofgt_state::scrolly_w<1>)); /* + something else in the top byte */
+ map(0xffff80, 0xffff87).w(FUNC(aerofgt_state::aerofgt_gfxbank_w));
+ map(0xffff88, 0xffff89).w(FUNC(aerofgt_state::scrolly_w<0>)); /* + something else in the top byte */
+ map(0xffff90, 0xffff91).w(FUNC(aerofgt_state::scrolly_w<1>)); /* + something else in the top byte */
map(0xffffa0, 0xffffbf).rw("io", FUNC(vs9209_device::read), FUNC(vs9209_device::write)).umask16(0x00ff);
map(0xffffc1, 0xffffc1).w(m_soundlatch, FUNC(generic_latch_8_device::write));
}
@@ -390,8 +390,8 @@ void aerofgt_state::aerfboot_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
map(0x0c0000, 0x0cffff).ram(); /* work RAM */
- map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1");
map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2");
map(0x0f8000, 0x0fbfff).ram(); /* work RAM */
@@ -401,10 +401,10 @@ void aerofgt_state::aerfboot_map(address_map &map)
map(0x0fe002, 0x0fe003).portr("IN1");
map(0x0fe004, 0x0fe005).portr("DSW1");
map(0x0fe008, 0x0fe009).portr("DSW2");
- map(0x0fe002, 0x0fe003).w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0x0fe004, 0x0fe005).w(this, FUNC(aerofgt_state::scrollx_w<1>));
- map(0x0fe006, 0x0fe007).w(this, FUNC(aerofgt_state::scrolly_w<1>));
- map(0x0fe008, 0x0fe00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w));
+ map(0x0fe002, 0x0fe003).w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0x0fe004, 0x0fe005).w(FUNC(aerofgt_state::scrollx_w<1>));
+ map(0x0fe006, 0x0fe007).w(FUNC(aerofgt_state::scrolly_w<1>));
+ map(0x0fe008, 0x0fe00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w));
map(0x0fe00e, 0x0fe00e).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0x0fe010, 0x0fe011).nopw();
map(0x0fe012, 0x0fe013).nopw(); // MSB = watchdog?
@@ -419,8 +419,8 @@ void aerofgt_state::aerfboo2_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
map(0x0c0000, 0x0cffff).ram(); /* work RAM */
- map(0x0d0000, 0x0d1fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
- map(0x0d2000, 0x0d3fff).ram().w(this, FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
+ map(0x0d0000, 0x0d1fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0x0d2000, 0x0d3fff).ram().w(FUNC(aerofgt_state::vram_w<1>)).share("vram.1");
map(0x0e0000, 0x0e3fff).ram().share("sprlookupram1");
map(0x0e4000, 0x0e7fff).ram().share("sprlookupram2");
map(0x0f8000, 0x0fbfff).ram(); /* work RAM */
@@ -430,15 +430,15 @@ void aerofgt_state::aerfboo2_map(address_map &map)
map(0x0fe002, 0x0fe003).portr("IN1");
map(0x0fe004, 0x0fe005).portr("DSW1");
map(0x0fe008, 0x0fe009).portr("DSW2");
- map(0x0fe002, 0x0fe003).w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0x0fe004, 0x0fe005).w(this, FUNC(aerofgt_state::scrollx_w<1>));
- map(0x0fe006, 0x0fe007).w(this, FUNC(aerofgt_state::scrolly_w<1>));
- map(0x0fe008, 0x0fe00b).w(this, FUNC(aerofgt_state::turbofrc_gfxbank_w));
+ map(0x0fe002, 0x0fe003).w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0x0fe004, 0x0fe005).w(FUNC(aerofgt_state::scrollx_w<1>));
+ map(0x0fe006, 0x0fe007).w(FUNC(aerofgt_state::scrolly_w<1>));
+ map(0x0fe008, 0x0fe00b).w(FUNC(aerofgt_state::turbofrc_gfxbank_w));
map(0x0fe006, 0x0fe006).r(m_oki, FUNC(okim6295_device::read));
map(0x0fe00e, 0x0fe00e).w(m_oki, FUNC(okim6295_device::write));
- map(0x0fe01e, 0x0fe01f).w(this, FUNC(aerofgt_state::aerfboo2_okim6295_banking_w));
+ map(0x0fe01e, 0x0fe01f).w(FUNC(aerofgt_state::aerfboo2_okim6295_banking_w));
// map(0x0fe010, 0x0fe011).nopw();
-// map(0x0fe012, 0x0fe013).w(this, FUNC(aerofgt_state::aerfboot_soundlatch_w));
+// map(0x0fe012, 0x0fe013).w(FUNC(aerofgt_state::aerfboot_soundlatch_w));
map(0x0fe400, 0x0fe403).nopw(); // GGA access
map(0x0ff000, 0x0fffff).ram().share("rasterram"); /* used only for the scroll registers */
}
@@ -449,17 +449,17 @@ void aerofgt_state::wbbc97_map(address_map &map)
map(0x500000, 0x50ffff).ram(); /* work RAM */
map(0x600000, 0x605fff).ram().share("sprlookupram1");
map(0xa00000, 0xa3ffff).ram().share("bitmapram");
- map(0xff8000, 0xff8fff).ram().w(this, FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
+ map(0xff8000, 0xff8fff).ram().w(FUNC(aerofgt_state::vram_w<0>)).share("vram.0");
map(0xffc000, 0xffc3ff).writeonly().share("spriteram");
map(0xffd000, 0xffdfff).ram().share("rasterram"); /* bg1 scroll registers */
map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfff000, 0xfff001).portr("IN0");
- map(0xfff001, 0xfff001).w(this, FUNC(aerofgt_state::pspikes_palette_bank_w));
+ map(0xfff001, 0xfff001).w(FUNC(aerofgt_state::pspikes_palette_bank_w));
map(0xfff002, 0xfff003).portr("IN1");
- map(0xfff003, 0xfff003).w(this, FUNC(aerofgt_state::pspikes_gfxbank_w));
- map(0xfff004, 0xfff005).portr("DSW").w(this, FUNC(aerofgt_state::scrolly_w<0>));
- map(0xfff007, 0xfff007).r(this, FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
- map(0xfff00e, 0xfff00f).w(this, FUNC(aerofgt_state::wbbc97_bitmap_enable_w));
+ map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w));
+ map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>));
+ map(0xfff007, 0xfff007).r(FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
+ map(0xfff00e, 0xfff00f).w(FUNC(aerofgt_state::wbbc97_bitmap_enable_w));
map(0xfff400, 0xfff403).nopw(); // GGA access
}
@@ -473,7 +473,7 @@ void aerofgt_state::sound_map(address_map &map)
void aerofgt_state::spinlbrk_sound_portmap(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).w(this, FUNC(aerofgt_state::spinlbrk_sh_bankswitch_w));
+ map(0x00, 0x00).w(FUNC(aerofgt_state::spinlbrk_sh_bankswitch_w));
map(0x14, 0x14).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w));
map(0x18, 0x1b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write));
}
@@ -481,7 +481,7 @@ void aerofgt_state::spinlbrk_sound_portmap(address_map &map)
void aerofgt_state::turbofrc_sound_portmap(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).w(this, FUNC(aerofgt_state::aerofgt_sh_bankswitch_w));
+ map(0x00, 0x00).w(FUNC(aerofgt_state::aerofgt_sh_bankswitch_w));
map(0x14, 0x14).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w));
map(0x18, 0x1b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write));
}
@@ -490,7 +490,7 @@ void aerofgt_state::aerofgt_sound_portmap(address_map &map)
{
map.global_mask(0xff);
map(0x00, 0x03).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write));
- map(0x04, 0x04).w(this, FUNC(aerofgt_state::aerofgt_sh_bankswitch_w));
+ map(0x04, 0x04).w(FUNC(aerofgt_state::aerofgt_sh_bankswitch_w));
map(0x08, 0x08).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w));
map(0x0c, 0x0c).r(m_soundlatch, FUNC(generic_latch_8_device::read));
}
@@ -499,7 +499,7 @@ void aerofgt_state::aerfboot_sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0x87ff).ram();
- map(0x9000, 0x9000).w(this, FUNC(aerofgt_state::aerfboot_okim6295_banking_w));
+ map(0x9000, 0x9000).w(FUNC(aerofgt_state::aerfboot_okim6295_banking_w));
map(0x9800, 0x9800).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
}
@@ -526,8 +526,8 @@ void aerofgt_state::karatblzbl_sound_portmap(address_map &map)
map.global_mask(0xff);
map(0x00, 0x00).rw("ymsnd", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w));
map(0x20, 0x20).w("ymsnd", FUNC(ym3812_device::write_port_w));
- map(0x40, 0x40).w(this, FUNC(aerofgt_state::karatblzbl_d7759_write_port_0_w));
- map(0x80, 0x80).w(this, FUNC(aerofgt_state::karatblzbl_d7759_reset_w));
+ map(0x40, 0x40).w(FUNC(aerofgt_state::karatblzbl_d7759_write_port_0_w));
+ map(0x80, 0x80).w(FUNC(aerofgt_state::karatblzbl_d7759_reset_w));
}
void aerofgt_state::kickball_sound_map(address_map &map)
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index c42bff09c4e..7323102695c 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -692,27 +692,27 @@ WRITE8_MEMBER(agat7_state::agat7_ram_w)
void agat7_state::agat7_map(address_map &map)
{
map.unmap_value_high();
- map(0x0000, 0xbfff).rw(this, FUNC(agat7_state::agat7_ram_r), FUNC(agat7_state::agat7_ram_w));
- map(0xc000, 0xc000).mirror(0xf).r(this, FUNC(agat7_state::keyb_data_r)).nopw();
- map(0xc010, 0xc010).mirror(0xf).rw(this, FUNC(agat7_state::keyb_strobe_r), FUNC(agat7_state::keyb_strobe_w));
- map(0xc020, 0xc020).mirror(0xf).rw(this, FUNC(agat7_state::cassette_toggle_r), FUNC(agat7_state::cassette_toggle_w));
- map(0xc030, 0xc030).mirror(0xf).rw(this, FUNC(agat7_state::speaker_toggle_r), FUNC(agat7_state::speaker_toggle_w));
- map(0xc040, 0xc040).mirror(0xf).rw(this, FUNC(agat7_state::interrupts_on_r), FUNC(agat7_state::interrupts_on_w));
- map(0xc050, 0xc050).mirror(0xf).rw(this, FUNC(agat7_state::interrupts_off_r), FUNC(agat7_state::interrupts_off_w));
- map(0xc060, 0xc067).mirror(0x8).r(this, FUNC(agat7_state::flags_r)).nopw();
- map(0xc070, 0xc070).mirror(0xf).rw(this, FUNC(agat7_state::controller_strobe_r), FUNC(agat7_state::controller_strobe_w));
- map(0xc080, 0xc0ef).rw(this, FUNC(agat7_state::c080_r), FUNC(agat7_state::c080_w));
- map(0xc0f0, 0xc0ff).rw(this, FUNC(agat7_state::agat7_membank_r), FUNC(agat7_state::agat7_membank_w));
- map(0xc100, 0xc6ff).rw(this, FUNC(agat7_state::c100_r), FUNC(agat7_state::c100_w));
+ map(0x0000, 0xbfff).rw(FUNC(agat7_state::agat7_ram_r), FUNC(agat7_state::agat7_ram_w));
+ map(0xc000, 0xc000).mirror(0xf).r(FUNC(agat7_state::keyb_data_r)).nopw();
+ map(0xc010, 0xc010).mirror(0xf).rw(FUNC(agat7_state::keyb_strobe_r), FUNC(agat7_state::keyb_strobe_w));
+ map(0xc020, 0xc020).mirror(0xf).rw(FUNC(agat7_state::cassette_toggle_r), FUNC(agat7_state::cassette_toggle_w));
+ map(0xc030, 0xc030).mirror(0xf).rw(FUNC(agat7_state::speaker_toggle_r), FUNC(agat7_state::speaker_toggle_w));
+ map(0xc040, 0xc040).mirror(0xf).rw(FUNC(agat7_state::interrupts_on_r), FUNC(agat7_state::interrupts_on_w));
+ map(0xc050, 0xc050).mirror(0xf).rw(FUNC(agat7_state::interrupts_off_r), FUNC(agat7_state::interrupts_off_w));
+ map(0xc060, 0xc067).mirror(0x8).r(FUNC(agat7_state::flags_r)).nopw();
+ map(0xc070, 0xc070).mirror(0xf).rw(FUNC(agat7_state::controller_strobe_r), FUNC(agat7_state::controller_strobe_w));
+ map(0xc080, 0xc0ef).rw(FUNC(agat7_state::c080_r), FUNC(agat7_state::c080_w));
+ map(0xc0f0, 0xc0ff).rw(FUNC(agat7_state::agat7_membank_r), FUNC(agat7_state::agat7_membank_w));
+ map(0xc100, 0xc6ff).rw(FUNC(agat7_state::c100_r), FUNC(agat7_state::c100_w));
map(0xc700, 0xc7ff).rw("a7video", FUNC(agat7video_device::read), FUNC(agat7video_device::write));
- map(0xc800, 0xcfff).rw(this, FUNC(agat7_state::c800_r), FUNC(agat7_state::c800_w));
+ map(0xc800, 0xcfff).rw(FUNC(agat7_state::c800_r), FUNC(agat7_state::c800_w));
map(0xd000, 0xffff).m(m_upperbank, FUNC(address_map_bank_device::amap8));
}
void agat7_state::inhbank_map(address_map &map)
{
- map(0x0000, 0x2fff).rom().region("maincpu", 0x1000).w(this, FUNC(agat7_state::inh_w));
- map(0x3000, 0x5fff).rw(this, FUNC(agat7_state::inh_r), FUNC(agat7_state::inh_w));
+ map(0x0000, 0x2fff).rom().region("maincpu", 0x1000).w(FUNC(agat7_state::inh_w));
+ map(0x3000, 0x5fff).rw(FUNC(agat7_state::inh_r), FUNC(agat7_state::inh_w));
}
/***************************************************************************
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index 4f841869de4..ed5851891fc 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -333,19 +333,19 @@ void airbustr_state::master_map(address_map &map)
void airbustr_state::master_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).w(this, FUNC(airbustr_state::master_bankswitch_w));
+ map(0x00, 0x00).w(FUNC(airbustr_state::master_bankswitch_w));
map(0x01, 0x01).nopw(); // ???
- map(0x02, 0x02).w(this, FUNC(airbustr_state::master_nmi_trigger_w));
+ map(0x02, 0x02).w(FUNC(airbustr_state::master_nmi_trigger_w));
}
void airbustr_state::slave_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0xbfff).bankr("slavebank");
- map(0xc000, 0xc3ff).ram().w(this, FUNC(airbustr_state::videoram_w<1>)).share("videoram2");
- map(0xc400, 0xc7ff).ram().w(this, FUNC(airbustr_state::colorram_w<1>)).share("colorram2");
- map(0xc800, 0xcbff).ram().w(this, FUNC(airbustr_state::videoram_w<0>)).share("videoram1");
- map(0xcc00, 0xcfff).ram().w(this, FUNC(airbustr_state::colorram_w<0>)).share("colorram1");
+ map(0xc000, 0xc3ff).ram().w(FUNC(airbustr_state::videoram_w<1>)).share("videoram2");
+ map(0xc400, 0xc7ff).ram().w(FUNC(airbustr_state::colorram_w<1>)).share("colorram2");
+ map(0xc800, 0xcbff).ram().w(FUNC(airbustr_state::videoram_w<0>)).share("videoram1");
+ map(0xcc00, 0xcfff).ram().w(FUNC(airbustr_state::colorram_w<0>)).share("colorram1");
map(0xd000, 0xd5ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
map(0xd600, 0xdfff).ram();
map(0xe000, 0xefff).ram();
@@ -355,14 +355,14 @@ void airbustr_state::slave_map(address_map &map)
void airbustr_state::slave_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).w(this, FUNC(airbustr_state::slave_bankswitch_w));
+ map(0x00, 0x00).w(FUNC(airbustr_state::slave_bankswitch_w));
map(0x02, 0x02).r(m_soundlatch[1], FUNC(generic_latch_8_device::read)).w(m_soundlatch[0], FUNC(generic_latch_8_device::write));
- map(0x04, 0x0c).w(this, FUNC(airbustr_state::scrollregs_w));
- map(0x0e, 0x0e).r(this, FUNC(airbustr_state::soundcommand_status_r));
+ map(0x04, 0x0c).w(FUNC(airbustr_state::scrollregs_w));
+ map(0x0e, 0x0e).r(FUNC(airbustr_state::soundcommand_status_r));
map(0x20, 0x20).portr("P1");
map(0x22, 0x22).portr("P2");
map(0x24, 0x24).portr("SYSTEM");
- map(0x28, 0x28).w(this, FUNC(airbustr_state::coin_counter_w));
+ map(0x28, 0x28).w(FUNC(airbustr_state::coin_counter_w));
map(0x38, 0x38).nopw(); // irq ack / irq mask
}
@@ -376,7 +376,7 @@ void airbustr_state::sound_map(address_map &map)
void airbustr_state::sound_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).w(this, FUNC(airbustr_state::sound_bankswitch_w));
+ map(0x00, 0x00).w(FUNC(airbustr_state::sound_bankswitch_w));
map(0x02, 0x03).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
map(0x04, 0x04).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0x06, 0x06).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)).w(m_soundlatch[1], FUNC(generic_latch_8_device::write));
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index a42e8a4fcae..83e62fb306f 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -253,16 +253,16 @@ void airraid_state::airraid_map(address_map &map)
map(0xc002, 0xc002).portr("IN2");
map(0xc003, 0xc003).portr("DSW2");
map(0xc004, 0xc004).portr("DSW1");
- map(0xc500, 0xc500).w(this, FUNC(airraid_state::cshooter_c500_w));
+ map(0xc500, 0xc500).w(FUNC(airraid_state::cshooter_c500_w));
// AM_RANGE(0xc600, 0xc600) AM_WRITE(cshooter_c600_w) // see notes
- map(0xc700, 0xc700).w(this, FUNC(airraid_state::cshooter_c700_w));
+ map(0xc700, 0xc700).w(FUNC(airraid_state::cshooter_c700_w));
// AM_RANGE(0xc801, 0xc801) AM_WRITE(cshooter_c801_w) // see notes
map(0xd000, 0xd7ff).ram().w(m_airraid_video, FUNC(airraid_video_device::txram_w)).share("txram");
map(0xd800, 0xd8ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
map(0xda00, 0xdaff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext");
map(0xdc00, 0xdc0f).ram().w(m_airraid_video, FUNC(airraid_video_device::vregs_w)).share("vregs");
// AM_RANGE(0xdc10, 0xdc10) AM_RAM
- map(0xdc11, 0xdc11).w(this, FUNC(airraid_state::bank_w));
+ map(0xdc11, 0xdc11).w(FUNC(airraid_state::bank_w));
// AM_RANGE(0xdc19, 0xdc19) AM_RAM
// AM_RANGE(0xdc1e, 0xdc1e) AM_RAM
// AM_RANGE(0xdc1f, 0xdc1f) AM_RAM
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index 0361a857c14..2933d1c2b84 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -25,7 +25,7 @@
void ajax_state::ajax_main_map(address_map &map)
{
- map(0x0000, 0x01c0).rw(this, FUNC(ajax_state::ls138_f10_r), FUNC(ajax_state::ls138_f10_w)); /* bankswitch + sound command + FIRQ command */
+ map(0x0000, 0x01c0).rw(FUNC(ajax_state::ls138_f10_r), FUNC(ajax_state::ls138_f10_w)); /* bankswitch + sound command + FIRQ command */
map(0x0800, 0x0807).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)); /* sprite control registers */
map(0x0c00, 0x0fff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)); /* sprite RAM 2128SL at J7 */
map(0x1000, 0x1fff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");/* palette */
@@ -40,7 +40,7 @@ void ajax_state::ajax_sub_map(address_map &map)
map(0x0000, 0x07ff).rw(m_k051316, FUNC(k051316_device::read), FUNC(k051316_device::write)); /* 051316 zoom/rotation layer */
map(0x0800, 0x080f).w(m_k051316, FUNC(k051316_device::ctrl_w)); /* 051316 control registers */
map(0x1000, 0x17ff).r(m_k051316, FUNC(k051316_device::rom_r)); /* 051316 (ROM test) */
- map(0x1800, 0x1800).w(this, FUNC(ajax_state::bankswitch_2_w)); /* bankswitch control */
+ map(0x1800, 0x1800).w(FUNC(ajax_state::bankswitch_2_w)); /* bankswitch control */
map(0x2000, 0x3fff).ram().share("share1"); /* shared RAM with the 052001 */
map(0x4000, 0x7fff).rw(m_k052109, FUNC(k052109_device::read), FUNC(k052109_device::write)); /* video RAM + color RAM + video registers */
map(0x8000, 0x9fff).bankr("subbank"); /* banked ROM */
@@ -51,10 +51,10 @@ void ajax_state::ajax_sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom(); /* ROM F6 */
map(0x8000, 0x87ff).ram(); /* RAM 2128SL at D16 */
- map(0x9000, 0x9000).w(this, FUNC(ajax_state::sound_bank_w)); /* 007232 bankswitch */
+ map(0x9000, 0x9000).w(FUNC(ajax_state::sound_bank_w)); /* 007232 bankswitch */
map(0xa000, 0xa00d).rw(m_k007232_1, FUNC(k007232_device::read), FUNC(k007232_device::write)); /* 007232 registers (chip 1) */
map(0xb000, 0xb00d).rw(m_k007232_2, FUNC(k007232_device::read), FUNC(k007232_device::write)); /* 007232 registers (chip 2) */
- map(0xb80c, 0xb80c).w(this, FUNC(ajax_state::k007232_extvol_w)); /* extra volume, goes to the 007232 w/ A11 */
+ map(0xb80c, 0xb80c).w(FUNC(ajax_state::k007232_extvol_w)); /* extra volume, goes to the 007232 w/ A11 */
/* selecting a different latch for the external port */
map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); /* YM2151 */
map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp
index 27392c688af..1700f6e3d45 100644
--- a/src/mame/drivers/albazc.cpp
+++ b/src/mame/drivers/albazc.cpp
@@ -188,16 +188,16 @@ void albazc_state::hanaroku_map(address_map &map)
map(0x9000, 0x97ff).ram().share("spriteram2");
map(0xa000, 0xa1ff).ram().share("spriteram3");
map(0xa200, 0xa2ff).nopw(); // ??? written once during P.O.S.T.
- map(0xa300, 0xa304).w(this, FUNC(albazc_state::albazc_vregs_w)); // ???
+ map(0xa300, 0xa304).w(FUNC(albazc_state::albazc_vregs_w)); // ???
map(0xb000, 0xb000).nopw(); // ??? always 0x40
map(0xc000, 0xc3ff).ram(); // main ram
map(0xc400, 0xc4ff).ram().share("nvram");
map(0xd000, 0xd000).r("aysnd", FUNC(ay8910_device::data_r));
map(0xd000, 0xd001).w("aysnd", FUNC(ay8910_device::address_data_w));
- map(0xe000, 0xe000).portr("IN0").w(this, FUNC(albazc_state::hanaroku_out_0_w));
+ map(0xe000, 0xe000).portr("IN0").w(FUNC(albazc_state::hanaroku_out_0_w));
map(0xe001, 0xe001).portr("IN1");
- map(0xe002, 0xe002).portr("IN2").w(this, FUNC(albazc_state::hanaroku_out_1_w));
- map(0xe004, 0xe004).portr("DSW3").w(this, FUNC(albazc_state::hanaroku_out_2_w));
+ map(0xe002, 0xe002).portr("IN2").w(FUNC(albazc_state::hanaroku_out_1_w));
+ map(0xe004, 0xe004).portr("DSW3").w(FUNC(albazc_state::hanaroku_out_2_w));
}
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index 817ed154c4e..46df3eceac9 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -220,13 +220,13 @@ void albazg_state::main_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0x9fff).bankr("bank1");
- map(0xa7fc, 0xa7fc).w(this, FUNC(albazg_state::prot_lock_w));
+ map(0xa7fc, 0xa7fc).w(FUNC(albazg_state::prot_lock_w));
map(0xa7ff, 0xa7ff).portw("EEPROMOUT");
- map(0xaf80, 0xafff).rw(this, FUNC(albazg_state::custom_ram_r), FUNC(albazg_state::custom_ram_w)).share("cus_ram");
+ map(0xaf80, 0xafff).rw(FUNC(albazg_state::custom_ram_r), FUNC(albazg_state::custom_ram_w)).share("cus_ram");
map(0xb000, 0xb07f).ram().w("palette", FUNC(palette_device::write8)).share("palette");
map(0xb080, 0xb0ff).ram().w("palette", FUNC(palette_device::write8_ext)).share("palette_ext");
- map(0xc000, 0xc3ff).ram().w(this, FUNC(albazg_state::yumefuda_vram_w)).share("videoram");
- map(0xd000, 0xd3ff).ram().w(this, FUNC(albazg_state::yumefuda_cram_w)).share("colorram");
+ map(0xc000, 0xc3ff).ram().w(FUNC(albazg_state::yumefuda_vram_w)).share("videoram");
+ map(0xd000, 0xd3ff).ram().w(FUNC(albazg_state::yumefuda_cram_w)).share("colorram");
map(0xe000, 0xffff).ram();
}
diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp
index 83c404dce29..07a52ecf605 100644
--- a/src/mame/drivers/aleck64.cpp
+++ b/src/mame/drivers/aleck64.cpp
@@ -336,7 +336,7 @@ void aleck64_state::n64_map(address_map &map)
map(0xc0000000, 0xc07fffff).ram(); // SDRAM, Aleck 64 specific
- map(0xc0800000, 0xc0800fff).rw(this, FUNC(aleck64_state::aleck_dips_r), FUNC(aleck64_state::aleck_dips_w));
+ map(0xc0800000, 0xc0800fff).rw(FUNC(aleck64_state::aleck_dips_r), FUNC(aleck64_state::aleck_dips_w));
}
/*
@@ -375,7 +375,7 @@ void aleck64_state::e90_map(address_map &map)
n64_map(map);
map(0xd0000000, 0xd0000fff).ram().share("e90vram");// x/y offsets
map(0xd0010000, 0xd0010fff).ram().share("e90pal");// RGB555 palette
- map(0xd0030000, 0xd003001f).rw(this, FUNC(aleck64_state::e90_prot_r), FUNC(aleck64_state::e90_prot_w));
+ map(0xd0030000, 0xd003001f).rw(FUNC(aleck64_state::e90_prot_r), FUNC(aleck64_state::e90_prot_w));
}
void aleck64_state::rsp_map(address_map &map)
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index 6b86c3ed807..8fe0d4fd534 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -127,11 +127,11 @@ void alesis_state::hr16_mem(address_map &map)
void alesis_state::hr16_io(address_map &map)
{
map.unmap_value_high();
- map(0x0000, 0x0000).r(this, FUNC(alesis_state::kb_r));
+ map(0x0000, 0x0000).r(FUNC(alesis_state::kb_r));
map(0x0002, 0x0002).w("dm3ag", FUNC(alesis_dm3ag_device::write));
- map(0x0004, 0x0004).w(this, FUNC(alesis_state::led_w));
+ map(0x0004, 0x0004).w(FUNC(alesis_state::led_w));
map(0x0006, 0x0007).rw(m_lcdc, FUNC(hd44780_device::read), FUNC(hd44780_device::write));
- map(0x0008, 0x0008).w(this, FUNC(alesis_state::kb_matrix_w));
+ map(0x0008, 0x0008).w(FUNC(alesis_state::kb_matrix_w));
map(0x8000, 0xffff).ram().share("nvram"); // 32Kx8 SRAM, (battery-backed)
}
@@ -145,9 +145,9 @@ void alesis_state::sr16_io(address_map &map)
{
//ADDRESS_MAP_UNMAP_HIGH
map(0x0000, 0x0000).mirror(0xff).w("dm3ag", FUNC(alesis_dm3ag_device::write));
- map(0x0200, 0x0200).mirror(0xff).w(this, FUNC(alesis_state::sr16_lcd_w));
- map(0x0300, 0x0300).mirror(0xff).w(this, FUNC(alesis_state::kb_matrix_w));
- map(0x0400, 0x0400).mirror(0xff).r(this, FUNC(alesis_state::kb_r));
+ map(0x0200, 0x0200).mirror(0xff).w(FUNC(alesis_state::sr16_lcd_w));
+ map(0x0300, 0x0300).mirror(0xff).w(FUNC(alesis_state::kb_matrix_w));
+ map(0x0400, 0x0400).mirror(0xff).r(FUNC(alesis_state::kb_r));
map(0x8000, 0xffff).ram().share("nvram"); // 32Kx8 SRAM, (battery-backed)
}
@@ -155,9 +155,9 @@ void alesis_state::mmt8_io(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0xffff).ram().share("nvram"); // 2x32Kx8 SRAM, (battery-backed)
- map(0xff02, 0xff02).w(this, FUNC(alesis_state::track_led_w));
- map(0xff04, 0xff04).rw(this, FUNC(alesis_state::mmt8_led_r), FUNC(alesis_state::mmt8_led_w));
- map(0xff06, 0xff06).w(this, FUNC(alesis_state::kb_matrix_w));
+ map(0xff02, 0xff02).w(FUNC(alesis_state::track_led_w));
+ map(0xff04, 0xff04).rw(FUNC(alesis_state::mmt8_led_r), FUNC(alesis_state::mmt8_led_w));
+ map(0xff06, 0xff06).w(FUNC(alesis_state::kb_matrix_w));
map(0xff08, 0xff09).rw(m_lcdc, FUNC(hd44780_device::read), FUNC(hd44780_device::write));
map(0xff0e, 0xff0e).nopr();
}
diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp
index c7040d423ca..6224af4e397 100644
--- a/src/mame/drivers/alg.cpp
+++ b/src/mame/drivers/alg.cpp
@@ -35,8 +35,8 @@
class alg_state : public amiga_state
{
public:
- alg_state(const machine_config &mconfig, device_type type, const char *tag)
- : amiga_state(mconfig, type, tag),
+ alg_state(const machine_config &mconfig, device_type type, const char *tag) :
+ amiga_state(mconfig, type, tag),
m_laserdisc(*this, "laserdisc"),
m_gun1x(*this, "GUN1X"),
m_gun1y(*this, "GUN1Y"),
@@ -186,12 +186,12 @@ void alg_state::a500_mem(address_map &map)
{
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16));
- map(0xa00000, 0xbfffff).rw(this, FUNC(alg_state::cia_r), FUNC(alg_state::cia_w));
- map(0xc00000, 0xd7ffff).rw(this, FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w));
+ map(0xa00000, 0xbfffff).rw(FUNC(alg_state::cia_r), FUNC(alg_state::cia_w));
+ map(0xc00000, 0xd7ffff).rw(FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w));
map(0xd80000, 0xddffff).noprw();
- map(0xde0000, 0xdeffff).rw(this, FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w));
- map(0xdf0000, 0xdfffff).rw(this, FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w));
- map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(alg_state::rom_mirror_r));
+ map(0xde0000, 0xdeffff).rw(FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w));
+ map(0xdf0000, 0xdfffff).rw(FUNC(alg_state::custom_chip_r), FUNC(alg_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).nopw().r(FUNC(alg_state::rom_mirror_r));
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf80000, 0xffffff).rom().region("kickstart", 0);
}
diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp
index 5a8c127690a..0c3ca24479d 100644
--- a/src/mame/drivers/alien.cpp
+++ b/src/mame/drivers/alien.cpp
@@ -89,10 +89,10 @@ READ64_MEMBER( alien_state::test_r )
void alien_state::alien_map(address_map &map)
{
map(0x00000000, 0x0003ffff).rom();
- map(0x08000000, 0x08000007).r(this, FUNC(alien_state::test_r)); //hangs if zero
+ map(0x08000000, 0x08000007).r(FUNC(alien_state::test_r)); //hangs if zero
map(0x0cfe0000, 0x0cffffff).ram();
map(0x10000000, 0x13ffffff).ram();
- map(0x18000000, 0x1800000f).r(this, FUNC(alien_state::test_r)).nopw();
+ map(0x18000000, 0x1800000f).r(FUNC(alien_state::test_r)).nopw();
}
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index a67fe6cfeea..3b5ae56365b 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -90,14 +90,14 @@ void aliens_state::aliens_map(address_map &map)
map(0x0000, 0x03ff).m(m_bank0000, FUNC(address_map_bank_device::amap8));
map(0x0400, 0x1fff).ram();
map(0x2000, 0x3fff).bankr("rombank"); /* banked ROM */
- map(0x4000, 0x7fff).rw(this, FUNC(aliens_state::k052109_051960_r), FUNC(aliens_state::k052109_051960_w));
+ map(0x4000, 0x7fff).rw(FUNC(aliens_state::k052109_051960_r), FUNC(aliens_state::k052109_051960_w));
map(0x5f80, 0x5f80).portr("DSW3");
map(0x5f81, 0x5f81).portr("P1");
map(0x5f82, 0x5f82).portr("P2");
map(0x5f83, 0x5f83).portr("DSW2");
map(0x5f84, 0x5f84).portr("DSW1");
- map(0x5f88, 0x5f88).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(this, FUNC(aliens_state::aliens_coin_counter_w)); /* coin counters */
- map(0x5f8c, 0x5f8c).w(this, FUNC(aliens_state::aliens_sh_irqtrigger_w)); /* cause interrupt on audio CPU */
+ map(0x5f88, 0x5f88).r("watchdog", FUNC(watchdog_timer_device::reset_r)).w(FUNC(aliens_state::aliens_coin_counter_w)); /* coin counters */
+ map(0x5f8c, 0x5f8c).w(FUNC(aliens_state::aliens_sh_irqtrigger_w)); /* cause interrupt on audio CPU */
map(0x8000, 0xffff).rom().region("maincpu", 0x28000); /* ROM e24_j02.bin */
}
diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp
index 19dc283b029..27c07353f6d 100644
--- a/src/mame/drivers/alinvade.cpp
+++ b/src/mame/drivers/alinvade.cpp
@@ -107,7 +107,7 @@ void alinvade_state::alinvade_map(address_map &map)
map(0x0000, 0x01ff).ram();
map(0x0400, 0x0bff).ram().share("videoram");
map(0x0c00, 0x0dff).ram();
- map(0x2000, 0x2000).w(this, FUNC(alinvade_state::sound_w));
+ map(0x2000, 0x2000).w(FUNC(alinvade_state::sound_w));
map(0x4000, 0x4000).portr("COIN");
map(0x6000, 0x6000).portr("DSW");
map(0x8000, 0x8000).portr("IN0");
@@ -118,8 +118,8 @@ void alinvade_state::alinvade_map(address_map &map)
map(0xa000, 0xa000).nopw(); //??
map(0xc000, 0xc00f).mirror(0xff0).rom().region("proms", 0);
map(0xe000, 0xe3ff).rom();
- map(0xe400, 0xe400).w(this, FUNC(alinvade_state::sounden_w));
- map(0xe800, 0xe800).rw(this, FUNC(alinvade_state::irqmask_r), FUNC(alinvade_state::irqmask_w)); //??
+ map(0xe400, 0xe400).w(FUNC(alinvade_state::sounden_w));
+ map(0xe800, 0xe800).rw(FUNC(alinvade_state::irqmask_r), FUNC(alinvade_state::irqmask_w)); //??
map(0xec00, 0xffff).rom();
}
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp
index 69e5987d96e..85286525a2a 100644
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@@ -629,9 +629,9 @@ void alpha68k_state::kyros_map(address_map &map)
map(0x020000, 0x020fff).ram().share("shared_ram"); // work RAM
map(0x040000, 0x041fff).ram().share("spriteram"); // sprite RAM
map(0x060000, 0x060001).ram().share("videoram"); // MSB: watchdog, LSB: BGC
- map(0x080000, 0x0801ff).rw(this, FUNC(alpha68k_state::kyros_alpha_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w));
+ map(0x080000, 0x0801ff).rw(FUNC(alpha68k_state::kyros_alpha_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w));
map(0x0c0000, 0x0c0001).portr("IN0");
- map(0x0e0000, 0x0e0001).r(this, FUNC(alpha68k_state::kyros_dip_r));
+ map(0x0e0000, 0x0e0001).r(FUNC(alpha68k_state::kyros_dip_r));
map(0x0e0000, 0x0e0000).w("soundlatch", FUNC(generic_latch_8_device::write));
}
@@ -645,7 +645,7 @@ void alpha68k_state::alpha68k_I_map(address_map &map)
map(0x300000, 0x300001).portr("IN0"); // joy1, joy2
map(0x340000, 0x340001).portr("IN1"); // coin, start, service
map(0x380000, 0x380001).portr("IN2");
- map(0x380001, 0x380001).w(this, FUNC(alpha68k_state::paddlema_soundlatch_w)); // LSB: sound latch write and RST38 trigger, joy3, joy4
+ map(0x380001, 0x380001).w(FUNC(alpha68k_state::paddlema_soundlatch_w)); // LSB: sound latch write and RST38 trigger, joy3, joy4
}
void alpha68k_state::alpha68k_II_map(address_map &map)
@@ -653,18 +653,18 @@ void alpha68k_state::alpha68k_II_map(address_map &map)
map(0x000000, 0x03ffff).rom();
map(0x008ffe, 0x008fff).nopw();
map(0x040000, 0x040fff).ram().share("shared_ram");
- map(0x080000, 0x080001).r(this, FUNC(alpha68k_state::control_1_r)); /* Joysticks */
+ map(0x080000, 0x080001).r(FUNC(alpha68k_state::control_1_r)); /* Joysticks */
map(0x080001, 0x080001).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0x0c0000, 0x0c0001).r(this, FUNC(alpha68k_state::control_2_r)); /* CN1 & Dip 1 */
- map(0x0c0001, 0x0c0001).select(0x78).w(this, FUNC(alpha68k_state::outlatch_w));
- map(0x0c8000, 0x0c8001).r(this, FUNC(alpha68k_state::control_3_r)); /* Bottom of CN2 */
- map(0x0d0000, 0x0d0001).r(this, FUNC(alpha68k_state::control_4_r)); /* Top of CN1 & CN2 */
+ map(0x0c0000, 0x0c0001).r(FUNC(alpha68k_state::control_2_r)); /* CN1 & Dip 1 */
+ map(0x0c0001, 0x0c0001).select(0x78).w(FUNC(alpha68k_state::outlatch_w));
+ map(0x0c8000, 0x0c8001).r(FUNC(alpha68k_state::control_3_r)); /* Bottom of CN2 */
+ map(0x0d0000, 0x0d0001).r(FUNC(alpha68k_state::control_4_r)); /* Top of CN1 & CN2 */
map(0x0d8000, 0x0d8001).nopr(); /* IRQ ack? */
map(0x0e0000, 0x0e0001).nopr(); /* IRQ ack? */
map(0x0e8000, 0x0e8001).nopr(); /* watchdog? */
- map(0x100000, 0x100fff).ram().w(this, FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram");
+ map(0x100000, 0x100fff).ram().w(FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram");
map(0x200000, 0x207fff).ram().share("spriteram");
- map(0x300000, 0x3001ff).rw(this, FUNC(alpha68k_state::alpha_II_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w));
+ map(0x300000, 0x3001ff).rw(FUNC(alpha68k_state::alpha_II_trigger_r), FUNC(alpha68k_state::alpha_microcontroller_w));
map(0x400000, 0x400fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x800000, 0x83ffff).bankr("bank8");
}
@@ -673,19 +673,19 @@ void alpha68k_state::alpha68k_V_map(address_map &map)
{
map(0x000000, 0x03ffff).rom();
map(0x040000, 0x043fff).ram().share("shared_ram");
- map(0x080000, 0x080001).r(this, FUNC(alpha68k_state::control_1_r)); /* Joysticks */
- map(0x080000, 0x080000).w(this, FUNC(alpha68k_state::video_bank_w));
+ map(0x080000, 0x080001).r(FUNC(alpha68k_state::control_1_r)); /* Joysticks */
+ map(0x080000, 0x080000).w(FUNC(alpha68k_state::video_bank_w));
map(0x080001, 0x080001).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0x0c0000, 0x0c0001).r(this, FUNC(alpha68k_state::control_2_V_r)); /* Dip 2 */
- map(0x0c0001, 0x0c0001).select(0x78).w(this, FUNC(alpha68k_state::outlatch_w));
+ map(0x0c0000, 0x0c0001).r(FUNC(alpha68k_state::control_2_V_r)); /* Dip 2 */
+ map(0x0c0001, 0x0c0001).select(0x78).w(FUNC(alpha68k_state::outlatch_w));
map(0x0d8000, 0x0d8001).nopr(); /* IRQ ack? */
map(0x0e0000, 0x0e0001).nopr(); /* IRQ ack? */
map(0x0e8000, 0x0e8001).nopr(); /* watchdog? */
- map(0x100000, 0x100fff).ram().w(this, FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram");
+ map(0x100000, 0x100fff).ram().w(FUNC(alpha68k_state::alpha68k_videoram_w)).share("videoram");
map(0x200000, 0x207fff).ram().share("spriteram");
- map(0x300000, 0x303fff).r(this, FUNC(alpha68k_state::alpha_V_trigger_r));
- map(0x300000, 0x3001ff).w(this, FUNC(alpha68k_state::alpha_microcontroller_w));
- map(0x303e00, 0x303fff).w(this, FUNC(alpha68k_state::alpha_microcontroller_w)); /* Gang Wars mirror */
+ map(0x300000, 0x303fff).r(FUNC(alpha68k_state::alpha_V_trigger_r));
+ map(0x300000, 0x3001ff).w(FUNC(alpha68k_state::alpha_microcontroller_w));
+ map(0x303e00, 0x303fff).w(FUNC(alpha68k_state::alpha_microcontroller_w)); /* Gang Wars mirror */
map(0x400000, 0x401fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x800000, 0x83ffff).bankr("bank8");
}
@@ -705,10 +705,10 @@ void alpha68k_state::tnextspc_map(address_map &map)
map(0x0e0008, 0x0e0009).portr("DSW1");
map(0x0e000a, 0x0e000b).portr("DSW2");
map(0x0e000e, 0x0e000f).nopw(); // unknown write port (0)
- map(0x0e0018, 0x0e0019).r(this, FUNC(alpha68k_state::sound_cpu_r));
- map(0x0f0000, 0x0f0001).w(this, FUNC(alpha68k_state::tnextspc_unknown_w));
- map(0x0f0002, 0x0f0005).w(this, FUNC(alpha68k_state::tnextspc_coin_counters_w));
- map(0x0f0009, 0x0f0009).w(this, FUNC(alpha68k_state::tnextspc_soundlatch_w));
+ map(0x0e0018, 0x0e0019).r(FUNC(alpha68k_state::sound_cpu_r));
+ map(0x0f0000, 0x0f0001).w(FUNC(alpha68k_state::tnextspc_unknown_w));
+ map(0x0f0002, 0x0f0005).w(FUNC(alpha68k_state::tnextspc_coin_counters_w));
+ map(0x0f0009, 0x0f0009).w(FUNC(alpha68k_state::tnextspc_soundlatch_w));
}
/******************************************************************************/
@@ -731,7 +731,7 @@ void alpha68k_state::kyros_sound_map(address_map &map)
map(0xc000, 0xc7ff).ram();
map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
map(0xe002, 0xe002).w(m_soundlatch, FUNC(generic_latch_8_device::clear_w));
- map(0xe004, 0xe004).w("dac", FUNC(dac_byte_interface::write));
+ map(0xe004, 0xe004).w("dac", FUNC(dac_byte_interface::data_w));
map(0xe006, 0xe00e).nopw(); // soundboard I/O's, ignored
/* reference only
AM_RANGE(0xe006, 0xe006) AM_WRITENOP // NMI: diminishing saw-tooth
@@ -748,7 +748,7 @@ void alpha68k_state::sstingry_sound_map(address_map &map)
map(0x8000, 0x87ff).ram();
map(0xc100, 0xc100).r(m_soundlatch, FUNC(generic_latch_8_device::read));
map(0xc102, 0xc102).w(m_soundlatch, FUNC(generic_latch_8_device::clear_w));
- map(0xc104, 0xc104).w("dac", FUNC(dac_byte_interface::write));
+ map(0xc104, 0xc104).w("dac", FUNC(dac_byte_interface::data_w));
map(0xc106, 0xc10e).nopw(); // soundboard I/O's, ignored
}
@@ -781,10 +781,10 @@ void alpha68k_state::sound_portmap(address_map &map)
map.global_mask(0x0f);
map(0x00, 0x00).mirror(0x0f).r(m_soundlatch, FUNC(generic_latch_8_device::read));
map(0x00, 0x00).mirror(0x01).w(m_soundlatch, FUNC(generic_latch_8_device::clear_w));
- map(0x08, 0x08).mirror(0x01).w("dac", FUNC(dac_byte_interface::write));
+ map(0x08, 0x08).mirror(0x01).w("dac", FUNC(dac_byte_interface::data_w));
map(0x0a, 0x0b).w("ym2", FUNC(ym2413_device::write));
map(0x0c, 0x0d).w("ym1", FUNC(ym2203_device::write));
- map(0x0e, 0x0e).mirror(0x01).w(this, FUNC(alpha68k_state::sound_bank_w));
+ map(0x0e, 0x0e).mirror(0x01).w(FUNC(alpha68k_state::sound_bank_w));
}
void alpha68k_state::kyros_sound_portmap(address_map &map)
diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp
index 755ebc60143..fe4333cf63b 100644
--- a/src/mame/drivers/alphasma.cpp
+++ b/src/mame/drivers/alphasma.cpp
@@ -175,14 +175,14 @@ void alphasmart_state::alphasmart_mem(address_map &map)
map(0x0000, 0x003f).noprw(); // internal registers
map(0x0040, 0x00ff).ram(); // internal RAM
map(0x8000, 0xffff).rom().region("maincpu", 0);
- map(0x8000, 0x8000).rw(this, FUNC(alphasmart_state::kb_r), FUNC(alphasmart_state::kb_matrixh_w));
- map(0xc000, 0xc000).w(this, FUNC(alphasmart_state::kb_matrixl_w));
+ map(0x8000, 0x8000).rw(FUNC(alphasmart_state::kb_r), FUNC(alphasmart_state::kb_matrixh_w));
+ map(0xc000, 0xc000).w(FUNC(alphasmart_state::kb_matrixl_w));
}
void alphasmart_state::alphasmart_io(address_map &map)
{
- map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(this, FUNC(alphasmart_state::port_a_r), FUNC(alphasmart_state::port_a_w));
- map(MC68HC11_IO_PORTD, MC68HC11_IO_PORTD).rw(this, FUNC(alphasmart_state::port_d_r), FUNC(alphasmart_state::port_d_w));
+ map(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA).rw(FUNC(alphasmart_state::port_a_r), FUNC(alphasmart_state::port_a_w));
+ map(MC68HC11_IO_PORTD, MC68HC11_IO_PORTD).rw(FUNC(alphasmart_state::port_d_r), FUNC(alphasmart_state::port_d_w));
}
READ8_MEMBER(asma2k_state::io_r)
@@ -237,7 +237,7 @@ void asma2k_state::asma2k_mem(address_map &map)
map(0x0000, 0x003f).noprw(); // internal registers
map(0x0040, 0x00ff).ram().share("internal_ram"); // internal RAM
map(0x8000, 0xffff).rom().region("maincpu", 0);
- map(0x9000, 0x9000).w(this, FUNC(asma2k_state::kb_matrixl_w));
+ map(0x9000, 0x9000).w(FUNC(asma2k_state::kb_matrixl_w));
}
/* Input ports */
diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp
index 8600780a15e..7979e9fd3e6 100644
--- a/src/mame/drivers/alphatpx.cpp
+++ b/src/mame/drivers/alphatpx.cpp
@@ -271,10 +271,10 @@ void alphatp_12_state::alphatp2_io(address_map &map)
map(0x04, 0x04).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
map(0x05, 0x05).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
map(0x10, 0x11).rw(m_kbdmcu, FUNC(i8041_device::upi41_master_r), FUNC(i8041_device::upi41_master_w));
- map(0x12, 0x12).w(this, FUNC(alphatp_12_state::beep_w));
- map(0x50, 0x53).rw(this, FUNC(alphatp_12_state::fdc_r), FUNC(alphatp_12_state::fdc_w));
- map(0x54, 0x54).rw(this, FUNC(alphatp_12_state::fdc_stat_r), FUNC(alphatp_12_state::fdc_cmd_w));
- map(0x78, 0x78).w(this, FUNC(alphatp_12_state::bank_w));
+ map(0x12, 0x12).w(FUNC(alphatp_12_state::beep_w));
+ map(0x50, 0x53).rw(FUNC(alphatp_12_state::fdc_r), FUNC(alphatp_12_state::fdc_w));
+ map(0x54, 0x54).rw(FUNC(alphatp_12_state::fdc_stat_r), FUNC(alphatp_12_state::fdc_cmd_w));
+ map(0x78, 0x78).w(FUNC(alphatp_12_state::bank_w));
}
@@ -310,33 +310,33 @@ void alphatp_34_state::alphatp3_io(address_map &map)
//AM_RANGE(0x00, 0x00) AM_READ // unknown
map(0x04, 0x04).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
map(0x05, 0x05).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
- map(0x08, 0x09).rw(this, FUNC(alphatp_34_state::comm88_r), FUNC(alphatp_34_state::comm88_w));
+ map(0x08, 0x09).rw(FUNC(alphatp_34_state::comm88_r), FUNC(alphatp_34_state::comm88_w));
map(0x10, 0x11).rw(m_kbdmcu, FUNC(i8041_device::upi41_master_r), FUNC(i8041_device::upi41_master_w));
- map(0x12, 0x12).w(this, FUNC(alphatp_34_state::beep_w));
- map(0x40, 0x41).r(this, FUNC(alphatp_34_state::start88_r));
+ map(0x12, 0x12).w(FUNC(alphatp_34_state::beep_w));
+ map(0x40, 0x41).r(FUNC(alphatp_34_state::start88_r));
//AM_RANGE(0x42, 0x42) AM_WRITE // unknown
- map(0x50, 0x53).rw(this, FUNC(alphatp_34_state::fdc_r), FUNC(alphatp_34_state::fdc_w));
- map(0x54, 0x54).rw(this, FUNC(alphatp_34_state::fdc_stat_r), FUNC(alphatp_34_state::fdc_cmd_w));
- map(0x78, 0x78).w(this, FUNC(alphatp_34_state::bank_w));
+ map(0x50, 0x53).rw(FUNC(alphatp_34_state::fdc_r), FUNC(alphatp_34_state::fdc_w));
+ map(0x54, 0x54).rw(FUNC(alphatp_34_state::fdc_stat_r), FUNC(alphatp_34_state::fdc_cmd_w));
+ map(0x78, 0x78).w(FUNC(alphatp_34_state::bank_w));
}
void alphatp_34_state::alphatp30_8088_map(address_map &map)
{
map(0x00000, 0x1ffff).ram();
- map(0xe0000, 0xeffff).rw(this, FUNC(alphatp_34_state::gfxext_r), FUNC(alphatp_34_state::gfxext_w));
+ map(0xe0000, 0xeffff).rw(FUNC(alphatp_34_state::gfxext_r), FUNC(alphatp_34_state::gfxext_w));
map(0xfe000, 0xfffff).rom().region("16bit", 0);
}
void alphatp_34_state::alphatp30_8088_io(address_map &map)
{
//AM_RANGE(0x008a, 0x008a) AM_READ // unknown
- map(0xf800, 0xf800).w(this, FUNC(alphatp_34_state::gfxext1_w));
- map(0xf900, 0xf900).w(this, FUNC(alphatp_34_state::gfxext2_w));
- map(0xfa00, 0xfa01).w(this, FUNC(alphatp_34_state::gfxext3_w));
+ map(0xf800, 0xf800).w(FUNC(alphatp_34_state::gfxext1_w));
+ map(0xf900, 0xf900).w(FUNC(alphatp_34_state::gfxext2_w));
+ map(0xfa00, 0xfa01).w(FUNC(alphatp_34_state::gfxext3_w));
//AM_RANGE(0xfb00, 0xfb0f) AM_WRITE // unknown possibly gfx ext
map(0xffe0, 0xffe1).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write));
map(0xffe4, 0xffe7).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
- map(0xffe9, 0xffea).rw(this, FUNC(alphatp_34_state::comm85_r), FUNC(alphatp_34_state::comm85_w));
+ map(0xffe9, 0xffea).rw(FUNC(alphatp_34_state::comm85_r), FUNC(alphatp_34_state::comm85_w));
}
READ8_MEMBER(alphatp_34_state::start88_r)
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index b834866f8c1..a546a285db5 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -391,23 +391,23 @@ INPUT_CHANGED_MEMBER( alphatro_state::alphatro_break )
void alphatro_state::alphatro_map(address_map &map)
{
map(0x0000, 0x5fff).m(m_lowbank, FUNC(address_map_bank_device::amap8));
- map(0x6000, 0x9fff).rw(this, FUNC(alphatro_state::ram6000_r), FUNC(alphatro_state::ram6000_w));
+ map(0x6000, 0x9fff).rw(FUNC(alphatro_state::ram6000_r), FUNC(alphatro_state::ram6000_w));
map(0xa000, 0xdfff).m("cartbank", FUNC(address_map_bank_device::amap8));
- map(0xe000, 0xefff).rw(this, FUNC(alphatro_state::rame000_r), FUNC(alphatro_state::rame000_w));
+ map(0xe000, 0xefff).rw(FUNC(alphatro_state::rame000_r), FUNC(alphatro_state::rame000_w));
map(0xf000, 0xffff).m("monbank", FUNC(address_map_bank_device::amap8));
}
void alphatro_state::rombank_map(address_map &map)
{
- map(0x0000, 0x5fff).rom().region("roms", 0x0000).w(this, FUNC(alphatro_state::ram0000_w));
- map(0x6000, 0xbfff).rw(this, FUNC(alphatro_state::ram0000_r), FUNC(alphatro_state::ram0000_w));
+ map(0x0000, 0x5fff).rom().region("roms", 0x0000).w(FUNC(alphatro_state::ram0000_w));
+ map(0x6000, 0xbfff).rw(FUNC(alphatro_state::ram0000_r), FUNC(alphatro_state::ram0000_w));
}
void alphatro_state::cartbank_map(address_map &map)
{
- map(0x0000, 0x3fff).r(m_cart, FUNC(generic_slot_device::read_rom)).w(this, FUNC(alphatro_state::rama000_w));
- map(0x4000, 0x7fff).rw(this, FUNC(alphatro_state::rama000_r), FUNC(alphatro_state::rama000_w));
+ map(0x0000, 0x3fff).r(m_cart, FUNC(generic_slot_device::read_rom)).w(FUNC(alphatro_state::rama000_w));
+ map(0x4000, 0x7fff).rw(FUNC(alphatro_state::rama000_r), FUNC(alphatro_state::rama000_w));
}
void alphatro_state::monbank_map(address_map &map)
@@ -421,8 +421,8 @@ void alphatro_state::alphatro_io(address_map &map)
{
map.global_mask(0xff);
map.unmap_value_high();
- map(0x10, 0x10).rw(this, FUNC(alphatro_state::port10_r), FUNC(alphatro_state::port10_w));
- map(0x20, 0x20).portr("X0").w(this, FUNC(alphatro_state::port20_w));
+ map(0x10, 0x10).rw(FUNC(alphatro_state::port10_r), FUNC(alphatro_state::port10_w));
+ map(0x20, 0x20).portr("X0").w(FUNC(alphatro_state::port20_w));
map(0x21, 0x21).portr("X1");
map(0x22, 0x22).portr("X2");
map(0x23, 0x23).portr("X3");
@@ -434,7 +434,7 @@ void alphatro_state::alphatro_io(address_map &map)
map(0x29, 0x29).portr("X9");
map(0x2a, 0x2a).portr("XA");
map(0x2b, 0x2b).portr("XB");
- map(0x30, 0x30).rw(this, FUNC(alphatro_state::port30_r), FUNC(alphatro_state::port30_w));
+ map(0x30, 0x30).rw(FUNC(alphatro_state::port30_r), FUNC(alphatro_state::port30_w));
// USART for cassette reading and writing
map(0x40, 0x40).rw(m_usart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
map(0x41, 0x41).rw(m_usart, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
@@ -445,7 +445,7 @@ void alphatro_state::alphatro_io(address_map &map)
map(0x60, 0x68).rw(m_dmac, FUNC(i8257_device::read), FUNC(i8257_device::write));
// 8259 PIT
//AM_RANGE(0x70, 0x72) AM_DEVREADWRITE("
- map(0xf0, 0xf0).r(this, FUNC(alphatro_state::portf0_r)).w(this, FUNC(alphatro_state::portf0_w));
+ map(0xf0, 0xf0).r(FUNC(alphatro_state::portf0_r)).w(FUNC(alphatro_state::portf0_w));
map(0xf8, 0xf8).rw(m_fdc, FUNC(upd765a_device::fifo_r), FUNC(upd765a_device::fifo_w));
map(0xf9, 0xf9).r(m_fdc, FUNC(upd765a_device::msr_r));
}
diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp
index bd3063f343f..99c7fb8c693 100644
--- a/src/mame/drivers/altos2.cpp
+++ b/src/mame/drivers/altos2.cpp
@@ -85,7 +85,7 @@ void altos2_state::io_map(address_map &map)
map(0x00, 0x03).rw("dart1", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
map(0x04, 0x07).rw("dart2", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
map(0x08, 0x0b).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
- map(0x0c, 0x0c).w(this, FUNC(altos2_state::video_mode_w));
+ map(0x0c, 0x0c).w(FUNC(altos2_state::video_mode_w));
map(0x40, 0x7f).rw(m_novram, FUNC(x2210_device::read), FUNC(x2210_device::write));
//AM_RANGE(0x80, 0xff) AM_DEVREADWRITE_MOD("vpac", crt9007_device, read, write, rshift<1>)
}
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index 69c5824324a..6a3528b8634 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -109,12 +109,12 @@ static void altos486_floppies(device_slot_interface &device)
void altos486_state::altos486_mem(address_map &map)
{
map.unmap_value_high();
- map(0x00000, 0xfffff).rw(this, FUNC(altos486_state::mmu_ram_r), FUNC(altos486_state::mmu_ram_w)).share("main_ram");
+ map(0x00000, 0xfffff).rw(FUNC(altos486_state::mmu_ram_r), FUNC(altos486_state::mmu_ram_w)).share("main_ram");
}
void altos486_state::altos486_io(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(altos486_state::mmu_io_r), FUNC(altos486_state::mmu_io_w));
+ map(0x0000, 0xffff).rw(FUNC(altos486_state::mmu_io_r), FUNC(altos486_state::mmu_io_w));
}
void altos486_state::altos486_z80_mem(address_map &map)
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index b1bbfeec99e..e33cc861711 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -102,12 +102,12 @@ void altos5_state::mem_map(address_map &map)
void altos5_state::io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
+ map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
map(0x04, 0x07).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write));
map(0x08, 0x0b).rw(m_pio0, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x0c, 0x0f).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x10, 0x13).rw("pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
- map(0x14, 0x17).w(this, FUNC(altos5_state::port14_w));
+ map(0x14, 0x17).w(FUNC(altos5_state::port14_w));
map(0x1c, 0x1f).rw("dart", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
//AM_RANGE(0x20, 0x23) // Hard drive
map(0x2c, 0x2f).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp
index 73bed2be0cf..bd714bcc78b 100644
--- a/src/mame/drivers/altos8600.cpp
+++ b/src/mame/drivers/altos8600.cpp
@@ -667,57 +667,57 @@ IRQ_CALLBACK_MEMBER(altos8600_state::inta)
void altos8600_state::cpu_mem(address_map &map)
{
- map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::cpuram_r), FUNC(altos8600_state::cpuram_w));
+ map(0x00000, 0xfffff).rw(FUNC(altos8600_state::cpuram_r), FUNC(altos8600_state::cpuram_w));
}
void altos8600_state::stack_mem(address_map &map)
{
- map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::stkram_r), FUNC(altos8600_state::stkram_w));
+ map(0x00000, 0xfffff).rw(FUNC(altos8600_state::stkram_r), FUNC(altos8600_state::stkram_w));
}
void altos8600_state::code_mem(address_map &map)
{
- map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::coderam_r), FUNC(altos8600_state::coderam_w));
+ map(0x00000, 0xfffff).rw(FUNC(altos8600_state::coderam_r), FUNC(altos8600_state::coderam_w));
}
void altos8600_state::extra_mem(address_map &map)
{
- map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::xtraram_r), FUNC(altos8600_state::xtraram_w));
+ map(0x00000, 0xfffff).rw(FUNC(altos8600_state::xtraram_r), FUNC(altos8600_state::xtraram_w));
}
void altos8600_state::cpu_io(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(altos8600_state::cpuio_r), FUNC(altos8600_state::cpuio_w));
+ map(0x0000, 0xffff).rw(FUNC(altos8600_state::cpuio_r), FUNC(altos8600_state::cpuio_w));
}
void altos8600_state::dmac_mem(address_map &map)
{
- map(0x00000, 0xfffff).rw(this, FUNC(altos8600_state::dmacram_r), FUNC(altos8600_state::dmacram_w));
+ map(0x00000, 0xfffff).rw(FUNC(altos8600_state::dmacram_r), FUNC(altos8600_state::dmacram_w));
}
void altos8600_state::dmac_io(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(altos8600_state::nmi_r), FUNC(altos8600_state::nmi_w));
- map(0x0000, 0x0007).r(this, FUNC(altos8600_state::fault_r));
- map(0x0008, 0x000f).w(this, FUNC(altos8600_state::clear_w));
- map(0x0010, 0x0017).r(this, FUNC(altos8600_state::errlo_r));
- map(0x0018, 0x001f).r(this, FUNC(altos8600_state::errhi_r));
- map(0x0020, 0x0027).rw(this, FUNC(altos8600_state::hd_r), FUNC(altos8600_state::hd_w)).umask16(0x00ff);
- map(0x0030, 0x0037).w(this, FUNC(altos8600_state::mode_w));
- map(0x0038, 0x003f).w(this, FUNC(altos8600_state::cattn_w));
+ map(0x0000, 0xffff).rw(FUNC(altos8600_state::nmi_r), FUNC(altos8600_state::nmi_w));
+ map(0x0000, 0x0007).r(FUNC(altos8600_state::fault_r));
+ map(0x0008, 0x000f).w(FUNC(altos8600_state::clear_w));
+ map(0x0010, 0x0017).r(FUNC(altos8600_state::errlo_r));
+ map(0x0018, 0x001f).r(FUNC(altos8600_state::errhi_r));
+ map(0x0020, 0x0027).rw(FUNC(altos8600_state::hd_r), FUNC(altos8600_state::hd_w)).umask16(0x00ff);
+ map(0x0030, 0x0037).w(FUNC(altos8600_state::mode_w));
+ map(0x0038, 0x003f).w(FUNC(altos8600_state::cattn_w));
map(0x0040, 0x0047).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff);
map(0x0040, 0x0047).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)).umask16(0xff00);
map(0x0048, 0x004f).rw(m_uart8274, FUNC(i8274_new_device::cd_ba_r), FUNC(i8274_new_device::cd_ba_w)).umask16(0x00ff);
map(0x0048, 0x004f).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0xff00);
- map(0x0050, 0x0057).rw(this, FUNC(altos8600_state::romport_r), FUNC(altos8600_state::romport_w));
+ map(0x0050, 0x0057).rw(FUNC(altos8600_state::romport_r), FUNC(altos8600_state::romport_w));
map(0x0058, 0x005f).rw(m_pic1, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff);
- map(0x0058, 0x005f).w(this, FUNC(altos8600_state::clrsys_w)).umask16(0xff00);
+ map(0x0058, 0x005f).w(FUNC(altos8600_state::clrsys_w)).umask16(0xff00);
map(0x0060, 0x0067).rw(m_pic2, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff);
map(0x0068, 0x006f).rw(m_pic3, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff);
map(0x0070, 0x0077).noprw();
- map(0x0078, 0x0079).w(this, FUNC(altos8600_state::ics_attn_w));
- map(0x0200, 0x03ff).rw(this, FUNC(altos8600_state::mmuflags_r), FUNC(altos8600_state::mmuflags_w));
- map(0x0400, 0x05ff).rw(this, FUNC(altos8600_state::mmuaddr_r), FUNC(altos8600_state::mmuaddr_w));
+ map(0x0078, 0x0079).w(FUNC(altos8600_state::ics_attn_w));
+ map(0x0200, 0x03ff).rw(FUNC(altos8600_state::mmuflags_r), FUNC(altos8600_state::mmuflags_w));
+ map(0x0400, 0x05ff).rw(FUNC(altos8600_state::mmuaddr_r), FUNC(altos8600_state::mmuaddr_w));
}
static void altos8600_floppies(device_slot_interface &device)
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index cfbc40e8dd0..d10741eb043 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -670,10 +670,10 @@ void amaticmg_state::amaticmg_portmap(address_map &map)
map(0x40, 0x41).w("ymsnd", FUNC(ym3812_device::write));
map(0x60, 0x60).w("crtc", FUNC(mc6845_device::address_w));
map(0x61, 0x61).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
- map(0x80, 0x80).w(this, FUNC(amaticmg_state::unk80_w));
- map(0xc0, 0xc0).w(this, FUNC(amaticmg_state::rombank_w));
-// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_byte_interface, write)
-// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac2", dac_byte_interface, write)
+ map(0x80, 0x80).w(FUNC(amaticmg_state::unk80_w));
+ map(0xc0, 0xc0).w(FUNC(amaticmg_state::rombank_w));
+// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_byte_interface, data_w)
+// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac2", dac_byte_interface, data_w)
}
void amaticmg_state::amaticmg2_portmap(address_map &map)
@@ -685,8 +685,8 @@ void amaticmg_state::amaticmg2_portmap(address_map &map)
map(0x40, 0x41).w("ymsnd", FUNC(ym3812_device::write));
map(0x60, 0x60).w("crtc", FUNC(mc6845_device::address_w)); // 0e for mg_iii_vger_3.64_v_8309
map(0x61, 0x61).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)); // 0f for mg_iii_vger_3.64_v_8309
- map(0xc0, 0xc0).w(this, FUNC(amaticmg_state::rombank_w));
- map(0xe6, 0xe6).w(this, FUNC(amaticmg_state::nmi_mask_w));
+ map(0xc0, 0xc0).w(FUNC(amaticmg_state::rombank_w));
+ map(0xe6, 0xe6).w(FUNC(amaticmg_state::nmi_mask_w));
map(0xe8, 0xeb).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write));
}
@@ -701,7 +701,7 @@ void amaticmg_state::amaticmg4_portmap(address_map &map)
map(0x0e, 0x0e).w("crtc", FUNC(mc6845_device::address_w));
map(0x0f, 0x0f).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
// AM_RANGE(0xc0, 0xc0) AM_WRITE(rombank_w)
- map(0xe6, 0xe6).w(this, FUNC(amaticmg_state::nmi_mask_w));
+ map(0xe6, 0xe6).w(FUNC(amaticmg_state::nmi_mask_w));
}
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 051fd5bf2d6..f979de87ecd 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -126,13 +126,13 @@ void ambush_state::main_map(address_map &map)
map(0x8000, 0x87ff).ram();
map(0xa000, 0xa000).r("watchdog", FUNC(watchdog_timer_device::reset_r));
map(0xc000, 0xc07f).ram();
- map(0xc080, 0xc09f).ram().w(this, FUNC(ambush_state::scroll_ram_w)).share("scroll_ram"); // 1 byte for each column
+ map(0xc080, 0xc09f).ram().w(FUNC(ambush_state::scroll_ram_w)).share("scroll_ram"); // 1 byte for each column
map(0xc0a0, 0xc0ff).ram();
map(0xc100, 0xc1ff).ram().share("attribute_ram"); // 1 line corresponds to 4 in the video ram
map(0xc200, 0xc3ff).ram().share("sprite_ram");
map(0xc400, 0xc7ff).ram().share("video_ram");
map(0xc800, 0xc800).portr("sw1");
- map(0xcc00, 0xcc07).w(this, FUNC(ambush_state::output_latches_w));
+ map(0xcc00, 0xcc07).w(FUNC(ambush_state::output_latches_w));
}
void ambush_state::main_portmap(address_map &map)
diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp
index f21b4b74454..d4fd70d4239 100644
--- a/src/mame/drivers/amerihok.cpp
+++ b/src/mame/drivers/amerihok.cpp
@@ -58,7 +58,7 @@ void amerihok_state::amerihok_map(address_map &map)
void amerihok_state::amerihok_data_map(address_map &map)
{
- map(0x2000, 0x2000).w(this, FUNC(amerihok_state::control_w));
+ map(0x2000, 0x2000).w(FUNC(amerihok_state::control_w));
map(0x4000, 0x4000).w(m_oki, FUNC(okim6376_device::write));
}
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index e20d392efe0..8e55a2e4d1e 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -35,9 +35,9 @@ class a1000_state : public amiga_state
{
public:
a1000_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_bootrom(*this, "bootrom"),
- m_wom(*this, "wom")
+ amiga_state(mconfig, type, tag),
+ m_bootrom(*this, "bootrom"),
+ m_wom(*this, "wom")
{ }
void init_pal();
@@ -64,11 +64,11 @@ class a2000_state : public amiga_state
{
public:
a2000_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_rtc(*this, "u65"),
- m_zorro(*this, ZORROBUS_TAG),
- m_zorro2_int2(0),
- m_zorro2_int6(0)
+ amiga_state(mconfig, type, tag),
+ m_rtc(*this, "u65"),
+ m_zorro(*this, ZORROBUS_TAG),
+ m_zorro2_int2(0),
+ m_zorro2_int6(0)
{ }
void init_pal();
@@ -104,10 +104,10 @@ class a500_state : public amiga_state
{
public:
a500_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_side(*this, EXP_SLOT_TAG),
- m_side_int2(0),
- m_side_int6(0)
+ amiga_state(mconfig, type, tag),
+ m_side(*this, EXP_SLOT_TAG),
+ m_side_int2(0),
+ m_side_int6(0)
{ }
void init_pal();
@@ -139,13 +139,13 @@ class cdtv_state : public amiga_state
{
public:
cdtv_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_rtc(*this, "u61"),
- m_dmac(*this, "u36"),
- m_tpi(*this, "u32"),
- m_cdrom(*this, "cdrom"),
- m_dmac_irq(0),
- m_tpi_irq(0)
+ amiga_state(mconfig, type, tag),
+ m_rtc(*this, "u61"),
+ m_dmac(*this, "u36"),
+ m_tpi(*this, "u32"),
+ m_cdrom(*this, "cdrom"),
+ m_dmac_irq(0),
+ m_tpi_irq(0)
{ }
void init_pal();
@@ -191,7 +191,7 @@ class a3000_state : public amiga_state
{
public:
a3000_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag)
+ amiga_state(mconfig, type, tag)
{ }
DECLARE_READ32_MEMBER( scsi_r );
@@ -214,11 +214,11 @@ class a500p_state : public amiga_state
{
public:
a500p_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_rtc(*this, "u9"),
- m_side(*this, EXP_SLOT_TAG),
- m_side_int2(0),
- m_side_int6(0)
+ amiga_state(mconfig, type, tag),
+ m_rtc(*this, "u9"),
+ m_side(*this, EXP_SLOT_TAG),
+ m_side_int2(0),
+ m_side_int6(0)
{ }
DECLARE_READ16_MEMBER( clock_r );
@@ -251,8 +251,8 @@ class a600_state : public amiga_state
{
public:
a600_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_gayle_int2(0)
+ amiga_state(mconfig, type, tag),
+ m_gayle_int2(0)
{ }
DECLARE_WRITE_LINE_MEMBER( gayle_int2_w );
@@ -276,8 +276,8 @@ class a1200_state : public amiga_state
{
public:
a1200_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_gayle_int2(0)
+ amiga_state(mconfig, type, tag),
+ m_gayle_int2(0)
{ }
DECLARE_WRITE_LINE_MEMBER( gayle_int2_w );
@@ -301,13 +301,13 @@ class a4000_state : public amiga_state
{
public:
a4000_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_ata(*this, "ata"),
- m_ramsey_config(0),
- m_gary_coldboot(1),
- m_gary_timeout(0),
- m_gary_toenb(0),
- m_ide_interrupt(0)
+ amiga_state(mconfig, type, tag),
+ m_ata(*this, "ata"),
+ m_ramsey_config(0),
+ m_gary_coldboot(1),
+ m_gary_timeout(0),
+ m_gary_toenb(0),
+ m_ide_interrupt(0)
{ }
DECLARE_READ32_MEMBER( scsi_r );
@@ -346,9 +346,9 @@ class cd32_state : public amiga_state
{
public:
cd32_state(const machine_config &mconfig, device_type type, const char *tag) :
- amiga_state(mconfig, type, tag),
- m_player_ports(*this, {"p1_cd32_buttons", "p2_cd32_buttons"}),
- m_cdda(*this, "cdda")
+ amiga_state(mconfig, type, tag),
+ m_player_ports(*this, {"p1_cd32_buttons", "p2_cd32_buttons"}),
+ m_cdda(*this, "cdda")
{ }
DECLARE_WRITE_LINE_MEMBER( akiko_int_w );
@@ -1001,7 +1001,7 @@ void a1000_state::a1000_overlay_map(address_map &map)
void a1000_state::a1000_bootrom_map(address_map &map)
{
- map(0x000000, 0x00ffff).mirror(0x30000).rom().region("bootrom", 0).w(this, FUNC(a1000_state::write_protect_w));
+ map(0x000000, 0x00ffff).mirror(0x30000).rom().region("bootrom", 0).w(FUNC(a1000_state::write_protect_w));
map(0x040000, 0x07ffff).bankr("wom");
}
@@ -1009,9 +1009,9 @@ void a1000_state::a1000_mem(address_map &map)
{
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16));
- map(0xa00000, 0xbfffff).rw(this, FUNC(a1000_state::cia_r), FUNC(a1000_state::cia_w));
- map(0xc00000, 0xdfffff).rw(this, FUNC(a1000_state::custom_chip_r), FUNC(a1000_state::custom_chip_w));
- map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a1000_state::rom_mirror_r));
+ map(0xa00000, 0xbfffff).rw(FUNC(a1000_state::cia_r), FUNC(a1000_state::cia_w));
+ map(0xc00000, 0xdfffff).rw(FUNC(a1000_state::custom_chip_r), FUNC(a1000_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).nopw().r(FUNC(a1000_state::rom_mirror_r));
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf80000, 0xfbffff).m(m_bootrom, FUNC(address_map_bank_device::amap16));
map(0xfc0000, 0xffffff).bankrw("wom");
@@ -1062,15 +1062,15 @@ void a2000_state::a2000_mem(address_map &map)
{
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16));
- map(0xa00000, 0xbfffff).rw(this, FUNC(a2000_state::cia_r), FUNC(a2000_state::cia_w));
+ map(0xa00000, 0xbfffff).rw(FUNC(a2000_state::cia_r), FUNC(a2000_state::cia_w));
map(0xc00000, 0xc7ffff).ram();
- map(0xc80000, 0xd7ffff).rw(this, FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w));
+ map(0xc80000, 0xd7ffff).rw(FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w));
map(0xd80000, 0xdbffff).noprw();
- map(0xdc0000, 0xdc7fff).rw(this, FUNC(a2000_state::clock_r), FUNC(a2000_state::clock_w));
+ map(0xdc0000, 0xdc7fff).rw(FUNC(a2000_state::clock_r), FUNC(a2000_state::clock_w));
map(0xdc8000, 0xddffff).noprw();
- map(0xde0000, 0xdeffff).rw(this, FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w));
- map(0xdf0000, 0xdfffff).rw(this, FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w));
- map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a2000_state::rom_mirror_r));
+ map(0xde0000, 0xdeffff).rw(FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w));
+ map(0xdf0000, 0xdfffff).rw(FUNC(a2000_state::custom_chip_r), FUNC(a2000_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).nopw().r(FUNC(a2000_state::rom_mirror_r));
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf00000, 0xf7ffff).noprw(); // cartridge space
map(0xf80000, 0xffffff).rom().region("kickstart", 0);
@@ -1081,12 +1081,12 @@ void a500_state::a500_mem(address_map &map)
{
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16));
- map(0xa00000, 0xbfffff).rw(this, FUNC(a500_state::cia_r), FUNC(a500_state::cia_w));
- map(0xc00000, 0xd7ffff).rw(this, FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w));
+ map(0xa00000, 0xbfffff).rw(FUNC(a500_state::cia_r), FUNC(a500_state::cia_w));
+ map(0xc00000, 0xd7ffff).rw(FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w));
map(0xd80000, 0xddffff).noprw();
- map(0xde0000, 0xdeffff).rw(this, FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w));
- map(0xdf0000, 0xdfffff).rw(this, FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w));
- map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a500_state::rom_mirror_r));
+ map(0xde0000, 0xdeffff).rw(FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w));
+ map(0xdf0000, 0xdfffff).rw(FUNC(a500_state::custom_chip_r), FUNC(a500_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).nopw().r(FUNC(a500_state::rom_mirror_r));
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf00000, 0xf7ffff).noprw(); // cartridge space
map(0xf80000, 0xffffff).rom().region("kickstart", 0);
@@ -1097,14 +1097,14 @@ void cdtv_state::cdtv_mem(address_map &map)
{
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16));
- map(0xa00000, 0xbfffff).rw(this, FUNC(cdtv_state::cia_r), FUNC(cdtv_state::cia_w));
- map(0xc00000, 0xd7ffff).rw(this, FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w));
+ map(0xa00000, 0xbfffff).rw(FUNC(cdtv_state::cia_r), FUNC(cdtv_state::cia_w));
+ map(0xc00000, 0xd7ffff).rw(FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w));
map(0xd80000, 0xdbffff).noprw();
- map(0xdc0000, 0xdc7fff).rw(this, FUNC(cdtv_state::clock_r), FUNC(cdtv_state::clock_w));
+ map(0xdc0000, 0xdc7fff).rw(FUNC(cdtv_state::clock_r), FUNC(cdtv_state::clock_w));
map(0xdc8000, 0xdc87ff).mirror(0x7800).ram().share("sram");
map(0xdd0000, 0xddffff).noprw();
- map(0xde0000, 0xdeffff).rw(this, FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w));
- map(0xdf0000, 0xdfffff).rw(this, FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w));
+ map(0xde0000, 0xdeffff).rw(FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w));
+ map(0xdf0000, 0xdfffff).rw(FUNC(cdtv_state::custom_chip_r), FUNC(cdtv_state::custom_chip_w));
map(0xe00000, 0xe3ffff).mirror(0x40000).ram().share("memcard");
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf00000, 0xf3ffff).mirror(0x40000).rom().region("cdrom", 0);
@@ -1120,13 +1120,13 @@ void a3000_state::a3000_mem(address_map &map)
{
map.unmap_value_high();
map(0x00000000, 0x001fffff).m(m_overlay, FUNC(address_map_bank_device::amap32));
- map(0x00b80000, 0x00bfffff).rw(this, FUNC(a3000_state::cia_r), FUNC(a3000_state::cia_w));
- map(0x00c00000, 0x00cfffff).rw(this, FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w));
+ map(0x00b80000, 0x00bfffff).rw(FUNC(a3000_state::cia_r), FUNC(a3000_state::cia_w));
+ map(0x00c00000, 0x00cfffff).rw(FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w));
map(0x00d00000, 0x00dbffff).noprw();
map(0x00dc0000, 0x00dcffff).rw("rtc", FUNC(rp5c01_device::read), FUNC(rp5c01_device::write)).umask32(0x000000ff);
- map(0x00dd0000, 0x00ddffff).rw(this, FUNC(a3000_state::scsi_r), FUNC(a3000_state::scsi_w));
- map(0x00de0000, 0x00deffff).rw(this, FUNC(a3000_state::motherboard_r), FUNC(a3000_state::motherboard_w));
- map(0x00df0000, 0x00dfffff).rw(this, FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w));
+ map(0x00dd0000, 0x00ddffff).rw(FUNC(a3000_state::scsi_r), FUNC(a3000_state::scsi_w));
+ map(0x00de0000, 0x00deffff).rw(FUNC(a3000_state::motherboard_r), FUNC(a3000_state::motherboard_w));
+ map(0x00df0000, 0x00dfffff).rw(FUNC(a3000_state::custom_chip_r), FUNC(a3000_state::custom_chip_w));
map(0x00e80000, 0x00efffff).noprw(); // autoconfig space (installed by devices)
map(0x00f00000, 0x00f7ffff).noprw(); // cartridge space
map(0x00f80000, 0x00ffffff).rom().region("kickstart", 0);
@@ -1138,15 +1138,15 @@ void a500p_state::a500p_mem(address_map &map)
{
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16));
- map(0xa00000, 0xbfffff).rw(this, FUNC(a500p_state::cia_r), FUNC(a500p_state::cia_w));
+ map(0xa00000, 0xbfffff).rw(FUNC(a500p_state::cia_r), FUNC(a500p_state::cia_w));
map(0xc00000, 0xc7ffff).ram();
- map(0xc80000, 0xd7ffff).rw(this, FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w));
+ map(0xc80000, 0xd7ffff).rw(FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w));
map(0xd80000, 0xdbffff).noprw();
- map(0xdc0000, 0xdc7fff).rw(this, FUNC(a500p_state::clock_r), FUNC(a500p_state::clock_w));
+ map(0xdc0000, 0xdc7fff).rw(FUNC(a500p_state::clock_r), FUNC(a500p_state::clock_w));
map(0xdc8000, 0xddffff).noprw();
- map(0xde0000, 0xdeffff).rw(this, FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w));
- map(0xdf0000, 0xdfffff).rw(this, FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w));
- map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a500p_state::rom_mirror_r));
+ map(0xde0000, 0xdeffff).rw(FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w));
+ map(0xdf0000, 0xdfffff).rw(FUNC(a500p_state::custom_chip_r), FUNC(a500p_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).nopw().r(FUNC(a500p_state::rom_mirror_r));
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf80000, 0xffffff).rom().region("kickstart", 0);
}
@@ -1157,10 +1157,10 @@ void a600_state::a600_mem(address_map &map)
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap16));
map(0x200000, 0xa7ffff).noprw();
- map(0xa80000, 0xafffff).nopw().r(this, FUNC(a600_state::rom_mirror_r));
- map(0xb00000, 0xb7ffff).nopw().r(this, FUNC(a600_state::rom_mirror_r));
+ map(0xa80000, 0xafffff).nopw().r(FUNC(a600_state::rom_mirror_r));
+ map(0xb00000, 0xb7ffff).nopw().r(FUNC(a600_state::rom_mirror_r));
map(0xb80000, 0xbeffff).noprw(); // reserved (cdtv)
- map(0xbf0000, 0xbfffff).rw(this, FUNC(a600_state::cia_r), FUNC(a600_state::gayle_cia_w));
+ map(0xbf0000, 0xbfffff).rw(FUNC(a600_state::cia_r), FUNC(a600_state::gayle_cia_w));
map(0xc00000, 0xd7ffff).noprw(); // slow mem
map(0xd80000, 0xd8ffff).noprw(); // spare chip select
map(0xd90000, 0xd9ffff).noprw(); // arcnet chip select
@@ -1169,8 +1169,8 @@ void a600_state::a600_mem(address_map &map)
map(0xdc0000, 0xdcffff).noprw(); // rtc
map(0xdd0000, 0xddffff).noprw(); // reserved (dma controller)
map(0xde0000, 0xdeffff).rw("gayle", FUNC(gayle_device::gayle_id_r), FUNC(gayle_device::gayle_id_w));
- map(0xdf0000, 0xdfffff).rw(this, FUNC(a600_state::custom_chip_r), FUNC(a600_state::custom_chip_w));
- map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a600_state::rom_mirror_r));
+ map(0xdf0000, 0xdfffff).rw(FUNC(a600_state::custom_chip_r), FUNC(a600_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).nopw().r(FUNC(a600_state::rom_mirror_r));
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf00000, 0xf7ffff).noprw(); // cartridge space
map(0xf80000, 0xffffff).rom().region("kickstart", 0);
@@ -1182,10 +1182,10 @@ void a1200_state::a1200_mem(address_map &map)
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap32));
map(0x200000, 0xa7ffff).noprw();
- map(0xa80000, 0xafffff).nopw().r(this, FUNC(a1200_state::rom_mirror32_r));
- map(0xb00000, 0xb7ffff).nopw().r(this, FUNC(a1200_state::rom_mirror32_r));
+ map(0xa80000, 0xafffff).nopw().r(FUNC(a1200_state::rom_mirror32_r));
+ map(0xb00000, 0xb7ffff).nopw().r(FUNC(a1200_state::rom_mirror32_r));
map(0xb80000, 0xbeffff).noprw(); // reserved (cdtv)
- map(0xbf0000, 0xbfffff).rw(this, FUNC(a1200_state::cia_r), FUNC(a1200_state::gayle_cia_w));
+ map(0xbf0000, 0xbfffff).rw(FUNC(a1200_state::cia_r), FUNC(a1200_state::gayle_cia_w));
map(0xc00000, 0xd7ffff).noprw(); // slow mem
map(0xd80000, 0xd8ffff).noprw(); // spare chip select
map(0xd90000, 0xd9ffff).noprw(); // arcnet chip select
@@ -1194,8 +1194,8 @@ void a1200_state::a1200_mem(address_map &map)
map(0xdc0000, 0xdcffff).noprw(); // rtc
map(0xdd0000, 0xddffff).noprw(); // reserved (dma controller)
map(0xde0000, 0xdeffff).rw("gayle", FUNC(gayle_device::gayle_id_r), FUNC(gayle_device::gayle_id_w));
- map(0xdf0000, 0xdfffff).rw(this, FUNC(a1200_state::custom_chip_r), FUNC(a1200_state::custom_chip_w));
- map(0xe00000, 0xe7ffff).nopw().r(this, FUNC(a1200_state::rom_mirror32_r));
+ map(0xdf0000, 0xdfffff).rw(FUNC(a1200_state::custom_chip_r), FUNC(a1200_state::custom_chip_w));
+ map(0xe00000, 0xe7ffff).nopw().r(FUNC(a1200_state::rom_mirror32_r));
map(0xe80000, 0xefffff).noprw(); // autoconfig space (installed by devices)
map(0xf00000, 0xf7ffff).noprw(); // cartridge space
map(0xf80000, 0xffffff).rom().region("kickstart", 0);
@@ -1209,17 +1209,17 @@ void a4000_state::a4000_mem(address_map &map)
map(0x00200000, 0x009fffff).noprw(); // zorro2 expansion
map(0x00a00000, 0x00b7ffff).noprw();
map(0x00b80000, 0x00beffff).noprw();
- map(0x00bf0000, 0x00bfffff).rw(this, FUNC(a4000_state::cia_r), FUNC(a4000_state::cia_w));
- map(0x00c00000, 0x00cfffff).rw(this, FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w));
+ map(0x00bf0000, 0x00bfffff).rw(FUNC(a4000_state::cia_r), FUNC(a4000_state::cia_w));
+ map(0x00c00000, 0x00cfffff).rw(FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w));
map(0x00d00000, 0x00d9ffff).noprw();
map(0x00da0000, 0x00dbffff).noprw();
map(0x00dc0000, 0x00dcffff).rw("rtc", FUNC(rp5c01_device::read), FUNC(rp5c01_device::write)).umask32(0x000000ff);
map(0x00dd0000, 0x00dd0fff).noprw();
- map(0x00dd1000, 0x00dd3fff).rw(this, FUNC(a4000_state::ide_r), FUNC(a4000_state::ide_w));
+ map(0x00dd1000, 0x00dd3fff).rw(FUNC(a4000_state::ide_r), FUNC(a4000_state::ide_w));
map(0x00dd4000, 0x00ddffff).noprw();
- map(0x00de0000, 0x00deffff).rw(this, FUNC(a4000_state::motherboard_r), FUNC(a4000_state::motherboard_w));
- map(0x00df0000, 0x00dfffff).rw(this, FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w));
- map(0x00e00000, 0x00e7ffff).nopw().r(this, FUNC(a4000_state::rom_mirror32_r));
+ map(0x00de0000, 0x00deffff).rw(FUNC(a4000_state::motherboard_r), FUNC(a4000_state::motherboard_w));
+ map(0x00df0000, 0x00dfffff).rw(FUNC(a4000_state::custom_chip_r), FUNC(a4000_state::custom_chip_w));
+ map(0x00e00000, 0x00e7ffff).nopw().r(FUNC(a4000_state::rom_mirror32_r));
map(0x00e80000, 0x00efffff).noprw(); // zorro2 autoconfig space (installed by devices)
map(0x00f00000, 0x00f7ffff).noprw(); // cartridge space
map(0x00f80000, 0x00ffffff).rom().region("kickstart", 0);
@@ -1244,8 +1244,8 @@ void cd32_state::cd32_mem(address_map &map)
map.unmap_value_high();
map(0x000000, 0x1fffff).m(m_overlay, FUNC(address_map_bank_device::amap32));
map(0xb80000, 0xb8003f).rw("akiko", FUNC(akiko_device::read), FUNC(akiko_device::write));
- map(0xbf0000, 0xbfffff).rw(this, FUNC(cd32_state::cia_r), FUNC(cd32_state::gayle_cia_w));
- map(0xc00000, 0xdfffff).rw(this, FUNC(cd32_state::custom_chip_r), FUNC(cd32_state::custom_chip_w));
+ map(0xbf0000, 0xbfffff).rw(FUNC(cd32_state::cia_r), FUNC(cd32_state::gayle_cia_w));
+ map(0xc00000, 0xdfffff).rw(FUNC(cd32_state::custom_chip_r), FUNC(cd32_state::custom_chip_w));
map(0xe00000, 0xe7ffff).rom().region("kickstart", 0x80000);
map(0xe80000, 0xf7ffff).noprw();
map(0xf80000, 0xffffff).rom().region("kickstart", 0);
@@ -1256,7 +1256,7 @@ void a4000_state::a4000t_mem(address_map &map)
{
map.unmap_value_high();
a4000_mem(map);
- map(0x00dd0000, 0x00dd0fff).rw(this, FUNC(a4000_state::scsi_r), FUNC(a4000_state::scsi_w));
+ map(0x00dd0000, 0x00dd0fff).rw(FUNC(a4000_state::scsi_r), FUNC(a4000_state::scsi_w));
}
@@ -1385,7 +1385,7 @@ MACHINE_CONFIG_START(amiga_state::amiga_base)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("cia_0_port_a"))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8("cent_data_out", output_latch_device, bus_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE("centronics", centronics_device, write_strobe))
MCFG_MOS6526_SP_CALLBACK(WRITELINE("kbd", amiga_keyboard_bus_device, kdat_in_w)) MCFG_DEVCB_INVERT
@@ -1737,10 +1737,10 @@ MACHINE_CONFIG_START(a600_state::a600)
MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a600_state::GAYLE_ID)
MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a600_state, gayle_int2_w))
- MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, read_cs0))
- MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs0))
- MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, read_cs1))
- MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs1))
+ MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, cs0_r))
+ MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs0_w))
+ MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, cs1_r))
+ MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs1_w))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("gayle", gayle_device, ide_interrupt_w))
@@ -1792,10 +1792,10 @@ MACHINE_CONFIG_START(a1200_state::a1200)
MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a1200_state::GAYLE_ID)
MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a1200_state, gayle_int2_w))
- MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, read_cs0))
- MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs0))
- MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, read_cs1))
- MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs1))
+ MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, cs0_r))
+ MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs0_w))
+ MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, cs1_r))
+ MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, cs1_w))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("gayle", gayle_device, ide_interrupt_w))
diff --git a/src/mame/drivers/ampex.cpp b/src/mame/drivers/ampex.cpp
index 108c5e02bc9..19aabb9c571 100644
--- a/src/mame/drivers/ampex.cpp
+++ b/src/mame/drivers/ampex.cpp
@@ -162,14 +162,14 @@ void ampex_state::mem_map(address_map &map)
map(0x0000, 0x2fff).rom().region("roms", 0);
map(0x4000, 0x43ff).ram(); // main RAM
map(0x4400, 0x57ff).ram(); // expansion RAM
- map(0x5840, 0x5840).rw(this, FUNC(ampex_state::read_5840), FUNC(ampex_state::write_5840));
- map(0x5841, 0x5841).rw(this, FUNC(ampex_state::read_5841), FUNC(ampex_state::write_5841));
- map(0x5842, 0x5842).r(this, FUNC(ampex_state::read_5842)).w(m_uart, FUNC(ay31015_device::transmit));
- map(0x5843, 0x5843).r(m_uart, FUNC(ay31015_device::receive)).w(this, FUNC(ampex_state::write_5843));
- map(0x5846, 0x5846).r(this, FUNC(ampex_state::read_5846));
- map(0x5847, 0x5847).r(this, FUNC(ampex_state::read_5847));
+ map(0x5840, 0x5840).rw(FUNC(ampex_state::read_5840), FUNC(ampex_state::write_5840));
+ map(0x5841, 0x5841).rw(FUNC(ampex_state::read_5841), FUNC(ampex_state::write_5841));
+ map(0x5842, 0x5842).r(FUNC(ampex_state::read_5842)).w(m_uart, FUNC(ay31015_device::transmit));
+ map(0x5843, 0x5843).r(m_uart, FUNC(ay31015_device::receive)).w(FUNC(ampex_state::write_5843));
+ map(0x5846, 0x5846).r(FUNC(ampex_state::read_5846));
+ map(0x5847, 0x5847).r(FUNC(ampex_state::read_5847));
map(0x5c00, 0x5c0f).rw("vtac", FUNC(crt5037_device::read), FUNC(crt5037_device::write));
- map(0x8000, 0x97ff).rw(this, FUNC(ampex_state::page_r), FUNC(ampex_state::page_w));
+ map(0x8000, 0x97ff).rw(FUNC(ampex_state::page_r), FUNC(ampex_state::page_w));
map(0xc000, 0xcfff).ram(); // video RAM
}
@@ -187,8 +187,8 @@ void ampex_state::machine_start()
m_uart->write_swe(0);
// Are rates hardwired to DIP switches? They don't seem to be software-controlled...
- m_dbrg->str_w(0xe);
- m_dbrg->stt_w(0xe);
+ m_dbrg->write_str(0xe);
+ m_dbrg->write_stt(0xe);
// Make up some settings for the UART (probably also actually controlled by DIP switches)
m_uart->write_nb1(1);
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index e9ae00f0d29..a3deba623ca 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -600,7 +600,7 @@ void ampoker2_state::ampoker2_map(address_map &map)
{
map(0x0000, 0xbfff).rom();
map(0xc000, 0xcfff).ram().share("nvram");
- map(0xe000, 0xefff).ram().w(this, FUNC(ampoker2_state::ampoker2_videoram_w)).share("videoram");
+ map(0xe000, 0xefff).ram().w(FUNC(ampoker2_state::ampoker2_videoram_w)).share("videoram");
}
void ampoker2_state::ampoker2_io_map(address_map &map)
@@ -616,14 +616,14 @@ void ampoker2_state::ampoker2_io_map(address_map &map)
map(0x16, 0x16).portr("IN6");
map(0x17, 0x17).portr("IN7");
// AM_RANGE(0x21, 0x21) AM_WRITENOP /* undocumented, write 0x1a after each reset */
- map(0x30, 0x30).w(this, FUNC(ampoker2_state::ampoker2_port30_w)); /* see write handlers */
- map(0x31, 0x31).w(this, FUNC(ampoker2_state::ampoker2_port31_w)); /* see write handlers */
- map(0x32, 0x32).w(this, FUNC(ampoker2_state::ampoker2_port32_w)); /* see write handlers */
- map(0x33, 0x33).w(this, FUNC(ampoker2_state::ampoker2_port33_w)); /* see write handlers */
- map(0x34, 0x34).w(this, FUNC(ampoker2_state::ampoker2_port34_w)); /* see write handlers */
- map(0x35, 0x35).w(this, FUNC(ampoker2_state::ampoker2_port35_w)); /* see write handlers */
- map(0x36, 0x36).w(this, FUNC(ampoker2_state::ampoker2_port36_w)); /* see write handlers */
-