summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-11-26 23:43:19 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-11-26 23:43:19 +0000
commitcdd9d7c75755992b00a51392b456b6cfcc2bdb60 (patch)
tree402d3158aa2ff8996dbf32256321595b39636caa
parent1583458859bd0e9a75654063b6785269d68054dc (diff)
Introduced a generic_pointers structure within machine that is
designed to hold generic pointers that are commonly used. For now, only generic_nvram has moved there. Added AM_BASE_GENERIC and AM_SIZE_GENERIC macros for initializing generic pointers in memory maps. Also added AM_BASE_SIZE_GENERIC to set both base and size in one step. Moved global variables out of machine/generic and into a private data structure hanging off of the running_machine. Added newly- needed machine parameters to coin_counter_w, coin_lockout_w, and coin_lockout_global_w. Also added machine parameter to set_led_state. Added interface functions to get the number of dispensed tickets and to increment the count, to remove the need for direct access to these global variables. Also added functions to get the current count on a particular coin counter and to determine the lockout state. Future checkins will move the remaining generic pointers (for paletteram, videoram, spriteram, colorram, etc.) into the new generic_pointers structure.
-rw-r--r--src/emu/inptport.c2
-rw-r--r--src/emu/machine/8042kbdc.c4
-rw-r--r--src/emu/machine/generic.c261
-rw-r--r--src/emu/machine/generic.h41
-rw-r--r--src/emu/machine/pckeybrd.h4
-rw-r--r--src/emu/mame.h29
-rw-r--r--src/emu/mamecore.h1
-rw-r--r--src/emu/memory.c29
-rw-r--r--src/emu/memory.h16
-rw-r--r--src/emu/uimenu.c15
-rw-r--r--src/mame/audio/8080bw.c4
-rw-r--r--src/mame/audio/atarijsa.c16
-rw-r--r--src/mame/audio/cinemat.c4
-rw-r--r--src/mame/audio/cyberbal.c4
-rw-r--r--src/mame/audio/dcs.c2
-rw-r--r--src/mame/audio/mw8080bw.c32
-rw-r--r--src/mame/audio/qix.c4
-rw-r--r--src/mame/audio/seibu.c4
-rw-r--r--src/mame/audio/skyraid.c2
-rw-r--r--src/mame/audio/tx1.c4
-rw-r--r--src/mame/drivers/20pacgal.c2
-rw-r--r--src/mame/drivers/2mindril.c8
-rw-r--r--src/mame/drivers/40love.c2
-rw-r--r--src/mame/drivers/4roses.c2
-rw-r--r--src/mame/drivers/8080bw.c2
-rw-r--r--src/mame/drivers/88games.c6
-rw-r--r--src/mame/drivers/acefruit.c2
-rw-r--r--src/mame/drivers/airbustr.c8
-rw-r--r--src/mame/drivers/albazc.c10
-rw-r--r--src/mame/drivers/albazg.c6
-rw-r--r--src/mame/drivers/alg.c6
-rw-r--r--src/mame/drivers/aliens.c4
-rw-r--r--src/mame/drivers/alpha68k.c2
-rw-r--r--src/mame/drivers/amaticmg.c2
-rw-r--r--src/mame/drivers/ambush.c4
-rw-r--r--src/mame/drivers/ampoker2.c2
-rw-r--r--src/mame/drivers/arabian.c4
-rw-r--r--src/mame/drivers/arcadia.c4
-rw-r--r--src/mame/drivers/artmagic.c4
-rw-r--r--src/mame/drivers/asteroid.c2
-rw-r--r--src/mame/drivers/astrocde.c52
-rw-r--r--src/mame/drivers/astrocorp.c18
-rw-r--r--src/mame/drivers/astrof.c2
-rw-r--r--src/mame/drivers/atarigt.c4
-rw-r--r--src/mame/drivers/atarisy1.c2
-rw-r--r--src/mame/drivers/atarisy2.c4
-rw-r--r--src/mame/drivers/atetris.c10
-rw-r--r--src/mame/drivers/avalnche.c6
-rw-r--r--src/mame/drivers/aztarac.c4
-rw-r--r--src/mame/drivers/bagman.c2
-rw-r--r--src/mame/drivers/balsente.c2
-rw-r--r--src/mame/drivers/baraduke.c10
-rw-r--r--src/mame/drivers/battlnts.c4
-rw-r--r--src/mame/drivers/beathead.c6
-rw-r--r--src/mame/drivers/berzerk.c14
-rw-r--r--src/mame/drivers/bfcobra.c2
-rw-r--r--src/mame/drivers/bfm_sc1.c6
-rw-r--r--src/mame/drivers/bfm_sc2.c2
-rw-r--r--src/mame/drivers/bfmsys85.c2
-rw-r--r--src/mame/drivers/big10.c2
-rw-r--r--src/mame/drivers/bishjan.c6
-rw-r--r--src/mame/drivers/bladestl.c8
-rw-r--r--src/mame/drivers/blktiger.c4
-rw-r--r--src/mame/drivers/blockhl.c4
-rw-r--r--src/mame/drivers/blueprnt.c4
-rw-r--r--src/mame/drivers/bottom9.c4
-rw-r--r--src/mame/drivers/boxer.c6
-rw-r--r--src/mame/drivers/btoads.c2
-rw-r--r--src/mame/drivers/bwidow.c8
-rw-r--r--src/mame/drivers/bzone.c2
-rw-r--r--src/mame/drivers/cabal.c4
-rw-r--r--src/mame/drivers/cabaret.c10
-rw-r--r--src/mame/drivers/calomega.c6
-rw-r--r--src/mame/drivers/canyon.c2
-rw-r--r--src/mame/drivers/capbowl.c10
-rw-r--r--src/mame/drivers/caswin.c20
-rw-r--r--src/mame/drivers/cave.c54
-rw-r--r--src/mame/drivers/cbasebal.c8
-rw-r--r--src/mame/drivers/ccastles.c22
-rw-r--r--src/mame/drivers/cchance.c4
-rw-r--r--src/mame/drivers/centiped.c6
-rw-r--r--src/mame/drivers/champbwl.c10
-rw-r--r--src/mame/drivers/changela.c2
-rw-r--r--src/mame/drivers/chqflag.c4
-rw-r--r--src/mame/drivers/chsuper.c2
-rw-r--r--src/mame/drivers/cidelsa.c12
-rw-r--r--src/mame/drivers/circusc.c2
-rw-r--r--src/mame/drivers/cischeat.c22
-rw-r--r--src/mame/drivers/cliffhgr.c6
-rw-r--r--src/mame/drivers/cloak.c6
-rw-r--r--src/mame/drivers/cloud9.c22
-rw-r--r--src/mame/drivers/cojag.c12
-rw-r--r--src/mame/drivers/combatsc.c4
-rw-r--r--src/mame/drivers/contra.c4
-rw-r--r--src/mame/drivers/coolpool.c16
-rw-r--r--src/mame/drivers/copsnrob.c4
-rw-r--r--src/mame/drivers/cps1.c16
-rw-r--r--src/mame/drivers/cps2.c50
-rw-r--r--src/mame/drivers/crimfght.c4
-rw-r--r--src/mame/drivers/crystal.c2
-rw-r--r--src/mame/drivers/cubeqst.c2
-rw-r--r--src/mame/drivers/cubocd32.c2
-rw-r--r--src/mame/drivers/cultures.c2
-rw-r--r--src/mame/drivers/dacholer.c8
-rw-r--r--src/mame/drivers/darius.c8
-rw-r--r--src/mame/drivers/dassault.c2
-rw-r--r--src/mame/drivers/dbz.c4
-rw-r--r--src/mame/drivers/ddenlovr.c54
-rw-r--r--src/mame/drivers/ddrible.c4
-rw-r--r--src/mame/drivers/deshoros.c2
-rw-r--r--src/mame/drivers/destroyr.c8
-rw-r--r--src/mame/drivers/dgpix.c4
-rw-r--r--src/mame/drivers/djboy.c4
-rw-r--r--src/mame/drivers/djmain.c12
-rw-r--r--src/mame/drivers/dkong.c6
-rw-r--r--src/mame/drivers/dlair.c6
-rw-r--r--src/mame/drivers/dragrace.c4
-rw-r--r--src/mame/drivers/drgnmst.c6
-rw-r--r--src/mame/drivers/dunhuang.c2
-rw-r--r--src/mame/drivers/dynadice.c2
-rw-r--r--src/mame/drivers/dynax.c34
-rw-r--r--src/mame/drivers/eolith.c4
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/equites.c2
-rw-r--r--src/mame/drivers/esh.c2
-rw-r--r--src/mame/drivers/ettrivia.c4
-rw-r--r--src/mame/drivers/exidy440.c2
-rw-r--r--src/mame/drivers/exterm.c6
-rw-r--r--src/mame/drivers/exzisus.c8
-rw-r--r--src/mame/drivers/fastlane.c4
-rw-r--r--src/mame/drivers/feversoc.c10
-rw-r--r--src/mame/drivers/finalizr.c4
-rw-r--r--src/mame/drivers/firefox.c4
-rw-r--r--src/mame/drivers/firetrk.c30
-rw-r--r--src/mame/drivers/flkatck.c4
-rw-r--r--src/mame/drivers/flyball.c2
-rw-r--r--src/mame/drivers/foodf.c8
-rw-r--r--src/mame/drivers/freekick.c2
-rw-r--r--src/mame/drivers/funkybee.c2
-rw-r--r--src/mame/drivers/funworld.c22
-rw-r--r--src/mame/drivers/gaelco.c4
-rw-r--r--src/mame/drivers/gaelco3d.c4
-rw-r--r--src/mame/drivers/galaga.c10
-rw-r--r--src/mame/drivers/galastrm.c8
-rw-r--r--src/mame/drivers/galaxi.c4
-rw-r--r--src/mame/drivers/galaxian.c10
-rw-r--r--src/mame/drivers/galpani2.c8
-rw-r--r--src/mame/drivers/galpanic.c8
-rw-r--r--src/mame/drivers/gameplan.c2
-rw-r--r--src/mame/drivers/gaplus.c10
-rw-r--r--src/mame/drivers/gatron.c2
-rw-r--r--src/mame/drivers/gberet.c8
-rw-r--r--src/mame/drivers/gbusters.c4
-rw-r--r--src/mame/drivers/gcpinbal.c4
-rw-r--r--src/mame/drivers/gei.c54
-rw-r--r--src/mame/drivers/gladiatr.c8
-rw-r--r--src/mame/drivers/glass.c4
-rw-r--r--src/mame/drivers/gng.c2
-rw-r--r--src/mame/drivers/goldnpkr.c12
-rw-r--r--src/mame/drivers/gottlieb.c10
-rw-r--r--src/mame/drivers/gradius3.c4
-rw-r--r--src/mame/drivers/grchamp.c4
-rw-r--r--src/mame/drivers/gridlee.c8
-rw-r--r--src/mame/drivers/groundfx.c8
-rw-r--r--src/mame/drivers/gstream.c2
-rw-r--r--src/mame/drivers/gunbustr.c8
-rw-r--r--src/mame/drivers/hcastle.c4
-rw-r--r--src/mame/drivers/hexion.c4
-rw-r--r--src/mame/drivers/highvdeo.c18
-rw-r--r--src/mame/drivers/hnayayoi.c6
-rw-r--r--src/mame/drivers/hng64.c2
-rw-r--r--src/mame/drivers/homedata.c4
-rw-r--r--src/mame/drivers/hyperspt.c2
-rw-r--r--src/mame/drivers/igs009.c24
-rw-r--r--src/mame/drivers/igs011.c26
-rw-r--r--src/mame/drivers/igs017.c4
-rw-r--r--src/mame/drivers/igspoker.c10
-rw-r--r--src/mame/drivers/ikki.c4
-rw-r--r--src/mame/drivers/ilpag.c24
-rw-r--r--src/mame/drivers/iqblock.c2
-rw-r--r--src/mame/drivers/irobot.c4
-rw-r--r--src/mame/drivers/itech32.c12
-rw-r--r--src/mame/drivers/itech8.c4
-rw-r--r--src/mame/drivers/jackie.c10
-rw-r--r--src/mame/drivers/jangou.c4
-rw-r--r--src/mame/drivers/jedi.c6
-rw-r--r--src/mame/drivers/jollyjgr.c2
-rw-r--r--src/mame/drivers/jongkyo.c2
-rw-r--r--src/mame/drivers/jpmimpct.c4
-rw-r--r--src/mame/drivers/jpmsys5.c2
-rw-r--r--src/mame/drivers/junofrst.c2
-rw-r--r--src/mame/drivers/kaneko16.c24
-rw-r--r--src/mame/drivers/kangaroo.c4
-rw-r--r--src/mame/drivers/kingdrby.c2
-rw-r--r--src/mame/drivers/kingpin.c2
-rw-r--r--src/mame/drivers/konamigx.c2
-rw-r--r--src/mame/drivers/kopunch.c6
-rw-r--r--src/mame/drivers/labyrunr.c4
-rw-r--r--src/mame/drivers/laserbat.c2
-rw-r--r--src/mame/drivers/lastfght.c2
-rw-r--r--src/mame/drivers/lethalj.c6
-rw-r--r--src/mame/drivers/liberatr.c4
-rw-r--r--src/mame/drivers/limenko.c2
-rw-r--r--src/mame/drivers/lockon.c8
-rw-r--r--src/mame/drivers/lordgun.c2
-rw-r--r--src/mame/drivers/lucky74.c2
-rw-r--r--src/mame/drivers/lvcards.c6
-rw-r--r--src/mame/drivers/lwings.c4
-rw-r--r--src/mame/drivers/m107.c4
-rw-r--r--src/mame/drivers/m63.c2
-rw-r--r--src/mame/drivers/m90.c4
-rw-r--r--src/mame/drivers/m92.c4
-rw-r--r--src/mame/drivers/magic10.c12
-rw-r--r--src/mame/drivers/magicfly.c8
-rw-r--r--src/mame/drivers/mainevt.c12
-rw-r--r--src/mame/drivers/malzak.c2
-rw-r--r--src/mame/drivers/mappy.c8
-rw-r--r--src/mame/drivers/mastboy.c6
-rw-r--r--src/mame/drivers/maygay1b.c2
-rw-r--r--src/mame/drivers/maygayv1.c2
-rw-r--r--src/mame/drivers/mayumi.c2
-rw-r--r--src/mame/drivers/mazerbla.c14
-rw-r--r--src/mame/drivers/mcatadv.c8
-rw-r--r--src/mame/drivers/mcr.c6
-rw-r--r--src/mame/drivers/mcr3.c16
-rw-r--r--src/mame/drivers/mcr68.c2
-rw-r--r--src/mame/drivers/megazone.c2
-rw-r--r--src/mame/drivers/merit.c36
-rw-r--r--src/mame/drivers/meritm.c4
-rw-r--r--src/mame/drivers/metro.c6
-rw-r--r--src/mame/drivers/mhavoc.c4
-rw-r--r--src/mame/drivers/midtunit.c2
-rw-r--r--src/mame/drivers/midvunit.c8
-rw-r--r--src/mame/drivers/midwunit.c2
-rw-r--r--src/mame/drivers/midxunit.c2
-rw-r--r--src/mame/drivers/midzeus.c6
-rw-r--r--src/mame/drivers/mikie.c2
-rw-r--r--src/mame/drivers/mil4000.c4
-rw-r--r--src/mame/drivers/missile.c10
-rw-r--r--src/mame/drivers/model1.c4
-rw-r--r--src/mame/drivers/mpoker.c6
-rw-r--r--src/mame/drivers/mpu4.c16
-rw-r--r--src/mame/drivers/mpu4drvr.c4
-rw-r--r--src/mame/drivers/mquake.c2
-rw-r--r--src/mame/drivers/msisaac.c2
-rw-r--r--src/mame/drivers/multfish.c2
-rw-r--r--src/mame/drivers/mw8080bw.c10
-rw-r--r--src/mame/drivers/namcofl.c2
-rw-r--r--src/mame/drivers/namcos1.c8
-rw-r--r--src/mame/drivers/namcos12.c4
-rw-r--r--src/mame/drivers/namcos22.c2
-rw-r--r--src/mame/drivers/namcos86.c10
-rw-r--r--src/mame/drivers/nbmj8688.c4
-rw-r--r--src/mame/drivers/nemesis.c10
-rw-r--r--src/mame/drivers/neogeo.c6
-rw-r--r--src/mame/drivers/niyanpai.c6
-rw-r--r--src/mame/drivers/norautp.c24
-rw-r--r--src/mame/drivers/nyny.c2
-rw-r--r--src/mame/drivers/ohmygod.c4
-rw-r--r--src/mame/drivers/ojankohs.c10
-rw-r--r--src/mame/drivers/omegrace.c14
-rw-r--r--src/mame/drivers/onetwo.c4
-rw-r--r--src/mame/drivers/orbit.c8
-rw-r--r--src/mame/drivers/othldrby.c8
-rw-r--r--src/mame/drivers/othunder.c4
-rw-r--r--src/mame/drivers/overdriv.c6
-rw-r--r--src/mame/drivers/pacland.c10
-rw-r--r--src/mame/drivers/pacman.c6
-rw-r--r--src/mame/drivers/pandoras.c4
-rw-r--r--src/mame/drivers/paradise.c2
-rw-r--r--src/mame/drivers/parodius.c4
-rw-r--r--src/mame/drivers/pingpong.c6
-rw-r--r--src/mame/drivers/pkscram.c4
-rw-r--r--src/mame/drivers/playmark.c18
-rw-r--r--src/mame/drivers/polepos.c12
-rw-r--r--src/mame/drivers/poolshrk.c4
-rw-r--r--src/mame/drivers/portrait.c12
-rw-r--r--src/mame/drivers/powerbal.c2
-rw-r--r--src/mame/drivers/ppmast93.c4
-rw-r--r--src/mame/drivers/psychic5.c4
-rw-r--r--src/mame/drivers/punchout.c4
-rw-r--r--src/mame/drivers/pushman.c4
-rw-r--r--src/mame/drivers/qdrmfgp.c8
-rw-r--r--src/mame/drivers/quantum.c10
-rw-r--r--src/mame/drivers/r2dtank.c2
-rw-r--r--src/mame/drivers/rallyx.c12
-rw-r--r--src/mame/drivers/rampart.c4
-rw-r--r--src/mame/drivers/re900.c2
-rw-r--r--src/mame/drivers/retofinv.c4
-rw-r--r--src/mame/drivers/rmhaihai.c4
-rw-r--r--src/mame/drivers/rockrage.c4
-rw-r--r--src/mame/drivers/rollerg.c4
-rw-r--r--src/mame/drivers/roul.c2
-rw-r--r--src/mame/drivers/royalmah.c46
-rw-r--r--src/mame/drivers/runaway.c2
-rw-r--r--src/mame/drivers/sandscrp.c4
-rw-r--r--src/mame/drivers/sauro.c12
-rw-r--r--src/mame/drivers/sbasketb.c2
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/sderby.c10
-rw-r--r--src/mame/drivers/seattle.c6
-rw-r--r--src/mame/drivers/segac2.c16
-rw-r--r--src/mame/drivers/segag80r.c6
-rw-r--r--src/mame/drivers/segag80v.c4
-rw-r--r--src/mame/drivers/segahang.c8
-rw-r--r--src/mame/drivers/segas16a.c8
-rw-r--r--src/mame/drivers/segas16b.c14
-rw-r--r--src/mame/drivers/segas18.c8
-rw-r--r--src/mame/drivers/segas32.c8
-rw-r--r--src/mame/drivers/segaxbd.c2
-rw-r--r--src/mame/drivers/sengokmj.c8
-rw-r--r--src/mame/drivers/seta2.c40
-rw-r--r--src/mame/drivers/sf.c10
-rw-r--r--src/mame/drivers/sg1000a.c2
-rw-r--r--src/mame/drivers/shangha3.c24
-rw-r--r--src/mame/drivers/shanghai.c4
-rw-r--r--src/mame/drivers/shisen.c4
-rw-r--r--src/mame/drivers/shootout.c2
-rw-r--r--src/mame/drivers/silkroad.c4
-rw-r--r--src/mame/drivers/skykid.c10
-rw-r--r--src/mame/drivers/skylncr.c4
-rw-r--r--src/mame/drivers/sms.c10
-rw-r--r--src/mame/drivers/snk.c16
-rw-r--r--src/mame/drivers/snk6502.c6
-rw-r--r--src/mame/drivers/snookr10.c10
-rw-r--r--src/mame/drivers/sonson.c4
-rw-r--r--src/mame/drivers/speedbal.c6
-rw-r--r--src/mame/drivers/spiders.c2
-rw-r--r--src/mame/drivers/splash.c4
-rw-r--r--src/mame/drivers/spoker.c24
-rw-r--r--src/mame/drivers/sprint2.c4
-rw-r--r--src/mame/drivers/sprint4.c4
-rw-r--r--src/mame/drivers/sprint8.c2
-rw-r--r--src/mame/drivers/spy.c4
-rw-r--r--src/mame/drivers/srmp2.c18
-rw-r--r--src/mame/drivers/sspeedr.c2
-rw-r--r--src/mame/drivers/ssv.c16
-rw-r--r--src/mame/drivers/stactics.c2
-rw-r--r--src/mame/drivers/starshp1.c6
-rw-r--r--src/mame/drivers/starwars.c6
-rw-r--r--src/mame/drivers/statriv2.c2
-rw-r--r--src/mame/drivers/stv.c8
-rw-r--r--src/mame/drivers/subsino.c2
-rw-r--r--src/mame/drivers/suna16.c18
-rw-r--r--src/mame/drivers/suna8.c20
-rw-r--r--src/mame/drivers/superchs.c8
-rw-r--r--src/mame/drivers/superdq.c4
-rw-r--r--src/mame/drivers/superqix.c12
-rw-r--r--src/mame/drivers/suprnova.c10
-rw-r--r--src/mame/drivers/suprridr.c2
-rw-r--r--src/mame/drivers/surpratk.c4
-rw-r--r--src/mame/drivers/system1.c2
-rw-r--r--src/mame/drivers/system16.c8
-rw-r--r--src/mame/drivers/taito_b.c8
-rw-r--r--src/mame/drivers/taito_f2.c40
-rw-r--r--src/mame/drivers/taito_f3.c16
-rw-r--r--src/mame/drivers/taito_l.c8
-rw-r--r--src/mame/drivers/taito_x.c16
-rw-r--r--src/mame/drivers/tank8.c2
-rw-r--r--src/mame/drivers/tankbatt.c10
-rw-r--r--src/mame/drivers/tankbust.c2
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tatsumi.c2
-rw-r--r--src/mame/drivers/tbowl.c2
-rw-r--r--src/mame/drivers/tceptor.c2
-rw-r--r--src/mame/drivers/tempest.c10
-rw-r--r--src/mame/drivers/tetrisp2.c14
-rw-r--r--src/mame/drivers/thayers.c2
-rw-r--r--src/mame/drivers/thoop2.c4
-rw-r--r--src/mame/drivers/thunderx.c8
-rw-r--r--src/mame/drivers/tiamc1.c4
-rw-r--r--src/mame/drivers/tickee.c4
-rw-r--r--src/mame/drivers/timeplt.c2
-rw-r--r--src/mame/drivers/tmaster.c2
-rw-r--r--src/mame/drivers/tmnt.c4
-rw-r--r--src/mame/drivers/toaplan2.c10
-rw-r--r--src/mame/drivers/tomcat.c8
-rw-r--r--src/mame/drivers/toratora.c4
-rw-r--r--src/mame/drivers/tourtabl.c10
-rw-r--r--src/mame/drivers/toypop.c6
-rw-r--r--src/mame/drivers/trackfld.c10
-rw-r--r--src/mame/drivers/triplhnt.c10
-rw-r--r--src/mame/drivers/trvquest.c4
-rw-r--r--src/mame/drivers/tsamurai.c2
-rw-r--r--src/mame/drivers/tubep.c4
-rw-r--r--src/mame/drivers/tunhunt.c6
-rw-r--r--src/mame/drivers/turbo.c18
-rw-r--r--src/mame/drivers/tutankhm.c2
-rw-r--r--src/mame/drivers/twin16.c14
-rw-r--r--src/mame/drivers/tx1.c18
-rw-r--r--src/mame/drivers/ultratnk.c6
-rw-r--r--src/mame/drivers/undrfire.c8
-rw-r--r--src/mame/drivers/unico.c12
-rw-r--r--src/mame/drivers/upscope.c10
-rw-r--r--src/mame/drivers/usgames.c14
-rw-r--r--src/mame/drivers/vcombat.c2
-rw-r--r--src/mame/drivers/vendetta.c4
-rw-r--r--src/mame/drivers/vertigo.c2
-rw-r--r--src/mame/drivers/vicdual.c4
-rw-r--r--src/mame/drivers/victory.c10
-rw-r--r--src/mame/drivers/videopin.c6
-rw-r--r--src/mame/drivers/vigilant.c8
-rw-r--r--src/mame/drivers/vmetal.c8
-rw-r--r--src/mame/drivers/vroulet.c2
-rw-r--r--src/mame/drivers/vsnes.c4
-rw-r--r--src/mame/drivers/wallc.c2
-rw-r--r--src/mame/drivers/warpwarp.c20
-rw-r--r--src/mame/drivers/williams.c14
-rw-r--r--src/mame/drivers/wink.c4
-rw-r--r--src/mame/drivers/witch.c2
-rw-r--r--src/mame/drivers/wiz.c2
-rw-r--r--src/mame/drivers/wldarrow.c4
-rw-r--r--src/mame/drivers/wolfpack.c4
-rw-r--r--src/mame/drivers/xmen.c2
-rw-r--r--src/mame/drivers/xtheball.c4
-rw-r--r--src/mame/drivers/xyonix.c8
-rw-r--r--src/mame/drivers/zaccaria.c4
-rw-r--r--src/mame/drivers/zaxxon.c2
-rw-r--r--src/mame/drivers/zodiack.c4
-rw-r--r--src/mame/machine/ajax.c20
-rw-r--r--src/mame/machine/asteroid.c6
-rw-r--r--src/mame/machine/atarifb.c14
-rw-r--r--src/mame/machine/balsente.c2
-rw-r--r--src/mame/machine/bonzeadv.c8
-rw-r--r--src/mame/machine/bsktball.c4
-rw-r--r--src/mame/machine/bublbobl.c2
-rw-r--r--src/mame/machine/carpolo.c2
-rw-r--r--src/mame/machine/cchip.c8
-rw-r--r--src/mame/machine/gaelco2.c20
-rw-r--r--src/mame/machine/galaxold.c10
-rw-r--r--src/mame/machine/harddriv.c4
-rw-r--r--src/mame/machine/irobot.c4
-rw-r--r--src/mame/machine/jackal.c4
-rw-r--r--src/mame/machine/mcr.c8
-rw-r--r--src/mame/machine/mhavoc.c14
-rw-r--r--src/mame/machine/midtunit.c4
-rw-r--r--src/mame/machine/midwunit.c6
-rw-r--r--src/mame/machine/nb1413m3.c6
-rw-r--r--src/mame/machine/nitedrvr.c2
-rw-r--r--src/mame/machine/opwolf.c10
-rw-r--r--src/mame/machine/pckeybrd.c28
-rw-r--r--src/mame/machine/pcshare.c2
-rw-r--r--src/mame/machine/qix.c8
-rw-r--r--src/mame/machine/rainbow.c8
-rw-r--r--src/mame/machine/simpsons.c4
-rw-r--r--src/mame/machine/starwars.c14
-rw-r--r--src/mame/machine/subs.c4
-rw-r--r--src/mame/machine/taitosj.c2
-rw-r--r--src/mame/machine/ticket.c11
-rw-r--r--src/mame/machine/tnzs.c44
-rw-r--r--src/mame/machine/toaplan1.c42
-rw-r--r--src/mame/machine/twincobr.c16
-rw-r--r--src/mame/machine/volfied.c8
-rw-r--r--src/mame/machine/williams.c10
-rw-r--r--src/mame/machine/wrally.c4
-rw-r--r--src/mame/machine/xevious.c10
-rw-r--r--src/mame/video/1942.c2
-rw-r--r--src/mame/video/1943.c4
-rw-r--r--src/mame/video/arkanoid.c8
-rw-r--r--src/mame/video/bionicc.c4
-rw-r--r--src/mame/video/bking.c2
-rw-r--r--src/mame/video/blktiger.c4
-rw-r--r--src/mame/video/buggychl.c4
-rw-r--r--src/mame/video/cischeat.c30
-rw-r--r--src/mame/video/commando.c4
-rw-r--r--src/mame/video/cop01.c4
-rw-r--r--src/mame/video/cps1.c12
-rw-r--r--src/mame/video/cvs.c4
-rw-r--r--src/mame/video/dday.c4
-rw-r--r--src/mame/video/deniam.c2
-rw-r--r--src/mame/video/dogfgt.c4
-rw-r--r--src/mame/video/dooyong.c8
-rw-r--r--src/mame/video/epos.c6
-rw-r--r--src/mame/video/exedexes.c8
-rw-r--r--src/mame/video/galivan.c8
-rw-r--r--src/mame/video/gunsmoke.c4
-rw-r--r--src/mame/video/higemaru.c4
-rw-r--r--src/mame/video/ironhors.c4
-rw-r--r--src/mame/video/kncljoe.c4
-rw-r--r--src/mame/video/lastduel.c8
-rw-r--r--src/mame/video/m52.c4
-rw-r--r--src/mame/video/m57.c4
-rw-r--r--src/mame/video/m58.c4
-rw-r--r--src/mame/video/m62.c4
-rw-r--r--src/mame/video/m72.c8
-rw-r--r--src/mame/video/mitchell.c4
-rw-r--r--src/mame/video/mjkjidai.c2
-rw-r--r--src/mame/video/mystston.c4
-rw-r--r--src/mame/video/nemesis.c4
-rw-r--r--src/mame/video/prehisle.c4
-rw-r--r--src/mame/video/qix.c6
-rw-r--r--src/mame/video/quizdna.c2
-rw-r--r--src/mame/video/rastan.c8
-rw-r--r--src/mame/video/realbrk.c4
-rw-r--r--src/mame/video/route16.c2
-rw-r--r--src/mame/video/scotrsht.c4
-rw-r--r--src/mame/video/seta.c12
-rw-r--r--src/mame/video/sidearms.c12
-rw-r--r--src/mame/video/skydiver.c6
-rw-r--r--src/mame/video/srumbler.c4
-rw-r--r--src/mame/video/starcrus.c4
-rw-r--r--src/mame/video/superqix.c4
-rw-r--r--src/mame/video/suprloco.c4
-rw-r--r--src/mame/video/taitoic.c24
-rw-r--r--src/mame/video/terracre.c4
-rw-r--r--src/mame/video/tigeroad.c8
-rw-r--r--src/mame/video/tmnt.c26
-rw-r--r--src/mame/video/travrusa.c4
-rw-r--r--src/mame/video/ultraman.c4
-rw-r--r--src/mame/video/vulgus.c4
-rw-r--r--src/mame/video/wecleman.c4
-rw-r--r--src/mame/video/yiear.c4
512 files changed, 2119 insertions, 2002 deletions
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 8bb0385aa47..c2a9672e7f7 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -2425,7 +2425,7 @@ static int frame_get_digital_field_state(const input_field_config *field, int mo
}
/* skip locked-out coin inputs */
- if (curstate && field->type >= IPT_COIN1 && field->type <= IPT_COIN8 && coinlockedout[field->type - IPT_COIN1] && options_get_bool(mame_options(), OPTION_COIN_LOCKOUT))
+ if (curstate && field->type >= IPT_COIN1 && field->type <= IPT_COIN8 && coin_lockout_get_state(field->port->machine, field->type - IPT_COIN1) && options_get_bool(mame_options(), OPTION_COIN_LOCKOUT))
{
ui_popup_time(3, "Coinlock disabled %s.", input_field_name(field));
return FALSE;
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index 6e419bca100..60164f90f65 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -441,7 +441,7 @@ WRITE8_HANDLER(kbdc8042_8_w)
/* normal case */
kbdc8042.data = data;
kbdc8042.sending=1;
- at_keyboard_write(data);
+ at_keyboard_write(space->machine, data);
break;
case 1:
@@ -462,7 +462,7 @@ WRITE8_HANDLER(kbdc8042_8_w)
/* preceeded by writing 0xD2 to port 60h */
kbdc8042.data = data;
kbdc8042.sending=1;
- at_keyboard_write(data);
+ at_keyboard_write(space->machine, data);
break;
case 3:
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 327fd288ec2..77107ffcfb2 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -16,37 +16,33 @@
/***************************************************************************
- GLOBAL VARIABLES
+ FUNCTION PROTOTYPES
***************************************************************************/
-/* These globals are only kept on a machine basis - LBO 042898 */
-UINT32 dispensed_tickets;
-UINT32 coin_count[COIN_COUNTERS];
-UINT32 coinlockedout[COIN_COUNTERS];
-static UINT32 lastcoin[COIN_COUNTERS];
-
-/* generic NVRAM */
-size_t generic_nvram_size;
-UINT8 *generic_nvram;
-UINT16 *generic_nvram16;
-UINT32 *generic_nvram32;
-UINT64 *generic_nvram64;
-
-/* memory card status */
-static int memcard_inserted;
-
-/* interrupt status for up to 8 CPUs */
-static UINT8 interrupt_enable[8];
+static void counters_load(running_machine *machine, int config_type, xml_data_node *parentnode);
+static void counters_save(running_machine *machine, int config_type, xml_data_node *parentnode);
+static void interrupt_reset(running_machine *machine);
/***************************************************************************
- FUNCTION PROTOTYPES
+ TYPE DEFINITIONS
***************************************************************************/
-static void counters_load(running_machine *machine, int config_type, xml_data_node *parentnode);
-static void counters_save(running_machine *machine, int config_type, xml_data_node *parentnode);
-static void interrupt_reset(running_machine *machine);
+struct _generic_machine_private
+{
+ /* tickets and coin counters */
+ UINT32 dispensed_tickets;
+ UINT32 coin_count[COIN_COUNTERS];
+ UINT32 coinlockedout[COIN_COUNTERS];
+ UINT32 lastcoin[COIN_COUNTERS];
+
+ /* memory card status */
+ int memcard_inserted;
+
+ /* interrupt status for up to 8 CPUs */
+ UINT8 interrupt_enable[8];
+};
@@ -61,8 +57,9 @@ static void interrupt_reset(running_machine *machine);
INLINE int interrupt_enabled(const device_config *device)
{
+ generic_machine_private *state = device->machine->generic_machine_data;
int cpunum = cpu_get_index(device);
- return (cpunum >= ARRAY_LENGTH(interrupt_enable) || interrupt_enable[cpunum]);
+ return (cpunum >= ARRAY_LENGTH(state->interrupt_enable) || state->interrupt_enable[cpunum]);
}
@@ -78,33 +75,35 @@ INLINE int interrupt_enabled(const device_config *device)
void generic_machine_init(running_machine *machine)
{
+ generic_machine_private *state;
int counternum;
+
+ /* allocate our state */
+ machine->generic_machine_data = auto_alloc_clear(machine, generic_machine_private);
+ state = machine->generic_machine_data;
/* reset coin counters */
for (counternum = 0; counternum < COIN_COUNTERS; counternum++)
{
- lastcoin[counternum] = 0;
- coinlockedout[counternum] = 0;
+ state->lastcoin[counternum] = 0;
+ state->coinlockedout[counternum] = 0;
}
/* register coin save state */
- state_save_register_item_array(machine, "coin", NULL, 0, coin_count);
- state_save_register_item_array(machine, "coin", NULL, 0, coinlockedout);
- state_save_register_item_array(machine, "coin", NULL, 0, lastcoin);
+ state_save_register_item_array(machine, "coin", NULL, 0, state->coin_count);
+ state_save_register_item_array(machine, "coin", NULL, 0, state->coinlockedout);
+ state_save_register_item_array(machine, "coin", NULL, 0, state->lastcoin);
/* reset NVRAM size and pointers */
- generic_nvram_size = 0;
- generic_nvram = NULL;
- generic_nvram16 = NULL;
- generic_nvram32 = NULL;
- generic_nvram64 = NULL;
+ machine->generic.nvram.ptr.v = NULL;
+ machine->generic.nvram.size = 0;
/* reset memory card info */
- memcard_inserted = -1;
+ state->memcard_inserted = -1;
/* register a reset callback and save state for interrupt enable */
add_reset_callback(machine, interrupt_reset);
- state_save_register_item_array(machine, "cpu", NULL, 0, interrupt_enable);
+ state_save_register_item_array(machine, "cpu", NULL, 0, state->interrupt_enable);
/* register for configuration */
config_register(machine, "counters", counters_load, counters_save);
@@ -112,7 +111,7 @@ void generic_machine_init(running_machine *machine)
/* for memory cards, request save state and an exit callback */
if (machine->config->memcard_handler != NULL)
{
- state_save_register_global(machine, memcard_inserted);
+ state_save_register_global(machine, state->memcard_inserted);
add_exit_callback(machine, memcard_eject);
}
}
@@ -120,6 +119,35 @@ void generic_machine_init(running_machine *machine)
/***************************************************************************
+ TICKETS
+***************************************************************************/
+
+/*-------------------------------------------------
+ get_dispensed_tickets - return the number of
+ tickets dispensed
+-------------------------------------------------*/
+
+int get_dispensed_tickets(running_machine *machine)
+{
+ generic_machine_private *state = machine->generic_machine_data;
+ return state->dispensed_tickets;
+}
+
+
+/*-------------------------------------------------
+ increment_dispensed_tickets - increment the
+ number of dispensed tickets
+-------------------------------------------------*/
+
+void increment_dispensed_tickets(running_machine *machine, int delta)
+{
+ generic_machine_private *state = machine->generic_machine_data;
+ state->dispensed_tickets += delta;
+}
+
+
+
+/***************************************************************************
COIN COUNTERS
***************************************************************************/
@@ -130,13 +158,14 @@ void generic_machine_init(running_machine *machine)
static void counters_load(running_machine *machine, int config_type, xml_data_node *parentnode)
{
+ generic_machine_private *state = machine->generic_machine_data;
xml_data_node *coinnode, *ticketnode;
/* on init, reset the counters */
if (config_type == CONFIG_TYPE_INIT)
{
- memset(coin_count, 0, sizeof(coin_count));
- dispensed_tickets = 0;
+ memset(state->coin_count, 0, sizeof(state->coin_count));
+ state->dispensed_tickets = 0;
}
/* only care about game-specific data */
@@ -152,13 +181,13 @@ static void counters_load(running_machine *machine, int config_type, xml_data_no
{
int index = xml_get_attribute_int(coinnode, "index", -1);
if (index >= 0 && index < COIN_COUNTERS)
- coin_count[index] = xml_get_attribute_int(coinnode, "number", 0);
+ state->coin_count[index] = xml_get_attribute_int(coinnode, "number", 0);
}
/* get the single tickets node */
ticketnode = xml_get_sibling(parentnode->child, "tickets");
if (ticketnode != NULL)
- dispensed_tickets = xml_get_attribute_int(ticketnode, "number", 0);
+ state->dispensed_tickets = xml_get_attribute_int(ticketnode, "number", 0);
}
@@ -169,6 +198,7 @@ static void counters_load(running_machine *machine, int config_type, xml_data_no
static void counters_save(running_machine *machine, int config_type, xml_data_node *parentnode)
{
+ generic_machine_private *state = machine->generic_machine_data;
int i;
/* only care about game-specific data */
@@ -177,22 +207,22 @@ static void counters_save(running_machine *machine, int config_type, xml_data_no
/* iterate over coin counters */
for (i = 0; i < COIN_COUNTERS; i++)
- if (coin_count[i] != 0)
+ if (state->coin_count[i] != 0)
{
xml_data_node *coinnode = xml_add_child(parentnode, "coins", NULL);
if (coinnode != NULL)
{
xml_set_attribute_int(coinnode, "index", i);
- xml_set_attribute_int(coinnode, "number", coin_count[i]);
+ xml_set_attribute_int(coinnode, "number", state->coin_count[i]);
}
}
/* output tickets */
- if (dispensed_tickets != 0)
+ if (state->dispensed_tickets != 0)
{
xml_data_node *tickets = xml_add_child(parentnode, "tickets", NULL);
if (tickets != NULL)
- xml_set_attribute_int(tickets, "number", dispensed_tickets);
+ xml_set_attribute_int(tickets, "number", state->dispensed_tickets);
}
}
@@ -201,15 +231,30 @@ static void counters_save(running_machine *machine, int config_type, xml_data_no
coin_counter_w - sets input for coin counter
-------------------------------------------------*/
-void coin_counter_w(int num, int on)
+void coin_counter_w(running_machine *machine, int num, int on)
{
- if (num >= COIN_COUNTERS)
+ generic_machine_private *state = machine->generic_machine_data;
+ if (num >= ARRAY_LENGTH(state->coin_count))
return;
/* Count it only if the data has changed from 0 to non-zero */
- if (on && (lastcoin[num] == 0))
- coin_count[num]++;
- lastcoin[num] = on;
+ if (on && (state->lastcoin[num] == 0))
+ state->coin_count[num]++;
+ state->lastcoin[num] = on;
+}
+
+
+/*-------------------------------------------------
+ coin_counter_get_count - return the coin count
+ for a given coin
+-------------------------------------------------*/
+
+int coin_counter_get_count(running_machine *machine, int num)
+{
+ generic_machine_private *state = machine->generic_machine_data;
+ if (num >= ARRAY_LENGTH(state->coin_count))
+ return 0;
+ return state->coin_count[num];
}
@@ -217,11 +262,26 @@ void coin_counter_w(int num, int on)
coin_lockout_w - locks out one coin input
-------------------------------------------------*/
-void coin_lockout_w(int num,int on)
+void coin_lockout_w(running_machine *machine, int num,int on)
{
- if (num >= COIN_COUNTERS)
+ generic_machine_private *state = machine->generic_machine_data;
+ if (num >= ARRAY_LENGTH(state->coinlockedout))
return;
- coinlockedout[num] = on;
+ state->coinlockedout[num] = on;
+}
+
+
+/*-------------------------------------------------
+ coin_lockout_get_state - return current lockout
+ state for a particular coin
+-------------------------------------------------*/
+
+int coin_lockout_get_state(running_machine *machine, int num)
+{
+ generic_machine_private *state = machine->generic_machine_data;
+ if (num >= ARRAY_LENGTH(state->coinlockedout))
+ return FALSE;
+ return state->coinlockedout[num];
}
@@ -230,12 +290,13 @@ void coin_lockout_w(int num,int on)
inputs
-------------------------------------------------*/
-void coin_lockout_global_w(int on)
+void coin_lockout_global_w(running_machine *machine, int on)
{
+ generic_machine_private *state = machine->generic_machine_data;
int i;
- for (i = 0; i < COIN_COUNTERS; i++)
- coin_lockout_w(i, on);
+ for (i = 0; i < ARRAY_LENGTH(state->coinlockedout); i++)
+ coin_lockout_w(machine, i, on);
}
@@ -245,26 +306,6 @@ void coin_lockout_global_w(int on)
***************************************************************************/
/*-------------------------------------------------
- nvram_select - select the right pointer based
- on which ones are non-NULL
--------------------------------------------------*/
-
-INLINE void *nvram_select(void)
-{
- if (generic_nvram != NULL)
- return generic_nvram;
- if (generic_nvram16 != NULL)
- return generic_nvram16;
- if (generic_nvram32 != NULL)
- return generic_nvram32;
- if (generic_nvram64 != NULL)
- return generic_nvram64;
- fatalerror("generic nvram handler called without nvram in the memory map");
- return 0;
-}
-
-
-/*-------------------------------------------------
nvram_fopen - open an NVRAM file directly
-------------------------------------------------*/
@@ -356,13 +397,13 @@ void nvram_save(running_machine *machine)
NVRAM_HANDLER( generic_0fill )
{
if (read_or_write)
- mame_fwrite(file, nvram_select(), generic_nvram_size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else if (file != NULL)
- mame_fread(file, nvram_select(), generic_nvram_size);
- else if (memory_region_length(machine, "nvram") == generic_nvram_size)
- memcpy(generic_nvram, memory_region(machine, "nvram"), generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
+ else if (memory_region_length(machine, "nvram") == machine->generic.nvram.size)
+ memcpy(machine->generic.nvram.ptr.v, memory_region(machine, "nvram"), machine->generic.nvram.size);
else
- memset(nvram_select(), 0, generic_nvram_size);
+ memset(machine->generic.nvram.ptr.v, 0, machine->generic.nvram.size);
}
@@ -374,13 +415,13 @@ NVRAM_HANDLER( generic_0fill )
NVRAM_HANDLER( generic_1fill )
{
if (read_or_write)
- mame_fwrite(file, nvram_select(), generic_nvram_size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else if (file != NULL)
- mame_fread(file, nvram_select(), generic_nvram_size);
- else if (memory_region_length(machine, "nvram") == generic_nvram_size)
- memcpy(generic_nvram, memory_region(machine, "nvram"), generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
+ else if (memory_region_length(machine, "nvram") == machine->generic.nvram.size)
+ memcpy(machine->generic.nvram.ptr.v, memory_region(machine, "nvram"), machine->generic.nvram.size);
else
- memset(nvram_select(), 0xff, generic_nvram_size);
+ memset(machine->generic.nvram.ptr.v, 0xff, machine->generic.nvram.size);
}
@@ -391,18 +432,17 @@ NVRAM_HANDLER( generic_1fill )
NVRAM_HANDLER( generic_randfill )
{
- int i;
-
if (read_or_write)
- mame_fwrite(file, nvram_select(), generic_nvram_size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else if (file != NULL)
- mame_fread(file, nvram_select(), generic_nvram_size);
- else if (memory_region_length(machine, "nvram") == generic_nvram_size)
- memcpy(generic_nvram, memory_region(machine, "nvram"), generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
+ else if (memory_region_length(machine, "nvram") == machine->generic.nvram.size)
+ memcpy(machine->generic.nvram.ptr.v, memory_region(machine, "nvram"), machine->generic.nvram.size);
else
{
- UINT8 *nvram = (UINT8 *)nvram_select();
- for (i = 0; i < generic_nvram_size; i++)
+ UINT8 *nvram = (UINT8 *)machine->generic.nvram.ptr.v;
+ int i;
+ for (i = 0; i < machine->generic.nvram.size; i++)
nvram[i] = mame_rand(machine);
}
}
@@ -475,15 +515,16 @@ int memcard_create(running_machine *machine, int index, int overwrite)
int memcard_insert(running_machine *machine, int index)
{
+ generic_machine_private *state = machine->generic_machine_data;
file_error filerr;
mame_file *file;
char name[16];
astring *fname;
/* if a card is already inserted, eject it first */
- if (memcard_inserted != -1)
+ if (state->memcard_inserted != -1)
memcard_eject(machine);
- assert(memcard_inserted == -1);
+ assert(state->memcard_inserted == -1);
/* create a name */
memcard_name(index, name);
@@ -501,7 +542,7 @@ int memcard_insert(running_machine *machine, int index)
/* close the file */
mame_fclose(file);
- memcard_inserted = index;
+ state->memcard_inserted = index;
return 0;
}
@@ -513,17 +554,18 @@ int memcard_insert(running_machine *machine, int index)
void memcard_eject(running_machine *machine)
{
+ generic_machine_private *state = machine->generic_machine_data;
file_error filerr;
mame_file *file;
char name[16];
astring *fname;
/* if no card is preset, just ignore */
- if (memcard_inserted == -1)
+ if (state->memcard_inserted == -1)
return;
/* create a name */
- memcard_name(memcard_inserted, name);
+ memcard_name(state->memcard_inserted, name);
fname = astring_assemble_3(astring_alloc(), machine->basename, PATH_SEPARATOR, name);
/* open the file; if we can't, it's an error */
@@ -541,7 +583,7 @@ void memcard_eject(running_machine *machine)
/* close the file */
mame_fclose(file);
- memcard_inserted = -1;
+ state->memcard_inserted = -1;
}
@@ -550,9 +592,10 @@ void memcard_eject(running_machine *machine)
card index, or -1 if none
-------------------------------------------------*/
-int memcard_present(void)
+int memcard_present(running_machine *machine)
{
- return memcard_inserted;
+ generic_machine_private *state = machine->generic_machine_data;
+ return state->memcard_inserted;
}
@@ -565,7 +608,7 @@ int memcard_present(void)
set_led_status - set the state of a given LED
-------------------------------------------------*/
-void set_led_status(int num, int on)
+void set_led_status(running_machine *machine, int num, int on)
{
output_set_led_value(num, on);
}
@@ -583,11 +626,12 @@ void set_led_status(int num, int on)
static void interrupt_reset(running_machine *machine)
{
+ generic_machine_private *state = machine->generic_machine_data;
int cpunum;
/* on a reset, enable all interrupts */
- for (cpunum = 0; cpunum < ARRAY_LENGTH(interrupt_enable); cpunum++)
- interrupt_enable[cpunum] = 1;
+ for (cpunum = 0; cpunum < ARRAY_LENGTH(state->interrupt_enable); cpunum++)
+ state->interrupt_enable[cpunum] = 1;
}
@@ -658,14 +702,15 @@ void generic_pulse_irq_line_and_vector(const device_config *device, int irqline,
void cpu_interrupt_enable(const device_config *device, int enabled)
{
+ generic_machine_private *state = device->machine->generic_machine_data;
int cpunum = cpu_get_index(device);
assert_always(device != NULL, "cpu_interrupt_enable() called for invalid cpu!");
- assert_always(cpunum < ARRAY_LENGTH(interrupt_enable), "cpu_interrupt_enable() called for a CPU > position 7!");
+ assert_always(cpunum < ARRAY_LENGTH(state->interrupt_enable), "cpu_interrupt_enable() called for a CPU > position 7!");
/* set the new state */
- if (cpunum < ARRAY_LENGTH(interrupt_enable))
- interrupt_enable[cpunum] = enabled;
+ if (cpunum < ARRAY_LENGTH(state->interrupt_enable))
+ state->interrupt_enable[cpunum] = enabled;
/* make sure there are no queued interrupts */
if (enabled == 0)
diff --git a/src/emu/machine/generic.h b/src/emu/machine/generic.h
index 8459d9df48b..5d80cd0edb7 100644
--- a/src/emu/machine/generic.h
+++ b/src/emu/machine/generic.h
@@ -33,21 +33,6 @@
/***************************************************************************
- GLOBAL VARIABLES
-***************************************************************************/
-
-extern UINT32 dispensed_tickets;
-extern UINT32 coin_count[COIN_COUNTERS];
-extern UINT32 coinlockedout[COIN_COUNTERS];
-
-extern size_t generic_nvram_size;
-extern UINT8 *generic_nvram;
-extern UINT16 *generic_nvram16;
-extern UINT32 *generic_nvram32;
-extern UINT64 *generic_nvram64;
-
-
-/***************************************************************************
FUNCTION PROTOTYPES
***************************************************************************/
@@ -59,16 +44,32 @@ void generic_machine_init(running_machine *machine);
+/* ----- tickets ----- */
+
+/* return the number of tickets dispensed */
+int get_dispensed_tickets(running_machine *machine);
+
+/* increment the number of dispensed tickets */
+void increment_dispensed_tickets(running_machine *machine, int delta);
+
+
+
/* ----- coin counters ----- */
/* write to a particular coin counter (clocks on active high edge) */
-void coin_counter_w(int num, int on);
+void coin_counter_w(running_machine *machine, int num, int on);
+
+/* return the coin count for a given coin */
+int coin_counter_get_count(running_machine *machine, int num);
/* enable/disable coin lockout for a particular coin */
-void coin_lockout_w(int num, int on);
+void coin_lockout_w(running_machine *machine, int num, int on);
+
+/* return current lockout state for a particular coin */
+int coin_lockout_get_state(running_machine *machine, int num);
/* enable/disable global coin lockout */
-void coin_lockout_global_w(int on);
+void coin_lockout_global_w(running_machine *machine, int on);
@@ -106,14 +107,14 @@ int memcard_insert(running_machine *machine, int index);
void memcard_eject(running_machine *machine);
/* returns the index of the current memory card, or -1 if none */
-int memcard_present(void);
+int memcard_present(running_machine *machine);
/* ----- miscellaneous bits & pieces ----- */
/* set the status of an LED */
-void set_led_status(int num, int value);
+void set_led_status(running_machine *machine, int num, int value);
diff --git a/src/emu/machine/pckeybrd.h b/src/emu/machine/pckeybrd.h
index 5ca446e5c70..a5c21b025ab 100644
--- a/src/emu/machine/pckeybrd.h
+++ b/src/emu/machine/pckeybrd.h
@@ -23,8 +23,8 @@ void at_keyboard_init(running_machine *machine, AT_KEYBOARD_TYPE type);
void at_keyboard_polling(void);
int at_keyboard_read(void);
-void at_keyboard_write(UINT8 data);
-void at_keyboard_reset(void);
+void at_keyboard_write(running_machine *machine, UINT8 data);
+void at_keyboard_reset(running_machine *machine);
void at_keyboard_set_scan_code_set(int set);
INPUT_PORTS_EXTERN( pc_keyboard );
diff --git a/src/emu/mame.h b/src/emu/mame.h
index 80ac78d5240..a6b2abcf3d7 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -140,6 +140,31 @@ typedef struct _ui_input_private ui_input_private;
typedef struct _cheat_private cheat_private;
typedef struct _debugcpu_private debugcpu_private;
typedef struct _debugvw_private debugvw_private;
+typedef struct _generic_machine_private generic_machine_private;
+
+
+/* structure to hold a pointer/size pair for generic pointers */
+typedef struct _generic_ptr generic_ptr;
+struct _generic_ptr
+{
+ union
+ {
+ void * v;
+ UINT8 * u8;
+ UINT16 * u16;
+ UINT32 * u32;
+ UINT64 * u64;
+ } ptr;
+ size_t size;
+};
+
+
+/* this structure holds generic pointers that are commonly used */
+typedef struct _generic_pointers generic_pointers;
+struct _generic_pointers
+{
+ generic_ptr nvram; /* generic NVRAM */
+};
/* description of the currently-running machine */
@@ -173,6 +198,9 @@ struct _running_machine
/* debugger-related information */
UINT32 debug_flags; /* the current debug flags */
+
+ /* generic pointers */
+ generic_pointers generic; /* generic pointers */
/* internal core information */
mame_private * mame_data; /* internal data from mame.c */
@@ -192,6 +220,7 @@ struct _running_machine
cheat_private * cheat_data; /* internal data from cheat.c */
debugcpu_private * debugcpu_data; /* internal data from debugcpu.c */
debugvw_private * debugvw_data; /* internal data from debugvw.c */
+ generic_machine_private *generic_machine_data; /* internal data from machine/generic.c */
#ifdef MESS
images_private * images_data; /* internal data from image.c */
ui_mess_private * ui_mess_data; /* internal data from uimess.c */
diff --git a/src/emu/mamecore.h b/src/emu/mamecore.h
index dbe60cbc3a3..248b2111082 100644
--- a/src/emu/mamecore.h
+++ b/src/emu/mamecore.h
@@ -127,7 +127,6 @@ typedef union
} PAIR64;
-
/***************************************************************************
COMMON CONSTANTS
***************************************************************************/
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 56afe6ab57a..d1b32ac04d6 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -1922,10 +1922,14 @@ static void memory_init_locate(running_machine *machine)
*entry->baseptr = entry->memory;
if (entry->baseptroffs_plus1 != 0)
*(void **)((UINT8 *)machine->driver_data + entry->baseptroffs_plus1 - 1) = entry->memory;
+ if (entry->genbaseptroffs_plus1 != 0)
+ *(void **)((UINT8 *)&machine->generic + entry->genbaseptroffs_plus1 - 1) = entry->memory;
if (entry->sizeptr != NULL)
*entry->sizeptr = entry->byteend - entry->bytestart + 1;
if (entry->sizeptroffs_plus1 != 0)
*(size_t *)((UINT8 *)machine->driver_data + entry->sizeptroffs_plus1 - 1) = entry->byteend - entry->bytestart + 1;
+ if (entry->gensizeptroffs_plus1 != 0)
+ *(size_t *)((UINT8 *)&machine->generic + entry->gensizeptroffs_plus1 - 1) = entry->byteend - entry->bytestart + 1;
}
}
@@ -2207,6 +2211,13 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch
entry->baseptroffs_plus1++;
break;
+ case ADDRMAP_TOKEN_BASE_GENERIC:
+ check_entry_field(genbaseptroffs_plus1);
+ TOKEN_UNGET_UINT32(tokens);
+ TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, entry->genbaseptroffs_plus1, 24);
+ entry->genbaseptroffs_plus1++;
+ break;
+
case ADDRMAP_TOKEN_SIZEPTR:
check_entry_field(sizeptr);
entry->sizeptr = TOKEN_GET_PTR(tokens, sizeptr);
@@ -2219,6 +2230,22 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch
entry->sizeptroffs_plus1++;
break;
+ case ADDRMAP_TOKEN_SIZE_GENERIC:
+ check_entry_field(gensizeptroffs_plus1);
+ TOKEN_UNGET_UINT32(tokens);
+ TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, entry->gensizeptroffs_plus1, 24);
+ entry->gensizeptroffs_plus1++;
+ break;
+
+ case ADDRMAP_TOKEN_BASE_SIZE_GENERIC:
+ check_entry_field(genbaseptroffs_plus1);
+ check_entry_field(gensizeptroffs_plus1);
+ TOKEN_UNGET_UINT32(tokens);
+ TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, entry->genbaseptroffs_plus1, 24);
+ entry->genbaseptroffs_plus1++;
+ entry->gensizeptroffs_plus1 = entry->genbaseptroffs_plus1 + offsetof(generic_ptr, size);
+ break;
+
default:
fatalerror("Invalid token %d in address map\n", entrytype);
break;
@@ -2379,7 +2406,7 @@ static int space_needs_backing_store(const address_space *space, const address_m
{
FPTR handler;
- if (entry->baseptr != NULL || entry->baseptroffs_plus1 != 0)
+ if (entry->baseptr != NULL || entry->baseptroffs_plus1 != 0 || entry->genbaseptroffs_plus1 != 0)
return TRUE;
handler = (FPTR)entry->write.generic;
diff --git a/src/emu/memory.h b/src/emu/memory.h
index b23ff7b186f..10ea9451d7d 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -77,8 +77,11 @@ enum
ADDRMAP_TOKEN_SHARE,
ADDRMAP_TOKEN_BASEPTR,
ADDRMAP_TOKEN_BASE_MEMBER,
+ ADDRMAP_TOKEN_BASE_GENERIC,
ADDRMAP_TOKEN_SIZEPTR,
- ADDRMAP_TOKEN_SIZE_MEMBER
+ ADDRMAP_TOKEN_SIZE_MEMBER,
+ ADDRMAP_TOKEN_SIZE_GENERIC,
+ ADDRMAP_TOKEN_BASE_SIZE_GENERIC
};
@@ -237,6 +240,8 @@ struct _address_map_entry
size_t * sizeptr; /* receives size of area in bytes (optional) */
UINT32 baseptroffs_plus1; /* offset of base pointer within driver_data, plus 1 */
UINT32 sizeptroffs_plus1; /* offset of size pointer within driver_data, plus 1 */
+ UINT32 genbaseptroffs_plus1;/* offset of base pointer within generic_pointers, plus 1 */
+ UINT32 gensizeptroffs_plus1;/* offset of size pointer within generic_pointers, plus 1 */
const char * region; /* tag of region containing the memory backing this entry */
offs_t rgnoffs; /* offset within the region */
@@ -765,6 +770,9 @@ union _addrmap64_token
#define AM_BASE_MEMBER(_struct, _member) \
TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_BASE_MEMBER, 8, offsetof(_struct, _member), 24),
+#define AM_BASE_GENERIC(_member) \
+ TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_BASE_GENERIC, 8, offsetof(generic_pointers, _member.ptr), 24),
+
#define AM_SIZE(_size) \
TOKEN_UINT32_PACK1(ADDRMAP_TOKEN_SIZEPTR, 8), \
TOKEN_PTR(sizeptr, _size),
@@ -772,6 +780,12 @@ union _addrmap64_token
#define AM_SIZE_MEMBER(_struct, _member) \
TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_SIZE_MEMBER, 8, offsetof(_struct, _member), 24),
+#define AM_SIZE_GENERIC(_member) \
+ TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_SIZE_GENERIC, 8, offsetof(generic_pointers, _member.size), 24),
+
+#define AM_BASE_SIZE_GENERIC(_member) \
+ TOKEN_UINT32_PACK2(ADDRMAP_TOKEN_BASE_SIZE_GENERIC, 8, offsetof(generic_pointers, _member), 24),
+
/* common shortcuts */
#define AM_READWRITE(_read,_write) AM_READ(_read) AM_WRITE(_write)
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index 0d414ce7ce6..12e84b10997 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -2413,6 +2413,7 @@ static void menu_bookkeeping(running_machine *machine, ui_menu *menu, void *para
#ifndef MESS
static void menu_bookkeeping_populate(running_machine *machine, ui_menu *menu, attotime *curtime)
{
+ int tickets = get_dispensed_tickets(machine);
astring *tempstring = astring_alloc();
int ctrnum;
@@ -2423,23 +2424,25 @@ static void menu_bookkeeping_populate(running_machine *machine, ui_menu *menu, a
astring_catprintf(tempstring, "Uptime: %d:%02d\n\n", (curtime->seconds / 60) % 60, curtime->seconds % 60);
/* show tickets at the top */
- if (dispensed_tickets > 0)
- astring_catprintf(tempstring, "Tickets dispensed: %d\n\n", dispensed_tickets);
+ if (tickets > 0)
+ astring_catprintf(tempstring, "Tickets dispensed: %d\n\n", tickets);
/* loop over coin counters */
for (ctrnum = 0; ctrnum < COIN_COUNTERS; ctrnum++)
{
+ int count = coin_counter_get_count(machine, ctrnum);
+
/* display the coin counter number */
astring_catprintf(tempstring, "Coin %c: ", ctrnum + 'A');
/* display how many coins */
- if (coin_count[ctrnum] == 0)
+ if (count == 0)
astring_catc(tempstring, "NA");
else
- astring_catprintf(tempstring, "%d", coin_count[ctrnum]);
+ astring_catprintf(tempstring, "%d", count);
/* display whether or not we are locked out */
- if (coinlockedout[ctrnum])
+ if (coin_lockout_get_state(machine, ctrnum))
astring_catc(tempstring, " (locked)");
astring_catc(tempstring, "\n");
}
@@ -2690,7 +2693,7 @@ static void menu_memory_card_populate(running_machine *machine, ui_menu *menu, i
/* add the remaining items */
ui_menu_item_append(menu, "Load Selected Card", NULL, 0, (void *)MEMCARD_ITEM_LOAD);
- if (memcard_present() != -1)
+ if (memcard_present(machine) != -1)
ui_menu_item_append(menu, "Eject Current Card", NULL, 0, (void *)MEMCARD_ITEM_EJECT);
ui_menu_item_append(menu, "Create New Card", NULL, 0, (void *)MEMCARD_ITEM_CREATE);
}
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index a4aa02ee812..227d5df0a43 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -647,7 +647,7 @@ WRITE8_DEVICE_HANDLER( polaris_sh_port_2_w )
WRITE8_DEVICE_HANDLER( polaris_sh_port_3_w )
{
- coin_lockout_global_w(data & 0x04); /* SX8 */
+ coin_lockout_global_w(device->machine, data & 0x04); /* SX8 */
c8080bw_flip_screen_w(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), data & 0x20); /* SX11 */
@@ -883,7 +883,7 @@ WRITE8_HANDLER( schaser_sh_port_2_w )
discrete_sound_w(discrete, SCHASER_SND_EN, data & 0x02);
sound_global_enable(space->machine, data & 0x02);
- coin_lockout_global_w(data & 0x04);
+ coin_lockout_global_w(space->machine, data & 0x04);
schaser_background_control_w(data & 0x18);
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index ce01c61fd49..a9ee776fd4a 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -290,8 +290,8 @@ static WRITE8_HANDLER( jsa1_io_w )
}
/* coin counters */
- coin_counter_w(1, (data >> 5) & 1);
- coin_counter_w(0, (data >> 4) & 1);
+ coin_counter_w(space->machine, 1, (data >> 5) & 1);
+ coin_counter_w(space->machine, 0, (data >> 4) & 1);
/* update the bank */
memcpy(bank_base, &bank_source_data[0x1000 * ((data >> 6) & 3)], 0x1000);
@@ -412,8 +412,8 @@ static WRITE8_HANDLER( jsa2_io_w )
last_ctl = data;
/* coin counters */
- coin_counter_w(1, (data >> 5) & 1);
- coin_counter_w(0, (data >> 4) & 1);
+ coin_counter_w(space->machine, 1, (data >> 5) & 1);
+ coin_counter_w(space->machine, 0, (data >> 4) & 1);
/* update the OKI frequency */
if (oki6295 != NULL)
@@ -538,8 +538,8 @@ static WRITE8_HANDLER( jsa3_io_w )
last_ctl = data;
/* coin counters */
- coin_counter_w(1, (data >> 5) & 1);
- coin_counter_w(0, (data >> 4) & 1);
+ coin_counter_w(space->machine, 1, (data >> 5) & 1);
+ coin_counter_w(space->machine, 0, (data >> 4) & 1);
/* update the OKI frequency */
if (oki6295 != NULL) okim6295_set_pin7(oki6295, data & 8);
@@ -668,8 +668,8 @@ static WRITE8_HANDLER( jsa3s_io_w )
last_ctl = data;
/* coin counters */
- coin_counter_w(1, (data >> 5) & 1);
- coin_counter_w(0, (data >> 4) & 1);
+ coin_counter_w(space->machine, 1, (data >> 5) & 1);
+ coin_counter_w(space->machine, 0, (data >> 4) & 1);
/* update the OKI frequency */
okim6295_set_pin7(oki6295_l, data & 8);
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 0bcfa616fc4..79b0379d252 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -312,7 +312,7 @@ static void speedfrk_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bi
sample_stop(samples, 0);
/* start LED is controlled by bit 0x02 */
- set_led_status(0, ~sound_val & 0x02);
+ set_led_status(machine, 0, ~sound_val & 0x02);
}
static MACHINE_RESET( speedfrk )
@@ -543,7 +543,7 @@ static void tailg_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_
sample_start(samples, 5, 5, 0);
/* LED */
- set_led_status(0, current_shift & 0x40);
+ set_led_status(machine, 0, current_shift & 0x40);
/* remember the previous value */
last_shift = current_shift;
diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c
index b5291f996dd..196e7f91d90 100644
--- a/src/mame/audio/cyberbal.c
+++ b/src/mame/audio/cyberbal.c
@@ -61,8 +61,8 @@ READ8_HANDLER( cyberbal_sound_6502_stat_r )
WRITE8_HANDLER( cyberbal_sound_bank_select_w )
{
memory_set_bankptr(space->machine, 8, &bank_base[0x1000 * ((data >> 6) & 3)]);
- coin_counter_w(1, (data >> 5) & 1);
- coin_counter_w(0, (data >> 4) & 1);
+ coin_counter_w(space->machine, 1, (data >> 5) & 1);
+ coin_counter_w(space->machine, 0, (data >> 4) & 1);
cputag_set_input_line(space->machine, "dac", INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
if (!(data & 0x01)) devtag_reset(space->machine, "ymsnd");
}
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index 5668e96096d..8af7a13db87 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -1072,7 +1072,7 @@ static WRITE16_HANDLER( dcs_data_bank_select_w )
/* bit 11 = sound board led */
#if 0
- set_led_status(2, data & 0x800);
+ set_led_status(space->machine, 2, data & 0x800);
#endif
}
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index 608a8c12074..bd15bd2d9e5 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -194,7 +194,7 @@ WRITE8_HANDLER( seawolf_audio_w )
/* if (data & 0x10) enable MINE HIT sound */
if (rising_bits & 0x10) sample_start(samples, 4, 4, 0);
- coin_counter_w(0, (data >> 5) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 5) & 0x01);
/* D6 and D7 are not connected */
@@ -247,7 +247,7 @@ WRITE8_HANDLER( gunfight_audio_w )
/* D0 and D1 are just tied to 1k resistors */
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 2) & 0x01);
/* the 74175 latches and inverts the top 4 bits */
switch ((~data >> 4) & 0x0f)
@@ -368,7 +368,7 @@ WRITE8_DEVICE_HANDLER( tornbase_audio_w )
/* if (data & 0x40) enable WHISTLE sound */
}
- coin_counter_w(0, (data >> 7) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 7) & 0x01);
}
@@ -409,7 +409,7 @@ WRITE8_HANDLER( zzzap_audio_2_w )
before it appears again, not sure what
it is supposed to sound like) */
- coin_counter_w(0, (data >> 5) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 5) & 0x01);
/* D4, D6 and D7 are not connected */
}
@@ -840,7 +840,7 @@ WRITE8_DEVICE_HANDLER( boothill_audio_w )
{
/* D0 and D1 are not connected */
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 2) & 0x01);
discrete_sound_w(device, BOOTHILL_GAME_ON_EN, (data >> 3) & 0x01);
@@ -1071,7 +1071,7 @@ WRITE8_DEVICE_HANDLER( checkmat_audio_w )
discrete_sound_w(device, CHECKMAT_BOOM_EN, (data >> 1) & 0x01);
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 2) & 0x01);
sound_global_enable(device->machine, (data >> 3) & 0x01);
@@ -1280,7 +1280,7 @@ WRITE8_DEVICE_HANDLER( desertgu_audio_1_w )
{
/* D0 and D1 are not connected */
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 2) & 0x01);
discrete_sound_w(device, DESERTGU_GAME_ON_EN, (data >> 3) & 0x01);
@@ -1553,7 +1553,7 @@ WRITE8_DEVICE_HANDLER( dplay_audio_w )
discrete_sound_w(device, DPLAY_GAME_ON_EN, (data >> 4) & 0x01);
- coin_counter_w(0, (data >> 5) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 5) & 0x01);
/* D6 and D7 are not connected */
}
@@ -1609,7 +1609,7 @@ WRITE8_HANDLER( gmissile_audio_1_w )
/* D0 and D1 are not connected */
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 2) & 0x01);
sound_global_enable(space->machine, (data >> 3) & 0x01);
@@ -1705,7 +1705,7 @@ WRITE8_HANDLER( m4_audio_1_w )
/* D0 and D1 are not connected */
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 2) & 0x01);
sound_global_enable(space->machine, (data >> 3) & 0x01);
@@ -1963,7 +1963,7 @@ MACHINE_DRIVER_END
WRITE8_HANDLER( clowns_audio_1_w )
{
- coin_counter_w(0, (data >> 0) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 0) & 0x01);
clowns_set_controller_select((data >> 1) & 0x01);
@@ -2329,7 +2329,7 @@ MACHINE_DRIVER_END
WRITE8_DEVICE_HANDLER( spacwalk_audio_1_w )
{
- coin_counter_w(0, (data >> 0) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 0) & 0x01);
clowns_set_controller_select((data >> 1) & 0x01);
@@ -2579,7 +2579,7 @@ WRITE8_DEVICE_HANDLER( shuffle_audio_2_w )
{
discrete_sound_w(device, SHUFFLE_FOUL_EN, (data >> 0) & 0x01);
- coin_counter_w(0, (data >> 1) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 1) & 0x01);
/* D2-D7 are not connected */
}
@@ -2625,7 +2625,7 @@ WRITE8_HANDLER( dogpatch_audio_w )
{
/* D0 and D1 are most likely not used */
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 2) & 0x01);
sound_global_enable(space->machine, (data >> 3) & 0x01);
@@ -3252,7 +3252,7 @@ WRITE8_HANDLER( phantom2_audio_1_w )
sound_global_enable(space->machine, (data >> 2) & 0x01);
- coin_counter_w(0, (data >> 3) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 3) & 0x01);
/* if (data & 0x10) enable RADAR sound */
@@ -3373,7 +3373,7 @@ WRITE8_DEVICE_HANDLER( bowler_audio_1_w )
{
/* D0 - selects controller on the cocktail PCB */
- coin_counter_w(0, (data >> 1) & 0x01);
+ coin_counter_w(device->machine, 0, (data >> 1) & 0x01);
sound_global_enable(device->machine, (data >> 2) & 0x01);
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index 4cf817aeeef..83fa78c4520 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -115,8 +115,8 @@ static WRITE8_DEVICE_HANDLER( sync_sndpia1_porta_w )
static WRITE8_DEVICE_HANDLER( slither_coinctl_w )
{
- coin_lockout_w(0, (~data >> 6) & 1);
- coin_counter_w(0, (data >> 5) & 1);
+ coin_lockout_w(device->machine, 0, (~data >> 6) & 1);
+ coin_counter_w(device->machine, 0, (data >> 5) & 1);
}
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 7404d0ba0d3..f7e8167623f 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -352,8 +352,8 @@ WRITE8_HANDLER( seibu_bank_w )
WRITE8_HANDLER( seibu_coin_w )
{
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
}
READ8_HANDLER( seibu_soundlatch_r )
diff --git a/src/mame/audio/skyraid.c b/src/mame/audio/skyraid.c
index bb7d7f2c032..bf773afcf19 100644
--- a/src/mame/audio/skyraid.c
+++ b/src/mame/audio/skyraid.c
@@ -305,7 +305,7 @@ WRITE8_DEVICE_HANDLER( skyraid_sound_w )
discrete_sound_w(device, SKYRAID_PLANE_SWEEP_EN, data & 0x01);
discrete_sound_w(device, SKYRAID_MISSILE_EN, data & 0x02);
discrete_sound_w(device, SKYRAID_EXPLOSION_EN, data & 0x04);
- set_led_status(0, !(data & 0x08));
+ set_led_status(device->machine, 0, !(data & 0x08));
discrete_sound_w(device, SKYRAID_PLANE_ON_EN, data & 0x10);
discrete_sound_w(device, SKYRAID_ATTRACT_EN, data & 0x20);
}
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index 72d6518a41f..01c37f50e56 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -422,8 +422,8 @@ WRITE8_DEVICE_HANDLER( bb_ym2_b_w )
if (!strcmp(device->machine->gamedrv->name, "buggybjr"))
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(device->machine, 0, data & 0x01);
+ coin_counter_w(device->machine, 1, data & 0x02);
}
/*
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index e2d276a919c..65375f723f2 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -113,7 +113,7 @@ static const eeprom_interface _20pacgal_eeprom_intf =
static WRITE8_HANDLER( _20pacgal_coin_counter_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
}
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 80a34cc80ef..9d09fb670b1 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -167,10 +167,10 @@ static WRITE16_HANDLER( drill_io_w )
switch(offset)
{
case 0x8/2:
- coin_counter_w(0, state->iodata[offset] & 0x0400);
- coin_counter_w(1, state->iodata[offset] & 0x0800);
- coin_lockout_w(0, ~state->iodata[offset] & 0x0100);
- coin_lockout_w(1, ~state->iodata[offset] & 0x0200);
+ coin_counter_w(space->machine, 0, state->iodata[offset] & 0x0400);
+ coin_counter_w(space->machine, 1, state->iodata[offset] & 0x0800);
+ coin_lockout_w(space->machine, 0, ~state->iodata[offset] & 0x0100);
+ coin_lockout_w(space->machine, 1, ~state->iodata[offset] & 0x0200);
break;
}
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 037501ab7cb..c5671a8a075 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -276,7 +276,7 @@ static WRITE8_HANDLER( nmi_enable_w )
#if 0
static WRITE8_HANDLER( fortyl_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
#endif
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index 7e7735cb329..47db9f41afa 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -196,7 +196,7 @@ VIDEO_UPDATE( funworld );
*************************/
static ADDRESS_MAP_START( 4roses_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM // AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM // AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(&colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 1b5a5ab7bb1..431ad2b75ab 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -1614,7 +1614,7 @@ MACHINE_DRIVER_END
static WRITE8_HANDLER( steelwkr_sh_port_3_w )
{
- coin_lockout_global_w(!(~data & 0x03)); /* possibly */
+ coin_lockout_global_w(space->machine, !(~data & 0x03)); /* possibly */
}
static ADDRESS_MAP_START( steelwkr_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index e3f04259d4b..3b1b47719c5 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -55,8 +55,8 @@ static WRITE8_HANDLER( bankedram_w )
static WRITE8_HANDLER( k88games_5f84_w )
{
/* bits 0/1 coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 enables ROM reading from the 051316 */
/* also 5fce == 2 read roms, == 3 read ram */
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&banked_rom) /* banked ROM + palette RAM */
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram_1000) /* banked ROM + palette RAM */
AM_RANGE(0x2000, 0x2fff) AM_RAM
- AM_RANGE(0x3000, 0x37ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x3800, 0x3fff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(&ram)
AM_RANGE(0x5f84, 0x5f84) AM_WRITE(k88games_5f84_w)
AM_RANGE(0x5f88, 0x5f88) AM_WRITE(watchdog_reset_w)
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index 13770398dc2..ec85143f0da 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -255,7 +255,7 @@ static PALETTE_INIT( acefruit )
static ADDRESS_MAP_START( acefruit_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x20ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2000, 0x20ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&videoram)
AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE(acefruit_colorram_w) AM_BASE(&colorram)
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 5edb310a17b..a6b1ff3b6e6 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -359,10 +359,10 @@ static WRITE8_HANDLER( airbustr_paletteram_w )
static WRITE8_HANDLER( airbustr_coin_counter_w )
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
- coin_lockout_w(0, ~data & 4);
- coin_lockout_w(1, ~data & 8);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
+ coin_lockout_w(space->machine, 0, ~data & 4);
+ coin_lockout_w(space->machine, 1, ~data & 8);
}
/* Memory Maps */
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index e6df79645d0..0d82864e864 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -95,11 +95,11 @@ static WRITE8_HANDLER( hanaroku_out_0_w )
7 meter5 (start)
*/
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
- coin_counter_w(2, data & 0x04);
- coin_counter_w(3, data & 0x08);
- coin_counter_w(4, data & 0x80);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 2, data & 0x04);
+ coin_counter_w(space->machine, 3, data & 0x08);
+ coin_counter_w(space->machine, 4, data & 0x80);
}
static WRITE8_HANDLER( hanaroku_out_1_w )
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index 5ac5a009880..65b2e5ef14b 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -203,9 +203,9 @@ static WRITE8_DEVICE_HANDLER( mux_w )
static WRITE8_DEVICE_HANDLER( yumefuda_output_w )
{
- coin_counter_w(0, ~data & 4);
- coin_counter_w(1, ~data & 2);
- coin_lockout_global_w(data & 1);
+ coin_counter_w(device->machine, 0, ~data & 4);
+ coin_counter_w(device->machine, 1, ~data & 2);
+ coin_lockout_global_w(device->machine, data & 1);
//data & 0x10 hopper-c (active LOW)
//data & 0x08 divider (active HIGH)
flip_screen_set(device->machine, ~data & 0x20);
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index b0bfcc91f39..e522c5590e6 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -263,7 +263,7 @@ static ADDRESS_MAP_START( main_map_r1, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfc0000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* System ROM */
AM_RANGE(0xf00000, 0xf1ffff) AM_ROM AM_REGION("user2", 0) /* Custom ROM */
- AM_RANGE(0xf54000, 0xf55fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf54000, 0xf55fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
@@ -276,7 +276,7 @@ static ADDRESS_MAP_START( main_map_r2, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfc0000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* System ROM */
AM_RANGE(0xf00000, 0xf3ffff) AM_ROM AM_REGION("user2", 0) /* Custom ROM */
- AM_RANGE(0xf7c000, 0xf7dfff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf7c000, 0xf7dfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
@@ -289,7 +289,7 @@ static ADDRESS_MAP_START( main_map_picmatic, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfc0000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* System ROM */
AM_RANGE(0xf00000, 0xf1ffff) AM_ROM AM_REGION("user2", 0) /* Custom ROM */
- AM_RANGE(0xf40000, 0xf41fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf40000, 0xf41fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index f9e36effa24..8d3b91d594f 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -53,8 +53,8 @@ static WRITE8_HANDLER( bankedram_w )
static WRITE8_HANDLER( aliens_coin_counter_w )
{
/* bits 0-1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 5 = select work RAM or palette */
palette_selected = data & 0x20;
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index d5d85e7cb5b..0bb8f4a9bda 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -256,7 +256,7 @@ static MACHINE_START( common )
static WRITE16_HANDLER( tnextspc_coin_counters_w )
{
- coin_counter_w(offset, data & 0x01);
+ coin_counter_w(space->machine, offset, data & 0x01);
}
static WRITE16_HANDLER( tnextspc_unknown_w )
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index ffa03f57ba1..5fa197df6ce 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -419,7 +419,7 @@ static PALETTE_INIT( amaticmg )
static ADDRESS_MAP_START( amaticmg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
-// AM_RANGE(0x0000, 0x0000) AM_RAM // AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+// AM_RANGE(0x0000, 0x0000) AM_RAM // AM_BASE_SIZE_GENERIC(nvram)
// AM_RANGE(0x0000, 0x0000) AM_DEVWRITE("crtc", mc6845_address_w)
// AM_RANGE(0x0000, 0x0000) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
// AM_RANGE(0x0000, 0x0000) AM_RAM_WRITE(amaticmg_videoram_w) AM_BASE(&videoram)
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index f3772c0921a..1a62cff40b4 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -47,8 +47,8 @@
static WRITE8_HANDLER( ambush_coin_counter_w )
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
}
static WRITE8_HANDLER( flip_screen_w )
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index df9d28e30f8..5c3b06b6a26 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -583,7 +583,7 @@ static WRITE8_HANDLER( ampoker2_watchdog_reset_w )
static ADDRESS_MAP_START( ampoker2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(ampoker2_videoram_w) AM_BASE(&videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 4fedab47ba8..9f75ca31fee 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -111,8 +111,8 @@ static WRITE8_DEVICE_HANDLER( ay8910_portb_w )
state->custom_cpu_reset = ~data & 0x10;
/* clock the coin counters */
- coin_counter_w(1, ~data & 0x02);
- coin_counter_w(0, ~data & 0x01);
+ coin_counter_w(device->machine, 1, ~data & 0x02);
+ coin_counter_w(device->machine, 0, ~data & 0x01);
}
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 77a688e25a5..1ff5cb1ac0c 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -107,7 +107,7 @@ static WRITE8_DEVICE_HANDLER( arcadia_cia_0_porta_w )
memory_install_write16_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, (write16_space_func)SMH_UNMAP);
/* bit 2 = Power Led on Amiga */
- set_led_status(0, (data & 2) ? 0 : 1);
+ set_led_status(device->machine, 0, (data & 2) ? 0 : 1);
}
@@ -188,7 +188,7 @@ static ADDRESS_MAP_START( amiga_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0x97ffff) AM_ROMBANK(2) AM_REGION("user3", 0)
AM_RANGE(0x980000, 0x9fbfff) AM_ROM AM_REGION("user2", 0)
- AM_RANGE(0x9fc000, 0x9ffffd) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x9fc000, 0x9ffffd) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x9ffffe, 0x9fffff) AM_WRITE(arcadia_multibios_change_game)
AM_RANGE(0xf00000, 0xf7ffff) AM_ROM AM_REGION("user2", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 413e64b19b8..74381098553 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -427,7 +427,7 @@ static WRITE16_HANDLER( protection_bit_w )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x220000, 0x23ffff) AM_RAM
- AM_RANGE(0x240000, 0x240fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x240000, 0x240fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("300000")
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("300002")
AM_RANGE(0x300004, 0x300005) AM_READ_PORT("300004")
@@ -444,7 +444,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( stonebal_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x27ffff) AM_RAM
- AM_RANGE(0x280000, 0x280fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x280000, 0x280fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("300000")
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("300002")
AM_RANGE(0x300004, 0x300005) AM_READ_PORT("300004")
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 847e70c17e5..34f91a2b7ae 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -204,7 +204,7 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a
static WRITE8_HANDLER( astdelux_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 22c8b00ef85..3d2faedda67 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -246,7 +246,7 @@ static WRITE8_HANDLER( seawolf2_sound_2_w ) // Port 41
if (rising_bits & 0x10) sample_start(samples, 8, 3, 0); /* Right Sonar */
if (rising_bits & 0x20) sample_start(samples, 3, 3, 0); /* Left Sonar */
- coin_counter_w(0, data & 0x40); /* Coin Counter */
+ coin_counter_w(space->machine, 0, data & 0x40); /* Coin Counter */
}
@@ -272,7 +272,7 @@ static WRITE8_HANDLER( ebases_trackball_select_w )
static WRITE8_HANDLER( ebases_coin_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
}
@@ -285,8 +285,8 @@ static WRITE8_HANDLER( ebases_coin_w )
static READ8_HANDLER( spacezap_io_r )
{
- coin_counter_w(0, (offset >> 8) & 1);
- coin_counter_w(1, (offset >> 9) & 1);
+ coin_counter_w(space->machine, 0, (offset >> 8) & 1);
+ coin_counter_w(space->machine, 1, (offset >> 9) & 1);
return input_port_read_safe(space->machine, "P3HANDLE", 0xff);
}
@@ -304,13 +304,13 @@ static READ8_HANDLER( wow_io_r )
switch ((offset >> 9) & 7)
{
- case 0: coin_counter_w(0, data); break;
- case 1: coin_counter_w(1, data); break;
+ case 0: coin_counter_w(space->machine, 0, data); break;
+ case 1: coin_counter_w(space->machine, 1, data); break;
case 2: astrocade_sparkle[0] = data; break;
case 3: astrocade_sparkle[1] = data; break;
case 4: astrocade_sparkle[2] = data; break;
case 5: astrocade_sparkle[3] = data; break;
- case 7: coin_counter_w(2, data); break;
+ case 7: coin_counter_w(space->machine, 2, data); break;
}
return 0xff;
}
@@ -329,8 +329,8 @@ static READ8_HANDLER( gorf_io_1_r )
switch ((offset >> 9) & 7)
{
- case 0: coin_counter_w(0, data); break;
- case 1: coin_counter_w(1, data); break;
+ case 0: coin_counter_w(space->machine, 0, data); break;
+ case 1: coin_counter_w(space->machine, 1, data); break;
case 2: astrocade_sparkle[0] = data; break;
case 3: astrocade_sparkle[1] = data; break;
case 4: astrocade_sparkle[2] = data; break;
@@ -377,11 +377,11 @@ static READ8_HANDLER( robby_io_r )
switch ((offset >> 9) & 7)
{
- case 0: coin_counter_w(0, data); break;
- case 1: coin_counter_w(1, data); break;
- case 2: coin_counter_w(2, data); break;
- case 6: set_led_status(0, data); break;
- case 7: set_led_status(1, data); break;
+ case 0: coin_counter_w(space->machine, 0, data); break;
+ case 1: coin_counter_w(space->machine, 1, data); break;
+ case 2: coin_counter_w(space->machine, 2, data); break;
+ case 6: set_led_status(space->machine, 0, data); break;
+ case 7: set_led_status(space->machine, 1, data); break;
}
return 0xff;
}
@@ -396,10 +396,10 @@ static READ8_HANDLER( robby_io_r )
static READ8_HANDLER( profpac_io_1_r )
{
- coin_counter_w(0, (offset >> 8) & 1);
- coin_counter_w(1, (offset >> 9) & 1);
- set_led_status(0, (offset >> 10) & 1);
- set_led_status(1, (offset >> 11) & 1);
+ coin_counter_w(space->machine, 0, (offset >> 8) & 1);
+ coin_counter_w(space->machine, 1, (offset >> 9) & 1);
+ set_led_status(space->machine, 0, (offset >> 10) & 1);
+ set_led_status(space->machine, 1, (offset >> 11) & 1);
return 0xff;
}
@@ -469,10 +469,10 @@ static STATE_POSTLOAD( profbank_banksw_restore )
static READ8_HANDLER( demndrgn_io_r )
{
- coin_counter_w(0, (offset >> 8) & 1);
- coin_counter_w(1, (offset >> 9) & 1);
- set_led_status(0, (offset >> 10) & 1);
- set_led_status(1, (offset >> 11) & 1);
+ coin_counter_w(space->machine, 0, (offset >> 8) & 1);
+ coin_counter_w(space->machine, 1, (offset >> 9) & 1);
+ set_led_status(space->machine, 0, (offset >> 10) & 1);
+ set_led_status(space->machine, 1, (offset >> 11) & 1);
input_select = (offset >> 12) & 1;
return 0xff;
}
@@ -550,7 +550,7 @@ static WRITE8_HANDLER( tenpindx_lamp_w )
static WRITE8_HANDLER( tenpindx_counter_w )
{
- coin_counter_w(0, (data >> 0) & 1);
+ coin_counter_w(space->machine, 0, (data >> 0) & 1);
if (data & 0xfc) mame_printf_debug("tenpindx_counter_w = %02X\n", data);
}
@@ -619,7 +619,7 @@ static ADDRESS_MAP_START( robby_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE(&videoram)
AM_RANGE(0x8000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(protected_ram_r, protected_ram_w) AM_BASE(&protected_ram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe800, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -631,7 +631,7 @@ static ADDRESS_MAP_START( profpac_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(1)
AM_RANGE(0xc000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(protected_ram_r, protected_ram_w) AM_BASE(&protected_ram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe800, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -642,7 +642,7 @@ static ADDRESS_MAP_START( demndrgn_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0x7fff) AM_READWRITE(profpac_videoram_r, profpac_videoram_w)
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(1)
AM_RANGE(0xc000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe800, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index a05c8d52605..9d2e0b883c0 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -128,18 +128,18 @@ static WRITE16_HANDLER( astrocorp_outputs_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, (data & 0x0004)); // coin counter
- set_led_status(0, (data & 0x0008)); // you win
- if ((data & 0x0010)) dispensed_tickets++; // coin out
- set_led_status(1, (data & 0x0020)); // coin/hopper jam
+ coin_counter_w(space->machine, 0, (data & 0x0004)); // coin counter
+ set_led_status(space->machine, 0, (data & 0x0008)); // you win
+ if ((data & 0x0010)) increment_dispensed_tickets(space->machine, 1); // coin out
+ set_led_status(space->machine, 1, (data & 0x0020)); // coin/hopper jam
}
if (ACCESSING_BITS_8_15)
{
- set_led_status(2, (data & 0x0100)); // bet
- set_led_status(3, (data & 0x0800)); // start
- set_led_status(4, (data & 0x1000)); // ? select/choose
- set_led_status(5, (data & 0x2000)); // ? select/choose
- set_led_status(6, (data & 0x4000)); // look
+ set_led_status(space->machine, 2, (data & 0x0100)); // bet
+ set_led_status(space->machine, 3, (data & 0x0800)); // start
+ set_led_status(space->machine, 4, (data & 0x1000)); // ? select/choose
+ set_led_status(space->machine, 5, (data & 0x2000)); // ? select/choose
+ set_led_status(space->machine, 6, (data & 0x4000)); // look
}
// popmessage("%04X",data);
}
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index 7d9e8cffd1a..871596ed2f7 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -94,7 +94,7 @@ static INPUT_CHANGED( coin_inserted )
{
/* coin insertion causes an NMI */
cputag_set_input_line(field->port->machine, "maincpu", INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE);
- coin_counter_w(0, newval);
+ coin_counter_w(field->port->machine, 0, newval);
}
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index bafe9b3a3d8..51c667d201e 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -200,8 +200,8 @@ static WRITE32_HANDLER( latch_w )
if (ACCESSING_BITS_16_23)
{
// cage_reset_w(data & 0x00100000);
- coin_counter_w(0, data & 0x00080000);
- coin_counter_w(1, data & 0x00010000);
+ coin_counter_w(space->machine, 0, data & 0x00080000);
+ coin_counter_w(space->machine, 1, data & 0x00010000);
}
}
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 9b7125e9c50..e297ec0c2df 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -446,7 +446,7 @@ static const via6522_interface via_interface =
static WRITE8_HANDLER( led_w )
{
- set_led_status(offset, ~data & 1);
+ set_led_status(space->machine, offset, ~data & 1);
}
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index e2c8f0a7a36..f8ffa54a063 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -704,8 +704,8 @@ static WRITE8_HANDLER( tms5220_strobe_w )
static WRITE8_HANDLER( coincount_w )
{
- coin_counter_w(0, (data >> 0) & 1);
- coin_counter_w(1, (data >> 1) & 1);
+ coin_counter_w(space->machine, 0, (data >> 0) & 1);
+ coin_counter_w(space->machine, 1, (data >> 1) & 1);
}
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 330f25e7fe7..4c8bcbc75ab 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -170,8 +170,8 @@ static READ8_HANDLER( atetris_slapstic_r )
static WRITE8_HANDLER( coincount_w )
{
- coin_counter_w(0, (data >> 5) & 1);
- coin_counter_w(1, (data >> 4) & 1);
+ coin_counter_w(space->machine, 0, (data >> 5) & 1);
+ coin_counter_w(space->machine, 1, (data >> 4) & 1);
}
@@ -185,7 +185,7 @@ static WRITE8_HANDLER( coincount_w )
static WRITE8_HANDLER( nvram_w )
{
if (nvram_write_enable)
- generic_nvram[offset] = data;
+ space->machine->generic.nvram.ptr.u8[offset] = data;
nvram_write_enable = 0;
}
@@ -208,7 +208,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size)
AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE(&paletteram)
- AM_RANGE(0x2400, 0x25ff) AM_MIRROR(0x0200) AM_RAM_WRITE(nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2400, 0x25ff) AM_MIRROR(0x0200) AM_RAM_WRITE(nvram_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x03e0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w)
AM_RANGE(0x2810, 0x281f) AM_MIRROR(0x03e0) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w)
AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_WRITE(watchdog_reset_w)
@@ -225,7 +225,7 @@ static ADDRESS_MAP_START( atetrsb2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size)
AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE(&paletteram)
- AM_RANGE(0x2400, 0x25ff) AM_RAM_WRITE(nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2400, 0x25ff) AM_RAM_WRITE(nvram_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2802, 0x2802) AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x2804, 0x2804) AM_DEVWRITE("sn2", sn76496_w)
AM_RANGE(0x2806, 0x2806) AM_DEVWRITE("sn3", sn76496_w)
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 9f24408308b..f3069766d79 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -107,19 +107,19 @@ static WRITE8_HANDLER( avalance_video_invert_w )
static WRITE8_HANDLER( avalance_credit_1_lamp_w )
{
- set_led_status(0, data & 0x01);
+ set_led_status(space->machine, 0, data & 0x01);
}
static WRITE8_HANDLER( avalance_credit_2_lamp_w )
{
- set_led_status(1, data & 0x01);
+ set_led_status(space->machine, 1, data & 0x01);
}
static WRITE8_HANDLER( avalance_start_lamp_w )
{
- set_led_status(2, data & 0x01);
+ set_led_status(space->machine, 2, data & 0x01);
}
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 90776ca84fc..4a687ba313e 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -49,7 +49,7 @@ static MACHINE_RESET( aztarac )
static READ16_HANDLER( nvram_r )
{
- return generic_nvram16[offset] | 0xfff0;
+ return space->machine->generic.nvram.ptr.u16[offset] | 0xfff0;
}
@@ -76,7 +76,7 @@ static READ16_HANDLER( joystick_r )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00bfff) AM_ROM
- AM_RANGE(0x022000, 0x0220ff) AM_READ(nvram_r) AM_WRITEONLY AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x022000, 0x0220ff) AM_READ(nvram_r) AM_WRITEONLY AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x027000, 0x027001) AM_READ(joystick_r)
AM_RANGE(0x027004, 0x027005) AM_READ_PORT("INPUTS")
AM_RANGE(0x027008, 0x027009) AM_READWRITE(aztarac_sound_r, aztarac_sound_w)
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index c181dba4882..32c67618d8b 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -166,7 +166,7 @@ static WRITE8_HANDLER( bagman_ls259_w )
static WRITE8_HANDLER( bagman_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 2cb642386f9..679a705981f 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -258,7 +258,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9903, 0x9903) AM_READ_PORT("IN1") AM_WRITENOP
AM_RANGE(0x9a00, 0x9a03) AM_READ(balsente_random_num_r)
AM_RANGE(0x9a04, 0x9a05) AM_READWRITE(balsente_m6850_r, balsente_m6850_w)
- AM_RANGE(0x9b00, 0x9cff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* system+cart NOVRAM */
+ AM_RANGE(0x9b00, 0x9cff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* system+cart NOVRAM */
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1)
AM_RANGE(0xc000, 0xffff) AM_ROMBANK(2)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 16bf73e5475..9b2bff5f46a 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -133,9 +133,9 @@ static WRITE8_HANDLER( inputport_select_w )
inputport_selected = data & 0x07;
else if ((data & 0xe0) == 0xc0)
{
- coin_lockout_global_w(~data & 1);
- coin_counter_w(0,data & 2);
- coin_counter_w(1,data & 4);
+ coin_lockout_global_w(space->machine, ~data & 1);
+ coin_counter_w(space->machine, 0,data & 2);
+ coin_counter_w(space->machine, 1,data & 4);
}
}
@@ -164,8 +164,8 @@ static READ8_HANDLER( inputport_r )
static WRITE8_HANDLER( baraduke_lamps_w )
{
- set_led_status(0,data & 0x08);
- set_led_status(1,data & 0x10);
+ set_led_status(space->machine, 0,data & 0x08);
+ set_led_status(space->machine, 1,data & 0x10);
}
static WRITE8_HANDLER( baraduke_irq_ack_w )
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 86466e7e367..6c0a6ec230f 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -43,8 +43,8 @@ static WRITE8_HANDLER( battlnts_bankswitch_w )
memory_set_bankptr(space->machine, 1,&RAM[bankaddress]);
/* bits 4 & 5 = coin counters */
- coin_counter_w(0,data & 0x10);
- coin_counter_w(1,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x10);
+ coin_counter_w(space->machine, 1,data & 0x20);
/* other bits unknown */
}
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index d24f35047f2..80bf9aff3cf 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -248,7 +248,7 @@ static WRITE32_HANDLER( eeprom_data_w )
if (eeprom_enabled)
{
mem_mask &= 0x000000ff;
- COMBINE_DATA(generic_nvram32 + offset);
+ COMBINE_DATA(space->machine->generic.nvram.ptr.u32 + offset);
eeprom_enabled = 0;
}
}
@@ -312,7 +312,7 @@ static WRITE32_HANDLER( sound_reset_w )
static WRITE32_HANDLER( coin_count_w )
{
- coin_counter_w(0, !offset);
+ coin_counter_w(space->machine, 0, !offset);
}
@@ -326,7 +326,7 @@ static WRITE32_HANDLER( coin_count_w )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE(&ram_base)
AM_RANGE(0x01800000, 0x01bfffff) AM_ROM AM_REGION("user1", 0) AM_BASE(&rom_base)
- AM_RANGE(0x40000000, 0x400007ff) AM_RAM_WRITE(eeprom_data_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x40000000, 0x400007ff) AM_RAM_WRITE(eeprom_data_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x41000000, 0x41000003) AM_READWRITE(sound_data_r, sound_data_w)
AM_RANGE(0x41000100, 0x41000103) AM_READ(interrupt_control_r)
AM_RANGE(0x41000100, 0x4100011f) AM_WRITE(interrupt_control_w)
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 72c898869fd..ac26b5dbca9 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -63,7 +63,7 @@ static UINT8 nmi_enabled; /* flip-flop made out of 2 NAND gates @ 1D */
static READ8_HANDLER( led_on_r )
{
- set_led_status(0, 1);
+ set_led_status(space->machine, 0, 1);
return 0;
}
@@ -71,13 +71,13 @@ static READ8_HANDLER( led_on_r )
static WRITE8_HANDLER( led_on_w )
{
- set_led_status(0, 1);
+ set_led_status(space->machine, 0, 1);
}
static READ8_HANDLER( led_off_r )
{
- set_led_status(0, 0);
+ set_led_status(space->machine, 0, 0);
return 0;
}
@@ -85,7 +85,7 @@ static READ8_HANDLER( led_off_r )
static WRITE8_HANDLER( led_off_w )
{
- set_led_status(0, 0);
+ set_led_status(space->machine, 0, 0);
}
@@ -294,7 +294,7 @@ static MACHINE_RESET( berzerk )
{
irq_enabled = 0;
nmi_enabled = 0;
- set_led_status(0, 0);
+ set_led_status(machine, 0, 0);
magicram_control = 0;
start_irq_timer(machine);
@@ -548,7 +548,7 @@ static SOUND_RESET(berzerk)
static ADDRESS_MAP_START( berzerk_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
- AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x0400) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&berzerk_videoram) AM_SIZE(&berzerk_videoram_size) AM_SHARE(1)
AM_RANGE(0x6000, 0x7fff) AM_RAM_WRITE(magicram_w) AM_SHARE(1)
@@ -563,7 +563,7 @@ static ADDRESS_MAP_START( frenzy_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0x7fff) AM_RAM_WRITE(magicram_w) AM_SHARE(1)
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x3800) AM_RAM AM_BASE(&berzerk_colorram)
AM_RANGE(0xc000, 0xcfff) AM_ROM
- AM_RANGE(0xf800, 0xfbff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf800, 0xfbff) AM_MIRROR(0x0400) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 85208c9a905..40220f24750 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1437,7 +1437,7 @@ static WRITE8_DEVICE_HANDLER( upd_w )
}
static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2000, 0x2000) AM_RAM // W 'B', 6F
AM_RANGE(0x2200, 0x2200) AM_RAM // W 'F'
AM_RANGE(0x2600, 0x2600) AM_READWRITE(meter_r, meter_w)
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index 9bc4fd39a6c..a7688710a01 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -765,7 +765,7 @@ static MACHINE_RESET( bfm_sc1 )
static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) //8k RAM
+ AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_BASE_SIZE_GENERIC(nvram) //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch
AM_RANGE(0x2200, 0x23FF) AM_WRITE(reel12_w) // reel 1+2 latch
AM_RANGE(0x2400, 0x25FF) AM_WRITE(vfd_w) // vfd latch
@@ -808,7 +808,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( memmap_adder2, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) //8k RAM
+ AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_BASE_SIZE_GENERIC(nvram) //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch
AM_RANGE(0x2200, 0x23FF) AM_WRITE(reel12_w) // reel 1+2 latch
AM_RANGE(0x2400, 0x25FF) AM_WRITE(vfd_w) // vfd latch
@@ -857,7 +857,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sc1_nec_uk, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) //8k RAM
+ AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_BASE_SIZE_GENERIC(nvram) //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch
AM_RANGE(0x2200, 0x23FF) AM_WRITE(reel12_w) // reel 1+2 latch
AM_RANGE(0x2400, 0x25FF) AM_WRITE(vfd_w) // vfd latch
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 07b5d21df87..2b8d3ef063a 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -880,7 +880,7 @@ static WRITE8_HANDLER( coininhib_w )
{
if ( changed & p )
{ // this inhibit line has changed
- coin_lockout_w(i, (~data & p) ); // update lockouts
+ coin_lockout_w(space->machine, i, (~data & p) ); // update lockouts
changed &= ~p;
}
diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c
index 13e36d7f9be..6ce922f8b3f 100644
--- a/src/mame/drivers/bfmsys85.c
+++ b/src/mame/drivers/bfmsys85.c
@@ -401,7 +401,7 @@ static MACHINE_START( bfm_sys85 )
static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) //8k RAM
+ AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 3+4 latch
AM_RANGE(0x2200, 0x23FF) AM_WRITE(reel12_w) // reel 1+2 latch
AM_RANGE(0x2400, 0x25FF) AM_WRITE(vfd_w) // vfd latch
diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c
index cc77d105652..8e3f99987f0 100644
--- a/src/mame/drivers/big10.c
+++ b/src/mame/drivers/big10.c
@@ -128,7 +128,7 @@ static READ8_HANDLER( mux_r )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index 8747d54dd96..0f0c35789d6 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -357,7 +357,7 @@ static WRITE16_HANDLER( bishjan_coin_w )
{
// coin out data & 0x01;
bishjan_hopper = data & 0x02; // hopper
- coin_counter_w( 1, data & 0x10 );
+ coin_counter_w(space->machine, 1, data & 0x10 );
}
}
@@ -367,7 +367,7 @@ static ADDRESS_MAP_START( bishjan_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_REGION("maincpu", 0)
AM_RANGE( 0x080000, 0x0fffff ) AM_ROM AM_REGION("maincpu", 0)
- AM_RANGE( 0x200000, 0x207fff ) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // battery
+ AM_RANGE( 0x200000, 0x207fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // battery
// read lo (2) (only half tilemap?)
@@ -490,7 +490,7 @@ static MACHINE_RESET( saklove )
}
static ADDRESS_MAP_START( saklove_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x00000, 0x07fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // battery
+ AM_RANGE(0x00000, 0x07fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // battery
// read lo (2) (only half tilemap?)
AM_RANGE(0x12000, 0x12fff) AM_READWRITE( bishjan_videoram_2_lo_r, bishjan_videoram_2_lo_w )
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index a0dc5ab69ea..c34d430387b 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -69,12 +69,12 @@ static WRITE8_HANDLER( bladestl_bankswitch_w )
int bankaddress;
/* bits 0 & 1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bits 2 & 3 = lamps */
- set_led_status(0,data & 0x04);
- set_led_status(1,data & 0x08);
+ set_led_status(space->machine, 0,data & 0x04);
+ set_led_status(space->machine, 1,data & 0x08);
/* bit 4 = relay (???) */
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index f4921df1008..193d83fbe4e 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -65,8 +65,8 @@ static WRITE8_HANDLER( blktiger_coinlockout_w )
{
if (input_port_read(space->machine, "COIN_LOCKOUT") & 0x01)
{
- coin_lockout_w(0,~data & 0x01);
- coin_lockout_w(1,~data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x01);
+ coin_lockout_w(space->machine, 1,~data & 0x02);
}
}
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index 34b4de876b5..0af6748ae23 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -254,8 +254,8 @@ static KONAMI_SETLINES_CALLBACK( blockhl_banking )
memory_set_bankptr(device->machine, 1,&RAM[offs]);
/* bits 3/4 = coin counters */
- coin_counter_w(0,lines & 0x08);
- coin_counter_w(1,lines & 0x10);
+ coin_counter_w(device->machine, 0,lines & 0x08);
+ coin_counter_w(device->machine, 1,lines & 0x10);
/* bit 5 = select palette RAM or work RAM at 5800-5fff */
palette_selected = ~lines & 0x20;
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index d03074ea01f..cc7c4c83cd1 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -84,8 +84,8 @@ static WRITE8_HANDLER( blueprnt_sound_command_w )
static WRITE8_HANDLER( blueprnt_coin_counter_w )
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
}
/*************************************
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 01a5981ee06..73881b361c2 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -84,8 +84,8 @@ if ((data & 1) == 0) popmessage("bankswitch RAM bank 0");
static WRITE8_HANDLER( bottom9_1f90_w )
{
/* bits 0/1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 68efc44eede..723cc95b693 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -265,14 +265,14 @@ static WRITE8_HANDLER( boxer_crowd_w )
/* BIT2 => CROWD-2 */
/* BIT3 => CROWD-3 */
- coin_lockout_global_w(data & 1);
+ coin_lockout_global_w(space->machine, data & 1);
}
static WRITE8_HANDLER( boxer_led_w )
{
- set_led_status(1, !(data & 1));
- set_led_status(0, !(data & 2));
+ set_led_status(space->machine, 1, !(data & 1));
+ set_led_status(space->machine, 0, !(data & 2));
}
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 177a30b7d0e..64f3cb21796 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -199,7 +199,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x20000380, 0x200003ff) AM_READWRITE(main_sound_r, main_sound_w)
AM_RANGE(0x20000400, 0x2000047f) AM_WRITE(btoads_misc_control_w)
AM_RANGE(0x40000000, 0x4000000f) AM_WRITENOP /* watchdog? */
- AM_RANGE(0x60000000, 0x6003ffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x60000000, 0x6003ffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xa0000000, 0xa03fffff) AM_READWRITE(btoads_vram_fg_display_r, btoads_vram_fg_display_w) AM_BASE(&btoads_vram_fg0)
AM_RANGE(0xa4000000, 0xa43fffff) AM_READWRITE(btoads_vram_fg_draw_r, btoads_vram_fg_draw_w) AM_BASE(&btoads_vram_fg1)
AM_RANGE(0xa8000000, 0xa87fffff) AM_RAM AM_BASE(&btoads_vram_fg_data)
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 14616aa94e0..440a0b196bf 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -326,10 +326,10 @@ static WRITE8_HANDLER( bwidow_misc_w )
static int lastdata;
if (data == lastdata) return;
- set_led_status(0,~data & 0x10);
- set_led_status(1,~data & 0x20);
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ set_led_status(space->machine, 0,~data & 0x10);
+ set_led_status(space->machine, 1,~data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
lastdata = data;
}
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 7a2c0a4ca25..0f66453b912 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -268,7 +268,7 @@ static CUSTOM_INPUT( clock_r )
static WRITE8_HANDLER( bzone_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 36d6d899293..3bc386dba42 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -176,8 +176,8 @@ static READ8_HANDLER( cabalbl_snd1_r )
static WRITE8_HANDLER( cabalbl_coin_w )
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
//data & 0x40? video enable?
}
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index 130916e886f..25ee313d6e4 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -118,12 +118,12 @@ static WRITE8_HANDLER( cabaret_nmi_and_coins_w )
// popmessage("%02x",data);
}
- coin_counter_w(0, data & 0x01); // coin_a
- coin_counter_w(1, data & 0x04); // coin_c
- coin_counter_w(2, data & 0x08); // key in
- coin_counter_w(3, data & 0x10); // coin out mech
+ coin_counter_w(space->machine, 0, data & 0x01); // coin_a
+ coin_counter_w(space->machine, 1, data & 0x04); // coin_c
+ coin_counter_w(space->machine, 2, data & 0x08); // key in
+ coin_counter_w(space->machine, 3, data & 0x10); // coin out mech
- set_led_status(6, data & 0x40); // led for coin out / hopper active
+ set_led_status(space->machine, 6, data & 0x40); // led for coin out / hopper active
nmi_enable = data; // data & 0x80 // nmi enable?
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 5a18795660f..1c97c30e3ef 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -754,7 +754,7 @@ static WRITE8_DEVICE_HANDLER( lamps_b_w )
static ADDRESS_MAP_START( sys903_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0840, 0x0841) AM_DEVWRITE("ay8912", ay8910_address_data_w)
AM_RANGE(0x0880, 0x0880) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
@@ -769,7 +769,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( s903mod_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0840, 0x0841) AM_DEVWRITE("ay8912", ay8910_address_data_w)
AM_RANGE(0x0880, 0x0880) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
@@ -782,7 +782,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sys905_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1040, 0x1041) AM_DEVWRITE("ay8912", ay8910_address_data_w)
AM_RANGE(0x1080, 0x1080) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x1081, 0x1081) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 1f497d34636..8b1b737951d 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -93,7 +93,7 @@ static READ8_HANDLER( canyon_options_r )
static WRITE8_HANDLER( canyon_led_w )
{
- set_led_status(offset & 0x01, offset & 0x02);
+ set_led_status(space->machine, offset & 0x01, offset & 0x02);
}
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 4c483a47713..33d06159c85 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -214,15 +214,15 @@ static void firqhandler( const device_config *device, int irq )
static NVRAM_HANDLER( capbowl )
{
if (read_or_write)
- mame_fwrite(file, generic_nvram, generic_nvram_size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else if (file)
- mame_fread(file, generic_nvram, generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else
{
/* invalidate nvram to make the game initialize it.
A 0xff fill will cause the game to malfunction, so we use a
0x01 fill which seems OK */
- memset(generic_nvram, 0x01, generic_nvram_size);
+ memset(machine->generic.nvram.ptr.v, 0x01, machine->generic.nvram.size);
}
}
@@ -238,7 +238,7 @@ static ADDRESS_MAP_START( capbowl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1)
AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(capbowl_state, rowaddress)
AM_RANGE(0x4800, 0x4800) AM_WRITE(capbowl_rom_select_w)
- AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x5800, 0x5fff) AM_READWRITE(capbowl_tms34061_r, capbowl_tms34061_w)
AM_RANGE(0x6000, 0x6000) AM_WRITE(capbowl_sndcmd_w)
AM_RANGE(0x6800, 0x6800) AM_WRITE(track_reset_w) /* + watchdog */
@@ -251,7 +251,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bowlrama_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(bowlrama_blitter_r, bowlrama_blitter_w)
AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(capbowl_state, rowaddress)
- AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x5800, 0x5fff) AM_READWRITE(capbowl_tms34061_r, capbowl_tms34061_w)
AM_RANGE(0x6000, 0x6000) AM_WRITE(capbowl_sndcmd_w)
AM_RANGE(0x6800, 0x6800) AM_WRITE(track_reset_w) /* + watchdog */
diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c
index 512bfad07ce..8003a39ab94 100644
--- a/src/mame/drivers/caswin.c
+++ b/src/mame/drivers/caswin.c
@@ -109,11 +109,11 @@ static READ8_HANDLER( vvillage_rng_r )
static WRITE8_HANDLER( vvillage_output_w )
{
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 1);
// data & 4 payout counter
- coin_lockout_w(0,data & 0x20);
- coin_lockout_w(1,data & 0x20);
+ coin_lockout_w(space->machine, 0,data & 0x20);
+ coin_lockout_w(space->machine, 1,data & 0x20);
}
static WRITE8_HANDLER( vvillage_lamps_w )
@@ -125,17 +125,17 @@ static WRITE8_HANDLER( vvillage_lamps_w )
---- --x- lamp button 2
---- ---x lamp button 1
*/
- set_led_status(0, data & 0x01);
- set_led_status(1, data & 0x02);
- set_led_status(2, data & 0x04);
- set_led_status(3, data & 0x08);
- set_led_status(4, data & 0x10);
+ set_led_status(space->machine, 0, data & 0x01);
+ set_led_status(space->machine, 1, data & 0x02);
+ set_led_status(space->machine, 2, data & 0x04);
+ set_led_status(space->machine, 3, data & 0x08);
+ set_led_status(space->machine, 4, data & 0x10);
}
static ADDRESS_MAP_START( vvillage_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READ(vvillage_rng_r) //accessed by caswin only
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(sc0_vram_w) AM_BASE(&sc0_vram)
AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(sc0_attr_w) AM_BASE(&sc0_attr)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 83c4d6eee07..b3930c5acb4 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -300,10 +300,10 @@ static WRITE16_HANDLER( cave_eeprom_msb_w )
if ( ACCESSING_BITS_8_15 ) // even address
{
- coin_lockout_w(1,~data & 0x8000);
- coin_lockout_w(0,~data & 0x4000);
- coin_counter_w(1, data & 0x2000);
- coin_counter_w(0, data & 0x1000);
+ coin_lockout_w(space->machine, 1,~data & 0x8000);
+ coin_lockout_w(space->machine, 0,~data & 0x4000);
+ coin_counter_w(space->machine, 1, data & 0x2000);
+ coin_counter_w(space->machine, 0, data & 0x1000);
// latch the bit
eeprom_write_bit(data & 0x0800);
@@ -344,10 +344,10 @@ static WRITE16_HANDLER( cave_eeprom_lsb_w )
if ( ACCESSING_BITS_0_7 ) // odd address
{
- coin_lockout_w(1,~data & 0x0008);
- coin_lockout_w(0,~data & 0x0004);
- coin_counter_w(1, data & 0x0002);
- coin_counter_w(0, data & 0x0001);
+ coin_lockout_w(space->machine, 1,~data & 0x0008);
+ coin_lockout_w(space->machine, 0,~data & 0x0004);
+ coin_counter_w(space->machine, 1, data & 0x0002);
+ coin_counter_w(space->machine, 0, data & 0x0001);
// latch the bit
eeprom_write_bit(data & 0x80);
@@ -365,8 +365,8 @@ static WRITE16_HANDLER( gaia_coin_lsb_w )
{
if ( ACCESSING_BITS_0_7 ) // odd address
{
- coin_counter_w(1, data & 0x0002);
- coin_counter_w(0, data & 0x0001);
+ coin_counter_w(space->machine, 1, data & 0x0002);
+ coin_counter_w(space->machine, 0, data & 0x0001);
}
}
@@ -379,8 +379,8 @@ static WRITE16_HANDLER( metmqstr_eeprom_msb_w )
if ( ACCESSING_BITS_8_15 ) // even address
{
- coin_counter_w(1, data & 0x2000);
- coin_counter_w(0, data & 0x1000);
+ coin_counter_w(space->machine, 1, data & 0x2000);
+ coin_counter_w(space->machine, 0, data & 0x1000);
if (~data & 0x0100)
{
@@ -685,21 +685,21 @@ static WRITE16_HANDLER( korokoro_leds_w )
{
COMBINE_DATA( &leds[0] );
- set_led_status(0, data & 0x8000);
- set_led_status(1, data & 0x4000);
- set_led_status(2, data & 0x1000); // square button
- set_led_status(3, data & 0x0800); // round button
-// coin_lockout_w(1,~data & 0x0200); // coin lockouts?
-// coin_lockout_w(0,~data & 0x0100);
-
-// coin_counter_w(2, data & 0x0080);
-// coin_counter_w(1, data & 0x0020);
- coin_counter_w(0, data & 0x0010);
-
- set_led_status(5, data & 0x0008);
- set_led_status(6, data & 0x0004);
- set_led_status(7, data & 0x0002);
- set_led_status(8, data & 0x0001);
+ set_led_status(space->machine, 0, data & 0x8000);
+ set_led_status(space->machine, 1, data & 0x4000);
+ set_led_status(space->machine, 2, data & 0x1000); // square button
+ set_led_status(space->machine, 3, data & 0x0800); // round button
+// coin_lockout_w(space->machine, 1,~data & 0x0200); // coin lockouts?
+// coin_lockout_w(space->machine, 0,~data & 0x0100);
+
+// coin_counter_w(space->machine, 2, data & 0x0080);
+// coin_counter_w(space->machine, 1, data & 0x0020);
+ coin_counter_w(space->machine, 0, data & 0x0010);
+
+ set_led_status(space->machine, 5, data & 0x0008);
+ set_led_status(space->machine, 6, data & 0x0004);
+ set_led_status(space->machine, 7, data & 0x0002);
+ set_led_status(space->machine, 8, data & 0x0001);
show_leds();
}
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index dbb6a135b8b..418a4a2d62e 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -77,10 +77,10 @@ static WRITE8_HANDLER( bankedram_w )
static WRITE8_HANDLER( cbasebal_coinctrl_w )
{
- coin_lockout_w(0,~data & 0x04);
- coin_lockout_w(1,~data & 0x08);
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x04);
+ coin_lockout_w(space->machine, 1,~data & 0x08);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 60fe479b1d6..68a7f7837e5 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -234,12 +234,12 @@ static MACHINE_START( ccastles )
schedule_next_irq(machine, 0);
/* allocate backing memory for the NVRAM */
- generic_nvram = auto_alloc_array(machine, UINT8, generic_nvram_size);
+ machine->generic.nvram.ptr.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram.size);
/* setup for save states */
state_save_register_global(machine, state->irq_state);
state_save_register_global_array(machine, state->nvram_store);
- state_save_register_global_pointer(machine, generic_nvram, generic_nvram_size);
+ state_save_register_global_pointer(machine, machine->generic.nvram.ptr.u8, machine->generic.nvram.size);
}
@@ -271,13 +271,13 @@ static WRITE8_HANDLER( irq_ack_w )
static WRITE8_HANDLER( led_w )
{
- set_led_status(offset, ~data & 1);
+ set_led_status(space->machine, offset, ~data & 1);
}
static WRITE8_HANDLER( ccounter_w )
{
- coin_counter_w(offset, data & 1);
+ coin_counter_w(space->machine, offset, data & 1);
}
@@ -307,19 +307,19 @@ static NVRAM_HANDLER( ccastles )
if (read_or_write)
{
/* on power down, the EAROM is implicitly stored */
- memcpy(generic_nvram, nvram_stage, generic_nvram_size);
- mame_fwrite(file, generic_nvram, generic_nvram_size);
+ memcpy(machine->generic.nvram.ptr.v, nvram_stage, machine->generic.nvram.size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
}
else if (file)
- mame_fread(file, generic_nvram, generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else
- memset(generic_nvram, 0, generic_nvram_size);
+ memset(machine->generic.nvram.ptr.v, 0, machine->generic.nvram.size);
}
static WRITE8_HANDLER( nvram_recall_w )
{
- memcpy(nvram_stage, generic_nvram, generic_nvram_size);
+ memcpy(nvram_stage, space->machine->generic.nvram.ptr.v, space->machine->generic.nvram.size);
}
@@ -329,7 +329,7 @@ static WRITE8_HANDLER( nvram_store_w )
state->nvram_store[offset] = data & 1;
if (!state->nvram_store[0] && state->nvram_store[1])
- memcpy(generic_nvram, nvram_stage, generic_nvram_size);
+ memcpy(space->machine->generic.nvram.ptr.v, nvram_stage, space->machine->generic.nvram.size);
}
@@ -347,7 +347,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_RAM_WRITE(ccastles_videoram_w) AM_BASE_MEMBER(ccastles_state, videoram)
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x8e00, 0x8fff) AM_BASE_MEMBER(ccastles_state, spriteram)
- AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0300) AM_RAM AM_BASE(&nvram_stage) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0300) AM_RAM AM_BASE(&nvram_stage) AM_SIZE_GENERIC(nvram)
AM_RANGE(0x9400, 0x9403) AM_MIRROR(0x01fc) AM_READ(leta_r)
AM_RANGE(0x9600, 0x97ff) AM_READ_PORT("IN0")
AM_RANGE(0x9800, 0x980f) AM_MIRROR(0x01f0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w)
diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c
index 30436688e2c..74d3c77f4be 100644
--- a/src/mame/drivers/cchance.c
+++ b/src/mame/drivers/cchance.c
@@ -41,9 +41,9 @@ static WRITE8_HANDLER( output_0_w )
{
//---- --x- divider?
- coin_lockout_w(0, ~data & 1);
+ coin_lockout_w(space->machine, 0, ~data & 1);
-// coin_counter_w(0, ~data & 1);
+// coin_counter_w(space->machine, 0, ~data & 1);
}
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 58598750bc4..c9689eaa3a6 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -621,7 +621,7 @@ static READ8_HANDLER( bullsdrt_data_port_r )
static WRITE8_HANDLER( led_w )
{
- set_led_status(offset, ~data & 0x80);
+ set_led_status(space->machine, offset, ~data & 0x80);
}
@@ -633,13 +633,13 @@ static READ8_DEVICE_HANDLER( caterplr_rand_r )
static WRITE8_HANDLER( coin_count_w )
{
- coin_counter_w(offset, data);
+ coin_counter_w(space->machine, offset, data);
}
static WRITE8_HANDLER( bullsdrt_coin_count_w )
{
- coin_counter_w(0, data);
+ coin_counter_w(space->machine, 0, data);
}
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index b1d8ed099f5..d4c7955dcad 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -173,11 +173,11 @@ static READ8_HANDLER( trackball_r )
static WRITE8_HANDLER( champbwl_misc_w )
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
- coin_lockout_w(0, ~data & 8);
- coin_lockout_w(1, ~data & 4);
+ coin_lockout_w(space->machine, 0, ~data & 8);
+ coin_lockout_w(space->machine, 1, ~data & 4);
memory_set_bank(space->machine, 1, (data & 0x30) >> 4);
}
@@ -194,7 +194,7 @@ static WRITE8_HANDLER( champbwl_objctrl_w )
static ADDRESS_MAP_START( champbwl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_REGION("maincpu", 0x10000)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
- AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram)
AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("x1snd", seta_sound_r, seta_sound_w)
AM_RANGE(0xe000, 0xe1ff) AM_RAM AM_BASE_MEMBER(tnzs_state, vdcram)
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index c2f4d35b22b..18249941c1e 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -215,7 +215,7 @@ static WRITE8_HANDLER( changela_collision_reset_1 )
static WRITE8_HANDLER( changela_coin_counter_w )
{
- coin_counter_w(offset, data);
+ coin_counter_w(space->machine, offset, data);
}
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 43927b2f926..5421d178473 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -78,8 +78,8 @@ static WRITE8_HANDLER( chqflag_vreg_w )
static int last;
/* bits 0 & 1 = coin counters */
- coin_counter_w(1,data & 0x01);
- coin_counter_w(0,data & 0x02);
+ coin_counter_w(space->machine, 1,data & 0x01);
+ coin_counter_w(space->machine, 0,data & 0x02);
/* bit 4 = enable rom reading thru K051316 #1 & #2 */
K051316_readroms = (data & 0x10);
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index e224361c8a9..cd847741942 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -95,7 +95,7 @@ static ADDRESS_MAP_START( chsuper_prg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0efff) AM_ROM
AM_RANGE(0x00000, 0x01fff) AM_WRITE( chsuper_vram_w )
AM_RANGE(0x0f000, 0x0ffff) AM_RAM AM_REGION("maincpu", 0xf000)
- AM_RANGE(0xfb000, 0xfbfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xfb000, 0xfbfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
// AM_RANGE(0xaff8, 0xaff8) AM_DEVWRITE("oki", okim6295_w)
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index d9780bc3add..23a46fcdb05 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -151,9 +151,9 @@ static WRITE8_HANDLER( altair_out1_w )
7 CONT. M1
*/
- set_led_status(0, data & 0x08); // 1P
- set_led_status(1, data & 0x10); // 2P
- set_led_status(2, data & 0x20); // FIRE
+ set_led_status(space->machine, 0, data & 0x08); // 1P
+ set_led_status(space->machine, 1, data & 0x10); // 2P
+ set_led_status(space->machine, 2, data & 0x20); // FIRE
}
static WRITE8_HANDLER( draco_out1_w )
@@ -231,14 +231,14 @@ static COP400_INTERFACE( draco_cop_intf )
static ADDRESS_MAP_START( destryer_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x20ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2000, 0x20ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w)
AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( destryea_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w)
AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w)
ADDRESS_MAP_END
@@ -276,7 +276,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( draco_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w)
AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index e512b02df45..7aea2b5a0be 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -102,7 +102,7 @@ static WRITE8_HANDLER( circusc_sh_irqtrigger_w )
static WRITE8_HANDLER( circusc_coin_counter_w )
{
- coin_counter_w(offset, data);
+ coin_counter_w(space->machine, offset, data);
}
static WRITE8_HANDLER(circusc_sound_w)
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index f5a677b4fce..e97de60a767 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -472,15 +472,15 @@ static WRITE16_HANDLER( scudhamm_leds_w )
{
if (ACCESSING_BITS_8_15)
{
- set_led_status(0, data & 0x0100); // 3 buttons
- set_led_status(1, data & 0x0200);
- set_led_status(2, data & 0x0400);
+ set_led_status(space->machine, 0, data & 0x0100); // 3 buttons
+ set_led_status(space->machine, 1, data & 0x0200);
+ set_led_status(space->machine, 2, data & 0x0400);
}
if (ACCESSING_BITS_0_7)
{
-// set_led_status(3, data & 0x0010); // if we had more leds..
-// set_led_status(4, data & 0x0020);
+// set_led_status(space->machine, 3, data & 0x0010); // if we had more leds..
+// set_led_status(space->machine, 4, data & 0x0020);
}
}
@@ -572,16 +572,16 @@ static WRITE16_HANDLER( armchmp2_leds_w )
{
if (ACCESSING_BITS_8_15)
{
- set_led_status(0, data & 0x0100);
- set_led_status(1, data & 0x1000);
- set_led_status(2, data & 0x2000);
- set_led_status(3, data & 0x4000);
+ set_led_status(space->machine, 0, data & 0x0100);
+ set_led_status(space->machine, 1, data & 0x1000);
+ set_led_status(space->machine, 2, data & 0x2000);
+ set_led_status(space->machine, 3, data & 0x4000);
}
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x0040);
- coin_counter_w(1, data & 0x0080);
+ coin_counter_w(space->machine, 0, data & 0x0040);
+ coin_counter_w(space->machine, 1, data & 0x0080);
}
}
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 805601712d0..d29bfda915b 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -94,7 +94,7 @@ static emu_timer *irq_timer;
static WRITE8_HANDLER( cliff_test_led_w )
{
- set_led_status(0, offset ^ 1);
+ set_led_status(space->machine, 0, offset ^ 1);
}
static WRITE8_HANDLER( cliff_port_bank_w )
@@ -132,7 +132,7 @@ static WRITE8_HANDLER( cliff_phillips_clear_w )
static WRITE8_HANDLER( cliff_coin_counter_w )
{
- coin_counter_w(0, (data & 0x40) ? 1 : 0 );
+ coin_counter_w(space->machine, 0, (data & 0x40) ? 1 : 0 );
}
static READ8_HANDLER( cliff_irq_ack_r )
@@ -230,7 +230,7 @@ static MACHINE_RESET( cliffhgr )
static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM /* ROM */
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* NVRAM */
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* NVRAM */
AM_RANGE(0xe800, 0xefff) AM_RAM /* RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index fa819e63d9a..33d3917cfde 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -130,12 +130,12 @@ static int cloak_nvram_enabled;
static WRITE8_HANDLER( cloak_led_w )
{
- set_led_status(1 - offset, ~data & 0x80);
+ set_led_status(space->machine, 1 - offset, ~data & 0x80);
}
static WRITE8_HANDLER( cloak_coin_counter_w )
{
- coin_counter_w(1 - offset, data & 0x80);
+ coin_counter_w(space->machine, 1 - offset, data & 0x80);
}
static WRITE8_HANDLER( cloak_custom_w )
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2200, 0x2200) AM_READ_PORT("P2")
AM_RANGE(0x2400, 0x2400) AM_READ_PORT("SYSTEM")
AM_RANGE(0x2600, 0x2600) AM_WRITE(cloak_custom_w)
- AM_RANGE(0x2800, 0x29ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2800, 0x29ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2f00, 0x2fff) AM_NOP
AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0x3200, 0x327f) AM_WRITE(cloak_paletteram_w)
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index 237d4dce47a..fa9f0f37eaf 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -200,11 +200,11 @@ static MACHINE_START( cloud9 )
schedule_next_irq(machine, 0-64);
/* allocate backing memory for the NVRAM */
- generic_nvram = auto_alloc_array(machine, UINT8, generic_nvram_size);
+ machine->generic.nvram.ptr.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram.size);
/* setup for save states */
state_save_register_global(machine, state->irq_state);
- state_save_register_global_pointer(machine, generic_nvram, generic_nvram_size);
+ state_save_register_global_pointer(machine, machine->generic.nvram.ptr.u8, machine->generic.nvram.size);
}
@@ -236,13 +236,13 @@ static WRITE8_HANDLER( irq_ack_w )
static WRITE8_HANDLER( cloud9_led_w )
{
- set_led_status(offset, ~data & 0x80);
+ set_led_status(space->machine, offset, ~data & 0x80);
}
static WRITE8_HANDLER( cloud9_coin_counter_w )
{
- coin_counter_w(offset, data & 0x80);
+ coin_counter_w(space->machine, offset, data & 0x80);
}
@@ -264,25 +264,25 @@ static NVRAM_HANDLER( cloud9 )
if (read_or_write)
{
/* on power down, the EAROM is implicitly stored */
- memcpy(generic_nvram, nvram_stage, generic_nvram_size);
- mame_fwrite(file, generic_nvram, generic_nvram_size);
+ memcpy(machine->generic.nvram.ptr.v, nvram_stage, machine->generic.nvram.size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
}
else if (file)
- mame_fread(file, generic_nvram, generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else
- memset(generic_nvram, 0, generic_nvram_size);
+ memset(machine->generic.nvram.ptr.v, 0, machine->generic.nvram.size);
}
static WRITE8_HANDLER( nvram_recall_w )
{
- memcpy(nvram_stage, generic_nvram, generic_nvram_size);
+ memcpy(nvram_stage, space->machine->generic.nvram.ptr.v, space->machine->generic.nvram.size);
}
static WRITE8_HANDLER( nvram_store_w )
{
- memcpy(generic_nvram, nvram_stage, generic_nvram_size);
+ memcpy(space->machine->generic.nvram.ptr.v, nvram_stage, space->machine->generic.nvram.size);
}
@@ -318,7 +318,7 @@ static ADDRESS_MAP_START( cloud9_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5900, 0x5903) AM_MIRROR(0x007c) AM_READ(leta_r)
AM_RANGE(0x5a00, 0x5a0f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w)
AM_RANGE(0x5b00, 0x5b0f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w)
- AM_RANGE(0x5c00, 0x5cff) AM_MIRROR(0x0300) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE(&nvram_stage) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x5c00, 0x5cff) AM_MIRROR(0x0300) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE(&nvram_stage) AM_SIZE_GENERIC(nvram)
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index bc522bdcfe6..250969214b1 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -509,9 +509,9 @@ static WRITE32_HANDLER( latch_w )
static READ32_HANDLER( eeprom_data_r )
{
if (cojag_is_r3000)
- return generic_nvram32[offset] | 0xffffff00;
+ return space->machine->generic.nvram.ptr.u32[offset] | 0xffffff00;
else
- return generic_nvram32[offset] | 0x00ffffff;
+ return space->machine->generic.nvram.ptr.u32[offset] | 0x00ffffff;
}
@@ -526,9 +526,9 @@ static WRITE32_HANDLER( eeprom_data_w )
// if (eeprom_enable)
{
if (cojag_is_r3000)
- generic_nvram32[offset] = data & 0x000000ff;
+ space->machine->generic.nvram.ptr.u32[offset] = data & 0x000000ff;
else
- generic_nvram32[offset] = data & 0xff000000;
+ space->machine->generic.nvram.ptr.u32[offset] = data & 0xff000000;
}
// else
// logerror("%08X:error writing to disabled EEPROM\n", cpu_get_previouspc(space->cpu));
@@ -805,7 +805,7 @@ static ADDRESS_MAP_START( r3000_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x12000000, 0x120fffff) AM_RAM // tested in self-test only?
AM_RANGE(0x14000004, 0x14000007) AM_WRITE(watchdog_reset32_w)
AM_RANGE(0x16000000, 0x16000003) AM_WRITE(eeprom_enable_w)
- AM_RANGE(0x18000000, 0x18001fff) AM_READWRITE(eeprom_data_r, eeprom_data_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x18000000, 0x18001fff) AM_READWRITE(eeprom_data_r, eeprom_data_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1fc00000, 0x1fdfffff) AM_ROM AM_REGION("user1", 0) AM_BASE(&rom_base)
ADDRESS_MAP_END
@@ -814,7 +814,7 @@ static ADDRESS_MAP_START( m68020_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_BASE(&jaguar_shared_ram) AM_SHARE(1)
AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("user1", 0) AM_BASE(&rom_base)
AM_RANGE(0xa00000, 0xa1ffff) AM_RAM
- AM_RANGE(0xa20000, 0xa21fff) AM_READWRITE(eeprom_data_r, eeprom_data_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xa20000, 0xa21fff) AM_READWRITE(eeprom_data_r, eeprom_data_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xa30000, 0xa30003) AM_WRITE(watchdog_reset32_w)
AM_RANGE(0xa40000, 0xa40003) AM_WRITE(eeprom_enable_w)
AM_RANGE(0xb70000, 0xb70003) AM_READWRITE(misc_control_r, misc_control_w)
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 9fbbb761646..05dc5812ad3 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -155,8 +155,8 @@ static WRITE8_HANDLER( combasc_coin_counter_w )
/* b1: coin counter 2 */
/* b0: coin counter 1 */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
static READ8_HANDLER( trackball_r )
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 1ddefb67487..0828806a7d2 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -58,8 +58,8 @@ static WRITE8_HANDLER( contra_sh_irqtrigger_w )
static WRITE8_HANDLER( contra_coin_counter_w )
{
- if (data & 0x01) coin_counter_w(0,data & 0x01);
- if (data & 0x02) coin_counter_w(1,(data & 0x02) >> 1);
+ if (data & 0x01) coin_counter_w(space->machine, 0,data & 0x01);
+ if (data & 0x02) coin_counter_w(space->machine, 1,(data & 0x02) >> 1);
}
static WRITE8_HANDLER( cpu_sound_command_w )
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index 40e2d40763d..9b8ab32a2e2 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -194,7 +194,7 @@ static WRITE16_HANDLER( nvram_data_w )
if (ACCESSING_BITS_0_7)
{
if (nvram_write_enable)
- generic_nvram16[offset] = data & 0xff;
+ space->machine->generic.nvram.ptr.u16[offset] = data & 0xff;
}
}
@@ -217,8 +217,8 @@ static WRITE16_HANDLER( amerdart_misc_w )
{
logerror("%08x:IOP_reset_w %04x\n",cpu_get_pc(space->cpu),data);
- coin_counter_w(0, ~data & 0x0001);
- coin_counter_w(1, ~data & 0x0002);
+ coin_counter_w(space->machine, 0, ~data & 0x0001);
+ coin_counter_w(space->machine, 1, ~data & 0x0002);
cputag_set_input_line(space->machine, "dsp", INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE);
@@ -294,8 +294,8 @@ static WRITE16_HANDLER( coolpool_misc_w )
{
logerror("%08x:IOP_reset_w %04x\n",cpu_get_pc(space->cpu),data);
- coin_counter_w(0, ~data & 0x0001);
- coin_counter_w(1, ~data & 0x0002);
+ coin_counter_w(space->machine, 0, ~data & 0x0001);
+ coin_counter_w(space->machine, 1, ~data & 0x0002);
cputag_set_input_line(space->machine, "dsp", INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE);
}
@@ -489,7 +489,7 @@ static ADDRESS_MAP_START( amerdart_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x000fffff) AM_RAM AM_BASE(&vram_base)
AM_RANGE(0x04000000, 0x0400000f) AM_WRITE(amerdart_misc_w)
AM_RANGE(0x05000000, 0x0500000f) AM_READWRITE(coolpool_iop_r, amerdart_iop_w)
- AM_RANGE(0x06000000, 0x06007fff) AM_RAM_WRITE(nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x06000000, 0x06007fff) AM_RAM_WRITE(nvram_thrash_data_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xffb00000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
@@ -501,7 +501,7 @@ static ADDRESS_MAP_START( coolpool_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x02000000, 0x020000ff) AM_READWRITE(coolpool_iop_r, coolpool_iop_w)
AM_RANGE(0x03000000, 0x0300000f) AM_WRITE(coolpool_misc_w)
AM_RANGE(0x03000000, 0x03ffffff) AM_ROM AM_REGION("gfx1", 0)
- AM_RANGE(0x06000000, 0x06007fff) AM_RAM_WRITE(nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x06000000, 0x06007fff) AM_RAM_WRITE(nvram_thrash_data_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
@@ -512,7 +512,7 @@ static ADDRESS_MAP_START( nballsht_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x02000000, 0x020000ff) AM_READWRITE(coolpool_iop_r, coolpool_iop_w)
AM_RANGE(0x03000000, 0x0300000f) AM_WRITE(coolpool_misc_w)
AM_RANGE(0x04000000, 0x040000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w) // IMSG176P-40
- AM_RANGE(0x06000000, 0x0601ffff) AM_MIRROR(0x00020000) AM_RAM_WRITE(nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x06000000, 0x0601ffff) AM_MIRROR(0x00020000) AM_RAM_WRITE(nvram_thrash_data_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xff000000, 0xff7fffff) AM_ROM AM_REGION("gfx1", 0)
AM_RANGE(0xffc00000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index 8dd5160e57a..b3b1292b3de 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -90,12 +90,12 @@ static WRITE8_HANDLER( copsnrob_misc_w )
{
copsnrob_state *state = (copsnrob_state *)space->machine->driver_data;
state->misc = data & 0x7f;
- set_led_status(1, ~data & 0x40);
+ set_led_status(space->machine, 1, ~data & 0x40);
}
static WRITE8_HANDLER( copsnrob_led_w )
{
- set_led_status(0, ~data & 0x01);
+ set_led_status(space->machine, 0, ~data & 0x01);
}
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 108d3cb424d..32911d1066e 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -309,10 +309,10 @@ WRITE16_HANDLER( cps1_coinctrl_w )
{
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(0,data & 0x0100);
- coin_counter_w(1,data & 0x0200);
- coin_lockout_w(0,~data & 0x0400);
- coin_lockout_w(1,~data & 0x0800);
+ coin_counter_w(space->machine, 0,data & 0x0100);
+ coin_counter_w(space->machine, 1,data & 0x0200);
+ coin_lockout_w(space->machine, 0,~data & 0x0400);
+ coin_lockout_w(space->machine, 1,~data & 0x0800);
// bit 15 = CPS-A custom reset?
}
@@ -322,10 +322,10 @@ static WRITE16_HANDLER( cpsq_coinctrl2_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(2,data & 0x01);
- coin_lockout_w(2,~data & 0x02);
- coin_counter_w(3,data & 0x04);
- coin_lockout_w(3,~data & 0x08);
+ coin_counter_w(space->machine, 2,data & 0x01);
+ coin_lockout_w(space->machine, 2,~data & 0x02);
+ coin_counter_w(space->machine, 3,data & 0x04);
+ coin_lockout_w(space->machine, 3,~data & 0x08);
}
}
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index f677c55bd6e..d151a1e355b 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -740,38 +740,38 @@ static WRITE16_HANDLER( cps2_eeprom_port_w )
if (cputag_get_cpu(space->machine, "audiocpu"))
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_RESET, (data & 0x0008) ? CLEAR_LINE : ASSERT_LINE);
- coin_counter_w(0, data & 0x0001);
+ coin_counter_w(space->machine, 0, data & 0x0001);
if( (strncmp(space->machine->gamedrv->name,"pzloop2",8)==0) ||
(strncmp(space->machine->gamedrv->name,"pzloop2j",8)==0) )
{
// Puzz Loop 2 uses coin counter 2 input to switch between stick and paddle controls
readpaddle = data & 0x0002;
- }
- else
- {
- coin_counter_w(1, data & 0x0002);
- }
+ }
+ else
+ {
+ coin_counter_w(space->machine, 1, data & 0x0002);
+ }
- if(strncmp(space->machine->gamedrv->name,"mmatrix",7)==0) // Mars Matrix seems to require the coin lockout bit to be reversed
- {
- coin_lockout_w(0,data & 0x0010);
- coin_lockout_w(1,data & 0x0020);
- coin_lockout_w(2,data & 0x0040);
- coin_lockout_w(3,data & 0x0080);
- }
- else
- {
- coin_lockout_w(0,~data & 0x0010);
- coin_lockout_w(1,~data & 0x0020);
- coin_lockout_w(2,~data & 0x0040);
- coin_lockout_w(3,~data & 0x0080);
- }
+ if(strncmp(space->machine->gamedrv->name,"mmatrix",7)==0) // Mars Matrix seems to require the coin lockout bit to be reversed
+ {
+ coin_lockout_w(space->machine, 0,data & 0x0010);
+ coin_lockout_w(space->machine, 1,data & 0x0020);
+ coin_lockout_w(space->machine, 2,data & 0x0040);
+ coin_lockout_w(space->machine, 3,data & 0x0080);
+ }
+ else
+ {
+ coin_lockout_w(space->machine, 0,~data & 0x0010);
+ coin_lockout_w(space->machine, 1,~data & 0x0020);
+ coin_lockout_w(space->machine, 2,~data & 0x0040);
+ coin_lockout_w(space->machine, 3,~data & 0x0080);
+ }
- /*
- set_led_status(0,data & 0x01);
- set_led_status(1,data & 0x10);
- set_led_status(2,data & 0x20);
- */
+ /*
+ set_led_status(space->machine, 0,data & 0x01);
+ set_led_status(space->machine, 1,data & 0x10);
+ set_led_status(space->machine, 2,data & 0x20);
+ */
}
}
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index be25c53711e..4a907af8734 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -29,8 +29,8 @@ VIDEO_UPDATE( crimfght );
static WRITE8_HANDLER( crimfght_coin_w )
{
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
}
static WRITE8_HANDLER( crimfght_sh_irqtrigger_w )
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index bbdcfe296cf..e65179a6247 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -423,7 +423,7 @@ static ADDRESS_MAP_START( crystal_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x01200000, 0x0120000f) AM_READ(Input_r)
AM_RANGE(0x01280000, 0x01280003) AM_WRITE(Banksw_w)
- AM_RANGE(0x01400000, 0x0140ffff) AM_RAM AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x01400000, 0x0140ffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x01801400, 0x01801403) AM_READ(Timer0_r) AM_WRITE(Timer0_w)
AM_RANGE(0x01801408, 0x0180140b) AM_READ(Timer1_r) AM_WRITE(Timer1_w)
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index c3992aa4e44..398c9421898 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -404,7 +404,7 @@ static ADDRESS_MAP_START( m68k_program_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x03800e, 0x03800f) AM_READWRITE(laserdisc_r, laserdisc_w)
AM_RANGE(0x03c800, 0x03c9ff) AM_RAM_WRITE(palette_w) AM_BASE(&paletteram16)
AM_RANGE(0x03cc00, 0x03cc01) AM_WRITE(control_w)
- AM_RANGE(0x03e000, 0x03efff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x03e000, 0x03efff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x03f000, 0x03ffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 31700557df9..3f8d78cc1c5 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -379,7 +379,7 @@ static WRITE8_DEVICE_HANDLER( cd32_cia_0_porta_w )
sound_set_output_gain(devtag_get_device(device->machine, "cdda"), 0, ( data & 1 ) ? 0.0 : 1.0 );
/* bit 2 = Power Led on Amiga */
- set_led_status(0, (data & 2) ? 0 : 1);
+ set_led_status(device->machine, 0, (data & 2) ? 0 : 1);
handle_cd32_joystick_cia(data, cia_r(device, 2));
}
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 2f27996a2f1..a2565c3f3bf 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -171,7 +171,7 @@ static WRITE8_HANDLER( bg_bank_w )
state->bg2_bank = (data & 0xc) >> 2;
tilemap_mark_all_tiles_dirty(state->bg2_tilemap);
}
- coin_counter_w(0, data & 0x10);
+ coin_counter_w(space->machine, 0, data & 0x10);
}
static ADDRESS_MAP_START( cultures_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 686ef69c3eb..bdc89d7b047 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -75,11 +75,11 @@ static WRITE8_HANDLER( bg_bank_w )
static WRITE8_HANDLER( coins_w )
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
- set_led_status(0, data & 4);
- set_led_status(1, data & 8);
+ set_led_status(space->machine, 0, data & 4);
+ set_led_status(space->machine, 1, data & 8);
}
static WRITE8_HANDLER(snd_w)
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 2c4e8cafdc2..08fa3338b1d 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -230,10 +230,10 @@ static WRITE16_HANDLER( darius_ioc_w )
case 0x30: /* coin control */
/* bits 7,5,4,0 used on reset */
/* bit 4 used whenever bg is blanked ? */
- coin_lockout_w(0, ~data & 0x02);
- coin_lockout_w(1, ~data & 0x04);
- coin_counter_w(0, data & 0x08);
- coin_counter_w(1, data & 0x40);
+ coin_lockout_w(space->machine, 0, ~data & 0x02);
+ coin_lockout_w(space->machine, 1, ~data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x08);
+ coin_counter_w(space->machine, 1, data & 0x40);
coin_word = data &0xffff;
//popmessage(" address %04x value %04x",offset,data);
return;
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index ebc25c079c9..caa3dd86964 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -161,7 +161,7 @@ static READ16_HANDLER( dassault_control_r )
static WRITE16_HANDLER( dassault_control_w )
{
- coin_counter_w(0,data&1);
+ coin_counter_w(space->machine, 0,data&1);
if (data&0xfffe)
logerror("Coin cointrol %04x\n",data);
}
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 15fc1eaae1e..576896a662b 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -109,8 +109,8 @@ static WRITE16_HANDLER( dbzcontrol_w )
K053246_set_OBJCHA_line(CLEAR_LINE);
}
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
}
static WRITE16_HANDLER( dbz_sound_command_w )
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index bc6c156b51a..cdab2705d44 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1331,12 +1331,12 @@ static CUSTOM_INPUT( ddenlovr_special_r )
static WRITE16_HANDLER( ddenlovr_coincounter_0_w )
{
if (ACCESSING_BITS_0_7)
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
}
static WRITE16_HANDLER( ddenlovr_coincounter_1_w )
{
if (ACCESSING_BITS_0_7)
- coin_counter_w(1, data & 1);
+ coin_counter_w(space->machine, 1, data & 1);
}
@@ -1562,8 +1562,8 @@ static WRITE16_HANDLER( quiz365_coincounter_w )
{
if (ddenlovr_select2 == 0x1c)
{
- coin_counter_w(0, ~data & 1);
- coin_counter_w(1, ~data & 4);
+ coin_counter_w(space->machine, 0, ~data & 1);
+ coin_counter_w(space->machine, 1, ~data & 4);
}
}
}
@@ -1640,8 +1640,8 @@ static WRITE16_HANDLER( ddenlvrj_coincounter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x04);
// data & 0x80 ?
}
}
@@ -1817,8 +1817,8 @@ static WRITE16_HANDLER( nettoqc_coincounter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x04);
// data & 0x80 ?
}
}
@@ -2002,22 +2002,22 @@ static WRITE8_HANDLER( mmpanic_blitter2_w )
/* A led for each of the 9 buttons */
static UINT16 mmpanic_leds;
-static void mmpanic_update_leds(void)
+static void mmpanic_update_leds(running_machine *machine)
{
- set_led_status(0,mmpanic_leds);
+ set_led_status(machine, 0,mmpanic_leds);
}
/* leds 1-8 */
static WRITE8_HANDLER( mmpanic_leds_w )
{
mmpanic_leds = (mmpanic_leds & 0xff00) | data;
- mmpanic_update_leds();
+ mmpanic_update_leds(space->machine);
}
/* led 9 */
static WRITE8_HANDLER( mmpanic_leds2_w )
{
mmpanic_leds = (mmpanic_leds & 0xfeff) | (data ? 0x0100 : 0);
- mmpanic_update_leds();
+ mmpanic_update_leds(space->machine);
}
@@ -2025,9 +2025,9 @@ static WRITE8_HANDLER( mmpanic_lockout_w )
{
if (ddenlovr_select == 0x0c)
{
- coin_counter_w(0,(~data) & 0x01);
- coin_lockout_w(0,(~data) & 0x02);
- set_led_status(1,(~data) & 0x04);
+ coin_counter_w(space->machine, 0,(~data) & 0x01);
+ coin_lockout_w(space->machine, 0,(~data) & 0x02);
+ set_led_status(space->machine, 1,(~data) & 0x04);
}
}
@@ -2185,8 +2185,8 @@ static WRITE8_HANDLER( funkyfig_lockout_w )
{
case 0x2c:
funkyfig_lockout = data;
- coin_counter_w(0, data & 0x01);
- coin_lockout_w(0,(~data) & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_lockout_w(space->machine, 0,(~data) & 0x02);
if (data & ~0x03)
logerror("%06x: warning, unknown bits written, lockout = %02x\n", cpu_get_pc(space->cpu), data);
break;
@@ -2336,7 +2336,7 @@ static WRITE8_HANDLER( hanakanz_coincounter_w )
// bit 2 = 1 if bet on
// bit 3 = 1 if bet off
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
if (data & 0xf0)
logerror("%04x: warning, coin counter = %02x\n", cpu_get_pc(space->cpu), data);
@@ -2531,8 +2531,8 @@ static WRITE8_HANDLER( mjchuuka_coincounter_w )
// bit 3 = lockout
// bit 8?
- coin_counter_w(0, data & 0x01);
- coin_lockout_w(0,(~data) & 0x08);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_lockout_w(space->machine, 0,(~data) & 0x08);
if (data & 0x74)
logerror("%04x: warning, coin counter = %02x\n", cpu_get_pc(space->cpu), data);
@@ -2650,8 +2650,8 @@ static WRITE8_HANDLER( mjmyster_coincounter_w )
switch( ddenlovr_select2 )
{
case 0x0c:
- coin_counter_w(0, (~data) & 0x01); // coin in
- coin_counter_w(0, (~data) & 0x02); // coin out actually
+ coin_counter_w(space->machine, 0, (~data) & 0x01); // coin in
+ coin_counter_w(space->machine, 0, (~data) & 0x02); // coin out actually
#ifdef MAME_DEBUG
// popmessage("cc: %02x",data);
#endif
@@ -2775,7 +2775,7 @@ static WRITE8_HANDLER( hginga_coins_w )
// bit 2 = 1 if bet on
// bit 3 = 1 if bet on
// bit 7?
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
#ifdef MAME_DEBUG
// popmessage("COINS %02x",data);
#endif
@@ -2904,7 +2904,7 @@ static WRITE8_HANDLER( hgokou_input_w )
// bit 0 = coin counter
// bit 1 = out counter
// bit 2 = hopper
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
hgokou_hopper = data & 0x04;
#ifdef MAME_DEBUG
// popmessage("COINS %02x",data);
@@ -3015,7 +3015,7 @@ static WRITE8_HANDLER( hparadis_coin_w )
{
switch ( hginga_select )
{
- case 0x0c: coin_counter_w(0, data & 1); break;
+ case 0x0c: coin_counter_w(space->machine, 0, data & 1); break;
case 0x0d: break;
default:
logerror("%04x: coins_w with select = %02x, data = %02x\n",cpu_get_pc(space->cpu),hginga_select,data);
@@ -3245,7 +3245,7 @@ static WRITE8_HANDLER( mjflove_blitter_w )
static WRITE8_HANDLER( mjflove_coincounter_w )
{
// bit 0 = in counter
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x01);
if (data & 0xfe)
{
@@ -3358,7 +3358,7 @@ static WRITE8_HANDLER( sryudens_coincounter_w )
// bit 4
// bit 7 = ? mostly on
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
if (data & 0x68)
logerror("%04x: warning, coin counter = %02x\n", cpu_get_pc(space->cpu), data);
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 0c1a25664f3..7b44f9ecfd9 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -88,8 +88,8 @@ static WRITE8_HANDLER( ddrible_coin_counter_w )
/* b2-b3: unknown */
/* b1: coin counter 2 */
/* b0: coin counter 1 */
- coin_counter_w(0,(data) & 0x01);
- coin_counter_w(1,(data >> 1) & 0x01);
+ coin_counter_w(space->machine, 0,(data) & 0x01);
+ coin_counter_w(space->machine, 1,(data >> 1) & 0x01);
}
static READ8_DEVICE_HANDLER( ddrible_vlm5030_busy_r )
diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c
index 3cf973b06e0..4541e1ec827 100644
--- a/src/mame/drivers/deshoros.c
+++ b/src/mame/drivers/deshoros.c
@@ -81,7 +81,7 @@ static WRITE8_HANDLER( io_w )
{
case 0x00: /*Printer data*/ return;
case 0x02: update_led_array(data); return;
- case 0x05: coin_lockout_w(0,io_ram[offset] & 1);return;
+ case 0x05: coin_lockout_w(space->machine, 0,io_ram[offset] & 1);return;
case 0x06: /*Printer IRQ enable*/ return;
// case 0x0a: "buzzer" 0 write
// case 0x0b: "buzzer" 1 write
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 42af2d745a0..e15572c5ef9 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -159,8 +159,8 @@ static WRITE8_HANDLER( destroyr_misc_w )
state->wavemod = data & 0x10;
state->potmask[1] = data & 0x20;
- coin_lockout_w(0, !state->attract);
- coin_lockout_w(1, !state->attract);
+ coin_lockout_w(space->machine, 0, !state->attract);
+ coin_lockout_w(space->machine, 1, !state->attract);
}
@@ -185,10 +185,10 @@ static WRITE8_HANDLER( destroyr_output_w )
switch (offset)
{
case 0:
- set_led_status(0, data & 1);
+ set_led_status(space->machine, 0, data & 1);
break;
case 1:
- set_led_status(1, data & 1); /* no second LED present on cab */
+ set_led_status(space->machine, 1, data & 1); /* no second LED present on cab */
break;
case 2:
/* bit 0 => songate */
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 982a85f6acc..94e37216ffe 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -172,8 +172,8 @@ static WRITE32_HANDLER( vbuffer_w )
static WRITE32_HANDLER( coin_w )
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
}
static READ32_HANDLER( vblank_r )
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index e0cb79c26ca..4a939f816c3 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -241,8 +241,8 @@ GetLives( running_machine *machine )
static WRITE8_HANDLER( coinplus_w )
{
int dsw = input_port_read(space->machine, "DSW1");
- coin_counter_w( 0, data&1 );
- coin_counter_w( 1, data&2 );
+ coin_counter_w( space->machine, 0, data&1 );
+ coin_counter_w( space->machine, 1, data&2 );
if( data&1 )
{ /* TODO: coinage adjustments */
logerror( "COIN A+\n" );
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 6338f8243f6..1f64a6e923c 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -396,9 +396,9 @@ static WRITE32_HANDLER( light_ctrl_2_w )
{
output_set_value("left-ssr", !!(data & 0x08000000)); // SSR
output_set_value("right-ssr", !!(data & 0x08000000)); // SSR
- set_led_status(0, data & 0x00010000); // 1P START
- set_led_status(1, data & 0x00020000); // 2P START
- set_led_status(2, data & 0x00040000); // EFFECT
+ set_led_status(space->machine, 0, data & 0x00010000); // 1P START
+ set_led_status(space->machine, 1, data & 0x00020000); // 2P START
+ set_led_status(space->machine, 2, data & 0x00040000); // EFFECT
}
}
@@ -1461,9 +1461,9 @@ static MACHINE_RESET( djmain )
devtag_reset(machine, "ide");
/* reset LEDs */
- set_led_status(0, 1);
- set_led_status(1, 1);
- set_led_status(2, 1);
+ set_led_status(machine, 0, 1);
+ set_led_status(machine, 1, 1);
+ set_led_status(machine, 2, 1);
}
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index b2f5c724747..eb21a24b314 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -540,7 +540,7 @@ static WRITE8_DEVICE_HANDLER( p8257_ctl_w )
static WRITE8_HANDLER( dkong3_coin_counter_w )
{
- coin_counter_w(offset, data & 0x01);
+ coin_counter_w(space->machine, offset, data & 0x01);
}
static WRITE8_DEVICE_HANDLER( p8257_drq_w )
@@ -558,7 +558,7 @@ static READ8_HANDLER( dkong_in2_r )
UINT8 r;
r = (input_port_read(space->machine, "IN2") & 0xBF) | (mcustatus << 6);
- coin_counter_w(offset, r >> 7);
+ coin_counter_w(space->machine, offset, r >> 7);
if (r & 0x10)
r = (r & ~0x10) | 0x80; /* service ==> coin */
return r;
@@ -571,7 +571,7 @@ static READ8_HANDLER( dkongjr_in2_r )
UINT8 r;
r = (input_port_read(space->machine, "IN2") & 0xBF) | 0x40;
- coin_counter_w(offset, r >> 7);
+ coin_counter_w(space->machine, offset, r >> 7);
if (r & 0x10)
r = (r & ~0x10) | 0x80; /* service ==> coin */
return r;
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 6c0c0336344..2ef74745673 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -238,7 +238,7 @@ static WRITE8_HANDLER( misc_w )
UINT8 diff = data ^ last_misc;
last_misc = data;
- coin_counter_w(0, (~data >> 4) & 1);
+ coin_counter_w(space->machine, 0, (~data >> 4) & 1);
/* on bit 5 going low, push the data out to the laserdisc player */
if ((diff & 0x20) && !(data & 0x20))
@@ -264,8 +264,8 @@ static WRITE8_HANDLER( dleuro_misc_w )
UINT8 diff = data ^ last_misc;
last_misc = data;
- coin_counter_w(1, (~data >> 3) & 1);
- coin_counter_w(0, (~data >> 4) & 1);
+ coin_counter_w(space->machine, 1, (~data >> 3) & 1);
+ coin_counter_w(space->machine, 0, (~data >> 4) & 1);
/* on bit 5 going low, push the data out to the laserdisc player */
if ((diff & 0x20) && !(data & 0x20))
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 1de63db660c..72940d024f5 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -68,8 +68,8 @@ static void dragrace_update_misc_flags( running_machine *machine )
* 0x091f = set Player 2 Start Lamp 0x80000000
* 0x0938 = clear 0x0918 - 0x091f
*/
- set_led_status(0, state->misc_flags & 0x00008000);
- set_led_status(1, state->misc_flags & 0x80000000);
+ set_led_status(machine, 0, state->misc_flags & 0x00008000);
+ set_led_status(machine, 1, state->misc_flags & 0x80000000);
discrete_sound_w(state->discrete, DRAGRACE_MOTOR1_DATA, ~state->misc_flags & 0x0000001f); // Speed1 data*
discrete_sound_w(state->discrete, DRAGRACE_EXPLODE1_EN, (state->misc_flags & 0x00000020) ? 1: 0); // Explosion1 enable
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 177fe67a858..2957f7261c6 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -43,9 +43,9 @@ Notes:
static WRITE16_HANDLER( drgnmst_coin_w )
{
- coin_counter_w(0, data & 0x100);
- coin_lockout_w(0, ~data & 0x400);
- coin_lockout_w(1, ~data & 0x800);
+ coin_counter_w(space->machine, 0, data & 0x100);
+ coin_lockout_w(space->machine, 0, ~data & 0x400);
+ coin_lockout_w(space->machine, 1, ~data & 0x800);
}
static WRITE16_HANDLER( drgnmst_snd_command_w )
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index ac171ea7292..88bb43771ff 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -465,7 +465,7 @@ static WRITE8_HANDLER( dunhuang_rombank_w )
memory_set_bank(space->machine, 1, ((data >> 2) & 0x7));
// COIN OUT: data & 0x20
- coin_counter_w(0, data & 0x40);
+ coin_counter_w(space->machine, 0, data & 0x40);
state->hopper = data & 0x80;
}
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index f0515f3eee8..16ad8de21bb 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -90,7 +90,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_w )
static ADDRESS_MAP_START( dynadice_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(dynadice_videoram_w) AM_BASE_MEMBER(dynadice_state, videoram)
- AM_RANGE(0x4000, 0x40ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x40ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( dynadice_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 5e23a0a33fc..85d1b515afb 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -222,11 +222,11 @@ static void jantouki_sound_callback(const device_config *device, int state)
static WRITE8_HANDLER( dynax_coincounter_0_w )
{
- coin_counter_w(0, data);
+ coin_counter_w(space->machine, 0, data);
}
static WRITE8_HANDLER( dynax_coincounter_1_w )
{
- coin_counter_w(1, data);
+ coin_counter_w(space->machine, 1, data);
}
static READ8_HANDLER( ret_ff ) { return 0xff; }
@@ -457,34 +457,34 @@ static WRITE8_HANDLER( yarunara_layer_half2_w )
static ADDRESS_MAP_START( sprtmtch_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1)
ADDRESS_MAP_END
static ADDRESS_MAP_START( hnoridur_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK(1), hnoridur_palette_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mcnpshnt_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK(1), hnoridur_palette_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( nanajign_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0x80ff ) AM_WRITE(nanajign_palette_w )
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjdialq2_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0800, 0x0fff ) AM_RAM
- AM_RANGE( 0x1000, 0x1fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x1000, 0x1fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x0000, 0x7fff ) AM_ROM
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1)
ADDRESS_MAP_END
@@ -492,7 +492,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( yarunara_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1)
AM_RANGE( 0x8000, 0x81ff ) AM_WRITE(yarunara_palette_w ) // Palette or RTC
ADDRESS_MAP_END
@@ -500,7 +500,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( jantouki_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1)
ADDRESS_MAP_END
@@ -599,7 +599,7 @@ static WRITE8_HANDLER( hjingi_bank_w )
static WRITE8_HANDLER( hjingi_lockout_w )
{
- coin_lockout_w(0, (~data) & 0x01);
+ coin_lockout_w(space->machine, 0, (~data) & 0x01);
}
static UINT8 hjingi_hopper;
@@ -624,7 +624,7 @@ static READ8_HANDLER( hjingi_keyboard_1_r )
static ADDRESS_MAP_START( hjingi_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x01ff ) AM_ROM
- AM_RANGE( 0x0200, 0x1fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x0200, 0x1fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x2000, 0x7fff ) AM_ROM
AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK(1), hnoridur_palette_w)
ADDRESS_MAP_END
@@ -969,7 +969,7 @@ static WRITE8_HANDLER( jantouki_rombank_w )
{
UINT8 *ROM = memory_region(space->machine, "maincpu");
memory_set_bankptr(space->machine, 1,&ROM[0x8000 + 0x8000*(data&0x0f)]);
- set_led_status(0,data & 0x10); // maybe
+ set_led_status(space->machine, 0,data & 0x10); // maybe
}
static ADDRESS_MAP_START( jantouki_io_map, ADDRESS_SPACE_IO, 8 )
@@ -1139,7 +1139,7 @@ static WRITE8_HANDLER( htengoku_coin_w )
// bit 0 = coin counter
// bit 1 = out counter
// bit 2 = hopper
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
htengoku_hopper = data & 0x04;
#ifdef MAME_DEBUG
// popmessage("COINS %02x",data);
@@ -1268,8 +1268,8 @@ static WRITE8_HANDLER( tenkai_ip_w )
switch( tenkai_ipsel )
{
case 0x0c:
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
// bit 2?
// bit 3?
// popmessage("%02x",data);
@@ -1485,7 +1485,7 @@ static WRITE8_HANDLER( tenkai_blit_romregion_w )
static ADDRESS_MAP_START( tenkai_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_READWRITE( tenkai_8000_r, tenkai_8000_w )
AM_RANGE( 0x10000, 0x10000 ) AM_DEVREAD ( "aysnd", ay8910_r ) // AY8910
AM_RANGE( 0x10008, 0x10008 ) AM_DEVWRITE( "aysnd", ay8910_data_w ) //
@@ -1652,7 +1652,7 @@ static WRITE8_HANDLER( gekisha_8000_w )
static ADDRESS_MAP_START( gekisha_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_READWRITE( gekisha_8000_r, gekisha_8000_w )
ADDRESS_MAP_END
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 3385283a4ed..9b09f0f6b2d 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -99,8 +99,8 @@ static READ32_HANDLER( eolith_custom_r )
static WRITE32_HANDLER( systemcontrol_w )
{
eolith_buffer = (data & 0x80) >> 7;
- coin_counter_w(0, data & coin_counter_bit);
- set_led_status(0, data & 1);
+ coin_counter_w(space->machine, 0, data & coin_counter_bit);
+ set_led_status(space->machine, 0, data & 1);
input_port_write(space->machine, "EEPROMOUT", data, 0xff);
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index f83c3f07b5d..36f5adac3b2 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -34,7 +34,7 @@ static const eeprom_interface eeprom_interface_93C66 =
static WRITE16_HANDLER( eeprom_w )
{
vbuffer = (data & 0x80) >> 7;
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
input_port_write(space->machine, "EEPROMOUT", data, 0xff);
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 71729188b35..f818340cec4 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -693,7 +693,7 @@ static WRITE16_HANDLER( mcu_halt_clear_w )
static ADDRESS_MAP_START( equites_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM area is written several times (dev system?)
- AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // nvram is for gekisou only
+ AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // nvram is for gekisou only
AM_RANGE(0x080000, 0x080fff) AM_READWRITE(equites_fg_videoram_r, equites_fg_videoram_w) // 8-bit
AM_RANGE(0x0c0000, 0x0c01ff) AM_RAM_WRITE(equites_bg_videoram_w) AM_BASE_MEMBER(equites_state, bg_videoram)
AM_RANGE(0x0c0200, 0x0c0fff) AM_RAM
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 1ef597c07c5..4c774669fee 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -142,7 +142,7 @@ static WRITE8_HANDLER(nmi_line_w)
/* PROGRAM MAPS */
static ADDRESS_MAP_START( z80_0_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000,0x3fff) AM_ROM
- AM_RANGE(0xe000,0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000,0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf000,0xf3ff) AM_RAM AM_BASE(&tile_ram)
AM_RANGE(0xf400,0xf7ff) AM_RAM AM_BASE(&tile_control_ram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index c563ccf65fb..7758b616055 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -63,7 +63,7 @@ static WRITE8_HANDLER( ettrivia_control_w )
question_bank = (data >> 3) & 3;
- coin_counter_w(0, data & 0x80);
+ coin_counter_w(space->machine, 0, data & 0x80);
flip_screen_set(space->machine, data & 1);
}
@@ -118,7 +118,7 @@ static WRITE8_HANDLER( b800_w )
static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x9000, 0x9000) AM_WRITE(ettrivia_control_w)
AM_RANGE(0x9800, 0x9800) AM_WRITENOP
AM_RANGE(0xa000, 0xa000) AM_WRITENOP
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 747fb29cc49..04a9380e9b1 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -388,7 +388,7 @@ static WRITE8_HANDLER( exidy440_input_port_3_w )
static WRITE8_HANDLER( exidy440_coin_counter_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
}
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 061f964361f..b89803f1e29 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -201,8 +201,8 @@ static WRITE16_HANDLER( exterm_output_port_0_w )
cputag_set_input_line(space->machine, "slave", INPUT_LINE_RESET, PULSE_LINE);
/* Bits 14-15 = Coin counters */
- coin_counter_w(0, data & 0x8000);
- coin_counter_w(1, data & 0x4000);
+ coin_counter_w(space->machine, 0, data & 0x8000);
+ coin_counter_w(space->machine, 1, data & 0x4000);
}
COMBINE_DATA(&last);
@@ -321,7 +321,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x01580000, 0x015bffff) AM_MIRROR(0xfc000000) AM_WRITE(sound_latch_w)
AM_RANGE(0x015c0000, 0x015fffff) AM_MIRROR(0xfc000000) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x01800000, 0x01807fff) AM_MIRROR(0xfc7f8000) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
- AM_RANGE(0x02800000, 0x02807fff) AM_MIRROR(0xfc7f8000) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x02800000, 0x02807fff) AM_MIRROR(0xfc7f8000) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x03000000, 0x03ffffff) AM_MIRROR(0xfc000000) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 3aeb054241e..7986a3d7753 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -109,10 +109,10 @@ static WRITE8_HANDLER( exzisus_cpub_bankswitch_w )
static WRITE8_HANDLER( exzisus_coincounter_w )
{
- coin_lockout_w(0,~data & 0x01);
- coin_lockout_w(1,~data & 0x02);
- coin_counter_w(0,data & 0x04);
- coin_counter_w(1,data & 0x08);
+ coin_lockout_w(space->machine, 0,~data & 0x01);
+ coin_lockout_w(space->machine, 1,~data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x04);
+ coin_counter_w(space->machine, 1,data & 0x08);
}
static READ8_HANDLER( exzisus_sharedram_ab_r )
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index 0180580af25..c297f23d6f0 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -53,8 +53,8 @@ static WRITE8_HANDLER( fastlane_bankswitch_w )
UINT8 *RAM = memory_region(space->machine, "maincpu");
/* bits 0 & 1 coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bits 2 & 3 = bank number */
bankaddress = 0x10000 + ((data & 0x0c) >> 2) * 0x4000;
diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c
index c95f4a987e5..7b99e43d558 100644
--- a/src/mame/drivers/feversoc.c
+++ b/src/mame/drivers/feversoc.c
@@ -129,18 +129,18 @@ static WRITE32_HANDLER( output_w )
if(ACCESSING_BITS_16_31)
{
/* probably eeprom stuff too */
- coin_lockout_w(0,~data>>16 & 0x40);
- coin_lockout_w(1,~data>>16 & 0x40);
- coin_counter_w(0,data>>16 & 1);
+ coin_lockout_w(space->machine, 0,~data>>16 & 0x40);
+ coin_lockout_w(space->machine, 1,~data>>16 & 0x40);
+ coin_counter_w(space->machine, 0,data>>16 & 1);
//data>>16 & 2 coin out
- coin_counter_w(1,data>>16 & 4);
+ coin_counter_w(space->machine, 1,data>>16 & 4);
//data>>16 & 8 coin hopper
okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), 0x40000 * (((data>>16) & 0x20)>>5));
}
if(ACCESSING_BITS_0_15)
{
/* -xxx xxxx lamps*/
- coin_counter_w(2,data & 0x2000); //key in
+ coin_counter_w(space->machine, 2,data & 0x2000); //key in
//data & 0x4000 key out
}
}
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 1cee083f61e..b0e6304c35e 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -49,8 +49,8 @@ static INTERRUPT_GEN( finalizr_interrupt )
static WRITE8_HANDLER( finalizr_coin_w )
{
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
static WRITE8_HANDLER( finalizr_flipscreen_w )
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index a43b72f52cf..f4d0222dae8 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -411,12 +411,12 @@ static WRITE8_HANDLER( self_reset_w )
static WRITE8_HANDLER( led_w )
{
- set_led_status( offset, ( data & 0x80 ) == 0 );
+ set_led_status( space->machine, offset, ( data & 0x80 ) == 0 );
}
static WRITE8_HANDLER( firefox_coin_counter_w )
{
- coin_counter_w( offset, data & 0x80 );
+ coin_counter_w( space->machine, offset, data & 0x80 );
}
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index dcc04c7d83f..38cc86f5485 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -83,24 +83,24 @@ static WRITE8_HANDLER( firetrk_output_w )
const device_config *discrete = devtag_get_device(space->machine, "discrete");
/* BIT0 => START1 LAMP */
- set_led_status(0, !(data & 0x01));
+ set_led_status(space->machine, 0, !(data & 0x01));
/* BIT1 => START2 LAMP */
- set_led_status(1, !(data & 0x02));
+ set_led_status(space->machine, 1, !(data & 0x02));
/* BIT2 => FLASH */
firetrk_flash = data & 0x04;
/* BIT3 => TRACK LAMP */
- set_led_status(3, !(data & 0x08));
+ set_led_status(space->machine, 3, !(data & 0x08));
/* BIT4 => ATTRACT */
discrete_sound_w(discrete, FIRETRUCK_ATTRACT_EN, data & 0x10);
- coin_lockout_w(0, !(data & 0x10));
- coin_lockout_w(1, !(data & 0x10));
+ coin_lockout_w(space->machine, 0, !(data & 0x10));
+ coin_lockout_w(space->machine, 1, !(data & 0x10));
/* BIT5 => START3 LAMP */
- set_led_status(2, !(data & 0x20));
+ set_led_status(space->machine, 2, !(data & 0x20));
/* BIT6 => UNUSED */
@@ -114,18 +114,18 @@ static WRITE8_HANDLER( superbug_output_w )
const device_config *discrete = devtag_get_device(space->machine, "discrete");
/* BIT0 => START LAMP */
- set_led_status(0, offset & 0x01);
+ set_led_status(space->machine, 0, offset & 0x01);
/* BIT1 => ATTRACT */
discrete_sound_w(discrete, SUPERBUG_ATTRACT_EN, offset & 0x02);
- coin_lockout_w(0, !(offset & 0x02));
- coin_lockout_w(1, !(offset & 0x02));
+ coin_lockout_w(space->machine, 0, !(offset & 0x02));
+ coin_lockout_w(space->machine, 1, !(offset & 0x02));
/* BIT2 => FLASH */
firetrk_flash = offset & 0x04;
/* BIT3 => TRACK LAMP */
- set_led_status(1, offset & 0x08);
+ set_led_status(space->machine, 1, offset & 0x08);
}
@@ -134,10 +134,10 @@ static WRITE8_HANDLER( montecar_output_1_w )
const device_config *discrete = devtag_get_device(space->machine, "discrete");
/* BIT0 => START LAMP */
- set_led_status(0, !(data & 0x01));
+ set_led_status(space->machine, 0, !(data & 0x01));
/* BIT1 => TRACK LAMP */
- set_led_status(1, !(data & 0x02));
+ set_led_status(space->machine, 1, !(data & 0x02));
/* BIT2 => ATTRACT */
discrete_sound_w(discrete, MONTECAR_ATTRACT_INV, data & 0x04);
@@ -146,13 +146,13 @@ static WRITE8_HANDLER( montecar_output_1_w )
/* BIT4 => UNUSED */
/* BIT5 => COIN3 COUNTER */
- coin_counter_w(0, data & 0x80);
+ coin_counter_w(space->machine, 0, data & 0x80);
/* BIT6 => COIN2 COUNTER */
- coin_counter_w(1, data & 0x40);
+ coin_counter_w(space->machine, 1, data & 0x40);
/* BIT7 => COIN1 COUNTER */
- coin_counter_w(2, data & 0x20);
+ coin_counter_w(space->machine, 2, data & 0x20);
}
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 2df0b88c163..2f976714166 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -47,8 +47,8 @@ static WRITE8_HANDLER( flkatck_bankswitch_w )
int bankaddress = 0;
/* bits 3-4: coin counters */
- coin_counter_w(0,data & 0x08);
- coin_counter_w(1,data & 0x10);
+ coin_counter_w(space->machine, 0,data & 0x08);
+ coin_counter_w(space->machine, 1,data & 0x10);
/* bits 0-1: bank # */
bankaddress += 0x10000 + (data & 0x03)*0x2000;
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index 71704f0273c..60c70e88a02 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -133,7 +133,7 @@ static WRITE8_HANDLER( flyball_misc_w )
switch (offset)
{
case 0:
- set_led_status(0, bit);
+ set_led_status(space->machine, 0, bit);
break;
case 1:
/* crowd very loud */
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index 5fb57d2ee97..231c78b495f 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -102,7 +102,7 @@ static UINT8 whichport = 0;
static READ16_HANDLER( nvram_r )
{
- return generic_nvram16[offset] | 0xfff0;
+ return space->machine->generic.nvram.ptr.u16[offset] | 0xfff0;
}
@@ -180,8 +180,8 @@ static WRITE16_HANDLER( digital_w )
output_set_led_value(0, (data >> 4) & 1);
output_set_led_value(1, (data >> 5) & 1);
- coin_counter_w(0, (data >> 6) & 1);
- coin_counter_w(1, (data >> 7) & 1);
+ coin_counter_w(space->machine, 0, (data >> 6) & 1);
+ coin_counter_w(space->machine, 1, (data >> 7) & 1);
}
}
@@ -220,7 +220,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x018000, 0x018fff) AM_MIRROR(0x3e3000) AM_RAM
AM_RANGE(0x01c000, 0x01c0ff) AM_MIRROR(0x3e3f00) AM_RAM AM_BASE(&spriteram16)
AM_RANGE(0x800000, 0x8007ff) AM_MIRROR(0x03f800) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE(&atarigen_playfield)
- AM_RANGE(0x900000, 0x9001ff) AM_MIRROR(0x03fe00) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x900000, 0x9001ff) AM_MIRROR(0x03fe00) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x940000, 0x940007) AM_MIRROR(0x023ff8) AM_READ(analog_r)
AM_RANGE(0x944000, 0x944007) AM_MIRROR(0x023ff8) AM_WRITE(analog_w)
AM_RANGE(0x948000, 0x948001) AM_MIRROR(0x023ffe) AM_READ_PORT("SYSTEM") AM_WRITE(digital_w)
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index a897e665762..f2b4176727e 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -76,7 +76,7 @@ static WRITE8_HANDLER( flipscreen_w )
static WRITE8_HANDLER( coin_w )
{
- coin_counter_w(offset,~data & 1);
+ coin_counter_w(space->machine, offset,~data & 1);
}
static WRITE8_HANDLER( spinner_select_w )
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index f1bab1ac193..14711d64553 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -95,7 +95,7 @@ static READ8_HANDLER( funkybee_input_port_0_r )
static WRITE8_HANDLER( funkybee_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
static ADDRESS_MAP_START( funkybee_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index be99e62eb9a..a4c01eca358 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -1074,12 +1074,12 @@ VIDEO_UPDATE( funworld );
static WRITE8_DEVICE_HANDLER(funworld_lamp_a_w)
{
- coin_counter_w(0, data & 0x01); /* credit in counter */
+ coin_counter_w(device->machine, 0, data & 0x01); /* credit in counter */
output_set_lamp_value(0, 1-((data >> 1) & 1)); /* button hold1 and */
output_set_lamp_value(2, 1-((data >> 1) & 1)); /* hold3 (see pinouts) */
- coin_counter_w(7, data & 0x04); /* credit out counter, mapped as coin 8 */
+ coin_counter_w(device->machine, 7, data & 0x04); /* credit out counter, mapped as coin 8 */
output_set_lamp_value(1, 1-((data >> 3) & 1)); /* button hold2/low */
output_set_lamp_value(5, 1-((data >> 5) & 1)); /* button 6 (collect/cancel) */
@@ -1106,7 +1106,7 @@ static WRITE8_DEVICE_HANDLER(pia1_ca2_w)
*************************/
static ADDRESS_MAP_START( funworld_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD("ay8910", ay8910_r)
@@ -1121,7 +1121,7 @@ static ADDRESS_MAP_START( funworld_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( magicrd2_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD("ay8910", ay8910_r)
@@ -1137,7 +1137,7 @@ static ADDRESS_MAP_START( magicrd2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( cuoreuno_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD("ay8910", ay8910_r)
@@ -1152,7 +1152,7 @@ static ADDRESS_MAP_START( cuoreuno_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( royalmcu_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x2a00, 0x2a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
AM_RANGE(0x2c00, 0x2c00) AM_DEVREAD("ay8910", ay8910_r)
@@ -1165,7 +1165,7 @@ static ADDRESS_MAP_START( royalmcu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( saloon_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("IN0")
AM_RANGE(0x0a01, 0x0a01) AM_READ_PORT("IN1")
AM_RANGE(0x081c, 0x081c) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -2283,14 +2283,14 @@ This code should be inserted into a PC-DOS program, that program is nowhere to b
static NVRAM_HANDLER( jolyc980 )
{
if (read_or_write)
- mame_fwrite(file, generic_nvram, generic_nvram_size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else if (file)
- mame_fread(file, generic_nvram, generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
else
{
int i;
- for(i=0;i<generic_nvram_size;i++)
- generic_nvram[i] = jolyc980_default_eeprom[i];
+ for(i=0;i<machine->generic.nvram.size;i++)
+ machine->generic.nvram.ptr.u8[i] = jolyc980_default_eeprom[i];
}
}
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 402f6529770..52240b11a53 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -128,11 +128,11 @@ static WRITE16_HANDLER( bigkarnk_coin_w )
{
case 0x00: /* Coin Lockouts */
case 0x01:
- coin_lockout_w( (offset >> 3) & 0x01, ~data & 0x01);
+ coin_lockout_w( space->machine, (offset >> 3) & 0x01, ~data & 0x01);
break;
case 0x02: /* Coin Counters */
case 0x03:
- coin_counter_w( (offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w( space->machine, (offset >> 3) & 0x01, data & 0x01);
break;
}
}
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 7dc36c67384..136e4c7c7c0 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -712,7 +712,7 @@ static WRITE16_HANDLER( led_0_w )
/* this has $00 written during an IRQ 6, then reset to $ff afterwards */
/* LED??? */
if (ACCESSING_BITS_0_7)
- set_led_status(0, data != 0);
+ set_led_status(space->machine, 0, data != 0);
}
@@ -720,7 +720,7 @@ static WRITE16_HANDLER( led_1_w )
{
/* LED??? -- only written $00 or $ff */
if (ACCESSING_BITS_0_7)
- set_led_status(1, data != 0);
+ set_led_status(space->machine, 1, data != 0);
}
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 2c454204882..7109bdcc92d 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -786,15 +786,15 @@ static CUSTOM_INPUT( shifted_port_r ) { return input_port_read(field->port->mach
static WRITE8_DEVICE_HANDLER( out_0 )
{
- set_led_status(1,data & 1);
- set_led_status(0,data & 2);
- coin_counter_w(1,~data & 4);
- coin_counter_w(0,~data & 8);
+ set_led_status(device->machine, 1,data & 1);
+ set_led_status(device->machine, 0,data & 2);
+ coin_counter_w(device->machine, 1,~data & 4);
+ coin_counter_w(device->machine, 0,~data & 8);
}
static WRITE8_DEVICE_HANDLER( out_1 )
{
- coin_lockout_global_w(data & 1);
+ coin_lockout_global_w(device->machine, data & 1);
}
static const namco_51xx_interface namco_51xx_intf =
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index a1d99dd435b..a7a50d621aa 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -144,10 +144,10 @@ popmessage(t);
{
if (ACCESSING_BITS_24_31)
{
- coin_lockout_w(0, ~data & 0x01000000);
- coin_lockout_w(1, ~data & 0x02000000);
- coin_counter_w(0, data & 0x04000000);
- coin_counter_w(1, data & 0x04000000);
+ coin_lockout_w(space->machine, 0, ~data & 0x01000000);
+ coin_lockout_w(space->machine, 1, ~data & 0x02000000);
+ coin_counter_w(space->machine, 0, data & 0x04000000);
+ coin_counter_w(space->machine, 1, data & 0x04000000);
coin_word = (data >> 16) &0xffff;
}
//logerror("CPU #0 PC %06x: write input %06x\n",cpu_get_pc(space->cpu),offset);
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index cc3d1742b97..e9927979347 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -207,7 +207,7 @@ static WRITE16_HANDLER( galaxi_500004_w )
{
ticket = data & 0x0100;
hopper = data & 0x1000;
- coin_counter_w(0, data & 0x2000); // coins
+ coin_counter_w(space->machine, 0, data & 0x2000); // coins
}
COMBINE_DATA( &out[2] );
@@ -244,7 +244,7 @@ static ADDRESS_MAP_START( galaxi_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x700000, 0x700001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff )
- AM_RANGE( 0x600000, 0x607fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size ) // 2x DS1230Y (non volatile SRAM)
+ AM_RANGE( 0x600000, 0x607fff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram ) // 2x DS1230Y (non volatile SRAM)
ADDRESS_MAP_END
/***************************************************************************
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index e00782dade5..36808e4ad08 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -316,26 +316,26 @@ static WRITE8_HANDLER( start_lamp_w )
{
/* offset 0 = 1P START LAMP */
/* offset 1 = 2P START LAMP */
- set_led_status(offset, data & 1);
+ set_led_status(space->machine, offset, data & 1);
}
static WRITE8_HANDLER( coin_lock_w )
{
/* many variants and bootlegs don't have this */
- coin_lockout_global_w(~data & 1);
+ coin_lockout_global_w(space->machine, ~data & 1);
}
static WRITE8_HANDLER( coin_count_0_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
}
static WRITE8_HANDLER( coin_count_1_w )
{
- coin_counter_w(1, data & 1);
+ coin_counter_w(space->machine, 1, data & 1);
}
@@ -505,7 +505,7 @@ static WRITE8_HANDLER( theend_ppi8255_w )
static WRITE8_DEVICE_HANDLER( theend_coin_counter_w )
{
- coin_counter_w(0, data & 0x80);
+ coin_counter_w(device->machine, 0, data & 0x80);
}
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index a033ec2d03c..72c1a101861 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -264,10 +264,10 @@ static WRITE8_HANDLER( galpani2_mcu_nmi2_w ) //driven by CPU2's int5 ISR
static WRITE8_HANDLER( galpani2_coin_lockout_w )
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
- coin_lockout_w(0,~data & 0x04);
- coin_lockout_w(1,~data & 0x08);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x04);
+ coin_lockout_w(space->machine, 1,~data & 0x08);
// & 0x10 CARD in lockout?
// & 0x20 CARD in lockout?
// & 0x40 CARD out
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index bfdfa97406f..6d40d85a2f7 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -199,11 +199,11 @@ static WRITE16_HANDLER( galpanic_coin_w )
{
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(0, data & 0x100);
- coin_counter_w(1, data & 0x200);
+ coin_counter_w(space->machine, 0, data & 0x100);
+ coin_counter_w(space->machine, 1, data & 0x200);
- coin_lockout_w(0, ~data & 0x400);
- coin_lockout_w(1, ~data & 0x800);
+ coin_lockout_w(space->machine, 0, ~data & 0x400);
+ coin_lockout_w(space->machine, 1, ~data & 0x800);
}
}
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 7db50b74db4..84a89a22bce 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -116,7 +116,7 @@ static READ8_DEVICE_HANDLER( io_port_r )
static WRITE8_DEVICE_HANDLER( coin_w )
{
- coin_counter_w(0, ~data & 1);
+ coin_counter_w(device->machine, 0, ~data & 1);
}
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 272e922a844..0c889d7d3f6 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -173,14 +173,14 @@ static READ8_HANDLER( dipB_l ) { return input_port_read(space->machine, "DSW1");
static READ8_HANDLER( dipB_h ) { return input_port_read(space->machine, "DSW1") >> 4; } // dips B
static WRITE8_HANDLER( out_lamps0 )
{
- set_led_status(0,data & 1);
- set_led_status(1,data & 2);
- coin_lockout_global_w(data & 4);
- coin_counter_w(0,~data & 8);
+ set_led_status(space->machine, 0,data & 1);
+ set_led_status(space->machine, 1,data & 2);
+ coin_lockout_global_w(space->machine, data & 4);
+ coin_counter_w(space->machine, 0,~data & 8);
}
static WRITE8_HANDLER( out_lamps1 )
{
- coin_counter_w(1,~data & 1);
+ coin_counter_w(space->machine, 1,~data & 1);
}
/* chip #0: player inputs, buttons, coins */
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index 99d8ab95ffd..81ca1409d8c 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -345,7 +345,7 @@ static const ppi8255_interface ppi8255_intf =
static ADDRESS_MAP_START( gat_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(gat_videoram_w) AM_BASE(&videoram)
- AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */
+ AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("snsnd", sn76496_w) /* PSG */
AM_RANGE(0xe000, 0xe000) AM_WRITE(output_port_0_w) /* lamps */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index 769342456b2..0964654fdd2 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -111,8 +111,8 @@ static INTERRUPT_GEN( gberet_interrupt )
static WRITE8_HANDLER( gberet_coin_counter_w )
{
/* bits 0/1 = coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
}
static WRITE8_HANDLER( gberet_flipscreen_w )
@@ -128,8 +128,8 @@ static WRITE8_HANDLER( mrgoemon_coin_counter_w )
int offs;
/* bits 0/1 = coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* bits 5-7 = ROM bank select */
offs = 0x10000 + ((data & 0xe0) >> 5) * 0x800;
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index 727843b3a78..da0349bad92 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -71,8 +71,8 @@ static WRITE8_HANDLER( gbusters_coin_counter_w )
palette_selected = ~data & 0x01;
/* bits 1 & 2 = coin counters */
- coin_counter_w(0,data & 0x02);
- coin_counter_w(1,data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x02);
+ coin_counter_w(space->machine, 1,data & 0x04);
/* bits 3 selects tilemap priority */
gbusters_priority = data & 0x08;
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index eb98ca24c59..3e344852507 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -112,8 +112,8 @@ static WRITE16_HANDLER( ioc_w )
// return;
//
// case 0x88/2: /* coin control (+ others) ??? */
-// coin_lockout_w(0, ~data & 0x01);
-// coin_lockout_w(1, ~data & 0x02);
+// coin_lockout_w(space->machine, 0, ~data & 0x01);
+// coin_lockout_w(space->machine, 1, ~data & 0x02);
//popmessage(" address %04x value %04x",offset,data);
// }
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index 52d299ecfa5..64d98167096 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -118,17 +118,17 @@ static PALETTE_INIT(gei)
static WRITE8_DEVICE_HANDLER( lamps_w )
{
/* 5 button lamps */
- set_led_status(0,data & 0x01);
- set_led_status(1,data & 0x02);
- set_led_status(2,data & 0x04);
- set_led_status(3,data & 0x08);
- set_led_status(4,data & 0x10);
+ set_led_status(device->machine, 0,data & 0x01);
+ set_led_status(device->machine, 1,data & 0x02);
+ set_led_status(device->machine, 2,data & 0x04);
+ set_led_status(device->machine, 3,data & 0x08);
+ set_led_status(device->machine, 4,data & 0x10);
/* 3 button lamps for deal, cancel, stand in poker games;
lamp order verified in poker and selection self tests */
- set_led_status(7,data & 0x20);
- set_led_status(5,data & 0x40);
- set_led_status(6,data & 0x80);
+ set_led_status(device->machine, 7,data & 0x20);
+ set_led_status(device->machine, 5,data & 0x40);
+ set_led_status(device->machine, 6,data & 0x80);
}
static WRITE8_DEVICE_HANDLER( sound_w )
@@ -136,8 +136,8 @@ static WRITE8_DEVICE_HANDLER( sound_w )
const address_space *space = cputag_get_address_space(device->machine, "cpu", ADDRESS_SPACE_PROGRAM);
/* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */
- coin_lockout_global_w(~data & 0x08);
- set_led_status(9,data & 0x08);
+ coin_lockout_global_w(device->machine, ~data & 0x08);
+ set_led_status(device->machine, 9,data & 0x08);
/* bit 5 - ticket out in trivia games */
ticket_dispenser_w(space, 0, (data & 0x20)<< 2);
@@ -152,15 +152,15 @@ static WRITE8_DEVICE_HANDLER( sound_w )
static WRITE8_DEVICE_HANDLER( sound2_w )
{
/* bit 3,6 - coin lockout, lamp10+11 in selection test mode */
- coin_lockout_w(0, ~data & 0x08);
- coin_lockout_w(1, ~data & 0x40);
- set_led_status(9,data & 0x08);
- set_led_status(10,data & 0x40);
+ coin_lockout_w(device->machine, 0, ~data & 0x08);
+ coin_lockout_w(device->machine, 1, ~data & 0x40);
+ set_led_status(device->machine, 9,data & 0x08);
+ set_led_status(device->machine, 10,data & 0x40);
/* bit 4,5 - lamps 12, 13 in selection test mode;
12 lights up if dsw maximum bet = 30 an bet > 15 or if dsw maximum bet = 10 an bet = 10 */
- set_led_status(11,data & 0x10);
- set_led_status(12,data & 0x20);
+ set_led_status(device->machine, 11,data & 0x10);
+ set_led_status(device->machine, 12,data & 0x20);
/* bit 7 goes directly to the sound amplifier */
dac_data_w(devtag_get_device(device->machine, "dac"), ((data & 0x80) >> 7) * 255);
@@ -169,7 +169,7 @@ static WRITE8_DEVICE_HANDLER( sound2_w )
static WRITE8_DEVICE_HANDLER( lamps2_w )
{
/* bit 4 - play/raise button lamp, lamp 9 in poker test mode */
- set_led_status(8,data & 0x10);
+ set_led_status(device->machine, 8,data & 0x10);
}
static WRITE8_DEVICE_HANDLER( nmi_w )
@@ -177,7 +177,7 @@ static WRITE8_DEVICE_HANDLER( nmi_w )
const address_space *space = cputag_get_address_space(device->machine, "cpu", ADDRESS_SPACE_PROGRAM);
/* bit 4 - play/raise button lamp, lamp 9 in selection test mode */
- set_led_status(8,data & 0x10);
+ set_led_status(device->machine, 8,data & 0x10);
/* bit 6 enables NMI */
interrupt_enable_w(space, 0, data & 0x40);
@@ -329,7 +329,7 @@ static WRITE8_HANDLER( signature2_w )
static ADDRESS_MAP_START( getrivia_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1)
- AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x600f, 0x600f) AM_WRITE(banksel_5_1_w)
@@ -351,7 +351,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gselect_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1)
- AM_RANGE(0x4000, 0x40ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x40ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4400, 0x4400) AM_WRITE(banksel_1_1_w)
AM_RANGE(0x4401, 0x4401) AM_WRITE(banksel_1_2_w)
AM_RANGE(0x4402, 0x4402) AM_WRITE(banksel_2_1_w)
@@ -366,7 +366,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( amuse_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1)
- AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x606f, 0x606f) AM_WRITE(banksel_5_1_w)
@@ -382,7 +382,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gepoker_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1)
- AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x60ef, 0x60ef) AM_WRITE(banksel_3_1_w)
@@ -399,7 +399,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( amuse1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1)
- AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4400, 0x4400) AM_WRITE(banksel_1_1_w)
AM_RANGE(0x4401, 0x4401) AM_WRITE(banksel_2_1_w)
AM_RANGE(0x4402, 0x4402) AM_WRITE(banksel_3_1_w)
@@ -415,7 +415,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( findout_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r,ppi8255_w)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r,ppi8255_w)
/* banked ROMs are enabled by low 6 bits of the address */
@@ -437,7 +437,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( suprpokr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x6200, 0x6200) AM_WRITE(signature2_w)
@@ -450,7 +450,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( geimulti_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x5800, 0x5fff) AM_ROM
@@ -463,7 +463,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sprtauth_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x5600, 0x5600) AM_READ(signature_r)
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index fa74dbf642b..cbd17897e4b 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -392,7 +392,7 @@ static ADDRESS_MAP_START( ppking_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(gladiatr_videoram_w) AM_BASE(&gladiatr_videoram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(gladiatr_colorram_w) AM_BASE(&gladiatr_colorram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(gladiatr_textram_w) AM_BASE(&gladiatr_textram)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
ADDRESS_MAP_END
@@ -430,7 +430,7 @@ static ADDRESS_MAP_START( gladiatr_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(gladiatr_videoram_w) AM_BASE(&gladiatr_videoram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(gladiatr_colorram_w) AM_BASE(&gladiatr_colorram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(gladiatr_textram_w) AM_BASE(&gladiatr_textram)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -1011,9 +1011,9 @@ static DRIVER_INIT( gladiatr )
static READ8_HANDLER(f6a3_r)
{
if(cpu_get_previouspc(space->cpu)==0x8e)
- generic_nvram[0x6a3]=1;
+ space->machine->generic.nvram.ptr.u8[0x6a3]=1;
- return generic_nvram[0x6a3];
+ return space->machine->generic.nvram.ptr.u8[0x6a3];
}
static DRIVER_INIT(ppking)
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 656060d492d..ac7dfe79c1d 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -81,11 +81,11 @@ static WRITE16_HANDLER( glass_coin_w )
switch (offset >> 3){
case 0x00: /* Coin Lockouts */
case 0x01:
- coin_lockout_w((offset >> 3) & 0x01, ~data & 0x01);
+ coin_lockout_w(space->machine, (offset >> 3) & 0x01, ~data & 0x01);
break;
case 0x02: /* Coin Counters */
case 0x03:
- coin_counter_w((offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w(space->machine, (offset >> 3) & 0x01, data & 0x01);
break;
case 0x04: /* Sound Muting (if bit 0 == 1, sound output stream = 0) */
break;
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index bd13d5da5e2..185da01493d 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -55,7 +55,7 @@ static WRITE8_HANDLER( gng_bankswitch_w )
static WRITE8_HANDLER( gng_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
static MACHINE_START( gng )
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index 7e8170fb893..d2e4c326a92 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -859,9 +859,9 @@ static WRITE8_DEVICE_HANDLER( lamps_a_w )
output_set_lamp_value(4, 1 - ((data >> 4) & 1)); /* Lamp 4 */
// popmessage("written : %02X", data);
- coin_counter_w(0, data & 0x40); /* counter1 */
- coin_counter_w(1, data & 0x80); /* counter2 */
- coin_counter_w(2, data & 0x20); /* counter3 */
+ coin_counter_w(device->machine, 0, data & 0x40); /* counter1 */
+ coin_counter_w(device->machine, 1, data & 0x80); /* counter2 */
+ coin_counter_w(device->machine, 2, data & 0x20); /* counter3 */
/* Counters:
@@ -893,7 +893,7 @@ static WRITE8_DEVICE_HANDLER( sound_w )
static ADDRESS_MAP_START( goldnpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
@@ -905,7 +905,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pottnpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
@@ -917,7 +917,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( witchcrd_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 0c1dc564921..ce9d241923a 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -360,7 +360,7 @@ static WRITE8_HANDLER( general_output_w )
gottlieb_laserdisc_video_control_w(space, offset, data);
/* bit 4 controls the coin meter */
- coin_counter_w(0, data & 0x10);
+ coin_counter_w(space->machine, 0, data & 0x10);
/* bit 5 controls the knocker */
output_set_value("knocker0", (data >> 5) & 1);
@@ -374,9 +374,9 @@ static WRITE8_HANDLER( general_output_w )
static WRITE8_HANDLER( reactor_output_w )
{
general_output_w(space, offset, data & ~0xe0);
- set_led_status(0, data & 0x20);
- set_led_status(1, data & 0x40);
- set_led_status(2, data & 0x80);
+ set_led_status(space->machine, 0, data & 0x20);
+ set_led_status(space->machine, 1, data & 0x40);
+ set_led_status(space->machine, 2, data & 0x80);
}
@@ -735,7 +735,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gottlieb_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xffff)
- AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1000, 0x1fff) AM_RAM AM_REGION("maincpu", 0x1000) /* or ROM */
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_REGION("maincpu", 0x2000) /* or ROM */
AM_RANGE(0x3000, 0x30ff) AM_MIRROR(0x0700) AM_WRITEONLY AM_BASE(&spriteram) /* FRSEL */
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 93e1a37509f..d072804dcbe 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -94,8 +94,8 @@ static WRITE16_HANDLER( cpuA_ctrl_w )
data >>= 8;
/* bits 0-1 are coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 selects layer priority */
gradius3_priority = data & 0x04;
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 5815ed68f2a..9d1694e1fdc 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -79,7 +79,7 @@
static MACHINE_RESET( grchamp )
{
/* if the coin system is 1 way, lock Coin B (Page 40) */
- coin_lockout_w(1, (input_port_read(machine, "DSWB") & 0x10) ? 1 : 0);
+ coin_lockout_w(machine, 1, (input_port_read(machine, "DSWB") & 0x10) ? 1 : 0);
}
@@ -168,7 +168,7 @@ static WRITE8_HANDLER( cpu0_outputs_w )
/* bit 4: coin lockout */
/* bit 5: Game Over lamp */
/* bit 6-7: n/c */
- coin_lockout_global_w((data >> 4) & 1);
+ coin_lockout_global_w(space->machine, (data >> 4) & 1);
output_set_value("led0", (~data >> 5) & 1);
break;
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index 215779b7537..a7e4e8eddfb 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -284,21 +284,21 @@ static READ8_HANDLER( random_num_r )
static WRITE8_HANDLER( led_0_w )
{
- set_led_status(0, data & 1);
+ set_led_status(space->machine, 0, data & 1);
logerror("LED 0 %s\n", (data & 1) ? "on" : "off");
}
static WRITE8_HANDLER( led_1_w )
{
- set_led_status(1, data & 1);
+ set_led_status(space->machine, 1, data & 1);
logerror("LED 1 %s\n", (data & 1) ? "on" : "off");
}
static WRITE8_HANDLER( gridlee_coin_counter_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
logerror("coin counter %s\n", (data & 1) ? "on" : "off");
}
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9700, 0x9700) AM_READ_PORT("IN2") AM_WRITENOP
AM_RANGE(0x9820, 0x9820) AM_READ(random_num_r)
AM_RANGE(0x9828, 0x993f) AM_WRITE(gridlee_sound_w)
- AM_RANGE(0x9c00, 0x9cff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x9c00, 0x9cff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xa000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 3fbc97498a4..da4f09c1f98 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -173,10 +173,10 @@ static WRITE32_HANDLER( groundfx_input_w )
case 0x01:
if (ACCESSING_BITS_24_31)
{
- coin_lockout_w(0,~data & 0x01000000);
- coin_lockout_w(1,~data & 0x02000000);
- coin_counter_w(0, data & 0x04000000);
- coin_counter_w(1, data & 0x08000000);
+ coin_lockout_w(space->machine, 0,~data & 0x01000000);
+ coin_lockout_w(space->machine, 1,~data & 0x02000000);
+ coin_counter_w(space->machine, 0, data & 0x04000000);
+ coin_counter_w(space->machine, 1, data & 0x08000000);
coin_word = (data >> 16) &0xffff;
}
break;
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index c6058ebc6ff..178d966d877 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -219,7 +219,7 @@ static ADDRESS_MAP_START( gstream_32bit_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x4FA00000, 0x4FA00003) AM_WRITE(gstream_tilemap1_scrolly_w)
AM_RANGE(0x4FC00000, 0x4FC00003) AM_WRITE(gstream_tilemap2_scrollx_w)
AM_RANGE(0x4FE00000, 0x4FE00003) AM_WRITE(gstream_tilemap2_scrolly_w)
- AM_RANGE(0xFFC00000, 0xFFC01FFF) AM_RAM AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) // Backup RAM
+ AM_RANGE(0xFFC00000, 0xFFC01FFF) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // Backup RAM
AM_RANGE(0xFFF80000, 0xFFFFFFFF) AM_ROM AM_REGION("user1",0) // boot rom
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 56f985f478d..5d93f4db797 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -130,10 +130,10 @@ popmessage(t);
/* game does not write a separate counter for coin 2!
It should disable both coins when 9 credits reached
see code $1d8a-f6... but for some reason it's not */
- coin_lockout_w(0, data & 0x01000000);
- coin_lockout_w(1, data & 0x02000000);
- coin_counter_w(0, data & 0x04000000);
- coin_counter_w(1, data & 0x04000000);
+ coin_lockout_w(space->machine, 0, data & 0x01000000);
+ coin_lockout_w(space->machine, 1, data & 0x02000000);
+ coin_counter_w(space->machine, 0, data & 0x04000000);
+ coin_counter_w(space->machine, 1, data & 0x04000000);
coin_word = (data >> 16) &0xffff;
}
//logerror("CPU #0 PC %06x: write input %06x\n",cpu_get_pc(space->cpu),offset);
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index dfe2194c13b..3e486f2a8ef 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -43,8 +43,8 @@ static WRITE8_HANDLER( hcastle_soundirq_w )
static WRITE8_HANDLER( hcastle_coin_w )
{
- coin_counter_w(0,data & 0x40);
- coin_counter_w(1,data & 0x80);
+ coin_counter_w(space->machine, 0,data & 0x40);
+ coin_counter_w(space->machine, 1,data & 0x80);
}
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 527534e2a51..af6dd7afe89 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -101,8 +101,8 @@ static WRITE8_HANDLER( coincntr_w )
//logerror("%04x: coincntr_w %02x\n",cpu_get_pc(space->cpu),data);
/* bits 0/1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 5 = flip screen */
flip_screen_set(space->machine, data & 0x20);
diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c
index 88e48491c18..3b359ea804c 100644
--- a/src/mame/drivers/highvdeo.c
+++ b/src/mame/drivers/highvdeo.c
@@ -255,7 +255,7 @@ static WRITE16_HANDLER( write1_w )
static ADDRESS_MAP_START( tv_vcf_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
- AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE(0x40000, 0x4ffff) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/
AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1)
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
@@ -294,7 +294,7 @@ static WRITE16_DEVICE_HANDLER( tv_ncf_oki6395_w )
}
static ADDRESS_MAP_START( tv_ncf_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
- AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE(0x20000, 0x2ffff) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/
AM_RANGE(0x40000, 0xbffff) AM_ROM AM_REGION("user1",0x40000)
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
@@ -337,7 +337,7 @@ static WRITE16_HANDLER( tv_tcf_bankselect_w )
static ADDRESS_MAP_START( tv_tcf_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
- AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE(0x40000, 0x5d4bf) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/
AM_RANGE(0x7fe00, 0x7ffff) AM_RAM_WRITE( tv_tcf_paletteram_w ) AM_BASE(&paletteram16)
AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1)
@@ -388,14 +388,14 @@ static WRITE16_HANDLER( write2_w )
for(i=0;i<4;i++)
{
- coin_counter_w(i,data & 0x20);
- coin_lockout_w(i,~data & 0x08);
+ coin_counter_w(space->machine, i,data & 0x20);
+ coin_lockout_w(space->machine, i,~data & 0x08);
}
}
static ADDRESS_MAP_START( newmcard_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
- AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE(0x40000, 0x7ffff) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/
AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1)
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
@@ -463,7 +463,7 @@ static WRITE16_HANDLER( brasil_status_w )
static ADDRESS_MAP_START( brasil_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
- AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE(0x40000, 0x7ffff) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/
AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1)
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
@@ -1209,8 +1209,8 @@ static WRITE16_HANDLER( fashion_output_w )
for(i=0;i<4;i++)
{
- coin_counter_w(i,data & 0x20);
- coin_lockout_w(i,~data & 0x01);
+ coin_counter_w(space->machine, i,data & 0x20);
+ coin_lockout_w(space->machine, i,~data & 0x01);
}
}
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index 0ec90940709..0a770933fbb 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -105,7 +105,7 @@ static MACHINE_RESET( hnayayoi )
static ADDRESS_MAP_START( hnayayoi_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
- AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -131,7 +131,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hnfubuki_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
- AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8000, 0xfeff) AM_ROM
AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("ymsnd", ym2203_w)
AM_RANGE(0xff02, 0xff03) AM_DEVREAD("ymsnd", ym2203_r)
@@ -153,7 +153,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( untoucha_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
- AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 1642d39f733..41daa371dc8 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1029,7 +1029,7 @@ static ADDRESS_MAP_START( hng_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x1f700000, 0x1f702fff) AM_READWRITE(hng64_sysregs_r,hng64_sysregs_w) AM_BASE(&hng64_sysregs)
// SRAM. Coin data, Player Statistics, etc.
- AM_RANGE(0x1F800000, 0x1F803fff) AM_RAM AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x1F800000, 0x1F803fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
// Dualport RAM
AM_RANGE(0x1F808000, 0x1F8087ff) AM_READWRITE(hng64_dualport_r, hng64_dualport_w) AM_BASE(&hng64_dualport)
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index c3471c4e464..696bd0a34c1 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -368,7 +368,7 @@ static WRITE8_HANDLER( reikaids_upd7807_portc_w )
memory_set_bankptr(space->machine, 2,memory_region(space->machine, "audiocpu") + 0x10000 * (data & 0x03));
- coin_counter_w(0,~data & 0x80);
+ coin_counter_w(space->machine, 0,~data & 0x80);
if (BIT(upd7807_portc,5) && !BIT(data,5)) /* write clock 1->0 */
{
@@ -524,7 +524,7 @@ static WRITE8_HANDLER( pteacher_upd7807_portc_w )
memory_set_bankptr(space->machine, 2,memory_region(space->machine, "audiocpu") + 0x10000 * ((data & 0x0c) >> 2));
- coin_counter_w(0,~data & 0x80);
+ coin_counter_w(space->machine, 0,~data & 0x80);
if (BIT(upd7807_portc,5) && !BIT(data,5)) /* clock 1->0 */
sn76496_w(devtag_get_device(space->machine, "snsnd"),0,upd7807_porta);
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 3ac7d99ed14..d802acdaa77 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -32,7 +32,7 @@ extern VIDEO_START( roadf );
static WRITE8_HANDLER( hyperspt_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index cb2eec7dd74..47af8aeef1b 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -327,12 +327,12 @@ static WRITE8_HANDLER( jingbell_nmi_and_coins_w )
// popmessage("%02x",data);
}
- coin_counter_w(0, data & 0x01); // coin_a
- coin_counter_w(1, data & 0x04); // coin_c
- coin_counter_w(2, data & 0x08); // key in
- coin_counter_w(3, data & 0x10); // coin out mech
+ coin_counter_w(space->machine, 0, data & 0x01); // coin_a
+ coin_counter_w(space->machine, 1, data & 0x04); // coin_c
+ coin_counter_w(space->machine, 2, data & 0x08); // key in
+ coin_counter_w(space->machine, 3, data & 0x10); // coin out mech
- set_led_status(6, data & 0x40); // led for coin out / hopper active
+ set_led_status(space->machine, 6, data & 0x40); // led for coin out / hopper active
nmi_enable = data; // data & 0x80 // nmi enable?
@@ -342,8 +342,8 @@ static WRITE8_HANDLER( jingbell_nmi_and_coins_w )
static WRITE8_HANDLER( jingbell_video_and_leds_w )
{
- set_led_status(4, data & 0x01); // start?
- set_led_status(5, data & 0x04); // l_bet?
+ set_led_status(space->machine, 4, data & 0x01); // start?
+ set_led_status(space->machine, 5, data & 0x04); // l_bet?
video_enable = data & 0x40;
hopper = (~data)& 0x80;
@@ -354,10 +354,10 @@ static WRITE8_HANDLER( jingbell_video_and_leds_w )
static WRITE8_HANDLER( jingbell_leds_w )
{
- set_led_status(0, data & 0x01); // stop_1
- set_led_status(1, data & 0x02); // stop_2
- set_led_status(2, data & 0x04); // stop_3
- set_led_status(3, data & 0x08); // stop
+ set_led_status(space->machine, 0, data & 0x01); // stop_1
+ set_led_status(space->machine, 1, data & 0x02); // stop_2
+ set_led_status(space->machine, 2, data & 0x04); // stop_3
+ set_led_status(space->machine, 3, data & 0x08); // stop
// data & 0x10?
out[2] = data;
@@ -409,7 +409,7 @@ static READ8_HANDLER( jingbell_magic_r )
static ADDRESS_MAP_START( jingbell_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0f3ff ) AM_ROM
- AM_RANGE( 0x0f400, 0x0ffff ) AM_RAM AM_BASE( &generic_nvram ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE( 0x0f400, 0x0ffff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
ADDRESS_MAP_END
static ADDRESS_MAP_START( jingbell_portmap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index 874979aff37..e73706c03ae 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -783,7 +783,7 @@ static WRITE16_HANDLER( lhb2_magic_w )
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x20);
// coin out data & 0x40
igs_hopper = data & 0x80;
}
@@ -874,7 +874,7 @@ static WRITE16_HANDLER( drgnwrld_magic_w )
case 0x00:
if (ACCESSING_BITS_0_7)
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
if (data & ~0x2)
logerror("%06x: warning, unknown bits written in coin counter = %02x\n", cpu_get_pc(space->cpu), data);
@@ -938,7 +938,7 @@ static WRITE16_HANDLER( wlcc_magic_w )
case 0x02:
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x01);
// coin out data & 0x02
okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (data & 0x10) ? 0x40000 : 0);
@@ -1012,7 +1012,7 @@ static WRITE16_HANDLER( lhb_inputs_w )
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x20 );
+ coin_counter_w(space->machine, 0, data & 0x20 );
// coin out data & 0x40
igs_hopper = data & 0x80;
}
@@ -1056,8 +1056,8 @@ static WRITE16_HANDLER( vbowl_magic_w )
case 0x02:
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
}
if (data & ~0x3)
@@ -1123,7 +1123,7 @@ static WRITE16_HANDLER( xymg_magic_w )
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x20);
// coin out data & 0x40
}
@@ -1192,7 +1192,7 @@ static READ16_HANDLER( xymg_magic_r )
static ADDRESS_MAP_START( drgnwrld, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM
- AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE( &igs011_priority_ram )
AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs011_palette ) AM_BASE( &paletteram16 )
AM_RANGE( 0x500000, 0x500001 ) AM_READ_PORT( "COIN" )
@@ -1217,7 +1217,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lhb2, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM
- AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE( 0x200000, 0x200001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff )
AM_RANGE( 0x204000, 0x204003 ) AM_DEVWRITE8( "ymsnd", ym2413_w, 0x00ff )
AM_RANGE( 0x208000, 0x208003 ) AM_WRITE( lhb2_magic_w )
@@ -1243,7 +1243,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( wlcc, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM
- AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE( &igs011_priority_ram )
AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs011_layers_r, igs011_layers_w )
AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs011_palette ) AM_BASE( &paletteram16 )
@@ -1276,7 +1276,7 @@ static WRITE16_HANDLER( lhb_irq_enable_w )
static ADDRESS_MAP_START( lhb, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x010000, 0x010001 ) AM_DEVWRITE( "oki", lhb_okibank_w )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM
- AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE( &igs011_priority_ram )
AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs011_layers_r, igs011_layers_w )
AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs011_palette ) AM_BASE( &paletteram16 )
@@ -1357,7 +1357,7 @@ static WRITE16_HANDLER( vbowl_link_3_w ) { }
static ADDRESS_MAP_START( vbowl, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM
- AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE( &igs011_priority_ram )
AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs011_layers_r, igs011_layers_w )
AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs011_palette ) AM_BASE( &paletteram16 )
@@ -1415,7 +1415,7 @@ static ADDRESS_MAP_START( xymg, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x85b800, 0x85b801 ) AM_WRITE( igs011_blit_pen_w )
AM_RANGE( 0x85c000, 0x85c001 ) AM_WRITE( igs011_blit_depth_w )
AM_RANGE( 0x888000, 0x888001 ) AM_READ( igs_3_dips_r )
- AM_RANGE( 0x1f0000, 0x1f3fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size ) // extra ram
+ AM_RANGE( 0x1f0000, 0x1f3fff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram ) // extra ram
ADDRESS_MAP_END
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 808e3355aee..95764d8f555 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -1279,7 +1279,7 @@ static WRITE16_HANDLER( sdmg2_magic_w )
if (ACCESSING_BITS_0_7)
{
input_select = data & 0x1f;
- coin_counter_w(0, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x20);
// coin out data & 0x40
hopper = data & 0x80;
}
@@ -1364,7 +1364,7 @@ static WRITE16_HANDLER( mgdh_magic_w )
if (ACCESSING_BITS_0_7)
{
// coin out data & 0x40
- coin_counter_w(0, data & 0x80);
+ coin_counter_w(space->machine, 0, data & 0x80);
}
if ( data & ~0xc0 )
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index 0d49f4e6aac..dd03691a30b 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -183,12 +183,12 @@ static void show_out(void)
static WRITE8_HANDLER( igs_nmi_and_coins_w )
{
- coin_counter_w(0, data & 0x01); // coin_a
- coin_counter_w(1, data & 0x04); // coin_c
- coin_counter_w(2, data & 0x08); // key in
- coin_counter_w(3, data & 0x10); // coin out mech
+ coin_counter_w(space->machine, 0, data & 0x01); // coin_a
+ coin_counter_w(space->machine, 1, data & 0x04); // coin_c
+ coin_counter_w(space->machine, 2, data & 0x08); // key in
+ coin_counter_w(space->machine, 3, data & 0x10); // coin out mech
- set_led_status(6, data & 0x20); // led for coin out / hopper active
+ set_led_status(space->machine, 6, data & 0x20); // led for coin out / hopper active
nmi_enable = data & 0x80; // nmi enable?
#ifdef VERBOSE
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index da061a341fa..0c17e5b74f0 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -36,8 +36,8 @@ static READ8_HANDLER( ikki_e000_r )
static WRITE8_HANDLER( ikki_coin_counters )
{
- coin_counter_w( 0, data & 0x01 );
- coin_counter_w( 1, data & 0x02 );
+ coin_counter_w( space->machine, 0, data & 0x01 );
+ coin_counter_w( space->machine, 1, data & 0x02 );
}
/****************************************************************************/
diff --git a/src/mame/drivers/ilpag.c b/src/mame/drivers/ilpag.c
index 8d5af3746ec..2215098cd9a 100644
--- a/src/mame/drivers/ilpag.c
+++ b/src/mame/drivers/ilpag.c
@@ -255,7 +255,7 @@ static WRITE16_HANDLER( sound_write_w )
static ADDRESS_MAP_START( ilpag_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1fffff) AM_ROM AM_REGION("blit_data", 0)
- AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
// AM_RANGE(0x800000, 0x800001) AM_READ(test_r)
// AM_RANGE(0x880000, 0x880001) AM_READ(test_r)
@@ -280,7 +280,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( steaser_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x1fffff) AM_ROM AM_REGION("blit_data", 0)
- AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x800000, 0x800001) AM_READ(test_r)
// AM_RANGE(0x840000, 0x840001) AM_WRITE(sound_write_w)
@@ -468,19 +468,19 @@ static TIMER_DEVICE_CALLBACK( steaser_mcu_sim )
{
// static int i;
/*first off, signal the "MCU is running" flag*/
- generic_nvram16[0x932/2] = 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x932/2] = 0xffff;
/*clear the inputs (they are impulsed)*/
// for(i=0;i<8;i+=2)
-// generic_nvram16[((0x8a0)+i)/2] = 0;
+// timer->machine->generic.nvram.ptr.u16[((0x8a0)+i)/2] = 0;
/*finally, read the inputs*/
- generic_nvram16[0x89e/2] = input_port_read(timer->machine, "MENU") & 0xffff;
- generic_nvram16[0x8a0/2] = input_port_read(timer->machine, "STAT") & 0xffff;
- generic_nvram16[0x8a2/2] = input_port_read(timer->machine, "BET_DEAL") & 0xffff;
- generic_nvram16[0x8a4/2] = input_port_read(timer->machine, "TAKE_DOUBLE") & 0xffff;
- generic_nvram16[0x8a6/2] = input_port_read(timer->machine, "SMALL_BIG") & 0xffff;
- generic_nvram16[0x8a8/2] = input_port_read(timer->machine, "CANCEL_HOLD1") & 0xffff;
- generic_nvram16[0x8aa/2] = input_port_read(timer->machine, "HOLD2_HOLD3") & 0xffff;
- generic_nvram16[0x8ac/2] = input_port_read(timer->machine, "HOLD4_HOLD5") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x89e/2] = input_port_read(timer->machine, "MENU") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x8a0/2] = input_port_read(timer->machine, "STAT") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x8a2/2] = input_port_read(timer->machine, "BET_DEAL") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x8a4/2] = input_port_read(timer->machine, "TAKE_DOUBLE") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x8a6/2] = input_port_read(timer->machine, "SMALL_BIG") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x8a8/2] = input_port_read(timer->machine, "CANCEL_HOLD1") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x8aa/2] = input_port_read(timer->machine, "HOLD2_HOLD3") & 0xffff;
+ timer->machine->generic.nvram.ptr.u16[0x8ac/2] = input_port_read(timer->machine, "HOLD4_HOLD5") & 0xffff;
}
/* TODO: remove this hack.*/
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 027c15f7a7a..5c8ef270361 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -102,7 +102,7 @@ static WRITE8_DEVICE_HANDLER( port_C_w )
iqblock_videoenable = data & 0x20;
/* bit 6 is coin counter */
- coin_counter_w(0,data & 0x40);
+ coin_counter_w(device->machine, 0,data & 0x40);
/* bit 7 could be a second coin counter, but coin 2 doesn't seem to work... */
}
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 02cba0c6195..2694092f18b 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -89,7 +89,7 @@
static WRITE8_HANDLER( irobot_nvram_w )
{
- generic_nvram[offset] = data & 0x0f;
+ space->machine->generic.nvram.ptr.u8[offset] = data & 0x0f;
}
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( irobot_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1140, 0x1140) AM_WRITE(irobot_statwr_w)
AM_RANGE(0x1180, 0x1180) AM_WRITE(irobot_out0_w)
AM_RANGE(0x11c0, 0x11c0) AM_WRITE(irobot_rom_banksel_w)
- AM_RANGE(0x1200, 0x12ff) AM_RAM_WRITE(irobot_nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x1200, 0x12ff) AM_RAM_WRITE(irobot_nvram_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1300, 0x13ff) AM_READ(irobot_control_r)
AM_RANGE(0x1400, 0x143f) AM_READWRITE(quad_pokey_r, quad_pokey_w)
AM_RANGE(0x1800, 0x18ff) AM_WRITE(irobot_paletteram_w)
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index d5ace923453..a1fcf616268 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -732,17 +732,17 @@ static WRITE8_DEVICE_HANDLER( drivedge_portb_out )
/* bit 4 controls the ticket dispenser */
/* bit 5 controls the coin counter */
/* bit 6 controls the diagnostic sound LED */
- set_led_status(1, data & 0x01);
- set_led_status(2, data & 0x02);
- set_led_status(3, data & 0x04);
+ set_led_status(space->machine, 1, data & 0x01);
+ set_led_status(space->machine, 2, data & 0x02);
+ set_led_status(space->machine, 3, data & 0x04);
ticket_dispenser_w(space, 0, (data & 0x10) << 3);
- coin_counter_w(0, (data & 0x20) >> 5);
+ coin_counter_w(space->machine, 0, (data & 0x20) >> 5);
}
static WRITE8_DEVICE_HANDLER( drivedge_turbo_light )
{
- set_led_status(0, data);
+ set_led_status(device->machine, 0, data);
}
@@ -755,7 +755,7 @@ static WRITE8_DEVICE_HANDLER( pia_portb_out )
/* bit 5 controls the coin counter */
/* bit 6 controls the diagnostic sound LED */
ticket_dispenser_w(space, 0, (data & 0x10) << 3);
- coin_counter_w(0, (data & 0x20) >> 5);
+ coin_counter_w(space->machine, 0, (data & 0x20) >> 5);
}
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 71132a152dc..526824fe880 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -780,7 +780,7 @@ static WRITE8_HANDLER( pia_portb_out )
/* bit 6 controls the diagnostic sound LED */
pia_portb_data = data;
ticket_dispenser_w(space, 0, (data & 0x10) << 3);
- coin_counter_w(0, (data & 0x20) >> 5);
+ coin_counter_w(space->machine, 0, (data & 0x20) >> 5);
}
@@ -794,7 +794,7 @@ static WRITE8_DEVICE_HANDLER( ym2203_portb_out )
/* bit 7 controls the ticket dispenser */
pia_portb_data = data;
ticket_dispenser_w(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0, data & 0x80);
- coin_counter_w(0, (data & 0x20) >> 5);
+ coin_counter_w(device->machine, 0, (data & 0x20) >> 5);
}
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index 702ae245cb7..3dbe76f596a 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -208,12 +208,12 @@ static WRITE8_HANDLER( jackie_unk_reg3_hi_w ) { jackie_unk_reg_hi_w( 2, offset,
static WRITE8_HANDLER( jackie_nmi_and_coins_w )
{
- coin_counter_w(0, data & 0x01); // coin_a
- coin_counter_w(1, data & 0x04); // coin_c
- coin_counter_w(2, data & 0x08); // key in
- coin_counter_w(3, data & 0x10); // coin out mech
+ coin_counter_w(space->machine, 0, data & 0x01); // coin_a
+ coin_counter_w(space->machine, 1, data & 0x04); // coin_c
+ coin_counter_w(space->machine, 2, data & 0x08); // key in
+ coin_counter_w(space->machine, 3, data & 0x10); // coin out mech
- set_led_status(6, data & 0x20); // led for coin out / hopper active
+ set_led_status(space->machine, 6, data & 0x20); // led for coin out / hopper active
exp_bank = (data & 0x02) ? 1 : 0; // expram bank number
nmi_enable = data & 0x80; // nmi enable?
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 0faa8aa1bcb..01afe658b5f 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -234,9 +234,9 @@ static WRITE8_HANDLER( output_w )
---- ---x coin counter
*/
// printf("%02x\n",data);
- coin_counter_w(0,data & 0x01);
+ coin_counter_w(space->machine, 0,data & 0x01);
// flip_screen_set(data & 0x04);
-// coin_lockout_w(0,~data & 0x20);
+// coin_lockout_w(space->machine, 0,~data & 0x20);
}
static READ8_DEVICE_HANDLER( input_mux_r )
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index 423a1c14cb8..8b4a150e731 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -232,7 +232,7 @@ static WRITE8_HANDLER( a2d_select_w )
static WRITE8_HANDLER( jedi_coin_counter_w )
{
- coin_counter_w(offset, data);
+ coin_counter_w(space->machine, offset, data);
}
@@ -248,7 +248,7 @@ static WRITE8_HANDLER( nvram_data_w )
jedi_state *state = (jedi_state *)space->machine->driver_data;
if (state->nvram_enabled)
- generic_nvram[offset] = data;
+ space->machine->generic.nvram.ptr.u8[offset] = data;
}
@@ -269,7 +269,7 @@ static WRITE8_HANDLER( nvram_enable_w )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
- AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0300) AM_RAM_WRITE(nvram_data_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0300) AM_RAM_WRITE(nvram_data_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x03fe) AM_READ_PORT("0c00") AM_WRITENOP
AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x03fe) AM_READ_PORT("0c01") AM_WRITENOP
AM_RANGE(0x1000, 0x13ff) AM_NOP
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index dbcae5b8340..c0f5c5d998d 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -141,7 +141,7 @@ static WRITE8_HANDLER( jollyjgr_misc_w )
}
static WRITE8_HANDLER( jollyjgr_coin_lookout_w )
{
- coin_lockout_global_w(data & 1);
+ coin_lockout_global_w(space->machine, data & 1);
/* bits 4, 5, 6 and 7 are used too */
}
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 4b4b6e35f0b..4e4b7c83ece 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -113,7 +113,7 @@ static WRITE8_HANDLER( mux_w )
static WRITE8_HANDLER( jongkyo_coin_counter_w )
{
/* bit 1 = coin counter */
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
/* bit 2 always set? */
}
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index d87e43a2041..6ecb298e4a1 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -621,7 +621,7 @@ static WRITE16_HANDLER( jpmio_w )
static ADDRESS_MAP_START( m68k_program_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM
AM_RANGE(0x00100000, 0x001fffff) AM_ROM
- AM_RANGE(0x00400000, 0x00403fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x00400000, 0x00403fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x00480000, 0x0048001f) AM_READWRITE(duart_1_r, duart_1_w)
AM_RANGE(0x00480020, 0x00480033) AM_READ(inputs1_r)
AM_RANGE(0x00480034, 0x00480035) AM_READ(unk_r)
@@ -1287,7 +1287,7 @@ static READ16_HANDLER( ump_r )
static ADDRESS_MAP_START( awp68k_program_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM
AM_RANGE(0x00100000, 0x001fffff) AM_ROM
- AM_RANGE(0x00400000, 0x00403fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x00400000, 0x00403fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x00480000, 0x0048001f) AM_READWRITE(duart_1_r, duart_1_w)
AM_RANGE(0x00480020, 0x00480033) AM_READ(inputs1_r)
AM_RANGE(0x00480034, 0x00480035) AM_READ(ump_r)
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 79ee94281c7..119fbdf4e8d 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -282,7 +282,7 @@ static ADDRESS_MAP_START( 68000_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x01fffe, 0x01ffff) AM_WRITE(rombank_w)
AM_RANGE(0x020000, 0x03ffff) AM_ROMBANK(1)
- AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x046000, 0x046001) AM_WRITENOP
AM_RANGE(0x046020, 0x046021) AM_DEVREADWRITE8("acia6850_0", acia6850_stat_r, acia6850_ctrl_w, 0xff)
AM_RANGE(0x046022, 0x046023) AM_DEVREADWRITE8("acia6850_0", acia6850_data_r, acia6850_data_w, 0xff)
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 55922f18d0c..ee073789b6e 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -171,7 +171,7 @@ static WRITE8_HANDLER( flip_screen_w )
static WRITE8_HANDLER( junofrst_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 6cf8bb07228..b54fb965997 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -277,10 +277,10 @@ static WRITE16_HANDLER( kaneko16_coin_lockout_w )
{
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(0, data & 0x0100);
- coin_counter_w(1, data & 0x0200);
- coin_lockout_w(0, (~data) & 0x0400 );
- coin_lockout_w(1, (~data) & 0x0800 );
+ coin_counter_w(space->machine, 0, data & 0x0100);
+ coin_counter_w(space->machine, 1, data & 0x0200);
+ coin_lockout_w(space->machine, 0, (~data) & 0x0400 );
+ coin_lockout_w(space->machine, 1, (~data) & 0x0800 );
}
}
@@ -340,10 +340,10 @@ static WRITE16_HANDLER( kaneko16_eeprom_w )
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(0, data & 0x0100);
- coin_counter_w(1, data & 0x0200);
- coin_lockout_w(0, data & 0x8000);
- coin_lockout_w(1, data & 0x8000);
+ coin_counter_w(space->machine, 0, data & 0x0100);
+ coin_counter_w(space->machine, 1, data & 0x0200);
+ coin_lockout_w(space->machine, 0, data & 0x8000);
+ coin_lockout_w(space->machine, 1, data & 0x8000);
}
}
@@ -487,10 +487,10 @@ static WRITE16_HANDLER( bloodwar_coin_lockout_w )
{
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(0, data & 0x0100);
- coin_counter_w(1, data & 0x0200);
- coin_lockout_w(0, data & 0x8000);
- coin_lockout_w(1, data & 0x8000);
+ coin_counter_w(space->machine, 0, data & 0x0100);
+ coin_counter_w(space->machine, 1, data & 0x0200);
+ coin_lockout_w(space->machine, 0, data & 0x8000);
+ coin_lockout_w(space->machine, 1, data & 0x8000);
}
}
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index dd9b96b99f0..4fe603db31e 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -239,8 +239,8 @@ static WRITE8_HANDLER( mcu_sim_w )
static WRITE8_HANDLER( kangaroo_coin_counter_w )
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
}
diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c
index 1bff3be3cd8..357e135a9c3 100644
--- a/src/mame/drivers/kingdrby.c
+++ b/src/mame/drivers/kingdrby.c
@@ -351,7 +351,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x3fff) AM_ROM //sound rom tested for the post check
- AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) //backup ram
+ AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) //backup ram
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* I/O Ports */
AM_RANGE(0x6000, 0x6003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* I/O Ports */
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_SHARE(1)
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index c4ecf4c022a..6a06369ba57 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -89,7 +89,7 @@ INPUT_PORTS_END
/* A 3.6V battery traces directly to U19, rendering it nvram */
static ADDRESS_MAP_START( kingpin_program_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( kingpin_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 1a9ebc19cbf..6dbcff499de 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1177,7 +1177,7 @@ static WRITE32_HANDLER( type4_prot_w )
// cabinet lamps for type 1 games
static WRITE32_HANDLER( type1_cablamps_w )
{
- set_led_status(0, (data>>24)&1);
+ set_led_status(space->machine, 0, (data>>24)&1);
}
/**********************************************************************************/
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 680f7ff45de..2b42dcbaf31 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -37,7 +37,7 @@ static READ8_HANDLER( kopunch_in_r )
static WRITE8_HANDLER( kopunch_lamp_w )
{
- set_led_status(0,~data & 0x80);
+ set_led_status(space->machine, 0,~data & 0x80);
// if ((data & 0x7f) != 0x7f)
// popmessage("port 38 = %02x",data);
@@ -45,8 +45,8 @@ static WRITE8_HANDLER( kopunch_lamp_w )
static WRITE8_HANDLER( kopunch_coin_w )
{
- coin_counter_w(0,~data & 0x80);
- coin_counter_w(1,~data & 0x40);
+ coin_counter_w(space->machine, 0,~data & 0x80);
+ coin_counter_w(space->machine, 1,~data & 0x40);
// if ((data & 0x3f) != 0x3f)
// popmessage("port 34 = %02x",data);
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 18004d4637f..f16f6690f39 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -49,8 +49,8 @@ if (data & 0xe0) popmessage("bankswitch %02x",data);
memory_set_bankptr(space->machine, 1,&RAM[bankaddress]);
/* bits 3 and 4 are coin counters */
- coin_counter_w(0,data & 0x08);
- coin_counter_w(1,data & 0x10);
+ coin_counter_w(space->machine, 0,data & 0x08);
+ coin_counter_w(space->machine, 1,data & 0x10);
}
static ADDRESS_MAP_START( labyrunr_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index e7555724d89..7bfe3576b03 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -82,7 +82,7 @@ static WRITE8_HANDLER( laserbat_input_mux_w )
flip_screen_set_no_update(space->machine, data & 0x08);
- coin_counter_w(0,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
//data & 0x02 ?
//data & 0x04 ?
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index bc10adf02d3..76b8453f638 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -352,7 +352,7 @@ static ADDRESS_MAP_START( lastfght_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_REGION("maincpu", 0)
AM_RANGE( 0x080000, 0x0fffff ) AM_ROM AM_REGION("maincpu", 0)
- AM_RANGE( 0x200000, 0x20ffff ) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // battery
+ AM_RANGE( 0x200000, 0x20ffff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // battery
AM_RANGE( 0x600000, 0x600001 ) AM_WRITE( lastfght_hi_w )
AM_RANGE( 0x600002, 0x600003 ) AM_READWRITE( lastfght_sound_r, lastfght_sound_w )
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 6a76568a714..9b3dd8d1a32 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -182,7 +182,7 @@ static CUSTOM_INPUT( cclownz_paddle )
static WRITE16_HANDLER( ripribit_control_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
ticket_dispenser_0_w(space, 0, ((data >> 1) & 1) << 7);
output_set_lamp_value(0, (data >> 2) & 1);
}
@@ -194,7 +194,7 @@ static WRITE16_HANDLER( cfarm_control_w )
output_set_lamp_value(0, (data >> 2) & 1);
output_set_lamp_value(1, (data >> 3) & 1);
output_set_lamp_value(2, (data >> 4) & 1);
- coin_counter_w(0, (data >> 7) & 1);
+ coin_counter_w(space->machine, 0, (data >> 7) & 1);
}
@@ -204,7 +204,7 @@ static WRITE16_HANDLER( cclownz_control_w )
output_set_lamp_value(0, (data >> 2) & 1);
output_set_lamp_value(1, (data >> 4) & 1);
output_set_lamp_value(2, (data >> 5) & 1);
- coin_counter_w(0, (data >> 6) & 1);
+ coin_counter_w(space->machine, 0, (data >> 6) & 1);
}
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index 959a7a9fd06..b03b60fa550 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -155,13 +155,13 @@ static UINT8 ctrld;
static WRITE8_HANDLER( liberatr_led_w )
{
- set_led_status(offset, ~data & 0x10);
+ set_led_status(space->machine, offset, ~data & 0x10);
}
static WRITE8_HANDLER( liberatr_coin_counter_w )
{
- coin_counter_w(offset ^ 0x01, data & 0x10);
+ coin_counter_w(space->machine, offset ^ 0x01, data & 0x10);
}
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 6c5d5bbf0ad..bbeb17752ce 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -48,7 +48,7 @@ static void draw_sprites(running_machine *machine, UINT32 *sprites, const rectan
static WRITE32_HANDLER( limenko_coincounter_w )
{
- coin_counter_w(0,data & 0x10000);
+ coin_counter_w(space->machine,0,data & 0x10000);
}
static WRITE32_HANDLER( limenko_paletteram_w )
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 06022ab4563..80dd56bc317 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -430,12 +430,12 @@ static void ym2203_irq(const device_config *device, int irq)
static WRITE8_DEVICE_HANDLER( ym2203_out_b )
{
- coin_counter_w(0, data & 0x80);
- coin_counter_w(1, data & 0x40);
- coin_counter_w(2, data & 0x20);
+ coin_counter_w(device->machine, 0, data & 0x80);
+ coin_counter_w(device->machine, 1, data & 0x40);
+ coin_counter_w(device->machine, 2, data & 0x20);
/* 'Lock-On' lamp */
- set_led_status(1, !(data & 0x10));
+ set_led_status(device->machine, 1, !(data & 0x10));
}
static const ym2203_interface ym2203_config =
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index dbfcfe2dcbb..170ccc6557b 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -99,7 +99,7 @@ static WRITE8_DEVICE_HANDLER( lordgun_eeprom_w )
logerror("%s - Unknown EEPROM bit written %02X\n",cpuexec_describe_context(device->machine),data);
}
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(device->machine, 0, data & 0x01);
// Update light guns positions
for (i = 0; i < 2; i++)
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 73b68605145..9fd6f190bf9 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -820,7 +820,7 @@ static INTERRUPT_GEN( nmi_interrupt )
static ADDRESS_MAP_START( lucky74_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* NVRAM */
+ AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* NVRAM */
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(lucky74_fg_videoram_w) AM_BASE(&lucky74_fg_videoram) /* VRAM1-1 */
AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(lucky74_fg_colorram_w) AM_BASE(&lucky74_fg_colorram) /* VRAM1-2 */
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lucky74_bg_videoram_w) AM_BASE(&lucky74_bg_videoram) /* VRAM2-1 */
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 6d9acb39b65..6a64f80c186 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -156,7 +156,7 @@ static READ8_HANDLER( payout_r )
static ADDRESS_MAP_START( ponttehk_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(lvcards_colorram_w) AM_BASE(&colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
@@ -166,7 +166,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lvcards_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(lvcards_colorram_w) AM_BASE(&colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lvpoker_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(lvcards_colorram_w) AM_BASE(&colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 15a32feaf14..faa2364400f 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -91,8 +91,8 @@ static WRITE8_HANDLER( lwings_bankswitch_w )
interrupt_enable_w(space,0,data & 0x08);
/* bits 6 and 7 are coin counters */
- coin_counter_w(1,data & 0x40);
- coin_counter_w(0,data & 0x80);
+ coin_counter_w(space->machine, 1,data & 0x40);
+ coin_counter_w(space->machine, 0,data & 0x80);
}
static INTERRUPT_GEN( lwings_interrupt )
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 629d7fdb48f..0dc1b928448 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -96,8 +96,8 @@ static WRITE16_HANDLER( m107_coincounter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
}
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 9cf90bf1250..05f3482d503 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -345,7 +345,7 @@ static VIDEO_UPDATE( m63 )
static WRITE8_HANDLER( coin_w )
{
- coin_counter_w(offset, data & 0x01);
+ coin_counter_w(space->machine, offset, data & 0x01);
}
static WRITE8_HANDLER( snd_irq_w )
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index d299c18343c..df90e671241 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -65,8 +65,8 @@ static WRITE16_HANDLER( m90_coincounter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
if (data&0xfe) logerror("Coin counter %02x\n",data);
}
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 73aff3013ff..4c9fc1d593c 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -292,8 +292,8 @@ static WRITE16_HANDLER( m92_coincounter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* Bit 0x8 is Motor(?!), used in Hook, In The Hunt, UCops */
/* Bit 0x8 is Memcard related in RTypeLeo */
/* Bit 0x40 set in Blade Master test mode input check */
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 7bd85ea1298..162801c6515 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -251,7 +251,7 @@ static WRITE16_HANDLER( magic10_out_w )
output_set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - PLAY (BET/TAKE/CANCEL) */
output_set_lamp_value(8, (data >> 8) & 1); /* Lamp 8 - PAYOUT/SUPERGAME */
- coin_counter_w(0, data & 0x400);
+ coin_counter_w(space->machine, 0, data & 0x400);
}
/***************************
@@ -263,7 +263,7 @@ static ADDRESS_MAP_START( magic10_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE(&layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE(&layer0_videoram)
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(layer2_videoram_w) AM_BASE(&layer2_videoram)
- AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x300000, 0x3001ff) AM_RAM_WRITE(paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("INPUTS")
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("DSW")
@@ -279,7 +279,7 @@ static ADDRESS_MAP_START( magic10a_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE(&layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE(&layer0_videoram)
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(layer2_videoram_w) AM_BASE(&layer2_videoram)
- AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x300000, 0x3001ff) AM_RAM_WRITE(paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("INPUTS")
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW")
@@ -295,7 +295,7 @@ static ADDRESS_MAP_START( magic102_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE(&layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE(&layer0_videoram)
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(layer2_videoram_w) AM_BASE(&layer2_videoram)
- AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x400000, 0x4001ff) AM_RAM_WRITE(paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x500000, 0x500001) AM_READ(magic102_r)
AM_RANGE(0x500004, 0x500005) AM_READNOP // gives credits
@@ -314,7 +314,7 @@ static ADDRESS_MAP_START( hotslot_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE(&layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE(&layer0_videoram)
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(layer2_videoram_w) AM_BASE(&layer2_videoram)
- AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x400000, 0x4001ff) AM_RAM_WRITE(paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x500004, 0x500005) AM_READWRITE(hotslot_copro_r, hotslot_copro_w) // copro comm
AM_RANGE(0x500006, 0x500011) AM_RAM
@@ -333,7 +333,7 @@ static ADDRESS_MAP_START( sgsafari_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE(&layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE(&layer0_videoram)
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(layer2_videoram_w) AM_BASE(&layer2_videoram)
- AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x300000, 0x3001ff) AM_RAM_WRITE(paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW1")
AM_RANGE(0x500008, 0x500009) AM_WRITE(magic10_out_w)
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 98489a61c7f..4037c594c8e 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -542,9 +542,9 @@ static WRITE8_HANDLER( mux_port_w )
dac_data_w(devtag_get_device(space->machine, "dac"), data & 0x80); /* Sound DAC */
- coin_counter_w(0, data & 0x40); /* Coin1 */
- coin_counter_w(1, data & 0x10); /* Coin2 */
- coin_counter_w(2, data & 0x20); /* Payout */
+ coin_counter_w(space->machine, 0, data & 0x40); /* Coin1 */
+ coin_counter_w(space->machine, 1, data & 0x10); /* Coin2 */
+ coin_counter_w(space->machine, 2, data & 0x20); /* Payout */
}
@@ -553,7 +553,7 @@ static WRITE8_HANDLER( mux_port_w )
*************************/
static ADDRESS_MAP_START( magicfly_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* MK48Z02B NVRAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* MK48Z02B NVRAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(magicfly_videoram_w) AM_BASE(&videoram) /* HM6116LP #1 (2K x 8) RAM (only 1st half used) */
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 0f5c5de72c6..19481d3616b 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -80,12 +80,12 @@ static WRITE8_HANDLER( mainevt_bankswitch_w )
static WRITE8_HANDLER( mainevt_coin_w )
{
- coin_counter_w(0,data & 0x10);
- coin_counter_w(1,data & 0x20);
- set_led_status(0,data & 0x01);
- set_led_status(1,data & 0x02);
- set_led_status(2,data & 0x04);
- set_led_status(3,data & 0x08);
+ coin_counter_w(space->machine, 0,data & 0x10);
+ coin_counter_w(space->machine, 1,data & 0x20);
+ set_led_status(space->machine, 0,data & 0x01);
+ set_led_status(space->machine, 1,data & 0x02);
+ set_led_status(space->machine, 2,data & 0x04);
+ set_led_status(space->machine, 3,data & 0x08);
}
static WRITE8_HANDLER( mainevt_sh_irqtrigger_w )
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index c5eaf143767..5e3aaa519bb 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( malzak2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1400, 0x14ff) AM_MIRROR(0x6000) AM_RAM AM_BASE(&malzak_s2636_0_ram)
AM_RANGE(0x1500, 0x15ff) AM_MIRROR(0x6000) AM_RAM AM_BASE(&malzak_s2636_1_ram)
AM_RANGE(0x1600, 0x16ff) AM_MIRROR(0x6000) AM_RAM_WRITE(malzak_playfield_w)
- AM_RANGE(0x1700, 0x17ff) AM_MIRROR(0x6000) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x1700, 0x17ff) AM_MIRROR(0x6000) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1800, 0x1fff) AM_MIRROR(0x6000) AM_RAM AM_BASE(&saa5050_vidram)
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_ROM
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 4dada0a9737..8d0f02fbea9 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -619,10 +619,10 @@ static READ8_HANDLER( dipB_muxi ) // dips B
static WRITE8_HANDLER( out_mux ) { mux = data & 1; }
static WRITE8_HANDLER( out_lamps )
{
- set_led_status(0,data & 1);
- set_led_status(1,data & 2);
- coin_lockout_global_w(data & 4);
- coin_counter_w(0,~data & 8);
+ set_led_status(space->machine, 0,data & 1);
+ set_led_status(space->machine, 1,data & 2);
+ coin_lockout_global_w(space->machine, data & 4);
+ coin_counter_w(space->machine, 0,~data & 8);
}
/* chip #0: player inputs, buttons, coins */
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 5a832c9b112..46907715395 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -583,14 +583,14 @@ static WRITE8_HANDLER( mastboy_bank_w )
static READ8_HANDLER( mastboy_backupram_r )
{
- return generic_nvram[offset];
+ return space->machine->generic.nvram.ptr.u8[offset];
}
static WRITE8_HANDLER( mastboy_backupram_w )
{
// if (mastboy_backupram_enabled)
// {
- generic_nvram[offset] = data;
+ space->machine->generic.nvram.ptr.u8[offset] = data;
// }
// else
// {
@@ -685,7 +685,7 @@ static ADDRESS_MAP_START( mastboy_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_READWRITE(banked_ram_r,banked_ram_w) // mastboy bank area read / write
- AM_RANGE(0xff000, 0xff7ff) AM_READWRITE(mastboy_backupram_r,mastboy_backupram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xff000, 0xff7ff) AM_READWRITE(mastboy_backupram_r,mastboy_backupram_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xff800, 0xff807) AM_READ_PORT("P1")
AM_RANGE(0xff808, 0xff80f) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index 56e1b7f5943..7ed2209a0dd 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -748,7 +748,7 @@ static WRITE8_HANDLER( m1_latch_w )
static ADDRESS_MAP_START( m1_memmap, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2000, 0x2000) AM_WRITE(reel12_w)
AM_RANGE(0x2010, 0x2010) AM_WRITE(reel34_w)
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index de4a7c0439c..58e2d0fd3ef 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -642,7 +642,7 @@ static WRITE16_HANDLER( vsync_int_ctrl )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION("maincpu", 0x80000)
AM_RANGE(0x820000, 0x820003) AM_READWRITE(maygay_8279_r, maygay_8279_w)
AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8( "ymsnd", ym2413_w, 0xff00 )
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 7dd35d6ae4d..eac18faaa22 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -77,7 +77,7 @@ static READ8_HANDLER( key_matrix_r )
static ADDRESS_MAP_START( mayumi_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1)
- AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE(mayumi_videoram_w) AM_BASE(&mayumi_videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index d701d706e6a..4773aaf7bc3 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -856,7 +856,7 @@ static WRITE8_HANDLER( zpu_led_w )
{
/* 0x6e - reset (offset = 0)*/
/* 0x6f - set */
- set_led_status(0, offset&1 );
+ set_led_status(space->machine, 0, offset&1 );
}
static WRITE8_HANDLER( zpu_lamps_w)
@@ -864,26 +864,26 @@ static WRITE8_HANDLER( zpu_lamps_w)
/* bit 4 = /LAMP0 */
/* bit 5 = /LAMP1 */
- /*set_led_status(0, (data&0x10)>>4 );*/
- /*set_led_status(1, (data&0x20)>>4 );*/
+ /*set_led_status(space->machine, 0, (data&0x10)>>4 );*/
+ /*set_led_status(space->machine, 1, (data&0x20)>>4 );*/
}
static WRITE8_HANDLER( zpu_coin_counter_w )
{
/* bit 6 = coin counter */
- coin_counter_w(offset, (data&0x40)>>6 );
+ coin_counter_w(space->machine, offset, (data&0x40)>>6 );
}
static WRITE8_HANDLER(cfb_led_w)
{
/* bit 7 - led on */
- set_led_status(2,(data&0x80)>>7);
+ set_led_status(space->machine, 2,(data&0x80)>>7);
}
static WRITE8_DEVICE_HANDLER( gg_led_ctrl_w )
{
/* bit 0, bit 1 - led on */
- set_led_status(1,data&0x01);
+ set_led_status(device->machine,1,data&0x01);
}
@@ -898,7 +898,7 @@ static WRITE8_HANDLER( vsb_ls273_audio_control_w )
vsb_ls273 = data;
/* bit 5 - led on */
- set_led_status(1,(data&0x20)>>5);
+ set_led_status(space->machine, 1,(data&0x20)>>5);
}
static READ8_DEVICE_HANDLER( soundcommand_r )
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index f2b43a1dd86..f410fe73d90 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -159,10 +159,10 @@ static WRITE16_HANDLER( mcat_coin_w )
{
if(ACCESSING_BITS_8_15)
{
- coin_counter_w(0, data & 0x1000);
- coin_counter_w(1, data & 0x2000);
- coin_lockout_w(0, ~data & 0x4000);
- coin_lockout_w(1, ~data & 0x8000);
+ coin_counter_w(space->machine, 0, data & 0x1000);
+ coin_counter_w(space->machine, 1, data & 0x2000);
+ coin_lockout_w(space->machine, 0, ~data & 0x4000);
+ coin_lockout_w(space->machine, 1, ~data & 0x8000);
}
}
#endif
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 5667e8e12bd..0883e17fb8f 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -617,7 +617,7 @@ static WRITE8_HANDLER( demoderb_op4_w )
static ADDRESS_MAP_START( cpu_90009_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x6fff) AM_ROM
- AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf000, 0xf1ff) AM_MIRROR(0x0200) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0xf400, 0xf41f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split1_w) AM_BASE(&paletteram)
AM_RANGE(0xf800, 0xf81f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split2_w) AM_BASE(&paletteram_2)
@@ -646,7 +646,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu_90010_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe000, 0xe1ff) AM_MIRROR(0x1600) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0xe800, 0xefff) AM_MIRROR(0x1000) AM_RAM_WRITE(mcr_90010_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size)
ADDRESS_MAP_END
@@ -673,7 +673,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu_91490_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe800, 0xe9ff) AM_MIRROR(0x0200) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(mcr_91490_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size)
AM_RANGE(0xf800, 0xf87f) AM_MIRROR(0x0780) AM_WRITE(mcr_91490_paletteram_w) AM_BASE(&paletteram)
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 3740c57116d..79f7df455d8 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -316,9 +316,9 @@ static WRITE8_HANDLER( powerdrv_op5_w )
/* bit 3 -> J1-10 = lamp 1 */
/* bit 2 -> J1-8 = lamp 2 */
/* bit 1 -> J1-6 = lamp 3 */
- set_led_status(0, (data >> 3) & 1);
- set_led_status(1, (data >> 2) & 1);
- set_led_status(2, (data >> 1) & 1);
+ set_led_status(space->machine, 0, (data >> 3) & 1);
+ set_led_status(space->machine, 1, (data >> 2) & 1);
+ set_led_status(space->machine, 2, (data >> 1) & 1);
/* remaining bits go to standard connections */
mcrmono_control_port_w(space, offset, data);
@@ -359,9 +359,9 @@ static WRITE8_HANDLER( stargrds_op5_w )
/* bit 2 controls light #0 */
/* bit 3 controls light #1 */
/* bit 4 controls light #2 */
- set_led_status(0, (data >> 2) & 1);
- set_led_status(1, (data >> 3) & 1);
- set_led_status(2, (data >> 4) & 1);
+ set_led_status(space->machine, 0, (data >> 2) & 1);
+ set_led_status(space->machine, 1, (data >> 3) & 1);
+ set_led_status(space->machine, 2, (data >> 4) & 1);
/* remaining bits go to standard connections */
mcrmono_control_port_w(space, offset, data);
@@ -477,7 +477,7 @@ static READ8_HANDLER( turbotag_kludge_r )
static ADDRESS_MAP_START( mcrmono_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe800, 0xe9ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0xea00, 0xebff) AM_RAM
AM_RANGE(0xec00, 0xec7f) AM_MIRROR(0x0380) AM_WRITE(mcr3_paletteram_w) AM_BASE(&paletteram)
@@ -513,7 +513,7 @@ static ADDRESS_MAP_START( spyhunt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size)
AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE(spyhunt_alpharam_w) AM_BASE(&spyhunt_alpharam)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_WRITE(mcr3_paletteram_w) AM_BASE(&paletteram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index cec4662957e..0a6c2ec75b5 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -386,7 +386,7 @@ static ADDRESS_MAP_START( trisport_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_READ(trisport_port_1_r)
AM_RANGE(0x0a0000, 0x0affff) AM_READ_PORT("DSW")
- AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x120000, 0x12007f) AM_WRITE(mcr68_paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x140000, 0x1407ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)
AM_RANGE(0x160000, 0x160fff) AM_RAM_WRITE(mcr68_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size)
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 682a2c1f3d8..cae73ff335a 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -86,7 +86,7 @@ static WRITE8_HANDLER( i8039_irqen_and_status_w )
static WRITE8_HANDLER( megazone_coin_counter_w )
{
- coin_counter_w(1-offset,data); /* 1-offset, because coin counters are in reversed order */
+ coin_counter_w(space->machine, 1-offset,data); /* 1-offset, because coin counters are in reversed order */
}
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index bf7a92a2771..70c561f5e3e 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -268,24 +268,24 @@ static const mc6845_interface mc6845_intf =
static WRITE8_DEVICE_HANDLER( led1_w )
{
/* 5 button lamps player 1 */
- set_led_status(0,~data & 0x01);
- set_led_status(1,~data & 0x02);
- set_led_status(2,~data & 0x04);
- set_led_status(3,~data & 0x08);
- set_led_status(4,~data & 0x10);
+ set_led_status(device->machine, 0,~data & 0x01);
+ set_led_status(device->machine, 1,~data & 0x02);
+ set_led_status(device->machine, 2,~data & 0x04);
+ set_led_status(device->machine, 3,~data & 0x08);
+ set_led_status(device->machine, 4,~data & 0x10);
}
static WRITE8_DEVICE_HANDLER( led2_w )
{
/* 5 button lamps player 2 */
- set_led_status(5,~data & 0x01);
- set_led_status(6,~data & 0x02);
- set_led_status(7,~data & 0x04);
- set_led_status(8,~data & 0x08);
- set_led_status(9,~data & 0x10);
+ set_led_status(device->machine, 5,~data & 0x01);
+ set_led_status(device->machine, 6,~data & 0x02);
+ set_led_status(device->machine, 7,~data & 0x04);
+ set_led_status(device->machine, 8,~data & 0x08);
+ set_led_status(device->machine, 9,~data & 0x10);
/* coin counter */
- coin_counter_w(0,0x80-(data & 0x80));
+ coin_counter_w(device->machine,0,0x80-(data & 0x80));
}
static WRITE8_DEVICE_HANDLER( misc_w )
@@ -348,7 +348,7 @@ static ADDRESS_MAP_START( casino5_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1)
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(2)
- AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x7000, 0x7000) AM_WRITE(casino5_bank_w)
AM_RANGE(0x7001, 0x7fff) AM_RAM
AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -362,7 +362,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bigappg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -374,7 +374,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dodge_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -1153,16 +1153,16 @@ static NVRAM_HANDLER(dodge)
{
if (read_or_write)
{
- mame_fwrite(file, generic_nvram, generic_nvram_size);
+ mame_fwrite(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
}
else if (file)
{
- mame_fread(file, generic_nvram, generic_nvram_size);
+ mame_fread(file, machine->generic.nvram.ptr.v, machine->generic.nvram.size);
}
else
{
- memset(generic_nvram, 0x00, generic_nvram_size);
- generic_nvram[0x1040] = 0xc9; /* ret */
+ memset(machine->generic.nvram.ptr.v, 0x00, machine->generic.nvram.size);
+ machine->generic.nvram.ptr.u8[0x1040] = 0xc9; /* ret */
}
}
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index d77049a430e..24ab83d3f38 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -565,7 +565,7 @@ static READ8_HANDLER(meritm_ds1644_r)
static ADDRESS_MAP_START( meritm_crt250_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROMBANK(1)
- AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( meritm_crt250_questions_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -573,7 +573,7 @@ static ADDRESS_MAP_START( meritm_crt250_questions_map, ADDRESS_SPACE_PROGRAM, 8
AM_RANGE(0x0000, 0x0000) AM_WRITE(meritm_crt250_questions_lo_w)
AM_RANGE(0x0001, 0x0001) AM_WRITE(meritm_crt250_questions_hi_w)
AM_RANGE(0x0002, 0x0002) AM_WRITE(meritm_crt250_questions_bank_w)
- AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( meritm_crt250_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 29870ef0da1..11dac513c2f 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -541,8 +541,8 @@ static WRITE16_HANDLER( metro_coin_lockout_1word_w )
{
if (ACCESSING_BITS_0_7)
{
-// coin_lockout_w(0, data & 1);
-// coin_lockout_w(1, data & 2);
+// coin_lockout_w(space->machine, 0, data & 1);
+// coin_lockout_w(space->machine, 1, data & 2);
}
if (data & ~3) logerror("CPU #0 PC %06X : unknown bits of coin lockout written: %04X\n",cpu_get_pc(space->cpu),data);
}
@@ -550,7 +550,7 @@ static WRITE16_HANDLER( metro_coin_lockout_1word_w )
static WRITE16_HANDLER( metro_coin_lockout_4words_w )
{
-// coin_lockout_w( (offset >> 1) & 1, offset & 1 );
+// coin_lockout_w( space->machine, (offset >> 1) & 1, offset & 1 );
if (data & ~1) logerror("CPU #0 PC %06X : unknown bits of coin lockout written: %04X\n",cpu_get_pc(space->cpu),data);
}
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index 3f61bdd72aa..ce802ad8f24 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -271,7 +271,7 @@ static ADDRESS_MAP_START( gamma_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW2") AM_WRITE(mhavoc_gamma_irq_ack_w) /* DSW at 8S, IRQ Acknowledge*/
AM_RANGE(0x4800, 0x4800) AM_WRITE(mhavoc_out_1_w) /* Coin Counters */
AM_RANGE(0x5000, 0x5000) AM_WRITE(mhavoc_alpha_w) /* Alpha Comm. Write Port */
- AM_RANGE(0x6000, 0x61ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */
+ AM_RANGE(0x6000, 0x61ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* EEROM */
AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* Program ROM (16K) */
ADDRESS_MAP_END
@@ -301,7 +301,7 @@ static ADDRESS_MAP_START( alphaone_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x10b4, 0x10b4) AM_WRITE(mhavoc_rom_banksel_w)
AM_RANGE(0x10b8, 0x10b8) AM_WRITE(mhavoc_ram_banksel_w)
AM_RANGE(0x10e0, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&mhavoc_colorram) /* ColorRAM */
- AM_RANGE(0x1800, 0x18ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */
+ AM_RANGE(0x1800, 0x18ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* EEROM */
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) /* Paged Program ROM (32K) */
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("alpha", 0x4000) /* Vector Generator RAM */
AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index 740143bb1e9..566dbd162a5 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -42,7 +42,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_r, midtunit_vram_w)
AM_RANGE(0x01000000, 0x013fffff) AM_RAM
- AM_RANGE(0x01400000, 0x0141ffff) AM_READWRITE(midtunit_cmos_r, midtunit_cmos_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x01400000, 0x0141ffff) AM_READWRITE(midtunit_cmos_r, midtunit_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x01480000, 0x014fffff) AM_WRITE(midtunit_cmos_enable_w)
AM_RANGE(0x01600000, 0x0160003f) AM_READ(midtunit_input_r)
AM_RANGE(0x01800000, 0x0187ffff) AM_RAM_WRITE(midtunit_paletteram_w) AM_BASE(&paletteram16)
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index d1955c100df..0ba05c3dfb5 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -183,13 +183,13 @@ static WRITE32_HANDLER( midvunit_cmos_protect_w )
static WRITE32_HANDLER( midvunit_cmos_w )
{
if (!cmos_protected)
- COMBINE_DATA(generic_nvram32 + offset);
+ COMBINE_DATA(space->machine->generic.nvram.ptr.u32 + offset);
}
static READ32_HANDLER( midvunit_cmos_r )
{
- return generic_nvram32[offset];
+ return space->machine->generic.nvram.ptr.u32[offset];
}
@@ -356,7 +356,7 @@ static READ32_HANDLER( bit_data_r )
{
int bit = (bit_data[bit_index / 32] >> (31 - (bit_index % 32))) & 1;
bit_index = (bit_index + 1) % 512;
- return bit ? generic_nvram32[offset] : ~generic_nvram32[offset];
+ return bit ? space->machine->generic.nvram.ptr.u32[offset] : ~space->machine->generic.nvram.ptr.u32[offset];
}
@@ -502,7 +502,7 @@ static ADDRESS_MAP_START( midvunit_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x995020, 0x995020) AM_WRITE(midvunit_cmos_protect_w)
AM_RANGE(0x997000, 0x997000) AM_NOP // communications
AM_RANGE(0x9a0000, 0x9a0000) AM_WRITE(midvunit_sound_w)
- AM_RANGE(0x9c0000, 0x9c1fff) AM_READWRITE(midvunit_cmos_r, midvunit_cmos_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x9c0000, 0x9c1fff) AM_READWRITE(midvunit_cmos_r, midvunit_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x9e0000, 0x9e7fff) AM_RAM_WRITE(midvunit_paletteram_w) AM_BASE(&paletteram32)
AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE(midvunit_textureram_r, midvunit_textureram_w) AM_BASE(&midvunit_textureram)
AM_RANGE(0xc00000, 0xffffff) AM_ROM AM_REGION("user1", 0)
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index b47c3a3e81c..f1fcd2766ab 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -103,7 +103,7 @@ Notes:
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_r, midtunit_vram_w)
AM_RANGE(0x01000000, 0x013fffff) AM_RAM
- AM_RANGE(0x01400000, 0x0145ffff) AM_READWRITE(midwunit_cmos_r, midwunit_cmos_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x01400000, 0x0145ffff) AM_READWRITE(midwunit_cmos_r, midwunit_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x01480000, 0x014fffff) AM_WRITE(midwunit_cmos_enable_w)
AM_RANGE(0x01600000, 0x0160001f) AM_READWRITE(midwunit_security_r, midwunit_security_w)
AM_RANGE(0x01680000, 0x0168001f) AM_READWRITE(midwunit_sound_r, midwunit_sound_w)
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index bca7e1b0793..7eeef4e2118 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x60c000e0, 0x60c000ff) AM_READWRITE(midwunit_security_r, midxunit_security_w)
AM_RANGE(0x80800000, 0x8080001f) AM_READWRITE(midxunit_analog_r, midxunit_analog_select_w)
AM_RANGE(0x80c00000, 0x80c000ff) AM_READWRITE(midxunit_uart_r, midxunit_uart_w)
- AM_RANGE(0xa0440000, 0xa047ffff) AM_READWRITE(midwunit_cmos_r, midxunit_cmos_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xa0440000, 0xa047ffff) AM_READWRITE(midwunit_cmos_r, midxunit_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xa0800000, 0xa08fffff) AM_READWRITE(midxunit_paletteram_r, midxunit_paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0xc0000000, 0xc00003ff) AM_READWRITE(tms34020_io_register_r, tms34020_io_register_w)
AM_RANGE(0xc0c00000, 0xc0c000ff) AM_MIRROR(0x00400000) AM_READWRITE(midtunit_dma_r, midtunit_dma_w)
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 25769c20339..2f5177750fe 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -129,7 +129,7 @@ static INTERRUPT_GEN( display_irq )
static WRITE32_HANDLER( cmos_w )
{
if (bitlatch[2] && !cmos_protected)
- COMBINE_DATA(&generic_nvram32[offset]);
+ COMBINE_DATA(&space->machine->generic.nvram.ptr.u32[offset]);
else
logerror("%06X:timekeeper_w with bitlatch[2] = %d, cmos_protected = %d\n", cpu_get_pc(space->cpu), bitlatch[2], cmos_protected);
cmos_protected = TRUE;
@@ -138,7 +138,7 @@ static WRITE32_HANDLER( cmos_w )
static READ32_HANDLER( cmos_r )
{
- return generic_nvram32[offset] | 0xffffff00;
+ return space->machine->generic.nvram.ptr.u32[offset] | 0xffffff00;
}
@@ -587,7 +587,7 @@ static ADDRESS_MAP_START( zeus_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x8d0000, 0x8d0004) AM_READWRITE(bitlatches_r, bitlatches_w)
AM_RANGE(0x990000, 0x99000f) AM_READWRITE(midway_ioasic_r, midway_ioasic_w)
AM_RANGE(0x9e0000, 0x9e0000) AM_WRITENOP // watchdog?
- AM_RANGE(0x9f0000, 0x9f7fff) AM_READWRITE(cmos_r, cmos_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x9f0000, 0x9f7fff) AM_READWRITE(cmos_r, cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x9f8000, 0x9f8000) AM_WRITE(cmos_protect_w)
AM_RANGE(0xa00000, 0xffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index c620146acf5..25ecae87c99 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -59,7 +59,7 @@ static WRITE8_HANDLER( mikie_sh_irqtrigger_w )
static WRITE8_HANDLER( mikie_coin_counter_w )
{
- coin_counter_w(offset, data);
+ coin_counter_w(space->machine, offset, data);
}
/* Memory Maps */
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index 0573feef2c8..0f10039ee83 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -237,7 +237,7 @@ static WRITE16_HANDLER( output_w )
static int i;
for(i=0;i<3;i++)
- coin_counter_w(i, data & 0x2000);
+ coin_counter_w(space->machine, i, data & 0x2000);
output_set_lamp_value(0, (data) & 1); /* HOLD1 */
output_set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */
@@ -266,7 +266,7 @@ static ADDRESS_MAP_START( mil4000_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x70801e, 0x70801f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff)
AM_RANGE(0x780000, 0x780fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16)
- AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // 2x CY62256L-70 (U7 & U8).
+ AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // 2x CY62256L-70 (U7 & U8).
ADDRESS_MAP_END
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index f3164ad0f04..5a3a74c9713 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -685,11 +685,11 @@ static WRITE8_HANDLER( missile_w )
else if (offset < 0x4900)
{
flipscreen = ~data & 0x40;
- coin_counter_w(0, data & 0x20);
- coin_counter_w(1, data & 0x10);
- coin_counter_w(2, data & 0x08);
- set_led_status(1, ~data & 0x04);
- set_led_status(0, ~data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x20);
+ coin_counter_w(space->machine, 1, data & 0x10);
+ coin_counter_w(space->machine, 2, data & 0x08);
+ set_led_status(space->machine, 1, ~data & 0x04);
+ set_led_status(space->machine, 0, ~data & 0x02);
ctrld = data & 1;
}
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 741cf9340c4..45df6c425f0 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -888,7 +888,7 @@ static ADDRESS_MAP_START( model1_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc00040, 0xc00043) AM_READWRITE(network_ctl_r, network_ctl_w)
- AM_RANGE(0xc00200, 0xc002ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc00200, 0xc002ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc40000, 0xc40001) AM_WRITE(snd_latch_to_68k_w)
AM_RANGE(0xc40002, 0xc40003) AM_READ(snd_68k_ready_r)
@@ -936,7 +936,7 @@ static ADDRESS_MAP_START( model1_vr_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc00040, 0xc00043) AM_READWRITE(network_ctl_r, network_ctl_w)
- AM_RANGE(0xc00200, 0xc002ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc00200, 0xc002ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc40000, 0xc40001) AM_WRITE(snd_latch_to_68k_w)
AM_RANGE(0xc40002, 0xc40003) AM_READ(snd_68k_ready_r)
diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c
index 4f7a1ae0814..d3f1aa81fc7 100644
--- a/src/mame/drivers/mpoker.c
+++ b/src/mame/drivers/mpoker.c
@@ -395,7 +395,7 @@ static WRITE8_HANDLER( outport5_w )
static WRITE8_HANDLER( outport6_w )
{
- coin_counter_w(1, data & 0x02); /* Payout pulse */
+ coin_counter_w(space->machine, 1, data & 0x02); /* Payout pulse */
output[6] = data;
popmessage("outport6 : %02X %02X %02X %02X %02X %02X %02X %02X", output[0], output[1], output[2], output[3], output[4], output[5], output[6], output[7]);
@@ -415,7 +415,7 @@ static WRITE8_HANDLER( outport6_w )
static WRITE8_HANDLER( outport7_w )
{
- coin_counter_w(0, data & 0x02); /* Coin pulse */
+ coin_counter_w(space->machine, 0, data & 0x02); /* Coin pulse */
output[7] = data;
popmessage("outport7 : %02X %02X %02X %02X %02X %02X %02X %02X", output[0], output[1], output[2], output[3], output[4], output[5], output[6], output[7]);
@@ -453,7 +453,7 @@ static WRITE8_HANDLER( outport7_w )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
// AM_RANGE(0x0158, 0x0158) AM_WRITE (muxed_w)
- AM_RANGE(0x3800, 0x38ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* NVRAM = 2x SCM5101E */
+ AM_RANGE(0x3800, 0x38ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* NVRAM = 2x SCM5101E */
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&mpoker_video) /* 4x MM2114N-3 */
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("SW1")
AM_RANGE(0x8001, 0x8001) AM_READ (mixport_r) /* DIP switch bank 2 + a sort of watchdog */
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 75028b3a087..d3e2c7bbd8a 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -759,10 +759,10 @@ static READ8_DEVICE_HANDLER( pia_ic5_portb_r )
{
const device_config *pia_ic5 = devtag_get_device(device->machine, "pia_ic5");
LOG(("%s: IC5 PIA Read of Port B (coin input AUX2)\n",cpuexec_describe_context(device->machine)));
- coin_lockout_w(0, (pia6821_get_output_b(pia_ic5) & 0x01) );
- coin_lockout_w(1, (pia6821_get_output_b(pia_ic5) & 0x02) );
- coin_lockout_w(2, (pia6821_get_output_b(pia_ic5) & 0x04) );
- coin_lockout_w(3, (pia6821_get_output_b(pia_ic5) & 0x08) );
+ coin_lockout_w(device->machine, 0, (pia6821_get_output_b(pia_ic5) & 0x01) );
+ coin_lockout_w(device->machine, 1, (pia6821_get_output_b(pia_ic5) & 0x02) );
+ coin_lockout_w(device->machine, 2, (pia6821_get_output_b(pia_ic5) & 0x04) );
+ coin_lockout_w(device->machine, 3, (pia6821_get_output_b(pia_ic5) & 0x08) );
return input_port_read(device->machine, "AUX2");
}
@@ -1748,7 +1748,7 @@ static TIMER_DEVICE_CALLBACK( gen_50hz )
static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0810) AM_READWRITE(characteriser_r,characteriser_w)
AM_RANGE(0x0850, 0x0850) AM_READWRITE(bankswitch_r,bankswitch_w) /* write bank (rom page select) */
@@ -1768,7 +1768,7 @@ static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( mod4_yam_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0810) AM_READWRITE(characteriser_r,characteriser_w)
@@ -1791,7 +1791,7 @@ static ADDRESS_MAP_START( mod4_yam_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( mod4_oki_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0810) AM_READWRITE(characteriser_r,characteriser_w)
@@ -1819,7 +1819,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dutch_memmap, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
// AM_RANGE(0x0800, 0x0810) AM_READWRITE(characteriser_r,characteriser_w)
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 94522e28dca..be8fbe4f321 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1474,7 +1474,7 @@ ADDRESS_MAP_END
/* TODO: Fix up MPU4 map*/
static ADDRESS_MAP_START( mpu4_6809_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("acia6850_0", acia6850_stat_r, acia6850_ctrl_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("acia6850_0", acia6850_data_r, acia6850_data_w)
@@ -1660,7 +1660,7 @@ static const mc6845_interface hd6845_intf =
static ADDRESS_MAP_START( dealem_memmap, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 670b93f1721..12c5fc24648 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -145,7 +145,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w)
AM_RANGE(0xfc0000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* System ROM */
- AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x204000, 0x2041ff) AM_DEVREADWRITE8("ensoniq", es5503_r, mquake_es5503_w, 0x00ff)
AM_RANGE(0x282000, 0x282001) AM_READ_PORT("SW.LO")
AM_RANGE(0x282002, 0x282003) AM_READ_PORT("SW.HI")
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index b0a2d35b6f3..aefc6e3e51c 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -81,7 +81,7 @@ static WRITE8_HANDLER( flip_screen_w )
static WRITE8_HANDLER( msisaac_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
#endif
static WRITE8_HANDLER( ms_unknown_w )
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 4d9db2b8f41..c624df1f2a1 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -355,7 +355,7 @@ static WRITE8_HANDLER(multfish_rtc_w)
static ADDRESS_MAP_START( multfish_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(SMH_ROM, multfish_vid_w)
AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(1), SMH_ROM )
- AM_RANGE(0xc000, 0xdff7) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xdff7) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xdff8, 0xdfff) AM_READWRITE(multfish_rtc_r, multfish_rtc_w)
AM_RANGE(0xe000, 0xffff) AM_READWRITE(bankedram_r, bankedram_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index 05ad772734b..3dab250600f 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -895,8 +895,8 @@ static MACHINE_START( maze )
static WRITE8_HANDLER( maze_coin_counter_w )
{
/* the data is not used, just pulse the counter */
- coin_counter_w(0, 0);
- coin_counter_w(0, 1);
+ coin_counter_w(space->machine, 0, 0);
+ coin_counter_w(space->machine, 0, 1);
}
@@ -2546,7 +2546,7 @@ static CUSTOM_INPUT( invaders_coin_input_r )
{
UINT32 ret = input_port_read(field->port->machine, INVADERS_COIN_INPUT_PORT_TAG);
- coin_counter_w(0, !ret);
+ coin_counter_w(field->port->machine, 0, !ret);
return ret;
}
@@ -2750,7 +2750,7 @@ static CUSTOM_INPUT( blueshrk_coin_input_r )
{
UINT32 ret = input_port_read(field->port->machine, BLUESHRK_COIN_INPUT_PORT_TAG);
- coin_counter_w(0, !ret);
+ coin_counter_w(field->port->machine, 0, !ret);
return ret;
}
@@ -2827,7 +2827,7 @@ static UINT32 invad2ct_coin_input_r(void *param)
{
UINT32 ret = input_port_read(machine, INVAD2CT_COIN_INPUT_PORT_TAG);
- coin_counter_w(0, !ret);
+ coin_counter_w(machine, 0, !ret);
return ret;
}
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index 211a3c64b68..5f779052b0a 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( namcofl_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_READWRITE(SMH_BANK(1), SMH_BANK(1))
AM_RANGE(0x10000000, 0x100fffff) AM_READWRITE(SMH_BANK(2), SMH_BANK(2))
AM_RANGE(0x20000000, 0x201fffff) AM_ROM AM_REGION("user1", 0) /* data */
- AM_RANGE(0x30000000, 0x30001fff) AM_RAM AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) /* nvram */
+ AM_RANGE(0x30000000, 0x30001fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* nvram */
AM_RANGE(0x30100000, 0x30100003) AM_WRITE(namcofl_spritebank_w)
AM_RANGE(0x30284000, 0x3028bfff) AM_READWRITE(namcofl_share_r, namcofl_share_w)
AM_RANGE(0x30300000, 0x30303fff) AM_RAM /* COMRAM */
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index c5c07941fca..d5a3c20f08f 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -377,9 +377,9 @@ static READ8_HANDLER( dsw_r )
static WRITE8_HANDLER( namcos1_coin_w )
{
- coin_lockout_global_w(~data & 1);
- coin_counter_w(0,data & 2);
- coin_counter_w(1,data & 4);
+ coin_lockout_global_w(space->machine, ~data & 1);
+ coin_counter_w(space->machine, 0,data & 2);
+ coin_counter_w(space->machine, 1,data & 4);
}
static void namcos1_update_DACs(running_machine *machine)
@@ -485,7 +485,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(20) /* banked ROM */
AM_RANGE(0xc000, 0xc000) AM_WRITE(namcos1_mcu_patch_w) /* kludge! see notes */
AM_RANGE(0xc000, 0xc7ff) AM_RAMBANK(19) /* TRIRAM (shared) */
- AM_RANGE(0xc800, 0xcfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEPROM */
+ AM_RANGE(0xc800, 0xcfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* EEPROM */
AM_RANGE(0xd000, 0xd000) AM_WRITE(namcos1_dac0_w)
AM_RANGE(0xd400, 0xd400) AM_WRITE(namcos1_dac1_w)
AM_RANGE(0xd800, 0xd800) AM_WRITE(namcos1_mcu_bankswitch_w) /* ROM bank selector */
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index e46d9755814..a6aedc2af7f 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1117,9 +1117,9 @@ static WRITE32_HANDLER( system11gun_w )
if( ACCESSING_BITS_0_15 )
{
/* start 1 */
- set_led_status(0, !(data & 0x08));
+ set_led_status(space->machine, 0, !(data & 0x08));
/* start 2 */
- set_led_status(1, !(data & 0x04));
+ set_led_status(space->machine, 1, !(data & 0x04));
/* blowback 1 */
/* !(data & 0x02) */
/* blowback 2 */
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index a27978f0314..aaba7138d7c 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -2591,7 +2591,7 @@ static WRITE8_HANDLER( mcu_port5_w )
if (!strcmp(space->machine->gamedrv->name, "propcycl"))
{
output_set_value("fan0", data & 1);
- set_led_status(0, data & 2);
+ set_led_status(space->machine, 0, data & 2);
}
}
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 3ce53e07cf3..0764689ca4c 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -300,15 +300,15 @@ static WRITE8_HANDLER( watchdog2_w )
static WRITE8_HANDLER( namcos86_coin_w )
{
- coin_lockout_global_w(data & 1);
- coin_counter_w(0,~data & 2);
- coin_counter_w(1,~data & 4);
+ coin_lockout_global_w(space->machine, data & 1);
+ coin_counter_w(space->machine, 0,~data & 2);
+ coin_counter_w(space->machine, 1,~data & 4);
}
static WRITE8_HANDLER( namcos86_led_w )
{
- set_led_status(0,data & 0x08);
- set_led_status(1,data & 0x10);
+ set_led_status(space->machine, 0,data & 0x08);
+ set_led_status(space->machine, 1,data & 0x10);
}
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 7a5f70414c8..654dea18ac9 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -324,8 +324,8 @@ ADDRESS_MAP_END
static WRITE8_HANDLER( barline_output_w )
{
- coin_lockout_w(0,~data & 0x80);
- coin_counter_w(0,data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x80);
+ coin_counter_w(space->machine, 0,data & 0x02);
}
static ADDRESS_MAP_START( barline_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 8246ea0101a..fbd343d16ad 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -126,7 +126,7 @@ static WRITE16_HANDLER( gx400_irq1_enable_word_w )
nemesis_irq1_on = data & 0x0001;
if (ACCESSING_BITS_8_15)
- coin_lockout_w(1, data & 0x0100);
+ coin_lockout_w(space->machine, 1, data & 0x0100);
}
static WRITE16_HANDLER( gx400_irq2_enable_word_w )
@@ -135,7 +135,7 @@ static WRITE16_HANDLER( gx400_irq2_enable_word_w )
nemesis_irq2_on = data & 0x0001;
if (ACCESSING_BITS_8_15)
- coin_lockout_w(0, data & 0x0100);
+ coin_lockout_w(space->machine, 0, data & 0x0100);
}
static WRITE16_HANDLER( gx400_irq4_enable_word_w )
@@ -150,7 +150,7 @@ static WRITE16_HANDLER( nemesis_irq_enable_word_w )
nemesis_irq_on = data & 0xff;
if (ACCESSING_BITS_8_15)
- coin_lockout_global_w(data & 0x0100);
+ coin_lockout_global_w(space->machine, data & 0x0100);
}
static WRITE16_HANDLER( konamigt_irq_enable_word_w )
@@ -159,7 +159,7 @@ static WRITE16_HANDLER( konamigt_irq_enable_word_w )
nemesis_irq_on = data & 0xff;
if (ACCESSING_BITS_8_15)
- coin_lockout_w(1, data & 0x0100);
+ coin_lockout_w(space->machine, 1, data & 0x0100);
}
static WRITE16_HANDLER( konamigt_irq2_enable_word_w )
@@ -168,7 +168,7 @@ static WRITE16_HANDLER( konamigt_irq2_enable_word_w )
nemesis_irq2_on = data & 0xff;
if (ACCESSING_BITS_8_15)
- coin_lockout_w(0, data & 0x0100);
+ coin_lockout_w(space->machine, 0, data & 0x0100);
}
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 752fe05d200..2f41e7e032e 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -583,7 +583,7 @@ static CUSTOM_INPUT( get_memcard_status )
{
/* D0 and D1 are memcard presence indicators, D2 indicates memcard
write protect status (we are always write enabled) */
- return (memcard_present() == -1) ? 0x07 : 0x00;
+ return (memcard_present(field->port->machine) == -1) ? 0x07 : 0x00;
}
@@ -591,7 +591,7 @@ static READ16_HANDLER( memcard_r )
{
UINT16 ret;
- if (memcard_present() != -1)
+ if (memcard_present(space->machine) != -1)
ret = memcard_data[offset] | 0xff00;
else
ret = 0xffff;
@@ -604,7 +604,7 @@ static WRITE16_HANDLER( memcard_w )
{
if (ACCESSING_BITS_0_7)
{
- if (memcard_present() != -1)
+ if (memcard_present(space->machine) != -1)
memcard_data[offset] = data;
}
}
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 9369e8544b8..372d8813110 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -273,7 +273,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( niyanpai_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0a0000, 0x0a08ff) AM_READWRITE(niyanpai_palette_r,niyanpai_palette_w)
AM_RANGE(0x0a0900, 0x0a11ff) AM_RAM // palette work ram?
@@ -313,7 +313,7 @@ static ADDRESS_MAP_START( musobana_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0a0000, 0x0a08ff) AM_READWRITE(niyanpai_palette_r,niyanpai_palette_w)
AM_RANGE(0x0a0900, 0x0a11ff) AM_RAM // palette work ram?
- AM_RANGE(0x0a8000, 0x0a87ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0a8000, 0x0a87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0bf800, 0x0bffff) AM_RAM
AM_RANGE(0x200000, 0x200001) AM_WRITE(niyanpai_sound_w)
@@ -352,7 +352,7 @@ static ADDRESS_MAP_START( mhhonban_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x060900, 0x0611ff) AM_RAM // palette work ram?
AM_RANGE(0x07f800, 0x07ffff) AM_RAM
- AM_RANGE(0x0a8000, 0x0a87ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0a8000, 0x0a87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0bf000, 0x0bffff) AM_RAM
AM_RANGE(0x200000, 0x200001) AM_WRITE(niyanpai_sound_w)
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index b37e32f250b..208c6bbc262 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -1262,9 +1262,9 @@ static WRITE8_DEVICE_HANDLER( counterlamps_w )
output_set_lamp_value(10, (data >> 0) & 1); /* HI lamp */
output_set_lamp_value(11, (data >> 1) & 1); /* LO lamp */
- coin_counter_w(0, data & 0x10); /* Coin1/3 counter */
- coin_counter_w(1, data & 0x20); /* Coin2 counter */
- coin_counter_w(2, data & 0x08); /* Payout pulse */
+ coin_counter_w(device->machine, 0, data & 0x10); /* Coin1/3 counter */
+ coin_counter_w(device->machine, 1, data & 0x20); /* Coin2 counter */
+ coin_counter_w(device->machine, 2, data & 0x08); /* Payout pulse */
}
@@ -1367,7 +1367,7 @@ static READ8_HANDLER( test2_r )
static ADDRESS_MAP_START( norautp_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* 6116 */
+ AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* 6116 */
ADDRESS_MAP_END
static ADDRESS_MAP_START( norautp_portmap, ADDRESS_SPACE_IO, 8 )
@@ -1398,24 +1398,24 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( nortest1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x2fff) AM_ROM
- AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( norautxp_map, ADDRESS_SPACE_PROGRAM, 8 )
// ADDRESS_MAP_GLOBAL_MASK(~0x4000)
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM /* need to be checked */
- AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* HM6116 */
+ AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* HM6116 */
ADDRESS_MAP_END
static ADDRESS_MAP_START( norautx4_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM /* need to be checked */
- AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* 6116 */
+ AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* 6116 */
ADDRESS_MAP_END
static ADDRESS_MAP_START( norautx8_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* need to be checked */
- AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* 6116 */
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* 6116 */
ADDRESS_MAP_END
static ADDRESS_MAP_START( norautxp_portmap, ADDRESS_SPACE_IO, 8 )
@@ -1428,20 +1428,20 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dphl_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* should be 2x 0x100 segments (4x 2111) */
+ AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* should be 2x 0x100 segments (4x 2111) */
ADDRESS_MAP_END
static ADDRESS_MAP_START( dphla_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x23ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2000, 0x23ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( dphltest_map, ADDRESS_SPACE_PROGRAM, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7fff) AM_RAM
- AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
/*
@@ -1462,7 +1462,7 @@ DPHLA
static ADDRESS_MAP_START( drhl_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x5400, 0x57ff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 74c1fd2748a..a2be17c4549 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -530,7 +530,7 @@ static ADDRESS_MAP_START( nyny_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&nyny_videoram_2)
AM_RANGE(0x6000, 0x7fff) AM_RAM AM_BASE(&nyny_colorram_2)
AM_RANGE(0x8000, 0x9fff) AM_RAM
- AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* SRAM (coin counter, shown when holding F2) */
+ AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* SRAM (coin counter, shown when holding F2) */
AM_RANGE(0xa100, 0xa100) AM_MIRROR(0x00fe) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0xa101, 0xa101) AM_MIRROR(0x00fe) AM_DEVWRITE("crtc", mc6845_register_w)
AM_RANGE(0xa200, 0xa20f) AM_MIRROR(0x00f0) AM_READWRITE(nyny_pia_1_2_r, nyny_pia_1_2_w)
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 2e95f1c1bfb..8d8cec88b09 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -52,8 +52,8 @@ static WRITE16_HANDLER( ohmygod_ctrl_w )
}
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(0,data & 0x1000);
- coin_counter_w(1,data & 0x2000);
+ coin_counter_w(space->machine, 0,data & 0x1000);
+ coin_counter_w(space->machine, 1,data & 0x2000);
}
}
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index 76dba45813f..23e8f8ef688 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -211,12 +211,12 @@ static READ8_HANDLER( ccasino_dipsw4_r )
static WRITE8_HANDLER( ojankoy_coinctr_w )
{
- coin_counter_w( 0, (data & 0x01));
+ coin_counter_w( space->machine, 0, (data & 0x01));
}
static WRITE8_HANDLER( ccasino_coinctr_w )
{
- coin_counter_w(0, (data & 0x02));
+ coin_counter_w(space->machine, 0, (data & 0x02));
}
@@ -224,7 +224,7 @@ static ADDRESS_MAP_START( ojankohs_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(ojankohs_videoram_w)
AM_RANGE(0x9000, 0x9fff) AM_RAM_WRITE(ojankohs_colorram_w)
- AM_RANGE(0xa000, 0xb7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xa000, 0xb7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xb800, 0xbfff) AM_RAM_WRITE(ojankohs_palette_w)
AM_RANGE(0xc000, 0xffff) AM_ROMBANK(1)
ADDRESS_MAP_END
@@ -234,14 +234,14 @@ static ADDRESS_MAP_START( ojankoy_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE(ojankohs_videoram_w)
AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(ojankohs_colorram_w)
- AM_RANGE(0xb000, 0xbfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xb000, 0xbfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc000, 0xffff) AM_ROMBANK(1)
ADDRESS_MAP_END
static ADDRESS_MAP_START( ojankoc_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
- AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) AM_WRITE(ojankoc_videoram_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 35280119e10..94704a0f78a 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -301,14 +301,14 @@ static READ8_HANDLER( omegrace_spinner1_r )
static WRITE8_HANDLER( omegrace_leds_w )
{
/* bits 0 and 1 are coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bits 2 to 5 are the start leds (4 and 5 cocktail only) */
- set_led_status(0,~data & 0x04);
- set_led_status(1,~data & 0x08);
- set_led_status(2,~data & 0x10);
- set_led_status(3,~data & 0x20);
+ set_led_status(space->machine, 0,~data & 0x04);
+ set_led_status(space->machine, 1,~data & 0x08);
+ set_led_status(space->machine, 2,~data & 0x10);
+ set_led_status(space->machine, 3,~data & 0x20);
/* bit 6 flips screen (not supported) */
}
@@ -331,7 +331,7 @@ static WRITE8_HANDLER( omegrace_soundlatch_w )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4bff) AM_RAM
- AM_RANGE(0x5c00, 0x5cff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* NVRAM */
+ AM_RANGE(0x5c00, 0x5cff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* NVRAM */
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x8000) /* vector ram */
AM_RANGE(0x9000, 0x9fff) AM_ROM /* vector rom */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 2f0336782a4..d72c35bc6c0 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -75,8 +75,8 @@ static WRITE8_HANDLER( onetwo_cpubank_w )
static WRITE8_HANDLER( onetwo_coin_counters_w )
{
watchdog_reset(space->machine);
- coin_counter_w(0, data & 0x02);
- coin_counter_w(1, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x04);
}
static WRITE8_HANDLER( onetwo_soundlatch_w )
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 75d463d92f1..b4bcd8a8eec 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -81,11 +81,11 @@ static void update_misc_flags(running_machine *machine, UINT8 val)
discrete_sound_w(discrete, ORBIT_WARNING_EN, orbit_misc_flags & 0x80);
- set_led_status(0, orbit_misc_flags & 0x08);
- set_led_status(1, orbit_misc_flags & 0x40);
+ set_led_status(machine, 0, orbit_misc_flags & 0x08);
+ set_led_status(machine, 1, orbit_misc_flags & 0x40);
- coin_lockout_w(0, !(orbit_misc_flags & 0x02));
- coin_lockout_w(1, !(orbit_misc_flags & 0x02));
+ coin_lockout_w(machine, 0, !(orbit_misc_flags & 0x02));
+ coin_lockout_w(machine, 1, !(orbit_misc_flags & 0x02));
}
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index f4d9e446c14..660cb3fd58e 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -53,10 +53,10 @@ static WRITE16_HANDLER( coinctrl_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
- coin_lockout_w(0,~data & 4);
- coin_lockout_w(1,~data & 8);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
+ coin_lockout_w(space->machine, 0,~data & 4);
+ coin_lockout_w(space->machine, 1,~data & 8);
}
}
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 0ca85e7e1f7..5ebdbddcb9e 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -360,8 +360,8 @@ static WRITE16_HANDLER( othunder_TC0220IOC_w )
0x000000 eeprom in data
x0000000 eeprom out data */
- set_led_status(0, data & 1);
- set_led_status(1, data & 2);
+ set_led_status(space->machine, 0, data & 1);
+ set_led_status(space->machine, 1, data & 2);
if (data & 4)
popmessage("OBPRI SET!");
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index e703ce58485..e92db4b9154 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -167,9 +167,9 @@ static WRITE16_HANDLER( cpuA_ctrl_w )
/* bit 1 is clear during service mode - function unknown */
- set_led_status(0, data & 0x08);
- coin_counter_w(0, data & 0x10);
- coin_counter_w(1, data & 0x20);
+ set_led_status(space->machine, 0, data & 0x08);
+ coin_counter_w(space->machine, 0, data & 0x10);
+ coin_counter_w(space->machine, 1, data & 0x20);
//logerror("%06x: write %04x to cpuA_ctrl_w\n",cpu_get_pc(space->cpu),data);
}
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index e599a629231..40569da5c3b 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -219,15 +219,15 @@ static READ8_HANDLER( pacland_input_r )
static WRITE8_HANDLER( pacland_coin_w )
{
- coin_lockout_global_w(data & 1);
- coin_counter_w(0, ~data & 2);
- coin_counter_w(1, ~data & 4);
+ coin_lockout_global_w(space->machine, data & 1);
+ coin_counter_w(space->machine, 0, ~data & 2);
+ coin_counter_w(space->machine, 1, ~data & 4);
}
static WRITE8_HANDLER( pacland_led_w )
{
- set_led_status(0, data & 0x08);
- set_led_status(1, data & 0x10);
+ set_led_status(space->machine, 0, data & 0x08);
+ set_led_status(space->machine, 1, data & 0x10);
}
static WRITE8_HANDLER( pacland_irq_1_ctrl_w )
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index cc5d009f5db..c57ba028d21 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -500,19 +500,19 @@ static WRITE8_HANDLER( nmouse_interrupt_vector_w)
static WRITE8_HANDLER( pacman_leds_w )
{
- set_led_status(offset,data & 1);
+ set_led_status(space->machine, offset,data & 1);
}
static WRITE8_HANDLER( pacman_coin_counter_w )
{
- coin_counter_w(offset,data & 1);
+ coin_counter_w(space->machine, offset,data & 1);
}
static WRITE8_HANDLER( pacman_coin_lockout_global_w )
{
- coin_lockout_global_w(~data & 0x01);
+ coin_lockout_global_w(space->machine, ~data & 0x01);
}
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 1e802a7b50d..a28c26910d3 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -61,9 +61,9 @@ static WRITE8_HANDLER( pandoras_int_control_w )
cputag_set_input_line(space->machine, "maincpu", M6809_IRQ_LINE, CLEAR_LINE);
state->irq_enable_a = data;
break;
- case 0x02: coin_counter_w(0,data & 0x01);
+ case 0x02: coin_counter_w(space->machine, 0,data & 0x01);
break;
- case 0x03: coin_counter_w(1,data & 0x01);
+ case 0x03: coin_counter_w(space->machine, 1,data & 0x01);
break;
case 0x05: pandoras_flipscreen_w(space, 0, data);
break;
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 3c83573239c..531fd23c921 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -64,7 +64,7 @@ static WRITE8_DEVICE_HANDLER( paradise_okibank_w )
static WRITE8_HANDLER( torus_coin_counter_w )
{
- coin_counter_w(0, data ^ 0xff);
+ coin_counter_w(space->machine, 0, data ^ 0xff);
}
#define STANDARD_MAP \
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 2a79b6ada33..c57ac29cc39 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -85,8 +85,8 @@ static WRITE8_HANDLER( parodius_3fc0_w )
if ((data & 0xf4) != 0x10) logerror("%04x: 3fc0 = %02x\n",cpu_get_pc(space->cpu),data);
/* bit 0/1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 3 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line( ( data & 0x08 ) ? ASSERT_LINE : CLEAR_LINE );
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index 1d835f49820..46b097df525 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -73,8 +73,8 @@ static WRITE8_HANDLER( coin_w )
intenable = data & 0x0c;
/* bit 0/1 = coin counters */
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
/* other bits unknown */
}
@@ -110,7 +110,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( merlinmm_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x5400, 0x57ff) AM_RAM
AM_RANGE(0x6000, 0x6007) AM_WRITENOP /* solenoid writes */
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("IN4")
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index d7af8af7658..f3317084d33 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -77,13 +77,13 @@ static WRITE16_HANDLER( pkscramble_output_w )
interrupt_line_active = 0;
}
- coin_counter_w(0, data & 0x80);
+ coin_counter_w(space->machine, 0, data & 0x80);
}
static ADDRESS_MAP_START( pkscramble_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0x7ffff)
AM_RANGE(0x000000, 0x01ffff) AM_ROM
- AM_RANGE(0x040000, 0x0400ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x040000, 0x0400ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x041000, 0x043fff) AM_RAM // main ram
AM_RANGE(0x044000, 0x044fff) AM_RAM_WRITE(pkscramble_fgtilemap_w) AM_BASE(&pkscramble_fgtilemap_ram) // fg tilemap
AM_RANGE(0x045000, 0x045fff) AM_RAM_WRITE(pkscramble_mdtilemap_w) AM_BASE(&pkscramble_mdtilemap_ram) // md tilemap (just a copy of fg?)
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 86afdd7d6d9..392369ecb4e 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -57,8 +57,8 @@ static WRITE16_HANDLER( coinctrl_w )
{
if (ACCESSING_BITS_8_15)
{
- coin_counter_w(0,data & 0x0100);
- coin_counter_w(1,data & 0x0200);
+ coin_counter_w(space->machine, 0,data & 0x0100);
+ coin_counter_w(space->machine, 1,data & 0x0200);
}
if (data & 0xfcff)
logerror("Writing %04x to unknown coin control bits\n",data);
@@ -110,10 +110,10 @@ static WRITE16_HANDLER( wbeachvl_coin_eeprom_w )
if (ACCESSING_BITS_0_7)
{
/* bits 0-3 are coin counters? (only 0 used?) */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
- coin_counter_w(2,data & 0x04);
- coin_counter_w(3,data & 0x08);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
+ coin_counter_w(space->machine, 2,data & 0x04);
+ coin_counter_w(space->machine, 3,data & 0x08);
/* bits 5-7 control EEPROM */
eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE);
@@ -126,7 +126,7 @@ static WRITE16_HANDLER( hotmind_coin_eeprom_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x20);
eeprom_set_cs_line((data & 1) ? CLEAR_LINE : ASSERT_LINE);
eeprom_write_bit(data & 4);
@@ -136,8 +136,8 @@ static WRITE16_HANDLER( hotmind_coin_eeprom_w )
static WRITE16_HANDLER( hrdtimes_coin_w )
{
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
static WRITE16_HANDLER( playmark_snd_command_w )
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index e6146f6f909..b97dc69f326 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -361,15 +361,15 @@ static CUSTOM_INPUT( auto_start_r ) { return auto_start_mask; }
static WRITE8_DEVICE_HANDLER( out_0 )
{
// no start lamps in pole position
-// set_led_status(1,data & 1);
-// set_led_status(0,data & 2);
- coin_counter_w(1,~data & 4);
- coin_counter_w(0,~data & 8);
+// set_led_status(device->machine, 1,data & 1);
+// set_led_status(device->machine, 0,data & 2);
+ coin_counter_w(device->machine, 1,~data & 4);
+ coin_counter_w(device->machine, 0,~data & 8);
}
static WRITE8_DEVICE_HANDLER( out_1 )
{
- coin_lockout_global_w(data & 1);
+ coin_lockout_global_w(device->machine, data & 1);
}
static const namco_51xx_interface namco_51xx_intf =
@@ -480,7 +480,7 @@ static MACHINE_RESET( polepos )
static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
- AM_RANGE(0x3000, 0x37ff) AM_MIRROR(0x0800) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* Battery Backup */
+ AM_RANGE(0x3000, 0x37ff) AM_MIRROR(0x0800) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* Battery Backup */
AM_RANGE(0x4000, 0x47ff) AM_READWRITE(polepos_sprite_r, polepos_sprite_w) /* Motion Object */
AM_RANGE(0x4800, 0x4bff) AM_READWRITE(polepos_road_r, polepos_road_w) /* Road Memory */
AM_RANGE(0x4c00, 0x4fff) AM_READWRITE(polepos_alpha_r, polepos_alpha_w) /* Alphanumeric (char ram) */
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 0eb282a4941..a61e164f133 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -55,9 +55,9 @@ static WRITE8_HANDLER( poolshrk_da_latch_w )
static WRITE8_HANDLER( poolshrk_led_w )
{
if (offset & 2)
- set_led_status(0, offset & 1);
+ set_led_status(space->machine, 0, offset & 1);
if (offset & 4)
- set_led_status(1, offset & 1);
+ set_led_status(space->machine, 1, offset & 1);
}
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index eedc9a8f184..d37d1a77653 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -104,13 +104,13 @@ static WRITE8_HANDLER( portrait_ctrl_w )
{
/* bits 4 and 5 are unknown */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
- coin_counter_w(2, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 2, data & 0x04);
/* the 2 lamps near the camera */
- set_led_status(0, data & 0x08);
- set_led_status(1, data & 0x40);
+ set_led_status(space->machine, 0, data & 0x08);
+ set_led_status(space->machine, 1, data & 0x40);
/* shows the black and white photo from the camera */
output_set_value("photo", (data >> 7) & 1);
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( portrait_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa010, 0xa010) AM_READ_PORT("INPUTS")
AM_RANGE(0xa018, 0xa018) AM_READWRITE(SMH_NOP, portrait_positive_scroll_w)
AM_RANGE(0xa019, 0xa019) AM_WRITE(portrait_negative_scroll_w)
- AM_RANGE(0xa800, 0xa83f) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xa800, 0xa83f) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xffff, 0xffff) AM_READNOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 7a8155a83ee..88627c6d4b1 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -65,7 +65,7 @@ static WRITE16_HANDLER( magicstk_coin_eeprom_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x20);
eeprom_set_cs_line((data & 8) ? CLEAR_LINE : ASSERT_LINE);
eeprom_write_bit(data & 2);
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index ae6c5847e25..a5fae2680e2 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -156,8 +156,8 @@ static WRITE8_HANDLER( ppmast93_port4_w )
UINT8 *rom = memory_region(space->machine, "maincpu");
int bank;
- coin_counter_w(0, data & 0x08);
- coin_counter_w(1, data & 0x10);
+ coin_counter_w(space->machine, 0, data & 0x08);
+ coin_counter_w(space->machine, 1, data & 0x10);
bank = data & 0x07;
memory_set_bankptr(space->machine, 1,&rom[0x10000+(bank*0x4000)]);
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index b90fb5eda7b..4b25f00f92e 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -398,8 +398,8 @@ static WRITE8_HANDLER( bombsa_bankselect_w )
static WRITE8_HANDLER( psychic5_coin_counter_w )
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
// bit 7 toggles flip screen
if (data & 0x80)
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index a0b5d7ae054..c2c800db9b4 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -338,7 +338,7 @@ static WRITE8_HANDLER( spunchout_exp_w )
static ADDRESS_MAP_START( punchout_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xdff0, 0xdff7) AM_RAM AM_BASE(&punchout_spr1_ctrlram)
AM_RANGE(0xdff8, 0xdffc) AM_RAM AM_BASE(&punchout_spr2_ctrlram)
@@ -352,7 +352,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( armwrest_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xdff0, 0xdff7) AM_RAM AM_BASE(&punchout_spr1_ctrlram)
AM_RANGE(0xdff8, 0xdffc) AM_RAM AM_BASE(&punchout_spr2_ctrlram)
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 81867c53676..f0e3ed7747c 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -44,8 +44,8 @@ static WRITE16_HANDLER( pushman_flipscreen_w )
if (ACCESSING_BITS_8_15)
{
flip_screen_set(space->machine, data & 0x0200);
- coin_counter_w(0, data & 0x4000);
- coin_counter_w(1, data & 0x8000);
+ coin_counter_w(space->machine, 0, data & 0x4000);
+ coin_counter_w(space->machine, 1, data & 0x8000);
}
}
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 11097f30a94..c3835c89057 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -82,7 +82,7 @@ static WRITE16_HANDLER( gp_control_w )
if (control & 0x0100)
{
- int vol = generic_nvram16[0x10] & 0xff;
+ int vol = space->machine->generic.nvram.ptr.u16[0x10] & 0xff;
if (vol)
{
const device_config *k054539 = devtag_get_device(space->machine, "konami");
@@ -112,7 +112,7 @@ static WRITE16_HANDLER( gp2_control_w )
if (control & 0x0100)
{
- int vol = generic_nvram16[0x8] & 0xff;
+ int vol = space->machine->generic.nvram.ptr.u16[0x8] & 0xff;
if (vol)
{
const device_config *k054539 = devtag_get_device(space->machine, "konami");
@@ -332,7 +332,7 @@ static void gp2_ide_interrupt(const device_config *device, int state)
static ADDRESS_MAP_START( qdrmfgp_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&workram) /* work ram */
- AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) /* backup ram */
+ AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* backup ram */
AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)
AM_RANGE(0x300000, 0x30003f) AM_WRITE(K056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_READWRITE(K053252_word_r,K053252_word_w) /* ccu */
@@ -355,7 +355,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( qdrmfgp2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x110fff) AM_RAM AM_BASE(&workram) /* work ram */
- AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) /* backup ram */
+ AM_RANGE(0x180000, 0x183fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* backup ram */
AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)
AM_RANGE(0x300000, 0x30003f) AM_WRITE(K056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_READWRITE(K053252_word_r,K053252_word_w) /* ccu */
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 5d582a11d4a..92ceaca1abc 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -89,14 +89,14 @@ static WRITE16_HANDLER( led_w )
if (ACCESSING_BITS_0_7)
{
/* bits 0 and 1 are coin counters */
- coin_counter_w(0, data & 2);
- coin_counter_w(1, data & 1);
+ coin_counter_w(space->machine, 0, data & 2);
+ coin_counter_w(space->machine, 1, data & 1);
/* bit 3 = select second trackball for cocktail mode? */
/* bits 4 and 5 are LED controls */
- set_led_status(0, data & 0x10);
- set_led_status(1, data & 0x20);
+ set_led_status(space->machine, 0, data & 0x10);
+ set_led_status(space->machine, 1, data & 0x20);
/* bits 6 and 7 flip screen */
avg_set_flip_x (data & 0x40);
@@ -118,7 +118,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0x801fff) AM_RAM AM_BASE(&quantum_vectorram) AM_SIZE(&vectorram_size)
AM_RANGE(0x840000, 0x84001f) AM_DEVREADWRITE8("pokey1", pokey_r, pokey_w, 0x00ff)
AM_RANGE(0x840020, 0x84003f) AM_DEVREADWRITE8("pokey2", pokey_r, pokey_w, 0x00ff)
- AM_RANGE(0x900000, 0x9001ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x900000, 0x9001ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x940000, 0x940001) AM_READ(trackball_r) /* trackball */
AM_RANGE(0x948000, 0x948001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x950000, 0x95001f) AM_WRITE(SMH_RAM) AM_BASE(&quantum_colorram)
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 4beff95a56c..59bef2be478 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -412,7 +412,7 @@ static ADDRESS_MAP_START( r2dtank_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8004, 0x8004) AM_READWRITE(audio_answer_r, audio_command_w)
AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0xb001, 0xb001) AM_DEVWRITE("crtc", mc6845_register_w)
- AM_RANGE(0xc000, 0xc007) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xc007) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc800, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 2150c22e152..c1fb35b5e19 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -258,19 +258,19 @@ static WRITE8_HANDLER( rallyx_latch_w )
break;
case 0x04:
- set_led_status(0,bit);
+ set_led_status(space->machine, 0,bit);
break;
case 0x05:
- set_led_status(1,bit);
+ set_led_status(space->machine, 1,bit);
break;
case 0x06:
- coin_lockout_w(0,!bit);
+ coin_lockout_w(space->machine, 0,!bit);
break;
case 0x07:
- coin_counter_w(0,bit);
+ coin_counter_w(space->machine, 0,bit);
break;
}
}
@@ -299,14 +299,14 @@ static WRITE8_HANDLER( locomotn_latch_w )
break;
case 0x04: /* OUT1 */
- coin_counter_w(0,bit);
+ coin_counter_w(space->machine, 0,bit);
break;
case 0x05: /* OUT2 */
break;
case 0x06: /* OUT3 */
- coin_counter_w(1,bit);
+ coin_counter_w(space->machine, 1,bit);
break;
case 0x07: /* STARSON */
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index afe8afb5668..aa639939c20 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -99,8 +99,8 @@ static WRITE16_HANDLER( latch_w )
{
if (data & 0x1000)
logerror("Color bank set to 1!\n");
- coin_counter_w(0, (data >> 9) & 1);
- coin_counter_w(1, (data >> 8) & 1);
+ coin_counter_w(space->machine, 0, (data >> 9) & 1);
+ coin_counter_w(space->machine, 1, (data >> 8) & 1);
}
/* lower byte being modified? */
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index 955419bdfa2..73a455714ce 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -209,7 +209,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mem_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0000, 0xbfff) AM_READ (rom_r)
- AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe000, 0xe000) AM_WRITE(TMS9928A_vram_w)
AM_RANGE(0xe001, 0xe001) AM_WRITE(TMS9928A_register_w)
AM_RANGE(0xe800, 0xe801) AM_DEVWRITE("ay_re900", ay8910_address_data_w)
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index e42d165e5f5..9f34ff6be9d 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -91,12 +91,12 @@ static WRITE8_HANDLER( irq1_ack_w )
static WRITE8_HANDLER( coincounter_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
}
static WRITE8_HANDLER( coinlockout_w )
{
- coin_lockout_w(0,~data & 1);
+ coin_lockout_w(space->machine, 0,~data & 1);
}
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 48c6c682682..6db9c17a170 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -147,8 +147,8 @@ static WRITE8_HANDLER( ctrl_w )
// (data & 0x02) is switched on and off in service mode
- coin_lockout_w(0, ~data & 0x04);
- coin_counter_w(0, data & 0x08);
+ coin_lockout_w(space->machine, 0, ~data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x08);
// (data & 0x10) is medal in service mode
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index fdfe153bfea..afcb99598d9 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -76,8 +76,8 @@ static WRITE8_HANDLER( rockrage_bankswitch_w )
memory_set_bankptr(space->machine, 1,&RAM[bankaddress]);
/* bits 0 & 1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* other bits unknown */
}
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index cd88e929bcd..d2483f96942 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -34,8 +34,8 @@ static WRITE8_HANDLER( rollerg_0010_w )
logerror("%04x: write %02x to 0010\n",cpu_get_pc(space->cpu),data);
/* bits 0/1 are coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 enables 051316 ROM reading */
readzoomroms = data & 0x04;
diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c
index 9777c9f9d14..03b3e02118f 100644
--- a/src/mame/drivers/roul.c
+++ b/src/mame/drivers/roul.c
@@ -153,7 +153,7 @@ static WRITE8_HANDLER( ball_w )
static ADDRESS_MAP_START( roul_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( roul_cpu_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 16f57485187..1ea09f847a4 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -159,7 +159,7 @@ static PALETTE_INIT( mjderngr )
static WRITE8_HANDLER( royalmah_palbank_w )
{
/* bit 1 = coin counter */
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
/* bit 2 always set? */
@@ -171,7 +171,7 @@ static WRITE8_HANDLER( royalmah_palbank_w )
static WRITE8_HANDLER( mjderngr_coin_w )
{
/* bit 1 = coin counter */
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
/* bit 2 always set? */
}
@@ -316,8 +316,8 @@ static WRITE8_HANDLER( mjapinky_palbank_w )
{
flip_screen_set(space->machine, ~data & 4);
palette_base = (data >> 3) & 0x01;
- coin_counter_w(0,data & 2); // in
- coin_counter_w(1,data & 1); // out
+ coin_counter_w(space->machine, 0,data & 2); // in
+ coin_counter_w(space->machine, 1,data & 1); // out
}
static READ8_HANDLER( mjapinky_dsw_r )
@@ -421,7 +421,7 @@ static WRITE8_HANDLER ( mjclub_bank_w )
static ADDRESS_MAP_START( royalmah_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( SMH_ROM, royalmah_rom_w )
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) ) // banked ROMs not present in royalmah
AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram)
ADDRESS_MAP_END
@@ -429,7 +429,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mjapinky_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( SMH_ROM, royalmah_rom_w )
- AM_RANGE( 0x7000, 0x77ff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x77ff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x7800, 0x7fff ) AM_RAM
AM_RANGE( 0x8000, 0x8000 ) AM_READ( mjapinky_dsw_r )
AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) )
@@ -564,7 +564,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( janho_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( SMH_ROM, royalmah_rom_w )
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE(1) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE(1) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram)
ADDRESS_MAP_END
@@ -686,7 +686,7 @@ static ADDRESS_MAP_START( jansou_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x6407, 0x6407 ) AM_READ(jansou_dsw_r)
AM_RANGE( 0x6800, 0x6800 ) AM_WRITE(jansou_sound_w)
- AM_RANGE( 0x7000, 0x77ff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x77ff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram)
ADDRESS_MAP_END
@@ -743,7 +743,7 @@ static WRITE8_HANDLER( janptr96_rombank_w )
static WRITE8_HANDLER( janptr96_rambank_w )
{
- memory_set_bankptr(space->machine, 2,generic_nvram + 0x1000 + 0x1000 * data);
+ memory_set_bankptr(space->machine, 2,space->machine->generic.nvram.ptr.u8 + 0x1000 + 0x1000 * data);
}
static READ8_HANDLER( janptr96_unknown_r )
@@ -755,8 +755,8 @@ static READ8_HANDLER( janptr96_unknown_r )
static WRITE8_HANDLER( janptr96_coin_counter_w )
{
flip_screen_set(space->machine, ~data & 4);
- coin_counter_w(0,data & 2); // in
- coin_counter_w(1,data & 1); // out
+ coin_counter_w(space->machine, 0,data & 2); // in
+ coin_counter_w(space->machine, 1,data & 1); // out
}
static ADDRESS_MAP_START( janptr96_iomap, ADDRESS_SPACE_IO, 8 )
@@ -783,8 +783,8 @@ static UINT8 mjifb_rom_enable;
static WRITE8_HANDLER( mjifb_coin_counter_w )
{
flip_screen_set(space->machine, data & 4);
- coin_counter_w(0,data & 2); // in
- coin_counter_w(1,data & 1); // out
+ coin_counter_w(space->machine, 0,data & 2); // in
+ coin_counter_w(space->machine, 1,data & 1); // out
}
static READ8_HANDLER( mjifb_rom_io_r )
@@ -840,7 +840,7 @@ static WRITE8_HANDLER( mjifb_videoram_w )
static ADDRESS_MAP_START( mjifb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xbfff ) AM_READWRITE(mjifb_rom_io_r, mjifb_rom_io_w) AM_BASE(&videoram)
AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(SMH_ROM, mjifb_videoram_w)
// AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(SMH_ROM, SMH_RAM) This should, but doesn't work
@@ -939,7 +939,7 @@ static WRITE8_HANDLER( mjdejavu_rom_io_w )
static ADDRESS_MAP_START( mjdejavu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xbfff ) AM_READWRITE(mjdejavu_rom_io_r, mjdejavu_rom_io_w) AM_BASE(&videoram)
AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(SMH_ROM, mjifb_videoram_w)
ADDRESS_MAP_END
@@ -980,7 +980,7 @@ static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x6ff0, 0x6ff0 ) AM_READWRITE( janptr96_dsw_r, janptr96_dswsel_w )
AM_RANGE( 0x6ff1, 0x6ff1 ) AM_WRITE( mjderngr_palbank_w )
AM_RANGE( 0x6ff3, 0x6ff3 ) AM_WRITE( mjtensin_6ff3_w )
- AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) )
AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram)
ADDRESS_MAP_END
@@ -1039,7 +1039,7 @@ static WRITE8_HANDLER( cafetime_7fe3_w )
static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
- AM_RANGE( 0x6000, 0x7eff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x6000, 0x7eff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x7fc1, 0x7fc1 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x7fc2, 0x7fc3 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
AM_RANGE( 0x7fd0, 0x7fd0 ) AM_WRITE( janptr96_coin_counter_w )
@@ -1153,8 +1153,8 @@ static WRITE8_HANDLER( mjvegasa_rom_io_w )
static WRITE8_HANDLER( mjvegasa_coin_counter_w )
{
flip_screen_set(space->machine, data & 4);
- coin_counter_w(0,data & 2); // in
- coin_counter_w(1,data & 1); // out
+ coin_counter_w(space->machine, 0,data & 2); // in
+ coin_counter_w(space->machine, 1,data & 1); // out
}
// hopper?
@@ -1172,7 +1172,7 @@ static READ8_HANDLER( mjvegasa_12500_r )
static ADDRESS_MAP_START( mjvegasa_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x05fff ) AM_ROM
- AM_RANGE( 0x06000, 0x07fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x06000, 0x07fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x08000, 0x0ffff ) AM_READWRITE(mjvegasa_rom_io_r, mjvegasa_rom_io_w) AM_BASE(&videoram)
AM_RANGE( 0x10001, 0x10001 ) AM_DEVREAD( "aysnd", ay8910_r )
@@ -4613,10 +4613,10 @@ static DRIVER_INIT( ippatsu ) { memory_set_bankptr(machine, 1, memory_region(mac
static DRIVER_INIT( janptr96 )
{
- generic_nvram_size = 0x1000 * 9;
- generic_nvram = auto_alloc_array(machine, UINT8, generic_nvram_size );
+ machine->generic.nvram.size = 0x1000 * 9;
+ machine->generic.nvram.ptr.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram.size );
- memory_set_bankptr(machine, 3,generic_nvram);
+ memory_set_bankptr(machine, 3,machine->generic.nvram.ptr.u8);
}
GAME( 1981, royalmj, 0, royalmah, royalmah, 0, ROT0, "Nichibutsu", "Royal Mahjong (Japan, v1.13)", 0 )
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index e50bae190cc..309ef10a079 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -80,7 +80,7 @@ static READ8_DEVICE_HANDLER( runaway_pot_r )
static WRITE8_HANDLER( runaway_led_w )
{
- set_led_status(offset, ~data & 1);
+ set_led_status(space->machine, offset, ~data & 1);
}
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index dbea5de0dca..6aeccc7b24b 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -162,8 +162,8 @@ static WRITE16_HANDLER( sandscrp_coin_counter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x0001);
- coin_counter_w(1, data & 0x0002);
+ coin_counter_w(space->machine, 0, data & 0x0001);
+ coin_counter_w(space->machine, 1, data & 0x0002);
}
}
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index a570a32134b..4ffd31bdad2 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -114,14 +114,14 @@ static READ8_HANDLER( sauro_sound_command_r )
static WRITE8_HANDLER( sauro_coin1_w )
{
- coin_counter_w(0, data);
- coin_counter_w(0, 0); // to get the coin counter working in sauro, as it doesn't write 0
+ coin_counter_w(space->machine, 0, data);
+ coin_counter_w(space->machine, 0, 0); // to get the coin counter working in sauro, as it doesn't write 0
}
static WRITE8_HANDLER( sauro_coin2_w )
{
- coin_counter_w(1, data);
- coin_counter_w(1, 0); // to get the coin counter working in sauro, as it doesn't write 0
+ coin_counter_w(space->machine, 1, data);
+ coin_counter_w(space->machine, 1, 0); // to get the coin counter working in sauro, as it doesn't write 0
}
static WRITE8_HANDLER( flip_screen_w )
@@ -136,7 +136,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_w )
static ADDRESS_MAP_START( sauro_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe800, 0xebff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(tecfri_videoram_w) AM_BASE(&tecfri_videoram)
AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(tecfri_colorram_w) AM_BASE(&tecfri_colorram)
@@ -182,7 +182,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( trckydoc_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xe800, 0xebff) AM_RAM AM_MIRROR(0x400) AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(tecfri_videoram_w) AM_BASE(&tecfri_videoram)
AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(tecfri_colorram_w) AM_BASE(&tecfri_colorram)
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 77d21075dfc..2802517bf33 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -68,7 +68,7 @@ static WRITE8_HANDLER( sbasketb_sh_irqtrigger_w )
static WRITE8_HANDLER( sbasketb_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 6db6f75e095..cb7068a2dd9 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -245,7 +245,7 @@ static WRITE8_HANDLER( serve_led_w )
static WRITE8_HANDLER( coincount_w )
{
- coin_counter_w(0, offset & 1);
+ coin_counter_w(space->machine, 0, offset & 1);
}
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 44cbf922730..788d24991ff 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -198,7 +198,7 @@ static WRITE16_HANDLER( sderby_out_w )
output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - BET */
output_set_lamp_value(3, (data >> 15) & 1); /* Lamp 3 - END OF RACE */
- coin_counter_w(0, data & 0x2000);
+ coin_counter_w(space->machine, 0, data & 0x2000);
}
@@ -247,7 +247,7 @@ static WRITE16_HANDLER( scmatto_out_w )
output_set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
output_set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - BET */
- coin_counter_w(0, data & 0x2000);
+ coin_counter_w(space->machine, 0, data & 0x2000);
}
@@ -298,7 +298,7 @@ static ADDRESS_MAP_START( sderby_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff)
AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16)
AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* unknown... write 0x01 in game, and 0x00 on reset */
- AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -319,7 +319,7 @@ static ADDRESS_MAP_START( spacewin_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd001ff) AM_RAM
AM_RANGE(0x800000, 0x800fff) AM_RAM AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)
AM_RANGE(0x801000, 0x80100d) AM_WRITENOP /* unknown */
- AM_RANGE(0x8f0000, 0x8f07ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) /* 16K Dallas DS1220Y-200 NVRAM */
+ AM_RANGE(0x8f0000, 0x8f07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* 16K Dallas DS1220Y-200 NVRAM */
AM_RANGE(0x8fc000, 0x8fffff) AM_RAM
ADDRESS_MAP_END
@@ -339,7 +339,7 @@ static ADDRESS_MAP_START( roulette_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x70800e, 0x70800f) AM_READWRITE(rprot_r, rprot_w) /* MCU communication */
AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16)
- AM_RANGE(0xff0000, 0xff07ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xff0000, 0xff07ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 883cd3d083e..3d000a798f7 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -1575,14 +1575,14 @@ static WRITE32_DEVICE_HANDLER( widget_w )
static WRITE32_HANDLER( cmos_w )
{
if (cmos_write_enabled)
- COMBINE_DATA(generic_nvram32 + offset);
+ COMBINE_DATA(space->machine->generic.nvram.ptr.u32 + offset);
cmos_write_enabled = FALSE;
}
static READ32_HANDLER( cmos_r )
{
- return generic_nvram32[offset];
+ return space->machine->generic.nvram.ptr.u32[offset];
}
@@ -1734,7 +1734,7 @@ static ADDRESS_MAP_START( seattle_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x0c000000, 0x0c000fff) AM_READWRITE(galileo_r, galileo_w)
AM_RANGE(0x13000000, 0x13000003) AM_WRITE(asic_fifo_w)
AM_RANGE(0x16000000, 0x1600003f) AM_READWRITE(midway_ioasic_r, midway_ioasic_w)
- AM_RANGE(0x16100000, 0x1611ffff) AM_READWRITE(cmos_r, cmos_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x16100000, 0x1611ffff) AM_READWRITE(cmos_r, cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x17000000, 0x17000003) AM_READWRITE(cmos_protect_r, cmos_protect_w)
AM_RANGE(0x17100000, 0x17100003) AM_WRITE(seattle_watchdog_w)
AM_RANGE(0x17300000, 0x17300003) AM_RAM_WRITE(seattle_interrupt_enable_w) AM_BASE(&interrupt_enable)
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 79068dec0c1..da51afe0973 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -131,7 +131,7 @@ static MACHINE_START( segac2 )
static MACHINE_RESET( segac2 )
{
- megadrive_ram = generic_nvram16;
+ megadrive_ram = machine->generic.nvram.ptr.u16;
/* set up interrupts and such */
MACHINE_RESET_CALL(megadriv);
@@ -401,10 +401,10 @@ static WRITE16_HANDLER( io_chip_w )
D1 : To CN1 pin J. (Coin meter 2)
D0 : To CN1 pin 8. (Coin meter 1)
*/
-/* coin_lockout_w(1, data & 0x08);
- coin_lockout_w(0, data & 0x04); */
- coin_counter_w(1, data & 0x02);
- coin_counter_w(0, data & 0x01);
+/* coin_lockout_w(space->machine, 1, data & 0x08);
+ coin_lockout_w(space->machine, 0, data & 0x04); */
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
break;
/* banking */
@@ -565,8 +565,8 @@ static WRITE16_HANDLER( counter_timer_w )
break;
case 0x10: /* coin counter */
-// coin_counter_w(0,1);
-// coin_counter_w(0,0);
+// coin_counter_w(space->machine, 0,1);
+// coin_counter_w(space->machine, 0,0);
break;
case 0x12: /* set coinage info -- followed by two 4-bit values */
@@ -629,7 +629,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x880100, 0x880101) AM_MIRROR(0x13fefe) AM_WRITE(counter_timer_w)
AM_RANGE(0x8c0000, 0x8c0fff) AM_MIRROR(0x13f000) AM_READWRITE(palette_r, palette_w) AM_BASE(&paletteram16)
AM_RANGE(0xc00000, 0xc0001f) AM_MIRROR(0x18ff00) AM_READWRITE(megadriv_vdp_r, megadriv_vdp_w)
- AM_RANGE(0xe00000, 0xe0ffff) AM_MIRROR(0x1f0000) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xe00000, 0xe0ffff) AM_MIRROR(0x1f0000) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index 678248c5994..98beef5faf8 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -282,8 +282,8 @@ static READ8_HANDLER( spaceod_port_fc_r )
static WRITE8_HANDLER( coin_count_w )
{
- coin_counter_w(0, (data >> 7) & 1);
- coin_counter_w(1, (data >> 6) & 1);
+ coin_counter_w(space->machine, 0, (data >> 7) & 1);
+ coin_counter_w(space->machine, 1, (data >> 6) & 1);
}
@@ -306,7 +306,7 @@ static WRITE8_DEVICE_HANDLER( sindbadm_soundport_w )
static WRITE8_DEVICE_HANDLER( sindbadm_misc_w )
{
- coin_counter_w(0, data & 0x02);
+ coin_counter_w(device->machine, 0, data & 0x02);
// mame_printf_debug("Unknown = %02X\n", data);
}
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 5600bfaa276..f50c38eb040 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -370,8 +370,8 @@ static READ8_HANDLER( multiply_r )
static WRITE8_HANDLER( coin_count_w )
{
- coin_counter_w(0, (data >> 7) & 1);
- coin_counter_w(1, (data >> 6) & 1);
+ coin_counter_w(space->machine, 0, (data >> 7) & 1);
+ coin_counter_w(space->machine, 1, (data >> 6) & 1);
}
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 7516be33555..b2a1a9a12ec 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -285,10 +285,10 @@ static WRITE8_DEVICE_HANDLER( video_lamps_w )
segaic16_sprites_set_flip(device->machine, 0, data & 0x80);
segaic16_sprites_set_shadow(device->machine, 0, ~data & 0x40);
segaic16_set_display_enable(device->machine, data & 0x10);
- set_led_status(1, data & 0x08);
- set_led_status(0, data & 0x04);
- coin_counter_w(1, data & 0x02);
- coin_counter_w(0, data & 0x01);
+ set_led_status(device->machine, 1, data & 0x08);
+ set_led_status(device->machine, 0, data & 0x04);
+ coin_counter_w(device->machine, 1, data & 0x02);
+ coin_counter_w(device->machine, 0, data & 0x01);
}
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 41668d32f3b..475a0c58b52 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -371,10 +371,10 @@ static WRITE8_DEVICE_HANDLER( video_control_w )
cpu_set_input_line(mcu, MCS51_INT1_LINE, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
segaic16_set_display_enable(device->machine, data & 0x10);
- set_led_status(1, data & 0x08);
- set_led_status(0, data & 0x04);
- coin_counter_w(1, data & 0x02);
- coin_counter_w(0, data & 0x01);
+ set_led_status(device->machine, 1, data & 0x08);
+ set_led_status(device->machine, 0, data & 0x04);
+ coin_counter_w(device->machine, 1, data & 0x02);
+ coin_counter_w(device->machine, 0, data & 0x01);
}
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 1edf940f9e2..2cf05ff44a9 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1171,10 +1171,10 @@ static WRITE16_HANDLER( standard_io_w )
segaic16_sprites_set_flip(space->machine, 0, data & 0x40);
if (!disable_screen_blanking)
segaic16_set_display_enable(space->machine, data & 0x20);
- set_led_status(1, data & 0x08);
- set_led_status(0, data & 0x04);
- coin_counter_w(1, data & 0x02);
- coin_counter_w(0, data & 0x01);
+ set_led_status(space->machine, 1, data & 0x08);
+ set_led_status(space->machine, 0, data & 0x04);
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
return;
}
logerror("%06X:standard_io_w - unknown write access to address %04X = %04X & %04X\n", cpu_get_pc(space->cpu), offset * 2, data, mem_mask);
@@ -1634,9 +1634,9 @@ static WRITE16_HANDLER( hwchamp_custom_io_w )
/* bit 4 is GONG */
// if (data & 0x10) popmessage("GONG");
/* are the following really lamps? */
- // set_led_status(1,data & 0x20);
- // set_led_status(2,data & 0x40);
- // set_led_status(3,data & 0x80);
+ // set_led_status(space->machine, 1,data & 0x20);
+ // set_led_status(space->machine, 2,data & 0x40);
+ // set_led_status(space->machine, 3,data & 0x80);
break;
}
break;
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 784a54f40e9..50c8b1e6e21 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -291,10 +291,10 @@ static WRITE16_HANDLER( io_chip_w )
segaic16_sprites_set_flip(space->machine, 0, data & 0x20);
/* These are correct according to cgfm's docs, but mwalker and ddcrew both
enable the lockout and never turn it off
- coin_lockout_w(1, data & 0x08);
- coin_lockout_w(0, data & 0x04); */
- coin_counter_w(1, data & 0x02);
- coin_counter_w(0, data & 0x01);
+ coin_lockout_w(space->machine, 1, data & 0x08);
+ coin_lockout_w(space->machine, 0, data & 0x04); */
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
break;
/* tile banking */
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 54c414a3d09..621eae2c8c3 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -695,10 +695,10 @@ static void common_io_chip_w(const address_space *space, int which, offs_t offse
eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE);
eeprom_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
}
-/* coin_lockout_w(1 + 2*which, data & 0x08);
- coin_lockout_w(0 + 2*which, data & 0x04);*/
- coin_counter_w(1 + 2*which, data & 0x02);
- coin_counter_w(0 + 2*which, data & 0x01);
+/* coin_lockout_w(space->machine, 1 + 2*which, data & 0x08);
+ coin_lockout_w(space->machine, 0 + 2*which, data & 0x04);*/
+ coin_counter_w(space->machine, 1 + 2*which, data & 0x02);
+ coin_counter_w(space->machine, 0 + 2*which, data & 0x01);
break;
/* tile banking */
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 5095cd982ab..f77adf9d50e 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -650,7 +650,7 @@ static WRITE16_HANDLER( aburner2_iochip_0_D_w )
output_set_lamp_value(2, (data >> 1) & 0x01); /* altitude warning lamp */
output_set_led_value(0, (data >> 2) & 0x01); /* start lamp */
- coin_counter_w(0, (data >> 4) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 4) & 0x01);
output_set_lamp_value(0, (data >> 5) & 0x01); /* lock on lamp */
output_set_lamp_value(1, (data >> 6) & 0x01); /* danger lamp */
sound_global_enable(space->machine, (data >> 7) & 0x01);
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 2e7f94c8e76..7fa2752be31 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -90,9 +90,9 @@ static WRITE16_HANDLER( sengokmj_out_w )
/* ---- ---- ---- -x-- Coin counter (done AFTER that you press start)*/
/* ---- ---- ---- --x- Cash enable (lockout)*/
/* ---- ---- ---- ---x Hopper 10 */
- coin_lockout_w(0,~data & 2);
- coin_lockout_w(1,~data & 2);
- coin_counter_w(0,data & 4);
+ coin_lockout_w(space->machine, 0,~data & 2);
+ coin_lockout_w(space->machine, 1,~data & 2);
+ coin_counter_w(space->machine, 0,data & 4);
hopper_io = ((data & 1)<<6);
// popmessage("%02x",hopper_io);
}
@@ -104,7 +104,7 @@ static READ16_HANDLER( sengokmj_system_r )
static ADDRESS_MAP_START( sengokmj_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x07fff) AM_RAM
- AM_RANGE(0x08000, 0x09fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x08000, 0x09fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE(seibucrtc_sc0vram_w) AM_BASE(&seibucrtc_sc0vram)
AM_RANGE(0x0c800, 0x0cfff) AM_RAM_WRITE(seibucrtc_sc1vram_w) AM_BASE(&seibucrtc_sc1vram)
AM_RANGE(0x0d000, 0x0d7ff) AM_RAM_WRITE(seibucrtc_sc2vram_w) AM_BASE(&seibucrtc_sc2vram)
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 0a2511f6a88..4a699c8db8a 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -570,8 +570,8 @@ static WRITE16_HANDLER( grdians_lockout_w )
if (ACCESSING_BITS_0_7)
{
// initially 0, then either $25 (coin 1) or $2a (coin 2)
- coin_counter_w(0,data & 0x01); // or 0x04
- coin_counter_w(1,data & 0x02); // or 0x08
+ coin_counter_w(space->machine, 0,data & 0x01); // or 0x04
+ coin_counter_w(space->machine, 1,data & 0x02); // or 0x08
}
// popmessage("%04X", data & 0xffff);
}
@@ -785,8 +785,8 @@ static WRITE16_HANDLER( pzlbowl_coin_counter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 0x10);
- coin_counter_w(1,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x10);
+ coin_counter_w(space->machine, 1,data & 0x20);
}
}
@@ -843,11 +843,11 @@ static WRITE16_HANDLER( samshoot_coin_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x10);
- coin_counter_w(1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x10);
+ coin_counter_w(space->machine, 1, data & 0x20);
// Are these connected? They are set in I/O test
- coin_lockout_w(0,~data & 0x40);
- coin_lockout_w(1,~data & 0x80);
+ coin_lockout_w(space->machine, 0,~data & 0x40);
+ coin_lockout_w(space->machine, 1,~data & 0x80);
}
// popmessage("%04x",data);
}
@@ -855,7 +855,7 @@ static WRITE16_HANDLER( samshoot_coin_w )
static ADDRESS_MAP_START( samshoot_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x1fffff ) AM_ROM
AM_RANGE( 0x200000, 0x20ffff ) AM_RAM
- AM_RANGE( 0x300000, 0x30ffff ) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x300000, 0x30ffff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x400000, 0x400001 ) AM_READ_PORT("DSW1") // DSW 1
AM_RANGE( 0x400002, 0x400003 ) AM_READ_PORT("BUTTONS") // Buttons
@@ -900,7 +900,7 @@ static UINT8 funcube_serial_count;
// RAM shared with the sub CPU
static READ32_HANDLER( funcube_nvram_dword_r )
{
- UINT16 val = generic_nvram16[offset];
+ UINT16 val = space->machine->generic.nvram.ptr.u16[offset];
return ((val & 0xff00) << 8) | (val & 0x00ff);
}
@@ -908,11 +908,11 @@ static WRITE32_HANDLER( funcube_nvram_dword_w )
{
if (ACCESSING_BITS_0_7)
{
- generic_nvram16[offset] = (generic_nvram16[offset] & 0xff00) | (data & 0x000000ff);
+ space->machine->generic.nvram.ptr.u16[offset] = (space->machine->generic.nvram.ptr.u16[offset] & 0xff00) | (data & 0x000000ff);
}
if (ACCESSING_BITS_16_23)
{
- generic_nvram16[offset] = (generic_nvram16[offset] & 0x00ff) | ((data & 0x00ff0000) >> 8);
+ space->machine->generic.nvram.ptr.u16[offset] = (space->machine->generic.nvram.ptr.u16[offset] & 0x00ff) | ((data & 0x00ff0000) >> 8);
}
}
@@ -1004,7 +1004,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( funcube_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x01ffff ) AM_ROM
- AM_RANGE( 0x200000, 0x20017f ) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x200000, 0x20017f ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
@@ -1073,14 +1073,14 @@ static WRITE8_HANDLER( funcube_leds_w )
{
*funcube_leds = data;
- set_led_status( 0, (~data) & 0x01 ); // win lamp (red)
- set_led_status( 1, (~data) & 0x02 ); // win lamp (green)
+ set_led_status( space->machine, 0, (~data) & 0x01 ); // win lamp (red)
+ set_led_status( space->machine, 1, (~data) & 0x02 ); // win lamp (green)
// Set in a moving pattern: 0111 -> 1011 -> 1101 -> 1110
- set_led_status( 2, (~data) & 0x10 );
- set_led_status( 3, (~data) & 0x20 );
- set_led_status( 4, (~data) & 0x40 );
- set_led_status( 5, (~data) & 0x80 );
+ set_led_status( space->machine, 2, (~data) & 0x10 );
+ set_led_status( space->machine, 3, (~data) & 0x20 );
+ set_led_status( space->machine, 4, (~data) & 0x40 );
+ set_led_status( space->machine, 5, (~data) & 0x80 );
funcube_debug_outputs();
}
@@ -1103,7 +1103,7 @@ static WRITE8_HANDLER( funcube_outputs_w )
// Bit 1: high on pay out
// Bit 3: low after coining up, blinks on pay out
- set_led_status( 6, (~data) & 0x08 );
+ set_led_status( space->machine, 6, (~data) & 0x08 );
funcube_debug_outputs();
}
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 18c36207247..155f72cffce 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -36,11 +36,11 @@ static WRITE16_HANDLER( sf_coin_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
- coin_lockout_w(0,~data & 0x10);
- coin_lockout_w(1,~data & 0x20);
- coin_lockout_w(2,~data & 0x40); /* is there a third coin input? */
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x10);
+ coin_lockout_w(space->machine, 1,~data & 0x20);
+ coin_lockout_w(space->machine, 2,~data & 0x40); /* is there a third coin input? */
}
}
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index f9e14594575..0356bde6ed9 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -244,7 +244,7 @@ static const TMS9928a_interface tms9928a_interface =
static WRITE8_DEVICE_HANDLER( sg1000a_coin_counter_w )
{
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(device->machine, 0, data & 0x01);
}
static I8255A_INTERFACE( ppi8255_intf )
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 17471e68f3e..9169b826814 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -79,10 +79,10 @@ static WRITE16_HANDLER( shangha3_coinctrl_w )
{
if (ACCESSING_BITS_8_15)
{
- coin_lockout_w(0,~data & 0x0400);
- coin_lockout_w(1,~data & 0x0400);
- coin_counter_w(0,data & 0x0100);
- coin_counter_w(1,data & 0x0200);
+ coin_lockout_w(space->machine, 0,~data & 0x0400);
+ coin_lockout_w(space->machine, 1,~data & 0x0400);
+ coin_counter_w(space->machine, 0,data & 0x0100);
+ coin_counter_w(space->machine, 1,data & 0x0200);
}
}
@@ -93,10 +93,10 @@ static WRITE16_HANDLER( heberpop_coinctrl_w )
/* the sound ROM bank is selected by the main CPU! */
okim6295_set_bank_base(devtag_get_device(space->machine, "oki"),(data & 0x08) ? 0x40000 : 0x00000);
- coin_lockout_w(0,~data & 0x04);
- coin_lockout_w(1,~data & 0x04);
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x04);
+ coin_lockout_w(space->machine, 1,~data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
}
@@ -107,10 +107,10 @@ static WRITE16_HANDLER( blocken_coinctrl_w )
/* the sound ROM bank is selected by the main CPU! */
okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), ((data >> 4) & 3) * 0x40000);
- coin_lockout_w(0,~data & 0x04);
- coin_lockout_w(1,~data & 0x04);
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x04);
+ coin_lockout_w(space->machine, 1,~data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
}
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 6ad0bfcd926..0f38b27844b 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -115,8 +115,8 @@ static WRITE16_HANDLER( shanghai_coin_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
}
}
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index f1da8f0fbc5..282b181d4a4 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -42,8 +42,8 @@ static WRITE8_HANDLER( sichuan2_coin_w )
{
if ((data & 0xf9) != 0x01) logerror("coin ctrl = %02x\n",data);
- coin_counter_w(0, data & 0x02);
- coin_counter_w(1, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x04);
}
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 23c52c98a68..0589df94a01 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -68,7 +68,7 @@ static WRITE8_HANDLER( shootout_flipscreen_w )
static WRITE8_HANDLER( shootout_coin_counter_w )
{
- coin_counter_w(0, data);
+ coin_counter_w(space->machine, 0, data);
}
/*******************************************************************************/
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 729e8157a36..02c634984b0 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -154,8 +154,8 @@ static WRITE32_HANDLER(silk_coin_counter_w)
{
if (ACCESSING_BITS_16_23)
{
- coin_counter_w(0, data & 0x10000);
- coin_counter_w(1, data & 0x80000);
+ coin_counter_w(space->machine, 0, data & 0x10000);
+ coin_counter_w(space->machine, 1, data & 0x80000);
}
}
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index fd0e1ee609b..8dd6e73a88d 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -41,9 +41,9 @@ static WRITE8_HANDLER( inputport_select_w )
inputport_selected = data & 0x07;
else if ((data & 0xe0) == 0xc0)
{
- coin_lockout_global_w(~data & 1);
- coin_counter_w(0,data & 2);
- coin_counter_w(1,data & 4);
+ coin_lockout_global_w(space->machine, ~data & 1);
+ coin_counter_w(space->machine, 0,data & 2);
+ coin_counter_w(space->machine, 1,data & 4);
}
}
@@ -72,8 +72,8 @@ static READ8_HANDLER( inputport_r )
static WRITE8_HANDLER( skykid_led_w )
{
- set_led_status(0,data & 0x08);
- set_led_status(1,data & 0x10);
+ set_led_status(space->machine, 0,data & 0x08);
+ set_led_status(space->machine, 1,data & 0x10);
}
static WRITE8_HANDLER( skykid_subreset_w )
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index c5bf1ff4753..82ffc38ceff 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -286,7 +286,7 @@ static WRITE8_HANDLER( reelscroll4_w )
static WRITE8_HANDLER( skylncr_coin_w )
{
- coin_counter_w( 0, data & 0x04 );
+ coin_counter_w( space->machine, 0, data & 0x04 );
}
static READ8_HANDLER( ret_ff )
@@ -313,7 +313,7 @@ static WRITE8_HANDLER( skylncr_nmi_enable_w )
static ADDRESS_MAP_START( mem_map_skylncr, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8800, 0x8fff) AM_READWRITE( SMH_RAM, skylncr_videoram_w ) AM_BASE( &skylncr_videoram )
AM_RANGE(0x9000, 0x97ff) AM_READWRITE( SMH_RAM, skylncr_colorram_w ) AM_BASE( &skylncr_colorram )
diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c
index 5c5d0007559..94746078f55 100644
--- a/src/mame/drivers/sms.c
+++ b/src/mame/drivers/sms.c
@@ -384,9 +384,9 @@ static WRITE8_DEVICE_HANDLER(ppi0_b_w)
output_set_lamp_value(8, !BIT(data,7)); /* Stand Light */
output_set_lamp_value(9, !BIT(data,6)); /* Cancel Light */
- coin_counter_w(0, BIT(data,1));
- coin_lockout_w(0, BIT(data,5));
- coin_lockout_w(1, BIT(data,4));
+ coin_counter_w(device->machine, 0, BIT(data,1));
+ coin_lockout_w(device->machine, 0, BIT(data,5));
+ coin_lockout_w(device->machine, 1, BIT(data,4));
}
static const ppi8255_interface ppi8255_intf[2] =
@@ -479,7 +479,7 @@ static PALETTE_INIT( sms )
*************************************/
static ADDRESS_MAP_START( sms_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x00800, 0x00803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x01000, 0x01007) AM_WRITE(video_w)
AM_RANGE(0x01800, 0x01803) AM_READWRITE(link_r, link_w)
@@ -490,7 +490,7 @@ static ADDRESS_MAP_START( sms_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( sureshot_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x02000, 0x02007) AM_WRITE(video_w)
AM_RANGE(0x03000, 0x03003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x03800, 0x03803) AM_READWRITE(link_r, link_w)
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 6918ffe4980..167181657ce 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -764,29 +764,29 @@ static CUSTOM_INPUT( gwarb_rotary )
static WRITE8_HANDLER( athena_coin_counter_w )
{
- coin_counter_w(0, ~data & 2);
- coin_counter_w(1, ~data & 1);
+ coin_counter_w(space->machine, 0, ~data & 2);
+ coin_counter_w(space->machine, 1, ~data & 1);
}
static WRITE8_HANDLER( ikari_coin_counter_w )
{
if (~data & 0x80)
{
- coin_counter_w(0, 1);
- coin_counter_w(0, 0);
+ coin_counter_w(space->machine, 0, 1);
+ coin_counter_w(space->machine, 0, 0);
}
if (~data & 0x40)
{
- coin_counter_w(1, 1);
- coin_counter_w(1, 0);
+ coin_counter_w(space->machine, 1, 1);
+ coin_counter_w(space->machine, 1, 0);
}
}
static WRITE8_HANDLER( tdfever_coin_counter_w )
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
}
static WRITE8_HANDLER( countryc_trackball_w )
diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c
index 458558ce7c5..f7104175ab5 100644
--- a/src/mame/drivers/snk6502.c
+++ b/src/mame/drivers/snk6502.c
@@ -727,7 +727,7 @@ static INTERRUPT_GEN( satansat_interrupt )
{
UINT8 val = input_port_read(device->machine, "IN2");
- coin_counter_w(0, val & 1);
+ coin_counter_w(device->machine, 0, val & 1);
/* user asks to insert coin: generate a NMI interrupt. */
if (val & 0x01)
@@ -743,8 +743,8 @@ static INTERRUPT_GEN( snk6502_interrupt )
{
UINT8 val = input_port_read(device->machine, "IN2");
- coin_counter_w(0, val & 1);
- coin_counter_w(1, val & 2);
+ coin_counter_w(device->machine, 0, val & 1);
+ coin_counter_w(device->machine, 1, val & 2);
/* user asks to insert coin: generate a NMI interrupt. */
if (val & 0x03)
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index d6dc8d4166b..bd81eb768c9 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -457,9 +457,9 @@ static WRITE8_HANDLER( output_port_0_w )
output_set_lamp_value(5, bit3); /* Lamp 5 - STOP4 */
output_set_lamp_value(6, bit4); /* Lamp 6 - STOP5 */
- coin_counter_w(0, data & 0x01); /* Coin in */
- coin_counter_w(1, data & 0x10); /* Key in */
- coin_counter_w(2, data & 0x04); /* Payout x10 */
+ coin_counter_w(space->machine, 0, data & 0x01); /* Coin in */
+ coin_counter_w(space->machine, 1, data & 0x10); /* Key in */
+ coin_counter_w(space->machine, 2, data & 0x04); /* Payout x10 */
// logerror("high: %04x - low: %X \n", outporth, outportl);
// popmessage("written : %02X", data);
@@ -505,7 +505,7 @@ static WRITE8_HANDLER( output_port_1_w )
*************************/
static ADDRESS_MAP_START( snookr10_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w)
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("IN0") /* IN0 */
AM_RANGE(0x3001, 0x3001) AM_READ_PORT("IN1") /* IN1 */
@@ -520,7 +520,7 @@ static ADDRESS_MAP_START( snookr10_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( tenballs_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w)
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("IN0") /* IN0 */
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("IN1") /* IN1 */
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index f36cc5041c9..5741f57e123 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -80,12 +80,12 @@ static WRITE8_HANDLER( sonson_sh_irqtrigger_w )
static WRITE8_HANDLER( sonson_coin1_counter_w )
{
- coin_counter_w(0,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
}
static WRITE8_HANDLER( sonson_coin2_counter_w )
{
- coin_counter_w(1,data & 1);
+ coin_counter_w(space->machine, 1,data & 1);
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index 73d47285048..585943c76bf 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -66,8 +66,8 @@ WRITE8_HANDLER( speedbal_background_videoram_w );
static WRITE8_HANDLER( speedbal_coincounter_w )
{
- coin_counter_w(0, data & 0x80);
- coin_counter_w(1, data & 0x40);
+ coin_counter_w(space->machine, 0, data & 0x80);
+ coin_counter_w(space->machine, 1, data & 0x40);
flip_screen_set(space->machine, data & 8); // also changes data & 0x10 at the same time too (flipx and flipy?)
/* unknown: (data & 0x10) and (data & 4) */
}
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE(speedbal_background_videoram_w) AM_BASE(&speedbal_background_videoram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(speedbal_foreground_videoram_w) AM_BASE(&speedbal_foreground_videoram)
AM_RANGE(0xf000, 0xf5ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram)
- AM_RANGE(0xf600, 0xfeff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf600, 0xfeff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xff00, 0xffff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index b4c5a8fc8f6..b0cb640ac77 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -588,7 +588,7 @@ static ADDRESS_MAP_START( spiders_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE(&spiders_ram)
AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0xc001, 0xc001) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
- AM_RANGE(0xc020, 0xc027) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc020, 0xc027) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc044, 0xc047) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
AM_RANGE(0xc048, 0xc04b) AM_DEVREADWRITE("pia2", pia6821_alt_r, pia6821_alt_w)
AM_RANGE(0xc050, 0xc053) AM_DEVREADWRITE("pia3", pia6821_r, pia6821_w)
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 5d9611ccc6d..0ab5370115f 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -95,11 +95,11 @@ static WRITE16_HANDLER( splash_coin_w )
{
case 0x00: /* Coin Lockouts */
case 0x01:
- coin_lockout_w( (offset >> 3) & 0x01, (data & 0x0400) >> 8);
+ coin_lockout_w( space->machine, (offset >> 3) & 0x01, (data & 0x0400) >> 8);
break;
case 0x02: /* Coin Counters */
case 0x03:
- coin_counter_w( (offset >> 3) & 0x01, (data & 0x0100) >> 8);
+ coin_counter_w( space->machine, (offset >> 3) & 0x01, (data & 0x0100) >> 8);
break;
}
}
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index d48885bbc34..5bfcbe3b311 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -104,12 +104,12 @@ static WRITE8_HANDLER( spoker_nmi_and_coins_w )
// popmessage("%02x",data);
}
- coin_counter_w(0, data & 0x01); // coin_a
- coin_counter_w(1, data & 0x04); // coin_c
- coin_counter_w(2, data & 0x08); // key in
- coin_counter_w(3, data & 0x10); // coin out mech
+ coin_counter_w(space->machine, 0, data & 0x01); // coin_a
+ coin_counter_w(space->machine, 1, data & 0x04); // coin_c
+ coin_counter_w(space->machine, 2, data & 0x08); // key in
+ coin_counter_w(space->machine, 3, data & 0x10); // coin out mech
- set_led_status(6, data & 0x40); // led for coin out / hopper active
+ set_led_status(space->machine, 6, data & 0x40); // led for coin out / hopper active
nmi_enable = data; // data & 0x80 // nmi enable?
@@ -119,8 +119,8 @@ static WRITE8_HANDLER( spoker_nmi_and_coins_w )
static WRITE8_HANDLER( spoker_video_and_leds_w )
{
- set_led_status(4, data & 0x01); // start?
- set_led_status(5, data & 0x04); // l_bet?
+ set_led_status(space->machine, 4, data & 0x01); // start?
+ set_led_status(space->machine, 5, data & 0x04); // l_bet?
video_enable = data & 0x40;
hopper = (~data)& 0x80;
@@ -131,10 +131,10 @@ static WRITE8_HANDLER( spoker_video_and_leds_w )
static WRITE8_HANDLER( spoker_leds_w )
{
- set_led_status(0, data & 0x01); // stop_1
- set_led_status(1, data & 0x02); // stop_2
- set_led_status(2, data & 0x04); // stop_3
- set_led_status(3, data & 0x08); // stop
+ set_led_status(space->machine, 0, data & 0x01); // stop_1
+ set_led_status(space->machine, 1, data & 0x02); // stop_2
+ set_led_status(space->machine, 2, data & 0x04); // stop_3
+ set_led_status(space->machine, 3, data & 0x08); // stop
// data & 0x10?
out[2] = data;
@@ -186,7 +186,7 @@ static READ8_HANDLER( spoker_magic_r )
static ADDRESS_MAP_START( spoker_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0f3ff ) AM_ROM
- AM_RANGE( 0x0f400, 0x0ffff ) AM_RAM AM_BASE( &generic_nvram ) AM_SIZE( &generic_nvram_size )
+ AM_RANGE( 0x0f400, 0x0ffff ) AM_RAM AM_BASE_SIZE_GENERIC( nvram )
ADDRESS_MAP_END
static ADDRESS_MAP_START( spoker_portmap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 4ef730d0bb3..699fbe09502 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -238,11 +238,11 @@ static WRITE8_DEVICE_HANDLER( sprint2_skid2_w )
static WRITE8_HANDLER( sprint2_lamp1_w )
{
- set_led_status(0, offset & 1);
+ set_led_status(space->machine, 0, offset & 1);
}
static WRITE8_HANDLER( sprint2_lamp2_w )
{
- set_led_status(1, offset & 1);
+ set_led_status(space->machine, 1, offset & 1);
}
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 2451d559a5e..9d8ac3d5bed 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -187,14 +187,14 @@ static WRITE8_HANDLER( sprint4_da_latch_w )
static WRITE8_HANDLER( sprint4_lamp_w )
{
- set_led_status((offset >> 1) & 3, offset & 1);
+ set_led_status(space->machine, (offset >> 1) & 3, offset & 1);
}
#ifdef UNUSED_FUNCTION
static WRITE8_HANDLER( sprint4_lockout_w )
{
- coin_lockout_global_w(~offset & 1);
+ coin_lockout_global_w(space->machine, ~offset & 1);
}
#endif
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index 175059fab3d..d3b5cfcef0a 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -90,7 +90,7 @@ static READ8_HANDLER( sprint8_input_r )
static WRITE8_HANDLER( sprint8_lockout_w )
{
- coin_lockout_w(offset, !(data & 1));
+ coin_lockout_w(space->machine, offset, !(data & 1));
}
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 264fc468b5e..bb1a6eebade 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -290,8 +290,8 @@ static WRITE8_HANDLER( spy_3f90_w )
********************************************************************/
/* bits 0/1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index a0bd09cd8d3..8c6a121ca51 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -157,8 +157,8 @@ static WRITE16_HANDLER( srmp2_flags_w )
x--- ---- : Palette Bank
*/
- coin_counter_w( 0, ((data & 0x01) >> 0) );
- coin_lockout_w( 0, (((~data) & 0x10) >> 4) );
+ coin_counter_w( space->machine, 0, ((data & 0x01) >> 0) );
+ coin_lockout_w( space->machine, 0, (((~data) & 0x10) >> 4) );
srmp2_adpcm_bank = ( (data & 0x20) >> 5 );
srmp2_color_bank = ( (data & 0x80) >> 7 );
}
@@ -171,8 +171,8 @@ static WRITE16_HANDLER( mjyuugi_flags_w )
---x ---- : Coin Lock Out
*/
- coin_counter_w( 0, ((data & 0x01) >> 0) );
- coin_lockout_w( 0, (((~data) & 0x10) >> 4) );
+ coin_counter_w( space->machine, 0, ((data & 0x01) >> 0) );
+ coin_lockout_w( space->machine, 0, (((~data) & 0x10) >> 4) );
}
@@ -384,7 +384,7 @@ static WRITE8_HANDLER( srmp3_rombank_w )
static ADDRESS_MAP_START( srmp2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_BASE(&spriteram16_2) /* Sprites Code + X + Attr */
AM_RANGE(0x180000, 0x180609) AM_RAM AM_BASE(&spriteram16) /* Sprites Y */
AM_RANGE(0x1c0000, 0x1c0001) AM_WRITENOP /* ??? */
@@ -427,7 +427,7 @@ static ADDRESS_MAP_START( mjyuugi_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd00609) AM_RAM AM_BASE(&spriteram16) /* Sprites Y */
AM_RANGE(0xd02000, 0xd023ff) AM_RAM /* ??? only writes $00fa */
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_BASE(&spriteram16_2) /* Sprites Code + X + Attr */
- AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
ADDRESS_MAP_END
@@ -532,8 +532,8 @@ static WRITE8_HANDLER( srmp3_flags_w )
xx-- ---- : GFX Bank
*/
- coin_counter_w( 0, ((data & 0x01) >> 0) );
- coin_lockout_w( 0, (((~data) & 0x10) >> 4) );
+ coin_counter_w( space->machine, 0, ((data & 0x01) >> 0) );
+ coin_lockout_w( space->machine, 0, (((~data) & 0x10) >> 4) );
srmp3_gfx_bank = (data >> 6) & 0x03;
}
@@ -541,7 +541,7 @@ static WRITE8_HANDLER( srmp3_flags_w )
static ADDRESS_MAP_START( srmp3_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) /* rom bank */
- AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* work ram */
+ AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* work ram */
AM_RANGE(0xa800, 0xa800) AM_WRITENOP /* flag ? */
AM_RANGE(0xb000, 0xb303) AM_RAM AM_BASE(&spriteram) /* Sprites Y */
AM_RANGE(0xb800, 0xb800) AM_WRITENOP /* flag ? */
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 9912fd0d093..1ec41861111 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -45,7 +45,7 @@ static WRITE8_HANDLER( sspeedr_lamp_w )
{
output_set_value("lampGO", (data >> 0) & 1);
output_set_value("lampEP", (data >> 1) & 1);
- coin_counter_w(0, data & 8);
+ coin_counter_w(space->machine, 0, data & 8);
}
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index add4cdb8fdd..3a0025d43ca 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -312,10 +312,10 @@ static WRITE16_HANDLER( ssv_lockout_w )
// popmessage("%02X",data & 0xff);
if (ACCESSING_BITS_0_7)
{
- coin_lockout_w(1,~data & 0x01);
- coin_lockout_w(0,~data & 0x02);
- coin_counter_w(1, data & 0x04);
- coin_counter_w(0, data & 0x08);
+ coin_lockout_w(space->machine, 1,~data & 0x01);
+ coin_lockout_w(space->machine, 0,~data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x08);
// data & 0x40?
ssv_enable_video( data & 0x80);
}
@@ -327,10 +327,10 @@ static WRITE16_HANDLER( ssv_lockout_inv_w )
// popmessage("%02X",data & 0xff);
if (ACCESSING_BITS_0_7)
{
- coin_lockout_w(1, data & 0x01);
- coin_lockout_w(0, data & 0x02);
- coin_counter_w(1, data & 0x04);
- coin_counter_w(0, data & 0x08);
+ coin_lockout_w(space->machine, 1, data & 0x01);
+ coin_lockout_w(space->machine, 0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x08);
// data & 0x40?
ssv_enable_video( data & 0x80);
}
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 90381c2cd6b..9bde548bd92 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -143,7 +143,7 @@ static CUSTOM_INPUT( get_rng )
static WRITE8_HANDLER( stactics_coin_lockout_w )
{
- coin_lockout_w(offset, ~data & 0x01);
+ coin_lockout_w(space->machine, offset, ~data & 0x01);
}
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index f62230dfdb8..ba71c85050c 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -54,8 +54,8 @@ static WRITE8_DEVICE_HANDLER( starshp1_audio_w )
break;
}
- coin_lockout_w(0, !starshp1_attract);
- coin_lockout_w(1, !starshp1_attract);
+ coin_lockout_w(device->machine, 0, !starshp1_attract);
+ coin_lockout_w(device->machine, 1, !starshp1_attract);
}
@@ -158,7 +158,7 @@ static WRITE8_HANDLER( starshp1_misc_w )
starshp1_mux = data;
break;
case 7:
- set_led_status(0, !data);
+ set_led_status(space->machine, 0, !data);
break;
}
}
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 3a9ab35e448..429b6c67794 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -167,7 +167,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4380, 0x439f) AM_READ(starwars_adc_r) /* a-d control result */
AM_RANGE(0x4400, 0x4400) AM_READWRITE(starwars_main_read_r, starwars_main_wr_w)
AM_RANGE(0x4401, 0x4401) AM_READ(starwars_main_ready_flag_r)
- AM_RANGE(0x4500, 0x45ff) AM_RAM AM_BASE(&starwars_ram_overlay) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4500, 0x45ff) AM_RAM AM_BASE(&starwars_ram_overlay) AM_SIZE_GENERIC(nvram)
AM_RANGE(0x4600, 0x461f) AM_WRITE(avgdvg_go_w)
AM_RANGE(0x4620, 0x463f) AM_WRITE(avgdvg_reset_w)
AM_RANGE(0x4640, 0x465f) AM_WRITE(watchdog_reset_w)
@@ -505,7 +505,7 @@ ROM_END
static DRIVER_INIT( starwars )
{
/* X2212 nvram */
- generic_nvram = auto_alloc_array(machine, UINT8, generic_nvram_size);
+ machine->generic.nvram.ptr.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram.size);
/* prepare the mathbox */
starwars_is_esb = 0;
@@ -522,7 +522,7 @@ static DRIVER_INIT( esb )
UINT8 *rom = memory_region(machine, "maincpu");
/* X2212 nvram */
- generic_nvram = auto_alloc_array(machine, UINT8, generic_nvram_size);
+ machine->generic.nvram.ptr.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram.size);
/* init the slapstic */
slapstic_init(machine, 101);
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 54d82f50ad9..6a638f4a273 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -267,7 +267,7 @@ static const ppi8255_interface ppi8255_intf =
static ADDRESS_MAP_START( statriv2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
- AM_RANGE(0x4800, 0x48ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x4800, 0x48ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(statriv2_videoram_w) AM_BASE(&videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 4f5d1459a7b..4960c3a8f26 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -916,10 +916,10 @@ static WRITE32_HANDLER ( stv_io_w32 )
{
/*Why does the BIOS tests these as ACTIVE HIGH? A program bug?*/
ioga[1] = (data) & 0xff;
- coin_counter_w(0,~data & 0x01);
- coin_counter_w(1,~data & 0x02);
- coin_lockout_w(0,~data & 0x04);
- coin_lockout_w(1,~data & 0x08);
+ coin_counter_w(space->machine, 0,~data & 0x01);
+ coin_counter_w(space->machine, 1,~data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x04);
+ coin_lockout_w(space->machine, 1,~data & 0x08);
/*
other bits reserved
*/
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 6b3128e5a93..a88f589aea5 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -93,7 +93,7 @@ static PALETTE_INIT( subsino_3proms )
static WRITE8_HANDLER( subsino_out_a_w )
{
- coin_counter_w( 0, data & 0x02 );
+ coin_counter_w( space->machine, 0, data & 0x02 );
// popmessage("Out A %02x",data);
}
static WRITE8_HANDLER( subsino_out_b_w )
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 8c564c57a9d..c17fe5c5b03 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -65,11 +65,11 @@ static WRITE16_HANDLER( bssoccer_leds_w )
{
if (ACCESSING_BITS_0_7)
{
- set_led_status(0, data & 0x01);
- set_led_status(1, data & 0x02);
- set_led_status(2, data & 0x04);
- set_led_status(3, data & 0x08);
- coin_counter_w(0, data & 0x10);
+ set_led_status(space->machine, 0, data & 0x01);
+ set_led_status(space->machine, 1, data & 0x02);
+ set_led_status(space->machine, 2, data & 0x04);
+ set_led_status(space->machine, 3, data & 0x08);
+ coin_counter_w(space->machine, 0, data & 0x10);
}
if (data & ~0x1f) logerror("CPU#0 PC %06X - Leds unknown bits: %04X\n", cpu_get_pc(space->cpu), data);
}
@@ -79,9 +79,9 @@ static WRITE16_HANDLER( uballoon_leds_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x01);
- set_led_status(0, data & 0x02);
- set_led_status(1, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ set_led_status(space->machine, 0, data & 0x02);
+ set_led_status(space->machine, 1, data & 0x04);
}
if (data & ~0x07) logerror("CPU#0 PC %06X - Leds unknown bits: %04X\n", cpu_get_pc(space->cpu), data);
}
@@ -91,7 +91,7 @@ static WRITE16_HANDLER( bestbest_coin_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x04);
+ coin_counter_w(space->machine, 0, data & 0x04);
}
if (data & ~0x04) logerror("CPU#0 PC %06X - Leds unknown bits: %04X\n", cpu_get_pc(space->cpu), data);
}
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 55c55e082b1..a97126d396a 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -504,8 +504,8 @@ static WRITE8_HANDLER( hardhead_bankswitch_w )
static WRITE8_HANDLER( hardhead_flipscreen_w )
{
flip_screen_set(space->machine, data & 0x04);
- coin_lockout_w ( 0, data & 0x08);
- coin_lockout_w ( 1, data & 0x10);
+ coin_lockout_w ( space->machine, 0, data & 0x08);
+ coin_lockout_w ( space->machine, 1, data & 0x10);
}
static ADDRESS_MAP_START( hardhead_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -551,8 +551,8 @@ static WRITE8_HANDLER( rranger_bankswitch_w )
memory_set_bank(space->machine, 1, bank);
flip_screen_set(space->machine, data & 0x20);
- coin_lockout_w ( 0, data & 0x40);
- coin_lockout_w ( 1, data & 0x80);
+ coin_lockout_w ( space->machine, 0, data & 0x40);
+ coin_lockout_w ( space->machine, 1, data & 0x80);
}
/*
@@ -691,9 +691,9 @@ static WRITE8_HANDLER( hardhea2_flipscreen_w )
static WRITE8_HANDLER( hardhea2_leds_w )
{
- set_led_status(0, data & 0x01);
- set_led_status(1, data & 0x02);
- coin_counter_w(0, data & 0x04);
+ set_led_status(space->machine, 0, data & 0x01);
+ set_led_status(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x04);
if (data & ~0x07) logerror("CPU#0 - PC %06X: unknown leds bits: %02X\n",cpu_get_pc(space->cpu),data);
}
@@ -840,9 +840,9 @@ static WRITE8_HANDLER( sparkman_flipscreen_w )
static WRITE8_HANDLER( sparkman_leds_w )
{
- set_led_status(0, data & 0x01);
- set_led_status(1, data & 0x02);
- coin_counter_w(0, data & 0x04);
+ set_led_status(space->machine, 0, data & 0x01);
+ set_led_status(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x04);
if (data & ~0x07) logerror("CPU#0 - PC %06X: unknown leds bits: %02X\n",cpu_get_pc(space->cpu),data);
}
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 2b49e715300..07326f77f6d 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -166,10 +166,10 @@ static WRITE32_HANDLER( superchs_input_w )
{
if (ACCESSING_BITS_24_31)
{
- coin_lockout_w(0,~data & 0x01000000);
- coin_lockout_w(1,~data & 0x02000000);
- coin_counter_w(0, data & 0x04000000);
- coin_counter_w(1, data & 0x08000000);
+ coin_lockout_w(space->machine, 0,~data & 0x01000000);
+ coin_lockout_w(space->machine, 1,~data & 0x02000000);
+ coin_counter_w(space->machine, 0, data & 0x04000000);
+ coin_counter_w(space->machine, 1, data & 0x08000000);
coin_word=(data >> 16) &0xffff;
}
}
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index 15eb8b7db9b..400ef0f9992 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -135,8 +135,8 @@ static WRITE8_HANDLER( superdq_io_w )
if ( data & 0x40 ) /* bit 6 = irqack */
cputag_set_input_line(space->machine, "maincpu", 0, CLEAR_LINE);
- coin_counter_w( 0, data & 0x08 );
- coin_counter_w( 1, data & 0x04 );
+ coin_counter_w( space->machine, 0, data & 0x08 );
+ coin_counter_w( space->machine, 1, data & 0x04 );
superdq_color_bank = ( data & 2 ) ? 1 : 0;
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 8d8ea719b77..7bbfb992eb4 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -233,13 +233,13 @@ static WRITE8_HANDLER( bootleg_mcu_p1_w )
// ???
break;
case 1:
- coin_counter_w(0,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
break;
case 2:
- coin_counter_w(1,data & 1);
+ coin_counter_w(space->machine, 1,data & 1);
break;
case 3:
- coin_lockout_global_w((data & 1) ^ invert_coin_lockout);
+ coin_lockout_global_w(space->machine, (data & 1) ^ invert_coin_lockout);
break;
case 4:
flip_screen_set(space->machine, data & 1);
@@ -300,13 +300,13 @@ static WRITE8_HANDLER( sqixu_mcu_p2_w )
// bit 0 = unknown (clocked often)
// bit 1 = coin cointer 1
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
// bit 2 = coin counter 2
- coin_counter_w(1,data & 4);
+ coin_counter_w(space->machine, 1,data & 4);
// bit 3 = coin lockout
- coin_lockout_global_w(~data & 8);
+ coin_lockout_global_w(space->machine, ~data & 8);
// bit 4 = flip screen
flip_screen_set(space->machine, data & 0x10);
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index adc2aa4a0c3..952ce9a3c79 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -651,10 +651,10 @@ static WRITE32_HANDLER( skns_io_w )
case 2:
if(ACCESSING_BITS_24_31)
{ /* Coin Lock/Count */
-// coin_counter_w(0, data & 0x01000000);
-// coin_counter_w(1, data & 0x02000000);
-// coin_lockout_w(0, ~data & 0x04000000);
-// coin_lockout_w(1, ~data & 0x08000000); // Works in puzzloop, others behave strange.
+// coin_counter_w(space->machine, 0, data & 0x01000000);
+// coin_counter_w(space->machine, 1, data & 0x02000000);
+// coin_lockout_w(space->machine, 0, ~data & 0x04000000);
+// coin_lockout_w(space->machine, 1, ~data & 0x08000000); // Works in puzzloop, others behave strange.
}
if(ACCESSING_BITS_16_23)
{ /* Analogue Input Select */
@@ -772,7 +772,7 @@ static ADDRESS_MAP_START( skns_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x00400004, 0x00400007) AM_READ_PORT("400004")
/* In between is write only */
AM_RANGE(0x0040000c, 0x0040000f) AM_READ_PORT("40000c")
- AM_RANGE(0x00800000, 0x00801fff) AM_RAM AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) /* 'backup' RAM */
+ AM_RANGE(0x00800000, 0x00801fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* 'backup' RAM */
AM_RANGE(0x00c00000, 0x00c00003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0xffff0000) /* ymz280_w (sound) */
AM_RANGE(0x01000000, 0x0100000f) AM_READWRITE(skns_msm6242_r, skns_msm6242_w)
AM_RANGE(0x01800000, 0x01800003) AM_WRITE(skns_hit2_w)
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 2f358f40ad4..1fe4279173f 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -150,7 +150,7 @@ static WRITE8_HANDLER( sound_irq_ack_w )
static WRITE8_HANDLER( coin_lock_w )
{
/* cleared when 9 credits are hit, but never reset! */
-/* coin_lockout_global_w(~data & 1); */
+/* coin_lockout_global_w(space->machine, ~data & 1); */
}
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 9a90017c675..a20f3a2ba9f 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -73,8 +73,8 @@ static WRITE8_HANDLER( surpratk_5fc0_w )
if ((data & 0xf4) != 0x10) logerror("%04x: 3fc0 = %02x\n",cpu_get_pc(space->cpu),data);
/* bit 0/1 = coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 3 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line( ( data & 0x08 ) ? ASSERT_LINE : CLEAR_LINE );
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index f0411769f06..dbe74ec8e2e 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -415,7 +415,7 @@ static WRITE8_HANDLER( videomode_w )
videomode_prev = data;
/* bit 0 is for the coin counters */
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
/* remaining signals are video-related */
system1_videomode_w(space, 0, data);
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 876d4bb801d..d49ac293235 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -289,10 +289,10 @@ static WRITE16_HANDLER( sys16_coinctrl_w )
{
coinctrl = data&0xff;
sys16_refreshenable = coinctrl & 0x20;
- set_led_status(1,coinctrl & 0x08);
- set_led_status(0,coinctrl & 0x04);
- coin_counter_w(1,coinctrl & 0x02);
- coin_counter_w(0,coinctrl & 0x01);
+ set_led_status(space->machine, 1,coinctrl & 0x08);
+ set_led_status(space->machine, 0,coinctrl & 0x04);
+ coin_counter_w(space->machine, 1,coinctrl & 0x02);
+ coin_counter_w(space->machine, 0,coinctrl & 0x01);
/* bit 6 is also used (1 most of the time; 0 in dduxbl, sdi, wb3;
tturf has it normally 1 but 0 after coin insertion) */
/* eswat sets bit 4 */
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 99ec4075dea..9d7cdba2f51 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -420,10 +420,10 @@ static WRITE16_HANDLER( player_34_coin_ctrl_w )
COMBINE_DATA(&coin_word);
/* coin counters and lockout */
- coin_lockout_w(2,~data & 0x0100);
- coin_lockout_w(3,~data & 0x0200);
- coin_counter_w(2, data & 0x0400);
- coin_counter_w(3, data & 0x0800);
+ coin_lockout_w(space->machine, 2,~data & 0x0100);
+ coin_lockout_w(space->machine, 3,~data & 0x0200);
+ coin_counter_w(space->machine, 2, data & 0x0400);
+ coin_counter_w(space->machine, 3, data & 0x0800);
}
static READ16_HANDLER( pbobble_input_bypass_r )
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 586151be9ab..9330ce9c722 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -316,10 +316,10 @@ static WRITE16_HANDLER( growl_coin_word_w ) /* what about coins 3&4 ?? */
{
if (ACCESSING_BITS_0_7)
{
- coin_lockout_w(0, ~data & 0x01);
- coin_lockout_w(1, ~data & 0x02);
- coin_counter_w(0, data & 0x04);
- coin_counter_w(1, data & 0x08);
+ coin_lockout_w(space->machine, 0, ~data & 0x01);
+ coin_lockout_w(space->machine, 1, ~data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x04);
+ coin_counter_w(space->machine, 1, data & 0x08);
}
}
@@ -327,14 +327,14 @@ static WRITE16_HANDLER( taitof2_4p_coin_word_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_lockout_w(0, ~data & 0x01);
- coin_lockout_w(1, ~data & 0x02);
- coin_lockout_w(2, ~data & 0x04);
- coin_lockout_w(3, ~data & 0x08);
- coin_counter_w(0, data & 0x10);
- coin_counter_w(1, data & 0x20);
- coin_counter_w(2, data & 0x40);
- coin_counter_w(3, data & 0x80);
+ coin_lockout_w(space->machine, 0, ~data & 0x01);
+ coin_lockout_w(space->machine, 1, ~data & 0x02);
+ coin_lockout_w(space->machine, 2, ~data & 0x04);
+ coin_lockout_w(space->machine, 3, ~data & 0x08);
+ coin_counter_w(space->machine, 0, data & 0x10);
+ coin_counter_w(space->machine, 1, data & 0x20);
+ coin_counter_w(space->machine, 2, data & 0x40);
+ coin_counter_w(space->machine, 3, data & 0x80);
}
}
@@ -342,14 +342,14 @@ static WRITE16_HANDLER( ninjak_coin_word_w )
{
if (ACCESSING_BITS_8_15)
{
- coin_lockout_w(0, ~data & 0x0100);
- coin_lockout_w(1, ~data & 0x0200);
- coin_lockout_w(2, ~data & 0x0400);
- coin_lockout_w(3, ~data & 0x0800);
- coin_counter_w(0, data & 0x1000);
- coin_counter_w(1, data & 0x2000);
- coin_counter_w(2, data & 0x4000);
- coin_counter_w(3, data & 0x8000);
+ coin_lockout_w(space->machine, 0, ~data & 0x0100);
+ coin_lockout_w(space->machine, 1, ~data & 0x0200);
+ coin_lockout_w(space->machine, 2, ~data & 0x0400);
+ coin_lockout_w(space->machine, 3, ~data & 0x0800);
+ coin_counter_w(space->machine, 0, data & 0x1000);
+ coin_counter_w(space->machine, 1, data & 0x2000);
+ coin_counter_w(space->machine, 2, data & 0x4000);
+ coin_counter_w(space->machine, 3, data & 0x8000);
}
}
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 2ef1d6aa71b..36f7a76ab73 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -88,10 +88,10 @@ static WRITE32_HANDLER( f3_control_w )
case 0x01: /* Coin counters & lockouts */
if (ACCESSING_BITS_24_31)
{
- coin_lockout_w(0,~data & 0x01000000);
- coin_lockout_w(1,~data & 0x02000000);
- coin_counter_w(0, data & 0x04000000);
- coin_counter_w(1, data & 0x08000000);
+ coin_lockout_w(space->machine, 0,~data & 0x01000000);
+ coin_lockout_w(space->machine, 1,~data & 0x02000000);
+ coin_counter_w(space->machine, 0, data & 0x04000000);
+ coin_counter_w(space->machine, 1, data & 0x08000000);
coin_word[0]=(data>>16)&0xffff;
}
return;
@@ -106,10 +106,10 @@ static WRITE32_HANDLER( f3_control_w )
case 0x05: /* Player 3 & 4 coin counters */
if (ACCESSING_BITS_24_31)
{
- coin_lockout_w(2,~data & 0x01000000);
- coin_lockout_w(3,~data & 0x02000000);
- coin_counter_w(2, data & 0x04000000);
- coin_counter_w(3, data & 0x08000000);
+ coin_lockout_w(space->machine, 2,~data & 0x01000000);
+ coin_lockout_w(space->machine, 3,~data & 0x02000000);
+ coin_counter_w(space->machine, 2, data & 0x04000000);
+ coin_counter_w(space->machine, 3, data & 0x08000000);
coin_word[1]=(data>>16)&0xffff;
}
return;
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index cd2710a886d..c7f570f13e1 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -442,10 +442,10 @@ static WRITE8_HANDLER( bank3_w )
static WRITE8_HANDLER( control2_w )
{
- coin_lockout_w(0,~data & 0x01);
- coin_lockout_w(1,~data & 0x02);
- coin_counter_w(0,data & 0x04);
- coin_counter_w(1,data & 0x08);
+ coin_lockout_w(space->machine, 0,~data & 0x01);
+ coin_lockout_w(space->machine, 1,~data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x04);
+ coin_counter_w(space->machine, 1,data & 0x08);
}
static READ8_DEVICE_HANDLER( portA_r )
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 608f3486d16..e3e1828c160 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -362,10 +362,10 @@ static WRITE16_HANDLER( daisenpu_input_w )
switch (offset)
{
case 0x04: /* coin counters and lockout */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
- coin_lockout_w(0,~data & 0x04);
- coin_lockout_w(1,~data & 0x08);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
+ coin_lockout_w(space->machine, 0,~data & 0x04);
+ coin_lockout_w(space->machine, 1,~data & 0x08);
//logerror("taitox coin control %04x to offset %04x\n",data,offset);
break;
@@ -380,10 +380,10 @@ static WRITE16_HANDLER( kyustrkr_input_w )
switch (offset)
{
case 0x04: /* coin counters and lockout */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
- coin_lockout_w(0,data & 0x04);
- coin_lockout_w(1,data & 0x08);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
+ coin_lockout_w(space->machine, 0,data & 0x04);
+ coin_lockout_w(space->machine, 1,data & 0x08);
//logerror("taitox coin control %04x to offset %04x\n",data,offset);
break;
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index 5ca3a434068..f37f74286ea 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -33,7 +33,7 @@ static READ8_HANDLER( tank8_collision_r )
static WRITE8_HANDLER( tank8_lockout_w )
{
- coin_lockout_w(offset, ~data & 1);
+ coin_lockout_w(space->machine, offset, ~data & 1);
}
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index af0d58eb322..603a5c894bb 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -74,7 +74,7 @@ extern VIDEO_UPDATE( tankbatt );
static WRITE8_HANDLER( tankbatt_led_w )
{
- set_led_status(offset,data & 1);
+ set_led_status(space->machine, offset,data & 1);
}
static READ8_HANDLER( tankbatt_in0_r )
@@ -156,14 +156,14 @@ static WRITE8_HANDLER( tankbatt_irq_ack_w )
static WRITE8_HANDLER( tankbatt_coin_counter_w )
{
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 1);
}
static WRITE8_HANDLER( tankbatt_coin_lockout_w )
{
- coin_lockout_w(0,data & 1);
- coin_lockout_w(1,data & 1);
+ coin_lockout_w(space->machine, 0,data & 1);
+ coin_lockout_w(space->machine, 1,data & 1);
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index c5ada53c238..7015aade992 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -100,7 +100,7 @@ static WRITE8_HANDLER( tankbust_e0xx_w )
break;
case 2: /* 0xe002 coin counter */
- coin_counter_w(0, data&1);
+ coin_counter_w(space->machine, 0, data&1);
break;
case 6: /* 0xe006 screen disable ?? or disable screen update */
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index 7ddd7db0d0f..13a43a310f6 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -65,7 +65,7 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w )
static WRITE16_HANDLER( targeth_coin_counter_w )
{
- coin_counter_w( (offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w( space->machine, (offset >> 3) & 0x01, data & 0x01);
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 6c6486edea9..c6866af8f08 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -194,7 +194,7 @@ static WRITE16_HANDLER(cyclwarr_sound_w)
static ADDRESS_MAP_START( apache3_v30_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03fff) AM_RAM
- AM_RANGE(0x04000, 0x07fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x04000, 0x07fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x08000, 0x08fff) AM_RAM_WRITE(apache3_palette_w) AM_BASE(&paletteram16)
AM_RANGE(0x0c000, 0x0dfff) AM_RAM_WRITE(roundup5_text_w) AM_BASE(&videoram16)
AM_RANGE(0x0e800, 0x0e803) AM_WRITENOP // CRT
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 0196b1d2da5..d8031d27a66 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -40,7 +40,7 @@ VIDEO_UPDATE( tbowl );
static WRITE8_HANDLER( tbowl_coin_counter_w )
{
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
}
/*** Banking
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 063462094e7..329ed4b643d 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -243,7 +243,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8800, 0x8800) AM_WRITE(mcu_irq_enable_w)
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
- AM_RANGE(0xc800, 0xdfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // Battery Backup
+ AM_RANGE(0xc800, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // Battery Backup
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index e8b79dc4250..ef48715c9f3 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -360,8 +360,8 @@ static READ8_DEVICE_HANDLER( input_port_2_bit_r )
static WRITE8_HANDLER( tempest_led_w )
{
- set_led_status(0, ~data & 0x02);
- set_led_status(1, ~data & 0x01);
+ set_led_status(space->machine, 0, ~data & 0x02);
+ set_led_status(space->machine, 1, ~data & 0x01);
/* FLIP is bit 0x04 */
tempest_player_select = data & 0x04;
}
@@ -369,9 +369,9 @@ static WRITE8_HANDLER( tempest_led_w )
static WRITE8_HANDLER( tempest_coin_w )
{
- coin_counter_w(0, (data & 0x01));
- coin_counter_w(1, (data & 0x02));
- coin_counter_w(2, (data & 0x04));
+ coin_counter_w(space->machine, 0, (data & 0x01));
+ coin_counter_w(space->machine, 1, (data & 0x02));
+ coin_counter_w(space->machine, 2, (data & 0x04));
avg_set_flip_x(data & 0x08);
avg_set_flip_y(data & 0x10);
}
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index dda7994d48c..85d5a536d8a 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -295,7 +295,7 @@ static WRITE16_HANDLER( rocknms_sub2main_w )
static WRITE16_HANDLER( tetrisp2_coincounter_w )
{
- coin_counter_w( 0, (data & 0x0001));
+ coin_counter_w( space->machine, 0, (data & 0x0001));
}
@@ -345,16 +345,16 @@ static WRITE16_HANDLER( nndmseal_coincounter_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w( 0, data & 0x0001 );
+ coin_counter_w( space->machine, 0, data & 0x0001 );
// data & 0x0004 ?
- coin_lockout_w( 0,(~data) & 0x0008 );
+ coin_lockout_w( space->machine, 0,(~data) & 0x0008 );
}
if (ACCESSING_BITS_8_15)
{
- set_led_status( 0, data & 0x1000 ); // +
- set_led_status( 1, data & 0x2000 ); // -
- set_led_status( 2, data & 0x4000 ); // Cancel
- set_led_status( 3, data & 0x8000 ); // OK
+ set_led_status( space->machine, 0, data & 0x1000 ); // +
+ set_led_status( space->machine, 1, data & 0x2000 ); // -
+ set_led_status( space->machine, 2, data & 0x4000 ); // Cancel
+ set_led_status( space->machine, 3, data & 0x8000 ); // OK
}
// popmessage("%04x",data);
}
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index aa21e612d94..05660d60b83 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -338,7 +338,7 @@ static WRITE8_HANDLER( laserdsc_control_w )
*/
- coin_counter_w(0, BIT(data, 4));
+ coin_counter_w(space->machine, 0, BIT(data, 4));
if (BIT(data, 5))
{
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index bbcc5143f7b..5b2a4a464a6 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -73,11 +73,11 @@ static WRITE16_HANDLER( thoop2_coin_w )
switch ((offset >> 3)){
case 0x00: /* Coin Lockouts */
case 0x01:
- coin_lockout_w((offset >> 3) & 0x01, ~data & 0x01);
+ coin_lockout_w(space->machine, (offset >> 3) & 0x01, ~data & 0x01);
break;
case 0x02: /* Coin Counters */
case 0x03:
- coin_counter_w((offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w(space->machine, (offset >> 3) & 0x01, data & 0x01);
break;
}
}
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 62fab18055a..9af0f731de4 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -331,8 +331,8 @@ static WRITE8_HANDLER( scontra_bankswitch_w )
palette_selected = ~data & 0x10;
/* bits 5/6 coin counters */
- coin_counter_w(0,data & 0x20);
- coin_counter_w(1,data & 0x40);
+ coin_counter_w(space->machine, 0,data & 0x20);
+ coin_counter_w(space->machine, 1,data & 0x40);
/* bit 7 controls layer priority */
scontra_priority = data & 0x80;
@@ -347,8 +347,8 @@ static WRITE8_HANDLER( thunderx_videobank_w )
rambank = data;
/* bits 1/2 coin counters */
- coin_counter_w(0,data & 0x02);
- coin_counter_w(1,data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x02);
+ coin_counter_w(space->machine, 1,data & 0x04);
/* bit 3 controls layer priority (seems to be always 1) */
scontra_priority = data & 0x08;
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index fd34a519134..e9b47590a59 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -126,8 +126,8 @@ static MACHINE_RESET( tiamc1 )
static WRITE8_HANDLER( tiamc1_control_w )
{
- coin_lockout_w(0, ~data & 0x02);
- coin_counter_w(0, data & 0x04);
+ coin_lockout_w(space->machine, 0, ~data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x04);
}
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index b334a890a0d..649465008e4 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -213,7 +213,7 @@ static WRITE16_HANDLER( tickee_control_w )
static ADDRESS_MAP_START( tickee_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE(&tickee_vram)
AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0)
- AM_RANGE(0x04000000, 0x04003fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x04000000, 0x04003fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x04100000, 0x041000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w)
AM_RANGE(0x04200000, 0x0420000f) AM_DEVREAD8("ym1", ay8910_r, 0x00ff)
AM_RANGE(0x04200000, 0x0420001f) AM_DEVWRITE8("ym1", ay8910_address_data_w, 0x00ff)
@@ -231,7 +231,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ghoshunt_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE(&tickee_vram)
AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0)
- AM_RANGE(0x04100000, 0x04103fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x04100000, 0x04103fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x04200000, 0x042000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w)
AM_RANGE(0x04300000, 0x0430000f) AM_DEVREAD8("ym1", ay8910_r, 0x00ff)
AM_RANGE(0x04300000, 0x0430001f) AM_DEVWRITE8("ym1", ay8910_address_data_w, 0x00ff)
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index 0ce90369122..e8dd37655ee 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -91,7 +91,7 @@ static WRITE8_HANDLER( timeplt_nmi_enable_w )
static WRITE8_HANDLER( timeplt_coin_counter_w )
{
- coin_counter_w(offset >> 1, data);
+ coin_counter_w(space->machine, offset >> 1, data);
}
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 6e1b074f057..425bd7ba361 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -475,7 +475,7 @@ static READ16_HANDLER( tmaster_coins_r )
static ADDRESS_MAP_START( tmaster_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x1fffff ) AM_ROM
AM_RANGE( 0x200000, 0x27ffff ) AM_RAM
- AM_RANGE( 0x280000, 0x28ffef ) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE( 0x280000, 0x28ffef ) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE( 0x28fff0, 0x28ffff ) AM_READWRITE( rtc_r, rtc_w )
AM_RANGE( 0x300010, 0x300011 ) AM_READ( tmaster_coins_r )
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index d401836904e..3afc6a923db 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -3931,8 +3931,8 @@ static DRIVER_INIT( glfgreat )
static DRIVER_INIT( cuebrick )
{
- generic_nvram = (UINT8 *)cuebrick_nvram;
- generic_nvram_size = 0x400*0x20;
+ machine->generic.nvram.ptr.u8 = (UINT8 *)cuebrick_nvram;
+ machine->generic.nvram.size = 0x400*0x20;
/* ROMs are interleaved at byte level */
shuffle(memory_region(machine, "gfx1"),memory_region_length(machine, "gfx1"));
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index b54324aa1c3..46728d03069 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -596,14 +596,14 @@ static WRITE8_HANDLER( toaplan2_coin_w )
if (data & 0x0f)
{
- coin_lockout_w( 0, ((data & 4) ? 0 : 1) );
- coin_lockout_w( 1, ((data & 8) ? 0 : 1) );
- coin_counter_w( 0, (data & 1) );
- coin_counter_w( 1, (data & 2) );
+ coin_lockout_w( space->machine, 0, ((data & 4) ? 0 : 1) );
+ coin_lockout_w( space->machine, 1, ((data & 8) ? 0 : 1) );
+ coin_counter_w( space->machine, 0, (data & 1) );
+ coin_counter_w( space->machine, 1, (data & 2) );
}
else
{
- coin_lockout_global_w(1); /* Lock all coin slots */
+ coin_lockout_global_w(space->machine, 1); /* Lock all coin slots */
}
if (data & 0xe0)
{
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index a75906e6e7f..82f7afb5eae 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -67,22 +67,22 @@ static READ16_HANDLER(tomcat_inputs_r)
static WRITE16_HANDLER(tomcat_led1on_w)
{
- set_led_status(1, 1);
+ set_led_status(space->machine, 1, 1);
}
static WRITE16_HANDLER(tomcat_led2on_w)
{
- set_led_status(2, 1);
+ set_led_status(space->machine, 2, 1);
}
static WRITE16_HANDLER(tomcat_led2off_w)
{
- set_led_status(2, 0);
+ set_led_status(space->machine, 2, 0);
}
static WRITE16_HANDLER(tomcat_led1off_w)
{
- set_led_status(1, 0);
+ set_led_status(space->machine, 1, 0);
}
static WRITE16_HANDLER(tomcat_lnkmodel_w)
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index b2df265e0dd..36420076ab9 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -104,9 +104,9 @@ static WRITE8_HANDLER( clear_tv_w )
static WRITE8_DEVICE_HANDLER( port_b_u1_w )
{
if (pia6821_get_port_b_z_mask(device) & 0x20)
- coin_counter_w(0, 1);
+ coin_counter_w(device->machine, 0, 1);
else
- coin_counter_w(0, data & 0x20);
+ coin_counter_w(device->machine, 0, data & 0x20);
}
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index 167d30aa05f..8f784d91790 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -18,12 +18,12 @@
static WRITE8_DEVICE_HANDLER( tourtabl_led_w )
{
- set_led_status(0, data & 0x40); /* start 1 */
- set_led_status(1, data & 0x20); /* start 2 */
- set_led_status(2, data & 0x10); /* start 4 */
- set_led_status(3, data & 0x80); /* select game */
+ set_led_status(device->machine, 0, data & 0x40); /* start 1 */
+ set_led_status(device->machine, 1, data & 0x20); /* start 2 */
+ set_led_status(device->machine, 2, data & 0x10); /* start 4 */
+ set_led_status(device->machine, 3, data & 0x80); /* select game */
- coin_lockout_global_w(!(data & 0x80));
+ coin_lockout_global_w(device->machine, !(data & 0x80));
}
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 7e66213122a..af7693798a5 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -69,12 +69,12 @@ static READ8_HANDLER( in2_h ) { return input_port_read(space->machine, "INPUT_LE
static READ8_HANDLER( in3 ) { return input_port_read(space->machine, "SERVICE"); } // test, cocktail, optional buttons
static WRITE8_HANDLER( out_coin0 )
{
- coin_lockout_global_w(data & 4);
- coin_counter_w(0,~data & 8);
+ coin_lockout_global_w(space->machine, data & 4);
+ coin_counter_w(space->machine, 0,~data & 8);
}
static WRITE8_HANDLER( out_coin1 )
{
- coin_counter_w(1,~data & 1);
+ coin_counter_w(space->machine, 1,~data & 1);
}
static WRITE8_HANDLER( flip )
{
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 1d9a337dc44..e094c99d12b 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -40,7 +40,7 @@ static UINT8 hyprolyb_vck_ready;
static WRITE8_HANDLER( coin_w )
{
- coin_counter_w(offset,data & 1);
+ coin_counter_w(space->machine, offset,data & 1);
}
static WRITE8_HANDLER( questions_bank_w )
@@ -122,7 +122,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1c00, 0x1c3f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
AM_RANGE(0x1c40, 0x1c5f) AM_RAM AM_BASE(&trackfld_scroll2)
AM_RANGE(0x1c60, 0x1fff) AM_RAM
- AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(&colorram)
AM_RANGE(0x6000, 0xffff) AM_ROM
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( reaktor_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9c40, 0x9c5f) AM_RAM AM_BASE(&trackfld_scroll2)
AM_RANGE(0x9c60, 0x9fff) AM_RAM
AM_RANGE(0xa800, 0xabff) AM_RAM
- AM_RANGE(0xac00, 0xafff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xac00, 0xafff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(&videoram)
AM_RANGE(0xb800, 0xbfff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(&colorram)
ADDRESS_MAP_END
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( mastkin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1c40, 0x1c5f) AM_RAM AM_BASE(&trackfld_scroll2)
AM_RANGE(0x1c60, 0x1fff) AM_RAM
AM_RANGE(0x2800, 0x2bff) AM_RAM
- AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(&colorram)
AM_RANGE(0x6000, 0xffff) AM_ROM
@@ -208,7 +208,7 @@ static ADDRESS_MAP_START( wizzquiz_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1c40, 0x1c5f) AM_RAM AM_BASE(&trackfld_scroll2)
AM_RANGE(0x1c60, 0x1fff) AM_RAM
AM_RANGE(0x2800, 0x2bff) AM_RAM
- AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_WRITE(trackfld_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x3800, 0x3fff) AM_READ(SMH_RAM) AM_WRITE(trackfld_colorram_w) AM_BASE(&colorram)
AM_RANGE(0xc000, 0xc000) AM_WRITE(questions_bank_w)
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index c4df584a87e..abaa3986c33 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -23,8 +23,8 @@ static UINT8 triplhnt_hit_code;
static DRIVER_INIT( triplhnt )
{
- generic_nvram = triplhnt_cmos;
- generic_nvram_size = sizeof triplhnt_cmos;
+ machine->generic.nvram.ptr.u8 = triplhnt_cmos;
+ machine->generic.nvram.size = sizeof triplhnt_cmos;
}
@@ -69,10 +69,10 @@ static void triplhnt_update_misc(running_machine *machine, int offset)
triplhnt_sprite_zoom = (triplhnt_misc_flags >> 4) & 1;
triplhnt_sprite_bank = (triplhnt_misc_flags >> 7) & 1;
- set_led_status(0, triplhnt_misc_flags & 0x02);
+ set_led_status(machine, 0, triplhnt_misc_flags & 0x02);
- coin_lockout_w(0, !(triplhnt_misc_flags & 0x08));
- coin_lockout_w(1, !(triplhnt_misc_flags & 0x08));
+ coin_lockout_w(machine, 0, !(triplhnt_misc_flags & 0x08));
+ coin_lockout_w(machine, 1, !(triplhnt_misc_flags & 0x08));
discrete_sound_w(discrete, TRIPLHNT_SCREECH_EN, triplhnt_misc_flags & 0x04); // screech
discrete_sound_w(discrete, TRIPLHNT_LAMP_EN, triplhnt_misc_flags & 0x02); // Lamp is used to reset noise
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index 62f9e6f29f0..9ca523e2a38 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -49,7 +49,7 @@ static READ8_HANDLER( trvquest_question_r )
static WRITE8_DEVICE_HANDLER( trvquest_coin_w )
{
- coin_counter_w(0,~data & 1);
+ coin_counter_w(device->machine, 0,~data & 1);
}
static WRITE8_DEVICE_HANDLER( trvquest_misc_w )
@@ -58,7 +58,7 @@ static WRITE8_DEVICE_HANDLER( trvquest_misc_w )
}
static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // cmos ram
+ AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) // cmos ram
AM_RANGE(0x2000, 0x27ff) AM_RAM // main ram
AM_RANGE(0x3800, 0x380f) AM_DEVREADWRITE("via6522_1", via_r, via_w)
AM_RANGE(0x3810, 0x381f) AM_DEVREADWRITE("via6522_2", via_r, via_w)
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 3b7e49378ec..7d9e22b047c 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -128,7 +128,7 @@ static WRITE8_HANDLER( flip_screen_w )
static WRITE8_HANDLER( tsamurai_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 0188390ac8a..0316a5f69ce 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -137,7 +137,7 @@ static WRITE8_HANDLER( tubep_LS259_w )
port b0: bit0 - coin 1 counter
port b1 bit0 - coin 2 counter
*/
- coin_counter_w(offset,data&1);
+ coin_counter_w(space->machine, offset,data&1);
break;
case 2:
//something...
@@ -391,7 +391,7 @@ static WRITE8_HANDLER( rjammer_LS259_w )
{
case 0:
case 1:
- coin_counter_w(offset,data&1); /* bit 0 = coin counter */
+ coin_counter_w(space->machine, offset,data&1); /* bit 0 = coin counter */
break;
case 5:
//screen_flip_w(offset,data&1); /* bit 0 = screen flip, active high */
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index cdfa0229a36..9de91d4477c 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -83,9 +83,9 @@ static WRITE8_HANDLER( tunhunt_control_w )
0x80 in-game
*/
tunhunt_control = data;
- coin_counter_w( 0,data&0x01 );
- coin_counter_w( 1,data&0x02 );
- set_led_status( 0, data&0x40 ); /* start */
+ coin_counter_w( space->machine, 0,data&0x01 );
+ coin_counter_w( space->machine, 1,data&0x02 );
+ set_led_status( space->machine, 0, data&0x40 ); /* start */
}
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 241a6eae030..45a95d02b55 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -343,9 +343,9 @@ static WRITE8_DEVICE_HANDLER( subroc3d_ppi0b_w )
/* bit 3 = NOUSE (n/c) */
/* bit 4 = FLIP (not really flip, just offset) */
turbo_state *state = (turbo_state *)device->machine->driver_data;
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
- set_led_status(0, data & 0x04);
+ coin_counter_w(device->machine, 0, data & 0x01);
+ coin_counter_w(device->machine, 1, data & 0x02);
+ set_led_status(device->machine, 0, data & 0x04);
state->subroc3d_flip = (data >> 4) & 1;
}
@@ -417,9 +417,9 @@ static WRITE8_DEVICE_HANDLER( buckrog_ppi1c_w )
/* bit 7 = NOUSE (BODY SONIC) */
turbo_state *state = (turbo_state *)device->machine->driver_data;
state->buckrog_obch = data & 0x07;
- coin_counter_w(0, data & 0x10);
- coin_counter_w(1, data & 0x20);
- set_led_status(0, data & 0x40);
+ coin_counter_w(device->machine, 0, data & 0x10);
+ coin_counter_w(device->machine, 1, data & 0x20);
+ set_led_status(device->machine, 0, data & 0x40);
}
@@ -657,13 +657,13 @@ static WRITE8_HANDLER( turbo_coin_and_lamp_w )
switch (offset & 7)
{
case 0:
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
break;
case 1:
- coin_counter_w(1, data & 1);
+ coin_counter_w(space->machine, 1, data & 1);
break;
case 3:
- set_led_status(0, data & 1);
+ set_led_status(space->machine, 0, data & 1);
break;
}
}
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index d5470362f39..e483225eb48 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -89,7 +89,7 @@ static WRITE8_HANDLER( sound_mute_w )
static WRITE8_HANDLER( tutankhm_coin_counter_w )
{
- coin_counter_w(offset ^ 1, data);
+ coin_counter_w(space->machine, offset ^ 1, data);
}
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index ca51f5f7fe6..5e0aba3a1be 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -135,9 +135,9 @@ static WRITE16_HANDLER( twin16_CPUA_register_w )
if ((old & 0x10) == 0 && (twin16_CPUA_register & 0x10))
cputag_set_input_line(space->machine, "sub", M68K_IRQ_6, HOLD_LINE);
- coin_counter_w(0, twin16_CPUA_register & 0x01);
- coin_counter_w(1, twin16_CPUA_register & 0x02);
- coin_counter_w(2, twin16_CPUA_register & 0x04);
+ coin_counter_w(space->machine, 0, twin16_CPUA_register & 0x01);
+ coin_counter_w(space->machine, 1, twin16_CPUA_register & 0x02);
+ coin_counter_w(space->machine, 2, twin16_CPUA_register & 0x04);
}
}
@@ -172,8 +172,8 @@ static WRITE16_HANDLER( fround_CPU_register_w )
if ((old & 0x08) == 0 && (twin16_CPUA_register & 0x08))
cputag_set_input_line_and_vector(space->machine, "audiocpu", 0, HOLD_LINE, 0xff);
- coin_counter_w(0, twin16_CPUA_register & 0x01);
- coin_counter_w(1, twin16_CPUA_register & 0x02);
+ coin_counter_w(space->machine, 0, twin16_CPUA_register & 0x01);
+ coin_counter_w(space->machine, 1, twin16_CPUA_register & 0x02);
}
}
@@ -1332,8 +1332,8 @@ static DRIVER_INIT( cuebrickj )
{
gfx_untangle(machine);
- generic_nvram = (UINT8 *)cuebrickj_nvram;
- generic_nvram_size = 0x400*0x20;
+ machine->generic.nvram.ptr.u8 = (UINT8 *)cuebrickj_nvram;
+ machine->generic.nvram.size = 0x400*0x20;
}
/* Game Drivers */
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 06e0b4a6b42..ed1ff4f44bf 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -415,16 +415,16 @@ static READ8_HANDLER( ts_r )
static WRITE8_DEVICE_HANDLER( tx1_coin_cnt_w )
{
- coin_counter_w(0, data & 0x80);
- coin_counter_w(1, data & 0x40);
-// coin_counter_w(2, data & 0x40);
+ coin_counter_w(device->machine, 0, data & 0x80);
+ coin_counter_w(device->machine, 1, data & 0x40);
+// coin_counter_w(device->machine, 2, data & 0x40);
}
static WRITE8_DEVICE_HANDLER( bb_coin_cnt_w )
{
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
-// coin_counter_w(2, data & 0x04);
+ coin_counter_w(device->machine, 0, data & 0x01);
+ coin_counter_w(device->machine, 1, data & 0x02);
+// coin_counter_w(device->machine, 2, data & 0x04);
}
static WRITE8_HANDLER( tx1_ppi_latch_w )
@@ -508,7 +508,7 @@ static const ppi8255_interface tx1_ppi8255_intf =
static ADDRESS_MAP_START( tx1_main, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x00fff) AM_MIRROR(0x1000) AM_RAM
AM_RANGE(0x02000, 0x02fff) AM_MIRROR(0x1000) AM_RAM
- AM_RANGE(0x04000, 0x04fff) AM_MIRROR(0x1000) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x04000, 0x04fff) AM_MIRROR(0x1000) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x06000, 0x06fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x09fff) AM_RAM AM_BASE(&tx1_vram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE(1) AM_BASE(&tx1_rcram)
@@ -559,7 +559,7 @@ ADDRESS_MAP_END
*************************************/
static ADDRESS_MAP_START( buggyboy_main, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x00000, 0x03fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x00000, 0x03fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x04000, 0x04fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x09fff) AM_RAM AM_BASE(&buggyboy_vram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE(1) AM_BASE(&buggyboy_rcram) AM_SIZE(&buggyboy_rcram_size)
@@ -574,7 +574,7 @@ static ADDRESS_MAP_START( buggyboy_main, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( buggybjr_main, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x00000, 0x03fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x00000, 0x03fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x04000, 0x04fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_BASE(&buggyboy_vram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE(1) AM_BASE(&buggyboy_rcram) AM_SIZE(&buggyboy_rcram_size)
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 425dc511581..d3969eee6ea 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -114,17 +114,17 @@ static WRITE8_HANDLER( ultratnk_da_latch_w )
static WRITE8_HANDLER( ultratnk_led_1_w )
{
- set_led_status(0, offset & 1); /* left player start */
+ set_led_status(space->machine, 0, offset & 1); /* left player start */
}
static WRITE8_HANDLER( ultratnk_led_2_w )
{
- set_led_status(1, offset & 1); /* right player start */
+ set_led_status(space->machine, 1, offset & 1); /* right player start */
}
static WRITE8_HANDLER( ultratnk_lockout_w )
{
- coin_lockout_global_w(~offset & 1);
+ coin_lockout_global_w(space->machine, ~offset & 1);
}
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 79c8239b2ee..217a8f02bac 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -336,10 +336,10 @@ static WRITE32_HANDLER( undrfire_input_w )
{
if (ACCESSING_BITS_24_31)
{
- coin_lockout_w(0,~data & 0x01000000);
- coin_lockout_w(1,~data & 0x02000000);
- coin_counter_w(0, data & 0x04000000);
- coin_counter_w(1, data & 0x08000000);
+ coin_lockout_w(space->machine, 0,~data & 0x01000000);
+ coin_lockout_w(space->machine, 1,~data & 0x02000000);
+ coin_counter_w(space->machine, 0, data & 0x04000000);
+ coin_counter_w(space->machine, 1, data & 0x08000000);
coin_word = (data >> 16) &0xffff;
}
}
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index d57563a244b..166a0c97532 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -102,9 +102,9 @@ static WRITE16_HANDLER( zeropnt_sound_bank_w )
UINT8 *src = dst + 0x80000 + 0x20000 + 0x20000 * bank;
memcpy(dst + 0x20000, src, 0x20000);
- coin_counter_w(0,data & 0x1000);
- set_led_status(0,data & 0x0800); // Start 1
- set_led_status(1,data & 0x0400); // Start 2
+ coin_counter_w(space->machine, 0,data & 0x1000);
+ set_led_status(space->machine, 0,data & 0x0800); // Start 1
+ set_led_status(space->machine, 1,data & 0x0400); // Start 2
}
}
@@ -204,9 +204,9 @@ static WRITE32_HANDLER( zeropnt2_leds_w )
{
if (ACCESSING_BITS_16_23)
{
- coin_counter_w(0,data & 0x00010000);
- set_led_status(0,data & 0x00800000); // Start 1
- set_led_status(1,data & 0x00400000); // Start 2
+ coin_counter_w(space->machine, 0,data & 0x00010000);
+ set_led_status(space->machine, 0,data & 0x00800000); // Start 1
+ set_led_status(space->machine, 1,data & 0x00400000); // Start 2
}
}
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 07621d03014..17d062384bd 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -177,7 +177,7 @@ static WRITE8_DEVICE_HANDLER( upscope_cia_1_porta_w )
case 0x02:
/* coin counter */
- coin_counter_w(0, data & 1);
+ coin_counter_w(device->machine, 0, data & 1);
break;
case 0x03:
@@ -194,7 +194,7 @@ static WRITE8_DEVICE_HANDLER( upscope_cia_1_porta_w )
else if ((data & 5) == 1)
{
if (LOG_IO) logerror("NVRAM data write @ %02X = %02X\n", nvram_address_latch, parallel_data);
- generic_nvram[nvram_address_latch] = parallel_data;
+ device->machine->generic.nvram.ptr.u8[nvram_address_latch] = parallel_data;
}
/* if SEL == 0 && BUSY == 0, who knows? */
@@ -217,7 +217,7 @@ static WRITE8_DEVICE_HANDLER( upscope_cia_1_porta_w )
/* if SEL == 0, we read NVRAM */
else
{
- nvram_data_latch = generic_nvram[nvram_address_latch];
+ nvram_data_latch = device->machine->generic.nvram.ptr.u8[nvram_address_latch];
if (LOG_IO) logerror("NVRAM data read @ %02X = %02X\n", nvram_address_latch, nvram_data_latch);
}
}
@@ -387,8 +387,8 @@ static DRIVER_INIT( upscope )
amiga_machine_config(machine, &upscope_intf);
/* allocate NVRAM */
- generic_nvram_size = 0x100;
- generic_nvram = auto_alloc_array(machine, UINT8, generic_nvram_size);
+ machine->generic.nvram.size = 0x100;
+ machine->generic.nvram.ptr.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram.size);
/* set up memory */
memory_configure_bank(machine, 1, 0, 1, amiga_chip_ram, 0);
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index 686b116fb7b..d8f856b3e28 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -52,11 +52,11 @@ static WRITE8_HANDLER( usgames_rombank_w )
static WRITE8_HANDLER( lamps1_w )
{
/* button lamps */
- set_led_status(0,data & 0x01);
- set_led_status(1,data & 0x02);
- set_led_status(2,data & 0x04);
- set_led_status(3,data & 0x08);
- set_led_status(4,data & 0x10);
+ set_led_status(space->machine, 0,data & 0x01);
+ set_led_status(space->machine, 1,data & 0x02);
+ set_led_status(space->machine, 2,data & 0x04);
+ set_led_status(space->machine, 3,data & 0x08);
+ set_led_status(space->machine, 4,data & 0x10);
/* bit 5 toggles all the time - extra lamp? */
}
@@ -69,7 +69,7 @@ static WRITE8_HANDLER( lamps2_w )
static ADDRESS_MAP_START( usgames_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW")
AM_RANGE(0x2010, 0x2010) AM_READ_PORT("INPUTS")
AM_RANGE(0x2020, 0x2020) AM_WRITE(lamps1_w)
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( usg185_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x2400, 0x2400) AM_READ_PORT("DSW")
AM_RANGE(0x2410, 0x2410) AM_READ_PORT("INPUTS")
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index 8b4f5c91f35..291b08874da 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x60000c, 0x60000d) AM_WRITE(crtc_w)
AM_RANGE(0x600010, 0x600011) AM_RAM AM_BASE(&framebuffer_ctrl)
- AM_RANGE(0x700000, 0x7007ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x700000, 0x7007ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x701000, 0x701001) AM_READ(main_irqiack_r)
AM_RANGE(0x702000, 0x702001) AM_READ(control_3_r)
AM_RANGE(0x705000, 0x705001) AM_RAM AM_SHARE(4) /* M1->M0 */
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index fd27e251b6c..f4c7dc1cefc 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -223,8 +223,8 @@ static void vendetta_video_banking( running_machine *machine, int select )
static WRITE8_HANDLER( vendetta_5fe0_w )
{
/* bit 0,1 coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 = BRAMBK ?? */
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index 95cf8e1538e..82803919b15 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -41,7 +41,7 @@ static ADDRESS_MAP_START( vertigo_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x004060, 0x00406f) AM_WRITE(vertigo_motor_w) AM_MIRROR(0x001000)
AM_RANGE(0x004070, 0x00407f) AM_WRITE(vertigo_wsot_w) AM_MIRROR(0x001000)
AM_RANGE(0x006000, 0x006007) AM_DEVREADWRITE("pit8254", vertigo_pit8254_lsb_r, vertigo_pit8254_lsb_w)
- AM_RANGE(0x007000, 0x0073ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x007000, 0x0073ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x800000, 0x81ffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 4d891cd7b51..535dc0d2555 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -96,8 +96,8 @@ static INPUT_CHANGED( coin_changed )
if (newval && !oldval)
{
/* increment the coin counter */
- coin_counter_w(0, 1);
- coin_counter_w(0, 0);
+ coin_counter_w(field->port->machine, 0, 1);
+ coin_counter_w(field->port->machine, 0, 0);
cputag_set_input_line(field->port->machine, "maincpu", INPUT_LINE_RESET, PULSE_LINE);
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index d779c5656fe..87c5cd9f5f1 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -109,10 +109,10 @@
static WRITE8_HANDLER( lamp_control_w )
{
- set_led_status(0, data & 0x80);
- set_led_status(1, data & 0x40);
- set_led_status(2, data & 0x20);
- set_led_status(3, data & 0x10);
+ set_led_status(space->machine, 0, data & 0x80);
+ set_led_status(space->machine, 1, data & 0x40);
+ set_led_status(space->machine, 2, data & 0x20);
+ set_led_status(space->machine, 3, data & 0x10);
}
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_BASE(&victory_videoram)
AM_RANGE(0xc800, 0xdfff) AM_RAM AM_BASE(&victory_charram)
AM_RANGE(0xe000, 0xefff) AM_RAM
- AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf800, 0xf800) AM_MIRROR(0x07fc) AM_READWRITE(victory_sound_response_r, victory_sound_command_w)
AM_RANGE(0xf801, 0xf801) AM_MIRROR(0x07fc) AM_READ(victory_sound_status_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index dfbdb27dc99..2929a14474e 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -132,7 +132,7 @@ static WRITE8_HANDLER( videopin_led_w )
output_set_value(matrix[i][3], (data >> 3) & 1);
if (i == 7)
- set_led_status(0, data & 8); /* start button */
+ set_led_status(space->machine, 0, data & 8); /* start button */
cputag_set_input_line(space->machine, "maincpu", 0, CLEAR_LINE);
}
@@ -154,7 +154,7 @@ static WRITE8_DEVICE_HANDLER( videopin_out1_w )
if (mask)
cputag_set_input_line(device->machine, "maincpu", INPUT_LINE_NMI, CLEAR_LINE);
- coin_lockout_global_w(~data & 0x08);
+ coin_lockout_global_w(device->machine, ~data & 0x08);
/* Convert octave data to divide value and write to sound */
discrete_sound_w(device, VIDEOPIN_OCTAVE_DATA, (0x01 << (~data & 0x07)) & 0xfe);
@@ -172,7 +172,7 @@ static WRITE8_DEVICE_HANDLER( videopin_out2_w )
/* D6 => BELL */
/* D7 => ATTRACT */
- coin_counter_w(0, data & 0x10);
+ coin_counter_w(device->machine, 0, data & 0x10);
discrete_sound_w(device, VIDEOPIN_BELL_EN, data & 0x40); // Bell
discrete_sound_w(device, VIDEOPIN_BONG_EN, data & 0x20); // Bong
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index e849f810ff3..2210828cd3a 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -52,8 +52,8 @@ static WRITE8_HANDLER( vigilant_out2_w )
/* D2 = COB1 = Coin Counter B? */
/* The hardware has both coin counters hooked up to a single meter. */
- coin_counter_w(0,data & 0x02);
- coin_counter_w(1,data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x02);
+ coin_counter_w(space->machine, 1,data & 0x04);
// data & 0x01 cocktail mode
}
@@ -65,8 +65,8 @@ static WRITE8_HANDLER( kikcubic_coin_w )
/* bit 1 is used but unknown */
/* bits 4/5 are coin counters */
- coin_counter_w(0,data & 0x10);
- coin_counter_w(1,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x10);
+ coin_counter_w(space->machine, 1,data & 0x20);
}
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index f481475f59c..6d4466ac566 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -157,10 +157,10 @@ static WRITE8_DEVICE_HANDLER( vmetal_control_w )
{
/* Lower nibble is the coin control bits shown in
service mode, but in game mode they're different */
- coin_counter_w(0,data & 0x04);
- coin_counter_w(1,data & 0x08); /* 2nd coin schute activates coin 0 counter in game mode?? */
-// coin_lockout_w(0,data & 0x01); /* always on in game mode?? */
- coin_lockout_w(1,data & 0x02); /* never activated in game mode?? */
+ coin_counter_w(device->machine, 0,data & 0x04);
+ coin_counter_w(device->machine, 1,data & 0x08); /* 2nd coin schute activates coin 0 counter in game mode?? */
+// coin_lockout_w(device->machine, 0,data & 0x01); /* always on in game mode?? */
+ coin_lockout_w(device->machine, 1,data & 0x02); /* never activated in game mode?? */
if ((data & 0x40) == 0)
device_reset(device);
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index b119caada02..a127c4d599a 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -103,7 +103,7 @@ static VIDEO_UPDATE(vroulet)
static ADDRESS_MAP_START( vroulet_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8000, 0x8000) AM_NOP
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(vroulet_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(vroulet_colorram_w) AM_BASE(&colorram)
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 3dca9ea74e5..1f471eca8c1 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -158,7 +158,7 @@ static WRITE8_HANDLER( sprite_dma_1_w )
static WRITE8_HANDLER( vsnes_coin_counter_w )
{
- coin_counter_w( 0, data & 0x01 );
+ coin_counter_w( space->machine, 0, data & 0x01 );
coin = data;
if( data & 0xfe ) //"bnglngby" and "cluclu"
{
@@ -174,7 +174,7 @@ static READ8_HANDLER( vsnes_coin_counter_r )
static WRITE8_HANDLER( vsnes_coin_counter_1_w )
{
- coin_counter_w( 1, data & 0x01 );
+ coin_counter_w( space->machine, 1, data & 0x01 );
if( data & 0xfe ) //vsbball service mode
{
//do something?
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 256b707775e..28404190674 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -139,7 +139,7 @@ static VIDEO_UPDATE( wallc )
static WRITE8_HANDLER( wallc_coin_counter_w )
{
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
}
static ADDRESS_MAP_START( wallc_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 8db7cc50d7a..0e88732feb7 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -188,20 +188,20 @@ static WRITE8_HANDLER( geebee_out7_w )
switch (offset & 7)
{
case 0:
- set_led_status(0,data & 1);
+ set_led_status(space->machine, 0,data & 1);
break;
case 1:
- set_led_status(1,data & 1);
+ set_led_status(space->machine, 1,data & 1);
break;
case 2:
- set_led_status(2,data & 1);
+ set_led_status(space->machine, 2,data & 1);
break;
case 3:
- coin_counter_w(0,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
break;
case 4:
if (strcmp(space->machine->gamedrv->name, "geebeeb"))
- coin_lockout_global_w(~data & 1);
+ coin_lockout_global_w(space->machine, ~data & 1);
break;
case 5:
if( geebee_bgw != (data & 1) )
@@ -271,22 +271,22 @@ static WRITE8_HANDLER( warpwarp_out3_w )
switch (offset & 7)
{
case 0:
- set_led_status(0,data & 1);
+ set_led_status(space->machine, 0,data & 1);
break;
case 1:
- set_led_status(1,data & 1);
+ set_led_status(space->machine, 1,data & 1);
break;
case 2:
- set_led_status(2,data & 1);
+ set_led_status(space->machine, 2,data & 1);
break;
case 3:
/* n.c. */
break;
case 4:
- coin_lockout_global_w(~data & 1);
+ coin_lockout_global_w(space->machine, ~data & 1);
break;
case 5:
- coin_counter_w(0,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
break;
case 6:
warpwarp_ball_on = data & 1;
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index aafbdf32f6c..1e2a4ea7c6e 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -514,7 +514,7 @@ static ADDRESS_MAP_START( defender_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE(&williams_videoram)
/* range from 0xc000-0xcfff is mapped programmatically below */
AM_RANGE(0xc000, 0xc00f) AM_BASE(&paletteram)
- AM_RANGE(0xc400, 0xc4ff) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xc400, 0xc4ff) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xc000, 0xcfff) AM_ROMBANK(1)
AM_RANGE(0xd000, 0xdfff) AM_WRITE(defender_bank_select_w)
AM_RANGE(0xd000, 0xffff) AM_ROM
@@ -534,7 +534,7 @@ void defender_install_io_space(const address_space *space)
memory_install_read8_handler (space, 0xc800, 0xcbff, 0, 0x03e0, williams_video_counter_r);
memory_install_readwrite8_device_handler(space, pia_1, 0xcc00, 0xcc03, 0, 0x03e0, pia6821_r, pia6821_w);
memory_install_readwrite8_device_handler(space, pia_0, 0xcc04, 0xcc07, 0, 0x03e0, pia6821_r, pia6821_w);
- memory_set_bankptr(space->machine, 3, generic_nvram);
+ memory_set_bankptr(space->machine, 3, space->machine->generic.nvram.ptr.v);
memory_set_bankptr(space->machine, 4, paletteram);
}
@@ -556,7 +556,7 @@ static ADDRESS_MAP_START( williams_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w)
AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r)
AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -571,7 +571,7 @@ static ADDRESS_MAP_START( williams_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w)
AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r)
AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -600,7 +600,7 @@ static ADDRESS_MAP_START( blaster_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w)
AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r)
AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -629,7 +629,7 @@ static ADDRESS_MAP_START( williams2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xcb80, 0xcb9f) AM_WRITE(defender_video_control_w)
AM_RANGE(0xcba0, 0xcbbf) AM_WRITE(williams2_blit_window_enable_w)
AM_RANGE(0xcbe0, 0xcbef) AM_READ(williams2_video_counter_r)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -651,7 +651,7 @@ static ADDRESS_MAP_START( williams2_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xcb80, 0xcb9f) AM_WRITE(defender_video_control_w)
AM_RANGE(0xcba0, 0xcbbf) AM_WRITE(williams2_blit_window_enable_w)
AM_RANGE(0xcbe0, 0xcbef) AM_READ(williams2_video_counter_r)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 0373f7acbf3..2130eeaf5bc 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -41,7 +41,7 @@ static WRITE8_HANDLER( tile_banking_w )
static WRITE8_HANDLER( wink_coin_counter_w )
{
- coin_counter_w(offset,data & 1);
+ coin_counter_w(space->machine, offset,data & 1);
}
static READ8_HANDLER( analog_port_r )
@@ -64,7 +64,7 @@ static WRITE8_HANDLER( sound_irq_w )
static ADDRESS_MAP_START( wink_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x9000, 0x97ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(bgram_w) AM_BASE(&videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index bd93bca65d9..e460e727dbd 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -451,7 +451,7 @@ static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_BASE(&paletteram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_BASE(&paletteram_2)
AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_SHARE(1)
- AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf180, 0xffff) AM_RAM AM_SHARE(2)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 08b11604249..5900d8e3211 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -226,7 +226,7 @@ static READ8_HANDLER( wiz_protection_r )
static WRITE8_HANDLER( wiz_coin_counter_w )
{
- coin_counter_w(offset,data);
+ coin_counter_w(space->machine, offset,data);
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index 51437882129..86c5abbd174 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -112,7 +112,7 @@ static WRITE8_HANDLER( lights_2_w )
static WRITE8_HANDLER( counter_w )
{
- coin_counter_w(0, data);
+ coin_counter_w(space->machine, 0, data);
}
@@ -165,7 +165,7 @@ static ADDRESS_MAP_START( wldarrow_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&wldarrow_videoram_0) AM_SIZE(&wldarrow_videoram_size)
AM_RANGE(0x6000, 0x7fff) AM_RAM AM_BASE(&wldarrow_videoram_1)
AM_RANGE(0x8000, 0x9fff) AM_RAM AM_BASE(&wldarrow_videoram_2)
- AM_RANGE(0xcd00, 0xcdff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0xcd00, 0xcdff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("BITSW") AM_DEVWRITE("dac", wldarrow_dac_1_w)
AM_RANGE(0xf004, 0xf004) AM_READ_PORT("IN1") AM_WRITE(lights_1_w)
AM_RANGE(0xf006, 0xf006) AM_READ_PORT("IN2") AM_WRITE(lights_2_w)
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index c200186f3c1..ebd527b8e45 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -113,13 +113,13 @@ static WRITE8_DEVICE_HANDLER( wolfpack_start_speech_w )
static WRITE8_HANDLER( wolfpack_attract_w )
{
- coin_lockout_global_w(!(data & 1));
+ coin_lockout_global_w(space->machine, !(data & 1));
}
static WRITE8_HANDLER( wolfpack_credit_w )
{
- set_led_status(0, !(data & 1));
+ set_led_status(space->machine, 0, !(data & 1));
}
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 63612801ef5..8ddb651e646 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -95,7 +95,7 @@ logerror("%06x: write %04x to 108000\n",cpu_get_pc(space->cpu),data);
if (ACCESSING_BITS_0_7)
{
/* bit 0 = coin counter */
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x01);
/* bit 2 is data */
/* bit 3 is clock (active high) */
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 834d0cbf033..327d724af1b 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -138,7 +138,7 @@ static WRITE16_HANDLER( bit_controls_w )
break;
case 8:
- set_led_status(0, data & 1);
+ set_led_status(space->machine, 0, data & 1);
break;
}
}
@@ -221,7 +221,7 @@ static READ16_HANDLER( analogy_watchdog_r )
*************************************/
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x01000000, 0x010fffff) AM_RAM AM_BASE(&vram_bg)
AM_RANGE(0x02000000, 0x020fffff) AM_RAM AM_BASE(&vram_fg)
AM_RANGE(0x03000000, 0x030000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w)
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index 50ac4287a89..96099ff9195 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -58,8 +58,8 @@ static void handle_coins(running_machine *machine, int coin)
credits += coinage_table[tmp][1];
coins -= coinage_table[tmp][0];
}
- coin_lockout_global_w(0); /* Unlock all coin slots */
- coin_counter_w(1,1); coin_counter_w(1,0); /* Count slot B */
+ coin_lockout_global_w(machine, 0); /* Unlock all coin slots */
+ coin_counter_w(machine,1,1); coin_counter_w(machine,1,0); /* Count slot B */
}
if (coin & 2) // Coin 1 !
@@ -71,8 +71,8 @@ static void handle_coins(running_machine *machine, int coin)
credits += coinage_table[tmp][1];
coins -= coinage_table[tmp][0];
}
- coin_lockout_global_w(0); /* Unlock all coin slots */
- coin_counter_w(0,1); coin_counter_w(0,0); /* Count slot A */
+ coin_lockout_global_w(machine, 0); /* Unlock all coin slots */
+ coin_counter_w(machine,0,1); coin_counter_w(machine,0,0); /* Count slot A */
}
if (credits >= 9)
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index afa3704e367..605d41c4170 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -183,7 +183,7 @@ static WRITE8_DEVICE_HANDLER( zaccaria_port1b_w )
acs = ~data & 0x08;
// bit 4 = led (for testing?)
- set_led_status(0,~data & 0x10);
+ set_led_status(device->machine, 0,~data & 0x10);
}
static READ_LINE_DEVICE_HANDLER( zaccaria_ca2_r )
@@ -302,7 +302,7 @@ static READ8_HANDLER( zaccaria_prot2_r )
static WRITE8_HANDLER( coin_w )
{
- coin_counter_w(0,data & 1);
+ coin_counter_w(space->machine, 0,data & 1);
}
static WRITE8_HANDLER( nmienable_w )
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index afd6ef0f359..8934333b32d 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -454,7 +454,7 @@ static CUSTOM_INPUT( razmataz_dial_r )
static WRITE8_HANDLER( zaxxon_coin_counter_w )
{
- coin_counter_w(offset, data & 0x01);
+ coin_counter_w(space->machine, offset, data & 0x01);
}
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 6e91aaa0579..3f8ac7c3635 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -113,8 +113,8 @@ static MACHINE_RESET( percuss )
static WRITE8_HANDLER( zodiack_control_w )
{
/* Bit 0-1 - coin counters */
- coin_counter_w(0, data & 0x02);
- coin_counter_w(1, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x01);
/* Bit 2 - ???? */
}
diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c
index 32df0d6e74f..2cf30287ad1 100644
--- a/src/mame/machine/ajax.c
+++ b/src/mame/machine/ajax.c
@@ -42,8 +42,8 @@ static WRITE8_HANDLER( ajax_bankswitch_w )
if (!(data & 0x80)) bankaddress += 0x8000;
/* coin counters */
- coin_counter_w(0,data & 0x20);
- coin_counter_w(1,data & 0x40);
+ coin_counter_w(space->machine, 0,data & 0x20);
+ coin_counter_w(space->machine, 1,data & 0x40);
/* priority */
ajax_priority = data & 0x08;
@@ -79,14 +79,14 @@ static WRITE8_HANDLER( ajax_bankswitch_w )
static WRITE8_HANDLER( ajax_lamps_w )
{
- set_led_status(1,data & 0x02); /* super weapon lamp */
- set_led_status(2,data & 0x04); /* power up lamps */
- set_led_status(5,data & 0x04); /* power up lamps */
- set_led_status(0,data & 0x20); /* start lamp */
- set_led_status(3,data & 0x40); /* game over lamps */
- set_led_status(6,data & 0x40); /* game over lamps */
- set_led_status(4,data & 0x80); /* game over lamps */
- set_led_status(7,data & 0x80); /* game over lamps */
+ set_led_status(space->machine, 1,data & 0x02); /* super weapon lamp */
+ set_led_status(space->machine, 2,data & 0x04); /* power up lamps */
+ set_led_status(space->machine, 5,data & 0x04); /* power up lamps */
+ set_led_status(space->machine, 0,data & 0x20); /* start lamp */
+ set_led_status(space->machine, 3,data & 0x40); /* game over lamps */
+ set_led_status(space->machine, 6,data & 0x40); /* game over lamps */
+ set_led_status(space->machine, 4,data & 0x80); /* game over lamps */
+ set_led_status(space->machine, 7,data & 0x80); /* game over lamps */
}
/* ajax_ls138_f10:
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index 283f5895e31..c8fe482d8ab 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -106,8 +106,8 @@ WRITE8_HANDLER( asteroid_bank_switch_w )
memory_set_bankptr(space->machine, 2, asteroid_ram2);
}
- set_led_status (0, ~data & 0x02);
- set_led_status (1, ~data & 0x01);
+ set_led_status (space->machine, 0, ~data & 0x02);
+ set_led_status (space->machine, 1, ~data & 0x01);
}
@@ -128,7 +128,7 @@ WRITE8_HANDLER( astdelux_bank_switch_w )
WRITE8_HANDLER( astdelux_led_w )
{
- set_led_status(offset, (data & 0x80) ? 0 : 1);
+ set_led_status(space->machine, offset, (data & 0x80) ? 0 : 1);
}
diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c
index a073019b34e..3158a685338 100644
--- a/src/mame/machine/atarifb.c
+++ b/src/mame/machine/atarifb.c
@@ -36,7 +36,7 @@ WRITE8_HANDLER( atarifb4_out1_w )
discrete_sound_w(discrete, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
discrete_sound_w(discrete, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
- coin_counter_w(1, data & 0x80);
+ coin_counter_w(space->machine, 1, data & 0x80);
}
@@ -87,8 +87,8 @@ WRITE8_HANDLER( soccer_out1_w )
discrete_sound_w(discrete, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
discrete_sound_w(discrete, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
-// set_led_status(0, data & 0x10); // !!!!!!!!!! Is this correct????
- set_led_status(1, data & 0x80);
+// set_led_status(space->machine, 0, data & 0x10); // !!!!!!!!!! Is this correct????
+ set_led_status(space->machine, 1, data & 0x80);
}
@@ -98,7 +98,7 @@ WRITE8_HANDLER( atarifb_out2_w )
discrete_sound_w(discrete, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
- coin_counter_w (0, data & 0x10);
+ coin_counter_w (space->machine, 0, data & 0x10);
}
@@ -108,9 +108,9 @@ WRITE8_HANDLER( soccer_out2_w )
discrete_sound_w(discrete, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
- coin_counter_w (0, data & 0x10);
- coin_counter_w (1, data & 0x20);
- coin_counter_w (2, data & 0x40);
+ coin_counter_w (space->machine, 0, data & 0x10);
+ coin_counter_w (space->machine, 1, data & 0x20);
+ coin_counter_w (space->machine, 2, data & 0x40);
}
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index 1a555b5dad7..ef523a9fd3b 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -407,7 +407,7 @@ WRITE8_HANDLER( balsente_misc_output_w )
}
else
{
-// set_led_status(offset, data);
+// set_led_status(space->machine, offset, data);
}
}
diff --git a/src/mame/machine/bonzeadv.c b/src/mame/machine/bonzeadv.c
index f71283dbfda..d7ad93a65e9 100644
--- a/src/mame/machine/bonzeadv.c
+++ b/src/mame/machine/bonzeadv.c
@@ -395,10 +395,10 @@ WRITE16_HANDLER( bonzeadv_cchip_ram_w )
{
cc_port = data;
- coin_lockout_w(1, data & 0x80);
- coin_lockout_w(0, data & 0x40);
- coin_counter_w(1, data & 0x20);
- coin_counter_w(0, data & 0x10);
+ coin_lockout_w(space->machine, 1, data & 0x80);
+ coin_lockout_w(space->machine, 0, data & 0x40);
+ coin_counter_w(space->machine, 1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x10);
}
if (offset == 0x0e && data != 0x00)
diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c
index f6c7f37b95f..71520ed8e41 100644
--- a/src/mame/machine/bsktball.c
+++ b/src/mame/machine/bsktball.c
@@ -162,10 +162,10 @@ READ8_HANDLER( bsktball_in0_r )
***************************************************************************/
WRITE8_HANDLER( bsktball_led1_w )
{
- set_led_status(0, offset & 0x01);
+ set_led_status(space->machine, 0, offset & 0x01);
}
WRITE8_HANDLER( bsktball_led2_w )
{
- set_led_status(1, offset & 0x01);
+ set_led_status(space->machine, 1, offset & 0x01);
}
diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c
index 078c2c68c8f..12549808616 100644
--- a/src/mame/machine/bublbobl.c
+++ b/src/mame/machine/bublbobl.c
@@ -211,7 +211,7 @@ WRITE8_HANDLER( bublbobl_mcu_port1_w )
//logerror("%04x: 6801U4 port 1 write %02x\n", cpu_get_pc(space->cpu), data);
// bit 4: coin lockout
- coin_lockout_global_w(~data & 0x10);
+ coin_lockout_global_w(space->machine, ~data & 0x10);
// bit 5: select 1-way or 2-way coin counter
diff --git a/src/mame/machine/carpolo.c b/src/mame/machine/carpolo.c
index 71777e35901..99fea0576c4 100644
--- a/src/mame/machine/carpolo.c
+++ b/src/mame/machine/carpolo.c
@@ -388,7 +388,7 @@ static WRITE8_DEVICE_HANDLER( pia_0_port_a_w )
bit 6 - Player 1 crash sound
bit 7 - Ball hit pulse sound */
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(device->machine, 0, data & 0x01);
TTL7474_clear_w(TTL7474_1F_1, data & 0x08);
diff --git a/src/mame/machine/cchip.c b/src/mame/machine/cchip.c
index 14fbcf5fa7c..0fa17cb8311 100644
--- a/src/mame/machine/cchip.c
+++ b/src/mame/machine/cchip.c
@@ -91,10 +91,10 @@ WRITE16_HANDLER( cchip1_ram_w )
{
cc_port = data;
- coin_lockout_w(1, data & 0x08);
- coin_lockout_w(0, data & 0x04);
- coin_counter_w(1, data & 0x02);
- coin_counter_w(0, data & 0x01);
+ coin_lockout_w(space->machine, 1, data & 0x08);
+ coin_lockout_w(space->machine, 0, data & 0x04);
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
}
else
{
diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c
index a16cb9b85a7..b2972fb5a34 100644
--- a/src/mame/machine/gaelco2.c
+++ b/src/mame/machine/gaelco2.c
@@ -140,33 +140,33 @@ DRIVER_INIT( snowboar )
WRITE16_HANDLER( gaelco2_coin_w )
{
/* Coin Lockouts */
- coin_lockout_w(0, ~data & 0x01);
- coin_lockout_w(1, ~data & 0x02);
+ coin_lockout_w(space->machine, 0, ~data & 0x01);
+ coin_lockout_w(space->machine, 1, ~data & 0x02);
/* Coin Counters */
- coin_counter_w(0, data & 0x04);
- coin_counter_w(1, data & 0x08);
+ coin_counter_w(space->machine, 0, data & 0x04);
+ coin_counter_w(space->machine, 1, data & 0x08);
}
WRITE16_HANDLER( gaelco2_coin2_w )
{
/* coin counters */
- coin_counter_w(offset & 0x01, data & 0x01);
+ coin_counter_w(space->machine, offset & 0x01, data & 0x01);
}
WRITE16_HANDLER( wrally2_coin_w )
{
/* coin counters */
- coin_counter_w((offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w(space->machine, (offset >> 3) & 0x01, data & 0x01);
}
WRITE16_HANDLER( touchgo_coin_w )
{
if ((offset >> 2) == 0){
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
- coin_counter_w(2, data & 0x04);
- coin_counter_w(3, data & 0x08);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
+ coin_counter_w(space->machine, 2, data & 0x04);
+ coin_counter_w(space->machine, 3, data & 0x08);
}
}
diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c
index 0982bc68333..9b8ad2e7b81 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -96,29 +96,29 @@ MACHINE_RESET( devilfsg )
WRITE8_HANDLER( galaxold_coin_lockout_w )
{
- coin_lockout_global_w(~data & 1);
+ coin_lockout_global_w(space->machine, ~data & 1);
}
WRITE8_HANDLER( galaxold_coin_counter_w )
{
- coin_counter_w(offset, data & 0x01);
+ coin_counter_w(space->machine, offset, data & 0x01);
}
WRITE8_HANDLER( galaxold_coin_counter_1_w )
{
- coin_counter_w(1, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x01);
}
WRITE8_HANDLER( galaxold_coin_counter_2_w )
{
- coin_counter_w(2, data & 0x01);
+ coin_counter_w(space->machine, 2, data & 0x01);
}
WRITE8_HANDLER( galaxold_leds_w )
{
- set_led_status(offset,data & 1);
+ set_led_status(space->machine, offset,data & 1);
}
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index b148921aca6..042d2b122c1 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -464,7 +464,7 @@ WRITE16_HANDLER( hd68k_wr0_write )
case 6: /* CC1 */
case 7: /* CC2 */
- coin_counter_w(offset - 6, data);
+ coin_counter_w(space->machine, offset - 6, data);
break;
}
}
@@ -497,7 +497,7 @@ WRITE16_HANDLER( hd68k_nwr_w )
{
case 0: /* CR2 */
case 1: /* CR1 */
- set_led_status(offset, data);
+ set_led_status(space->machine, offset, data);
break;
case 2: /* LC1 */
break;
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index 89f414cb827..193f6e45465 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -168,8 +168,8 @@ WRITE8_HANDLER( irobot_rom_banksel_w )
memory_set_bankptr(space->machine, 1, &RAM[0x1A000]);
break;
}
- set_led_status(0,data & 0x10);
- set_led_status(1,data & 0x20);
+ set_led_status(space->machine, 0,data & 0x10);
+ set_led_status(space->machine, 1,data & 0x20);
}
static TIMER_CALLBACK( scanline_callback )
diff --git a/src/mame/machine/jackal.c b/src/mame/machine/jackal.c
index 7295743a872..328f9ed65ae 100644
--- a/src/mame/machine/jackal.c
+++ b/src/mame/machine/jackal.c
@@ -55,8 +55,8 @@ WRITE8_HANDLER( jackal_rambank_w )
UINT8 *rgn = memory_region(space->machine, "master");
if (data & 0x04) popmessage("jackal_rambank_w %02x",data);
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
jackal_spritebank = &rgn[((data & 0x08) << 13)];
jackal_rambank = &rgn[((data & 0x10) << 12)];
memory_set_bankptr(space->machine, 1,&rgn[((data & 0x20) << 11) + 0x4000]);
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 374092124bb..a9e5cae0be2 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -517,9 +517,9 @@ WRITE8_HANDLER( mcr_control_port_w )
D0 = coin meter 1
*/
- coin_counter_w(0, (data >> 0) & 1);
- coin_counter_w(1, (data >> 1) & 1);
- coin_counter_w(2, (data >> 2) & 1);
+ coin_counter_w(space->machine, 0, (data >> 0) & 1);
+ coin_counter_w(space->machine, 1, (data >> 1) & 1);
+ coin_counter_w(space->machine, 2, (data >> 2) & 1);
mcr_cocktail_flip = (data >> 6) & 1;
}
@@ -538,7 +538,7 @@ WRITE8_HANDLER( mcrmono_control_port_w )
D0 = coin meter 1
*/
- coin_counter_w(0, (data >> 0) & 1);
+ coin_counter_w(space->machine, 0, (data >> 0) & 1);
mcr_cocktail_flip = (data >> 6) & 1;
}
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index 27440742caa..1decb0b2a59 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -282,23 +282,23 @@ WRITE8_HANDLER( mhavoc_out_0_w )
}
/* Bit 0 = Roller light (Blinks on fatal errors) */
- set_led_status(0, data & 0x01);
+ set_led_status(space->machine, 0, data & 0x01);
}
WRITE8_HANDLER( alphaone_out_0_w )
{
/* Bit 5 = P2 lamp */
- set_led_status(0, ~data & 0x20);
+ set_led_status(space->machine, 0, ~data & 0x20);
/* Bit 4 = P1 lamp */
- set_led_status(1, ~data & 0x10);
+ set_led_status(space->machine, 1, ~data & 0x10);
/* Bit 1 = right coin counter */
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* Bit 0 = left coin counter */
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x01);
logerror("alphaone_out_0_w(%02X)\n", data);
}
@@ -307,10 +307,10 @@ logerror("alphaone_out_0_w(%02X)\n", data);
WRITE8_HANDLER( mhavoc_out_1_w )
{
/* Bit 1 = left coin counter */
- coin_counter_w(0, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x02);
/* Bit 0 = right coin counter */
- coin_counter_w(1, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x01);
}
/*************************************
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index 72134c20500..a3456267f21 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -79,7 +79,7 @@ WRITE16_HANDLER( midtunit_cmos_w )
{
if (1)/*cmos_write_enable)*/
{
- COMBINE_DATA(generic_nvram16+offset);
+ COMBINE_DATA(space->machine->generic.nvram.ptr.u16+offset);
cmos_write_enable = 0;
}
else
@@ -92,7 +92,7 @@ WRITE16_HANDLER( midtunit_cmos_w )
READ16_HANDLER( midtunit_cmos_r )
{
- return generic_nvram16[offset];
+ return space->machine->generic.nvram.ptr.u16[offset];
}
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index 1495397b0ea..51d7ed07cc5 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -67,7 +67,7 @@ WRITE16_HANDLER( midwunit_cmos_w )
{
if (cmos_write_enable)
{
- COMBINE_DATA(generic_nvram16+offset);
+ COMBINE_DATA(space->machine->generic.nvram.ptr.u16+offset);
cmos_write_enable = 0;
}
else
@@ -80,13 +80,13 @@ WRITE16_HANDLER( midwunit_cmos_w )
WRITE16_HANDLER( midxunit_cmos_w )
{
- COMBINE_DATA(generic_nvram16+offset);
+ COMBINE_DATA(space->machine->generic.nvram.ptr.u16+offset);
}
READ16_HANDLER( midwunit_cmos_r )
{
- return generic_nvram16[offset];
+ return space->machine->generic.nvram.ptr.u16[offset];
}
diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c
index 440f8483847..58b343e3528 100644
--- a/src/mame/machine/nb1413m3.c
+++ b/src/mame/machine/nb1413m3.c
@@ -659,7 +659,7 @@ WRITE8_HANDLER( nb1413m3_outcoin_w )
break;
}
- set_led_status(2, nb1413m3_outcoin_flag); // out coin
+ set_led_status(space->machine, 2, nb1413m3_outcoin_flag); // out coin
}
WRITE8_HANDLER( nb1413m3_vcrctrl_w )
@@ -667,11 +667,11 @@ WRITE8_HANDLER( nb1413m3_vcrctrl_w )
if (data & 0x08)
{
popmessage(" ** VCR CONTROL ** ");
- set_led_status(2, 1);
+ set_led_status(space->machine, 2, 1);
}
else
{
- set_led_status(2, 0);
+ set_led_status(space->machine, 2, 0);
}
}
diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c
index d28abcb4873..6cf3bfa04a8 100644
--- a/src/mame/machine/nitedrvr.c
+++ b/src/mame/machine/nitedrvr.c
@@ -231,7 +231,7 @@ WRITE8_HANDLER( nitedrvr_out1_w )
{
const device_config *discrete = devtag_get_device(space->machine, "discrete");
- set_led_status(0,data & 0x10);
+ set_led_status(space->machine, 0,data & 0x10);
nitedrvr_crash_en = data & 0x01;
discrete_sound_w(discrete, NITEDRVR_CRASH_EN, nitedrvr_crash_en); // Crash enable
diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c
index 86b661631cb..7571bb9c0ed 100644
--- a/src/mame/machine/opwolf.c
+++ b/src/mame/machine/opwolf.c
@@ -554,7 +554,7 @@ static TIMER_CALLBACK( cchip_timer )
cchip_ram[0x52]=0x55;
cchip_coins[slot]-=cchip_coins_for_credit[slot];
}
- coin_counter_w(slot, 1);
+ coin_counter_w(machine, slot, 1);
}
if (cchip_ram[0x53]>9)
@@ -575,10 +575,10 @@ static TIMER_CALLBACK( cchip_timer )
cchip_last_05=cchip_ram[0x5];
// Cchip handles coin lockout (68k flags error if more than 9 coins)
- coin_lockout_w(1, cchip_ram[0x53]==9);
- coin_lockout_w(0, cchip_ram[0x53]==9);
- coin_counter_w(0, 0);
- coin_counter_w(1, 0);
+ coin_lockout_w(machine, 1, cchip_ram[0x53]==9);
+ coin_lockout_w(machine, 0, cchip_ram[0x53]==9);
+ coin_counter_w(machine, 0, 0);
+ coin_counter_w(machine, 1, 0);
// Special handling for last level
if (cchip_ram[0x1b]==0x6)
diff --git a/src/mame/machine/pckeybrd.c b/src/mame/machine/pckeybrd.c
index 1e0b968739a..3e5b3316784 100644
--- a/src/mame/machine/pckeybrd.c
+++ b/src/mame/machine/pckeybrd.c
@@ -331,9 +331,9 @@ void at_keyboard_init(running_machine *machine, AT_KEYBOARD_TYPE type)
keyboard.input_state = 0;
memset(&keyboard.make[0], 0, sizeof(UINT8)*128);
/* set default led state */
- set_led_status(2, 0);
- set_led_status(0, 0);
- set_led_status(1, 0);
+ set_led_status(machine, 2, 0);
+ set_led_status(machine, 0, 0);
+ set_led_status(machine, 1, 0);
keyboard.scan_code_set = 3;
@@ -354,15 +354,15 @@ void at_keyboard_init(running_machine *machine, AT_KEYBOARD_TYPE type)
-void at_keyboard_reset(void)
+void at_keyboard_reset(running_machine *machine)
{
keyboard.head = keyboard.tail = 0;
keyboard.input_state = 0;
memset(&keyboard.make[0], 0, sizeof(UINT8)*128);
/* set default led state */
- set_led_status(2, 0);
- set_led_status(0, 0);
- set_led_status(1, 0);
+ set_led_status(machine, 2, 0);
+ set_led_status(machine, 0, 0);
+ set_led_status(machine, 1, 0);
keyboard.scan_code_set=1;
at_keyboard_queue_insert(0xaa);
@@ -675,7 +675,7 @@ Note: each command is acknowledged by FAh (ACK), if not mentioned otherwise.
SeeAlso: #P046
*/
-void at_keyboard_write(UINT8 data)
+void at_keyboard_write(running_machine *machine, UINT8 data)
{
if (LOG_KEYBOARD)
logerror("keyboard write %.2x\n",data);
@@ -765,7 +765,7 @@ void at_keyboard_write(UINT8 data)
if (data & 0x080)
{
/* command received instead of code - execute command */
- at_keyboard_write(data);
+ at_keyboard_write(machine, data);
}
else
{
@@ -777,9 +777,9 @@ void at_keyboard_write(UINT8 data)
/* led's in same order as my keyboard leds. */
/* num lock, caps lock, scroll lock */
- set_led_status(2, (data & 0x01));
- set_led_status(0, ((data & 0x02)>>1));
- set_led_status(1, ((data & 0x04)>>2));
+ set_led_status(machine, 2, (data & 0x01));
+ set_led_status(machine, 0, ((data & 0x02)>>1));
+ set_led_status(machine, 1, ((data & 0x04)>>2));
}
break;
@@ -790,7 +790,7 @@ void at_keyboard_write(UINT8 data)
if (data & 0x080)
{
/* command received instead of code - execute command */
- at_keyboard_write(data);
+ at_keyboard_write(machine, data);
}
else
{
@@ -820,7 +820,7 @@ void at_keyboard_write(UINT8 data)
if (data & 0x080)
{
/* command received instead of code - execute command */
- at_keyboard_write(data);
+ at_keyboard_write(machine, data);
}
else
{
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index d17b905ae04..7665d2c1659 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -80,7 +80,7 @@ static TIMER_CALLBACK( pc_keyb_timer )
pc_keyboard();
} else {
/* Clock has been low for more than 5 msec, start diagnostic test */
- at_keyboard_reset();
+ at_keyboard_reset(machine);
pc_keyb.self_test = 1;
}
}
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 45ceea4a4f7..488f36eb350 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -449,8 +449,8 @@ WRITE8_HANDLER( qix_68705_portB_w )
qix_state *state = (qix_state *)space->machine->driver_data;
state->_68705_port_out[1] = data;
- coin_lockout_w(0, (~data >> 6) & 1);
- coin_counter_w(0, (data >> 7) & 1);
+ coin_lockout_w(space->machine, 0, (~data >> 6) & 1);
+ coin_counter_w(space->machine, 0, (data >> 7) & 1);
}
@@ -493,8 +493,8 @@ WRITE8_DEVICE_HANDLER( qix_pia_w )
static WRITE8_DEVICE_HANDLER( qix_coinctl_w )
{
- coin_lockout_w(0, (~data >> 2) & 1);
- coin_counter_w(0, (data >> 1) & 1);
+ coin_lockout_w(device->machine, 0, (~data >> 2) & 1);
+ coin_counter_w(device->machine, 0, (data >> 1) & 1);
}
diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rainbow.c
index 5be1df036eb..0973a3b3be2 100644
--- a/src/mame/machine/rainbow.c
+++ b/src/mame/machine/rainbow.c
@@ -755,10 +755,10 @@ static TIMER_CALLBACK( cchip_timer )
CRAM[1][0x149] = 0xFF;
}
- coin_lockout_w(1, CRAM[0][8] & 0x80);
- coin_lockout_w(0, CRAM[0][8] & 0x40);
- coin_counter_w(1, CRAM[0][8] & 0x20);
- coin_counter_w(0, CRAM[0][8] & 0x10);
+ coin_lockout_w(machine, 1, CRAM[0][8] & 0x80);
+ coin_lockout_w(machine, 0, CRAM[0][8] & 0x40);
+ coin_counter_w(machine, 1, CRAM[0][8] & 0x20);
+ coin_counter_w(machine, 0, CRAM[0][8] & 0x10);
CRAM[0][3] = input_port_read(machine, "800007"); /* STARTn + SERVICE1 */
CRAM[0][4] = input_port_read(machine, "800009"); /* COINn */
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index 7a9c73cab64..a51e13b2d0a 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -86,8 +86,8 @@ WRITE8_HANDLER( simpsons_eeprom_w )
WRITE8_HANDLER( simpsons_coin_counter_w )
{
/* bit 0,1 coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 selects mono or stereo sound */
/* bit 3 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c
index d601bfeea99..441677f025c 100644
--- a/src/mame/machine/starwars.c
+++ b/src/mame/machine/starwars.c
@@ -71,7 +71,7 @@ static TIMER_CALLBACK( math_run_clear )
WRITE8_HANDLER( starwars_nstore_w )
{
- memcpy (generic_nvram, starwars_ram_overlay, generic_nvram_size);
+ memcpy (space->machine->generic.nvram.ptr.v, starwars_ram_overlay, space->machine->generic.nvram.size);
}
/*************************************
@@ -85,19 +85,19 @@ WRITE8_HANDLER( starwars_out_w )
switch (offset & 7)
{
case 0: /* Coin counter 1 */
- coin_counter_w(0, data);
+ coin_counter_w(space->machine, 0, data);
break;
case 1: /* Coin counter 2 */
- coin_counter_w(1, data);
+ coin_counter_w(space->machine, 1, data);
break;
case 2: /* LED 3 */
- set_led_status(2, ~data & 0x80);
+ set_led_status(space->machine, 2, ~data & 0x80);
break;
case 3: /* LED 2 */
- set_led_status(1, ~data & 0x80);
+ set_led_status(space->machine, 1, ~data & 0x80);
break;
case 4: /* bank switch */
@@ -109,11 +109,11 @@ WRITE8_HANDLER( starwars_out_w )
break;
case 6: /* LED 1 */
- set_led_status(0, ~data & 0x80);
+ set_led_status(space->machine, 0, ~data & 0x80);
break;
case 7: /* NVRAM array recall */
- memcpy (starwars_ram_overlay, generic_nvram, generic_nvram_size);
+ memcpy (starwars_ram_overlay, space->machine->generic.nvram.ptr.v, space->machine->generic.nvram.size);
break;
}
}
diff --git a/src/mame/machine/subs.c b/src/mame/machine/subs.c
index 687a707d47d..570aa81e5c2 100644
--- a/src/mame/machine/subs.c
+++ b/src/mame/machine/subs.c
@@ -174,7 +174,7 @@ subs_lamp1_w
***************************************************************************/
WRITE8_HANDLER( subs_lamp1_w )
{
- set_led_status(0,~offset & 1);
+ set_led_status(space->machine, 0,~offset & 1);
}
/***************************************************************************
@@ -182,5 +182,5 @@ subs_lamp2_w
***************************************************************************/
WRITE8_HANDLER( subs_lamp2_w )
{
- set_led_status(1,~offset & 1);
+ set_led_status(space->machine, 1,~offset & 1);
}
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index ab7a609853e..9fb26a642be 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -62,7 +62,7 @@ MACHINE_RESET( taitosj )
WRITE8_HANDLER( taitosj_bankswitch_w )
{
- coin_lockout_global_w(~data & 1);
+ coin_lockout_global_w(space->machine, ~data & 1);
if(data & 0x80) memory_set_bank(space->machine, 1, 1);
else memory_set_bank(space->machine, 1, 0);
diff --git a/src/mame/machine/ticket.c b/src/mame/machine/ticket.c
index be472706606..7df6e1d5d66 100644
--- a/src/mame/machine/ticket.c
+++ b/src/mame/machine/ticket.c
@@ -48,7 +48,6 @@ void ticket_dispenser_init(running_machine *machine, int msec, int motoronhigh,
motoron = motoronhigh ? active_bit : 0;
ticketdispensed = statusactivehigh ? active_bit : 0;
ticketnotdispensed = ticketdispensed ^ active_bit;
- dispensed_tickets = 0;
for (i = 0; i < MAX_DISPENSERS; i++)
{
@@ -119,7 +118,7 @@ WRITE8_HANDLER( ticket_dispenser_0_w )
{
LOG(("PC: %04X Ticket Power Off\n", cpu_get_pc(space->cpu)));
timer_adjust_oneshot(dispenser[0].timer, attotime_never, 0);
- set_led_status(2,0);
+ set_led_status(space->machine, 2,0);
dispenser[0].power = 0;
}
}
@@ -145,7 +144,7 @@ WRITE8_HANDLER( ticket_dispenser_1_w )
{
LOG(("PC: %04X Ticket Power Off\n", cpu_get_pc(space->cpu)));
timer_adjust_oneshot(dispenser[1].timer, attotime_never, 0);
- set_led_status(2,0);
+ set_led_status(space->machine, 2,0);
dispenser[1].power = 0;
}
}
@@ -173,13 +172,13 @@ static TIMER_CALLBACK( ticket_dispenser_toggle )
if (dispenser->status == ticketdispensed)
{
- set_led_status(2,1);
- dispensed_tickets++;
+ set_led_status(machine, 2,1);
+ increment_dispensed_tickets(machine, 1);
LOG(("Ticket Dispensed\n"));
}
else
{
- set_led_status(2,0);
+ set_led_status(machine, 2,0);
}
}
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index 746da012209..01e96179970 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -71,10 +71,10 @@ WRITE8_HANDLER( tnzs_port2_w )
tnzs_state *state = (tnzs_state *)space->machine->driver_data;
// logerror("I8742:%04x Write %02x to port 2\n", cpu_get_previouspc(space->cpu), data);
- coin_lockout_w(0, (data & 0x40));
- coin_lockout_w(1, (data & 0x80));
- coin_counter_w(0, (~data & 0x10));
- coin_counter_w(1, (~data & 0x20));
+ coin_lockout_w(space->machine, 0, (data & 0x40));
+ coin_lockout_w(space->machine, 1, (data & 0x80));
+ coin_counter_w(space->machine, 0, (~data & 0x10));
+ coin_counter_w(space->machine, 1, (~data & 0x20));
state->input_select = data;
}
@@ -128,7 +128,7 @@ static void mcu_handle_coins( running_machine *machine, int coin )
if (coin & 0x01) /* coin A */
{
// logerror("Coin dropped into slot A\n");
- coin_counter_w(0,1); coin_counter_w(0,0); /* Count slot A */
+ coin_counter_w(machine,0,1); coin_counter_w(machine,0,0); /* Count slot A */
state->mcu_coins_a++;
if (state->mcu_coins_a >= state->mcu_coinage[0])
{
@@ -137,11 +137,11 @@ static void mcu_handle_coins( running_machine *machine, int coin )
if (state->mcu_credits >= 9)
{
state->mcu_credits = 9;
- coin_lockout_global_w(1); /* Lock all coin slots */
+ coin_lockout_global_w(machine, 1); /* Lock all coin slots */
}
else
{
- coin_lockout_global_w(0); /* Unlock all coin slots */
+ coin_lockout_global_w(machine, 0); /* Unlock all coin slots */
}
}
}
@@ -149,7 +149,7 @@ static void mcu_handle_coins( running_machine *machine, int coin )
if (coin & 0x02) /* coin B */
{
// logerror("Coin dropped into slot B\n");
- coin_counter_w(1,1); coin_counter_w(1,0); /* Count slot B */
+ coin_counter_w(machine,1,1); coin_counter_w(machine,1,0); /* Count slot B */
state->mcu_coins_b++;
if (state->mcu_coins_b >= state->mcu_coinage[2])
{
@@ -158,11 +158,11 @@ static void mcu_handle_coins( running_machine *machine, int coin )
if (state->mcu_credits >= 9)
{
state->mcu_credits = 9;
- coin_lockout_global_w(1); /* Lock all coin slots */
+ coin_lockout_global_w(machine, 1); /* Lock all coin slots */
}
else
{
- coin_lockout_global_w(0); /* Unlock all coin slots */
+ coin_lockout_global_w(machine, 0); /* Unlock all coin slots */
}
}
}
@@ -178,7 +178,7 @@ static void mcu_handle_coins( running_machine *machine, int coin )
else
{
if (state->mcu_credits < 9)
- coin_lockout_global_w(0); /* Unlock all coin slots */
+ coin_lockout_global_w(machine, 0); /* Unlock all coin slots */
state->mcu_reportcoin = 0;
}
@@ -740,22 +740,22 @@ WRITE8_HANDLER( tnzs_bankswitch1_w )
/* Coin count and lockout is handled by the i8742 */
break;
case MCU_NONE_INSECTX:
- coin_lockout_w(0, (~data & 0x04));
- coin_lockout_w(1, (~data & 0x08));
- coin_counter_w(0, (data & 0x10));
- coin_counter_w(1, (data & 0x20));
+ coin_lockout_w(space->machine, 0, (~data & 0x04));
+ coin_lockout_w(space->machine, 1, (~data & 0x08));
+ coin_counter_w(space->machine, 0, (data & 0x10));
+ coin_counter_w(space->machine, 1, (data & 0x20));
break;
case MCU_NONE_TNZSB:
case MCU_NONE_KABUKIZ:
- coin_lockout_w(0, (~data & 0x10));
- coin_lockout_w(1, (~data & 0x20));
- coin_counter_w(0, (data & 0x04));
- coin_counter_w(1, (data & 0x08));
+ coin_lockout_w(space->machine, 0, (~data & 0x10));
+ coin_lockout_w(space->machine, 1, (~data & 0x20));
+ coin_counter_w(space->machine, 0, (data & 0x04));
+ coin_counter_w(space->machine, 1, (data & 0x08));
break;
case MCU_NONE_KAGEKI:
- coin_lockout_global_w((~data & 0x20));
- coin_counter_w(0, (data & 0x04));
- coin_counter_w(1, (data & 0x08));
+ coin_lockout_global_w(space->machine, (~data & 0x20));
+ coin_counter_w(space->machine, 0, (data & 0x04));
+ coin_counter_w(space->machine, 1, (data & 0x08));
break;
case MCU_ARKANOID:
case MCU_EXTRMATN:
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index a954ecc6265..9f9400a12d7 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -242,14 +242,14 @@ WRITE16_HANDLER( toaplan1_reset_sound )
WRITE8_HANDLER( rallybik_coin_w )
{
switch (data) {
- case 0x08: if (toaplan1_coin_count) { coin_counter_w(0,1); coin_counter_w(0,0); } break;
- case 0x09: if (toaplan1_coin_count) { coin_counter_w(2,1); coin_counter_w(2,0); } break;
- case 0x0a: if (toaplan1_coin_count) { coin_counter_w(1,1); coin_counter_w(1,0); } break;
- case 0x0b: if (toaplan1_coin_count) { coin_counter_w(3,1); coin_counter_w(3,0); } break;
- case 0x0c: coin_lockout_w(0,1); coin_lockout_w(2,1); break;
- case 0x0d: coin_lockout_w(0,0); coin_lockout_w(2,0); break;
- case 0x0e: coin_lockout_w(1,1); coin_lockout_w(3,1); break;
- case 0x0f: coin_lockout_w(1,0); coin_lockout_w(3,0); toaplan1_coin_count=1; break;
+ case 0x08: if (toaplan1_coin_count) { coin_counter_w(space->machine, 0,1); coin_counter_w(space->machine, 0,0); } break;
+ case 0x09: if (toaplan1_coin_count) { coin_counter_w(space->machine, 2,1); coin_counter_w(space->machine, 2,0); } break;
+ case 0x0a: if (toaplan1_coin_count) { coin_counter_w(space->machine, 1,1); coin_counter_w(space->machine, 1,0); } break;
+ case 0x0b: if (toaplan1_coin_count) { coin_counter_w(space->machine, 3,1); coin_counter_w(space->machine, 3,0); } break;
+ case 0x0c: coin_lockout_w(space->machine, 0,1); coin_lockout_w(space->machine, 2,1); break;
+ case 0x0d: coin_lockout_w(space->machine, 0,0); coin_lockout_w(space->machine, 2,0); break;
+ case 0x0e: coin_lockout_w(space->machine, 1,1); coin_lockout_w(space->machine, 3,1); break;
+ case 0x0f: coin_lockout_w(space->machine, 1,0); coin_lockout_w(space->machine, 3,0); toaplan1_coin_count=1; break;
default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",cpu_get_previouspc(space->cpu),data); break;
}
}
@@ -262,24 +262,24 @@ WRITE8_HANDLER( toaplan1_coin_w )
/* Are some outputs for lights ? (no space on JAMMA for it though) */
switch (data) {
- case 0xee: coin_counter_w(1,1); coin_counter_w(1,0); break; /* Count slot B */
- case 0xed: coin_counter_w(0,1); coin_counter_w(0,0); break; /* Count slot A */
+ case 0xee: coin_counter_w(space->machine, 1,1); coin_counter_w(space->machine, 1,0); break; /* Count slot B */
+ case 0xed: coin_counter_w(space->machine, 0,1); coin_counter_w(space->machine, 0,0); break; /* Count slot A */
/* The following are coin counts after coin-lock active (faulty coin-lock ?) */
- case 0xe2: coin_counter_w(1,1); coin_counter_w(1,0); coin_lockout_w(1,1); break;
- case 0xe1: coin_counter_w(0,1); coin_counter_w(0,0); coin_lockout_w(0,1); break;
+ case 0xe2: coin_counter_w(space->machine, 1,1); coin_counter_w(space->machine, 1,0); coin_lockout_w(space->machine, 1,1); break;
+ case 0xe1: coin_counter_w(space->machine, 0,1); coin_counter_w(space->machine, 0,0); coin_lockout_w(space->machine, 0,1); break;
- case 0xec: coin_lockout_global_w(0); break; /* ??? count games played */
+ case 0xec: coin_lockout_global_w(space->machine, 0); break; /* ??? count games played */
case 0xe8: break; /* ??? Maximum credits reached with coin/credit ratio */
case 0xe4: break; /* ??? Reset coin system */
- case 0x0c: coin_lockout_global_w(0); break; /* Unlock all coin slots */
- case 0x08: coin_lockout_w(2,0); break; /* Unlock coin slot C */
- case 0x09: coin_lockout_w(0,0); break; /* Unlock coin slot A */
- case 0x0a: coin_lockout_w(1,0); break; /* Unlock coin slot B */
+ case 0x0c: coin_lockout_global_w(space->machine, 0); break; /* Unlock all coin slots */
+ case 0x08: coin_lockout_w(space->machine, 2,0); break; /* Unlock coin slot C */
+ case 0x09: coin_lockout_w(space->machine, 0,0); break; /* Unlock coin slot A */
+ case 0x0a: coin_lockout_w(space->machine, 1,0); break; /* Unlock coin slot B */
- case 0x02: coin_lockout_w(1,1); break; /* Lock coin slot B */
- case 0x01: coin_lockout_w(0,1); break; /* Lock coin slot A */
- case 0x00: coin_lockout_global_w(1); break; /* Lock all coin slots */
+ case 0x02: coin_lockout_w(space->machine, 1,1); break; /* Lock coin slot B */
+ case 0x01: coin_lockout_w(space->machine, 0,1); break; /* Lock coin slot A */
+ case 0x00: coin_lockout_global_w(space->machine, 1); break; /* Lock all coin slots */
default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",cpu_get_previouspc(space->cpu),data); break;
}
}
@@ -302,7 +302,7 @@ MACHINE_RESET( toaplan1 )
toaplan1_intenable = 0;
toaplan1_coin_count = 0;
toaplan1_unk_reset_port = 0;
- coin_lockout_global_w(0);
+ coin_lockout_global_w(machine, 0);
}
void toaplan1_driver_savestate(running_machine *machine)
{
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 0816caaa017..824c83c8dd8 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -276,14 +276,14 @@ static void toaplan0_coin_dsp_w(const address_space *space, int offset, int data
if (data > 1)
LOG(("%s:Writing %08x to %08x.\n",cpuexec_describe_context(space->machine),data,toaplan_port_type[toaplan_main_cpu] - offset));
switch (data) {
- case 0x08: coin_counter_w(0,0); break;
- case 0x09: coin_counter_w(0,1); break;
- case 0x0a: coin_counter_w(1,0); break;
- case 0x0b: coin_counter_w(1,1); break;
- case 0x0c: coin_lockout_w(0,1); break;
- case 0x0d: coin_lockout_w(0,0); break;
- case 0x0e: coin_lockout_w(1,1); break;
- case 0x0f: coin_lockout_w(1,0); break;
+ case 0x08: coin_counter_w(space->machine, 0,0); break;
+ case 0x09: coin_counter_w(space->machine, 0,1); break;
+ case 0x0a: coin_counter_w(space->machine, 1,0); break;
+ case 0x0b: coin_counter_w(space->machine, 1,1); break;
+ case 0x0c: coin_lockout_w(space->machine, 0,1); break;
+ case 0x0d: coin_lockout_w(space->machine, 0,0); break;
+ case 0x0e: coin_lockout_w(space->machine, 1,1); break;
+ case 0x0f: coin_lockout_w(space->machine, 1,0); break;
/****** The following apply to Flying Shark/Wardner only ******/
case 0x00: /* This means assert the INT line to the DSP */
LOG(("Turning DSP on and main CPU off\n"));
diff --git a/src/mame/machine/volfied.c b/src/mame/machine/volfied.c
index c14718e0a95..aba7ed747ef 100644
--- a/src/mame/machine/volfied.c
+++ b/src/mame/machine/volfied.c
@@ -355,10 +355,10 @@ WRITE16_HANDLER( volfied_cchip_ram_w )
{
cc_port = data;
- coin_lockout_w(1, data & 0x80);
- coin_lockout_w(0, data & 0x40);
- coin_counter_w(1, data & 0x20);
- coin_counter_w(0, data & 0x10);
+ coin_lockout_w(space->machine, 1, data & 0x80);
+ coin_lockout_w(space->machine, 0, data & 0x40);
+ coin_counter_w(space->machine, 1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x10);
}
if (offset == 0x3fe)
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index 004356ccbdd..0f6586e4db8 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -647,14 +647,14 @@ READ8_DEVICE_HANDLER( williams_input_port_49way_0_5_r )
WRITE8_HANDLER( williams_cmos_w )
{
/* only 4 bits are valid */
- generic_nvram[offset] = data | 0xf0;
+ space->machine->generic.nvram.ptr.u8[offset] = data | 0xf0;
}
WRITE8_HANDLER( bubbles_cmos_w )
{
/* bubbles has additional CMOS for a full 8 bits */
- generic_nvram[offset] = data;
+ space->machine->generic.nvram.ptr.u8[offset] = data;
}
@@ -892,7 +892,7 @@ static READ8_DEVICE_HANDLER( lottofun_input_port_0_r )
static WRITE8_DEVICE_HANDLER( lottofun_coin_lock_w )
{
- coin_lockout_global_w(data & 1); /* bit 5 of PIC control port A */
+ coin_lockout_global_w(device->machine, data & 1); /* bit 5 of PIC control port A */
}
/*************************************
@@ -923,10 +923,10 @@ static WRITE8_DEVICE_HANDLER( tshoot_maxvol_w )
static WRITE8_DEVICE_HANDLER( tshoot_lamp_w )
{
/* set the grenade lamp */
- set_led_status(0,data & 0x04);
+ set_led_status(device->machine, 0,data & 0x04);
/* set the gun lamp */
- set_led_status(1,data & 0x08);
+ set_led_status(device->machine, 1,data & 0x08);
#if 0
/* gun coil */
diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c
index 849b4215458..d19bf78d488 100644
--- a/src/mame/machine/wrally.c
+++ b/src/mame/machine/wrally.c
@@ -42,11 +42,11 @@ WRITE16_HANDLER( OKIM6295_bankswitch_w )
WRITE16_HANDLER( wrally_coin_counter_w )
{
- coin_counter_w( (offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w( space->machine, (offset >> 3) & 0x01, data & 0x01);
}
WRITE16_HANDLER( wrally_coin_lockout_w )
{
- coin_lockout_w( (offset >> 3) & 0x01, ~data & 0x01);
+ coin_lockout_w( space->machine, (offset >> 3) & 0x01, ~data & 0x01);
}
diff --git a/src/mame/machine/xevious.c b/src/mame/machine/xevious.c
index c1e7724371b..caed6e37037 100644
--- a/src/mame/machine/xevious.c
+++ b/src/mame/machine/xevious.c
@@ -147,12 +147,12 @@ WRITE8_HANDLER( battles_customio_data3_w )
WRITE8_HANDLER( battles_CPU4_coin_w )
{
- set_led_status(0,data & 0x02); // Start 1
- set_led_status(1,data & 0x01); // Start 2
+ set_led_status(space->machine, 0,data & 0x02); // Start 1
+ set_led_status(space->machine, 1,data & 0x01); // Start 2
- coin_counter_w(0,data & 0x20);
- coin_counter_w(1,data & 0x10);
- coin_lockout_global_w(~data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x20);
+ coin_counter_w(space->machine, 1,data & 0x10);
+ coin_lockout_global_w(space->machine, ~data & 0x04);
}
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index 61d1196f12a..c2927a5a5f8 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -186,7 +186,7 @@ WRITE8_HANDLER( c1942_c804_w )
bit 4: cpu B reset
bit 0: coin counter */
- coin_counter_w(0,data & 0x01);
+ coin_counter_w(space->machine, 0,data & 0x01);
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c
index 6dd5319ed43..9f0e6fe1849 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -140,8 +140,8 @@ WRITE8_HANDLER( c1943_c804_w )
int bank, i;
/* bits 0 and 1 are coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* bits 2, 3 and 4 select the ROM bank */
bank = data & 0x1c;
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index a4fcd3d3057..9c5ee164655 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -39,8 +39,8 @@ WRITE8_HANDLER( arkanoid_d008_w )
state->paddle_select = data & 0x04;
/* bit 3 is coin lockout (but not the service coin) */
- coin_lockout_w(0, !(data & 0x08));
- coin_lockout_w(1, !(data & 0x08));
+ coin_lockout_w(space->machine, 0, !(data & 0x08));
+ coin_lockout_w(space->machine, 1, !(data & 0x08));
/* bit 4 is unknown */
@@ -115,8 +115,8 @@ WRITE8_HANDLER( tetrsark_d008_w )
}
/* bit 7 is coin lockout (but not the service coin) */
- coin_lockout_w(0, !(data & 0x80));
- coin_lockout_w(1, !(data & 0x80));
+ coin_lockout_w(space->machine, 0, !(data & 0x80));
+ coin_lockout_w(space->machine, 1, !(data & 0x80));
}
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index 36a41975146..50a2d897698 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -194,8 +194,8 @@ WRITE16_HANDLER( bionicc_gfxctrl_w )
tilemap_set_enable(state->bg_tilemap, data & 0x2000); /* guess */
tilemap_set_enable(state->fg_tilemap, data & 0x1000); /* guess */
- coin_counter_w(0, data & 0x8000);
- coin_counter_w(1, data & 0x4000);
+ coin_counter_w(space->machine, 0, data & 0x8000);
+ coin_counter_w(space->machine, 1, data & 0x4000);
}
}
diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c
index 8df59df84da..bee76d04e12 100644
--- a/src/mame/video/bking.c
+++ b/src/mame/video/bking.c
@@ -147,7 +147,7 @@ WRITE8_HANDLER( bking_cont1_w )
/* D3 = Not Connected */
/* D4-D7 = CROW0-CROW3 (selects crow picture) */
- coin_lockout_global_w(~data & 0x01);
+ coin_lockout_global_w(space->machine, ~data & 0x01);
flip_screen_set_no_update(space->machine, data & 0x04);
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 9a80b266200..bfd94b50e4f 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -153,8 +153,8 @@ WRITE8_HANDLER( blktiger_video_control_w )
{
blktiger_state *state = (blktiger_state *)space->machine->driver_data;
/* bits 0 and 1 are coin counters */
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
/* bit 5 resets the sound CPU */
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index 173d1facf52..14b872b35af 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -74,8 +74,8 @@ WRITE8_HANDLER( buggychl_ctrl_w )
sprite_color_base = (data & 0x10) ? 1*16 : 3*16;
- coin_lockout_global_w((~data & 0x40) >> 6);
- set_led_status(0,~data & 0x80);
+ coin_lockout_global_w(space->machine, (~data & 0x40) >> 6);
+ set_led_status(space->machine, 0,~data & 0x80);
}
WRITE8_HANDLER( buggychl_bg_scrollx_w )
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 29e7f8b4971..824ad42d4a7 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -255,10 +255,10 @@ WRITE16_HANDLER( bigrun_vregs_w )
case 0x0000/2 : // leds
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,new_data & 0x01);
- coin_counter_w(1,new_data & 0x02);
- set_led_status(0,new_data & 0x10); // start button
- set_led_status(1,new_data & 0x20); // ?
+ coin_counter_w(space->machine, 0,new_data & 0x01);
+ coin_counter_w(space->machine, 1,new_data & 0x02);
+ set_led_status(space->machine, 0,new_data & 0x10); // start button
+ set_led_status(space->machine, 1,new_data & 0x20); // ?
}
break;
@@ -267,7 +267,7 @@ WRITE16_HANDLER( bigrun_vregs_w )
case 0x0004/2 : // motor (seat?)
if (ACCESSING_BITS_0_7)
- set_led_status(2, (new_data != old_data) ? 1 : 0);
+ set_led_status(space->machine, 2, (new_data != old_data) ? 1 : 0);
break;
case 0x0006/2 : // motor (wheel?)
@@ -348,10 +348,10 @@ WRITE16_HANDLER( cischeat_vregs_w )
case 0x0000/2 : // leds
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,new_data & 0x01);
- coin_counter_w(1,new_data & 0x02);
- set_led_status(0,new_data & 0x10); // start button
- set_led_status(1,new_data & 0x20); // ?
+ coin_counter_w(space->machine, 0,new_data & 0x01);
+ coin_counter_w(space->machine, 1,new_data & 0x02);
+ set_led_status(space->machine, 0,new_data & 0x10); // start button
+ set_led_status(space->machine, 1,new_data & 0x20); // ?
}
break;
@@ -360,7 +360,7 @@ WRITE16_HANDLER( cischeat_vregs_w )
case 0x0004/2 : // motor (seat?)
if (ACCESSING_BITS_0_7)
- set_led_status(2, (new_data != old_data) ? 1 : 0);
+ set_led_status(space->machine, 2, (new_data != old_data) ? 1 : 0);
break;
case 0x0006/2 : // motor (wheel?)
@@ -489,12 +489,12 @@ CPU #0 PC 00235C : Warning, vreg 0006 <- 0000
case 0x0004/2 :
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0,new_data & 0x01);
- coin_counter_w(1,new_data & 0x02);
- set_led_status(0,new_data & 0x04); // start button
- set_led_status(1,new_data & 0x20); // ?
+ coin_counter_w(space->machine, 0,new_data & 0x01);
+ coin_counter_w(space->machine, 1,new_data & 0x02);
+ set_led_status(space->machine, 0,new_data & 0x04); // start button
+ set_led_status(space->machine, 1,new_data & 0x20); // ?
// wheel | seat motor
- set_led_status(2, ((new_data >> 3) | (new_data >> 4)) & 1 );
+ set_led_status(space->machine, 2, ((new_data >> 3) | (new_data >> 4)) & 1 );
}
break;
case 0x0014/2 : break;
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index ae07b4adae6..77333853b3c 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -61,8 +61,8 @@ WRITE8_HANDLER( commando_scrolly_w )
WRITE8_HANDLER( commando_c804_w )
{
// bits 0 and 1 are coin counters
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
// bit 4 resets the sound CPU
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c
index 9a4536c8ccf..71298db4516 100644
--- a/src/mame/video/cop01.c
+++ b/src/mame/video/cop01.c
@@ -152,8 +152,8 @@ WRITE8_HANDLER( cop01_vreg_w )
if (offset == 0)
{
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
flip_screen_set(space->machine, data & 4);
}
}
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 057dba56634..e47d89cdbb3 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1655,15 +1655,15 @@ WRITE16_HANDLER( cps1_cps_b_w )
{
if (cps1_game_config->cpsb_value == 0x0402) // Mercs (CN2 connector)
{
- coin_lockout_w(2,~data & 0x01);
- set_led_status(0,data & 0x02);
- set_led_status(1,data & 0x04);
- set_led_status(2,data & 0x08);
+ coin_lockout_w(space->machine, 2,~data & 0x01);
+ set_led_status(space->machine, 0,data & 0x02);
+ set_led_status(space->machine, 1,data & 0x04);
+ set_led_status(space->machine, 2,data & 0x08);
}
else // kod, captcomm, knights
{
- coin_lockout_w(2,~data & 0x02);
- coin_lockout_w(3,~data & 0x08);
+ coin_lockout_w(space->machine, 2,~data & 0x02);
+ coin_lockout_w(space->machine, 3,~data & 0x08);
}
}
}
diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c
index 17f6cb25480..37ac84427f6 100644
--- a/src/mame/video/cvs.c
+++ b/src/mame/video/cvs.c
@@ -114,8 +114,8 @@ WRITE8_HANDLER( cvs_video_fx_w )
if (data & 0x04) logerror(" SCREEN ROTATE\n");
if (data & 0x08) logerror(" SHADE BRIGHTER TO LEFT\n");
- set_led_status(1, data & 0x10); /* lamp 1 */
- set_led_status(2, data & 0x20); /* lamp 2 */
+ set_led_status(space->machine, 1, data & 0x10); /* lamp 1 */
+ set_led_status(space->machine, 2, data & 0x20); /* lamp 2 */
if (data & 0x40) logerror(" SHADE BRIGHTER TO BOTTOM\n");
if (data & 0x80) logerror(" SHADE BRIGHTER TO TOP\n");
diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c
index b40a5bd471a..abd734d642a 100644
--- a/src/mame/video/dday.c
+++ b/src/mame/video/dday.c
@@ -290,10 +290,10 @@ WRITE8_HANDLER( dday_control_w )
//if (data & 0xac) logerror("Control = %02X\n", data & 0xac);
/* bit 0 is coin counter 1 */
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x01);
/* bit 1 is coin counter 2 */
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* bit 4 is sound enable */
if (!(data & 0x10) && (control & 0x10))
diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c
index ba46e9e5175..78fd0e2f9e4 100644
--- a/src/mame/video/deniam.c
+++ b/src/mame/video/deniam.c
@@ -174,7 +174,7 @@ WRITE16_HANDLER( deniam_coinctrl_w )
COMBINE_DATA(&state->coinctrl);
/* bit 0 is coin counter */
- coin_counter_w(0, state->coinctrl & 0x01);
+ coin_counter_w(space->machine, 0, state->coinctrl & 0x01);
/* bit 6 is display enable (0 freezes screen) */
state->display_enable = state->coinctrl & 0x20;
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index 062e3b45a31..6a72088f6b1 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -167,8 +167,8 @@ WRITE8_HANDLER( dogfgt_1800_w )
state->pixcolor = ((data & 0x01) << 1) | ((data & 0x02) >> 1);
/* bits 4 and 5 are coin counters */
- coin_counter_w(0, data & 0x10);
- coin_counter_w(1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x10);
+ coin_counter_w(space->machine, 1, data & 0x20);
/* bit 7 is screen flip */
flip_screen_set(space->machine, data & 0x80);
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 2792d9a0322..17f6d4f8f2c 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -132,8 +132,8 @@ WRITE8_HANDLER( dooyong_txvideoram8_w )
WRITE8_HANDLER( lastday_ctrl_w )
{
/* bits 0 and 1 are coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* bit 3 is used but unknown */
@@ -150,8 +150,8 @@ WRITE8_HANDLER( pollux_ctrl_w )
flip_screen_set(space->machine, data & 0x01);
/* bits 6 and 7 are coin counters */
- coin_counter_w(0, data & 0x80);
- coin_counter_w(1, data & 0x40);
+ coin_counter_w(space->machine, 0, data & 0x80);
+ coin_counter_w(space->machine, 1, data & 0x40);
/* bit 1 is used but unknown */
diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c
index ef64c2fb005..1a3ce6919df 100644
--- a/src/mame/video/epos.c
+++ b/src/mame/video/epos.c
@@ -63,10 +63,10 @@ WRITE8_HANDLER( epos_port_1_w )
D4-D7 - unused
*/
- set_led_status(0, (data >> 0) & 0x01);
- set_led_status(1, (data >> 1) & 0x01);
+ set_led_status(space->machine, 0, (data >> 0) & 0x01);
+ set_led_status(space->machine, 1, (data >> 1) & 0x01);
- coin_counter_w(0, (data >> 2) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 2) & 0x01);
state->palette = (data >> 3) & 0x01;
}
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index 21e2a5e398e..3317bd3a3f9 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -101,11 +101,11 @@ WRITE8_HANDLER( exedexes_c804_w )
exedexes_state *state = (exedexes_state *)space->machine->driver_data;
/* bits 0 and 1 are coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
- coin_lockout_w(0, data & 0x04);
- coin_lockout_w(1, data & 0x08);
+ coin_lockout_w(space->machine, 0, data & 0x04);
+ coin_lockout_w(space->machine, 1, data & 0x08);
/* bit 7 is text enable */
state->chon = data & 0x80;
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index 2637230316d..4aff4fd7d18 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -241,8 +241,8 @@ WRITE8_HANDLER( galivan_colorram_w )
WRITE8_HANDLER( galivan_gfxbank_w )
{
/* bits 0 and 1 coin counters */
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
/* bit 2 flip screen */
flipscreen = data & 0x04;
@@ -258,8 +258,8 @@ WRITE8_HANDLER( galivan_gfxbank_w )
WRITE8_HANDLER( ninjemak_gfxbank_w )
{
/* bits 0 and 1 coin counters */
- coin_counter_w(0,data & 1);
- coin_counter_w(1,data & 2);
+ coin_counter_w(space->machine, 0,data & 1);
+ coin_counter_w(space->machine, 1,data & 2);
/* bit 2 flip screen */
flipscreen = data & 0x04;
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index b83b2d81920..391fdf940d1 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -79,8 +79,8 @@ WRITE8_HANDLER( gunsmoke_colorram_w )
WRITE8_HANDLER( gunsmoke_c804_w )
{
/* bits 0 and 1 are for coin counters */
- coin_counter_w(1, data & 0x01);
- coin_counter_w(0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x02);
/* bits 2 and 3 select the ROM bank */
memory_set_bank(space->machine, 1, (data & 0x0c) >> 2);
diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c
index c76b79479a1..ec8c8325c49 100644
--- a/src/mame/video/higemaru.c
+++ b/src/mame/video/higemaru.c
@@ -76,8 +76,8 @@ WRITE8_HANDLER( higemaru_c800_w )
if (data & 0x7c) logerror("c800 = %02x\n",data);
/* bits 0 and 1 are coin counters */
- coin_counter_w(0,data & 2);
- coin_counter_w(1,data & 1);
+ coin_counter_w(space->machine, 0,data & 2);
+ coin_counter_w(space->machine, 1,data & 1);
/* bit 7 flips screen */
if (flip_screen_get(space->machine) != (data & 0x80))
diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c
index 47d7eae794d..3f992a8c947 100644
--- a/src/mame/video/ironhors.c
+++ b/src/mame/video/ironhors.c
@@ -114,8 +114,8 @@ WRITE8_HANDLER( ironhors_palettebank_w )
tilemap_mark_all_tiles_dirty_all(space->machine);
}
- coin_counter_w(0, data & 0x10);
- coin_counter_w(1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x10);
+ coin_counter_w(space->machine, 1, data & 0x20);
/* bit 6 unknown - set after game over */
diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c
index 822766d21c6..ab8487df16f 100644
--- a/src/mame/video/kncljoe.c
+++ b/src/mame/video/kncljoe.c
@@ -143,8 +143,8 @@ WRITE8_HANDLER( kncljoe_control_w )
flipscreen = data & 0x01;
tilemap_set_flip_all(space->machine,flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY);
- coin_counter_w(0,data & 0x02);
- coin_counter_w(1,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x02);
+ coin_counter_w(space->machine, 1,data & 0x20);
i = (data & 0x10) >> 4;
if (tile_bank != i)
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index ea0e6ddd837..1937cc2901b 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -130,10 +130,10 @@ WRITE16_HANDLER( lastduel_flip_w )
{
flip_screen_set(space->machine, data & 0x01);
- coin_lockout_w(0,~data & 0x10);
- coin_lockout_w(1,~data & 0x20);
- coin_counter_w(0,data & 0x40);
- coin_counter_w(1,data & 0x80);
+ coin_lockout_w(space->machine, 0,~data & 0x10);
+ coin_lockout_w(space->machine, 1,~data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x40);
+ coin_counter_w(space->machine, 1,data & 0x80);
}
}
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index 86832fbc7dc..d4d899daac4 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -286,8 +286,8 @@ WRITE8_HANDLER( m52_flipscreen_w )
/* screen flip is handled both by software and hardware */
flip_screen_set(space->machine, (data & 0x01) ^ (~input_port_read(space->machine, "DSW2") & 0x01));
- coin_counter_w(0, data & 0x02);
- coin_counter_w(1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x20);
}
WRITE8_HANDLER( alpha1v_flipscreen_w )
diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c
index 47d2c002bca..299ca2fd355 100644
--- a/src/mame/video/m57.c
+++ b/src/mame/video/m57.c
@@ -166,8 +166,8 @@ WRITE8_HANDLER( m57_flipscreen_w )
state->flipscreen = (data & 0x01) ^ (~input_port_read(space->machine, "DSW2") & 0x01);
tilemap_set_flip(state->bg_tilemap, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- coin_counter_w(0,data & 0x02);
- coin_counter_w(1,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x02);
+ coin_counter_w(space->machine, 1,data & 0x20);
}
diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c
index 9629e4f653b..04d16de8530 100644
--- a/src/mame/video/m58.c
+++ b/src/mame/video/m58.c
@@ -205,8 +205,8 @@ WRITE8_HANDLER( yard_flipscreen_w )
/* screen flip is handled both by software and hardware */
flip_screen_set(space->machine, (data & 0x01) ^ (~input_port_read(space->machine, "DSW2") & 0x01));
- coin_counter_w(0, data & 0x02);
- coin_counter_w(1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x20);
}
diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c
index 970d412fd78..0eb23719ae1 100644
--- a/src/mame/video/m62.c
+++ b/src/mame/video/m62.c
@@ -290,8 +290,8 @@ WRITE8_HANDLER( m62_flipscreen_w )
else
tilemap_set_flip_all(space->machine, 0);
- coin_counter_w(0, data & 2);
- coin_counter_w(1, data & 4);
+ coin_counter_w(space->machine, 0, data & 2);
+ coin_counter_w(space->machine, 1, data & 4);
}
WRITE8_HANDLER( m62_hscroll_low_w )
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 95d00965ef7..e2fcbe46fea 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -344,8 +344,8 @@ WRITE16_HANDLER( m72_port02_w )
if (data & 0xe0) logerror("write %02x to port 02\n",data);
/* bits 0/1 are coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 is flip screen (handled both by software and hardware) */
flip_screen_set(space->machine, ((data & 0x04) >> 2) ^ ((~input_port_read(space->machine, "DSW") >> 8) & 1));
@@ -370,8 +370,8 @@ WRITE16_HANDLER( rtype2_port02_w )
if (data & 0xe0) logerror("write %02x to port 02\n",data);
/* bits 0/1 are coin counters */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 2 is flip screen (handled both by software and hardware) */
flip_screen_set(space->machine, ((data & 0x04) >> 2) ^ ((~input_port_read(space->machine, "DSW") >> 8) & 1));
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index 27248d72004..2ec16a970f5 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -163,7 +163,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data);
/* bit 0 is unknown (used, maybe back color enable?) */
/* bit 1 is coin counter */
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
/* bit 2 is flip screen */
if (flipscreen != (data & 0x04))
@@ -198,7 +198,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data);
/* bit 0 is unknown (used, maybe back color enable?) */
/* bit 1 is coin counter */
- coin_counter_w(0,data & 2);
+ coin_counter_w(space->machine, 0,data & 2);
/* bit 2 is flip screen */
if (flipscreen != (data & 0x04))
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index 94e0587cd6d..7ebc4930b5e 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -65,7 +65,7 @@ WRITE8_HANDLER( mjkjidai_ctrl_w )
display_enable = data & 0x04;
/* bit 5 = coin counter */
- coin_counter_w(0,data & 0x20);
+ coin_counter_w(space->machine, 0,data & 0x20);
/* bits 6-7 select ROM bank */
if (data & 0xc0)
diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c
index 6ad1c7e3c24..64ef6cd7ae4 100644
--- a/src/mame/video/mystston.c
+++ b/src/mame/video/mystston.c
@@ -134,8 +134,8 @@ WRITE8_HANDLER( mystston_video_control_w )
/* D3 - unused */
/* D4-D5 - coin counters in flipped order */
- coin_counter_w(0, data & 0x20);
- coin_counter_w(1, data & 0x10);
+ coin_counter_w(space->machine, 0, data & 0x20);
+ coin_counter_w(space->machine, 1, data & 0x10);
/* D6 - unused */
/* D7 - screen flip */
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index aad74fc2f68..ca7ac659efb 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -157,8 +157,8 @@ WRITE16_HANDLER( salamand_control_port_word_w )
if (ACCESSING_BITS_8_15)
{
- coin_lockout_w(0, data & 0x0200);
- coin_lockout_w(1, data & 0x0400);
+ coin_lockout_w(space->machine, 0, data & 0x0200);
+ coin_lockout_w(space->machine, 1, data & 0x0400);
if (data & 0x0800)
cputag_set_input_line(space->machine, "audiocpu", 0, HOLD_LINE);
diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c
index 7fbd11e48a8..687e381d4bd 100644
--- a/src/mame/video/prehisle.c
+++ b/src/mame/video/prehisle.c
@@ -54,8 +54,8 @@ WRITE16_HANDLER( prehisle_control16_w )
case 0x10: tilemap_set_scrolly(bg2_tilemap, 0, scroll); break;
case 0x18: tilemap_set_scrollx(bg2_tilemap, 0, scroll); break;
case 0x23: invert_controls = data ? 0x00ff : 0x0000; break;
- case 0x28: coin_counter_w(0, data & 1); break;
- case 0x29: coin_counter_w(1, data & 1); break;
+ case 0x28: coin_counter_w(space->machine, 0, data & 1); break;
+ case 0x29: coin_counter_w(space->machine, 1, data & 1); break;
case 0x30: flip_screen_set(space->machine, data & 0x01); break;
}
}
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index 38fd3e8c2d2..ddac9968ac1 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -367,7 +367,7 @@ static VIDEO_UPDATE( qix )
static ADDRESS_MAP_START( qix_video_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, qix_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE(1)
- AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE(qix_palettebank_w)
AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w)
AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w)
@@ -384,7 +384,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( zookeep_video_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, qix_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE(1)
- AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03fe) AM_WRITE(qix_palettebank_w)
AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x03fe) AM_WRITE(zookeep_bankswitch_w)
AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w)
@@ -403,7 +403,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slither_video_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, slither_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE(1)
- AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram)
AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE(qix_palettebank_w)
AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w)
AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w)
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index 71b67b66309..b96bffd893b 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -112,7 +112,7 @@ WRITE8_HANDLER( quizdna_screen_ctrl_w )
int tmp = (data & 0x10) >> 4;
quizdna_video_enable = data & 0x20;
- coin_counter_w(0, data & 1);
+ coin_counter_w(space->machine, 0, data & 1);
if (quizdna_flipscreen == tmp)
return;
diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c
index 701293cfb44..d4a8248a1d2 100644
--- a/src/mame/video/rastan.c
+++ b/src/mame/video/rastan.c
@@ -57,12 +57,12 @@ WRITE16_HANDLER( rastan_spritectrl_w )
/* bit 4 unused */
/* bits 0 and 1 are coin lockout */
- coin_lockout_w(1,~data & 0x01);
- coin_lockout_w(0,~data & 0x02);
+ coin_lockout_w(space->machine, 1,~data & 0x01);
+ coin_lockout_w(space->machine, 0,~data & 0x02);
/* bits 2 and 3 are the coin counters */
- coin_counter_w(1,data & 0x04);
- coin_counter_w(0,data & 0x08);
+ coin_counter_w(space->machine, 1,data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x08);
}
WRITE16_HANDLER( rainbow_spritectrl_w )
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index 00cdd3b95da..069d2df1d9a 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -33,8 +33,8 @@ WRITE16_HANDLER( realbrk_flipscreen_w )
{
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(0, data & 0x0001);
- coin_counter_w(1, data & 0x0004);
+ coin_counter_w(space->machine, 0, data & 0x0001);
+ coin_counter_w(space->machine, 1, data & 0x0004);
flip_screen_set(space->machine, data & 0x0080);
}
diff --git a/src/mame/video/route16.c b/src/mame/video/route16.c
index 1d36f8b5fda..f6d9cd4d305 100644
--- a/src/mame/video/route16.c
+++ b/src/mame/video/route16.c
@@ -31,7 +31,7 @@ WRITE8_HANDLER( route16_out0_w )
{
palette_1 = data & 0x1f;
- coin_counter_w(0, (data >> 5) & 0x01);
+ coin_counter_w(space->machine, 0, (data >> 5) & 0x01);
}
diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c
index 0ebbae12c49..e67e41fe9db 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -71,8 +71,8 @@ WRITE8_HANDLER( scotrsht_palettebank_w )
tilemap_mark_all_tiles_dirty(bg_tilemap);
}
- coin_counter_w(0, data & 1);
- coin_counter_w(1, data & 2);
+ coin_counter_w(space->machine, 0, data & 1);
+ coin_counter_w(space->machine, 1, data & 2);
// data & 4 unknown
}
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 9b1d73a6dcb..addd74c8d2e 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -251,14 +251,14 @@ void seta_coin_lockout_w(running_machine *machine, int data)
}
}
- coin_counter_w (0, (( data) >> 0) & 1 );
- coin_counter_w (1, (( data) >> 1) & 1 );
+ coin_counter_w (machine, 0, (( data) >> 0) & 1 );
+ coin_counter_w (machine, 1, (( data) >> 1) & 1 );
/* blandia, gundhara, kamenrid & zingzip haven't the coin lockout device */
if ( !seta_coin_lockout )
return;
- coin_lockout_w (0, ((~data) >> 2) & 1 );
- coin_lockout_w (1, ((~data) >> 3) & 1 );
+ coin_lockout_w (machine, 0, ((~data) >> 2) & 1 );
+ coin_lockout_w (machine, 1, ((~data) >> 3) & 1 );
}
@@ -283,8 +283,8 @@ WRITE16_HANDLER( seta_vregs_w )
seta_coin_lockout_w (space->machine, data & 0x0f);
if (x1_010 != NULL)
seta_sound_enable_w (x1_010, data & 0x20);
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
}
break;
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index 1167fc071ab..0a43225ae51 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -34,19 +34,19 @@ WRITE8_HANDLER( sidearms_colorram_w )
WRITE8_HANDLER( sidearms_c804_w )
{
/* bits 0 and 1 are coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* bit 2 and 3 lock the coin chutes */
if (!sidearms_gameid || sidearms_gameid==3)
{
- coin_lockout_w(0, !(data & 0x04));
- coin_lockout_w(1, !(data & 0x08));
+ coin_lockout_w(space->machine, 0, !(data & 0x04));
+ coin_lockout_w(space->machine, 1, !(data & 0x08));
}
else
{
- coin_lockout_w(0, data & 0x04);
- coin_lockout_w(1, data & 0x08);
+ coin_lockout_w(space->machine, 0, data & 0x04);
+ coin_lockout_w(space->machine, 1, data & 0x08);
}
/* bit 4 resets the sound CPU */
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index 2ae92ad5223..0f27d5caccd 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -93,18 +93,18 @@ WRITE8_HANDLER( skydiver_width_w )
WRITE8_HANDLER( skydiver_coin_lockout_w )
{
- coin_lockout_global_w(!offset);
+ coin_lockout_global_w(space->machine, !offset);
}
WRITE8_HANDLER( skydiver_start_lamp_1_w )
{
- set_led_status(0, offset);
+ set_led_status(space->machine, 0, offset);
}
WRITE8_HANDLER( skydiver_start_lamp_2_w )
{
- set_led_status(1, offset);
+ set_led_status(space->machine, 1, offset);
}
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 702ed11c8e3..e97e7db5366 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -89,8 +89,8 @@ WRITE8_HANDLER( srumbler_4009_w )
/* bits 4-5 used during attract mode, unknown */
/* bits 6-7 coin counters */
- coin_counter_w(0,data & 0x40);
- coin_counter_w(1,data & 0x80);
+ coin_counter_w(space->machine, 0,data & 0x40);
+ coin_counter_w(space->machine, 1,data & 0x80);
}
diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c
index b6cb92b527a..8757ea47d35 100644
--- a/src/mame/video/starcrus.c
+++ b/src/mame/video/starcrus.c
@@ -93,8 +93,8 @@ WRITE8_HANDLER( starcrus_ship_parm_2_w )
const device_config *samples = devtag_get_device(space->machine, "samples");
s2_sprite = data&0x1f;
- set_led_status(2,~data & 0x80); /* game over lamp */
- coin_counter_w(0, ((data&0x40)>>6)^0x01); /* coin counter */
+ set_led_status(space->machine, 2,~data & 0x80); /* game over lamp */
+ coin_counter_w(space->machine, 0, ((data&0x40)>>6)^0x01); /* coin counter */
engine2_on = ((data&0x20)>>5)^0x01;
if (engine1_on || engine2_on)
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index afa0fe19bc0..f7bf10f196f 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -132,8 +132,8 @@ WRITE8_HANDLER( pbillian_0410_w )
--5----- flip screen
*/
- coin_counter_w(0,data & 0x02);
- coin_counter_w(1,data & 0x04);
+ coin_counter_w(space->machine, 0,data & 0x02);
+ coin_counter_w(space->machine, 1,data & 0x04);
memory_set_bank(space->machine, 1, (data & 0x08) >> 3);
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index d4bb09e2cb7..37161b2777f 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -142,8 +142,8 @@ WRITE8_HANDLER( suprloco_control_w )
/*logerror("Bit 4 = %d\n", (data >> 4) & 1); */
}
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
flip_screen_set(space->machine, data & 0x80);
diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c
index 68eae876fbf..9f6a34694b7 100644
--- a/src/mame/video/taitoic.c
+++ b/src/mame/video/taitoic.c
@@ -4808,10 +4808,10 @@ WRITE8_HANDLER( TC0220IOC_w )
break;
case 0x04: /* coin counters and lockout, hi nibble irrelevant */
- coin_lockout_w(0,~data & 0x01);
- coin_lockout_w(1,~data & 0x02);
- coin_counter_w(0,data & 0x04);
- coin_counter_w(1,data & 0x08);
+ coin_lockout_w(space->machine, 0,~data & 0x01);
+ coin_lockout_w(space->machine, 1,~data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x04);
+ coin_counter_w(space->machine, 1,data & 0x08);
//if (data &0xf0)
//logerror("PC %06x: warning - write %02x to TC0220IOC address %02x\n",cpu_get_pc(space->cpu),data,offset);
@@ -4889,10 +4889,10 @@ WRITE8_HANDLER( TC0510NIO_w )
break;
case 0x04: /* coin counters and lockout */
- coin_lockout_w(0,~data & 0x01);
- coin_lockout_w(1,~data & 0x02);
- coin_counter_w(0,data & 0x04);
- coin_counter_w(1,data & 0x08);
+ coin_lockout_w(space->machine, 0,~data & 0x01);
+ coin_lockout_w(space->machine, 1,~data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x04);
+ coin_counter_w(space->machine, 1,data & 0x08);
break;
default:
@@ -4972,10 +4972,10 @@ WRITE8_HANDLER( TC0640FIO_w )
break;
case 0x04: /* coin counters and lockout */
- coin_lockout_w(0,~data & 0x01);
- coin_lockout_w(1,~data & 0x02);
- coin_counter_w(0,data & 0x04);
- coin_counter_w(1,data & 0x08);
+ coin_lockout_w(space->machine, 0,~data & 0x01);
+ coin_lockout_w(space->machine, 1,~data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x04);
+ coin_counter_w(space->machine, 1,data & 0x08);
break;
default:
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index 585c1caf706..65429ba9496 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -167,8 +167,8 @@ WRITE16_HANDLER( amazon_flipscreen_w )
{
if( ACCESSING_BITS_0_7 )
{
- coin_counter_w( 0, data&0x01 );
- coin_counter_w( 1, (data&0x02)>>1 );
+ coin_counter_w( space->machine, 0, data&0x01 );
+ coin_counter_w( space->machine, 1, (data&0x02)>>1 );
flip_screen_set(space->machine, data&0x04);
}
}
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index 8be76b114b1..db4a94489af 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -37,13 +37,13 @@ WRITE16_HANDLER( tigeroad_videoctrl_w )
/* bits 4-5 are coin lockouts */
- coin_lockout_w(0, !(data & 0x10));
- coin_lockout_w(1, !(data & 0x20));
+ coin_lockout_w(space->machine, 0, !(data & 0x10));
+ coin_lockout_w(space->machine, 1, !(data & 0x20));
/* bits 6-7 are coin counters */
- coin_counter_w(0, data & 0x40);
- coin_counter_w(1, data & 0x80);
+ coin_counter_w(space->machine, 0, data & 0x40);
+ coin_counter_w(space->machine, 1, data & 0x80);
}
}
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 78fb6039ffd..6c65ff56a01 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -335,8 +335,8 @@ WRITE16_HANDLER( tmnt_0a0000_w )
static int last;
/* bit 0/1 = coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02); /* 2 players version */
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02); /* 2 players version */
/* bit 3 high then low triggers irq on sound CPU */
if (last == 0x08 && (data & 0x08) == 0)
@@ -362,7 +362,7 @@ WRITE16_HANDLER( punkshot_0a0020_w )
/* bit 0 = coin counter */
- coin_counter_w(0, data & 0x01);
+ coin_counter_w(space->machine, 0, data & 0x01);
/* bit 2 = trigger irq on sound CPU */
if (last == 0x04 && (data & 0x04) == 0)
@@ -383,8 +383,8 @@ WRITE16_HANDLER( lgtnfght_0a0018_w )
/* bit 0,1 = coin counter */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* bit 2 = trigger irq on sound CPU */
if (last == 0x00 && (data & 0x04) == 0x04)
@@ -402,8 +402,8 @@ WRITE16_HANDLER( blswhstl_700300_w )
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 3 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
@@ -439,8 +439,8 @@ WRITE16_HANDLER( glfgreat_122000_w )
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 4 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
@@ -491,8 +491,8 @@ WRITE16_HANDLER( ssriders_1c0300_w )
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 3 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
@@ -507,8 +507,8 @@ WRITE16_HANDLER( prmrsocr_122000_w )
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(0,data & 0x01);
- coin_counter_w(1,data & 0x02);
+ coin_counter_w(space->machine, 0,data & 0x01);
+ coin_counter_w(space->machine, 1,data & 0x02);
/* bit 4 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c
index 95bdfef845e..003df95297a 100644
--- a/src/mame/video/travrusa.c
+++ b/src/mame/video/travrusa.c
@@ -281,8 +281,8 @@ WRITE8_HANDLER( travrusa_flipscreen_w )
flip_screen_set(space->machine, data & 1);
- coin_counter_w(0, data & 0x02);
- coin_counter_w(1, data & 0x20);
+ coin_counter_w(space->machine, 0, data & 0x02);
+ coin_counter_w(space->machine, 1, data & 0x20);
}
diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c
index 56289524ff4..a9cdb361f8e 100644
--- a/src/mame/video/ultraman.c
+++ b/src/mame/video/ultraman.c
@@ -111,8 +111,8 @@ WRITE16_HANDLER( ultraman_gfxctrl_w )
bank2 = (data & 0x20) >> 5;
tilemap_mark_all_tiles_dirty_all(space->machine); /* should mark only zoom2 */
}
- coin_counter_w(0, data & 0x40);
- coin_counter_w(1, data & 0x80);
+ coin_counter_w(space->machine, 0, data & 0x40);
+ coin_counter_w(space->machine, 1, data & 0x80);
}
}
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index 5999ce06fa8..ebec4c872a0 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -146,8 +146,8 @@ WRITE8_HANDLER( vulgus_bgvideoram_w )
WRITE8_HANDLER( vulgus_c804_w )
{
/* bits 0 and 1 are coin counters */
- coin_counter_w(0, data & 0x01);
- coin_counter_w(1, data & 0x02);
+ coin_counter_w(space->machine, 0, data & 0x01);
+ coin_counter_w(space->machine, 1, data & 0x02);
/* bit 7 flips screen */
flip_screen_set(space->machine, data & 0x80);
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index e37ed54c570..6204fcfda48 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -1052,7 +1052,7 @@ VIDEO_UPDATE ( wecleman )
video_on = wecleman_irqctrl & 0x40;
- set_led_status(0, wecleman_selected_ip & 0x04); // Start lamp
+ set_led_status(screen->machine, 0, wecleman_selected_ip & 0x04); // Start lamp
fg_y = (wecleman_txtram[0x0f24>>1] & (TILEMAP_DIMY - 1));
bg_y = (wecleman_txtram[0x0f26>>1] & (TILEMAP_DIMY - 1));
@@ -1139,7 +1139,7 @@ VIDEO_UPDATE( hotchase )
video_on = wecleman_irqctrl & 0x40;
- set_led_status(0, wecleman_selected_ip & 0x04); // Start lamp
+ set_led_status(screen->machine, 0, wecleman_selected_ip & 0x04); // Start lamp
get_sprite_info(screen->machine);
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index 4752f9a3788..02ce5ef8204 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -87,8 +87,8 @@ WRITE8_HANDLER( yiear_control_w )
/* bits 3 and 4 are coin counters */
- coin_counter_w(0, data & 0x08);
- coin_counter_w(1, data & 0x10);
+ coin_counter_w(space->machine, 0, data & 0x08);
+ coin_counter_w(space->machine, 1, data & 0x10);
}
static TILE_GET_INFO( get_bg_tile_info )