summaryrefslogtreecommitdiffstats
path: root/src/mame
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
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')
-rw-r--r--src/mame/audio/atarijsa.cpp30
-rw-r--r--src/mame/audio/cage.cpp12
-rw-r--r--src/mame/audio/cclimber.cpp4
-rw-r--r--src/mame/audio/cclimber.h2
-rw-r--r--src/mame/audio/dcs.cpp92
-rw-r--r--src/mame/audio/decobsmt.cpp10
-rw-r--r--src/mame/audio/dkong.cpp4
-rw-r--r--src/mame/audio/dsbz80.cpp10
-rw-r--r--src/mame/audio/efo_zsu.cpp2
-rw-r--r--src/mame/audio/exidy.cpp16
-rw-r--r--src/mame/audio/exidy440.cpp10
-rw-r--r--src/mame/audio/flower.cpp12
-rw-r--r--src/mame/audio/gottlieb.cpp26
-rw-r--r--src/mame/audio/harddriv.cpp28
-rw-r--r--src/mame/audio/hng64.cpp12
-rw-r--r--src/mame/audio/irem.cpp16
-rw-r--r--src/mame/audio/jedi.cpp12
-rw-r--r--src/mame/audio/leland.cpp4
-rw-r--r--src/mame/audio/mario.cpp2
-rw-r--r--src/mame/audio/midway.cpp10
-rw-r--r--src/mame/audio/n8080.cpp4
-rw-r--r--src/mame/audio/nichisnd.cpp4
-rw-r--r--src/mame/audio/rax.cpp8
-rw-r--r--src/mame/audio/redalert.cpp4
-rw-r--r--src/mame/audio/s11c_bg.cpp8
-rw-r--r--src/mame/audio/scramble.cpp2
-rw-r--r--src/mame/audio/segag80r.cpp2
-rw-r--r--src/mame/audio/segam1audio.cpp4
-rw-r--r--src/mame/audio/segasnd.cpp2
-rw-r--r--src/mame/audio/t5182.cpp10
-rw-r--r--src/mame/audio/taito_en.cpp4
-rw-r--r--src/mame/audio/taito_zm.cpp2
-rw-r--r--src/mame/audio/timeplt.cpp18
-rw-r--r--src/mame/audio/timeplt.h2
-rw-r--r--src/mame/audio/tx1.cpp24
-rw-r--r--src/mame/audio/williams.cpp44
-rw-r--r--src/mame/audio/wpcsnd.cpp14
-rw-r--r--src/mame/audio/zaccaria.cpp6
-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
-rw-r--r--src/mame/includes/amiga.h2
-rw-r--r--src/mame/includes/bw12.h2
-rw-r--r--src/mame/includes/coco.h2
-rw-r--r--src/mame/includes/hyperspt.h8
-rw-r--r--src/mame/includes/sbasketb.h15
-rw-r--r--src/mame/includes/trackfld.h8
-rw-r--r--src/mame/includes/yiear.h15
-rw-r--r--src/mame/machine/315-5881_crypt.cpp20
-rw-r--r--src/mame/machine/abc1600mac.cpp2
-rw-r--r--src/mame/machine/acs8600_ics.cpp6
-rw-r--r--src/mame/machine/apricotkb.cpp14
-rw-r--r--src/mame/machine/archimds.cpp30
-rw-r--r--src/mame/machine/asic65.cpp4
-rw-r--r--src/mame/machine/at.cpp6
-rw-r--r--src/mame/machine/awboard.cpp14
-rw-r--r--src/mame/machine/bbc.cpp4
-rw-r--r--src/mame/machine/bebox.cpp8
-rw-r--r--src/mame/machine/cammu.cpp104
-rw-r--r--src/mame/machine/cedar_magnet_plane.cpp8
-rw-r--r--src/mame/machine/cedar_magnet_sprite.cpp12
-rw-r--r--src/mame/machine/cuda.cpp14
-rw-r--r--src/mame/machine/dec_lk201.cpp10
-rw-r--r--src/mame/machine/deco_irq.cpp8
-rw-r--r--src/mame/machine/decopincpu.cpp4
-rw-r--r--src/mame/machine/egret.cpp14
-rw-r--r--src/mame/machine/gaelco_ds5002fp.cpp2
-rw-r--r--src/mame/machine/hng64_net.cpp6
-rw-r--r--src/mame/machine/inder_sb.cpp30
-rw-r--r--src/mame/machine/interpro_arbga.cpp50
-rw-r--r--src/mame/machine/interpro_ioga.cpp68
-rw-r--r--src/mame/machine/interpro_mcga.cpp34
-rw-r--r--src/mame/machine/interpro_sga.cpp86
-rw-r--r--src/mame/machine/isbc_208.cpp2
-rw-r--r--src/mame/machine/isbc_215g.cpp4
-rw-r--r--src/mame/machine/iteagle_fpga.cpp12
-rw-r--r--src/mame/machine/k573dio.cpp60
-rw-r--r--src/mame/machine/kr1601rr1.cpp14
-rw-r--r--src/mame/machine/kr1601rr1.h3
-rw-r--r--src/mame/machine/m1comm.cpp6
-rw-r--r--src/mame/machine/m20_8086.cpp4
-rw-r--r--src/mame/machine/m24_z8000.cpp12
-rw-r--r--src/mame/machine/m3comm.cpp10
-rw-r--r--src/mame/machine/maple-dc.cpp12
-rw-r--r--src/mame/machine/mega32x.cpp48
-rw-r--r--src/mame/machine/megacd.cpp42
-rw-r--r--src/mame/machine/megadriv.cpp26
-rw-r--r--src/mame/machine/mie.cpp36
-rw-r--r--src/mame/machine/model1.cpp16
-rw-r--r--src/mame/machine/model1io2.cpp2
-rw-r--r--src/mame/machine/mpu4.cpp6
-rw-r--r--src/mame/machine/mtx.cpp2
-rw-r--r--src/mame/machine/namco_c139.cpp2
-rw-r--r--src/mame/machine/namco_c148.cpp32
-rw-r--r--src/mame/machine/naomibd.cpp20
-rw-r--r--src/mame/machine/naomig1.cpp36
-rw-r--r--src/mame/machine/naomim1.cpp2
-rw-r--r--src/mame/machine/naomim4.cpp2
-rw-r--r--src/mame/machine/nb1412m2.cpp18
-rw-r--r--src/mame/machine/nextkbd.cpp12
-rw-r--r--src/mame/machine/nextmo.cpp18
-rw-r--r--src/mame/machine/nmk004.cpp8
-rw-r--r--src/mame/machine/pcshare.cpp2
-rw-r--r--src/mame/machine/pgmprot_igs027a_type1.cpp12
-rw-r--r--src/mame/machine/pgmprot_igs027a_type2.cpp8
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.cpp12
-rw-r--r--src/mame/machine/prof80mmu.cpp2
-rw-r--r--src/mame/machine/qix.cpp4
-rw-r--r--src/mame/machine/seicopbl.cpp20
-rw-r--r--src/mame/machine/sms.cpp4
-rw-r--r--src/mame/machine/st0016.cpp18
-rw-r--r--src/mame/machine/super80.cpp2
-rw-r--r--src/mame/machine/taitocchip.cpp2
-rw-r--r--src/mame/machine/thomson.cpp2
-rw-r--r--src/mame/machine/trs80.cpp2
-rw-r--r--src/mame/machine/vector06.cpp2
-rw-r--r--src/mame/machine/wangpckb.cpp2
-rw-r--r--src/mame/machine/wpc_shift.cpp8
-rw-r--r--src/mame/machine/xbox.cpp26
-rw-r--r--src/mame/machine/xbox_pci.cpp24
-rw-r--r--src/mame/video/abc1600.cpp42
-rw-r--r--src/mame/video/amiga.cpp4
-rw-r--r--src/mame/video/bfm_adr2.cpp18
-rw-r--r--src/mame/video/bfm_dm01.cpp8
-rw-r--r--src/mame/video/c45.cpp4
-rw-r--r--src/mame/video/decodmd1.cpp2
-rw-r--r--src/mame/video/decodmd2.cpp10
-rw-r--r--src/mame/video/decodmd3.cpp6
-rw-r--r--src/mame/video/gamate.cpp14
-rw-r--r--src/mame/video/gime.h4
-rw-r--r--src/mame/video/gp9001.cpp6
-rw-r--r--src/mame/video/igs017_igs031.cpp14
-rw-r--r--src/mame/video/kaneko_grap2.cpp28
-rw-r--r--src/mame/video/nick.cpp10
-rw-r--r--src/mame/video/pcd.cpp12
-rw-r--r--src/mame/video/powervr2.cpp110
-rw-r--r--src/mame/video/qix.cpp50
-rw-r--r--src/mame/video/seibu_crtc.cpp10
-rw-r--r--src/mame/video/tmc600.cpp2
-rw-r--r--src/mame/video/wpc_dmd.cpp16
-rw-r--r--src/mame/video/ygv608.cpp66
1943 files changed, 22959 insertions, 23015 deletions
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index 6c718a19cc4..0e58d0db7cc 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -101,13 +101,13 @@ void atari_jsa_i_device::atarijsa1_map(address_map &map)
map(0x2000, 0x2001).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x2800, 0x2800).mirror(0x01f9); // N/C
map(0x2802, 0x2802).mirror(0x01f9).r("soundcomm", FUNC(atari_sound_comm_device::sound_command_r)); // /RDP
- map(0x2804, 0x2804).mirror(0x01f9).r(this, FUNC(atari_jsa_i_device::rdio_r)); // /RDIO
+ map(0x2804, 0x2804).mirror(0x01f9).r(FUNC(atari_jsa_i_device::rdio_r)); // /RDIO
map(0x2806, 0x2806).mirror(0x01f9).rw("soundcomm", FUNC(atari_sound_comm_device::sound_irq_ack_r), FUNC(atari_sound_comm_device::sound_irq_ack_w)); // R/W=/IRQACK
- map(0x2a00, 0x2a00).mirror(0x01f9).w(this, FUNC(atari_jsa_i_device::tms5220_voice)); // /VOICE
+ map(0x2a00, 0x2a00).mirror(0x01f9).w(FUNC(atari_jsa_i_device::tms5220_voice)); // /VOICE
map(0x2a02, 0x2a02).mirror(0x01f9).w("soundcomm", FUNC(atari_sound_comm_device::sound_response_w)); // /WRP
- map(0x2a04, 0x2a04).mirror(0x01f9).w(this, FUNC(atari_jsa_i_device::wrio_w)); // /WRIO
- map(0x2a06, 0x2a06).mirror(0x01f9).w(this, FUNC(atari_jsa_i_device::mix_w)); // /MIX
- map(0x2c00, 0x2c0f).mirror(0x03f0).rw(this, FUNC(atari_jsa_i_device::pokey_r), FUNC(atari_jsa_i_device::pokey_w));
+ map(0x2a04, 0x2a04).mirror(0x01f9).w(FUNC(atari_jsa_i_device::wrio_w)); // /WRIO
+ map(0x2a06, 0x2a06).mirror(0x01f9).w(FUNC(atari_jsa_i_device::mix_w)); // /MIX
+ map(0x2c00, 0x2c0f).mirror(0x03f0).rw(FUNC(atari_jsa_i_device::pokey_r), FUNC(atari_jsa_i_device::pokey_w));
map(0x3000, 0x3fff).bankr("cpubank");
map(0x4000, 0xffff).rom();
}
@@ -117,14 +117,14 @@ void atari_jsa_ii_device::atarijsa2_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
map(0x2000, 0x2001).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
- map(0x2800, 0x2800).mirror(0x01f9).r(this, FUNC(atari_jsa_ii_device::oki_r)); // /RDV
+ map(0x2800, 0x2800).mirror(0x01f9).r(FUNC(atari_jsa_ii_device::oki_r)); // /RDV
map(0x2802, 0x2802).mirror(0x01f9).r("soundcomm", FUNC(atari_sound_comm_device::sound_command_r)); // /RDP
- map(0x2804, 0x2804).mirror(0x01f9).r(this, FUNC(atari_jsa_ii_device::rdio_r)); // /RDIO
+ map(0x2804, 0x2804).mirror(0x01f9).r(FUNC(atari_jsa_ii_device::rdio_r)); // /RDIO
map(0x2806, 0x2806).mirror(0x01f9).rw("soundcomm", FUNC(atari_sound_comm_device::sound_irq_ack_r), FUNC(atari_sound_comm_device::sound_irq_ack_w)); // R/W=/IRQACK
- map(0x2a00, 0x2a00).mirror(0x01f9).w(this, FUNC(atari_jsa_ii_device::oki_w)); // /WRV
+ map(0x2a00, 0x2a00).mirror(0x01f9).w(FUNC(atari_jsa_ii_device::oki_w)); // /WRV
map(0x2a02, 0x2a02).mirror(0x01f9).w("soundcomm", FUNC(atari_sound_comm_device::sound_response_w)); // /WRP
- map(0x2a04, 0x2a04).mirror(0x01f9).w(this, FUNC(atari_jsa_ii_device::wrio_w)); // /WRIO
- map(0x2a06, 0x2a06).mirror(0x01f9).w(this, FUNC(atari_jsa_ii_device::mix_w)); // /MIX
+ map(0x2a04, 0x2a04).mirror(0x01f9).w(FUNC(atari_jsa_ii_device::wrio_w)); // /WRIO
+ map(0x2a06, 0x2a06).mirror(0x01f9).w(FUNC(atari_jsa_ii_device::mix_w)); // /MIX
map(0x3000, 0x3fff).bankr("cpubank");
map(0x4000, 0xffff).rom();
}
@@ -135,14 +135,14 @@ void atari_jsa_iii_device::atarijsa3_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
map(0x2000, 0x2001).mirror(0x07fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
- map(0x2800, 0x2801).mirror(0x05f8).rw(this, FUNC(atari_jsa_iii_device::oki_r), FUNC(atari_jsa_iii_device::overall_volume_w)); // /RDV
+ map(0x2800, 0x2801).mirror(0x05f8).rw(FUNC(atari_jsa_iii_device::oki_r), FUNC(atari_jsa_iii_device::overall_volume_w)); // /RDV
map(0x2802, 0x2802).mirror(0x05f9).r("soundcomm", FUNC(atari_sound_comm_device::sound_command_r)); // /RDP
- map(0x2804, 0x2804).mirror(0x05f9).r(this, FUNC(atari_jsa_iii_device::rdio_r)); // /RDIO
+ map(0x2804, 0x2804).mirror(0x05f9).r(FUNC(atari_jsa_iii_device::rdio_r)); // /RDIO
map(0x2806, 0x2806).mirror(0x05f9).rw("soundcomm", FUNC(atari_sound_comm_device::sound_irq_ack_r), FUNC(atari_sound_comm_device::sound_irq_ack_w)); // R/W=/IRQACK
- map(0x2a00, 0x2a01).mirror(0x05f8).w(this, FUNC(atari_jsa_iii_device::oki_w)); // /WRV
+ map(0x2a00, 0x2a01).mirror(0x05f8).w(FUNC(atari_jsa_iii_device::oki_w)); // /WRV
map(0x2a02, 0x2a02).mirror(0x05f9).w("soundcomm", FUNC(atari_sound_comm_device::sound_response_w)); // /WRP
- map(0x2a04, 0x2a04).mirror(0x05f9).w(this, FUNC(atari_jsa_iii_device::wrio_w)); // /WRIO
- map(0x2a06, 0x2a06).mirror(0x05f9).w(this, FUNC(atari_jsa_iii_device::mix_w)); // /MIX
+ map(0x2a04, 0x2a04).mirror(0x05f9).w(FUNC(atari_jsa_iii_device::wrio_w)); // /WRIO
+ map(0x2a06, 0x2a06).mirror(0x05f9).w(FUNC(atari_jsa_iii_device::mix_w)); // /MIX
map(0x3000, 0x3fff).bankr("cpubank");
map(0x4000, 0xffff).rom();
}
diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp
index 0c35c32a044..e0199cb0b9d 100644
--- a/src/mame/audio/cage.cpp
+++ b/src/mame/audio/cage.cpp
@@ -600,9 +600,9 @@ void atari_cage_device::cage_map(address_map &map)
map(0x000000, 0x00ffff).ram().share("cageram");
map(0x200000, 0x200000).nopw();
map(0x400000, 0x47ffff).bankr("bank10");
- map(0x808000, 0x8080ff).rw(this, FUNC(atari_cage_device::tms32031_io_r), FUNC(atari_cage_device::tms32031_io_w));
+ map(0x808000, 0x8080ff).rw(FUNC(atari_cage_device::tms32031_io_r), FUNC(atari_cage_device::tms32031_io_w));
map(0x809800, 0x809fff).ram();
- map(0xa00000, 0xa00000).rw(this, FUNC(atari_cage_device::cage_from_main_r), FUNC(atari_cage_device::cage_to_main_w));
+ map(0xa00000, 0xa00000).rw(FUNC(atari_cage_device::cage_from_main_r), FUNC(atari_cage_device::cage_to_main_w));
map(0xc00000, 0xffffff).bankr("bank11");
}
@@ -612,11 +612,11 @@ void atari_cage_seattle_device::cage_map_seattle(address_map &map)
map(0x000000, 0x00ffff).ram().share("cageram");
map(0x200000, 0x200000).nopw();
map(0x400000, 0x47ffff).bankr("bank10");
- map(0x808000, 0x8080ff).rw(this, FUNC(atari_cage_seattle_device::tms32031_io_r), FUNC(atari_cage_seattle_device::tms32031_io_w));
+ map(0x808000, 0x8080ff).rw(FUNC(atari_cage_seattle_device::tms32031_io_r), FUNC(atari_cage_seattle_device::tms32031_io_w));
map(0x809800, 0x809fff).ram();
- map(0xa00000, 0xa00000).rw(this, FUNC(atari_cage_seattle_device::cage_from_main_r), FUNC(atari_cage_seattle_device::cage_from_main_ack_w));
- map(0xa00001, 0xa00001).w(this, FUNC(atari_cage_seattle_device::cage_to_main_w));
- map(0xa00003, 0xa00003).r(this, FUNC(atari_cage_seattle_device::cage_io_status_r));
+ map(0xa00000, 0xa00000).rw(FUNC(atari_cage_seattle_device::cage_from_main_r), FUNC(atari_cage_seattle_device::cage_from_main_ack_w));
+ map(0xa00001, 0xa00001).w(FUNC(atari_cage_seattle_device::cage_to_main_w));
+ map(0xa00003, 0xa00003).r(FUNC(atari_cage_seattle_device::cage_io_status_r));
map(0xc00000, 0xffffff).bankr("bank11");
}
diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp
index b9dbae51604..b7e17987e71 100644
--- a/src/mame/audio/cclimber.cpp
+++ b/src/mame/audio/cclimber.cpp
@@ -85,7 +85,7 @@ WRITE8_MEMBER(cclimber_audio_device::sample_volume_w)
m_sample_volume = data & 0x1f; /* range 0-31 */
}
-WRITE_LINE_MEMBER(cclimber_audio_device::sample_trigger_w)
+WRITE_LINE_MEMBER(cclimber_audio_device::sample_trigger)
{
if (state == 0)
return;
@@ -95,7 +95,7 @@ WRITE_LINE_MEMBER(cclimber_audio_device::sample_trigger_w)
WRITE8_MEMBER(cclimber_audio_device::sample_trigger_w)
{
- sample_trigger_w(data != 0);
+ sample_trigger(data != 0);
}
diff --git a/src/mame/audio/cclimber.h b/src/mame/audio/cclimber.h
index 3ea38fc8b77..0038c43556c 100644
--- a/src/mame/audio/cclimber.h
+++ b/src/mame/audio/cclimber.h
@@ -24,7 +24,7 @@ public:
// construction/destruction
cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE_LINE_MEMBER(sample_trigger_w);
+ DECLARE_WRITE_LINE_MEMBER(sample_trigger);
DECLARE_WRITE8_MEMBER(sample_trigger_w);
DECLARE_WRITE8_MEMBER(sample_rate_w);
DECLARE_WRITE8_MEMBER(sample_volume_w);
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 0e0b22fb871..daebaf6bf09 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -278,26 +278,26 @@ void dcs_audio_device::dcs_2k_program_map(address_map &map)
void dcs_audio_device::dcs_2k_data_map(address_map &map)
{
- map(0x0000, 0x07ff).mirror(0x1800).rw(this, FUNC(dcs_audio_device::dcs_dataram_r), FUNC(dcs_audio_device::dcs_dataram_w));
+ map(0x0000, 0x07ff).mirror(0x1800).rw(FUNC(dcs_audio_device::dcs_dataram_r), FUNC(dcs_audio_device::dcs_dataram_w));
map(0x2000, 0x2fff).bankr("databank");
- map(0x3000, 0x33ff).w(this, FUNC(dcs_audio_device::dcs_data_bank_select_w));
- map(0x3400, 0x37ff).rw(this, FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::output_latch_w));
+ map(0x3000, 0x33ff).w(FUNC(dcs_audio_device::dcs_data_bank_select_w));
+ map(0x3400, 0x37ff).rw(FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::output_latch_w));
map(0x3800, 0x39ff).ram();
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
/* DCS 2k with UART memory map */
void dcs_audio_device::dcs_2k_uart_data_map(address_map &map)
{
- map(0x0000, 0x07ff).mirror(0x1800).rw(this, FUNC(dcs_audio_device::dcs_dataram_r), FUNC(dcs_audio_device::dcs_dataram_w));
+ map(0x0000, 0x07ff).mirror(0x1800).rw(FUNC(dcs_audio_device::dcs_dataram_r), FUNC(dcs_audio_device::dcs_dataram_w));
map(0x2000, 0x2fff).bankr("databank");
- map(0x3000, 0x33ff).w(this, FUNC(dcs_audio_device::dcs_data_bank_select_w));
+ map(0x3000, 0x33ff).w(FUNC(dcs_audio_device::dcs_data_bank_select_w));
map(0x3400, 0x3402).noprw(); /* UART (ignored) */
- map(0x3403, 0x3403).rw(this, FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::output_latch_w));
+ map(0x3403, 0x3403).rw(FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::output_latch_w));
map(0x3404, 0x3405).noprw(); /* UART (ignored) */
map(0x3800, 0x39ff).ram().share("iram");
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
@@ -306,18 +306,18 @@ void dcs_audio_device::dcs_8k_program_map(address_map &map)
{
map(0x0000, 0x03ff).ram().share("dcsint");
map(0x0800, 0x1fff).ram().share("dcsext");
- map(0x3000, 0x3003).rw(this, FUNC(dcs_audio_device::input_latch32_r), FUNC(dcs_audio_device::output_latch32_w)); // why?
+ map(0x3000, 0x3003).rw(FUNC(dcs_audio_device::input_latch32_r), FUNC(dcs_audio_device::output_latch32_w)); // why?
}
void dcs_audio_device::dcs_8k_data_map(address_map &map)
{
map(0x0000, 0x07ff).ram();
- map(0x0800, 0x1fff).rw(this, FUNC(dcs_audio_device::dcs_dataram_r), FUNC(dcs_audio_device::dcs_dataram_w));
+ map(0x0800, 0x1fff).rw(FUNC(dcs_audio_device::dcs_dataram_r), FUNC(dcs_audio_device::dcs_dataram_w));
map(0x2000, 0x2fff).bankr("databank");
- map(0x3000, 0x3000).w(this, FUNC(dcs_audio_device::dcs_data_bank_select_w));
- map(0x3400, 0x3403).rw(this, FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::output_latch_w)); // mk3 etc. need this
+ map(0x3000, 0x3000).w(FUNC(dcs_audio_device::dcs_data_bank_select_w));
+ map(0x3400, 0x3403).rw(FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::output_latch_w)); // mk3 etc. need this
map(0x3800, 0x39ff).ram().share("iram");
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
/* Williams WPC DCS/Security Pinball */
@@ -330,12 +330,12 @@ void dcs_audio_device::dcs_wpc_program_map(address_map &map)
void dcs_audio_wpc_device::dcs_wpc_data_map(address_map &map)
{
map(0x0000, 0x07ff).bankr("databank");
- map(0x1000, 0x2fff).rw(this, FUNC(dcs_audio_wpc_device::dcs_dataram_r), FUNC(dcs_audio_wpc_device::dcs_dataram_w));
- map(0x3000, 0x3000).w(this, FUNC(dcs_audio_wpc_device::dcs_data_bank_select_w));
- map(0x3100, 0x3100).w(this, FUNC(dcs_audio_wpc_device::dcs_data_bank_select2_w));
- map(0x3300, 0x3303).rw(this, FUNC(dcs_audio_wpc_device::input_latch_r), FUNC(dcs_audio_wpc_device::output_latch_w));
+ map(0x1000, 0x2fff).rw(FUNC(dcs_audio_wpc_device::dcs_dataram_r), FUNC(dcs_audio_wpc_device::dcs_dataram_w));
+ map(0x3000, 0x3000).w(FUNC(dcs_audio_wpc_device::dcs_data_bank_select_w));
+ map(0x3100, 0x3100).w(FUNC(dcs_audio_wpc_device::dcs_data_bank_select2_w));
+ map(0x3300, 0x3303).rw(FUNC(dcs_audio_wpc_device::input_latch_r), FUNC(dcs_audio_wpc_device::output_latch_w));
map(0x3800, 0x39ff).ram().share("iram");
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_wpc_device::adsp_control_r), FUNC(dcs_audio_wpc_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_wpc_device::adsp_control_r), FUNC(dcs_audio_wpc_device::adsp_control_w));
}
/*************************************
@@ -360,27 +360,27 @@ void dcs_audio_device::dcs2_2104_program_map(address_map &map)
void dcs_audio_device::dcs2_2115_data_map(address_map &map)
{
map.unmap_value_high();
- map(0x0400, 0x0400).rw(this, FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
- map(0x0401, 0x0401).w(this, FUNC(dcs_audio_device::output_latch_w));
- map(0x0402, 0x0402).rw(this, FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
- map(0x0403, 0x0403).r(this, FUNC(dcs_audio_device::latch_status_r));
- map(0x0404, 0x0407).r(this, FUNC(dcs_audio_device::fifo_input_r));
- map(0x0480, 0x0483).rw(this, FUNC(dcs_audio_device::sdrc_r), FUNC(dcs_audio_device::sdrc_w));
+ map(0x0400, 0x0400).rw(FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
+ map(0x0401, 0x0401).w(FUNC(dcs_audio_device::output_latch_w));
+ map(0x0402, 0x0402).rw(FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
+ map(0x0403, 0x0403).r(FUNC(dcs_audio_device::latch_status_r));
+ map(0x0404, 0x0407).r(FUNC(dcs_audio_device::fifo_input_r));
+ map(0x0480, 0x0483).rw(FUNC(dcs_audio_device::sdrc_r), FUNC(dcs_audio_device::sdrc_w));
map(0x3800, 0x39ff).ram().share("iram");
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
void dcs_audio_device::dcs2_2104_data_map(address_map &map)
{
map.unmap_value_high();
- map(0x0400, 0x0400).rw(this, FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
- map(0x0401, 0x0401).w(this, FUNC(dcs_audio_device::output_latch_w));
- map(0x0402, 0x0402).rw(this, FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
- map(0x0403, 0x0403).r(this, FUNC(dcs_audio_device::latch_status_r));
- map(0x0404, 0x0407).r(this, FUNC(dcs_audio_device::fifo_input_r));
- map(0x0480, 0x0483).rw(this, FUNC(dcs_audio_device::sdrc_r), FUNC(dcs_audio_device::sdrc_w));
+ map(0x0400, 0x0400).rw(FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
+ map(0x0401, 0x0401).w(FUNC(dcs_audio_device::output_latch_w));
+ map(0x0402, 0x0402).rw(FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
+ map(0x0403, 0x0403).r(FUNC(dcs_audio_device::latch_status_r));
+ map(0x0404, 0x0407).r(FUNC(dcs_audio_device::fifo_input_r));
+ map(0x0480, 0x0483).rw(FUNC(dcs_audio_device::sdrc_r), FUNC(dcs_audio_device::sdrc_w));
map(0x3800, 0x39ff).ram().share("iram");
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
@@ -403,7 +403,7 @@ void dcs_audio_device::dsio_data_map(address_map &map)
map.unmap_value_high();
map(0x0000, 0x1fff).m("data_map_bank", FUNC(address_map_bank_device::amap16));
map(0x2000, 0x3fdf).ram().share("dcsint_data");
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
void dcs_audio_device::dsio_rambank_map(address_map &map)
@@ -415,12 +415,12 @@ void dcs_audio_device::dsio_rambank_map(address_map &map)
void dcs_audio_device::dsio_io_map(address_map &map)
{
map.unmap_value_high();
- map(0x0400, 0x0400).rw(this, FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
- map(0x0401, 0x0401).w(this, FUNC(dcs_audio_device::output_latch_w));
- map(0x0402, 0x0402).rw(this, FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
- map(0x0403, 0x0403).r(this, FUNC(dcs_audio_device::latch_status_r));
- map(0x0404, 0x0407).r(this, FUNC(dcs_audio_device::fifo_input_r));
- map(0x0480, 0x0483).rw(this, FUNC(dcs_audio_device::dsio_r), FUNC(dcs_audio_device::dsio_w));
+ map(0x0400, 0x0400).rw(FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
+ map(0x0401, 0x0401).w(FUNC(dcs_audio_device::output_latch_w));
+ map(0x0402, 0x0402).rw(FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
+ map(0x0403, 0x0403).r(FUNC(dcs_audio_device::latch_status_r));
+ map(0x0404, 0x0407).r(FUNC(dcs_audio_device::fifo_input_r));
+ map(0x0480, 0x0483).rw(FUNC(dcs_audio_device::dsio_r), FUNC(dcs_audio_device::dsio_w));
}
@@ -443,7 +443,7 @@ void dcs_audio_device::denver_data_map(address_map &map)
map.unmap_value_high();
map(0x0000, 0x1fff).m("data_map_bank", FUNC(address_map_bank_device::amap16));
map(0x2000, 0x3fdf).ram().share("dcsint_data");
- map(0x3fe0, 0x3fff).rw(this, FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
void dcs_audio_device::denver_rambank_map(address_map &map)
@@ -456,12 +456,12 @@ void dcs_audio_device::denver_rambank_map(address_map &map)
void dcs_audio_device::denver_io_map(address_map &map)
{
map.unmap_value_high();
- map(0x0400, 0x0400).rw(this, FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
- map(0x0401, 0x0401).w(this, FUNC(dcs_audio_device::output_latch_w));
- map(0x0402, 0x0402).rw(this, FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
- map(0x0403, 0x0403).r(this, FUNC(dcs_audio_device::latch_status_r));
- map(0x0404, 0x0407).r(this, FUNC(dcs_audio_device::fifo_input_r));
- map(0x0480, 0x0483).rw(this, FUNC(dcs_audio_device::denver_r), FUNC(dcs_audio_device::denver_w));
+ map(0x0400, 0x0400).rw(FUNC(dcs_audio_device::input_latch_r), FUNC(dcs_audio_device::input_latch_ack_w));
+ map(0x0401, 0x0401).w(FUNC(dcs_audio_device::output_latch_w));
+ map(0x0402, 0x0402).rw(FUNC(dcs_audio_device::output_control_r), FUNC(dcs_audio_device::output_control_w));
+ map(0x0403, 0x0403).r(FUNC(dcs_audio_device::latch_status_r));
+ map(0x0404, 0x0407).r(FUNC(dcs_audio_device::fifo_input_r));
+ map(0x0480, 0x0483).rw(FUNC(dcs_audio_device::denver_r), FUNC(dcs_audio_device::denver_w));
}
diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp
index e3da4e65b27..fd94192e026 100644
--- a/src/mame/audio/decobsmt.cpp
+++ b/src/mame/audio/decobsmt.cpp
@@ -20,11 +20,11 @@ void decobsmt_device::decobsmt_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
map(0x2000, 0xffff).rom().region(":soundcpu", 0x2000);
- map(0x2000, 0x2001).w(this, FUNC(decobsmt_device::bsmt_reset_w));
- map(0x2002, 0x2003).r(this, FUNC(decobsmt_device::bsmt_comms_r));
- map(0x2006, 0x2007).r(this, FUNC(decobsmt_device::bsmt_status_r));
- map(0x6000, 0x6000).w(this, FUNC(decobsmt_device::bsmt0_w));
- map(0xa000, 0xa0ff).w(this, FUNC(decobsmt_device::bsmt1_w));
+ map(0x2000, 0x2001).w(FUNC(decobsmt_device::bsmt_reset_w));
+ map(0x2002, 0x2003).r(FUNC(decobsmt_device::bsmt_comms_r));
+ map(0x2006, 0x2007).r(FUNC(decobsmt_device::bsmt_status_r));
+ map(0x6000, 0x6000).w(FUNC(decobsmt_device::bsmt0_w));
+ map(0xa000, 0xa0ff).w(FUNC(decobsmt_device::bsmt1_w));
}
void decobsmt_device::bsmt_map(address_map &map)
diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp
index 0b0dbfdbf15..7b36a4414aa 100644
--- a/src/mame/audio/dkong.cpp
+++ b/src/mame/audio/dkong.cpp
@@ -1277,7 +1277,7 @@ void dkong_state::dkong_sound_map(address_map &map)
void dkong_state::dkong_sound_io_map(address_map &map)
{
- map(0x00, 0xff).rw(this, FUNC(dkong_state::dkong_tune_r), FUNC(dkong_state::dkong_voice_w));
+ map(0x00, 0xff).rw(FUNC(dkong_state::dkong_tune_r), FUNC(dkong_state::dkong_voice_w));
}
void dkong_state::dkongjr_sound_io_map(address_map &map)
@@ -1288,7 +1288,7 @@ void dkong_state::dkongjr_sound_io_map(address_map &map)
void dkong_state::radarscp1_sound_io_map(address_map &map)
{
map(0x00, 0x00).mirror(0xff).r("ls175.3d", FUNC(latch8_device::read));
- map(0x00, 0xff).w(this, FUNC(dkong_state::dkong_p1_w)); /* DAC here */
+ map(0x00, 0xff).w(FUNC(dkong_state::dkong_p1_w)); /* DAC here */
}
void dkong_state::dkong3_sound1_map(address_map &map)
diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp
index 6102e97a1bf..ea7a83ae824 100644
--- a/src/mame/audio/dsbz80.cpp
+++ b/src/mame/audio/dsbz80.cpp
@@ -24,11 +24,11 @@ void dsbz80_device::dsbz80_map(address_map &map)
void dsbz80_device::dsbz80io_map(address_map &map)
{
map.global_mask(0xff);
- map(0xe0, 0xe0).w(this, FUNC(dsbz80_device::mpeg_trigger_w));
- map(0xe2, 0xe4).rw(this, FUNC(dsbz80_device::mpeg_pos_r), FUNC(dsbz80_device::mpeg_start_w));
- map(0xe5, 0xe7).w(this, FUNC(dsbz80_device::mpeg_end_w));
- map(0xe8, 0xe8).w(this, FUNC(dsbz80_device::mpeg_volume_w));
- map(0xe9, 0xe9).w(this, FUNC(dsbz80_device::mpeg_stereo_w));
+ map(0xe0, 0xe0).w(FUNC(dsbz80_device::mpeg_trigger_w));
+ map(0xe2, 0xe4).rw(FUNC(dsbz80_device::mpeg_pos_r), FUNC(dsbz80_device::mpeg_start_w));
+ map(0xe5, 0xe7).w(FUNC(dsbz80_device::mpeg_end_w));
+ map(0xe8, 0xe8).w(FUNC(dsbz80_device::mpeg_volume_w));
+ map(0xe9, 0xe9).w(FUNC(dsbz80_device::mpeg_stereo_w));
map(0xf0, 0xf0).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
map(0xf1, 0xf1).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
}
diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp
index 21a652f296f..c4667bfdfad 100644
--- a/src/mame/audio/efo_zsu.cpp
+++ b/src/mame/audio/efo_zsu.cpp
@@ -103,7 +103,7 @@ void efo_zsu_device::zsu_io(address_map &map)
map(0x00, 0x03).rw("ctc0", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x04, 0x07).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
- map(0x08, 0x08).w(this, FUNC(efo_zsu_device::adpcm_fifo_w));
+ map(0x08, 0x08).w(FUNC(efo_zsu_device::adpcm_fifo_w));
map(0x0c, 0x0c).w("aysnd0", FUNC(ay8910_device::address_w));
map(0x0d, 0x0d).w("aysnd0", FUNC(ay8910_device::data_w));
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index 31c622548a9..348b98ef214 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -742,10 +742,10 @@ void venture_sound_device::venture_audio_map(address_map &map)
map(0x0000, 0x007f).mirror(0x0780).ram();
map(0x0800, 0x087f).mirror(0x0780).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write));
map(0x1000, 0x1003).mirror(0x07fc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x1800, 0x1803).mirror(0x07fc).w(this, FUNC(venture_sound_device::sh8253_w));
- map(0x2000, 0x27ff).w(this, FUNC(venture_sound_device::filter_w));
- map(0x2800, 0x2807).mirror(0x07f8).rw(this, FUNC(venture_sound_device::sh6840_r), FUNC(venture_sound_device::sh6840_w));
- map(0x3000, 0x3003).mirror(0x07fc).w(this, FUNC(venture_sound_device::sfxctrl_w));
+ map(0x1800, 0x1803).mirror(0x07fc).w(FUNC(venture_sound_device::sh8253_w));
+ map(0x2000, 0x27ff).w(FUNC(venture_sound_device::filter_w));
+ map(0x2800, 0x2807).mirror(0x07f8).rw(FUNC(venture_sound_device::sh6840_r), FUNC(venture_sound_device::sh6840_w));
+ map(0x3000, 0x3003).mirror(0x07fc).w(FUNC(venture_sound_device::sfxctrl_w));
map(0x5800, 0x7fff).rom();
}
@@ -830,7 +830,7 @@ void mtrap_sound_device::cvsd_map(address_map &map)
void mtrap_sound_device::cvsd_iomap(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0xff).rw(this, FUNC(mtrap_sound_device::voiceio_r), FUNC(mtrap_sound_device::voiceio_w));
+ map(0x00, 0xff).rw(FUNC(mtrap_sound_device::voiceio_r), FUNC(mtrap_sound_device::voiceio_w));
}
@@ -972,10 +972,10 @@ void victory_sound_device::victory_audio_map(address_map &map)
map(0x0000, 0x00ff).mirror(0x0f00).ram();
map(0x1000, 0x107f).mirror(0x0f80).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write));
map(0x2000, 0x2003).mirror(0x0ffc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x3000, 0x3003).mirror(0x0ffc).w(this, FUNC(victory_sound_device::sh8253_w));
+ map(0x3000, 0x3003).mirror(0x0ffc).w(FUNC(victory_sound_device::sh8253_w));
map(0x4000, 0x4fff).noprw();
- map(0x5000, 0x5007).mirror(0x0ff8).rw(this, FUNC(victory_sound_device::sh6840_r), FUNC(victory_sound_device::sh6840_w));
- map(0x6000, 0x6003).mirror(0x0ffc).w(this, FUNC(victory_sound_device::sfxctrl_w));
+ map(0x5000, 0x5007).mirror(0x0ff8).rw(FUNC(victory_sound_device::sh6840_r), FUNC(victory_sound_device::sh6840_w));
+ map(0x6000, 0x6003).mirror(0x0ffc).w(FUNC(victory_sound_device::sfxctrl_w));
map(0x7000, 0xafff).noprw();
map(0xb000, 0xffff).rom();
}
diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp
index ee59b122ac9..59920448465 100644
--- a/src/mame/audio/exidy440.cpp
+++ b/src/mame/audio/exidy440.cpp
@@ -52,12 +52,12 @@ static const int channel_bits[4] =
void exidy440_sound_device::exidy440_audio_map(address_map &map)
{
map(0x0000, 0x7fff).noprw();
- map(0x8000, 0x801f).mirror(0x03e0).rw(this, FUNC(exidy440_sound_device::m6844_r), FUNC(exidy440_sound_device::m6844_w));
- map(0x8400, 0x840f).mirror(0x03f0).rw(this, FUNC(exidy440_sound_device::sound_volume_r), FUNC(exidy440_sound_device::sound_volume_w));
- map(0x8800, 0x8800).mirror(0x03ff).r(this, FUNC(exidy440_sound_device::sound_command_r)).nopw();
+ map(0x8000, 0x801f).mirror(0x03e0).rw(FUNC(exidy440_sound_device::m6844_r), FUNC(exidy440_sound_device::m6844_w));
+ map(0x8400, 0x840f).mirror(0x03f0).rw(FUNC(exidy440_sound_device::sound_volume_r), FUNC(exidy440_sound_device::sound_volume_w));
+ map(0x8800, 0x8800).mirror(0x03ff).r(FUNC(exidy440_sound_device::sound_command_r)).nopw();
map(0x8c00, 0x93ff).noprw();
- map(0x9400, 0x9403).mirror(0x03fc).nopr().w(this, FUNC(exidy440_sound_device::sound_banks_w));
- map(0x9800, 0x9800).mirror(0x03ff).nopr().w(this, FUNC(exidy440_sound_device::sound_interrupt_clear_w));
+ map(0x9400, 0x9403).mirror(0x03fc).nopr().w(FUNC(exidy440_sound_device::sound_banks_w));
+ map(0x9800, 0x9800).mirror(0x03ff).nopr().w(FUNC(exidy440_sound_device::sound_interrupt_clear_w));
map(0x9c00, 0x9fff).noprw();
map(0xa000, 0xbfff).ram();
map(0xc000, 0xdfff).noprw();
diff --git a/src/mame/audio/flower.cpp b/src/mame/audio/flower.cpp
index 0380586b5dc..1d6edf5b2a0 100644
--- a/src/mame/audio/flower.cpp
+++ b/src/mame/audio/flower.cpp
@@ -26,12 +26,12 @@ DEFINE_DEVICE_TYPE(FLOWER_CUSTOM, flower_sound_device, "flower_sound", "Flower C
// TODO: AM_SELECT unsupported by DEVICE_ADDRESS_MAP, so we need a trampoline here
void flower_sound_device::regs_map(address_map &map)
{
- map(0x00, 0x03).select(0x38).w(this, FUNC(flower_sound_device::frequency_w));
- map(0x04, 0x04).select(0x38).w(this, FUNC(flower_sound_device::repeat_w));
- map(0x05, 0x05).select(0x38).w(this, FUNC(flower_sound_device::unk_w));
- map(0x07, 0x07).select(0x38).w(this, FUNC(flower_sound_device::volume_w));
- map(0x40, 0x45).select(0x38).w(this, FUNC(flower_sound_device::start_address_w));
- map(0x47, 0x47).select(0x38).w(this, FUNC(flower_sound_device::sample_trigger_w));
+ map(0x00, 0x03).select(0x38).w(FUNC(flower_sound_device::frequency_w));
+ map(0x04, 0x04).select(0x38).w(FUNC(flower_sound_device::repeat_w));
+ map(0x05, 0x05).select(0x38).w(FUNC(flower_sound_device::unk_w));
+ map(0x07, 0x07).select(0x38).w(FUNC(flower_sound_device::volume_w));
+ map(0x40, 0x45).select(0x38).w(FUNC(flower_sound_device::start_address_w));
+ map(0x47, 0x47).select(0x38).w(FUNC(flower_sound_device::sample_trigger_w));
}
//**************************************************************************
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index 58cbd11cedb..4ff2f5fe978 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -116,7 +116,7 @@ MACHINE_CONFIG_START(gottlieb_sound_r0_device::device_add_mconfig)
// I/O configuration
MCFG_DEVICE_ADD("r6530", MOS6530, SOUND1_CLOCK/4) // unknown - same as cpu
- MCFG_MOS6530_OUT_PA_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MOS6530_OUT_PA_CB(WRITE8("dac", dac_byte_interface, data_w))
MCFG_MOS6530_IN_PB_CB(READ8(*this, gottlieb_sound_r0_device, r6530b_r))
// sound devices
@@ -272,9 +272,9 @@ void gottlieb_sound_r1_device::gottlieb_sound_r1_map(address_map &map)
map.global_mask(0x7fff);
map(0x0000, 0x007f).mirror(0x0d80).ram();
map(0x0200, 0x021f).mirror(0x0de0).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write));
- map(0x1000, 0x1000).mirror(0x0fff).w("dac", FUNC(dac_byte_interface::write));
- map(0x2000, 0x2000).mirror(0x0fff).w(this, FUNC(gottlieb_sound_r1_device::votrax_data_w));
- map(0x3000, 0x3000).mirror(0x0fff).w(this, FUNC(gottlieb_sound_r1_device::speech_clock_dac_w));
+ map(0x1000, 0x1000).mirror(0x0fff).w("dac", FUNC(dac_byte_interface::data_w));
+ map(0x2000, 0x2000).mirror(0x0fff).w(FUNC(gottlieb_sound_r1_device::votrax_data_w));
+ map(0x3000, 0x3000).mirror(0x0fff).w(FUNC(gottlieb_sound_r1_device::speech_clock_dac_w));
map(0x6000, 0x7fff).rom();
}
@@ -609,9 +609,9 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::sp0250_latch_w )
void gottlieb_sound_r2_device::gottlieb_sound_r2_map(address_map &map)
{
map(0x0000, 0x03ff).mirror(0x3c00).ram();
- map(0x4000, 0x4000).mirror(0x3ffe).w("dacvol", FUNC(dac_byte_interface::write));
- map(0x4001, 0x4001).mirror(0x3ffe).w("dac", FUNC(dac_byte_interface::write));
- map(0x8000, 0x8000).mirror(0x3fff).r(this, FUNC(gottlieb_sound_r2_device::audio_data_r));
+ map(0x4000, 0x4000).mirror(0x3ffe).w("dacvol", FUNC(dac_byte_interface::data_w));
+ map(0x4001, 0x4001).mirror(0x3ffe).w("dac", FUNC(dac_byte_interface::data_w));
+ map(0x8000, 0x8000).mirror(0x3fff).r(FUNC(gottlieb_sound_r2_device::audio_data_r));
map(0xc000, 0xdfff).mirror(0x2000).rom();
}
@@ -623,13 +623,13 @@ void gottlieb_sound_r2_device::gottlieb_sound_r2_map(address_map &map)
void gottlieb_sound_r2_device::gottlieb_speech_r2_map(address_map &map)
{
map(0x0000, 0x03ff).mirror(0x1c00).ram();
- map(0x2000, 0x2000).mirror(0x1fff).w(this, FUNC(gottlieb_sound_r2_device::sp0250_latch_w));
- map(0x4000, 0x4000).mirror(0x1fff).w(this, FUNC(gottlieb_sound_r2_device::speech_control_w));
+ map(0x2000, 0x2000).mirror(0x1fff).w(FUNC(gottlieb_sound_r2_device::sp0250_latch_w));
+ map(0x4000, 0x4000).mirror(0x1fff).w(FUNC(gottlieb_sound_r2_device::speech_control_w));
map(0x6000, 0x6000).mirror(0x1fff).portr("SB2");
- map(0x8000, 0x8000).mirror(0x1fff).w(this, FUNC(gottlieb_sound_r2_device::psg_latch_w));
- map(0xa000, 0xa000).mirror(0x07ff).w(this, FUNC(gottlieb_sound_r2_device::nmi_rate_w));
- map(0xa800, 0xa800).mirror(0x07ff).r(this, FUNC(gottlieb_sound_r2_device::speech_data_r));
- map(0xb000, 0xb000).mirror(0x07ff).w(this, FUNC(gottlieb_sound_r2_device::signal_audio_nmi_w));
+ map(0x8000, 0x8000).mirror(0x1fff).w(FUNC(gottlieb_sound_r2_device::psg_latch_w));
+ map(0xa000, 0xa000).mirror(0x07ff).w(FUNC(gottlieb_sound_r2_device::nmi_rate_w));
+ map(0xa800, 0xa800).mirror(0x07ff).r(FUNC(gottlieb_sound_r2_device::speech_data_r));
+ map(0xb000, 0xb000).mirror(0x07ff).w(FUNC(gottlieb_sound_r2_device::signal_audio_nmi_w));
map(0xc000, 0xffff).rom();
}
diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp
index 6957ca97472..70916a3b95f 100644
--- a/src/mame/audio/harddriv.cpp
+++ b/src/mame/audio/harddriv.cpp
@@ -395,13 +395,13 @@ void harddriv_sound_board_device::driversnd_68k_map(address_map &map)
{
map.unmap_value_high();
map(0x000000, 0x01ffff).rom();
- map(0xff0000, 0xff0fff).rw(this, FUNC(harddriv_sound_board_device::hdsnd68k_data_r), FUNC(harddriv_sound_board_device::hdsnd68k_data_w));
- map(0xff1000, 0xff1fff).rw(this, FUNC(harddriv_sound_board_device::hdsnd68k_switches_r), FUNC(harddriv_sound_board_device::hdsnd68k_latches_w));
- map(0xff2000, 0xff2fff).rw(this, FUNC(harddriv_sound_board_device::hdsnd68k_320port_r), FUNC(harddriv_sound_board_device::hdsnd68k_speech_w));
- map(0xff3000, 0xff3fff).rw(this, FUNC(harddriv_sound_board_device::hdsnd68k_status_r), FUNC(harddriv_sound_board_device::hdsnd68k_irqclr_w));
- map(0xff4000, 0xff5fff).rw(this, FUNC(harddriv_sound_board_device::hdsnd68k_320ram_r), FUNC(harddriv_sound_board_device::hdsnd68k_320ram_w));
- map(0xff6000, 0xff7fff).rw(this, FUNC(harddriv_sound_board_device::hdsnd68k_320ports_r), FUNC(harddriv_sound_board_device::hdsnd68k_320ports_w));
- map(0xff8000, 0xffbfff).rw(this, FUNC(harddriv_sound_board_device::hdsnd68k_320com_r), FUNC(harddriv_sound_board_device::hdsnd68k_320com_w));
+ map(0xff0000, 0xff0fff).rw(FUNC(harddriv_sound_board_device::hdsnd68k_data_r), FUNC(harddriv_sound_board_device::hdsnd68k_data_w));
+ map(0xff1000, 0xff1fff).rw(FUNC(harddriv_sound_board_device::hdsnd68k_switches_r), FUNC(harddriv_sound_board_device::hdsnd68k_latches_w));
+ map(0xff2000, 0xff2fff).rw(FUNC(harddriv_sound_board_device::hdsnd68k_320port_r), FUNC(harddriv_sound_board_device::hdsnd68k_speech_w));
+ map(0xff3000, 0xff3fff).rw(FUNC(harddriv_sound_board_device::hdsnd68k_status_r), FUNC(harddriv_sound_board_device::hdsnd68k_irqclr_w));
+ map(0xff4000, 0xff5fff).rw(FUNC(harddriv_sound_board_device::hdsnd68k_320ram_r), FUNC(harddriv_sound_board_device::hdsnd68k_320ram_w));
+ map(0xff6000, 0xff7fff).rw(FUNC(harddriv_sound_board_device::hdsnd68k_320ports_r), FUNC(harddriv_sound_board_device::hdsnd68k_320ports_w));
+ map(0xff8000, 0xffbfff).rw(FUNC(harddriv_sound_board_device::hdsnd68k_320com_r), FUNC(harddriv_sound_board_device::hdsnd68k_320com_w));
map(0xffc000, 0xffffff).ram();
}
@@ -417,14 +417,14 @@ void harddriv_sound_board_device::driversnd_dsp_program_map(address_map &map)
void harddriv_sound_board_device::driversnd_dsp_io_map(address_map &map)
{
- map(0, 0).r(this, FUNC(harddriv_sound_board_device::hdsnddsp_rom_r)).w(this, FUNC(harddriv_sound_board_device::hdsnddsp_dac_w));
- map(1, 1).r(this, FUNC(harddriv_sound_board_device::hdsnddsp_comram_r));
- map(2, 2).r(this, FUNC(harddriv_sound_board_device::hdsnddsp_compare_r));
+ map(0, 0).r(FUNC(harddriv_sound_board_device::hdsnddsp_rom_r)).w(FUNC(harddriv_sound_board_device::hdsnddsp_dac_w));
+ map(1, 1).r(FUNC(harddriv_sound_board_device::hdsnddsp_comram_r));
+ map(2, 2).r(FUNC(harddriv_sound_board_device::hdsnddsp_compare_r));
map(1, 2).nopw();
- map(3, 3).w(this, FUNC(harddriv_sound_board_device::hdsnddsp_comport_w));
- map(4, 4).w(this, FUNC(harddriv_sound_board_device::hdsnddsp_mute_w));
- map(5, 5).w(this, FUNC(harddriv_sound_board_device::hdsnddsp_gen68kirq_w));
- map(6, 7).w(this, FUNC(harddriv_sound_board_device::hdsnddsp_soundaddr_w));
+ map(3, 3).w(FUNC(harddriv_sound_board_device::hdsnddsp_comport_w));
+ map(4, 4).w(FUNC(harddriv_sound_board_device::hdsnddsp_mute_w));
+ map(5, 5).w(FUNC(harddriv_sound_board_device::hdsnddsp_gen68kirq_w));
+ map(6, 7).w(FUNC(harddriv_sound_board_device::hdsnddsp_soundaddr_w));
}
diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp
index db3c6cb5609..4642dc5f8c7 100644
--- a/src/mame/audio/hng64.cpp
+++ b/src/mame/audio/hng64.cpp
@@ -306,15 +306,15 @@ void hng64_state::hng_sound_io(address_map &map)
{
map(0x0000, 0x0007).rw(m_dsp, FUNC(l7a1045_sound_device::l7a1045_sound_r), FUNC(l7a1045_sound_device::l7a1045_sound_w));
- map(0x0008, 0x0009).rw(this, FUNC(hng64_state::hng64_sound_port_0008_r), FUNC(hng64_state::hng64_sound_port_0008_w));
- map(0x000a, 0x000b).w(this, FUNC(hng64_state::hng64_sound_port_000a_w));
- map(0x000c, 0x000d).w(this, FUNC(hng64_state::hng64_sound_port_000c_w));
+ map(0x0008, 0x0009).rw(FUNC(hng64_state::hng64_sound_port_0008_r), FUNC(hng64_state::hng64_sound_port_0008_w));
+ map(0x000a, 0x000b).w(FUNC(hng64_state::hng64_sound_port_000a_w));
+ map(0x000c, 0x000d).w(FUNC(hng64_state::hng64_sound_port_000c_w));
- map(0x0080, 0x0081).w(this, FUNC(hng64_state::hng64_sound_port_0080_w));
+ map(0x0080, 0x0081).w(FUNC(hng64_state::hng64_sound_port_0080_w));
- map(0x0100, 0x010f).rw(this, FUNC(hng64_state::sound_comms_r), FUNC(hng64_state::sound_comms_w));
+ map(0x0100, 0x010f).rw(FUNC(hng64_state::sound_comms_r), FUNC(hng64_state::sound_comms_w));
- map(0x0200, 0x021f).w(this, FUNC(hng64_state::hng64_sound_bank_w)); // ??
+ map(0x0200, 0x021f).w(FUNC(hng64_state::hng64_sound_bank_w)); // ??
}
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index a8f5dc42df4..c53ee460931 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -361,15 +361,15 @@ DISCRETE_SOUND_END
void irem_audio_device::m52_small_sound_map(address_map &map)
{
map.global_mask(0x7fff);
- map(0x0000, 0x0fff).w(this, FUNC(irem_audio_device::m52_adpcm_w));
- map(0x1000, 0x1fff).w(this, FUNC(irem_audio_device::sound_irq_ack_w));
+ map(0x0000, 0x0fff).w(FUNC(irem_audio_device::m52_adpcm_w));
+ map(0x1000, 0x1fff).w(FUNC(irem_audio_device::sound_irq_ack_w));
map(0x2000, 0x7fff).rom();
}
void irem_audio_device::m52_large_sound_map(address_map &map)
{
- map(0x0000, 0x1fff).w(this, FUNC(irem_audio_device::m52_adpcm_w));
- map(0x2000, 0x3fff).w(this, FUNC(irem_audio_device::sound_irq_ack_w));
+ map(0x0000, 0x1fff).w(FUNC(irem_audio_device::m52_adpcm_w));
+ map(0x2000, 0x3fff).w(FUNC(irem_audio_device::sound_irq_ack_w));
map(0x4000, 0xffff).rom();
}
@@ -377,16 +377,16 @@ void irem_audio_device::m52_large_sound_map(address_map &map)
/* complete address map verified from Kid Niki schematics */
void irem_audio_device::m62_sound_map(address_map &map)
{
- map(0x0800, 0x0800).mirror(0xf7fc).w(this, FUNC(irem_audio_device::sound_irq_ack_w));
- map(0x0801, 0x0802).mirror(0xf7fc).w(this, FUNC(irem_audio_device::m62_adpcm_w));
+ map(0x0800, 0x0800).mirror(0xf7fc).w(FUNC(irem_audio_device::sound_irq_ack_w));
+ map(0x0801, 0x0802).mirror(0xf7fc).w(FUNC(irem_audio_device::m62_adpcm_w));
map(0x4000, 0xffff).rom();
}
void irem_audio_device::irem_sound_portmap(address_map &map)
{
- map(M6801_PORT1, M6801_PORT1).rw(this, FUNC(irem_audio_device::m6803_port1_r), FUNC(irem_audio_device::m6803_port1_w));
- map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(irem_audio_device::m6803_port2_r), FUNC(irem_audio_device::m6803_port2_w));
+ map(M6801_PORT1, M6801_PORT1).rw(FUNC(irem_audio_device::m6803_port1_r), FUNC(irem_audio_device::m6803_port1_w));
+ map(M6801_PORT2, M6801_PORT2).rw(FUNC(irem_audio_device::m6803_port2_r), FUNC(irem_audio_device::m6803_port2_w));
}
/*
diff --git a/src/mame/audio/jedi.cpp b/src/mame/audio/jedi.cpp
index a53e386819b..f13e0e5ffc3 100644
--- a/src/mame/audio/jedi.cpp
+++ b/src/mame/audio/jedi.cpp
@@ -167,14 +167,14 @@ void jedi_state::audio_map(address_map &map)
map(0x0810, 0x081f).mirror(0x07c0).rw("pokey2", FUNC(pokey_device::read), FUNC(pokey_device::write));
map(0x0820, 0x082f).mirror(0x07c0).rw("pokey3", FUNC(pokey_device::read), FUNC(pokey_device::write));
map(0x0830, 0x083f).mirror(0x07c0).rw("pokey4", FUNC(pokey_device::read), FUNC(pokey_device::write));
- map(0x1000, 0x1000).mirror(0x00ff).nopr().w(this, FUNC(jedi_state::irq_ack_w));
+ map(0x1000, 0x1000).mirror(0x00ff).nopr().w(FUNC(jedi_state::irq_ack_w));
map(0x1100, 0x1100).mirror(0x00ff).nopr().writeonly().share("speech_data");
- map(0x1200, 0x13ff).nopr().w(this, FUNC(jedi_state::speech_strobe_w));
- map(0x1400, 0x1400).mirror(0x00ff).nopr().w(this, FUNC(jedi_state::audio_ack_latch_w));
- map(0x1500, 0x1500).mirror(0x00ff).nopr().w(this, FUNC(jedi_state::speech_reset_w));
+ map(0x1200, 0x13ff).nopr().w(FUNC(jedi_state::speech_strobe_w));
+ map(0x1400, 0x1400).mirror(0x00ff).nopr().w(FUNC(jedi_state::audio_ack_latch_w));
+ map(0x1500, 0x1500).mirror(0x00ff).nopr().w(FUNC(jedi_state::speech_reset_w));
map(0x1600, 0x17ff).noprw();
- map(0x1800, 0x1800).mirror(0x03ff).r(this, FUNC(jedi_state::audio_latch_r)).nopw();
- map(0x1c00, 0x1c00).mirror(0x03fe).r(this, FUNC(jedi_state::speech_ready_r)).nopw();
+ map(0x1800, 0x1800).mirror(0x03ff).r(FUNC(jedi_state::audio_latch_r)).nopw();
+ map(0x1c00, 0x1c00).mirror(0x03fe).r(FUNC(jedi_state::speech_ready_r)).nopw();
map(0x1c01, 0x1c01).mirror(0x03fe).readonly().nopw().share("audio_comm_stat");
map(0x2000, 0x7fff).noprw();
map(0x8000, 0xffff).rom();
diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp
index 4ff24acd042..027e1ff2adb 100644
--- a/src/mame/audio/leland.cpp
+++ b/src/mame/audio/leland.cpp
@@ -328,13 +328,13 @@ void leland_80186_sound_device::ataxx_80186_map_io(address_map &map)
void redline_80186_sound_device::redline_80186_map_io(address_map &map)
{
- map(0x0000, 0xffff).w(this, FUNC(redline_80186_sound_device::redline_dac_w));
+ map(0x0000, 0xffff).w(FUNC(redline_80186_sound_device::redline_dac_w));
}
void leland_80186_sound_device::leland_80186_map_io(address_map &map)
{
- map(0x0000, 0xffff).w(this, FUNC(leland_80186_sound_device::dac_w));
+ map(0x0000, 0xffff).w(FUNC(leland_80186_sound_device::dac_w));
}
/*************************************
diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp
index f1e080824d4..6706e8f3b48 100644
--- a/src/mame/audio/mario.cpp
+++ b/src/mame/audio/mario.cpp
@@ -617,7 +617,7 @@ void mario_state::mario_sound_map(address_map &map)
void mario_state::mario_sound_io_map(address_map &map)
{
- map(0x00, 0xff).r(this, FUNC(mario_state::mario_sh_tune_r)).w(this, FUNC(mario_state::mario_sh_sound_w));
+ map(0x00, 0xff).r(FUNC(mario_state::mario_sh_tune_r)).w(FUNC(mario_state::mario_sh_sound_w));
}
void mario_state::masao_sound_map(address_map &map)
diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp
index ee905a5253a..92093175f37 100644
--- a/src/mame/audio/midway.cpp
+++ b/src/mame/audio/midway.cpp
@@ -349,16 +349,16 @@ void midway_ssio_device::ssio_map(address_map &map)
map.unmap_value_high();
map(0x0000, 0x3fff).rom();
map(0x8000, 0x83ff).mirror(0x0c00).ram();
- map(0x9000, 0x9003).mirror(0x0ffc).r(this, FUNC(midway_ssio_device::data_r));
+ map(0x9000, 0x9003).mirror(0x0ffc).r(FUNC(midway_ssio_device::data_r));
map(0xa000, 0xa000).mirror(0x0ffc).w("ay0", FUNC(ay8910_device::address_w));
map(0xa001, 0xa001).mirror(0x0ffc).r("ay0", FUNC(ay8910_device::data_r));
map(0xa002, 0xa002).mirror(0x0ffc).w("ay0", FUNC(ay8910_device::data_w));
map(0xb000, 0xb000).mirror(0x0ffc).w("ay1", FUNC(ay8910_device::address_w));
map(0xb001, 0xb001).mirror(0x0ffc).r("ay1", FUNC(ay8910_device::data_r));
map(0xb002, 0xb002).mirror(0x0ffc).w("ay1", FUNC(ay8910_device::data_w));
- map(0xc000, 0xcfff).nopr().w(this, FUNC(midway_ssio_device::status_w));
+ map(0xc000, 0xcfff).nopr().w(FUNC(midway_ssio_device::status_w));
map(0xd000, 0xdfff).nopw(); // low bit controls yellow LED
- map(0xe000, 0xefff).r(this, FUNC(midway_ssio_device::irq_clear));
+ map(0xe000, 0xefff).r(FUNC(midway_ssio_device::irq_clear));
map(0xf000, 0xffff).portr("DIP"); // 6 DIP switches
}
@@ -916,7 +916,7 @@ void midway_squawk_n_talk_device::squawkntalk_map(address_map &map)
map(0x0000, 0x007f).ram(); // internal RAM
map(0x0080, 0x0083).mirror(0x4f6c).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x0090, 0x0093).mirror(0x4f6c).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x1000, 0x1fff).mirror(0x4000).w(this, FUNC(midway_squawk_n_talk_device::dac_w));
+ map(0x1000, 0x1fff).mirror(0x4000).w(FUNC(midway_squawk_n_talk_device::dac_w));
map(0x8000, 0xbfff).mirror(0x4000).rom();
}
@@ -929,7 +929,7 @@ void midway_squawk_n_talk_device::squawkntalk_alt_map(address_map &map)
map(0x0000, 0x007f).ram(); // internal RAM
map(0x0080, 0x0083).mirror(0x676c).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x0090, 0x0093).mirror(0x676c).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x0800, 0x0fff).mirror(0x6000).w(this, FUNC(midway_squawk_n_talk_device::dac_w));
+ map(0x0800, 0x0fff).mirror(0x6000).w(FUNC(midway_squawk_n_talk_device::dac_w));
map(0x8000, 0x9fff).mirror(0x6000).rom();
}
#endif
diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp
index d311fe1e21d..99c0e41c2f2 100644
--- a/src/mame/audio/n8080.cpp
+++ b/src/mame/audio/n8080.cpp
@@ -469,7 +469,7 @@ void n8080_state::n8080_sound_cpu_map(address_map &map)
void n8080_state::helifire_sound_io_map(address_map &map)
{
- map(0x00, 0x7f).r(this, FUNC(n8080_state::helifire_8035_external_ram_r));
+ map(0x00, 0x7f).r(FUNC(n8080_state::helifire_8035_external_ram_r));
}
@@ -563,7 +563,7 @@ MACHINE_CONFIG_START(n8080_state::helifire_sound)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, n8080_state, helifire_8035_t0_r))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, n8080_state, helifire_8035_t1_r))
MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, n8080_state, helifire_8035_p2_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("helifire_dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("helifire_dac", dac_byte_interface, data_w))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, n8080_state, helifire_sound_ctrl_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("helifire_dac_volume_timer", n8080_state, helifire_dac_volume_timer, attotime::from_hz(1000))
diff --git a/src/mame/audio/nichisnd.cpp b/src/mame/audio/nichisnd.cpp
index d5b4d0ceb1c..a73a7ef5b9b 100644
--- a/src/mame/audio/nichisnd.cpp
+++ b/src/mame/audio/nichisnd.cpp
@@ -85,8 +85,8 @@ MACHINE_CONFIG_START(nichisnd_device::device_add_mconfig)
MCFG_DEVICE_IO_MAP(nichisnd_io_map)
MCFG_TMPZ84C011_PORTD_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(*this, nichisnd_device, soundbank_w))
- MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8("dac1", dac_byte_interface, write))
- MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8("dac2", dac_byte_interface, write))
+ MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8("dac1", dac_byte_interface, data_w))
+ MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8("dac2", dac_byte_interface, data_w))
MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, nichisnd_device, soundlatch_clear_w))
MCFG_TMPZ84C011_ZC0_CB(WRITELINE("audiocpu", tmpz84c011_device, trg3))
diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp
index 4b16f6b1975..90ffd568606 100644
--- a/src/mame/audio/rax.cpp
+++ b/src/mame/audio/rax.cpp
@@ -283,15 +283,15 @@ void acclaim_rax_device::adsp_data_map(address_map &map)
map.unmap_value_high();
map(0x0000, 0x1fff).bankrw("databank");
map(0x2000, 0x3fdf).ram(); // Internal RAM
- map(0x3fe0, 0x3fff).rw(this, FUNC(acclaim_rax_device::adsp_control_r), FUNC(acclaim_rax_device::adsp_control_w));
+ map(0x3fe0, 0x3fff).rw(FUNC(acclaim_rax_device::adsp_control_r), FUNC(acclaim_rax_device::adsp_control_w));
}
void acclaim_rax_device::adsp_io_map(address_map &map)
{
map.unmap_value_high();
- map(0x0000, 0x0000).w(this, FUNC(acclaim_rax_device::ram_bank_w));
- map(0x0001, 0x0001).w(this, FUNC(acclaim_rax_device::rom_bank_w));
- map(0x0003, 0x0003).rw(this, FUNC(acclaim_rax_device::host_r), FUNC(acclaim_rax_device::host_w));
+ map(0x0000, 0x0000).w(FUNC(acclaim_rax_device::ram_bank_w));
+ map(0x0001, 0x0001).w(FUNC(acclaim_rax_device::rom_bank_w));
+ map(0x0003, 0x0003).rw(FUNC(acclaim_rax_device::host_r), FUNC(acclaim_rax_device::host_w));
}
diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp
index f0194492b61..2112c9bc4d7 100644
--- a/src/mame/audio/redalert.cpp
+++ b/src/mame/audio/redalert.cpp
@@ -115,8 +115,8 @@ void redalert_state::redalert_audio_map(address_map &map)
{
map.global_mask(0x7fff);
map(0x0000, 0x03ff).mirror(0x0c00).ram();
- map(0x1000, 0x1000).mirror(0x0ffe).nopr().w(this, FUNC(redalert_state::redalert_AY8910_w));
- map(0x1001, 0x1001).mirror(0x0ffe).rw(this, FUNC(redalert_state::redalert_ay8910_latch_1_r), FUNC(redalert_state::redalert_ay8910_latch_2_w));
+ map(0x1000, 0x1000).mirror(0x0ffe).nopr().w(FUNC(redalert_state::redalert_AY8910_w));
+ map(0x1001, 0x1001).mirror(0x0ffe).rw(FUNC(redalert_state::redalert_ay8910_latch_1_r), FUNC(redalert_state::redalert_ay8910_latch_2_w));
map(0x2000, 0x6fff).noprw();
map(0x7000, 0x77ff).mirror(0x0800).rom();
}
diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp
index 14fae6244c1..715a2334bff 100644
--- a/src/mame/audio/s11c_bg.cpp
+++ b/src/mame/audio/s11c_bg.cpp
@@ -31,9 +31,9 @@ void s11c_bg_device::s11c_bg_map(address_map &map)
map(0x0000, 0x07ff).ram();
map(0x2000, 0x2001).mirror(0x1ffe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x4000, 0x4003).mirror(0x1ffc).rw("pia40", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x6000, 0x67ff).w(this, FUNC(s11c_bg_device::bg_speech_digit_w));
- map(0x6800, 0x6fff).w(this, FUNC(s11c_bg_device::bg_speech_clock_w));
- map(0x7800, 0x7fff).w(this, FUNC(s11c_bg_device::bgbank_w));
+ map(0x6000, 0x67ff).w(FUNC(s11c_bg_device::bg_speech_digit_w));
+ map(0x6800, 0x6fff).w(FUNC(s11c_bg_device::bg_speech_clock_w));
+ map(0x7800, 0x7fff).w(FUNC(s11c_bg_device::bgbank_w));
map(0x8000, 0xffff).bankr("bgbank");
}
@@ -74,7 +74,7 @@ MACHINE_CONFIG_START(s11c_bg_device::device_add_mconfig)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.5)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11c_bg_device, pia40_pb_w))
MCFG_PIA_CA2_HANDLER(WRITELINE("ym2151", ym2151_device, reset_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11c_bg_device, pia40_cb2_w))
diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp
index 3f80b80eb07..9c4710f6f46 100644
--- a/src/mame/audio/scramble.cpp
+++ b/src/mame/audio/scramble.cpp
@@ -256,7 +256,7 @@ void scramble_state::ad2083_sound_map(address_map &map)
void scramble_state::ad2083_sound_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x01, 0x01).w(this, FUNC(scramble_state::ad2083_tms5110_ctrl_w));
+ map(0x01, 0x01).w(FUNC(scramble_state::ad2083_tms5110_ctrl_w));
map(0x10, 0x10).w("ay1", FUNC(ay8910_device::address_w));
map(0x20, 0x20).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
map(0x40, 0x40).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp
index 35e05e7e7b1..a70416615b1 100644
--- a/src/mame/audio/segag80r.cpp
+++ b/src/mame/audio/segag80r.cpp
@@ -699,7 +699,7 @@ MACHINE_CONFIG_START(monsterb_sound_device::device_add_mconfig)
MCFG_MCS48_PORT_T1_IN_CB(GND) // labelled as "TEST", connected to ground
MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, monsterb_sound_device, n7751_command_r))
MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, monsterb_sound_device, n7751_rom_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, monsterb_sound_device, n7751_p2_w))
MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(m_i8243, i8243_device, prog_w))
diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp
index 749f65e2f06..85475dc28bb 100644
--- a/src/mame/audio/segam1audio.cpp
+++ b/src/mame/audio/segam1audio.cpp
@@ -30,9 +30,9 @@ void segam1audio_device::segam1audio_map(address_map &map)
map(0xc20003, 0xc20003).rw(UART_TAG, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
map(0xc40000, 0xc40007).rw(MULTIPCM_1_TAG, FUNC(multipcm_device::read), FUNC(multipcm_device::write)).umask16(0x00ff);
map(0xc40012, 0xc40013).nopw();
- map(0xc50000, 0xc50001).w(this, FUNC(segam1audio_device::m1_snd_mpcm_bnk1_w));
+ map(0xc50000, 0xc50001).w(FUNC(segam1audio_device::m1_snd_mpcm_bnk1_w));
map(0xc60000, 0xc60007).rw(MULTIPCM_2_TAG, FUNC(multipcm_device::read), FUNC(multipcm_device::write)).umask16(0x00ff);
- map(0xc70000, 0xc70001).w(this, FUNC(segam1audio_device::m1_snd_mpcm_bnk2_w));
+ map(0xc70000, 0xc70001).w(FUNC(segam1audio_device::m1_snd_mpcm_bnk2_w));
map(0xd00000, 0xd00007).rw(YM3438_TAG, FUNC(ym3438_device::read), FUNC(ym3438_device::write)).umask16(0x00ff);
map(0xf00000, 0xf0ffff).ram();
}
diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp
index f284fa50502..a4d62273cd9 100644
--- a/src/mame/audio/segasnd.cpp
+++ b/src/mame/audio/segasnd.cpp
@@ -864,7 +864,7 @@ void usb_sound_device::usb_map(address_map &map)
void usb_sound_device::usb_portmap(address_map &map)
{
- map(0x00, 0xff).rw(this, FUNC(usb_sound_device::workram_r), FUNC(usb_sound_device::workram_w)).share("workram");
+ map(0x00, 0xff).rw(FUNC(usb_sound_device::workram_r), FUNC(usb_sound_device::workram_w)).share("workram");
}
diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp
index cdeb8a9ed2e..93726634dcb 100644
--- a/src/mame/audio/t5182.cpp
+++ b/src/mame/audio/t5182.cpp
@@ -358,11 +358,11 @@ void t5182_device::t5182_io(address_map &map)
{
map.global_mask(0xff);
map(0x00, 0x01).rw(":ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
- map(0x10, 0x10).w(this, FUNC(t5182_device::sharedram_semaphore_snd_acquire_w));
- map(0x11, 0x11).w(this, FUNC(t5182_device::sharedram_semaphore_snd_release_w));
- map(0x12, 0x12).w(this, FUNC(t5182_device::ym2151_irq_ack_w));
- map(0x13, 0x13).w(this, FUNC(t5182_device::cpu_irq_ack_w));
- map(0x20, 0x20).r(this, FUNC(t5182_device::sharedram_semaphore_main_r));
+ map(0x10, 0x10).w(FUNC(t5182_device::sharedram_semaphore_snd_acquire_w));
+ map(0x11, 0x11).w(FUNC(t5182_device::sharedram_semaphore_snd_release_w));
+ map(0x12, 0x12).w(FUNC(t5182_device::ym2151_irq_ack_w));
+ map(0x13, 0x13).w(FUNC(t5182_device::cpu_irq_ack_w));
+ map(0x20, 0x20).r(FUNC(t5182_device::sharedram_semaphore_main_r));
map(0x30, 0x30).portr("T5182_COIN");
}
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index fc038c8a68e..a9c77698cc4 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -105,8 +105,8 @@ void taito_en_device::en_sound_map(address_map &map)
map(0x200000, 0x20001f).rw("ensoniq", FUNC(es5505_device::read), FUNC(es5505_device::write));
map(0x260000, 0x2601ff).rw("esp", FUNC(es5510_device::host_r), FUNC(es5510_device::host_w)).umask16(0x00ff);
map(0x280000, 0x28001f).rw("duart68681", FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff);
- map(0x300000, 0x30003f).w(this, FUNC(taito_en_device::en_es5505_bank_w));
- map(0x340000, 0x340003).w(this, FUNC(taito_en_device::en_volume_w)).umask16(0xff00);
+ map(0x300000, 0x30003f).w(FUNC(taito_en_device::en_es5505_bank_w));
+ map(0x340000, 0x340003).w(FUNC(taito_en_device::en_volume_w)).umask16(0xff00);
map(0xc00000, 0xc1ffff).bankr("cpubank1");
map(0xc20000, 0xc3ffff).bankr("cpubank2");
map(0xc40000, 0xc7ffff).bankr("cpubank3");
diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp
index cd5e36eaf83..2419cc05f3d 100644
--- a/src/mame/audio/taito_zm.cpp
+++ b/src/mame/audio/taito_zm.cpp
@@ -118,7 +118,7 @@ void taito_zoom_device::taitozoom_mn_map(address_map &map)
map(0x400000, 0x41ffff).ram();
map(0x800000, 0x8007ff).rw("zsg2", FUNC(zsg2_device::read), FUNC(zsg2_device::write));
map(0xc00000, 0xc00001).ram(); // TMS57002 comms
- map(0xe00000, 0xe000ff).rw(this, FUNC(taito_zoom_device::shared_ram_r), FUNC(taito_zoom_device::shared_ram_w)); // M66220FP for comms with maincpu
+ map(0xe00000, 0xe000ff).rw(FUNC(taito_zoom_device::shared_ram_r), FUNC(taito_zoom_device::shared_ram_w)); // M66220FP for comms with maincpu
}
diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp
index 04b206d6246..fd4d7581e22 100644
--- a/src/mame/audio/timeplt.cpp
+++ b/src/mame/audio/timeplt.cpp
@@ -95,7 +95,7 @@ READ8_MEMBER( timeplt_audio_device::portB_r )
*
*************************************/
-void timeplt_audio_device::filter_w(filter_rc_device &device, int data)
+void timeplt_audio_device::set_filter(filter_rc_device &device, int data)
{
int C = 0;
@@ -110,12 +110,12 @@ void timeplt_audio_device::filter_w(filter_rc_device &device, int data)
WRITE8_MEMBER( timeplt_audio_device::filter_w )
{
- filter_w(*m_filter_1[0], (offset >> 0) & 3);
- filter_w(*m_filter_1[1], (offset >> 2) & 3);
- filter_w(*m_filter_1[2], (offset >> 4) & 3);
- filter_w(*m_filter_0[0], (offset >> 6) & 3);
- filter_w(*m_filter_0[1], (offset >> 8) & 3);
- filter_w(*m_filter_0[2], (offset >> 10) & 3);
+ set_filter(*m_filter_1[0], (offset >> 0) & 3);
+ set_filter(*m_filter_1[1], (offset >> 2) & 3);
+ set_filter(*m_filter_1[2], (offset >> 4) & 3);
+ set_filter(*m_filter_0[0], (offset >> 6) & 3);
+ set_filter(*m_filter_0[1], (offset >> 8) & 3);
+ set_filter(*m_filter_0[2], (offset >> 10) & 3);
}
@@ -166,7 +166,7 @@ void timeplt_audio_device::timeplt_sound_map(address_map &map)
map(0x5000, 0x5000).mirror(0x0fff).w("ay1", FUNC(ay8910_device::address_w));
map(0x6000, 0x6000).mirror(0x0fff).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
map(0x7000, 0x7000).mirror(0x0fff).w("ay2", FUNC(ay8910_device::address_w));
- map(0x8000, 0xffff).w(this, FUNC(timeplt_audio_device::filter_w));
+ map(0x8000, 0xffff).w(FUNC(timeplt_audio_device::filter_w));
}
@@ -174,7 +174,7 @@ void locomotn_audio_device::locomotn_sound_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x2000, 0x23ff).mirror(0x0c00).ram();
- map(0x3000, 0x3fff).w(this, FUNC(locomotn_audio_device::filter_w));
+ map(0x3000, 0x3fff).w(FUNC(locomotn_audio_device::filter_w));
map(0x4000, 0x4000).mirror(0x0fff).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
map(0x5000, 0x5000).mirror(0x0fff).w("ay1", FUNC(ay8910_device::address_w));
map(0x6000, 0x6000).mirror(0x0fff).rw("ay2", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
diff --git a/src/mame/audio/timeplt.h b/src/mame/audio/timeplt.h
index 3440cc79aac..fc3d57ec241 100644
--- a/src/mame/audio/timeplt.h
+++ b/src/mame/audio/timeplt.h
@@ -43,7 +43,7 @@ private:
uint8_t m_last_irq_state;
- void filter_w(filter_rc_device &device, int data);
+ void set_filter(filter_rc_device &device, int data);
};
class locomotn_audio_device : public timeplt_audio_device
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index ff03b2e8a26..8c44033191b 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -417,11 +417,11 @@ void tx1_sound_device::tx1_sound_prg(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x3000, 0x37ff).ram().mirror(0x800).share("z80_ram");
- map(0x4000, 0x4000).w(this, FUNC(tx1_sound_device::z80_intreq_w));
+ map(0x4000, 0x4000).w(FUNC(tx1_sound_device::z80_intreq_w));
map(0x5000, 0x5003).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
- map(0x6000, 0x6003).rw(this, FUNC(tx1_sound_device::pit8253_r), FUNC(tx1_sound_device::pit8253_w));
- map(0x7000, 0x7fff).w(this, FUNC(tx1_sound_device::tx1_ppi_latch_w));
- map(0xb000, 0xbfff).rw(this, FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
+ map(0x6000, 0x6003).rw(FUNC(tx1_sound_device::pit8253_r), FUNC(tx1_sound_device::pit8253_w));
+ map(0x7000, 0x7fff).w(FUNC(tx1_sound_device::tx1_ppi_latch_w));
+ map(0xb000, 0xbfff).rw(FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
}
void tx1_sound_device::tx1_sound_io(address_map &map)
@@ -851,11 +851,11 @@ void buggyboy_sound_device::buggyboy_sound_prg(address_map &map)
{
map(0x0000, 0x3fff).rom();
map(0x4000, 0x47ff).ram().share("z80_ram");
- map(0x6000, 0x6001).r(this, FUNC(buggyboy_sound_device::bb_analog_r));
+ map(0x6000, 0x6001).r(FUNC(buggyboy_sound_device::bb_analog_r));
map(0x6800, 0x6803).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
- map(0x7000, 0x7003).rw(this, FUNC(buggyboy_sound_device::pit8253_r), FUNC(buggyboy_sound_device::pit8253_w));
- map(0x7800, 0x7800).w(this, FUNC(tx1_sound_device::z80_intreq_w));
- map(0xc000, 0xc7ff).rw(this, FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
+ map(0x7000, 0x7003).rw(FUNC(buggyboy_sound_device::pit8253_r), FUNC(buggyboy_sound_device::pit8253_w));
+ map(0x7800, 0x7800).w(FUNC(tx1_sound_device::z80_intreq_w));
+ map(0xc000, 0xc7ff).rw(FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
}
/* Buggy Boy Jr Sound PCB TC043 */
@@ -863,10 +863,10 @@ void buggyboyjr_sound_device::buggybjr_sound_prg(address_map &map)
{
map(0x0000, 0x3fff).rom();
map(0x4000, 0x47ff).ram().share("z80_ram");
- map(0x5000, 0x5003).rw(this, FUNC(buggyboy_sound_device::pit8253_r), FUNC(buggyboy_sound_device::pit8253_w));
- map(0x6000, 0x6001).r(this, FUNC(buggyboyjr_sound_device::bbjr_analog_r));
- map(0x7000, 0x7000).w(this, FUNC(tx1_sound_device::z80_intreq_w));
- map(0xc000, 0xc7ff).rw(this, FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
+ map(0x5000, 0x5003).rw(FUNC(buggyboy_sound_device::pit8253_r), FUNC(buggyboy_sound_device::pit8253_w));
+ map(0x6000, 0x6001).r(FUNC(buggyboyjr_sound_device::bbjr_analog_r));
+ map(0x7000, 0x7000).w(FUNC(tx1_sound_device::z80_intreq_w));
+ map(0xc000, 0xc7ff).rw(FUNC(tx1_sound_device::ts_r), FUNC(tx1_sound_device::ts_w));
}
/* Common */
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp
index 6323a20f85a..250f24fc8d4 100644
--- a/src/mame/audio/williams.cpp
+++ b/src/mame/audio/williams.cpp
@@ -164,9 +164,9 @@ void williams_cvsd_sound_device::williams_cvsd_map(address_map &map)
map(0x0000, 0x07ff).mirror(0x1800).ram();
map(0x2000, 0x2001).mirror(0x1ffe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x4000, 0x4003).mirror(0x1ffc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x6000, 0x6000).mirror(0x07ff).w(this, FUNC(williams_cvsd_sound_device::cvsd_digit_clock_clear_w));
- map(0x6800, 0x6800).mirror(0x07ff).w(this, FUNC(williams_cvsd_sound_device::cvsd_clock_set_w));
- map(0x7800, 0x7800).mirror(0x07ff).w(this, FUNC(williams_cvsd_sound_device::bank_select_w));
+ map(0x6000, 0x6000).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::cvsd_digit_clock_clear_w));
+ map(0x6800, 0x6800).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::cvsd_clock_set_w));
+ map(0x7800, 0x7800).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::bank_select_w));
map(0x8000, 0xffff).bankr("rombank");
}
@@ -180,7 +180,7 @@ MACHINE_CONFIG_START(williams_cvsd_sound_device::device_add_mconfig)
MCFG_DEVICE_PROGRAM_MAP(williams_cvsd_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams_cvsd_sound_device, talkback_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("cpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("cpu", INPUT_LINE_NMI))
@@ -460,12 +460,12 @@ void williams_narc_sound_device::williams_narc_master_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
map(0x2000, 0x2001).mirror(0x03fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
- map(0x2800, 0x2800).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::master_talkback_w));
- map(0x2c00, 0x2c00).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::command2_w));
- map(0x3000, 0x3000).mirror(0x03ff).w("dac1", FUNC(dac_byte_interface::write));
- map(0x3400, 0x3400).mirror(0x03ff).r(this, FUNC(williams_narc_sound_device::command_r));
- map(0x3800, 0x3800).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::master_bank_select_w));
- map(0x3c00, 0x3c00).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::master_sync_w));
+ map(0x2800, 0x2800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_talkback_w));
+ map(0x2c00, 0x2c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::command2_w));
+ map(0x3000, 0x3000).mirror(0x03ff).w("dac1", FUNC(dac_byte_interface::data_w));
+ map(0x3400, 0x3400).mirror(0x03ff).r(FUNC(williams_narc_sound_device::command_r));
+ map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_bank_select_w));
+ map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_sync_w));
map(0x4000, 0xbfff).bankr("masterbank");
map(0xc000, 0xffff).bankr("masterupper");
}
@@ -478,13 +478,13 @@ void williams_narc_sound_device::williams_narc_master_map(address_map &map)
void williams_narc_sound_device::williams_narc_slave_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
- map(0x2000, 0x2000).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::cvsd_clock_set_w));
- map(0x2400, 0x2400).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::cvsd_digit_clock_clear_w));
- map(0x2800, 0x2800).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::slave_talkback_w));
- map(0x3000, 0x3000).mirror(0x03ff).w("dac2", FUNC(dac_byte_interface::write));
- map(0x3400, 0x3400).mirror(0x03ff).r(this, FUNC(williams_narc_sound_device::command2_r));
- map(0x3800, 0x3800).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::slave_bank_select_w));
- map(0x3c00, 0x3c00).mirror(0x03ff).w(this, FUNC(williams_narc_sound_device::slave_sync_w));
+ map(0x2000, 0x2000).mirror(0x03ff).w(FUNC(williams_narc_sound_device::cvsd_clock_set_w));
+ map(0x2400, 0x2400).mirror(0x03ff).w(FUNC(williams_narc_sound_device::cvsd_digit_clock_clear_w));
+ map(0x2800, 0x2800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_talkback_w));
+ map(0x3000, 0x3000).mirror(0x03ff).w("dac2", FUNC(dac_byte_interface::data_w));
+ map(0x3400, 0x3400).mirror(0x03ff).r(FUNC(williams_narc_sound_device::command2_r));
+ map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_bank_select_w));
+ map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_sync_w));
map(0x4000, 0xbfff).bankr("slavebank");
map(0xc000, 0xffff).bankr("slaveupper");
}
@@ -723,13 +723,13 @@ WRITE8_MEMBER(williams_adpcm_sound_device::talkback_w)
void williams_adpcm_sound_device::williams_adpcm_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
- map(0x2000, 0x2000).mirror(0x03ff).w(this, FUNC(williams_adpcm_sound_device::bank_select_w));
+ map(0x2000, 0x2000).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::bank_select_w));
map(0x2400, 0x2401).mirror(0x03fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
- map(0x2800, 0x2800).mirror(0x03ff).w("dac", FUNC(dac_byte_interface::write));
+ map(0x2800, 0x2800).mirror(0x03ff).w("dac", FUNC(dac_byte_interface::data_w));
map(0x2c00, 0x2c00).mirror(0x03ff).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
- map(0x3000, 0x3000).mirror(0x03ff).r(this, FUNC(williams_adpcm_sound_device::command_r));
- map(0x3400, 0x3400).mirror(0x03ff).w(this, FUNC(williams_adpcm_sound_device::oki6295_bank_select_w));
- map(0x3c00, 0x3c00).mirror(0x03ff).w(this, FUNC(williams_adpcm_sound_device::talkback_w));
+ map(0x3000, 0x3000).mirror(0x03ff).r(FUNC(williams_adpcm_sound_device::command_r));
+ map(0x3400, 0x3400).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::oki6295_bank_select_w));
+ map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::talkback_w));
map(0x4000, 0xbfff).bankr("rombank");
map(0xc000, 0xffff).bankr("romupper");
}
diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp
index 8f918353b49..87d75acd4d5 100644
--- a/src/mame/audio/wpcsnd.cpp
+++ b/src/mame/audio/wpcsnd.cpp
@@ -34,14 +34,14 @@ wpcsnd_device::wpcsnd_device(const machine_config &mconfig, const char *tag, dev
void wpcsnd_device::wpcsnd_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
- map(0x2000, 0x2000).mirror(0x03ff).w(this, FUNC(wpcsnd_device::rombank_w));
+ map(0x2000, 0x2000).mirror(0x03ff).w(FUNC(wpcsnd_device::rombank_w));
map(0x2400, 0x2401).mirror(0x03fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
- map(0x2800, 0x2800).mirror(0x03ff).w("dac", FUNC(dac_byte_interface::write));
- map(0x2c00, 0x2fff).w(this, FUNC(wpcsnd_device::bg_speech_digit_w));
- map(0x3000, 0x33ff).r(this, FUNC(wpcsnd_device::latch_r));
- map(0x3400, 0x37ff).w(this, FUNC(wpcsnd_device::bg_speech_clock_w));
- map(0x3800, 0x3bff).w(this, FUNC(wpcsnd_device::volume_w));
- map(0x3c00, 0x3fff).w(this, FUNC(wpcsnd_device::latch_w));
+ map(0x2800, 0x2800).mirror(0x03ff).w("dac", FUNC(dac_byte_interface::data_w));
+ map(0x2c00, 0x2fff).w(FUNC(wpcsnd_device::bg_speech_digit_w));
+ map(0x3000, 0x33ff).r(FUNC(wpcsnd_device::latch_r));
+ map(0x3400, 0x37ff).w(FUNC(wpcsnd_device::bg_speech_clock_w));
+ map(0x3800, 0x3bff).w(FUNC(wpcsnd_device::volume_w));
+ map(0x3c00, 0x3fff).w(FUNC(wpcsnd_device::latch_w));
map(0x4000, 0xbfff).bankr("rombank");
map(0xc000, 0xffff).bankr("fixed");
}
diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp
index 566fcef973f..2f82f962c6a 100644
--- a/src/mame/audio/zaccaria.cpp
+++ b/src/mame/audio/zaccaria.cpp
@@ -134,9 +134,9 @@ void zac1b11142_audio_device::zac1b11142_audio_map(address_map &map)
map.unmap_value_high();
map(0x0000, 0x007f).ram(); // 6802 internal RAM
map(0x0090, 0x0093).mirror(0x8f6c).rw("pia_1i", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
- map(0x1000, 0x1000).mirror(0x83ff).w("dac", FUNC(dac_byte_interface::write));
- map(0x1400, 0x1400).mirror(0xc3ff).w(this, FUNC(zac1b11142_audio_device::melody_command_w));
- map(0x1800, 0x1800).mirror(0xc3ff).r(this, FUNC(zac1b11142_audio_device::host_command_r));
+ map(0x1000, 0x1000).mirror(0x83ff).w("dac", FUNC(dac_byte_interface::data_w));
+ map(0x1400, 0x1400).mirror(0xc3ff).w(FUNC(zac1b11142_audio_device::melody_command_w));
+ map(0x1800, 0x1800).mirror(0xc3ff).r(FUNC(zac1b11142_audio_device::host_command_r));
map(0x2000, 0x2fff).mirror(0x8000).rom(); // ROM 8 with A12 low
map(0x3000, 0x3fff).mirror(0x8000).rom(); // ROM 7 with A12 low
map(0x6000, 0x6fff).mirror(0x8000).rom(); // ROM 8 with A12 high
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), FU